From a6d2460752d8d361bb0d7e68593d5bf08c2019b9 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 9 Jan 2026 13:39:45 +0800
Subject: [PATCH] =?UTF-8?q?2026-01-09=201=E3=80=81=E5=A2=9E=E5=8A=A0"?=
 =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=8F=82=E6=95=B0"=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=94=BE=E5=9C=A8=E7=94=9F=E4=BA=A7=E5=87=86=E5=A4=87?=
 =?UTF-8?q?=E9=87=8C=202=E3=80=81=E7=82=B9=E5=87=BB=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=9C=B0=E5=9D=80=EF=BC=9Ahttps.....?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E4=B8=AD=E5=BF=83=E7=BC=96=E5=8F=B7/?=
 =?UTF-8?q?=E5=90=88=E7=BA=A6=E5=8F=B7=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gaotao/modules/schedule/data/BaseShopOrderData.java  | 9 +++++++++
 src/main/resources/mapper/schedule/ScheduleMapper.xml    | 1 +
 2 files changed, 10 insertions(+)

diff --git a/src/main/java/com/gaotao/modules/schedule/data/BaseShopOrderData.java b/src/main/java/com/gaotao/modules/schedule/data/BaseShopOrderData.java
index 477781b..aff9ce7 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/BaseShopOrderData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/BaseShopOrderData.java
@@ -28,6 +28,15 @@ public class BaseShopOrderData extends BaseData {
     private Float machRunFactor;
     private Float machSetupTime;//
     private String factorUnit;//
+    private String batchNo;
+
+    public String getBatchNo() {
+        return batchNo;
+    }
+
+    public void setBatchNo(String batchNo) {
+        this.batchNo = batchNo;
+    }
 
     public BaseShopOrderData() {
     }
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index e48cb92..f3f3cc1 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -627,6 +627,7 @@
         d.total_roll_qty,
         d.total_per_volume,
         d.Remark as soRemark,
+        SO.batch_no as batchNo,
         (SELECT count(1) FROM SFDC_Rolls S WHERE s.Site = T.SITE AND s.CreatedOpsSeqNo = T.SeqNo AND s.VirtualNewRollFlag ='N'  and s.RollType ='下道流转') as productionRollQty
         from SOScheduledRouting as T
         Left Join SOScheduledList as E on E.Site = T.Site and E.LinkedSeqNo = T.SeqNo,