From a8914a16b23e93f6bfd12bcfd5cbe8b24cf7eb84 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 07 四月 2024 21:49:01 +0800
Subject: [PATCH] 发货支持仓库传参
---
docs/docs.go | 389 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 373 insertions(+), 16 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index b18d3bc..07d8fc6 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1097,6 +1097,25 @@
}
}
},
+ "/api-wms/v1/operation/getClientList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鍏ュ簱/鍑哄簱"
+ ],
+ "summary": "鑾峰彇鐗╂祦鍏徃鍒楄〃",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/operation/getLogisticCompanyList": {
"get": {
"produces": [
@@ -1131,6 +1150,53 @@
}
}
},
+ "/api-wms/v1/operation/getOperationInfo/{id}": {
+ "get": {
+ "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/operation/getSupplierList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鍏ュ簱/鍑哄簱"
+ ],
+ "summary": "鑾峰彇鐗╂祦鍏徃鍒楄〃",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/operation/list": {
"post": {
"produces": [
@@ -1148,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"
}
}
],
@@ -1230,6 +1326,34 @@
"鍏ュ簱/鍑哄簱"
],
"summary": "鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/operation/outputOperation/{id}": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鍏ュ簱/鍑哄簱"
+ ],
+ "summary": "鎵撳嵃",
"parameters": [
{
"type": "integer",
@@ -1797,6 +1921,72 @@
"items": {
"$ref": "#/definitions/models.Material"
}
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/product/getUnitInfo": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "鑾峰彇鍗曚綅淇℃伅",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.UnitDict"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/product/getUserInfo": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "object",
+ "additionalProperties": true
}
}
}
@@ -2624,12 +2814,26 @@
"enum": [
"鍘熸潗鏂�",
"鍗婃垚鍝�",
- "鎴愬搧"
+ "鎴愬搧",
+ "杈呮枡",
+ "鑰楁潗",
+ "鍏朵粬",
+ "铏氭嫙浠�"
],
+ "x-enum-comments": {
+ "MaterialModeAuxiliary": "杈呮枡",
+ "MaterialModeConsumables": "鑰楁潗",
+ "MaterialModeOther": "鍏朵粬",
+ "MaterialModeVirtual": "铏氭嫙浠�, 涓嶈兘閿�鍞紝涓嶈兘鍑哄叆搴擄紝涓嶈兘閲囪喘"
+ },
"x-enum-varnames": [
"MaterialModeRaw",
"MaterialModeSemi",
- "MaterialModeFinished"
+ "MaterialModeFinished",
+ "MaterialModeAuxiliary",
+ "MaterialModeConsumables",
+ "MaterialModeOther",
+ "MaterialModeVirtual"
]
},
"constvar.OperationStatus": {
@@ -2642,7 +2846,7 @@
5
],
"x-enum-comments": {
- "OperationStatus_Cancel": "瀹屾垚",
+ "OperationStatus_Cancel": "鍙栨秷",
"OperationStatus_Draft": "鑽夌",
"OperationStatus_Finish": "瀹屾垚",
"OperationStatus_Ready": "灏辩华",
@@ -2955,6 +3159,7 @@
"type": "number"
},
"attachmentIDs": {
+ "description": "浠ヤ笅涓轰笉瀛樺簱鐨勫瓧娈�",
"type": "array",
"items": {
"type": "integer"
@@ -3059,6 +3264,14 @@
"description": "鏄惁閿�鍞�",
"type": "boolean"
},
+ "isStorage": {
+ "description": "鏃犲簱瀛樼殑鍦╳ms浠ュ強srm涓渶瑕佽繃婊ゆ帀",
+ "type": "integer"
+ },
+ "isVirtual": {
+ "description": "铏氭嫙鐗╂枡鍦∕RP璁＄畻鏃惰烦杩囪灞傜骇鐩存帴棰嗙敤涓嬬骇鐗╂枡锛岃櫄鎷熺墿鏂欎笉鐢熸垚宸ュ崟",
+ "type": "integer"
+ },
"makeAdvanceTime": {
"description": "鍒堕�犲墠缃椂闂�(澶�)",
"type": "number"
@@ -3147,6 +3360,12 @@
"purchaseType": {
"$ref": "#/definitions/constvar.PurchaseType"
},
+ "purchaseTypeList": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
"reorderRuleNum": {
"type": "integer"
},
@@ -3193,6 +3412,9 @@
"models.Operation": {
"type": "object",
"properties": {
+ "auditDate": {
+ "type": "string"
+ },
"baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
@@ -3225,7 +3447,10 @@
"$ref": "#/definitions/models.OperationDetails"
}
},
- "fromLocation": {
+ "id": {
+ "type": "integer"
+ },
+ "location": {
"description": "婧愪綅缃�",
"allOf": [
{
@@ -3233,11 +3458,8 @@
}
]
},
- "fromLocationId": {
+ "locationID": {
"description": "婧愪綅缃甶d",
- "type": "integer"
- },
- "id": {
"type": "integer"
},
"logisticCompany": {
@@ -3255,6 +3477,7 @@
"type": "string"
},
"operationDate": {
+ "description": "FromLocationID int ` + "`" + `json:\"fromLocationId\" gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` + "`" + ` //婧愪綅缃甶d\nFromLocation Location ` + "`" + `json:\"fromLocation\" gorm:\"foreignKey:FromLocationID;references:Id\"` + "`" + ` //婧愪綅缃甛nToLocationID int ` + "`" + `json:\"toLocationId\" gorm:\"type:int;not null;comment:鐩爣浣嶇疆id\"` + "`" + ` //鐩爣浣嶇疆id\nToLocation Location ` + "`" + `json:\"toLocation\" gorm:\"foreignKey:ToLocationID;references:Id\"` + "`" + ` //鐩爣浣嶇疆",
"type": "string"
},
"operationTypeId": {
@@ -3263,6 +3486,18 @@
},
"operationTypeName": {
"description": "浣滀笟绫诲瀷鍚嶇О",
+ "type": "string"
+ },
+ "receiverAddr": {
+ "type": "string"
+ },
+ "receiverName": {
+ "type": "string"
+ },
+ "receiverPhone": {
+ "type": "string"
+ },
+ "source": {
"type": "string"
},
"sourceNumber": {
@@ -3312,6 +3547,18 @@
"createTime": {
"type": "string"
},
+ "fromLocation": {
+ "description": "婧愪綅缃�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Location"
+ }
+ ]
+ },
+ "fromLocationId": {
+ "description": "婧愪綅缃甶d",
+ "type": "integer"
+ },
"id": {
"type": "integer"
},
@@ -3331,6 +3578,18 @@
"description": "浜у搧id",
"type": "string"
},
+ "toLocation": {
+ "description": "鐩爣浣嶇疆",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Location"
+ }
+ ]
+ },
+ "toLocationId": {
+ "description": "鐩爣浣嶇疆id",
+ "type": "integer"
+ },
"updateTime": {
"type": "string"
}
@@ -3346,6 +3605,9 @@
"$ref": "#/definitions/constvar.CostingMethod"
}
]
+ },
+ "createTime": {
+ "type": "string"
},
"forceRemovalStrategy": {
"description": "寮哄埗涓嬫灦绛栫暐",
@@ -3380,6 +3642,9 @@
},
"routeName": {
"description": "鍏徃",
+ "type": "string"
+ },
+ "updateTime": {
"type": "string"
}
}
@@ -3444,6 +3709,20 @@
}
}
},
+ "models.UnitDict": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "isDefault": {
+ "type": "boolean"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
+ },
"models.Warehouse": {
"type": "object",
"required": [
@@ -3473,6 +3752,10 @@
},
"companyId": {
"type": "integer"
+ },
+ "contacts": {
+ "description": "鑱旂郴浜�",
+ "type": "string"
},
"createTime": {
"type": "string"
@@ -3563,6 +3846,10 @@
"fromLocationId": {
"type": "integer"
},
+ "number": {
+ "description": "Unit string ` + "`" + `json:\"unit\"` + "`" + `",
+ "type": "string"
+ },
"productId": {
"type": "string"
},
@@ -3632,11 +3919,11 @@
"$ref": "#/definitions/request.OperationDetails"
}
},
- "fromLocationId": {
- "description": "婧愪綅缃甶d",
+ "id": {
"type": "integer"
},
- "id": {
+ "locationId": {
+ "description": "婧愪綅缃甶d",
"type": "integer"
},
"logisticCompanyId": {
@@ -3651,7 +3938,7 @@
"type": "string"
},
"operationDate": {
- "description": "瀹夋帓鏃ユ湡",
+ "description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` + "`" + ` //婧愪綅缃甶d\nToLocationId int ` + "`" + `json:\"toLocationId\" gorm:\"type:int;not null;comment:鐩爣浣嶇疆id\"` + "`" + ` //鐩爣浣嶇疆id",
"type": "string"
},
"operationTypeId": {
@@ -3660,6 +3947,15 @@
},
"operationTypeName": {
"description": "浣滀笟绫诲瀷鍚嶇О",
+ "type": "string"
+ },
+ "receiverAddr": {
+ "type": "string"
+ },
+ "receiverName": {
+ "type": "string"
+ },
+ "receiverPhone": {
"type": "string"
},
"sourceNumber": {
@@ -3787,6 +4083,10 @@
"type": "string",
"maxLength": 5,
"minLength": 1
+ },
+ "contacts": {
+ "description": "鑱旂郴浜�",
+ "type": "string"
},
"inboundTransportation": {
"description": "鍏ュ悜杩愯緭",
@@ -4039,6 +4339,22 @@
}
}
},
+ "request.OperationCondition": {
+ "type": "object",
+ "properties": {
+ "condition": {
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ }
+ }
+ },
"request.OperationDetails": {
"type": "object",
"properties": {
@@ -4050,9 +4366,17 @@
"description": "ProductName string ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` + "`" + ` //浜у搧鍚嶇О",
"type": "number"
},
+ "fromLocationId": {
+ "description": "Unit string ` + "`" + `json:\"unit\" gorm:\"type:varchar(31);comment:鍗曚綅\"` + "`" + ` //鍗曚綅\nProduct models.Material ` + "`" + `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"` + "`" + `",
+ "type": "integer"
+ },
"productId": {
"description": "浜у搧id",
"type": "string"
+ },
+ "toLocationId": {
+ "description": "鐩爣浣嶇疆id",
+ "type": "integer"
}
}
},
@@ -4315,11 +4639,11 @@
"$ref": "#/definitions/request.OperationDetails"
}
},
- "fromLocationId": {
- "description": "婧愪綅缃甶d",
+ "id": {
"type": "integer"
},
- "id": {
+ "locationId": {
+ "description": "婧愪綅缃甶d",
"type": "integer"
},
"logisticCompanyId": {
@@ -4334,7 +4658,7 @@
"type": "string"
},
"operationDate": {
- "description": "瀹夋帓鏃ユ湡",
+ "description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` + "`" + ` //婧愪綅缃甶d\nToLocationId int ` + "`" + `json:\"toLocationId\" gorm:\"type:int;not null;comment:鐩爣浣嶇疆id\"` + "`" + ` //鐩爣浣嶇疆id",
"type": "string"
},
"operationTypeId": {
@@ -4343,6 +4667,15 @@
},
"operationTypeName": {
"description": "浣滀笟绫诲瀷鍚嶇О",
+ "type": "string"
+ },
+ "receiverAddr": {
+ "type": "string"
+ },
+ "receiverName": {
+ "type": "string"
+ },
+ "receiverPhone": {
"type": "string"
},
"sourceNumber": {
@@ -4519,8 +4852,21 @@
"description": "婧愪綅缃�",
"type": "string"
},
+ "fromLocationId": {
+ "type": "integer"
+ },
"number": {
"description": "鍗曞彿",
+ "type": "string"
+ },
+ "operationId": {
+ "type": "integer"
+ },
+ "operationTypeName": {
+ "description": "浣滀笟绫诲瀷鍚嶇О",
+ "type": "string"
+ },
+ "productId": {
"type": "string"
},
"productName": {
@@ -4535,9 +4881,16 @@
"description": "鐩爣浣嶇疆",
"type": "string"
},
+ "toLocationId": {
+ "type": "integer"
+ },
"unit": {
"description": "鍗曚綅",
"type": "string"
+ },
+ "weight": {
+ "description": "閲嶉噺",
+ "type": "number"
}
}
},
@@ -4548,6 +4901,10 @@
"description": "鏁伴噺",
"type": "number"
},
+ "locationId": {
+ "description": "浣嶇疆id",
+ "type": "integer"
+ },
"locationName": {
"description": "浣嶇疆鍚嶇О",
"type": "string"
--
Gitblit v1.8.0