From 8bcf258496e7c6cdaa3921acec4db1d4f77fe6f2 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 24 四月 2025 13:34:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 a4ceb8c..eb2a7b7 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
@@ -36,6 +36,7 @@
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="processStatus" column="process_status" />
+ <result property="stdOp" column="std_op" />
</resultMap>
@@ -43,7 +44,7 @@
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
+ del_flag, create_by, create_time, update_by, update_time , process_status,org_code, std_op
from aps_work_order_job
</sql>
@@ -119,6 +120,7 @@
<if test="updateTime != null">update_time,</if>
<if test="orgCode != null">org_code,</if>
<if test="processStatus != null">process_status,</if>
+ <if test="stdOp != null">std_op,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderId != null">#{orderId},</if>
@@ -152,6 +154,7 @@
<if test="updateTime != null">#{updateTime},</if>
<if test="orgCode != null">#{orgCode},</if>
<if test="processStatus != null">#{processStatus},</if>
+ <if test="stdOp != null">#{stdOp},</if>
</trim>
</insert>
@@ -189,6 +192,7 @@
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="orgCode != null"> org_code= #{orgCode},</if>
<if test="processStatus != null"> process_status= #{processStatus},</if>
+ <if test="stdOp != null"> std_op= #{stdOp},</if>
</trim>
where id = #{id}
</update>
@@ -237,7 +241,8 @@
update_by,
update_time,
org_code,
- process_status
+ process_status,
+ std_op,
</trim>
values
<foreach collection="list" item="job" separator=",">
@@ -272,7 +277,8 @@
#{job.updateBy},
#{job.updateTime},
#{job.orgCode},
- #{job.processStatus}
+ #{job.processStatus},
+ #{job.stdOp},
)
</foreach>
</insert>
@@ -305,7 +311,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
+ id,create_time,del_flag,plant,order_status,std_op
)
select
doc_no,mainitem_code,mainitem_figure,
@@ -315,7 +321,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
+ order_id,now(),'0',org_code,doc_status,std_op
from aps_work_order_job
where ( doc_status in (0,1,2,4) and
(mainitem_code like 'M01%' or mainitem_code like 'M02%'or mainitem_code like 'M05%' or mainitem_code like 'M10%'
@@ -335,7 +341,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
+ id,create_time,del_flag,plant,order_status,,std_op
)
select
doc_no,mainitem_code,mainitem_figure,
@@ -345,7 +351,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
+ order_id,now(),'0',org_code,doc_status,,std_op
from aps_work_order_job
where ( doc_status in (0,1,2,4)
and (mainitem_code like 'M03%' or mainitem_code like 'M04%'or mainitem_code like 'A75%')
--
Gitblit v1.9.3