From 5b84285b7b1feec082deaeb12d8a2240a0c4b64b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 21 九月 2023 16:23:34 +0800
Subject: [PATCH] 获取任务，未完成的开始时间小于等于当前时间，结束时间大于当前时间的任务
---
model/response/common.go | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/model/response/common.go b/model/response/common.go
index c5e203e..788dd40 100644
--- a/model/response/common.go
+++ b/model/response/common.go
@@ -2,6 +2,7 @@
import (
"apsClient/model"
+ "apsClient/model/common"
)
type PageResult struct {
@@ -21,7 +22,16 @@
type TaskData struct {
Order *model.Order
Procedure *model.Procedures
- Config
+
+ Position int //褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜浣嶇疆
+ AllProcedures []string
+ CurrentProcedureIndex int
+}
+
+type TaskResponse struct {
+ Tasks []*TaskData
+ TaskCount int64
+ Workers []*common.ProcedureWorker `json:"workers"` // 浜哄憳鍒楄〃
}
type Config struct {
@@ -42,4 +52,11 @@
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