From b0e3591e4d3b695197a5d827c01ce9e8b75ea603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Tue, 25 Nov 2025 09:21:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/pms/EamMapper.xml | 35 ++++++++++-----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 03b9b4eb..d68fc0dc 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -4030,28 +4030,25 @@
     </select>
     <select id="getAllCoreComponents" resultType="com.xujie.sys.modules.pms.data.ExportCoreComponentsData">
         SELECT
-        rs.id,
-        rs.site,
-        rs.bu_no,
-        rs.part_no,
-        ps.part_description,
-        rs.qty_usable,
-        rs.delflag,
-        rs.version,
-        ewc.oldSerialNo,
-        ewc.newSerialNo,
-        ewc.created_date,
-        ps.spec,
-        ps.umid,
-        ps.remark,
-        ewc.created_by,
-        d.fault_reason,
-        rs.resource_id,
-        dbo.eam_Get_eamResourceDesc(d.Site, d.ObjectID) as resourceDesc
+            D.OrderNo,
+            ewc.site,
+            ewc.bu_no,
+            ewc.partno,
+            ps.part_description,
+            ewc.oldSerialNo,
+            ewc.newSerialNo,
+            ewc.created_date,
+            ps.spec,
+            ps.umid,
+            ps.remark,
+            ewc.created_by,
+            d.fault_reason,
+            b.resource_id,
+            dbo.eam_Get_eamResourceDesc(d.Site, d.ObjectID) as resourceDesc
         FROM eam_workOrder_coreComponents ewc
-        LEFT JOIN resource_spare rs ON ewc.site = rs.site AND ewc.bu_no = rs.bu_no AND ewc.partNo = rs.part_no
         LEFT JOIN part_spare ps ON ewc.site = ps.site AND ewc.bu_no = ps.bu_no AND ewc.partNo = ps.part_no
         LEFT JOIN eam_workOrder d ON ewc.site = d.Site AND ewc.bu_no = d.bu_no AND ewc.OrderNo = d.OrderNo
+        left join resource B ON ewc.site = b.site and d.objectid = b.resource_id
         <where>
             ewc.site = #{site} and ewc.bu_no = #{buNo} and ps.coreFlag = 'Y'
             <if test="startDate != null ">