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 | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/model/response/common.go b/model/response/common.go
index f162e49..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,10 +21,21 @@
}
type TaskData struct {
- Order *model.Order
- Procedure *model.Procedures
- NextProcedure *model.Procedures
- Config
+ Order *model.Order
+ Procedure *model.Procedures
+
+ Channel int32 //褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜閫氶亾
+ AllProcedures []string
+ CurrentProcedureIndex int
+ CanStarted bool //鏄惁鍙互寮�濮嬬敓浜�
+}
+
+type TaskResponse struct {
+ Tasks []*TaskData //浠诲姟鍒楄〃
+ TaskCount int64 //浠诲姟鏁伴噺
+ Workers []*common.ProcedureWorker `json:"workers"` // 浜哄憳鍒楄〃
+ Prompt conf.Prompt //鎻愮ず璇�
+ ChannelAmount int //閫氶亾鏁伴噺
}
type Config struct {
@@ -30,12 +43,24 @@
DeviceStatus string
}
+type ProcessParamsResponse struct {
+ Number string
+ Params []ProcessParams
+}
+
type ProcessParams struct {
Key string
Value interface{}
}
-type NetConfig struct {
- DeviceName string
- DeviceStatus string
+type ProductProgress struct {
+ FinishNumber int `json:"finishNumber"`
+ TotalNumber int `json:"totalNumber"`
+ PlcStatus int `json:"plcStatus"`
+}
+
+type TaskCountdown struct {
+ CountDownHour int64 //鍊掕鏃� 鏃�
+ CountDownMinute int64 //鍊掕鏃� 鍒�
+ ShowCountDown bool //鏄惁灞曠ず鍊掕鏃�
}
--
Gitblit v1.8.0