From 726662cd89d0fe6b24461c850495db8c37a3e8f1 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 20 九月 2023 14:16:04 +0800
Subject: [PATCH] 作业类型路径修改

---
 controllers/operation_type.go |    8 
 models/warehouse.go           |   25 
 request/warehouse.go          |   15 
 docs/swagger.yaml             |  207 +++++++-----
 docs/docs.go                  |  324 +++++++++++---------
 docs/swagger.json             |  324 +++++++++++---------
 6 files changed, 504 insertions(+), 399 deletions(-)

diff --git a/controllers/operation_type.go b/controllers/operation_type.go
index b2d5dc3..03bf227 100644
--- a/controllers/operation_type.go
+++ b/controllers/operation_type.go
@@ -22,7 +22,7 @@
 // @Produce   application/json
 // @Param     object  body  request.AddOperationType true  "浣滀笟绫诲瀷淇℃伅"
 // @Success   200 {object} util.Response "鎴愬姛"
-// @Router    /api-wms/v1/warehouse/operationType [post]
+// @Router    /api-wms/v1/operationType/operationType [post]
 func (slf OperationTypeController) Add(c *gin.Context) {
 	var reqParams request.AddOperationType
 	var params models.OperationType
@@ -55,7 +55,7 @@
 // @Param     object  body request.UpdateOperationType true  "浣滀笟绫诲瀷淇℃伅"
 // @Param     id  path string true  "浣滀笟绫诲瀷id"
 // @Success   200 {object} util.Response "鎴愬姛"
-// @Router    /api-wms/v1/warehouse/operationType/{id} [put]
+// @Router    /api-wms/v1/operationType/operationType/{id} [put]
 func (slf OperationTypeController) Update(c *gin.Context) {
 	id := cast.ToUint(c.Param("id"))
 	if id == 0 {
@@ -107,7 +107,7 @@
 // @Produce   application/json
 // @Param     object  query    request.GetOperationTypeList true  "鏌ヨ鍙傛暟"
 // @Success   200   {object}  util.ResponseList{data=[]models.OperationType}  "鎴愬姛"
-// @Router    /api-wms/v1/warehouse/operationType [get]
+// @Router    /api-wms/v1/operationType/operationType [get]
 func (slf OperationTypeController) List(c *gin.Context) {
 	var params request.GetOperationTypeList
 	if err := c.ShouldBindQuery(&params); err != nil {
@@ -129,7 +129,7 @@
 // @Produce   application/json
 // @Param     id  path string true  "浣滀笟绫诲瀷id"
 // @Success   200 {object} util.Response "鎴愬姛"
-// @Router    /api-wms/v1/warehouse/operationType/{id} [delete]
+// @Router    /api-wms/v1/operationType/operationType/{id} [delete]
 func (slf OperationTypeController) Delete(c *gin.Context) {
 	id := cast.ToUint(c.Param("id"))
 	if id == 0 {
diff --git a/docs/docs.go b/docs/docs.go
index 9647266..03c8ea4 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -426,6 +426,150 @@
                 }
             }
         },
+        "/api-wms/v1/operationType/operationType": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "浣滀笟绫诲瀷"
+                ],
+                "summary": "鏌ヨ浣滀笟绫诲瀷鍒楄〃",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "name": "keyword",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "椤电爜",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "姣忛〉澶у皬",
+                        "name": "pageSize",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/util.ResponseList"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/models.OperationType"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            },
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "浣滀笟绫诲瀷"
+                ],
+                "summary": "娣诲姞浣滀笟绫诲瀷",
+                "parameters": [
+                    {
+                        "description": "浣滀笟绫诲瀷淇℃伅",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.AddOperationType"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/operationType/operationType/{id}": {
+            "put": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "浣滀笟绫诲瀷"
+                ],
+                "summary": "缂栬緫浣滀笟绫诲瀷",
+                "parameters": [
+                    {
+                        "description": "浣滀笟绫诲瀷淇℃伅",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.UpdateOperationType"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "浣滀笟绫诲瀷id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "浣滀笟绫诲瀷"
+                ],
+                "summary": "鍒犻櫎浣滀笟绫诲瀷",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "浣滀笟绫诲瀷id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api-wms/v1/product/addProduct": {
             "post": {
                 "produces": [
@@ -760,150 +904,6 @@
                         "schema": {
                             "$ref": "#/definitions/models.ProductCategory"
                         }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/util.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api-wms/v1/warehouse/operationType": {
-            "get": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "浣滀笟绫诲瀷"
-                ],
-                "summary": "鏌ヨ浣滀笟绫诲瀷鍒楄〃",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "name": "keyword",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "椤电爜",
-                        "name": "page",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "姣忛〉澶у皬",
-                        "name": "pageSize",
-                        "in": "query"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "allOf": [
-                                {
-                                    "$ref": "#/definitions/util.ResponseList"
-                                },
-                                {
-                                    "type": "object",
-                                    "properties": {
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/definitions/models.OperationType"
-                                            }
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                }
-            },
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "浣滀笟绫诲瀷"
-                ],
-                "summary": "娣诲姞浣滀笟绫诲瀷",
-                "parameters": [
-                    {
-                        "description": "浣滀笟绫诲瀷淇℃伅",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.AddOperationType"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/util.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api-wms/v1/warehouse/operationType/{id}": {
-            "put": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "浣滀笟绫诲瀷"
-                ],
-                "summary": "缂栬緫浣滀笟绫诲瀷",
-                "parameters": [
-                    {
-                        "description": "浣滀笟绫诲瀷淇℃伅",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.UpdateOperationType"
-                        }
-                    },
-                    {
-                        "type": "string",
-                        "description": "浣滀笟绫诲瀷id",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/util.Response"
-                        }
-                    }
-                }
-            },
-            "delete": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "浣滀笟绫诲瀷"
-                ],
-                "summary": "鍒犻櫎浣滀笟绫诲瀷",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "浣滀笟绫诲瀷id",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
                     }
                 ],
                 "responses": {
@@ -1741,6 +1741,10 @@
                     "description": "鏄惁鍚敤锛屼紶true灏辫",
                     "type": "boolean"
                 },
+                "address": {
+                    "description": "鍦板潃",
+                    "type": "string"
+                },
                 "buyToResupply": {
                     "description": "鏄惁璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
                     "type": "boolean"
@@ -1763,9 +1767,17 @@
                 "id": {
                     "type": "integer"
                 },
+                "inboundTransportation": {
+                    "description": "鍏ュ悜杩愯緭",
+                    "type": "integer"
+                },
                 "name": {
                     "description": "浠撳簱鍚嶇О",
                     "type": "string"
+                },
+                "outboundTransportation": {
+                    "description": "鍑哄簱杩愯緭",
+                    "type": "integer"
                 },
                 "partnerId": {
                     "description": "鍚堜綔浼欎即id",
@@ -1974,6 +1986,10 @@
                     "description": "鏄惁鍚敤锛屼紶true灏辫",
                     "type": "boolean"
                 },
+                "address": {
+                    "description": "鍦板潃",
+                    "type": "string"
+                },
                 "buyToResupply": {
                     "description": "璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
                     "type": "boolean"
@@ -1984,9 +2000,17 @@
                     "maxLength": 5,
                     "minLength": 1
                 },
+                "inboundTransportation": {
+                    "description": "鍏ュ悜杩愯緭",
+                    "type": "integer"
+                },
                 "name": {
                     "description": "浠撳簱鍚嶇О",
                     "type": "string"
+                },
+                "outboundTransportation": {
+                    "description": "鍑哄簱杩愯緭",
+                    "type": "integer"
                 },
                 "partnerId": {
                     "description": "鍚堜綔浼欎即id",
@@ -2228,6 +2252,10 @@
                     "description": "鏄惁鍚敤锛屼紶true灏辫",
                     "type": "boolean"
                 },
+                "address": {
+                    "description": "鍦板潃",
+                    "type": "string"
+                },
                 "buyToResupply": {
                     "description": "璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
                     "type": "boolean"
@@ -2241,10 +2269,18 @@
                 "id": {
                     "type": "integer"
                 },
+                "inboundTransportation": {
+                    "description": "鍏ュ悜杩愯緭",
+                    "type": "integer"
+                },
                 "name": {
                     "description": "浠撳簱鍚嶇О",
                     "type": "string"
                 },
+                "outboundTransportation": {
+                    "description": "鍑哄簱杩愯緭",
+                    "type": "integer"
+                },
                 "partnerId": {
                     "description": "鍚堜綔浼欎即id",
                     "type": "integer"
diff --git a/docs/swagger.json b/docs/swagger.json
index 10ca3e1..b7f8f43 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -414,6 +414,150 @@
                 }
             }
         },
+        "/api-wms/v1/operationType/operationType": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "浣滀笟绫诲瀷"
+                ],
+                "summary": "鏌ヨ浣滀笟绫诲瀷鍒楄〃",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "name": "keyword",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "椤电爜",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "姣忛〉澶у皬",
+                        "name": "pageSize",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/util.ResponseList"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/models.OperationType"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            },
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "浣滀笟绫诲瀷"
+                ],
+                "summary": "娣诲姞浣滀笟绫诲瀷",
+                "parameters": [
+                    {
+                        "description": "浣滀笟绫诲瀷淇℃伅",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.AddOperationType"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
+        "/api-wms/v1/operationType/operationType/{id}": {
+            "put": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "浣滀笟绫诲瀷"
+                ],
+                "summary": "缂栬緫浣滀笟绫诲瀷",
+                "parameters": [
+                    {
+                        "description": "浣滀笟绫诲瀷淇℃伅",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.UpdateOperationType"
+                        }
+                    },
+                    {
+                        "type": "string",
+                        "description": "浣滀笟绫诲瀷id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "浣滀笟绫诲瀷"
+                ],
+                "summary": "鍒犻櫎浣滀笟绫诲瀷",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "浣滀笟绫诲瀷id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/util.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/api-wms/v1/product/addProduct": {
             "post": {
                 "produces": [
@@ -748,150 +892,6 @@
                         "schema": {
                             "$ref": "#/definitions/models.ProductCategory"
                         }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/util.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api-wms/v1/warehouse/operationType": {
-            "get": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "浣滀笟绫诲瀷"
-                ],
-                "summary": "鏌ヨ浣滀笟绫诲瀷鍒楄〃",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "name": "keyword",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "椤电爜",
-                        "name": "page",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "姣忛〉澶у皬",
-                        "name": "pageSize",
-                        "in": "query"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "allOf": [
-                                {
-                                    "$ref": "#/definitions/util.ResponseList"
-                                },
-                                {
-                                    "type": "object",
-                                    "properties": {
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/definitions/models.OperationType"
-                                            }
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                }
-            },
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "浣滀笟绫诲瀷"
-                ],
-                "summary": "娣诲姞浣滀笟绫诲瀷",
-                "parameters": [
-                    {
-                        "description": "浣滀笟绫诲瀷淇℃伅",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.AddOperationType"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/util.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api-wms/v1/warehouse/operationType/{id}": {
-            "put": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "浣滀笟绫诲瀷"
-                ],
-                "summary": "缂栬緫浣滀笟绫诲瀷",
-                "parameters": [
-                    {
-                        "description": "浣滀笟绫诲瀷淇℃伅",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.UpdateOperationType"
-                        }
-                    },
-                    {
-                        "type": "string",
-                        "description": "浣滀笟绫诲瀷id",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/util.Response"
-                        }
-                    }
-                }
-            },
-            "delete": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "浣滀笟绫诲瀷"
-                ],
-                "summary": "鍒犻櫎浣滀笟绫诲瀷",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "浣滀笟绫诲瀷id",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
                     }
                 ],
                 "responses": {
@@ -1729,6 +1729,10 @@
                     "description": "鏄惁鍚敤锛屼紶true灏辫",
                     "type": "boolean"
                 },
