From 80c8e74c7428329f06d1aa3b70b95b46da732b0a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 27 六月 2024 20:09:03 +0800
Subject: [PATCH] 保存库存结算时间点重启定时任务
---
task/month_stats.go | 116 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 60 insertions(+), 56 deletions(-)
diff --git a/task/month_stats.go b/task/month_stats.go
index ee539ea..a6b2669 100644
--- a/task/month_stats.go
+++ b/task/month_stats.go
@@ -4,6 +4,7 @@
"encoding/json"
"fmt"
"github.com/shopspring/decimal"
+ "gorm.io/gorm"
"time"
"wms/constvar"
"wms/models"
@@ -11,21 +12,25 @@
"wms/service"
)
-func MonthStats() {
+func MonthStats() (err error) {
//鍔犻攣锛屽彧闇�瑕佷竴涓繘绋嬭繍琛屾浠诲姟
var (
lockName = "monthStats"
serviceID = "wms"
)
- err := models.NewLockSearch().AcquireLock(lockName, serviceID)
+ err = models.NewLockSearch().AcquireLock(lockName, serviceID)
if err != nil {
logx.Errorf("MonthStats AcquireLock err:%v", err)
return
}
defer func() {
- err := models.NewLockSearch().ReleaseLock(lockName, serviceID)
+ if err != nil {
+ service.SendAlarm("鏈堝害缁熻鎵ц澶辫触", "鎶ラ敊: "+err.Error())
+ }
+ err = models.NewLockSearch().ReleaseLock(lockName, serviceID)
if err != nil {
logx.Errorf("MonthStats ReleaseLock err:%v", err)
+ service.SendAlarm("鏈堝害缁熻鎵ц鎴愬姛瑙ｉ攣澶辫触", err.Error())
}
}()
@@ -67,6 +72,12 @@
return
}
var record models.MonthStats
+
+ err = models.NewMonthStatsSearch().SetDate(date).Delete()
+ if err != nil {
+ return
+ }
+
for _, groupSum := range groupSumList {
productId := groupSum.Class
if productMap[productId] == nil {
@@ -92,65 +103,58 @@
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 {
- moreValueArr = append(moreValueArr, models.UnitItems{
- Amount: amount.Mul(unitItem.Amount),
- Unit: unitItem.Unit,
- Floating: unitItem.Floating,
- })
- bys, _ := json.Marshal(moreValueArr)
- moreUnits = string(bys)
-
- if !inputMap[productId].IsZero() {
- inputMoreValueArr = append(inputMoreValueArr, models.UnitItems{
- Amount: inputMap[productId].Mul(unitItem.Amount),
- Unit: unitItem.Unit,
- Floating: unitItem.Floating,
- })
- bys, _ = json.Marshal(inputMoreValueArr)
- inputMoreUnits = string(bys)
-
- }
-
- if !outputMap[productId].IsZero() {
- outputMoreValueArr = append(outputMoreValueArr, models.UnitItems{
- Amount: outputMap[productId].Mul(unitItem.Amount),
- Unit: unitItem.Unit,
- Floating: unitItem.Floating,
- })
- bys, _ = json.Marshal(outputMoreValueArr)
- outputMoreUnits = string(bys)
-
- }
+ if !amount.IsZero() {
+ moreValueArr = service.CreateMoreUnit(amount, product.MoreUnitList)
}
+ if !inputMap[productId].IsZero() {
+ inputMoreValueArr = service.CreateMoreUnit(inputMap[productId], product.MoreUnitList)
+ }
+
+ if !outputMap[productId].IsZero() {
+ outputMoreValueArr = service.CreateMoreUnit(outputMap[productId], product.MoreUnitList)
+ }
+ bys, _ := json.Marshal(moreValueArr)
+ moreUnits = string(bys)
+ bys, _ = json.Marshal(inputMoreValueArr)
+ inputMoreUnits = string(bys)
+ bys, _ = json.Marshal(outputMoreValueArr)
+ outputMoreUnits = string(bys)
}
record.BeginMoreUnits = moreUnits
- err = models.NewMonthStatsSearch().Create(&record)
- if err != nil {
- logx.Errorf("NewMonthStatsSearch Create err:%v, record: %+v", err, record)
- service.SendAlarm("鏈堝害缁熻鍒涘缓鏈湀澶辫触", fmt.Sprintf("NewMonthStatsSearch Create err:%v, record: %+v", err, record))
- }
-
- if oldRecordsMap[productId] != nil && (!inputMap[productId].IsZero() || !outputMap[productId].IsZero()) {
- record.InputAmount = inputMap[productId]
- record.InputMoreUnits = inputMoreUnits
- record.OutputAmount = outputMap[productId]
- record.OutputMoreUnits = outputMoreUnits
- m := map[string]interface{}{
- "input_amount": inputMap[productId],
- "input_more_units": inputMoreUnits,
- "output_amount": outputMap[productId],
- "output_more_units": outputMoreUnits,
- "end_more_units": moreUnits,
- "end_amount": amount,
- }
- err = models.NewMonthStatsSearch().SetID(oldRecordsMap[productId].Id).UpdateByMap(m)
+ err = models.WithTransaction(func(db *gorm.DB) error {
+ err = models.NewMonthStatsSearch().SetOrm(db).Create(&record)
if err != nil {
- logx.Errorf("NewMonthStatsSearch UpdateByMap err:%v, id:%v, m:%+v", err, oldRecordsMap[productId].ID, m)
- service.SendAlarm("鏈堝害缁熻鏇存敼涓婃湀澶辫触", fmt.Sprintf("NewMonthStatsSearch Create err:%v, record: %+v", err, record))
+ logx.Errorf("NewMonthStatsSearch Create err:%v, record: %+v", err, record)
+ service.SendAlarm("鏈堝害缁熻鍒涘缓鏈湀澶辫触", fmt.Sprintf("NewMonthStatsSearch Create err:%v, record: %+v", err, record))
}
- }
+
+ if oldRecordsMap[productId] != nil {
+ m := map[string]interface{}{
+ "end_more_units": moreUnits,
+ "end_amount": amount,
+ }
+ if !inputMap[productId].IsZero() || !outputMap[productId].IsZero() {
+ record.InputAmount = inputMap[productId]
+ record.InputMoreUnits = inputMoreUnits
+ record.OutputAmount = outputMap[productId]
+ record.OutputMoreUnits = outputMoreUnits
+ m["input_amount"] = inputMap[productId]
+ m["input_more_units"] = inputMoreUnits
+ m["output_amount"] = outputMap[productId]
+ m["output_more_units"] = outputMoreUnits
+ }
+ err = models.NewMonthStatsSearch().SetOrm(db).SetID(oldRecordsMap[productId].Id).UpdateByMap(m)
+ if err != nil {
+ logx.Errorf("NewMonthStatsSearch UpdateByMap err:%v, id:%v, m:%+v", err, oldRecordsMap[productId].ID, m)
+ service.SendAlarm("鏈堝害缁熻鏇存敼涓婃湀澶辫触", fmt.Sprintf("NewMonthStatsSearch Create err:%v, record: %+v", err, record))
+ }
+ }
+ return nil
+ })
+ }
+ if err == nil {
+ service.SendAlarm("鏈堝害缁熻鎵ц鎴愬姛", "")
}
return
}
--
Gitblit v1.8.0