From 1770deb5829f745194508339a7924eefd4dbd627 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 18 九月 2023 20:04:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
docs/docs.go | 293 +++++++++++++++++-----------------------------------------
1 files changed, 88 insertions(+), 205 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 7a99fb9..0f27c63 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -294,23 +294,23 @@
}
}
},
- "/api-wms/v1/product/addProduct": {
+ "/api-wms/v1/operation/operation": {
"post": {
"produces": [
"application/json"
],
"tags": [
- "浜у搧"
+ "鍏ュ簱/鍑哄簱"
],
- "summary": "娣诲姞浜у搧",
+ "summary": "娣诲姞鍏ュ簱/鍑哄簱",
"parameters": [
{
- "description": "浜у搧淇℃伅",
+ "description": "鍏ュ簱/鍑哄簱淇℃伅",
"name": "object",
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/models.Product"
+ "$ref": "#/definitions/request.AddOperation"
}
}
],
@@ -632,30 +632,6 @@
"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": [
@@ -686,7 +662,7 @@
"LocationTypeTransit"
]
},
- "constvar.OrderCreation": {
+ "constvar.OperationStatus": {
"type": "integer",
"enum": [
1,
@@ -695,34 +671,16 @@
4
],
"x-enum-comments": {
- "Nothing": "涓嶆搷浣�",
- "Object": "椤圭洰",
- "Task": "浠诲姟",
- "TaskAndObject": "浠诲姟鍜岄」鐩�"
+ "OperationStatus_Draft": "鑽夌",
+ "OperationStatus_Finish": "瀹屾垚",
+ "OperationStatus_Ready": "灏辩华",
+ "OperationStatus_Waiting": "姝ｅ湪绛夊緟"
},
"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"
+ "OperationStatus_Draft",
+ "OperationStatus_Waiting",
+ "OperationStatus_Ready",
+ "OperationStatus_Finish"
]
},
"constvar.ReservationMethod": {
@@ -989,153 +947,6 @@
}
}
},
- "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"
- },
- "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"
- }
- }
- },
"models.Warehouse": {
"type": "object",
"required": [
@@ -1222,6 +1033,51 @@
"remark": {
"description": "澶囨敞",
"type": "string"
+ }
+ }
+ },
+ "request.AddOperation": {
+ "type": "object",
+ "properties": {
+ "details": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/request.OperationDetails"
+ }
+ },
+ "fromLocationId": {
+ "description": "婧愪綅缃甶d",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "number": {
+ "description": "鍗曞彿",
+ "type": "string"
+ },
+ "operationDate": {
+ "$ref": "#/definitions/util.JSONTime"
+ },
+ "operationTypeId": {
+ "description": "浣滀笟绫诲瀷id",
+ "type": "integer"
+ },
+ "sourceNumber": {
+ "description": "婧愬崟鍙�",
+ "type": "string"
+ },
+ "status": {
+ "description": "鐘舵��",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.OperationStatus"
+ }
+ ]
+ },
+ "toLocationId": {
+ "description": "鐩爣浣嶇疆id",
+ "type": "integer"
}
}
},
@@ -1331,6 +1187,27 @@
"items": {
"type": "string"
}
+ }
+ }
+ },
+ "request.OperationDetails": {
+ "type": "object",
+ "properties": {
+ "finishQuantity": {
+ "description": "瀹屾垚鏁伴噺",
+ "type": "number"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "integer"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "quantity": {
+ "description": "鏁伴噺",
+ "type": "number"
}
}
},
@@ -1482,6 +1359,14 @@
}
}
},
+ "util.JSONTime": {
+ "type": "object",
+ "properties": {
+ "time.Time": {
+ "type": "string"
+ }
+ }
+ },
"util.Response": {
"type": "object",
"properties": {
@@ -1528,8 +1413,6 @@
Description: "",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
- LeftDelim: "{{",
- RightDelim: "}}",
}
func init() {
--
Gitblit v1.8.0