Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp

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

@@ -77,14 +77,15 @@ public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategySe
         // 客户条码
         resultMap.put(MesPcnExtConstWords.SN, workOrder.getCustSn());
         // 车型名称
-        resultMap.put(MesPcnExtConstWords.REMARK, workOrder.getDescription() + (customerCarModel == null ? "" : customerCarModel.getRemark()));
+        resultMap.put(MesPcnExtConstWords.REMARK, workOrder.getDescription());
         // 重打印
         resultMap.put(MesPcnExtConstWords.REPRINT, "");
         // EDI接口时间 取工单plan_start_time
         resultMap.put(MesPcnExtConstWords.EDI_REC_TIME, workOrder.getPlanStartTime());
         // 打印时间
         resultMap.put(MesPcnExtConstWords.PRINT_TIME, TimeTool.getNowTime("yyyy-MM-dd HH:mm:ss"));
-
+        //替换总成SN
+        resultMap.put(MesPcnExtConstWords.REPLACE_CSN,MesPcnExtConstWords.REPLACE_CSN_CP+workOrder.getCustPartNo().substring(workOrder.getCustPartNo().length() -4));
         // 总个数
         Integer totalCount = partProdGroup.getTotalCount();
         // 为空时显示内容

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

@@ -234,8 +234,8 @@ public class MesProductionCustomContextStepService extends BaseStepService imple
     @Override
     public String getRepeatAssemblySn(String organizeCode, String workCenterCode, String workCellCode, String repeatKey) {
         String repeatAssemblySnJson = getFsmBusiData(organizeCode, getRepeatAssemblySnContextKey(organizeCode, workCenterCode, workCellCode), repeatKey);
-        MesProductionAssemblyContext productionAssemblyContext = !StringUtils.isEmpty(repeatAssemblySnJson) ? JSONObject.parseObject(repeatAssemblySnJson, MesProductionAssemblyContext.class) : null;
-        return null != productionAssemblyContext ? productionAssemblyContext.getAssemblySn() : null;
+        //MesProductionAssemblyContext productionAssemblyContext = !StringUtils.isEmpty(repeatAssemblySnJson) ? JSONObject.parseObject(repeatAssemblySnJson, MesProductionAssemblyContext.class) : null;
+        return repeatAssemblySnJson;
     }
 
     //根据设备代码获取可复用条码的个数

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

@@ -653,6 +653,10 @@ public class MesPcnExtConstWords {
     public static final String FG_PART_NO = "fgPartNo";
     // 打印时间
     public static final String PRINT_TIME = "printTime";
+    //替换数
+    public static final String REPLACE_CSN = "replaceCsn";
+    //目视单固定值
+    public static final String REPLACE_CSN_CP = "CP";
     // 裁片名称
     public static final String CUT_NAME = "cutName";
     //包覆零件号