From 5836788a6aabf60014a746b724607e3e965a0d86 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 10 六月 2025 10:51:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsStocktakingBoundController.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsStocktakingBoundController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsStocktakingBoundController.java
index ffef65a..b818afc 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsStocktakingBoundController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsStocktakingBoundController.java
@@ -16,6 +16,7 @@
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
 import org.jeecg.modules.tms.entity.BaseTools;
+import org.jeecg.modules.tms.entity.ToolSharpening;
 import org.jeecg.modules.tms.entity.ToolsStocktakingBound;
 import org.jeecg.modules.tms.entity.ToolsStocktakingBoundDetail;
 import org.jeecg.modules.tms.entity.dto.LossBoundFlowDto;
@@ -283,4 +284,23 @@
         return Result.OK("鏂囦欢瀵煎叆澶辫触锛�");
     }
 
+    /**
+     * 宸ュ叿鍙拌处-鐩樼偣瀛愰〉闈㈠垪琛ㄦ煡璇�
+     *
+     * @param toolsStocktakingBound
+     * @param pageNo
+     * @param pageSize
+     * @param query
+     * @return
+     */
+    @ApiOperation(value="宸ュ叿鍙拌处-鐩樼偣瀛愰〉闈㈠垪琛ㄦ煡璇�", notes="宸ュ叿鍙拌处-鐩樼偣瀛愰〉闈㈠垪琛ㄦ煡璇�")
+    @GetMapping(value = "/toolsStocktakingList")
+    public Result<?> toolsStocktakingList(ToolsStocktakingBound toolsStocktakingBound,
+                                        @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                        @RequestParam Map<String, String> query) {
+        IPage<Map<String, Object>> pageList = toolsStocktakingBoundDetailService.toolsStocktakingList(pageNo,pageSize, query);
+        return Result.OK(pageList);
+    }
+
 }

--
Gitblit v1.9.3