From f16252d8b4736a0212b14a2bfb0eeee411d0cc76 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期一, 13 十一月 2023 11:16:34 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
docs/docs.go | 625 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 599 insertions(+), 26 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 2d534d2..a25619b 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -150,6 +150,22 @@
}
}
},
+ "/api-wms/v1/attachment/uploadFiles": {
+ "post": {
+ "tags": [
+ "闄勪欢绠＄悊"
+ ],
+ "summary": "涓婁紶闄勪欢",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/company/company": {
"get": {
"produces": [
@@ -543,10 +559,44 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.GetProductList"
+ "$ref": "#/definitions/request.GetLocationList"
}
}
],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Location"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/location/getLocationTreeList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浣嶇疆"
+ ],
+ "summary": "鑾峰彇浣嶇疆鍒楄〃鏍�",
"responses": {
"200": {
"description": "鎴愬姛",
@@ -736,7 +786,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.AddLocationProductAmount"
+ "$ref": "#/definitions/request.UpdateLocationProductAmount"
}
}
],
@@ -913,6 +963,40 @@
}
}
},
+ "/api-wms/v1/operation/getLogisticCompanyList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鍏ュ簱/鍑哄簱"
+ ],
+ "summary": "鑾峰彇鐗╂祦鍏徃鍒楄〃",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.LogisticCompany"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/operation/list": {
"post": {
"produces": [
@@ -943,7 +1027,7 @@
}
}
},
- "/api-wms/v1/operation/listAll": {
+ "/api-wms/v1/operation/listTransfer": {
"post": {
"produces": [
"application/json"
@@ -951,7 +1035,7 @@
"tags": [
"鍏ュ簱/鍑哄簱"
],
- "summary": "璋冩嫧",
+ "summary": "搴撳瓨璋冩嫧鍒楄〃",
"parameters": [
{
"description": "鍙傛暟",
@@ -1056,6 +1140,32 @@
"description": "鎴愬姛",
"schema": {
"$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/operationType/listTransfer": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "涓氬姟绫诲瀷"
+ ],
+ "summary": "璋冩嫧绫诲瀷鍒楄〃",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "keyword",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.ResponseList"
}
}
}
@@ -1744,6 +1854,187 @@
}
}
},
+ "/api-wms/v1/reorderRule/addReorderRule": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "閲嶈璐ц鍒�"
+ ],
+ "summary": "娣诲姞閲嶈璐ц鍒�",
+ "parameters": [
+ {
+ "description": "閲嶈璐ц鍒�",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/models.ReorderRule"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/reorderRule/getAmountAndPrediction": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "閲嶈璐ц鍒�"
+ ],
+ "summary": "鑾峰彇鍦ㄥ簱涓庨娴嬫暟閲�",
+ "parameters": [
+ {
+ "description": "閲嶈璐ц鍒�",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetAmountAndPrediction"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "type": "object",
+ "additionalProperties": true
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/reorderRule/getReorderRuleList": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "閲嶈璐ц鍒�"
+ ],
+ "summary": "鑾峰彇閲嶈璐ц鍒欏垪琛�",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetReorderRuleList"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.ReorderRule"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/reorderRule/orderAgain": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "閲嶈璐ц鍒�"
+ ],
+ "summary": "鍐嶈涓�娆�",
+ "parameters": [
+ {
+ "description": "閲嶈璐ц鍒�",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/models.ReorderRule"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/reorderRule/updateReorderRule": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "閲嶈璐ц鍒�"
+ ],
+ "summary": "鏇存柊閲嶈璐ц鍒�",
+ "parameters": [
+ {
+ "description": "閲嶈璐ц鍒�",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/models.ReorderRule"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/warehouse/getWarehouseDetails/{id}": {
"get": {
"produces": [
@@ -1967,6 +2258,24 @@
"CostingMethodAverageCost"
]
},
+ "constvar.FileType": {
+ "type": "string",
+ "enum": [
+ "file",
+ "picture",
+ "thumbnail"
+ ],
+ "x-enum-comments": {
+ "FileType_File": "鏂囦欢",
+ "FileType_Picture": "鍥剧墖",
+ "FileType_Thumbnail": "缂╃暐鍥�"
+ },
+ "x-enum-varnames": [
+ "FileType_File",
+ "FileType_Picture",
+ "FileType_Thumbnail"
+ ]
+ },
"constvar.ForceRemovalStrategy": {
"type": "integer",
"enum": [
@@ -2146,6 +2455,21 @@
"ReservationMethodByDate"
]
},
+ "constvar.RuleType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-comments": {
+ "RuleType_Product": "浜у搧涓婃灦瑙勫垯",
+ "RuleType_ProductCategory": "浜у搧绫诲埆涓婃灦瑙勫垯"
+ },
+ "x-enum-varnames": [
+ "RuleType_Product",
+ "RuleType_ProductCategory"
+ ]
+ },
"constvar.WhetherType": {
"type": "integer",
"enum": [
@@ -2163,6 +2487,26 @@
"WhetherTypeAlways",
"ReservationNever"
]
+ },
+ "models.Attachment": {
+ "type": "object",
+ "properties": {
+ "FileUrl": {
+ "type": "string"
+ },
+ "ext": {
+ "type": "string"
+ },
+ "fileName": {
+ "type": "string"
+ },
+ "fileType": {
+ "$ref": "#/definitions/constvar.FileType"
+ },
+ "id": {
+ "type": "integer"
+ }
+ }
},
"models.Company": {
"type": "object",
@@ -2223,6 +2567,12 @@
"models.Location": {
"type": "object",
"properties": {
+ "children": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Location"
+ }
+ },
"companyId": {
"description": "鍏徃id",
"type": "integer"
@@ -2294,12 +2644,51 @@
}
}
},
+ "models.LogisticCompany": {
+ "type": "object",
+ "properties": {
+ "contact": {
+ "description": "鑱旂郴浜�",
+ "type": "string"
+ },
+ "contact_phone": {
+ "description": "鑱旂郴鐢佃瘽",
+ "type": "string"
+ },
+ "hidden": {
+ "description": "闅愯棌",
+ "type": "boolean"
+ },
+ "id": {
+ "type": "string"
+ },
+ "monthly_account": {
+ "description": "鏈堢粨璐﹀彿",
+ "type": "string"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
+ },
"models.Material": {
"type": "object",
"properties": {
"amount": {
"description": "鏁伴噺",
"type": "number"
+ },
+ "attachmentIDs": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
+ "attachmentList": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Attachment"
+ }
},
"barcode": {
"description": "鏉＄爜",
@@ -2536,6 +2925,16 @@
"id": {
"type": "integer"
},
+ "logisticCompany": {
+ "$ref": "#/definitions/models.LogisticCompany"
+ },
+ "logisticCompanyId": {
+ "type": "string"
+ },
+ "logisticWeight": {
+ "description": "鐗╂祦閲嶉噺",
+ "type": "number"
+ },
"number": {
"description": "鍗曞彿",
"type": "string"
@@ -2577,6 +2976,14 @@
},
"updateTime": {
"type": "string"
+ },
+ "waybillNumber": {
+ "description": "杩愬崟鍙�",
+ "type": "string"
+ },
+ "weight": {
+ "description": "閲嶉噺",
+ "type": "number"
}
}
},
@@ -2658,6 +3065,62 @@
},
"routeName": {
"description": "鍏徃",
+ "type": "string"
+ }
+ }
+ },
+ "models.ReorderRule": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "鍦ㄥ簱鏁伴噺",
+ "type": "number"
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "location": {
+ "$ref": "#/definitions/models.Location"
+ },
+ "locationId": {
+ "description": "浣嶇疆id",
+ "type": "integer"
+ },
+ "maxInventory": {
+ "description": "鏈�澶у簱瀛�",
+ "type": "number"
+ },
+ "minInventory": {
+ "description": "鏈�灏忓簱瀛�",
+ "type": "number"
+ },
+ "orderNumber": {
+ "description": "璁㈣喘鏁伴噺",
+ "type": "number"
+ },
+ "prediction": {
+ "description": "棰勬祴鏁伴噺",
+ "type": "number"
+ },
+ "product": {
+ "$ref": "#/definitions/models.Material"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
+ },
+ "route": {
+ "description": "璺嚎",
+ "type": "string"
+ },
+ "unit": {
+ "description": "鍗曚綅",
+ "type": "string"
+ },
+ "updateTime": {
"type": "string"
}
}
@@ -2810,29 +3273,14 @@
"productId": {
"description": "浜у搧id",
"type": "string"
- }
- }
- },
- "request.AddLocationProductAmount": {
- "type": "object",
- "properties": {
- "Amount": {
- "description": "搴撳瓨鏁伴噺",
- "type": "number"
},
- "adjustAmount": {
- "description": "宸��",
- "type": "number"
- },
- "differenceAmount": {
- "description": "璁℃暟鏁伴噺",
- "type": "number"
- },
- "locationId": {
- "type": "integer"
- },
- "productId": {
- "type": "string"
+ "ruleType": {
+ "description": "涓婃灦瑙勫垯绫诲瀷 1锛氫骇鍝佺被鍨嬶紱2锛氫骇鍝佺被鍒被鍨�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.RuleType"
+ }
+ ]
}
}
},
@@ -2872,6 +3320,13 @@
"id": {
"type": "integer"
},
+ "logisticCompanyId": {
+ "type": "string"
+ },
+ "logisticWeight": {
+ "description": "鐗╂祦閲嶉噺",
+ "type": "number"
+ },
"number": {
"description": "鍗曞彿",
"type": "string"
@@ -2903,6 +3358,14 @@
"toLocationId": {
"description": "鐩爣浣嶇疆id",
"type": "integer"
+ },
+ "waybillNumber": {
+ "description": "杩愬崟鍙�",
+ "type": "string"
+ },
+ "weight": {
+ "description": "閲嶉噺",
+ "type": "number"
}
}
},
@@ -3052,6 +3515,17 @@
}
}
},
+ "request.GetAmountAndPrediction": {
+ "type": "object",
+ "properties": {
+ "locationId": {
+ "type": "integer"
+ },
+ "productId": {
+ "type": "string"
+ }
+ }
+ },
"request.GetInventoryForms": {
"type": "object",
"properties": {
@@ -3083,6 +3557,14 @@
"request.GetInventoryHistory": {
"type": "object",
"properties": {
+ "baseOperationType": {
+ "description": "鍩虹浣滀笟绫诲瀷",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.BaseOperationType"
+ }
+ ]
+ },
"keyWord": {
"description": "鎼滅储鏉′欢",
"type": "string"
@@ -3131,6 +3613,29 @@
}
}
},
+ "request.GetLocationList": {
+ "type": "object",
+ "properties": {
+ "jointName": {
+ "description": "鎷兼帴鍚嶇О",
+ "type": "string"
+ },
+ "keyWord": {
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "type": {
+ "type": "integer"
+ }
+ }
+ },
"request.GetProductList": {
"type": "object",
"properties": {
@@ -3147,6 +3652,32 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ }
+ }
+ },
+ "request.GetReorderRuleList": {
+ "type": "object",
+ "properties": {
+ "keyWord": {
+ "type": "string"
+ },
+ "locationId": {
+ "type": "integer"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "productId": {
+ "type": "string"
+ },
+ "type": {
+ "description": "绫诲瀷:bh=琛ヨ揣",
+ "type": "string"
}
}
},
@@ -3215,6 +3746,9 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ },
+ "status": {
+ "$ref": "#/definitions/constvar.OperationStatus"
}
}
},
@@ -3374,6 +3908,14 @@
"productId": {
"description": "浜у搧id",
"type": "string"
+ },
+ "ruleType": {
+ "description": "涓婃灦瑙勫垯绫诲瀷 1锛氫骇鍝佺被鍨嬶紱2锛氫骇鍝佺被鍒被鍨�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.RuleType"
+ }
+ ]
}
}
},
@@ -3392,8 +3934,16 @@
"description": "璁℃暟鏁伴噺",
"type": "number"
},
+ "locationId": {
+ "description": "浣嶇疆id",
+ "type": "integer"
+ },
"operationId": {
"description": "鍑哄叆搴搃d",
+ "type": "integer"
+ },
+ "productCategoryId": {
+ "description": "浜у搧绉嶇被id",
"type": "integer"
},
"productId": {
@@ -3446,6 +3996,13 @@
"id": {
"type": "integer"
},
+ "logisticCompanyId": {
+ "type": "string"
+ },
+ "logisticWeight": {
+ "description": "鐗╂祦閲嶉噺",
+ "type": "number"
+ },
"number": {
"description": "鍗曞彿",
"type": "string"
@@ -3477,6 +4034,14 @@
"toLocationId": {
"description": "鐩爣浣嶇疆id",
"type": "integer"
+ },
+ "waybillNumber": {
+ "description": "杩愬崟鍙�",
+ "type": "string"
+ },
+ "weight": {
+ "description": "閲嶉噺",
+ "type": "number"
}
}
},
@@ -3608,6 +4173,14 @@
"description": "鏁伴噺",
"type": "number"
},
+ "baseOperationType": {
+ "description": "鍩虹浣滀笟绫诲瀷",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.BaseOperationType"
+ }
+ ]
+ },
"contactedName": {
"description": "瀹屾垚鑰�",
"type": "string"
--
Gitblit v1.8.0