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/materialstock/MesWmMaterialStockController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
index e3dff5a..1a283a0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
@@ -60,6 +60,9 @@
public class MesWmMaterialStockController {
@Resource
+ private cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService batchService;
+
+ @Resource
private MesWmMaterialStockService materialStockService;
@Resource
private MdmItemApi mdmItemApi;
@@ -181,10 +184,14 @@
Map<Long, SrmSupplierRespDTO> vendorMap = srmSupplierApi.getSupplierList(
convertSet(list, MesWmMaterialStockDO::getVendorId)).getCheckedData().stream()
.collect(Collectors.toMap(SrmSupplierRespDTO::getId, s -> s));
+ Map<Long, cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO> batchMap =
+ batchService.getBatchMap(convertSet(list, MesWmMaterialStockDO::getBatchId));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmMaterialStockRespVO.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()).setSpecification(item.getSpecification());
+ vo.setTechnicalParameters(item.getTechnicalParameters());
MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
});
--
Gitblit v1.9.3