From 5aeb61e49e9e518108fec4aeb6fdd460f21cdbfe Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 14 九月 2023 13:59:24 +0800
Subject: [PATCH] 解决冲突

---
 docs/swagger.yaml |  430 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 430 insertions(+), 0 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 034292b..eb93df2 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1,4 +1,58 @@
 definitions:
+  constvar.BaseOperationType:
+    enum:
+    - 1
+    - 2
+    - 3
+    type: integer
+    x-enum-comments:
+      BaseOperationTypeIncoming: 鏀惰揣
+      BaseOperationTypeInternal: 鍐呴儴璋冩嫧
+      BaseOperationTypeOutgoing: 浜よ揣
+    x-enum-varnames:
+    - BaseOperationTypeIncoming
+    - BaseOperationTypeOutgoing
+    - BaseOperationTypeInternal
+  constvar.ReservationMethod:
+    enum:
+    - 1
+    - 2
+    - 3
+    type: integer
+    x-enum-comments:
+      ReservationMethodAtConfirm: 鍦ㄧ‘璁ゆ椂
+      ReservationMethodByDate: 鍦ㄩ瀹氭棩鏈熶箣鍓�
+      ReservationMethodManual: 鎵嬪姩
+    x-enum-varnames:
+    - ReservationMethodAtConfirm
+    - ReservationMethodManual
+    - ReservationMethodByDate
+  constvar.WhetherType:
+    enum:
+    - 1
+    - 2
+    - 3
+    type: integer
+    x-enum-comments:
+      ReservationNever: 浠庝笉
+      WhetherTypeAlways: 鎬绘槸
+      WhetherTypeAsk: 璇㈤棶
+    x-enum-varnames:
+    - WhetherTypeAsk
+    - WhetherTypeAlways
+    - ReservationNever
+  models.Company:
+    properties:
+      createTime:
+        type: string
+      id:
+        type: integer
+      name:
+        description: 鍏徃鍚嶇О
+        type: string
+      updateTime:
+        type: string
+    type: object
   models.Department:
     properties:
       children:
@@ -26,6 +80,88 @@
         description: 鎺掑簭
         type: integer
     type: object
+  models.Location:
+    properties:
+      createTime:
+        type: string
+      id:
+        type: integer
+      name:
+        description: 浣嶇疆鍚嶇О
+        type: string
+      updateTime:
+        type: string
+    type: object
+  models.OperationType:
+    properties:
+      ReservationDaysBeforePriority:
+        description: 鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ
+        type: integer
+      baseOperationType:
+        allOf:
+        - $ref: '#/definitions/constvar.BaseOperationType'
+        description: 鍩虹浣滀笟绫诲瀷
+      company:
+        allOf:
+        - $ref: '#/definitions/models.Company'
+        description: 鍏徃
+      companyId:
+        description: 鍏徃id
+        type: integer
+      createBackorder:
+        allOf:
+        - $ref: '#/definitions/constvar.WhetherType'
+        description: 鍒涘缓娆犲崟
+      createTime:
+        type: string
+      defaultLocationDest:
+        allOf:
+        - $ref: '#/definitions/models.Location'
+        description: 榛樿鐩爣浣嶇疆
+      defaultLocationDestId:
+        description: 榛樿鐩爣浣嶇疆id
+        type: integer
+      defaultLocationSrc:
+        allOf:
+        - $ref: '#/definitions/models.Location'
+        description: 榛樿婧愪綅缃�
+      defaultLocationSrcId:
+        description: 榛樿婧愪綅缃甶d
+        type: integer
+      id:
+        type: integer
+      name:
+        description: 浠撳簱鍚嶇О
+        type: string
+      printLabel:
+        description: 鏄惁鎵撳嵃鏍囩
+        type: boolean
+      reservationDaysBefore:
+        description: 鏀惰揣鍓嶅嚑澶�
+        type: integer
+      reservationMethod:
+        allOf:
+        - $ref: '#/definitions/constvar.ReservationMethod'
+        description: 淇濈暀鏂瑰紡
+      returnOperationType:
+        description: 閫�璐х被鍨嬪悕绉�
+        type: string
+      returnOperationTypeID:
+        description: 閫�璐х被鍨婭D
+        type: integer
+      showOperations:
+        description: 鏄剧ず浣滀笟璇︽儏
+        type: boolean
+      updateTime:
+        type: string
+      warehouse:
+        allOf:
+        - $ref: '#/definitions/models.Warehouse'
+        description: 浠撳簱
+      warehouseId:
+        description: 浠撳簱id
+        type: integer
+    type: object
   models.Warehouse:
     properties:
       active:
