From cfb6fbce3687230ccb4704dbc0c87fd411b39af1 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 20 九月 2023 17:37:22 +0800
Subject: [PATCH] 仓库字段添加与功能修改

---
 docs/swagger.yaml |  137 ++++++++++++++++++++++++---------------------
 1 files changed, 74 insertions(+), 63 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 3339932..a30050d 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -138,6 +138,20 @@
     - Task
     - Object
     - TaskAndObject
+  constvar.ProductType:
+    enum:
+    - 1
+    - 2
+    - 3
+    type: integer
+    x-enum-comments:
+      Consumables: 娑堣�楀搧
+      Server: 鏈嶅姟
+      StoredProduct: 鍙偍瀛樼殑浜у搧
+    x-enum-varnames:
+    - Consumables
+    - Server
+    - StoredProduct
   constvar.ReservationMethod:
     enum:
     - 1
@@ -232,7 +246,7 @@
         type: string
       parentId:
         description: 涓婄骇id
-        type: integer
+        type: string
       replenishLocation:
         description: 鏄惁琛ュ厖浣嶇疆
         type: boolean
@@ -263,6 +277,9 @@
       categoryId:
         description: 浜у搧绫诲埆id
         type: integer
+      categoryName:
+        description: 浜у搧绫诲埆鍚嶇О
+        type: string
       companyId:
         description: 鍏徃id
         type: integer
@@ -302,7 +319,7 @@
       invoicingStrategy:
         allOf:
         - $ref: '#/definitions/constvar.InvoicingStrategy'
-        description: wms娣诲姞瀛楁
+        description: 寮�绁ㄧ瓥鐣�
       isSale:
         description: PurchaseType      constvar.PurchaseType `gorm:"type:int(11);comment:閲囪喘绫诲瀷"
           json:"purchaseType"`
@@ -352,6 +369,10 @@
       productTagName:
         description: 浜у搧鏍囩鍚嶇О
         type: string
+      productType:
+        allOf:
+        - $ref: '#/definitions/constvar.ProductType'
+        description: wms娣诲姞瀛楁
       purchasePrice:
         description: 閲囪喘浠锋牸
         type: number
@@ -510,6 +531,9 @@
       inboundTransportation:
         description: 鍏ュ悜杩愯緭
         type: integer
+      locationId:
+        description: 浣嶇疆id
+        type: integer
       name:
         description: 浠撳簱鍚嶇О
         type: string
@@ -530,6 +554,9 @@
           type: string
         type: array
       updateTime:
+        type: string
+      warehouseLocation:
+        description: 搴撳瓨浣嶇疆
         type: string
     required:
     - code
@@ -668,6 +695,9 @@
         type: string
       inboundTransportation:
         description: 鍏ュ悜杩愯緭
+        type: integer
+      locationId:
+        description: 浣嶇疆id
         type: integer
       name:
         description: 浠撳簱鍚嶇О
@@ -831,44 +861,6 @@
       warehouseId:
         description: 浠撳簱id
         type: integer
-    type: object
-  request.UpdateWarehouse:
-    properties:
-      active:
-        description: 鏄惁鍚敤锛屼紶true灏辫
-        type: boolean
-      address:
-        description: 鍦板潃
-        type: string
-      buyToResupply:
-        description: 璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
-        type: boolean
-      code:
-        description: 浠撳簱缂栫爜
-        maxLength: 5
-        minLength: 1
-        type: string
-      id:
-        type: integer
-      inboundTransportation:
-        description: 鍏ュ悜杩愯緭
-        type: integer
-      name:
-        description: 浠撳簱鍚嶇О
-        type: string
-      outboundTransportation:
-        description: 鍑哄簱杩愯緭
-        type: integer
-      partnerId:
-        description: 鍚堜綔浼欎即id
-        type: integer
-      resupplyWhIds:
-        description: 琛ョ粰鏉ユ簮浠撳簱ID
-        items:
-          type: string
-        type: array
-    required:
-    - code
     type: object
   util.Response:
     properties:
@@ -1453,6 +1445,48 @@
       summary: 淇敼浜у搧绫诲瀷
       tags:
       - 浜у搧绫诲瀷
+  /api-wms/v1/warehouse/getWarehouseDetails/{id}:
+    get:
+      parameters:
+      - description: 浠撳簱id
+        in: path
+        name: id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/models.Warehouse'
+              type: object
+      summary: 鑾峰彇浠撳簱璇︽儏
+      tags:
+      - 浠撳簱
+  /api-wms/v1/warehouse/updateWarehouse:
+    post:
+      parameters:
+      - description: 浠撳簱淇℃伅
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/models.Warehouse'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 缂栬緫浠撳簱
+      tags:
+      - 浠撳簱
   /api-wms/v1/warehouse/warehouse:
     get:
       parameters:
@@ -1518,29 +1552,6 @@
           schema:
             $ref: '#/definitions/util.Response'
       summary: 鍒犻櫎浠撳簱
-      tags:
-      - 浠撳簱
-    put:
-      parameters:
-      - description: 浠撳簱淇℃伅
-        in: body
-        name: object
-        required: true
-        schema:
-          $ref: '#/definitions/request.UpdateWarehouse'
-      - description: 浠撳簱id
-        in: path
-        name: id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: 鎴愬姛
-          schema:
-            $ref: '#/definitions/util.Response'
-      summary: 缂栬緫浠撳簱
       tags:
       - 浠撳簱
 swagger: "2.0"

--
Gitblit v1.8.0