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

maven

4 天以前 577fd97c572af76ac2464543e74e7edc2c35ffa0

 src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java

@@ -20,7 +20,7 @@

    List<PurchaseLedger> selectPurchaseLedgerList(PurchaseLedger purchaseLedger);

    int addOrEditPurchase(PurchaseLedgerDto purchaseLedgerDto) throws IOException;
    int addOrEditPurchase(PurchaseLedgerDto purchaseLedgerDto) throws Exception;

    int deletePurchaseLedgerByIds(Long[] ids);

@@ -34,7 +34,10 @@

    PurchaseLedgerDto getPurchaseNoById(Long id);

    IPage<PurchaseLedger> selectPurchaseLedgerListPage(IPage ipage, PurchaseLedger purchaseLedger);
    IPage<PurchaseLedgerDto> selectPurchaseLedgerListPage(IPage ipage, PurchaseLedgerDto purchaseLedger);

    List<InvoiceRegistrationProduct> getProductBySalesNo(Long id);

    String getPurchaseNo();

}