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);