问题清单修复

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

@@ -147,7 +147,7 @@ public class GqxnyPrintStrategy implements IPrintTemplateStrategyService {
             serialNo34 = stringFormat(serialNo34, 4, false, "0");
             //封装打印信息
             MesProduceSnPrintDataModel printDataModel = getModel(mesProduceSn, serialNo34, custPartNo, organizeName);
-            printDataModel.setBarcode(sn);
+            printDataModel.setSupplierCode(configService.getMesConfigByCfgCodeKeyOrg(MesPcnExtConstWords.SUPPLIER_CODE, MesExtEnumUtil.MES_PRINT_TEMPLATE.GQXNY.getValue(), organizeCode).getCfgValue());
             mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(printDataModel);
             //保存打印记录
             MesPrintedSnLog snLog = new MesPrintedSnLog();

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

@@ -62,7 +62,7 @@ public class XiaoPengNewPrintStrategy implements IPrintTemplateStrategyService {
 
     @Override
     public MesProduceSnPrintModel execute(GenSerialNoModel genSerialNoModel, MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule, StepResult stepResult, StationRequestBean reqBean, Boolean isStep) {
-        String format = "yyyy/MM/dd";
+        String format = DateUtil.SHORT_FORMAT;
         Date date = new Date();
         String organizeCode = mesProduceSnPrintModel.getOrganizeCode();
         //gz-xiaopeng

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

@@ -62,7 +62,7 @@ public class XiaoPengPrintStrategy implements IPrintTemplateStrategyService {
 
     @Override
     public MesProduceSnPrintModel execute(GenSerialNoModel genSerialNoModel, MesProduceSnPrintModel mesProduceSnPrintModel, MesNumberRule numberRule, StepResult stepResult, StationRequestBean reqBean, Boolean isStep) {
-        String format = "yyyy/MM/dd";
+        String format = DateUtil.BASE_FORMAT;
         Date date = new Date();
         String organizeCode = mesProduceSnPrintModel.getOrganizeCode();
         //gz-xiaopeng

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

@@ -109,6 +109,7 @@ public class MesProductSnPrintStepService extends BaseStepService {
             MesLabelTemplate labelTemplate = getLabelTemplate(prodLabelTemplate, organizeCode);
             mesProduceSnPrintModel.setMesLabelTemplate(labelTemplate);
             mesProduceSnPrintModel.setProductSn(sn.getProductSn());
+            mesProduceSnPrintModel.setPartNo(sn.getPartNo());
             mesProduceSnPrintModel.setOrganizeCode(organizeCode);
             List<MesProduceSn> snList = new ArrayList<>();
             snList.add(sn);