From f36fe3eca14e9a9543eb5dc8fa3bd9a7e3611b98 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 21 九月 2023 19:30:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
docs/docs.go | 403 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 307 insertions(+), 96 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index f67d02f..81492dd 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": [
@@ -364,41 +565,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 +592,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 +679,7 @@
"application/json"
],
"tags": [
- "浣滀笟绫诲瀷"
+ "涓氬姟绫诲瀷"
],
"summary": "娣诲姞浣滀笟绫诲瀷",
"parameters": [
@@ -513,7 +709,7 @@
"application/json"
],
"tags": [
- "浣滀笟绫诲瀷"
+ "涓氬姟绫诲瀷"
],
"summary": "缂栬緫浣滀笟绫诲瀷",
"parameters": [
@@ -548,7 +744,7 @@
"application/json"
],
"tags": [
- "浣滀笟绫诲瀷"
+ "涓氬姟绫诲瀷"
],
"summary": "鍒犻櫎浣滀笟绫诲瀷",
"parameters": [
@@ -1383,14 +1579,6 @@
"models.Location": {
"type": "object",
"properties": {
- "company": {
- "description": "鍏徃",
- "allOf": [
- {
- "$ref": "#/definitions/models.Company"
- }
- ]
- },
"companyId": {
"description": "鍏徃id",
"type": "integer"
@@ -1401,6 +1589,14 @@
},
"createTime": {
"type": "string"
+ },
+ "forceRemovalStrategy": {
+ "description": "涓嬫灦绛栫暐",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.ForceRemovalStrategy"
+ }
+ ]
},
"id": {
"type": "integer"
@@ -1417,8 +1613,20 @@
"description": "浣嶇疆鍚嶇О",
"type": "string"
},
+ "nextCount": {
+ "description": "涓嬫鐩樼偣",
+ "type": "string"
+ },
+ "notes": {
+ "description": "澶栭儴澶囨敞",
+ "type": "string"
+ },
"parentId": {
"description": "涓婄骇id",
+ "type": "string"
+ },
+ "recentlyCount": {
+ "description": "鏈�杩戠洏鐐�",
"type": "string"
},
"replenishLocation": {
@@ -1426,7 +1634,7 @@
"type": "boolean"
},
"type": {
- "description": "浣嶇疆绫诲瀷",
+ "description": "Company Company ` + "`" + `json:\"company\" gorm:\"foreignKey:CompanyId\"` + "`" + ` //鍏徃",
"allOf": [
{
"$ref": "#/definitions/constvar.LocationType"
@@ -1441,10 +1649,6 @@
"models.Material": {
"type": "object",
"properties": {
- "HSCode": {
- "description": "HS缂栫爜",
- "type": "string"
- },
"amount": {
"description": "鏁伴噺",
"type": "number"
@@ -1498,14 +1702,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 +1736,10 @@
"description": "PurchaseType constvar.PurchaseType ` + "`" + `gorm:\"type:int(11);comment:閲囪喘绫诲瀷\" json:\"purchaseType\"` + "`" + `",
"type": "boolean"
},
+ "makeAdvanceTime": {
+ "description": "鍒堕�犲墠缃椂闂�(澶�)",
+ "type": "number"
+ },
"maxInventory": {
"description": "鏈�澶у簱瀛�",
"type": "number"
@@ -1556,6 +1764,10 @@
"description": "鐗╂枡鍚嶇О",
"type": "string"
},
+ "orderAdvanceTime": {
+ "description": "璁㈠崟鍑嗗澶╂暟(澶�)",
+ "type": "number"
+ },
"orderCreation": {
"description": "璁㈠崟鍒涘缓",
"allOf": [
@@ -1563,14 +1775,6 @@
"$ref": "#/definitions/constvar.OrderCreation"
}
]
- },
- "originCountryId": {
- "description": "鍘熶骇鍦癷d",
- "type": "integer"
- },
- "originCountryName": {
- "description": "鍘熶骇鍦板悕绉�",
- "type": "string"
},
"outStorageExplain": {
"description": "鍑哄簱璇存槑",
@@ -1606,7 +1810,7 @@
},
"selectProduct": {
"description": "鍙�変骇鍝乮d",
- "type": "integer"
+ "type": "string"
},
"sellExplain": {
"description": "閿�鍞鏄�",
@@ -1696,11 +1900,19 @@
"description": "榛樿婧愪綅缃甶d",
"type": "integer"
},
+ "earlyOperations": {
+ "description": "棰勫～鍐欎綔涓氳鎯�",
+ "type": "boolean"
+ },
"id": {
"type": "integer"
},
"name": {
"description": "浠撳簱鍚嶇О",
+ "type": "string"
+ },
+ "prefix": {
+ "description": "鍓嶇紑",
"type": "string"
},
"printLabel": {
@@ -1908,22 +2120,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": {
@@ -1944,11 +2158,16 @@
"type": "string"
},
"operationDate": {
+ "description": "瀹夋帓鏃ユ湡",
"type": "string"
},
"operationTypeId": {
"description": "浣滀笟绫诲瀷id",
"type": "integer"
+ },
+ "operationTypeName": {
+ "description": "浣滀笟绫诲瀷鍚嶇О",
+ "type": "string"
},
"sourceNumber": {
"description": "婧愬崟鍙�",
@@ -1965,15 +2184,6 @@
"toLocationId": {
"description": "鐩爣浣嶇疆id",
"type": "integer"
- },
- "tracking": {
- "type": "string"
- },
- "transferWeight": {
- "type": "number"
- },
- "weight": {
- "type": "number"
}
}
},
@@ -2121,21 +2331,24 @@
"request.OperationDetails": {
"type": "object",
"properties": {
- "finishQuantity": {
- "description": "瀹屾垚鏁伴噺",
+ "OperationId": {
+ "description": "鎿嶄綔id",
+ "type": "integer"
+ },
+ "amount": {
+ "description": "鏁伴噺",
"type": "number"
},
"productId": {
"description": "浜у搧id",
- "type": "integer"
+ "type": "string"
},
"productName": {
"description": "浜у搧鍚嶇О",
"type": "string"
},
- "quantity": {
- "description": "鏁伴噺",
- "type": "number"
+ "unit": {
+ "type": "string"
}
}
},
@@ -2178,22 +2391,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": {
@@ -2214,11 +2429,16 @@
"type": "string"
},
"operationDate": {
+ "description": "瀹夋帓鏃ユ湡",
"type": "string"
},
"operationTypeId": {
"description": "浣滀笟绫诲瀷id",
"type": "integer"
+ },
+ "operationTypeName": {
+ "description": "浣滀笟绫诲瀷鍚嶇О",
+ "type": "string"
},
"sourceNumber": {
"description": "婧愬崟鍙�",
@@ -2235,15 +2455,6 @@
"toLocationId": {
"description": "鐩爣浣嶇疆id",
"type": "integer"
- },
- "tracking": {
- "type": "string"
- },
- "transferWeight": {
- "type": "number"
- },
- "weight": {
- "type": "number"
}
}
},
--
Gitblit v1.8.0