From 97ccfb53d3e00e9d2deed227696b30cdc0fb4236 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 28 四月 2025 13:02:47 +0800
Subject: [PATCH] 钣金、零件 统计时，根据秒数计算计划开始时间
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateProcessStatServiceImpl.java | 7 +++++--
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPartRouteStatServiceImpl.java | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
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 12b6f07..68cffad 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,8 +167,8 @@
if (stat.getCurrentProcessNumber().compareTo(stat.getRoadProcessNumber()) < 0) {
if (last != null) {
LocalDateTime lastStartDate = LocalDateTime.ofInstant(last.getProcessPlanStartDay().toInstant(), ZoneId.systemDefault());
- long minutes = last.getProcessTotalTime().multiply(new BigDecimal(60)).multiply(new BigDecimal(60)).longValue();
- LocalDateTime currentStartDate = lastStartDate.plusMinutes(minutes);
+ long seconds = last.getProcessTotalTime().multiply(new BigDecimal(60)).multiply(new BigDecimal(60)).longValue();
+ LocalDateTime currentStartDate = lastStartDate.plusSeconds(seconds);
stat.setProcessPlanStartDay(Date.from(currentStartDate.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 ba9637a..4770828 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
@@ -1,5 +1,6 @@
package com.aps.core.service.impl;
+import java.math.BigDecimal;
import java.time.*;
import java.util.Date;
import java.util.List;
@@ -137,7 +138,8 @@
/*璁″垝瀹屽伐鏃�=閽ｉ噾璁″垝宸ュ崟瀹屾垚鏃堕棿*/
stat.setProcessPlanEndDay(transDate(orderPlanEndDayLocalDateTime));
/*璁″垝寮�宸ユ棩=閽ｉ噾璁″垝宸ュ崟瀹屾垚鏃堕棿 - 宸ュ簭鎬诲伐鏃�*/
- LocalDateTime lastPlanStartDt = orderPlanEndDayLocalDateTime.minusHours(stat.getProcessTotalTime().longValue());
+ long seconds = stat.getProcessTotalTime().multiply(new BigDecimal(60)).multiply(new BigDecimal(60)).longValue();
+ LocalDateTime lastPlanStartDt = orderPlanEndDayLocalDateTime.minusSeconds(seconds);
if(lastPlanStartDt.isBefore(now)){
hasBefore = true;
stat.setProcessPlanStartDay(transDate(now));
@@ -161,7 +163,8 @@
/*褰撳墠宸ュ簭缁撴潫鏃堕棿=涓嬩竴閬撳伐搴忕殑寮�濮嬫椂闂�*/
stat.setProcessPlanEndDay(last.getProcessPlanStartDay());
/*寮�濮嬫椂闂�=缁撴潫鏃堕棿-鎬诲伐鏃�*/
- LocalDateTime crtStartDt = transLocalDateTime(last.getProcessPlanStartDay()).minusHours(stat.getProcessTotalTime().longValue());
+ long seconds = stat.getProcessTotalTime().multiply(new BigDecimal(60)).multiply(new BigDecimal(60)).longValue();
+ LocalDateTime crtStartDt = transLocalDateTime(last.getProcessPlanStartDay()).minusSeconds(seconds);
/*濡傛灉寮�濮嬫椂闂村皬浜庡綋鍓嶆椂闂�*/
if(crtStartDt.isBefore(now)){
hasBefore=true;
--
Gitblit v1.9.3