Browse Source

Merge pull request '平均每小时产量' (#225) from fix_dashboard4 into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/225
pull/227/head
娄文智 2 years ago
parent
commit
215120092b
1 changed files with 19 additions and 3 deletions
  1. +19
    -3
      services/pln/implments/CustOrder.Dashborad.impl.go

+ 19
- 3
services/pln/implments/CustOrder.Dashborad.impl.go View File

@ -848,7 +848,13 @@ func (impl *CustOrderServiceImplement) SelectTeamTemPo(user *global.User, dayMod
packTimes := impl.GetUsefulTime(WorkShift1StartTime, time.Now(), timeModelList)
if countPack > 0 {
TeamTemPoNumber = utils.Decimal(float64(packTimes)/float64(countPack), 2)
PerTeamTemPoNumber = utils.Decimal(float64(countPack)/float64(num), 4)
if packTimes > 0 {
packHours := packTimes / 3600
PerTeamTemPoNumber = utils.Decimal(float64(countPack)/float64(num)/float64(packHours), 4)
} else {
PerTeamTemPoNumber = 0
}
} else {
TeamTemPoNumber = 0
PerTeamTemPoNumber = 0
@ -872,7 +878,12 @@ func (impl *CustOrderServiceImplement) SelectTeamTemPo(user *global.User, dayMod
packTimes := impl.GetUsefulTime(WorkShift2StartTime, time.Now(), timeModelList)
if countPack > 0 {
TeamTemPoNumber = utils.Decimal(float64(packTimes)/float64(countPack), 2)
PerTeamTemPoNumber = utils.Decimal(float64(countPack)/float64(num), 4)
if packTimes > 0 {
packHours := packTimes / 3600
PerTeamTemPoNumber = utils.Decimal(float64(countPack)/float64(num)/float64(packHours), 4)
} else {
PerTeamTemPoNumber = 0
}
} else {
TeamTemPoNumber = 0
PerTeamTemPoNumber = 0
@ -895,7 +906,12 @@ func (impl *CustOrderServiceImplement) SelectTeamTemPo(user *global.User, dayMod
packTimes := impl.GetUsefulTime(WorkShift3StartTime, time.Now(), timeModelList)
if countPack > 0 {
TeamTemPoNumber = utils.Decimal(float64(packTimes)/float64(countPack), 2)
PerTeamTemPoNumber = utils.Decimal(float64(countPack)/float64(num), 4)
if packTimes > 0 {
packHours := packTimes / 3600
PerTeamTemPoNumber = utils.Decimal(float64(countPack)/float64(num)/float64(packHours), 4)
} else {
PerTeamTemPoNumber = 0
}
} else {
TeamTemPoNumber = 0
PerTeamTemPoNumber = 0


Loading…
Cancel
Save