From 14c80fbd16a51a355138345ecf69df9ca37746bf Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期五, 06 十一月 2026 09:18:32 +0800
Subject: [PATCH] 完善售后退货联动和订单作废保护
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java
index ee0e5f2..3bed64b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/safety/SafetyMaterialController.java
@@ -62,6 +62,7 @@
@PreAuthorize("@ss.hasPermission('safety:material:query')")
public CommonResult<SafetyMaterialRespVO> get(@RequestParam("id") Long id) {
var material = materialService.getMaterial(id);
+ materialService.fillManagers(java.util.List.of(material));
var resp = BeanUtils.toBean(material, SafetyMaterialRespVO.class);
SafetyMaterialService.fillMaterialDisplay(material, resp);
return success(resp);
@@ -72,6 +73,7 @@
@PreAuthorize("@ss.hasPermission('safety:material:query')")
public CommonResult<PageResult<SafetyMaterialRespVO>> page(@Valid SafetyMaterialPageReqVO reqVO) {
var page = materialService.getMaterialPage(reqVO);
+ materialService.fillManagers(page.getList());
var result = BeanUtils.toBean(page, SafetyMaterialRespVO.class);
for (int i = 0; i < page.getList().size(); i++) {
SafetyMaterialService.fillMaterialDisplay(page.getList().get(i), result.getList().get(i));
@@ -83,7 +85,9 @@
@Operation(summary = "鑾峰緱浣庝簬瀹夊叏搴撳瓨鐨勭墿璧勫垪琛紙棰勮锛�")
@PreAuthorize("@ss.hasPermission('safety:material:query')")
public CommonResult<List<SafetyMaterialRespVO>> belowSafeStock() {
- List<SafetyMaterialRespVO> list = materialService.getBelowSafeStockList().stream()
+ var materials = materialService.getBelowSafeStockList();
+ materialService.fillManagers(materials);
+ List<SafetyMaterialRespVO> list = materials.stream()
.map(material -> {
var resp = BeanUtils.toBean(material, SafetyMaterialRespVO.class);
SafetyMaterialService.fillMaterialDisplay(material, resp);
@@ -98,7 +102,9 @@
@PreAuthorize("@ss.hasPermission('safety:material:query')")
public CommonResult<List<SafetyMaterialRespVO>> expiringList(
@RequestParam(value = "days", required = false) Integer days) {
- List<SafetyMaterialRespVO> list = materialService.getExpiringList(days).stream()
+ var materials = materialService.getExpiringList(days);
+ materialService.fillManagers(materials);
+ List<SafetyMaterialRespVO> list = materials.stream()
.map(material -> {
var resp = BeanUtils.toBean(material, SafetyMaterialRespVO.class);
SafetyMaterialService.fillMaterialDisplay(material, resp);
--
Gitblit v1.9.3