From ed53a53373a94813425bbe8871b014d922d8ac1a 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, 26 Nov 2025 18:46:28 +0800
Subject: [PATCH] =?UTF-8?q?=20=E7=94=B3=E8=AF=B7=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/customer/ShipmentIssueMapper.xml     | 3 +--
 src/main/resources/mapper/notify/IssureNotifyMapper.xml   | 8 ++++++--
 .../mapper/outsourcing/OutsourcingNotifyMapper.xml        | 4 +++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/customer/ShipmentIssueMapper.xml b/src/main/resources/mapper/customer/ShipmentIssueMapper.xml
index a81d103..9a41b78 100644
--- a/src/main/resources/mapper/customer/ShipmentIssueMapper.xml
+++ b/src/main/resources/mapper/customer/ShipmentIssueMapper.xml
@@ -29,7 +29,7 @@
               ,#{needDate},#{releaseNo},#{sequenceNo},#{orderType},#{productionArea},#{pushWmsFlag},#{transportFlag})
     </insert>
 
-    <!-- rqrq - 关联part_attribute表查询is_in_wh字段 -->
+    <!-- rqrq - 关联part_attribute表查询is_in_wh字段（去除order_type限制，支持所有订单类型） -->
     <select id="selectOrderMaterialList"
             resultType="com.gaotao.modules.customer.entity.vo.SOIssueNotifyOrderMaterialListShipmentVo">
         SELECT
@@ -51,7 +51,6 @@
             a.site = #{data.site}
             AND a.notify_no = #{data.notifyNo}
             AND a.item_no = #{data.itemNo}
-            AND a.order_type='shipment'
         ORDER BY
             a.bom_item_no ASC;
     </select>
diff --git a/src/main/resources/mapper/notify/IssureNotifyMapper.xml b/src/main/resources/mapper/notify/IssureNotifyMapper.xml
index e24288e..07415c4 100644
--- a/src/main/resources/mapper/notify/IssureNotifyMapper.xml
+++ b/src/main/resources/mapper/notify/IssureNotifyMapper.xml
@@ -427,10 +427,12 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu)
               ,#{needDate},#{releaseNo},#{sequenceNo},#{pushWmsFlag},#{productionArea},#{transportFlag},#{orderType})
     </insert>
 
+    <!-- rqrq - 查询无订单申请单订单明细（包含运输标志和配送区域） -->
     <select id="getNotifyNoOrderDetail" resultType="SOIssueNotifyOrderListData">
         select a.notify_no,a.site,a.item_no,a.fgpart_no,a.soorder_no,a.ops_item_no,a.seq_no,a.issure_qty,a.out_work_order_flag,a.location_no,a.need_date
-             ,a.release_no,a.sequence_no,a.order_type
+             ,a.release_no,a.sequence_no,a.order_type,a.push_wms_flag,a.transport_flag,a.production_area,ar.area_desc as areaDesc
         from SOIssueNotifyOrderList a
+        LEFT JOIN area ar ON a.production_area = ar.area_id
         where a.site=#{site} and a.notify_no=#{notifyNo}
     </select>
     <select id="getNoOrderMaterialList" resultType="NoOrderMaterialListVo" >
@@ -477,11 +479,13 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu)
         </where>
         order by a.notify_no desc
     </select>
+    <!-- rqrq - 查询无订单申请单订单明细（包含运输标志和配送区域） -->
     <select id="getNotifyNoOrderDetailByType" resultType="com.gaotao.modules.notify.entity.SOIssueNotifyOrderList">
         select a.notify_no,a.site,a.item_no,a.fgpart_no,a.soorder_no,a.ops_item_no,a.seq_no,a.issure_qty,a.out_work_order_flag,a.location_no,a.need_date
-             ,a.release_no,a.sequence_no
+             ,a.release_no,a.sequence_no,a.push_wms_flag,a.transport_flag,a.production_area,ar.area_desc as areaDesc
         from SOIssueNotifyOrderList a
         left join SOIssueNotifyHeader b on a.site = b.site and a.notify_no = b.notify_no
+        LEFT JOIN area ar ON a.production_area = ar.area_id
         where a.site=#{site} and a.notify_no=#{notifyNo} and b.order_type='noorder'
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/outsourcing/OutsourcingNotifyMapper.xml b/src/main/resources/mapper/outsourcing/OutsourcingNotifyMapper.xml
index 6b00c6e..7543a91 100644
--- a/src/main/resources/mapper/outsourcing/OutsourcingNotifyMapper.xml
+++ b/src/main/resources/mapper/outsourcing/OutsourcingNotifyMapper.xml
@@ -10,10 +10,12 @@
         order by a.entered_date desc
 
     </select>
+    <!-- rqrq - 查询委外申请单订单明细（包含运输标志和配送区域） -->
     <select id="getNotifyPoDetail" resultType="com.gaotao.modules.notify.entity.SOIssueNotifyOrderListData">
         select a.notify_no,a.site,a.item_no,a.fgpart_no,a.soorder_no,a.ops_item_no,a.seq_no,a.issure_qty,a.out_work_order_flag,a.location_no,a.need_date
-             ,a.release_no,a.sequence_no,a.order_type
+             ,a.release_no,a.sequence_no,a.order_type,a.push_wms_flag,a.transport_flag,a.production_area,ar.area_desc as areaDesc
         from SOIssueNotifyOrderList a
+        LEFT JOIN area ar ON a.production_area = ar.area_id
         where a.site=#{site} and a.notify_no=#{notifyNo}
     </select>
 </mapper>
\ No newline at end of file