From 68bb7ca9af76f83028da94c53436da679e00f067 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期二, 21 十一月 2023 15:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm
---
api/v1/salesDetails.go | 1
docs/swagger.yaml | 53 +++++++++++++
docs/docs.go | 82 ++++++++++++++++++++
docs/swagger.json | 82 ++++++++++++++++++++
4 files changed, 218 insertions(+), 0 deletions(-)
diff --git a/api/v1/salesDetails.go b/api/v1/salesDetails.go
index 6b71e25..0aea8f1 100644
--- a/api/v1/salesDetails.go
+++ b/api/v1/salesDetails.go
@@ -171,6 +171,7 @@
salesDetailsModel.QuotationId = salesDetails.QuotationId
salesDetailsModel.Status = salesDetails.Status
salesDetailsModel.Source = salesDetails.Source
+ salesDetailsModel.ProjectId = salesDetails.ProjectId
return ecode.OK, salesDetailsModel
}
diff --git a/docs/docs.go b/docs/docs.go
index caf496f..fa1dca8 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -7059,6 +7059,25 @@
}
}
},
+ "/api/salesDetails/getApsProjectList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "SalesDetails"
+ ],
+ "summary": "鑾峰彇aps椤圭洰鍒楄〃",
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/response.Response"
+ }
+ }
+ }
+ }
+ },
"/api/salesDetails/getProductInventoryInfo/{number}": {
"get": {
"produces": [
@@ -7124,6 +7143,36 @@
}
}
]
+ }
+ }
+ }
+ }
+ },
+ "/api/salesDetails/sendSalesDetailsToApsProject": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "SalesDetails"
+ ],
+ "summary": "鎺ㄩ�侀攢鍞槑缁嗕俊鎭埌aps椤圭洰妯″潡",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.SalesDetails"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/response.ListResponse"
}
}
}
@@ -12378,6 +12427,9 @@
"$ref": "#/definitions/model.Product"
}
},
+ "projectId": {
+ "type": "string"
+ },
"quotation": {
"$ref": "#/definitions/model.Quotation"
},
@@ -14513,11 +14565,17 @@
"request.AddSalesDetails": {
"type": "object",
"properties": {
+ "Member": {
+ "$ref": "#/definitions/model.User"
+ },
"address": {
"type": "string"
},
"addressee": {
"type": "string"
+ },
+ "client": {
+ "$ref": "#/definitions/model.Client"
},
"clientId": {
"type": "integer"
@@ -14559,6 +14617,9 @@
"items": {
"$ref": "#/definitions/model.Product"
}
+ },
+ "projectId": {
+ "type": "string"
},
"quotationId": {
"type": "integer"
@@ -16088,11 +16149,17 @@
"request.SalesDetails": {
"type": "object",
"properties": {
+ "Member": {
+ "$ref": "#/definitions/model.User"
+ },
"address": {
"type": "string"
},
"addressee": {
"type": "string"
+ },
+ "client": {
+ "$ref": "#/definitions/model.Client"
},
"clientId": {
"type": "integer"
@@ -16134,6 +16201,9 @@
"items": {
"$ref": "#/definitions/model.Product"
}
+ },
+ "projectId": {
+ "type": "string"
},
"quotationId": {
"type": "integer"
@@ -19347,6 +19417,18 @@
}
}
},
+ "response.Response": {
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "integer"
+ },
+ "data": {},
+ "msg": {
+ "type": "string"
+ }
+ }
+ },
"response.SaleChanceResponse": {
"type": "object",
"properties": {
diff --git a/docs/swagger.json b/docs/swagger.json
index cbe9c95..f8b86aa 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -7047,6 +7047,25 @@
}
}
},
+ "/api/salesDetails/getApsProjectList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "SalesDetails"
+ ],
+ "summary": "鑾峰彇aps椤圭洰鍒楄〃",
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/response.Response"
+ }
+ }
+ }
+ }
+ },
"/api/salesDetails/getProductInventoryInfo/{number}": {
"get": {
"produces": [
@@ -7112,6 +7131,36 @@
}
}
]
+ }
+ }
+ }
+ }
+ },
+ "/api/salesDetails/sendSalesDetailsToApsProject": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "SalesDetails"
+ ],
+ "summary": "鎺ㄩ�侀攢鍞槑缁嗕俊鎭埌aps椤圭洰妯″潡",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.SalesDetails"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/response.ListResponse"
}
}
}
@@ -12366,6 +12415,9 @@
"$ref": "#/definitions/model.Product"
}
},
+ "projectId": {
+ "type": "string"
+ },
"quotation": {
"$ref": "#/definitions/model.Quotation"
},
@@ -14501,11 +14553,17 @@
"request.AddSalesDetails": {
"type": "object",
"properties": {
+ "Member": {
+ "$ref": "#/definitions/model.User"
+ },
"address": {
"type": "string"
},
"addressee": {
"type": "string"
+ },
+ "client": {
+ "$ref": "#/definitions/model.Client"
},
"clientId": {
"type": "integer"
@@ -14547,6 +14605,9 @@
"items": {
"$ref": "#/definitions/model.Product"
}
+ },
+ "projectId": {
+ "type": "string"
},
"quotationId": {
"type": "integer"
@@ -16076,11 +16137,17 @@
"request.SalesDetails": {
"type": "object",
"properties": {
+ "Member": {
+ "$ref": "#/definitions/model.User"
+ },
"address": {
"type": "string"
},
"addressee": {
"type": "string"
+ },
+ "client": {
+ "$ref": "#/definitions/model.Client"
},
"clientId": {
"type": "integer"
@@ -16122,6 +16189,9 @@
"items": {
"$ref": "#/definitions/model.Product"
}
+ },
+ "projectId": {
+ "type": "string"
},
"quotationId": {
"type": "integer"
@@ -19335,6 +19405,18 @@
}
}
},
+ "response.Response": {
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "integer"
+ },
+ "data": {},
+ "msg": {
+ "type": "string"
+ }
+ }
+ },
"response.SaleChanceResponse": {
"type": "object",
"properties": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 1c70de8..076c9b8 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1482,6 +1482,8 @@
items:
$ref: '#/definitions/model.Product'
type: array
+ projectId:
+ type: string
quotation:
$ref: '#/definitions/model.Quotation'
quotationId:
@@ -2915,10 +2917,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:
@@ -2947,6 +2953,8 @@
items:
$ref: '#/definitions/model.Product'
type: array
+ projectId:
+ type: string
quotationId:
type: integer
remark:
@@ -4017,10 +4025,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:
@@ -4049,6 +4061,8 @@
items:
$ref: '#/definitions/model.Product'
type: array
+ projectId:
+ type: string
quotationId:
type: integer
remark:
@@ -6209,6 +6223,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:
@@ -10689,6 +10711,18 @@
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}:
get:
parameters:
@@ -10731,6 +10765,25 @@
summary: 閿�鍞槑缁嗗崟鍒楄〃
tags:
- SalesDetails
+ /api/salesDetails/sendSalesDetailsToApsProject:
+ 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: 鎺ㄩ�侀攢鍞槑缁嗕俊鎭埌aps椤圭洰妯″潡
+ tags:
+ - SalesDetails
/api/salesDetails/update:
put:
parameters:
--
Gitblit v1.8.0