zss
6 天以前 24caea6a373d78bebdc0d400c96778d2776c4b3b
feat(account): 添加是否生成对账单字段到采购和销售相关视图
已修改4个文件
16 ■■■■ 文件已修改
src/main/java/com/ruoyi/account/bean/vo/purchase/AccountPurchasePaymentVo.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/account/bean/vo/sales/AccountSalesCollectionVo.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/account/sales/AccountSalesCollectionMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/account/bean/vo/purchase/AccountPurchasePaymentVo.java
@@ -27,5 +27,8 @@
    @Excel(name = "银行账号")
    private String bankAccountNum;
    @Schema(description = "是否生成了对账单")
    private boolean isAccountStatemen;
}
src/main/java/com/ruoyi/account/bean/vo/sales/AccountSalesCollectionVo.java
@@ -19,5 +19,8 @@
    @Excel(name = "出库单号")
    private String outboundBatches;
    @Schema(description = "是否生成了对账单")
    private boolean isAccountStatemen;
}
src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml
@@ -24,10 +24,12 @@
               sm.supplier_name,
               sm.bank_account_num,
               sm.bank_account_name,
               apa.invoice_application_no AS invoiceApplicationNo
               apa.invoice_application_no AS invoiceApplicationNo,
               if(asd.receipt_number is not null, true, false) as isAccountStatemen
        from account_purchase_payment app
        left join supplier_manage sm on app.supplier_id = sm.id
        left join account_payment_application apa on app.account_payment_application_id=apa.id
        left join account_statement_details asd on app.payment_number = asd.receipt_number
         <where>
            <if test="req.supplierId != null">
                 AND app.supplier_id = #{req.supplierId}
src/main/resources/mapper/account/sales/AccountSalesCollectionMapper.xml
@@ -20,13 +20,17 @@
    </resultMap>
    <select id="listPageAccountSalesCollection"
            resultType="com.ruoyi.account.bean.vo.sales.AccountSalesCollectionVo">
       select * from (select ascc.*,
       select
           A.* ,
           if(asd.receipt_number is not null, true, false) as isAccountStatemen
       from (select ascc.*,
               c.customer_name,
               GROUP_CONCAT(sour.outbound_batches SEPARATOR ',') AS outboundBatches
        from account_sales_collection ascc
        left join customer c on ascc.customer_id = c.id
        left join stock_out_record sour on FIND_IN_SET(sour.id, ascc.stock_out_record_ids) > 0
        GROUP BY ascc.id)A
       left join account_statement_details asd on A.collection_number = asd.receipt_number
         <where>
            <if test="req.customerId != null">
                 AND A.customer_id = #{req.customerId}