From 9d6170903806cb351975c9d68005837aec6a8578 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 19 五月 2025 10:42:17 +0800
Subject: [PATCH] 即时库存功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseStockController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseStockController.java
index 1fc48ed..58724db 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseStockController.java
@@ -11,6 +11,7 @@
import com.vincent.rsf.server.manager.controller.params.WarehouseStockParam;
import com.vincent.rsf.server.manager.entity.StockItem;
import com.vincent.rsf.server.manager.entity.ViewStockManage;
+import com.vincent.rsf.server.manager.entity.WarehouseAreasItem;
import com.vincent.rsf.server.manager.enums.ViewStockType;
import com.vincent.rsf.server.manager.service.WarehouseStockService;
import com.vincent.rsf.server.system.controller.BaseController;
@@ -44,7 +45,7 @@
BaseParam baseParam = buildParam(param, BaseParam.class);
PageParam<ViewStockManage, BaseParam> pageParam = new PageParam<>(baseParam, ViewStockManage.class);
WarehouseStockParam stockParam = JSONObject.parseObject(JSONObject.toJSONString(param), WarehouseStockParam.class);
- String type = stockParam.getAggType();
+ String type = Objects.isNull(stockParam.getAggType()) ? ViewStockType.VIEW_STOCK_TYPE_MATNR.val : stockParam.getAggType();
ViewStockManage stock = stockParam.getStock();
QueryWrapper<ViewStockManage> wrapper = new QueryWrapper<>();
@@ -59,6 +60,9 @@
} else {
wrapper.groupBy("matnr_id");
}
+
+ FieldsUtils.setFieldsFilters(wrapper, pageParam, ViewStockManage.class);
+
IPage<ViewStockManage> pageResult = warehouseStockService.pageByStock(pageParam, wrapper);
List<ViewStockManage> records = pageResult.getRecords();
for (ViewStockManage record : records) {
@@ -82,7 +86,7 @@
BaseParam baseParam = buildParam(param, BaseParam.class);
PageParam<StockItem, BaseParam> pageParam = new PageParam<>(baseParam, StockItem.class);
WarehouseStockParam stockParam = JSONObject.parseObject(JSONObject.toJSONString(param), WarehouseStockParam.class);
- String type = stockParam.getAggType();
+ String type = Objects.isNull(stockParam.getAggType()) ? ViewStockType.VIEW_STOCK_TYPE_MATNR.val : stockParam.getAggType();
ViewStockManage stock = stockParam.getStock();
QueryWrapper<StockItem> wrapper = new QueryWrapper<>();
@@ -120,7 +124,7 @@
BaseParam baseParam = buildParam(param, BaseParam.class);
PageParam<ViewStockManage, BaseParam> pageParam = new PageParam<>(baseParam, ViewStockManage.class);
WarehouseStockParam stockParam = JSONObject.parseObject(JSONObject.toJSONString(param), WarehouseStockParam.class);
- String type = stockParam.getAggType();
+ String type = Objects.isNull(stockParam.getAggType()) ? ViewStockType.VIEW_STOCK_TYPE_MATNR.val : stockParam.getAggType();
if (Objects.isNull(type)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
--
Gitblit v1.9.1