From db1be72e80a9532ceda5000d79c153eb859caa05 Mon Sep 17 00:00:00 2001
From: bluejay <253316343@qq.com>
Date: 星期一, 14 四月 2025 16:46:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsWeldSeamStatisticsServiceImpl.java | 20 ++++++++++++++++++++
1 files changed, 20 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 c621166..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
@@ -69,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