Browse Source

修改mu的计算逻辑

pull/361/head
zhangxin 3 years ago
parent
commit
c83024f693
1 changed files with 5 additions and 4 deletions
  1. +5
    -4
      services/report/implments/FilterDataInfo.service.impl.go

+ 5
- 4
services/report/implments/FilterDataInfo.service.impl.go View File

@ -470,7 +470,7 @@ func (impl *FilterDataInfoServiceImplement) GetDisplayData() (result []model.AWM
}
}
}
if dayModelNr == 0 || yesterdayModelNr == 0{
if dayModelNr == 0 || yesterdayModelNr == 0 {
return nil, grmi.NewBusinessError("未获取到该工位的日模型主数据")
}
dayModel, err := dayModelDao.SelectOne(dayModelNr)
@ -547,7 +547,6 @@ func (impl *FilterDataInfoServiceImplement) GetDisplayData() (result []model.AWM
yesterdayStartStr := yesterdayBegin.Add(time.Duration(yesterdayStart) * time.Second).Format(grmi.DatetimeOutFormat)
yesterdayEndStr := yesterdayBegin.Add(time.Duration(yesterdayEnd) * time.Second).Format(grmi.DatetimeOutFormat)
// 求取今天的开始 结束时间
var startInt int
if dayModel.WorkShiftToggle {
@ -623,6 +622,7 @@ func (impl *FilterDataInfoServiceImplement) GetDisplayData() (result []model.AWM
}
// 计算昨天的mu
var mu float64
var yesterdaySum float64
yesterdayCapacity := 0
for _, dataInfo := range yesterdayArcLi {
targetValue := reflect.ValueOf(dataInfo).FieldByName(statisticField).String()
@ -637,12 +637,13 @@ func (impl *FilterDataInfoServiceImplement) GetDisplayData() (result []model.AWM
continue
}
yesterdayCapacity++
yesterdaySum += target
}
yesterdayAvg := yesterdaySum / float64(yesterdayCapacity)
if yesterdayCapacity == 0 {
mu = 0
} else {
mu = float64(yesterdayCapacity) / (float64(yesterdayLength) / 3600)
mu = float64(yesterdayCapacity) * yesterdayAvg / float64(yesterdayLength)
}
mu, err = strconv.ParseFloat(fmt.Sprintf("%.2f", mu), 64)
if err != nil {


Loading…
Cancel
Save