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<MesProductionPartContext> 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<MesProductionPsInContext> productionPsInContextList = null;
+        List<MesProductionPsInContext> productionPsInContextList = new ArrayList<>();
         //加工规则数据信息集合
         List<MesProdRuleContext> 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<MesStation>) stationMap2Back.values(), topContainerSnDetailMap2Sort);
+        return new MesContainerPackageDetailStationContext(stationMap2Back.values().stream().collect(Collectors.toList()), topContainerSnDetailMap2Sort);
 
     }