Merge pull request 'dashborad' (#114) from fix_dash into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/114

models/pln/pln.go

@@ -55,10 +55,12 @@ type DashboardPic struct {
 	DashboardDataPic1   []DashboardData  //图例1
 	DashboardDataPic2   []DefectItem     //图例2
 	DashboardDataPic3   PerDashboardData //图例3
-	DashboardDataPic4   TargetItem      //目标数据
+	DashboardDataPic4   TargetItem       //目标数据
 	DashboardDataStatus int              //状态
 	CurrentTempo        float64          //当前节拍
 	TeamTemPo           float64          //当班节拍
 	PerHourTemPo        float64          //当班平均每小时单人产出
 	TemPoPerson         int              //当前上班人数
+	DateTimeNow         string           //当前日期
+	IppmTarge           int              //IPPM
 }

services/pln/implments/CustOrder.service.impl.go

@@ -1842,10 +1842,11 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User) (interface{}
 	if err != nil {
 		return nil, err
 	}
-	var personNum int    //当班人数
-	var timeBeat float64 //节拍
-	var days int         //展示天数
-	var workLineId string         //产线
+	var personNum int     //当班人数
+	var timeBeat float64  //节拍
+	var days int          //展示天数
+	var workLineId string //产线
+	var ippmTarge int     //IPPM
 	for _, v := range dashlist {
 		if v.ParamName == "TimeBeat" {
 			timeBeat = v.FloatParam1
@@ -1859,6 +1860,9 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User) (interface{}
 		if v.ParamName == "WorkLineId" {
 			workLineId = v.CharParam1
 		}
+		if v.ParamName == "IppmTarge" {
+			ippmTarge = v.IntParam1
+		}
 	}
 	if personNum <= 0 {
 		return nil, errors.New("当班人数不能为空!")
@@ -2146,6 +2150,8 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User) (interface{}
 	DashboardData.TemPoPerson = personNum
 	//节拍
 	DashboardData.CurrentTempo = timeBeat
+	DashboardData.IppmTarge = ippmTarge
+	DashboardData.DateTimeNow = utils.TimeFormat(time.Now(), "yyyy-MM-dd HH:00")
 	wg.Wait() // 等待，直到计数为0
 	return DashboardData, err