From 314bb7656d139fe3a64e05e696dbc428091ffe04 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 13 十一月 2023 17:36:17 +0800
Subject: [PATCH] 当设置了跳过工艺参数时，工艺参数列表不再报错
---
api/v1/task.go | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 22c282e..99db0e8 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -153,15 +153,22 @@
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
}
}
--
Gitblit v1.8.0