From 768a0481d17df43543fe15416eb0683df0ab32f4 Mon Sep 17 00:00:00 2001
From: Dayu <1010@qq.com>
Date: Wed, 17 Jul 2024 16:04:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?BUG=20=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/spares/mapper/MaterialMapper.xml  | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
index 1013526..ac128a7 100644
--- a/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
+++ b/src/main/java/org/energy/modules/spares/mapper/MaterialMapper.xml
@@ -38,18 +38,16 @@
     </select>
 
     <select id="getDetailList" resultType="org.energy.modules.spares.vo.MaterialVO">
-        select material_name, model
-             ,b.name as warehouse_name
-             ,inventory_count
-        from s_material
-        inner join (
-            select code
-            ,name
-            from spt_warehouse
-            where code in (select warehouse from s_material where material_no = #{materialNo} and is_deleted = 0)
-        ) as b
-        on b.code = s_material.warehouse
-        where material_no = #{materialNo} and is_deleted = 0
+        SELECT
+            a.material_name
+             , a.model
+             , b.name AS warehouse_name
+             , a.inventory_count
+        FROM s_material a
+        LEFT JOIN spt_warehouse b ON b.code = a.warehouse
+        WHERE
+            a.material_no = #{materialNo}
+          AND a.is_deleted = 0
     </select>
 
     <select id="exportData" resultType="org.energy.modules.spares.excel.MaterialExcel">

From 0bbab0709f66c6a9997fed83f7b4410ea435a37f Mon Sep 17 00:00:00 2001
From: yangzhicheng <dayu123@qq.com>
Date: Wed, 17 Jul 2024 16:17:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=A9=E8=B5=84=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BB=93=E5=BA=93=E6=9D=A1=E4=BB=B6=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/energy/modules/spares/mapper/WarehouseMapper.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.xml b/src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.xml
index 8bf98ea..f804faf 100644
--- a/src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.xml
+++ b/src/main/java/org/energy/modules/spares/mapper/WarehouseMapper.xml
@@ -54,7 +54,7 @@
     </select>
 
     <select id="getWarehouseList" resultMap="warehouseResultMap">
-        select id, code, name from spt_warehouse where is_deleted = 0
+        select id, code, name from spt_warehouse where is_deleted = 0 and approval_status = 2
     </select>
 
 </mapper>