From 77227aa57db37d5f27b002312dd0e36105c21cf6 Mon Sep 17 00:00:00 2001 From: "DESKTOP-H7A6KL3\\wenzh" Date: Fri, 16 Sep 2022 16:36:14 +0800 Subject: [PATCH] dashboard --- services/pln/implments/CustOrder.Dashborad.impl.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/services/pln/implments/CustOrder.Dashborad.impl.go b/services/pln/implments/CustOrder.Dashborad.impl.go index 70b46a2..fdd17ee 100644 --- a/services/pln/implments/CustOrder.Dashborad.impl.go +++ b/services/pln/implments/CustOrder.Dashborad.impl.go @@ -1685,7 +1685,6 @@ func (impl *CustOrderServiceImplement) SelectPic3(user *global.User, DayModelHou if len(hours) == 0 { return DashboardData3, err } - glog.InfoExtln("白线日志", "displayHourProductMap", displayHourProductMap) var usedTimeTotal int for i := 0; i < len(hours); i++ { key := hours[i] @@ -1707,10 +1706,9 @@ func (impl *CustOrderServiceImplement) SelectPic3(user *global.User, DayModelHou hourData, exist := displayHourProductMap[key] if !exist { //判断是否是当前时间 - if headInfo != nil && headInfo.CurrentTempo != 0 { + if headInfo != nil && headInfo.CurrentTempo > 0 { DashboardData3.CompleteNumber += usedTimeTotal / headInfo.CurrentTempo } - glog.InfoExtln("白线日志", "key", key, usedTimeTotal/headInfo.CurrentTempo) continue } var hourPercent float64 @@ -1741,14 +1739,10 @@ func (impl *CustOrderServiceImplement) SelectPic3(user *global.User, DayModelHou completeNumber := 0 if jPHPercent > 0 && hourPercent > 0 { - completeNumber = utils.ValueToInt(utils.Decimal(float64(usedTimeTotal)/hourPercent/jPHPercent, 2), 0) + completeNumber = utils.ValueToInt(fmt.Sprintf("%0.0f",utils.Decimal(float64(usedTimeTotal)/(3600/hourPercent/jPHPercent), 2)), 0) } - glog.InfoExtln("白线日志", key,"产线Id:",workLineId,"hourPercent:", hourPercent) - glog.InfoExtln("白线日志", key,"产线Id:",workLineId,"usedTimeTotal:", usedTimeTotal) - glog.InfoExtln("白线日志", key,"产线Id:",workLineId,"completeNumber:", completeNumber) var jphVal float64 if headInfo != nil && key != recordKey { - jPHPercent = headInfo.JPHPercent if headInfo.PersonNum > 0 { jphVal = utils.Decimal(float64((hourPercent)/float64(headInfo.PersonNum))*(float64(hourAllUsedTime)/3600), 2) }