From 5807fc22aba974b4ca85a8049ecd983673b0ca28 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期一, 20 十月 2025 16:59:34 +0800
Subject: [PATCH] 1. 添加大屏接口 2. 任务站点确认修改

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseStockController.java |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 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 e83b13b..aa8edf6 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
@@ -15,6 +15,7 @@
 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;
@@ -34,8 +35,7 @@
     @Autowired
     private WarehouseStockService warehouseStockService;
 
-
-    @PreAuthorize("hasAuthority('manager:locItem:list')")
+//    @PreAuthorize("hasAuthority('manager:locItem:list')")
     @PostMapping("/page")
     public R page(@RequestBody Map<String, Object> param) {
         if (Objects.isNull(param)) {
@@ -44,7 +44,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 +59,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,12 +85,12 @@
         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<>();
 
         if (type.equals(ViewStockType.VIEW_STOCK_TYPE_SUPPLIER.val)) {
-            wrapper.eq("sprl_id", stock.getSplrId());
+            wrapper.eq("splr_id", stock.getSplrId());
         } else if (type.equals(ViewStockType.VIEW_STOCK_TYPE_BATCH.val)) {
             wrapper.eq("batch", stock.getBatch());
         } else if (type.equals(ViewStockType.VIEW_STOCK_TYPE_WAREHOUSE.val)) {
@@ -120,7 +123,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 +137,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