From 6cce6de2161840f77d397fe25bee6096d0eb9877 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 22 三月 2024 19:37:21 +0800
Subject: [PATCH] 物料搜索接口

---
 controllers/order.go |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/controllers/order.go b/controllers/order.go
index d575584..f627704 100644
--- a/controllers/order.go
+++ b/controllers/order.go
@@ -8,8 +8,11 @@
 	"outsourcing/extend/code"
 	"outsourcing/extend/util"
 	"outsourcing/models"
+	"outsourcing/pkg/logx"
 	"outsourcing/pkg/structx"
 	"outsourcing/request"
+	"outsourcing/service"
+	"outsourcing/service/outsourcing"
 )
 
 type OrderController struct{}
@@ -282,10 +285,41 @@
 		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
 		return
 	}
-	list, err := models.NewOutsourcingOrderDeliveryDetailsSearch().SetOutsourcingOrderID(params.OutsourcingOrderID).SetPreload(true).FindNotTotal()
+	list, err := models.NewOutsourcingOrderDeliveryDetailsSearch().
+		SetOutsourcingOrderID(params.OutsourcingOrderID).
+		SetPreload(true).
+		SetOrder("id desc").
+		FindNotTotal()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "鏌ヨ澶辫触")
 		return
 	}
 	util.ResponseFormat(c, code.Success, list)
 }
+
+// MaterialSearch
+// @Tags      璁㈠崟绠＄悊
+// @Summary   鐗╂枡鎼滅储
+// @Produce   application/json
+// @Param     object  body    request.MaterialSearch true  "鍙傛暟"
+// @Success   200   {object}  util.ResponseList{[]models.OutsourcingOrderDeliveryDetails}  "鎴愬姛"
+// @Router    /api-outsourcing/v1/order/materialSearch [post]
+func (slf *OrderController) MaterialSearch(c *gin.Context) {
+	var params request.MaterialSearch
+	if err := c.BindJSON(&params); err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+		return
+	}
+	client := outsourcing.NewOutsourcingServiceClient(service.ApsServiceConn)
+	list, err := client.GetMaterialList(c, &outsourcing.GetMaterialListRequest{
+		Page:     int32(params.Page),
+		PageSize: int32(params.PageSize),
+		Keyword:  params.Keyword,
+	})
+	if err != nil {
+		logx.Errorf("grpc outsourcing GetProductList err:%v", err)
+		util.ResponseFormat(c, code.RequestParamError, "鏌ヨ澶辫触")
+		return
+	}
+	util.ResponseFormat(c, code.Success, list)
+}

--
Gitblit v1.8.0