From 1c15dbfcab5dd355f00e35a963adffe8ca135b4f Mon Sep 17 00:00:00 2001
From: dy <dingyang@lnfxkj.tech>
Date: 星期三, 23 四月 2025 11:08:13 +0800
Subject: [PATCH] 零件计划统计表和钣金计划统计表后台代码提交
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java | 18 +++++++++---------
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartRouteStat.java | 18 +++++++++---------
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessStatServiceImpl.java | 4 ++--
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java | 2 +-
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartRouteStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartRouteStat.java
index 91e81ae..4eaf23b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartRouteStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartRouteStat.java
@@ -38,15 +38,15 @@
/** 鐢熶骇鏁伴噺 */
@Excel(name = "鐢熶骇鏁伴噺")
- private Long productionQuantity;
+ private BigDecimal productionQuantity;
/** 鏍囧噯宸ユ椂 */
@Excel(name = "鏍囧噯宸ユ椂")
- private Long standardTime;
+ private BigDecimal standardTime;
/** 宸ュ簭鎬诲伐鏃� */
@Excel(name = "宸ュ簭鎬诲伐鏃�")
- private Long processTotalTime;
+ private BigDecimal processTotalTime;
/** 璁″垝寮�宸ユ棩 */
@Excel(name = "璁″垝寮�宸ユ棩")
@@ -103,32 +103,32 @@
return currentProcessNumber;
}
- public void setProductionQuantity(Long productionQuantity)
+ public void setProductionQuantity(BigDecimal productionQuantity)
{
this.productionQuantity = productionQuantity;
}
- public Long getProductionQuantity()
+ public BigDecimal getProductionQuantity()
{
return productionQuantity;
}
- public void setStandardTime(Long standardTime)
+ public void setStandardTime(BigDecimal standardTime)
{
this.standardTime = standardTime;
}
- public Long getStandardTime()
+ public BigDecimal getStandardTime()
{
return standardTime;
}
- public void setProcessTotalTime(Long processTotalTime)
+ public void setProcessTotalTime(BigDecimal processTotalTime)
{
this.processTotalTime = processTotalTime;
}
- public Long getProcessTotalTime()
+ public BigDecimal getProcessTotalTime()
{
return processTotalTime;
}
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;
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
index 0cf88f2..eb24cf0 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java
@@ -167,7 +167,7 @@
if (stat.getCurrentProcessNumber().compareTo(stat.getRoadProcessNumber()) < 0) {
if (last != null) {
LocalDateTime lastStartDate = LocalDateTime.ofInstant(last.getProcessPlanStartDay().toInstant(), ZoneId.systemDefault());
- lastStartDate.plusHours(last.getProcessTotalTime());
+ lastStartDate.plusHours(last.getProcessTotalTime().longValue());
stat.setProcessPlanStartDay(Date.from(lastStartDate.atZone(ZoneId.systemDefault()).toInstant()));
}
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessStatServiceImpl.java
index 83ed6e3..ba9637a 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessStatServiceImpl.java
@@ -137,7 +137,7 @@
/*璁″垝瀹屽伐鏃�=閽ｉ噾璁″垝宸ュ崟瀹屾垚鏃堕棿*/
stat.setProcessPlanEndDay(transDate(orderPlanEndDayLocalDateTime));
/*璁″垝寮�宸ユ棩=閽ｉ噾璁″垝宸ュ崟瀹屾垚鏃堕棿 - 宸ュ簭鎬诲伐鏃�*/
- LocalDateTime lastPlanStartDt = orderPlanEndDayLocalDateTime.minusHours(stat.getProcessTotalTime());
+ LocalDateTime lastPlanStartDt = orderPlanEndDayLocalDateTime.minusHours(stat.getProcessTotalTime().longValue());
if(lastPlanStartDt.isBefore(now)){
hasBefore = true;
stat.setProcessPlanStartDay(transDate(now));
@@ -161,7 +161,7 @@
/*褰撳墠宸ュ簭缁撴潫鏃堕棿=涓嬩竴閬撳伐搴忕殑寮�濮嬫椂闂�*/
stat.setProcessPlanEndDay(last.getProcessPlanStartDay());
/*寮�濮嬫椂闂�=缁撴潫鏃堕棿-鎬诲伐鏃�*/
- LocalDateTime crtStartDt = transLocalDateTime(last.getProcessPlanStartDay()).minusHours(stat.getProcessTotalTime());
+ LocalDateTime crtStartDt = transLocalDateTime(last.getProcessPlanStartDay()).minusHours(stat.getProcessTotalTime().longValue());
/*濡傛灉寮�濮嬫椂闂村皬浜庡綋鍓嶆椂闂�*/
if(crtStartDt.isBefore(now)){
hasBefore=true;
--
Gitblit v1.9.3