Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev

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

@@ -167,9 +167,6 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
                 mesWorkOrderToWmsService.insertBatch(mesWorkOrderToWmsService.saveMesWorkOrderToWms(result, bomList));
             }
         }
-        //修改工单，工单标识需要改为未同步
-        result.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
-
         updateMesWorkOrder(result);
         return result;
     }
@@ -941,6 +938,8 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
     }
 
     private void updateMesWorkOrder(MesWorkOrder mesWorkOrder) {
+        //修改工单，需要重新同步
+        mesWorkOrder.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
         ConvertBean.serviceModelUpdate(mesWorkOrder, AuthUtil.getSessionUser().getUserName());
         baseRDao.update(mesWorkOrder);
         //保存记录