From 197b81cb2412bb6e80b98841123d58710da85063 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 30 Oct 2025 09:58:21 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-30=20=E7=94=9F=E4=BA=A7=E6=B4=BE?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E6=8B=96?=
 =?UTF-8?q?=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ShopOrderController.java       | 16 ++++++++++-
 .../SearchProductionDispatchListData.java     | 27 +++++++++++++++++++
 .../mapper/shopOrder/ShopOrderMapper.xml      |  6 +++++
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java b/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java
index 307dd5a..7737b33 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java
@@ -208,10 +208,24 @@ public class ShopOrderController extends AbstractController {
     public Object searchProductionDispatchList(@RequestBody SearchProductionDispatchListData indata) {
         Map<String, Object> map = new HashMap<>();
         try {
+            // 计算OFFSET值（页码从1开始，OFFSET从0开始）
+            if (indata.getPage() != null && indata.getLimit() != null) {
+                indata.setPage((indata.getPage() - 1) * indata.getLimit());
+            }
+            
             List<SearchProductionDispatchListData> result = shopOrderService.searchProductionDispatchList(indata);
+            
+            // 获取总记录数（从第一条记录中获取）
+            int total = 0;
+            if (result != null && !result.isEmpty() && result.get(0).getTotalCount() != null) {
+                total = result.get(0).getTotalCount();
+            } else if (result != null) {
+                total = result.size();
+            }
+            
             map.put("success", true);
             map.put("rows", result);
-            map.put("total", result.size());
+            map.put("total", total);
         } catch (Exception e) {
             map.put("success", false);
             map.put("msg", e.getMessage());
diff --git a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchProductionDispatchListData.java b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchProductionDispatchListData.java
index b730246..26437e1 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchProductionDispatchListData.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchProductionDispatchListData.java
@@ -84,6 +84,9 @@ public class SearchProductionDispatchListData {
     private boolean checked;
     private String sql;
     private Integer serialNumber;
+    private Integer page;  // 当前页码
+    private Integer limit; // 每页数量
+    private Integer totalCount; // 总记录数
 
     public Integer getSerialNumber() {
         return serialNumber;
@@ -93,6 +96,30 @@ public class SearchProductionDispatchListData {
         this.serialNumber = serialNumber;
     }
 
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getLimit() {
+        return limit;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
+
+    public Integer getTotalCount() {
+        return totalCount;
+    }
+
+    public void setTotalCount(Integer totalCount) {
+        this.totalCount = totalCount;
+    }
+
     public String getSite() {
         return site;
     }
diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
index fc02969..1bcb955 100644
--- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
@@ -97,6 +97,9 @@
 
     <select id="searchProductionDispatchList" resultType="com.gaotao.modules.shopOrder.entity.SearchProductionDispatchListData">
         SELECT
+        <if test="page != null and limit != null">
+            COUNT(*) OVER() AS totalCount,
+        </if>
         T.Site,
         T.OrderNo,
         T.ItemNo,
@@ -211,6 +214,9 @@
             ${sql}
         </where>
         ORDER BY d.bu_no, T.S_ResourceID, ISNULL(T.serial_number, 999999)
+        <if test="page != null and limit != null">
+            OFFSET #{page} ROWS FETCH NEXT #{limit} ROWS ONLY
+        </if>
     </select>
     <select id="searchShopOrder" resultType="com.gaotao.modules.shopOrder.entity.SearchShopOrder">
         Select T.OrderNo,T.NeedDate,T.OrderType,T.PartNo,p.PartDescription+' / '+isnull(p.Spec,'') as PartDescription,