From a8622c9cc1b20eac20e384e704aa98194372e72a Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期日, 08 十月 2023 20:45:15 +0800 Subject: [PATCH] 工序保存使用的工艺参数编号 --- service/task.go | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/service/task.go b/service/task.go index 885a66d..a9b75ca 100644 --- a/service/task.go +++ b/service/task.go @@ -131,13 +131,19 @@ return procedure, ecode.OK } -func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id int, status model.ProcedureStatus, channel int32) error { - if status == model.ProcedureStatusFinished { +func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id int, status model.ProcedureStatus, channel int32, processModelNumber string) error { + if status == model.ProcedureStatusFinished || status == model.ProcedureStatusWaitProcess { ProgressCacheUnset(channel) } - return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{ - "status": status, - }) + + upMap := map[string]interface{}{"status": status} + if status == model.ProcedureStatusProcessing { + upMap["process_model_number"] = processModelNumber + } else if status == model.ProcedureStatusWaitProcess { + upMap["process_model_number"] = "" + } + + return model.NewProceduresSearch(db).SetId(id).UpdateByMap(upMap) } func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id int, status model.ProcedureStatus, channel int32) error { -- Gitblit v1.8.0