From 644c6b5f5808c49f59d27f2ed9400cc70c4dd22a Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 09:52:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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 56269ce..a25b782 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
@@ -139,23 +139,22 @@
</delete>
<resultMap type="ApsBom" id="ApsBomLineResult">
+ <result property="id" column="id" />
<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
+ select id, 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 id="selectApsBomLineList" parameterType="String" resultMap="ApsBomLineResult">
+ select id, bom_line_id, item_code, num
+ from aps_bom_line where del_flag='0'
+ and org_code = #{orgCode}
+ and bom_header_id = #{bomHeaderId}
+ order by bom_line_id
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3