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/returnsales/MesWmReturnSalesLineController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesLineController.java
index 66fbe50..480f97d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesLineController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesLineController.java
@@ -12,6 +12,8 @@
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnsales.MesWmReturnSalesLineDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
@@ -45,6 +47,8 @@
private MdmItemApi mdmItemApi;
@Resource
private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private MesWmBatchService batchService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓閿�鍞��璐у崟琛�")
@@ -73,7 +77,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱閿�鍞��璐у崟琛�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:query')")
public CommonResult<MesWmReturnSalesLineRespVO> getReturnSalesLine(@RequestParam("id") Long id) {
MesWmReturnSalesLineDO line = returnSalesLineService.getReturnSalesLine(id);
if (line == null) {
@@ -84,7 +87,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱閿�鍞��璐у崟琛屽垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:query')")
public CommonResult<PageResult<MesWmReturnSalesLineRespVO>> getReturnSalesLinePage(
@Valid MesWmReturnSalesLinePageReqVO pageReqVO) {
PageResult<MesWmReturnSalesLineDO> pageResult = returnSalesLineService.getReturnSalesLinePage(pageReqVO);
@@ -94,7 +96,6 @@
@GetMapping("/list-by-return-sales")
@Operation(summary = "鑾峰緱閿�鍞��璐у崟琛屽垪琛紙鎸夐��璐у崟缂栧彿锛�")
@Parameter(name = "returnId", description = "閫�璐у崟缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-return-sales:query')")
public CommonResult<List<MesWmReturnSalesLineRespVO>> getReturnSalesLineListByReturnId(
@RequestParam("returnId") Long returnId) {
List<MesWmReturnSalesLineDO> list = returnSalesLineService.getReturnSalesLineListByReturnId(returnId);
@@ -113,13 +114,17 @@
Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureList(
convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId)).getCheckedData()
.stream().collect(Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
+ Map<Long, MesWmBatchDO> batchMap = batchService.getBatchMap(
+ convertSet(list, MesWmReturnSalesLineDO::getBatchId));
// 2. 鏋勫缓缁撴灉
- return BeanUtils.toBean(list, MesWmReturnSalesLineRespVO.class, vo ->
+ return BeanUtils.toBean(list, MesWmReturnSalesLineRespVO.class, vo -> {
+ MapUtils.findAndThen(batchMap, vo.getBatchId(), batch -> vo.setReelNo(batch.getReelNo()));
MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification());
MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
unitMeasure -> vo.setItemUnit(unitMeasure.getName()));
- }));
+ });
+ });
}
}
--
Gitblit v1.9.3