工步打印条码修复

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

@@ -98,6 +98,7 @@ public class AionPrintStrategy implements IPrintTemplateStrategyService {
         }else {
             String sn = mesProduceSnPrintModel.getProductSn();
             MesProduceSn mesProduceSn = mesProduceSnPrintModel.getMesProduceSnList().get(0);
+            //如下目的主要是截取流水号,主要把流水号转换为32位
             int versionNoLength = numberRule.getSpiltRule().substring(numberRule.getSpiltRule().lastIndexOf(",") + 1).length();
             Integer serialNoLength = numberRule.getSerialnoLength();
             String snPrefix = sn.substring(0, sn.length() - versionNoLength - serialNoLength);
@@ -107,7 +108,7 @@ public class AionPrintStrategy implements IPrintTemplateStrategyService {
             serialNo34 = stringFormat(serialNo34, 4, false, "0");
             sn = snPrefix + serialNo34 + snSuffix;
             //封装打印信息
-                MesProduceSnPrintDataModel printDataModel = getModel(mesProduceSn, serialNo, mesCustomerPart.getCustPartNo(), organizeName);
+            MesProduceSnPrintDataModel printDataModel = getModel(mesProduceSn, serialNo34, mesCustomerPart.getCustPartNo(), organizeName);
             printDataModel.setBarcode(sn);
             mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel);
             //保存打印记录

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

@@ -98,6 +98,7 @@ public class GqaaPrintStrategy implements IPrintTemplateStrategyService {
       }else {
             String sn = mesProduceSnPrintModel.getProductSn();
             MesProduceSn mesProduceSn = mesProduceSnPrintModel.getMesProduceSnList().get(0);
+            //如下目的主要是截取流水号,主要把流水号转换为32位
             int versionNoLength = numberRule.getSpiltRule().substring(numberRule.getSpiltRule().lastIndexOf(",") + 1).length();
             Integer serialNoLength = numberRule.getSerialnoLength();
             String snPrefix = sn.substring(0, sn.length() - versionNoLength - serialNoLength);
@@ -107,7 +108,7 @@ public class GqaaPrintStrategy implements IPrintTemplateStrategyService {
             serialNo34 = stringFormat(serialNo34, 4, false, "0");
             sn = snPrefix + serialNo34 + snSuffix;
             //封装打印信息
-            MesProduceSnPrintDataModel printDataModel = getModel(mesProduceSn, serialNo, mesCustomerPart.getCustPartNo(), organizeName);
+            MesProduceSnPrintDataModel printDataModel = getModel(mesProduceSn, serialNo34, mesCustomerPart.getCustPartNo(), organizeName);
             printDataModel.setBarcode(sn);
             mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel);
             //保存打印记录