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'