Merge remote-tracking branch 'origin/dev-temp-nht-202502180000-customprint' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CustomFieldPrintStrategy.java

@@ -26,9 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
-import java.util.HashMap;
+import java.util.*;
-import java.util.Map;
-import java.util.Objects;
 
 /**
  * @Description :通用打印方式
@@ -89,7 +87,10 @@ public class CustomFieldPrintStrategy implements IPrintTemplateStrategyService {
             mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().clear();
             Map<String, Object> printTemplateData = new HashMap<>(getPrintContextMap(mesProduceSn, customerPart));
             printTemplateData.putAll(customParamValue);
-            mesProduceSnPrintModel.getPrintContextList().add(printTemplateData);
+            List<Map<String, Object>> printDataMapList = new ArrayList<>();
+            printDataMapList.add(printTemplateData);
+            mesProduceSnPrintModel.getPrintContextList().add(packResultMap(mesProduceSnPrintModel, printDataMapList));
+
             //保存打印记录
             mesProduceSnPrintModel.getMesPrintedSnLogList().add(mesPrintedSnLogService.getMesCustomPrintedSnLog(mesProduceSnPrintModel.getUserName(), organizeCode, printDataModel, printTemplateData));
         }
@@ -143,4 +144,13 @@ public class CustomFieldPrintStrategy implements IPrintTemplateStrategyService {
         result.put(MesPcnExtConstWords.USER_NAME, produceSn.getCreateUser());
         return result;
     }
+
+    private Map<String, Object> packResultMap(MesProduceSnPrintModel printModel, List<Map<String, Object>> printTemplateDateList) {
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put(MesPcnExtConstWords.LABEL_TEMPLATE, printModel.getMesLabelTemplate());
+        resultMap.put(MesPcnExtConstWords.TEMPLATE_DATA, printTemplateDateList);
+        resultMap.put(MesPcnExtConstWords.TEMPLATE_CODE, printModel.getMesLabelTemplate().getTemplateCode());
+        resultMap.put(MesPcnExtConstWords.PRINTER, printModel.getPrinter());
+        return resultMap;
+    }
 }