From fc3313955a083c9480e4ea74398f72f9ba6addcd Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期四, 01 八月 2024 20:29:51 +0800 Subject: [PATCH] 月度统计查询多单位数据计算改查询。 --- docs/docs.go | 414 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 395 insertions(+), 19 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index da9fa40..19463a0 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -1,5 +1,4 @@ -// Code generated by swaggo/swag. DO NOT EDIT. - +// Package docs Code generated by swaggo/swag. DO NOT EDIT package docs import "github.com/swaggo/swag" @@ -682,6 +681,72 @@ "type": "array", "items": { "$ref": "#/definitions/models.MiniDict" + } + } + } + } + ] + } + } + } + } + }, + "/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" } } } @@ -1682,6 +1747,13 @@ "summary": "娣诲姞搴撳瓨鐩樼偣淇℃伅", "parameters": [ { + "type": "string", + "description": "token", + "name": "Authorization", + "in": "header", + "required": true + }, + { "description": "鍏ュ簱/鍑哄簱淇℃伅", "name": "object", "in": "body", @@ -1711,6 +1783,13 @@ ], "summary": "搴旂敤銆侀獙璇�", "parameters": [ + { + "type": "string", + "description": "token", + "name": "Authorization", + "in": "header", + "required": true + }, { "description": "鍏ュ弬", "name": "object", @@ -1896,6 +1975,13 @@ "summary": "淇敼搴撳瓨鐩樼偣淇℃伅", "parameters": [ { + "type": "string", + "description": "token", + "name": "Authorization", + "in": "header", + "required": true + }, + { "description": "鍏ュ簱/鍑哄簱淇℃伅", "name": "object", "in": "body", @@ -1953,6 +2039,13 @@ ], "summary": "鏇存敼璁板綍鐘舵��", "parameters": [ + { + "type": "string", + "description": "token", + "name": "Authorization", + "in": "header", + "required": true + }, { "type": "integer", "description": "id", @@ -2032,7 +2125,7 @@ "tags": [ "鍏ュ簱/鍑哄簱" ], - "summary": "鍏ュ簱/鍑哄簱鍒楄〃", + "summary": "鎿嶄綔璇︽儏鎺ュ彛", "parameters": [ { "type": "string", @@ -2040,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" + } + } + } + ] } } } @@ -2100,6 +2212,13 @@ ], "summary": "鍏ュ簱/鍑哄簱鍒楄〃", "parameters": [ + { + "type": "string", + "description": "token", + "name": "Authorization", + "in": "header", + "required": true + }, { "description": "鏌ヨ鍙傛暟", "name": "object", @@ -2206,6 +2325,13 @@ "summary": "娣诲姞鍏ュ簱/鍑哄簱", "parameters": [ { + "type": "string", + "description": "token", + "name": "Authorization", + "in": "header", + "required": true + }, + { "description": "鍏ュ簱/鍑哄簱淇℃伅", "name": "object", "in": "body", @@ -2235,6 +2361,13 @@ ], "summary": "鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅", "parameters": [ + { + "type": "string", + "description": "token", + "name": "Authorization", + "in": "header", + "required": true + }, { "type": "integer", "description": "id", @@ -2595,6 +2728,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": { @@ -3059,6 +3229,13 @@ "schema": { "$ref": "#/definitions/request.GetProductList" } + }, + { + "type": "string", + "description": "token", + "name": "Authorization", + "in": "header", + "required": true } ], "responses": { @@ -4190,10 +4367,12 @@ 2, 3, 4, - 5 + 5, + 6 ], "x-enum-comments": { "DisuseType": "鎶ュ簾绫诲瀷", + "ProductSource": "浜у搧鏉ユ簮", "StockoutType": "鍑哄簱绫诲瀷", "StorageType": "鍏ュ簱绫诲瀷", "TakeStockType": "鐩樼偣绫诲瀷", @@ -4204,7 +4383,8 @@ "StockoutType", "TransferType", "TakeStockType", - "DisuseType" + "DisuseType", + "ProductSource" ] }, "constvar.OperationSource": { @@ -4377,6 +4557,27 @@ "WhetherTypeAlways", "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", @@ -4640,6 +4841,7 @@ "type": "string" }, "warehouseId": { + "description": "浠撳簱id", "type": "integer" } } @@ -5168,12 +5370,15 @@ "type": "object", "properties": { "accountant": { + "description": "浼氳鍚嶇О", "type": "string" }, "accountantId": { + "description": "浼氳id", "type": "string" }, "auditDate": { + "description": "瀹℃壒鏃堕棿", "type": "string" }, "baseOperationType": { @@ -5185,39 +5390,50 @@ ] }, "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" @@ -5243,9 +5459,15 @@ "type": "integer" }, "logisticCompany": { - "$ref": "#/definitions/models.LogisticCompany" + "description": "鐗╂祦鍏徃淇℃伅", + "allOf": [ + { + "$ref": "#/definitions/models.LogisticCompany" + } + ] }, "logisticCompanyId": { + "description": "鐗╂祦鍏徃id", "type": "string" }, "logisticWeight": { @@ -5253,9 +5475,11 @@ "type": "number" }, "manager": { + "description": "涓荤鍚嶇О", "type": "string" }, "managerId": { + "description": "涓荤id", "type": "string" }, "number": { @@ -5263,6 +5487,7 @@ "type": "string" }, "operationDate": { + "description": "瀹夋帓鏃ユ湡", "type": "string" }, "operationSource": { @@ -5282,21 +5507,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": { @@ -5327,9 +5562,15 @@ "type": "string" }, "warehouse": { - "$ref": "#/definitions/models.Warehouse" + "description": "浠撳簱淇℃伅", + "allOf": [ + { + "$ref": "#/definitions/models.Warehouse" + } + ] }, "warehouseId": { + "description": "浠撳簱id", "type": "integer" }, "waybillNumber": { @@ -5350,9 +5591,11 @@ "type": "number" }, "auxiliaryAmount": { + "description": "杈呭姪鏁伴噺", "type": "number" }, "auxiliaryUnit": { + "description": "杈呭姪鍗曚綅", "type": "string" }, "baseOperationType": { @@ -5393,8 +5636,14 @@ "description": "鏄惁璋冩嫧浜х敓鐨勫嚭搴�", "type": "boolean" }, + "moreUnitList": { + "type": "array", + "items": { + "$ref": "#/definitions/models.UnitItems" + } + }, "operationId": { - "description": "鎿嶄綔id", + "description": "鎿嶄綔璁板綍id", "type": "integer" }, "product": { @@ -5410,11 +5659,20 @@ "type": "string" }, "remark": { + "description": "澶囨敞", "type": "string" }, "salePrice": { "description": "閿�鍞崟浠�", "type": "number" + }, + "silkMarket": { + "description": "鍢夎仈浠撳偍娣诲姞 SilkMarket銆丼ilkMarketClose", + "type": "string" + }, + "silkMarketClose": { + "description": "搴勫彛鍏抽棴", + "type": "string" }, "stockAmount": { "description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�", @@ -5433,9 +5691,11 @@ "type": "integer" }, "totalGrossWeight": { + "description": "鎬绘瘺閲�", "type": "number" }, "totalNetWeight": { + "description": "鎬诲噣閲�", "type": "number" }, "updateTime": { @@ -5919,6 +6179,10 @@ "request.AddMiniDict": { "type": "object", "properties": { + "code": { + "description": "缂栫爜", + "type": "string" + }, "isDefault": { "description": "鏄惁榛樿", "type": "boolean" @@ -5945,13 +6209,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" @@ -5979,15 +6245,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" @@ -6001,6 +6271,7 @@ "type": "integer" }, "logisticCompanyId": { + "description": "鐗╂祦鍏徃id", "type": "string" }, "logisticWeight": { @@ -6008,9 +6279,11 @@ "type": "number" }, "manager": { + "description": "涓荤鍚嶇О", "type": "string" }, "managerId": { + "description": "涓荤id", "type": "string" }, "number": { @@ -6018,7 +6291,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": { @@ -6030,12 +6303,19 @@ "type": "string" }, "receiverAddr": { + "description": "鏀惰揣鍦板潃", "type": "string" }, "receiverName": { + "description": "鏀惰揣浜哄鍚�", "type": "string" }, "receiverPhone": { + "description": "鑱旂郴鐢佃瘽", + "type": "string" + }, + "silkMarket": { + "description": "搴勫彛", "type": "string" }, "sourceNumber": { @@ -6239,6 +6519,10 @@ "request.EditMiniDict": { "type": "object", "properties": { + "code": { + "description": "缂栫爜", + "type": "string" + }, "id": { "description": "瀛楀吀绫诲瀷", "type": "integer" @@ -6315,9 +6599,9 @@ "description": "姣忛〉澶у皬", "type": "integer" }, - "warehouseCode": { - "description": "浠撳簱缂╁啓", - "type": "string" + "warehouseId": { + "description": "WarehouseCode string ` + "`" + `json:\"warehouseCode\"` + "`" + ` //浠撳簱缂╁啓", + "type": "integer" } } }, @@ -6354,6 +6638,13 @@ }, "unit": { "description": "鍗曚綅", + "type": "string" + }, + "warehouseCode": { + "type": "string" + }, + "warehouseId": { + "description": "浠撳簱ID", "type": "string" } } @@ -6461,6 +6752,10 @@ "request.GetMiniDictList": { "type": "object", "properties": { + "keyword": { + "description": "鍏抽敭瀛楁煡璇�", + "type": "string" + }, "type": { "description": "瀛楀吀绫诲瀷", "allOf": [ @@ -6501,6 +6796,12 @@ "properties": { "categoryId": { "type": "integer" + }, + "categoryIds": { + "type": "array", + "items": { + "type": "integer" + } }, "keyWord": { "type": "string" @@ -6557,6 +6858,10 @@ "request.MiniDict": { "type": "object", "properties": { + "code": { + "description": "缂栫爜", + "type": "string" + }, "isDefault": { "description": "鏄惁榛樿", "type": "boolean" @@ -6575,6 +6880,7 @@ "type": "object", "properties": { "number": { + "description": "鍗曞彿", "type": "string" }, "page": { @@ -6586,6 +6892,7 @@ "type": "integer" }, "sourceNumber": { + "description": "婧愬崟鍙�", "type": "string" } } @@ -6594,6 +6901,7 @@ "type": "object", "properties": { "condition": { + "description": "妯$硦鏌ヨ鏉′欢", "type": "string" }, "keyword": { @@ -6626,7 +6934,7 @@ "type": "integer" }, "amount": { - "description": "ProductName string ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` + "`" + ` //浜у搧鍚嶇О", + "description": "ProductName string ` + "`" + `json:\"productName\" ` + "`" + ` //浜у搧鍚嶇О", "type": "number" }, "auxiliaryAmount": { @@ -6642,19 +6950,34 @@ "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" + }, + "moreUnitList": { + "type": "array", + "items": { + "$ref": "#/definitions/models.UnitItems" + } }, "productId": { "description": "浜у搧id", "type": "string" }, "remark": { + "description": "澶囨敞", "type": "string" }, "salePrice": { "description": "閿�鍞崟浠�", "type": "number" + }, + "silkMarket": { + "description": "搴勫彛", + "type": "string" + }, + "silkMarketClose": { + "description": "搴勫彛鍏抽棴", + "type": "string" }, "stockAmount": { "description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�", @@ -6678,7 +7001,7 @@ "type": "object", "properties": { "baseOperationType": { - "description": "1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣", + "description": "鍩虹浣滀笟绫诲瀷 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣", "allOf": [ { "$ref": "#/definitions/constvar.BaseOperationType" @@ -6686,9 +7009,11 @@ ] }, "number": { + "description": "鍗曞彿", "type": "string" }, "operationTypeId": { + "description": "浣滀笟绫诲瀷id", "type": "integer" }, "page": { @@ -6700,7 +7025,12 @@ "type": "integer" }, "status": { - "$ref": "#/definitions/constvar.OperationStatus" + "description": "鐘舵��", + "allOf": [ + { + "$ref": "#/definitions/constvar.OperationStatus" + } + ] } } }, @@ -7016,9 +7346,11 @@ "type": "object", "properties": { "accountant": { + "description": "浼氳鍚嶇О", "type": "string" }, "accountantId": { + "description": "浼氳id", "type": "string" }, "baseOperationType": { @@ -7050,12 +7382,15 @@ "type": "string" }, "custodian": { + "description": "淇濈鍛樺悕绉�", "type": "string" }, "custodianId": { + "description": "淇濈鍛榠d", "type": "string" }, "details": { + "description": "璇︽儏", "type": "array", "items": { "$ref": "#/definitions/request.OperationDetails" @@ -7065,6 +7400,7 @@ "type": "integer" }, "inventoryDealerType": { + "description": "璋冩嫧鍑哄叆搴撳垎绫�(瀵瑰簲dict瀛楀吀琛ㄧ殑ID)", "type": "integer" }, "locationId": { @@ -7079,9 +7415,11 @@ "type": "number" }, "manager": { + "description": "涓荤鍚嶇О", "type": "string" }, "managerId": { + "description": "涓荤id", "type": "string" }, "number": { @@ -7089,7 +7427,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": { @@ -7101,12 +7439,19 @@ "type": "string" }, "receiverAddr": { + "description": "鏀惰揣鍦板潃", "type": "string" }, "receiverName": { + "description": "鏀惰揣浜哄鍚�", "type": "string" }, "receiverPhone": { + "description": "鑱旂郴鐢佃瘽", + "type": "string" + }, + "silkMarket": { + "description": "搴勫彛", "type": "string" }, "sourceNumber": { @@ -7270,8 +7615,16 @@ "description": "浜у搧id", "type": "string" }, + "productCategory": { + "description": "浜у搧绫诲埆", + "type": "string" + }, "productName": { "description": "浜у搧鍚嶇О", + "type": "string" + }, + "productSpecs": { + "description": "浜у搧瑙勬牸", "type": "string" }, "productType": { @@ -7351,6 +7704,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