From 20bbbcc1d14536ddaa498ac84a6008828df8dc1c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 13 十二月 2023 20:23:11 +0800
Subject: [PATCH] 往plc写目标数时，优先往写入地址写，没有写入地址再往读取地址写
---
model/request/task.go | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/model/request/task.go b/model/request/task.go
index 6198d95..0302d0b 100644
--- a/model/request/task.go
+++ b/model/request/task.go
@@ -2,15 +2,6 @@
import "apsClient/constvar"
-// TaskInfo 浠诲姟寮�鍚�氱煡璇锋眰鍙傛暟
-type TaskInfo struct {
- OrderId string `json:"orderId"` // 璁㈠崟鍙�
- Product string `json:"password"` // 浜у搧
- Procedure string `json:"procedure"` // 宸ュ簭
- WorkOrder string `json:"workOrder"` // 宸ュ崟
- Device string `json:"device"` // 璁惧
-}
-
// TaskList 浠诲姟鍒楄〃璇锋眰鍙傛暟
type TaskList struct {
PageInfo
@@ -18,17 +9,33 @@
}
type SendProcessParams struct {
- ProcedureId uint `json:"procedureId" binding:"required"`
+ ProcedureId uint `json:"procedureId,string" binding:"required"`
}
type GetProductProgress struct {
- ProcedureId int `json:"procedureId" binding:"required"`
+ ProcedureId uint `json:"procedureId,string"`
Channel int32 `json:"channel"`
}
// ProcessModelList 宸ヨ壓鍙傛暟鍒楄〃璇锋眰鍙傛暟
type ProcessModelList struct {
PageInfo
- ProcedureId uint `json:"procedureId" form:"procedureId" binding:"required"` //褰撳墠鐨勫伐搴廼d
- Number string `json:"number" form:"number" binding:"required"` //褰撳墠姝ｅ湪浣跨敤鐨勫伐鑹哄弬鏁扮紪鍙�
+ ProcedureId uint `json:"procedureId,string" form:"procedureId" binding:"required"` //褰撳墠鐨勫伐搴廼d
}
+
+// TaskListByChannel 鎸塩hannel杩斿洖浠诲姟鍒楄〃璇锋眰鍙傛暟
+type TaskListByChannel struct {
+ Offset int `json:"offset,omitempty" form:"offset"` //榛樿0
+ Limit int `json:"limit,omitempty" form:"limit"` //榛樿3
+ Type QueryType `json:"type,omitempty" form:"type"` //1 鏈畬鎴� 2 浠婂ぉ鏈畬鎴� 3 宸插畬鎴�
+ Channel *int32 `json:"channel" form:"channel"` //閫氶亾鍙枫�備笉浼犲彇鍏ㄩ儴鐨�
+ DeviceID string `json:"deviceID"`
+}
+
+type QueryType int
+
+const (
+ QueryTypeUnFinish QueryType = 1
+ QueryTypeToday QueryType = 2
+ QueryTypeFinished QueryType = 3
+)
--
Gitblit v1.8.0