From 5640fc8f31e729bc4ddb7881c305dc41fe20314a Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期二, 29 四月 2025 11:25:57 +0800
Subject: [PATCH] 【UPDATE-BUGFIX】优化计算气柜管路产能统计底表数据计算功能
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
index b34c170..9c7677c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipingRouteStatServiceImpl.java
@@ -148,6 +148,7 @@
apsProcessRoutes.sort((a, b)->b.getProcessNumber().compareTo(a.getProcessNumber()));
//鏄惁鎵惧埌褰撳墠宸ュ簭
boolean isCurrentProcess = false;
+ boolean lastProcessStartTimeIsBeforeNow = false;
ApsGasPipingRouteStat preApsProcessRoute = null;
for (int i=0;i<apsProcessRoutes.size();i++){
ApsProcessRoute apsProcessRoute = apsProcessRoutes.get(i);
@@ -172,14 +173,10 @@
apsGasPipingRouteStat.setProcessTotalTime(apsProcessRoute.getStandardTime().multiply(apsGasPipingPlan.getProductionQuantity()));
//璁″垝寮�宸ユ棩 濡傛灉鏄綋鍓嶅簭
if(apsGasPipingPlan.getProcessNumber().equals(apsProcessRoute.getProcessNumber())) {
- if(apsGasPipingPlan.getOpStatus()==null || apsGasPipingPlan.getOpStatus().equals("瀹屽伐")){
- break;
- }
isCurrentProcess = true;
}
// 涓婁竴閬撳伐搴忕殑缁撴潫鏃堕棿 = 涓婁竴閬撳伐搴忕殑寮�濮嬫椂闂� + 涓婁竴閬撳伐搴忕殑鎬诲伐鏃�
if(i==0){
- apsGasPipingRouteStat.setProcessPlanEndDay(apsGasPipingPlan.getPlanEndDay());
LocalDate endLocalDate = LocalDate.ofInstant(apsGasPipingPlan.getPlanEndDay().toInstant(), ZoneId.systemDefault());
LocalDate nowLocalDate = LocalDate.now();
LocalDateTime planEndDay;
@@ -188,15 +185,25 @@
}else{
planEndDay = apsGasPipingPlan.getPlanEndDay().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
}
+ apsGasPipingRouteStat.setProcessPlanEndDay(Date.from(planEndDay.atZone(ZoneId.systemDefault()).toInstant()));
long seconds = apsProcessRoute.getStandardTime().multiply(apsGasPipingPlan.getProductionQuantity()).multiply(new BigDecimal(60)).multiply(new BigDecimal(60)).longValue();
LocalDateTime planStartDay = planEndDay.plusSeconds(-seconds);
apsGasPipingRouteStat.setProcessPlanStartDay(Date.from(planStartDay.atZone(ZoneId.systemDefault()).toInstant()));
+ if(planStartDay.isBefore(LocalDateTime.now())){
+ lastProcessStartTimeIsBeforeNow = true;
+ }
}else{
- apsGasPipingRouteStat.setProcessPlanEndDay(preApsProcessRoute.getProcessPlanEndDay());
- LocalDateTime planEndDay = apsGasPipingPlan.getPlanEndDay().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
- long seconds = apsProcessRoute.getStandardTime().multiply(apsGasPipingPlan.getProductionQuantity()).multiply(new BigDecimal(60)).multiply(new BigDecimal(60)).longValue();
- LocalDateTime planStartDay = planEndDay.plusSeconds(-seconds);
- apsGasPipingRouteStat.setProcessPlanStartDay(Date.from(planStartDay.atZone(ZoneId.systemDefault()).toInstant()));
+ if(lastProcessStartTimeIsBeforeNow){
+ Date now = new Date();
+ apsGasPipingRouteStat.setProcessPlanStartDay(now);
+ apsGasPipingRouteStat.setProcessPlanEndDay(now);
+ }else{
+ apsGasPipingRouteStat.setProcessPlanEndDay(preApsProcessRoute.getProcessPlanStartDay());
+ LocalDateTime planEndDay = preApsProcessRoute.getProcessPlanStartDay().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+ long seconds = apsProcessRoute.getStandardTime().multiply(apsGasPipingPlan.getProductionQuantity()).multiply(new BigDecimal(60)).multiply(new BigDecimal(60)).longValue();
+ LocalDateTime planStartDay = planEndDay.plusSeconds(-seconds);
+ apsGasPipingRouteStat.setProcessPlanStartDay(Date.from(planStartDay.atZone(ZoneId.systemDefault()).toInstant()));
+ }
}
//鎻掑叆 骞� 鏈� 鏃�
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
--
Gitblit v1.9.3