From fe5275dccee28f3e6da37aedf2701e4ba8477d1d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 27 Dec 2024 17:43:56 +0800 Subject: [PATCH] =?UTF-8?q?=2044514=20=E6=96=99=E5=8C=85=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=88=97=E6=98=BE=E7=A4=BA=E5=85=A8=EF=BC=8C?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E7=9A=84=E6=9D=A1=E7=A0=81=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9A=E4=BD=8D=20(=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IMesRecyclablePackageBindingService.java | 3 ++- .../MesRecyclablePackageBindingController.java | 2 +- .../MesRecyclablePackageBindingServiceImpl.java | 18 ++++++++++++------ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/recyclablepackage/IMesRecyclablePackageBindingService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/recyclablepackage/IMesRecyclablePackageBindingService.java index 2f2d7c9..ade1fea 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/recyclablepackage/IMesRecyclablePackageBindingService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/recyclablepackage/IMesRecyclablePackageBindingService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.ext.mes.pcn.api.busi.recyclablepackage; import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesRecyclablePackageBindingModel; import cn.estsh.i3plus.pojo.mes.bean.recyclablepackage.MesRecyclablePackageBinding; import cn.estsh.i3plus.pojo.mes.bean.recyclablepackage.MesRecyclablePackageBindingDetail; +import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.ApiOperation; import java.util.List; @@ -39,7 +40,7 @@ public interface IMesRecyclablePackageBindingService { List findMesRecyclablePackageBindingDetail(MesRecyclablePackageBindingModel mesRecyclablePackageBindingModel); @ApiOperation("扫描信息") - MesRecyclablePackageBinding doScan(MesRecyclablePackageBindingModel mesRecyclablePackageBindingModel); + ResultBean doScan(MesRecyclablePackageBindingModel mesRecyclablePackageBindingModel); @ApiOperation("解绑") void doMesRecyclablePackageUnBinding(MesRecyclablePackageBinding mesRecyclablePackageBinding, List bindingDetailList,String userName); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/recyclablepackage/MesRecyclablePackageBindingController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/recyclablepackage/MesRecyclablePackageBindingController.java index 8f94b5a..c3b3719 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/recyclablepackage/MesRecyclablePackageBindingController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/recyclablepackage/MesRecyclablePackageBindingController.java @@ -55,7 +55,7 @@ public class MesRecyclablePackageBindingController { ValidatorBean.checkNotNull(mesRecyclablePackageBindingModel.getOrganizeCode(), "工厂代码不能为空"); ValidatorBean.checkNotNull(mesRecyclablePackageBindingModel.getType(), "操作类型不能为空"); ValidatorBean.checkNotNull(mesRecyclablePackageBindingModel.getUserName(), "操作人不能为空"); - return ResultBean.success("操作成功").setResultObject(mesRecyclablePackageBindingService.doScan(mesRecyclablePackageBindingModel)); + return mesRecyclablePackageBindingService.doScan(mesRecyclablePackageBindingModel); } 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/recyclablepackage/MesRecyclablePackageBindingServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/recyclablepackage/MesRecyclablePackageBindingServiceImpl.java index 108c500..c259f11 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/recyclablepackage/MesRecyclablePackageBindingServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/recyclablepackage/MesRecyclablePackageBindingServiceImpl.java @@ -21,6 +21,7 @@ import cn.estsh.i3plus.pojo.mes.bean.recyclablepackage.*; import cn.estsh.i3plus.pojo.mes.repository.recyclablepackage.MesRecyclablePackageBindingDetailRepository; import cn.estsh.i3plus.pojo.mes.repository.recyclablepackage.MesRecyclablePackageBindingRepository; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; +import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.SpringContextsUtil; import cn.estsh.impp.framework.boot.util.ValidatorBean; import lombok.extern.slf4j.Slf4j; @@ -137,35 +138,40 @@ public class MesRecyclablePackageBindingServiceImpl implements IMesRecyclablePac } @Override - public MesRecyclablePackageBinding doScan(MesRecyclablePackageBindingModel mesRecyclablePackageBindingModel) { + public ResultBean doScan(MesRecyclablePackageBindingModel mesRecyclablePackageBindingModel) { MesRecyclablePackageBinding mesRecyclablePackageBinding = null; + String msg = MesPcnExtConstWords.EMPTY; switch (mesRecyclablePackageBindingModel.getType()) { //扫描包条码 case 10: mesRecyclablePackageBinding = doScanPackageSn(mesRecyclablePackageBindingModel); + msg = String.format("料包条码[%s]扫描成功!", mesRecyclablePackageBindingModel.getPackageSn()); break; //扫描零件条码 case 20: mesRecyclablePackageBinding = doScanProductSn(mesRecyclablePackageBindingModel); + msg = String.format("零件条码[%s]扫描成功!", mesRecyclablePackageBindingModel.getProductSn()); break; //清空 case 30: mesRecyclablePackageBinding = deletedMesRecyclablePackageBindingDetail(mesRecyclablePackageBindingModel, true); + msg = String.format("料包条码[%s]清空成功!", mesRecyclablePackageBindingModel.getPackageSn()); break; //删除 case 40: mesRecyclablePackageBinding = deletedMesRecyclablePackageBindingDetail(mesRecyclablePackageBindingModel, false); + msg = "删除成功!"; break; //关箱 case 50: mesRecyclablePackageBinding = updateClosePackageBinding(mesRecyclablePackageBindingModel); + msg = String.format("料包条码[%s]关箱成功,请扫描下一箱!", mesRecyclablePackageBindingModel.getPackageSn()); break; default: MesPcnException.throwMesBusiException("扫描类型【%s】不存在", mesRecyclablePackageBindingModel.getType()); break; } - return mesRecyclablePackageBinding; - + return ResultBean.success(msg).setResultObject(mesRecyclablePackageBinding); } @Override @@ -201,7 +207,7 @@ public class MesRecyclablePackageBindingServiceImpl implements IMesRecyclablePac //校验箱 MesRecyclablePackageBinding mesRecyclablePackageBinding = getPackageBinding(mesRecyclablePackageBindingModel.getOrganizeCode(), mesRecyclablePackageBindingModel.getPackageSn()); if (MesExtEnumUtil.RECYCLABLE_PACKAGE_PACKAGE_BINDING_STATUS.CLOSED.getValue() == mesRecyclablePackageBinding.getStatus()) { - MesPcnException.throwMesBusiException("包条码【%s】已关箱", mesRecyclablePackageBinding.getPackageSn()); + MesPcnException.throwMesBusiException("料包条码【%s】已关箱", mesRecyclablePackageBinding.getPackageSn()); } //校验零件条码是否扫描 checkIsScan(mesRecyclablePackageBindingModel); @@ -350,10 +356,10 @@ public class MesRecyclablePackageBindingServiceImpl implements IMesRecyclablePac private MesRecyclablePackageBinding updateClosePackageBinding(MesRecyclablePackageBindingModel mesRecyclablePackageBindingModel) { MesRecyclablePackageBinding mesRecyclablePackageBinding = getPackageBinding(mesRecyclablePackageBindingModel.getOrganizeCode(), mesRecyclablePackageBindingModel.getPackageSn()); if (MesExtEnumUtil.RECYCLABLE_PACKAGE_PACKAGE_BINDING_STATUS.CLOSED.getValue() == mesRecyclablePackageBinding.getStatus()) { - MesPcnException.throwMesBusiException("包条码【%s】已关，不能重复关箱，请重新扫描", mesRecyclablePackageBinding.getPackageSn()); + MesPcnException.throwMesBusiException("料包条码【%s】已关，不能重复关箱，请重新扫描", mesRecyclablePackageBinding.getPackageSn()); } if (findMesRecyclablePackageBindingDetailByPidCount(mesRecyclablePackageBinding.getOrganizeCode(), mesRecyclablePackageBinding.getId()) <= MesPcnExtConstWords.ZERO) { - MesPcnException.throwMesBusiException("包条码【%s】明细不能为空，请扫描零件明细", mesRecyclablePackageBinding.getPackageSn()); + MesPcnException.throwMesBusiException("料包条码【%s】明细不能为空，请扫描零件明细", mesRecyclablePackageBinding.getPackageSn()); } //更新未关箱状态 mesRecyclablePackageBinding.setStatus(MesExtEnumUtil.RECYCLABLE_PACKAGE_PACKAGE_BINDING_STATUS.CLOSED.getValue());