Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈

云

12 小时以前 620bb4712a31791231c4381581f0f60088f079fe

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

@@ -3,13 +3,13 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.framework.web.domain.R;
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.util.Date;
import java.util.List;

/**
@@ -40,11 +40,9 @@

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

    List<InvoiceRegistrationProduct> getProductBySalesNo(Long id);
    String getPurchaseNo(Date entryDate);

    String getPurchaseNo();

    R<?> importData(MultipartFile file);
    AjaxResult importData(MultipartFile file);

    PurchaseLedgerDto getPurchaseByCode(PurchaseLedgerDto purchaseLedgerDto);
}