From ca23602089d4a5410fa5fe125b317c260536c192 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 18 七月 2026 11:42:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
---
src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java b/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
index c0eb379..b9afc5c 100644
--- a/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
+++ b/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
@@ -3,12 +3,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+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;
+import java.util.Map;
/**
* 閲囪喘鍙拌处Service鎺ュ彛
@@ -20,7 +22,9 @@
List<PurchaseLedger> selectPurchaseLedgerList(PurchaseLedger purchaseLedger);
- int addOrEditPurchase(PurchaseLedgerDto purchaseLedgerDto) throws IOException;
+ int addOrEditPurchase(PurchaseLedgerDto purchaseLedgerDto) throws Exception;
+
+ void addQualityInspect(PurchaseLedger purchaseLedger, SalesLedgerProduct saleProduct);
int deletePurchaseLedgerByIds(Long[] ids);
@@ -36,9 +40,11 @@
IPage<PurchaseLedgerDto> selectPurchaseLedgerListPage(IPage ipage, PurchaseLedgerDto purchaseLedger);
- List<InvoiceRegistrationProduct> getProductBySalesNo(Long id);
-
String getPurchaseNo();
- int addPurchaseTemplate(PurchaseLedgerDto purchaseLedgerDto) throws IOException;
+ AjaxResult importData(MultipartFile file);
+
+ PurchaseLedgerDto getPurchaseByCode(PurchaseLedgerDto purchaseLedgerDto);
+
+ Map<String, Object> getPrintData(Long id);
}
--
Gitblit v1.9.3