Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_New...

liyong

6 天以前 9d66bfbfcda297f628e6a857e343f98422f4534a

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

@@ -6,10 +6,9 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.util.List;

/**
@@ -24,6 +23,8 @@

    int addOrEditPurchase(PurchaseLedgerDto purchaseLedgerDto) throws Exception;

    void addQualityInspect(PurchaseLedger purchaseLedger, SalesLedgerProduct saleProduct);

    int deletePurchaseLedgerByIds(Long[] ids);

    PurchaseLedgerDto getPurchaseById(PurchaseLedgerDto purchaseLedgerDto);
@@ -37,8 +38,6 @@
    PurchaseLedgerDto getPurchaseNoById(Long id);

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

    List<InvoiceRegistrationProduct> getProductBySalesNo(Long id);

    String getPurchaseNo();