From fd1efdba56dbf07943b82c971694579af034fc5a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 03 十一月 2026 20:10:12 +0800
Subject: [PATCH] feat: 新增废料管理并完善合同导出
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeLineController.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeLineController.java
index d3eaa0e..1aab963 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeLineController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeLineController.java
@@ -1,18 +1,20 @@
package cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice;
import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
+import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderItemRespDTO;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
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.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.line.MesWmSalesNoticeLinePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.line.MesWmSalesNoticeLineRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.line.MesWmSalesNoticeLineSaveReqVO;
-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.wm.salesnotice.MesWmSalesNoticeLineDO;
-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.wm.salesnotice.MesWmSalesNoticeLineService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -24,8 +26,10 @@
import org.springframework.web.bind.annotation.*;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
@@ -39,9 +43,11 @@
@Resource
private MesWmSalesNoticeLineService salesNoticeLineService;
@Resource
- private MesMdItemService itemService;
+ private MdmItemApi mdmItemApi;
@Resource
- private MesMdUnitMeasureService unitMeasureService;
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private ErpSaleOrderApi saleOrderApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鍙戣揣閫氱煡鍗曡")
@@ -70,7 +76,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鍙戣揣閫氱煡鍗曡")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-sales-notice:query')")
public CommonResult<MesWmSalesNoticeLineRespVO> getSalesNoticeLine(@RequestParam("id") Long id) {
MesWmSalesNoticeLineDO line = salesNoticeLineService.getSalesNoticeLine(id);
if (line == null) {
@@ -81,7 +86,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鍙戣揣閫氱煡鍗曡鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:wm-sales-notice:query')")
public CommonResult<PageResult<MesWmSalesNoticeLineRespVO>> getSalesNoticeLinePage(
@Valid MesWmSalesNoticeLinePageReqVO pageReqVO) {
PageResult<MesWmSalesNoticeLineDO> pageResult = salesNoticeLineService.getSalesNoticeLinePage(pageReqVO);
@@ -94,13 +98,19 @@
if (CollUtil.isEmpty(list)) {
return Collections.emptyList();
}
- // 1. 鑾峰緱鍏宠仈鏁版嵁
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+ // 1. 鑾峰緱鍏宠仈鏁版嵁 - 浣跨敤 MDM API 鑾峰彇鐗╂枡淇℃伅
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
convertSet(list, MesWmSalesNoticeLineDO::getItemId));
- Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureList(
+ convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId)).getCheckedData()
+ .stream().collect(java.util.stream.Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
+ Map<Long, ErpSaleOrderItemRespDTO> saleItems = new HashMap<>();
+ for (Long itemId : convertSet(list, MesWmSalesNoticeLineDO::getSaleOrderItemId)) {
+ if (itemId != null) saleItems.put(itemId, saleOrderApi.getSaleOrderItem(itemId).getCheckedData());
+ }
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmSalesNoticeLineRespVO.class, vo -> {
+ MapUtils.findAndThen(saleItems, vo.getSaleOrderItemId(), item -> vo.setReelNo(item.getReelNo()));
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
--
Gitblit v1.9.3