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/swagger.yaml | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 163 insertions(+), 2 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 93c77e5..2df7b38 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -694,6 +694,17 @@
- OrderStatusReceived
- OrderStatusStored
- OrderStatusCompleted
+ purchase.PriceAdjustmentType:
+ enum:
+ - 1
+ - 2
+ type: integer
+ x-enum-comments:
+ PriceAdjustmentTypeAdd: 澧炲姞
+ PriceAdjustmentTypeSub: 鍑忓皯
+ x-enum-varnames:
+ - PriceAdjustmentTypeAdd
+ - PriceAdjustmentTypeSub
purchase.Purchase:
properties:
contact:
@@ -714,14 +725,36 @@
id:
description: 涓婚敭ID
type: integer
+ invoiceAmount:
+ description: 宸叉敹绁ㄩ噾棰�
+ type: number
name:
description: 閲囪喘鍚嶇О
type: string
number:
description: 閲囪喘缂栧彿
type: string
+ orderSource:
+ description: 鍗曟嵁鏉ユ簮
+ type: string
+ orderType:
+ description: 鍗曟嵁绫诲瀷
+ type: string
+ paidAmount:
+ description: 宸蹭粯閲戦
+ type: number
phone:
description: 鑱旂郴浜虹數璇�
+ type: string
+ priceAdjustment:
+ description: 浠锋牸璋冩暣鍊�
+ type: number
+ priceAdjustmentType:
+ allOf:
+ - $ref: '#/definitions/purchase.PriceAdjustmentType'
+ description: 浠锋牸璋冩暣绫诲瀷
+ principal:
+ description: 閲囪喘璐熻矗浜�
type: string
purchaseType:
$ref: '#/definitions/purchase.PurchaseType'
@@ -731,9 +764,15 @@
quantity:
description: 閲囪喘鏁伴噺
type: number
+ realTotalPrice:
+ description: 鏈�缁堜环鏍�
+ type: number
remark:
description: 澶囨敞
type: string
+ shouldPayAmount:
+ description: 搴斾粯閲戦
+ type: number
signingDate:
description: 绛剧害鏃ユ湡
type: string
@@ -746,6 +785,22 @@
supplierId:
description: 渚涘簲鍟唅d
type: integer
+ totalPrice:
+ description: 浠风◣鍚堣
+ type: number
+ unInvoiceAmount:
+ description: 鏈敹绁ㄩ噾棰�
+ type: number
+ warehouse:
+ description: 鏀惰揣浠撳簱
+ type: string
+ wholeDiscount:
+ description: 鏁村崟鎶樻墸鍊�
+ type: number
+ wholeDiscountType:
+ allOf:
+ - $ref: '#/definitions/purchase.WholeDiscountType'
+ description: 鏁村崟鎶樻墸绫诲瀷
type: object
purchase.PurchaseProducts:
properties:
@@ -792,6 +847,17 @@
description: 鎺掑簭
type: integer
type: object
+ purchase.WholeDiscountType:
+ enum:
+ - 1
+ - 2
+ type: integer
+ x-enum-comments:
+ WholeDiscountTypeDiscount: 鐩存帴闄嶄环
+ WholeDiscountTypePercent: 鐧惧垎姣旈檷浠�
+ x-enum-varnames:
+ - WholeDiscountTypePercent
+ - WholeDiscountTypeDiscount
purchaserequest.AddPurchase:
properties:
productList:
@@ -821,9 +887,22 @@
phone:
description: 鑱旂郴浜虹數璇�
type: string
+ priceAdjustment:
+ description: 浠锋牸璋冩暣鍊�
+ type: number
+ priceAdjustmentType:
+ allOf:
+ - $ref: '#/definitions/purchase.PriceAdjustmentType'
+ description: 浠锋牸璋冩暣绫诲瀷
purchaseTypeId:
description: 閲囪喘绫诲瀷id
type: integer
+ quantity:
+ description: 閲囪喘鏁伴噺
+ type: number
+ realTotalPrice:
+ description: 鏈�缁堜环鏍�
+ type: number
remark:
description: 澶囨敞
type: string
@@ -837,6 +916,16 @@
supplierId:
description: 渚涘簲鍟唅d
type: integer
+ totalPrice:
+ description: 浠风◣鍚堣
+ type: number
+ wholeDiscount:
+ description: 鏁村崟鎶樻墸鍊�
+ type: number
+ wholeDiscountType:
+ allOf:
+ - $ref: '#/definitions/purchase.WholeDiscountType'
+ description: 鏁村崟鎶樻墸绫诲瀷
type: object
purchaserequest.PurchaseType:
properties:
@@ -1174,11 +1263,47 @@
$ref: '#/definitions/request.CasbinInfo'
type: array
type: object
+ response.PurchaseProducts:
+ 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
+ type: object
response.PurchaseResponse:
properties:
productList:
items:
- $ref: '#/definitions/purchase.PurchaseProducts'
+ $ref: '#/definitions/response.PurchaseProducts'
type: array
purchase:
$ref: '#/definitions/purchase.Purchase'
@@ -4520,7 +4645,7 @@
consumes:
- application/json
parameters:
- - description: 閲囪喘鍗曠敤鎴峰悕, 閲囪喘鍗曟墜鏈哄彿鐮�
+ - description: 閲囪喘鍗�,閲囪喘鍗曚骇鍝�
in: body
name: data
required: true
@@ -4716,6 +4841,42 @@
summary: 鑾峰彇閲囪喘绫诲瀷鍒楄〃
tags:
- Purchase
+ /purchase/qualityInspectList:
+ get:
+ consumes:
+ - application/json
+ parameters:
+ - description: 鍏抽敭瀛�
+ in: query
+ name: keyword
+ type: string
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
+ type: integer
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鍒嗛〉鑾峰彇璐ㄦ鍗曞垪琛�,杩斿洖鍖呮嫭鍒楄〃,鎬绘暟,椤电爜,姣忛〉鏁伴噺
+ schema:
+ allOf:
+ - $ref: '#/definitions/response.Response'
+ - properties:
+ data:
+ $ref: '#/definitions/response.PageResult'
+ msg:
+ type: string
+ type: object
+ security:
+ - ApiKeyAuth: []
+ summary: 鍒嗛〉鑾峰彇璐ㄦ鍗曞垪琛�
+ tags:
+ - QualityInspect
/purchase/submit/{id}:
post:
consumes:
--
Gitblit v1.8.0