@@ -39,8 +175,14 @@
         maxLength: 5
         minLength: 1
         type: string
+      company:
+        $ref: '#/definitions/models.Company'
+      companyId:
+        type: integer
       createTime:
         type: string
+      id:
+        type: integer
       name:
         description: 浠撳簱鍚嶇О
         type: string
@@ -62,6 +204,12 @@
     required:
     - code
     type: object
+  request.AddCompany:
+    properties:
+      name:
+        description: 鍏徃鍚嶇О
+        type: string
+    type: object
   request.AddDepartment:
     properties:
       name:
@@ -76,6 +224,53 @@
       remark:
         description: 澶囨敞
         type: string
+    type: object
+  request.AddOperationType:
+    properties:
+      ReservationDaysBeforePriority:
+        description: 鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ
+        type: integer
+      baseOperationType:
+        allOf:
+        - $ref: '#/definitions/constvar.BaseOperationType'
+        description: 鍩虹浣滀笟绫诲瀷
+      companyId:
+        description: 鍏徃id
+        type: integer
+      createBackorder:
+        allOf:
+        - $ref: '#/definitions/constvar.WhetherType'
+        description: 鍒涘缓娆犲崟
+      defaultLocationDestId:
+        description: 榛樿鐩爣浣嶇疆id
+        type: integer
+      defaultLocationSrcId:
+        description: 榛樿婧愪綅缃甶d
+        type: integer
+      id:
+        type: integer
+      name:
+        description: 浠撳簱鍚嶇О
+        type: string
+      printLabel:
+        description: 鏄惁鎵撳嵃鏍囩
+        type: boolean
+      reservationDaysBefore:
+        description: 鏀惰揣鍓嶅嚑澶�
+        type: integer
+      reservationMethod:
+        allOf:
+        - $ref: '#/definitions/constvar.ReservationMethod'
+        description: 淇濈暀鏂瑰紡
+      returnOperationTypeID:
+        description: 閫�璐х被鍨婭D
+        type: integer
+      showOperations:
+        description: 鏄剧ず浣滀笟璇︽儏
+        type: boolean
+      warehouseId:
+        description: 浠撳簱id
+        type: integer
     type: object
   request.AddWarehouse:
     properties:
@@ -104,6 +299,14 @@
     required:
     - code
     type: object
+  request.UpdateCompany:
+    properties:
+      id:
+        type: integer
+      name:
+        description: 鍏徃鍚嶇О
+        type: string
+    type: object
   request.UpdateDepartment:
     properties:
       id:
@@ -120,6 +323,53 @@
       remark:
         description: 澶囨敞
         type: string
