From e8ba2050da56d09dd4e7281566e5be39747d520d Mon Sep 17 00:00:00 2001 From: jun Date: Thu, 12 Dec 2024 10:09:29 +0800 Subject: [PATCH] =?UTF-8?q?44263=20PCN=E8=A3=85=E7=AE=B1=E9=98=B2=E9=94=99?= =?UTF-8?q?=EF=BC=9A=E6=BB=A1=E7=AE=B1=E5=85=B3=E7=AE=B1=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E2=80=9C=E5=BD=93=E5=89=8D=E7=AE=B1=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=B7=B2=E5=AE=8C=E6=88=90=E8=A3=85=E7=AE=B1=E3=80=82?= =?UTF-8?q?=E8=AF=B7=E6=89=AB=E6=8F=8F=E4=B8=8B=E4=B8=80=E4=B8=AA=E7=AE=B1?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busi/IMesBoxingErrorProofingService.java | 4 ++-- .../busi/MesBoxingErrorProofingController.java | 6 ++---- .../busi/MesBoxingErrorProofingService.java | 22 +++++++++++++--------- 3 files changed, 17 insertions(+), 15 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 925aa72..423c400 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,10 +26,10 @@ public interface IMesBoxingErrorProofingService { Integer getIsMemory(String organizeCode, String userName); @ApiOperation(value = "扫描") - MesPackage doScan(MesPackageDetail mesPackageDetail); + ResultBean doScan(MesPackageDetail mesPackageDetail); @ApiOperation(value = "保存包装明细") - MesPackage saveMesPackageDetails(List mesPackage, String userName); + ResultBean 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 bcb6b76..1e43637 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 @@ -74,8 +74,7 @@ public class MesBoxingErrorProofingController { mesPackageDetail.setOrganizeCode(!StringUtils.isEmpty(mesPackageDetail.getOrganizeCode())?mesPackageDetail.getOrganizeCode():AuthUtil.getOrganizeCode()); ConvertBean.serviceModelInitialize(mesPackageDetail,!StringUtils.isEmpty(mesPackageDetail.getModifyUser())?mesPackageDetail.getModifyUser():AuthUtil.getSessionUser().getUserName()); - MesPackage mesPackage = mesBoxingErrorProofingService.doScan(mesPackageDetail); - return ResultBean.success("扫描成功").setResultObject(mesPackage); + return mesBoxingErrorProofingService.doScan(mesPackageDetail); } catch (ImppBusiException imppException) { return ResultBean.fail(imppException); } catch (Exception e) { @@ -94,8 +93,7 @@ public class MesBoxingErrorProofingController { }); MesPackageDetail next = mesPackageDetailList.iterator().next(); String userName = !StringUtils.isEmpty(next.getModifyUser())?next.getModifyUser():AuthUtil.getSessionUser().getUserName(); - MesPackage mesPackage = mesBoxingErrorProofingService.saveMesPackageDetails(mesPackageDetailList, userName); - return ResultBean.success("保存成功").setResultObject(mesPackage); + return mesBoxingErrorProofingService.saveMesPackageDetails(mesPackageDetailList, userName); } 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 6c26e92..3fd1f19 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 @@ -99,16 +99,14 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer } @Override - public MesPackage doScan(MesPackageDetail mesPackageDetail) { + public ResultBean doScan(MesPackageDetail mesPackageDetail) { //获取包装定义 MesPackingDefine packingDefine = getMesPackingDefine(mesPackageDetail); //扫描的是包装 if (mesPackageDetail.getIsScanPackageBoolean()) { checkNotNull(mesPackageDetail); MesPackage mesPackage = getMesPackage(mesPackageDetail.getOrganizeCode(), mesPackageDetail.getPackageNo()); - if (Objects.nonNull(mesPackage)) { - return mesPackage; - }else{ + if (Objects.isNull(mesPackage)) { MesPart mesPart; Double qty; String packageOneCode = ""; @@ -133,9 +131,9 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer //获取数量信息是否存在 qty = getQty(packingDefine, split); } - MesPackage packages = getMesPackage(mesPackageDetail, mesPart, qty, packingDefine,packageOneCode); - return mesPackageRDao.insert(packages); + mesPackage = mesPackageRDao.insert(getMesPackage(mesPackageDetail, mesPart, qty, packingDefine,packageOneCode)); } + return ResultBean.success("箱条码扫描成功，请扫产品条码！").setResultObject(mesPackage); } else { checkNotNull(mesPackageDetail); //校验过程条码是否存在 @@ -161,12 +159,15 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer //缓存是否记忆开关 saveRedis(getKey(mesPackageDetail.getOrganizeCode(), mesPackageDetail.getModifyUser()),mesPackageDetail.getIsMemory()); mesPackage.setMesPackageDetail(saveMesPackageDetail); - return mesPackage; + if(mesPackage.getIsSealed() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){ + return ResultBean.success("当前箱条码已完成装箱，请扫描下一个箱条码！").setResultObject(mesPackage); + } + return ResultBean.success("产品条码扫描成功，请继续扫描产品条码！").setResultObject(mesPackage); } } @Override - public MesPackage saveMesPackageDetails(List mesPackageDetailList, String userName) { + public ResultBean saveMesPackageDetails(List mesPackageDetailList, String userName) { MesPackageDetail packageDetail = mesPackageDetailList.iterator().next(); //校验包装条码信息 MesPackage mesPackage = getMesPackageAndCheck(packageDetail.getPackageNo(), packageDetail.getOrganizeCode()); @@ -184,7 +185,10 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer //更新包装表 updateMesPackage(mesPackage, userName, qty, false); } - return mesPackage; + if(mesPackage.getIsSealed() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){ + return ResultBean.success("当前箱条码已完成装箱，请扫描下一个箱条码！").setResultObject(mesPackage); + } + return ResultBean.success("提交成功，请继续扫描产品条码！").setResultObject(mesPackage); } @Override