Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into develop

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

@@ -285,17 +285,13 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s
 
 	var err1, err2, err3, err4, err5, err6, err7, err8 error
 	var wg sync.WaitGroup
-	wg.Add(7)
+	wg.Add(6)
 	//图例001
 	go func(wg *sync.WaitGroup) {
 		DashboardData.DashboardDataPic1, err1 = impl.SelectPic1(user, dayModel, workLineId, startTime, endTime, useDayStartTime, jPHPercent)
 		wg.Done() // 操作完成，减少一个计数
 	}(&wg)
-	//图例002
-	go func(wg *sync.WaitGroup) {
-		DashboardData.DashboardDataPic2, err2 = impl.SelectDefectNumber(user, days, workLineId)
-		wg.Done() // 操作完成，减少一个计数
-	}(&wg)
+
 	//图例003
 	go func(wg *sync.WaitGroup) {
 		DashboardData.DashboardDataPic3, err3 = impl.SelectPic3(user, DayModelHours, dayModel, jPHPercent, startTime, endTime, timeBeat, personNum, workLineId, useDayStartTime)
@@ -320,6 +316,8 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s
 		wg.Done() // 操作完成，减少一个计数
 	}(&wg)
 	wg.Wait()
+	//图例002
+	DashboardData.DashboardDataPic2, err2 = impl.SelectDefectNumber(user, days, workLineId)
 	DashboardData.DashboardOEE, err8 = impl.SelectOee(user, dayModel, workLineId, startTime, endTime, useDayStartTime, DashboardData.DashboardDataPic4.Current, DashboardData.DashboardDataPic3.CompleteNumber, DashboardData.DashboardDataPic4.Target)
 
 	if err1 != nil {
@@ -402,6 +400,17 @@ func (impl *CustOrderServiceImplement) RecordDashBoard(user *global.User, dashbo
 	headData.JPHPercent = jPHPercent
 	headData.CurrentTempo = dashboardData.DashboardDataPic1.ProductFamilyMeter
 
+	//构建detail数据
+	detailData = model.DashBoardDetail{}
+	detailData.WorkLineId = workLineId
+	detailData.RefreshTime = refreshTime
+	detailData.RecordObject = "CurrentWorkShiftAccomplished"
+	detailData.Descr = "当班达成"
+	detailData.DataType = "独立数值"
+	detailData.RecordKey = "CurrentWorkShiftAccomplished"
+	detailData.RecordValue = utils.ValueToString(dashboardData.DashboardDataPic4.Current, "")
+	detailDatas = append(detailDatas, detailData)
+
 	//构建detail数据
 	detailData = model.DashBoardDetail{}
 	detailData.WorkLineId = workLineId

services/pln/implments/ToyotaCallOffCheck.impl.go

@@ -106,9 +106,9 @@ func (impl *ToyotaCalloffServiceImplement) Check(user *global.User, barcode stri
 		if packOrderStatus == nil {
 			return grmi.NewBusinessError("该条码的打包数据不存在, 包装单条码:" + packOrderId)
 		}
-		if packOrderStatus.ShipStatus == jitModel.SHIP_STATUS_CLOSED {
-			return grmi.NewBusinessError("当前座椅归属包装单已发运")
-		}
+		//if packOrderStatus.ShipStatus == jitModel.SHIP_STATUS_CLOSED {
+		//	return grmi.NewBusinessError("当前座椅归属包装单已发运")
+		//}
 		if packOrderStatus.Status1 == jitModel.PACK_STATUS_CLOSED {
 			return grmi.NewBusinessError("该包装单已校验过， 包装单条码:" + packOrderId)
 		}