From ed3d45b189f102249eabd0cb5a0299bc66b0dea6 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 18 十二月 2023 21:04:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

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

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 83761e3..a4cbae1 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -180,7 +180,7 @@
     - 5
     type: integer
     x-enum-comments:
-      OperationStatus_Cancel: 瀹屾垚
+      OperationStatus_Cancel: 鍙栨秷
       OperationStatus_Draft: 鑽夌
       OperationStatus_Finish: 瀹屾垚
       OperationStatus_Ready: 灏辩华
@@ -636,6 +636,8 @@
         type: string
       receiverPhone:
         type: string
+      source:
+        type: string
       sourceNumber:
         description: 婧愬崟鍙�
         type: string
@@ -843,6 +845,9 @@
         type: number
       fromLocationId:
         type: integer
+      number:
+        description: Unit           string          `json:"unit"`
+        type: string
       productId:
         type: string
       sourceNumber:
@@ -1176,6 +1181,17 @@
         type: integer
       sourceNumber:
         type: string
+    type: object
+  request.OperationCondition:
+    properties:
+      condition:
+        type: string
+      page:
+        description: 椤电爜
+        type: integer
+      pageSize:
+        description: 姣忛〉澶у皬
+        type: integer
     type: object
   request.OperationDetails:
     properties:
@@ -1521,6 +1537,9 @@
         type: string
       operationId:
         type: integer
+      operationTypeName:
+        description: 浣滀笟绫诲瀷鍚嶇О
+        type: string
       productId:
         type: string
       productName:
@@ -1546,6 +1565,9 @@
       amount:
         description: 鏁伴噺
         type: number
+      locationId:
+        description: 浣嶇疆id
+        type: integer
       locationName:
         description: 浣嶇疆鍚嶇О
         type: string
@@ -2343,6 +2365,25 @@
       summary: 鍏ュ簱/鍑哄簱鍒楄〃
       tags:
       - 鍏ュ簱/鍑哄簱
+  /api-wms/v1/operation/listByCondition:
+    post:
+      parameters:
+      - description: 鍙傛暟
+        in: body
+        name: object
+        required: true
+        schema:
+          $ref: '#/definitions/request.OperationCondition'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 鎴愬姛
+          schema:
+            $ref: '#/definitions/util.Response'
+      summary: 鍑哄叆搴撴槑缁�
+      tags:
+      - 鍏ュ簱/鍑哄簱
   /api-wms/v1/operation/listTransfer:
     post:
       parameters:

--
Gitblit v1.8.0