From 44b18be16f09b1d934ee7bc98a34d8bcf85d050e Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 09 九月 2025 20:46:52 +0800
Subject: [PATCH] 报工接口，新增下拉框适配
---
src/main/java/org/jeecg/modules/lsw/mapper/xml/LswMaterialInventoryMapper.xml | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 11 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 6620c48..e04fea9 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,16 +1,47 @@
<?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">
+ <select id="selectLineSideMaterialInventoryByMaterialNumber"
+ resultType="org.jeecg.modules.lsw.vo.LswMaterialInventoryVo">
+ SELECT
+ t1.material_number materialNumber,
+ t1.material_name materialName,
+ SUM(t2.quantity) AS stockQuantity
+ FROM lsw_material t1
+ INNER JOIN lsw_material_inventory t2 ON t1.id = t2.material_id
+ WHERE t1.material_number IN
+ <foreach collection="materialNumberList" item="item" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ AND t2.warehouse_id = #{factoryId}
+ AND t1.del_flag = 0
+ GROUP BY
+ 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
- <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>
+ <select id="queryMaterialInventory" resultType="org.jeecg.modules.lsw.vo.MaterialInventoryVO">
+ select t2.material_number,
+ t2.material_name,
+ t2.material_category,
+ t1.batch_number,
+ t1.quantity
+ from lsw_material_inventory t1
+ left join lsw_material t2 on t1.material_id = t2.id
+ where t1.inventory_status = 'NORMAL'
+ and t1.warehouse_id = #{warehouseId}
+ and t2.material_category in
+ <foreach collection="materialCategoryList" item="item" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </select>
</mapper>
--
Gitblit v1.9.3