From e92008cb4ac5eb652a889b973a4c36e9ab9cb961 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 15 Apr 2026 10:06:02 +0800
Subject: [PATCH] =?UTF-8?q?2026-04-15=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=A2=9E=E5=8A=A0=E4=B8=80?=
 =?UTF-8?q?=E5=88=97?=
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  | 3 ++-
 2 files changed, 11 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 11205af..97c82a5 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/entity/SearchProductionDispatchListData.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/entity/SearchProductionDispatchListData.java
@@ -94,6 +94,15 @@ public class SearchProductionDispatchListData {
     private Integer rowCount;
 
     private Double orderQty;
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public Integer getRowCount() {
         return rowCount;
diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
index 8b209bc..5af4338 100644
--- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
@@ -162,7 +162,8 @@
         ISNULL(R.RollCount, 0) AS rollCount,
         D.LotSize AS OrderQty,
         T.row_count,
-        T.roll_count
+        T.roll_count,
+        T.remark
         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