From 6203a1f61eb9bdcd7bacae6bdb1ee64cf977151e Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 28 九月 2023 11:27:21 +0800
Subject: [PATCH] 1.库存盘点列表增加status状态

---
 docs/swagger.yaml |  552 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 546 insertions(+), 6 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index e933993..cdfc43c 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -4,8 +4,12 @@
     - 1
     - 2
     - 3
+    - 4
+    - 5
     type: integer
     x-enum-comments:
+      BaseOperationTypeAdjust: 搴撳瓨鐩樼偣
+      BaseOperationTypeDisuse: 鎶ュ簾
       BaseOperationTypeIncoming: 鏀惰揣
       BaseOperationTypeInternal: 鍐呴儴璋冩嫧
       BaseOperationTypeOutgoing: 浜よ揣
@@ -13,6 +17,8 @@
     - BaseOperationTypeIncoming
     - BaseOperationTypeOutgoing
     - BaseOperationTypeInternal
+    - BaseOperationTypeDisuse
+    - BaseOperationTypeAdjust
   constvar.CostingMethod:
     enum:
     - 1
@@ -78,9 +84,12 @@
     - 6
     - 7
     - 8
+    - 9
     type: integer
     x-enum-comments:
+      LocationTypeAdjust: 搴撳瓨鐩樼偣
       LocationTypeCustomer: 瀹㈡埛浣嶇疆
+      LocationTypeDisuse: 鎶ュ簾浣嶇疆
       LocationTypeInternal: 鍐呴儴浣嶇疆
       LocationTypeInventoryLoss: 搴撳瓨鎹熷け
       LocationTypeProduction: 鐢熶骇
@@ -96,6 +105,7 @@
     - LocationTypeProduction
     - LocationTypeTransit
     - LocationTypeDisuse
+    - LocationTypeAdjust
   constvar.MaterialMode:
     enum:
     - 鍘熸潗鏂�
@@ -257,7 +267,7 @@
         type: string
       parentId:
         description: 涓婄骇id
-        type: string
+        type: integer
       recentlyCount:
         description: 鏈�杩戠洏鐐�
         type: string
@@ -422,6 +432,10 @@
     type: object
   models.Operation:
     properties:
+      baseOperationType:
+        allOf:
+        - $ref: '#/definitions/constvar.BaseOperationType'
+        description: 鍩虹浣滀笟绫诲瀷
       comment:
         type: string
       companyID:
@@ -619,6 +633,37 @@
       toLocationId:
         type: integer
     type: object
+  request.AddLocationProduct:
+    properties:
+      areaId:
+        description: 鍖哄煙id
+        type: integer
+      locationId:
+        description: 浣嶇疆id
+        type: integer
+      productCategoryId:
+        description: 浜у搧绉嶇被id
+        type: integer
+      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
+    type: object
   request.AddOperation:
     properties:
       comment:
@@ -754,8 +799,57 @@
     required:
     - code
     type: object
+  request.FinishLocationProductAmount:
+    properties:
+      locationProductAmountId:
+        description: 搴撳瓨鐩樼偣id
+        type: integer
+      operationId:
+        description: 鍑哄叆搴搃d
+        type: integer
+      productId:
+        description: 浜у搧id
+        type: string
+    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:
+        type: integer
       keyWord:
         type: string
       page:
@@ -764,6 +858,15 @@
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
+    type: object
+  request.GetRuleList:
+    properties:
+      locationId:
+        description: 浣嶇疆id
+        type: integer
+      productId:
+        description: 浜у搧id
+        type: string
     type: object
   request.OperationAllList:
     properties:
@@ -803,8 +906,15 @@
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
-      sourceNumber:
-        type: string
+    type: object
+  request.PageInfo:
+    properties:
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
     type: object
   request.QueryDisuseList:
     properties:
@@ -816,7 +926,18 @@
       pageSize:
         description: 姣忛〉澶у皬
         type: integer
-      sourceNumber:
+    type: object
+  request.QueryOperationHistory:
+    properties:
+      locationId:
+        type: integer
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
+      productId:
         type: string
     type: object
   request.QueryOperationList:
@@ -858,14 +979,14 @@
   request.UpdateDisuse:
     properties:
       amount:
