From 762dd6158767829ba94e32a3fa0cb00fca320716 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 28 十一月 2023 14:38:58 +0800
Subject: [PATCH] 工序完成时，上报工序的最后完成数量
---
docs/docs.go | 1203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 1,174 insertions(+), 29 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 13c6d5b..935673b 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -152,15 +152,117 @@
}
}
},
- "/v1/plc/productProgress": {
+ "/v1/device/config": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "璁惧"
+ ],
+ "summary": "璁剧疆璁惧涓�浜涢厤缃�",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.DeviceConfig"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/v1/device/list": {
"get": {
"produces": [
"application/json"
],
"tags": [
- "鑾峰彇鍔ㄦ�佹暟鎹�"
+ "璁惧"
+ ],
+ "summary": "鑾峰彇褰撳墠闈㈡澘缁戝畾鐨勮澶囧垪琛�",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.DeviceListResponse"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/v1/device/setCurrentDeviceId": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "璁惧"
+ ],
+ "summary": "璁剧疆褰撳墠璁惧id",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.SetCurrentDevice"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/v1/plc/productProgress": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鐢熶骇鏁伴噺"
],
"summary": "鑾峰彇鐢熶骇杩涘害",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetProductProgress"
+ }
+ }
+ ],
"responses": {
"200": {
"description": "鎴愬姛",
@@ -178,6 +280,25 @@
}
}
]
+ }
+ }
+ }
+ }
+ },
+ "/v1/plc/setProductNumber": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鐢熶骇鏁伴噺"
+ ],
+ "summary": "璁剧疆鐢熶骇鎬婚噺",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
}
}
}
@@ -305,6 +426,211 @@
}
}
},
+ "/v1/processModel/list": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "宸ヨ壓妯″瀷"
+ ],
+ "summary": "鑾峰彇宸ヨ壓妯″瀷鍒楄〃",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "褰撳墠鐨勫伐搴廼d",
+ "name": "procedureId",
+ "in": "query",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.ProcessModel"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/v1/reportWork/list": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ュ伐"
+ ],
+ "summary": "鎶ュ伐鍒楄〃",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "宸ュ簭id",
+ "name": "procedureId",
+ "in": "query",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.ReportWork"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/v1/reportWork/report": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ュ伐"
+ ],
+ "summary": "涓婃姤",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.ReportWork"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/v1/system/problemList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺"
+ ],
+ "summary": "闂璇婃柇/闂鍒楄〃",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/problem.CheckResult"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/v1/task/countdown": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Task"
+ ],
+ "summary": "鏂颁换鍔″�掕鏃�",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.TaskCountdown"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/v1/task/finish/{id}": {
"put": {
"produces": [
@@ -342,6 +668,40 @@
"Task"
],
"summary": "鑾峰彇浠诲姟",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "enum": [
+ 1,
+ 2,
+ 3
+ ],
+ "type": "integer",
+ "x-enum-comments": {
+ "TaskModeCurrent": "鏈紑濮嬬殑鍜岃繘琛屼腑鐨�",
+ "TaskModeLastFinished": "涓婁竴涓粨鏉熺殑",
+ "TaskModeUnStarted": "鏈紑濮嬬殑"
+ },
+ "x-enum-varnames": [
+ "TaskModeUnStarted",
+ "TaskModeCurrent",
+ "TaskModeLastFinished"
+ ],
+ "name": "taskMode",
+ "in": "query"
+ }
+ ],
"responses": {
"200": {
"description": "鎴愬姛",
@@ -354,7 +714,7 @@
"type": "object",
"properties": {
"data": {
- "$ref": "#/definitions/response.TaskData"
+ "$ref": "#/definitions/response.TaskResponse"
}
}
}
@@ -364,7 +724,82 @@
}
}
},
- "/v1/task/sendProcessParams/{id}": {
+ "/v1/task/list": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Task"
+ ],
+ "summary": "鑾峰彇浠诲姟鍒楄〃2",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "閫氶亾鍙枫�備笉浼犲彇鍏ㄩ儴鐨�",
+ "name": "channel",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "deviceID",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "榛樿3",
+ "name": "limit",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "榛樿0",
+ "name": "offset",
+ "in": "query"
+ },
+ {
+ "enum": [
+ 1,
+ 2,
+ 3
+ ],
+ "type": "integer",
+ "x-enum-varnames": [
+ "QueryTypeUnFinish",
+ "QueryTypeToday",
+ "QueryTypeFinished"
+ ],
+ "description": "1 鏈畬鎴� 2 浠婂ぉ鏈畬鎴� 3 宸插畬鎴�",
+ "name": "type",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "object",
+ "additionalProperties": {
+ "$ref": "#/definitions/response.TaskResponse"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/v1/task/sendProcessParams": {
"post": {
"produces": [
"application/json"
@@ -372,14 +807,16 @@
"tags": [
"Task"
],
- "summary": "涓嬪彂宸ヨ壓鍙傛暟",
+ "summary": "涓嬪彂宸ヨ壓鍙傛暟锛堝紑濮嬩换鍔★級",
"parameters": [
{
- "type": "integer",
- "description": "宸ュ簭id",
- "name": "id",
- "in": "path",
- "required": true
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.SendProcessParams"
+ }
}
],
"responses": {
@@ -400,7 +837,7 @@
"tags": [
"Task"
],
- "summary": "浠诲姟寮�濮�",
+ "summary": "浠诲姟寮�濮嬶紙鑾峰彇宸ヨ壓鍙傛暟锛�",
"parameters": [
{
"type": "integer",
@@ -427,6 +864,36 @@
}
}
]
+ }
+ }
+ }
+ }
+ },
+ "/v1/task/updateProcessParams": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Task"
+ ],
+ "summary": "鏇存柊宸ヨ壓鍙傛暟锛堣繘琛屼腑鐨勪换鍔★級",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.SendProcessParams"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
}
}
}
@@ -474,6 +941,17 @@
"common.ProductProcedure": {
"type": "object",
"properties": {
+ "allProcedureNames": {
+ "description": "鎵�灞炲伐鍗曞伐搴忓垪琛�",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "channel": {
+ "description": "閫氶亾搴忓彿",
+ "type": "integer"
+ },
"deviceId": {
"type": "string"
},
@@ -509,6 +987,9 @@
"procedureName": {
"type": "string"
},
+ "productProcedureID": {
+ "type": "string"
+ },
"startTime": {
"type": "integer"
},
@@ -524,6 +1005,136 @@
}
}
},
+ "conf.Prompt": {
+ "type": "object",
+ "properties": {
+ "plcNotConnected": {
+ "type": "string"
+ },
+ "safeProduce": {
+ "type": "string"
+ }
+ }
+ },
+ "constvar.Parity": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3
+ ],
+ "x-enum-comments": {
+ "ParityEven": "濂囨牎楠�",
+ "ParityNull": "鏃犳牎楠�",
+ "ParityOdd": "鍋舵牎楠�"
+ },
+ "x-enum-varnames": [
+ "ParityEven",
+ "ParityOdd",
+ "ParityNull"
+ ]
+ },
+ "constvar.PlcMethod": {
+ "type": "string",
+ "enum": [
+ "modbusTCP",
+ "modbusRTU",
+ "serial",
+ "缃戠粶",
+ "涓插彛"
+ ],
+ "x-enum-varnames": [
+ "PlcMethodModbusTCP",
+ "PlcMethodModbusRTU",
+ "PlcMethodSerial",
+ "PlcMethodModbusTCPChinese",
+ "PlcMethodSerialChinese"
+ ]
+ },
+ "constvar.PlcStartAddressType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-varnames": [
+ "PlcStartAddressTypeFinishNumber",
+ "PlcStartAddressTypeTotalNumber"
+ ]
+ },
+ "constvar.PlcStartAddressValueType": {
+ "type": "string",
+ "enum": [
+ "string",
+ "int16",
+ "int32"
+ ],
+ "x-enum-varnames": [
+ "PlcStartAddressValueTypeString",
+ "PlcStartAddressValueTypeInt16",
+ "PlcStartAddressValueTypeInt32"
+ ]
+ },
+ "constvar.ProblemCode": {
+ "type": "string",
+ "enum": [
+ "service",
+ "network",
+ "db",
+ "serf",
+ "cloud",
+ "device",
+ "process_model",
+ "plc_config",
+ "plc_address_list",
+ "plc_process_model_address_list",
+ "plc_connect"
+ ],
+ "x-enum-comments": {
+ "ProblemCodeCloud": "鏈繛鎺ヤ簯绔�",
+ "ProblemCodeDB": "鏁版嵁搴撹繛鎺ラ敊璇�",
+ "ProblemCodeDevice": "鏈粦瀹氳澶�",
+ "ProblemCodeNetwork": "缃戠粶閿欒",
+ "ProblemCodePlcAddressList": "plc鍦板潃琛ㄧ己澶�",
+ "ProblemCodePlcConfig": "plc閰嶇疆缂哄け",
+ "ProblemCodePlcConnect": "plc杩炴帴澶辫触",
+ "ProblemCodePlcProcessModelAddressList": "plc鍦板潃琛ㄧ己澶�",
+ "ProblemCodeProcessModel": "宸ヨ壓鍙傛暟缂哄け",
+ "ProblemCodeSerf": "鏈姞鍏erf闆嗙兢",
+ "ProblemCodeService": "鏈嶅姟涓嶅彲鐢�"
+ },
+ "x-enum-varnames": [
+ "ProblemCodeService",
+ "ProblemCodeNetwork",
+ "ProblemCodeDB",
+ "ProblemCodeSerf",
+ "ProblemCodeCloud",
+ "ProblemCodeDevice",
+ "ProblemCodeProcessModel",
+ "ProblemCodePlcConfig",
+ "ProblemCodePlcAddressList",
+ "ProblemCodePlcProcessModelAddressList",
+ "ProblemCodePlcConnect"
+ ]
+ },
+ "constvar.TaskMode": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3
+ ],
+ "x-enum-comments": {
+ "TaskModeCurrent": "鏈紑濮嬬殑鍜岃繘琛屼腑鐨�",
+ "TaskModeLastFinished": "涓婁竴涓粨鏉熺殑",
+ "TaskModeUnStarted": "鏈紑濮嬬殑"
+ },
+ "x-enum-varnames": [
+ "TaskModeUnStarted",
+ "TaskModeCurrent",
+ "TaskModeLastFinished"
+ ]
+ },
"contextx.Response": {
"type": "object",
"properties": {
@@ -536,13 +1147,43 @@
}
}
},
+ "contextx.ResponseList": {
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "integer"
+ },
+ "data": {},
+ "msg": {
+ "type": "string"
+ },
+ "total": {
+ "type": "integer"
+ }
+ }
+ },
"model.DevicePlc": {
"type": "object",
"properties": {
"address": {
+ "description": "plc ip鍦板潃锛� method = modbusTCP鐢�",
"type": "string"
},
+ "baudRate": {
+ "description": "涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�",
+ "type": "integer"
+ },
"brand": {
+ "type": "string"
+ },
+ "createdAt": {
+ "type": "string"
+ },
+ "dataBit": {
+ "description": "鏁版嵁浣嶏紝method = modbusRTU 鐢�",
+ "type": "integer"
+ },
+ "deletedAt": {
"type": "string"
},
"details": {
@@ -551,8 +1192,9 @@
"$ref": "#/definitions/model.DevicePlcAddress"
}
},
- "frequency": {
- "type": "integer"
+ "deviceID": {
+ "description": "璁惧缂栧彿",
+ "type": "string"
},
"id": {
"type": "integer"
@@ -561,12 +1203,29 @@
"type": "boolean"
},
"method": {
- "type": "string"
+ "$ref": "#/definitions/constvar.PlcMethod"
+ },
+ "parity": {
+ "description": "鏍￠獙鏂瑰紡锛宮ethod = modbusRTU 鐢�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.Parity"
+ }
+ ]
},
"port": {
+ "description": "plc 绔彛鍙凤紝 method = modbusTCP鐢�",
"type": "integer"
},
- "portName": {
+ "serialName": {
+ "description": "涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�",
+ "type": "string"
+ },
+ "stopBit": {
+ "description": "鍋滄浣嶏紝method = modbusRTU 鐢�",
+ "type": "integer"
+ },
+ "updatedAt": {
"type": "string"
}
}
@@ -574,9 +1233,17 @@
"model.DevicePlcAddress": {
"type": "object",
"properties": {
+ "channel": {
+ "description": "鏁版嵁璧峰鍦板潃",
+ "type": "integer"
+ },
"fieldName": {
"description": "瀵瑰簲绯荤粺瀛楁",
- "type": "integer"
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.PlcStartAddressType"
+ }
+ ]
},
"length": {
"description": "鏁版嵁闀垮害",
@@ -588,7 +1255,11 @@
},
"type": {
"description": "鏁版嵁绫诲瀷",
- "type": "string"
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.PlcStartAddressValueType"
+ }
+ ]
}
}
},
@@ -601,6 +1272,12 @@
"networkCard"
],
"properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
"dns": {
"description": "dns",
"type": "string"
@@ -631,6 +1308,9 @@
"$ref": "#/definitions/model.NetConfigStatus"
}
]
+ },
+ "updatedAt": {
+ "type": "string"
}
}
},
@@ -655,13 +1335,22 @@
"amount": {
"type": "number"
},
+ "createdAt": {
+ "type": "string"
+ },
"customer": {
+ "type": "string"
+ },
+ "deletedAt": {
"type": "string"
},
"deliverDate": {
"type": "string"
},
"endTime": {
+ "type": "integer"
+ },
+ "id": {
"type": "integer"
},
"orderAttr": {
@@ -689,6 +1378,9 @@
"unit": {
"type": "string"
},
+ "updatedAt": {
+ "type": "string"
+ },
"workOrderId": {
"type": "string"
}
@@ -698,20 +1390,31 @@
"type": "integer",
"enum": [
1,
- 2
+ 2,
+ 3
],
"x-enum-varnames": [
- "OrderStatusUnFinished",
+ "OrderStatusWaitProcess",
+ "OrderStatusProcessing",
"OrderStatusFinished"
]
},
"model.PlcBrand": {
"type": "object",
"properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
"id": {
"type": "integer"
},
"name": {
+ "type": "string"
+ },
+ "updatedAt": {
"type": "string"
}
}
@@ -720,16 +1423,31 @@
"type": "integer",
"enum": [
1,
- 2
+ 2,
+ 3
],
"x-enum-varnames": [
- "ProcedureStatusUnFinished",
+ "ProcedureStatusWaitProcess",
+ "ProcedureStatusProcessing",
"ProcedureStatusFinished"
]
},
"model.Procedures": {
"type": "object",
"properties": {
+ "channel": {
+ "description": "閫氶亾",
+ "type": "integer"
+ },
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
+ "deviceId": {
+ "type": "string"
+ },
"endTime": {
"type": "integer"
},
@@ -744,21 +1462,261 @@
}
]
},
+ "procedureId": {
+ "type": "string"
+ },
+ "processModelNumber": {
+ "description": "宸ヨ壓妯″瀷缂栧彿",
+ "type": "string"
+ },
+ "productProcedureID": {
+ "description": "浜у搧宸ュ簭id",
+ "type": "string"
+ },
+ "realEndTime": {
+ "type": "integer"
+ },
+ "realStartTime": {
+ "type": "integer"
+ },
"startTime": {
"type": "integer"
},
"status": {
"$ref": "#/definitions/model.ProcedureStatus"
+ },
+ "updatedAt": {
+ "type": "string"
+ }
+ }
+ },
+ "model.ProcessModel": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
+ "deviceId": {
+ "description": "鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅",
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "isUpdate": {
+ "description": "鍓嶇鐢�",
+ "type": "boolean"
+ },
+ "newNumber": {
+ "type": "string"
+ },
+ "newParamsMap": {
+ "type": "object",
+ "additionalProperties": true
+ },
+ "number": {
+ "description": "宸ヨ壓妯″瀷缂栧彿",
+ "type": "string"
+ },
+ "params": {
+ "type": "string"
+ },
+ "paramsMap": {
+ "type": "object",
+ "additionalProperties": true
+ },
+ "procedure": {
+ "description": "宸ュ簭",
+ "type": "string"
+ },
+ "product": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "updatedAt": {
+ "type": "string"
+ }
+ }
+ },
+ "model.ReportWork": {
+ "type": "object",
+ "properties": {
+ "barCode": {
+ "description": "鏉″舰鐮�",
+ "type": "string"
+ },
+ "channel": {
+ "description": "閫氶亾",
+ "type": "integer"
+ },
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
+ "deviceId": {
+ "type": "string"
+ },
+ "deviceName": {
+ "type": "string"
+ },
+ "endTime": {
+ "type": "integer"
+ },
+ "finishAmount": {
+ "description": "鏈鎶ュ伐 - 涓婃鎶ュ伐",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "procedureId": {
+ "type": "string"
+ },
+ "proceduresId": {
+ "description": "procedures琛ㄧ殑id",
+ "type": "integer"
+ },
+ "productProcedureID": {
+ "description": "浜у搧宸ュ簭id",
+ "type": "string"
+ },
+ "reportAmount": {
+ "description": "鎶ュ伐鏁伴噺",
+ "type": "integer"
+ },
+ "startTime": {
+ "type": "integer"
+ },
+ "updatedAt": {
+ "type": "string"
+ },
+ "workOrderId": {
+ "type": "string"
+ },
+ "workerID": {
+ "description": "鎶ュ伐浜篿d",
+ "type": "string"
+ },
+ "workerName": {
+ "description": "鎶ュ伐浜哄鍚�",
+ "type": "string"
+ },
+ "workerTime": {
+ "description": "宸ユ椂锛屽崟浣嶇",
+ "type": "integer"
+ }
+ }
+ },
+ "problem.CheckResult": {
+ "type": "object",
+ "properties": {
+ "checkResult": {
+ "type": "boolean"
+ },
+ "itemCode": {
+ "$ref": "#/definitions/constvar.ProblemCode"
+ },
+ "itemName": {
+ "type": "string"
}
}
},
"request.AddPlcBrand": {
"type": "object",
"properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
"id": {
"type": "integer"
},
"name": {
+ "type": "string"
+ },
+ "updatedAt": {
+ "type": "string"
+ }
+ }
+ },
+ "request.DeviceConfig": {
+ "type": "object",
+ "properties": {
+ "needSetProcessParams": {
+ "description": "鏄惁闇�瑕佽缃伐鑹哄弬鏁�",
+ "type": "boolean"
+ }
+ }
+ },
+ "request.GetProductProgress": {
+ "type": "object",
+ "properties": {
+ "channel": {
+ "type": "integer"
+ },
+ "procedureId": {
+ "type": "integer"
+ }
+ }
+ },
+ "request.QueryType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3
+ ],
+ "x-enum-varnames": [
+ "QueryTypeUnFinish",
+ "QueryTypeToday",
+ "QueryTypeFinished"
+ ]
+ },
+ "request.ReportWork": {
+ "type": "object",
+ "required": [
+ "procedureId",
+ "reportAmount",
+ "workerID"
+ ],
+ "properties": {
+ "procedureId": {
+ "description": "宸ュ簭id",
+ "type": "integer"
+ },
+ "reportAmount": {
+ "description": "鎶ュ伐鏁伴噺",
+ "type": "integer"
+ },
+ "workerID": {
+ "description": "鎶ュ憡鑰卛d",
+ "type": "string"
+ }
+ }
+ },
+ "request.SendProcessParams": {
+ "type": "object",
+ "required": [
+ "procedureId"
+ ],
+ "properties": {
+ "procedureId": {
+ "type": "integer"
+ }
+ }
+ },
+ "request.SetCurrentDevice": {
+ "type": "object",
+ "properties": {
+ "currentDeviceID": {
+ "description": "褰撳墠閫夊畾鐨勭敓浜ц澶�",
"type": "string"
}
}
@@ -767,9 +1725,24 @@
"type": "object",
"properties": {
"address": {
+ "description": "plc ip鍦板潃锛� method = modbusTCP鐢�",
"type": "string"
},
+ "baudRate": {
+ "description": "涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�",
+ "type": "integer"
+ },
"brand": {
+ "type": "string"
+ },
+ "createdAt": {
+ "type": "string"
+ },
+ "dataBit": {
+ "description": "鏁版嵁浣嶏紝method = modbusRTU 鐢�",
+ "type": "integer"
+ },
+ "deletedAt": {
"type": "string"
},
"details": {
@@ -778,8 +1751,9 @@
"$ref": "#/definitions/model.DevicePlcAddress"
}
},
- "frequency": {
- "type": "integer"
+ "deviceID": {
+ "description": "璁惧缂栧彿",
+ "type": "string"
},
"id": {
"type": "integer"
@@ -788,12 +1762,29 @@
"type": "boolean"
},
"method": {
- "type": "string"
+ "$ref": "#/definitions/constvar.PlcMethod"
+ },
+ "parity": {
+ "description": "鏍￠獙鏂瑰紡锛宮ethod = modbusRTU 鐢�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.Parity"
+ }
+ ]
},
"port": {
+ "description": "plc 绔彛鍙凤紝 method = modbusTCP鐢�",
"type": "integer"
},
- "portName": {
+ "serialName": {
+ "description": "涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�",
+ "type": "string"
+ },
+ "stopBit": {
+ "description": "鍋滄浣嶏紝method = modbusRTU 鐢�",
+ "type": "integer"
+ },
+ "updatedAt": {
"type": "string"
}
}
@@ -801,11 +1792,75 @@
"request.UpdatePlcBrand": {
"type": "object",
"properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
"id": {
"type": "integer"
},
"name": {
"type": "string"
+ },
+ "updatedAt": {
+ "type": "string"
+ }
+ }
+ },
+ "response.Device": {
+ "type": "object",
+ "properties": {
+ "deviceID": {
+ "type": "string"
+ },
+ "deviceName": {
+ "type": "string"
+ },
+ "needSetProcessParams": {
+ "description": "鏄惁闇�瑕佽缃伐鑹哄弬鏁�",
+ "type": "boolean"
+ }
+ }
+ },
+ "response.DeviceListResponse": {
+ "type": "object",
+ "properties": {
+ "clusterNodeQuantity": {
+ "description": "闆嗙兢鑺傜偣鏁伴噺",
+ "type": "integer"
+ },
+ "clusterStatus": {
+ "description": "闆嗙兢鐘舵��",
+ "type": "string"
+ },
+ "currentDeviceID": {
+ "description": "褰撳墠閫夊畾鐨勭敓浜ц澶�",
+ "type": "string"
+ },
+ "deviceList": {
+ "description": "鐢熶骇璁惧id鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.Device"
+ }
+ },
+ "systemDeviceID": {
+ "description": "宸ユ帶鏈鸿澶嘔D",
+ "type": "string"
+ },
+ "systemDeviceRunSince": {
+ "description": "绯荤粺杩愯寮�濮嬫椂闂存埑",
+ "type": "integer"
+ },
+ "systemDeviceStatus": {
+ "description": "璁惧鐘舵��",
+ "allOf": [
+ {
+ "$ref": "#/definitions/response.SystemDeviceStatus"
+ }
+ ]
}
}
},
@@ -850,19 +1905,74 @@
"response.ProductProgress": {
"type": "object",
"properties": {
+ "RealEndTime": {
+ "type": "integer"
+ },
+ "RealStartTime": {
+ "type": "integer"
+ },
"finishNumber": {
"type": "integer"
+ },
+ "plcStatus": {
+ "type": "integer"
+ },
+ "totalNumber": {
+ "type": "integer"
+ }
+ }
+ },
+ "response.SystemDeviceStatus": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-comments": {
+ "SystemDeviceStatusNormal": "姝ｅ父",
+ "SystemDeviceStatusUnNormal": "寮傚父"
+ },
+ "x-enum-varnames": [
+ "SystemDeviceStatusNormal",
+ "SystemDeviceStatusUnNormal"
+ ]
+ },
+ "response.TaskCountdown": {
+ "type": "object",
+ "properties": {
+ "countDownHour": {
+ "description": "鍊掕鏃� 鏃�",
+ "type": "integer"
+ },
+ "countDownMinute": {
+ "description": "鍊掕鏃� 鍒�",
+ "type": "integer"
+ },
+ "showCountDown": {
+ "description": "鏄惁灞曠ず鍊掕鏃�",
+ "type": "boolean"
}
}
},
"response.TaskData": {
"type": "object",
"properties": {
- "deviceName": {
- "type": "string"
+ "allProcedures": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
},
- "deviceStatus": {
- "type": "string"
+ "canStarted": {
+ "description": "鏄惁鍙互寮�濮嬬敓浜�",
+ "type": "boolean"
+ },
+ "channel": {
+ "description": "褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜閫氶亾",
+ "type": "integer"
+ },
+ "currentProcedureIndex": {
+ "type": "integer"
},
"order": {
"$ref": "#/definitions/model.Order"
@@ -871,6 +1981,41 @@
"$ref": "#/definitions/model.Procedures"
}
}
+ },
+ "response.TaskResponse": {
+ "type": "object",
+ "properties": {
+ "channelAmount": {
+ "description": "閫氶亾鏁伴噺",
+ "type": "integer"
+ },
+ "prompt": {
+ "description": "鎻愮ず璇�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/conf.Prompt"
+ }
+ ]
+ },
+ "taskCount": {
+ "description": "浠诲姟鏁伴噺",
+ "type": "integer"
+ },
+ "tasks": {
+ "description": "浠诲姟鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.TaskData"
+ }
+ },
+ "workers": {
+ "description": "浜哄憳鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/common.ProcedureWorker"
+ }
+ }
+ }
}
}
}`
--
Gitblit v1.8.0