From b97b0ba40ae012e59cd3bba0960f485aae86bb13 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 26 九月 2023 09:31:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
docs/swagger.json | 180 ++++-------------------------------------------------------
1 files changed, 14 insertions(+), 166 deletions(-)
diff --git a/docs/swagger.json b/docs/swagger.json
index 86a516f..801bf26 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -663,22 +663,7 @@
"200": {
"description": "鎴愬姛",
"schema": {
- "allOf": [
- {
- "$ref": "#/definitions/util.ResponseList"
- },
- {
- "type": "object",
- "properties": {
- "data": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/models.OperationType"
- }
- }
- }
- }
- ]
+ "$ref": "#/definitions/util.ResponseList"
}
}
}
@@ -2106,7 +2091,7 @@
"type": "object",
"properties": {
"amount": {
- "description": "鏁伴噺",
+ "description": "ProductName string `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` //浜у搧鍚嶇О",
"type": "number"
},
"createTime": {
@@ -2119,141 +2104,20 @@
"description": "鎿嶄綔id",
"type": "integer"
},
+ "product": {
+ "description": "Unit string `json:\"unit\" gorm:\"type:varchar(31);comment:鍗曚綅\"` //鍗曚綅",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Material"
+ }
+ ]
+ },
"productId": {
"description": "浜у搧id",
"type": "string"
},
- "productName": {
- "description": "浜у搧鍚嶇О",
- "type": "string"
- },
- "unit": {
- "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"
- },
- "earlyOperations": {
- "description": "棰勫～鍐欎綔涓氳鎯�",
- "type": "boolean"
- },
- "id": {
- "type": "integer"
- },
- "name": {
- "description": "浠撳簱鍚嶇О",
- "type": "string"
- },
- "prefix": {
- "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"
}
}
},
@@ -2418,6 +2282,7 @@
"type": "object",
"properties": {
"amount": {
+ "description": "ProductName string `json:\"productName\"`",
"type": "number"
},
"fromLocationId": {
@@ -2426,17 +2291,11 @@
"productId": {
"type": "string"
},
- "productName": {
- "type": "string"
- },
"sourceNumber": {
"type": "string"
},
"toLocationId": {
"type": "integer"
- },
- "unit": {
- "type": "string"
}
}
},
@@ -2681,18 +2540,11 @@
"type": "integer"
},
"amount": {
- "description": "鏁伴噺",
+ "description": "ProductName string `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` //浜у搧鍚嶇О",
"type": "number"
},
"productId": {
"description": "浜у搧id",
- "type": "string"
- },
- "productName": {
- "description": "浜у搧鍚嶇О",
- "type": "string"
- },
- "unit": {
"type": "string"
}
}
@@ -2794,6 +2646,7 @@
"type": "object",
"properties": {
"amount": {
+ "description": "ProductName string `json:\"productName\"`",
"type": "number"
},
"fromLocationId": {
@@ -2803,15 +2656,13 @@
"type": "integer"
},
"number": {
+ "description": "Unit string `json:\"unit\"`",
"type": "string"
},
"operationDate": {
"type": "string"
},
"productId": {
- "type": "string"
- },
- "productName": {
"type": "string"
},
"sourceNumber": {
@@ -2822,9 +2673,6 @@
},
"toLocationId": {
"type": "integer"
- },
- "unit": {
- "type": "string"
}
}
},
--
Gitblit v1.8.0