-        description: ProductName    string                   `json:"productName"`
         type: number
+      baseOperationType:
+        $ref: '#/definitions/constvar.BaseOperationType'
       fromLocationId:
         type: integer
       id:
         type: integer
       number:
-        description: Unit           string                   `json:"unit"`
         type: string
       operationDate:
         type: string
@@ -878,8 +999,48 @@
       toLocationId:
         type: integer
     type: object
+  request.UpdateLocationProduct:
+    properties:
+      areaId:
+        description: 鍖哄煙id
+        type: integer
+      id:
+        type: integer
+      locationId:
+        description: 浣嶇疆id
+        type: integer
+      productCategoryId:
+        description: 浜у搧绉嶇被id
+        type: integer
+      productId:
+        description: 浜у搧id
+        type: string
+    type: object
+  request.UpdateLocationProductAmount:
+    properties:
+      Amount:
+        description: 搴撳瓨鏁伴噺
+        type: number
+      adjustAmount:
+        description: LocationProductAmountId int             `json:"locationProductAmountId"`
+          //搴撳瓨鐩樼偣id
+        type: number
+      differenceAmount:
+        description: 璁℃暟鏁伴噺
+        type: number
+      operationId:
+        description: 鍑哄叆搴搃d
+        type: integer
+      productId:
+        description: 浜у搧id
+        type: string
+    type: object
   request.UpdateOperation:
     properties:
+      baseOperationType:
+        allOf:
+        - $ref: '#/definitions/constvar.BaseOperationType'
+        description: 鍩虹浣滀笟绫诲瀷
       comment:
         description: 澶囨敞
         type: string
@@ -973,6 +1134,104 @@
       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
+  response.LocationForms:
+    properties:
+      amount:
+        description: 鏁伴噺
+        type: number
+      locationName:
+        description: 浣嶇疆鍚嶇О
+        type: string
+      produceId:
+        description: 浜у搧id
+        type: string
+      productName:
+        description: 浜у搧鍚嶇О
+        type: string
+      productTypeName:
+        description: 浜у搧绫诲埆
+        type: string
+      unit:
+        description: 鍗曚綅
+        type: string
+      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:
@@ -1172,6 +1431,84 @@
       summary: 缂栬緫鍏徃
       tags:
       - 鍏徃
+  /api-wms/v1/forms/getHistory:
+    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/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/getLocationForms:
+    post:
+      parameters:
+      - description: 鏌ヨ鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.PageInfo'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.ResponseList'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/response.LocationForms'
+                  type: array
+              type: object
+      summary: 鑾峰彇浣嶇疆鎶ヨ〃
+      tags:
+      - 鎶ヨ〃
   /api-wms/v1/location/addLocation:
     post:
       parameters:
@@ -1277,6 +1614,183 @@
       summary: 淇敼浣嶇疆
       tags:
       - 浣嶇疆
+  /api-wms/v1/locationProduct/add:
+    post:
+      parameters:
+      - description: 鏂板涓婃灦瑙勫垯
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.AddLocationProduct'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 娣诲姞涓婃灦瑙勫垯
+      tags:
+      - 涓婃灦瑙勫垯
+  /api-wms/v1/locationProduct/delete/{id}:
+    delete:
+      parameters:
+      - description: id
+        in: path
+        name: id
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 鍒犻櫎涓婃灦瑙勫垯
+      tags:
+      - 涓婃灦瑙勫垯
+  /api-wms/v1/locationProduct/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/locationProduct/update:
+    post:
+      parameters:
+      - description: 淇敼鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.UpdateLocationProduct'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      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/finish:
+    post:
+      parameters:
+      - description: 鍏ュ弬
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.FinishLocationProductAmount'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          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:
+    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/locationProductAmount/update:
+    post:
+      parameters:
+      - description: 鍏ュ簱/鍑哄簱淇℃伅
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.UpdateLocationProductAmount'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 淇敼搴撳瓨鐩樼偣淇℃伅
+      tags:
+      - 搴撳瓨鐩樼偣
   /api-wms/v1/operation/finish/{id}:
     put:
       parameters:
@@ -1700,6 +2214,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