diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java index 7f30874..79ed7f4 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java +++ b/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(); // 为空时显示内容 diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java index 0686355..9897385 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java +++ b/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"; //包覆零件号