From ea25d0bb100a95d043b420e5c32f86300bf19df4 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期六, 21 十月 2023 17:43:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
docs/docs.go | 181 +++++++++++++++++++++++++++++++++++----------
1 files changed, 141 insertions(+), 40 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index ce8cdb9..2f157ba 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -400,7 +400,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.PageInfo"
+ "$ref": "#/definitions/request.GetLocationForms"
}
}
],
@@ -736,7 +736,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.AddLocationProductAmount"
+ "$ref": "#/definitions/request.UpdateLocationProductAmount"
}
}
],
@@ -775,6 +775,51 @@
"description": "鎴愬姛",
"schema": {
"$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/locationProductAmount/getRuleList": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "搴撳瓨鐩樼偣"
+ ],
+ "summary": "鑾峰彇涓婃灦瑙勫垯",
+ "parameters": [
+ {
+ "description": "鏌ヨ淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetRuleList"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.RuleList"
+ }
+ }
+ }
+ }
+ ]
}
}
}
@@ -898,7 +943,7 @@
}
}
},
- "/api-wms/v1/operation/listAll": {
+ "/api-wms/v1/operation/listTransfer": {
"post": {
"produces": [
"application/json"
@@ -906,7 +951,7 @@
"tags": [
"鍏ュ簱/鍑哄簱"
],
- "summary": "璋冩嫧",
+ "summary": "搴撳瓨璋冩嫧鍒楄〃",
"parameters": [
{
"description": "鍙傛暟",
@@ -2600,7 +2645,7 @@
]
},
"name": {
- "description": "浣嶇疆鍚嶇О",
+ "description": "鍒嗙被鍚嶇О",
"type": "string"
},
"parentId": {
@@ -2768,29 +2813,6 @@
}
}
},
- "request.AddLocationProductAmount": {
- "type": "object",
- "properties": {
- "Amount": {
- "description": "搴撳瓨鏁伴噺",
- "type": "number"
- },
- "adjustAmount": {
- "description": "宸��",
- "type": "number"
- },
- "differenceAmount": {
- "description": "璁℃暟鏁伴噺",
- "type": "number"
- },
- "locationId": {
- "type": "integer"
- },
- "productId": {
- "type": "string"
- }
- }
- },
"request.AddOperation": {
"type": "object",
"properties": {
@@ -2903,6 +2925,10 @@
"description": "浠撳簱鍚嶇О",
"type": "string"
},
+ "prefix": {
+ "description": "鍓嶇紑",
+ "type": "string"
+ },
"printLabel": {
"description": "鏄惁鎵撳嵃鏍囩",
"type": "boolean"
@@ -3013,6 +3039,10 @@
"type": "integer"
}
},
+ "keyWord": {
+ "description": "鎼滅储鏉′欢",
+ "type": "string"
+ },
"page": {
"description": "椤电爜",
"type": "integer"
@@ -3030,6 +3060,10 @@
"request.GetInventoryHistory": {
"type": "object",
"properties": {
+ "keyWord": {
+ "description": "鎼滅储鏉′欢",
+ "type": "string"
+ },
"page": {
"description": "椤电爜",
"type": "integer"
@@ -3052,6 +3086,28 @@
}
}
},
+ "request.GetLocationForms": {
+ "type": "object",
+ "properties": {
+ "keyWord": {
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "productId": {
+ "type": "string"
+ },
+ "wareHouseCode": {
+ "type": "string"
+ }
+ }
+ },
"request.GetProductList": {
"type": "object",
"properties": {
@@ -3068,6 +3124,19 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ }
+ }
+ },
+ "request.GetRuleList": {
+ "type": "object",
+ "properties": {
+ "locationId": {
+ "description": "浣嶇疆id",
+ "type": "integer"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
}
}
},
@@ -3123,6 +3192,9 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ },
+ "status": {
+ "$ref": "#/definitions/constvar.OperationStatus"
}
}
},
@@ -3288,17 +3360,21 @@
"request.UpdateLocationProductAmount": {
"type": "object",
"properties": {
- "Amount": {
- "description": "搴撳瓨鏁伴噺",
- "type": "number"
- },
"adjustAmount": {
"description": "LocationProductAmountId int ` + "`" + `json:\"locationProductAmountId\"` + "`" + ` //搴撳瓨鐩樼偣id",
+ "type": "number"
+ },
+ "amount": {
+ "description": "搴撳瓨鏁伴噺",
"type": "number"
},
"differenceAmount": {
"description": "璁℃暟鏁伴噺",
"type": "number"
+ },
+ "locationId": {
+ "description": "浣嶇疆id",
+ "type": "integer"
},
"operationId": {
"description": "鍑哄叆搴搃d",
@@ -3430,6 +3506,10 @@
"description": "浠撳簱鍚嶇О",
"type": "string"
},
+ "prefix": {
+ "description": "鍓嶇紑",
+ "type": "string"
+ },
"printLabel": {
"description": "鏄惁鎵撳嵃鏍囩",
"type": "boolean"
@@ -3512,14 +3592,6 @@
"description": "鏁伴噺",
"type": "number"
},
- "baseOperationType": {
- "description": "鍩虹浣滀笟绫诲瀷",
- "allOf": [
- {
- "$ref": "#/definitions/constvar.BaseOperationType"
- }
- ]
- },
"contactedName": {
"description": "瀹屾垚鑰�",
"type": "string"
@@ -3534,6 +3606,14 @@
},
"number": {
"description": "鍗曞彿",
+ "type": "string"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "status": {
+ "description": "鐘舵��",
"type": "string"
},
"toLocation": {
@@ -3576,6 +3656,25 @@
"value": {
"description": "鎬讳环鍊�",
"type": "number"
+ }
+ }
+ },
+ "response.RuleList": {
+ "type": "object",
+ "properties": {
+ "locationList": {
+ "description": "浣嶇疆鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Location"
+ }
+ },
+ "productList": {
+ "description": "浜у搧鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Material"
+ }
}
}
},
@@ -3625,6 +3724,8 @@
Description: "",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
+ LeftDelim: "{{",
+ RightDelim: "}}",
}
func init() {
--
Gitblit v1.8.0