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 | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/model/response/common.go b/model/response/common.go index 7461096..6bd6284 100644 --- a/model/response/common.go +++ b/model/response/common.go @@ -1,8 +1,66 @@ package response +import ( + "apsClient/conf" + "apsClient/model" + "apsClient/model/common" +) + type PageResult struct { List interface{} `json:"list"` Total int64 `json:"total"` Page int `json:"page"` PageSize int `json:"pageSize"` } + +type ListResponse struct { + Code int `json:"code"` + Msg string `json:"msg"` + Data interface{} `json:"data"` + Count int64 `json:"count"` +} + +type TaskData struct { + 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 { + DeviceName string + DeviceStatus string +} + +type ProcessParamsResponse struct { + Number string + Params []ProcessParams +} + +type ProcessParams struct { + Key string + Value interface{} +} + +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