From 91487fbd678ed772c5aa5b4e250f6f6e9616f219 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 14 十一月 2023 14:54:18 +0800
Subject: [PATCH] fixt
---
api/v1/task.go | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 60f6b8d..99db0e8 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -153,14 +153,21 @@
var processModel *model.ProcessModel
if procedure.ProcessModelNumber != "" {
processModel, err = service.GetProcessModelByNumber(procedure.ProcessModelNumber)
- if err != nil || processModel == nil || processModel.ParamsMap == nil {
- ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
- return
- }
} else {
processModel, err = service.NewTaskService().GetProcessParams(procedure, order)
- if err != nil || processModel == nil || processModel.ParamsMap == nil {
+ }
+
+ if err != nil || processModel == nil || processModel.ParamsMap == nil {
+ device, err := service.GetCurrentDevice()
+ if err != nil {
+ ctx.FailWithMsg(ecode.UnknownErr, err.Error())
+ return
+ }
+ if device.NeedSetProcessParams {
ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
+ return
+ } else {
+ ctx.OkWithDetailed(response.ProcessParamsResponse{})
return
}
}
@@ -284,6 +291,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 +303,7 @@
ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
return
}
+ processModelNumber = processModel.Number
}
plcConfig.CurrentTryTimes = 0
@@ -304,7 +313,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