From 0508f5918ab78873cbac208d24ea8bb8ddb3d575 Mon Sep 17 00:00:00 2001 From: jun Date: Wed, 12 Jun 2024 19:32:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/api/base/IMesMoveRuleService.java | 2 +- .../apiservice/serviceimpl/base/MesMoveRuleImpl.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMoveRuleService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMoveRuleService.java index a05360a..14ac0a5 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMoveRuleService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMoveRuleService.java @@ -13,5 +13,5 @@ import java.util.List; **/ public interface IMesMoveRuleService extends IBaseMesService { - List findMesMoveRuleByPartProdGroupCode(String partProdGroupCode,String organizeCode); + List findMesMoveRuleByPartProdGroupCode(String code,String organizeCode); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleImpl.java index b5893a0..325571e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleImpl.java @@ -25,7 +25,7 @@ public class MesMoveRuleImpl extends BaseMesService implements IMes @Override protected void setPackQueryBean(MesMoveRule bean, DdlPackBean packBean) { - DdlPreparedPack.getStringEqualPack(bean.getPartProdGroupCode(), "partProdGroupCode", packBean); + DdlPreparedPack.getStringEqualPack(bean.getCode(), "code", packBean); DdlPreparedPack.getStringEqualPack(bean.getSrcType(), "srcType", packBean); } @@ -35,11 +35,11 @@ public class MesMoveRuleImpl extends BaseMesService implements IMes checkNotNull(item); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(item.getPartProdGroupCode(), "partProdGroupCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(item.getCode(), "code", ddlPackBean); DdlPreparedPack.getStringEqualPack(item.getSrcType(), "srcType", ddlPackBean); if (baseRDao.isExitByHql(ddlPackBean)) { - MesException.throwMesBusiException("零件生产组代码【%s】来源类型【%s】数据已存在", item.getPartProdGroupCode(), item.getSrcType()); + MesException.throwMesBusiException("代码【%s】来源类型【%s】数据已存在", item.getCode(), item.getSrcType()); } } @@ -50,28 +50,28 @@ public class MesMoveRuleImpl extends BaseMesService implements IMes checkNotNull(item); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); - DdlPreparedPack.getStringEqualPack(item.getPartProdGroupCode(), "partProdGroupCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(item.getCode(), "code", ddlPackBean); DdlPreparedPack.getStringEqualPack(item.getSrcType(), "srcType", ddlPackBean); DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", ddlPackBean); if (baseRDao.isExitByHql(ddlPackBean)) { - MesException.throwMesBusiException("零件生产组代码【%s】来源类型【%s】数据已存在", item.getPartProdGroupCode(), item.getSrcType()); + MesException.throwMesBusiException("代码【%s】来源类型【%s】数据已存在", item.getCode(), item.getSrcType()); } } @Override - public List findMesMoveRuleByPartProdGroupCode(String partProdGroupCode, String organizeCode) { + public List findMesMoveRuleByPartProdGroupCode(String code, String organizeCode) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); - DdlPreparedPack.getStringEqualPack(partProdGroupCode, "partProdGroupCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(code, "code", ddlPackBean); List moveRules = baseRDao.findByHqlWhere(ddlPackBean); if (CollectionUtils.isEmpty(moveRules)) { - MesException.throwMesBusiException("零件生产组代码【%s】移库规则数据不存在", partProdGroupCode); + MesException.throwMesBusiException("代码【%s】移库规则数据不存在", code); } return moveRules; } private void checkNotNull(MesMoveRule item) { - ValidatorBean.checkNotNull(item.getPartProdGroupCode(), "零件生产组代码不能为空"); + ValidatorBean.checkNotNull(item.getCode(), "代码不能为空"); ValidatorBean.checkNotNull(item.getErpSrcLocateNo(), "ERP来源库位不能为空"); ValidatorBean.checkNotNull(item.getErpDestLocateNo(), "ERP目的库位不能为空"); ValidatorBean.checkNotNull(item.getSrcType(), "来源类型不能为空"); From ea08717ad7a90351054b2ad0dc634f3f482ccc54 Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 12 Jun 2024 19:35:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/MesPartTransferDetailService.java | 25 ++++++++++++++++++++++ .../serviceimpl/base/MesPartTransferService.java | 25 ++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTransferDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTransferDetailService.java index de777b9..5e6e50c 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTransferDetailService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartTransferDetailService.java @@ -53,5 +53,30 @@ public class MesPartTransferDetailService extends BaseMesService impl .build(); } } + @Override + protected void onUpdateBean(MesPartTransfer item) { + // 数据校验 + ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空"); + ValidatorBean.checkNotNull(item.getCustCode(), "custCode不能为空" ); + ValidatorBean.checkNotNull(item.getCustOrganizeCode(), "custOrganizeCode不能为空" ); + ValidatorBean.checkNotNull(item.getMessageNo(), "messageNo不能为空"); + + //唯一性校验 + DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(item.getCustCode(), "custCode", packBean); + DdlPreparedPack.getStringEqualPack(item.getCustOrganizeCode(), "custOrganizeCode", packBean); + DdlPreparedPack.getStringEqualPack(item.getMessageNo(), "messageNo", packBean); + DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", packBean); + boolean flg = baseRDao.isExitByHql(packBean); + if (flg) { + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("客户零件转化配置客户代码【%s】信息点代码【%s】已经存在，请检查数据", + item.getCustCode(),item.getMessageNo() ) + .build(); + } + } } From 7f078c176dcc31cf8f320af36b46184ca11538b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Wed, 12 Jun 2024 20:08:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=B8=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/MesProdRuleNosortCfgService.java | 21 --------------------- .../serviceimpl/base/MesProdRuleSortCfgService.java | 21 --------------------- 2 files changed, 42 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleNosortCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleNosortCfgService.java index a0b7c9a..987a546 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleNosortCfgService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleNosortCfgService.java @@ -66,29 +66,8 @@ public class MesProdRuleNosortCfgService extends BaseMesService prodRuleNosortCfgList = mesProdRuleNosortCfgDao.findMesProdRuleNosortCfgByWorkCenterCode(workCenterCode, partNo, organizeCode); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java index 5e0c661..d2d4ddb 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java @@ -59,26 +59,5 @@ public class MesProdRuleSortCfgService extends BaseMesService