From a77decc3df26449414639082293e2ee6722e643c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 15:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/stock/service/StockInventoryService.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/service/StockInventoryService.java b/src/main/java/com/ruoyi/stock/service/StockInventoryService.java
index 65dcca3..d47cc4b 100644
--- a/src/main/java/com/ruoyi/stock/service/StockInventoryService.java
+++ b/src/main/java/com/ruoyi/stock/service/StockInventoryService.java
@@ -7,9 +7,10 @@
import com.ruoyi.stock.dto.StockInRecordDto;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.pojo.StockInventory;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
* <p>
@@ -23,9 +24,15 @@
IPage<StockInventoryDto> pagestockInventory(Page page, StockInventoryDto stockInventoryDto);
+ IPage<StockInventoryDto> pageListCombinedStockInventory(Page page, StockInventoryDto stockInventoryDto);
+
Boolean addstockInventory(StockInventoryDto stockInventoryDto);
Boolean subtractStockInventory(StockInventoryDto stockInventoryDto);
+
+ Boolean addStockInRecordOnly(StockInventoryDto stockInventoryDto);
+
+ Boolean addStockOutRecordOnly(StockInventoryDto stockInventoryDto);
R importStockInventory(MultipartFile file);
@@ -38,4 +45,6 @@
Boolean frozenStock(StockInventoryDto stockInventoryDto);
Boolean thawStock(StockInventoryDto stockInventoryDto);
+
+ List<StockInventory> getByModelId(Long modelId);
}
--
Gitblit v1.9.3