From dca4d89330a9f53ddc76a203eeece083b95d57a9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 24 Jan 2025 09:28:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E8=A1=A5=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/pcn/api/busi/IMesProduceSnPrintService.java | 4 ++-- .../pcn/apiservice/controller/busi/MesProduceSnPrintController.java | 6 +++--- .../pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnPrintService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnPrintService.java index a272222..afc471c 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnPrintService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProduceSnPrintService.java @@ -29,6 +29,6 @@ public interface IMesProduceSnPrintService { @ApiOperation(value = "打印队列查询") List findMesPrintQueueList(MesPrintQueue printQueue); - @ApiOperation(value = "根据包装条码或者零件条码补打印包装条码") - MesProduceSnPrintModel doRePrintPackByPackageNoOrProductSn(MesProduceSnPrintModel mesProduceSnPrintModel); + @ApiOperation(value = "根据包装条码补打印包装条码标签") + MesProduceSnPrintModel doRePrintPackByPackageNo(MesProduceSnPrintModel mesProduceSnPrintModel); } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java index f73ce94..e73214a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java @@ -173,13 +173,13 @@ public class MesProduceSnPrintController { } @PostMapping("/by-packageno/reprint-pack") - @ApiOperation(value = "根据包装条码或者零件条码补打印包装条码") - public ResultBean doRePrintPackByPackageNoOrProductSn(@RequestBody MesProduceSnPrintModel mesProduceSnPrintModel) { + @ApiOperation(value = "根据包装条码补打印包装条码标签") + public ResultBean doRePrintPackByPackageNo(@RequestBody MesProduceSnPrintModel mesProduceSnPrintModel) { try { ValidatorBean.checkNotNull(mesProduceSnPrintModel.getPackageNo(), "包装条码不能为空"); ValidatorBean.checkNotNull(mesProduceSnPrintModel.getOrganizeCode(), "工厂代码不能为空"); ValidatorBean.checkNotNull(mesProduceSnPrintModel.getUserName(), "操作人不能为空"); - return ResultBean.success("查询成功").setResultObject(mesProduceSnPrintService.doRePrintPackByPackageNoOrProductSn(mesProduceSnPrintModel)); + return ResultBean.success("查询成功").setResultObject(mesProduceSnPrintService.doRePrintPackByPackageNo(mesProduceSnPrintModel)); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java index 31c7cd6..7402068 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java @@ -503,7 +503,7 @@ public class MesProduceSnPrintService implements IMesProduceSnPrintService { } @Override - public MesProduceSnPrintModel doRePrintPackByPackageNoOrProductSn(MesProduceSnPrintModel mesProduceSnPrintModel) { + public MesProduceSnPrintModel doRePrintPackByPackageNo(MesProduceSnPrintModel mesProduceSnPrintModel) { //根据包装条码查询包装信息 MesPackage packageDb = packageExtService.getPackageDb(mesProduceSnPrintModel.getOrganizeCode(), mesProduceSnPrintModel.getPackageNo()); if (null == packageDb) MesPcnException.throwBusiException("包装条码[%s]信息不存在!", mesProduceSnPrintModel.getPackageNo());