From 3d191e81842cf3bcd6f841fbe2fc3d451c45ef99 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期三, 14 五月 2025 13:54:40 +0800
Subject: [PATCH] 钣金计划大表增加“异常状态”字段

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml
index 31c225b..fe78db3 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml
@@ -103,15 +103,19 @@
         </foreach>
     </delete>
 
-    <select id="selectBomRedisData" parameterType="String" resultType="com.alibaba.fastjson2.JSONObject">
-        SELECT a.item_code as mainItemCode,f.num as mainStock,b.item_code as subItemCode,b.num as usageNum,c.num as subStock,d.self_made as selfMade FROM aps_bom_header a
+    <select id="selectBomRedisData" parameterType="String" resultType="com.aps.core.domain.ApsBom">
+        SELECT a.item_code as mainItemCode,b.bom_line_id as bomLineId, b.item_code as itemCode,b.num
+        FROM aps_bom_header a
         LEFT JOIN aps_bom_line b on a.bom_header_id=b.bom_header_id
-        LEFT JOIN aps_material_storage_management c on b.item_code=c.item_number
         LEFT JOIN aps_material_management d on b.item_code=d.item_number
-        LEFT JOIN aps_material_storage_management as f on a.item_code=f.item_number
-        <if test="orgCode != null and orgCode != ''">
-            WHERE a.org_code=#{orgCode} and d.applicable_factories=#{orgCode} and c.applicable_factories=#{orgCode}
-        </if>
+        LEFT JOIN aps_material_management c on a.item_code=c.item_number
+        <where>
+            <if test="orgCode != null and orgCode != ''">
+                and a.org_code=#{orgCode} and d.applicable_factories=#{orgCode}
+            </if>
+            and d.material_type='鍒堕�犱欢'
+            and c.material_type='鍒堕�犱欢'
+        </where>
         ORDER BY mainItemCode
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3