From 0fd4e2f54faa48b94a8daa8f34365d4501accb39 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Sat, 11 Oct 2025 16:07:51 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=20=20TMS=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=20-=20=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20-=20=E4=B8=9A=E5=8A=A1=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=20-=20=E5=BF=AB=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=8F=96=E5=80=BC?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit committer: heyu --- .../src/main/resources/mapper/EmisWriteoffApplyMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml index 8e85bbcd0..230241246 100644 --- a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml @@ -494,7 +494,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" -- 新增运单字段：寄件日期、产品类型、件数、结算重量 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.site_name, ''), '-', COALESCE(dest_site.site_name, '')) as express_type,tp.prod_name as w_product_type_name, + CONCAT(COALESCE(send_site.site_name, ''), '--', COALESCE(dest_site.site_name, '')) 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, @@ -522,9 +522,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ssb.customer_name as ssb_customer_name, ssb.invoiced_money as ssb_invoiced_money, ssb.reced_money as ssb_reced_money, ssb.satisfy_money as ssb_satisfy_money, ssb.allowance_money as ssb_allowance_money, ssb.deduction_money as ssb_deduction_money, ssb.other_money as ssb_other_money, ssb.satisfy_reason as ssb_satisfy_reason, ssb.allowance_reason as ssb_allowance_reason, - ssb.deduction_reason as ssb_deduction_reason, ssb.other_reason as ssb_other_reason, + ssb.deduction_reason as ssb_deduction_reason, ssb.other_reason as ssb_other_reason, ssb.bl_confirm_center as ssb_bl_confirm_center, ssb.bl_confirm_site as ssb_bl_confirm_site, - ssb.create_by as ssb_create_by, ssb.create_time as ssb_create_time, ssb.update_by as ssb_update_by, + ssb.create_by as ssb_create_by, ssb.create_time as ssb_create_time, ssb.update_by as ssb_update_by, ssb.update_time as ssb_update_time from emis_waybill w left join emis_settle_sub_bill ssb on w.bill_code = ssb.bill_code and ssb.del_flag = '0'