From ce34bb17c5e41f13b170ad9fa7e580030f0ec63c Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期二, 13 五月 2025 11:28:25 +0800
Subject: [PATCH] 【UPDATE】钣金工单计划新增字段
---
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml | 6 ++++--
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java | 3 +++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
index c45b643..8c8762d 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
@@ -304,6 +304,9 @@
order.setOpStatus(jsonObject.getString("OpStatus"));
order.setNextOpName(jsonObject.getString("NextOpName"));
order.setLowOrderCode(jsonObject.getString("LowLevelCode"));
+ order.setOrderCreateTime(jsonObject.getDate("CreatedOn"));
+ order.setApproveOn(jsonObject.getDate("ApproveOn"));
+ order.setStartWorkDate(jsonObject.getDate("StartDatetime"));
jobs.add(order);
orderIds.add(order.getOrderId());
} catch (Exception e) {
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 2da09bb..b99c35d 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
+ professional_affiliation,order_create_time,approve_on,start_work_date
)
select
doc_no,mainitem_code,mainitem_figure,
@@ -419,7 +419,9 @@
is_hold_release,is_out_source,org_code,
cast(order_id as bigint) as id,now(),'0',org_code,doc_status,std_op,op_status,next_op_name,
(case when low_order_code='0' then 'main' else 'sub' end ) as professional_affiliation,
- order_create_time
+ order_create_time,
+ approve_on,
+ start_work_date
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