From 43f551f8b8ff7e2a9d834bd86e7cb30396d8d53b Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Fri, 6 Dec 2024 18:29:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=BF=90=E5=8A=A0=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/busi/MesSortShippingCheckService.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java index b4d74fb..c96d81a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java @@ -566,6 +566,8 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService DdlPreparedPack.getNumberSmallerEqualPack(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SKIP.getValue(),"status",orderManagementPackBean); List listDetails = vehiclesOrderDetailRepository.findByHqlWhere(orderManagementPackBean); if(CollectionUtils.isEmpty(listDetails)) return; + + List shippingCodeList = listDetails.stream().map(MesLoadingListDetail::getShippingCode).collect(Collectors.toList()); orderManagementPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getInPackList(listDetails.stream().map(MesLoadingListDetail::getShippingCode).collect(Collectors.toList()), "shippingCode", orderManagementPackBean); DdlPreparedPack.getNumNOEqualPack(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue(), "status", orderManagementPackBean); @@ -574,6 +576,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService if (!exitByHql) { DdlPackBean jisBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(orderManagement.getOrderCode(), "orderCode", jisBean); + DdlPreparedPack.getInPackList(shippingCodeList, "shippingCode", jisBean); List shippingOrderManagementList = shippingOrderManagementRepository.findByHqlWhere(jisBean); for (MesShippingOrderManagement mesShippingOrderManagement : shippingOrderManagementList) { //保存当前发运单明细 @@ -589,6 +592,11 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService ConvertBean.serviceModelUpdate(loadingList, userInfo); shippingLoadingCheckService.update(loadingList); } + listDetails.stream().forEach(mesLoadingListDetail -> { + mesLoadingListDetail.setStatus(MesExtEnumUtil.LOADING_ORDER_DETAIL_SHIPPING_STATUS.SYNC.getValue()); + ConvertBean.serviceModelUpdate(mesLoadingListDetail, userInfo); + }); + vehiclesOrderDetailRepository.saveAll(listDetails); } } //发运结果回传