From 80e365b39dcae49ee326a447a43380f548b7b642 Mon Sep 17 00:00:00 2001 From: xs Date: Mon, 19 May 2025 13:46:44 +0800 Subject: [PATCH] =?UTF-8?q?1.3.7=20=E5=90=8E=E7=AB=AF=EF=BC=9A=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=AE=A1=E5=88=92=E9=80=89=E6=8B=A9=E7=89=A9=E6=96=99?= =?UTF-8?q?bom=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProdPlanInfoController.java | 5 ++--- .../mes/service/IProdMaterialBomService.java | 9 ++++++++ .../impl/ProdMaterialBomServiceImpl.java | 21 +++++++++++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdPlanInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdPlanInfoController.java index 3a1b610..178bd97 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdPlanInfoController.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdPlanInfoController.java @@ -17,7 +17,6 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; import org.dromara.mes.domain.ProdBaseRouteProcess; import org.dromara.mes.domain.bo.ProdMaterialBomBo; -import org.dromara.mes.domain.bo.ProdMaterialBomVersionBo; import org.dromara.mes.domain.bo.ProdPlanInfoBo; import org.dromara.mes.domain.vo.*; import org.dromara.mes.enums.PlanEventEnum; @@ -207,8 +206,8 @@ public class ProdPlanInfoController extends BaseController { */ @SaCheckPermission("mes:planInfo:list") @GetMapping("/materialBomVersionSelect") - public R> materialBomVersionSelect(ProdMaterialBomVersionBo prodMaterialBomBo) { - return R.ok(prodMaterialBomVersionService.queryList(prodMaterialBomBo)); + public R> materialBomVersionSelect(ProdMaterialBomBo prodMaterialBomBo) { + return R.ok(prodMaterialBomService.queryList4Select(prodMaterialBomBo)); } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMaterialBomService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMaterialBomService.java index f6cd314..f1c35f2 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMaterialBomService.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdMaterialBomService.java @@ -8,6 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Collection; import java.util.List; +import java.util.Map; /** * 物料BOM信息Service接口 @@ -112,4 +113,12 @@ public interface IProdMaterialBomService { * @return 生产bom信息集合 */ public List selectMaterialBomTreeList(ProdMaterialBomBo bo); + + /** + * 查询符合条件的物料BOM版本，供下拉选择 + * + * @param bo 查询条件 + * @return 物料BOM信息列表 + */ + public List queryList4Select(ProdMaterialBomBo bo); } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMaterialBomServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMaterialBomServiceImpl.java index 96ba54f..5277c84 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMaterialBomServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdMaterialBomServiceImpl.java @@ -841,4 +841,25 @@ public class ProdMaterialBomServiceImpl implements IProdMaterialBomService { return lqw; } + + /** + * 查询符合条件的物料BOM版本，供下拉选择 + * + * @param bo 查询条件 + * @return 物料BOM信息列表 + */ + @Override + public List queryList4Select(ProdMaterialBomBo bo) { + bo.setDeleteFlag(HwMomMesConstants.DELETE_FLAG_NO); + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + List prodMaterialBomVos = baseMapper.selectVoList(lqw); + + List filteredList = prodMaterialBomVos.stream() + .collect(Collectors.groupingBy(ProdMaterialBomVo::getMaterialBomVersion)) // 按BOM版本分组 + .values().stream() // 获取分组后的值集合 + .map(group -> group.get(0)) // 取每组第一个元素 + .collect(Collectors.toList()); // 收集为列表 + + return filteredList; + } }