Merge branch 'uat-temp-nht-2504070000-46139' into uat-temp-wj-chongqingdaqu-dev

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

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

@@ -246,6 +246,7 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
             loadingList.setEndScanTime(TimeTool.getNowTime(true));
             //装车单主表
             loadingList.setStatus(MesExtEnumUtil.MES_LOADING_STATUS.SCANNED.getValue());
+            loadingList.setSystemSyncStatus(CommonEnumUtil.FALSE);
             ConvertBean.serviceModelUpdate(loadingList, userInfo);
             //不记忆的数据持久化
             if (!Objects.equals(loadingList.getIsEnableMemory(), MesCommonConstant.TRUE_INTEGER)) {
@@ -266,6 +267,7 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
                 MesShippingOrderManagement orderManagement = shippingOrderManagementRepository.getByProperty(packBean);
                 if (orderManagement != null) {
                     orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.LOADING.getValue());
+                    orderManagement.setSystemSyncStatus(CommonEnumUtil.FALSE);
                     shippingOrderList.add(orderManagement);
                 }
             });