From 4a43ad748f0b3d91776e0a99161acb4abc6b553b Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 17 Mar 2025 16:17:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BE=99=E5=85=B4=E5=8F=91=E8=BF=90=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/CqLxSortShippingPrintStrategyService.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/sortshipping/strategy/CqLxSortShippingPrintStrategyService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/sortshipping/strategy/CqLxSortShippingPrintStrategyService.java index 35dc4a1..51fc440 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/sortshipping/strategy/CqLxSortShippingPrintStrategyService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/sortshipping/strategy/CqLxSortShippingPrintStrategyService.java @@ -87,7 +87,8 @@ public class CqLxSortShippingPrintStrategyService extends SortShippingDispatchSt result.setDocNoOther(shippingOrderManagement.getShippingCode().substring(0, shippingOrderManagement.getShippingCode().length() - 4)); } List sheetJisDetailList = CollectionUtils.isEmpty(jisDetailByPidMap) ? new ArrayList<>() : jisDetailByPidMap.get(sheetJis.get(0).getId()); - if (!CollectionUtils.isEmpty(sheetJisDetailList)) sheetJisDetailList = sheetJisDetailList.stream().filter(o -> null != o).sorted(Comparator.comparing(MesCimSeresSrmRunSheetJisDetail::getMaterielCode)).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(sheetJisDetailList)) sheetJisDetailList = sheetJisDetailList.stream().filter(o -> + (null != o && !StringUtils.isEmpty(o.getSerialNumber()))).sorted(Comparator.comparing(MesCimSeresSrmRunSheetJisDetail::getSerialNumber)).collect(Collectors.toList()); Integer index = MesExtConstWords.ONE; for (MesCimSeresSrmRunSheetJisDetail cimSeresSrmRunSheetJisDetail : sheetJisDetailList) { @@ -147,10 +148,7 @@ public class CqLxSortShippingPrintStrategyService extends SortShippingDispatchSt DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode); if (jisIdList.size() == 1) DdlPreparedPack.getNumEqualPack(jisIdList.get(0), MesExtConstWords.PID, packBean); else DdlPreparedPack.getInPackList(jisIdList, MesExtConstWords.PID, packBean); - List cimSeresSrmRunSheetJisDetailList = cimSeresSrmRunSheetJisDetailRepository.findByHqlWhere(packBean); - return CollectionUtils.isEmpty(cimSeresSrmRunSheetJisDetailList) ? null : - cimSeresSrmRunSheetJisDetailList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getSerialNumber()))) - .sorted(Comparator.comparing(MesCimSeresSrmRunSheetJisDetail::getSerialNumber)).collect(Collectors.toList()); + return cimSeresSrmRunSheetJisDetailRepository.findByHqlWhere(packBean); } }