From 17a7a0c0df3dbc3e6225dddb55f6332deccdb201 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 03 六月 2026 11:38:30 +0800
Subject: [PATCH] 浪潮部署

---
 src/main/java/com/ruoyi/stock/service/StockInventoryService.java |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/service/StockInventoryService.java b/src/main/java/com/ruoyi/stock/service/StockInventoryService.java
index 37571f6..c615aa3 100644
--- a/src/main/java/com/ruoyi/stock/service/StockInventoryService.java
+++ b/src/main/java/com/ruoyi/stock/service/StockInventoryService.java
@@ -2,13 +2,17 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.stock.dto.StockInventoryDto;
-import com.ruoyi.stock.pojo.StockInventory;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.stock.dto.StockInRecordDto;
+import com.ruoyi.stock.dto.StockInventoryDto;
+import com.ruoyi.stock.dto.StockOutRecordDto;
+import com.ruoyi.stock.pojo.StockInventory;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotBlank;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * <p>
@@ -22,11 +26,33 @@
 
     IPage<StockInventoryDto> pagestockInventory(Page page, StockInventoryDto stockInventoryDto);
 
-    Boolean addstockInventory(StockInventoryDto stockInventoryDto);
+    IPage<StockInventoryDto> pageListCombinedStockInventory(Page page, StockInventoryDto stockInventoryDto);
 
-    Boolean subtractStockInventory(StockInventoryDto stockInventoryDto);
+    StockInRecordDto addstockInventory(StockInventoryDto stockInventoryDto);
+
+    StockOutRecordDto subtractStockInventory(StockInventoryDto stockInventoryDto);
+
+    StockInRecordDto addStockInRecordOnly(StockInventoryDto stockInventoryDto);
+
+    StockOutRecordDto addStockOutRecordOnly(StockInventoryDto stockInventoryDto);
 
     R importStockInventory(MultipartFile file);
 
     void exportStockInventory(HttpServletResponse response, StockInventoryDto stockInventoryDto);
+
+    IPage<StockInRecordDto> stockInventoryPage(StockInventoryDto stockInventoryDto,Page page);
+
+    IPage<StockInventoryDto> stockInAndOutRecord(StockInventoryDto stockInventoryDto,Page page);
+
+    Boolean frozenStock(StockInventoryDto stockInventoryDto);
+
+    Boolean thawStock(StockInventoryDto stockInventoryDto);
+
+    List<StockInventory> getByModelId(Long modelId);
+
+    List<StockInventoryDto> selectStockInvenrory(Long productModelId);
+
+    IPage<StockInventoryDto> pagestockInventoryNoQua(Page page, StockInventoryDto stockInventoryDto);
+
+    boolean updateLocked(@NotBlank(message = "涓嶈兘涓虹┖") Long productModelId, String batchNo, boolean b);
 }

--
Gitblit v1.9.3