From 63ba78bc47993596f250d6b8036c2a04b79ee9ae Mon Sep 17 00:00:00 2001 From: "DESKTOP-IO8B2ND\\ZhangXin" Date: Mon, 5 Sep 2022 09:20:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9dashboard=E5=92=8C=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pln/implments/CustOrder.Dashborad.impl.go | 21 +++++++++++++------ .../pln/implments/ToyotaCallOffCheck.impl.go | 6 +++--- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/services/pln/implments/CustOrder.Dashborad.impl.go b/services/pln/implments/CustOrder.Dashborad.impl.go index 02714e3..da1436e 100644 --- a/services/pln/implments/CustOrder.Dashborad.impl.go +++ b/services/pln/implments/CustOrder.Dashborad.impl.go @@ -277,17 +277,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) @@ -312,6 +308,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 { @@ -381,6 +379,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 diff --git a/services/pln/implments/ToyotaCallOffCheck.impl.go b/services/pln/implments/ToyotaCallOffCheck.impl.go index 99e852a..4962299 100644 --- a/services/pln/implments/ToyotaCallOffCheck.impl.go +++ b/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) }