From 96818fff1bc772e85ca78507aaa42e48f7fa30ed Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 13 Nov 2025 15:26:05 +0800
Subject: [PATCH] =?UTF-8?q?2025-11-13=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gaotao/modules/boxManage/data/SoReceiveCasesData.java   | 2 ++
 .../com/gaotao/modules/boxManage/entity/SoReceiveCases.java | 2 ++
 src/main/resources/mapper/shopOrder/ShopOrderMapper.xml     | 6 ++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
index e8c2237..237cb4d 100644
--- a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
+++ b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
@@ -52,6 +52,8 @@ public class SoReceiveCasesData extends SoReceiveCases {
 
 
 
+
+
 
 
 
diff --git a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
index b901e11..4499566 100644
--- a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
+++ b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
@@ -195,6 +195,8 @@ public class SoReceiveCases {
 
 
 
+
+
 
 
 
diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
index 1a8b74e..02006e9 100644
--- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
@@ -118,7 +118,7 @@
         S2.OperationDesc AS NextOperationDesc,
         S2.ScheduledFlag AS NextScheduledFlag,
         D.CustomerID,
-        P.ConfigurationTemplateID AS CustomerName,
+        C.CustomerName AS CustomerName,
         D.EnterDate,
         dbo.Get_SOOpsScheduleAvailResource (
         T.Site,
@@ -159,7 +159,8 @@
         T.closedby,
         T.serial_number AS serialNumber,
         d.total_roll,
-        ISNULL(R.RollCount, 0) AS rollCount
+        ISNULL(R.RollCount, 0) AS rollCount,
+        D.LotSize AS OrderQty
         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
@@ -169,6 +170,7 @@
         LEFT JOIN SORouting AS S1  WITH(NOLOCK)  ON S.Site = S1.Site AND S.OrderNo = S1.OrderNo  AND S.PreItemNo = S1.ItemNo
         LEFT JOIN SORouting AS S2  WITH(NOLOCK)  ON S.Site = S2.Site AND S.OrderNo = S2.OrderNo  AND S.NextItemNo = S2.ItemNo
         LEFT JOIN ( SELECT  Site, CreatedOpsSeqNo, COUNT(1) AS RollCount FROM SFDC_Rolls WITH(NOLOCK) WHERE RollType = '下道流转'  GROUP BY Site, CreatedOpsSeqNo) AS R  ON R.Site = T.Site   AND R.CreatedOpsSeqNo = T.SeqNo
+        LEFT JOIN Customer C WITH(NOLOCK)  ON D.Site = C.Site AND D.CustomerID = C.CustomerID
         <where>
             AND T.Site = S.Site
             AND T.OrderNo = S.OrderNo