修复成都工位端打印DataMatrix格式问题

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

@@ -77,7 +77,7 @@ public class ChengDuSplitFixCharPrintStrategy implements IPrintTemplateStrategyS
                 MesProduceSnPrintDataModel printDataModel = getModel(produceSn, custPartNo);
                 mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().clear();
                 mesProduceSnPrintModel.getMesProduceSnList().add(produceSn);
-                Map<String, Object> printTemplateData = new HashMap<>(getPrintContextMap(produceSn, custPartNo));
+                Map<String, Object> printTemplateData = new HashMap<>(getPrintContextMap(produceSn, custPartNo, isStep));
                 mesProduceSnPrintModel.getPrintContextList().add(printTemplateData);
                 //保存打印记录
                 mesProduceSnPrintModel.getMesPrintedSnLogList().add(mesPrintedSnLogService.getMesCustomPrintedSnLog(mesProduceSnPrintModel.getUserName(), organizeCode, printDataModel, printTemplateData));
@@ -87,7 +87,7 @@ public class ChengDuSplitFixCharPrintStrategy implements IPrintTemplateStrategyS
             //封装打印信息
             MesProduceSnPrintDataModel printDataModel = getModel(mesProduceSn, custPartNo);
             mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().clear();
-            Map<String, Object> printTemplateData = new HashMap<>(getPrintContextMap(mesProduceSn, custPartNo));
+            Map<String, Object> printTemplateData = new HashMap<>(getPrintContextMap(mesProduceSn, custPartNo, isStep));
             List<Map<String, Object>> printDataMapList = new ArrayList<>();
             printDataMapList.add(printTemplateData);
             mesProduceSnPrintModel.getPrintContextList().add(packResultMap(mesProduceSnPrintModel, printDataMapList));
@@ -131,7 +131,7 @@ public class ChengDuSplitFixCharPrintStrategy implements IPrintTemplateStrategyS
         return mesProduceSnPrintDataModel;
     }
 
-    private Map<String, Object> getPrintContextMap(MesProduceSn produceSn, String custPartNo) {
+    private Map<String, Object> getPrintContextMap(MesProduceSn produceSn, String custPartNo, boolean isStep) {
         Map<String, Object> result = new HashMap<>();
         String[] splitSn = produceSn.getProductSn().split("#");
         if (splitSn.length < 3) {
@@ -173,7 +173,11 @@ public class ChengDuSplitFixCharPrintStrategy implements IPrintTemplateStrategyS
             log.error("ChengDuSplitFixCharPrintStrategy --- execute --- 报错:{}", e.getMessage());
             return result;
         }
-        result.put(MesPcnExtConstWords.CUST_SN_DATA_MATRIX, "data:image/jpeg;base64," + Base64.getEncoder().encodeToString(dataMatrixCode.toByteArray()));
+        String encoderCode = Base64.getEncoder().encodeToString(dataMatrixCode.toByteArray());
+        if (!isStep) {
+            encoderCode = "data:image/jpeg;base64," + encoderCode;
+        }
+        result.put(MesPcnExtConstWords.CUST_SN_DATA_MATRIX, encoderCode);
         return result;
     }