yys 供应商往来

maven

16 小时以前 03bb698cf9156b010602891cc8abcf5f12b498c9

yys 供应商往来

 src/main/java/com/ruoyi/purchase/dto/PaymentLedgerDto.java

@@ -8,6 +8,8 @@
    // 供应商名称
    private String supplierName;

    private Long supplierId;

    // 开始日期
    private String startDate;


 src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java

@@ -32,6 +32,12 @@
    // 待付款金额
    private BigDecimal unPaymentAmount;

    // 付款金额
    private BigDecimal paymentAmount;

    // 应付金额
    private BigDecimal payableAmount;

    // 税率
    private String taxRate;


 src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml

@@ -191,7 +191,7 @@
        IFNULL( SUM(T2.current_payment_amount) , 0 ) AS paymentAmount,
        IFNULL((IFNULL(SUM(contract_amount),0)  - IFNULL(SUM(T2.current_payment_amount),0)),0) AS payableAmount
        FROM purchase_ledger T1
        LEFT JOIN payment_registration T2 ON T1.id = T2.sales_ledger_id
        LEFT JOIN payment_registration T2 ON T1.id = T2.purchase_ledger_id
        <where>
            <if test="req.supplierName != null and req.supplierName != '' ">
                T1.supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
@@ -209,7 +209,7 @@
        T1.purchase_contract_number,
        T2.payment_date
        FROM purchase_ledger T1
        LEFT JOIN payment_registration T2 ON T1.id = T2.sales_ledger_id
        LEFT JOIN payment_registration T2 ON T1.id = T2.purchase_ledger_id
        <where>
            T1.supplier_id = #{req.supplierId}
            <if test="req.supplierName != null and req.supplierName != '' ">