From 659c74e7aaf751cc10ac47b7e0939f235a17d873 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 06 九月 2025 10:12:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialInventoryMapper.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 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 c715596..ff096c2 100644
--- a/src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialInventoryMapper.java
+++ b/src/main/java/org/jeecg/modules/lsw/mapper/LswMaterialInventoryMapper.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
+import org.jeecg.modules.lsw.vo.LswMaterialInventoryVo;
+import org.jeecg.modules.lsw.vo.MaterialInventoryStatisticsVO;
import java.util.List;
@@ -14,19 +16,13 @@
*/
public interface LswMaterialInventoryMapper extends BaseMapper<LswMaterialInventory> {
- /**
- * 閫氳繃涓昏〃id鍒犻櫎瀛愯〃鏁版嵁
- *
- * @param mainId 涓昏〃id
- * @return boolean
- */
- public boolean deleteByMainId(@Param("mainId") String mainId);
+ List<LswMaterialInventoryVo> selectLineSideMaterialInventoryByMaterialNumber(@Param("materialNumberList") List<String> bomMaterialNumberList,
+ @Param("factoryId") String factoryId);
- /**
- * 閫氳繃涓昏〃id鏌ヨ瀛愯〃鏁版嵁
- *
- * @param mainId 涓昏〃id
- * @return List<LswMaterialInventory>
- */
- public List<LswMaterialInventory> selectByMainId(@Param("mainId") String mainId);
+ /**
+ * 搴撳瓨缁熻
+ * @param materialId
+ * @return
+ */
+ List<MaterialInventoryStatisticsVO> statisticsInventory(@Param("materialId") String materialId);
}
--
Gitblit v1.9.3