裁片工单标签打印工步修改

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderCutPackagePrintStepService.java

@@ -74,7 +74,7 @@ public class MesWorkOrderCutPackagePrintStepService extends BaseStepService {
         //
         //String labelTemplateCode = entry.getValue().getLabelTemplate();
 
-        List<Map<String, Object>> resultMap = null;
+        List<Map<String, Object>> resultMap = new ArrayList<>();
 
         Map<String, List<MesWorkOrderCutDetailModel>> workOrderCutDetailModelMapByPartNo = workOrderCutFgDataContext.stream().collect(Collectors.groupingBy(o -> new StringJoiner(MesPcnExtConstWords.AND).add(o.getPrinter()).add(o.getLabelTemplate()).toString()));
 
@@ -113,7 +113,7 @@ public class MesWorkOrderCutPackagePrintStepService extends BaseStepService {
             // GenSerialNoModel model , MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule, StepResult stepResult, StationRequestBean reqBean, Boolean isStep
             MesProduceSnPrintModel printModel = strategyService.execute(null, mesProduceSnPrintModel, null, stepResult, reqBean, true);
 
-            resultMap = printModel.getPrintContextList();
+            resultMap.addAll(printModel.getPrintContextList());
         }
 
         List<String> cutWorkOrderNoList = workOrderCutFgDataContext.stream().map(MesWorkOrderCutDetailModel::getCutWorkOrderNo).collect(Collectors.toList());