From e4efff6637f4d598a7efdfca8b62fbb4c3286b02 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期四, 22 五月 2025 15:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsBomHeaderMapper.xml | 11 ++++-------
1 files changed, 4 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 aaa2a8e..174bc86 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
@@ -109,13 +109,10 @@
LEFT JOIN aps_bom_line b on a.bom_header_id=b.bom_header_id
LEFT JOIN aps_material_management d on b.item_code=d.item_number
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>
+ where d.material_type='鍒堕�犱欢' and c.material_type='鍒堕�犱欢'
+ <if test="orgCode != null and orgCode != ''">
+ and a.org_code=#{orgCode} and d.applicable_factories=#{orgCode}
+ </if>
ORDER BY mainItemCode
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3