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/service/impl/ApsPlateProcessStatServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
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