From 96536e0052cc29e9fb9fab729fe2f50f53bcc084 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 10 十一月 2023 17:56:53 +0800
Subject: [PATCH] 切换设备时不需要重启任务
---
api/v1/task.go | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 60f6b8d..22c282e 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -284,6 +284,7 @@
ctx.FailWithMsg(ecode.DBErr, err.Error())
return
}
+ var processModelNumber string
if device.NeedSetProcessParams {
processModel, err := taskService.GetProcessParams(procedure, order)
if err != nil || processModel == nil || processModel.ParamsMap == nil {
@@ -295,6 +296,7 @@
ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
return
}
+ processModelNumber = processModel.Number
}
plcConfig.CurrentTryTimes = 0
@@ -304,7 +306,7 @@
return
}
err = model.WithTransaction(func(db *gorm.DB) error {
- err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel, processModel.Number)
+ err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel, processModelNumber)
if err != nil {
return err
}
--
Gitblit v1.8.0