From 9dfda3355efbbee2a148fe6d7031535a31a57769 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 23 三月 2024 17:34:00 +0800
Subject: [PATCH] 采购单修改2

---
 service/purchase/purchase.go |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/service/purchase/purchase.go b/service/purchase/purchase.go
index e6b6cb9..22dee18 100644
--- a/service/purchase/purchase.go
+++ b/service/purchase/purchase.go
@@ -311,10 +311,8 @@
 	}
 
 	m := make(map[string]interface{})
-	newList := make([]*purchase.PurchaseProductConfirm, 0)
 	if first {
 		m["status"] = purchase.OrderStatusWaitReceive
-		newList = list
 	} else {
 		yu := int64(0)
 		for _, confirm := range list {
@@ -322,10 +320,6 @@
 			confirm.NotReceiveAmount = confirm.Amount.Sub(confirm.OverReceiveAmount)
 			if !confirm.SurplusReceiveAmount.IsZero() {
 				yu = confirm.SurplusReceiveAmount.IntPart()
-			}
-			//杩囨护鏈鏀惰揣鏁伴噺涓�0鐨勬暟鎹�
-			if !confirm.NowReceiveAmount.IsZero() {
-				newList = append(newList, confirm)
 			}
 		}
 		if yu > 0 {
@@ -342,7 +336,7 @@
 			return err
 		}
 
-		err = tx.Create(newList).Error
+		err = tx.Create(list).Error
 		if err != nil {
 			return err
 		}
@@ -369,6 +363,9 @@
 	purchaseNumber := list[0].PurchaseNumber
 	qualityList := make([]*purchase.PurchaseQualityInspection, 0)
 	for _, confirm := range list {
+		if confirm.NowReceiveAmount.IsZero() {
+			continue
+		}
 		var pqi purchase.PurchaseQualityInspection
 		pqi.PurchaseNumber = purchaseNumber
 		pqi.Principal = confirm.Principal

--
Gitblit v1.8.0