From 5e6bd2e36e7dab693f2a82461cd2ec9772862a7b Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 27 Mar 2025 23:42:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=B7=A5=E5=8D=95=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E5=B7=A5=E6=AD=A5=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/step/MesWorkOrderCheckSortStepService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCheckSortStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCheckSortStepService.java index ac45bd8..c541763 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCheckSortStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCheckSortStepService.java @@ -105,7 +105,8 @@ public class MesWorkOrderCheckSortStepService extends MesWorkOrderCheckStepServi } //扫描场景下合并历史产出零件信息/产品条码信息 - if (MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN.getValue() == equipVariableCollectContextList.get(0).getMessageSource() && !CollectionUtils.isEmpty(cachedProductionPartContextList)) { + if (MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN.getValue() == equipVariableCollectContextList.get(0).getMessageSource() && + !CollectionUtils.isEmpty(cachedProductionPartContextList) && !CollectionUtils.isEmpty(cachedProductionPsInContextList)) { productionPartContextList.addAll(cachedProductionPartContextList); productionPsInContextList.addAll(cachedProductionPsInContextList); productionPsOutContextList.addAll(cachedProductionPsOutContextList);