From 2be53f46ac2a40563edaedb18108ed453eb95400 Mon Sep 17 00:00:00 2001 From: jason Date: Tue, 8 Apr 2025 09:50:41 +0800 Subject: [PATCH] =?UTF-8?q?46139=20CN=EF=BC=9A=E5=8F=91=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81=E5=A2=9E=E5=8A=A0=E2=80=9C=E5=B7=B2?= =?UTF-8?q?=E8=A3=85=E8=BD=A6=E2=80=9D=E6=9E=9A=E4=B8=BE=EF=BC=8850?= =?UTF-8?q?=EF=BC=89=EF=BC=8C=E5=AE=8C=E6=88=90=E8=A3=85=E8=BD=A6=E9=98=B2?= =?UTF-8?q?=E9=94=99=E6=A0=A1=E9=AA=8C=E5=90=8E=E6=9B=B4=E6=96=B0=E4=B8=BA?= =?UTF-8?q?=E2=80=9C=E5=B7=B2=E8=A3=85=E8=BD=A6=E2=80=9D=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesShippingLoadingCheckService.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java index 0ec30de..e20ec8b 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java @@ -228,15 +228,25 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS //装车单明细 List vehiclesOrderDetailList = model.getDetailList(); vehiclesOrderDetailList.forEach(k -> { -// if(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue() == k.getStatus()){ -// k.setStatus(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.PUBLISHED.getValue()); // todo 不改变为发运状态 -// } k.setSystemSyncStatus(CommonEnumUtil.FALSE); ConvertBean.serviceModelUpdate(k, userInfo); }); vehiclesOrderDetailRepository.saveAll(vehiclesOrderDetailList); } + + List shippingOrderList = new ArrayList<>(); + model.getDetailList().forEach(k -> { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getNumEqualPack(k.getShippingId(),"id",packBean); + MesShippingOrderManagement orderManagement = shippingOrderManagementRepository.getByProperty(packBean); + if (orderManagement != null) { + orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.LOADING.getValue()); + shippingOrderList.add(orderManagement); + } + }); + shippingOrderManagementRepository.saveAll(shippingOrderList); + update(loadingList); } return model;