From 2b3b678a0e0156e68415aa287fdf85d05583a5b4 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 21 九月 2023 15:10:08 +0800
Subject: [PATCH] 1.修改出入库列表显示异常的问题
---
docs/docs.go | 308 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 247 insertions(+), 61 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index f67d02f..0e06838 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -294,6 +294,207 @@
}
}
},
+ "/api-wms/v1/location/addLocation": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浣嶇疆"
+ ],
+ "summary": "娣诲姞浣嶇疆淇℃伅",
+ "parameters": [
+ {
+ "description": "浣嶇疆淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/models.Location"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/location/deleteLocation/{id}": {
+ "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/location/getLocationDetails/{id}": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浣嶇疆"
+ ],
+ "summary": "鑾峰彇浣嶇疆璇︽儏",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/models.Location"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/location/getLocationList": {
+ "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.Location"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/location/updateLocation": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浣嶇疆"
+ ],
+ "summary": "淇敼浣嶇疆",
+ "parameters": [
+ {
+ "description": "浜у搧淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/models.Location"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/operation/finish/{id}": {
+ "put": {
+ "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/operation/operation": {
"get": {
"consumes": [
@@ -432,7 +633,7 @@
"application/json"
],
"tags": [
- "浣滀笟绫诲瀷"
+ "涓氬姟绫诲瀷"
],
"summary": "鏌ヨ浣滀笟绫诲瀷鍒楄〃",
"parameters": [
@@ -483,7 +684,7 @@
"application/json"
],
"tags": [
- "浣滀笟绫诲瀷"
+ "涓氬姟绫诲瀷"
],
"summary": "娣诲姞浣滀笟绫诲瀷",
"parameters": [
@@ -513,7 +714,7 @@
"application/json"
],
"tags": [
- "浣滀笟绫诲瀷"
+ "涓氬姟绫诲瀷"
],
"summary": "缂栬緫浣滀笟绫诲瀷",
"parameters": [
@@ -548,7 +749,7 @@
"application/json"
],
"tags": [
- "浣滀笟绫诲瀷"
+ "涓氬姟绫诲瀷"
],
"summary": "鍒犻櫎浣滀笟绫诲瀷",
"parameters": [
@@ -1383,14 +1584,6 @@
"models.Location": {
"type": "object",
"properties": {
- "company": {
- "description": "鍏徃",
- "allOf": [
- {
- "$ref": "#/definitions/models.Company"
- }
- ]
- },
"companyId": {
"description": "鍏徃id",
"type": "integer"
@@ -1401,6 +1594,14 @@
},
"createTime": {
"type": "string"
+ },
+ "forceRemovalStrategy": {
+ "description": "涓嬫灦绛栫暐",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.ForceRemovalStrategy"
+ }
+ ]
},
"id": {
"type": "integer"
@@ -1426,7 +1627,7 @@
"type": "boolean"
},
"type": {
- "description": "浣嶇疆绫诲瀷",
+ "description": "Company Company ` + "`" + `json:\"company\" gorm:\"foreignKey:CompanyId\"` + "`" + ` //鍏徃",
"allOf": [
{
"$ref": "#/definitions/constvar.LocationType"
@@ -1441,10 +1642,6 @@
"models.Material": {
"type": "object",
"properties": {
- "HSCode": {
- "description": "HS缂栫爜",
- "type": "string"
- },
"amount": {
"description": "鏁伴噺",
"type": "number"
@@ -1498,14 +1695,14 @@
"type": "number"
},
"deliveryAdvanceTime": {
- "description": "浜よ揣鎻愬墠鏃堕棿(澶�)",
- "type": "integer"
+ "description": "瀹㈡埛鍓嶇疆鏃堕棿(澶�)",
+ "type": "number"
},
"id": {
"type": "string"
},
"inStorageExplain": {
- "description": "鍏ュ簱璇存槑",
+ "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"
},
"internalNotes": {
@@ -1532,6 +1729,10 @@
"description": "PurchaseType constvar.PurchaseType ` + "`" + `gorm:\"type:int(11);comment:閲囪喘绫诲瀷\" json:\"purchaseType\"` + "`" + `",
"type": "boolean"
},
+ "makeAdvanceTime": {
+ "description": "鍒堕�犲墠缃椂闂�(澶�)",
+ "type": "number"
+ },
"maxInventory": {
"description": "鏈�澶у簱瀛�",
"type": "number"
@@ -1556,6 +1757,10 @@
"description": "鐗╂枡鍚嶇О",
"type": "string"
},
+ "orderAdvanceTime": {
+ "description": "璁㈠崟鍑嗗澶╂暟(澶�)",
+ "type": "number"
+ },
"orderCreation": {
"description": "璁㈠崟鍒涘缓",
"allOf": [
@@ -1563,14 +1768,6 @@
"$ref": "#/definitions/constvar.OrderCreation"
}
]
- },
- "originCountryId": {
- "description": "鍘熶骇鍦癷d",
- "type": "integer"
- },
- "originCountryName": {
- "description": "鍘熶骇鍦板悕绉�",
- "type": "string"
},
"outStorageExplain": {
"description": "鍑哄簱璇存槑",
@@ -1606,7 +1803,7 @@
},
"selectProduct": {
"description": "鍙�変骇鍝乮d",
- "type": "integer"
+ "type": "string"
},
"sellExplain": {
"description": "閿�鍞鏄�",
@@ -1908,22 +2105,24 @@
"request.AddOperation": {
"type": "object",
"properties": {
- "carrierID": {
- "type": "integer"
- },
- "carrierName": {
+ "comment": {
+ "description": "澶囨敞",
"type": "string"
},
"companyID": {
+ "description": "鍏徃ID-瀹㈡埛",
"type": "integer"
},
"companyName": {
+ "description": "鍏徃鍚嶇О-瀹㈡埛鍚嶇О",
"type": "string"
},
"contacterID": {
+ "description": "鑱旂郴浜篒D-闈炲繀濉�",
"type": "integer"
},
"contacterName": {
+ "description": "鑱旂郴浜哄鍚�-闈炲繀濉�",
"type": "string"
},
"details": {
@@ -1944,6 +2143,7 @@
"type": "string"
},
"operationDate": {
+ "description": "瀹夋帓鏃ユ湡",
"type": "string"
},
"operationTypeId": {
@@ -1965,15 +2165,6 @@
"toLocationId": {
"description": "鐩爣浣嶇疆id",
"type": "integer"
- },
- "tracking": {
- "type": "string"
- },
- "transferWeight": {
- "type": "number"
- },
- "weight": {
- "type": "number"
}
}
},
@@ -2121,13 +2312,13 @@
"request.OperationDetails": {
"type": "object",
"properties": {
- "finishQuantity": {
- "description": "瀹屾垚鏁伴噺",
- "type": "number"
+ "OperationId": {
+ "description": "鎿嶄綔id",
+ "type": "integer"
},
"productId": {
"description": "浜у搧id",
- "type": "integer"
+ "type": "string"
},
"productName": {
"description": "浜у搧鍚嶇О",
@@ -2136,6 +2327,9 @@
"quantity": {
"description": "鏁伴噺",
"type": "number"
+ },
+ "unit": {
+ "type": "string"
}
}
},
@@ -2178,22 +2372,24 @@
"request.UpdateOperation": {
"type": "object",
"properties": {
- "carrierID": {
- "type": "integer"
- },
- "carrierName": {
+ "comment": {
+ "description": "澶囨敞",
"type": "string"
},
"companyID": {
+ "description": "鍏徃ID-瀹㈡埛",
"type": "integer"
},
"companyName": {
+ "description": "鍏徃鍚嶇О-瀹㈡埛鍚嶇О",
"type": "string"
},
"contacterID": {
+ "description": "鑱旂郴浜篒D-闈炲繀濉�",
"type": "integer"
},
"contacterName": {
+ "description": "鑱旂郴浜哄鍚�-闈炲繀濉�",
"type": "string"
},
"details": {
@@ -2214,6 +2410,7 @@
"type": "string"
},
"operationDate": {
+ "description": "瀹夋帓鏃ユ湡",
"type": "string"
},
"operationTypeId": {
@@ -2235,15 +2432,6 @@
"toLocationId": {
"description": "鐩爣浣嶇疆id",
"type": "integer"
- },
- "tracking": {
- "type": "string"
- },
- "transferWeight": {
- "type": "number"
- },
- "weight": {
- "type": "number"
}
}
},
@@ -2365,8 +2553,6 @@
Description: "",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
- LeftDelim: "{{",
- RightDelim: "}}",
}
func init() {
--
Gitblit v1.8.0