From 9fc5f95185830ce06583d4dca19a909cb40148e8 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 28 十二月 2023 16:39:26 +0800
Subject: [PATCH] operation list preload bug
---
docs/swagger.json | 364 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 328 insertions(+), 36 deletions(-)
diff --git a/docs/swagger.json b/docs/swagger.json
index fb080eb..261625a 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -1085,6 +1085,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": [
@@ -1119,6 +1138,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": [
@@ -1136,6 +1202,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"
}
}
],
@@ -1218,6 +1314,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",
@@ -2155,6 +2279,36 @@
}
}
},
+ "/api-wms/v1/reorderRule/submitOrder": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "閲嶈璐ц鍒�"
+ ],
+ "summary": "鍐嶈涓�娆�",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/models.ReorderRule"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/reorderRule/updateReorderRule": {
"post": {
"produces": [
@@ -2582,12 +2736,26 @@
"enum": [
"鍘熸潗鏂�",
"鍗婃垚鍝�",
- "鎴愬搧"
+ "鎴愬搧",
+ "杈呮枡",
+ "鑰楁潗",
+ "鍏朵粬",
+ "铏氭嫙浠�"
],
+ "x-enum-comments": {
+ "MaterialModeAuxiliary": "杈呮枡",
+ "MaterialModeConsumables": "鑰楁潗",
+ "MaterialModeOther": "鍏朵粬",
+ "MaterialModeVirtual": "铏氭嫙浠�, 涓嶈兘閿�鍞紝涓嶈兘鍑哄叆搴擄紝涓嶈兘閲囪喘"
+ },
"x-enum-varnames": [
"MaterialModeRaw",
"MaterialModeSemi",
- "MaterialModeFinished"
+ "MaterialModeFinished",
+ "MaterialModeAuxiliary",
+ "MaterialModeConsumables",
+ "MaterialModeOther",
+ "MaterialModeVirtual"
]
},
"constvar.OperationStatus": {
@@ -2600,7 +2768,7 @@
5
],
"x-enum-comments": {
- "OperationStatus_Cancel": "瀹屾垚",
+ "OperationStatus_Cancel": "鍙栨秷",
"OperationStatus_Draft": "鑽夌",
"OperationStatus_Finish": "瀹屾垚",
"OperationStatus_Ready": "灏辩华",
@@ -2990,6 +3158,9 @@
"description": "HSCode string `gorm:\"type:varchar(255);comment:HS缂栫爜\" json:\"HSCode\"` //HS缂栫爜\nOriginCountryId int `gorm:\"type:int(11);comment:鍘熶骇鍦癷d\" json:\"originCountryId\"` //鍘熶骇鍦癷d\nOriginCountryName string `gorm:\"type:varchar(255);comment:鍘熶骇鍦板悕绉癨" json:\"originCountryName\"` //鍘熶骇鍦板悕绉�",
"type": "string"
},
+ "inputAmount": {
+ "type": "number"
+ },
"internalNotes": {
"description": "鍐呴儴璇存槑",
"type": "string"
@@ -3022,7 +3193,15 @@
"description": "鏈�澶у簱瀛�",
"type": "number"
},
+ "maxInventoryRule": {
+ "description": "鏈�澶у簱瀛�",
+ "type": "number"
+ },
"minInventory": {
+ "description": "鏈�灏忓簱瀛�",
+ "type": "number"
+ },
+ "minInventoryRule": {
"description": "鏈�灏忓簱瀛�",
"type": "number"
},
@@ -3061,6 +3240,12 @@
"description": "鍑哄簱璇存槑",
"type": "string"
},
+ "outputAmount": {
+ "type": "number"
+ },
+ "predictionAmount": {
+ "type": "number"
+ },
"principal": {
"description": "璐熻矗浜�",
"type": "string"
@@ -3087,6 +3272,9 @@
},
"purchaseType": {
"$ref": "#/definitions/constvar.PurchaseType"
+ },
+ "reorderRuleNum": {
+ "type": "integer"
},
"salePrice": {
"description": "閿�鍞崟浠�",
@@ -3131,6 +3319,9 @@
"models.Operation": {
"type": "object",
"properties": {
+ "auditDate": {
+ "type": "string"
+ },
"baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
@@ -3163,7 +3354,10 @@
"$ref": "#/definitions/models.OperationDetails"
}
},
- "fromLocation": {
+ "id": {
+ "type": "integer"
+ },
+ "location": {
"description": "婧愪綅缃�",
"allOf": [
{
@@ -3171,11 +3365,8 @@
}
]
},
- "fromLocationId": {
+ "locationID": {
"description": "婧愪綅缃甶d",
- "type": "integer"
- },
- "id": {
"type": "integer"
},
"logisticCompany": {
@@ -3193,6 +3384,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": {
@@ -3201,6 +3393,18 @@
},
"operationTypeName": {
"description": "浣滀笟绫诲瀷鍚嶇О",
+ "type": "string"
+ },
+ "receiverAddr": {
+ "type": "string"
+ },
+ "receiverName": {
+ "type": "string"
+ },
+ "receiverPhone": {
+ "type": "string"
+ },
+ "source": {
"type": "string"
},
"sourceNumber": {
@@ -3214,18 +3418,6 @@
"$ref": "#/definitions/constvar.OperationStatus"
}
]
- },
- "toLocation": {
- "description": "鐩爣浣嶇疆",
- "allOf": [
- {
- "$ref": "#/definitions/models.Location"
- }
- ]
- },
- "toLocationId": {
- "description": "鐩爣浣嶇疆id",
- "type": "integer"
},
"updateTime": {
"type": "string"
@@ -3250,6 +3442,18 @@
"createTime": {
"type": "string"
},
+ "fromLocation": {
+ "description": "婧愪綅缃�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Location"
+ }
+ ]
+ },
+ "fromLocationId": {
+ "description": "婧愪綅缃甶d",
+ "type": "integer"
+ },
"id": {
"type": "integer"
},
@@ -3269,6 +3473,18 @@
"description": "浜у搧id",
"type": "string"
},
+ "toLocation": {
+ "description": "鐩爣浣嶇疆",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Location"
+ }
+ ]
+ },
+ "toLocationId": {
+ "description": "鐩爣浣嶇疆id",
+ "type": "integer"
+ },
"updateTime": {
"type": "string"
}
@@ -3284,6 +3500,9 @@
"$ref": "#/definitions/constvar.CostingMethod"
}
]
+ },
+ "createTime": {
+ "type": "string"
},
"forceRemovalStrategy": {
"description": "寮哄埗涓嬫灦绛栫暐",
@@ -3318,6 +3537,9 @@
},
"routeName": {
"description": "鍏徃",
+ "type": "string"
+ },
+ "updateTime": {
"type": "string"
}
}
@@ -3368,6 +3590,10 @@
"route": {
"description": "璺嚎",
"type": "string"
+ },
+ "supplierId": {
+ "description": "渚涘簲鍟唅d",
+ "type": "integer"
},
"unit": {
"description": "鍗曚綅",
@@ -3497,6 +3723,10 @@
"fromLocationId": {
"type": "integer"
},
+ "number": {
+ "description": "Unit string `json:\"unit\"`",
+ "type": "string"
+ },
"productId": {
"type": "string"
},
@@ -3566,11 +3796,11 @@
"$ref": "#/definitions/request.OperationDetails"
}
},
- "fromLocationId": {
- "description": "婧愪綅缃甶d",
+ "id": {
"type": "integer"
},
- "id": {
+ "locationId": {
+ "description": "婧愪綅缃甶d",
"type": "integer"
},
"logisticCompanyId": {
@@ -3585,7 +3815,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": {
@@ -3594,6 +3824,15 @@
},
"operationTypeName": {
"description": "浣滀笟绫诲瀷鍚嶇О",
+ "type": "string"
+ },
+ "receiverAddr": {
+ "type": "string"
+ },
+ "receiverName": {
+ "type": "string"
+ },
+ "receiverPhone": {
"type": "string"
},
"sourceNumber": {
@@ -3607,10 +3846,6 @@
"$ref": "#/definitions/constvar.OperationStatus"
}
]
- },
- "toLocationId": {
- "description": "鐩爣浣嶇疆id",
- "type": "integer"
},
"waybillNumber": {
"description": "杩愬崟鍙�",
@@ -3872,6 +4107,10 @@
"request.GetLocationList": {
"type": "object",
"properties": {
+ "isScrapLocation": {
+ "description": "鏄惁鎶ュ簾",
+ "type": "boolean"
+ },
"jointName": {
"description": "鎷兼帴鍚嶇О",
"type": "string"
@@ -3969,6 +4208,22 @@
}
}
},
+ "request.OperationCondition": {
+ "type": "object",
+ "properties": {
+ "condition": {
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ }
+ }
+ },
"request.OperationDetails": {
"type": "object",
"properties": {
@@ -3980,9 +4235,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"
}
}
},
@@ -4245,11 +4508,11 @@
"$ref": "#/definitions/request.OperationDetails"
}
},
- "fromLocationId": {
- "description": "婧愪綅缃甶d",
+ "id": {
"type": "integer"
},
- "id": {
+ "locationId": {
+ "description": "婧愪綅缃甶d",
"type": "integer"
},
"logisticCompanyId": {
@@ -4264,7 +4527,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": {
@@ -4273,6 +4536,15 @@
},
"operationTypeName": {
"description": "浣滀笟绫诲瀷鍚嶇О",
+ "type": "string"
+ },
+ "receiverAddr": {
+ "type": "string"
+ },
+ "receiverName": {
+ "type": "string"
+ },
+ "receiverPhone": {
"type": "string"
},
"sourceNumber": {
@@ -4286,10 +4558,6 @@
"$ref": "#/definitions/constvar.OperationStatus"
}
]
- },
- "toLocationId": {
- "description": "鐩爣浣嶇疆id",
- "type": "integer"
},
"waybillNumber": {
"description": "杩愬崟鍙�",
@@ -4449,8 +4717,21 @@
"description": "婧愪綅缃�",
"type": "string"
},
+ "fromLocationId": {
+ "type": "integer"
+ },
"number": {
"description": "鍗曞彿",
+ "type": "string"
+ },
+ "operationId": {
+ "type": "integer"
+ },
+ "operationTypeName": {
+ "description": "浣滀笟绫诲瀷鍚嶇О",
+ "type": "string"
+ },
+ "productId": {
"type": "string"
},
"productName": {
@@ -4465,9 +4746,16 @@
"description": "鐩爣浣嶇疆",
"type": "string"
},
+ "toLocationId": {
+ "type": "integer"
+ },
"unit": {
"description": "鍗曚綅",
"type": "string"
+ },
+ "weight": {
+ "description": "閲嶉噺",
+ "type": "number"
}
}
},
@@ -4478,6 +4766,10 @@
"description": "鏁伴噺",
"type": "number"
},
+ "locationId": {
+ "description": "浣嶇疆id",
+ "type": "integer"
+ },
"locationName": {
"description": "浣嶇疆鍚嶇О",
"type": "string"
--
Gitblit v1.8.0