From 3880de9f96b068dfa8b1f35fcac0060f3d4ad604 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期日, 27 四月 2025 15:08:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 9d4a269..9afd5bc 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
@@ -41,15 +41,15 @@
/** 鐢熶骇鏁伴噺 */
@Excel(name = "鐢熶骇鏁伴噺")
- private Integer productionQuantity;
+ private BigDecimal productionQuantity;
/** 鏍囧噯宸ユ椂 */
@Excel(name = "鏍囧噯宸ユ椂")
- private Integer standardTime;
+ private BigDecimal standardTime;
/** 宸ュ簭鎬诲伐鏃� */
@Excel(name = "宸ュ簭鎬诲伐鏃�")
- private Integer processTotalTime;
+ private BigDecimal processTotalTime;
/** 璁″垝瀹屾垚鏃� */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -147,32 +147,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;
}
--
Gitblit v1.9.3