From 2c2605a1297882bf88c3c86313ee37797854689b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 08 六月 2026 10:28:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_宁夏_万通新型
---
src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java b/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
index a998d0e..c0c0831 100644
--- a/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
+++ b/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
@@ -3,11 +3,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
+import com.ruoyi.purchase.dto.PurchaseStockInDto;
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;
/**
@@ -21,6 +25,10 @@
List<PurchaseLedger> selectPurchaseLedgerList(PurchaseLedger purchaseLedger);
int addOrEditPurchase(PurchaseLedgerDto purchaseLedgerDto) throws Exception;
+
+ R batchInsertPurchaseSteps(List<Long> ids);
+
+ void addQualityInspect(PurchaseLedger purchaseLedger, SalesLedgerProduct saleProduct);
int deletePurchaseLedgerByIds(Long[] ids);
@@ -36,8 +44,16 @@
IPage<PurchaseLedgerDto> selectPurchaseLedgerListPage(IPage ipage, PurchaseLedgerDto purchaseLedger);
- List<InvoiceRegistrationProduct> getProductBySalesNo(Long id);
+ String getPurchaseNo(Date entryDate);
- String getPurchaseNo();
+ AjaxResult importData(MultipartFile file);
+ PurchaseLedgerDto getPurchaseByCode(PurchaseLedgerDto purchaseLedgerDto);
+
+ /**
+ * 鎵嬪姩鍏ュ簱
+ * @param purchaseStockInDto 鍏ュ簱璇锋眰DTO
+ * @return 鍏ュ簱缁撴灉
+ */
+ int manualStockIn(PurchaseStockInDto purchaseStockInDto);
}
--
Gitblit v1.9.3