From c5987d3bd847e9c9e28a14a4681586cd65a11106 Mon Sep 17 00:00:00 2001 From: jun Date: Tue, 3 Dec 2024 18:33:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A6=E6=B1=89cockpit=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E9=98=B2=E9=94=99=E6=8C=89=E7=85=A7=E6=95=A3=E4=BB=B6=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E5=86=99=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/ext/mes/api/base/IMesMoveRuleService.java | 4 +++- .../mes/apiservice/serviceimpl/base/MesMoveRuleServiceImpl.java | 7 ++++++- .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 2 +- 3 files changed, 10 insertions(+), 3 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 14ac0a5..dceabd6 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.ext.mes.api.base; import cn.estsh.i3plus.pojo.mes.bean.MesMoveRule; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -13,5 +14,6 @@ import java.util.List; **/ public interface IMesMoveRuleService extends IBaseMesService { - List findMesMoveRuleByPartProdGroupCode(String code,String organizeCode); + @ApiOperation("根据组代码加code查询移库规则信息") + List findMesMoveRuleByPartProdGroupCode(String code,String organizeCode,Integer groupType); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleServiceImpl.java index 1f0a210..c453cb5 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleServiceImpl.java @@ -25,6 +25,7 @@ public class MesMoveRuleServiceImpl extends BaseMesService implemen @Override protected void setPackQueryBean(MesMoveRule bean, DdlPackBean packBean) { + DdlPreparedPack.getNumEqualPack(bean.getGroupType(), "groupType", packBean); DdlPreparedPack.getStringEqualPack(bean.getCode(), "code", packBean); DdlPreparedPack.getStringEqualPack(bean.getSrcType(), "srcType", packBean); } @@ -35,6 +36,7 @@ public class MesMoveRuleServiceImpl extends BaseMesService implemen checkNotNull(item); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(item.getGroupType(), "groupType", ddlPackBean); DdlPreparedPack.getStringEqualPack(item.getCode(), "code", ddlPackBean); DdlPreparedPack.getStringEqualPack(item.getSrcType(), "srcType", ddlPackBean); @@ -50,6 +52,7 @@ public class MesMoveRuleServiceImpl extends BaseMesService implemen checkNotNull(item); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); + DdlPreparedPack.getNumEqualPack(item.getGroupType(), "groupType", ddlPackBean); DdlPreparedPack.getStringEqualPack(item.getCode(), "code", ddlPackBean); DdlPreparedPack.getStringEqualPack(item.getSrcType(), "srcType", ddlPackBean); DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", ddlPackBean); @@ -60,8 +63,9 @@ public class MesMoveRuleServiceImpl extends BaseMesService implemen } @Override - public List findMesMoveRuleByPartProdGroupCode(String code, String organizeCode) { + public List findMesMoveRuleByPartProdGroupCode(String code, String organizeCode,Integer groupType) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); + DdlPreparedPack.getNumEqualPack(groupType, "groupType", ddlPackBean); DdlPreparedPack.getStringEqualPack(code, "code", ddlPackBean); List moveRules = baseRDao.findByHqlWhere(ddlPackBean); if (CollectionUtils.isEmpty(moveRules)) { @@ -76,5 +80,6 @@ public class MesMoveRuleServiceImpl extends BaseMesService implemen ValidatorBean.checkNotNull(item.getErpDestLocateNo(), "ERP目的库位不能为空"); ValidatorBean.checkNotNull(item.getSrcType(), "来源类型不能为空"); ValidatorBean.checkNotNull(item.getReportType(), "汇报类型不能为空"); + ValidatorBean.checkNotNull(item.getGroupType(), "组类型不能为空"); } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 25f475f..0972ea1 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -1463,7 +1463,7 @@ public class MesWorkOrderService extends BaseMesService implements MesMoveRule moveRule; MesPart itemPart; //查询零件生产组的移库规则 - List moveRules = mesMoveRuleService.findMesMoveRuleByPartProdGroupCode(mesWorkOrder.getPartProdGroupCode(), mesWorkOrder.getOrganizeCode()); + List moveRules = mesMoveRuleService.findMesMoveRuleByPartProdGroupCode(mesWorkOrder.getPartProdGroupCode(), mesWorkOrder.getOrganizeCode(), MesExtEnumUtil.MOVE_RULE_GROUP_TYPE.MOVE_RULE_GROUP_TYPE_20.getValue()); Map> mesMoveRuleMap = moveRules.stream().filter(t -> Objects.nonNull(t.getSrcType())).collect(Collectors.groupingBy(MesMoveRule::getSrcType)); List itemPartNoList = mesBoms.stream().map(MesBom::getItemPartNo).collect(Collectors.toList()); //子物料SAP下发信息