merge 46139

uat-temp-wj-chongqingdaqu-prod-merge-longxing
王杰 3 months ago
parent 9bc3922048
commit aa49e3d9b3

@ -237,6 +237,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)) {
@ -257,6 +258,8 @@ 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);
ConvertBean.serviceModelUpdate(orderManagement, userInfo);
shippingOrderList.add(orderManagement);
}
});

Loading…
Cancel
Save