Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

zhangqian

2024-01-12 a10d59528a36dc5a1fbe4d9caa6b4abf25ab828c

 docs/swagger.json

@@ -1918,6 +1918,38 @@
                }
            }
        },
        "/api-wms/v1/product/getUserInfo": {
            "get": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "产品"
                ],
                "summary": "获取登录用户信息",
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.ResponseList"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "type": "object",
                                            "additionalProperties": true
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/api-wms/v1/product/listDisuse": {
            "post": {
                "produces": [
@@ -2736,12 +2768,26 @@
            "enum": [
                "原材料",
                "半成品",
                "成品"
                "成品",
                "辅料",
                "耗材",
                "其他",
                "虚拟件"
            ],
            "x-enum-comments": {
                "MaterialModeAuxiliary": "辅料",
                "MaterialModeConsumables": "耗材",
                "MaterialModeOther": "其他",
                "MaterialModeVirtual": "虚拟件, 不能销售，不能出入库，不能采购"
            },
            "x-enum-varnames": [
                "MaterialModeRaw",
                "MaterialModeSemi",
                "MaterialModeFinished"
                "MaterialModeFinished",
                "MaterialModeAuxiliary",
                "MaterialModeConsumables",
                "MaterialModeOther",
                "MaterialModeVirtual"
            ]
        },
        "constvar.OperationStatus": {
@@ -3340,7 +3386,10 @@
                        "$ref": "#/definitions/models.OperationDetails"
                    }
                },
                "fromLocation": {
                "id": {
                    "type": "integer"
                },
                "location": {
                    "description": "源位置",
                    "allOf": [
                        {
@@ -3348,11 +3397,8 @@
                        }
                    ]
                },
                "fromLocationId": {
                "locationID": {
                    "description": "源位置id",
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
                "logisticCompany": {
@@ -3370,6 +3416,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "FromLocationID    int                      `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:源位置id\"`         //源位置id\nFromLocation      Location                 `json:\"fromLocation\"     gorm:\"foreignKey:FromLocationID;references:Id\"` //源位置\nToLocationID      int                      `json:\"toLocationId\"    gorm:\"type:int;not null;comment:目标位置id\"`         //目标位置id\nToLocation        Location                 `json:\"toLocation\"      gorm:\"foreignKey:ToLocationID;references:Id\"`    //目标位置",
                    "type": "string"
                },
                "operationTypeId": {
@@ -3439,6 +3486,18 @@
                "createTime": {
                    "type": "string"
                },
                "fromLocation": {
                    "description": "源位置",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.Location"
                        }
                    ]
                },
                "fromLocationId": {
                    "description": "源位置id",
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
@@ -3457,6 +3516,18 @@
                "productId": {
                    "description": "产品id",
                    "type": "string"
                },
                "toLocation": {
                    "description": "目标位置",
                    "allOf": [
                        {
                            "$ref": "#/definitions/models.Location"
                        }
                    ]
                },
                "toLocationId": {
                    "description": "目标位置id",
                    "type": "integer"
                },
                "updateTime": {
                    "type": "string"
@@ -3769,11 +3840,11 @@
                        "$ref": "#/definitions/request.OperationDetails"
                    }
                },
                "fromLocationId": {
                    "description": "源位置id",
                "id": {
                    "type": "integer"
                },
                "id": {
                "locationId": {
                    "description": "源位置id",
                    "type": "integer"
                },
                "logisticCompanyId": {
@@ -3788,7 +3859,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "安排日期",
                    "description": "FromLocationId    int                      `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:源位置id\"`   //源位置id\nToLocationId      int                      `json:\"toLocationId\"    gorm:\"type:int;not null;comment:目标位置id\"`   //目标位置id",
                    "type": "string"
                },
                "operationTypeId": {
@@ -4212,9 +4283,17 @@
                    "description": "ProductName string          `json:\"productName\" gorm:\"type:varchar(255);not null;comment:产品名称\"` //产品名称",
                    "type": "number"
                },
                "fromLocationId": {
                    "description": "Unit        string          `json:\"unit\" gorm:\"type:varchar(31);comment:单位\"`                    //单位\nProduct models.Material `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"`",
                    "type": "integer"
                },
                "productId": {
                    "description": "产品id",
                    "type": "string"
                },
                "toLocationId": {
                    "description": "目标位置id",
                    "type": "integer"
                }
            }
        },
@@ -4477,11 +4556,11 @@
                        "$ref": "#/definitions/request.OperationDetails"
                    }
                },
                "fromLocationId": {
                    "description": "源位置id",
                "id": {
                    "type": "integer"
                },
                "id": {
                "locationId": {
                    "description": "源位置id",
                    "type": "integer"
                },
                "logisticCompanyId": {
@@ -4496,7 +4575,7 @@
                    "type": "string"
                },
                "operationDate": {
                    "description": "安排日期",
                    "description": "FromLocationId    int                        `json:\"fromLocationId\"   gorm:\"type:int;not null;comment:源位置id\"`   //源位置id\nToLocationId      int                        `json:\"toLocationId\"    gorm:\"type:int;not null;comment:目标位置id\"`   //目标位置id",
                    "type": "string"
                },
                "operationTypeId": {