From 25358f36dfe72f8d10c8657f1c4d6a91f4e8bec4 Mon Sep 17 00:00:00 2001
From: "castle.zang" <castle.zang@estsh.com>
Date: Mon, 18 Nov 2024 18:51:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=9B=AE=E8=A7=86=E5=8D=95-d?=
 =?UTF-8?q?escription?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java  | 5 +++--
 .../cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java   | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

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";
     //包覆零件号