From 2aea64bfec61758ef8a4cc87853d48b5e7320f2d Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期六, 13 一月 2024 16:29:10 +0800
Subject: [PATCH] 更新订单排产

---
 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java |  165 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 146 insertions(+), 19 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
index 2347f53..97ed85d 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
@@ -9,15 +9,18 @@
  * 璁㈠崟鎺掍骇瀵硅薄 bs_order_scheduling
  * 
  * @author jiang
- * @date 2024-01-09
+ * @date 2024-01-13
  */
 public class BsOrderScheduling extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** ID */
+    private Long id;
+
     /** 璁㈠崟缂栧彿 */
     @Excel(name = "璁㈠崟缂栧彿")
-    private String orderNumber;
+    private String orderNo;
 
     /** 鍙戝姩鏈哄彿 */
     @Excel(name = "鍙戝姩鏈哄彿")
@@ -61,11 +64,11 @@
 
     /** 鍚堢涓婄嚎 */
     @Excel(name = "鍚堢涓婄嚎")
-    private String combinedBoxLaunch;
+    private String combinedBoxTime;
 
     /** 鎬昏涓嬬嚎 */
     @Excel(name = "鎬昏涓嬬嚎")
-    private String finalAssemblyOffline;
+    private String finalAssemblyTime;
 
     /** 鎿嶄綔浜� */
     @Excel(name = "鎿嶄綔浜�")
@@ -75,14 +78,55 @@
     @Excel(name = "鎿嶄綔鏃堕棿")
     private String operateTime;
 
-    public void setOrderNumber(String orderNumber) 
+    /** 鐘舵�� */
+    @Excel(name = "鐘舵��")
+    private String status;
+
+    /** 棰勭暀瀛楁1 */
+    @Excel(name = "棰勭暀瀛楁1")
+    private String spareField1;
+
+    /** 棰勭暀瀛楁2 */
+    @Excel(name = "棰勭暀瀛楁2")
+    private String spareField2;
+
+    /** 棰勭暀瀛楁3 */
+    @Excel(name = "棰勭暀瀛楁3")
+    private String spareField3;
+
+    /** 棰勭暀瀛楁4 */
+    @Excel(name = "棰勭暀瀛楁4")
+    private String spareField4;
+
+    /** 鍒涘缓鐢ㄦ埛 */
+    @Excel(name = "鍒涘缓鐢ㄦ埛")
+    private String createUser;
+
+    /** 鏇存敼鐢ㄦ埛 */
+    @Excel(name = "鏇存敼鐢ㄦ埛")
+    private String updateUser;
+
+    /** 澶囨敞 */
+    @Excel(name = "澶囨敞")
+    private String remarks;
+
+    public void setId(Long id) 
     {
-        this.orderNumber = orderNumber;
+        this.id = id;
     }
 
-    public String getOrderNumber() 
+    public Long getId() 
     {
-        return orderNumber;
+        return id;
+    }
+    public void setOrderNo(String orderNo) 
+    {
+        this.orderNo = orderNo;
+    }
+
+    public String getOrderNo() 
+    {
+        return orderNo;
     }
     public void setEngineNo(String engineNo) 
     {
@@ -174,23 +218,23 @@
     {
         return report20;
     }
-    public void setCombinedBoxLaunch(String combinedBoxLaunch) 
+    public void setCombinedBoxTime(String combinedBoxTime) 
     {
-        this.combinedBoxLaunch = combinedBoxLaunch;
+        this.combinedBoxTime = combinedBoxTime;
     }
 
-    public String getCombinedBoxLaunch() 
+    public String getCombinedBoxTime() 
     {
-        return combinedBoxLaunch;
+        return combinedBoxTime;
     }
-    public void setFinalAssemblyOffline(String finalAssemblyOffline) 
+    public void setFinalAssemblyTime(String finalAssemblyTime) 
     {
-        this.finalAssemblyOffline = finalAssemblyOffline;
+        this.finalAssemblyTime = finalAssemblyTime;
     }
 
-    public String getFinalAssemblyOffline() 
+    public String getFinalAssemblyTime() 
     {
-        return finalAssemblyOffline;
+        return finalAssemblyTime;
     }
     public void setOperator(String operator) 
     {
@@ -210,11 +254,84 @@
     {
         return operateTime;
     }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setSpareField1(String spareField1) 
+    {
+        this.spareField1 = spareField1;
+    }
+
+    public String getSpareField1() 
+    {
+        return spareField1;
+    }
+    public void setSpareField2(String spareField2) 
+    {
+        this.spareField2 = spareField2;
+    }
+
+    public String getSpareField2() 
+    {
+        return spareField2;
+    }
+    public void setSpareField3(String spareField3) 
+    {
+        this.spareField3 = spareField3;
+    }
+
+    public String getSpareField3() 
+    {
+        return spareField3;
+    }
+    public void setSpareField4(String spareField4) 
+    {
+        this.spareField4 = spareField4;
+    }
+
+    public String getSpareField4() 
+    {
+        return spareField4;
+    }
+    public void setCreateUser(String createUser) 
+    {
+        this.createUser = createUser;
+    }
+
+    public String getCreateUser() 
+    {
+        return createUser;
+    }
+    public void setUpdateUser(String updateUser) 
+    {
+        this.updateUser = updateUser;
+    }
+
+    public String getUpdateUser() 
+    {
+        return updateUser;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("orderNumber", getOrderNumber())
+            .append("id", getId())
+            .append("orderNo", getOrderNo())
             .append("engineNo", getEngineNo())
             .append("productType", getProductType())
             .append("model", getModel())
@@ -225,10 +342,20 @@
             .append("whetherOrPrint", getWhetherOrPrint())
             .append("report10", getReport10())
             .append("report20", getReport20())
-            .append("combinedBoxLaunch", getCombinedBoxLaunch())
-            .append("finalAssemblyOffline", getFinalAssemblyOffline())
+            .append("combinedBoxTime", getCombinedBoxTime())
+            .append("finalAssemblyTime", getFinalAssemblyTime())
             .append("operator", getOperator())
             .append("operateTime", getOperateTime())
+            .append("status", getStatus())
+            .append("spareField1", getSpareField1())
+            .append("spareField2", getSpareField2())
+            .append("spareField3", getSpareField3())
+            .append("spareField4", getSpareField4())
+            .append("createUser", getCreateUser())
+            .append("createTime", getCreateTime())
+            .append("updateUser", getUpdateUser())
+            .append("updateTime", getUpdateTime())
+            .append("remarks", getRemarks())
             .toString();
     }
 }

--
Gitblit v1.9.3