Merge remote-tracking branch 'origin/jialian' into jialian

yinbentan

2024-07-16 33cb0eb308c1b62e25211600383371c31907025e

 docs/docs.go

@@ -2031,7 +2031,7 @@
                "tags": [
                    "入库/出库"
                ],
                "summary": "入库/出库列表",
                "summary": "操作详情接口",
                "parameters": [
                    {
                        "type": "string",
@@ -2039,13 +2039,32 @@
                        "name": "id",
                        "in": "path",
                        "required": true
                    },
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "$ref": "#/definitions/util.Response"
                            "allOf": [
                                {
                                    "$ref": "#/definitions/util.Response"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "$ref": "#/definitions/models.Operation"
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
@@ -2594,6 +2613,43 @@
                        "schema": {
                            "$ref": "#/definitions/request.UpdateDepartment"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "$ref": "#/definitions/util.Response"
                        }
                    }
                }
            }
        },
        "/api-wms/v1/other/saveProductImagesFromExcel": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "其他"
                ],
                "summary": "从excel中获取产品图片并保存",
                "parameters": [
                    {
                        "description": "属性信息",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/controllers.saveProductImagesFromExcelRequest"
                        }
                    },
                    {
                        "type": "string",
                        "description": "token",
                        "name": "Authorization",
                        "in": "header",
                        "required": true
                    }
                ],
                "responses": {
@@ -4377,6 +4433,27 @@
                "ReservationNever"
            ]
        },
        "controllers.saveProductImagesFromExcelRequest": {
            "type": "object",
            "properties": {
                "excelFilePath": {
                    "description": "excel路径 用docker cp传到容器里",
                    "type": "string"
                },
                "imageColumn": {
                    "description": "图片所在列名",
                    "type": "string"
                },
                "productIdColumnIndex": {
                    "description": "产品ID是第几列(从0开始)",
                    "type": "integer"
                },
                "sheetIndex": {
                    "description": "第几个sheet",
                    "type": "integer"
                }
            }
        },
        "gorm.DeletedAt": {
            "type": "object",
            "properties": {
@@ -5213,6 +5290,9 @@
                "custodianId": {
                    "type": "string"
                },
                "dealerType": {
                    "type": "string"
                },
                "details": {
                    "type": "array",
                    "items": {
@@ -5220,12 +5300,6 @@
                    }
                },
                "id": {
                    "type": "integer"
                },
                "inventoryDealer": {
                    "$ref": "#/definitions/models.MiniDict"
                },
                "inventoryDealerType": {
                    "type": "integer"
                },
                "isInternalOutput": {
@@ -5265,7 +5339,6 @@
                    "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"
                },
                "operationSource": {
@@ -5417,6 +5490,10 @@
                },
                "salePrice": {
                    "description": "销售单价",
                    "type": "number"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
                    "type": "number"
                },
                "toLocation": {
@@ -5983,6 +6060,9 @@
                "custodianId": {
                    "type": "string"
                },
                "dealerType": {
                    "type": "string"
                },
                "details": {
                    "type": "array",
                    "items": {
@@ -5990,9 +6070,6 @@
                    }
                },
                "id": {
                    "type": "integer"
                },
                "inventoryDealerType": {
                    "type": "integer"
                },
                "locationId": {
@@ -6314,9 +6391,9 @@
                    "description": "每页大小",
                    "type": "integer"
                },
                "warehouseCode": {
                    "description": "仓库缩写",
                    "type": "string"
                "warehouseId": {
                    "description": "WarehouseCode string ` + "`" + `json:\"warehouseCode\"` + "`" + ` //仓库缩写",
                    "type": "integer"
                }
            }
        },
@@ -6353,6 +6430,9 @@
                },
                "unit": {
                    "description": "单位",
                    "type": "string"
                },
                "warehouseCode": {
                    "type": "string"
                }
            }
@@ -6655,6 +6735,10 @@
                    "description": "销售单价",
                    "type": "number"
                },
                "stockAmount": {
                    "description": "库存数量，盘点时用",
                    "type": "number"
                },
                "toLocationId": {
                    "description": "目标位置id",
                    "type": "integer"