From 5c1dfdd9f0d51821ac47a46cba74ef94bfe0141e Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 27 九月 2023 17:28:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 docs/swagger.yaml |  251 ++++++++++++++++++++------------------------------
 1 files changed, 100 insertions(+), 151 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index d0c176d..a87ffb6 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -84,9 +84,12 @@
     - 6
     - 7
     - 8
+    - 9
     type: integer
     x-enum-comments:
+      LocationTypeAdjust: 搴撳瓨鐩樼偣
       LocationTypeCustomer: 瀹㈡埛浣嶇疆
+      LocationTypeDisuse: 鎶ュ簾浣嶇疆
       LocationTypeInternal: 鍐呴儴浣嶇疆
       LocationTypeInventoryLoss: 搴撳瓨鎹熷け
       LocationTypeProduction: 鐢熶骇
@@ -102,6 +105,7 @@
     - LocationTypeProduction
     - LocationTypeTransit
     - LocationTypeDisuse
+    - LocationTypeAdjust
   constvar.MaterialMode:
     enum:
     - 鍘熸潗鏂�
@@ -644,6 +648,22 @@
         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
+    type: object
   request.AddOperation:
     properties:
       comment:
@@ -779,41 +799,6 @@
     required:
     - code
     type: object
-  request.GetInventoryForms:
-    properties:
-      categoryIds:
-        description: 浜у搧绫诲瀷id
-        items:
-          type: integer
-        type: array
-      page:
-        description: 椤电爜
-        type: integer
-      pageSize:
-        description: 姣忛〉澶у皬
-        type: integer
-      warehouseCode:
-        description: 浠撳簱缂╁啓
-        type: string
-    type: object
-  request.GetInventoryHistory:
-    properties:
-      page:
-        description: 椤电爜
-        type: integer
-      pageSize:
-        description: 姣忛〉澶у皬
-        type: integer
-      produceId:
-        description: 浜у搧id
-        type: string
-      productName:
-        description: 浜у搧鍚嶇О
-        type: string
-      unit:
-        description: 鍗曚綅
-        type: string
-    type: object
   request.GetProductList:
     properties:
       categoryId:
@@ -888,6 +873,19 @@
         description: 姣忛〉澶у皬
         type: integer
       sourceNumber:
+        type: string
+    type: object
+  request.QueryOperationHistory:
+    properties:
+      locationId:
+        type: integer
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+      productId:
         type: string
     type: object
   request.QueryOperationList:
@@ -1065,67 +1063,6 @@
       warehouseId:
         description: 浠撳簱id
         type: integer
-    type: object
-  response.InventoryForms:
-    properties:
-      amount:
-        description: 鍦ㄥ簱鏁伴噺
-        type: number
-      availableNumber:
-        description: 鍙敤搴撳瓨
-        type: number
-      cost:
-        description: 鎴愭湰
-        type: number
-      in:
-        description: 鍏ュ簱
-        type: number
-      out:
-        description: 鍑哄簱
-        type: number
-      produceId:
-        description: 浜у搧id
-        type: string
-      productName:
-        description: 浜у搧鍚嶇О
-        type: string
-      productType:
-        description: 浜у搧绫诲瀷
-        type: string
-      unit:
-        description: 鍗曚綅
-        type: string
-      value:
-        description: 鎬讳环鍊�
-        type: number
-    type: object
-  response.InventoryHistory:
-    properties:
-      amount:
-        description: 鏁伴噺
-        type: number
-      baseOperationType:
-        allOf:
-        - $ref: '#/definitions/constvar.BaseOperationType'
-        description: 鍩虹浣滀笟绫诲瀷
-      contactedName:
-        description: 瀹屾垚鑰�
-        type: string
-      date:
-        description: 鏃ユ湡
-        type: string
-      fromLocation:
-        description: 婧愪綅缃�
-        type: string
-      number:
-        description: 鍗曞彿
-        type: string
-      toLocation:
-        description: 鐩爣浣嶇疆
-        type: string
-      unit:
-        description: 鍗曚綅
-        type: string
     type: object
   util.Response:
     properties:
@@ -1325,58 +1262,6 @@
       summary: 缂栬緫鍏徃
       tags:
       - 鍏徃
-  /api-wms/v1/forms/getInventoryForms:
-    post:
-      parameters:
-      - description: 鏌ヨ鍙傛暟
-        in: body
-        name: object
-        required: true
-        schema:
-          $ref: '#/definitions/request.GetInventoryForms'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: 鎴愬姛
-          schema:
-            allOf:
-            - $ref: '#/definitions/util.ResponseList'
-            - properties:
-                data:
-                  items:
-                    $ref: '#/definitions/response.InventoryForms'
-                  type: array
-              type: object
-      summary: 鑾峰彇搴撳瓨鎶ヨ〃
-      tags:
-      - 鎶ヨ〃
-  /api-wms/v1/forms/getInventoryHistory:
-    post:
-      parameters:
-      - description: 鏌ヨ鍙傛暟
-        in: body
-        name: object
-        required: true
-        schema:
-          $ref: '#/definitions/request.GetInventoryHistory'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: 鎴愬姛
-          schema:
-            allOf:
-            - $ref: '#/definitions/util.ResponseList'
-            - properties:
-                data:
-                  items:
-                    $ref: '#/definitions/response.InventoryHistory'
-                  type: array
-              type: object
-      summary: 鑾峰彇搴撳瓨鍘嗗彶
-      tags:
-      - 鎶ヨ〃
   /api-wms/v1/location/addLocation:
     post:
       parameters:
@@ -1535,13 +1420,13 @@
           description: 鎴愬姛
           schema:
             $ref: '#/definitions/util.Response'
-      summary: 搴撳瓨鐩樼偣鍒楄〃
+      summary: 涓婃灦瑙勫垯鍒楄〃
       tags:
-      - 搴撳瓨鐩樼偣
+      - 涓婃灦瑙勫垯
   /api-wms/v1/locationProduct/update:
     post:
       parameters:
-      - description: 鍏ュ簱淇℃伅
+      - description: 淇敼鍙傛暟
         in: body
         name: object
         required: true
@@ -1557,6 +1442,44 @@
       summary: 淇敼涓婃灦瑙勫垯
       tags:
       - 涓婃灦瑙勫垯
+  /api-wms/v1/locationProductAmount/add:
+    post:
+      parameters:
+      - description: 鍏ュ簱/鍑哄簱淇℃伅
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.AddLocationProductAmount'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 娣诲姞搴撳瓨鐩樼偣淇℃伅
+      tags:
+      - 搴撳瓨鐩樼偣
+  /api-wms/v1/locationProductAmount/list:
+    post:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.PageInfo'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 搴撳瓨鐩樼偣鍒楄〃
+      tags:
+      - 搴撳瓨鐩樼偣
   /api-wms/v1/operation/finish/{id}:
     put:
       parameters:
@@ -1980,6 +1903,32 @@
       summary: 鎶ュ簾鍒楄〃
       tags:
       - 浜у搧
+  /api-wms/v1/product/listHistory:
+    post:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.QueryOperationHistory'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.ResponseList'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/models.Operation'
+                  type: array
+              type: object
+      summary: 浜у搧浣嶇疆鍘嗗彶淇℃伅
+      tags:
+      - 浜у搧
   /api-wms/v1/product/listOperaton:
     post:
       parameters:

--
Gitblit v1.8.0