From fbc80648adf176fed54046c3aa52173b20e5d12e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 12 十月 2026 14:57:32 +0800
Subject: [PATCH] 宁夏万通需求：商机状态组改为非必填；过程检验单生产订单、工位改为非必填
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueLineController.java | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 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 4547c0c..5523d77 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
@@ -8,15 +8,18 @@
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.mdm.api.item.MdmItemModelApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemModelRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
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.mdm.MesMdmItemService;
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;
@@ -33,9 +36,11 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
@@ -53,11 +58,13 @@
@Resource
private MesProWorkOrderBomService workOrderBomService;
@Resource
- private MesMdItemService mdmItemService;
+ private MesMdmItemService mdmItemService;
@Resource
private MesMdUnitMeasureService unitMeasureService;
@Resource
private MesProTaskService taskService;
+ @Resource
+ private MdmItemModelApi mdmItemModelApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓棰嗘枡鍑哄簱鍗曡")
@@ -136,12 +143,12 @@
requiredQtyMap.merge(bom.getItemId(), quantity, BigDecimal::add);
}
// 3. 鎵归噺鑾峰彇鐗╂枡涓庡崟浣嶄俊鎭紝鎷兼帴 VO
- Map<Long, MesMdItemDO> itemMap = mdmItemService.getItemMap(requiredQtyMap.keySet());
+ Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(requiredQtyMap.keySet());
Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ convertSet(itemMap.values(), MesMdmItemDO::getUnitMeasureId));
List<MesWmProductIssueBomItemRespVO> result = new ArrayList<>(requiredQtyMap.size());
requiredQtyMap.forEach((itemId, requiredQuantity) -> {
- MesMdItemDO item = itemMap.get(itemId);
+ MesMdmItemDO item = itemMap.get(itemId);
if (item == null) {
return;
}
@@ -155,6 +162,15 @@
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) {
@@ -162,19 +178,28 @@
return Collections.emptyList();
}
// 1. 鑾峰緱鍏宠仈鏁版嵁
- Map<Long, MesMdItemDO> itemMap = mdmItemService.getItemMap(
+ Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(
convertSet(list, MesWmProductIssueLineDO::getItemId));
- Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ // 鐗╂枡涓诲崟浣嶄笌褰曞叆鍗曚綅閮借瑙ｆ瀽鍚嶇О
+ Set<Long> unitMeasureIds = new HashSet<>(convertSet(itemMap.values(), MesMdmItemDO::getUnitMeasureId));
+ unitMeasureIds.addAll(convertSet(list, MesWmProductIssueLineDO::getEnterUnitMeasureId));
+ Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(unitMeasureIds);
+ Map<Long, MdmItemModelRespDTO> itemModelMap = mdmItemModelApi.getItemModelMap(
+ convertSet(list, MesWmProductIssueLineDO::getItemModelId));
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()).setMdmItemId(item.getMdmItemId());
+ vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification()).setMdmItemId(item.getId());
+ vo.setUnitMeasureId(item.getUnitMeasureId());
MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
unit -> vo.setUnitMeasureName(unit.getName()));
});
+ MapUtils.findAndThen(unitMeasureMap, vo.getEnterUnitMeasureId(),
+ unit -> vo.setEnterUnitMeasureName(unit.getName()));
+ MapUtils.findAndThen(itemModelMap, vo.getItemModelId(),
+ itemModel -> vo.setItemModel(itemModel.getModel()));
MapUtils.findAndThen(taskMap, vo.getTaskId(), task ->
vo.setTaskCode(task.getCode()).setTaskName(task.getName()));
});
--
Gitblit v1.9.3