From 3545b1af80395204e96f748cb6c52cf1dc572606 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期三, 30 八月 2023 14:34:35 +0800 Subject: [PATCH] merge --- docs/docs.go | 248 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 246 insertions(+), 2 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index 90295a0..9156122 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -4629,7 +4629,7 @@ "summary": "鍒涘缓閲囪喘鍗�", "parameters": [ { - "description": "閲囪喘鍗曠敤鎴峰悕, 閲囪喘鍗曟墜鏈哄彿鐮�", + "description": "閲囪喘鍗�,閲囪喘鍗曚骇鍝�", "name": "data", "in": "body", "required": true, @@ -4905,6 +4905,68 @@ "items": { "$ref": "#/definitions/purchase.PurchaseType" } + }, + "msg": { + "type": "string" + } + } + } + ] + } + } + } + } + }, + "/purchase/qualityInspectList": { + "get": { + "security": [ + { + "ApiKeyAuth": [] + } + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "QualityInspect" + ], + "summary": "鍒嗛〉鑾峰彇璐ㄦ鍗曞垪琛�", + "parameters": [ + { + "type": "string", + "description": "鍏抽敭瀛�", + "name": "keyword", + "in": "query" + }, + { + "type": "integer", + "description": "椤电爜", + "name": "page", + "in": "query" + }, + { + "type": "integer", + "description": "姣忛〉澶у皬", + "name": "pageSize", + "in": "query" + } + ], + "responses": { + "200": { + "description": "鍒嗛〉鑾峰彇璐ㄦ鍗曞垪琛�,杩斿洖鍖呮嫭鍒楄〃,鎬绘暟,椤电爜,姣忛〉鏁伴噺", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "$ref": "#/definitions/response.PageResult" }, "msg": { "type": "string" @@ -8414,6 +8476,21 @@ "OrderStatusCompleted" ] }, + "purchase.PriceAdjustmentType": { + "type": "integer", + "enum": [ + 1, + 2 + ], + "x-enum-comments": { + "PriceAdjustmentTypeAdd": "澧炲姞", + "PriceAdjustmentTypeSub": "鍑忓皯" + }, + "x-enum-varnames": [ + "PriceAdjustmentTypeAdd", + "PriceAdjustmentTypeSub" + ] + }, "purchase.Purchase": { "type": "object", "properties": { @@ -8441,6 +8518,10 @@ "description": "涓婚敭ID", "type": "integer" }, + "invoiceAmount": { + "description": "宸叉敹绁ㄩ噾棰�", + "type": "number" + }, "name": { "description": "閲囪喘鍚嶇О", "type": "string" @@ -8449,8 +8530,36 @@ "description": "閲囪喘缂栧彿", "type": "string" }, + "orderSource": { + "description": "鍗曟嵁鏉ユ簮", + "type": "string" + }, + "orderType": { + "description": "鍗曟嵁绫诲瀷", + "type": "string" + }, + "paidAmount": { + "description": "宸蹭粯閲戦", + "type": "number" + }, "phone": { "description": "鑱旂郴浜虹數璇�", + "type": "string" + }, + "priceAdjustment": { + "description": "浠锋牸璋冩暣鍊�", + "type": "number" + }, + "priceAdjustmentType": { + "description": "浠锋牸璋冩暣绫诲瀷", + "allOf": [ + { + "$ref": "#/definitions/purchase.PriceAdjustmentType" + } + ] + }, + "principal": { + "description": "閲囪喘璐熻矗浜�", "type": "string" }, "purchaseType": { @@ -8464,9 +8573,17 @@ "description": "閲囪喘鏁伴噺", "type": "number" }, + "realTotalPrice": { + "description": "鏈�缁堜环鏍�", + "type": "number" + }, "remark": { "description": "澶囨敞", "type": "string" + }, + "shouldPayAmount": { + "description": "搴斾粯閲戦", + "type": "number" }, "signingDate": { "description": "绛剧害鏃ユ湡", @@ -8486,6 +8603,30 @@ "supplierId": { "description": "渚涘簲鍟唅d", "type": "integer" + }, + "totalPrice": { + "description": "浠风◣鍚堣", + "type": "number" + }, + "unInvoiceAmount": { + "description": "鏈敹绁ㄩ噾棰�", + "type": "number" + }, + "warehouse": { + "description": "鏀惰揣浠撳簱", + "type": "string" + }, + "wholeDiscount": { + "description": "鏁村崟鎶樻墸鍊�", + "type": "number" + }, + "wholeDiscountType": { + "description": "鏁村崟鎶樻墸绫诲瀷", + "allOf": [ + { + "$ref": "#/definitions/purchase.WholeDiscountType" + } + ] } } }, @@ -8551,6 +8692,21 @@ } } }, + "purchase.WholeDiscountType": { + "type": "integer", + "enum": [ + 1, + 2 + ], + "x-enum-comments": { + "WholeDiscountTypeDiscount": "鐩存帴闄嶄环", + "WholeDiscountTypePercent": "鐧惧垎姣旈檷浠�" + }, + "x-enum-varnames": [ + "WholeDiscountTypePercent", + "WholeDiscountTypeDiscount" + ] + }, "purchaserequest.AddPurchase": { "type": "object", "properties": { @@ -8592,9 +8748,29 @@ "description": "鑱旂郴浜虹數璇�", "type": "string" }, + "priceAdjustment": { + "description": "浠锋牸璋冩暣鍊�", + "type": "number" + }, + "priceAdjustmentType": { + "description": "浠锋牸璋冩暣绫诲瀷", + "allOf": [ + { + "$ref": "#/definitions/purchase.PriceAdjustmentType" + } + ] + }, "purchaseTypeId": { "description": "閲囪喘绫诲瀷id", "type": "integer" + }, + "quantity": { + "description": "閲囪喘鏁伴噺", + "type": "number" + }, + "realTotalPrice": { + "description": "鏈�缁堜环鏍�", + "type": "number" }, "remark": { "description": "澶囨敞", @@ -8615,6 +8791,22 @@ "supplierId": { "description": "渚涘簲鍟唅d", "type": "integer" + }, + "totalPrice": { + "description": "浠风◣鍚堣", + "type": "number" + }, + "wholeDiscount": { + "description": "鏁村崟鎶樻墸鍊�", + "type": "number" + }, + "wholeDiscountType": { + "description": "鏁村崟鎶樻墸绫诲瀷", + "allOf": [ + { + "$ref": "#/definitions/purchase.WholeDiscountType" + } + ] } } }, @@ -9109,13 +9301,65 @@ } } }, + "response.PurchaseProducts": { + "type": "object", + "properties": { + "amount": { + "description": "閲囪喘鏁伴噺", + "type": "number" + }, + "deliveryTime": { + "type": "integer" + }, + "modelNumber": { + "type": "string" + }, + "name": { + "type": "string" + }, + "number": { + "type": "string" + }, + "price": { + "description": "閲囪喘鍗曚环", + "type": "number" + }, + "productId": { + "description": "浜у搧id", + "type": "integer" + }, + "productType": { + "type": "string" + }, + "purchaseId": { + "description": "閲囪喘id", + "type": "integer" + }, + "purchasePrice": { + "type": "number" + }, + "shippingDuration": { + "type": "integer" + }, + "specifications": { + "type": "string" + }, + "total": { + "description": "閲囪喘鎬讳环", + "type": "number" + }, + "unit": { + "type": "string" + } + } + }, "response.PurchaseResponse": { "type": "object", "properties": { "productList": { "type": "array", "items": { - "$ref": "#/definitions/purchase.PurchaseProducts" + "$ref": "#/definitions/response.PurchaseProducts" } }, "purchase": { -- Gitblit v1.8.0