From 0bb97dd848f7e0eab95248a1ea44bab6af49b4bd Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 25 Aug 2025 15:35:12 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20tms/app=E8=BF=90=E5=8D=95=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E3=80=81=E8=BF=90=E5=8D=95=E4=BF=AE=E6=94=B9=E3=80=81?=
 =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5=E3=80=81?=
 =?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=BD=95=E5=85=A5=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E3=80=81=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=20=20tms/app=E8=BF=90=E5=8D=95=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E3=80=81=E8=BF=90=E5=8D=95=E4=BF=AE=E6=94=B9=E3=80=81=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5=E3=80=81=E7=BD=91?=
 =?UTF-8?q?=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E3=80=81=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E7=A8=8E=E5=8F=B7=E5=90=8E=E8=87=AA=E5=8A=A8=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0/=E6=96=B0=E5=A2=9E=E5=88=B0=E5=AF=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BA=BA=E4=BF=A1=E6=81=AF=20=20=20tms-=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86-=E5=AF=84=E4=BB=B6=E4=BA=BA?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80-=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E3=80=81=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E7=A8=8E=E5=8F=B7=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E3=80=81?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=B7=BB=E5=8A=A0=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E5=90=8D=E7=A7=B0=E3=80=81=E4=BC=81=E4=B8=9A=E7=A8=8E?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../main/resources/mapper/EmisWaybillMapper.xml    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 6393aa1ff..8f1aff425 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -44,6 +44,8 @@
         <result property="sendAddress"    column="send_address"    />
         <result property="sendPostcode"    column="send_postcode"    />
         <result property="sendPcd"    column="send_pcd"    />
+        <result property="enterpriseName"    column="enterprise_name"    />
+        <result property="enterpriseTaxId"    column="enterprise_tax_id"    />
         <result property="paymentType"    column="payment_type"    />
         <result property="calcFeeType"    column="calc_fee_type"    />
         <result property="custNo"    column="cust_no"    />
@@ -299,7 +301,7 @@
             a.receive_company, a.receive_mobile, a.receive_tel, a.receive_country, a.receive_province, a.receive_city,
             a.receive_county, a.receive_town, a.receive_address, a.receive_postcode, a.receive_pcd, a.send_name, a.send_company,a.start_site_code,
             a.send_mobile, a.send_tel, a.send_country, a.send_province, a.send_city, a.send_county, a.send_town, a.send_address,
-            a.send_postcode, a.send_pcd, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type,
+            a.send_postcode, a.send_pcd, a.enterprise_name, a.enterprise_tax_id, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type,
             a.time_type, a.meter_type, a.carry_type, a.customs_clear, a.customs_eclaration, a.estimate_date, a.pack_type, a.dispatch_method,
             a.pickup_method, a.pick_start_date, a.pick_finish_date, a.pick_fail_reason, a.into_warehouse_code,
             a.into_warehouse_name, a.into_warehouse_address, a.into_warehouse_contact, a.into_warehouse_phone,
@@ -400,7 +402,7 @@
             a.receive_company, a.receive_mobile, a.receive_tel, a.receive_country, a.receive_province, a.receive_city,
             a.receive_county, a.receive_town, a.receive_address, a.receive_postcode, a.receive_pcd, a.send_name, a.send_company,
             a.send_mobile, a.send_tel, a.send_country, a.send_province, a.send_city, a.send_county, a.send_town, a.send_address,
-            a.send_postcode, a.send_pcd, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type,
+            a.send_postcode, a.send_pcd, a.enterprise_name, a.enterprise_tax_id, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type,
             a.time_type, a.meter_type, a.carry_type, a.customs_clear, a.customs_eclaration, a.estimate_date, a.pack_type, a.dispatch_method,
             a.pickup_method, a.pick_start_date, a.pick_finish_date, a.pick_fail_reason, a.into_warehouse_code,
             a.into_warehouse_name, a.into_warehouse_address, a.into_warehouse_contact, a.into_warehouse_phone,
@@ -2811,6 +2813,8 @@
             <if test="sendAddress != null and sendAddress != ''">send_address,</if>
             <if test="sendPostcode != null and sendPostcode != ''">send_postcode,</if>
             <if test="sendPcd != null and sendPcd != ''">send_pcd,</if>
+            <if test="enterpriseName != null and enterpriseName != ''">enterprise_name,</if>
+            <if test="enterpriseTaxId != null and enterpriseTaxId != ''">enterprise_tax_id,</if>
             <if test="paymentType != null and paymentType != ''">payment_type,</if>
             <if test="calcFeeType != null and calcFeeType != ''">calc_fee_type,</if>
             <if test="custNo != null and custNo != ''">cust_no,</if>
@@ -2997,6 +3001,8 @@
             <if test="sendAddress != null and sendAddress != ''">#{sendAddress},</if>
             <if test="sendPostcode != null and sendPostcode != ''">#{sendPostcode},</if>
             <if test="sendPcd != null and sendPcd != ''">#{sendPcd},</if>
+            <if test="enterpriseName != null and enterpriseName != ''">#{enterpriseName},</if>
+            <if test="enterpriseTaxId != null and enterpriseTaxId != ''">#{enterpriseTaxId},</if>
             <if test="paymentType != null and paymentType != ''">#{paymentType},</if>
             <if test="calcFeeType != null and calcFeeType != ''">#{calcFeeType},</if>
             <if test="custNo != null and custNo != ''">#{custNo},</if>
@@ -3185,6 +3191,8 @@
             <if test="sendAddress != null and sendAddress != ''">send_address = #{sendAddress},</if>
             <if test="sendPostcode != null and sendPostcode != ''">send_postcode = #{sendPostcode},</if>
             <if test="sendPcd != null and sendPcd != ''">send_pcd = #{sendPcd},</if>
+            <if test="enterpriseName != null and enterpriseName != ''">enterprise_name = #{enterpriseName},</if>
+            <if test="enterpriseTaxId != null and enterpriseTaxId != ''">enterprise_tax_id = #{enterpriseTaxId},</if>
             <if test="paymentType != null and paymentType != ''">payment_type = #{paymentType},</if>
             <if test="calcFeeType != null and calcFeeType != ''">calc_fee_type = #{calcFeeType},</if>
             <if test="custNo != null and custNo != ''">cust_no = #{custNo},</if>
@@ -3374,6 +3382,8 @@
             <if test="sendAddress != null and sendAddress != ''">send_address = #{sendAddress},</if>
             <if test="sendPostcode != null and sendPostcode != ''">send_postcode = #{sendPostcode},</if>
             <if test="sendPcd != null and sendPcd != ''">send_pcd = #{sendPcd},</if>
+            <if test="enterpriseName != null and enterpriseName != ''">enterprise_name = #{enterpriseName},</if>
+            <if test="enterpriseTaxId != null and enterpriseTaxId != ''">enterprise_tax_id = #{enterpriseTaxId},</if>
             <if test="paymentType != null and paymentType != ''">payment_type = #{paymentType},</if>
             <if test="calcFeeType != null and calcFeeType != ''">calc_fee_type = #{calcFeeType},</if>
             <if test="custNo != null and custNo != ''">cust_no = #{custNo},</if>