From 5ec8d62c24fc5844d1b88a91398178856ec76b12 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 08 五月 2025 15:46:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

---
 aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java |  107 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 100 insertions(+), 7 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 0bc7a35..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
@@ -1,10 +1,14 @@
 package com.aps.job.domain;
 
-import java.math.BigDecimal;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 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
@@ -21,6 +25,7 @@
 
     /** 鍚屾涓婚敭 */
     @Excel(name = "鍚屾涓婚敭")
+    @JsonProperty("ID")
     private String orderId;
 
     /** 鍗曟嵁鍙� */
@@ -77,7 +82,7 @@
 
     /** 宸ヤ綔涓績 褰撳墠鍦ㄥ埗鐨勫伐搴� */
     @Excel(name = "宸ヤ綔涓績 褰撳墠鍦ㄥ埗鐨勫伐搴�")
-    private Integer workCenter;
+    private String workCenter;
 
     /** 鎵�灞為儴闂� */
     @Excel(name = "鎵�灞為儴闂�")
@@ -119,7 +124,50 @@
     @Excel(name = "鍒犻櫎鏍囧織", readConverterExp = "0=浠ｈ〃瀛樺湪,2=浠ｈ〃鍒犻櫎")
     private String delFlag;
 
-    public void setId(Long id) 
+    /** 浣滀笟 */
+    @Excel(name = "浣滀笟")
+    private String stdOp;
+
+    /** 璐﹀缂栫爜 */
+    private String orgCode;
+
+    /** 褰撳墠宸ュ簭鐘舵�� */
+    @JsonProperty("OpStatus")
+    @Excel(name = "褰撳墠宸ュ簭鐘舵��")
+    private String opStatus;
+
+    /** 涓嬩竴宸ュ簭鍚嶇О */
+    @JsonProperty("NextOpName")
+    @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
+    private String nextOpName;
+
+    /**
+     * 浣庨樁鐮�
+     */
+    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;
     }
@@ -269,12 +317,12 @@
         return opNum;
     }
 
-    public void setWorkCenter(Integer workCenter) 
+    public void setWorkCenter(String workCenter)
     {
         this.workCenter = workCenter;
     }
 
-    public Integer getWorkCenter() 
+    public String getWorkCenter()
     {
         return workCenter;
     }
@@ -378,6 +426,47 @@
     {
         return delFlag;
     }
+    public String getProcessStatus() {
+        return processStatus;
+    }
+
+    public void setProcessStatus(String processStatus) {
+        this.processStatus = processStatus;
+    }
+
+    private String processStatus;
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+
+    public void setStdOp(String stdOp) {
+        this.stdOp = stdOp;
+    }
+
+    public String getStdOp() {
+        return stdOp;
+    }
+
+    public String getOpStatus() {
+        return opStatus;
+    }
+
+    public void setOpStatus(String opStatus) {
+        this.opStatus = opStatus;
+    }
+
+    public String getNextOpName() {
+        return nextOpName;
+    }
+
+    public void setNextOpName(String nextOpName) {
+        this.nextOpName = nextOpName;
+    }
 
     @Override
     public String toString() {
@@ -412,6 +501,10 @@
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
+            .append("processStatus", getProcessStatus())
+            .append("stdOp", getStdOp())
+            .append("opStatus", getOpStatus())
+            .append("nextOpName", getNextOpName())
             .toString();
     }
 }

--
Gitblit v1.9.3