From d80428a19673e819440a34f2565b6dbbbe6ac567 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 18 七月 2024 22:32:08 +0800
Subject: [PATCH] fix
---
controllers/report_forms_controller.go | 219 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 193 insertions(+), 26 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index 660ebee..fac922e 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -345,38 +345,41 @@
return
}
- now := time.Now().Local()
- today := now.Day()
- nowMonth := now.Format("2006-01")
-
- day, dateStr, _ := service.NewSystemConfigService().GetInventoryCutOffPoint()
- if nowMonth == params.Date && today < day || today == day && now.Format("15:04") < dateStr { //鏈湀鏈嚦缁撶畻鏃堕棿鐐�
- productIds := make([]string, 0, len(result))
- for _, item := range result {
- productIds = append(productIds, item.ProductId)
- }
- statsRecords, err := service.GetCurrentStats(params.Date, productIds)
+ nowMonth := time.Now().Local().Format("2006-01")
+ if nowMonth == params.Date { //瀹炴椂鏌ヨ
+ result, err = MonthStatsReplaceRealtimeOperation(result, params.Date)
if err != nil {
- util.ResponseFormat(c, code.InternalError, "鍐呴儴閿欒")
+ util.ResponseFormat(c, code.InternalError, "鏌ヨ澶辫触")
return
}
- statsMap := models.MonthStatsMap(statsRecords)
- for k, v := range result {
- if statsMap[v.ProductId] == nil {
- continue
- }
-
- result[k].OutputAmount = statsMap[v.ProductId].OutputAmount
- result[k].OutputMoreUnits = statsMap[v.ProductId].OutputMoreUnits
- result[k].EndAmount = statsMap[v.ProductId].EndAmount
- result[k].EndMoreUnits = statsMap[v.ProductId].EndMoreUnits
- result[k].InputAmount = statsMap[v.ProductId].InputAmount
- result[k].InputMoreUnits = statsMap[v.ProductId].InputMoreUnits
- }
-
}
util.ResponseFormatList(c, code.Success, result, int(total))
+}
+
+func MonthStatsReplaceRealtimeOperation(result []*models.MonthStats, date string) ([]*models.MonthStats, error) {
+ productIds := make([]string, 0, len(result))
+ for _, item := range result {
+ productIds = append(productIds, item.ProductId)
+ }
+ statsRecords, err := service.GetCurrentStats(date, productIds)
+ if err != nil {
+ return nil, err
+ }
+ statsMap := models.MonthStatsMap(statsRecords)
+ for k, v := range result {
+ if statsMap[v.ProductId] == nil {
+ continue
+ }
+
+ result[k].OutputAmount = statsMap[v.ProductId].OutputAmount
+ result[k].OutputMoreUnits = statsMap[v.ProductId].OutputMoreUnits
+ result[k].EndAmount = statsMap[v.ProductId].EndAmount
+ result[k].EndMoreUnits = statsMap[v.ProductId].EndMoreUnits
+ result[k].InputAmount = statsMap[v.ProductId].InputAmount
+ result[k].InputMoreUnits = statsMap[v.ProductId].InputMoreUnits
+ }
+ return result, nil
}
// DownloadMonthStats
@@ -401,6 +404,16 @@
util.ResponseFormat(c, code.InternalError, "鏌ヨ澶辫触")
return
}
+
+ nowMonth := time.Now().Local().Format("2006-01")
+ if nowMonth == params.Date { //瀹炴椂鏌ヨ
+ list, err = MonthStatsReplaceRealtimeOperation(list, params.Date)
+ if err != nil {
+ util.ResponseFormat(c, code.InternalError, "鏌ヨ澶辫触")
+ return
+ }
+ }
+
filename, err := monthFormsService.Export(list)
if err != nil {
logx.Errorf("DownloadMonthStats Export err:%v", err)
@@ -437,3 +450,157 @@
task.MonthStats()
util.ResponseFormat(c, code.Success, nil)
}
+
+// WarehouseMonthStats
+// @Tags 鎶ヨ〃
+// @Summary 浠撳簱鏈堝害缁熻搴撳瓨鎶ヨ〃
+// @Produce application/json
+// @Param object body request.GetMonthStats true "鏌ヨ鍙傛暟"
+// @Param Authorization header string true "token"
+// @Success 200 {object} util.ResponseList{data=[]models.WarehouseMonthStats} "鎴愬姛"
+// @Router /api-wms/v1/forms/warehouseMonthStats [post]
+func (slf ReportFormsController) WarehouseMonthStats(c *gin.Context) {
+ var params request.GetMonthStats
+ if err := c.BindJSON(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+
+ if params.WarehouseID == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "浠撳簱ID鍙傛暟缂哄け")
+ return
+ }
+
+ monthFormsService := service.NewWarehouseMonthFormsService()
+ total, err := monthFormsService.Count(params)
+ if err != nil {
+ logx.Errorf("MonthStats count err:%v", err)
+ util.ResponseFormat(c, code.InternalError, "鏌ヨ鎬绘暟澶辫触")
+ return
+ }
+
+ params.Preload = true
+
+ result, err := monthFormsService.Query(params)
+ if err != nil {
+ logx.Errorf("MonthStats query err:%v", err)
+ util.ResponseFormat(c, code.InternalError, "鏌ヨ澶辫触")
+ return
+ }
+
+ if len(result) == 0 {
+ util.ResponseFormatList(c, code.Success, result, int(total))
+ return
+ }
+
+ nowMonth := time.Now().Local().Format("2006-01")
+ if nowMonth == params.Date {
+ result, err = WarehouseMonthStatsReplaceRealtimeOperation(result, params.Date, params.WarehouseID)
+ if err != nil {
+ util.ResponseFormat(c, code.InternalError, "鏌ヨ澶辫触")
+ return
+ }
+ }
+
+ util.ResponseFormatList(c, code.Success, result, int(total))
+
+}
+
+// DoWareHouseMonthStats
+// @Tags 鎶ヨ〃
+// @Summary 鎵嬪姩璺戞湀搴︾粺璁″簱瀛樻姤琛�
+// @Produce application/json
+// @Param object body request.DoWarehouseMonthStats true "鏌ヨ鍙傛暟"
+// @Param Authorization header string true "token"
+// @Success 200 {object} util.ResponseList{data=[]models.MonthStats} "鎴愬姛"
+// @Router /api-wms/v1/forms/doWarehouseMonthStats [post]
+func (slf ReportFormsController) DoWareHouseMonthStats(c *gin.Context) {
+ var params request.DoMonthStats
+ if err := c.BindJSON(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+
+ if params.Token != constvar.DoMonthStatsToken {
+ return
+ }
+
+ task.WarehouseMonthStats()
+ util.ResponseFormat(c, code.Success, nil)
+}
+
+// DownloadWarehouseMonthStats
+// @Tags 鎶ヨ〃
+// @Summary 涓嬭浇鎸変粨搴撶粺璁℃湀搴︾粺璁″簱瀛樻姤琛�
+// @Produce application/json
+// @Param object body request.GetMonthStats true "鏌ヨ鍙傛暟"
+// @Param Authorization header string true "token"
+// @Success 200 {object} util.ResponseList{data=[]models.MonthStats} "鎴愬姛"
+// @Router /api-wms/v1/forms/downloadWarehouseMonthStats [post]
+func (slf ReportFormsController) DownloadWarehouseMonthStats(c *gin.Context) {
+ var params request.GetMonthStats
+ if err := c.BindJSON(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+
+ if params.WarehouseID == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "浠撳簱ID鍙傛暟缂哄け")
+ return
+ }
+
+ params.Preload = true
+ monthFormsService := service.NewWarehouseMonthFormsService()
+ list, err := monthFormsService.FetchAll(params)
+ if err != nil {
+ logx.Errorf("DownloadMonthStats FetchAll err:%v", err)
+ util.ResponseFormat(c, code.InternalError, "鏌ヨ澶辫触")
+ return
+ }
+
+ nowMonth := time.Now().Local().Format("2006-01")
+ if nowMonth == params.Date {
+ list, err = WarehouseMonthStatsReplaceRealtimeOperation(list, params.Date, params.WarehouseID)
+ if err != nil {
+ util.ResponseFormat(c, code.InternalError, "鏌ヨ澶辫触")
+ return
+ }
+ }
+
+ filename, err := monthFormsService.Export(list)
+ if err != nil {
+ logx.Errorf("DownloadMonthStats Export err:%v", err)
+ util.ResponseFormat(c, code.InternalError, "瀵煎嚭鏁版嵁鍒版枃浠跺け璐�")
+ return
+ }
+
+ fileContentDisposition := "attachment;filename=\"" + url.QueryEscape(filename) + "\""
+ c.Header("Content-Type", "application/xlsx")
+ c.Header("Content-Disposition", fileContentDisposition)
+ c.File(filename)
+ defer os.Remove(filename)
+}
+
+func WarehouseMonthStatsReplaceRealtimeOperation(list []*models.WarehouseMonthStats, date string, warehouseId int) (newList []*models.WarehouseMonthStats, err error) {
+ productIds := make([]string, 0, len(list))
+ for _, item := range list {
+ productIds = append(productIds, item.ProductId)
+ }
+ statsRecords, err := service.GetCurrentWarehouseStats(date, warehouseId, productIds, true)
+ if err != nil {
+ return nil, err
+ }
+ statsMap := models.WarehouseMonthStatsMap(statsRecords)
+ for k, v := range list {
+ if statsMap[v.ProductId] == nil {
+ continue
+ }
+
+ list[k].OutputAmount = statsMap[v.ProductId].OutputAmount
+ list[k].EndAmount = statsMap[v.ProductId].EndAmount
+ list[k].InputAmount = statsMap[v.ProductId].InputAmount
+ list[k].InputItems = statsMap[v.ProductId].InputItems
+ list[k].OutputItems = statsMap[v.ProductId].OutputItems
+ }
+ return list, nil
+}
--
Gitblit v1.8.0