From 06cff5f59c72d36b745515d98b9e645e92bb91a3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 23 八月 2023 20:14:23 +0800
Subject: [PATCH] 修改获取工艺参数等待超时，修改生产进度返回值参数
---
model/response/common.go | 7 +------
api/v1/task.go | 4 ++--
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 0c77d46..48484b3 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -98,7 +98,7 @@
OrderId: procedure.OrderID,
Product: order.ProductName,
Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceName}, &result, time.Second*5)
+ Device: procedure.ProceduresInfo.DeviceName}, &result, time.Second*3)
if err != nil {
logx.Errorf("TaskStart GetProcessModel error:%v", err.Error())
ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
@@ -194,7 +194,7 @@
OrderId: procedure.OrderID,
Product: order.ProductName,
Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceName}, &result, time.Second*5)
+ Device: procedure.ProceduresInfo.DeviceName}, &result, time.Second*3)
if err != nil {
logx.Errorf("SendProcessParams GetProcessModel error:%v", err.Error())
ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
diff --git a/model/response/common.go b/model/response/common.go
index 8a25c70..c7ebad6 100644
--- a/model/response/common.go
+++ b/model/response/common.go
@@ -39,11 +39,6 @@
Value interface{}
}
-type NetConfig struct {
- DeviceName string
- DeviceStatus string
-}
-
type ProductProgress struct {
- FinishNumber int
+ FinishNumber int `json:"finishNumber"`
}
--
Gitblit v1.8.0