From 14457994a9b6485d87dfc47862bff26f95a154c9 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 15 Oct 2024 13:41:55 +0800
Subject: [PATCH] =?UTF-8?q?2024-10-15=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/pms/QcMapper.xml | 30 +++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index c6bceb6..ea92305 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -2173,19 +2173,25 @@
     <!-- 查询工序列表 -->
     <select id="getOperationList" parameterType="QcFAIRecordData" resultType="QcFAIRecordData">
         SELECT
-            DISTINCT
-            a.SeqNo as seqNo,
-            a.OrderNo as orderNo,
-            a.partNo,
-            j.PartDescription + Isnull(j.Spec,'') as part_desc,
-            j.spec,
-            a.operationDesc as operationDesc,
-            a.ResourceID as resourceId,
-            a.ResourceDesc as resourceDesc,
+            a.site,
+            a.BarcodeID as seqNo,
+            a.SOOrderNo as orderNo,
+            a.PartNo,
+            p.PartDescription + Isnull(p.Spec,'') as part_desc,
+            t.lotsize,
+            a.QtyRequired as qtyrequired,
+            a.OperationDesc as operationDesc,
+            p.UMID as umId,
+            t.status,
+            p.spec,
+            a.S_ResourceID as resourceId,
+            w.ResourceDesc as resourceDesc,
             a.S_workCenterNo as workCenterNo
-        FROM view_virtual_SOScheduledRouting as a
-        LEFT JOIN part j ON a.partNo = j.partNo and a.site = j.site
-        WHERE a.SeqNo = #{seqNo}
+        FROM SOScheduledRouting AS a
+        inner join ShopOrder as t ON t.Site = a.Site AND t.OrderNo = a.SOOrderNo
+        inner join WorkCenterResource as w ON w.Site = a.Site AND w.WorkCenterNo = a.S_WorkCenterNo and w.ResourceID = a.S_ResourceID
+        left join part as p on a.site = p.site and a.partNo = p.partNo
+        WHERE a.BarcodeID = #{seqNo}
     </select>
 
     <!-- 根据工单号和工序号查出所有数据 -->