From 7ef882f052ab0796b68be7d97150f8c3f321827c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 02 九月 2026 09:31:17 +0800
Subject: [PATCH] feat(mes): 领料出库单新增物料仅展示当前工单 BOM 物料
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/vo/line/MesWmProductIssueBomItemRespVO.java | 30 +++++++++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/MesMdItemPageReqVO.java | 3 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java | 4 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueLineController.java | 53 ++++++++++++++++++++++++++
4 files changed, 90 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/MesMdItemPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/MesMdItemPageReqVO.java
index ab0a5a6..a475907 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/MesMdItemPageReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/vo/MesMdItemPageReqVO.java
@@ -29,6 +29,9 @@
@Schema(description = "鐘舵��", example = "0")
private Integer status;
+ @Schema(description = "鐗╂枡缂栧彿闆嗗悎锛堥�楀彿鍒嗛殧锛夛紝鐢ㄤ簬闄愬畾鍙�夌墿鏂欒寖鍥�", example = "1,2,3")
+ private String ids;
+
@Schema(description = "鍒涘缓鏃堕棿")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueLineController.java
index a9ec67c..4547c0c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueLineController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueLineController.java
@@ -5,17 +5,22 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.line.MesWmProductIssueBomItemRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.line.MesWmProductIssueLinePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.line.MesWmProductIssueLineRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.line.MesWmProductIssueLineSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueLineDO;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderBomService;
import cn.iocoder.yudao.module.mes.service.wm.productissue.MesWmProductIssueLineService;
+import cn.iocoder.yudao.module.mes.service.wm.productissue.MesWmProductIssueService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -25,7 +30,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -40,6 +48,10 @@
@Resource
private MesWmProductIssueLineService issueLineService;
+ @Resource
+ private MesWmProductIssueService issueService;
+ @Resource
+ private MesProWorkOrderBomService workOrderBomService;
@Resource
private MesMdItemService mdmItemService;
@Resource
@@ -102,6 +114,47 @@
return success(buildRespVOList(list));
}
+ @GetMapping("/bom-item-list")
+ @Operation(summary = "鑾峰緱棰嗘枡鍑哄簱鍗曞彲棰嗙墿鏂欏垪琛�",
+ description = "浠呰繑鍥炲綋鍓嶉鏂欏崟瀵瑰簲鐢熶骇宸ュ崟 BOM 涓殑鐗╂枡锛岀敤浜庢柊澧炶鐗╂枡閫夋嫨鍣ㄨ繃婊わ紝閬垮厤閫夋嫨 BOM 涔嬪鐨勭墿鏂�")
+ @Parameter(name = "issueId", description = "棰嗘枡鍗曠紪鍙�", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:query')")
+ public CommonResult<List<MesWmProductIssueBomItemRespVO>> getBomItemList(@RequestParam("issueId") Long issueId) {
+ // 1. 鏍￠獙棰嗘枡鍗曞瓨鍦紝鑾峰彇鍏宠仈宸ュ崟
+ MesWmProductIssueDO issue = issueService.validateProductIssueExists(issueId);
+ if (issue.getWorkOrderId() == null) {
+ return success(Collections.emptyList());
+ }
+ // 2. 鑾峰彇宸ュ崟 BOM 鐗╂枡锛堝悓涓�鐗╂枡璺ㄥ伐搴忓娆℃姇鏂欐椂锛岄渶姹傞噺鎸夌墿鏂欐眹鎬伙級
+ List<MesProWorkOrderBomDO> bomList = workOrderBomService.getWorkOrderBomListByWorkOrderId(issue.getWorkOrderId());
+ if (CollUtil.isEmpty(bomList)) {
+ return success(Collections.emptyList());
+ }
+ Map<Long, BigDecimal> requiredQtyMap = new LinkedHashMap<>();
+ for (MesProWorkOrderBomDO bom : bomList) {
+ BigDecimal quantity = bom.getQuantity() != null ? bom.getQuantity() : BigDecimal.ZERO;
+ requiredQtyMap.merge(bom.getItemId(), quantity, BigDecimal::add);
+ }
+ // 3. 鎵归噺鑾峰彇鐗╂枡涓庡崟浣嶄俊鎭紝鎷兼帴 VO
+ Map<Long, MesMdItemDO> itemMap = mdmItemService.getItemMap(requiredQtyMap.keySet());
+ Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
+ convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ List<MesWmProductIssueBomItemRespVO> result = new ArrayList<>(requiredQtyMap.size());
+ requiredQtyMap.forEach((itemId, requiredQuantity) -> {
+ MesMdItemDO item = itemMap.get(itemId);
+ if (item == null) {
+ return;
+ }
+ MesWmProductIssueBomItemRespVO vo = new MesWmProductIssueBomItemRespVO()
+ .setItemId(itemId).setItemCode(item.getCode()).setItemName(item.getName())
+ .setItemSpecification(item.getSpecification()).setRequiredQuantity(requiredQuantity);
+ MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
+ unit -> vo.setUnitMeasureName(unit.getName()));
+ result.add(vo);
+ });
+ return success(result);
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesWmProductIssueLineRespVO> buildRespVOList(List<MesWmProductIssueLineDO> list) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/vo/line/MesWmProductIssueBomItemRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/vo/line/MesWmProductIssueBomItemRespVO.java
new file mode 100644
index 0000000..eef39f5
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/vo/line/MesWmProductIssueBomItemRespVO.java
@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.line;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "绠＄悊鍚庡彴 - MES 棰嗘枡鍑哄簱鍗曡 BOM 鐗╂枡閫夋嫨 Response VO")
+@Data
+public class MesWmProductIssueBomItemRespVO {
+
+ @Schema(description = "鐗╂枡缂栧彿", example = "100")
+ private Long itemId;
+
+ @Schema(description = "鐗╂枡缂栫爜", example = "M-001")
+ private String itemCode;
+
+ @Schema(description = "鐗╂枡鍚嶇О", example = "鐢甸樆 10K")
+ private String itemName;
+
+ @Schema(description = "瑙勬牸鍨嬪彿", example = "0603")
+ private String itemSpecification;
+
+ @Schema(description = "鍗曚綅鍚嶇О", example = "涓�")
+ private String unitMeasureName;
+
+ @Schema(description = "宸ュ崟 BOM 闇�姹傞噺锛堝悓鐗╂枡璺ㄥ伐搴忕敤閲忔眹鎬伙級", example = "1000.00")
+ private BigDecimal requiredQuantity;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
index 5a5a843..8c998a3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
@@ -1,7 +1,9 @@
package cn.iocoder.yudao.module.mes.dal.mysql.md.item;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.string.StrUtils;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.mes.controller.admin.md.item.vo.MesMdItemPageReqVO;
@@ -31,6 +33,8 @@
.likeIfPresent(MesMdItemDO::getCode, reqVO.getCode())
.likeIfPresent(MesMdItemDO::getName, reqVO.getName())
.inIfPresent(MesMdItemDO::getItemTypeId, itemTypeIds)
+ .inIfPresent(MesMdItemDO::getId,
+ StrUtil.isBlank(reqVO.getIds()) ? null : StrUtils.splitToLong(reqVO.getIds(), ","))
.eqIfPresent(MesMdItemDO::getStatus, reqVO.getStatus())
.betweenIfPresent(MesMdItemDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(MesMdItemDO::getId));
--
Gitblit v1.9.3