Merge pull request '添加回写序列工单的完成时间' (#377) from feature_om into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/377
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>

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,
+}

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)