From 1572f45e72cc0fa15c029f9ee2a08474104435e6 Mon Sep 17 00:00:00 2001
From: selfcheer <selfcheer@gmail.com>
Date: 星期五, 19 七月 2024 00:48:43 +0800
Subject: [PATCH] 采购单产品列表去掉过滤重复产品的逻辑

---
 api/v1/purchase/purchase.go |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/api/v1/purchase/purchase.go b/api/v1/purchase/purchase.go
index 8d07ab6..398c153 100644
--- a/api/v1/purchase/purchase.go
+++ b/api/v1/purchase/purchase.go
@@ -399,14 +399,14 @@
 	var operationInfos purchaseRes.OperationInfo
 	productInfos := make([]purchaseRes.ProductInfo, 0)
 	inWarehouseInfos := make([]purchaseRes.InWarehouseInfo, 0)
-	productMap := make(map[string]*purchaseRes.ProductInfo)
+	//productMap := make(map[string]*purchaseRes.ProductInfo)
 	if len(info.Operations) > 0 {
 		for _, operation := range info.Operations {
 			var pi purchaseRes.ProductInfo
 			var iwi purchaseRes.InWarehouseInfo
-			if p, ok := productMap[operation.ProductId]; ok {
-				pi = *p
-			}
+			//if p, ok := productMap[operation.ProductId]; ok {
+			//	pi = *p
+			//}
 			pi.Number = operation.ProductId
 			pi.Name = operation.ProductName
 			iwi.Number = operation.ProductId
@@ -438,7 +438,8 @@
 				}
 			}
 			inWarehouseInfos = append(inWarehouseInfos, iwi)
-			productMap[operation.ProductId] = &pi
+			//productMap[operation.ProductId] = &pi
+			productInfos = append(productInfos, pi)
 		}
 	} else {
 		for _, products := range productList {
@@ -457,12 +458,13 @@
 					break
 				}
 			}
-			productMap[pi.Number] = &pi
+			//productMap[pi.Number] = &pi
+			productInfos = append(productInfos, pi)
 		}
 	}
-	for _, productInfo := range productMap {
-		productInfos = append(productInfos, *productInfo)
-	}
+	//for _, productInfo := range productMap {
+	//	productInfos = append(productInfos, *productInfo)
+	//}
 	operationInfos.InWarehouseInfos = inWarehouseInfos
 	operationInfos.ProductInfos = productInfos
 

--
Gitblit v1.8.0