From 519cfbaf9666b1ac4191f620c75f935dc20d0a18 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 9 Apr 2025 17:33:03 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
=?UTF-8?q?=E9=9C=80=E8=A6=81=E5=B1=95=E7=8E=B0=E5=9C=A8=E5=AF=84=E4=BB=B6?=
=?UTF-8?q?=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E3=80=81=E6=B4=BE=E4=BB=B6?=
=?UTF-8?q?=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E3=80=81=E8=BF=90=E5=8D=95?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=81=E5=BF=AB=E4=BB=B6=E8=B7=9F=E8=B8=AA?=
=?UTF-8?q?=EF=BC=88=E8=BF=90=E5=8D=95=E4=BF=A1=E6=81=AF=EF=BC=89=E3=80=81?=
=?UTF-8?q?=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=E3=80=81?=
=?UTF-8?q?=E8=B4=A2=E5=8A=A1=E4=B8=AD=E5=BF=83=E8=B4=B9=E7=94=A8=E5=AE=A1?=
=?UTF-8?q?=E6=A0=B8=E3=80=81=E4=B8=9A=E5=8A=A1=E5=87=BA=E8=B4=A6=E7=A1=AE?=
=?UTF-8?q?=E8=AE=A4=E3=80=81=E4=B8=9A=E5=8A=A1=E8=B4=A6=E5=8D=95=E7=A1=AE?=
=?UTF-8?q?=E8=AE=A4=E3=80=81=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E3=80=82=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/resources/mapper/EmisSettleSubBillMapper.xml | 1 +
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml | 9 +++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index 542bf5a27..0d6260a94 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -117,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.send_name,a.parcel_qty,a.bill_weight,a.total_volume,a.volume_weight,a.settlement_weight,
a.freight,real_fee,a.fee_remark,a.payment_type,a.remark,
a.payee,a.salesmen,a.bl_is_question,a.problem_cause,
+ a.lading_bill_code, a.company_code, a.departure_port, a.destination_port, a.box_quantity,
j.prod_name as product_type_name,
k.line_name as trans_line_type_name,
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index aa585f057..9f0cba0ea 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -171,6 +171,11 @@
+
+
+
+
+
@@ -300,7 +305,7 @@
a.payment_status, a.payment_date, a.payment_remark, a.order_remark, a.data_from, a.bl_special_goods,a.ext_info,
a.remark, a.del_flag, a.create_by,
a.create_time, a.update_by, a.update_time, a.create_site, a.update_site,
- a.cod_fee_desc,
+ a.cod_fee_desc, a.lading_bill_code, a.company_code, a.departure_port, a.destination_port, a.box_quantity,
b.name as receive_country_name,c.name as send_country_name,
d.region_name as receive_province_name,e.region_name as receive_city_name,f.region_name as receive_county_name,
@@ -396,7 +401,7 @@
a.payment_status, a.payment_date, a.payment_remark, a.order_remark, a.data_from, a.bl_special_goods,a.ext_info,
a.remark, a.del_flag, a.create_by,
a.create_time, a.update_by, a.update_time, a.create_site, a.update_site,
- a.cod_fee_desc,
+ a.cod_fee_desc, a.lading_bill_code, a.company_code, a.departure_port, a.destination_port, a.box_quantity,
b.name as receive_country_name,c.name as send_country_name,
d.region_name as receive_province_name,e.region_name as receive_city_name,f.region_name as receive_county_name,