From 95fe516ea97596711326639d014d574a68235e83 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 18 Sep 2025 10:19:39 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=E8=B4=A2?=
 =?UTF-8?q?=E5=8A=A1=E9=94=80=E8=B4=A6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../erp/emis/domain/EmisWriteoffApplyDetail.java     |  5 +++++
 .../mapper/EmisWriteoffApplyDetailMapper.xml         | 12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWriteoffApplyDetail.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWriteoffApplyDetail.java
index c8a4cc63e..d53b14da0 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWriteoffApplyDetail.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWriteoffApplyDetail.java
@@ -67,4 +67,9 @@ public class EmisWriteoffApplyDetail extends BaseEntity {
     @TableField(exist = false)
     private EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill();
 
+    // 快件类型（寄件网点-目的网点，只作查询）
+    @TableField(exist = false)
+    @Excel(name = "快件类型")
+    private String expressType;
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyDetailMapper.xml b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyDetailMapper.xml
index 562ac31db..efda638f9 100644
--- a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyDetailMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyDetailMapper.xml
@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="billCode"    column="bill_code"    />
         <result property="applyMoney"    column="apply_money"    />
         <result property="settleBillNo"    column="settle_bill_no"    />
+        <result property="expressType"    column="express_type"    />
         <!-- 关联运单信息 -->
         <association property="emisWaybill" javaType="EmisWaybill">
             <result property="id" column="w_id"/>
@@ -73,6 +74,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="boxQuantity" column="w_box_quantity"/>
             <result property="salesSupport" column="w_sales_support"/>
             <result property="salesExecutive" column="w_sales_executive"/>
+            <result property="settlementWeight"    column="w_settlement_weight"    />
+            <result property="sendSiteCode" column="w_send_site_code"/>
+            <result property="sendSiteName" column="w_send_site_name"/>
+            <result property="dispatchUnderlingSiteCode" column="w_dispatch_underling_site_code"/>
+            <result property="dispatchUnderlingSiteName" column="w_dispatch_underling_site_name"/>
         </association>
         <!-- 关联结算账单信息 -->
         <association property="emisSettleBill" javaType="EmisSettleBill">
@@ -188,6 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectEmisWriteoffApplyDetailVo">
         select wad.id, wad.apply_id, wad.apply_no, wad.bill_code, wad.apply_money, wad.settle_bill_no,
+               CONCAT(IFNULL(send_site.site_name, ''), '-', IFNULL(dest_site.site_name, '')) as express_type,
                w.id as w_id, w.order_sn as w_order_sn, w.cust_order_id as w_cust_order_id, w.bill_code as w_bill_code, w.bill_code_sub as w_bill_code_sub,
                w.order_status as w_order_status, w.waybill_status as w_waybill_status, w.order_type as w_order_type, w.order_date as w_order_date,
                w.user_id as w_user_id, w.customer_code as w_customer_code, w.customer_name as w_customer_name, w.open_id as w_open_id,
@@ -203,7 +210,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                w.sign_site_code as w_sign_site_code, w.sign_date as w_sign_date, w.timezone_offset as w_timezone_offset, w.payment_status as w_payment_status,
                w.payment_date as w_payment_date, w.payment_remark as w_payment_remark, w.order_remark as w_order_remark, w.data_from as w_data_from,
                w.bl_special_goods as w_bl_special_goods, w.ext_info as w_ext_info, w.lading_bill_code as w_lading_bill_code, w.company_code as w_company_code,
-               w.departure_port as w_departure_port, w.destination_port as w_destination_port, w.box_quantity as w_box_quantity,
+               w.departure_port as w_departure_port, w.destination_port as w_destination_port, w.box_quantity as w_box_quantity, w.settlement_weight as w_settlement_weight,
+               w.send_site_code as w_send_site_code, send_site.site_name as w_send_site_name, w.dispatch_underling_site_code as w_dispatch_underling_site_code, dest_site.site_name as w_dispatch_underling_site_name,
                sb.id as sb_id, sb.settle_bill_no as sb_settle_bill_no, sb.settle_bill_name as sb_settle_bill_name, sb.settle_type as sb_settle_type,
                sb.settle_start_date as sb_settle_start_date, sb.settle_end_date as sb_settle_end_date, sb.bill_month as sb_bill_month,
                sb.rec_money as sb_rec_money, sb.reced_money as sb_reced_money, sb.invoiced_money as sb_invoiced_money, sb.cust_no as sb_cust_no,
@@ -237,6 +245,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join emis_waybill w on wad.bill_code = w.bill_code
         left join emis_settle_bill sb on wad.settle_bill_no = sb.settle_bill_no
         left join emis_settle_sub_bill ssb on wad.bill_code = ssb.bill_code
+        left join emis_site send_site on w.send_site_code = send_site.site_code
+        left join emis_site dest_site on w.dispatch_underling_site_code = dest_site.site_code
     </sql>
 
     <select id="selectEmisWriteoffApplyDetailList" parameterType="EmisWriteoffApplyDetail" resultMap="EmisWriteoffApplyDetailResult">