Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java

@@ -439,7 +439,9 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
     public void doUpdatePrintStatus(List<String> cutWorkOrderIds, String organizeCode, String userName) {
 
         for (String cutWorkOrderId : cutWorkOrderIds) {
-            workOrderCutRepository.updateByProperties(MesExtConstWords.ID, Long.parseLong(cutWorkOrderId),
+            workOrderCutRepository.updateByProperties(
+                    new String[]{MesExtConstWords.ID, MesExtConstWords.ORGANIZE_CODE},
+                    new Object[]{Long.parseLong(cutWorkOrderId), organizeCode},
                     new String[]{MesExtConstWords.IS_DELETED, MesExtConstWords.MODIFY_USER, MesExtConstWords.MODIFY_DATE_TIME, MesExtConstWords.SYSTEM_SYNC_STATUS, MesExtConstWords.PRINT_STATUS},
                     new Object[]{CommonEnumUtil.VALID,userName,TimeTool.getNowTime(true), CommonEnumUtil.FALSE, MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue()});
         }