+    type: object
+  request.UpdateOperationType:
+    properties:
+      ReservationDaysBeforePriority:
+        description: 鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ
+        type: integer
+      baseOperationType:
+        allOf:
+        - $ref: '#/definitions/constvar.BaseOperationType'
+        description: 鍩虹浣滀笟绫诲瀷
+      companyId:
+        description: 鍏徃id
+        type: integer
+      createBackorder:
+        allOf:
+        - $ref: '#/definitions/constvar.WhetherType'
+        description: 鍒涘缓娆犲崟
+      defaultLocationDestId:
+        description: 榛樿鐩爣浣嶇疆id
+        type: integer
+      defaultLocationSrcId:
+        description: 榛樿婧愪綅缃甶d
+        type: integer
+      id:
+        type: integer
+      name:
+        description: 浠撳簱鍚嶇О
+        type: string
+      printLabel:
+        description: 鏄惁鎵撳嵃鏍囩
+        type: boolean
+      reservationDaysBefore:
+        description: 鏀惰揣鍓嶅嚑澶�
+        type: integer
+      reservationMethod:
+        allOf:
+        - $ref: '#/definitions/constvar.ReservationMethod'
+        description: 淇濈暀鏂瑰紡
+      returnOperationTypeID:
+        description: 閫�璐х被鍨婭D
+        type: integer
+      showOperations:
+        description: 鏄剧ず浣滀笟璇︽儏
+        type: boolean
+      warehouseId:
+        description: 浠撳簱id
+        type: integer
     type: object
   request.UpdateWarehouse:
     properties:
@@ -258,6 +508,186 @@
       summary: 缂栬緫閮ㄩ棬淇℃伅
       tags:
       - 閮ㄩ棬淇℃伅
+  /api-wms/v1/company/company:
+    get:
+      parameters:
+      - in: query
+        name: keyword
+        type: string
+      - description: 椤电爜
+        in: query
+        name: page
+        type: integer
+      - description: 姣忛〉澶у皬
+        in: query
+        name: pageSize
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.ResponseList'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/models.Company'
+                  type: array
+              type: object
+      summary: 鏌ヨ鍏徃鍒楄〃
+      tags:
+      - 鍏徃
+    post:
+      parameters:
+      - description: 鍏徃淇℃伅
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.AddCompany'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 娣诲姞鍏徃
+      tags:
+      - 鍏徃
+  /api-wms/v1/company/company/{id}:
+    delete:
+      parameters:
+      - description: 鍏徃id
+        in: path
+        name: id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 鍒犻櫎鍏徃
+      tags:
+      - 鍏徃
+    put:
+      parameters:
+      - description: 鍏徃淇℃伅
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.UpdateCompany'
+      - description: 鍏徃id
+        in: path
+        name: id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 缂栬緫鍏徃
+      tags:
+      - 鍏徃
+  /api-wms/v1/warehouse/operationType:
+    get:
+      parameters:
+      - in: query
+        name: keyword
+        type: string
+      - description: 椤电爜
+        in: query
+        name: page
+        type: integer
+      - description: 姣忛〉澶у皬
+        in: query
+        name: pageSize
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            allOf:
+            - $ref: '#/definitions/util.ResponseList'
+            - properties:
+                data:
+                  items:
+                    $ref: '#/definitions/models.OperationType'
+                  type: array
+              type: object
+      summary: 鏌ヨ浣滀笟绫诲瀷鍒楄〃
+      tags:
+      - 浣滀笟绫诲瀷
+    post:
+      parameters:
+      - description: 浣滀笟绫诲瀷淇℃伅
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.AddOperationType'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 娣诲姞浣滀笟绫诲瀷
+      tags:
+      - 浣滀笟绫诲瀷
+  /api-wms/v1/warehouse/operationType/{id}:
+    delete:
+      parameters:
+      - description: 浣滀笟绫诲瀷id
+        in: path
+        name: id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 鍒犻櫎浣滀笟绫诲瀷
+      tags:
+      - 浣滀笟绫诲瀷
+    put:
+      parameters:
+      - description: 浣滀笟绫诲瀷淇℃伅
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.UpdateOperationType'
+      - description: 浣滀笟绫诲瀷id
+        in: path
+        name: id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 缂栬緫浣滀笟绫诲瀷
+      tags:
+      - 浣滀笟绫诲瀷
   /api-wms/v1/warehouse/warehouse:
     get:
       parameters:

--
Gitblit v1.8.0