From 67ac603f410319a0d999e5f493c8ef2d74163fe1 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期一, 15 九月 2025 19:44:47 +0800
Subject: [PATCH] 保养标准:点检标准导入 点检名称修改/ 设备台账导入

---
 src/main/java/org/jeecg/modules/lsw/mapper/xml/LswMaterialInventoryMapper.xml |    4 ++++
 1 files changed, 4 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 e04fea9..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,

--
Gitblit v1.9.3