From a5bcf11818521a66f304a115ed44208d3cb3ffef Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期三, 07 五月 2025 15:46:04 +0800
Subject: [PATCH] 【UPDATE】钣金供应缺口报表接口-补充
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java | 60 +++++++++++++++++++++++++++++++++---------------------------
1 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
index 77a1bd1..7190995 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
@@ -1,7 +1,6 @@
package com.aps.core.domain;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -27,11 +26,9 @@
private String workOrderNo;
/** 宸ュ簭鍚嶇О */
- @Excel(name = "宸ュ簭鍚嶇О")
+ @Excel(name = "宸ュ簭鍚嶇О", width = 50)
private String processName;
- /** 鎺掑簭 */
- @Excel(name = "鎺掑簭")
private Integer num;
/** 宸ュ簭鍙� */
@@ -44,26 +41,15 @@
/** 鐢熶骇鏁伴噺 */
@Excel(name = "鐢熶骇鏁伴噺")
- private Integer productionQuantity;
+ private BigDecimal productionQuantity;
/** 鏍囧噯宸ユ椂 */
@Excel(name = "鏍囧噯宸ユ椂")
- private Integer standardTime;
+ private BigDecimal standardTime;
/** 宸ュ簭鎬诲伐鏃� */
@Excel(name = "宸ュ簭鎬诲伐鏃�")
- private Integer processTotalTime;
-
- /** 璁″垝瀹屾垚鏃� */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璁″垝瀹屾垚鏃�", width = 30, dateFormat = "yyyy-MM-dd")
- private Date processPlanEndDay;
-
- /** 璁＄畻瀹屾垚鏃� */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "璁＄畻瀹屾垚鏃�", width = 30, dateFormat = "yyyy-MM-dd")
- private Date computePlanEndDay;
-
+ private BigDecimal processTotalTime;
/** 璁″垝寮�宸ユ棩 */
@@ -71,21 +57,34 @@
@Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date processPlanStartDay;
+ /** 璁″垝瀹屾垚鏃� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date processPlanEndDay;
+
/** 璁㈠崟寮�宸ユ棩 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璁㈠崟寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁㈠崟瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderPlanEndDay;
+ /** 璁＄畻瀹屾垚鏃� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date computePlanEndDay;
+
/** 璁捐宸ユ椂 */
- @Excel(name = "璁捐宸ユ椂")
+
private Long designTimes;
/** 鎵规鍙� */
- @Excel(name = "鎵规鍙�")
+
private String batchNumber;
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
private String delFlag;
+
+
+
+ private Boolean warning;
public void setId(String id)
{
@@ -147,32 +146,32 @@
return currentProcessNumber;
}
- public void setProductionQuantity(Integer productionQuantity)
+ public void setProductionQuantity(BigDecimal productionQuantity)
{
this.productionQuantity = productionQuantity;
}
- public Integer getProductionQuantity()
+ public BigDecimal getProductionQuantity()
{
return productionQuantity;
}
- public void setStandardTime(Integer standardTime)
+ public void setStandardTime(BigDecimal standardTime)
{
this.standardTime = standardTime;
}
- public Integer getStandardTime()
+ public BigDecimal getStandardTime()
{
return standardTime;
}
- public void setProcessTotalTime(Integer processTotalTime)
+ public void setProcessTotalTime(BigDecimal processTotalTime)
{
this.processTotalTime = processTotalTime;
}
- public Integer getProcessTotalTime()
+ public BigDecimal getProcessTotalTime()
{
return processTotalTime;
}
@@ -240,6 +239,13 @@
{
return delFlag;
}
+ public Boolean getWarning() {
+ return warning;
+ }
+
+ public void setWarning(Boolean warning) {
+ this.warning = warning;
+ }
@Override
public String toString() {
--
Gitblit v1.9.3