From dcc8eec9265e91670a2a94f20a75a233daf15263 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Wed, 14 Jul 2021 10:01:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=9E=E5=86=99=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=B7=A5=E5=8D=95=E7=9A=84=E5=AE=8C=E6=88=90=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/base/base.go | 5 +++++ services/om/implments/OmToMes.serivce.impl.go | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/models/base/base.go b/models/base/base.go index da6dc23..786a93d 100644 --- a/models/base/base.go +++ b/models/base/base.go @@ -89,3 +89,8 @@ type ArtData struct { Attribute `xorm:"extends"` ArticleAtcodLst `xorm:"extends"` } + + +var AccomplishWorkLineMap = map[string]interface{}{ + "G-Frame Assy": nil, +} \ No newline at end of file diff --git a/services/om/implments/OmToMes.serivce.impl.go b/services/om/implments/OmToMes.serivce.impl.go index a6067fc..3f89cbb 100644 --- a/services/om/implments/OmToMes.serivce.impl.go +++ b/services/om/implments/OmToMes.serivce.impl.go @@ -483,6 +483,15 @@ func (impl *OmToMesServiceImplement) dealWorkOrderHeader(mesWorkOrder apiModel.A StartTime: detail.SYNCTIME, EndTime: detail.SYNCTIME, } + _, exist := baseModel.AccomplishWorkLineMap[serialOrder.PlanResourceId] + if exist { + serialOrder.ActEndTime = detail.SYNCTIME + err = serialOrderDao.UpdateOne(&serialOrder) + if err != nil { + log.Error("dealWorkOrderHeader update serialOrder ActEndTime failed, error:"+err.Error()+" serialOrderId: "+detail.UNITSN, "feedback id:"+feedbackId) + return feedbackWorkOrder, err + } + } err = serialOrderStatusRecDao.InsertOne(&statusRec) if err != nil { log.Error("dealWorkOrderHeader insert serialOrder status rec failed, error:"+err.Error()+" serialOrderId: "+detail.UNITSN, "feedback id:"+feedbackId)