From 0579d8ed7f53a1883dde8b6cb9df258370348e1e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 27 六月 2024 18:23:15 +0800
Subject: [PATCH] 新增wms系统设置表,保存库存结算时间点,给前端提供查询和保存配置接口

---
 task/month_stats.go |   34 ++++++++--------------------------
 1 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/task/month_stats.go b/task/month_stats.go
index 6d82bb4..a6b2669 100644
--- a/task/month_stats.go
+++ b/task/month_stats.go
@@ -103,35 +103,17 @@
 			moreValueArr := make([]models.UnitItems, 0, len(product.MoreUnitList))
 			inputMoreValueArr := make([]models.UnitItems, 0, len(product.MoreUnitList))
 			outputMoreValueArr := make([]models.UnitItems, 0, len(product.MoreUnitList))
-			for _, unitItem := range product.MoreUnitList {
-				if !amount.IsZero() {
-					moreValueArr = append(moreValueArr, models.UnitItems{
-						Amount:   amount.Mul(unitItem.Amount),
-						Unit:     unitItem.Unit,
-						Floating: unitItem.Floating,
-					})
-				}
+			if !amount.IsZero() {
+				moreValueArr = service.CreateMoreUnit(amount, product.MoreUnitList)
+			}
+			if !inputMap[productId].IsZero() {
+				inputMoreValueArr = service.CreateMoreUnit(inputMap[productId], product.MoreUnitList)
+			}
 
-				if !inputMap[productId].IsZero() {
-					inputMoreValueArr = append(inputMoreValueArr, models.UnitItems{
-						Amount:   inputMap[productId].Mul(unitItem.Amount),
-						Unit:     unitItem.Unit,
-						Floating: unitItem.Floating,
-					})
-				}
-
-				if !outputMap[productId].IsZero() {
-					outputMoreValueArr = append(outputMoreValueArr, models.UnitItems{
-						Amount:   outputMap[productId].Mul(unitItem.Amount),
-						Unit:     unitItem.Unit,
-						Floating: unitItem.Floating,
-					})
-				}
+			if !outputMap[productId].IsZero() {
+				outputMoreValueArr = service.CreateMoreUnit(outputMap[productId], product.MoreUnitList)
 			}
 			bys, _ := json.Marshal(moreValueArr)
-			if len(moreValueArr) > 0 {
-				fmt.Println(moreValueArr)
-			}
 			moreUnits = string(bys)
 			bys, _ = json.Marshal(inputMoreValueArr)
 			inputMoreUnits = string(bys)

--
Gitblit v1.8.0