From f0cd2ca1e34f6a724c8961ca8a6da3a0bab7b0b3 Mon Sep 17 00:00:00 2001 From: "logic.fang" Date: Thu, 19 Jun 2025 10:50:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?47700=20MES-PCN=EF=BC=9A=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E5=AE=B9=E5=99=A8=E7=BB=91=E5=AE=9A=E9=97=AE=E9=A2=98=E6=B1=87?= =?UTF-8?q?=E6=80=BB=EF=BC=9A=EF=BC=88=E4=BC=98=E5=8C=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/controller/base/MesContainerSnStationController.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/controller/base/MesContainerSnStationController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesContainerSnStationController.java index daad800..e60220e 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesContainerSnStationController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesContainerSnStationController.java @@ -55,7 +55,7 @@ public class MesContainerSnStationController { @ApiOperation(value = "新增") public ResultBean doInsert(@RequestBody MesContainerSnStation mesContainerSnStation) { try { - ValidatorBean.checkNotNull(mesContainerSnStation.getCreateUser(), "工厂代码为空"); + ValidatorBean.checkNotNull(mesContainerSnStation.getCreateUser(), "操作人为空"); ValidatorBean.checkNotNull(mesContainerSnStation.getOrganizeCode(), "工厂代码为空"); //校验容器条码是否存在 mesContainerSnService.checkContainerSnIsExist(mesContainerSnStation.getContainerSn(), mesContainerSnStation.getOrganizeCode()); From 27ab9ec39b9e1e97acd0af42e70f9e928f265592 Mon Sep 17 00:00:00 2001 From: jason Date: Thu, 19 Jun 2025 17:03:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?47758=20=E6=AD=A6=E6=B1=89=E8=A3=81?= =?UTF-8?q?=E7=89=87=E5=B7=A5=E5=8D=95=E4=B8=8A=E9=9C=80=E8=A6=81=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AF=B9=E5=BA=94=E7=9A=84=E8=A3=81=E7=89=87=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java index e6d2752..2661758 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java @@ -54,6 +54,7 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic resultMap.put(MesPcnExtConstWords.CUT_WORK_ORDER_NO, workOrderCutPrintModel.getCutWorkOrderNo()); resultMap.put(MesPcnExtConstWords.CUT_NAME, workOrderCutPrintModel.getCutName()); + resultMap.put(MesPcnExtConstWords.CUT_CODE, workOrderCutPrintModel.getCutCode()); // 原材料零件号 resultMap.put(MesPcnExtConstWords.RAW_PART_NO, cutSchemeMaterial == null ? "" : cutSchemeMaterial.getPartNo());