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 |   67 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 1 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index a9369d0..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
@@ -687,6 +702,10 @@
       productId:
         description: 浜у搧id
         type: string
+      ruleType:
+        allOf:
+        - $ref: '#/definitions/constvar.RuleType'
+        description: 涓婃灦瑙勫垯绫诲瀷 1锛氫骇鍝佺被鍨嬶紱2锛氫骇鍝佺被鍒被鍨�
     type: object
   request.AddOperation:
     properties:
@@ -905,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:
@@ -922,12 +957,19 @@
     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:
@@ -1087,6 +1129,10 @@
       productId:
         description: 浜у搧id
         type: string
+      ruleType:
+        allOf:
+        - $ref: '#/definitions/constvar.RuleType'
+        description: 涓婃灦瑙勫垯绫诲瀷 1锛氫骇鍝佺被鍨嬶紱2锛氫骇鍝佺被鍒被鍨�
     type: object
   request.UpdateLocationProductAmount:
     properties:
@@ -1664,7 +1710,7 @@
         name: object
         required: true
         schema:
-          $ref: '#/definitions/request.GetProductList'
+          $ref: '#/definitions/request.GetLocationList'
       produces:
       - application/json
       responses:
@@ -1682,6 +1728,25 @@
       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:
     post:
       parameters:

--
Gitblit v1.8.0