From 2baa7bad0482613829e217997c44a51d8ec0ec66 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 20 九月 2023 09:51:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

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

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 2d89dc0..2dc5f06 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -520,6 +520,18 @@
     type: object
   request.AddOperation:
     properties:
+      carrierID:
+        type: integer
+      carrierName:
+        type: string
+      companyID:
+        type: integer
+      companyName:
+        type: string
+      contacterID:
+        type: integer
+      contacterName:
+        type: string
       details:
         items:
           $ref: '#/definitions/request.OperationDetails'
@@ -547,6 +559,12 @@
       toLocationId:
         description: 鐩爣浣嶇疆id
         type: integer
+      tracking:
+        type: string
+      transferWeight:
+        type: number
+      weight:
+        type: number
     type: object
   request.AddOperationType:
     properties:
@@ -672,6 +690,54 @@
       remark:
         description: 澶囨敞
         type: string
+    type: object
+  request.UpdateOperation:
+    properties:
+      carrierID:
+        type: integer
+      carrierName:
+        type: string
+      companyID:
+        type: integer
+      companyName:
+        type: string
+      contacterID:
+        type: integer
+      contacterName:
+        type: string
+      details:
+        items:
+          $ref: '#/definitions/request.OperationDetails'
+        type: array
+      fromLocationId:
+        description: 婧愪綅缃甶d
+        type: integer
+      id:
+        type: integer
+      number:
+        description: 鍗曞彿
+        type: string
+      operationDate:
+        type: string
+      operationTypeId:
+        description: 浣滀笟绫诲瀷id
+        type: integer
+      sourceNumber:
+        description: 婧愬崟鍙�
+        type: string
+      status:
+        allOf:
+        - $ref: '#/definitions/constvar.OperationStatus'
+        description: 鐘舵��
+      toLocationId:
+        description: 鐩爣浣嶇疆id
+        type: integer
+      tracking:
+        type: string
+      transferWeight:
+        type: number
+      weight:
+        type: number
     type: object
   request.UpdateOperationType:
     properties:
@@ -948,6 +1014,31 @@
       tags:
       - 鍏徃
   /api-wms/v1/operation/operation:
+    get:
+      consumes:
+      - application/json
+      parameters:
+      - in: query
+        name: operationTypeId
+        type: integer
+      - description: 椤电爜
+        in: query
+        name: page
+        type: integer
+      - description: 姣忛〉澶у皬
+        in: query
+        name: pageSize
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 鍏ュ簱/鍑哄簱鍒楄〃
+      tags:
+      - 鍏ュ簱/鍑哄簱
     post:
       parameters:
       - description: 鍏ュ簱/鍑哄簱淇℃伅
@@ -966,6 +1057,47 @@
       summary: 娣诲姞鍏ュ簱/鍑哄簱
       tags:
       - 鍏ュ簱/鍑哄簱
+  /api-wms/v1/operation/operation/{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:
+      - 鍏ュ簱/鍑哄簱
+    put:
+      parameters:
+      - description: 鍏ュ簱淇℃伅
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.UpdateOperation'
+      - 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/product/addProduct:
     post:
       parameters:

--
Gitblit v1.8.0