From d4971b0cd7a73c2a3e2d8a6ba2789540ddb70019 Mon Sep 17 00:00:00 2001 From: jun Date: Sat, 28 Sep 2024 09:58:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E6=8B=89=E5=8A=A8?= =?UTF-8?q?=E7=BB=84=E6=98=8E=E7=BB=86=E6=9B=B4=E6=96=B0=E6=8E=92=E9=99=A4?= =?UTF-8?q?=E8=87=AA=E5=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesPartPullDetailService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPullDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPullDetailService.java index db94ac6..19f10fc 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPullDetailService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPullDetailService.java @@ -51,6 +51,7 @@ public class MesPartPullDetailService extends BaseMesService DdlPreparedPack.getStringEqualPack(item.getPullCode(), "pullCode", partPackBean); DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", partPackBean); DdlPreparedPack.getStringEqualPack(item.getWorkCellCode(), "workCellCode", partPackBean); + DdlPreparedPack.getNumNOEqualPack(item.getId(),"id",partPackBean); boolean flg = baseRDao.isExitByHql(partPackBean); if (flg) { throw ImppExceptionBuilder.newInstance() From 2f36e42def67466dfd2f7f56539391a60a1dc754 Mon Sep 17 00:00:00 2001 From: gsz Date: Sun, 29 Sep 2024 09:46:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?43285=20JIS=E6=8B=89=E5=8A=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java index 3f6a064..90edeb7 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java @@ -245,6 +245,7 @@ public class MesPullingOrderInfoService extends BaseMesService Date: Sun, 29 Sep 2024 15:02:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?PC=E7=AB=AF=E8=A3=85=E9=85=8D=E7=9B=AE?= =?UTF-8?q?=E8=A7=86=E5=8D=95=E6=89=93=E5=8D=B0=E7=AD=96=E7=95=A5=E7=B1=BB?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=BC=95=E7=94=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java | 2 +- 1 file changed, 1 insertion(+), 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 9349981..5ddaa24 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 @@ -63,7 +63,7 @@ public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategySe // 客户零件号 resultMap.put(MesExtConstWords.CUST_PART_NO, workOrder.getPartNo()); // 客户条码 - resultMap.put(MesExtConstWords.SN, workOrder.getSn()); + resultMap.put(MesExtConstWords.SN, workOrder.getCustSn()); // 备注 resultMap.put(MesExtConstWords.REMARK, customerCarModel == null ? "" : customerCarModel.getRemark()); // 重打印