From 6ea7f096e3f2e09b61974f8d6a259c94fd9e13eb Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 15 五月 2025 13:44:21 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 02d5ed6..3b8bb42 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
@@ -442,7 +442,11 @@
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,op_status,next_op_name,plan_type
+ id,create_time,del_flag,plant,order_status,std_op,op_status,next_op_name,plan_type,
+ order_create_time,
+ approve_on,
+ start_work_date,
+ low_order_code
)
select
doc_no,mainitem_code,mainitem_figure,
@@ -453,7 +457,11 @@
start_date,complete_date,next_dept,
is_hold_release,is_out_source,org_code,
order_id,now(),'0',org_code,doc_status,std_op,op_status,next_op_name,
- case when substr(item_code,0,4)='A65' then 'gas' else 'piping' end as plan_type
+ case when substr(item_code,0,4)='A65' then 'gas' else 'piping' end as plan_type,
+ order_create_time,
+ approve_on,
+ 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 'A65%' or item_code like 'W%'));
--
Gitblit v1.9.3