From c610375cba763e1a373ea81941ea6ec25b5f39fd Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 20 Mar 2026 15:55:54 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-20=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=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/SearchProductionDispatchListData.java         | 9 +++++++++
 src/main/resources/mapper/shopOrder/ShopOrderMapper.xml  | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

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 86edd4a..11205af 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchProductionDispatchListData.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchProductionDispatchListData.java
@@ -91,9 +91,18 @@ public class SearchProductionDispatchListData {
     private Integer totalRoll;
 
     private Integer rollCount;
+    private Integer rowCount;
 
     private Double orderQty;
 
+    public Integer getRowCount() {
+        return rowCount;
+    }
+
+    public void setRowCount(Integer rowCount) {
+        this.rowCount = rowCount;
+    }
+
     public Double getOrderQty() {
         return orderQty;
     }
diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
index 9f5ccce..3b83ce7 100644
--- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
@@ -160,7 +160,9 @@
         T.serial_number AS serialNumber,
         d.total_roll,
         ISNULL(R.RollCount, 0) AS rollCount,
-        D.LotSize AS OrderQty
+        D.LotSize AS OrderQty,
+        T.row_count,
+        T.roll_count
         FROM
         SOScheduledRouting AS T
         INNER JOIN SORouting AS S WITH(NOLOCK) ON T.Site = S.Site AND T.OrderNo = S.OrderNo AND T.ItemNo = S.ItemNo