From ecc6048c4257f4d8ad120ebf2fdb21356dcca977 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 24 十一月 2023 10:25:46 +0800
Subject: [PATCH] 根据编码查询供应商

---
 api/v1/test/supplier.go  |   23 +++++++
 service/test/supplier.go |    4 
 docs/swagger.yaml        |   22 +++++++
 router/test/supplier.go  |    5 +
 docs/docs.go             |   36 ++++++++++++
 docs/swagger.json        |   36 ++++++++++++
 6 files changed, 122 insertions(+), 4 deletions(-)

diff --git a/api/v1/test/supplier.go b/api/v1/test/supplier.go
index f7e30b5..674d309 100644
--- a/api/v1/test/supplier.go
+++ b/api/v1/test/supplier.go
@@ -151,6 +151,29 @@
 	}
 }
 
+// GetSupplierByNumber 鐢ㄧ紪鐮佹煡璇upplier
+// @Tags Supplier
+// @Summary 鐢ㄧ紪鐮佹煡璇upplier
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param     number  path string true  "渚涘簲鍟嗙紪鐮�"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"鏌ヨ鎴愬姛"}"
+// @Router /s/getSupplierByNumber/{number} [get]
+func (sApi *SupplierApi) GetSupplierByNumber(c *gin.Context) {
+	number := c.Param("number")
+	if number == "" {
+		response.FailWithMessage("缂栫爜鍙傛暟涓嶈兘涓虹┖", c)
+		return
+	}
+	if res, err := sService.GetSupplierByNumber(number); err != nil {
+		global.GVA_LOG.Error("鏌ヨ澶辫触!", zap.Error(err))
+		response.FailWithMessage("鏌ヨ澶辫触", c)
+	} else {
+		response.OkWithData(gin.H{"res": res}, c)
+	}
+}
+
 // GetSupplierList 鍒嗛〉鑾峰彇Supplier鍒楄〃
 // @Tags Supplier
 // @Summary 鍒嗛〉鑾峰彇Supplier鍒楄〃
diff --git a/docs/docs.go b/docs/docs.go
index 240e3be..750d564 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -2249,6 +2249,42 @@
                 }
             }
         },
+        "/s/getSupplierByNumber/{number}": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Supplier"
+                ],
+                "summary": "鐢ㄧ紪鐮佹煡璇upplier",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "渚涘簲鍟嗙紪鐮�",
+                        "name": "number",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{\"success\":true,\"data\":{},\"msg\":\"鏌ヨ鎴愬姛\"}",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        },
         "/s/getSupplierList": {
             "get": {
                 "security": [
diff --git a/docs/swagger.json b/docs/swagger.json
index c34b2f1..d8aaa68 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -2240,6 +2240,42 @@
                 }
             }
         },
+        "/s/getSupplierByNumber/{number}": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Supplier"
+                ],
+                "summary": "鐢ㄧ紪鐮佹煡璇upplier",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "渚涘簲鍟嗙紪鐮�",
+                        "name": "number",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{\"success\":true,\"data\":{},\"msg\":\"鏌ヨ鎴愬姛\"}",
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        },
         "/s/getSupplierList": {
             "get": {
                 "security": [
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 53b4e11..6334613 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -2248,6 +2248,28 @@
       summary: 鐢╥d鏌ヨSupplier
       tags:
       - Supplier
+  /s/getSupplierByNumber/{number}:
+    get:
+      consumes:
+      - application/json
+      parameters:
+      - description: 渚涘簲鍟嗙紪鐮�
+        in: path
+        name: number
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: '{"success":true,"data":{},"msg":"鏌ヨ鎴愬姛"}'
+          schema:
+            type: string
+      security:
+      - ApiKeyAuth: []
+      summary: 鐢ㄧ紪鐮佹煡璇upplier
+      tags:
+      - Supplier
   /s/getSupplierList:
     get:
       consumes:
diff --git a/router/test/supplier.go b/router/test/supplier.go
index c76cf9c..5ab0466 100644
--- a/router/test/supplier.go
+++ b/router/test/supplier.go
@@ -21,7 +21,8 @@
 		sRouter.POST("changeSupplierStatus", sApi.ChangeSupplierStatus) // 鏇存柊Supplier鐘舵��
 	}
 	{
-		sRouterWithoutRecord.GET("findSupplier", sApi.FindSupplier)       // 鏍规嵁ID鑾峰彇Supplier
-		sRouterWithoutRecord.GET("getSupplierList", sApi.GetSupplierList) // 鑾峰彇Supplier鍒楄〃
+		sRouterWithoutRecord.GET("findSupplier", sApi.FindSupplier)                       // 鏍规嵁ID鑾峰彇Supplier
+		sRouterWithoutRecord.GET("getSupplierByNumber/:number", sApi.GetSupplierByNumber) // 鐢ㄧ紪鐮佹煡璇upplier
+		sRouterWithoutRecord.GET("getSupplierList", sApi.GetSupplierList)                 // 鑾峰彇Supplier鍒楄〃
 	}
 }
diff --git a/service/test/supplier.go b/service/test/supplier.go
index 082d181..87a8024 100644
--- a/service/test/supplier.go
+++ b/service/test/supplier.go
@@ -36,13 +36,13 @@
 
 // GetSupplier 鏍规嵁id鑾峰彇Supplier璁板綍
 func (sService *SupplierService) GetSupplier(id uint) (s test.Supplier, err error) {
-	err = global.GVA_DB.Where("id = ?", id).First(&s).Error
+	err = global.GVA_DB.Model(&test.Supplier{}).Where("id = ?", id).First(&s).Error
 	return
 }
 
 // GetSupplierByNumber 鏍规嵁缂栫爜鑾峰彇Supplier璁板綍
 func (sService *SupplierService) GetSupplierByNumber(number string) (s test.Supplier, err error) {
-	err = global.GVA_DB.Where("number = ?", number).First(&s).Error
+	err = global.GVA_DB.Model(&test.Supplier{}).Where("number = ?", number).Preload("Contract").First(&s).Error
 	return
 }
 

--
Gitblit v1.8.0