From 83e3d34abd06c0256f61382c4c9cf89c4be109d8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 19 五月 2025 19:35:41 +0800
Subject: [PATCH] #问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseStockController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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..983ac11 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,10 +11,12 @@
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;
import io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
@@ -44,7 +46,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 +61,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 +87,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 +125,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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -134,7 +139,11 @@
} else if (type.equals(ViewStockType.VIEW_STOCK_TYPE_WAREHOUSE.val)) {
wrapper.eq(ViewStockManage::getWarehouse, stock.getWarehouse());
} else if (type.equals(ViewStockType.VIEW_STOCK_TYPE_FIELDSINDEX.val)) {
- wrapper.eq(ViewStockManage::getFieldsIndex, stock.getFieldsIndex());
+ if (StringUtils.isBlank(stock.getFieldsIndex())) {
+ wrapper.isNull(ViewStockManage::getFieldsIndex);
+ } else {
+ wrapper.eq(ViewStockManage::getFieldsIndex, stock.getFieldsIndex());
+ }
} else {
wrapper.eq(ViewStockManage::getMatnrCode, stock.getMatnrCode());
}
--
Gitblit v1.9.1