diff --git a/services/pln/implments/CustOrder.Dashborad.impl.go b/services/pln/implments/CustOrder.Dashborad.impl.go index a368829..351daed 100644 --- a/services/pln/implments/CustOrder.Dashborad.impl.go +++ b/services/pln/implments/CustOrder.Dashborad.impl.go @@ -37,10 +37,10 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s session := engine.NewSession() defer session.Close() - //engineSlaves := db.Eloquent.Slaves() - //sessionSlave := engineSlaves[1].NewSession() - sessionSlave := engine.NewSession() - defer sessionSlave.Close() + engineSlaves := db.Eloquent.Slaves() + sessionSlave := engineSlaves[1].NewSession() + //sessionSlave := engine.NewSession() + //defer sessionSlave.Close() daoWorkLine := baseDal.NewWorkLineDAO(session, user.PlantNr, user.UserId) daoDayModel := baseDal.NewDayModelDAO(session, user.PlantNr, user.UserId) @@ -62,22 +62,22 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s var jPHPercent float64 //IPPM for _, v := range dashlist { if v.ParamName == "TimeBeat" { - timeBeat = v.FloatParam1 + timeBeat = utils.ValueToFloat(v.CharParam1, 0.0) } if v.ParamName == "PersonNum" { - personNum = v.IntParam1 + personNum = utils.ValueToInt(v.CharParam1, 0) } if v.ParamName == "AttendancePersonNum" { - attendancePersonNum = v.IntParam1 + attendancePersonNum = utils.ValueToInt(v.CharParam1, 0) } if v.ParamName == "Days" { - days = v.IntParam1 + days = utils.ValueToInt(v.CharParam1, 0) } if v.ParamName == "IppmTarge" { - ippmTarge = v.IntParam1 + ippmTarge = utils.ValueToInt(v.CharParam1, 0) } if v.ParamName == "JPHPercent" { - jPHPercent = v.FloatParam1 + jPHPercent = utils.ValueToFloat(v.CharParam1, 0.0) } } @@ -300,10 +300,11 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s return nil, errors.New("日模型开始时间大于结束时间") } dayModelStartHour := startDayTime.Add(time.Duration(dayModelStartTime) * time.Second) - dayModelEndHour := startDayTime.Add(time.Duration(dayModelEndTime) * time.Second) + //dayModelEndHour := startDayTime.Add(time.Duration(dayModelEndTime) * time.Second) endDayTime := utils.GetZeroTime(time.Now().AddDate(0, 0, 1)) - DayModelHours, err := utils.GetHoursData(dayModelStartHour, dayModelEndHour) + nowEndHour := time.Now() + DayModelHours, err := utils.GetHoursData(dayModelStartHour, nowEndHour) _ = endDayTime _ = DayModelHours if err != nil { @@ -325,7 +326,7 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s }(&wg) //图例003 go func(wg *sync.WaitGroup) { - DashboardData.DashboardDataPic3, err3 = impl.SelectPic3(user, DayModelHours, dayModel, startDayTime, endDayTime, timeBeat, attendancePersonNum, workLineId) + DashboardData.DashboardDataPic3, err3 = impl.SelectPic3(user, DayModelHours, dayModel, jPHPercent, startDayTime, endDayTime, timeBeat, attendancePersonNum, workLineId) wg.Done() // 操作完成,减少一个计数 }(&wg) //图例004 @@ -1231,7 +1232,7 @@ func (impl *CustOrderServiceImplement) GetUsefulTime(start, end time.Time, timeL } //图例3 -func (impl *CustOrderServiceImplement) SelectPic3(user *global.User, DayModelHours []string, dayModel *baseModel.DayModel, startDayTime time.Time, endDayTime time.Time, timeBeat float64, attendancePersonNum int, workLineId string) (model.PerDashboardData, error) { +func (impl *CustOrderServiceImplement) SelectPic3(user *global.User, DayModelHours []string, dayModel *baseModel.DayModel, jPHPercent float64, startDayTime time.Time, endDayTime time.Time, timeBeat float64, attendancePersonNum int, workLineId string) (model.PerDashboardData, error) { engine := db.Eloquent.Master() session := engine.NewSession() defer session.Close() @@ -1439,6 +1440,8 @@ func (impl *CustOrderServiceImplement) SelectPic3(user *global.User, DayModelHou } DashboardData3.DashboardData2 = append(DashboardData3.DashboardData2, two) } + DashboardData3.CompleteNumber = utils.ValueToInt(utils.ValueToFloat(DashboardData3.CompleteNumber, 0.0)*jPHPercent, 0) + return DashboardData3, nil } diff --git a/web/controllers/qm/qm.go b/web/controllers/qm/qm.go index c26845d..8bce7c9 100644 --- a/web/controllers/qm/qm.go +++ b/web/controllers/qm/qm.go @@ -257,7 +257,7 @@ func RegisterRoutes() { // ReclinerReclst查询一条 RegisterSelectOneReclinerReclst(reclinerreclst, "/get", serviceOfReclinerReclst.SelectOne) // ReclinerReclst修改一条 - // RegisterUpdateOneReclinerReclst(reclinerreclst, "/updateone", serviceOfReclinerReclst.UpdateOne) + RegisterUpdateOneReclinerReclst(reclinerreclst, "/updateone", serviceOfReclinerReclst.UpdateOne) // ReclinerReclst修改多条 // RegisterUpdateReclinerReclst(reclinerreclst, "/update", serviceOfReclinerReclst.Update) // 插入条码