From e5a48de88081f1fe0e5250a6e147c392d22acd4b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 19 三月 2024 13:09:38 +0800
Subject: [PATCH] 发货信息字段完善
---
api/v1/salesDetails.go | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/api/v1/salesDetails.go b/api/v1/salesDetails.go
index f6c2931..9e1abda 100644
--- a/api/v1/salesDetails.go
+++ b/api/v1/salesDetails.go
@@ -254,7 +254,7 @@
}
number := c.Param("number")
client := product_inventory.NewProductInventoryServiceClient(grpc_init.ProductInventoryServiceConn)
- info, err := client.GetInventoryProductInfo(ctx.GetCtx(), &product_inventory.GetInventoryProductInfoRequest{Number: number})
+ info, err := client.GetOrderInputAndOutputInfo(ctx.GetCtx(), &product_inventory.GetOrderInputAndOutputInfoRequest{Number: number})
if err != nil {
if strings.Contains(err.Error(), "record not found") {
ctx.Ok()
@@ -265,11 +265,25 @@
return
}
var list []response.ProductInfo
- err = structx.AssignTo(info.ProductList, &list)
+ err = structx.AssignTo(info.OutputList, &list)
if err != nil {
ctx.FailWithMsg(ecode.UnknownErr, "杞崲閿欒")
return
}
+
+ products, err := salesDetailsService.GetProducts(number)
+ m := make(map[string]*model.Product)
+
+ for _, product := range products {
+ m[product.Number] = product
+ }
+ for _, v := range list {
+ if m[v.Number] == nil {
+ continue
+ }
+ v.OrderAmount = m[v.Number].Amount.String()
+ }
+
ctx.OkWithDetailed(list)
}
@@ -419,7 +433,7 @@
if err != nil {
logx.Errorf("product_inventory.OrderProductOutput err:%v, params:%v", err, params)
- ctx.FailWithMsg(ecode.UnknownErr, "鍙戣揣澶辫触")
+ ctx.FailWithMsg(ecode.UnknownErr, "鍙戣揣澶辫触"+err.Error())
return
}
--
Gitblit v1.8.0