From 191b8ae5c768fbb97c7cdea87edde77d0a10e7da Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 15:15:41 +0800
Subject: [PATCH] 钣金需求匹配-完善工时计算

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java |  109 +++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 90 insertions(+), 19 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
index 8977676..d56b49c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
@@ -1,27 +1,35 @@
 package com.aps.core.domain;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 閽ｉ噾璁″垝绠＄悊瀵硅薄 aps_plate_plan
  * 
  * @author ruoyi
- * @date 2025-04-08
+ * &#064;date  2025-04-08
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class ApsPlatePlan extends BaseEntity
 {
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /** 涓婚敭id */
-    private String id;
+    private Long id;
 
     /** 涓昏鍒掑憳 */
-    @Excel(name = "涓昏鍒掑憳")
+    @Excel(name = "涓昏鍒�")
     private String masterPlanner;
 
     /** 鍛ㄦ棩 */
@@ -75,11 +83,11 @@
 
     /** 鐢熶骇鏁伴噺 */
     @Excel(name = "鐢熶骇鏁伴噺")
-    private Integer productionQuantity;
+    private BigDecimal productionQuantity;
 
     /** 鑹搧鏁伴噺 */
     @Excel(name = "鑹搧鏁伴噺")
-    private Integer goodProductsQuantity;
+    private BigDecimal goodProductsQuantity;
 
     /** 宸ュ簭鍙� */
     @Excel(name = "宸ュ簭鍙�")
@@ -121,7 +129,7 @@
 
     /** 鏄惁鎸傝捣 */
     @Excel(name = "鏄惁鎸傝捣")
-    private Integer isSuspended;
+    private String isSuspended;
 
     /** 澶栧崗鏍囪瘑 */
     @Excel(name = "澶栧崗鏍囪瘑")
@@ -160,9 +168,61 @@
     @Excel(name = "椋庨櫓鏍囪瘑")
     private Integer hasRisk;
 
+    /** 浣滀笟锛堝伐搴忓悕绉帮級 */
+    @Excel(name = "浣滀笟")
+    private String stdOp;
+
     /** 宸ュ巶 */
-    @Excel(name = "宸ュ巶")
+//    @Excel(name = "宸ュ巶")
     private String plant;
+
+    /** 褰撳墠宸ュ簭鐘舵�� */
+    @Excel(name = "褰撳墠宸ュ簭鐘舵��")
+    private String opStatus;
+
+    /** 涓嬩竴宸ュ簭鍚嶇О */
+    @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
+    private String nextOpName;
+
+    /** 宸ュ崟鍒涘缓鏃堕棿 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date orderCreateTime;
+
+    /** 鑷畾涔夋椂闂� */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鑷畾涔夋椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date customTime;
+
+    /** 鐢熶骇鍩哄湴 */
+    @Excel(name = "鐢熶骇鍩哄湴")
+    private String productionBase;
+
+    /** 鏈尮閰嶇殑鐢熶骇鏁伴噺*/
+    private BigDecimal unmatchedQuantity;
+    /** 涓撲笟褰掑睘*/
+    private String professionalAffiliation;
+
+    /** 闇�姹傝拷婧疘D*/
+    private String requireId;
+
+    private Integer version;
+/*
+    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;
+    }
 
     public void setId(String id) 
     {
@@ -304,22 +364,22 @@
         return versionNumber;
     }
 
-    public void setProductionQuantity(Integer productionQuantity) 
+    public void setProductionQuantity(BigDecimal productionQuantity)
     {
         this.productionQuantity = productionQuantity;
     }
 
-    public Integer getProductionQuantity() 
+    public BigDecimal getProductionQuantity()
     {
         return productionQuantity;
     }
 
-    public void setGoodProductsQuantity(Integer goodProductsQuantity) 
+    public void setGoodProductsQuantity(BigDecimal goodProductsQuantity)
     {
         this.goodProductsQuantity = goodProductsQuantity;
     }
 
-    public Integer getGoodProductsQuantity() 
+    public BigDecimal getGoodProductsQuantity()
     {
         return goodProductsQuantity;
     }
@@ -414,12 +474,12 @@
         return nextProcessDeparment;
     }
 
-    public void setIsSuspended(Integer isSuspended)
+    public void setIsSuspended(String isSuspended)
     {
         this.isSuspended = isSuspended;
     }
 
-    public Integer getIsSuspended()
+    public String getIsSuspended()
     {
         return isSuspended;
     }
@@ -514,6 +574,14 @@
         return hasRisk;
     }
 
+    public void setStdOp(String stdOp) {
+        this.stdOp = stdOp;
+    }
+
+    public String getStdOp() {
+        return stdOp;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -552,7 +620,10 @@
             .append("isStockComplete", getIsStockComplete())
             .append("hasTurnback", getHasTurnback())
             .append("hasRisk", getHasRisk())
-                .append("plant", getPlant())
+            .append("plant", getPlant())
+            .append("stdOp", getStdOp())
+            .append("opStatus", getOpStatus())
+            .append("nextOpName", getNextOpName())
             .toString();
     }
     public String getPlant() {
@@ -561,5 +632,5 @@
 
     public void setPlant(String plant) {
         this.plant = plant;
-    }
+    }*/
 }

--
Gitblit v1.9.3