From a0bb4d1cafff1d662e9a18d60d17110e375cc91b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Wed, 3 Dec 2025 09:39:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/impl/IfsApiServiceImpl.java   |  1 -
 .../SOIssueNotifyOrderMaterialListDetail.java |  5 +++
 .../NotifyDetailQueryMapper.xml               | 40 +++++++++++--------
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/api/service/impl/IfsApiServiceImpl.java b/src/main/java/com/gaotao/modules/api/service/impl/IfsApiServiceImpl.java
index 4374976..bf52525 100644
--- a/src/main/java/com/gaotao/modules/api/service/impl/IfsApiServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/api/service/impl/IfsApiServiceImpl.java
@@ -242,7 +242,6 @@ public class IfsApiServiceImpl implements IfsApiService {
                 String errorMessage = IfsErrorMessageUtils.extractOracleErrorMessage(ifsResponse);
                 throw new RuntimeException(errorMessage);
             }
-            
             return ifsResponse;
         } catch (Exception e) {
             log.error("IFS ChangeWdrNo异常 - rqrq：{}", e.getMessage());
diff --git a/src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderMaterialListDetail.java b/src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderMaterialListDetail.java
index 449db8e..1f5ac62 100644
--- a/src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderMaterialListDetail.java
+++ b/src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderMaterialListDetail.java
@@ -67,4 +67,9 @@ public class SOIssueNotifyOrderMaterialListDetail {
      * 订单类型（shoporder/customer等）- rqrq
      */
     private String orderType;
+    
+    /**
+     * 物料号（从SOIssueNotifyOrderMaterialList关联查询）- rqrq
+     */
+    private String componentPartNo;
 }
diff --git a/src/main/resources/mapper/automatedWarehouse/NotifyDetailQueryMapper.xml b/src/main/resources/mapper/automatedWarehouse/NotifyDetailQueryMapper.xml
index 17ed774..c0a64e9 100644
--- a/src/main/resources/mapper/automatedWarehouse/NotifyDetailQueryMapper.xml
+++ b/src/main/resources/mapper/automatedWarehouse/NotifyDetailQueryMapper.xml
@@ -40,25 +40,31 @@
         ORDER BY a.notify_no DESC, a.item_no ASC
     </select>
 
-    <!-- rqrq - 查询申请单物料明细（根据notify_no+site+item_no） -->
+    <!-- rqrq - 查询申请单物料明细（根据notify_no+site+item_no，关联物料号） -->
     <select id="searchMaterialListDetail" resultType="SOIssueNotifyOrderMaterialListDetail">
         SELECT
-            site,
-            notify_no AS notifyNo,
-            item_no AS itemNo,
-            bom_item_no AS bomItemNo,
-        serialNo AS serialNo,
-            task_ref AS taskRef,
-            task_item AS taskItem,
-            task_seq AS taskSeq,
-            out_wcs_flag AS outWcsFlag,
-            issure_flag AS issureFlag,
-            order_type AS orderType
-        FROM SOIssueNotifyOrderMaterialList_detail WITH (NOLOCK)
-        WHERE site = #{query.site}
-          AND notify_no = #{query.notifyNo}
-          AND item_no = #{query.itemNo}
-        ORDER BY bom_item_no, serialNo
+            d.site,
+            d.notify_no AS notifyNo,
+            d.item_no AS itemNo,
+            d.bom_item_no AS bomItemNo,
+            d.serialNo AS serialNo,
+            d.task_ref AS taskRef,
+            d.task_item AS taskItem,
+            d.task_seq AS taskSeq,
+            d.out_wcs_flag AS outWcsFlag,
+            d.issure_flag AS issureFlag,
+            d.order_type AS orderType,
+            m.component_part_no AS componentPartNo
+        FROM SOIssueNotifyOrderMaterialList_detail d WITH (NOLOCK)
+        LEFT JOIN SOIssueNotifyOrderMaterialList m WITH (NOLOCK)
+            ON d.site = m.site
+            AND d.notify_no = m.notify_no
+            AND d.item_no = m.item_no
+            AND d.bom_item_no = m.bom_item_no
+        WHERE d.site = #{query.site}
+          AND d.notify_no = #{query.notifyNo}
+          AND d.item_no = #{query.itemNo}
+        ORDER BY d.bom_item_no, d.serialNo
     </select>
 
 </mapper>