From 04d2803720568c1e7227e205d0f27cf9b83a2f00 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期二, 06 五月 2025 14:47:04 +0800
Subject: [PATCH] BOM 基础代码

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsBomMapper.xml |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 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 c17395f..50f1f10 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
@@ -6,8 +6,8 @@
     
     <resultMap type="ApsBom" id="ApsBomResult">
         <result property="id"    column="id"    />
-        <result property="bomId"    column="bom_id"    />
-        <result property="parentBomId"    column="parent_bom_id"    />
+        <result property="bomLineId"    column="bom_line_id"    />
+        <result property="bomHeaderId"    column="bom_header_id"    />
         <result property="itemCode"    column="item_code"    />
         <result property="itemName"    column="item_name"    />
         <result property="startDate"    column="start_date"    />
@@ -28,14 +28,17 @@
     </resultMap>
 
     <sql id="selectApsBomVo">
-        select id, bom_id, parent_bom_id, item_code, item_name, start_date, end_date, org_code, del_flag, create_by, create_time, update_by, update_time, drawing_no, process_no, unit, num, total_num, preparation_time, processing_time from aps_bom
+        select id, bom_line_id, bom_header_id, item_code, item_name, start_date, end_date, org_code,
+               del_flag, create_by, create_time, update_by, update_time, drawing_no, process_no, unit, num,
+               total_num, preparation_time, processing_time
+        from aps_bom_line
     </sql>
 
     <select id="selectApsBomList" parameterType="ApsBom" resultMap="ApsBomResult">
         <include refid="selectApsBomVo"/>
         <where>  
-            <if test="bomId != null  and bomId != ''"> and bom_id = #{bomId}</if>
-            <if test="parentBomId != null  and parentBomId != ''"> and parent_bom_id = #{parentBomId}</if>
+            <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="params.beginStartDate != null and params.beginStartDate != '' and params.endStartDate != null and params.endStartDate != ''"> and start_date between #{params.beginStartDate} and #{params.endStartDate}</if>
@@ -44,7 +47,7 @@
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
             and del_flag='0'
         </where>
-        order by parent_bom_id,bom_id
+        order by bom_header_id,bom_line_id
     </select>
     
     <select id="selectApsBomById" parameterType="Long" resultMap="ApsBomResult">
@@ -53,10 +56,10 @@
     </select>
 
     <insert id="insertApsBom" parameterType="ApsBom" useGeneratedKeys="true" keyProperty="id">
-        insert into aps_bom
+        insert into aps_bom_line
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="bomId != null">bom_id,</if>
-            <if test="parentBomId != null">parent_bom_id,</if>
+            <if test="bomLineId != null">bom_line_id,</if>
+            <if test="bomHeaderId != null">bom_header_id,</if>
             <if test="itemCode != null">item_code,</if>
             <if test="itemName != null">item_name,</if>
             <if test="startDate != null">start_date,</if>
@@ -76,8 +79,8 @@
             <if test="processingTime != null">processing_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="bomId != null">#{bomId},</if>
-            <if test="parentBomId != null">#{parentBomId},</if>
+            <if test="bomLineId != null">#{bomLineId},</if>
+            <if test="bomHeaderId != null">#{bomHeaderId},</if>
             <if test="itemCode != null">#{itemCode},</if>
             <if test="itemName != null">#{itemName},</if>
             <if test="startDate != null">#{startDate},</if>
@@ -99,10 +102,10 @@
     </insert>
 
     <update id="updateApsBom" parameterType="ApsBom">
-        update aps_bom
+        update aps_bom_line
         <trim prefix="SET" suffixOverrides=",">
-            <if test="bomId != null">bom_id = #{bomId},</if>
-            <if test="parentBomId != null">parent_bom_id = #{parentBomId},</if>
+            <if test="bomLineId != null">bom_line_id = #{bomLineId},</if>
+            <if test="bomHeaderId != null">bom_header_id = #{bomHeaderId},</if>
             <if test="itemCode != null">item_code = #{itemCode},</if>
             <if test="itemName != null">item_name = #{itemName},</if>
             <if test="startDate != null">start_date = #{startDate},</if>
@@ -125,11 +128,11 @@
     </update>
 
     <delete id="deleteApsBomById" parameterType="Long">
-        delete from aps_bom where id = #{id}
+        delete from aps_bom_line where id = #{id}
     </delete>
 
     <delete id="deleteApsBomByIds" parameterType="String">
-        delete from aps_bom where id in 
+        delete from aps_bom_line where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

--
Gitblit v1.9.3