From 47000c8d61e28bc590d085753c8b9ceff8546121 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期三, 08 十一月 2023 14:23:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
docs/swagger.yaml | 239 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 238 insertions(+), 1 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index c8df29e..b2a6ba4 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -178,6 +178,17 @@
- ReservationMethodAtConfirm
- ReservationMethodManual
- ReservationMethodByDate
+ constvar.RuleType:
+ enum:
+ - 1
+ - 2
+ type: integer
+ x-enum-comments:
+ RuleType_Product: 浜у搧涓婃灦瑙勫垯
+ RuleType_ProductCategory: 浜у搧绫诲埆涓婃灦瑙勫垯
+ x-enum-varnames:
+ - RuleType_Product
+ - RuleType_ProductCategory
constvar.WhetherType:
enum:
- 1
@@ -233,6 +244,10 @@
type: object
models.Location:
properties:
+ children:
+ items:
+ $ref: '#/definitions/models.Location'
+ type: array
companyId:
description: 鍏徃id
type: integer
@@ -541,6 +556,46 @@
description: 鍏徃
type: string
type: object
+ models.ReorderRule:
+ 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
+ type: object
models.Warehouse:
properties:
active:
@@ -647,6 +702,10 @@
productId:
description: 浜у搧id
type: string
+ ruleType:
+ allOf:
+ - $ref: '#/definitions/constvar.RuleType'
+ description: 涓婃灦瑙勫垯绫诲瀷 1锛氫骇鍝佺被鍨嬶紱2锛氫骇鍝佺被鍒被鍨�
type: object
request.AddOperation:
properties:
@@ -798,6 +857,13 @@
description: 浜у搧id
type: string
type: object
+ request.GetAmountAndPrediction:
+ properties:
+ locationId:
+ type: integer
+ productId:
+ type: string
+ type: object
request.GetInventoryForms:
properties:
categoryIds:
@@ -858,6 +924,22 @@
wareHouseCode:
type: string
type: object
+ request.GetLocationList:
+ properties:
+ jointName:
+ description: 鎷兼帴鍚嶇О
+ type: string
+ keyWord:
+ type: string
+ page:
+ description: 椤电爜
+ type: integer
+ pageSize:
+ description: 姣忛〉澶у皬
+ type: integer
+ type:
+ type: integer
+ type: object
request.GetProductList:
properties:
categoryId:
@@ -870,6 +952,24 @@
pageSize:
description: 姣忛〉澶у皬
type: integer
+ type: object
+ request.GetReorderRuleList:
+ properties:
+ keyWord:
+ type: string
+ locationId:
+ type: integer
+ page:
+ description: 椤电爜
+ type: integer
+ pageSize:
+ description: 姣忛〉澶у皬
+ type: integer
+ productId:
+ type: string
+ type:
+ description: 绫诲瀷:bh=琛ヨ揣
+ type: string
type: object
request.GetRuleList:
properties:
@@ -1029,6 +1129,10 @@
productId:
description: 浜у搧id
type: string
+ ruleType:
+ allOf:
+ - $ref: '#/definitions/constvar.RuleType'
+ description: 涓婃灦瑙勫垯绫诲瀷 1锛氫骇鍝佺被鍨嬶紱2锛氫骇鍝佺被鍒被鍨�
type: object
request.UpdateLocationProductAmount:
properties:
@@ -1196,6 +1300,10 @@
amount:
description: 鏁伴噺
type: number
+ baseOperationType:
+ allOf:
+ - $ref: '#/definitions/constvar.BaseOperationType'
+ description: 鍩虹浣滀笟绫诲瀷
contactedName:
description: 瀹屾垚鑰�
type: string
@@ -1602,7 +1710,7 @@
name: object
required: true
schema:
- $ref: '#/definitions/request.GetProductList'
+ $ref: '#/definitions/request.GetLocationList'
produces:
- application/json
responses:
@@ -1618,6 +1726,25 @@
type: array
type: object
summary: 鑾峰彇浣嶇疆鍒楄〃
+ tags:
+ - 浣嶇疆
+ /api-wms/v1/location/getLocationTreeList:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/models.Location'
+ type: array
+ type: object
+ summary: 鑾峰彇浣嶇疆鍒楄〃鏍�
tags:
- 浣嶇疆
/api-wms/v1/location/updateLocation:
@@ -2364,6 +2491,116 @@
summary: 淇敼浜у搧绫诲瀷
tags:
- 浜у搧绫诲瀷
+ /api-wms/v1/reorderRule/addReorderRule:
+ post:
+ parameters:
+ - description: 閲嶈璐ц鍒�
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/models.ReorderRule'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 娣诲姞閲嶈璐ц鍒�
+ tags:
+ - 閲嶈璐ц鍒�
+ /api-wms/v1/reorderRule/getAmountAndPrediction:
+ post:
+ parameters:
+ - description: 閲嶈璐ц鍒�
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.GetAmountAndPrediction'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ additionalProperties: true
+ type: object
+ type: array
+ type: object
+ summary: 鑾峰彇鍦ㄥ簱涓庨娴嬫暟閲�
+ tags:
+ - 閲嶈璐ц鍒�
+ /api-wms/v1/reorderRule/getReorderRuleList:
+ post:
+ parameters:
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.GetReorderRuleList'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/models.ReorderRule'
+ type: array
+ type: object
+ summary: 鑾峰彇閲嶈璐ц鍒欏垪琛�
+ tags:
+ - 閲嶈璐ц鍒�
+ /api-wms/v1/reorderRule/orderAgain:
+ post:
+ parameters:
+ - description: 閲嶈璐ц鍒�
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/models.ReorderRule'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 鍐嶈涓�娆�
+ tags:
+ - 閲嶈璐ц鍒�
+ /api-wms/v1/reorderRule/updateReorderRule:
+ post:
+ parameters:
+ - description: 閲嶈璐ц鍒�
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/models.ReorderRule'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 鏇存柊閲嶈璐ц鍒�
+ tags:
+ - 閲嶈璐ц鍒�
/api-wms/v1/warehouse/getWarehouseDetails/{id}:
get:
parameters:
--
Gitblit v1.8.0