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

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

@@ -320,15 +320,18 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                 }
 
                 orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPING.getValue());
+                orderManagement.setSystemSyncStatus(CommonEnumUtil.FALSE);
                 ConvertBean.serviceModelUpdate(orderManagement, userInfo);
                 update(orderManagement);
 
                 detail.setActualQty(1);
+                detail.setSystemSyncStatus(CommonEnumUtil.FALSE);
                 ConvertBean.serviceModelUpdate(detail, userInfo);
                 updateDetail(detail);
                 //内部条码更新条码状态
                 if (!Objects.isNull(produceSn.getId())) {
                     produceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.SHIPPED.getValue());
+                    produceSn.setSystemSyncStatus(CommonEnumUtil.FALSE);
                     ConvertBean.serviceModelUpdate(detail, userInfo);
                     produceSnExtService.update(produceSn);
                 }
@@ -494,6 +497,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         }
 
         //发运单状态修改为校验完成
+        orderManagement.setSystemSyncStatus(CommonEnumUtil.FALSE);
         orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue());
         orderManagement.setEndScanTime(TimeTool.getNowTime(true));
 
@@ -518,6 +522,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                 detail.setBarcode(managementDetail.getBarcode());
                 DdlPreparedPack.getStringEqualPack(detail.getBarcode(), "productSn", packBean);
             }
+            detail.setSystemSyncStatus(CommonEnumUtil.FALSE);
             detail.setActualQty(1);
             ConvertBean.serviceModelUpdate(detail, userInfo);
             if(!StringUtils.isEmpty(detail.getBarcode()) && !Objects.equals(orderManagement.getIsEnableMemory(), MesCommonConstant.TRUE_INTEGER)){
@@ -525,6 +530,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                 MesProduceSn produceSn = produceSnRepository.getByProperty(packBean);
                 if(!Objects.isNull(produceSn)){
                     produceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.SHIPPED.getValue());
+                    produceSn.setSystemSyncStatus(CommonEnumUtil.FALSE);
                     ConvertBean.serviceModelUpdate(produceSn, userInfo);
                     produceSnList.add(produceSn);
                 }
@@ -573,6 +579,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                 if(!StringUtil.isEmpty(vehiclesOrderDetail)){
                     MesLoadingList loadingList = vehiclesOrderRepository.getById(vehiclesOrderDetail.getPid());
                     if (!StringUtils.isEmpty(loadingList)) {
+                        loadingList.setSystemSyncStatus(CommonEnumUtil.FALSE);
                         loadingList.setStatus(MesExtEnumUtil.MES_LOADING_STATUS.ASN.getValue());
                         ConvertBean.serviceModelUpdate(loadingList, userInfo);
                         shippingLoadingCheckService.update(loadingList);