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 | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/api/v1/purchase/purchase.go b/api/v1/purchase/purchase.go
index 1066c6c..398c153 100644
--- a/api/v1/purchase/purchase.go
+++ b/api/v1/purchase/purchase.go
@@ -10,6 +10,7 @@
"srm/model/common/response"
"srm/model/purchase"
purchaserequest "srm/model/purchase/request"
+ "srm/proto/common"
"srm/proto/purchase_wms"
"strconv"
"strings"
@@ -264,7 +265,7 @@
SupplierName: data.Supplier.Name,
Product: product,
Source: "SRM_PURCHASE",
- OperationSource: purchase_wms.OperationSource_OperationSourcePurchase,
+ OperationSource: common.OperationSource_OperationSourcePurchase,
SalesDetailsNumber: data.SourceOrder,
})
if err != nil {
@@ -398,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
@@ -437,7 +438,8 @@
}
}
inWarehouseInfos = append(inWarehouseInfos, iwi)
- productMap[operation.ProductId] = &pi
+ //productMap[operation.ProductId] = &pi
+ productInfos = append(productInfos, pi)
}
} else {
for _, products := range productList {
@@ -456,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
@@ -688,7 +691,7 @@
Product: product,
Source: "SRM_PURCHASE",
WarehouseName: purchaseData.Warehouse,
- OperationSource: purchase_wms.OperationSource_OperationSourcePurchase,
+ OperationSource: common.OperationSource_OperationSourcePurchase,
SalesDetailsNumber: purchaseData.SourceOrder,
})
if err != nil {
@@ -776,7 +779,7 @@
Product: product,
Source: "SRM_PURCHASE",
WarehouseName: purchaseData.Warehouse,
- OperationSource: purchase_wms.OperationSource_OperationSourcePurchase,
+ OperationSource: common.OperationSource_OperationSourcePurchase,
SalesDetailsNumber: purchaseData.SourceOrder,
})
if err != nil {
--
Gitblit v1.8.0