排程任务下发增加productProcedureID，报工表和工序表增加productProcedureID

zhangqian

2023-11-27 dcf393c077af5638ea12c05dd6e1754fa535be20

 docs/docs.go

@@ -492,13 +492,23 @@
                "summary": "报工列表",
                "parameters": [
                    {
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.ReportWorkList"
                        }
                        "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": {
@@ -975,6 +985,9 @@
                    "type": "string"
                },
                "procedureName": {
                    "type": "string"
                },
                "productProcedureID": {
                    "type": "string"
                },
                "startTime": {
@@ -1456,6 +1469,10 @@
                    "description": "工艺模型编号",
                    "type": "string"
                },
                "productProcedureID": {
                    "description": "产品工序id",
                    "type": "string"
                },
                "realEndTime": {
                    "type": "integer"
                },
@@ -1527,6 +1544,10 @@
        "model.ReportWork": {
            "type": "object",
            "properties": {
                "barCode": {
                    "description": "条形码",
                    "type": "string"
                },
                "channel": {
                    "description": "通道",
                    "type": "integer"
@@ -1546,6 +1567,10 @@
                "endTime": {
                    "type": "integer"
                },
                "finishAmount": {
                    "description": "本次报工 - 上次报工",
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
@@ -1554,6 +1579,14 @@
                },
                "proceduresId": {
                    "description": "procedures表的id",
                    "type": "integer"
                },
                "productProcedureID": {
                    "description": "产品工序id",
                    "type": "string"
                },
                "reportAmount": {
                    "description": "报工数量",
                    "type": "integer"
                },
                "startTime": {
@@ -1572,6 +1605,10 @@
                "workerName": {
                    "description": "报工人姓名",
                    "type": "string"
                },
                "workerTime": {
                    "description": "工时，单位秒",
                    "type": "integer"
                }
            }
        },
@@ -1623,6 +1660,9 @@
            "properties": {
                "channel": {
                    "type": "integer"
                },
                "procedureId": {
                    "type": "integer"
                }
            }
        },
@@ -1658,26 +1698,6 @@
                "workerID": {
                    "description": "报告者id",
                    "type": "string"
                }
            }
        },
        "request.ReportWorkList": {
            "type": "object",
            "required": [
                "procedureId"
            ],
            "properties": {
                "page": {
                    "description": "页码",
                    "type": "integer"
                },
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                },
                "procedureId": {
                    "description": "工序id",
                    "type": "integer"
                }
            }
        },