From 286adacbe154f984b500cd7df16e332e255f2010 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 04 七月 2024 22:40:07 +0800
Subject: [PATCH] fix
---
docs/swagger.json | 255 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 210 insertions(+), 45 deletions(-)
diff --git a/docs/swagger.json b/docs/swagger.json
index eb8f26a..b4e0835 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -1323,7 +1323,7 @@
"data": {
"type": "array",
"items": {
- "$ref": "#/definitions/models.MonthStats"
+ "$ref": "#/definitions/models.WarehouseMonthStats"
}
}
}
@@ -1836,6 +1836,43 @@
}
}
},
+ "/api-wms/v1/locationProductAmount/locationProductList": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "搴撳瓨鐩樼偣"
+ ],
+ "summary": "鑾峰彇浣嶇疆瀵瑰簲浜у搧鍒楄〃",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetLocationProductList"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/util.ResponseList"
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/locationProductAmount/update": {
"post": {
"produces": [
@@ -2012,37 +2049,11 @@
"鍏ュ簱/鍑哄簱"
],
"summary": "鑾峰彇浜哄憳鍒楄〃",
- "parameters": [
- {
- "description": "鍙傛暟",
- "name": "object",
- "in": "body",
- "required": true,
- "schema": {
- "$ref": "#/definitions/request.OperationCondition"
- }
- }
- ],
"responses": {
"200": {
"description": "鎴愬姛",
"schema": {
- "allOf": [
- {
- "$ref": "#/definitions/util.ResponseList"
- },
- {
- "type": "object",
- "properties": {
- "data": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/inventory_order.WorkerInfo"
- }
- }
- }
- }
- ]
+ "$ref": "#/definitions/util.Response"
}
}
}
@@ -2786,6 +2797,31 @@
}
}
},
+ "/api-wms/v1/product/downloadInputFormat": {
+ "get": {
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "涓嬭浇瀵煎叆鐗╂枡/浜у搧妯℃澘",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/product/finishDisuse/{id}": {
"put": {
"produces": [
@@ -3113,9 +3149,9 @@
"application/xlsx"
],
"tags": [
- "鐗╂枡绠＄悊"
+ "浜у搧"
],
- "summary": "瀵煎叆鐗╂枡",
+ "summary": "瀵煎叆鐗╂枡/浜у搧",
"parameters": [
{
"type": "file",
@@ -4141,19 +4177,22 @@
1,
2,
3,
- 4
+ 4,
+ 5
],
"x-enum-comments": {
+ "DisuseType": "鎶ュ簾绫诲瀷",
"StockoutType": "鍑哄簱绫诲瀷",
"StorageType": "鍏ュ簱绫诲瀷",
- "TakeStock": "鐩樼偣绫诲瀷",
+ "TakeStockType": "鐩樼偣绫诲瀷",
"TransferType": "璋冩嫧绫诲瀷"
},
"x-enum-varnames": [
"StorageType",
"StockoutType",
"TransferType",
- "TakeStock"
+ "TakeStockType",
+ "DisuseType"
]
},
"constvar.OperationSource": {
@@ -4336,17 +4375,6 @@
"valid": {
"description": "Valid is true if Time is not NULL",
"type": "boolean"
- }
- }
- },
- "inventory_order.WorkerInfo": {
- "type": "object",
- "properties": {
- "id": {
- "type": "string"
- },
- "name": {
- "type": "string"
}
}
},
@@ -4579,7 +4607,7 @@
"$ref": "#/definitions/models.Location"
},
"locationId": {
- "description": "LocationProductId int `json:\"locationProductId\" gorm:\"type:int;not null;comment:涓婃灦瑙勫垯id\"` //涓婃灦瑙勫垯id\nLocationProduct LocationProduct `json:\"locationProduct\" gorm:\"foreignKey:LocationProductId;references:Id\"`",
+ "description": "浣嶇疆id",
"type": "integer"
},
"product": {
@@ -4598,6 +4626,9 @@
},
"updateTime": {
"type": "string"
+ },
+ "warehouseId": {
+ "type": "integer"
}
}
},
@@ -5027,6 +5058,21 @@
"type": "number"
}
}
+ },
+ "models.MonthStatsItemsType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-comments": {
+ "MonthStatsItemsTypeInput": "鍏ュ簱",
+ "MonthStatsItemsTypeOutput": "鍑哄簱"
+ },
+ "x-enum-varnames": [
+ "MonthStatsItemsTypeInput",
+ "MonthStatsItemsTypeOutput"
+ ]
},
"models.MoveHistory": {
"type": "object",
@@ -5650,6 +5696,93 @@
}
}
},
+ "models.WarehouseMonthStats": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "鏈熸湯缁撲綑鏁伴噺",
+ "type": "number"
+ },
+ "beginAmount": {
+ "description": "鏈熷垵鏁伴噺",
+ "type": "number"
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "date": {
+ "description": "鏃ユ湡 2024-04",
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "inputAmount": {
+ "description": "鍏ュ簱鏁伴噺",
+ "type": "number"
+ },
+ "inputItems": {
+ "description": "鍏ュ簱鏄庣粏",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.WarehouseStatsItems"
+ }
+ },
+ "outputAmount": {
+ "description": "鍑哄簱鏁伴噺",
+ "type": "number"
+ },
+ "outputItems": {
+ "description": "鍑哄簱鏄庣粏",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.WarehouseStatsItems"
+ }
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "salePrice": {
+ "description": "閿�鍞崟浠�",
+ "type": "number"
+ },
+ "unit": {
+ "description": "鍗曚綅",
+ "type": "string"
+ },
+ "updateTime": {
+ "type": "string"
+ },
+ "warehouseId": {
+ "description": "浠撳簱ID",
+ "type": "integer"
+ }
+ }
+ },
+ "models.WarehouseStatsItems": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "鏁伴噺",
+ "type": "number"
+ },
+ "name": {
+ "description": "鍏ュ簱鏉ユ簮锛屽嚭搴撳幓澶�",
+ "type": "string"
+ },
+ "type": {
+ "$ref": "#/definitions/models.MonthStatsItemsType"
+ },
+ "warehouseMonthStatsId": {
+ "type": "integer"
+ }
+ }
+ },
"request.AddAttribute": {
"type": "object",
"properties": {
@@ -6238,6 +6371,12 @@
"locationId": {
"type": "integer"
},
+ "locationIds": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
"page": {
"description": "椤电爜",
"type": "integer"
@@ -6278,6 +6417,32 @@
},
"type": {
"type": "integer"
+ },
+ "warehouseId": {
+ "description": "浠撳簱ID",
+ "type": "integer"
+ }
+ }
+ },
+ "request.GetLocationProductList": {
+ "type": "object",
+ "properties": {
+ "keyword": {
+ "type": "string"
+ },
+ "locationId": {
+ "type": "integer"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "warehouseId": {
+ "type": "integer"
}
}
},
--
Gitblit v1.8.0