From a5b2fa48efc136ba2b07623e5eb2467eb5379850 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 17 Jun 2024 23:32:22 +0800 Subject: [PATCH] md --- .../erp/emis/domain/EmisSiteSettleRecord.java | 45 +++-- .../service/impl/EmisWaybillServiceImpl.java | 7 +- .../main/resources/mapper/EmisBaseMapper.xml | 5 + .../mapper/EmisSiteSettleRecordMapper.xml | 186 ++++++++++++------ 4 files changed, 168 insertions(+), 75 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java index b6e24e209..89168afce 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSiteSettleRecord.java @@ -41,7 +41,7 @@ public class EmisSiteSettleRecord extends BaseEntity private String billCode; /* 结算类型：1-应收 2-应付 */ private String recPayType; - /* 结算类型: 充值等 */ + /* 结算类型编码 */ private String settleType; /* 结算类型名称 */ private String settleName; @@ -59,41 +59,50 @@ public class EmisSiteSettleRecord extends BaseEntity private BigDecimal backConfirmBalance; /* 币种 */ private String currency; - /* 改变类型 加,减 */ + /* 操作类型 加,减 */ private String changeType; - /* 改变时间 */ + /* 操作时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date changeDate; /* 财务中心代码 */ private String centerCode; - /* 站点名称 */ + /* 财务中心名称 */ + private String centerName; + /* 财务中心人员编码 */ + private String centerManCode; + /* 财务中心人员名称 */ + private String centerManName; + /* 网点代码 */ private String siteCode; - /* 来源 */ - private String sourceType; + /* 网点名称 */ + private String siteName; + /* 站点人代码 */ + private String siteManCode; + /* 站点人名称 */ + private String siteManName; /* 财务操作时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date financeDate; /* 网点操作时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date operataDate; + /* 中心日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date centerDate; /* 是否确认 */ private String blConfirm; - /* 确认人代码 */ - private String confirmManCode; /* 确认站点代码 */ private String confirmSiteCode; - /* 结算人代码 */ - private String settleManCode; + /* 确认人代码 */ + private String confirmManCode; /* 结算站点代码 */ private String settleSiteCode; + /* 结算人代码 */ + private String settleManCode; /* 是否中心审核 */ private String blCenter; - /* 中心人代码 */ - private String centerManCode; /* 是否站点审核 */ private String blSite; - /* 站点人代码 */ - private String siteManCode; /* 站点日期 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date siteDate; @@ -108,8 +117,10 @@ public class EmisSiteSettleRecord extends BaseEntity private Date settleEbrDate; /* 客户代码 */ private String customerCode; - /* 中心日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date centerDate; + /* 客户名称 */ + private String customerName; + /* 来源 */ + private String dataFrom; + } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 2abfcfa86..61e58dba0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -816,15 +816,18 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb emisSiteSettleRecord.setBillCode(emisWaybillSave.getBillCode()); emisSiteSettleRecord.setRecPayType("2"); // 应付 emisSiteSettleRecord.setSettleType("003");// 运输费用 - emisSiteSettleRecord.setSettleName("预付款-充值"); + emisSiteSettleRecord.setSettleName("运输费"); emisSiteSettleRecord.setCurMoney(emisWaybillSave.getFreight()); emisSiteSettleRecord.setCurConfirmMoney(emisWaybillSave.getFreight()); emisSiteSettleRecord.setChangeType("2"); // 减少 emisSiteSettleRecord.setCurrency("CNY"); + + // 计算日期 emisSiteSettleRecord.setChangeDate(new Date()); emisSiteSettleRecord.setSiteCode(emisWaybillSave.getSendSiteCode()); - emisSiteSettleRecord.setSourceType("pc"); + emisSiteSettleRecord.setSiteName(emisWaybillSave.getSendSiteName()); + emisSiteSettleRecord.setDataFrom("开单"); emisSiteSettleRecord.setOperataDate(new Date()); emisSiteSettleRecord.setFinanceDate(new Date()); emisSiteSettleRecord.setBlCenter("1"); diff --git a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml index 5be762cf0..950321ec8 100644 --- a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml @@ -124,5 +124,10 @@ select a.type_name from emis_problem_type a where a.id = #{id} limit 1 + + + \ No newline at end of file diff --git a/emis-biz/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml index 95f1b693d..771a9dcc3 100644 --- a/emis-biz/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSiteSettleRecordMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -21,30 +21,45 @@ + + + - + + + + - - + + - - - + + + + + + + + + + + + - select id, acc_code, bill_code, rec_pay_type, settle_type, settle_name, pre_balance, pre_confirm_balance, cur_money, cur_confirm_money, back_balance, back_confirm_balance, currency, change_type, change_date, center_code, site_code, source_type, finance_date, operata_date, bl_confirm, confirm_man_code, confirm_site_code, settle_man_code, settle_site_code, bl_center, center_man_code, bl_site, site_man_code, site_date, bl_charge_fee, transfer_code, settle_ebr_code, settle_ebr_date, customer_code, center_date, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_site_settle_record + select id, acc_code, bill_code, rec_pay_type, settle_type, settle_name, pre_balance, pre_confirm_balance, cur_money, cur_confirm_money, back_balance, back_confirm_balance, currency, change_type, change_date, center_code, center_name, center_man_code, center_man_name, site_code, site_name, site_man_code, site_man_name, finance_date, operata_date, center_date, bl_confirm, confirm_site_code, confirm_man_code, settle_site_code, settle_man_code, bl_center, bl_site, site_date, bl_charge_fee, transfer_code, settle_ebr_code, settle_ebr_date, customer_code, customer_name, data_from, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_site_settle_record @@ -118,26 +172,31 @@ and change_type = #{changeType} and change_date = #{changeDate} and center_code = #{centerCode} + and center_name = #{centerName} + and center_man_code = #{centerManCode} + and center_man_name = #{centerManName} and site_code = #{siteCode} - and source_type = #{sourceType} + and site_name = #{siteName} + and site_man_code = #{siteManCode} + and site_man_name = #{siteManName} and finance_date = #{financeDate} and operata_date = #{operataDate} + and center_date = #{centerDate} and bl_confirm = #{blConfirm} - and confirm_man_code = #{confirmManCode} and confirm_site_code = #{confirmSiteCode} - and settle_man_code = #{settleManCode} + and confirm_man_code = #{confirmManCode} and settle_site_code = #{settleSiteCode} + and settle_man_code = #{settleManCode} and bl_center = #{blCenter} - and center_man_code = #{centerManCode} and bl_site = #{blSite} - and site_man_code = #{siteManCode} and site_date = #{siteDate} and bl_charge_fee = #{blChargeFee} and transfer_code = #{transferCode} and settle_ebr_code = #{settleEbrCode} and settle_ebr_date = #{settleEbrDate} and customer_code = #{customerCode} - and center_date = #{centerDate} + and customer_name = #{customerName} + and data_from = #{dataFrom} and remark = #{remark} and del_flag = #{delFlag} and create_by = #{createBy} @@ -150,7 +209,7 @@ @@ -174,26 +233,31 @@ change_type, change_date, center_code, + center_name, + center_man_code, + center_man_name, site_code, - source_type, + site_name, + site_man_code, + site_man_name, finance_date, operata_date, + center_date, bl_confirm, - confirm_man_code, confirm_site_code, - settle_man_code, + confirm_man_code, settle_site_code, + settle_man_code, bl_center, - center_man_code, bl_site, - site_man_code, site_date, bl_charge_fee, transfer_code, settle_ebr_code, settle_ebr_date, customer_code, - center_date, + customer_name, + data_from, remark, del_flag, create_by, @@ -220,26 +284,31 @@ #{changeType}, #{changeDate}, #{centerCode}, + #{centerName}, + #{centerManCode}, + #{centerManName}, #{siteCode}, - #{sourceType}, + #{siteName}, + #{siteManCode}, + #{siteManName}, #{financeDate}, #{operataDate}, + #{centerDate}, #{blConfirm}, - #{confirmManCode}, #{confirmSiteCode}, - #{settleManCode}, + #{confirmManCode}, #{settleSiteCode}, + #{settleManCode}, #{blCenter}, - #{centerManCode}, #{blSite}, - #{siteManCode}, #{siteDate}, #{blChargeFee}, #{transferCode}, #{settleEbrCode}, #{settleEbrDate}, #{customerCode}, - #{centerDate}, + #{customerName}, + #{dataFrom}, #{remark}, #{delFlag}, #{createBy}, @@ -269,26 +338,31 @@ change_type = #{changeType}, change_date = #{changeDate}, center_code = #{centerCode}, + center_name = #{centerName}, + center_man_code = #{centerManCode}, + center_man_name = #{centerManName}, site_code = #{siteCode}, - source_type = #{sourceType}, + site_name = #{siteName}, + site_man_code = #{siteManCode}, + site_man_name = #{siteManName}, finance_date = #{financeDate}, operata_date = #{operataDate}, + center_date = #{centerDate}, bl_confirm = #{blConfirm}, - confirm_man_code = #{confirmManCode}, confirm_site_code = #{confirmSiteCode}, - settle_man_code = #{settleManCode}, + confirm_man_code = #{confirmManCode}, settle_site_code = #{settleSiteCode}, + settle_man_code = #{settleManCode}, bl_center = #{blCenter}, - center_man_code = #{centerManCode}, bl_site = #{blSite}, - site_man_code = #{siteManCode}, site_date = #{siteDate}, bl_charge_fee = #{blChargeFee}, transfer_code = #{transferCode}, settle_ebr_code = #{settleEbrCode}, settle_ebr_date = #{settleEbrDate}, customer_code = #{customerCode}, - center_date = #{centerDate}, + customer_name = #{customerName}, + data_from = #{dataFrom}, remark = #{remark}, del_flag = #{delFlag}, create_by = #{createBy}, @@ -302,11 +376,11 @@ - delete from emis_site_settle_record where id = #{id} + update emis_site_settle_record set del_flag='1' where id = #{id} - delete from emis_site_settle_record where id in + update emis_site_settle_record set del_flag='1' where id in #{id}