From f95d05316d49bcdd31d022a11d0fc4fbafb040da Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 08 九月 2025 11:40:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/jeecg/modules/lsw/service/ILswMaterialInventoryService.java |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/lsw/service/ILswMaterialInventoryService.java b/src/main/java/org/jeecg/modules/lsw/service/ILswMaterialInventoryService.java
index 0dd1bf4..26c436b 100644
--- a/src/main/java/org/jeecg/modules/lsw/service/ILswMaterialInventoryService.java
+++ b/src/main/java/org/jeecg/modules/lsw/service/ILswMaterialInventoryService.java
@@ -10,17 +10,26 @@
 /**
  * @Description: 鐗╂枡搴撳瓨淇℃伅
  * @Author: jeecg-boot
- * @Date:   2025-06-30
+ * @Date: 2025-06-30
  * @Version: V1.0
  */
 public interface ILswMaterialInventoryService extends IService<LswMaterialInventory> {
-	/** 閫氳繃鐗╂枡缂栫爜鍜岀嚎杈瑰簱id鏌ヨ鐗╂枡搴撳瓨 */
+    /** 閫氳繃鐗╂枡缂栫爜鍜岀嚎杈瑰簱id鏌ヨ鐗╂枡搴撳瓨 */
     List<LswMaterialInventoryVo> selectLineSideMaterialInventoryByMaterialNumber(List<String> bomMaterialNumberList, String factoryId);
 
-	/**
-	 * 搴撳瓨缁熻
-	 * @param materialId 鐗╂枡ID
-	 * @return
-	 */
+    /**
+     * 搴撳瓨缁熻
+     * @param materialId 鐗╂枡ID
+     * @return
+     */
     List<MaterialInventoryStatisticsVO> statisticsInventory(String materialId);
+
+    /**
+     * 鏌ヨ鏈嚭搴撲俊鎭�
+     * @param materialNumber
+     * @param batchNumber
+     * @param warehouseId
+     * @return
+     */
+    LswMaterialInventory queryByMaterialNumberAndBatchNumber(String materialNumber, String batchNumber, String warehouseId);
 }

--
Gitblit v1.9.3