打印模板问题修复

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

@@ -72,8 +72,8 @@ public class CustCodeWhqrPrintStrategy implements IPrintTemplateStrategyService
         if (Objects.isNull(customerPart)) {
             MesPcnException.throwMesBusiException("请检查客户零件信息,零件[%s]客户零件关系未维护", mesProduceSnPrintModel.getPartNo());
         }
-        genSerialNoModel.putDataMap(MesCustomerPart.class.getSimpleName(), customerPart);
         if (!isStep) {
+            genSerialNoModel.putDataMap(MesCustomerPart.class.getSimpleName(), customerPart);
             genSerialNoModel.setCustPartNo(customerPart.getCustPartNo());
             for (int i = 0; i < mesProduceSnPrintModel.getPrintQty(); i++) {
                 //保存条码信息

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

@@ -60,10 +60,10 @@ public class InternalBarcodePrintStrategy implements IPrintTemplateStrategyServi
         //物料信息
         MesPart mesPart = mesPartService.getMesPartByPartNo(mesProduceSnPrintModel.getPartNo(), organizeCode);
         MesCustomerPart customerPart = (!Objects.isNull(genSerialNoModel) && !CollectionUtils.isEmpty(genSerialNoModel.getDataMap()) && genSerialNoModel.getDataMap().containsKey(MesCustomerPart.class.getSimpleName())) ? (MesCustomerPart) genSerialNoModel.getDataMap().get(MesCustomerPart.class.getSimpleName()) : mesCustomerPartService.getMesCustomerPart(organizeCode,mesProduceSnPrintModel.getPartNo());
+        if (!isStep){
             if (StringUtils.isEmpty(genSerialNoModel.getShiftCode()) || StringUtils.isEmpty(genSerialNoModel.getPartNo())) {
                 MesPcnException.throwMesBusiException("班次代码或零件号未维护");
             }
-        if (!isStep){
             if (!Objects.isNull(customerPart)) {
                 genSerialNoModel.setCustPartNo(customerPart.getCustPartNo());
             }

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

@@ -61,10 +61,10 @@ public class MesDPBarcodeWhPrintStrategy implements IPrintTemplateStrategyServic
         //物料信息
         MesPart mesPart = mesPartService.getMesPartByPartNo(mesProduceSnPrintModel.getPartNo(), organizeCode);
         MesCustomerPart customerPart = (!Objects.isNull(genSerialNoModel) && !CollectionUtils.isEmpty(genSerialNoModel.getDataMap()) && genSerialNoModel.getDataMap().containsKey(MesCustomerPart.class.getSimpleName())) ? (MesCustomerPart) genSerialNoModel.getDataMap().get(MesCustomerPart.class.getSimpleName()) : mesCustomerPartService.getMesCustomerPart(organizeCode,mesProduceSnPrintModel.getPartNo());
+        if (!isStep){
             if (StringUtils.isEmpty(genSerialNoModel.getShiftCode()) || Objects.isNull(customerPart)) {
                 MesPcnException.throwMesBusiException("班次代码或客户零件号未维护");
             }
-        if (!isStep){
             genSerialNoModel.setCustPartNo(customerPart.getCustPartNo());
             for (int i = 0; i < mesProduceSnPrintModel.getPrintQty(); i++) {
                 //保存条码信息