From 0f4b1ef7db5b361f38ca62ee75c31eca07b191aa Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期日, 27 四月 2025 15:20:00 +0800
Subject: [PATCH] 【UPDATE】1.修改获取U9工单数据实体字段新增op_status, next_op_name 2.对应钣金、零件、气柜管路实体
---
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
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 1a77528..c8740af 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
@@ -37,14 +37,15 @@
<result property="updateTime" column="update_time" />
<result property="processStatus" column="process_status" />
<result property="stdOp" column="std_op" />
-
+ <result property="opStatus" column="op_status" />
+ <result property="nextOpName" column="next_op_name" />
</resultMap>
<sql id="selectApsWorkOrderJobVo">
select id, order_id, doc_no, mainitem_code, mainitem_figure, customer_name, business_type, demand_type,
doc_status, item_code, item_figure, item_figure_version, pruduct_qty, work_qty, op_num, work_center,
dept, start_date, complete_date, next_dept, is_hold_release, is_out_source, org, page_num, page_index,
- del_flag, create_by, create_time, update_by, update_time , process_status,org_code, std_op
+ del_flag, create_by, create_time, update_by, update_time , process_status,org_code, std_op, op_status, next_op_name
from aps_work_order_job
</sql>
@@ -78,6 +79,8 @@
<if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode}</if>
<if test="processStatus != null and processStatus != ''"> and process_status = #{processStatus}</if>
<if test="delFlag != null and delFlag != ''"> and del_flag = #{delFlag}</if>
+ <if test="opStatus != null and opStatus != ''"> and op_status = #{opStatus}</if>
+ <if test="nextOpName != null and nextOpName != ''"> and next_op_name = #{nextOpName}</if>
</where>
</select>
@@ -121,6 +124,8 @@
<if test="orgCode != null">org_code,</if>
<if test="processStatus != null">process_status,</if>
<if test="stdOp != null">std_op,</if>
+ <if test="opStatus != null">op_status,</if>
+ <if test="nextOpName != null">next_op_name,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderId != null">#{orderId},</if>
@@ -155,6 +160,8 @@
<if test="orgCode != null">#{orgCode},</if>
<if test="processStatus != null">#{processStatus},</if>
<if test="stdOp != null">#{stdOp},</if>
+ <if test="opStatus != null">#{opStatus},</if>
+ <if test="nextOpName != null">#{nextOpName},</if>
</trim>
</insert>
@@ -193,6 +200,8 @@
<if test="orgCode != null"> org_code= #{orgCode},</if>
<if test="processStatus != null"> process_status= #{processStatus},</if>
<if test="stdOp != null"> std_op= #{stdOp},</if>
+ <if test="opStatus != null"> op_status= #{opStatus},</if>
+ <if test="nextOpName != null"> next_op_name= #{nextOpName},</if>
</trim>
where id = #{id}
</update>
@@ -242,7 +251,9 @@
update_time,
org_code,
process_status,
- std_op
+ std_op,
+ op_status,
+ next_op_name
</trim>
values
<foreach collection="list" item="job" separator=",">
@@ -278,7 +289,9 @@
#{job.updateTime},
#{job.orgCode},
#{job.processStatus},
- #{job.stdOp}
+ #{job.stdOp},
+ #{job.opStatus},
+ #{job.nextOpName}
)
</foreach>
</insert>
@@ -311,7 +324,7 @@
process_number,work_center,department,
plan_start_day,plan_end_day,next_process_deparment,
is_suspended,is_outsourcing,account,
- id,create_time,del_flag,plant,order_status,std_op
+ id,create_time,del_flag,plant,order_status,std_op,op_status,next_op_name
)
select
doc_no,mainitem_code,mainitem_figure,
@@ -321,7 +334,7 @@
op_num,work_center,dept,
start_date,complete_date,next_dept,
is_hold_release,is_out_source,org_code,
- order_id,now(),'0',org_code,doc_status,std_op
+ order_id,now(),'0',org_code,doc_status,std_op,op_status,next_op_name
from aps_work_order_job
where ( doc_status in (0,1,2,4) and is_hold_release='0'
and (mainitem_code like 'M01%' or mainitem_code like 'M02%'or mainitem_code like 'M05%' or mainitem_code like 'M10%'
@@ -342,7 +355,7 @@
process_number,work_center,department,
plan_start_day,plan_end_day,next_process_deparment,
is_suspended,is_outsourcing,account,
- id,create_time,del_flag,plant,order_status,std_op
+ id,create_time,del_flag,plant,order_status,,std_op,op_status,next_op_name
)
select
doc_no,mainitem_code,mainitem_figure,
@@ -352,7 +365,7 @@
op_num,work_center,dept,
start_date,complete_date,next_dept,
is_hold_release,is_out_source,org_code,
- order_id,now(),'0',org_code,doc_status,std_op
+ order_id,now(),'0',org_code,doc_status,std_op,op_status,next_op_name
from aps_work_order_job
where ( doc_status in (0,1,2,4) and is_hold_release='0'
and (mainitem_code like 'M03%' or mainitem_code like 'M04%'or mainitem_code like 'A75%')
@@ -372,7 +385,7 @@
process_number,work_center,department,
plan_start_day,plan_end_day,next_process_deparment,
is_suspended,is_outsourcing,account,
- id,create_time,del_flag,plant,order_status,std_op,plan_type
+ id,create_time,del_flag,plant,order_status,std_op,plan_type,op_status,next_op_name
)
select
doc_no,mainitem_code,mainitem_figure,
@@ -382,7 +395,7 @@
op_num,work_center,dept,
start_date,complete_date,next_dept,
is_hold_release,is_out_source,org_code,
- order_id,now(),'0',org_code,doc_status,std_op,
+ order_id,now(),'0',org_code,doc_status,std_op,op_status,next_op_name
case when substr(mainitem_code,3)='A65' then 'gas' else 'piping' end as plan_type
from aps_work_order_job
where ( doc_status in (0,1,2,4) and is_hold_release='0'
--
Gitblit v1.9.3