diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWriteoffApplyDetail.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWriteoffApplyDetail.java index c8a4cc63e..d53b14da0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWriteoffApplyDetail.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWriteoffApplyDetail.java @@ -67,4 +67,9 @@ public class EmisWriteoffApplyDetail extends BaseEntity { @TableField(exist = false) private EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill(); + // 快件类型(寄件网点-目的网点,只作查询) + @TableField(exist = false) + @Excel(name = "快件类型") + private String expressType; + } diff --git a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyDetailMapper.xml b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyDetailMapper.xml index 562ac31db..efda638f9 100644 --- a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyDetailMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyDetailMapper.xml @@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -73,6 +74,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -188,6 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select wad.id, wad.apply_id, wad.apply_no, wad.bill_code, wad.apply_money, wad.settle_bill_no, + CONCAT(IFNULL(send_site.site_name, ''), '-', IFNULL(dest_site.site_name, '')) as express_type, w.id as w_id, w.order_sn as w_order_sn, w.cust_order_id as w_cust_order_id, w.bill_code as w_bill_code, w.bill_code_sub as w_bill_code_sub, w.order_status as w_order_status, w.waybill_status as w_waybill_status, w.order_type as w_order_type, w.order_date as w_order_date, w.user_id as w_user_id, w.customer_code as w_customer_code, w.customer_name as w_customer_name, w.open_id as w_open_id, @@ -203,7 +210,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" w.sign_site_code as w_sign_site_code, w.sign_date as w_sign_date, w.timezone_offset as w_timezone_offset, w.payment_status as w_payment_status, w.payment_date as w_payment_date, w.payment_remark as w_payment_remark, w.order_remark as w_order_remark, w.data_from as w_data_from, w.bl_special_goods as w_bl_special_goods, w.ext_info as w_ext_info, w.lading_bill_code as w_lading_bill_code, w.company_code as w_company_code, - w.departure_port as w_departure_port, w.destination_port as w_destination_port, w.box_quantity as w_box_quantity, + w.departure_port as w_departure_port, w.destination_port as w_destination_port, w.box_quantity as w_box_quantity, w.settlement_weight as w_settlement_weight, + w.send_site_code as w_send_site_code, send_site.site_name as w_send_site_name, w.dispatch_underling_site_code as w_dispatch_underling_site_code, dest_site.site_name as w_dispatch_underling_site_name, sb.id as sb_id, sb.settle_bill_no as sb_settle_bill_no, sb.settle_bill_name as sb_settle_bill_name, sb.settle_type as sb_settle_type, sb.settle_start_date as sb_settle_start_date, sb.settle_end_date as sb_settle_end_date, sb.bill_month as sb_bill_month, sb.rec_money as sb_rec_money, sb.reced_money as sb_reced_money, sb.invoiced_money as sb_invoiced_money, sb.cust_no as sb_cust_no, @@ -237,6 +245,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join emis_waybill w on wad.bill_code = w.bill_code left join emis_settle_bill sb on wad.settle_bill_no = sb.settle_bill_no left join emis_settle_sub_bill ssb on wad.bill_code = ssb.bill_code + 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