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 f068d8d98..84e4e5291 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 @@ -79,6 +79,34 @@ public class EmisSettleSubBill extends BaseEntity private String customerCode; /* 客户名称 */ private String customerName; + + /* 已开票金额 */ + private BigDecimal invoicedMoney; + /* 已收款金额 */ + private BigDecimal recedMoney; + /* 安全金额 */ + private BigDecimal satisfyMoney; + /* 允许金额 */ + private BigDecimal allowanceMoney; + /* 抵扣金额 */ + private BigDecimal deductionMoney; + /* 其他金额 */ + private BigDecimal otherMoney; + /* 安全原因 */ + private String satisfyReason; + /* 允许原因 */ + private String allowanceReason; + /* 抵扣原因 */ + private String deductionReason; + /* 其他原因 */ + private String otherReason; + /* 开票状态 0-未开票 1-已开票 2-部分开票 3-不开票 */ + private String openBillStatus; + /* 付款状态 0-未付款 1-已付款 2-部分付款 */ + private String paymentStatus; + /* 核销状态 0-未核销1-已核销 */ + private String chargeStatus; + /* 销售回款人 */ @DataAuditField(fieldComment = "回款联系人") private String payee; diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml index b2cb0f53e..e17cae4d7 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml @@ -21,6 +21,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + @@ -46,36 +59,6 @@ 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, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_sub_bill + select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, invoiced_money, reced_money, satisfy_money, allowance_money, deduction_money, other_money, satisfy_reason, allowance_reason, deduction_reason, other_reason, open_bill_status, payment_status, charge_status, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_sub_bill - select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site + select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, invoiced_money, reced_money, satisfy_money, allowance_money, deduction_money, other_money, satisfy_reason, allowance_reason, deduction_reason, other_reason, open_bill_status, payment_status, charge_status, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_sub_bill a where a.id = #{id} @@ -607,14 +596,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -623,7 +612,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into emis_settle_sub_bill - id, bill_no, parent_bill_no, settle_bill_no, @@ -639,6 +627,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" cust_name, customer_code, customer_name, + invoiced_money, + reced_money, + satisfy_money, + allowance_money, + deduction_money, + other_money, + satisfy_reason, + allowance_reason, + deduction_reason, + other_reason, + open_bill_status, + payment_status, + charge_status, payee, salesmen, bl_special_quote, @@ -662,7 +663,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_site, - #{id}, #{billNo}, #{parentBillNo}, #{settleBillNo}, @@ -678,6 +678,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{custName}, #{customerCode}, #{customerName}, + #{invoicedMoney}, + #{recedMoney}, + #{satisfyMoney}, + #{allowanceMoney}, + #{deductionMoney}, + #{otherMoney}, + #{satisfyReason}, + #{allowanceReason}, + #{deductionReason}, + #{otherReason}, + #{openBillStatus}, + #{paymentStatus}, + #{chargeStatus}, #{payee}, #{salesmen}, #{blSpecialQuote}, @@ -705,7 +718,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update emis_settle_sub_bill - bill_no = #{billNo}, parent_bill_no = #{parentBillNo}, settle_bill_no = #{settleBillNo}, bill_code = #{billCode}, @@ -720,6 +732,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" cust_name = #{custName}, customer_code = #{customerCode}, customer_name = #{customerName}, + invoiced_money = #{invoicedMoney}, + reced_money = #{recedMoney}, + satisfy_money = #{satisfyMoney}, + allowance_money = #{allowanceMoney}, + deduction_money = #{deductionMoney}, + other_money = #{otherMoney}, + satisfy_reason = #{satisfyReason}, + allowance_reason = #{allowanceReason}, + deduction_reason = #{deductionReason}, + other_reason = #{otherReason}, + open_bill_status = #{openBillStatus}, + payment_status = #{paymentStatus}, + charge_status = #{chargeStatus}, payee = #{payee}, salesmen = #{salesmen}, bl_special_quote = #{blSpecialQuote}, @@ -742,7 +767,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_site = #{createSite}, update_site = #{updateSite}, - where id = #{id} and del_flag='0' + where id = #{id}