From d4d5f196cc42ef8cfe739de6ecd40f2d21a96e31 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期二, 29 四月 2025 09:45:57 +0800
Subject: [PATCH] 【UPDATE-BUGFIX】优化计算产能开始结束日期
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java
index 83c4232..0eb3ad3 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.aps.common.core.utils.DateUtils;
+import com.aps.common.core.utils.uuid.IdUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsWeldSeamStatisticsMapper;
@@ -53,6 +54,7 @@
@Override
public int insertApsWeldSeamStatistics(ApsWeldSeamStatistics apsWeldSeamStatistics)
{
+ apsWeldSeamStatistics.setId(IdUtils.fastUUID());
apsWeldSeamStatistics.setCreateTime(DateUtils.getNowDate());
return apsWeldSeamStatisticsMapper.insertApsWeldSeamStatistics(apsWeldSeamStatistics);
}
@@ -67,6 +69,26 @@
public int updateApsWeldSeamStatistics(ApsWeldSeamStatistics apsWeldSeamStatistics)
{
apsWeldSeamStatistics.setUpdateTime(DateUtils.getNowDate());
+ //棰勭暀绱ф�ヨ鍗曚骇鍑烘槸鍚︿负绌�
+ if (apsWeldSeamStatistics.getReserveEmergencyOrderOutput() != null) {
+ apsWeldSeamStatistics.setTotal(apsWeldSeamStatistics.getPipingOrderRequirement() + apsWeldSeamStatistics.getPipingPredictionRequirement() + apsWeldSeamStatistics.getGasOrderRequirement() + apsWeldSeamStatistics.getGasPredictionRequirement() + apsWeldSeamStatistics.getReserveEmergencyOrderOutput());
+ //澶╂暟涓嶄负绌鸿绠楅渶姹傛棩鐒婄紳
+ if(apsWeldSeamStatistics.getDays()!=null){
+ // 杞崲涓� double 绫诲瀷杩涜闄ゆ硶杩愮畻
+ double result = (double) apsWeldSeamStatistics.getTotal() / apsWeldSeamStatistics.getDays();
+ // 鍥涜垗浜斿叆
+ long roundedResult = Math.round(result);
+ apsWeldSeamStatistics.setRequirementDayWeldSeam(roundedResult);
+ //鍒ゆ柇鐢熶骇鏃ョ剨缂濅笉涓虹┖璁＄畻鏄惁婊¤冻
+ if(apsWeldSeamStatistics.getProductionDayWeldSeam()!=null){
+ if(apsWeldSeamStatistics.getProductionDayWeldSeam()>=apsWeldSeamStatistics.getRequirementDayWeldSeam()){
+ apsWeldSeamStatistics.setIsSatisfy("鏄�");
+ }else{
+ apsWeldSeamStatistics.setIsSatisfy("鍚�");
+ }
+ }
+ }
+ }
return apsWeldSeamStatisticsMapper.updateApsWeldSeamStatistics(apsWeldSeamStatistics);
}
--
Gitblit v1.9.3