From dd07a07290bf66fde945dbbebc23ae048205775d Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 22 九月 2023 10:19:46 +0800
Subject: [PATCH] 分页查询product列表搜索条件合并
---
docs/docs.go | 326 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 279 insertions(+), 47 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 00c67da..bd498d8 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1919,7 +1919,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -1937,6 +1936,11 @@
{
"type": "integer",
"name": "supplierID",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
}
],
@@ -1970,7 +1974,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -1988,6 +1991,11 @@
{
"type": "integer",
"name": "supplierID",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
}
],
@@ -2021,7 +2029,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -2068,6 +2075,11 @@
"type": "integer",
"name": "supplierID",
"in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
+ "in": "query"
}
],
"responses": {
@@ -2100,7 +2112,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -2118,6 +2129,11 @@
{
"type": "integer",
"name": "supplierID",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
}
],
@@ -2189,7 +2205,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -2221,6 +2236,11 @@
"type": "integer",
"description": "绠＄悊ID",
"name": "sysUserId",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
}
],
@@ -2946,7 +2966,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -2959,6 +2978,11 @@
{
"type": "string",
"name": "name",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
}
],
@@ -2992,7 +3016,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -3033,6 +3056,11 @@
{
"type": "string",
"name": "startCreatedAt",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
}
],
@@ -3334,7 +3362,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -3347,6 +3374,11 @@
{
"type": "string",
"name": "nickname",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
},
{
@@ -3390,7 +3422,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -3431,6 +3462,11 @@
{
"type": "string",
"name": "startCreatedAt",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
},
{
@@ -3474,7 +3510,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -3515,6 +3550,11 @@
{
"type": "string",
"name": "startCreatedAt",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
},
{
@@ -4170,7 +4210,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -4243,6 +4282,11 @@
{
"type": "string",
"name": "unit",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
}
],
@@ -4276,7 +4320,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -4376,7 +4419,17 @@
},
{
"type": "string",
+ "name": "supplierNumber",
+ "in": "query"
+ },
+ {
+ "type": "string",
"name": "unit",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
}
],
@@ -4410,7 +4463,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -4510,7 +4562,17 @@
},
{
"type": "string",
+ "name": "supplierNumber",
+ "in": "query"
+ },
+ {
+ "type": "string",
"name": "unit",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
}
],
@@ -4917,6 +4979,68 @@
}
}
},
+ "/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"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/purchase/submit/{id}": {
"post": {
"security": [
@@ -5157,7 +5281,6 @@
},
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -5219,6 +5342,11 @@
},
{
"type": "string",
+ "name": "updated_at",
+ "in": "query"
+ },
+ {
+ "type": "string",
"name": "url",
"in": "query"
}
@@ -5273,7 +5401,6 @@
},
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -5359,6 +5486,11 @@
{
"type": "string",
"name": "supplierType",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
},
{
@@ -5549,7 +5681,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -5562,6 +5693,11 @@
{
"type": "string",
"name": "name",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
}
],
@@ -5595,7 +5731,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -5636,6 +5771,11 @@
{
"type": "string",
"name": "startCreatedAt",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
}
],
@@ -5807,7 +5947,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -5839,6 +5978,11 @@
"type": "string",
"description": "瀛楀吀鍚嶏紙鑻憋級",
"name": "type",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
}
],
@@ -5888,7 +6032,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -5938,6 +6081,11 @@
"type": "string",
"description": "瀛楀吀鍚嶏紙鑻憋級",
"name": "type",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
}
],
@@ -6136,7 +6284,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -6168,6 +6315,11 @@
"type": "integer",
"description": "鍏宠仈鏍囪",
"name": "sysDictionaryID",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
},
{
@@ -6223,7 +6375,6 @@
"parameters": [
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -6273,6 +6424,11 @@
"type": "integer",
"description": "鍏宠仈鏍囪",
"name": "sysDictionaryID",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
},
{
@@ -6539,7 +6695,6 @@
},
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -6589,6 +6744,11 @@
"type": "integer",
"description": "璇锋眰鐘舵��",
"name": "status",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
},
{
@@ -6656,7 +6816,6 @@
},
{
"type": "string",
- "description": "鍒涘缓鏃堕棿",
"name": "created_at",
"in": "query"
},
@@ -6724,6 +6883,11 @@
"type": "integer",
"description": "璇锋眰鐘舵��",
"name": "status",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "updated_at",
"in": "query"
},
{
@@ -8275,7 +8439,6 @@
"type": "object",
"properties": {
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"customerName": {
@@ -8305,6 +8468,9 @@
"sysUserId": {
"description": "绠＄悊ID",
"type": "integer"
+ },
+ "updated_at": {
+ "type": "string"
}
}
},
@@ -8315,7 +8481,6 @@
"type": "integer"
},
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"exaFileChunk": {
@@ -8339,6 +8504,9 @@
},
"isFinish": {
"type": "boolean"
+ },
+ "updated_at": {
+ "type": "string"
}
}
},
@@ -8346,7 +8514,6 @@
"type": "object",
"properties": {
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"exaFileID": {
@@ -8361,6 +8528,9 @@
"id": {
"description": "涓婚敭ID",
"type": "integer"
+ },
+ "updated_at": {
+ "type": "string"
}
}
},
@@ -8368,7 +8538,6 @@
"type": "object",
"properties": {
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"id": {
@@ -8385,6 +8554,9 @@
},
"tag": {
"description": "鏂囦欢鏍囩",
+ "type": "string"
+ },
+ "updated_at": {
"type": "string"
},
"url": {
@@ -8437,7 +8609,6 @@
"type": "string"
},
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"creator": {
@@ -8456,6 +8627,10 @@
"description": "涓婚敭ID",
"type": "integer"
},
+ "invoiceAmount": {
+ "description": "宸叉敹绁ㄩ噾棰�",
+ "type": "number"
+ },
"name": {
"description": "閲囪喘鍚嶇О",
"type": "string"
@@ -8472,6 +8647,10 @@
"description": "鍗曟嵁绫诲瀷",
"type": "string"
},
+ "paidAmount": {
+ "description": "宸蹭粯閲戦",
+ "type": "number"
+ },
"phone": {
"description": "鑱旂郴浜虹數璇�",
"type": "string"
@@ -8487,6 +8666,10 @@
"$ref": "#/definitions/purchase.PriceAdjustmentType"
}
]
+ },
+ "principal": {
+ "description": "閲囪喘璐熻矗浜�",
+ "type": "string"
},
"purchaseType": {
"$ref": "#/definitions/purchase.PurchaseType"
@@ -8506,6 +8689,10 @@
"remark": {
"description": "澶囨敞",
"type": "string"
+ },
+ "shouldPayAmount": {
+ "description": "搴斾粯閲戦",
+ "type": "number"
},
"signingDate": {
"description": "绛剧害鏃ユ湡",
@@ -8529,6 +8716,13 @@
"totalPrice": {
"description": "浠风◣鍚堣",
"type": "number"
+ },
+ "unInvoiceAmount": {
+ "description": "鏈敹绁ㄩ噾棰�",
+ "type": "number"
+ },
+ "updated_at": {
+ "type": "string"
},
"warehouse": {
"description": "鏀惰揣浠撳簱",
@@ -8556,7 +8750,6 @@
"type": "number"
},
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"id": {
@@ -8582,6 +8775,9 @@
"total": {
"description": "閲囪喘鎬讳环",
"type": "number"
+ },
+ "updated_at": {
+ "type": "string"
}
}
},
@@ -8589,7 +8785,6 @@
"type": "object",
"properties": {
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"id": {
@@ -8607,6 +8802,9 @@
"sort": {
"description": "鎺掑簭",
"type": "integer"
+ },
+ "updated_at": {
+ "type": "string"
}
}
},
@@ -9009,7 +9207,6 @@
"type": "string"
},
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"desc": {
@@ -9046,6 +9243,9 @@
},
"path": {
"description": "api璺緞",
+ "type": "string"
+ },
+ "updated_at": {
"type": "string"
}
}
@@ -9593,7 +9793,6 @@
"type": "string"
},
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"description": {
@@ -9610,6 +9809,9 @@
},
"path": {
"description": "api璺緞",
+ "type": "string"
+ },
+ "updated_at": {
"type": "string"
}
}
@@ -9668,7 +9870,6 @@
"type": "object",
"properties": {
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"desc": {
@@ -9682,6 +9883,9 @@
"type": "string"
},
"packageName": {
+ "type": "string"
+ },
+ "updated_at": {
"type": "string"
}
}
@@ -9706,7 +9910,6 @@
"type": "string"
},
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"hidden": {
@@ -9752,6 +9955,9 @@
"sort": {
"description": "鎺掑簭鏍囪",
"type": "integer"
+ },
+ "updated_at": {
+ "type": "string"
}
}
},
@@ -9759,7 +9965,6 @@
"type": "object",
"properties": {
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"desc": {
@@ -9774,6 +9979,9 @@
},
"sysBaseMenuID": {
"type": "integer"
+ },
+ "updated_at": {
+ "type": "string"
}
}
},
@@ -9781,7 +9989,6 @@
"type": "object",
"properties": {
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"id": {
@@ -9799,6 +10006,9 @@
"description": "鍦板潃鏍忔惡甯﹀弬鏁颁负params杩樻槸query",
"type": "string"
},
+ "updated_at": {
+ "type": "string"
+ },
"value": {
"description": "鍦板潃鏍忔惡甯﹀弬鏁扮殑鍊�",
"type": "string"
@@ -9809,7 +10019,6 @@
"type": "object",
"properties": {
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"desc": {
@@ -9837,6 +10046,9 @@
"type": {
"description": "瀛楀吀鍚嶏紙鑻憋級",
"type": "string"
+ },
+ "updated_at": {
+ "type": "string"
}
}
},
@@ -9844,7 +10056,6 @@
"type": "object",
"properties": {
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"id": {
@@ -9866,6 +10077,9 @@
"sysDictionaryID": {
"description": "鍏宠仈鏍囪",
"type": "integer"
+ },
+ "updated_at": {
+ "type": "string"
},
"value": {
"description": "瀛楀吀鍊�",
@@ -9899,7 +10113,6 @@
"type": "string"
},
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"hidden": {
@@ -9948,6 +10161,9 @@
"sort": {
"description": "鎺掑簭鏍囪",
"type": "integer"
+ },
+ "updated_at": {
+ "type": "string"
}
}
},
@@ -9963,7 +10179,6 @@
"type": "string"
},
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"error_message": {
@@ -9997,6 +10212,9 @@
"status": {
"description": "璇锋眰鐘舵��",
"type": "integer"
+ },
+ "updated_at": {
+ "type": "string"
},
"user": {
"$ref": "#/definitions/system.SysUser"
@@ -10032,7 +10250,6 @@
"type": "string"
},
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"email": {
@@ -10063,6 +10280,9 @@
"description": "鐢ㄦ埛渚ц竟涓婚",
"type": "string"
},
+ "updated_at": {
+ "type": "string"
+ },
"userName": {
"description": "鐢ㄦ埛鐧诲綍鍚�",
"type": "string"
@@ -10085,7 +10305,6 @@
"type": "object",
"properties": {
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"fileName": {
@@ -10097,6 +10316,9 @@
},
"supplierID": {
"type": "integer"
+ },
+ "updated_at": {
+ "type": "string"
}
}
},
@@ -10104,7 +10326,6 @@
"type": "object",
"properties": {
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"id": {
@@ -10113,6 +10334,9 @@
},
"name": {
"type": "string"
+ },
+ "updated_at": {
+ "type": "string"
}
}
},
@@ -10120,7 +10344,6 @@
"type": "object",
"properties": {
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"id": {
@@ -10128,6 +10351,9 @@
"type": "integer"
},
"nickname": {
+ "type": "string"
+ },
+ "updated_at": {
"type": "string"
},
"userName": {
@@ -10142,7 +10368,6 @@
"type": "object",
"properties": {
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"deliveryTime": {
@@ -10190,6 +10415,9 @@
},
"unit": {
"type": "string"
+ },
+ "updated_at": {
+ "type": "string"
}
}
},
@@ -10212,7 +10440,6 @@
"$ref": "#/definitions/test.Contract"
},
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"detailAddress": {
@@ -10249,6 +10476,9 @@
"supplierType": {
"type": "string"
},
+ "updated_at": {
+ "type": "string"
+ },
"url": {
"type": "string"
}
@@ -10258,7 +10488,6 @@
"type": "object",
"properties": {
"created_at": {
- "description": "鍒涘缓鏃堕棿",
"type": "string"
},
"id": {
@@ -10267,6 +10496,9 @@
},
"name": {
"type": "string"
+ },
+ "updated_at": {
+ "type": "string"
}
}
}
--
Gitblit v1.8.0