diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java index 06d99c376..9c4708ecf 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java @@ -81,4 +81,7 @@ public class EmisSettleSubBill extends BaseEntity /* 网点确认备注 */ private String siteConfirmNote; + // 扩展参数 + private EmisWaybill waybillDetail; + } diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml index 2763113fb..de8eb0201 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -30,6 +30,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bill_month, cust_no, customer_code, customer_name, bl_confirm, confirm_date, confirm_site, confirm_man_code, bl_site_confirm, confirm_note, site_confirm_date, site_confirm_man_code, site_confirm_note, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_sub_bill @@ -47,16 +56,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bill_fee = #{billFee} and currency like concat('%', #{currency}, '%') and settle_type like concat('%', #{settleType}, '%') - and bl_split like concat('%', #{blSplit}, '%') - and bill_month like concat('%', #{billMonth}, '%') - and cust_no like concat('%', #{custNo}, '%') + and bl_split=#{blSplit} + and bill_month=#{billMonth} + and cust_no=#{custNo} and customer_code like concat('%', #{customerCode}, '%') and customer_name like concat('%', #{customerName}, '%') - and bl_confirm like concat('%', #{blConfirm}, '%') + and bl_confirm=#{blConfirm} and confirm_date like concat('%', #{confirmDate}, '%') and confirm_site like concat('%', #{confirmSite}, '%') and confirm_man_code like concat('%', #{confirmManCode}, '%') - and bl_site_confirm like concat('%', #{blSiteConfirm}, '%') + and bl_site_confirm=#{blSiteConfirm} and confirm_note like concat('%', #{confirmNote}, '%') and site_confirm_date like concat('%', #{siteConfirmDate}, '%') and site_confirm_man_code like concat('%', #{siteConfirmManCode}, '%')