From 7b7a2cc050d55af2eed2cccb3761a91314c9b9f6 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 30 四月 2026 15:07:32 +0800
Subject: [PATCH] feat:1.产品维护,增加产品编号字段 2.入库批号添加 3.是否质检仅添加入库记录（待审核） 4.是否生产报工更改 5.入库做审核
---
src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java b/src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java
index 0d345df..21fa421 100644
--- a/src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java
+++ b/src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java
@@ -29,6 +29,7 @@
IPage<StockInventoryDto> pagestockInventory(Page page, @Param("ew") StockInventoryDto stockInventoryDto);
+ IPage<StockInventoryDto> pageListCombinedStockInventory(Page page, @Param("ew") StockInventoryDto stockInventoryDto);
int updateAddStockInventory(@Param("ew") StockInventoryDto stockInventoryDto);
@@ -49,4 +50,8 @@
List<Map<String, Object>> selectDailyStockOutCounts(@Param("rootCategoryId") Long rootCategoryId, @Param("startDate") String startDate, @Param("endDate") String endDate);
BigDecimal selectTotalByDate(@Param("now") LocalDate now);
+
+ BigDecimal selectPendingOutQuantity(@Param("productModelId") Long productModelId, @Param("batchNo") String batchNo, @Param("type") String type);
+
+ List<StockInventory> listSelectableBatchNoByProductModelIds(@Param("productModelIds") List<Long> productModelIds);
}
--
Gitblit v1.9.3