任务接收增加channel字段，postion字段改为channel

zhangqian

2023-09-23 14fc2f577e2c0b7b146c1a430e9438f317ad5b0c

 docs/swagger.json

@@ -622,6 +622,10 @@
                        "type": "string"
                    }
                },
                "channel": {
                    "description": "通道序号",
                    "type": "integer"
                },
                "deviceId": {
                    "type": "string"
                },
@@ -763,6 +767,10 @@
        "model.DevicePlcAddress": {
            "type": "object",
            "properties": {
                "channel": {
                    "description": "数据起始地址",
                    "type": "integer"
                },
                "fieldName": {
                    "description": "对应系统字段",
                    "allOf": [
@@ -773,10 +781,6 @@
                },
                "length": {
                    "description": "数据长度",
                    "type": "integer"
                },
                "position": {
                    "description": "数据起始地址",
                    "type": "integer"
                },
                "startAddress": {
@@ -935,6 +939,10 @@
        "model.Procedures": {
            "type": "object",
            "properties": {
                "channel": {
                    "description": "通道",
                    "type": "integer"
                },
                "deviceId": {
                    "type": "string"
                },
@@ -942,10 +950,6 @@
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
                "position": {
                    "description": "每个设备可能有多个机位同时生产，用position表示位置",
                    "type": "integer"
                },
                "procedure": {
@@ -984,7 +988,7 @@
                "procedureId"
            ],
            "properties": {
                "position": {
                "channel": {
                    "type": "integer"
                },
                "procedureId": {
@@ -1124,15 +1128,15 @@
                    "description": "是否可以开始生产",
                    "type": "boolean"
                },
                "channel": {
                    "description": "当前任务在设备第几个通道",
                    "type": "integer"
                },
                "currentProcedureIndex": {
                    "type": "integer"
                },
                "order": {
                    "$ref": "#/definitions/model.Order"
                },
                "position": {
                    "description": "当前任务在设备第几个位置",
                    "type": "integer"
                },
                "procedure": {
                    "$ref": "#/definitions/model.Procedures"