|
|
@ -1699,7 +1699,7 @@ func (impl *CustOrderServiceImplement) SelectPic3(user *global.User, DayModelHou |
|
|
return DashboardData3, err |
|
|
return DashboardData3, err |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if preTime.Unix() <= recordKeyTime.Unix() { |
|
|
|
|
|
|
|
|
if preTime.Unix() < recordKeyTime.Unix() { |
|
|
usedTimeTotal = impl.GetUsefulTime(preTime, endTime, timeModelList) |
|
|
usedTimeTotal = impl.GetUsefulTime(preTime, endTime, timeModelList) |
|
|
} else { |
|
|
} else { |
|
|
usedTimeTotal = impl.GetUsefulTime(preTime, nowTime, timeModelList) |
|
|
usedTimeTotal = impl.GetUsefulTime(preTime, nowTime, timeModelList) |
|
|
@ -1743,8 +1743,9 @@ func (impl *CustOrderServiceImplement) SelectPic3(user *global.User, DayModelHou |
|
|
if jPHPercent > 0 && hourPercent > 0 { |
|
|
if jPHPercent > 0 && hourPercent > 0 { |
|
|
completeNumber = utils.ValueToInt(utils.Decimal(float64(usedTimeTotal)/hourPercent/jPHPercent, 2), 0) |
|
|
completeNumber = utils.ValueToInt(utils.Decimal(float64(usedTimeTotal)/hourPercent/jPHPercent, 2), 0) |
|
|
} |
|
|
} |
|
|
glog.InfoExtln("白线日志", key, hourPercent) |
|
|
|
|
|
glog.InfoExtln("白线日志", key, completeNumber) |
|
|
|
|
|
|
|
|
glog.InfoExtln("白线日志", key,"产线Id:",workLineId,"hourPercent:", hourPercent) |
|
|
|
|
|
glog.InfoExtln("白线日志", key,"产线Id:",workLineId,"usedTimeTotal:", usedTimeTotal) |
|
|
|
|
|
glog.InfoExtln("白线日志", key,"产线Id:",workLineId,"completeNumber:", completeNumber) |
|
|
var jphVal float64 |
|
|
var jphVal float64 |
|
|
if headInfo != nil && key != recordKey { |
|
|
if headInfo != nil && key != recordKey { |
|
|
jPHPercent = headInfo.JPHPercent |
|
|
jPHPercent = headInfo.JPHPercent |
|
|
|