+                "address": {
+                    "description": "鍦板潃",
+                    "type": "string"
+                },
                 "buyToResupply": {
                     "description": "鏄惁璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
                     "type": "boolean"
@@ -1751,9 +1755,17 @@
                 "id": {
                     "type": "integer"
                 },
+                "inboundTransportation": {
+                    "description": "鍏ュ悜杩愯緭",
+                    "type": "integer"
+                },
                 "name": {
                     "description": "浠撳簱鍚嶇О",
                     "type": "string"
+                },
+                "outboundTransportation": {
+                    "description": "鍑哄簱杩愯緭",
+                    "type": "integer"
                 },
                 "partnerId": {
                     "description": "鍚堜綔浼欎即id",
@@ -1962,6 +1974,10 @@
                     "description": "鏄惁鍚敤锛屼紶true灏辫",
                     "type": "boolean"
                 },
+                "address": {
+                    "description": "鍦板潃",
+                    "type": "string"
+                },
                 "buyToResupply": {
                     "description": "璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
                     "type": "boolean"
@@ -1972,9 +1988,17 @@
                     "maxLength": 5,
                     "minLength": 1
                 },
+                "inboundTransportation": {
+                    "description": "鍏ュ悜杩愯緭",
+                    "type": "integer"
+                },
                 "name": {
                     "description": "浠撳簱鍚嶇О",
                     "type": "string"
+                },
+                "outboundTransportation": {
+                    "description": "鍑哄簱杩愯緭",
+                    "type": "integer"
                 },
                 "partnerId": {
                     "description": "鍚堜綔浼欎即id",
@@ -2216,6 +2240,10 @@
                     "description": "鏄惁鍚敤锛屼紶true灏辫",
                     "type": "boolean"
                 },
+                "address": {
+                    "description": "鍦板潃",
+                    "type": "string"
+                },
                 "buyToResupply": {
                     "description": "璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
                     "type": "boolean"
@@ -2229,10 +2257,18 @@
                 "id": {
                     "type": "integer"
                 },
+                "inboundTransportation": {
+                    "description": "鍏ュ悜杩愯緭",
+                    "type": "integer"
+                },
                 "name": {
                     "description": "浠撳簱鍚嶇О",
                     "type": "string"
                 },
+                "outboundTransportation": {
+                    "description": "鍑哄簱杩愯緭",
+                    "type": "integer"
+                },
                 "partnerId": {
                     "description": "鍚堜綔浼欎即id",
                     "type": "integer"
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 80597bb..3339932 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -488,6 +488,9 @@
       active:
         description: 鏄惁鍚敤锛屼紶true灏辫
         type: boolean
+      address:
+        description: 鍦板潃
+        type: string
       buyToResupply:
         description: 鏄惁璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
         type: boolean
@@ -504,9 +507,15 @@
         type: string
       id:
         type: integer
+      inboundTransportation:
+        description: 鍏ュ悜杩愯緭
+        type: integer
       name:
         description: 浠撳簱鍚嶇О
         type: string
+      outboundTransportation:
+        description: 鍑哄簱杩愯緭
+        type: integer
       partnerId:
         description: 鍚堜綔浼欎即id
         type: integer
@@ -646,6 +655,9 @@
       active:
         description: 鏄惁鍚敤锛屼紶true灏辫
         type: boolean
+      address:
+        description: 鍦板潃
+        type: string
       buyToResupply:
         description: 璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
         type: boolean
@@ -654,9 +666,15 @@
         maxLength: 5
         minLength: 1
         type: string
+      inboundTransportation:
+        description: 鍏ュ悜杩愯緭
+        type: integer
       name:
         description: 浠撳簱鍚嶇О
         type: string
+      outboundTransportation:
+        description: 鍑哄簱杩愯緭
+        type: integer
       partnerId:
         description: 鍚堜綔浼欎即id
         type: integer
@@ -819,6 +837,9 @@
       active:
         description: 鏄惁鍚敤锛屼紶true灏辫
         type: boolean
+      address:
+        description: 鍦板潃
+        type: string
       buyToResupply:
         description: 璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
         type: boolean
@@ -829,9 +850,15 @@
         type: string
       id:
         type: integer
+      inboundTransportation:
+        description: 鍏ュ悜杩愯緭
+        type: integer
       name:
         description: 浠撳簱鍚嶇О
         type: string
+      outboundTransportation:
+        description: 鍑哄簱杩愯緭
+        type: integer
       partnerId:
         description: 鍚堜綔浼欎即id
         type: integer
@@ -1126,6 +1153,96 @@
       summary: 淇敼鍏ュ簱/鍑哄簱淇℃伅
       tags:
       - 鍏ュ簱/鍑哄簱
+  /api-wms/v1/operationType/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/operationType/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/product/addProduct:
     post:
       parameters:
@@ -1336,96 +1453,6 @@
       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:
diff --git a/models/warehouse.go b/models/warehouse.go
index c6cd670..a8db21e 100644
--- a/models/warehouse.go
+++ b/models/warehouse.go
@@ -11,17 +11,20 @@
 	// Warehouse 浠撳簱
 	Warehouse struct {
 		WmsModel
-		Id               int          `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
-		Name             string       `json:"name" gorm:"index;type:varchar(255);not null;comment:浠撳簱鍚嶇О"`                                 //浠撳簱鍚嶇О
-		Active           bool         `json:"active" gorm:"type:tinyint(1);not null;comment:鏄惁婵�娲�"`                                       //鏄惁鍚敤锛屼紶true灏辫
-		Code             string       `json:"code" binding:"required,min=1,max=5"  gorm:"index;type:varchar(255);not null;comment:浠撳簱缂栫爜"` //浠撳簱缂栫爜
-		PartnerID        int          `json:"partnerId"  gorm:"type:int;not null;comment:鍚堜綔浼欎即id"`                                        //鍚堜綔浼欎即id
-		BuyToResupply    bool         `json:"buyToResupply" gorm:"type:tinyint(1);not null;comment:鏄惁璐拱琛ョ粰"`                              //鏄惁璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
-		ResupplyWhIdsStr string       `json:"-" gorm:"column:resupply_wh_ids;type:varchar(255);not null;comment:琛ョ粰鏉ユ簮浠撳簱ID"`               //琛ョ粰鏉ユ簮浠撳簱ID
-		ResupplyWhIds    []string     `json:"resupplyWhIds" gorm:"-"`                                                                    //琛ョ粰鏉ユ簮浠撳簱ID
-		ResupplyWh       []*Warehouse `json:"resupplyWh" gorm:"-"`                                                                       //琛ョ粰鏉ユ簮浠撳簱
-		CompanyId        int          `json:"companyId" gorm:"type:int;not null;comment:鍏徃id"`
-		Company          Company      `json:"company" gorm:"foreignKey:CompanyId"`
+		Id                     int          `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+		Name                   string       `json:"name" gorm:"index;type:varchar(255);not null;comment:浠撳簱鍚嶇О"`                                 //浠撳簱鍚嶇О
+		Active                 bool         `json:"active" gorm:"type:tinyint(1);not null;comment:鏄惁婵�娲�"`                                       //鏄惁鍚敤锛屼紶true灏辫
+		Code                   string       `json:"code" binding:"required,min=1,max=5"  gorm:"index;type:varchar(255);not null;comment:浠撳簱缂栫爜"` //浠撳簱缂栫爜
+		PartnerID              int          `json:"partnerId"  gorm:"type:int;not null;comment:鍚堜綔浼欎即id"`                                        //鍚堜綔浼欎即id
+		BuyToResupply          bool         `json:"buyToResupply" gorm:"type:tinyint(1);not null;comment:鏄惁璐拱琛ョ粰"`                              //鏄惁璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
+		ResupplyWhIdsStr       string       `json:"-" gorm:"column:resupply_wh_ids;type:varchar(255);not null;comment:琛ョ粰鏉ユ簮浠撳簱ID"`               //琛ョ粰鏉ユ簮浠撳簱ID
+		ResupplyWhIds          []string     `json:"resupplyWhIds" gorm:"-"`                                                                    //琛ョ粰鏉ユ簮浠撳簱ID
+		ResupplyWh             []*Warehouse `json:"resupplyWh" gorm:"-"`                                                                       //琛ョ粰鏉ユ簮浠撳簱
+		CompanyId              int          `json:"companyId" gorm:"type:int;not null;comment:鍏徃id"`
+		Company                Company      `json:"company" gorm:"foreignKey:CompanyId"`
+		Address                string       `json:"address" gorm:"type:varchar(512);comment:鍦板潃"`         //鍦板潃
+		InboundTransportation  int          `json:"inboundTransportation" gorm:"type:int;comment:鍏ュ悜杩愯緭"`  //鍏ュ悜杩愯緭
+		OutboundTransportation int          `json:"outboundTransportation" gorm:"type:int;comment:鍑哄簱杩愯緭"` //鍑哄簱杩愯緭
 	}
 
 	WarehouseSearch struct {
diff --git a/request/warehouse.go b/request/warehouse.go
index c2c4fef..47fb595 100644
--- a/request/warehouse.go
+++ b/request/warehouse.go
@@ -6,12 +6,15 @@
 }
 
 type AddWarehouse struct {
-	Name          string   `json:"name" gorm:"index;type:varchar(255);not null;comment:浠撳簱鍚嶇О"`                                 //浠撳簱鍚嶇О
-	Active        bool     `json:"active" gorm:"type:tinyint(1);not null;comment:鏄惁婵�娲�"`                                       //鏄惁鍚敤锛屼紶true灏辫
-	Code          string   `json:"code" binding:"required,min=1,max=5"  gorm:"index;type:varchar(255);not null;comment:浠撳簱缂栫爜"` //浠撳簱缂栫爜
-	PartnerID     int      `json:"partnerId"  gorm:"type:int;not null;comment:鍚堜綔浼欎即id"`                                        //鍚堜綔浼欎即id
-	BuyToResupply bool     `json:"buyToResupply"`                                                                             //璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
-	ResupplyWhIds []string `json:"resupplyWhIds"`                                                                             //琛ョ粰鏉ユ簮浠撳簱ID
+	Name                   string   `json:"name" gorm:"index;type:varchar(255);not null;comment:浠撳簱鍚嶇О"`                                 //浠撳簱鍚嶇О
+	Active                 bool     `json:"active" gorm:"type:tinyint(1);not null;comment:鏄惁婵�娲�"`                                       //鏄惁鍚敤锛屼紶true灏辫
+	Code                   string   `json:"code" binding:"required,min=1,max=5"  gorm:"index;type:varchar(255);not null;comment:浠撳簱缂栫爜"` //浠撳簱缂栫爜
+	PartnerID              int      `json:"partnerId"  gorm:"type:int;not null;comment:鍚堜綔浼欎即id"`                                        //鍚堜綔浼欎即id
+	BuyToResupply          bool     `json:"buyToResupply"`                                                                             //璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
+	ResupplyWhIds          []string `json:"resupplyWhIds"`                                                                             //琛ョ粰鏉ユ簮浠撳簱ID
+	Address                string   `json:"address" gorm:"type:varchar(512);comment:鍦板潃"`                                               //鍦板潃
+	InboundTransportation  int      `json:"inboundTransportation" gorm:"type:int;comment:鍏ュ悜杩愯緭"`                                        //鍏ュ悜杩愯緭
+	OutboundTransportation int      `json:"outboundTransportation" gorm:"type:int;comment:鍑哄簱杩愯緭"`                                       //鍑哄簱杩愯緭
 }
 
 type UpdateWarehouse struct {

--
Gitblit v1.8.0