From 088e1ba6624c7523ee2566110b2c4721a37204a5 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 14:22:09 +0800
Subject: [PATCH] #生成波次
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
index a9f161f..af27d42 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
@@ -29,6 +29,7 @@
import com.vincent.rsf.server.manager.service.OutStockService;
import com.vincent.rsf.server.manager.service.TaskService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
@@ -62,7 +63,9 @@
List<String> list = Arrays.asList(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type, OrderWorkType.ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION.type, OrderWorkType.ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION.type);
queryWrapper.eq("type", OrderType.ORDER_PRE.type);
queryWrapper.in("wk_type",list);
- return R.ok().add(outStockService.page(pageParam, queryWrapper));
+ PageParam<WkOrder, BaseParam> page = outStockService.page(pageParam, queryWrapper);
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:outStock:list')")
@@ -73,7 +76,9 @@
QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
List<String> list = Arrays.asList(OrderType.ORDER_OUT.type);
queryWrapper.in("type", list);
- return R.ok().add(outStockService.page(pageParam, queryWrapper));
+ PageParam<WkOrder, BaseParam> page = outStockService.page(pageParam, queryWrapper);
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:outStock:list')")
--
Gitblit v1.9.1