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/mapper/xml/LswMaterialInventoryMapper.xml | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/lsw/mapper/xml/LswMaterialInventoryMapper.xml b/src/main/java/org/jeecg/modules/lsw/mapper/xml/LswMaterialInventoryMapper.xml
index ef93fbc..e7ca719 100644
--- a/src/main/java/org/jeecg/modules/lsw/mapper/xml/LswMaterialInventoryMapper.xml
+++ b/src/main/java/org/jeecg/modules/lsw/mapper/xml/LswMaterialInventoryMapper.xml
@@ -1,18 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.lsw.mapper.LswMaterialInventoryMapper">
-
- <delete id="deleteByMainId" parameterType="java.lang.String">
- DELETE
- FROM lsw_material_inventory
- WHERE
- material_id = #{mainId} </delete>
-
- <select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.lsw.entity.LswMaterialInventory">
- SELECT *
- FROM lsw_material_inventory
- WHERE
- material_id = #{mainId} </select>
<select id="selectLineSideMaterialInventoryByMaterialNumber"
resultType="org.jeecg.modules.lsw.vo.LswMaterialInventoryVo">
SELECT
@@ -31,4 +19,14 @@
t1.material_number,
t1.material_name
</select>
+ <select id="statisticsInventory" resultType="org.jeecg.modules.lsw.vo.MaterialInventoryStatisticsVO">
+ select m1.warehouse_id, m2.warehouse_name, m1.materialQuantity
+ from (select warehouse_id, SUM(quantity) as materialQuantity
+ from lsw_material_inventory
+ where material_id = #{materialId}
+ and inventory_status = 'NORMAL'
+ group by warehouse_id) m1
+ left join base_line_side_warehouse m2 on m1.warehouse_id = m2.id
+
+ </select>
</mapper>
--
Gitblit v1.9.3