From d20acf38c36c11ee4428c3e74a17f5870dc61b51 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 16 十一月 2023 09:51:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM
---
docs/docs.go | 377 +++++++++++++++++++----------------------------------
1 files changed, 134 insertions(+), 243 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 9706af8..089c556 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1151,7 +1151,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/test.Product"
+ "$ref": "#/definitions/request.GetById"
}
}
],
@@ -1222,89 +1222,9 @@
"summary": "鐢╥d鏌ヨProduct",
"parameters": [
{
- "type": "string",
- "name": "created_at",
- "in": "query"
- },
- {
- "type": "integer",
- "name": "deliveryTime",
- "in": "query"
- },
- {
"type": "integer",
"description": "涓婚敭ID",
"name": "id",
- "in": "query"
- },
- {
- "type": "integer",
- "name": "maximumStock",
- "in": "query"
- },
- {
- "type": "integer",
- "name": "minimumStock",
- "in": "query"
- },
- {
- "type": "string",
- "name": "modelNumber",
- "in": "query"
- },
- {
- "type": "string",
- "name": "name",
- "in": "query"
- },
- {
- "type": "string",
- "name": "number",
- "in": "query"
- },
- {
- "type": "string",
- "name": "productType",
- "in": "query"
- },
- {
- "type": "number",
- "name": "purchasePrice",
- "in": "query"
- },
- {
- "type": "string",
- "name": "remark",
- "in": "query"
- },
- {
- "type": "integer",
- "name": "shippingDuration",
- "in": "query"
- },
- {
- "type": "string",
- "name": "specifications",
- "in": "query"
- },
- {
- "type": "integer",
- "name": "supplierId",
- "in": "query"
- },
- {
- "type": "string",
- "name": "supplierName",
- "in": "query"
- },
- {
- "type": "string",
- "name": "unit",
- "in": "query"
- },
- {
- "type": "string",
- "name": "updated_at",
"in": "query"
}
],
@@ -1338,7 +1258,7 @@
"parameters": [
{
"type": "string",
- "name": "created_at",
+ "name": "categoryName",
"in": "query"
},
{
@@ -1348,29 +1268,8 @@
},
{
"type": "string",
- "name": "endCreatedAt",
- "in": "query"
- },
- {
- "type": "integer",
- "description": "涓婚敭ID",
- "name": "id",
- "in": "query"
- },
- {
- "type": "string",
"description": "鍏抽敭瀛�",
"name": "keyword",
- "in": "query"
- },
- {
- "type": "integer",
- "name": "maximumStock",
- "in": "query"
- },
- {
- "type": "integer",
- "name": "minimumStock",
"in": "query"
},
{
@@ -1401,18 +1300,8 @@
"in": "query"
},
{
- "type": "string",
- "name": "productType",
- "in": "query"
- },
- {
"type": "number",
"name": "purchasePrice",
- "in": "query"
- },
- {
- "type": "string",
- "name": "remark",
"in": "query"
},
{
@@ -1427,7 +1316,7 @@
},
{
"type": "string",
- "name": "startCreatedAt",
+ "name": "supplier",
"in": "query"
},
{
@@ -1448,11 +1337,6 @@
{
"type": "string",
"name": "unit",
- "in": "query"
- },
- {
- "type": "string",
- "name": "updated_at",
"in": "query"
}
],
@@ -1486,7 +1370,7 @@
"parameters": [
{
"type": "string",
- "name": "created_at",
+ "name": "categoryName",
"in": "query"
},
{
@@ -1496,29 +1380,8 @@
},
{
"type": "string",
- "name": "endCreatedAt",
- "in": "query"
- },
- {
- "type": "integer",
- "description": "涓婚敭ID",
- "name": "id",
- "in": "query"
- },
- {
- "type": "string",
"description": "鍏抽敭瀛�",
"name": "keyword",
- "in": "query"
- },
- {
- "type": "integer",
- "name": "maximumStock",
- "in": "query"
- },
- {
- "type": "integer",
- "name": "minimumStock",
"in": "query"
},
{
@@ -1549,18 +1412,8 @@
"in": "query"
},
{
- "type": "string",
- "name": "productType",
- "in": "query"
- },
- {
"type": "number",
"name": "purchasePrice",
- "in": "query"
- },
- {
- "type": "string",
- "name": "remark",
"in": "query"
},
{
@@ -1575,7 +1428,7 @@
},
{
"type": "string",
- "name": "startCreatedAt",
+ "name": "supplier",
"in": "query"
},
{
@@ -1596,11 +1449,6 @@
{
"type": "string",
"name": "unit",
- "in": "query"
- },
- {
- "type": "string",
- "name": "updated_at",
"in": "query"
}
],
@@ -1638,7 +1486,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/test.Product"
+ "$ref": "#/definitions/test.SupplierMaterial"
}
}
],
@@ -2069,7 +1917,7 @@
}
}
},
- "/purchase/submit/{id}": {
+ "/purchase/submit": {
"post": {
"security": [
{
@@ -3458,33 +3306,23 @@
"type": "string"
},
"grpc-admin-url": {
- "description": "grpc鏈嶅姟鍦板潃",
+ "description": "admin grpc鏈嶅姟鍦板潃",
+ "type": "string"
+ },
+ "grpc-port": {
+ "description": "瀵瑰鎻愪緵鏈嶅姟grpc绔彛",
"type": "string"
},
"grpc-url": {
- "description": "grpc鏈嶅姟鍦板潃",
+ "description": "aps grpc鏈嶅姟鍦板潃",
"type": "string"
},
- "iplimit-count": {
- "type": "integer"
- },
- "iplimit-time": {
- "type": "integer"
- },
- "oss-type": {
- "description": "Oss绫诲瀷",
+ "grpc-wms-url": {
+ "description": "wms grpc鏈嶅姟鍦板潃",
"type": "string"
},
"router-prefix": {
"type": "string"
- },
- "use-multipoint": {
- "description": "澶氱偣鐧诲綍鎷︽埅",
- "type": "boolean"
- },
- "use-redis": {
- "description": "浣跨敤redis",
- "type": "boolean"
}
}
},
@@ -3535,19 +3373,22 @@
1,
2,
3,
- 4
+ 4,
+ 5
],
"x-enum-comments": {
+ "OrderStatusCanceled": "宸插彇娑�",
"OrderStatusCompleted": "宸插畬鎴�",
- "OrderStatusConfirmed": "宸蹭笅鍗�",
- "OrderStatusReceived": "宸插埌璐�",
+ "OrderStatusConfirmed": "寰呯‘璁�",
+ "OrderStatusReceived": "寰呭叆搴�",
"OrderStatusStored": "宸插叆搴�"
},
"x-enum-varnames": [
"OrderStatusConfirmed",
"OrderStatusReceived",
"OrderStatusStored",
- "OrderStatusCompleted"
+ "OrderStatusCompleted",
+ "OrderStatusCanceled"
]
},
"purchase.PriceAdjustmentType": {
@@ -3726,7 +3567,7 @@
},
"productId": {
"description": "浜у搧id",
- "type": "integer"
+ "type": "string"
},
"purchaseId": {
"description": "閲囪喘id",
@@ -3925,6 +3766,15 @@
}
}
},
+ "request.GetById": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "description": "涓婚敭ID",
+ "type": "integer"
+ }
+ }
+ },
"request.IdsReq": {
"type": "object",
"properties": {
@@ -3947,13 +3797,57 @@
}
}
},
+ "request.Product": {
+ "type": "object",
+ "properties": {
+ "categoryName": {
+ "type": "string"
+ },
+ "deliveryTime": {
+ "type": "integer"
+ },
+ "modelNumber": {
+ "type": "string"
+ },
+ "name": {
+ "type": "string"
+ },
+ "number": {
+ "type": "string"
+ },
+ "purchasePrice": {
+ "type": "number"
+ },
+ "shippingDuration": {
+ "type": "integer"
+ },
+ "specifications": {
+ "type": "string"
+ },
+ "supplier": {
+ "type": "string"
+ },
+ "supplierId": {
+ "type": "integer"
+ },
+ "supplierName": {
+ "type": "string"
+ },
+ "supplierNumber": {
+ "type": "string"
+ },
+ "unit": {
+ "type": "string"
+ }
+ }
+ },
"request.ProductCreate": {
"type": "object",
"properties": {
"list": {
"type": "array",
"items": {
- "$ref": "#/definitions/test.Product"
+ "$ref": "#/definitions/request.Product"
}
}
}
@@ -4144,66 +4038,6 @@
}
}
},
- "test.Product": {
- "type": "object",
- "properties": {
- "created_at": {
- "type": "string"
- },
- "deliveryTime": {
- "type": "integer"
- },
- "id": {
- "description": "涓婚敭ID",
- "type": "integer"
- },
- "maximumStock": {
- "type": "integer"
- },
- "minimumStock": {
- "type": "integer"
- },
- "modelNumber": {
- "type": "string"
- },
- "name": {
- "type": "string"
- },
- "number": {
- "type": "string"
- },
- "productType": {
- "type": "string"
- },
- "purchasePrice": {
- "type": "number"
- },
- "remark": {
- "type": "string"
- },
- "shippingDuration": {
- "type": "integer"
- },
- "specifications": {
- "type": "string"
- },
- "supplier": {
- "$ref": "#/definitions/test.Supplier"
- },
- "supplierId": {
- "type": "integer"
- },
- "supplierName": {
- "type": "string"
- },
- "unit": {
- "type": "string"
- },
- "updated_at": {
- "type": "string"
- }
- }
- },
"test.Supplier": {
"type": "object",
"properties": {
@@ -4267,6 +4101,63 @@
}
}
},
+ "test.SupplierMaterial": {
+ "type": "object",
+ "properties": {
+ "categoryName": {
+ "description": "浜у搧绫诲埆鍚嶇О",
+ "type": "string"
+ },
+ "created_at": {
+ "type": "string"
+ },
+ "deliveryTime": {
+ "description": "渚涜揣鏃堕暱",
+ "type": "integer"
+ },
+ "id": {
+ "description": "涓婚敭ID",
+ "type": "integer"
+ },
+ "maximumStock": {
+ "type": "integer"
+ },
+ "minimumStock": {
+ "type": "integer"
+ },
+ "modelNumber": {
+ "type": "string"
+ },
+ "name": {
+ "type": "string"
+ },
+ "number": {
+ "type": "string"
+ },
+ "purchasePrice": {
+ "type": "number"
+ },
+ "shippingDuration": {
+ "description": "鐗╂祦鏃堕暱",
+ "type": "integer"
+ },
+ "specifications": {
+ "type": "string"
+ },
+ "supplier": {
+ "$ref": "#/definitions/test.Supplier"
+ },
+ "supplierId": {
+ "type": "integer"
+ },
+ "unit": {
+ "type": "string"
+ },
+ "updated_at": {
+ "type": "string"
+ }
+ }
+ },
"test.SupplierType": {
"type": "object",
"properties": {
--
Gitblit v1.8.0