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 | 439 ++++++++----------------------------------------------
1 files changed, 68 insertions(+), 371 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 1e95ad9..f46a305 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -691,122 +691,6 @@
}
}
},
- "/api-wms/v1/dict/getSilkDictList/{type}": {
- "get": {
- "produces": [
- "application/json"
- ],
- "tags": [
- "鏁版嵁瀛楀吀"
- ],
- "summary": "鑾峰彇搴勫彛鍒楄〃",
- "parameters": [
- {
- "type": "string",
- "description": "token",
- "name": "Authorization",
- "in": "header",
- "required": true
- },
- {
- "type": "string",
- "description": "瀛楀吀绫诲瀷",
- "name": "type",
- "in": "path",
- "required": true
- }
- ],
- "responses": {
- "200": {
- "description": "鎴愬姛",
- "schema": {
- "allOf": [
- {
- "$ref": "#/definitions/util.ResponseList"
- },
- {
- "type": "object",
- "properties": {
- "data": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/models.SilkDict"
- }
- }
- }
- }
- ]
- }
- }
- }
- }
- },
- "/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": [
@@ -1797,13 +1681,6 @@
"summary": "娣诲姞搴撳瓨鐩樼偣淇℃伅",
"parameters": [
{
- "type": "string",
- "description": "token",
- "name": "Authorization",
- "in": "header",
- "required": true
- },
- {
"description": "鍏ュ簱/鍑哄簱淇℃伅",
"name": "object",
"in": "body",
@@ -1833,13 +1710,6 @@
],
"summary": "搴旂敤銆侀獙璇�",
"parameters": [
- {
- "type": "string",
- "description": "token",
- "name": "Authorization",
- "in": "header",
- "required": true
- },
{
"description": "鍏ュ弬",
"name": "object",
@@ -2025,13 +1895,6 @@
"summary": "淇敼搴撳瓨鐩樼偣淇℃伅",
"parameters": [
{
- "type": "string",
- "description": "token",
- "name": "Authorization",
- "in": "header",
- "required": true
- },
- {
"description": "鍏ュ簱/鍑哄簱淇℃伅",
"name": "object",
"in": "body",
@@ -2089,13 +1952,6 @@
],
"summary": "鏇存敼璁板綍鐘舵��",
"parameters": [
- {
- "type": "string",
- "description": "token",
- "name": "Authorization",
- "in": "header",
- "required": true
- },
{
"type": "integer",
"description": "id",
@@ -2263,13 +2119,6 @@
"summary": "鍏ュ簱/鍑哄簱鍒楄〃",
"parameters": [
{
- "type": "string",
- "description": "token",
- "name": "Authorization",
- "in": "header",
- "required": true
- },
- {
"description": "鏌ヨ鍙傛暟",
"name": "object",
"in": "body",
@@ -2375,13 +2224,6 @@
"summary": "娣诲姞鍏ュ簱/鍑哄簱",
"parameters": [
{
- "type": "string",
- "description": "token",
- "name": "Authorization",
- "in": "header",
- "required": true
- },
- {
"description": "鍏ュ簱/鍑哄簱淇℃伅",
"name": "object",
"in": "body",
@@ -2411,13 +2253,6 @@
],
"summary": "鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅",
"parameters": [
- {
- "type": "string",
- "description": "token",
- "name": "Authorization",
- "in": "header",
- "required": true
- },
{
"type": "integer",
"description": "id",
@@ -2778,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": {
@@ -4561,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": {
@@ -4823,7 +4716,6 @@
"type": "string"
},
"warehouseId": {
- "description": "浠撳簱id",
"type": "integer"
}
}
@@ -5352,15 +5244,12 @@
"type": "object",
"properties": {
"accountant": {
- "description": "浼氳鍚嶇О",
"type": "string"
},
"accountantId": {
- "description": "浼氳id",
"type": "string"
},
"auditDate": {
- "description": "瀹℃壒鏃堕棿",
"type": "string"
},
"baseOperationType": {
@@ -5372,50 +5261,39 @@
]
},
"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"
@@ -5441,15 +5319,9 @@
"type": "integer"
},
"logisticCompany": {
- "description": "鐗╂祦鍏徃淇℃伅",
- "allOf": [
- {
- "$ref": "#/definitions/models.LogisticCompany"
- }
- ]
+ "$ref": "#/definitions/models.LogisticCompany"
},
"logisticCompanyId": {
- "description": "鐗╂祦鍏徃id",
"type": "string"
},
"logisticWeight": {
@@ -5457,11 +5329,9 @@
"type": "number"
},
"manager": {
- "description": "涓荤鍚嶇О",
"type": "string"
},
"managerId": {
- "description": "涓荤id",
"type": "string"
},
"number": {
@@ -5469,7 +5339,6 @@
"type": "string"
},
"operationDate": {
- "description": "瀹夋帓鏃ユ湡",
"type": "string"
},
"operationSource": {
@@ -5489,31 +5358,21 @@
"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": {
@@ -5544,15 +5403,9 @@
"type": "string"
},
"warehouse": {
- "description": "浠撳簱淇℃伅",
- "allOf": [
- {
- "$ref": "#/definitions/models.Warehouse"
- }
- ]
+ "$ref": "#/definitions/models.Warehouse"
},
"warehouseId": {
- "description": "浠撳簱id",
"type": "integer"
},
"waybillNumber": {
@@ -5573,11 +5426,9 @@
"type": "number"
},
"auxiliaryAmount": {
- "description": "杈呭姪鏁伴噺",
"type": "number"
},
"auxiliaryUnit": {
- "description": "杈呭姪鍗曚綅",
"type": "string"
},
"baseOperationType": {
@@ -5619,7 +5470,7 @@
"type": "boolean"
},
"operationId": {
- "description": "鎿嶄綔璁板綍id",
+ "description": "鎿嶄綔id",
"type": "integer"
},
"product": {
@@ -5635,20 +5486,11 @@
"type": "string"
},
"remark": {
- "description": "澶囨敞",
"type": "string"
},
"salePrice": {
"description": "閿�鍞崟浠�",
"type": "number"
- },
- "silkMarket": {
- "description": "鍢夎仈浠撳偍娣诲姞 SilkMarket銆丼ilkMarketClose",
- "type": "string"
- },
- "silkMarketClose": {
- "description": "搴勫彛鍏抽棴",
- "type": "string"
},
"stockAmount": {
"description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�",
@@ -5667,11 +5509,9 @@
"type": "integer"
},
"totalGrossWeight": {
- "description": "鎬绘瘺閲�",
"type": "number"
},
"totalNetWeight": {
- "description": "鎬诲噣閲�",
"type": "number"
},
"updateTime": {
@@ -5792,64 +5632,6 @@
"type": "string"
}
}
- },
- "models.SilkDict": {
- "type": "object",
- "properties": {
- "createdAt": {
- "type": "string"
- },
- "deletedAt": {
- "$ref": "#/definitions/gorm.DeletedAt"
- },
- "dictType": {
- "description": "瀛楀吀绫诲瀷",
- "allOf": [
- {
- "$ref": "#/definitions/models.SilkDictType"
- }
- ]
- },
- "id": {
- "type": "integer"
- },
- "name": {
- "description": "鍚嶇О",
- "type": "string"
- },
- "number": {
- "description": "缂栧彿",
- "type": "string"
- },
- "remark": {
- "description": "澶囨敞",
- "type": "string"
- },
- "updatedAt": {
- "type": "string"
- }
- }
- },
- "models.SilkDictType": {
- "type": "integer",
- "enum": [
- 1,
- 2,
- 3,
- 4
- ],
- "x-enum-comments": {
- "DictTypeColor": "棰滆壊",
- "DictTypeMarket": "搴勫彛",
- "DictTypeSpec": "瑙勬牸",
- "DictTypeWorkshop": "杞﹂棿"
- },
- "x-enum-varnames": [
- "DictTypeMarket",
- "DictTypeWorkshop",
- "DictTypeColor",
- "DictTypeSpec"
- ]
},
"models.SystemConfig": {
"type": "object",
@@ -6239,15 +6021,13 @@
"type": "object",
"properties": {
"accountant": {
- "description": "浼氳鍚嶇О",
"type": "string"
},
"accountantId": {
- "description": "浼氳id",
"type": "string"
},
"baseOperationType": {
- "description": "鍩虹浣滀笟绫诲瀷 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣",
+ "description": "鍩虹浣滀笟绫诲瀷 5搴撳瓨鐩樼偣",
"allOf": [
{
"$ref": "#/definitions/constvar.BaseOperationType"
@@ -6275,19 +6055,15 @@
"type": "string"
},
"custodian": {
- "description": "淇濈鍛樺悕绉�",
"type": "string"
},
"custodianId": {
- "description": "淇濈鍛榠d",
"type": "string"
},
"dealerType": {
- "description": "璋冩嫧鍑哄叆搴撶被鍨�",
"type": "string"
},
"details": {
- "description": "璇︽儏",
"type": "array",
"items": {
"$ref": "#/definitions/request.OperationDetails"
@@ -6301,7 +6077,6 @@
"type": "integer"
},
"logisticCompanyId": {
- "description": "鐗╂祦鍏徃id",
"type": "string"
},
"logisticWeight": {
@@ -6309,11 +6084,9 @@
"type": "number"
},
"manager": {
- "description": "涓荤鍚嶇О",
"type": "string"
},
"managerId": {
- "description": "涓荤id",
"type": "string"
},
"number": {
@@ -6321,7 +6094,7 @@
"type": "string"
},
"operationDate": {
- "description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" ` + "`" + ` //婧愪綅缃甶d\nToLocationId int ` + "`" + `json:\"toLocationId\" ` + "`" + ` //鐩爣浣嶇疆id",
+ "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",
"type": "string"
},
"operationTypeId": {
@@ -6333,19 +6106,12 @@
"type": "string"
},
"receiverAddr": {
- "description": "鏀惰揣鍦板潃",
"type": "string"
},
"receiverName": {
- "description": "鏀惰揣浜哄鍚�",
"type": "string"
},
"receiverPhone": {
- "description": "鑱旂郴鐢佃瘽",
- "type": "string"
- },
- "silkMarket": {
- "description": "搴勫彛",
"type": "string"
},
"sourceNumber": {
@@ -6668,10 +6434,6 @@
},
"warehouseCode": {
"type": "string"
- },
- "warehouseId": {
- "description": "浠撳簱ID",
- "type": "string"
}
}
},
@@ -6892,7 +6654,6 @@
"type": "object",
"properties": {
"number": {
- "description": "鍗曞彿",
"type": "string"
},
"page": {
@@ -6904,7 +6665,6 @@
"type": "integer"
},
"sourceNumber": {
- "description": "婧愬崟鍙�",
"type": "string"
}
}
@@ -6913,7 +6673,6 @@
"type": "object",
"properties": {
"condition": {
- "description": "妯＄硦鏌ヨ鏉′欢",
"type": "string"
},
"keyword": {
@@ -6946,7 +6705,7 @@
"type": "integer"
},
"amount": {
- "description": "ProductName string ` + "`" + `json:\"productName\" ` + "`" + ` //浜у搧鍚嶇О",
+ "description": "ProductName string ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` + "`" + ` //浜у搧鍚嶇О",
"type": "number"
},
"auxiliaryAmount": {
@@ -6962,7 +6721,7 @@
"type": "number"
},
"fromLocationId": {
- "description": "Unit string ` + "`" + `json:\"unit\"` + "`" + ` //鍗曚綅\nProduct models.Material ` + "`" + `json:\"product\" ` + "`" + ` // 浜у搧",
+ "description": "Unit string ` + "`" + `json:\"unit\" gorm:\"type:varchar(31);comment:鍗曚綅\"` + "`" + ` //鍗曚綅\nProduct models.Material ` + "`" + `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"` + "`" + `",
"type": "integer"
},
"productId": {
@@ -6970,20 +6729,11 @@
"type": "string"
},
"remark": {
- "description": "澶囨敞",
"type": "string"
},
"salePrice": {
"description": "閿�鍞崟浠�",
"type": "number"
- },
- "silkMarket": {
- "description": "搴勫彛",
- "type": "string"
- },
- "silkMarketClose": {
- "description": "搴勫彛鍏抽棴",
- "type": "string"
},
"stockAmount": {
"description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�",
@@ -7007,7 +6757,7 @@
"type": "object",
"properties": {
"baseOperationType": {
- "description": "鍩虹浣滀笟绫诲瀷 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣",
+ "description": "1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣",
"allOf": [
{
"$ref": "#/definitions/constvar.BaseOperationType"
@@ -7015,11 +6765,9 @@
]
},
"number": {
- "description": "鍗曞彿",
"type": "string"
},
"operationTypeId": {
- "description": "浣滀笟绫诲瀷id",
"type": "integer"
},
"page": {
@@ -7031,12 +6779,7 @@
"type": "integer"
},
"status": {
- "description": "鐘舵��",
- "allOf": [
- {
- "$ref": "#/definitions/constvar.OperationStatus"
- }
- ]
+ "$ref": "#/definitions/constvar.OperationStatus"
}
}
},
@@ -7352,11 +7095,9 @@
"type": "object",
"properties": {
"accountant": {
- "description": "浼氳鍚嶇О",
"type": "string"
},
"accountantId": {
- "description": "浼氳id",
"type": "string"
},
"baseOperationType": {
@@ -7388,15 +7129,12 @@
"type": "string"
},
"custodian": {
- "description": "淇濈鍛樺悕绉�",
"type": "string"
},
"custodianId": {
- "description": "淇濈鍛榠d",
"type": "string"
},
"details": {
- "description": "璇︽儏",
"type": "array",
"items": {
"$ref": "#/definitions/request.OperationDetails"
@@ -7406,7 +7144,6 @@
"type": "integer"
},
"inventoryDealerType": {
- "description": "璋冩嫧鍑哄叆搴撳垎绫�(瀵瑰簲dict瀛楀吀琛ㄧ殑ID)",
"type": "integer"
},
"locationId": {
@@ -7421,11 +7158,9 @@
"type": "number"
},
"manager": {
- "description": "涓荤鍚嶇О",
"type": "string"
},
"managerId": {
- "description": "涓荤id",
"type": "string"
},
"number": {
@@ -7433,7 +7168,7 @@
"type": "string"
},
"operationDate": {
- "description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" ` + "`" + ` //婧愪綅缃甶d\nToLocationId int ` + "`" + `json:\"toLocationId\" ` + "`" + ` //鐩爣浣嶇疆id",
+ "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",
"type": "string"
},
"operationTypeId": {
@@ -7445,19 +7180,12 @@
"type": "string"
},
"receiverAddr": {
- "description": "鏀惰揣鍦板潃",
"type": "string"
},
"receiverName": {
- "description": "鏀惰揣浜哄鍚�",
"type": "string"
},
"receiverPhone": {
- "description": "鑱旂郴鐢佃瘽",
- "type": "string"
- },
- "silkMarket": {
- "description": "搴勫彛",
"type": "string"
},
"sourceNumber": {
@@ -7621,16 +7349,8 @@
"description": "浜у搧id",
"type": "string"
},
- "productCategory": {
- "description": "浜у搧绫诲埆",
- "type": "string"
- },
"productName": {
"description": "浜у搧鍚嶇О",
- "type": "string"
- },
- "productSpecs": {
- "description": "浜у搧瑙勬牸",
"type": "string"
},
"productType": {
@@ -7707,29 +7427,6 @@
"items": {
"$ref": "#/definitions/models.Material"
}
- }
- }
- },
- "user.GetUserRequest": {
- "type": "object",
- "properties": {
- "id": {
- "type": "string"
- },
- "nickName": {
- "type": "string"
- },
- "parentId": {
- "type": "string"
- },
- "pos": {
- "type": "string"
- },
- "userName": {
- "type": "string"
- },
- "userType": {
- "type": "integer"
}
}
},
--
Gitblit v1.8.0