From 2ea0bf5d81f21edc01d9580e3535981f43211b37 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 08 五月 2025 17:14:58 +0800
Subject: [PATCH] 统一需求追溯ID requireTrackId
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java | 2 +-
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomOrderDetail.java | 2 +-
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomStockDetailService.java | 2 +-
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 4 ++--
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireBomStockDetail.java | 2 +-
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireError.java | 2 +-
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java | 4 ++--
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml | 27 +++++++++++++++++----------
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java | 2 +-
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java | 2 +-
10 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java
index bb1c86f..e7f6293 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java
@@ -27,7 +27,7 @@
/** 闇�姹傝拷婧疘D */
@Excel(name = "闇�姹傝拷婧疘D")
- private String requireId;
+ private String requireTrackId;
/**鍗曞彿*/
private String docNum;
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 80cbc87..c5a4db9 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
@@ -28,7 +28,7 @@
/** 闇�姹侷D */
@Excel(name = "闇�姹侷D")
- private String requireId;
+ private Long requireId;
/** 闇�姹傝拷婧疘D */
@Excel(name = "闇�姹傝拷婧疘D")
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 df97283..20283c2 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
@@ -29,7 +29,7 @@
/** 闇�姹傝拷婧疘D */
@Excel(name = "闇�姹侷D")
- private String requireId;
+ private Long requireId;
/** 闇�姹傝拷婧疘D */
@Excel(name = "闇�姹傝拷婧疘D")
private String requireTrackId;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireError.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireError.java
index 7015421..180f2a1 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireError.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequireError.java
@@ -33,7 +33,7 @@
/** 闇�姹侷d鍙� */
@Excel(name = "闇�姹侷d鍙�")
@Schema(description = "闇�姹侷d鍙�")
- private String requireId;
+ private Long requireId;
/** 宸ュ崟鍙� */
@Excel(name = "宸ュ崟鍙�")
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomStockDetailService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomStockDetailService.java
index 44a0e68..7f1f9e0 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomStockDetailService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomStockDetailService.java
@@ -64,5 +64,5 @@
*/
public int deleteApsPlateStandardRequireBomStockDetailById(Long id);
- void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,String requireId);
+ void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,Long requireId);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
index bc6c7b0..0fc83c9 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
@@ -108,8 +108,8 @@
/* 璁板綍宸ュ崟涓庡噣闇�姹傜殑鍖归厤鍏崇郴*/
ApsPlateStandardRequireBomOrderDetail bomOrderDetail = ApsPlateStandardRequireBomOrderDetail.builder()
.id(IdUtil.getSnowflakeNextId())
- .requireId(require.getId().toString())
- .requireTrackId(require.getRequireId())
+ .requireId(require.getId())
+ .requireTrackId(require.getRequireTrackId())
.bomLineId(require.getBomLineId())
.bomLineCode(require.getBomLineCode())
.docNo(platePlan.getDocumentNumber())
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java
index 054cf44..e1acf03 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java
@@ -109,7 +109,7 @@
* 璁＄畻鐗╂枡鍓╀綑搴撳瓨 骞朵繚瀛樼墿鏂欏墿浣欏簱瀛樻槑缁嗐��
* */
@Override
- public void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,String requireId){
+ public void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,Long requireId){
/*鏇存柊鐗╂枡鍓╀綑搴撳瓨*/
itemStorageMapper.updateMaterialStorageByVersion(afterStockAmount,itemStorage.getVersion());
/*璁板綍鎵ｅ噺鏄庣粏*/
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
index 6181c6d..d44a30b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
@@ -203,7 +203,7 @@
/*鏋勫缓闇�姹備俊鎭�*/
ApsPlateStandardRequire require = new ApsPlateStandardRequire();
require.setId(IdUtil.getSnowflakeNextId());
- require.setRequireId(plan.getId());
+ require.setRequireTrackId(plan.getId());
require.setBatchNumber(batchNum);
require.setDocNum(plan.getDocumentNumber());
require.setOrgCode(plant);
@@ -246,7 +246,7 @@
afterStockAmount = remainderStock.subtract(deductionAmount);
require.setNetRequirement(BigDecimal.ZERO);
}
- bomStockDetailService.saveStorageAndDetail(storage, plan, bomLine, batchNum, deductionAmount, afterStockAmount,require.getId().toString());
+ bomStockDetailService.saveStorageAndDetail(storage, plan, bomLine, batchNum, deductionAmount, afterStockAmount,require.getId());
}
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java
index 5597f89..d49ca13 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsStandardProcessRouteLineServiceImpl.java
@@ -165,7 +165,7 @@
private void saveRequireError(ApsPlateStandardRequire require,String message) {
ApsPlateStandardRequireError data = ApsPlateStandardRequireError.builder()
- .requireId(require.getRequireId())
+ .requireId(require.getId())
.batchNumber(require.getBatchNumber())
.docNum(require.getDocNum())
.itemNum(require.getBomLineCode())
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml
index 3721c3b..04751b5 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireMapper.xml
@@ -6,7 +6,7 @@
<resultMap type="ApsPlateStandardRequire" id="ApsPlateStandardRequireResult">
<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="bomLineLevel" column="bom_line_level" />
@@ -34,13 +34,18 @@
</resultMap>
<sql id="selectApsPlateStandardRequireVo">
- select id, require_id, bom_line_id, bom_line_code, bom_line_level, bom_use_amount, process_route_id, process_route_hours, require_amount, net_requirement, start_date, complete_date, demand_date, org_code, production_base, match_state, match_mode, unmatched_demand_amount, suggested_completion_date, has_delay_risk, batch_number, del_flag, create_time, create_by, update_by, update_time from aps_plate_standard_require
+ select id, require_track_id, bom_line_id, bom_line_code, bom_line_level, bom_use_amount,
+ process_route_id, process_route_hours, require_amount, net_requirement, start_date,
+ complete_date, demand_date, org_code, production_base, match_state, match_mode,
+ unmatched_demand_amount, suggested_completion_date, has_delay_risk, batch_number,
+ del_flag, create_time, create_by, update_by, update_time
+ from aps_plate_standard_require
</sql>
<select id="selectApsPlateStandardRequireList" parameterType="ApsPlateStandardRequire" resultMap="ApsPlateStandardRequireResult">
<include refid="selectApsPlateStandardRequireVo"/>
<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="bomLineLevel != null "> and bom_line_level = #{bomLineLevel}</if>
@@ -72,7 +77,7 @@
insert into aps_plate_standard_require
<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="bomLineLevel != null">bom_line_level,</if>
@@ -100,7 +105,7 @@
</trim>
<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="bomLineLevel != null">#{bomLineLevel},</if>
@@ -131,7 +136,7 @@
<update id="updateApsPlateStandardRequire" parameterType="ApsPlateStandardRequire">
update aps_plate_standard_require
<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="bomLineLevel != null">bom_line_level = #{bomLineLevel},</if>
@@ -172,15 +177,17 @@
</delete>
<select id="selectPlateSupplyGapList" parameterType="ApsPlateStandardRequire" resultMap="ApsPlateStandardRequireResult">
- select id, require_id, bom_line_code, bom_line_level, match_state, match_mode, unmatched_demand_amount, start_date, complete_date, demand_date, org_code, production_base
+ select id, require_track_id, bom_line_code, bom_line_level,
+ match_state, match_mode, unmatched_demand_amount, start_date,
+ complete_date, demand_date, org_code, production_base
from aps_plate_standard_require where unmatched_demand_amount>0
- <if test="requireId != null and requireId != ''"> and require_id like '%' || #{requireId} || '%'</if>
+ <if test="requireTrackId != null and requireTrackId != ''"> and require_track_id like '%' || #{requireTrackId} || '%'</if>
<if test="bomLineCode != null and bomLineCode != ''"> and bom_line_code like '%' || #{bomLineCode} || '%'</if>
</select>
<insert id="batchInsert" parameterType="java.util.List">
insert into aps_plate_standard_require
- (id, require_id,doc_num,batch_number, org_code, bom_line_id, bom_line_code, bom_line_level, bom_use_amount, process_route_id,
+ (id, require_track_id,doc_num,batch_number, org_code, bom_line_id, bom_line_code, bom_line_level, bom_use_amount, process_route_id,
process_route_hours, require_amount, net_requirement, start_date, complete_date, demand_date,
production_base, match_state, match_mode, unmatched_demand_amount, suggested_completion_date,
has_delay_risk, batch_number, del_flag, create_time, create_by)
@@ -188,7 +195,7 @@
<foreach collection="list" item="item" separator=",">
(
#{item.Id},
- #{item.requireId},
+ #{item.requireTrackId},
#{item.docNum},
#{item.batchNumber},
#{item.orgCode},
--
Gitblit v1.9.3