From 1572f45e72cc0fa15c029f9ee2a08474104435e6 Mon Sep 17 00:00:00 2001
From: selfcheer <selfcheer@gmail.com>
Date: 星期五, 19 七月 2024 00:48:43 +0800
Subject: [PATCH] 采购单产品列表去掉过滤重复产品的逻辑
---
proto/purchase_wms/server.go | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/proto/purchase_wms/server.go b/proto/purchase_wms/server.go
index f7339e7..523a7b8 100644
--- a/proto/purchase_wms/server.go
+++ b/proto/purchase_wms/server.go
@@ -20,8 +20,12 @@
if req.Number == "" {
return nil, errors.New("閲囪喘缂栧彿涓嶈兘涓虹┖")
}
- err := global.GVA_DB.Model(&purchase.Purchase{}).Where("number = ?", req.Number).
- Updates(map[string]interface{}{"status": purchase.OrderStatusStored}).Error
+ m := make(map[string]interface{})
+ m["status"] = purchase.OrderStatusStored
+ if req.Status > 0 {
+ m["status"] = req.Status
+ }
+ err := global.GVA_DB.Model(&purchase.Purchase{}).Where("number = ?", req.Number).Updates(m).Error
return new(UpdatePurchaseStatusResponse), err
}
@@ -157,21 +161,21 @@
info.PurchaseNumber = p.Number
info.PurchaseName = p.Name
info.SupplierName = p.Supplier.Name
- info.Amount = p.Quantity.IntPart()
info.Status = int64(p.Status)
if p.Status == purchase.OrderStatusStored || p.Status == purchase.OrderStatusCompleted {
info.FinishAmount = info.Amount
}
for _, pp := range pps {
if int(p.ID) == pp.PurchaseId {
- info.ProductId = pp.Product.Number
- info.ProductName = pp.Product.Name
- info.Specs = pp.Product.Specifications
- info.Unit = pp.Product.Unit
- break
+ ni := info
+ ni.ProductId = pp.Product.Number
+ ni.ProductName = pp.Product.Name
+ ni.Specs = pp.Product.Specifications
+ ni.Unit = pp.Product.Unit
+ ni.Amount = pp.Amount.IntPart()
+ infos = append(infos, &ni)
}
}
- infos = append(infos, &info)
}
resp := new(GetPurchaseInfoResponse)
resp.Infos = infos
--
Gitblit v1.8.0