From d6388d041cc58b9f2be3ddcddfb6042e7af094f7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 11 五月 2026 10:11:00 +0800
Subject: [PATCH] fix(stock): 修复库存盘点计划中的出入库记录类型错误
---
src/main/java/com/ruoyi/stock/service/StockInventoryService.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/service/StockInventoryService.java b/src/main/java/com/ruoyi/stock/service/StockInventoryService.java
index d4b5171..89da581 100644
--- a/src/main/java/com/ruoyi/stock/service/StockInventoryService.java
+++ b/src/main/java/com/ruoyi/stock/service/StockInventoryService.java
@@ -2,14 +2,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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 com.baomidou.mybatisplus.extension.service.IService;
+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;
/**
@@ -24,9 +26,15 @@
IPage<StockInventoryDto> pagestockInventory(Page page, StockInventoryDto stockInventoryDto);
+ IPage<StockInventoryDto> pageListCombinedStockInventory(Page page, StockInventoryDto stockInventoryDto);
+
Boolean addstockInventory(StockInventoryDto stockInventoryDto);
- Boolean subtractStockInventory(StockInventoryDto stockInventoryDto);
+ StockOutRecordDto subtractStockInventory(StockInventoryDto stockInventoryDto);
+
+ StockInRecordDto addStockInRecordOnly(StockInventoryDto stockInventoryDto);
+
+ StockOutRecordDto addStockOutRecordOnly(StockInventoryDto stockInventoryDto);
R importStockInventory(MultipartFile file);
@@ -36,4 +44,15 @@
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