From 5ec8d62c24fc5844d1b88a91398178856ec76b12 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 08 五月 2025 15:46:17 +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/ApsPlateStandardRequireBomOrderDetailMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomOrderDetailMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomOrderDetailMapper.xml
index 702ac58..149e3fc 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomOrderDetailMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomOrderDetailMapper.xml
@@ -7,6 +7,7 @@
<resultMap type="ApsPlateStandardRequireBomOrderDetail" id="ApsPlateStandardRequireBomOrderDetailResult">
<result property="id" column="id" />
<result property="requireId" column="require_id" />
+ <result property="requireTrackId" column="require_track_id" />
<result property="bomLineId" column="bom_line_id" />
<result property="bomLineCode" column="bom_line_code" />
<result property="docNo" column="doc_no" />
@@ -23,13 +24,17 @@
</resultMap>
<sql id="selectApsPlateStandardRequireBomOrderDetailVo">
- select id, require_id, bom_line_id, bom_line_code, doc_no, before_prod_amount, deduction_amount, after_prod_amount, org_code, batch_number, del_flag, create_time, create_by, update_by, update_time from aps_plate_standard_require_bom_order_detail
+ select id, require_id,require_track_id, bom_line_id, bom_line_code, doc_no,
+ before_prod_amount, deduction_amount, after_prod_amount,
+ org_code, batch_number, del_flag, create_time, create_by, update_by, update_time
+ from aps_plate_standard_require_bom_order_detail
</sql>
<select id="selectApsPlateStandardRequireBomOrderDetailList" parameterType="ApsPlateStandardRequireBomOrderDetail" resultMap="ApsPlateStandardRequireBomOrderDetailResult">
<include refid="selectApsPlateStandardRequireBomOrderDetailVo"/>
<where>
<if test="requireId != null and requireId != ''"> and require_id = #{requireId}</if>
+ <if test="requireTrackId != null and requireTrackId != ''"> and require_track_id = #{requireTrackId}</if>
<if test="bomLineId != null and bomLineId != ''"> and bom_line_id = #{bomLineId}</if>
<if test="bomLineCode != null and bomLineCode != ''"> and bom_line_code = #{bomLineCode}</if>
<if test="docNo != null and docNo != ''"> and doc_no = #{docNo}</if>
@@ -51,6 +56,8 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="requireId != null">require_id,</if>
+ <if test="requireTrackId != null">require_track_id,</if>
+
<if test="bomLineId != null">bom_line_id,</if>
<if test="bomLineCode != null">bom_line_code,</if>
<if test="docNo != null">doc_no,</if>
@@ -68,6 +75,8 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="requireId != null">#{requireId},</if>
+ <if test="requireTrackId != null">#{requireTrackId},</if>
+
<if test="bomLineId != null">#{bomLineId},</if>
<if test="bomLineCode != null">#{bomLineCode},</if>
<if test="docNo != null">#{docNo},</if>
@@ -88,6 +97,7 @@
update aps_plate_standard_require_bom_order_detail
<trim prefix="SET" suffixOverrides=",">
<if test="requireId != null">require_id = #{requireId},</if>
+ <if test="requireTrackId != null">require_track_id = #{requireTrackId},</if>
<if test="bomLineId != null">bom_line_id = #{bomLineId},</if>
<if test="bomLineCode != null">bom_line_code = #{bomLineCode},</if>
<if test="docNo != null">doc_no = #{docNo},</if>
--
Gitblit v1.9.3