diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java
index 14b0d46ad..7a7bb2b4a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java
@@ -33,7 +33,6 @@ import lombok.Data;
@Data
public class EmisSettleBill extends BaseEntity
{
-
private static final long serialVersionUID = 1L;
/* id */
@@ -45,10 +44,10 @@ public class EmisSettleBill extends BaseEntity
/* 结算账单类型 1-现金 2-月结 */
private String settleType;
/* 结算开始时间 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date settleStartDate;
/* 结算结束时间 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date settleEndDate;
/* 账单月份 202402 */
private String billMonth;
@@ -56,6 +55,8 @@ public class EmisSettleBill extends BaseEntity
private BigDecimal recMoney;
/* 已收款金额 */
private BigDecimal recedMoney;
+ /* 已开票金额 */
+ private BigDecimal invoicedMoney;
/* 月结编号 */
private String custNo;
/* 月结账户名称 */
@@ -108,12 +109,21 @@ public class EmisSettleBill extends BaseEntity
private String payee;
/* 销售联系人 */
private String salesmen;
+ /* 付款期 默认10天 */
+ private BigDecimal creditPeriod;
+ /* 付款期类型 1-天 2-月 */
+ private String creditPeriodType;
+ /* 账单日 1-31 */
+ private Integer settleDay;
+ /* 最后回款日 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ private Date paymentDueDate;
/* 推送oms */
private String blSendOms;
/* 财务确认状态 0-待确认 1-已确认 2-驳回 */
private String blConfirmCenter;
/* 财务确认日期 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date confirmCenterDate;
/* 财务确认备注 */
private String confirmCenterNote;
@@ -121,10 +131,10 @@ public class EmisSettleBill extends BaseEntity
private String confirmCenterManCode;
/* 财务确认站点 */
private String confirmCenterCode;
- /* 站点确认状态 0-待确认 1-已确认 2-驳回 3-账单异常 */
+ /* 站点确认状态 0-待确认 1-已确认 2-驳回 */
private String blConfirmSite;
/* 站点确认日期 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date confirmSiteDate;
/* 站点确认人 */
private String confirmSiteManCode;
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index 2e722f73f..9656fedf9 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -14,6 +14,7 @@
+
@@ -40,6 +41,10 @@
+
+
+
+
@@ -63,7 +68,7 @@
- select id, settle_bill_no, settle_bill_name, settle_type, settle_start_date, settle_end_date, bill_month, rec_money, reced_money, cust_no, cust_name, customer_code, customer_name, site_code, site_name, satisfy_money, allowance_money, deduction_money, other_money, satisfy_reason, allowance_reason, deduction_reason, other_reason, open_bill_status, payment_status, charge_status, send_piece_sum, piece_number, fee_weight, uncollected_amount, send_money_sum, refund_amount, refund_money, payee, salesmen, bl_send_oms, 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, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_bill a
+ select id, settle_bill_no, settle_bill_name, settle_type, settle_start_date, settle_end_date, bill_month, rec_money, reced_money, invoiced_money, cust_no, cust_name, customer_code, customer_name, site_code, site_name, satisfy_money, allowance_money, deduction_money, other_money, satisfy_reason, allowance_reason, deduction_reason, other_reason, open_bill_status, payment_status, charge_status, send_piece_sum, piece_number, fee_weight, uncollected_amount, send_money_sum, refund_amount, refund_money, payee, salesmen, credit_period, credit_period_type, settle_day, payment_due_date, bl_send_oms, 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, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_bill
@@ -183,7 +194,6 @@
insert into emis_settle_bill
- id,
settle_bill_no,
settle_bill_name,
settle_type,
@@ -192,6 +202,7 @@
bill_month,
rec_money,
reced_money,
+ invoiced_money,
cust_no,
cust_name,
customer_code,
@@ -218,6 +229,10 @@
refund_money,
payee,
salesmen,
+ credit_period,
+ credit_period_type,
+ settle_day,
+ payment_due_date,
bl_send_oms,
bl_confirm_center,
confirm_center_date,
@@ -239,7 +254,6 @@
update_site,
- #{id},
#{settleBillNo},
#{settleBillName},
#{settleType},
@@ -248,6 +262,7 @@
#{billMonth},
#{recMoney},
#{recedMoney},
+ #{invoicedMoney},
#{custNo},
#{custName},
#{customerCode},
@@ -274,6 +289,10 @@
#{refundMoney},
#{payee},
#{salesmen},
+ #{creditPeriod},
+ #{creditPeriodType},
+ #{settleDay},
+ #{paymentDueDate},
#{blSendOms},
#{blConfirmCenter},
#{confirmCenterDate},
@@ -299,7 +318,6 @@
update emis_settle_bill
- settle_bill_no = #{settleBillNo},
settle_bill_name = #{settleBillName},
settle_type = #{settleType},
settle_start_date = #{settleStartDate},
@@ -307,6 +325,7 @@
bill_month = #{billMonth},
rec_money = #{recMoney},
reced_money = #{recedMoney},
+ invoiced_money = #{invoicedMoney},
cust_no = #{custNo},
cust_name = #{custName},
customer_code = #{customerCode},
@@ -333,6 +352,10 @@
refund_money = #{refundMoney},
payee = #{payee},
salesmen = #{salesmen},
+ credit_period = #{creditPeriod},
+ credit_period_type = #{creditPeriodType},
+ settle_day = #{settleDay},
+ payment_due_date = #{paymentDueDate},
bl_send_oms = #{blSendOms},
bl_confirm_center = #{blConfirmCenter},
confirm_center_date = #{confirmCenterDate},