From f1842bf9b5bb69b5078a215c02cb16b7e33f893a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 08 一月 2024 14:38:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm
---
docs/swagger.yaml | 256 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 217 insertions(+), 39 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index aa85bd5..cd49b10 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1118,18 +1118,26 @@
properties:
amount:
type: number
+ cost:
+ type: string
desc:
type: string
id:
type: integer
+ margin:
+ type: string
name:
type: string
number:
type: string
price:
type: number
+ profit:
+ type: string
total:
type: number
+ unit:
+ type: string
type: object
model.Province:
properties:
@@ -1144,6 +1152,9 @@
type: object
model.Quotation:
properties:
+ amountTotal:
+ description: 浠锋牸鍚堣
+ type: number
client:
$ref: '#/definitions/model.Client'
client_id:
@@ -1480,6 +1491,8 @@
items:
$ref: '#/definitions/model.Product'
type: array
+ projectId:
+ type: string
quotation:
$ref: '#/definitions/model.Quotation'
quotationId:
@@ -2107,6 +2120,17 @@
$ref: '#/definitions/model.Product'
type: array
type: object
+ model.SystemSet:
+ properties:
+ id:
+ type: integer
+ modeType:
+ type: string
+ name:
+ type: string
+ value:
+ type: string
+ type: object
model.TimeSpent:
properties:
id:
@@ -2148,6 +2172,9 @@
pos:
type: string
realName:
+ type: string
+ subUserIds:
+ description: 涓嬪睘鍛樺伐鐢ㄦ埛id,鐢ㄩ�楀彿鍒嗗紑
type: string
userType:
$ref: '#/definitions/constvar.UserType'
@@ -2200,23 +2227,6 @@
description: 鍨嬪彿
type: string
Unit:
- type: string
- type: object
- product.WorkOrderInfo:
- properties:
- EndTime:
- type: string
- OrderId:
- type: string
- OrderStatus:
- type: string
- ProductName:
- type: string
- StartTime:
- type: string
- WorkOrderId:
- type: string
- WorkOrderStatus:
type: string
type: object
request.AddAccountId:
@@ -2910,10 +2920,14 @@
type: object
request.AddSalesDetails:
properties:
+ Member:
+ $ref: '#/definitions/model.User'
address:
type: string
addressee:
type: string
+ client:
+ $ref: '#/definitions/model.Client'
clientId:
type: integer
codeStandID:
@@ -2942,6 +2956,8 @@
items:
$ref: '#/definitions/model.Product'
type: array
+ projectId:
+ type: string
quotationId:
type: integer
remark:
@@ -3661,6 +3677,8 @@
type: object
request.GetContractList:
properties:
+ keyword:
+ type: string
page:
description: 椤电爜
type: integer
@@ -3712,6 +3730,10 @@
pageSize:
description: 姣忛〉澶у皬
type: integer
+ principalIds:
+ items:
+ type: integer
+ type: array
sourceId:
type: integer
sourceType:
@@ -4008,10 +4030,14 @@
type: object
request.SalesDetails:
properties:
+ Member:
+ $ref: '#/definitions/model.User'
address:
type: string
addressee:
type: string
+ client:
+ $ref: '#/definitions/model.Client'
clientId:
type: integer
codeStandID:
@@ -4040,6 +4066,8 @@
items:
$ref: '#/definitions/model.Product'
type: array
+ projectId:
+ type: string
quotationId:
type: integer
remark:
@@ -4129,6 +4157,13 @@
allOf:
- $ref: '#/definitions/constvar.SalesReturnSourceType'
description: 婧愬崟绫诲瀷锛�1閿�鍞槑缁嗭級
+ type: object
+ request.SaveSystemSet:
+ properties:
+ sets:
+ items:
+ $ref: '#/definitions/model.SystemSet'
+ type: array
type: object
request.SetAuthorityMenu:
properties:
@@ -6062,6 +6097,17 @@
$ref: '#/definitions/model.Industry'
type: array
type: object
+ response.Info:
+ properties:
+ makeInfo:
+ items:
+ $ref: '#/definitions/response.WorkOrderInfo'
+ type: array
+ purchaseInfo:
+ items:
+ $ref: '#/definitions/response.Purchase'
+ type: array
+ type: object
response.IsInvoiceResponse:
properties:
list:
@@ -6150,6 +6196,19 @@
$ref: '#/definitions/model.Province'
type: array
type: object
+ response.Purchase:
+ properties:
+ amount:
+ type: integer
+ purchaseName:
+ type: string
+ purchaseNumber:
+ type: string
+ status:
+ type: integer
+ supplierName:
+ type: string
+ type: object
response.QuotationResponse:
properties:
count:
@@ -6200,6 +6259,14 @@
items:
$ref: '#/definitions/model.Repository'
type: array
+ type: object
+ response.Response:
+ properties:
+ code:
+ type: integer
+ data: {}
+ msg:
+ type: string
type: object
response.SaleChanceResponse:
properties:
@@ -6337,6 +6404,23 @@
items:
$ref: '#/definitions/model.TimelyRate'
type: array
+ type: object
+ response.WorkOrderInfo:
+ properties:
+ endTime:
+ type: string
+ orderId:
+ type: string
+ orderStatus:
+ type: string
+ productName:
+ type: string
+ startTime:
+ type: string
+ workOrderId:
+ type: string
+ workOrderStatus:
+ type: string
type: object
info:
contact: {}
@@ -9375,9 +9459,7 @@
- $ref: '#/definitions/contextx.Response'
- properties:
data:
- items:
- $ref: '#/definitions/product.WorkOrderInfo'
- type: array
+ $ref: '#/definitions/response.Info'
type: object
summary: 鑾峰彇浜у搧璁㈠崟淇℃伅
tags:
@@ -9423,6 +9505,10 @@
- description: 浜у搧缂栫爜
in: query
name: productNumber
+ type: string
+ - description: 鎶ヤ环鍗曠紪鐮�
+ in: query
+ name: quotationNumber
type: string
produces:
- application/json
@@ -9601,6 +9687,25 @@
summary: 鎶ヤ环鍗曞垪琛�
tags:
- Quotation
+ /api/quotation/statistics:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ additionalProperties:
+ type: integer
+ type: object
+ type: object
+ summary: 鎶ヤ环鍗曠粺璁�
+ tags:
+ - Quotation
/api/quotation/update:
put:
parameters:
@@ -9745,6 +9850,12 @@
in: query
name: pageSize
type: integer
+ - collectionFormat: csv
+ in: query
+ items:
+ type: integer
+ name: principleIds
+ type: array
- in: query
name: sourceId
type: integer
@@ -10618,25 +10729,6 @@
summary: 娣诲姞閿�鍞槑缁�
tags:
- SalesDetails
- /api/salesDetails/createOperation:
- post:
- parameters:
- - description: 鏌ヨ鍙傛暟
- in: body
- name: object
- required: true
- schema:
- $ref: '#/definitions/request.SalesDetails'
- produces:
- - application/json
- responses:
- "200":
- description: OK
- schema:
- $ref: '#/definitions/response.ListResponse'
- summary: 鍒涘缓浜у搧鍑哄簱淇℃伅
- tags:
- - SalesDetails
/api/salesDetails/delete:
delete:
parameters:
@@ -10672,6 +10764,18 @@
schema:
$ref: '#/definitions/contextx.Response'
summary: 鍒犻櫎閿�鍞槑缁�
+ tags:
+ - SalesDetails
+ /api/salesDetails/getApsProjectList:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ $ref: '#/definitions/response.Response'
+ summary: 鑾峰彇aps椤圭洰鍒楄〃
tags:
- SalesDetails
/api/salesDetails/getProductInventoryInfo/{number}:
@@ -10714,6 +10818,25 @@
$ref: '#/definitions/response.SalesDetailsResponse'
type: object
summary: 閿�鍞槑缁嗗崟鍒楄〃
+ tags:
+ - SalesDetails
+ /api/salesDetails/sendSalesDetailsToOtherSystem:
+ post:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.SalesDetails'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ $ref: '#/definitions/response.ListResponse'
+ summary: 鎺ㄩ�侀攢鍞槑缁嗕俊鎭埌鍏朵粬绯荤粺
tags:
- SalesDetails
/api/salesDetails/update:
@@ -12344,6 +12467,61 @@
summary: 鏇存柊瀛愯鍗�
tags:
- SubOrder
+ /api/system/getSystemSet:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ additionalProperties: true
+ type: object
+ type: object
+ summary: 鑾峰彇绯荤粺璁剧疆
+ tags:
+ - 绯荤粺璁剧疆
+ /api/system/saveSystemSet:
+ post:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.SaveSystemSet'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/contextx.Response'
+ summary: 淇濆瓨绯荤粺璁剧疆
+ tags:
+ - 绯荤粺璁剧疆
+ /api/system/useSystemSet/{modeType}:
+ get:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: path
+ name: modeType
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ $ref: '#/definitions/response.ListResponse'
+ summary: 浣跨敤绯荤粺璁剧疆
+ tags:
+ - 绯荤粺璁剧疆
/api/timeSpent/add:
post:
parameters:
--
Gitblit v1.8.0