From d51f64c1f0105d4b18aa8344c11e47827730a40c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 10:42:39 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockController.java
index b32b8ba..8f9ad32 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockController.java
@@ -12,6 +12,7 @@
 import com.vincent.rsf.server.manager.entity.Stock;
 import com.vincent.rsf.server.manager.service.StockService;
 import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -19,6 +20,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
+@Api(tags = "搴撳瓨淇℃伅")
 @RestController
 public class StockController extends BaseController {
 
@@ -34,6 +36,14 @@
     }
 
     @PreAuthorize("hasAuthority('manager:stock:list')")
+    @PostMapping("/inStock/num/page")
+    public R inStockpage(@RequestBody Map<String, Object> map) {
+        BaseParam baseParam = buildParam(map, BaseParam.class);
+        PageParam<Stock, BaseParam> pageParam = new PageParam<>(baseParam, Stock.class);
+        return R.ok().add(stockService.page(pageParam, pageParam.buildWrapper(true)));
+    }
+
+    @PreAuthorize("hasAuthority('manager:stock:list')")
     @PostMapping("/stock/list")
     public R list(@RequestBody Map<String, Object> map) {
         return R.ok().add(stockService.list());

--
Gitblit v1.9.1