From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java b/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
index 2976eb6..a1f135e 100644
--- a/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
+++ b/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
@@ -6,10 +6,10 @@
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.Date;
import java.util.List;
/**
@@ -23,6 +23,8 @@
List<PurchaseLedger> selectPurchaseLedgerList(PurchaseLedger purchaseLedger);
int addOrEditPurchase(PurchaseLedgerDto purchaseLedgerDto) throws Exception;
+
+ void addQualityInspect(PurchaseLedger purchaseLedger, SalesLedgerProduct saleProduct);
int deletePurchaseLedgerByIds(Long[] ids);
@@ -38,9 +40,9 @@
IPage<PurchaseLedgerDto> selectPurchaseLedgerListPage(IPage ipage, PurchaseLedgerDto purchaseLedger);
- List<InvoiceRegistrationProduct> getProductBySalesNo(Long id);
-
- String getPurchaseNo();
+ String getPurchaseNo(Date entryDate);
AjaxResult importData(MultipartFile file);
+
+ PurchaseLedgerDto getPurchaseByCode(PurchaseLedgerDto purchaseLedgerDto);
}
--
Gitblit v1.9.3