From a9f55fb1ab24f43fee70b16e1a8c58a33fc59fa6 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期二, 13 五月 2025 18:12:14 +0800
Subject: [PATCH] 钣金工单计划管理：新增 查看上下阶需求接口
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java | 137 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 110 insertions(+), 27 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 4a9c763..087713f 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,24 +1,32 @@
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
+ * @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 = "涓昏鍒�")
@@ -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 Boolean isSuspended;
+ private String isSuspended;
/** 澶栧崗鏍囪瘑 */
@Excel(name = "澶栧崗鏍囪瘑")
@@ -146,19 +154,75 @@
/** 璁″垝榻愬 */
@Excel(name = "璁″垝榻愬")
- private Boolean isPlanComplete;
+ private Integer isPlanComplete;
/** 搴撳瓨榻愬 */
@Excel(name = "搴撳瓨榻愬")
- private Boolean isStockComplete;
+ private Integer isStockComplete;
/** 鏄惁鏈夋姌杩斿伐搴� */
@Excel(name = "鏄惁鏈夋姌杩斿伐搴�")
- private Boolean hasTurnback;
+ private Integer hasTurnback;
/** 椋庨櫓鏍囪瘑 */
@Excel(name = "椋庨櫓鏍囪瘑")
- private Boolean hasRisk;
+ private Integer hasRisk;
+
+ /** 浣滀笟锛堝伐搴忓悕绉帮級 */
+ @Excel(name = "浣滀笟")
+ private String stdOp;
+
+ /** 宸ュ巶 */
+// @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)
{
@@ -300,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;
}
@@ -410,12 +474,12 @@
return nextProcessDeparment;
}
- public void setIsSuspended(Boolean isSuspended)
+ public void setIsSuspended(String isSuspended)
{
this.isSuspended = isSuspended;
}
- public Boolean getIsSuspended()
+ public String getIsSuspended()
{
return isSuspended;
}
@@ -470,44 +534,52 @@
return advancedRequirementDay;
}
- public void setIsPlanComplete(Boolean isPlanComplete)
+ public void setIsPlanComplete(Integer isPlanComplete)
{
this.isPlanComplete = isPlanComplete;
}
- public Boolean getIsPlanComplete()
+ public Integer getIsPlanComplete()
{
return isPlanComplete;
}
- public void setIsStockComplete(Boolean isStockComplete)
+ public void setIsStockComplete(Integer isStockComplete)
{
this.isStockComplete = isStockComplete;
}
- public Boolean getIsStockComplete()
+ public Integer getIsStockComplete()
{
return isStockComplete;
}
- public void setHasTurnback(Boolean hasTurnback)
+ public void setHasTurnback(Integer hasTurnback)
{
this.hasTurnback = hasTurnback;
}
- public Boolean getHasTurnback()
+ public Integer getHasTurnback()
{
return hasTurnback;
}
- public void setHasRisk(Boolean hasRisk)
+ public void setHasRisk(Integer hasRisk)
{
this.hasRisk = hasRisk;
}
- public Boolean getHasRisk()
+ public Integer getHasRisk()
{
return hasRisk;
+ }
+
+ public void setStdOp(String stdOp) {
+ this.stdOp = stdOp;
+ }
+
+ public String getStdOp() {
+ return stdOp;
}
@Override
@@ -548,6 +620,17 @@
.append("isStockComplete", getIsStockComplete())
.append("hasTurnback", getHasTurnback())
.append("hasRisk", getHasRisk())
+ .append("plant", getPlant())
+ .append("stdOp", getStdOp())
+ .append("opStatus", getOpStatus())
+ .append("nextOpName", getNextOpName())
.toString();
}
+ public String getPlant() {
+ return plant;
+ }
+
+ public void setPlant(String plant) {
+ this.plant = plant;
+ }*/
}
--
Gitblit v1.9.3