From 9d0d545bdd6f1448c19c24d2159a4f1752131d31 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期二, 14 十一月 2023 11:48:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 docs/docs.go |   66 ++++++++++++++++++++++++++++++++-
 1 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index a25619b..794a765 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -935,6 +935,34 @@
                 }
             }
         },
+        "/api-wms/v1/operation/cancel/{id}": {
+            "put": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鍏ュ簱/鍑哄簱"
+                ],
+                "summary": "鍙栨秷",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api-wms/v1/operation/finish/{id}": {
             "put": {
                 "produces": [
@@ -1378,6 +1406,34 @@
                         "schema": {
                             "$ref": "#/definitions/models.ProductCategory"
                         }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/product/cancelDisuse/{id}": {
+            "put": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "浜у搧"
+                ],
+                "summary": "鍙栨秷鎶ュ簾",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
                     }
                 ],
                 "responses": {
@@ -2383,9 +2439,11 @@
                 1,
                 2,
                 3,
-                4
+                4,
+                5
             ],
             "x-enum-comments": {
+                "OperationStatus_Cancel": "瀹屾垚",
                 "OperationStatus_Draft": "鑽夌",
                 "OperationStatus_Finish": "瀹屾垚",
                 "OperationStatus_Ready": "灏辩华",
@@ -2395,7 +2453,8 @@
                 "OperationStatus_Draft",
                 "OperationStatus_Waiting",
                 "OperationStatus_Ready",
-                "OperationStatus_Finish"
+                "OperationStatus_Finish",
+                "OperationStatus_Cancel"
             ]
         },
         "constvar.OrderCreation": {
@@ -3597,6 +3656,9 @@
                 "keyWord": {
                     "type": "string"
                 },
+                "locationId": {
+                    "type": "integer"
+                },
                 "page": {
                     "description": "椤电爜",
                     "type": "integer"

--
Gitblit v1.8.0