From a90693f35b4cc33c25373e7f39ad56effdbe418a Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 18 Sep 2025 10:43:01 +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
---
 .../resources/mapper/EmisWriteoffApplyMapper.xml    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml
index dc42eb1c9..a8866cd35 100644
--- a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml
@@ -326,6 +326,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"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -369,6 +370,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="salesmen" column="w_salesmen"/>
             <result property="payee" column="w_payee"/>
             <result property="paymentType" column="w_payment_type"/>
+            <result property="sendDate" column="w_send_date"/>
+            <result property="productType" column="w_product_type"/>
+            <result property="productTypeName" column="w_product_type_name"/>
+            <result property="parcelQty" column="w_parcel_qty"/>
+            <result property="settlementWeight" column="w_settlement_weight"/>
             <result property="createBy" column="w_create_by"/>
             <result property="createTime" column="w_create_time"/>
             <result property="updateBy" column="w_update_by"/>
@@ -478,6 +484,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                w.send_address as w_send_address, w.send_postcode as w_send_postcode, w.freight as w_freight,
                w.salesmen as w_salesmen, w.payee as w_payee, w.payment_type as w_payment_type, w.create_by as w_create_by,
                w.create_time as w_create_time, w.update_by as w_update_by, w.update_time as w_update_time, w.remark as w_remark,
+               -- 新增运单字段：寄件日期、产品类型、件数、结算重量
+               w.send_date as w_send_date, w.product_type as w_product_type, w.parcel_qty as w_parcel_qty, w.settlement_weight as w_settlement_weight,
+               -- 快件类型（寄件网点-目的网点）
+               CONCAT(COALESCE(send_site.size_code2, ''), '-', COALESCE(dest_site.size_code2, '')) as express_type,tp.prod_name as w_product_type_name,
 
                -- 结算账单信息
                sb.id as sb_id, sb.settle_bill_no as sb_settle_bill_no, sb.settle_bill_name as sb_settle_bill_name,
@@ -509,6 +519,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from emis_waybill w
         left join emis_settle_sub_bill ssb on w.bill_code = ssb.bill_code
         left join emis_settle_bill sb on ssb.settle_bill_no = sb.settle_bill_no
+        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
+        left join emis_trans_product tp on w.product_type = tp.prod_code
         where w.bill_code in
         <foreach collection="list" item="billCode" open="(" separator="," close=")">
             #{billCode}