From ca1ae59e3172ebe9ccfdfe07585de83103d5ee7d Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期二, 29 四月 2025 21:48:47 +0800
Subject: [PATCH] 更新：气柜管路产能负载：列表只显示对应专业的工序名称
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java | 87 ++++++++++++++++++++++++++++---------------
1 files changed, 56 insertions(+), 31 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
index 6ebb573..341d233 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
@@ -1,17 +1,13 @@
package com.aps.core.domain;
-import java.util.Date;
-
-import com.aps.common.core.utils.uuid.IdUtils;
-import com.aps.common.core.utils.uuid.UUID;
+import com.aps.common.core.annotation.Excel;
+import com.aps.common.core.web.domain.BaseEntity;
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 org.springframework.data.annotation.Id;
-import javax.annotation.processing.Generated;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 闆朵欢璁″垝绠＄悊瀵硅薄 aps_part_plan
@@ -80,11 +76,11 @@
/** 鐢熶骇鏁伴噺 */
@Excel(name = "鐢熶骇鏁伴噺")
- private Long productionQuantity;
+ private BigDecimal productionQuantity;
/** 鑹搧鏁伴噺 */
@Excel(name = "鑹搧鏁伴噺")
- private Long goodProductsQuantity;
+ private BigDecimal goodProductsQuantity;
/** 宸ュ簭鍙� */
@Excel(name = "宸ュ簭鍙�")
@@ -125,11 +121,9 @@
private String nextProcessDeparment;
/** 鏄惁鎸傝捣 */
-// @Excel(name = "鏄惁鎸傝捣")
- private Integer isSuspended;
- /** 鏄惁鎸傝捣 */
@Excel(name = "鏄惁鎸傝捣")
- private String isSuspendedTxt;
+ private String isSuspended;
+
/** 澶栧崗鏍囪瘑 */
@Excel(name = "澶栧崗鏍囪瘑")
private String isOutsourcing;
@@ -167,9 +161,38 @@
@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;
+
+
+ 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)
{
@@ -311,22 +334,22 @@
return versionNumber;
}
- public void setProductionQuantity(Long productionQuantity)
+ public void setProductionQuantity(BigDecimal productionQuantity)
{
this.productionQuantity = productionQuantity;
}
- public Long getProductionQuantity()
+ public BigDecimal getProductionQuantity()
{
return productionQuantity;
}
- public void setGoodProductsQuantity(Long goodProductsQuantity)
+ public void setGoodProductsQuantity(BigDecimal goodProductsQuantity)
{
this.goodProductsQuantity = goodProductsQuantity;
}
- public Long getGoodProductsQuantity()
+ public BigDecimal getGoodProductsQuantity()
{
return goodProductsQuantity;
}
@@ -421,12 +444,12 @@
return nextProcessDeparment;
}
- public void setIsSuspended(Integer isSuspended)
+ public void setIsSuspended(String isSuspended)
{
this.isSuspended = isSuspended;
}
- public Integer getIsSuspended()
+ public String getIsSuspended()
{
return isSuspended;
}
@@ -521,6 +544,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)
@@ -559,18 +590,12 @@
.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 getIsSuspendedTxt() {
- return isSuspendedTxt;
- }
-
- public void setIsSuspendedTxt(String isSuspendedTxt) {
- this.isSuspendedTxt = isSuspendedTxt;
- }
-
public String getPlant() {
return plant;
}
--
Gitblit v1.9.3