From 64380a5f5a0dab7866dfce8d1c33207cd66d3261 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 28 Feb 2025 14:13:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E5=88=A4=E5=8F=AF?= =?UTF-8?q?=E7=96=91=20=E6=9D=A5=E6=BA=90=E5=BA=93=E4=BD=8D=20=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E9=94=99=E8=AF=AF=20=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java index eec6574..665dd30 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java @@ -1279,7 +1279,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService version = productVersionRepository.getByProperty(ddlPackBean); if (version != null) { - source = version.getShipInventoryPoint(); + source = version.getReceiveInventoryPoint(); } } From 4bf1931b394c5efce895dcf60cc6fb60129caaf9 Mon Sep 17 00:00:00 2001 From: jason Date: Mon, 3 Mar 2025 13:12:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=90=E9=83=BD?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=E7=94=9F=E4=BA=A7=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/print/strategy/CustomFieldPrintStrategy.java | 2 ++ .../cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CustomFieldPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CustomFieldPrintStrategy.java index 18a8169..49c347d 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CustomFieldPrintStrategy.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CustomFieldPrintStrategy.java @@ -142,6 +142,8 @@ public class CustomFieldPrintStrategy implements IPrintTemplateStrategyService { result.put(MesPcnExtConstWords.PRINT_BAR_CODE, produceSn.getProductSn()); result.put(MesPcnExtConstWords.PRINT_DATE, TimeTool.getNowTime(true)); result.put(MesPcnExtConstWords.USER_NAME, produceSn.getCreateUser()); + result.put(MesPcnExtConstWords.PRODUCT_DATE, TimeTool.getToday()); + result.put(MesPcnExtConstWords.PRODUCT_TIME, TimeTool.getTimeShortWithColon()); return result; } 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 076b45f..a5cffb4 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 @@ -745,6 +745,10 @@ public class MesPcnExtConstWords { public static final String FG_PART_NO = "fgPartNo"; // 打印日期 public static final String PRINT_DATE = "printDate"; + // 生产日期 + public static final String PRODUCT_DATE = "productDate"; + // 生产日期 + public static final String PRODUCT_TIME = "productTime"; // 打印时间 public static final String PRINT_TIME = "printTime"; //替换数