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 |  376 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 351 insertions(+), 25 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index fe5de96..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
@@ -529,7 +544,7 @@
         - $ref: '#/definitions/constvar.InventoryValuation'
         description: 搴撳瓨璁′环
       name:
-        description: 浣嶇疆鍚嶇О
+        description: 鍒嗙被鍚嶇О
         type: string
       parentId:
         description: 涓婄骇id
@@ -539,6 +554,46 @@
         type: integer
       routeName:
         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:
@@ -647,22 +702,10 @@
       productId:
         description: 浜у搧id
         type: string
-    type: object
-  request.AddLocationProductAmount:
-    properties:
-      Amount:
-        description: 搴撳瓨鏁伴噺
-        type: number
-      adjustAmount:
-        description: 宸��
-        type: number
-      differenceAmount:
-        description: 璁℃暟鏁伴噺
-        type: number
-      locationId:
-        type: integer
-      productId:
-        type: string
+      ruleType:
+        allOf:
+        - $ref: '#/definitions/constvar.RuleType'
+        description: 涓婃灦瑙勫垯绫诲瀷 1锛氫骇鍝佺被鍨嬶紱2锛氫骇鍝佺被鍒被鍨�
     type: object
   request.AddOperation:
     properties:
@@ -740,6 +783,9 @@
       name:
         description: 浠撳簱鍚嶇О
         type: string
+      prefix:
+        description: 鍓嶇紑
+        type: string
       printLabel:
         description: 鏄惁鎵撳嵃鏍囩
         type: boolean
@@ -811,6 +857,13 @@
         description: 浜у搧id
         type: string
     type: object
+  request.GetAmountAndPrediction:
+    properties:
+      locationId:
+        type: integer
+      productId:
+        type: string
+    type: object
   request.GetInventoryForms:
     properties:
       categoryIds:
@@ -818,6 +871,9 @@
         items:
           type: integer
         type: array
+      keyWord:
+        description: 鎼滅储鏉′欢
+        type: string
       page:
         description: 椤电爜
         type: integer
@@ -830,6 +886,13 @@
     type: object
   request.GetInventoryHistory:
     properties:
+      baseOperationType:
+        allOf:
+        - $ref: '#/definitions/constvar.BaseOperationType'
+        description: 鍩虹浣滀笟绫诲瀷
+      keyWord:
+        description: 鎼滅储鏉′欢
+        type: string
       page:
         description: 椤电爜
         type: integer
@@ -846,6 +909,37 @@
         description: 鍗曚綅
         type: string
     type: object
+  request.GetLocationForms:
+    properties:
+      keyWord:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+      productId:
+        type: string
+      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:
@@ -858,6 +952,33 @@
       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:
+      locationId:
+        description: 浣嶇疆id
+        type: integer
+      productId:
+        description: 浜у搧id
+        type: string
     type: object
   request.OperationAllList:
     properties:
@@ -897,6 +1018,8 @@
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
+      status:
+        $ref: '#/definitions/constvar.OperationStatus'
     type: object
   request.PageInfo:
     properties:
@@ -1006,21 +1129,31 @@
       productId:
         description: 浜у搧id
         type: string
+      ruleType:
+        allOf:
+        - $ref: '#/definitions/constvar.RuleType'
+        description: 涓婃灦瑙勫垯绫诲瀷 1锛氫骇鍝佺被鍨嬶紱2锛氫骇鍝佺被鍒被鍨�
     type: object
   request.UpdateLocationProductAmount:
     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:
         description: 浜у搧id
@@ -1106,6 +1239,9 @@
       name:
         description: 浠撳簱鍚嶇О
         type: string
+      prefix:
+        description: 鍓嶇紑
+        type: string
       printLabel:
         description: 鏄惁鎵撳嵃鏍囩
         type: boolean
@@ -1180,6 +1316,12 @@
       number:
         description: 鍗曞彿
         type: string
+      productName:
+        description: 浜у搧鍚嶇О
+        type: string
+      status:
+        description: 鐘舵��
+        type: string
       toLocation:
         description: 鐩爣浣嶇疆
         type: string
@@ -1210,6 +1352,19 @@
       value:
         description: 鎬讳环鍊�
         type: number
+    type: object
+  response.RuleList:
+    properties:
+      locationList:
+        description: 浣嶇疆鍒楄〃
+        items:
+          $ref: '#/definitions/models.Location'
+        type: array
+      productList:
+        description: 浜у搧鍒楄〃
+        items:
+          $ref: '#/definitions/models.Material'
+        type: array
     type: object
   util.Response:
     properties:
@@ -1469,7 +1624,7 @@
         name: object
         required: true
         schema:
-          $ref: '#/definitions/request.PageInfo'
+          $ref: '#/definitions/request.GetLocationForms'
       produces:
       - application/json
       responses:
@@ -1555,7 +1710,7 @@
         name: object
         required: true
         schema:
-          $ref: '#/definitions/request.GetProductList'
+          $ref: '#/definitions/request.GetLocationList'
       produces:
       - application/json
       responses:
@@ -1571,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:
@@ -1675,7 +1849,7 @@
         name: object
         required: true
         schema:
-          $ref: '#/definitions/request.AddLocationProductAmount'
+          $ref: '#/definitions/request.UpdateLocationProductAmount'
       produces:
       - application/json
       responses:
@@ -1703,6 +1877,32 @@
           schema:
             $ref: '#/definitions/util.Response'
       summary: 搴旂敤銆侀獙璇�
+      tags:
+      - 搴撳瓨鐩樼偣
+  /api-wms/v1/locationProductAmount/getRuleList:
+    post:
+      parameters:
+      - description: 鏌ヨ淇℃伅
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetRuleList'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.ResponseList'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/response.RuleList'
+                  type: array
+              type: object
+      summary: 鑾峰彇涓婃灦瑙勫垯
       tags:
       - 搴撳瓨鐩樼偣
   /api-wms/v1/locationProductAmount/list:
@@ -1780,7 +1980,7 @@
       summary: 鍏ュ簱/鍑哄簱鍒楄〃
       tags:
       - 鍏ュ簱/鍑哄簱
-  /api-wms/v1/operation/listAll:
+  /api-wms/v1/operation/listTransfer:
     post:
       parameters:
       - description: 鍙傛暟
@@ -1796,7 +1996,7 @@
           description: 鎴愬姛
           schema:
             $ref: '#/definitions/util.Response'
-      summary: 璋冩嫧
+      summary: 搴撳瓨璋冩嫧鍒楄〃
       tags:
       - 鍏ュ簱/鍑哄簱
   /api-wms/v1/operation/operation:
@@ -1855,6 +2055,22 @@
       summary: 淇敼鍏ュ簱/鍑哄簱淇℃伅
       tags:
       - 鍏ュ簱/鍑哄簱
+  /api-wms/v1/operationType/listTransfer:
+    get:
+      parameters:
+      - in: query
+        name: keyword
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.ResponseList'
+      summary: 璋冩嫧绫诲瀷鍒楄〃
+      tags:
+      - 涓氬姟绫诲瀷
   /api-wms/v1/operationType/operationType:
     get:
       parameters:
@@ -2275,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