From 1cd1206c18ed14dd9ebf2baf477f46c847a271b0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 15 三月 2024 16:39:19 +0800
Subject: [PATCH] merge
---
docs/docs.go | 604 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 542 insertions(+), 62 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 294962d..35d02d0 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -4947,10 +4947,7 @@
"type": "object",
"properties": {
"data": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/product.WorkOrderInfo"
- }
+ "$ref": "#/definitions/response.Info"
}
}
}
@@ -5032,6 +5029,12 @@
"type": "string",
"description": "浜у搧缂栫爜",
"name": "productNumber",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "description": "鎶ヤ环鍗曠紪鐮�",
+ "name": "quotationNumber",
"in": "query"
}
],
@@ -5320,6 +5323,40 @@
}
}
},
+ "/api/quotation/statistics": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Quotation"
+ ],
+ "summary": "鎶ヤ环鍗曠粺璁�",
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "object",
+ "additionalProperties": {
+ "type": "integer"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api/quotation/update": {
"put": {
"produces": [
@@ -5553,6 +5590,15 @@
"type": "integer",
"description": "姣忛〉澶у皬",
"name": "pageSize",
+ "in": "query"
+ },
+ {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ },
+ "collectionFormat": "csv",
+ "name": "principleIds",
"in": "query"
},
{
@@ -6962,36 +7008,6 @@
}
}
},
- "/api/salesDetails/createOperation": {
- "post": {
- "produces": [
- "application/json"
- ],
- "tags": [
- "SalesDetails"
- ],
- "summary": "鍒涘缓浜у搧鍑哄簱淇℃伅",
- "parameters": [
- {
- "description": "鏌ヨ鍙傛暟",
- "name": "object",
- "in": "body",
- "required": true,
- "schema": {
- "$ref": "#/definitions/request.SalesDetails"
- }
- }
- ],
- "responses": {
- "200": {
- "description": "OK",
- "schema": {
- "$ref": "#/definitions/response.ListResponse"
- }
- }
- }
- }
- },
"/api/salesDetails/delete": {
"delete": {
"produces": [
@@ -7050,6 +7066,85 @@
}
}
},
+ "/api/salesDetails/getApsProjectList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "SalesDetails"
+ ],
+ "summary": "鑾峰彇aps椤圭洰鍒楄〃",
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/response.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api/salesDetails/getDeliveryList": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "SalesDetails"
+ ],
+ "summary": "鍙戣揣鏄庣粏",
+ "parameters": [
+ {
+ "description": "鏄庣粏缂栫爜",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/v1.GetWarehouseProductInfoReq"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/response.ListResponse"
+ }
+ }
+ }
+ }
+ },
+ "/api/salesDetails/getDeliveryPrepareInfo": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "SalesDetails"
+ ],
+ "summary": "鑾峰彇浜у搧鍏ュ簱淇℃伅",
+ "parameters": [
+ {
+ "description": "鏄庣粏缂栫爜",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/v1.GetWarehouseProductInfoReq"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/response.ListResponse"
+ }
+ }
+ }
+ }
+ },
"/api/salesDetails/getProductInventoryInfo/{number}": {
"get": {
"produces": [
@@ -7058,7 +7153,35 @@
"tags": [
"SalesDetails"
],
- "summary": "鑾峰彇浜у搧搴撳瓨淇℃伅",
+ "summary": "鑾峰彇浜у搧鍙戣揣淇℃伅",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "鏄庣粏缂栫爜",
+ "name": "number",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/response.ListResponse"
+ }
+ }
+ }
+ }
+ },
+ "/api/salesDetails/getSalesDetailsProductInfo/{number}": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "SalesDetails"
+ ],
+ "summary": "鑾峰彇閿�鍞槑缁嗕骇鍝佷俊鎭�",
"parameters": [
{
"type": "string",
@@ -7115,6 +7238,36 @@
}
}
]
+ }
+ }
+ }
+ }
+ },
+ "/api/salesDetails/sendSalesDetailsToOtherSystem": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "SalesDetails"
+ ],
+ "summary": "鎺ㄩ�侀攢鍞槑缁嗕俊鎭埌鍏朵粬绯荤粺",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.SalesDetails"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/response.ListResponse"
}
}
}
@@ -9758,6 +9911,96 @@
}
}
},
+ "/api/system/getSystemSet": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺璁剧疆"
+ ],
+ "summary": "鑾峰彇绯荤粺璁剧疆",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "object",
+ "additionalProperties": true
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api/system/saveSystemSet": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺璁剧疆"
+ ],
+ "summary": "淇濆瓨绯荤粺璁剧疆",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.SaveSystemSet"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api/system/useSystemSet/{modeType}": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺璁剧疆"
+ ],
+ "summary": "浣跨敤绯荤粺璁剧疆",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "鏌ヨ鍙傛暟",
+ "name": "modeType",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/response.ListResponse"
+ }
+ }
+ }
+ }
+ },
"/api/timeSpent/add": {
"post": {
"produces": [
@@ -10498,16 +10741,22 @@
1,
2,
3,
- 4
+ 4,
+ 5,
+ 6
],
"x-enum-comments": {
+ "InStock": "澶囪揣涓�",
"OverCLose": "宸插叧闂�",
"OverOutbound": "鍑哄簱瀹屾垚",
"WaitConfirmed": "寰呯‘璁�",
+ "WaitDecompose": "寰呭垎瑙�",
"WaitOutbound": "寰呭嚭搴�"
},
"x-enum-varnames": [
"WaitConfirmed",
+ "WaitDecompose",
+ "InStock",
"WaitOutbound",
"OverOutbound",
"OverCLose"
@@ -11815,11 +12064,17 @@
"amount": {
"type": "number"
},
+ "cost": {
+ "type": "string"
+ },
"desc": {
"type": "string"
},
"id": {
"type": "integer"
+ },
+ "margin": {
+ "type": "string"
},
"name": {
"type": "string"
@@ -11830,8 +12085,20 @@
"price": {
"type": "number"
},
+ "profit": {
+ "type": "string"
+ },
+ "specs": {
+ "type": "string"
+ },
"total": {
"type": "number"
+ },
+ "type": {
+ "type": "string"
+ },
+ "unit": {
+ "type": "string"
}
}
},
@@ -11855,6 +12122,10 @@
"model.Quotation": {
"type": "object",
"properties": {
+ "amountTotal": {
+ "description": "浠锋牸鍚堣",
+ "type": "number"
+ },
"client": {
"$ref": "#/definitions/model.Client"
},
@@ -12365,6 +12636,9 @@
"items": {
"$ref": "#/definitions/model.Product"
}
+ },
+ "projectId": {
+ "type": "string"
},
"quotation": {
"$ref": "#/definitions/model.Quotation"
@@ -13301,6 +13575,23 @@
}
}
},
+ "model.SystemSet": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "modeType": {
+ "type": "string"
+ },
+ "name": {
+ "type": "string"
+ },
+ "value": {
+ "type": "string"
+ }
+ }
+ },
"model.TimeSpent": {
"type": "object",
"properties": {
@@ -13362,6 +13653,10 @@
"type": "string"
},
"realName": {
+ "type": "string"
+ },
+ "subUserIds": {
+ "description": "涓嬪睘鍛樺伐鐢ㄦ埛id,鐢ㄩ�楀彿鍒嗗紑",
"type": "string"
},
"userType": {
@@ -13436,32 +13731,6 @@
"type": "string"
},
"Unit": {
- "type": "string"
- }
- }
- },
- "product.WorkOrderInfo": {
- "type": "object",
- "properties": {
- "EndTime": {
- "type": "string"
- },
- "OrderId": {
- "type": "string"
- },
- "OrderStatus": {
- "type": "string"
- },
- "ProductName": {
- "type": "string"
- },
- "StartTime": {
- "type": "string"
- },
- "WorkOrderId": {
- "type": "string"
- },
- "WorkOrderStatus": {
"type": "string"
}
}
@@ -14497,11 +14766,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"
@@ -14543,6 +14818,9 @@
"items": {
"$ref": "#/definitions/model.Product"
}
+ },
+ "projectId": {
+ "type": "string"
},
"quotationId": {
"type": "integer"
@@ -15582,6 +15860,9 @@
"request.GetContractList": {
"type": "object",
"properties": {
+ "keyword": {
+ "type": "string"
+ },
"page": {
"description": "椤电爜",
"type": "integer"
@@ -15647,6 +15928,12 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ },
+ "principalIds": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
},
"sourceId": {
"type": "integer"
@@ -16066,11 +16353,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"
@@ -16112,6 +16405,9 @@
"items": {
"$ref": "#/definitions/model.Product"
}
+ },
+ "projectId": {
+ "type": "string"
},
"quotationId": {
"type": "integer"
@@ -16245,6 +16541,17 @@
"$ref": "#/definitions/constvar.SalesReturnSourceType"
}
]
+ }
+ }
+ },
+ "request.SaveSystemSet": {
+ "type": "object",
+ "properties": {
+ "sets": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.SystemSet"
+ }
}
}
},
@@ -19108,6 +19415,29 @@
}
}
},
+ "response.Info": {
+ "type": "object",
+ "properties": {
+ "makeInfo": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.WorkOrderInfo"
+ }
+ },
+ "outsourcingInfo": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.OutsourcingInfo"
+ }
+ },
+ "purchaseInfo": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.Purchase"
+ }
+ }
+ }
+ },
"response.IsInvoiceResponse": {
"type": "object",
"properties": {
@@ -19209,6 +19539,49 @@
}
}
},
+ "response.OutsourcingInfo": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "璁㈠崟鏁伴噺",
+ "type": "integer"
+ },
+ "endTime": {
+ "type": "string"
+ },
+ "finishAmount": {
+ "description": "瀹屾垚鏁伴噺",
+ "type": "integer"
+ },
+ "outsourcingId": {
+ "description": "濮斿璁㈠崟id",
+ "type": "string"
+ },
+ "outsourcingStatus": {
+ "type": "string"
+ },
+ "productId": {
+ "type": "string"
+ },
+ "productName": {
+ "type": "string"
+ },
+ "specs": {
+ "description": "鐗╂枡瑙勬牸",
+ "type": "string"
+ },
+ "startTime": {
+ "type": "string"
+ },
+ "supplierName": {
+ "type": "string"
+ },
+ "unit": {
+ "description": "鍗曚綅",
+ "type": "string"
+ }
+ }
+ },
"response.PlanResponse": {
"type": "object",
"properties": {
@@ -19242,6 +19615,45 @@
"items": {
"$ref": "#/definitions/model.Province"
}
+ }
+ }
+ },
+ "response.Purchase": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "璁㈠崟鏁伴噺",
+ "type": "integer"
+ },
+ "finishAmount": {
+ "description": "瀹屾垚鏁伴噺",
+ "type": "integer"
+ },
+ "productId": {
+ "type": "string"
+ },
+ "productName": {
+ "type": "string"
+ },
+ "purchaseName": {
+ "type": "string"
+ },
+ "purchaseNumber": {
+ "type": "string"
+ },
+ "specs": {
+ "description": "鐗╂枡瑙勬牸",
+ "type": "string"
+ },
+ "status": {
+ "type": "integer"
+ },
+ "supplierName": {
+ "type": "string"
+ },
+ "unit": {
+ "description": "鍗曚綅",
+ "type": "string"
}
}
},
@@ -19322,6 +19734,18 @@
"items": {
"$ref": "#/definitions/model.Repository"
}
+ }
+ }
+ },
+ "response.Response": {
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "integer"
+ },
+ "data": {},
+ "msg": {
+ "type": "string"
}
}
},
@@ -19538,6 +19962,62 @@
}
}
}
+ },
+ "response.WorkOrderInfo": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "璁㈠崟鏁伴噺",
+ "type": "integer"
+ },
+ "endTime": {
+ "type": "string"
+ },
+ "finishAmount": {
+ "description": "瀹屾垚鏁伴噺",
+ "type": "integer"
+ },
+ "orderId": {
+ "type": "string"
+ },
+ "orderStatus": {
+ "type": "string"
+ },
+ "productId": {
+ "type": "string"
+ },
+ "productName": {
+ "type": "string"
+ },
+ "specs": {
+ "description": "鐗╂枡瑙勬牸",
+ "type": "string"
+ },
+ "startTime": {
+ "type": "string"
+ },
+ "unit": {
+ "description": "鍗曚綅",
+ "type": "string"
+ },
+ "workOrderId": {
+ "type": "string"
+ },
+ "workOrderStatus": {
+ "type": "string"
+ }
+ }
+ },
+ "v1.GetWarehouseProductInfoReq": {
+ "type": "object",
+ "properties": {
+ "saleDetailID": {
+ "type": "integer"
+ },
+ "saleDetailNumber": {
+ "type": "string"
+ }
+ }
}
}
}`
--
Gitblit v1.8.0