From a6f82a1a1cbb4a3dfde004cf29b91c9b4c7da7c3 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期二, 19 九月 2023 19:57:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
docs/docs.go | 747 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 717 insertions(+), 30 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 5efc844..6d2848c 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -294,7 +294,214 @@
}
}
},
- "/api-wms/v1/warehouse/jobType": {
+ "/api-wms/v1/operation/operation": {
+ "get": {
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鍏ュ簱/鍑哄簱"
+ ],
+ "summary": "鍏ュ簱/鍑哄簱鍒楄〃",
+ "parameters": [
+ {
+ "type": "integer",
+ "name": "operationTypeId",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ },
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鍏ュ簱/鍑哄簱"
+ ],
+ "summary": "娣诲姞鍏ュ簱/鍑哄簱",
+ "parameters": [
+ {
+ "description": "鍏ュ簱/鍑哄簱淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddOperation"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/operation/operation/{id}": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鍏ュ簱/鍑哄簱"
+ ],
+ "summary": "淇敼鍏ュ簱/鍑哄簱淇℃伅",
+ "parameters": [
+ {
+ "description": "鍏ュ簱淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateOperation"
+ }
+ },
+ {
+ "type": "integer",
+ "description": "鍏ュ簱淇℃伅id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ },
+ "delete": {
+ "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/product/addProduct": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "娣诲姞浜у搧",
+ "parameters": [
+ {
+ "description": "浜у搧淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/models.Product"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/product/getProductList": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "鑾峰彇浜у搧璇︽儏",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetProductList"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Product"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/warehouse/operationType": {
"get": {
"produces": [
"application/json"
@@ -336,7 +543,7 @@
"data": {
"type": "array",
"items": {
- "$ref": "#/definitions/models.JobType"
+ "$ref": "#/definitions/models.OperationType"
}
}
}
@@ -361,7 +568,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.AddJobType"
+ "$ref": "#/definitions/request.AddOperationType"
}
}
],
@@ -375,7 +582,7 @@
}
}
},
- "/api-wms/v1/warehouse/jobType/{id}": {
+ "/api-wms/v1/warehouse/operationType/{id}": {
"put": {
"produces": [
"application/json"
@@ -391,7 +598,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.UpdateJobType"
+ "$ref": "#/definitions/request.UpdateOperationType"
}
},
{
@@ -584,7 +791,7 @@
}
},
"definitions": {
- "constvar.BaseJobType": {
+ "constvar.BaseOperationType": {
"type": "integer",
"enum": [
1,
@@ -592,14 +799,128 @@
3
],
"x-enum-comments": {
- "BaseJobTypeIncoming": "鏀惰揣",
- "BaseJobTypeInternal": "鍐呴儴璋冩嫧",
- "BaseJobTypeOutgoing": "浜よ揣"
+ "BaseOperationTypeIncoming": "鏀惰揣",
+ "BaseOperationTypeInternal": "鍐呴儴璋冩嫧",
+ "BaseOperationTypeOutgoing": "浜よ揣"
},
"x-enum-varnames": [
- "BaseJobTypeIncoming",
- "BaseJobTypeOutgoing",
- "BaseJobTypeInternal"
+ "BaseOperationTypeIncoming",
+ "BaseOperationTypeOutgoing",
+ "BaseOperationTypeInternal"
+ ]
+ },
+ "constvar.InvoicingStrategy": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3,
+ 4,
+ 5
+ ],
+ "x-enum-comments": {
+ "BasedDeliverNumber": "鍩轰簬浜や粯鏁伴噺",
+ "DeliverNumber": "浜や粯鏁伴噺",
+ "IndentNumber": "璁㈣喘鏁伴噺",
+ "Milestones": "鍩轰簬閲岀▼纰�",
+ "PrepaidPrice": "棰勪粯\\鍥哄畾浠锋牸"
+ },
+ "x-enum-varnames": [
+ "IndentNumber",
+ "DeliverNumber",
+ "PrepaidPrice",
+ "Milestones",
+ "BasedDeliverNumber"
+ ]
+ },
+ "constvar.LocationType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7
+ ],
+ "x-enum-comments": {
+ "LocationTypeCustomer": "瀹㈡埛浣嶇疆",
+ "LocationTypeInternal": "鍐呴儴浣嶇疆",
+ "LocationTypeInventoryLoss": "搴撳瓨鎹熷け",
+ "LocationTypeProduction": "鐢熶骇",
+ "LocationTypeTransit": "涓浆浣嶇疆",
+ "LocationTypeVendor": "渚涘簲鍟嗕綅缃�",
+ "LocationTypeView": "瑙嗗浘"
+ },
+ "x-enum-varnames": [
+ "LocationTypeVendor",
+ "LocationTypeView",
+ "LocationTypeInternal",
+ "LocationTypeCustomer",
+ "LocationTypeInventoryLoss",
+ "LocationTypeProduction",
+ "LocationTypeTransit"
+ ]
+ },
+ "constvar.OperationStatus": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3,
+ 4
+ ],
+ "x-enum-comments": {
+ "OperationStatus_Draft": "鑽夌",
+ "OperationStatus_Finish": "瀹屾垚",
+ "OperationStatus_Ready": "灏辩华",
+ "OperationStatus_Waiting": "姝ｅ湪绛夊緟"
+ },
+ "x-enum-varnames": [
+ "OperationStatus_Draft",
+ "OperationStatus_Waiting",
+ "OperationStatus_Ready",
+ "OperationStatus_Finish"
+ ]
+ },
+ "constvar.OrderCreation": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3,
+ 4
+ ],
+ "x-enum-comments": {
+ "Nothing": "涓嶆搷浣�",
+ "Object": "椤圭洰",
+ "Task": "浠诲姟",
+ "TaskAndObject": "浠诲姟鍜岄」鐩�"
+ },
+ "x-enum-varnames": [
+ "Nothing",
+ "Task",
+ "Object",
+ "TaskAndObject"
+ ]
+ },
+ "constvar.ProductType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3
+ ],
+ "x-enum-comments": {
+ "Consumables": "娑堣�楀搧",
+ "Server": "鏈嶅姟",
+ "StoredProduct": "鍙偍瀛樼殑浜у搧"
+ },
+ "x-enum-varnames": [
+ "Consumables",
+ "Server",
+ "StoredProduct"
]
},
"constvar.ReservationMethod": {
@@ -694,18 +1015,76 @@
}
}
},
- "models.JobType": {
+ "models.Location": {
+ "type": "object",
+ "properties": {
+ "company": {
+ "description": "鍏徃",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Company"
+ }
+ ]
+ },
+ "companyId": {
+ "description": "鍏徃id",
+ "type": "integer"
+ },
+ "countFrequency": {
+ "description": "鐩樼偣棰戠巼锛堝ぉ锛�",
+ "type": "integer"
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "isReturnLocation": {
+ "description": "鏄惁閫�璐т綅缃�",
+ "type": "boolean"
+ },
+ "isScrapLocation": {
+ "description": "鏄惁鎶ュ簾浣嶇疆",
+ "type": "boolean"
+ },
+ "name": {
+ "description": "浣嶇疆鍚嶇О",
+ "type": "string"
+ },
+ "parentId": {
+ "description": "涓婄骇id",
+ "type": "integer"
+ },
+ "replenishLocation": {
+ "description": "鏄惁琛ュ厖浣嶇疆",
+ "type": "boolean"
+ },
+ "type": {
+ "description": "浣嶇疆绫诲瀷",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.LocationType"
+ }
+ ]
+ },
+ "updateTime": {
+ "type": "string"
+ }
+ }
+ },
+ "models.OperationType": {
"type": "object",
"properties": {
"ReservationDaysBeforePriority": {
"description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ",
"type": "integer"
},
- "baseJobType": {
+ "baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
{
- "$ref": "#/definitions/constvar.BaseJobType"
+ "$ref": "#/definitions/constvar.BaseOperationType"
}
]
},
@@ -779,11 +1158,11 @@
}
]
},
- "returnJobType": {
+ "returnOperationType": {
"description": "閫�璐х被鍨嬪悕绉�",
"type": "string"
},
- "returnJobTypeID": {
+ "returnOperationTypeID": {
"description": "閫�璐х被鍨婭D",
"type": "integer"
},
@@ -808,21 +1187,150 @@
}
}
},
- "models.Location": {
+ "models.Product": {
"type": "object",
"properties": {
+ "HSCode": {
+ "type": "string"
+ },
+ "barcode": {
+ "description": "鏉＄爜",
+ "type": "string"
+ },
+ "buyExplain": {
+ "type": "string"
+ },
+ "canBePurchased": {
+ "description": "鏄惁鍙噰璐�",
+ "type": "boolean"
+ },
+ "canBeSell": {
+ "description": "鏄惁閿�鍞�",
+ "type": "boolean"
+ },
+ "categoryId": {
+ "description": "浜у搧鍒嗙被id",
+ "type": "integer"
+ },
+ "companyId": {
+ "type": "integer"
+ },
+ "companyName": {
+ "type": "string"
+ },
+ "controlStrategy": {
+ "$ref": "#/definitions/constvar.InvoicingStrategy"
+ },
+ "cost": {
+ "description": "鎴愭湰",
+ "type": "number"
+ },
"createTime": {
"type": "string"
+ },
+ "currencyId": {
+ "type": "integer"
+ },
+ "currencyName": {
+ "type": "string"
+ },
+ "customerAdvanceTime": {
+ "type": "number"
+ },
+ "customerTaxes": {
+ "description": "瀹㈡埛绋庣櫨鍒嗘瘮",
+ "type": "number"
+ },
+ "deliveryAdvanceTime": {
+ "type": "number"
},
"id": {
"type": "integer"
},
- "name": {
- "description": "浣嶇疆鍚嶇О",
+ "inStorageExplain": {
"type": "string"
+ },
+ "internalNotes": {
+ "description": "鍐呴儴璇存槑",
+ "type": "string"
+ },
+ "internalReference": {
+ "description": "鍐呴儴鍙傝��",
+ "type": "string"
+ },
+ "internalTransferExplain": {
+ "type": "string"
+ },
+ "invoicingStrategy": {
+ "$ref": "#/definitions/constvar.InvoicingStrategy"
+ },
+ "name": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "objectTemplateId": {
+ "type": "string"
+ },
+ "orderCreation": {
+ "$ref": "#/definitions/constvar.OrderCreation"
+ },
+ "originCountryId": {
+ "type": "integer"
+ },
+ "originCountryName": {
+ "type": "string"
+ },
+ "outStorageExplain": {
+ "type": "string"
+ },
+ "price": {
+ "type": "number"
+ },
+ "principal": {
+ "description": "璐熻矗浜�",
+ "type": "string"
+ },
+ "productTagId": {
+ "description": "浜у搧鏍囩",
+ "type": "integer"
+ },
+ "productTagName": {
+ "type": "string"
+ },
+ "salePrice": {
+ "description": "閿�鍞环鏍�",
+ "type": "number"
+ },
+ "selectProduct": {
+ "type": "integer"
+ },
+ "sellExplain": {
+ "type": "string"
+ },
+ "supplierId": {
+ "type": "integer"
+ },
+ "supplierName": {
+ "type": "string"
+ },
+ "type": {
+ "description": "浜у搧绫诲瀷",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.ProductType"
+ }
+ ]
},
"updateTime": {
"type": "string"
+ },
+ "volume": {
+ "description": "浣撶Н",
+ "type": "number"
+ },
+ "weight": {
+ "description": "閲嶉噺",
+ "type": "number"
}
}
},
@@ -915,18 +1423,90 @@
}
}
},
- "request.AddJobType": {
+ "request.AddOperation": {
+ "type": "object",
+ "properties": {
+ "carrierID": {
+ "type": "integer"
+ },
+ "carrierName": {
+ "type": "string"
+ },
+ "companyID": {
+ "type": "integer"
+ },
+ "companyName": {
+ "type": "string"
+ },
+ "contacterID": {
+ "type": "integer"
+ },
+ "contacterName": {
+ "type": "string"
+ },
+ "details": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/request.OperationDetails"
+ }
+ },
+ "fromLocationId": {
+ "description": "婧愪綅缃甶d",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "number": {
+ "description": "鍗曞彿",
+ "type": "string"
+ },
+ "operationDate": {
+ "type": "string"
+ },
+ "operationTypeId": {
+ "description": "浣滀笟绫诲瀷id",
+ "type": "integer"
+ },
+ "sourceNumber": {
+ "description": "婧愬崟鍙�",
+ "type": "string"
+ },
+ "status": {
+ "description": "鐘舵��",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.OperationStatus"
+ }
+ ]
+ },
+ "toLocationId": {
+ "description": "鐩爣浣嶇疆id",
+ "type": "integer"
+ },
+ "tracking": {
+ "type": "string"
+ },
+ "transferWeight": {
+ "type": "number"
+ },
+ "weight": {
+ "type": "number"
+ }
+ }
+ },
+ "request.AddOperationType": {
"type": "object",
"properties": {
"ReservationDaysBeforePriority": {
"description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ",
"type": "integer"
},
- "baseJobType": {
+ "baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
{
- "$ref": "#/definitions/constvar.BaseJobType"
+ "$ref": "#/definitions/constvar.BaseOperationType"
}
]
},
@@ -973,7 +1553,7 @@
}
]
},
- "returnJobTypeID": {
+ "returnOperationTypeID": {
"description": "閫�璐х被鍨婭D",
"type": "integer"
},
@@ -1024,6 +1604,43 @@
}
}
},
+ "request.GetProductList": {
+ "type": "object",
+ "properties": {
+ "keyWord": {
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ }
+ }
+ },
+ "request.OperationDetails": {
+ "type": "object",
+ "properties": {
+ "finishQuantity": {
+ "description": "瀹屾垚鏁伴噺",
+ "type": "number"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "integer"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "quantity": {
+ "description": "鏁伴噺",
+ "type": "number"
+ }
+ }
+ },
"request.UpdateCompany": {
"type": "object",
"properties": {
@@ -1060,18 +1677,90 @@
}
}
},
- "request.UpdateJobType": {
+ "request.UpdateOperation": {
+ "type": "object",
+ "properties": {
+ "carrierID": {
+ "type": "integer"
+ },
+ "carrierName": {
+ "type": "string"
+ },
+ "companyID": {
+ "type": "integer"
+ },
+ "companyName": {
+ "type": "string"
+ },
+ "contacterID": {
+ "type": "integer"
+ },
+ "contacterName": {
+ "type": "string"
+ },
+ "details": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/request.OperationDetails"
+ }
+ },
+ "fromLocationId": {
+ "description": "婧愪綅缃甶d",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "number": {
+ "description": "鍗曞彿",
+ "type": "string"
+ },
+ "operationDate": {
+ "type": "string"
+ },
+ "operationTypeId": {
+ "description": "浣滀笟绫诲瀷id",
+ "type": "integer"
+ },
+ "sourceNumber": {
+ "description": "婧愬崟鍙�",
+ "type": "string"
+ },
+ "status": {
+ "description": "鐘舵��",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.OperationStatus"
+ }
+ ]
+ },
+ "toLocationId": {
+ "description": "鐩爣浣嶇疆id",
+ "type": "integer"
+ },
+ "tracking": {
+ "type": "string"
+ },
+ "transferWeight": {
+ "type": "number"
+ },
+ "weight": {
+ "type": "number"
+ }
+ }
+ },
+ "request.UpdateOperationType": {
"type": "object",
"properties": {
"ReservationDaysBeforePriority": {
"description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ",
"type": "integer"
},
- "baseJobType": {
+ "baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
{
- "$ref": "#/definitions/constvar.BaseJobType"
+ "$ref": "#/definitions/constvar.BaseOperationType"
}
]
},
@@ -1118,7 +1807,7 @@
}
]
},
- "returnJobTypeID": {
+ "returnOperationTypeID": {
"description": "閫�璐х被鍨婭D",
"type": "integer"
},
@@ -1218,8 +1907,6 @@
Description: "",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
- LeftDelim: "{{",
- RightDelim: "}}",
}
func init() {
--
Gitblit v1.8.0