From 84d2953e7b641600779e7aecc80bdd35e96d31d6 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期二, 06 二月 2024 10:13:12 +0800
Subject: [PATCH] 拦截器
---
api/v1/purchase/purchase.go | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/api/v1/purchase/purchase.go b/api/v1/purchase/purchase.go
index c037be0..e723875 100644
--- a/api/v1/purchase/purchase.go
+++ b/api/v1/purchase/purchase.go
@@ -2,20 +2,16 @@
import (
"context"
- "fmt"
"github.com/gin-gonic/gin"
"go.uber.org/zap"
"gorm.io/gorm"
"srm/global"
- "srm/model/common/request"
"srm/model/common/response"
"srm/model/purchase"
purchaserequest "srm/model/purchase/request"
"srm/proto/purchase_wms"
"strconv"
"strings"
- "time"
-
//"srm/model/purchase"
//"srm/model/purchase"
@@ -55,7 +51,6 @@
purchaseRecord.Status = purchase.OrderStatusConfirmed
purchaseRecord.HandledBy = "admin"
purchaseRecord.Creator = "admin"
- purchaseRecord.Number = fmt.Sprintf("CG%v", time.Now().Unix())
purchaseRecord.Principal = "admin"
purchaseRecord.OrderType = "閲囪喘璁㈠崟"
@@ -196,11 +191,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/purchaseList [get]
func (e *PurchaseApi) GetPurchaseList(c *gin.Context) {
- var pageInfo request.PageInfo
+ var pageInfo purchaserequest.PurchaseSearch
err := c.ShouldBindQuery(&pageInfo)
if err != nil {
response.FailWithMessage(err.Error(), c)
@@ -242,6 +237,7 @@
response.FailWithMessage(err.Error(), c)
return
}
+ warehouse := ""
if params.Status == purchase.OrderStatusReceived {
data, err := service.NewPurchaseService().GetPurchase(uint(params.Id))
if err != nil {
@@ -263,19 +259,21 @@
product = append(product, &p)
}
client := purchase_wms.NewPurchaseServiceClient(purchase_wms.PurchaseConn)
- _, err = client.PurchaseToWms(context.Background(), &purchase_wms.PurchaseToWmsRequest{
+ resp, err := client.PurchaseToWms(context.Background(), &purchase_wms.PurchaseToWmsRequest{
Number: data.Number,
SupplierName: data.Supplier.Name,
Product: product,
+ Source: "SRM_PURCHASE",
})
if err != nil {
global.GVA_LOG.Error("grpc璋冪敤澶辫触!", zap.Error(err))
response.FailWithMessage("grpc璋冪敤澶辫触", c)
return
}
+ warehouse = resp.Warehouse
}
- err = service.NewPurchaseService().Submit(params.Id, params.Status)
+ err = service.NewPurchaseService().Submit(params.Id, params.Status, warehouse)
if err != nil {
global.GVA_LOG.Error("鏇存柊澶辫触!", zap.Error(err))
response.FailWithMessage("鏇存柊澶辫触", c)
--
Gitblit v1.8.0