裁片工单标签打印接口开发

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

@@ -71,7 +71,7 @@ public class CutWorkOrderPackageSnPrintStrategy implements IPrintTemplateStrateg
         resultMap.put(MesPcnExtConstWords.LABEL_TEMPLATE, printModel.getMesLabelTemplate());
         resultMap.put(MesPcnExtConstWords.TEMPLATE_DATA, printTemplateDateList);
         resultMap.put(MesPcnExtConstWords.TEMPLATE_CODE, printModel.getMesLabelTemplate().getTemplateCode());
-        resultMap.put(MesPcnExtConstWords.PRINTERE, printModel.getPrinter());
+        resultMap.put(MesPcnExtConstWords.PRINTER, printModel.getPrinter());
         resultMapList.add(resultMap);
         return resultMapList;
     }

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

@@ -30,6 +30,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -100,9 +101,8 @@ public class MesWorkOrderCutPackagePrintStepService extends BaseStepService {
             //根据反射获取策略类--封装打印数据
             String methodCode = labelTemplate.getMethodCode();
             //模板信息丢失抛出异常
-            if (methodCode == null) {
+            if (StringUtils.isEmpty(methodCode))
                 stepExpSendMsgAndThrowEx(reqBean, resultBean, String.format("零件号[%s]的模板代码[%s]的反射类丢失,请配置!", partNoList, labelTemplate.getTemplateCode()));
-            }
 
             MesProduceSnPrintModel mesProduceSnPrintModel = new MesProduceSnPrintModel();
             mesProduceSnPrintModel.setMesLabelTemplate(labelTemplate);

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java

@@ -471,13 +471,12 @@ public class MesPcnExtConstWords {
 
     // 模板代码
     public static final String TEMPLATE_CODE = "templateCode";
-
     //打印模板
     public static final String LABEL_TEMPLATE = "labelTemplate";
     //打印模板数据
     public static final String TEMPLATE_DATA = "templateData";
     //打印机
-    public static final String PRINTERE = "printer";
+    public static final String PRINTER = "printer";
     //客户零件号
     public static final String CUST_PART_NO = "custPartNo";