From 94ec4e9e9214cb5dc28aef4a7f38be462cfda728 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 16:50:09 +0800
Subject: [PATCH] fix(product): 产品型号复制功能的进行勾选复制

---
 src/main/java/com/ruoyi/stock/service/StockInventoryService.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/service/StockInventoryService.java b/src/main/java/com/ruoyi/stock/service/StockInventoryService.java
index f7b1b17..5fb5f8a 100644
--- a/src/main/java/com/ruoyi/stock/service/StockInventoryService.java
+++ b/src/main/java/com/ruoyi/stock/service/StockInventoryService.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.framework.security.LoginUser;
 import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.stock.dto.FinishedProductTreeDto;
 import com.ruoyi.stock.dto.StockInRecordDto;
 import com.ruoyi.stock.dto.StockInventoryDto;
 import com.ruoyi.stock.pojo.StockInRecord;
@@ -12,6 +13,7 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * <p>
@@ -25,13 +27,17 @@
 
     IPage<StockInventoryDto> pagestockInventory(Page page, StockInventoryDto stockInventoryDto);
 
+    List<FinishedProductTreeDto> finishedProductList(StockInventoryDto stockInventoryDto);
+
+    IPage<StockInventoryDto> pageListCombinedStockInventory(Page page, StockInventoryDto stockInventoryDto);
+
     Boolean addstockInventory(StockInventoryDto stockInventoryDto);
 
     Boolean subtractStockInventory(StockInventoryDto stockInventoryDto);
 
-    R importStockInventory(MultipartFile file);
+    R importStockInventory(MultipartFile file, Integer productType);
 
-    void exportStockInventory(HttpServletResponse response, StockInventoryDto stockInventoryDto);
+    void exportStockInventory(HttpServletResponse response, StockInventoryDto stockInventoryDto, Integer productType);
 
     IPage<StockInRecordDto> stockInventoryPage(StockInventoryDto stockInventoryDto,Page page);
 

--
Gitblit v1.9.3