From 744bb797ec7971571422d715b3feeeea8128f691 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期四, 08 五月 2025 08:55:33 +0800
Subject: [PATCH] 【UPDATE】获取U9工单数据增加字段
---
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml | 20 +++++++++++++++-----
aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java | 30 +++++++++++++++++++++++++++++-
2 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
index a97966b..09322b3 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
@@ -2,11 +2,13 @@
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
+import java.util.Date;
/**
* 宸ュ崟鍚屾瀵硅薄 aps_work_order_job
@@ -139,7 +141,33 @@
@Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
private String nextOpName;
- public void setId(Long id)
+ /**
+ * 浣庨樁鐮�
+ */
+ private String lowOrderCode;
+
+ /** 宸ュ崟鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date orderCreateTime;
+
+ public String getLowOrderCode() {
+ return lowOrderCode;
+ }
+
+ public void setLowOrderCode(String lowOrderCode) {
+ this.lowOrderCode = lowOrderCode;
+ }
+
+ public Date getOrderCreateTime() {
+ return orderCreateTime;
+ }
+
+ public void setOrderCreateTime(Date orderCreateTime) {
+ this.orderCreateTime = orderCreateTime;
+ }
+
+ public void setId(Long id)
{
this.id = id;
}
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 8091623..8e82da4 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
@@ -39,13 +39,16 @@
<result property="stdOp" column="std_op" />
<result property="opStatus" column="op_status" />
<result property="nextOpName" column="next_op_name" />
+ <result property="lowOrderCode" column="low_order_code" />
+ <result property="orderCreateTime" column="order_create_time" />
</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, op_status, next_op_name
+ del_flag, create_by, create_time, update_by, update_time , process_status,org_code, std_op, op_status, next_op_name,
+ low_order_code, order_create_time
from aps_work_order_job
</sql>
@@ -290,7 +293,9 @@
process_status,
std_op,
op_status,
- next_op_name
+ next_op_name,
+ low_order_code,
+ order_create_time
</trim>
values
<foreach collection="list" item="job" separator=",">
@@ -329,7 +334,9 @@
#{job.processStatus},
#{job.stdOp},
#{job.opStatus},
- #{job.nextOpName}
+ #{job.nextOpName},
+ #{job.lowOrderCode},
+ #{job.orderCreateTime}
)
</foreach>
</insert>
@@ -393,7 +400,8 @@
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
+ id,create_time,del_flag,plant,order_status,std_op,op_status,next_op_name,
+ professional_affiliation,order_create_time
)
select
doc_no,mainitem_code,mainitem_figure,
@@ -403,7 +411,9 @@
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,op_status,next_op_name
+ order_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
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