Merge branch 'dev-wuhan' into dev-wuhan-temp

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionSortModuleService.java

@@ -107,7 +107,7 @@ public class MesProductionSortModuleService extends BaseModuleService {
     //队列工单清单列表标题
     public List<AttrBean> dataAttrList() {
         List<AttrBean> attrBeanList = new ArrayList<>();
-        PojoAttrUtil.loadPojoAttrs(attrBeanList, MesPcnExtConstWords.PRODUCE_SEQ, "工单序号");
+        PojoAttrUtil.loadPojoAttrs(attrBeanList, MesPcnExtConstWords.WORK_ORDER_SEQ, "工单序号");
         PojoAttrUtil.loadPojoAttrs(attrBeanList, MesPcnExtConstWords.CAR_MODEL_CODE, "车型配置");
         PojoAttrUtil.loadPojoAttrs(attrBeanList, MesPcnExtConstWords.CUST_ORDER_NO, "客户订单号");
         PojoAttrUtil.loadPojoAttrs(attrBeanList, MesPcnExtConstWords.PART_NO, "零件号");

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

@@ -23,7 +23,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -128,17 +131,10 @@ public class MesProductSnPrintSortStepService extends BaseStepService {
             // 从物料信息中获取标签模板
             String labelTemplateCode = partDataContext.get(sn.getPartNo()).getCustLabelTemplate();
 
-            // 从物料信息中获取打印机
-            String productPrinterCode = partDataContext.get(sn.getPartNo()).getProductPrinterCode();
-
             if (labelTemplateCode == null) {
                 stepExpSendMsgAndThrowEx(reqBean, resultBean, String.format("工单号[%s]零件号[%s]未在ERP物料信息维护打印模板,请检查并修改!", sn.getWorkOrderNo(), sn.getPartNo()));
             }
 
-            if (StringUtils.isEmpty(productPrinterCode)) {
-                stepExpSendMsgAndThrowEx(reqBean, resultBean, String.format("工单号[%s]零件号[%s]未在ERP物料信息维护打印机,请检查并修改!", sn.getWorkOrderNo(), sn.getPartNo()));
-            }
-
             MesProduceSnPrintModel mesProduceSnPrintModel = new MesProduceSnPrintModel();
             // 查模板代码
             MesLabelTemplate labelTemplate = getLabelTemplate(labelTemplateCode, organizeCode);
@@ -148,7 +144,7 @@ public class MesProductSnPrintSortStepService extends BaseStepService {
             }
 
             mesProduceSnPrintModel.setMesLabelTemplate(labelTemplate);
-            mesProduceSnPrintModel.setPrinter(productPrinterCode);
+            mesProduceSnPrintModel.setPrinter(partDataContext.get(sn.getPartNo()).getProductPrinterCode());
             mesProduceSnPrintModel.setPartNo(sn.getPartNo());
             mesProduceSnPrintModel.setOrganizeCode(organizeCode);
             mesProduceSnPrintModel.setSourceData(workOrder);

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

@@ -641,5 +641,7 @@ public class MesPcnExtConstWords {
     public static final int DATA_MATRIX_CODE_HEIGHT = 80;
     // dataMatrix 形式的客户条码
     public static final String CUST_SN_DATA_MATRIX = "custSnDataMatrix";
-    public static final String CUST_SN_DATA_MATRIX_BASE64 = "custSnDataMatrixBase64";
+
+    // 工单序号
+    public static final String WORK_ORDER_SEQ = "workOrderSeq";
 }