Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan

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-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java

@@ -631,5 +631,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";
 }