From 02a2176f7c5733a4e4c4429c2028bbb86a967ce7 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期二, 06 二月 2024 10:13:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM
---
docs/docs.go | 343 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 196 insertions(+), 147 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index a8e10bb..55a08e3 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -135,61 +135,6 @@
}
}
},
- "/con/downloadContract": {
- "get": {
- "security": [
- {
- "ApiKeyAuth": []
- }
- ],
- "consumes": [
- "application/json"
- ],
- "produces": [
- "application/json"
- ],
- "tags": [
- "Contract"
- ],
- "summary": "涓嬭浇Contract",
- "parameters": [
- {
- "type": "string",
- "name": "created_at",
- "in": "query"
- },
- {
- "type": "string",
- "name": "fileName",
- "in": "query"
- },
- {
- "type": "integer",
- "description": "涓婚敭ID",
- "name": "id",
- "in": "query"
- },
- {
- "type": "integer",
- "name": "supplierID",
- "in": "query"
- },
- {
- "type": "string",
- "name": "updated_at",
- "in": "query"
- }
- ],
- "responses": {
- "200": {
- "description": "{\"success\":true,\"data\":{},\"msg\":\"涓嬭浇鎴愬姛\"}",
- "schema": {
- "type": "string"
- }
- }
- }
- }
- },
"/con/findContract": {
"get": {
"security": [
@@ -328,61 +273,6 @@
}
}
},
- "/con/previewContract": {
- "get": {
- "security": [
- {
- "ApiKeyAuth": []
- }
- ],
- "consumes": [
- "application/json"
- ],
- "produces": [
- "application/json"
- ],
- "tags": [
- "Contract"
- ],
- "summary": "棰勮Contract",
- "parameters": [
- {
- "type": "string",
- "name": "created_at",
- "in": "query"
- },
- {
- "type": "string",
- "name": "fileName",
- "in": "query"
- },
- {
- "type": "integer",
- "description": "涓婚敭ID",
- "name": "id",
- "in": "query"
- },
- {
- "type": "integer",
- "name": "supplierID",
- "in": "query"
- },
- {
- "type": "string",
- "name": "updated_at",
- "in": "query"
- }
- ],
- "responses": {
- "200": {
- "description": "{\"success\":true,\"data\":{},\"msg\":\"棰勮鎴愬姛\"}",
- "schema": {
- "type": "string"
- }
- }
- }
- }
- },
"/con/updateContract": {
"put": {
"security": [
@@ -414,6 +304,61 @@
"responses": {
"200": {
"description": "{\"success\":true,\"data\":{},\"msg\":\"鏇存柊鎴愬姛\"}",
+ "schema": {
+ "type": "string"
+ }
+ }
+ }
+ }
+ },
+ "/downloadContract": {
+ "get": {
+ "security": [
+ {
+ "ApiKeyAuth": []
+ }
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Contract"
+ ],
+ "summary": "涓嬭浇Contract",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "created_at",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "fileName",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "涓婚敭ID",
+ "name": "id",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "name": "supplierID",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "{\"success\":true,\"data\":{},\"msg\":\"涓嬭浇鎴愬姛\"}",
"schema": {
"type": "string"
}
@@ -1257,6 +1202,11 @@
"summary": "鍒嗛〉鑾峰彇Product鍒楄〃",
"parameters": [
{
+ "type": "string",
+ "name": "categoryName",
+ "in": "query"
+ },
+ {
"type": "integer",
"name": "deliveryTime",
"in": "query"
@@ -1292,11 +1242,6 @@
"type": "integer",
"description": "姣忛〉澶у皬",
"name": "pageSize",
- "in": "query"
- },
- {
- "type": "string",
- "name": "productType",
"in": "query"
},
{
@@ -1369,6 +1314,11 @@
"summary": "鍒嗛〉鑾峰彇Product鍒楄〃",
"parameters": [
{
+ "type": "string",
+ "name": "categoryName",
+ "in": "query"
+ },
+ {
"type": "integer",
"name": "deliveryTime",
"in": "query"
@@ -1404,11 +1354,6 @@
"type": "integer",
"description": "姣忛〉澶у皬",
"name": "pageSize",
- "in": "query"
- },
- {
- "type": "string",
- "name": "productType",
"in": "query"
},
{
@@ -1493,6 +1438,61 @@
"responses": {
"200": {
"description": "{\"success\":true,\"data\":{},\"msg\":\"鏇存柊鎴愬姛\"}",
+ "schema": {
+ "type": "string"
+ }
+ }
+ }
+ }
+ },
+ "/previewContract": {
+ "get": {
+ "security": [
+ {
+ "ApiKeyAuth": []
+ }
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Contract"
+ ],
+ "summary": "棰勮Contract",
+ "parameters": [
+ {
+ "type": "string",
+ "name": "created_at",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "fileName",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "涓婚敭ID",
+ "name": "id",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "name": "supplierID",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "{\"success\":true,\"data\":{},\"msg\":\"棰勮鎴愬姛\"}",
"schema": {
"type": "string"
}
@@ -1730,6 +1730,12 @@
"description": "姣忛〉澶у皬",
"name": "pageSize",
"in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "渚涘簲鍟唅d",
+ "name": "supplierId",
+ "in": "query"
}
],
"responses": {
@@ -1890,6 +1896,12 @@
"description": "姣忛〉澶у皬",
"name": "pageSize",
"in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "渚涘簲鍟唅d",
+ "name": "supplierId",
+ "in": "query"
}
],
"responses": {
@@ -1917,7 +1929,7 @@
}
}
},
- "/purchase/submit/{id}": {
+ "/purchase/submit": {
"post": {
"security": [
{
@@ -2225,6 +2237,42 @@
"type": "string",
"name": "url",
"in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "{\"success\":true,\"data\":{},\"msg\":\"鏌ヨ鎴愬姛\"}",
+ "schema": {
+ "type": "string"
+ }
+ }
+ }
+ }
+ },
+ "/s/getSupplierByNumber/{number}": {
+ "get": {
+ "security": [
+ {
+ "ApiKeyAuth": []
+ }
+ ],
+ "consumes": [
+ "application/json"
+ ],
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Supplier"
+ ],
+ "summary": "鐢ㄧ紪鐮佹煡璇upplier",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "渚涘簲鍟嗙紪鐮�",
+ "name": "number",
+ "in": "path",
+ "required": true
}
],
"responses": {
@@ -3306,33 +3354,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"
}
}
},
@@ -3383,19 +3421,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": {
@@ -3574,7 +3615,7 @@
},
"productId": {
"description": "浜у搧id",
- "type": "string"
+ "type": "integer"
},
"purchaseId": {
"description": "閲囪喘id",
@@ -3670,6 +3711,10 @@
},
"number": {
"description": "閲囪喘缂栧彿",
+ "type": "string"
+ },
+ "orderSource": {
+ "description": "鍗曟嵁鏉ユ簮",
"type": "string"
},
"phone": {
@@ -3807,6 +3852,9 @@
"request.Product": {
"type": "object",
"properties": {
+ "categoryName": {
+ "type": "string"
+ },
"deliveryTime": {
"type": "integer"
},
@@ -3817,9 +3865,6 @@
"type": "string"
},
"number": {
- "type": "string"
- },
- "productType": {
"type": "string"
},
"purchasePrice": {
@@ -4111,6 +4156,10 @@
"test.SupplierMaterial": {
"type": "object",
"properties": {
+ "categoryName": {
+ "description": "浜у搧绫诲埆鍚嶇О",
+ "type": "string"
+ },
"created_at": {
"type": "string"
},
--
Gitblit v1.8.0