From 68200e7e7ac1cfd021b8b37a92b7ab8eb11c759e Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 03 十一月 2023 11:36:46 +0800
Subject: [PATCH] 上架规则列表搜索增加产品和产品类别
---
docs/docs.go | 293 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 254 insertions(+), 39 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 4f78bf4..f287150 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"
}
}
],
@@ -745,6 +745,81 @@
"description": "鎴愬姛",
"schema": {
"$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/locationProductAmount/finish": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "搴撳瓨鐩樼偣"
+ ],
+ "summary": "搴旂敤銆侀獙璇�",
+ "parameters": [
+ {
+ "description": "鍏ュ弬",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.FinishLocationProductAmount"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "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"
+ }
+ }
+ }
+ }
+ ]
}
}
}
@@ -868,7 +943,7 @@
}
}
},
- "/api-wms/v1/operation/listAll": {
+ "/api-wms/v1/operation/listTransfer": {
"post": {
"produces": [
"application/json"
@@ -876,7 +951,7 @@
"tags": [
"鍏ュ簱/鍑哄簱"
],
- "summary": "璋冩嫧",
+ "summary": "搴撳瓨璋冩嫧鍒楄〃",
"parameters": [
{
"description": "鍙傛暟",
@@ -981,6 +1056,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"
}
}
}
@@ -2071,6 +2172,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": [
@@ -2570,7 +2686,7 @@
]
},
"name": {
- "description": "浣嶇疆鍚嶇О",
+ "description": "鍒嗙被鍚嶇О",
"type": "string"
},
"parentId": {
@@ -2735,29 +2851,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"
+ }
+ ]
}
}
},
@@ -2873,6 +2974,10 @@
"description": "浠撳簱鍚嶇О",
"type": "string"
},
+ "prefix": {
+ "description": "鍓嶇紑",
+ "type": "string"
+ },
"printLabel": {
"description": "鏄惁鎵撳嵃鏍囩",
"type": "boolean"
@@ -2956,6 +3061,23 @@
}
}
},
+ "request.FinishLocationProductAmount": {
+ "type": "object",
+ "properties": {
+ "locationProductAmountId": {
+ "description": "搴撳瓨鐩樼偣id",
+ "type": "integer"
+ },
+ "operationId": {
+ "description": "鍑哄叆搴搃d",
+ "type": "integer"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
+ }
+ }
+ },
"request.GetInventoryForms": {
"type": "object",
"properties": {
@@ -2965,6 +3087,10 @@
"items": {
"type": "integer"
}
+ },
+ "keyWord": {
+ "description": "鎼滅储鏉′欢",
+ "type": "string"
},
"page": {
"description": "椤电爜",
@@ -2983,6 +3109,18 @@
"request.GetInventoryHistory": {
"type": "object",
"properties": {
+ "baseOperationType": {
+ "description": "鍩虹浣滀笟绫诲瀷",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.BaseOperationType"
+ }
+ ]
+ },
+ "keyWord": {
+ "description": "鎼滅储鏉′欢",
+ "type": "string"
+ },
"page": {
"description": "椤电爜",
"type": "integer"
@@ -3005,6 +3143,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": {
@@ -3021,6 +3181,19 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ }
+ }
+ },
+ "request.GetRuleList": {
+ "type": "object",
+ "properties": {
+ "locationId": {
+ "description": "浣嶇疆id",
+ "type": "integer"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
}
}
},
@@ -3076,6 +3249,9 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ },
+ "status": {
+ "$ref": "#/definitions/constvar.OperationStatus"
}
}
},
@@ -3235,26 +3411,42 @@
"productId": {
"description": "浜у搧id",
"type": "string"
+ },
+ "ruleType": {
+ "description": "涓婃灦瑙勫垯绫诲瀷 1锛氫骇鍝佺被鍨嬶紱2锛氫骇鍝佺被鍒被鍨�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.RuleType"
+ }
+ ]
}
}
},
"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",
+ "type": "integer"
+ },
+ "productCategoryId": {
+ "description": "浜у搧绉嶇被id",
"type": "integer"
},
"productId": {
@@ -3383,6 +3575,10 @@
"description": "浠撳簱鍚嶇О",
"type": "string"
},
+ "prefix": {
+ "description": "鍓嶇紑",
+ "type": "string"
+ },
"printLabel": {
"description": "鏄惁鎵撳嵃鏍囩",
"type": "boolean"
@@ -3465,14 +3661,6 @@
"description": "鏁伴噺",
"type": "number"
},
- "baseOperationType": {
- "description": "鍩虹浣滀笟绫诲瀷",
- "allOf": [
- {
- "$ref": "#/definitions/constvar.BaseOperationType"
- }
- ]
- },
"contactedName": {
"description": "瀹屾垚鑰�",
"type": "string"
@@ -3487,6 +3675,14 @@
},
"number": {
"description": "鍗曞彿",
+ "type": "string"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "status": {
+ "description": "鐘舵��",
"type": "string"
},
"toLocation": {
@@ -3532,6 +3728,25 @@
}
}
},
+ "response.RuleList": {
+ "type": "object",
+ "properties": {
+ "locationList": {
+ "description": "浣嶇疆鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Location"
+ }
+ },
+ "productList": {
+ "description": "浜у搧鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Material"
+ }
+ }
+ }
+ },
"util.Response": {
"type": "object",
"properties": {
--
Gitblit v1.8.0