From a07fc02a9f0aa49aaaf273f5ff9cce4c6d546de9 Mon Sep 17 00:00:00 2001 From: liujiandao <274878379@qq.com> Date: 星期四, 21 九月 2023 15:25:36 +0800 Subject: [PATCH] 位置字段添加 --- docs/docs.go | 864 +++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 677 insertions(+), 187 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index dd6d9d1..bc7b478 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -294,7 +294,247 @@ } } }, + "/api-wms/v1/location/addLocation": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "浣嶇疆" + ], + "summary": "娣诲姞浣嶇疆淇℃伅", + "parameters": [ + { + "description": "浣嶇疆淇℃伅", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/models.Location" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/location/deleteLocation/{id}": { + "delete": { + "produces": [ + "application/json" + ], + "tags": [ + "浣嶇疆" + ], + "summary": "鍒犻櫎浣嶇疆", + "parameters": [ + { + "type": "string", + "description": "id", + "name": "id", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/location/getLocationDetails/{id}": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "浣嶇疆" + ], + "summary": "鑾峰彇浣嶇疆璇︽儏", + "parameters": [ + { + "type": "string", + "description": "id", + "name": "id", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/util.Response" + }, + { + "type": "object", + "properties": { + "data": { + "$ref": "#/definitions/models.Location" + } + } + } + ] + } + } + } + } + }, + "/api-wms/v1/location/getLocationList": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "浣嶇疆" + ], + "summary": "鑾峰彇浣嶇疆鍒楄〃", + "parameters": [ + { + "description": "鏌ヨ鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.GetProductList" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/util.ResponseList" + }, + { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/models.Location" + } + } + } + } + ] + } + } + } + } + }, + "/api-wms/v1/location/updateLocation": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "浣嶇疆" + ], + "summary": "淇敼浣嶇疆", + "parameters": [ + { + "description": "浜у搧淇℃伅", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/models.Location" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/operation/finish/{id}": { + "put": { + "produces": [ + "application/json" + ], + "tags": [ + "鍏ュ簱/鍑哄簱" + ], + "summary": "鏇存敼璁板綍鐘舵��", + "parameters": [ + { + "type": "integer", + "description": "id", + "name": "id", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, "/api-wms/v1/operation/operation": { + "get": { + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "鍏ュ簱/鍑哄簱" + ], + "summary": "鍏ュ簱/鍑哄簱鍒楄〃", + "parameters": [ + { + "type": "integer", + "name": "operationTypeId", + "in": "query" + }, + { + "type": "integer", + "description": "椤电爜", + "name": "page", + "in": "query" + }, + { + "type": "integer", + "description": "姣忛〉澶у皬", + "name": "pageSize", + "in": "query" + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + }, "post": { "produces": [ "application/json" @@ -312,6 +552,213 @@ "schema": { "$ref": "#/definitions/request.AddOperation" } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/operation/operation/{id}": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "鍏ュ簱/鍑哄簱" + ], + "summary": "淇敼鍏ュ簱/鍑哄簱淇℃伅", + "parameters": [ + { + "description": "鍏ュ簱淇℃伅", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.UpdateOperation" + } + }, + { + "type": "integer", + "description": "鍏ュ簱淇℃伅id", + "name": "id", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + }, + "delete": { + "produces": [ + "application/json" + ], + "tags": [ + "鍏ュ簱/鍑哄簱" + ], + "summary": "鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅", + "parameters": [ + { + "type": "integer", + "description": "id", + "name": "id", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/operationType/operationType": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "涓氬姟绫诲瀷" + ], + "summary": "鏌ヨ浣滀笟绫诲瀷鍒楄〃", + "parameters": [ + { + "type": "string", + "name": "keyword", + "in": "query" + }, + { + "type": "integer", + "description": "椤电爜", + "name": "page", + "in": "query" + }, + { + "type": "integer", + "description": "姣忛〉澶у皬", + "name": "pageSize", + "in": "query" + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/util.ResponseList" + }, + { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/models.OperationType" + } + } + } + } + ] + } + } + } + }, + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "涓氬姟绫诲瀷" + ], + "summary": "娣诲姞浣滀笟绫诲瀷", + "parameters": [ + { + "description": "浣滀笟绫诲瀷淇℃伅", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.AddOperationType" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/operationType/operationType/{id}": { + "put": { + "produces": [ + "application/json" + ], + "tags": [ + "涓氬姟绫诲瀷" + ], + "summary": "缂栬緫浣滀笟绫诲瀷", + "parameters": [ + { + "description": "浣滀笟绫诲瀷淇℃伅", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.UpdateOperationType" + } + }, + { + "type": "string", + "description": "浣滀笟绫诲瀷id", + "name": "id", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + }, + "delete": { + "produces": [ + "application/json" + ], + "tags": [ + "涓氬姟绫诲瀷" + ], + "summary": "鍒犻櫎浣滀笟绫诲瀷", + "parameters": [ + { + "type": "string", + "description": "浣滀笟绫诲瀷id", + "name": "id", + "in": "path", + "required": true } ], "responses": { @@ -670,32 +1117,22 @@ } } }, - "/api-wms/v1/warehouse/operationType": { + "/api-wms/v1/warehouse/getWarehouseDetails/{id}": { "get": { "produces": [ "application/json" ], "tags": [ - "浣滀笟绫诲瀷" + "浠撳簱" ], - "summary": "鏌ヨ浣滀笟绫诲瀷鍒楄〃", + "summary": "鑾峰彇浠撳簱璇︽儏", "parameters": [ { "type": "string", - "name": "keyword", - "in": "query" - }, - { - "type": "integer", - "description": "椤电爜", - "name": "page", - "in": "query" - }, - { - "type": "integer", - "description": "姣忛〉澶у皬", - "name": "pageSize", - "in": "query" + "description": "浠撳簱id", + "name": "id", + "in": "path", + "required": true } ], "responses": { @@ -704,16 +1141,13 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/util.ResponseList" + "$ref": "#/definitions/util.Response" }, { "type": "object", "properties": { "data": { - "type": "array", - "items": { - "$ref": "#/definitions/models.OperationType" - } + "$ref": "#/definitions/models.Warehouse" } } } @@ -721,87 +1155,26 @@ } } } - }, + } + }, + "/api-wms/v1/warehouse/updateWarehouse": { "post": { "produces": [ "application/json" ], "tags": [ - "浣滀笟绫诲瀷" + "浠撳簱" ], - "summary": "娣诲姞浣滀笟绫诲瀷", + "summary": "缂栬緫浠撳簱", "parameters": [ { - "description": "浣滀笟绫诲瀷淇℃伅", + "description": "浠撳簱淇℃伅", "name": "object", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/request.AddOperationType" + "$ref": "#/definitions/models.Warehouse" } - } - ], - "responses": { - "200": { - "description": "鎴愬姛", - "schema": { - "$ref": "#/definitions/util.Response" - } - } - } - } - }, - "/api-wms/v1/warehouse/operationType/{id}": { - "put": { - "produces": [ - "application/json" - ], - "tags": [ - "浣滀笟绫诲瀷" - ], - "summary": "缂栬緫浣滀笟绫诲瀷", - "parameters": [ - { - "description": "浣滀笟绫诲瀷淇℃伅", - "name": "object", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/request.UpdateOperationType" - } - }, - { - "type": "string", - "description": "浣滀笟绫诲瀷id", - "name": "id", - "in": "path", - "required": true - } - ], - "responses": { - "200": { - "description": "鎴愬姛", - "schema": { - "$ref": "#/definitions/util.Response" - } - } - } - }, - "delete": { - "produces": [ - "application/json" - ], - "tags": [ - "浣滀笟绫诲瀷" - ], - "summary": "鍒犻櫎浣滀笟绫诲瀷", - "parameters": [ - { - "type": "string", - "description": "浣滀笟绫诲瀷id", - "name": "id", - "in": "path", - "required": true } ], "responses": { @@ -896,41 +1269,6 @@ } }, "/api-wms/v1/warehouse/warehouse/{id}": { - "put": { - "produces": [ - "application/json" - ], - "tags": [ - "浠撳簱" - ], - "summary": "缂栬緫浠撳簱", - "parameters": [ - { - "description": "浠撳簱淇℃伅", - "name": "object", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/request.UpdateWarehouse" - } - }, - { - "type": "string", - "description": "浠撳簱id", - "name": "id", - "in": "path", - "required": true - } - ], - "responses": { - "200": { - "description": "鎴愬姛", - "schema": { - "$ref": "#/definitions/util.Response" - } - } - } - }, "delete": { "produces": [ "application/json" @@ -1133,6 +1471,24 @@ "TaskAndObject" ] }, + "constvar.ProductType": { + "type": "integer", + "enum": [ + 1, + 2, + 3 + ], + "x-enum-comments": { + "Consumables": "娑堣�楀搧", + "Server": "鏈嶅姟", + "StoredProduct": "鍙偍瀛樼殑浜у搧" + }, + "x-enum-varnames": [ + "Consumables", + "Server", + "StoredProduct" + ] + }, "constvar.ReservationMethod": { "type": "integer", "enum": [ @@ -1247,6 +1603,14 @@ "createTime": { "type": "string" }, + "forceRemovalStrategy": { + "description": "涓嬫灦绛栫暐", + "allOf": [ + { + "$ref": "#/definitions/constvar.ForceRemovalStrategy" + } + ] + }, "id": { "type": "integer" }, @@ -1264,7 +1628,7 @@ }, "parentId": { "description": "涓婄骇id", - "type": "integer" + "type": "string" }, "replenishLocation": { "description": "鏄惁琛ュ厖浣嶇疆", @@ -1286,10 +1650,8 @@ "models.Material": { "type": "object", "properties": { - "HSCode": { - "type": "string" - }, "amount": { + "description": "鏁伴噺", "type": "number" }, "barcode": { @@ -1297,6 +1659,7 @@ "type": "string" }, "buyExplain": { + "description": "閲囪喘璇存槑", "type": "string" }, "canBePurchased": { @@ -1307,20 +1670,32 @@ "description": "浜у搧绫诲埆id", "type": "integer" }, + "categoryName": { + "description": "浜у搧绫诲埆鍚嶇О", + "type": "string" + }, "companyId": { + "description": "鍏徃id", "type": "integer" }, "companyName": { + "description": "鍏徃鍚嶇О", "type": "string" }, "controlStrategy": { - "$ref": "#/definitions/constvar.InvoicingStrategy" + "description": "鎺у埗绛栫暐", + "allOf": [ + { + "$ref": "#/definitions/constvar.InvoicingStrategy" + } + ] }, "cost": { "description": "鎴愭湰", "type": "number" }, "currencyName": { + "description": "甯佺鍚嶇О", "type": "string" }, "customerTaxes": { @@ -1328,12 +1703,14 @@ "type": "number" }, "deliveryAdvanceTime": { - "type": "integer" + "description": "瀹㈡埛鍓嶇疆鏃堕棿(澶�)", + "type": "number" }, "id": { "type": "string" }, "inStorageExplain": { + "description": "HSCode string ` + "`" + `gorm:\"type:varchar(255);comment:HS缂栫爜\" json:\"HSCode\"` + "`" + ` //HS缂栫爜\nOriginCountryId int ` + "`" + `gorm:\"type:int(11);comment:鍘熶骇鍦癷d\" json:\"originCountryId\"` + "`" + ` //鍘熶骇鍦癷d\nOriginCountryName string ` + "`" + `gorm:\"type:varchar(255);comment:鍘熶骇鍦板悕绉癨" json:\"originCountryName\"` + "`" + ` //鍘熶骇鍦板悕绉�", "type": "string" }, "internalNotes": { @@ -1345,10 +1722,11 @@ "type": "string" }, "internalTransferExplain": { + "description": "鍐呴儴璋冩嫧璇存槑", "type": "string" }, "invoicingStrategy": { - "description": "wms娣诲姞瀛楁", + "description": "寮�绁ㄧ瓥鐣�", "allOf": [ { "$ref": "#/definitions/constvar.InvoicingStrategy" @@ -1359,7 +1737,12 @@ "description": "PurchaseType constvar.PurchaseType ` + "`" + `gorm:\"type:int(11);comment:閲囪喘绫诲瀷\" json:\"purchaseType\"` + "`" + `", "type": "boolean" }, + "makeAdvanceTime": { + "description": "鍒堕�犲墠缃椂闂�(澶�)", + "type": "number" + }, "maxInventory": { + "description": "鏈�澶у簱瀛�", "type": "number" }, "minInventory": { @@ -1379,18 +1762,23 @@ ] }, "name": { + "description": "鐗╂枡鍚嶇О", "type": "string" + }, + "orderAdvanceTime": { + "description": "璁㈠崟鍑嗗澶╂暟(澶�)", + "type": "number" }, "orderCreation": { - "$ref": "#/definitions/constvar.OrderCreation" - }, - "originCountryId": { - "type": "integer" - }, - "originCountryName": { - "type": "string" + "description": "璁㈠崟鍒涘缓", + "allOf": [ + { + "$ref": "#/definitions/constvar.OrderCreation" + } + ] }, "outStorageExplain": { + "description": "鍑哄簱璇存槑", "type": "string" }, "principal": { @@ -1398,26 +1786,43 @@ "type": "string" }, "productTagId": { - "description": "浜у搧鏍囩", + "description": "浜у搧鏍囩id", "type": "integer" }, "productTagName": { + "description": "浜у搧鏍囩鍚嶇О", "type": "string" }, + "productType": { + "description": "wms娣诲姞瀛楁", + "allOf": [ + { + "$ref": "#/definitions/constvar.ProductType" + } + ] + }, "purchasePrice": { + "description": "閲囪喘浠锋牸", "type": "number" }, "salePrice": { + "description": "閿�鍞崟浠�", "type": "number" }, "selectProduct": { - "type": "integer" + "description": "鍙�変骇鍝乮d", + "type": "string" }, "sellExplain": { + "description": "閿�鍞鏄�", "type": "string" }, "supplier": { "description": "FSource string ` + "`" + `gorm:\"type:varchar(191);comment:鐢熶骇杞﹂棿\" json:\"-\"` + "`" + `\nStatus constvar.MaterialStatus ` + "`" + `gorm:\"type:int(11);comment:鐘舵�乗" json:\"status\"` + "`" + `", + "type": "string" + }, + "templateID": { + "description": "Note string ` + "`" + `gorm:\"type:varchar(1024);comment:澶囨敞\" json:\"note\"` + "`" + `", "type": "string" }, "unit": { @@ -1587,6 +1992,7 @@ "type": "integer" }, "routeId": { + "description": "璺嚎id", "type": "integer" }, "routeName": { @@ -1604,6 +2010,10 @@ "active": { "description": "鏄惁鍚敤锛屼紶true灏辫", "type": "boolean" + }, + "address": { + "description": "鍦板潃", + "type": "string" }, "buyToResupply": { "description": "鏄惁璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�", @@ -1627,9 +2037,21 @@ "id": { "type": "integer" }, + "inboundTransportation": { + "description": "鍏ュ悜杩愯緭", + "type": "integer" + }, + "locationId": { + "description": "浣嶇疆id", + "type": "integer" + }, "name": { "description": "浠撳簱鍚嶇О", "type": "string" + }, + "outboundTransportation": { + "description": "鍑哄簱杩愯緭", + "type": "integer" }, "partnerId": { "description": "鍚堜綔浼欎即id", @@ -1650,6 +2072,10 @@ } }, "updateTime": { + "type": "string" + }, + "warehouseLocation": { + "description": "搴撳瓨浣嶇疆", "type": "string" } } @@ -1687,6 +2113,26 @@ "request.AddOperation": { "type": "object", "properties": { + "comment": { + "description": "澶囨敞", + "type": "string" + }, + "companyID": { + "description": "鍏徃ID-瀹㈡埛", + "type": "integer" + }, + "companyName": { + "description": "鍏徃鍚嶇О-瀹㈡埛鍚嶇О", + "type": "string" + }, + "contacterID": { + "description": "鑱旂郴浜篒D-闈炲繀濉�", + "type": "integer" + }, + "contacterName": { + "description": "鑱旂郴浜哄鍚�-闈炲繀濉�", + "type": "string" + }, "details": { "type": "array", "items": { @@ -1705,6 +2151,7 @@ "type": "string" }, "operationDate": { + "description": "瀹夋帓鏃ユ湡", "type": "string" }, "operationTypeId": { @@ -1811,6 +2258,10 @@ "description": "鏄惁鍚敤锛屼紶true灏辫", "type": "boolean" }, + "address": { + "description": "鍦板潃", + "type": "string" + }, "buyToResupply": { "description": "璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�", "type": "boolean" @@ -1821,9 +2272,21 @@ "maxLength": 5, "minLength": 1 }, + "inboundTransportation": { + "description": "鍏ュ悜杩愯緭", + "type": "integer" + }, + "locationId": { + "description": "浣嶇疆id", + "type": "integer" + }, "name": { "description": "浠撳簱鍚嶇О", "type": "string" + }, + "outboundTransportation": { + "description": "鍑哄簱杩愯緭", + "type": "integer" }, "partnerId": { "description": "鍚堜綔浼欎即id", @@ -1857,13 +2320,13 @@ "request.OperationDetails": { "type": "object", "properties": { - "finishQuantity": { - "description": "瀹屾垚鏁伴噺", - "type": "number" + "OperationId": { + "description": "鎿嶄綔id", + "type": "integer" }, "productId": { "description": "浜у搧id", - "type": "integer" + "type": "string" }, "productName": { "description": "浜у搧鍚嶇О", @@ -1872,6 +2335,9 @@ "quantity": { "description": "鏁伴噺", "type": "number" + }, + "unit": { + "type": "string" } } }, @@ -1908,6 +2374,72 @@ "remark": { "description": "澶囨敞", "type": "string" + } + } + }, + "request.UpdateOperation": { + "type": "object", + "properties": { + "comment": { + "description": "澶囨敞", + "type": "string" + }, + "companyID": { + "description": "鍏徃ID-瀹㈡埛", + "type": "integer" + }, + "companyName": { + "description": "鍏徃鍚嶇О-瀹㈡埛鍚嶇О", + "type": "string" + }, + "contacterID": { + "description": "鑱旂郴浜篒D-闈炲繀濉�", + "type": "integer" + }, + "contacterName": { + "description": "鑱旂郴浜哄鍚�-闈炲繀濉�", + "type": "string" + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/request.OperationDetails" + } + }, + "fromLocationId": { + "description": "婧愪綅缃甶d", + "type": "integer" + }, + "id": { + "type": "integer" + }, + "number": { + "description": "鍗曞彿", + "type": "string" + }, + "operationDate": { + "description": "瀹夋帓鏃ユ湡", + "type": "string" + }, + "operationTypeId": { + "description": "浣滀笟绫诲瀷id", + "type": "integer" + }, + "sourceNumber": { + "description": "婧愬崟鍙�", + "type": "string" + }, + "status": { + "description": "鐘舵��", + "allOf": [ + { + "$ref": "#/definitions/constvar.OperationStatus" + } + ] + }, + "toLocationId": { + "description": "鐩爣浣嶇疆id", + "type": "integer" } } }, @@ -1983,46 +2515,6 @@ } } }, - "request.UpdateWarehouse": { - "type": "object", - "required": [ - "code" - ], - "properties": { - "active": { - "description": "鏄惁鍚敤锛屼紶true灏辫", - "type": "boolean" - }, - "buyToResupply": { - "description": "璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�", - "type": "boolean" - }, - "code": { - "description": "浠撳簱缂栫爜", - "type": "string", - "maxLength": 5, - "minLength": 1 - }, - "id": { - "type": "integer" - }, - "name": { - "description": "浠撳簱鍚嶇О", - "type": "string" - }, - "partnerId": { - "description": "鍚堜綔浼欎即id", - "type": "integer" - }, - "resupplyWhIds": { - "description": "琛ョ粰鏉ユ簮浠撳簱ID", - "type": "array", - "items": { - "type": "string" - } - } - } - }, "util.Response": { "type": "object", "properties": { @@ -2069,8 +2561,6 @@ Description: "", InfoInstanceName: "swagger", SwaggerTemplate: docTemplate, - LeftDelim: "{{", - RightDelim: "}}", } func init() { -- Gitblit v1.8.0