From cb3476ce44f2e8090aacfb2adebbc3080b3c1f11 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 17 Jul 2025 09:25:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=AE=B9=E5=99=A8=E4=B8=BB?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=9C=BA=E6=99=AF=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/step/MesStationMatchProductSnStepService.java | 2 +- .../stationpm/MesStationMatchPsProcessMethodDecoratorStepService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesStationMatchProductSnStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesStationMatchProductSnStepService.java index c749b6e..807645a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesStationMatchProductSnStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesStationMatchProductSnStepService.java @@ -149,7 +149,7 @@ public class MesStationMatchProductSnStepService extends BaseStepService { List productionPartContextList2UnFinish = CollectionUtils.isEmpty(productionPartContextList) ? null : productionPartContextList.stream().filter(o -> (null != o && o.getIsFinishCode().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0)).collect(Collectors.toList()); //进料主条码数据信息 - List productionPsInContextList = null; + List productionPsInContextList = new ArrayList<>(); //加工规则数据信息集合 List prodRuleContextList = new ArrayList<>(); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/method/stationpm/MesStationMatchPsProcessMethodDecoratorStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/method/stationpm/MesStationMatchPsProcessMethodDecoratorStepService.java index 97ea90b..0dab9ff 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/method/stationpm/MesStationMatchPsProcessMethodDecoratorStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/method/stationpm/MesStationMatchPsProcessMethodDecoratorStepService.java @@ -115,7 +115,7 @@ public class MesStationMatchPsProcessMethodDecoratorStepService extends BaseStep topContainerSnDetailMap2Sort.put(detailList2Sort.get(0).getTopContainerSnKey(), detailList2Sort); } - return new MesContainerPackageDetailStationContext((List) stationMap2Back.values(), topContainerSnDetailMap2Sort); + return new MesContainerPackageDetailStationContext(stationMap2Back.values().stream().collect(Collectors.toList()), topContainerSnDetailMap2Sort); }