aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-09-03 06:11:17 +08:00
parent 6db97c7fff
commit 4dcc5cd061
2 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java
View File

@ -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;

35
emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
View File

@ -14,6 +14,7 @@
<result property="billMonth" column="bill_month" />
<result property="recMoney" column="rec_money" />
<result property="recedMoney" column="reced_money" />
<result property="invoicedMoney" column="invoiced_money" />
<result property="custNo" column="cust_no" />
<result property="custName" column="cust_name" />
<result property="customerCode" column="customer_code" />
@ -40,6 +41,10 @@
<result property="refundMoney" column="refund_money" />
<result property="payee" column="payee" />
<result property="salesmen" column="salesmen" />
<result property="creditPeriod" column="credit_period" />
<result property="creditPeriodType" column="credit_period_type" />
<result property="settleDay" column="settle_day" />
<result property="paymentDueDate" column="payment_due_date" />
<result property="blSendOms" column="bl_send_oms" />
<result property="blConfirmCenter" column="bl_confirm_center" />
<result property="confirmCenterDate" column="confirm_center_date" />
@ -63,7 +68,7 @@
<sql id="selectEmisSettleBillVo">
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
</sql>
<select id="selectEmisSettleBillList" parameterType="EmisSettleBill" resultMap="EmisSettleBillResult">
@ -125,6 +130,12 @@
<if test="createSite != null and createSite != ''"> and create_site = #{createSite}</if>
<if test="updateSite != null and updateSite != ''"> and update_site = #{updateSite}</if>
<if test="creditPeriod != null "> and credit_period = #{creditPeriod}</if>
<if test="creditPeriodType != null and creditPeriodType != ''"> and credit_period_type=#{creditPeriodType}</if>
<if test="settleDay != null "> and settle_day = #{settleDay}</if>
<if test="paymentDueDate != null "> and payment_due_date = #{paymentDueDate}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != ''">
and create_time <![CDATA[ >= ]]> #{params.beginCreateTime}
</if>
@ -167,14 +178,14 @@
</select>
<select id="selectEmisSettleBillById" parameterType="Long" resultMap="EmisSettleBillResult">
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
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 a
where a.id = #{id}
</select>
<select id="selectSettleBillBySettleBillNo" parameterType="String" resultMap="EmisSettleBillResult">
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
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 a
where a.settle_bill_no = #{settleBillNo} and del_flag='0'
</select>
@ -183,7 +194,6 @@
<insert id="insertEmisSettleBill" parameterType="EmisSettleBill" useGeneratedKeys="true" keyProperty="id">
insert into emis_settle_bill
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="settleBillNo != null and settleBillNo != ''">settle_bill_no,</if>
<if test="settleBillName != null and settleBillName != ''">settle_bill_name,</if>
<if test="settleType != null and settleType != ''">settle_type,</if>
@ -192,6 +202,7 @@
<if test="billMonth != null and billMonth != ''">bill_month,</if>
<if test="recMoney != null">rec_money,</if>
<if test="recedMoney != null">reced_money,</if>
<if test="invoicedMoney != null">invoiced_money,</if>
<if test="custNo != null and custNo != ''">cust_no,</if>
<if test="custName != null and custName != ''">cust_name,</if>
<if test="customerCode != null and customerCode != ''">customer_code,</if>
@ -218,6 +229,10 @@
<if test="refundMoney != null">refund_money,</if>
<if test="payee != null and payee != ''">payee,</if>
<if test="salesmen != null and salesmen != ''">salesmen,</if>
<if test="creditPeriod != null">credit_period,</if>
<if test="creditPeriodType != null and creditPeriodType != ''">credit_period_type,</if>
<if test="settleDay != null">settle_day,</if>
<if test="paymentDueDate != null">payment_due_date,</if>
<if test="blSendOms != null and blSendOms != ''">bl_send_oms,</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">bl_confirm_center,</if>
<if test="confirmCenterDate != null">confirm_center_date,</if>
@ -239,7 +254,6 @@
<if test="updateSite != null and updateSite != ''">update_site,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="settleBillNo != null and settleBillNo != ''">#{settleBillNo},</if>
<if test="settleBillName != null and settleBillName != ''">#{settleBillName},</if>
<if test="settleType != null and settleType != ''">#{settleType},</if>
@ -248,6 +262,7 @@
<if test="billMonth != null and billMonth != ''">#{billMonth},</if>
<if test="recMoney != null">#{recMoney},</if>
<if test="recedMoney != null">#{recedMoney},</if>
<if test="invoicedMoney != null">#{invoicedMoney},</if>
<if test="custNo != null and custNo != ''">#{custNo},</if>
<if test="custName != null and custName != ''">#{custName},</if>
<if test="customerCode != null and customerCode != ''">#{customerCode},</if>
@ -274,6 +289,10 @@
<if test="refundMoney != null">#{refundMoney},</if>
<if test="payee != null and payee != ''">#{payee},</if>
<if test="salesmen != null and salesmen != ''">#{salesmen},</if>
<if test="creditPeriod != null">#{creditPeriod},</if>
<if test="creditPeriodType != null and creditPeriodType != ''">#{creditPeriodType},</if>
<if test="settleDay != null">#{settleDay},</if>
<if test="paymentDueDate != null">#{paymentDueDate},</if>
<if test="blSendOms != null and blSendOms != ''">#{blSendOms},</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">#{blConfirmCenter},</if>
<if test="confirmCenterDate != null">#{confirmCenterDate},</if>
@ -299,7 +318,6 @@
<update id="updateEmisSettleBill" parameterType="EmisSettleBill">
update emis_settle_bill
<trim prefix="SET" suffixOverrides=",">
<if test="settleBillNo != null and settleBillNo != ''">settle_bill_no = #{settleBillNo},</if>
<if test="settleBillName != null and settleBillName != ''">settle_bill_name = #{settleBillName},</if>
<if test="settleType != null and settleType != ''">settle_type = #{settleType},</if>
<if test="settleStartDate != null">settle_start_date = #{settleStartDate},</if>
@ -307,6 +325,7 @@
<if test="billMonth != null and billMonth != ''">bill_month = #{billMonth},</if>
<if test="recMoney != null">rec_money = #{recMoney},</if>
<if test="recedMoney != null">reced_money = #{recedMoney},</if>
<if test="invoicedMoney != null">invoiced_money = #{invoicedMoney},</if>
<if test="custNo != null and custNo != ''">cust_no = #{custNo},</if>
<if test="custName != null and custName != ''">cust_name = #{custName},</if>
<if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
@ -333,6 +352,10 @@
<if test="refundMoney != null">refund_money = #{refundMoney},</if>
<if test="payee != null and payee != ''">payee = #{payee},</if>
<if test="salesmen != null and salesmen != ''">salesmen = #{salesmen},</if>
<if test="creditPeriod != null">credit_period = #{creditPeriod},</if>
<if test="creditPeriodType != null and creditPeriodType != ''">credit_period_type = #{creditPeriodType},</if>
<if test="settleDay != null">settle_day = #{settleDay},</if>
<if test="paymentDueDate != null">payment_due_date = #{paymentDueDate},</if>
<if test="blSendOms != null and blSendOms != ''">bl_send_oms = #{blSendOms},</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">bl_confirm_center = #{blConfirmCenter},</if>
<if test="confirmCenterDate != null">confirm_center_date = #{confirmCenterDate},</if>