From 618030e495a9520291ebfd709c80c4c8a8b73451 Mon Sep 17 00:00:00 2001
From: quxin <592870522@qq.com>
Date: 星期五, 04 九月 2026 11:36:26 +0800
Subject: [PATCH] 修复： 生产领料后的退料应该是选择领料的记录，不是选择库存的记录（同时库存数据需要根据领料退料变动，比如库存100，领用80，然后领用80中退料30，库存应由原来的20变成50）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueLineController.java | 79 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 4 deletions(-)
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 67d1b5a..42a1e39 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,15 +5,23 @@
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.MesWmProductIssueLineReturnableRespVO;
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;
@@ -23,7 +31,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;
@@ -39,9 +50,15 @@
@Resource
private MesWmProductIssueLineService issueLineService;
@Resource
- private MesMdItemService itemService;
+ private MesWmProductIssueService issueService;
+ @Resource
+ private MesProWorkOrderBomService workOrderBomService;
+ @Resource
+ private MesMdItemService mdmItemService;
@Resource
private MesMdUnitMeasureService unitMeasureService;
+ @Resource
+ private MesProTaskService taskService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓棰嗘枡鍑哄簱鍗曡")
@@ -98,6 +115,56 @@
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);
+ }
+
+ @GetMapping("/returnable-list")
+ @Operation(summary = "鑾峰緱棰嗘枡鍑哄簱鍗曞彲閫�鏂欒鍒楄〃",
+ description = "杩斿洖鎸囧畾宸ュ崟涓嬪凡瀹屾垚棰嗘枡鍗曠殑鍙��鏂欒锛屽彲閫�鏁伴噺 = 宸查鏁伴噺 - 宸查��鏁伴噺")
+ @Parameter(name = "workOrderId", description = "鐢熶骇宸ュ崟ID", required = true, example = "1")
+ @PreAuthorize("@ss.hasPermission('mes:wm-product-issue:query')")
+ public CommonResult<List<MesWmProductIssueLineReturnableRespVO>> getReturnableList(@RequestParam("workOrderId") Long workOrderId) {
+ return success(issueLineService.getReturnableList(workOrderId));
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesWmProductIssueLineRespVO> buildRespVOList(List<MesWmProductIssueLineDO> list) {
@@ -105,17 +172,21 @@
return Collections.emptyList();
}
// 1. 鑾峰緱鍏宠仈鏁版嵁
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+ Map<Long, MesMdItemDO> itemMap = mdmItemService.getItemMap(
convertSet(list, MesWmProductIssueLineDO::getItemId));
Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ Map<Long, MesProTaskDO> taskMap = taskService.getTaskMap(
+ convertSet(list, MesWmProductIssueLineDO::getTaskId));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmProductIssueLineRespVO.class, vo -> {
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
- vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
+ vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification()).setMdmItemId(item.getMdmItemId());
MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
- unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
+ unit -> vo.setUnitMeasureName(unit.getName()));
});
+ MapUtils.findAndThen(taskMap, vo.getTaskId(), task ->
+ vo.setTaskCode(task.getCode()).setTaskName(task.getName()));
});
}
--
Gitblit v1.9.3