From 33cb0eb308c1b62e25211600383371c31907025e Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期二, 16 七月 2024 20:25:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jialian' into jialian
---
docs/docs.go | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 162 insertions(+), 16 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 597d1c7..f46a305 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1847,6 +1847,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": [
@@ -1994,7 +2031,7 @@
"tags": [
"鍏ュ簱/鍑哄簱"
],
- "summary": "鍏ュ簱/鍑哄簱鍒楄〃",
+ "summary": "鎿嶄綔璇︽儏鎺ュ彛",
"parameters": [
{
"type": "string",
@@ -2002,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"
+ }
+ }
+ }
+ ]
}
}
}
@@ -2557,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": "浠巈xcel涓幏鍙栦骇鍝佸浘鐗囧苟淇濆瓨",
+ "parameters": [
+ {
+ "description": "灞炴�т俊鎭�",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/controllers.saveProductImagesFromExcelRequest"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
}
],
"responses": {
@@ -4340,6 +4433,27 @@
"ReservationNever"
]
},
+ "controllers.saveProductImagesFromExcelRequest": {
+ "type": "object",
+ "properties": {
+ "excelFilePath": {
+ "description": "excel璺緞 鐢╠ocker cp浼犲埌瀹瑰櫒閲�",
+ "type": "string"
+ },
+ "imageColumn": {
+ "description": "鍥剧墖鎵�鍦ㄥ垪鍚�",
+ "type": "string"
+ },
+ "productIdColumnIndex": {
+ "description": "浜у搧ID鏄鍑犲垪(浠�0寮�濮�)",
+ "type": "integer"
+ },
+ "sheetIndex": {
+ "description": "绗嚑涓猻heet",
+ "type": "integer"
+ }
+ }
+ },
"gorm.DeletedAt": {
"type": "object",
"properties": {
@@ -4581,7 +4695,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": {
@@ -4600,6 +4714,9 @@
},
"updateTime": {
"type": "string"
+ },
+ "warehouseId": {
+ "type": "integer"
}
}
},
@@ -5173,6 +5290,9 @@
"custodianId": {
"type": "string"
},
+ "dealerType": {
+ "type": "string"
+ },
"details": {
"type": "array",
"items": {
@@ -5180,12 +5300,6 @@
}
},
"id": {
- "type": "integer"
- },
- "inventoryDealer": {
- "$ref": "#/definitions/models.MiniDict"
- },
- "inventoryDealerType": {
"type": "integer"
},
"isInternalOutput": {
@@ -5225,7 +5339,6 @@
"type": "string"
},
"operationDate": {
- "description": "FromLocationID int ` + "`" + `json:\"fromLocationId\" gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` + "`" + ` //婧愪綅缃甶d\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": {
@@ -5377,6 +5490,10 @@
},
"salePrice": {
"description": "閿�鍞崟浠�",
+ "type": "number"
+ },
+ "stockAmount": {
+ "description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�",
"type": "number"
},
"toLocation": {
@@ -5943,6 +6060,9 @@
"custodianId": {
"type": "string"
},
+ "dealerType": {
+ "type": "string"
+ },
"details": {
"type": "array",
"items": {
@@ -5950,9 +6070,6 @@
}
},
"id": {
- "type": "integer"
- },
- "inventoryDealerType": {
"type": "integer"
},
"locationId": {
@@ -6274,9 +6391,9 @@
"description": "姣忛〉澶у皬",
"type": "integer"
},
- "warehouseCode": {
- "description": "浠撳簱缂╁啓",
- "type": "string"
+ "warehouseId": {
+ "description": "WarehouseCode string ` + "`" + `json:\"warehouseCode\"` + "`" + ` //浠撳簱缂╁啓",
+ "type": "integer"
}
}
},
@@ -6313,6 +6430,9 @@
},
"unit": {
"description": "鍗曚綅",
+ "type": "string"
+ },
+ "warehouseCode": {
"type": "string"
}
}
@@ -6391,6 +6511,28 @@
},
"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"
}
}
@@ -6593,6 +6735,10 @@
"description": "閿�鍞崟浠�",
"type": "number"
},
+ "stockAmount": {
+ "description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�",
+ "type": "number"
+ },
"toLocationId": {
"description": "鐩爣浣嶇疆id",
"type": "integer"
--
Gitblit v1.8.0