From 2c0dfda67513c847035f1a972f05e90474c0897c Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 1 Dec 2025 16:18:04 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-01=20=E5=88=9B=E5=BB=BA=E5=88=86?=
 =?UTF-8?q?=E5=8D=B7=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/schedule/data/BaseData.java       |  9 ++++++++
 .../mapper/schedule/ScheduleMapper.xml        |  4 +++-
 .../mapper/schedule/SchedulingMapper.xml      | 22 ++++++++++++++-----
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/data/BaseData.java b/src/main/java/com/gaotao/modules/schedule/data/BaseData.java
index d5275f4..50f2c4b 100644
--- a/src/main/java/com/gaotao/modules/schedule/data/BaseData.java
+++ b/src/main/java/com/gaotao/modules/schedule/data/BaseData.java
@@ -25,6 +25,15 @@ public class BaseData extends QueryPage {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updatedDate;//更细时间
+    private String buNo;
+
+    public String getBuNo() {
+        return buNo;
+    }
+
+    public void setBuNo(String buNo) {
+        this.buNo = buNo;
+    }
 
     public BaseData() {
     }
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index ec97b18..94d6349 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -288,7 +288,8 @@
         T.ClosedDate closedDate,
         T.mat_issueflag matIssueFlag,
         T.plate_issueflag plateIssueFlag,
-        T.tool_issueflag toolIssueFlag
+        T.tool_issueflag toolIssueFlag,
+        so.bu_no buNo
         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
@@ -578,6 +579,7 @@
         D.PartNo partNo,
         P.PartDescription partDesc,
         P.Spec spec,
+        SO.bu_no buNo,
         T.SeqNo seqNo,
         T.QtyRequired qtyRequired,
         T.QtyReported qtyReported,
diff --git a/src/main/resources/mapper/schedule/SchedulingMapper.xml b/src/main/resources/mapper/schedule/SchedulingMapper.xml
index 29aea53..9bab4e8 100644
--- a/src/main/resources/mapper/schedule/SchedulingMapper.xml
+++ b/src/main/resources/mapper/schedule/SchedulingMapper.xml
@@ -446,12 +446,22 @@
 
     <!--获取流转标签的打印数据-->
     <select id="getSfdcFlowLabelData" parameterType="SearchScheduleData" resultType="java.util.HashMap">
-        SELECT sfr.RollNo rollNo, CONVERT(VARCHAR(19), sfr.CreatedDate, 120) createdDate, dbo.Get_OperatorDesc(sfr.Site, sfr.Createdby) createdBy,
-        sfr.CreatedOpsItemNo itemNo, dbo.Get_SOOpsDescription(sfr.Site, sfr.OrderNo, sfr.CreatedOpsItemNo) itemDesc,
-        dbo.Get_SORouting_NextOperationDesc(sfr.Site,sfr.OrderNo,sfr.CreatedOpsItemNo) nextItemDesc, sfr.RollQty rollQty, so.PartNo partNo,
-        dbo.Get_Part_DescSpec(so.Site,so.PartNo) partDesc, pt.Remark customerPartNo, pt.ConfigurationTemplateID customerName,'系统数据' ul,
-<!--        oi.U_UL ul,-->
-        pt.DefaultLocationID locationId, st.SiteName siteName
+        SELECT
+        sfr.RollNo rollNo,
+        CONVERT(VARCHAR(19),
+        sfr.CreatedDate, 120) createdDate,
+        dbo.Get_OperatorDesc(sfr.Site, sfr.Createdby) createdBy,
+        sfr.CreatedOpsItemNo itemNo,
+        dbo.Get_SOOpsDescription(sfr.Site, sfr.OrderNo, sfr.CreatedOpsItemNo) itemDesc,
+        dbo.Get_SORouting_NextOperationDesc(sfr.Site,sfr.OrderNo,sfr.CreatedOpsItemNo) nextItemDesc,
+        sfr.RollQty rollQty,
+        so.PartNo partNo,
+        dbo.Get_Part_DescSpec(so.Site,so.PartNo) partDesc,
+        pt.Remark customerPartNo,
+        pt.ConfigurationTemplateID customerName,
+        '系统数据' as ul,
+        pt.DefaultLocationID locationId,
+        st.SiteName siteName
         FROM SFDC_Rolls sfr, ShopOrder so, Part pt
 <!--        LEFT JOIN dbo.view_sap_oitm oi ON oi.ItemCode = pt.PartNo-->
         LEFT JOIN Site st ON st.SiteID = pt.Site