aps/apsClient.git

			@@ -153,7 +153,7 @@
			}
			},
			"/v1/plc/productProgress": {
			"get": {
			"post": {
			"produces": [
			"application/json"
			],
			@@ -161,6 +161,48 @@
			"生产数量"
			],
			"summary": "获取生产进度",
			"parameters": [
			{
			"description": "查询参数",
			"name": "object",
			"in": "body",
			"required": true,
			"schema": {
			"$ref": "#/definitions/request.SendProcessParams"
			}
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"allOf": [
			{
			"$ref": "#/definitions/contextx.Response"
			},
			{
			"type": "object",
			"properties": {
			"data": {
			"$ref": "#/definitions/response.ProductProgress"
			}
			}
			}
			]
			}
			}
			}
			}
			},
			"/v1/plc/productProgressRealTime": {
			"post": {
			"produces": [
			"application/json"
			],
			"tags": [
			"生产数量"
			],
			"summary": "实时获取生产进度",
			"responses": {
			"200": {
			"description": "成功",
			@@ -392,6 +434,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": "成功",
			@@ -404,7 +480,7 @@
			"type": "object",
			"properties": {
			"data": {
			"$ref": "#/definitions/response.TaskData"
			"$ref": "#/definitions/response.TaskResponse"
			}
			}
			}
			@@ -414,7 +490,7 @@
			}
			}
			},
			"/v1/task/sendProcessParams/{id}": {
			"/v1/task/sendProcessParams": {
			"post": {
			"produces": [
			"application/json"
			@@ -422,14 +498,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": {
			@@ -450,7 +528,7 @@
			"tags": [
			"Task"
			],
			"summary": "任务开始",
			"summary": "任务开始（获取工艺参数）",
			"parameters": [
			{
			"type": "integer",
			@@ -524,6 +602,17 @@
			"common.ProductProcedure": {
			"type": "object",
			"properties": {
			"allProcedureNames": {
			"description": "所属工单工序列表",
			"type": "array",
			"items": {
			"type": "string"
			}
			},
			"channel": {
			"description": "通道序号",
			"type": "integer"
			},
			"deviceId": {
			"type": "string"
			},
			@@ -574,15 +663,30 @@
			}
			}
			},
			"conf.Prompt": {
			"type": "object",
			"properties": {
			"plcNotConnected": {
			"type": "string"
			},
			"safeProduce": {
			"type": "string"
			}
			}
			},
			"constvar.PlcMethod": {
			"type": "string",
			"enum": [
			"modbusTCP",
			"serial"
			"serial",
			"网络",
			"串口"
			],
			"x-enum-varnames": [
			"PlcMethodModbusTCP",
			"PlcMethodSerial"
			"PlcMethodSerial",
			"PlcMethodModbusTCPChinese",
			"PlcMethodSerialChinese"
			]
			},
			"constvar.PlcStartAddressType": {
			@@ -607,6 +711,24 @@
			"PlcStartAddressValueTypeInt"
			]
			},
			"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": {
			@@ -623,7 +745,7 @@
			"type": "object",
			"properties": {
			"address": {
			"description": "PortName string ` + "`" + `gorm:\"type:varchar(191);comment:端口名称\" json:\"portName\"` + "`" + `\nFrequency int ` + "`" + `gorm:\"type:int(11);comment:数据更新频率 0-实时更新 1-1次/秒\" json:\"frequency\"` + "`" + `",
			"description": "PortName string ` + "`" + `gorm:\"type:varchar(191);comment:端口名称\" json:\"portName\"` + "`" + `\nFrequency int ` + "`" + `gorm:\"comment:数据更新频率 0-实时更新 1-1次/秒\" json:\"frequency\"` + "`" + `",
			"type": "string"
			},
			"baudRate": {
			@@ -661,6 +783,10 @@
			"model.DevicePlcAddress": {
			"type": "object",
			"properties": {
			"channel": {
			"description": "数据起始地址",
			"type": "integer"
			},
			"fieldName": {
			"description": "对应系统字段",
			"allOf": [
			@@ -793,10 +919,12 @@
			"type": "integer",
			"enum": [
			1,
			2
			2,
			3
			],
			"x-enum-varnames": [
			"OrderStatusUnFinished",
			"OrderStatusWaitProcess",
			"OrderStatusProcessing",
			"OrderStatusFinished"
			]
			},
			@@ -815,16 +943,25 @@
			"type": "integer",
			"enum": [
			1,
			2
			2,
			3
			],
			"x-enum-varnames": [
			"ProcedureStatusUnFinished",
			"ProcedureStatusWaitProcess",
			"ProcedureStatusProcessing",
			"ProcedureStatusFinished"
			]
			},
			"model.Procedures": {
			"type": "object",
			"properties": {
			"channel": {
			"description": "通道",
			"type": "integer"
			},
			"deviceId": {
			"type": "string"
			},
			"endTime": {
			"type": "integer"
			},
			@@ -838,6 +975,9 @@
			"$ref": "#/definitions/common.ProductProcedure"
			}
			]
			},
			"procedureId": {
			"type": "string"
			},
			"startTime": {
			"type": "integer"
			@@ -858,11 +998,25 @@
			}
			}
			},
			"request.SendProcessParams": {
			"type": "object",
			"required": [
			"procedureId"
			],
			"properties": {
			"channel": {
			"type": "integer"
			},
			"procedureId": {
			"type": "integer"
			}
			}
			},
			"request.UpdatePlc": {
			"type": "object",
			"properties": {
			"address": {
			"description": "PortName string ` + "`" + `gorm:\"type:varchar(191);comment:端口名称\" json:\"portName\"` + "`" + `\nFrequency int ` + "`" + `gorm:\"type:int(11);comment:数据更新频率 0-实时更新 1-1次/秒\" json:\"frequency\"` + "`" + `",
			"description": "PortName string ` + "`" + `gorm:\"type:varchar(191);comment:端口名称\" json:\"portName\"` + "`" + `\nFrequency int ` + "`" + `gorm:\"comment:数据更新频率 0-实时更新 1-1次/秒\" json:\"frequency\"` + "`" + `",
			"type": "string"
			},
			"baudRate": {
			@@ -952,6 +1106,9 @@
			"finishNumber": {
			"type": "integer"
			},
			"plcStatus": {
			"type": "integer"
			},
			"totalNumber": {
			"type": "integer"
			}
			@@ -977,11 +1134,22 @@
			"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"
			@@ -990,6 +1158,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"
			}
			}
			}
			}
			}
			}`