From b331c9990a0396301e934daffe095f99d62d1c89 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 27 九月 2023 15:58:49 +0800
Subject: [PATCH] 任务获取修改，状态2只返回已开始和已结束的
---
model/response/common.go | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/model/response/common.go b/model/response/common.go
index 269909f..6bd6284 100644
--- a/model/response/common.go
+++ b/model/response/common.go
@@ -1,7 +1,9 @@
package response
import (
+ "apsClient/conf"
"apsClient/model"
+ "apsClient/model/common"
)
type PageResult struct {
@@ -19,16 +21,21 @@
}
type TaskData struct {
- Order *model.Order
- Procedure *model.Procedures
- Position int //褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜浣嶇疆
+ Order *model.Order
+ Procedure *model.Procedures
+
+ Channel int32 //褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜閫氶亾
AllProcedures []string
CurrentProcedureIndex int
+ CanStarted bool //鏄惁鍙互寮�濮嬬敓浜�
}
type TaskResponse struct {
- Tasks []*TaskData
- TaskCount int64
+ Tasks []*TaskData //浠诲姟鍒楄〃
+ TaskCount int64 //浠诲姟鏁伴噺
+ Workers []*common.ProcedureWorker `json:"workers"` // 浜哄憳鍒楄〃
+ Prompt conf.Prompt //鎻愮ず璇�
+ ChannelAmount int //閫氶亾鏁伴噺
}
type Config struct {
@@ -49,6 +56,7 @@
type ProductProgress struct {
FinishNumber int `json:"finishNumber"`
TotalNumber int `json:"totalNumber"`
+ PlcStatus int `json:"plcStatus"`
}
type TaskCountdown struct {
--
Gitblit v1.8.0