From b3d87ae859f20f3bfb4d2e495d7a0f316900b670 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 28 十一月 2023 17:12:21 +0800
Subject: [PATCH] 获取生产进度接口有工序id参数从数据库查询实际开始时间和实际结束时间
---
docs/docs.go | 272 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 263 insertions(+), 9 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index df8f13f..935673b 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -152,6 +152,36 @@
}
}
},
+ "/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": [
@@ -451,6 +481,91 @@
}
}
},
+ "/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": [
@@ -554,11 +669,6 @@
],
"summary": "鑾峰彇浠诲姟",
"parameters": [
- {
- "type": "string",
- "name": "deviceID",
- "in": "query"
- },
{
"type": "integer",
"description": "椤电爜",
@@ -877,6 +987,9 @@
"procedureName": {
"type": "string"
},
+ "productProcedureID": {
+ "type": "string"
+ },
"startTime": {
"type": "integer"
},
@@ -953,11 +1066,13 @@
"type": "string",
"enum": [
"string",
- "int"
+ "int16",
+ "int32"
],
"x-enum-varnames": [
"PlcStartAddressValueTypeString",
- "PlcStartAddressValueTypeInt"
+ "PlcStartAddressValueTypeInt16",
+ "PlcStartAddressValueTypeInt32"
]
},
"constvar.ProblemCode": {
@@ -1029,6 +1144,21 @@
"data": {},
"msg": {
"type": "string"
+ }
+ }
+ },
+ "contextx.ResponseList": {
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "integer"
+ },
+ "data": {},
+ "msg": {
+ "type": "string"
+ },
+ "total": {
+ "type": "integer"
}
}
},
@@ -1339,6 +1469,10 @@
"description": "宸ヨ壓妯″瀷缂栧彿",
"type": "string"
},
+ "productProcedureID": {
+ "description": "浜у搧宸ュ簭id",
+ "type": "string"
+ },
"realEndTime": {
"type": "integer"
},
@@ -1407,6 +1541,77 @@
}
}
},
+ "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": {
@@ -1441,10 +1646,22 @@
}
}
},
+ "request.DeviceConfig": {
+ "type": "object",
+ "properties": {
+ "needSetProcessParams": {
+ "description": "鏄惁闇�瑕佽缃伐鑹哄弬鏁�",
+ "type": "boolean"
+ }
+ }
+ },
"request.GetProductProgress": {
"type": "object",
"properties": {
"channel": {
+ "type": "integer"
+ },
+ "procedureId": {
"type": "integer"
}
}
@@ -1461,6 +1678,28 @@
"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",
@@ -1570,6 +1809,21 @@
}
}
},
+ "response.Device": {
+ "type": "object",
+ "properties": {
+ "deviceID": {
+ "type": "string"
+ },
+ "deviceName": {
+ "type": "string"
+ },
+ "needSetProcessParams": {
+ "description": "鏄惁闇�瑕佽缃伐鑹哄弬鏁�",
+ "type": "boolean"
+ }
+ }
+ },
"response.DeviceListResponse": {
"type": "object",
"properties": {
@@ -1585,11 +1839,11 @@
"description": "褰撳墠閫夊畾鐨勭敓浜ц澶�",
"type": "string"
},
- "deviceIDList": {
+ "deviceList": {
"description": "鐢熶骇璁惧id鍒楄〃",
"type": "array",
"items": {
- "type": "string"
+ "$ref": "#/definitions/response.Device"
}
},
"systemDeviceID": {
--
Gitblit v1.8.0