合并dev

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

@@ -146,7 +146,7 @@ public class MesProductSnPrintNosortStepService extends BaseStepService {
             DdlPackBean packBean = DdlPackBean.getDdlPackBean(outSn.getOrganizeCode());
             DdlPreparedPack.getNumEqualPack(outSn.getId(), MesPcnExtConstWords.ID, packBean);
             mesProduceSnRao.updateByProperties(
-                    new String[]{MesPcnExtConstWords.PRINT_STATUS, "printCount", MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.MODIFY_DATE_TIME},
+                    new String[]{MesPcnExtConstWords.PRINT_STATUS, MesPcnExtConstWords.PRINT_COUNT, MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.MODIFY_DATE_TIME},
                     new Object[]{MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue(), MesPcnExtConstWords.ONE, reqBean.getUserInfo(), TimeTool.getNowTime(true)}, packBean);
         }
         //保存打印条码记录

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

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepServ
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProdShiftContext;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
 import cn.estsh.i3plus.mes.pcn.util.StringUtil;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
@@ -151,11 +152,11 @@ public class MesProductSnSaveStepService extends BaseStepService {
         }
 
         produceSnRepository.updateByProperties(
-                new String[]{"id", "organizeCode"},
+                new String[]{MesPcnExtConstWords.ID, MesPcnExtConstWords.ORGANIZE_CODE},
                 new Object[]{produceSn.getId(), reqBean.getOrganizeCode()},
-                new String[]{"areaCode", "workCenterCode", "workCellCode", "routeCode", "processCode", "craftCode",
+                new String[]{MesPcnExtConstWords.AREA_CODE, MesPcnExtConstWords.WORK_CENTER_CODE, MesPcnExtConstWords.WORK_CELL_CODE, MesPcnExtConstWords.ROUTE_CODE, MesPcnExtConstWords.PROCESS_CODE, MesPcnExtConstWords.CRAFT_CODE,
-                        "snStatus", "qcStatus", "shiftCode", "shiftGroup", "processLabelTemplate", "prodLabelTemplate",
+                        MesPcnExtConstWords.SN_STATUS, MesPcnExtConstWords.QC_STATUS, MesPcnExtConstWords.SHIFT_CODE, MesPcnExtConstWords.SHIFT_GROUP, MesPcnExtConstWords.PROCESS_LABEL_TEMPLATE, MesPcnExtConstWords.PROD_LABEL_TEMPLATE,
-                        "custLabelTemplate", "modifyDatetime", "modifyUser", "inWorkCenterTime", "outWorkCenterTime", "lotNo"},
+                        MesPcnExtConstWords.CUST_LABEL_TEMPLATE, MesPcnExtConstWords.MODIFY_DATE_TIME, MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.IN_WC_TIME, MesPcnExtConstWords.OUT_WC_TIME, MesPcnExtConstWords.LOT_NO},
                 new Object[]{productionPsOutContext.getAreaCode(), productionPsOutContext.getWorkCenterCode(), productionPsOutContext.getWorkCellCode(), productionPsOutContext.getRouteCode(), productionPsOutContext.getProcessCode(), productionPsOutContext.getCraftCode(),
                         productionPsOutContext.getSnStatus(), productionPsOutContext.getQcStatus(), productionPsOutContext.getShiftCode(), productionPsOutContext.getShiftGroup(), productionPsOutContext.getProcessLabelTemplate(), productionPsOutContext.getProdLabelTemplate(),
                         productionPsOutContext.getCustLabelTemplate(), productionPsOutContext.getModifyDatetime(), productionPsOutContext.getModifyUser(), productionPsOutContext.getInWorkCenterTime(), productionPsOutContext.getOutWorkCenterTime(), productionPsOutContext.getLotNo()});

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

@@ -109,6 +109,8 @@ public class MesPcnExtConstWords {
     public static final String SHIFT_GROUP = "shiftGroup";
     // 班组名称
     public static final String SHIFT_GROUP_NAME = "shiftGroupName";
+    // 流程代码
+    public static final String ROUTE_CODE = "routeCode";
     // 工序代码
     public static final String PROCESS_CODE = "processCode";
     // 工艺代码
@@ -157,6 +159,18 @@ public class MesPcnExtConstWords {
     public static final String CUST_SN = "custSn";
     // 条码状态
     public static final String SN_STATUS = "snStatus";
+    // 质量状态
+    public static final String QC_STATUS = "qcStatus";
+    // 过程标签模板
+    public static final String PROCESS_LABEL_TEMPLATE = "processLabelTemplate";
+    // 产品标签模板
+    public static final String PROD_LABEL_TEMPLATE = "prodLabelTemplate";
+    // 客户标签模板
+    public static final String CUST_LABEL_TEMPLATE = "custLabelTemplate";
+    // 进产线时间
+    public static final String IN_WC_TIME = "inWorkCenterTime";
+    // 出产线时间
+    public static final String OUT_WC_TIME = "outWorkCenterTime";
     // 腔数
     public static final String CAVITY = "cavity";
     // 数量
@@ -185,6 +199,8 @@ public class MesPcnExtConstWords {
     public static final String RULE_CODE = "ruleCode";
     // 打印状态
     public static final String PRINT_STATUS = "printStatus";
+    // 打印次数
+    public static final String PRINT_COUNT = "printCount";
     // 颜色
     public static final String COLOR = "color";
     // 设备计数点位固定二级变量