From c32e7f9f184af972398072b2d92dfedb5e717b3f Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 18 Feb 2025 17:11:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=B7=A5=E8=BF=94=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/heai/modules/production/entity/ReworkRecordData.java  | 2 ++
 src/main/resources/mapper/production/ReworkRecordMapper.xml   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/heai/modules/production/entity/ReworkRecordData.java b/src/main/java/com/heai/modules/production/entity/ReworkRecordData.java
index 32ef184..0a261d4 100644
--- a/src/main/java/com/heai/modules/production/entity/ReworkRecordData.java
+++ b/src/main/java/com/heai/modules/production/entity/ReworkRecordData.java
@@ -32,5 +32,7 @@ public class ReworkRecordData extends ReworkRecord{
 
     private String originOperatorName;
 
+    private String qtyApprove;
+
 }
 
diff --git a/src/main/resources/mapper/production/ReworkRecordMapper.xml b/src/main/resources/mapper/production/ReworkRecordMapper.xml
index 39bb371..c77429b 100644
--- a/src/main/resources/mapper/production/ReworkRecordMapper.xml
+++ b/src/main/resources/mapper/production/ReworkRecordMapper.xml
@@ -99,8 +99,10 @@
         rw.order_no,
         rw.type,
         rw.origin_operator_id,
-        dbo.Get_OperatorDesc(rw.site,rw.origin_operator_id) as originOperatorName
+        dbo.Get_OperatorDesc(rw.site,rw.origin_operator_id) as originOperatorName,
+        ss.QtyApprove as qtyApprove
         from so_rework_record rw
+        left join SOScheduledRouting ss on rw.seq_no = ss.SeqNo and rw.site = ss.Site
         <where>
             <if test="site != null and site != ''">
                 and rw.site = #{site}