1、优化采购报表（按商品），未执行金额和数量不能为负值；

2024-09-29 22:13:35 +08:00 · 2024-09-29 22:13:35 +08:00 · caad0d881b
commit caad0d881b
parent a0263fedf1
1 changed files with 9 additions and 2 deletions
--- a/app/admin/models/purchase.go
+++ b/app/admin/models/purchase.go
@ -4625,7 +4625,14 @@ LEFT JOIN

 	// 计算未执行金额和未执行数量
 	purchaseData.NonExecutionAmount = purchaseData.PlanAmount - purchaseData.Amount
+	if purchaseData.NonExecutionAmount < 0 {
+		purchaseData.NonExecutionAmount = 0
+	}
+
 	purchaseData.NonExecutionCount = purchaseData.PlanCount - purchaseData.Count
+	if purchaseData.NonExecutionCount < 0 {
+		purchaseData.NonExecutionCount = 0
+	}

 	if purchaseType == ErpRejectOrder {
 		purchaseData.PlanCount = -purchaseData.PlanCount