From 5aeb61e49e9e518108fec4aeb6fdd460f21cdbfe Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 14 九月 2023 13:59:24 +0800
Subject: [PATCH] 解决冲突
---
docs/docs.go | 937 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 937 insertions(+), 0 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 491292f..2922b77 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -149,9 +149,513 @@
}
}
}
+ },
+ "/api-wms/v1/company/company": {
+ "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.Company"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ },
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鍏徃"
+ ],
+ "summary": "娣诲姞鍏徃",
+ "parameters": [
+ {
+ "description": "鍏徃淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddCompany"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/company/company/{id}": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鍏徃"
+ ],
+ "summary": "缂栬緫鍏徃",
+ "parameters": [
+ {
+ "description": "鍏徃淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateCompany"
+ }
+ },
+ {
+ "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/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": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/warehouse/warehouse": {
+ "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.Warehouse"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ },
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浠撳簱"
+ ],
+ "summary": "娣诲姞浠撳簱",
+ "parameters": [
+ {
+ "description": "浠撳簱淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddWarehouse"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/warehouse/warehouse/{id}": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浠撳簱"
+ ],
+ "summary": "缂栬緫浠撳簱",
+ "parameters": [
+ {
+ "description": "浠撳簱淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateWarehouse"
+ }
+ },
+ {
+ "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"
+ }
+ }
+ }
+ }
}
},
"definitions": {
+ "constvar.BaseOperationType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3
+ ],
+ "x-enum-comments": {
+ "BaseOperationTypeIncoming": "鏀惰揣",
+ "BaseOperationTypeInternal": "鍐呴儴璋冩嫧",
+ "BaseOperationTypeOutgoing": "浜よ揣"
+ },
+ "x-enum-varnames": [
+ "BaseOperationTypeIncoming",
+ "BaseOperationTypeOutgoing",
+ "BaseOperationTypeInternal"
+ ]
+ },
+ "constvar.ReservationMethod": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3
+ ],
+ "x-enum-comments": {
+ "ReservationMethodAtConfirm": "鍦ㄧ‘璁ゆ椂",
+ "ReservationMethodByDate": "鍦ㄩ瀹氭棩鏈熶箣鍓�",
+ "ReservationMethodManual": "鎵嬪姩"
+ },
+ "x-enum-varnames": [
+ "ReservationMethodAtConfirm",
+ "ReservationMethodManual",
+ "ReservationMethodByDate"
+ ]
+ },
+ "constvar.WhetherType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3
+ ],
+ "x-enum-comments": {
+ "ReservationNever": "浠庝笉",
+ "WhetherTypeAlways": "鎬绘槸",
+ "WhetherTypeAsk": "璇㈤棶"
+ },
+ "x-enum-varnames": [
+ "WhetherTypeAsk",
+ "WhetherTypeAlways",
+ "ReservationNever"
+ ]
+ },
+ "models.Company": {
+ "type": "object",
+ "properties": {
+ "createTime": {
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "鍏徃鍚嶇О",
+ "type": "string"
+ },
+ "updateTime": {
+ "type": "string"
+ }
+ }
+ },
"models.Department": {
"type": "object",
"properties": {
@@ -190,6 +694,206 @@
}
}
},
+ "models.Location": {
+ "type": "object",
+ "properties": {
+ "createTime": {
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "浣嶇疆鍚嶇О",
+ "type": "string"
+ },
+ "updateTime": {
+ "type": "string"
+ }
+ }
+ },
+ "models.OperationType": {
+ "type": "object",
+ "properties": {
+ "ReservationDaysBeforePriority": {
+ "description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ",
+ "type": "integer"
+ },
+ "baseOperationType": {
+ "description": "鍩虹浣滀笟绫诲瀷",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.BaseOperationType"
+ }
+ ]
+ },
+ "company": {
+ "description": "鍏徃",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Company"
+ }
+ ]
+ },
+ "companyId": {
+ "description": "鍏徃id",
+ "type": "integer"
+ },
+ "createBackorder": {
+ "description": "鍒涘缓娆犲崟",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.WhetherType"
+ }
+ ]
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "defaultLocationDest": {
+ "description": "榛樿鐩爣浣嶇疆",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Location"
+ }
+ ]
+ },
+ "defaultLocationDestId": {
+ "description": "榛樿鐩爣浣嶇疆id",
+ "type": "integer"
+ },
+ "defaultLocationSrc": {
+ "description": "榛樿婧愪綅缃�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Location"
+ }
+ ]
+ },
+ "defaultLocationSrcId": {
+ "description": "榛樿婧愪綅缃甶d",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "浠撳簱鍚嶇О",
+ "type": "string"
+ },
+ "printLabel": {
+ "description": "鏄惁鎵撳嵃鏍囩",
+ "type": "boolean"
+ },
+ "reservationDaysBefore": {
+ "description": "鏀惰揣鍓嶅嚑澶�",
+ "type": "integer"
+ },
+ "reservationMethod": {
+ "description": "淇濈暀鏂瑰紡",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.ReservationMethod"
+ }
+ ]
+ },
+ "returnOperationType": {
+ "description": "閫�璐х被鍨嬪悕绉�",
+ "type": "string"
+ },
+ "returnOperationTypeID": {
+ "description": "閫�璐х被鍨婭D",
+ "type": "integer"
+ },
+ "showOperations": {
+ "description": "鏄剧ず浣滀笟璇︽儏",
+ "type": "boolean"
+ },
+ "updateTime": {
+ "type": "string"
+ },
+ "warehouse": {
+ "description": "浠撳簱",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Warehouse"
+ }
+ ]
+ },
+ "warehouseId": {
+ "description": "浠撳簱id",
+ "type": "integer"
+ }
+ }
+ },
+ "models.Warehouse": {
+ "type": "object",
+ "required": [
+ "code"
+ ],
+ "properties": {
+ "active": {
+ "description": "鏄惁鍚敤锛屼紶true灏辫",
+ "type": "boolean"
+ },
+ "buyToResupply": {
+ "description": "鏄惁璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
+ "type": "boolean"
+ },
+ "code": {
+ "description": "浠撳簱缂栫爜",
+ "type": "string",
+ "maxLength": 5,
+ "minLength": 1
+ },
+ "company": {
+ "$ref": "#/definitions/models.Company"
+ },
+ "companyId": {
+ "type": "integer"
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "浠撳簱鍚嶇О",
+ "type": "string"
+ },
+ "partnerId": {
+ "description": "鍚堜綔浼欎即id",
+ "type": "integer"
+ },
+ "resupplyWh": {
+ "description": "琛ョ粰鏉ユ簮浠撳簱",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Warehouse"
+ }
+ },
+ "resupplyWhIds": {
+ "description": "琛ョ粰鏉ユ簮浠撳簱ID",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "updateTime": {
+ "type": "string"
+ }
+ }
+ },
+ "request.AddCompany": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "description": "鍏徃鍚嶇О",
+ "type": "string"
+ }
+ }
+ },
"request.AddDepartment": {
"type": "object",
"properties": {
@@ -207,6 +911,127 @@
},
"remark": {
"description": "澶囨敞",
+ "type": "string"
+ }
+ }
+ },
+ "request.AddOperationType": {
+ "type": "object",
+ "properties": {
+ "ReservationDaysBeforePriority": {
+ "description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ",
+ "type": "integer"
+ },
+ "baseOperationType": {
+ "description": "鍩虹浣滀笟绫诲瀷",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.BaseOperationType"
+ }
+ ]
+ },
+ "companyId": {
+ "description": "鍏徃id",
+ "type": "integer"
+ },
+ "createBackorder": {
+ "description": "鍒涘缓娆犲崟",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.WhetherType"
+ }
+ ]
+ },
+ "defaultLocationDestId": {
+ "description": "榛樿鐩爣浣嶇疆id",
+ "type": "integer"
+ },
+ "defaultLocationSrcId": {
+ "description": "榛樿婧愪綅缃甶d",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "浠撳簱鍚嶇О",
+ "type": "string"
+ },
+ "printLabel": {
+ "description": "鏄惁鎵撳嵃鏍囩",
+ "type": "boolean"
+ },
+ "reservationDaysBefore": {
+ "description": "鏀惰揣鍓嶅嚑澶�",
+ "type": "integer"
+ },
+ "reservationMethod": {
+ "description": "淇濈暀鏂瑰紡",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.ReservationMethod"
+ }
+ ]
+ },
+ "returnOperationTypeID": {
+ "description": "閫�璐х被鍨婭D",
+ "type": "integer"
+ },
+ "showOperations": {
+ "description": "鏄剧ず浣滀笟璇︽儏",
+ "type": "boolean"
+ },
+ "warehouseId": {
+ "description": "浠撳簱id",
+ "type": "integer"
+ }
+ }
+ },
+ "request.AddWarehouse": {
+ "type": "object",
+ "required": [
+ "code"
+ ],
+ "properties": {
+ "active": {
+ "description": "鏄惁鍚敤锛屼紶true灏辫",
+ "type": "boolean"
+ },
+ "buyToResupply": {
+ "description": "璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
+ "type": "boolean"
+ },
+ "code": {
+ "description": "浠撳簱缂栫爜",
+ "type": "string",
+ "maxLength": 5,
+ "minLength": 1
+ },
+ "name": {
+ "description": "浠撳簱鍚嶇О",
+ "type": "string"
+ },
+ "partnerId": {
+ "description": "鍚堜綔浼欎即id",
+ "type": "integer"
+ },
+ "resupplyWhIds": {
+ "description": "琛ョ粰鏉ユ簮浠撳簱ID",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ }
+ }
+ },
+ "request.UpdateCompany": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "鍏徃鍚嶇О",
"type": "string"
}
}
@@ -235,6 +1060,118 @@
}
}
},
+ "request.UpdateOperationType": {
+ "type": "object",
+ "properties": {
+ "ReservationDaysBeforePriority": {
+ "description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ",
+ "type": "integer"
+ },
+ "baseOperationType": {
+ "description": "鍩虹浣滀笟绫诲瀷",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.BaseOperationType"
+ }
+ ]
+ },
+ "companyId": {
+ "description": "鍏徃id",
+ "type": "integer"
+ },
+ "createBackorder": {
+ "description": "鍒涘缓娆犲崟",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.WhetherType"
+ }
+ ]
+ },
+ "defaultLocationDestId": {
+ "description": "榛樿鐩爣浣嶇疆id",
+ "type": "integer"
+ },
+ "defaultLocationSrcId": {
+ "description": "榛樿婧愪綅缃甶d",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "浠撳簱鍚嶇О",
+ "type": "string"
+ },
+ "printLabel": {
+ "description": "鏄惁鎵撳嵃鏍囩",
+ "type": "boolean"
+ },
+ "reservationDaysBefore": {
+ "description": "鏀惰揣鍓嶅嚑澶�",
+ "type": "integer"
+ },
+ "reservationMethod": {
+ "description": "淇濈暀鏂瑰紡",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.ReservationMethod"
+ }
+ ]
+ },
+ "returnOperationTypeID": {
+ "description": "閫�璐х被鍨婭D",
+ "type": "integer"
+ },
+ "showOperations": {
+ "description": "鏄剧ず浣滀笟璇︽儏",
+ "type": "boolean"
+ },
+ "warehouseId": {
+ "description": "浠撳簱id",
+ "type": "integer"
+ }
+ }
+ },
+ "request.UpdateWarehouse": {
+ "type": "object",
+ "required": [
+ "code"
+ ],
+ "properties": {
+ "active": {
+ "description": "鏄惁鍚敤锛屼紶true灏辫",
+ "type": "boolean"
+ },
+ "buyToResupply": {
+ "description": "璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�",
+ "type": "boolean"
+ },
+ "code": {
+ "description": "浠撳簱缂栫爜",
+ "type": "string",
+ "maxLength": 5,
+ "minLength": 1
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "浠撳簱鍚嶇О",
+ "type": "string"
+ },
+ "partnerId": {
+ "description": "鍚堜綔浼欎即id",
+ "type": "integer"
+ },
+ "resupplyWhIds": {
+ "description": "琛ョ粰鏉ユ簮浠撳簱ID",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ }
+ }
+ },
"util.Response": {
"type": "object",
"properties": {
--
Gitblit v1.8.0