From 695d501ce0a2eacecc58bb94892a5acfbf4eccca Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 08 五月 2025 16:18:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
index 50f1f10..56269ce 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml
@@ -39,8 +39,8 @@
<where>
<if test="bomLineId != null and bomLineId != ''"> and bom_line_id = #{bomLineId}</if>
<if test="bomHeaderId != null and bomHeaderId != ''"> and bom_header_id = #{bomHeaderId}</if>
- <if test="itemCode != null and itemCode != ''"> and item_code like '%'||#{itemCode}||'%'</if>
- <if test="itemName != null and itemName != ''"> and item_name like '%'|| #{itemName}||'%'</if>
+ <if test="itemCode != null and itemCode != ''"> and item_code like '%' || #{itemCode} || '%'</if>
+ <if test="itemName != null and itemName != ''"> and item_name like '%' || #{itemName} || '%'</if>
<if test="params.beginStartDate != null and params.beginStartDate != '' and params.endStartDate != null and params.endStartDate != ''"> and start_date between #{params.beginStartDate} and #{params.endStartDate}</if>
<if test="params.beginEndDate != null and params.beginEndDate != '' and params.endEndDate != null and params.endEndDate != ''"> and end_date between #{params.beginEndDate} and #{params.endEndDate}</if>
<if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode}</if>
@@ -137,4 +137,25 @@
#{id}
</foreach>
</delete>
+
+ <resultMap type="ApsBom" id="ApsBomLineResult">
+ <result property="bomLineId" column="bom_line_id" />
+ <result property="itemCode" column="item_code" />
+ <result property="itemName" column="item_name" />
+ <result property="num" column="num" />
+ </resultMap>
+ <sql id="selectApsBomLineVo">
+ select bom_line_id, item_code, item_name, num
+ from aps_bom_line
+ </sql>
+
+ <select id="selectApsBomLineList" parameterType="ApsBom" resultMap="ApsBomLineResult">
+ <include refid="selectApsBomLineVo"/>
+ <where>
+ <if test="bomHeaderId != null and bomHeaderId != ''"> and bom_header_id = #{bomHeaderId}</if>
+ <if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode}</if>
+ and del_flag='0'
+ </where>
+ order by bom_header_id,bom_line_id
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3