From 6c54c40e685faa7ddebb16260978598c3dd1f121 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 27 Dec 2024 16:31:08 +0800 Subject: [PATCH] =?UTF-8?q?44628=20=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=89=93=E5=8D=B0=E7=9B=AE=E8=A7=86=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java | 2 +- .../main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java index 6eb3583..436f5bf 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java @@ -59,7 +59,7 @@ public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategySe // vinCode resultMap.put(MesExtConstWords.VIN_CODE, workOrder.getVinCode()); // vinCode 后四位 - resultMap.put(MesExtConstWords.VIN_CODE_AFTER_FOUR, workOrder.getVinCode()); + resultMap.put(MesExtConstWords.VIN_CODE_AFTER_FOUR, !StringUtils.isEmpty(workOrder.getVinCode()) && workOrder.getVinCode().length() > MesExtConstWords.FOUR ? workOrder.getVinCode().substring(workOrder.getVinCode().length() - MesExtConstWords.FOUR) : workOrder.getVinCode()); // 总成零件号 resultMap.put(MesExtConstWords.PART_NO, workOrder.getPartNo()); // 工单标识 diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java index d8f3f89..5d2e3c0 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java @@ -226,6 +226,8 @@ public class MesExtConstWords { public static final int ONE = 1; //"1" public static final String ONE_STR = "1"; + //4 + public static final Integer FOUR = 4; // 10 public static final Integer TEN = 10; //""