From 76c5ad320495758d4e76d852d96914f1b405ece7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 15 九月 2025 11:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialInventoryMapper.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialInventoryMapper.java b/src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialInventoryMapper.java
index ff096c2..2afeb8d 100644
--- a/src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialInventoryMapper.java
+++ b/src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialInventoryMapper.java
@@ -5,6 +5,7 @@
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.vo.LswMaterialInventoryVo;
import org.jeecg.modules.lsw.vo.MaterialInventoryStatisticsVO;
+import org.jeecg.modules.lsw.vo.MaterialInventoryVO;
import java.util.List;
@@ -17,7 +18,8 @@
public interface LswMaterialInventoryMapper extends BaseMapper<LswMaterialInventory> {
List<LswMaterialInventoryVo> selectLineSideMaterialInventoryByMaterialNumber(@Param("materialNumberList") List<String> bomMaterialNumberList,
- @Param("factoryId") String factoryId);
+ @Param("factoryId") String factoryId,
+ @Param("heatFlag") String heatFlag);
/**
* 搴撳瓨缁熻
@@ -25,4 +27,12 @@
* @return
*/
List<MaterialInventoryStatisticsVO> statisticsInventory(@Param("materialId") String materialId);
+
+ /**
+ * 鏌ヨ鐗╂枡搴撳瓨
+ * @param warehouseId
+ * @param materialCategoryList
+ * @return
+ */
+ List<MaterialInventoryVO> queryMaterialInventory(@Param("warehouseId") String warehouseId, @Param("materialCategoryList") List<String> materialCategoryList);
}
--
Gitblit v1.9.3