From eae7648dfc2085a849401f9e49de184002f1cece Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 21 九月 2023 17:46:31 +0800
Subject: [PATCH] 1.出入库一部分代码
---
docs/docs.go | 695 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 471 insertions(+), 224 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 9647266..0e06838 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -294,6 +294,207 @@
}
}
},
+ "/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": [
@@ -411,6 +612,150 @@
{
"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
@@ -772,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": {
@@ -806,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"
}
}
}
@@ -823,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": {
@@ -998,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"
@@ -1235,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": [
@@ -1330,14 +1584,6 @@
"models.Location": {
"type": "object",
"properties": {
- "company": {
- "description": "鍏徃",
- "allOf": [
- {
- "$ref": "#/definitions/models.Company"
- }
- ]
- },
"companyId": {
"description": "鍏徃id",
"type": "integer"
@@ -1348,6 +1594,14 @@
},
"createTime": {
"type": "string"
+ },
+ "forceRemovalStrategy": {
+ "description": "涓嬫灦绛栫暐",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.ForceRemovalStrategy"
+ }
+ ]
},
"id": {
"type": "integer"
@@ -1366,14 +1620,14 @@
},
"parentId": {
"description": "涓婄骇id",
- "type": "integer"
+ "type": "string"
},
"replenishLocation": {
"description": "鏄惁琛ュ厖浣嶇疆",
"type": "boolean"
},
"type": {
- "description": "浣嶇疆绫诲瀷",
+ "description": "Company Company ` + "`" + `json:\"company\" gorm:\"foreignKey:CompanyId\"` + "`" + ` //鍏徃",
"allOf": [
{
"$ref": "#/definitions/constvar.LocationType"
@@ -1388,10 +1642,6 @@
"models.Material": {
"type": "object",
"properties": {
- "HSCode": {
- "description": "HS缂栫爜",
- "type": "string"
- },
"amount": {
"description": "鏁伴噺",
"type": "number"
@@ -1411,6 +1661,10 @@
"categoryId": {
"description": "浜у搧绫诲埆id",
"type": "integer"
+ },
+ "categoryName": {
+ "description": "浜у搧绫诲埆鍚嶇О",
+ "type": "string"
},
"companyId": {
"description": "鍏徃id",
@@ -1441,14 +1695,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": {
@@ -1464,7 +1718,7 @@
"type": "string"
},
"invoicingStrategy": {
- "description": "wms娣诲姞瀛楁",
+ "description": "寮�绁ㄧ瓥鐣�",
"allOf": [
{
"$ref": "#/definitions/constvar.InvoicingStrategy"
@@ -1474,6 +1728,10 @@
"isSale": {
"description": "PurchaseType constvar.PurchaseType ` + "`" + `gorm:\"type:int(11);comment:閲囪喘绫诲瀷\" json:\"purchaseType\"` + "`" + `",
"type": "boolean"
+ },
+ "makeAdvanceTime": {
+ "description": "鍒堕�犲墠缃椂闂�(澶�)",
+ "type": "number"
},
"maxInventory": {
"description": "鏈�澶у簱瀛�",
@@ -1499,6 +1757,10 @@
"description": "鐗╂枡鍚嶇О",
"type": "string"
},
+ "orderAdvanceTime": {
+ "description": "璁㈠崟鍑嗗澶╂暟(澶�)",
+ "type": "number"
+ },
"orderCreation": {
"description": "璁㈠崟鍒涘缓",
"allOf": [
@@ -1506,14 +1768,6 @@
"$ref": "#/definitions/constvar.OrderCreation"
}
]
- },
- "originCountryId": {
- "description": "鍘熶骇鍦癷d",
- "type": "integer"
- },
- "originCountryName": {
- "description": "鍘熶骇鍦板悕绉�",
- "type": "string"
},
"outStorageExplain": {
"description": "鍑哄簱璇存槑",
@@ -1531,6 +1785,14 @@
"description": "浜у搧鏍囩鍚嶇О",
"type": "string"
},
+ "productType": {
+ "description": "wms娣诲姞瀛楁",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.ProductType"
+ }
+ ]
+ },
"purchasePrice": {
"description": "閲囪喘浠锋牸",
"type": "number"
@@ -1541,7 +1803,7 @@
},
"selectProduct": {
"description": "鍙�変骇鍝乮d",
- "type": "integer"
+ "type": "string"
},
"sellExplain": {
"description": "閿�鍞鏄�",
@@ -1741,6 +2003,10 @@
"description": "鏄惁鍚敤锛屼紶true灏辫",
"type": "boolean"
},
+ "address": {
+ "description": "鍦板潃",
+ "type": "string"
+ },
"buyToResupply": {
"description": "鏄惁璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
"type": "boolean"
@@ -1763,9 +2029,21 @@
"id": {
"type": "integer"
},
+ "inboundTransportation": {
+ "description": "鍏ュ悜杩愯緭",
+ "type": "integer"
+ },
+ "locationId": {
+ "description": "浣嶇疆id",
+ "type": "integer"
+ },
"name": {
"description": "浠撳簱鍚嶇О",
"type": "string"
+ },
+ "outboundTransportation": {
+ "description": "鍑哄簱杩愯緭",
+ "type": "integer"
},
"partnerId": {
"description": "鍚堜綔浼欎即id",
@@ -1786,6 +2064,10 @@
}
},
"updateTime": {
+ "type": "string"
+ },
+ "warehouseLocation": {
+ "description": "搴撳瓨浣嶇疆",
"type": "string"
}
}
@@ -1823,22 +2105,24 @@
"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": {
@@ -1859,6 +2143,7 @@
"type": "string"
},
"operationDate": {
+ "description": "瀹夋帓鏃ユ湡",
"type": "string"
},
"operationTypeId": {
@@ -1880,15 +2165,6 @@
"toLocationId": {
"description": "鐩爣浣嶇疆id",
"type": "integer"
- },
- "tracking": {
- "type": "string"
- },
- "transferWeight": {
- "type": "number"
- },
- "weight": {
- "type": "number"
}
}
},
@@ -1974,6 +2250,10 @@
"description": "鏄惁鍚敤锛屼紶true灏辫",
"type": "boolean"
},
+ "address": {
+ "description": "鍦板潃",
+ "type": "string"
+ },
"buyToResupply": {
"description": "璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
"type": "boolean"
@@ -1984,9 +2264,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",
@@ -2020,13 +2312,13 @@
"request.OperationDetails": {
"type": "object",
"properties": {
- "finishQuantity": {
- "description": "瀹屾垚鏁伴噺",
- "type": "number"
+ "OperationId": {
+ "description": "鎿嶄綔id",
+ "type": "integer"
},
"productId": {
"description": "浜у搧id",
- "type": "integer"
+ "type": "string"
},
"productName": {
"description": "浜у搧鍚嶇О",
@@ -2035,6 +2327,9 @@
"quantity": {
"description": "鏁伴噺",
"type": "number"
+ },
+ "unit": {
+ "type": "string"
}
}
},
@@ -2077,22 +2372,24 @@
"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": {
@@ -2113,6 +2410,7 @@
"type": "string"
},
"operationDate": {
+ "description": "瀹夋帓鏃ユ湡",
"type": "string"
},
"operationTypeId": {
@@ -2134,15 +2432,6 @@
"toLocationId": {
"description": "鐩爣浣嶇疆id",
"type": "integer"
- },
- "tracking": {
- "type": "string"
- },
- "transferWeight": {
- "type": "number"
- },
- "weight": {
- "type": "number"
}
}
},
@@ -2218,46 +2507,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": {
@@ -2304,8 +2553,6 @@
Description: "",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
- LeftDelim: "{{",
- RightDelim: "}}",
}
func init() {
--
Gitblit v1.8.0