From 2709a057033514dcf83111f6e52d0c42de8ac905 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 11 Dec 2025 14:28:28 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-11=20=E8=BF=87=E7=AB=99=E9=87=87?=
 =?UTF-8?q?=E9=9B=86-=E3=80=8B=E8=BD=A6=E9=97=B4=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=9A=84=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=B8=AD=E6=98=BE=E7=A4=BA=E5=B7=A5=E8=89=BA=E7=9A=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/schedule/data/ScheduleData.java   | 46 +++++++++++++++++++
 .../mapper/schedule/ScheduleMapper.xml        |  7 ++-
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java b/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
index 33cf7be..92fafa0 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/ScheduleData.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.ibatis.type.Alias;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -89,6 +90,51 @@ public class ScheduleData extends BaseShopOrderData {
     private Integer rowCount;
     private Integer rollCount;
     private String carrierNo;
+    private BigDecimal productionQty;
+    private BigDecimal totalRollQty;
+    private BigDecimal totalPerVolume;
+    private String soRemark;
+    private BigDecimal productionRollQty;
+
+    public BigDecimal getProductionRollQty() {
+        return productionRollQty;
+    }
+
+    public void setProductionRollQty(BigDecimal productionRollQty) {
+        this.productionRollQty = productionRollQty;
+    }
+
+    public BigDecimal getProductionQty() {
+        return productionQty;
+    }
+
+    public void setProductionQty(BigDecimal productionQty) {
+        this.productionQty = productionQty;
+    }
+
+    public BigDecimal getTotalRollQty() {
+        return totalRollQty;
+    }
+
+    public void setTotalRollQty(BigDecimal totalRollQty) {
+        this.totalRollQty = totalRollQty;
+    }
+
+    public BigDecimal getTotalPerVolume() {
+        return totalPerVolume;
+    }
+
+    public void setTotalPerVolume(BigDecimal totalPerVolume) {
+        this.totalPerVolume = totalPerVolume;
+    }
+
+    public String getSoRemark() {
+        return soRemark;
+    }
+
+    public void setSoRemark(String soRemark) {
+        this.soRemark = soRemark;
+    }
 
     public Float getQtyToReport() {
         return qtyToReport;
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index edc699c..e046d06 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -622,7 +622,12 @@
         SO.ManualFlag manualFlag,
         T.row_count,
         T.roll_count,
-        T.carrier_no
+        T.carrier_no,
+        d.production_qty,
+        d.total_roll_qty,
+        d.total_per_volume,
+        d.Remark as soRemark,
+        (SELECT  count(1)  FROM  SFDC_Rolls S WHERE  Site = T.SITE AND CreatedOpsSeqNo = T.SeqNo AND VirtualNewRollFlag ='N'  and RollType ='下道流转') as productionRollQty
         from SOScheduledRouting as T
         Left Join SOScheduledList as E on E.Site = T.Site and E.LinkedSeqNo = T.SeqNo,
         SORouting as D, Part as P, ShopOrder as SO