diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintStepService.java index 48d7110..f5205ce 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnPrintStepService.java @@ -59,24 +59,24 @@ public class MesProductSnPrintStepService extends BaseStepService { List productionPsOutContextList = mesProductionDispatchContextStepService.getProductionPsOutContext(reqBean); //2. 获取条码需要模板、模板代码、打印机 --- 循环遍历条码 封装数据 for (MesProductionPsOutContext sn : productionPsOutContextList) { - String custLabelTemplate = sn.getCustLabelTemplate(); + String prodLabelTemplate = sn.getProdLabelTemplate(); MesLabelTemplate labelTemplate; // 查模板代码 - if (!labelTemplateMap.containsKey(custLabelTemplate)) { - labelTemplate = getLabelTemplate(custLabelTemplate, organizeCode); + if (!labelTemplateMap.containsKey(prodLabelTemplate)) { + labelTemplate = getLabelTemplate(prodLabelTemplate, organizeCode); //模板信息丢失抛出异常 if (labelTemplate == null) { - execExpSendMsgAndThrowEx(reqBean, resultBean, String.format("零件号[%s]的模板代码[%s]的模板信息丢失,请配置!", sn.getPartNo(), custLabelTemplate)); + execExpSendMsgAndThrowEx(reqBean, resultBean, String.format("零件号[%s]的模板代码[%s]的模板信息丢失,请配置!", sn.getPartNo(), prodLabelTemplate)); } - labelTemplateMap.put(custLabelTemplate, labelTemplate); + labelTemplateMap.put(prodLabelTemplate, labelTemplate); } else { - labelTemplate = labelTemplateMap.get(custLabelTemplate); + labelTemplate = labelTemplateMap.get(prodLabelTemplate); } //根据反射获取策略类--封装打印数据 String methodCode = labelTemplate.getMethodCode(); //模板信息丢失抛出异常 if (methodCode == null) { - execExpSendMsgAndThrowEx(reqBean, resultBean, String.format("零件号[%s]的模板代码[%s]的反射类丢失,请配置!", sn.getPartNo(), custLabelTemplate)); + execExpSendMsgAndThrowEx(reqBean, resultBean, String.format("零件号[%s]的模板代码[%s]的反射类丢失,请配置!", sn.getPartNo(), prodLabelTemplate)); } IPrintTemplateStrategyService strategyService = (IPrintTemplateStrategyService) SpringContextsUtil.getBean(methodCode); Map snData = strategyService.execute(sn, organizeCode);