From 53577ae0fcba9342b22ad1758303aa61409160d1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 12 九月 2025 19:10:58 +0800
Subject: [PATCH] art: 设备保养标准导入问题修改
---
src/main/java/org/jeecg/modules/lsw/mapper/xml/LswMaterialInventoryMapper.xml | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 e7ca719..c7cedf7 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
@@ -13,7 +13,11 @@
<foreach collection="materialNumberList" item="item" separator="," open="(" close=")">
#{item}
</foreach>
+ <if test="heatFlag != null and heatFlag != ''">
+ AND t2.heat_treatment_flag = #{heatFlag}
+ </if>
AND t2.warehouse_id = #{factoryId}
+ AND t2.inventory_status = 'NORMAL'
AND t1.del_flag = 0
GROUP BY
t1.material_number,
@@ -29,4 +33,19 @@
left join base_line_side_warehouse m2 on m1.warehouse_id = m2.id
</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