申请单

src/main/java/com/gaotao/modules/notify/entity/SOIssueNotifyOrderList.java

@@ -1,5 +1,6 @@
 package com.gaotao.modules.notify.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -74,5 +75,11 @@ public class SOIssueNotifyOrderList implements Serializable {
      */
     private String orderType;
     
+    /**
+     * 配送区域描述（通过production_area关联area表获取的area_desc，非数据库字段）- rqrq
+     */
+    @TableField(exist = false)
+    private String areaDesc;
+
 }
 

src/main/resources/mapper/customer/ShipmentIssueMapper.xml

@@ -11,10 +11,12 @@
         where a.site=#{site} and a.username=#{username} and a.status='UNISSUE' and a.order_type='shipment'
         order by a.entered_date desc
     </select>
+    <!-- rqrq - 查询发货申请单订单明细（包含运输标志和配送区域） -->
     <select id="getNotifyNoDetail" 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 area ar ON  a.production_area = ar.area_id
         where a.site=#{site} and a.notify_no=#{notifyNo} and a.order_type='shipment'
     </select>
     <select id="getNextItemForShipmentOrderList" resultType="java.math.BigDecimal">

src/main/resources/mapper/notify/IssureNotifyMapper.xml

@@ -26,11 +26,12 @@ record_version,out_work_order_flag,project_id,order_type,auth_rule_id,bu)
         update SOIssueNotifyHeader set bu=#{bu} where site=#{site} and notify_no=#{notifyNo}
     </update>
 
-    <!-- rqrq - 根据申请单号查询订单明细 -->
+    <!-- rqrq - 根据申请单号查询订单明细（包含运输标志和配送区域） -->
     <select id="getNotifyNoDetail" 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>
 

src/main/resources/mapper/notify/NewIssureMapper.xml

@@ -82,7 +82,7 @@
                b.area_desc as areaDesc
         from SOIssueNotifyOrderList a
         left join area b on a.production_area = b.area_id
-        where a.notify_no=#{notifyNo} and a.site=#{site} and a.order_type='shoporder'
+        where a.notify_no=#{notifyNo} and a.site=#{site}
         order by a.item_no
     </select>
 
@@ -359,7 +359,7 @@
         AND unit_id = #{serialNo}
     </select>
     
-    <!-- rqrq - 查询预留标签清单 -->
+    <!-- rqrq - 查询预留标签清单（适用于所有订单类型：shoporder/shipment/noorder） -->
     <select id="searchMaterialListDetail" resultType="com.gaotao.modules.notify.entity.SOIssueNotifyOrderMaterialListDetail">
         SELECT 
             site,
@@ -376,7 +376,6 @@
         FROM SOIssueNotifyOrderMaterialList_detail WITH (NOLOCK)
         WHERE site = #{site}
           AND notify_no = #{notifyNo}
-          AND order_type = 'shoporder'
         ORDER BY item_no, BOM_item_no, task_seq
     </select>