From d80428a19673e819440a34f2565b6dbbbe6ac567 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 18 七月 2024 22:32:08 +0800
Subject: [PATCH] fix
---
docs/docs.go | 661 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 591 insertions(+), 70 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 7310db0..95b1f70 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -691,6 +691,72 @@
}
}
},
+ "/api-wms/v1/dict/getUserList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏁版嵁瀛楀吀"
+ ],
+ "summary": "鑾峰彇鐢ㄦ埛鍒楄〃",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "id",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "nickName",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "parentId",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "pos",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "userName",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "name": "userType",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/user.GetUserRequest"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/dict/save": {
"post": {
"produces": [
@@ -1334,7 +1400,7 @@
"data": {
"type": "array",
"items": {
- "$ref": "#/definitions/models.MonthStats"
+ "$ref": "#/definitions/models.WarehouseMonthStats"
}
}
}
@@ -1681,6 +1747,13 @@
"summary": "娣诲姞搴撳瓨鐩樼偣淇℃伅",
"parameters": [
{
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
"description": "鍏ュ簱/鍑哄簱淇℃伅",
"name": "object",
"in": "body",
@@ -1710,6 +1783,13 @@
],
"summary": "搴旂敤銆侀獙璇�",
"parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
{
"description": "鍏ュ弬",
"name": "object",
@@ -1847,6 +1927,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": [
@@ -1857,6 +1974,13 @@
],
"summary": "淇敼搴撳瓨鐩樼偣淇℃伅",
"parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
{
"description": "鍏ュ簱/鍑哄簱淇℃伅",
"name": "object",
@@ -1915,6 +2039,13 @@
],
"summary": "鏇存敼璁板綍鐘舵��",
"parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
{
"type": "integer",
"description": "id",
@@ -1994,7 +2125,7 @@
"tags": [
"鍏ュ簱/鍑哄簱"
],
- "summary": "鍏ュ簱/鍑哄簱鍒楄〃",
+ "summary": "鎿嶄綔璇︽儏鎺ュ彛",
"parameters": [
{
"type": "string",
@@ -2002,13 +2133,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"
+ }
+ }
+ }
+ ]
}
}
}
@@ -2023,37 +2173,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"
}
}
}
@@ -2088,6 +2212,13 @@
],
"summary": "鍏ュ簱/鍑哄簱鍒楄〃",
"parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
{
"description": "鏌ヨ鍙傛暟",
"name": "object",
@@ -2194,6 +2325,13 @@
"summary": "娣诲姞鍏ュ簱/鍑哄簱",
"parameters": [
{
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
"description": "鍏ュ簱/鍑哄簱淇℃伅",
"name": "object",
"in": "body",
@@ -2223,6 +2361,13 @@
],
"summary": "鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅",
"parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
{
"type": "integer",
"description": "id",
@@ -2595,6 +2740,43 @@
}
}
},
+ "/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": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/product/addDisuse": {
"post": {
"produces": [
@@ -2784,6 +2966,31 @@
"description": "id",
"name": "id",
"in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/product/downloadInputFormat": {
+ "get": {
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "涓嬭浇瀵煎叆鐗╂枡/浜у搧妯℃澘",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
"required": true
}
],
@@ -3124,9 +3331,9 @@
"application/xlsx"
],
"tags": [
- "鐗╂枡绠＄悊"
+ "浜у搧"
],
- "summary": "瀵煎叆鐗╂枡",
+ "summary": "瀵煎叆鐗╂枡/浜у搧",
"parameters": [
{
"type": "file",
@@ -4152,19 +4359,25 @@
1,
2,
3,
- 4
+ 4,
+ 5,
+ 6
],
"x-enum-comments": {
+ "DisuseType": "鎶ュ簾绫诲瀷",
+ "ProductSource": "浜у搧鏉ユ簮",
"StockoutType": "鍑哄簱绫诲瀷",
"StorageType": "鍏ュ簱绫诲瀷",
- "TakeStock": "鐩樼偣绫诲瀷",
+ "TakeStockType": "鐩樼偣绫诲瀷",
"TransferType": "璋冩嫧绫诲瀷"
},
"x-enum-varnames": [
"StorageType",
"StockoutType",
"TransferType",
- "TakeStock"
+ "TakeStockType",
+ "DisuseType",
+ "ProductSource"
]
},
"constvar.OperationSource": {
@@ -4338,6 +4551,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": {
@@ -4347,17 +4581,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"
}
}
},
@@ -4590,7 +4813,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": {
@@ -4609,6 +4832,10 @@
},
"updateTime": {
"type": "string"
+ },
+ "warehouseId": {
+ "description": "浠撳簱id",
+ "type": "integer"
}
}
},
@@ -5039,6 +5266,21 @@
}
}
},
+ "models.MonthStatsItemsType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-comments": {
+ "MonthStatsItemsTypeInput": "鍏ュ簱",
+ "MonthStatsItemsTypeOutput": "鍑哄簱"
+ },
+ "x-enum-varnames": [
+ "MonthStatsItemsTypeInput",
+ "MonthStatsItemsTypeOutput"
+ ]
+ },
"models.MoveHistory": {
"type": "object",
"properties": {
@@ -5121,12 +5363,15 @@
"type": "object",
"properties": {
"accountant": {
+ "description": "浼氳鍚嶇О",
"type": "string"
},
"accountantId": {
+ "description": "浼氳id",
"type": "string"
},
"auditDate": {
+ "description": "瀹℃壒鏃堕棿",
"type": "string"
},
"baseOperationType": {
@@ -5138,48 +5383,56 @@
]
},
"checkedBy": {
+ "description": "楠岃瘉鑰匲serId",
"type": "string"
},
"comment": {
+ "description": "澶囨敞",
"type": "string"
},
"companyID": {
+ "description": "鍏徃ID-瀹㈡埛",
"type": "string"
},
"companyName": {
+ "description": "鍏徃鍚嶇О-瀹㈡埛",
"type": "string"
},
"contacterID": {
+ "description": "鑱旂郴浜篒D",
"type": "integer"
},
"contacterName": {
+ "description": "鑱旂郴浜哄鍚�",
"type": "string"
},
"createBy": {
+ "description": "鍒涘缓鑰匲serId",
"type": "string"
},
"createTime": {
"type": "string"
},
"custodian": {
+ "description": "淇濈鍛樺悕绉�",
"type": "string"
},
"custodianId": {
+ "description": "淇濈鍛榠d",
+ "type": "string"
+ },
+ "dealerType": {
+ "description": "璋冩嫧鍑哄叆搴撶被鍨�",
"type": "string"
},
"details": {
+ "description": "鎿嶄綔鏄庣粏",
"type": "array",
"items": {
"$ref": "#/definitions/models.OperationDetails"
}
},
"id": {
- "type": "integer"
- },
- "inventoryDealer": {
- "$ref": "#/definitions/models.MiniDict"
- },
- "inventoryDealerType": {
"type": "integer"
},
"isInternalOutput": {
@@ -5199,9 +5452,15 @@
"type": "integer"
},
"logisticCompany": {
- "$ref": "#/definitions/models.LogisticCompany"
+ "description": "鐗╂祦鍏徃淇℃伅",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.LogisticCompany"
+ }
+ ]
},
"logisticCompanyId": {
+ "description": "鐗╂祦鍏徃id",
"type": "string"
},
"logisticWeight": {
@@ -5209,9 +5468,11 @@
"type": "number"
},
"manager": {
+ "description": "涓荤鍚嶇О",
"type": "string"
},
"managerId": {
+ "description": "涓荤id",
"type": "string"
},
"number": {
@@ -5219,7 +5480,7 @@
"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\"` + "`" + ` //鐩爣浣嶇疆",
+ "description": "瀹夋帓鏃ユ湡",
"type": "string"
},
"operationSource": {
@@ -5239,21 +5500,31 @@
"type": "string"
},
"receiverAddr": {
+ "description": "鏀惰揣鍦板潃",
"type": "string"
},
"receiverName": {
+ "description": "鏀惰揣浜哄鍚�",
"type": "string"
},
"receiverPhone": {
+ "description": "鑱旂郴鐢佃瘽",
"type": "string"
},
"remark": {
+ "description": "澶囨敞",
"type": "string"
},
"salesDetailsNumber": {
+ "description": "閿�鍞槑缁嗙紪鐮�",
+ "type": "string"
+ },
+ "silkMarket": {
+ "description": "鍢夎仈浠撳偍娣诲姞 SilkMarket",
"type": "string"
},
"source": {
+ "description": "鏉ユ簮绯荤粺",
"type": "string"
},
"sourceNumber": {
@@ -5284,9 +5555,15 @@
"type": "string"
},
"warehouse": {
- "$ref": "#/definitions/models.Warehouse"
+ "description": "浠撳簱淇℃伅",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Warehouse"
+ }
+ ]
},
"warehouseId": {
+ "description": "浠撳簱id",
"type": "integer"
},
"waybillNumber": {
@@ -5307,9 +5584,11 @@
"type": "number"
},
"auxiliaryAmount": {
+ "description": "杈呭姪鏁伴噺",
"type": "number"
},
"auxiliaryUnit": {
+ "description": "杈呭姪鍗曚綅",
"type": "string"
},
"baseOperationType": {
@@ -5351,7 +5630,7 @@
"type": "boolean"
},
"operationId": {
- "description": "鎿嶄綔id",
+ "description": "鎿嶄綔璁板綍id",
"type": "integer"
},
"product": {
@@ -5367,10 +5646,23 @@
"type": "string"
},
"remark": {
+ "description": "澶囨敞",
"type": "string"
},
"salePrice": {
"description": "閿�鍞崟浠�",
+ "type": "number"
+ },
+ "silkMarket": {
+ "description": "鍢夎仈浠撳偍娣诲姞 SilkMarket銆丼ilkMarketClose",
+ "type": "string"
+ },
+ "silkMarketClose": {
+ "description": "搴勫彛鍏抽棴",
+ "type": "string"
+ },
+ "stockAmount": {
+ "description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�",
"type": "number"
},
"toLocation": {
@@ -5386,9 +5678,11 @@
"type": "integer"
},
"totalGrossWeight": {
+ "description": "鎬绘瘺閲�",
"type": "number"
},
"totalNetWeight": {
+ "description": "鎬诲噣閲�",
"type": "number"
},
"updateTime": {
@@ -5661,6 +5955,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": {
@@ -5785,6 +6166,10 @@
"request.AddMiniDict": {
"type": "object",
"properties": {
+ "code": {
+ "description": "缂栫爜",
+ "type": "string"
+ },
"isDefault": {
"description": "鏄惁榛樿",
"type": "boolean"
@@ -5811,13 +6196,15 @@
"type": "object",
"properties": {
"accountant": {
+ "description": "浼氳鍚嶇О",
"type": "string"
},
"accountantId": {
+ "description": "浼氳id",
"type": "string"
},
"baseOperationType": {
- "description": "鍩虹浣滀笟绫诲瀷 5搴撳瓨鐩樼偣",
+ "description": "鍩虹浣滀笟绫诲瀷 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣",
"allOf": [
{
"$ref": "#/definitions/constvar.BaseOperationType"
@@ -5845,12 +6232,19 @@
"type": "string"
},
"custodian": {
+ "description": "淇濈鍛樺悕绉�",
"type": "string"
},
"custodianId": {
+ "description": "淇濈鍛榠d",
+ "type": "string"
+ },
+ "dealerType": {
+ "description": "璋冩嫧鍑哄叆搴撶被鍨�",
"type": "string"
},
"details": {
+ "description": "璇︽儏",
"type": "array",
"items": {
"$ref": "#/definitions/request.OperationDetails"
@@ -5859,14 +6253,12 @@
"id": {
"type": "integer"
},
- "inventoryDealerType": {
- "type": "integer"
- },
"locationId": {
"description": "婧愪綅缃甶d",
"type": "integer"
},
"logisticCompanyId": {
+ "description": "鐗╂祦鍏徃id",
"type": "string"
},
"logisticWeight": {
@@ -5874,9 +6266,11 @@
"type": "number"
},
"manager": {
+ "description": "涓荤鍚嶇О",
"type": "string"
},
"managerId": {
+ "description": "涓荤id",
"type": "string"
},
"number": {
@@ -5884,7 +6278,7 @@
"type": "string"
},
"operationDate": {
- "description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` + "`" + ` //婧愪綅缃甶d\nToLocationId int ` + "`" + `json:\"toLocationId\" gorm:\"type:int;not null;comment:鐩爣浣嶇疆id\"` + "`" + ` //鐩爣浣嶇疆id",
+ "description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" ` + "`" + ` //婧愪綅缃甶d\nToLocationId int ` + "`" + `json:\"toLocationId\" ` + "`" + ` //鐩爣浣嶇疆id",
"type": "string"
},
"operationTypeId": {
@@ -5896,12 +6290,19 @@
"type": "string"
},
"receiverAddr": {
+ "description": "鏀惰揣鍦板潃",
"type": "string"
},
"receiverName": {
+ "description": "鏀惰揣浜哄鍚�",
"type": "string"
},
"receiverPhone": {
+ "description": "鑱旂郴鐢佃瘽",
+ "type": "string"
+ },
+ "silkMarket": {
+ "description": "搴勫彛缂栫爜",
"type": "string"
},
"sourceNumber": {
@@ -6105,6 +6506,10 @@
"request.EditMiniDict": {
"type": "object",
"properties": {
+ "code": {
+ "description": "缂栫爜",
+ "type": "string"
+ },
"id": {
"description": "瀛楀吀绫诲瀷",
"type": "integer"
@@ -6181,9 +6586,9 @@
"description": "姣忛〉澶у皬",
"type": "integer"
},
- "warehouseCode": {
- "description": "浠撳簱缂╁啓",
- "type": "string"
+ "warehouseId": {
+ "description": "WarehouseCode string ` + "`" + `json:\"warehouseCode\"` + "`" + ` //浠撳簱缂╁啓",
+ "type": "integer"
}
}
},
@@ -6221,6 +6626,13 @@
"unit": {
"description": "鍗曚綅",
"type": "string"
+ },
+ "warehouseCode": {
+ "type": "string"
+ },
+ "warehouseId": {
+ "description": "浠撳簱ID",
+ "type": "string"
}
}
},
@@ -6248,6 +6660,12 @@
},
"locationId": {
"type": "integer"
+ },
+ "locationIds": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
},
"page": {
"description": "椤电爜",
@@ -6289,12 +6707,42 @@
},
"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"
}
}
},
"request.GetMiniDictList": {
"type": "object",
"properties": {
+ "keyword": {
+ "description": "鍏抽敭瀛楁煡璇�",
+ "type": "string"
+ },
"type": {
"description": "瀛楀吀绫诲瀷",
"allOf": [
@@ -6391,6 +6839,10 @@
"request.MiniDict": {
"type": "object",
"properties": {
+ "code": {
+ "description": "缂栫爜",
+ "type": "string"
+ },
"isDefault": {
"description": "鏄惁榛樿",
"type": "boolean"
@@ -6409,6 +6861,7 @@
"type": "object",
"properties": {
"number": {
+ "description": "鍗曞彿",
"type": "string"
},
"page": {
@@ -6420,6 +6873,7 @@
"type": "integer"
},
"sourceNumber": {
+ "description": "婧愬崟鍙�",
"type": "string"
}
}
@@ -6428,6 +6882,7 @@
"type": "object",
"properties": {
"condition": {
+ "description": "妯＄硦鏌ヨ鏉′欢",
"type": "string"
},
"keyword": {
@@ -6460,7 +6915,7 @@
"type": "integer"
},
"amount": {
- "description": "ProductName string ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` + "`" + ` //浜у搧鍚嶇О",
+ "description": "ProductName string ` + "`" + `json:\"productName\" ` + "`" + ` //浜у搧鍚嶇О",
"type": "number"
},
"auxiliaryAmount": {
@@ -6476,7 +6931,7 @@
"type": "number"
},
"fromLocationId": {
- "description": "Unit string ` + "`" + `json:\"unit\" gorm:\"type:varchar(31);comment:鍗曚綅\"` + "`" + ` //鍗曚綅\nProduct models.Material ` + "`" + `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"` + "`" + `",
+ "description": "Unit string ` + "`" + `json:\"unit\"` + "`" + ` //鍗曚綅\nProduct models.Material ` + "`" + `json:\"product\" ` + "`" + ` // 浜у搧",
"type": "integer"
},
"productId": {
@@ -6484,10 +6939,23 @@
"type": "string"
},
"remark": {
+ "description": "澶囨敞",
"type": "string"
},
"salePrice": {
"description": "閿�鍞崟浠�",
+ "type": "number"
+ },
+ "silkMarket": {
+ "description": "搴勫彛缂栫爜",
+ "type": "string"
+ },
+ "silkMarketClose": {
+ "description": "搴勫彛鍏抽棴",
+ "type": "string"
+ },
+ "stockAmount": {
+ "description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�",
"type": "number"
},
"toLocationId": {
@@ -6508,7 +6976,7 @@
"type": "object",
"properties": {
"baseOperationType": {
- "description": "1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣",
+ "description": "鍩虹浣滀笟绫诲瀷 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣",
"allOf": [
{
"$ref": "#/definitions/constvar.BaseOperationType"
@@ -6516,9 +6984,11 @@
]
},
"number": {
+ "description": "鍗曞彿",
"type": "string"
},
"operationTypeId": {
+ "description": "浣滀笟绫诲瀷id",
"type": "integer"
},
"page": {
@@ -6530,7 +7000,12 @@
"type": "integer"
},
"status": {
- "$ref": "#/definitions/constvar.OperationStatus"
+ "description": "鐘舵��",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.OperationStatus"
+ }
+ ]
}
}
},
@@ -6846,9 +7321,11 @@
"type": "object",
"properties": {
"accountant": {
+ "description": "浼氳鍚嶇О",
"type": "string"
},
"accountantId": {
+ "description": "浼氳id",
"type": "string"
},
"baseOperationType": {
@@ -6880,12 +7357,15 @@
"type": "string"
},
"custodian": {
+ "description": "淇濈鍛樺悕绉�",
"type": "string"
},
"custodianId": {
+ "description": "淇濈鍛榠d",
"type": "string"
},
"details": {
+ "description": "璇︽儏",
"type": "array",
"items": {
"$ref": "#/definitions/request.OperationDetails"
@@ -6895,6 +7375,7 @@
"type": "integer"
},
"inventoryDealerType": {
+ "description": "璋冩嫧鍑哄叆搴撳垎绫�(瀵瑰簲dict瀛楀吀琛ㄧ殑ID)",
"type": "integer"
},
"locationId": {
@@ -6909,9 +7390,11 @@
"type": "number"
},
"manager": {
+ "description": "涓荤鍚嶇О",
"type": "string"
},
"managerId": {
+ "description": "涓荤id",
"type": "string"
},
"number": {
@@ -6919,7 +7402,7 @@
"type": "string"
},
"operationDate": {
- "description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` + "`" + ` //婧愪綅缃甶d\nToLocationId int ` + "`" + `json:\"toLocationId\" gorm:\"type:int;not null;comment:鐩爣浣嶇疆id\"` + "`" + ` //鐩爣浣嶇疆id",
+ "description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" ` + "`" + ` //婧愪綅缃甶d\nToLocationId int ` + "`" + `json:\"toLocationId\" ` + "`" + ` //鐩爣浣嶇疆id",
"type": "string"
},
"operationTypeId": {
@@ -6931,12 +7414,19 @@
"type": "string"
},
"receiverAddr": {
+ "description": "鏀惰揣鍦板潃",
"type": "string"
},
"receiverName": {
+ "description": "鏀惰揣浜哄鍚�",
"type": "string"
},
"receiverPhone": {
+ "description": "鑱旂郴鐢佃瘽",
+ "type": "string"
+ },
+ "silkMarket": {
+ "description": "搴勫彛缂栫爜",
"type": "string"
},
"sourceNumber": {
@@ -7100,8 +7590,16 @@
"description": "浜у搧id",
"type": "string"
},
+ "productCategory": {
+ "description": "浜у搧绫诲埆",
+ "type": "string"
+ },
"productName": {
"description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productSpecs": {
+ "description": "浜у搧瑙勬牸",
"type": "string"
},
"productType": {
@@ -7181,6 +7679,29 @@
}
}
},
+ "user.GetUserRequest": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string"
+ },
+ "nickName": {
+ "type": "string"
+ },
+ "parentId": {
+ "type": "string"
+ },
+ "pos": {
+ "type": "string"
+ },
+ "userName": {
+ "type": "string"
+ },
+ "userType": {
+ "type": "integer"
+ }
+ }
+ },
"util.Response": {
"type": "object",
"properties": {
--
Gitblit v1.8.0