From 69f0410081da54e6cea8a04a07fd0119a8edc623 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 30 三月 2024 11:38:42 +0800
Subject: [PATCH] 采购单修改

---
 api/v1/purchase/purchase.go |  112 +++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 78 insertions(+), 34 deletions(-)

diff --git a/api/v1/purchase/purchase.go b/api/v1/purchase/purchase.go
index 753d8dc..b81fe5a 100644
--- a/api/v1/purchase/purchase.go
+++ b/api/v1/purchase/purchase.go
@@ -367,13 +367,20 @@
 		response.FailWithMessage("鍙傛暟缂哄け", c)
 		return
 	}
-	data, err := service.NewPurchaseService().GetPurchase(uint(id))
+	server := service.NewPurchaseService()
+	data, err := server.GetPurchase(uint(id))
 	if err != nil {
 		global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
 		response.FailWithMessage("鑾峰彇澶辫触", c)
 		return
 	}
-	productList, err := service.NewPurchaseService().GetPurchaseProductList(uint(id))
+	productList, err := server.GetPurchaseProductList(uint(id))
+	if err != nil {
+		global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
+		response.FailWithMessage("鑾峰彇澶辫触", c)
+		return
+	}
+	confirmInfo, err := server.GetPurchaseProductConfirmInfo(data.Number)
 	if err != nil {
 		global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
 		response.FailWithMessage("鑾峰彇澶辫触", c)
@@ -387,48 +394,75 @@
 		return
 	}
 
-	operationInfos := make([]purchaseRes.OperationInfo, 0)
+	var operationInfos purchaseRes.OperationInfo
+	productInfos := make([]purchaseRes.ProductInfo, 0)
+	inWarehouseInfos := make([]purchaseRes.InWarehouseInfo, 0)
+	productMap := make(map[string]*purchaseRes.ProductInfo)
 	if len(info.Operations) > 0 {
 		for _, operation := range info.Operations {
-			var oi purchaseRes.OperationInfo
-			oi.Number = operation.ProductId
-			oi.Name = operation.ProductName
-			oi.OperationNumber = operation.Number
-			oi.Status = operation.Status
-			oi.Principal = data.Principal
-			oi.WarehouseName = data.Warehouse
-			oi.SendAmount = operation.Amount
+			var pi purchaseRes.ProductInfo
+			var iwi purchaseRes.InWarehouseInfo
+			if p, ok := productMap[operation.ProductId]; ok {
+				pi = *p
+			}
+			pi.Number = operation.ProductId
+			pi.Name = operation.ProductName
+			iwi.Number = operation.ProductId
+			iwi.Name = operation.ProductName
+			iwi.OperationNumber = operation.Number
+			iwi.Status = operation.Status
+			iwi.Principal = data.Principal
+			iwi.WarehouseName = data.Warehouse
 			if operation.OverTime != "" {
-				oi.OverTime = operation.OverTime
-				oi.OverAmount = operation.Amount
+				iwi.OverTime = operation.OverTime
+				iwi.OverAmount = operation.Amount
+				pi.OverAmount = pi.OverAmount + operation.Amount
 			}
 			for _, products := range productList {
 				if products.Product.Number == operation.ProductId {
-					oi.Amount = products.Amount
-					oi.PurchasePrice = products.Price
-					oi.Total = products.Total
-					oi.Unit = products.Product.Unit
-					oi.Specifications = products.Product.Specifications
-					oi.ModelNumber = products.Product.ModelNumber
+					pi.Amount = products.Amount
+					pi.PurchasePrice = products.Price
+					pi.Total = products.Total
+					pi.Unit = products.Product.Unit
+					pi.Specifications = products.Product.Specifications
+					pi.ModelNumber = products.Product.ModelNumber
 					break
 				}
 			}
-			operationInfos = append(operationInfos, oi)
+			for _, confirm := range confirmInfo {
+				if operation.ProductId == confirm.ProductId {
+					pi.SendAmount = confirm.OverReceiveAmount.IntPart()
+					break
+				}
+			}
+			inWarehouseInfos = append(inWarehouseInfos, iwi)
+			productMap[operation.ProductId] = &pi
 		}
 	} else {
 		for _, products := range productList {
-			var oi purchaseRes.OperationInfo
-			oi.Number = products.Product.Number
-			oi.Name = products.Product.Name
-			oi.Amount = products.Amount
-			oi.PurchasePrice = products.Price
-			oi.Total = products.Total
-			oi.Unit = products.Product.Unit
-			oi.Specifications = products.Product.Specifications
-			oi.ModelNumber = products.Product.ModelNumber
-			operationInfos = append(operationInfos, oi)
+			var pi purchaseRes.ProductInfo
+			pi.Number = products.Product.Number
+			pi.Name = products.Product.Name
+			pi.Amount = products.Amount
+			pi.PurchasePrice = products.Price
+			pi.Total = products.Total
+			pi.Unit = products.Product.Unit
+			pi.Specifications = products.Product.Specifications
+			pi.ModelNumber = products.Product.ModelNumber
+			for _, confirm := range confirmInfo {
+				if products.Product.Number == confirm.ProductId {
+					pi.SendAmount = confirm.OverReceiveAmount.IntPart()
+					break
+				}
+			}
+			productMap[pi.Number] = &pi
 		}
 	}
+	for _, productInfo := range productMap {
+		productInfos = append(productInfos, *productInfo)
+	}
+	operationInfos.InWarehouseInfos = inWarehouseInfos
+	operationInfos.ProductInfos = productInfos
 
 	response.OkWithData(operationInfos, c)
 }
@@ -721,12 +755,16 @@
 	}
 	product := make([]*purchase_wms.PurchaseProduct, 0)
 	ids := make([]int, 0)
+	productMap := make(map[string]int64)
 	for _, inspection := range inspectionList {
-		var p purchase_wms.PurchaseProduct
-		p.Id = inspection.ProductId
-		p.Amount = inspection.Amount.IntPart()
-		product = append(product, &p)
+		productMap[inspection.ProductId] = inspection.Amount.IntPart()
 		ids = append(ids, int(inspection.ID))
+	}
+	for k, v := range productMap {
+		var p purchase_wms.PurchaseProduct
+		p.Id = k
+		p.Amount = v
+		product = append(product, &p)
 	}
 	client := purchase_wms.NewPurchaseServiceClient(purchase_wms.PurchaseConn)
 	_, err = client.PurchaseToWms(context.Background(), &purchase_wms.PurchaseToWmsRequest{
@@ -749,5 +787,11 @@
 		response.FailWithMessage("璐ㄦ澶辫触", c)
 		return
 	}
+	err = server.UpdatePurchaseStatus(purchaseData.Number, purchase.WaitInspection)
+	if err != nil {
+		global.GVA_LOG.Error("璐ㄦ澶辫触!", zap.Error(err))
+		response.FailWithMessage("璐ㄦ澶辫触", c)
+		return
+	}
 	response.OkWithMessage("璐ㄦ鎴愬姛", c)
 }

--
Gitblit v1.8.0