From cab28f1ba8533dcd39801bd9aa36231bc054da56 Mon Sep 17 00:00:00 2001 From: yxw Date: Wed, 18 Sep 2024 16:20:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=81=E7=89=87=E7=AE=B1=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8F=82=E6=95=B0=E5=A2=9E=E5=8A=A0=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/print/strategy/CutWorkOrderPackageSnPrintStrategy.java | 3 ++- .../cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderPackageSnPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderPackageSnPrintStrategy.java index f74c12d..86f593a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderPackageSnPrintStrategy.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderPackageSnPrintStrategy.java @@ -45,11 +45,12 @@ public class CutWorkOrderPackageSnPrintStrategy implements IPrintTemplateStrateg } resultMap.put(MesPcnExtConstWords.LOT_NO, lotNo); + resultMap.put(MesPcnExtConstWords.TIME, model.getCreateDatetime()); resultMap.put(MesPcnExtConstWords.PACKAGE_QTY, model.getPackageQty()); resultMap.put(MesPcnExtConstWords.QTY, model.getQty()); resultMap.put(MesPcnExtConstWords.CUT_WORK_ORDER_NO, model.getCutWorkOrderNo()); resultMap.put(MesPcnExtConstWords.PACKAGE_SN, model.getPackageNo()); - // 二维码 + // 一维码 resultMap.put(MesPcnExtConstWords.BAR_CODE, model.getPackageNo()); // 二维码 resultMap.put(MesPcnExtConstWords.QR_CODE, new StringJoiner(MesPcnExtConstWords.VERTIVAL_BAR).add("YFWHU") 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 3a84fd5..8ada139 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 @@ -496,4 +496,6 @@ public class MesPcnExtConstWords { public static final String BAR_CODE = "barCode"; //竖杠 public static final String VERTIVAL_BAR = "|"; + // 时间 + public static final String TIME = "time"; }