From 62cc4765bdb6e7084897fefd91b6c25a64dd4d72 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期三, 27 十二月 2023 17:40:49 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS --- docs/docs.go | 74 ++++++++++++++++++++++++++++++++++-- 1 files changed, 69 insertions(+), 5 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index de21b37..9db38a4 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -1150,8 +1150,8 @@ } } }, - "/api-wms/v1/operation/getOperationInfo/{number}": { - "post": { + "/api-wms/v1/operation/getOperationInfo/{id}": { + "get": { "produces": [ "application/json" ], @@ -1162,8 +1162,8 @@ "parameters": [ { "type": "string", - "description": "鍗曞彿", - "name": "number", + "description": "id", + "name": "id", "in": "path", "required": true } @@ -1214,6 +1214,36 @@ "required": true, "schema": { "$ref": "#/definitions/request.OperationList" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/operation/listByCondition": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "鍏ュ簱/鍑哄簱" + ], + "summary": "鍑哄叆搴撴槑缁�", + "parameters": [ + { + "description": "鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.OperationCondition" } } ], @@ -2736,7 +2766,7 @@ 5 ], "x-enum-comments": { - "OperationStatus_Cancel": "瀹屾垚", + "OperationStatus_Cancel": "鍙栨秷", "OperationStatus_Draft": "鑽夌", "OperationStatus_Finish": "瀹屾垚", "OperationStatus_Ready": "灏辩华", @@ -3371,6 +3401,9 @@ "receiverPhone": { "type": "string" }, + "source": { + "type": "string" + }, "sourceNumber": { "description": "婧愬崟鍙�", "type": "string" @@ -3674,6 +3707,10 @@ }, "fromLocationId": { "type": "integer" + }, + "number": { + "description": "Unit string ` + "`" + `json:\"unit\"` + "`" + `", + "type": "string" }, "productId": { "type": "string" @@ -4157,6 +4194,22 @@ }, "sourceNumber": { "type": "string" + } + } + }, + "request.OperationCondition": { + "type": "object", + "properties": { + "condition": { + "type": "string" + }, + "page": { + "description": "椤电爜", + "type": "integer" + }, + "pageSize": { + "description": "姣忛〉澶у皬", + "type": "integer" } } }, @@ -4656,6 +4709,13 @@ "description": "鍗曞彿", "type": "string" }, + "operationId": { + "type": "integer" + }, + "operationTypeName": { + "description": "浣滀笟绫诲瀷鍚嶇О", + "type": "string" + }, "productId": { "type": "string" }, @@ -4691,6 +4751,10 @@ "description": "鏁伴噺", "type": "number" }, + "locationId": { + "description": "浣嶇疆id", + "type": "integer" + }, "locationName": { "description": "浣嶇疆鍚嶇О", "type": "string" -- Gitblit v1.8.0