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

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java

@@ -116,6 +116,6 @@ public class PcnRepositoryAspect {
 
     private void updateBeanSync(BaseBean bean) {
         bean.setSystemSyncStatus(CommonEnumUtil.FALSE);
-        //bean.setModifyDatetime(TimeTool.getNowTime(true));
+        bean.setSystemSyncDatetime("");
     }
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java

@@ -285,6 +285,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
             }
         }
         model.getOrderPartList().forEach(k -> {
+            k.setSystemSyncStatus(CommonEnumUtil.FALSE);
+            k.setSystemSyncDatetime("");
             ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName());
         });
         spotCheckOrderPartRepository.saveAll(model.getOrderPartList());
@@ -300,6 +302,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
                 orderResult = MesExtEnumUtil.SPOT_CHECK_ORDER_RESULT_TYPE.NOK.getValue();
             }
             result.setSpotCheckTime(TimeTool.getNowTime(true));
+            result.setSystemSyncStatus(CommonEnumUtil.FALSE);
+            result.setSystemSyncDatetime("");
             ConvertBean.serviceModelUpdate(result, AuthUtil.getSessionUser().getUserName());
         }
 
@@ -307,6 +311,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
 
         spotCheckOrder.setSpotCheckOrderResult(orderResult);
         spotCheckOrder.setSpotCheckTime(TimeTool.getNowTime(true));
+        spotCheckOrder.setSystemSyncStatus(CommonEnumUtil.FALSE);
+        spotCheckOrder.setSystemSyncDatetime("");
         spotCheckOrder.setSpotCheckUser(AuthUtil.getSessionUser().getUserName());
         spotCheckOrder.setStatus(MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.COMPLETE.getValue());
         ConvertBean.serviceModelUpdate(spotCheckOrder, AuthUtil.getSessionUser().getUserName());
@@ -371,6 +377,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
             result.setSpotCheckRealValue("");
             result.setIsTolerance(0);
             result.setSpotCheckTime("");
+            result.setSystemSyncStatus(CommonEnumUtil.FALSE);
+            result.setSystemSyncDatetime("");
             ConvertBean.serviceModelInitialize(result, AuthUtil.getSessionUser().getUserName());
             orderResultNewList.add(result);
         });
@@ -391,6 +399,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
                 BeanUtils.copyProperties(k, spotCheckOrderPart, "id");
                 spotCheckOrderPart.setSpotCheckOrderId(finalOrderTemp.getId());
                 spotCheckOrderPart.setSn("");
+                spotCheckOrderPart.setSystemSyncStatus(CommonEnumUtil.FALSE);
+                spotCheckOrderPart.setSystemSyncDatetime("");
 //                ConvertBean.serviceModelInitialize(spotCheckOrderPart, "LML");
                 ConvertBean.serviceModelInitialize(spotCheckOrderPart, AuthUtil.getSessionUser().getUserName());
                 spotCheckOrderPartList.add(spotCheckOrderPart);
@@ -493,6 +503,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
         BeanUtils.copyProperties(equipmentSpotCheck, bean, "id");
 //        bean.setSpotCheckOrderNo("SPOT_CHECK_ORDER_NO_0003");
         bean.setSpotCheckOrderNo(orderNo);
+        bean.setSystemSyncStatus(CommonEnumUtil.FALSE);
+        bean.setSystemSyncDatetime("");
         ConvertBean.serviceModelInitialize(bean, AuthUtil.getSessionUser().getUserName());
         bean = spotCheckOrderRepository.insert(bean);
 
@@ -510,6 +522,7 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
             result.setTaskItemName(k.getSpotCheckItemName());
             result.setSpotCheckStandardValue(k.getStandardValue());
             result.setSystemSyncStatus(CommonEnumUtil.FALSE);
+            result.setSystemSyncDatetime("");
             ConvertBean.serviceModelInitialize(result, AuthUtil.getSessionUser().getUserName());
 //            ConvertBean.serviceModelInitialize(result, "LML");
             spotCheckOrderResults.add(result);
@@ -524,6 +537,7 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
                 spotCheckOrderPart.setSpotCheckOrderId(finalBean.getId());
                 BeanUtils.copyProperties(k, spotCheckOrderPart, "id");
                 spotCheckOrderPart.setSystemSyncStatus(CommonEnumUtil.FALSE);
+                spotCheckOrderPart.setSystemSyncDatetime("");
                 ConvertBean.serviceModelInitialize(spotCheckOrderPart, AuthUtil.getSessionUser().getUserName());
 //                ConvertBean.serviceModelInitialize(spotCheckOrderPart, "LML");
                 spotCheckOrderPartList.add(spotCheckOrderPart);