From 541486c20ad74c2bcbb2e42137a116981b313787 Mon Sep 17 00:00:00 2001 From: jiangshuai <291802688@qq.com> Date: 星期一, 25 九月 2023 10:18:06 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS --- docs/docs.go | 895 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 769 insertions(+), 126 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index f67d02f..20489c0 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -294,35 +294,24 @@ } } }, - "/api-wms/v1/operation/operation": { - "get": { - "consumes": [ - "application/json" - ], + "/api-wms/v1/location/addLocation": { + "post": { "produces": [ "application/json" ], "tags": [ - "鍏ュ簱/鍑哄簱" + "浣嶇疆" ], - "summary": "鍏ュ簱/鍑哄簱鍒楄〃", + "summary": "娣诲姞浣嶇疆淇℃伅", "parameters": [ { - "type": "integer", - "name": "operationTypeId", - "in": "query" - }, - { - "type": "integer", - "description": "椤电爜", - "name": "page", - "in": "query" - }, - { - "type": "integer", - "description": "姣忛〉澶у皬", - "name": "pageSize", - "in": "query" + "description": "浣嶇疆淇℃伅", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/models.Location" + } } ], "responses": { @@ -333,7 +322,240 @@ } } } - }, + } + }, + "/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/list": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "鍏ュ簱/鍑哄簱" + ], + "summary": "鍏ュ簱/鍑哄簱鍒楄〃", + "parameters": [ + { + "description": "鏌ヨ鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.OperationList" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/operation/listAll": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "鍏ュ簱/鍑哄簱" + ], + "summary": "璋冩嫧", + "parameters": [ + { + "description": "鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.OperationAllList" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/operation/operation": { "post": { "produces": [ "application/json" @@ -364,41 +586,6 @@ } }, "/api-wms/v1/operation/operation/{id}": { - "put": { - "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" @@ -426,13 +613,43 @@ } } }, + "/api-wms/v1/operation/update": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "鍏ュ簱/鍑哄簱" + ], + "summary": "淇敼鍏ュ簱/鍑哄簱淇℃伅", + "parameters": [ + { + "description": "鍏ュ簱淇℃伅", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.UpdateOperation" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, "/api-wms/v1/operationType/operationType": { "get": { "produces": [ "application/json" ], "tags": [ - "浣滀笟绫诲瀷" + "涓氬姟绫诲瀷" ], "summary": "鏌ヨ浣滀笟绫诲瀷鍒楄〃", "parameters": [ @@ -483,7 +700,7 @@ "application/json" ], "tags": [ - "浣滀笟绫诲瀷" + "涓氬姟绫诲瀷" ], "summary": "娣诲姞浣滀笟绫诲瀷", "parameters": [ @@ -513,7 +730,7 @@ "application/json" ], "tags": [ - "浣滀笟绫诲瀷" + "涓氬姟绫诲瀷" ], "summary": "缂栬緫浣滀笟绫诲瀷", "parameters": [ @@ -548,7 +765,7 @@ "application/json" ], "tags": [ - "浣滀笟绫诲瀷" + "涓氬姟绫诲瀷" ], "summary": "鍒犻櫎浣滀笟绫诲瀷", "parameters": [ @@ -558,6 +775,36 @@ "name": "id", "in": "path", "required": true + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/product/addDisuse": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "浜у搧" + ], + "summary": "娣诲姞鎶ュ簾淇℃伅", + "parameters": [ + { + "description": "鍏ュ簱/鍑哄簱淇℃伅", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.AddDisuse" + } } ], "responses": { @@ -670,6 +917,34 @@ "parameters": [ { "type": "string", + "description": "id", + "name": "id", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/product/finishDisuse/{id}": { + "put": { + "produces": [ + "application/json" + ], + "tags": [ + "浜у搧" + ], + "summary": "楠岃瘉鎶ュ簾", + "parameters": [ + { + "type": "integer", "description": "id", "name": "id", "in": "path", @@ -851,6 +1126,111 @@ } } ] + } + } + } + } + }, + "/api-wms/v1/product/listDisuse": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "浜у搧" + ], + "summary": "鎶ュ簾鍒楄〃", + "parameters": [ + { + "description": "鏌ヨ鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.QueryDisuseList" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/product/listOperaton": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "浜у搧" + ], + "summary": "浜у搧鍘嗗彶鍑哄叆搴撲俊鎭�", + "parameters": [ + { + "description": "鏌ヨ鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.QueryOperationList" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/util.ResponseList" + }, + { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/models.Operation" + } + } + } + } + ] + } + } + } + } + }, + "/api-wms/v1/product/updateDisuse": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "浜у搧" + ], + "summary": "淇敼鎶ュ簾淇℃伅", + "parameters": [ + { + "description": "鍏ュ簱/鍑哄簱淇℃伅", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.UpdateDisuse" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" } } } @@ -1194,7 +1574,8 @@ 4, 5, 6, - 7 + 7, + 8 ], "x-enum-comments": { "LocationTypeCustomer": "瀹㈡埛浣嶇疆", @@ -1212,7 +1593,8 @@ "LocationTypeCustomer", "LocationTypeInventoryLoss", "LocationTypeProduction", - "LocationTypeTransit" + "LocationTypeTransit", + "LocationTypeDisuse" ] }, "constvar.MaterialMode": { @@ -1383,14 +1765,6 @@ "models.Location": { "type": "object", "properties": { - "company": { - "description": "鍏徃", - "allOf": [ - { - "$ref": "#/definitions/models.Company" - } - ] - }, "companyId": { "description": "鍏徃id", "type": "integer" @@ -1401,6 +1775,14 @@ }, "createTime": { "type": "string" + }, + "forceRemovalStrategy": { + "description": "涓嬫灦绛栫暐", + "allOf": [ + { + "$ref": "#/definitions/constvar.ForceRemovalStrategy" + } + ] }, "id": { "type": "integer" @@ -1413,12 +1795,28 @@ "description": "鏄惁鎶ュ簾浣嶇疆", "type": "boolean" }, + "jointName": { + "description": "鎷兼帴鍚嶇О", + "type": "string" + }, "name": { "description": "浣嶇疆鍚嶇О", "type": "string" }, + "nextCount": { + "description": "涓嬫鐩樼偣", + "type": "string" + }, + "notes": { + "description": "澶栭儴澶囨敞", + "type": "string" + }, "parentId": { "description": "涓婄骇id", + "type": "string" + }, + "recentlyCount": { + "description": "鏈�杩戠洏鐐�", "type": "string" }, "replenishLocation": { @@ -1426,7 +1824,7 @@ "type": "boolean" }, "type": { - "description": "浣嶇疆绫诲瀷", + "description": "Company Company ` + "`" + `json:\"company\" gorm:\"foreignKey:CompanyId\"` + "`" + ` //鍏徃", "allOf": [ { "$ref": "#/definitions/constvar.LocationType" @@ -1441,10 +1839,6 @@ "models.Material": { "type": "object", "properties": { - "HSCode": { - "description": "HS缂栫爜", - "type": "string" - }, "amount": { "description": "鏁伴噺", "type": "number" @@ -1498,14 +1892,14 @@ "type": "number" }, "deliveryAdvanceTime": { - "description": "浜よ揣鎻愬墠鏃堕棿(澶�)", - "type": "integer" + "description": "瀹㈡埛鍓嶇疆鏃堕棿(澶�)", + "type": "number" }, "id": { "type": "string" }, "inStorageExplain": { - "description": "鍏ュ簱璇存槑", + "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": { @@ -1532,6 +1926,10 @@ "description": "PurchaseType constvar.PurchaseType ` + "`" + `gorm:\"type:int(11);comment:閲囪喘绫诲瀷\" json:\"purchaseType\"` + "`" + `", "type": "boolean" }, + "makeAdvanceTime": { + "description": "鍒堕�犲墠缃椂闂�(澶�)", + "type": "number" + }, "maxInventory": { "description": "鏈�澶у簱瀛�", "type": "number" @@ -1556,6 +1954,10 @@ "description": "鐗╂枡鍚嶇О", "type": "string" }, + "orderAdvanceTime": { + "description": "璁㈠崟鍑嗗澶╂暟(澶�)", + "type": "number" + }, "orderCreation": { "description": "璁㈠崟鍒涘缓", "allOf": [ @@ -1563,14 +1965,6 @@ "$ref": "#/definitions/constvar.OrderCreation" } ] - }, - "originCountryId": { - "description": "鍘熶骇鍦癷d", - "type": "integer" - }, - "originCountryName": { - "description": "鍘熶骇鍦板悕绉�", - "type": "string" }, "outStorageExplain": { "description": "鍑哄簱璇存槑", @@ -1606,7 +2000,7 @@ }, "selectProduct": { "description": "鍙�変骇鍝乮d", - "type": "integer" + "type": "string" }, "sellExplain": { "description": "閿�鍞鏄�", @@ -1631,6 +2025,126 @@ "weight": { "description": "閲嶉噺", "type": "number" + } + } + }, + "models.Operation": { + "type": "object", + "properties": { + "comment": { + "type": "string" + }, + "companyID": { + "type": "integer" + }, + "companyName": { + "type": "string" + }, + "contacterID": { + "type": "integer" + }, + "contacterName": { + "type": "string" + }, + "createTime": { + "type": "string" + }, + "details": { + "type": "array", + "items": { + "$ref": "#/definitions/models.OperationDetails" + } + }, + "fromLocation": { + "description": "婧愪綅缃�", + "allOf": [ + { + "$ref": "#/definitions/models.Location" + } + ] + }, + "fromLocationId": { + "description": "婧愪綅缃甶d", + "type": "integer" + }, + "id": { + "type": "integer" + }, + "number": { + "description": "鍗曞彿", + "type": "string" + }, + "operationDate": { + "type": "string" + }, + "operationTypeId": { + "description": "浣滀笟绫诲瀷id", + "type": "integer" + }, + "operationTypeName": { + "description": "浣滀笟绫诲瀷鍚嶇О", + "type": "string" + }, + "sourceNumber": { + "description": "婧愬崟鍙�", + "type": "string" + }, + "status": { + "description": "鐘舵��", + "allOf": [ + { + "$ref": "#/definitions/constvar.OperationStatus" + } + ] + }, + "toLocation": { + "description": "鐩爣浣嶇疆", + "allOf": [ + { + "$ref": "#/definitions/models.Location" + } + ] + }, + "toLocationId": { + "description": "鐩爣浣嶇疆id", + "type": "integer" + }, + "updateTime": { + "type": "string" + } + } + }, + "models.OperationDetails": { + "type": "object", + "properties": { + "amount": { + "description": "ProductName string ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` + "`" + ` //浜у搧鍚嶇О", + "type": "number" + }, + "createTime": { + "type": "string" + }, + "id": { + "type": "integer" + }, + "operationId": { + "description": "鎿嶄綔id", + "type": "integer" + }, + "product": { + "description": "Unit string ` + "`" + `json:\"unit\" gorm:\"type:varchar(31);comment:鍗曚綅\"` + "`" + ` //鍗曚綅", + "allOf": [ + { + "$ref": "#/definitions/models.Material" + } + ] + }, + "productId": { + "description": "浜у搧id", + "type": "string" + }, + "updateTime": { + "type": "string" } } }, @@ -1696,11 +2210,19 @@ "description": "榛樿婧愪綅缃甶d", "type": "integer" }, + "earlyOperations": { + "description": "棰勫~鍐欎綔涓氳鎯�", + "type": "boolean" + }, "id": { "type": "integer" }, "name": { "description": "浠撳簱鍚嶇О", + "type": "string" + }, + "prefix": { + "description": "鍓嶇紑", "type": "string" }, "printLabel": { @@ -1905,25 +2427,48 @@ } } }, + "request.AddDisuse": { + "type": "object", + "properties": { + "amount": { + "description": "ProductName string ` + "`" + `json:\"productName\"` + "`" + `", + "type": "number" + }, + "fromLocationId": { + "type": "integer" + }, + "productId": { + "type": "string" + }, + "sourceNumber": { + "type": "string" + }, + "toLocationId": { + "type": "integer" + } + } + }, "request.AddOperation": { "type": "object", "properties": { - "carrierID": { - "type": "integer" - }, - "carrierName": { + "comment": { + "description": "澶囨敞", "type": "string" }, "companyID": { + "description": "鍏徃ID-瀹㈡埛", "type": "integer" }, "companyName": { + "description": "鍏徃鍚嶇О-瀹㈡埛鍚嶇О", "type": "string" }, "contacterID": { + "description": "鑱旂郴浜篒D-闈炲繀濉�", "type": "integer" }, "contacterName": { + "description": "鑱旂郴浜哄鍚�-闈炲繀濉�", "type": "string" }, "details": { @@ -1944,11 +2489,16 @@ "type": "string" }, "operationDate": { + "description": "瀹夋帓鏃ユ湡", "type": "string" }, "operationTypeId": { "description": "浣滀笟绫诲瀷id", "type": "integer" + }, + "operationTypeName": { + "description": "浣滀笟绫诲瀷鍚嶇О", + "type": "string" }, "sourceNumber": { "description": "婧愬崟鍙�", @@ -1965,15 +2515,6 @@ "toLocationId": { "description": "鐩爣浣嶇疆id", "type": "integer" - }, - "tracking": { - "type": "string" - }, - "transferWeight": { - "type": "number" - }, - "weight": { - "type": "number" } } }, @@ -2118,24 +2659,96 @@ } } }, + "request.OperationAllList": { + "type": "object", + "properties": { + "number": { + "type": "string" + }, + "page": { + "description": "椤电爜", + "type": "integer" + }, + "pageSize": { + "description": "姣忛〉澶у皬", + "type": "integer" + }, + "sourceNumber": { + "type": "string" + } + } + }, "request.OperationDetails": { "type": "object", "properties": { - "finishQuantity": { - "description": "瀹屾垚鏁伴噺", + "OperationId": { + "description": "鎿嶄綔id", + "type": "integer" + }, + "amount": { + "description": "ProductName string ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` + "`" + ` //浜у搧鍚嶇О", "type": "number" }, "productId": { "description": "浜у搧id", - "type": "integer" - }, - "productName": { - "description": "浜у搧鍚嶇О", + "type": "string" + } + } + }, + "request.OperationList": { + "type": "object", + "properties": { + "number": { "type": "string" }, - "quantity": { - "description": "鏁伴噺", - "type": "number" + "operationTypeId": { + "type": "integer" + }, + "page": { + "description": "椤电爜", + "type": "integer" + }, + "pageSize": { + "description": "姣忛〉澶у皬", + "type": "integer" + }, + "sourceNumber": { + "type": "string" + } + } + }, + "request.QueryDisuseList": { + "type": "object", + "properties": { + "number": { + "type": "string" + }, + "page": { + "description": "椤电爜", + "type": "integer" + }, + "pageSize": { + "description": "姣忛〉澶у皬", + "type": "integer" + }, + "sourceNumber": { + "type": "string" + } + } + }, + "request.QueryOperationList": { + "type": "object", + "properties": { + "page": { + "description": "椤电爜", + "type": "integer" + }, + "pageSize": { + "description": "姣忛〉澶у皬", + "type": "integer" + }, + "productId": { + "type": "string" } } }, @@ -2175,25 +2788,61 @@ } } }, + "request.UpdateDisuse": { + "type": "object", + "properties": { + "amount": { + "description": "ProductName string ` + "`" + `json:\"productName\"` + "`" + `", + "type": "number" + }, + "fromLocationId": { + "type": "integer" + }, + "id": { + "type": "integer" + }, + "number": { + "description": "Unit string ` + "`" + `json:\"unit\"` + "`" + `", + "type": "string" + }, + "operationDate": { + "type": "string" + }, + "productId": { + "type": "string" + }, + "sourceNumber": { + "type": "string" + }, + "status": { + "$ref": "#/definitions/constvar.OperationStatus" + }, + "toLocationId": { + "type": "integer" + } + } + }, "request.UpdateOperation": { "type": "object", "properties": { - "carrierID": { - "type": "integer" - }, - "carrierName": { + "comment": { + "description": "澶囨敞", "type": "string" }, "companyID": { + "description": "鍏徃ID-瀹㈡埛", "type": "integer" }, "companyName": { + "description": "鍏徃鍚嶇О-瀹㈡埛鍚嶇О", "type": "string" }, "contacterID": { + "description": "鑱旂郴浜篒D-闈炲繀濉�", "type": "integer" }, "contacterName": { + "description": "鑱旂郴浜哄鍚�-闈炲繀濉�", "type": "string" }, "details": { @@ -2214,11 +2863,16 @@ "type": "string" }, "operationDate": { + "description": "瀹夋帓鏃ユ湡", "type": "string" }, "operationTypeId": { "description": "浣滀笟绫诲瀷id", "type": "integer" + }, + "operationTypeName": { + "description": "浣滀笟绫诲瀷鍚嶇О", + "type": "string" }, "sourceNumber": { "description": "婧愬崟鍙�", @@ -2235,15 +2889,6 @@ "toLocationId": { "description": "鐩爣浣嶇疆id", "type": "integer" - }, - "tracking": { - "type": "string" - }, - "transferWeight": { - "type": "number" - }, - "weight": { - "type": "number" } } }, @@ -2365,8 +3010,6 @@ Description: "", InfoInstanceName: "swagger", SwaggerTemplate: docTemplate, - LeftDelim: "{{", - RightDelim: "}}", } func init() { -- Gitblit v1.8.0