From ab0b4b2397c46701e372a49cf8ff4d268bb577b3 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 23 四月 2025 10:40:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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..9d4a269 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;
@@ -30,8 +29,6 @@
@Excel(name = "宸ュ簭鍚嶇О")
private String processName;
- /** 鎺掑簭 */
- @Excel(name = "鎺掑簭")
private Integer num;
/** 宸ュ簭鍙� */
@@ -56,12 +53,11 @@
/** 璁″垝瀹屾垚鏃� */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璁″垝瀹屾垚鏃�", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "璁″垝瀹屾垚鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date processPlanEndDay;
/** 璁＄畻瀹屾垚鏃� */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "璁＄畻瀹屾垚鏃�", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date computePlanEndDay;
@@ -77,15 +73,19 @@
private Date orderPlanEndDay;
/** 璁捐宸ユ椂 */
- @Excel(name = "璁捐宸ユ椂")
+
private Long designTimes;
/** 鎵规鍙� */
- @Excel(name = "鎵规鍙�")
+
private String batchNumber;
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
private String delFlag;
+
+
+
+ private Boolean warning;
public void setId(String id)
{
@@ -240,6 +240,13 @@
{
return delFlag;
}
+ public Boolean getWarning() {
+ return warning;
+ }
+
+ public void setWarning(Boolean warning) {
+ this.warning = warning;
+ }
@Override
public String toString() {
--
Gitblit v1.9.3