修复二维码打印为dataMatrix格式

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesCustomerPartService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesPrintedSnLogService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProduceSnExtService;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.print.IPrintTemplateStrategyService;
+import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.BarCodeUtils;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintDataModel;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesProduceSnPrintModel;
@@ -23,12 +24,17 @@ import cn.estsh.i3plus.pojo.mes.model.StepResult;
 import cn.estsh.i3plus.pojo.mes.repository.MesCustSoftInfoRepository;
 import cn.estsh.i3plus.pojo.mes.repository.edi.cd.MesCimVolvoJisRackIdDetailRepository;
 import cn.estsh.i3plus.pojo.mes.repository.edi.cd.MesCimVolvoJisRackIdRepository;
+import com.google.zxing.WriterException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.util.*;
 
 /**
@@ -125,6 +131,19 @@ public class ChengDuVolvoPartPrintStrategy implements IPrintTemplateStrategyServ
         result.put(MesPcnExtConstWords.PRINT_BAR_CODE, produceSn.getCustSn());
         result.put(MesPcnExtConstWords.PRINT_DATE, TimeTool.getNowTime(true));
         result.put(MesPcnExtConstWords.USER_NAME, produceSn.getCreateUser());
+
+        // 客户条码 dataMatrix
+        ByteArrayOutputStream dataMatrixCode;
+        try {
+            dataMatrixCode = BarCodeUtils.createDataMatrixCode(workOrder.getCustSn());
+        } catch (WriterException e) {
+            log.error("CustSnPrintStrategy --- execute --- 报错:{}", e.getMessage());
+            return result;
+        } catch (IOException e) {
+            log.error("CustSnPrintStrategy --- execute --- 报错:{}", e.getMessage());
+            return result;
+        }
+        result.put(MesPcnExtConstWords.CUST_SN_DATA_MATRIX, Base64.getEncoder().encodeToString(dataMatrixCode.toByteArray()));
         return result;
     }