From 632d64050bb5c7d7959f0e93523cf6a0cd351d7d Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期三, 14 五月 2025 17:21:29 +0800
Subject: [PATCH] 【UPDATE】钣金计划增加低阶码字段
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml | 9 +++++++--
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml | 5 +++--
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java | 3 +++
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java | 5 +++--
4 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
index 8f203a0..b92f664 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
@@ -5,8 +5,6 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import java.io.Serial;
import java.math.BigDecimal;
@@ -217,6 +215,9 @@
private String requireId;
private Integer version;
+
+ /** 浣庨樁鐮�*/
+ private String lowOrderCode;
/*
public String getOpStatus() {
return opStatus;
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
index bd68f2a..9dbc55b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
@@ -154,6 +154,9 @@
@Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
private String nextOpName;
+ /** 浣庨樁鐮�*/
+ @Excel(name = "浣庨樁鐮�")
+ private String lowOrderCode;
private List<ApsPlateProcessShopStat> deptPlans=new ArrayList<>();
}
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
index 9cb4122..f60cecf 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
@@ -51,6 +51,7 @@
<result property="version" column="version" />
<result property="approveOn" column="approve_on" />
<result property="startWorkDate" column="start_work_date" />
+ <result property="lowOrderCode" column="low_order_code" />
</resultMap>
<sql id="selectApsPlatePlanVo">
@@ -61,7 +62,7 @@
standby_stock, next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials,
advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete,
has_turnback, has_risk, std_op, op_status, next_op_name ,unmatched_quantity,professional_affiliation,
- require_id, version,production_base, order_create_time, approve_on, start_work_date
+ require_id, version,production_base, order_create_time, approve_on, start_work_date, low_order_code
from aps_plate_plan
</sql>
@@ -106,6 +107,7 @@
<if test="stdOp != null "> and std_op = #{stdOp}</if>
<if test="opStatus != null and opStatus != ''"> and op_status = #{opStatus}</if>
<if test="nextOpName != null and nextOpName != ''"> and next_op_name = #{nextOpName}</if>
+ <if test="lowOrderCode != null and lowOrderCode != ''"> and low_order_code = #{lowOrderCode}</if>
and del_flag='0'
</where>
</select>
@@ -157,6 +159,7 @@
<if test="opStatus != null">op_status,</if>
<if test="nextOpName != null">next_op_name,</if>
<if test="unmatchedQuantity != null">unmatched_quantity,</if>
+ <if test="lowOrderCode != null">low_order_code,</if>
create_time,
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -199,6 +202,7 @@
<if test="opStatus != null">#{opStatus},</if>
<if test="nextOpName != null">#{nextOpName},</if>
<if test="unmatchedQuantity != null">#{unmatchedQuantity},</if>
+ <if test="lowOrderCode != null">#{lowOrderCode},</if>
#{createTime},
</trim>
</insert>
@@ -244,6 +248,7 @@
<if test="opStatus != null"> op_status= #{opStatus},</if>
<if test="nextOpName != null"> next_op_name= #{nextOpName},</if>
<if test="unmatchedQuantity != null"> unmatched_quantity = #{unmatchedQuantity},</if>
+ <if test="lowOrderCode != null"> low_order_code = #{lowOrderCode},</if>
</trim>
where id = #{id}
</update>
@@ -273,7 +278,7 @@
<select id="selectPlatePlanByPlantMajor" parameterType="com.aps.core.domain.ApsPlatePlan" resultMap="ApsPlatePlanResult">
select id,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,require_id,
- unmatched_quantity,version, production_base,plan_end_day,order_create_time
+ unmatched_quantity,version, production_base,plan_end_day,order_create_time,low_order_code
from aps_plate_plan
<where>
<if test="plant != null "> and plant = #{plant} </if>
diff --git a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
index b99c35d..02d5ed6 100644
--- a/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
+++ b/aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
@@ -407,7 +407,7 @@
plan_start_day,plan_end_day,next_process_deparment,
is_suspended,is_outsourcing,account,
id,create_time,del_flag,plant,order_status,std_op,op_status,next_op_name,
- professional_affiliation,order_create_time,approve_on,start_work_date
+ professional_affiliation,order_create_time,approve_on,start_work_date,low_order_code
)
select
doc_no,mainitem_code,mainitem_figure,
@@ -421,7 +421,8 @@
(case when low_order_code='0' then 'main' else 'sub' end ) as professional_affiliation,
order_create_time,
approve_on,
- start_work_date
+ start_work_date,
+ low_order_code
from aps_work_order_job
where ( doc_status in (0,1,2,4) and is_hold_release='0'
and (item_code like 'M03%' or item_code like 'M04%'or item_code like 'A75%')
--
Gitblit v1.9.3