From a3e1a05689db18564f6cf03dc48c50fe24a18456 Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 9 Aug 2024 18:15:28 +0800 Subject: [PATCH] md --- .../web/emis/EmisSettleBillController.java | 1 + .../erp/emis/domain/EmisSettleBill.java | 10 ++++ .../resources/mapper/EmisSettleBillMapper.xml | 9 +++ .../EmisSettleInvoiceChRecordMapper.xml | 55 +++++++++++++++++++ 4 files changed, 75 insertions(+) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java index e535cc205..f592010da 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java @@ -252,6 +252,7 @@ public class EmisSettleBillController extends BaseController emisSettleBill.setConfirmSiteManCode(getLoginUser().getUser().getEmpCode()); emisSettleBill.setConfirmSiteCode(getLoginUser().getUser().getOwnerSiteCode()); emisSettleBill.setBlConfirmSite("1"); + emisSettleBill.setConfirmSiteDate(new Date()); emisSettleBill.setId(id); emisSettleBillService.updateEmisSettleBill(emisSettleBill); 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 e6a2d3019..c834e157f 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 @@ -133,6 +133,16 @@ public class EmisSettleBill extends BaseEntity /* 确认网点代码 */ private String confirmSiteCode; + +// 扩展信息 + + private String confirmCenterManName; + private String confirmCenterName; + + private String confirmSiteManName; + private String confirmSiteName; + + List subBillList; diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml index 2e5cdf1d0..2de79b5fc 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml @@ -51,8 +51,17 @@ + + + + + + + + + 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 diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml index 36669e0bf..ab0a6ebee 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml @@ -96,6 +96,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and create_site like concat('%', #{createSite}, '%') and update_site like concat('%', #{updateSite}, '%') + + AND apply_seq_no IN ( + SELECT x1.apply_seq_no FROM + emis_settle_invoice_record x1, + emis_settle_bill x2 + WHERE + x1.del_flag = '0' + AND x2.del_flag = '0' + AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no ) + AND exists ( + select 1 from emis_settle_sub_bill b + where x2.settle_bill_no=b.settle_bill_no + and ( FIND_IN_SET(b.`bill_code`,#{params.billCode}) or b.bill_code like concat('%', #{params.billCode}, '%') ) + ) + ) + + + + AND apply_seq_no IN ( + SELECT x1.apply_seq_no FROM emis_settle_invoice_record x1,emis_settle_bill x2 + WHERE x1.del_flag = '0' AND x2.del_flag = '0' + AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no ) + AND x2.settle_bill_no=#{params.settleBillNo} + ) + + + + AND apply_seq_no IN ( + SELECT x1.apply_seq_no FROM + emis_settle_invoice_record x1, + emis_settle_bill x2 + WHERE + x1.del_flag = '0' + AND x2.del_flag = '0' + AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no ) + AND exists ( + select 1 from emis_settle_sub_bill b + where x2.settle_bill_no=b.settle_bill_no + and ( FIND_IN_SET(b.`bill_code`,#{params.billCode}) or b.bill_code like concat('%', #{params.billCode}, '%') ) + ) + ) + + + + + + and a.create_time = ]]> #{params.beginCreateTime} + + + and a.create_time #{params.endCreateTime} + + and apply_seq_no in( select apply_seq_no from emis_settle_invoice_record @@ -323,6 +375,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, create_site = #{createSite}, update_site = #{updateSite}, + + + where id = #{id}