From 2452dd99bfd28d13988996ed7180349983a08192 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 08 五月 2025 15:10:58 +0800
Subject: [PATCH] 增加需求追溯号
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomOrderDetail.java | 6 +++++-
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomStockDetail.java | 6 ++++--
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomOrderDetailMapper.xml | 12 +++++++++++-
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomStockDetailMapper.xml | 10 +++++++++-
4 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomOrderDetail.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomOrderDetail.java
index 6bbf5c7..80cbc87 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomOrderDetail.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomOrderDetail.java
@@ -26,9 +26,13 @@
private Long id;
+ /** 闇�姹侷D */
+ @Excel(name = "闇�姹侷D")
+ private String requireId;
+
/** 闇�姹傝拷婧疘D */
@Excel(name = "闇�姹傝拷婧疘D")
- private String requireId;
+ private String requireTrackId;
/** bom_line_id */
@Excel(name = "bom_line_id")
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomStockDetail.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomStockDetail.java
index 25fc2b1..df97283 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomStockDetail.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomStockDetail.java
@@ -28,9 +28,11 @@
private Long id;
/** 闇�姹傝拷婧疘D */
- @Excel(name = "闇�姹傝拷婧疘D")
+ @Excel(name = "闇�姹侷D")
private String requireId;
-
+ /** 闇�姹傝拷婧疘D */
+ @Excel(name = "闇�姹傝拷婧疘D")
+ private String requireTrackId;
/** bom_line_id */
@Excel(name = "bom_line_id")
private String bomLineId;
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>
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomStockDetailMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomStockDetailMapper.xml
index 117c0fb..e94a2cd 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomStockDetailMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireBomStockDetailMapper.xml
@@ -7,6 +7,7 @@
<resultMap type="ApsPlateStandardRequireBomStockDetail" id="ApsPlateStandardRequireBomStockDetailResult">
<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="beforeStockAmount" column="before_stock_amount" />
@@ -22,13 +23,17 @@
</resultMap>
<sql id="selectApsPlateStandardRequireBomStockDetailVo">
- select id, require_id, bom_line_id, bom_line_code, before_stock_amount, deduction_amount, after_stock_amount, org_code, batch_number, del_flag, create_time, create_by, update_by, update_time from aps_plate_standard_require_bom_stock_detail
+ select id, require_id,require_track_id, bom_line_id, bom_line_code, before_stock_amount,
+ deduction_amount, after_stock_amount, org_code, batch_number, del_flag,
+ create_time, create_by, update_by, update_time
+ from aps_plate_standard_require_bom_stock_detail
</sql>
<select id="selectApsPlateStandardRequireBomStockDetailList" parameterType="ApsPlateStandardRequireBomStockDetail" resultMap="ApsPlateStandardRequireBomStockDetailResult">
<include refid="selectApsPlateStandardRequireBomStockDetailVo"/>
<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="beforeStockAmount != null and beforeStockAmount != ''"> and before_stock_amount = #{beforeStockAmount}</if>
@@ -49,6 +54,7 @@
<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="beforeStockAmount != null">before_stock_amount,</if>
@@ -65,6 +71,7 @@
<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="beforeStockAmount != null">#{beforeStockAmount},</if>
@@ -84,6 +91,7 @@
update aps_plate_standard_require_bom_stock_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="beforeStockAmount != null">before_stock_amount = #{beforeStockAmount},</if>
--
Gitblit v1.9.3