From 3f5aa5f14c56e55a05902c7e3b9b112eb23ee80d Mon Sep 17 00:00:00 2001 From: liujiandao <274878379@qq.com> Date: 星期三, 03 一月 2024 17:27:04 +0800 Subject: [PATCH] 采购类型修改 --- api/v1/purchase/quality_inspection.go | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/api/v1/purchase/quality_inspection.go b/api/v1/purchase/quality_inspection.go index 803f593..7a2afeb 100644 --- a/api/v1/purchase/quality_inspection.go +++ b/api/v1/purchase/quality_inspection.go @@ -5,9 +5,9 @@ "github.com/gin-gonic/gin" "go.uber.org/zap" "srm/global" - "srm/model/common/request" "srm/model/common/response" "srm/model/purchase" + purchaserequest "srm/model/purchase/request" purchaseRes "srm/model/purchase/response" "srm/proto/qualityinspect" service "srm/service/purchase" @@ -22,11 +22,11 @@ // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data query request.PageInfo true "椤电爜, 姣忛〉澶у皬" +// @Param data query purchaserequest.PurchaseSearch true "鍙傛暟" // @Success 200 {object} response.Response{data=response.PageResult,msg=string} "鍒嗛〉鑾峰彇璐ㄦ鍗曞垪琛�,杩斿洖鍖呮嫭鍒楄〃,鎬绘暟,椤电爜,姣忛〉鏁伴噺" // @Router /purchase/qualityInspectList [get] func (e *QualityInspectApi) GetQualityInspectList(c *gin.Context) { - var pageInfo request.PageInfo + var pageInfo purchaserequest.PurchaseSearch err := c.ShouldBindQuery(&pageInfo) if err != nil { response.FailWithMessage(err.Error(), c) @@ -44,7 +44,7 @@ purchaseNumbers = append(purchaseNumbers, item.Number) } resultList := make([]*purchaseRes.QualityInspectList, 0, len(purchaseList)) - if len(purchaseList) == 0 { + if len(purchaseList) != 0 { err = utils.AssignTo(purchaseList, &resultList) if err != nil { global.GVA_LOG.Error("mapStructure decode", zap.Error(err)) @@ -77,7 +77,6 @@ } } } - response.OkWithDetailed(response.PageResult{ List: resultList, Total: total, @@ -87,6 +86,29 @@ } // +//// QualityTest +//// @Tags QualityInspect +//// @Summary QualityTest +//// @Security ApiKeyAuth +//// @accept application/json +//// @Produce application/json +//// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "鍒嗛〉鑾峰彇璐ㄦ鍗曞垪琛�,杩斿洖鍖呮嫭鍒楄〃,鎬绘暟,椤电爜,姣忛〉鏁伴噺" +//// @Router /purchase/qualityTest [get] +//func (e *QualityInspectApi) QualityTest(c *gin.Context) { +// client := quality.NewQualityServiceClient(qualityinspect.Conn) +// list, err := client.GetQualityStatusList(context.Background(), &quality.QualityStatusRequest{WorkOrderId: []string{"GD-0116", "GD-0117", "GD-0156"}}) +// if err != nil { +// fmt.Println(err) +// response.FailWithMessage("鍐呴儴閿欒", c) +// return +// } +// for _, status := range list.List { +// fmt.Println(status) +// } +// response.Ok(c) +//} + +// //// GetQualityInspect //// @Tags QualityInspect //// @Summary 鑾峰彇鍗曚竴璐ㄦ鍗曚俊鎭� -- Gitblit v1.8.0