From f1b3ed59297a5a9911f4b43cb8b41a878f9e6f62 Mon Sep 17 00:00:00 2001 From: jun Date: Tue, 11 Jun 2024 18:21:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BC=94=E7=A4=BA=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/api/busi/IMesBoxingErrorProofingService.java | 2 +- .../controller/busi/MesBoxingErrorProofingController.java | 4 ++-- .../serviceimpl/busi/MesBoxingErrorProofingService.java | 15 +++++++++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesBoxingErrorProofingService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesBoxingErrorProofingService.java index abcf68d..b65bcd5 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesBoxingErrorProofingService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesBoxingErrorProofingService.java @@ -26,7 +26,7 @@ public interface IMesBoxingErrorProofingService { MesPackage doScan(MesPackageDetail mesPackageDetail); @ApiOperation(value = "保存包装明细") - void saveMesPackageDetails(List mesPackage, String userName); + MesPackage saveMesPackageDetails(List mesPackage, String userName); @ApiOperation(value = "更新包装表") ResultBean updateMesPackage(MesPackage mesPackage); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesBoxingErrorProofingController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesBoxingErrorProofingController.java index 67eb10d..e893cf7 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesBoxingErrorProofingController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesBoxingErrorProofingController.java @@ -76,8 +76,8 @@ public class MesBoxingErrorProofingController { ValidatorBean.checkNotNull(mesPackageDetail.getPackageNo(), "箱条码不能为空"); }); String userName = AuthUtil.getSessionUser().getUserName(); - mesBoxingErrorProofingService.saveMesPackageDetails(mesPackageDetailList, userName); - return ResultBean.success("保存成功"); + MesPackage mesPackage = mesBoxingErrorProofingService.saveMesPackageDetails(mesPackageDetailList, userName); + return ResultBean.success("保存成功").setResultObject(mesPackage); } 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/MesBoxingErrorProofingService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java index d69834e..800d64b 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java @@ -125,20 +125,25 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer } @Override - public void saveMesPackageDetails(List mesPackageDetailList, String userName) { + public MesPackage saveMesPackageDetails(List mesPackageDetailList, String userName) { MesPackageDetail packageDetail = mesPackageDetailList.iterator().next(); - int qty = mesPackageDetailList.size(); //校验包装条码信息 MesPackage mesPackage = getMesPackageAndCheck(packageDetail.getPackageNo(), packageDetail.getOrganizeCode()); + //校验是否已关闭 + if (CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == mesPackage.getIsSealed()) { + MesPcnException.throwMesBusiException("箱条码已封箱，不允许扫描零件条码"); + } //去掉重复零件条码 List saveMesPackageDetailList = new ArrayList<>(); checkSerialNumber(saveMesPackageDetailList,mesPackageDetailList, packageDetail, userName); //保存包装明细 if(!CollectionUtils.isEmpty(saveMesPackageDetailList)){ mesPackageDetailRDao.saveAll(saveMesPackageDetailList); + int qty = saveMesPackageDetailList.size(); + //更新包装表 + updateMesPackage(mesPackage, userName, qty, false); } - //更新包装表 - updateMesPackage(mesPackage, userName, qty, false); + return mesPackage; } @Override @@ -291,6 +296,8 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer saveMesPackageDetailList.add(mesPackageDetail); } } + }else{ + saveMesPackageDetailList.addAll(mesPackageDetailList); } }