Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

5 天以前 780d2ae86cc0c4ebd42922f649bf557f1f17cd62

 src/main/java/com/ruoyi/sales/mapper/InvoiceLedgerMapper.java

@@ -41,7 +41,7 @@
     * @param invoiceLedgerDto
     * @return
     */
    IPage<InvoiceLedgerDto> invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto);
    IPage<InvoiceLedgerDto> invoiceLedgerSalesAccount(Page page,@Param("invoiceLedgerDto") InvoiceLedgerDto invoiceLedgerDto);

    /**
     * 产品开票台账详情
@@ -50,4 +50,11 @@
     */
    InvoiceRegistrationProductDto invoiceLedgerProductInfo(Integer id);

    /**
     * 根据销售合同计算已开票金额
     * @param salesLedgerIds
     * @return
     */
    List<InvoiceLedgerDto> invoicedTotal(List<Long> salesLedgerIds);

}