From 73b6baf6af3d88cdcb0e2df7932a9bd96b0b85c5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 01 七月 2024 22:32:34 +0800
Subject: [PATCH] 月度统计出入库按类型汇总报表定时任务和手动跑任务接口
---
controllers/report_forms_controller.go | 278 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 223 insertions(+), 55 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index 37bcc1c..230525c 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -1,18 +1,17 @@
package controllers
import (
- "fmt"
"github.com/gin-gonic/gin"
"github.com/shopspring/decimal"
"net/url"
"os"
+ "time"
"wms/constvar"
"wms/extend/code"
"wms/extend/util"
"wms/models"
"wms/pkg/logx"
"wms/request"
- "wms/response"
"wms/service"
"wms/task"
)
@@ -88,11 +87,6 @@
return
}
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "瀵煎嚭澶辫触")
- return
- }
-
fileContentDisposition := "attachment;filename=\"" + url.QueryEscape(filename) + "\""
c.Header("Content-Type", "application/xlsx")
c.Header("Content-Disposition", fileContentDisposition)
@@ -102,10 +96,11 @@
// GetHistory
// @Tags 鎶ヨ〃
-// @Summary 鑾峰彇鍘嗗彶淇℃伅
+// @Summary 鑾峰彇鍑哄叆搴撴槑缁�
// @Produce application/json
+// @Param Authorization header string true "token"
// @Param object body request.GetInventoryHistory true "鏌ヨ鍙傛暟"
-// @Success 200 {object} util.ResponseList{data=[]response.InventoryHistory} "鎴愬姛"
+// @Success 200 {object} util.ResponseList{data=[]models.MoveHistory} "鎴愬姛"
// @Router /api-wms/v1/forms/getHistory [post]
func (slf ReportFormsController) GetHistory(c *gin.Context) {
slf.GetHistoryNew(c)
@@ -195,51 +190,62 @@
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
}
- //鑾峰彇鎿嶄綔璇︽儏
- detailsSearch := models.NewMoveHistorySearch()
- var (
- result []*response.InventoryHistory
- total uint64
- ids []int
- err error
- )
- if params.KeyWord != "" {
- ids, total, err = service.SearchHistoryReport(params.KeyWord, params.BaseOperationType, params.Page, params.PageSize)
- if err != nil {
- util.ResponseFormat(c, code.InternalError, err.Error())
- return
- }
- if len(ids) == 0 {
- util.ResponseFormatList(c, code.Success, result, 0)
- return
- }
+
+ historyFormsService := service.NewHistoryFormsService()
+ result, err := historyFormsService.Query(params)
+ if err != nil {
+ util.ResponseFormat(c, code.InternalError, "鍐呴儴閿欒")
+ return
}
- detailsSearch.Orm = detailsSearch.Orm.Model(&models.MoveHistory{}).
- Select("number, updated_at as date, product_name as product_name, from_location_id, operation_id,to_location_id, amount, " +
- "unit, operator as contacted_name, base_operation_type, weight, product_id, from_location, to_location, operation_type_name, weight").Order("id desc")
- if len(ids) > 0 {
- detailsSearch.Orm = detailsSearch.Orm.Where("id in ?", ids)
- }
- if params.BaseOperationType != 0 {
- detailsSearch.Orm = detailsSearch.Orm.Where("base_operation_type = ?", params.BaseOperationType)
- }
- var t int64
- err = detailsSearch.Orm.Count(&t).Error
+ total, err := historyFormsService.Count(params)
if err != nil {
- util.ResponseFormat(c, code.RequestParamError, fmt.Errorf("鏌ヨ鎬绘潯鏁板け璐�: %v", err))
+ util.ResponseFormat(c, code.InternalError, "鍐呴儴閿欒")
return
}
- total = uint64(t)
- if params.Page*params.PageSize > 0 {
- detailsSearch.Orm = detailsSearch.Orm.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize)
- }
- err = detailsSearch.Orm.Find(&result).Error
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, fmt.Errorf("鏌ヨ鎿嶄綔鏄庣粏澶辫触: %v", err))
- return
- }
+
util.ResponseFormatList(c, code.Success, result, int(total))
+}
+
+// DownloadHistory
+// @Tags 鎶ヨ〃
+// @Summary 涓嬭浇鍑哄叆搴撴槑缁嗘姤琛�
+// @Produce application/json
+// @Param Authorization header string true "token"
+// @Param object body request.GetInventoryHistory true "鏌ヨ鍙傛暟"
+// @Success 200 {object} util.ResponseList{data=[]models.MoveHistory} "鎴愬姛"
+// @Router /api-wms/v1/forms/downloadHistory [post]
+func (slf ReportFormsController) DownloadHistory(c *gin.Context) {
+ var params request.GetInventoryHistory
+ if err := c.BindJSON(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+
+ if params.BaseOperationType == 0 {
+ util.ResponseFormat(c, code.RequestParamError, "鍩虹鎿嶄綔绫诲瀷涓嶈兘涓虹┖")
+ return
+ }
+
+ historyFormsService := service.NewHistoryFormsService()
+ list, err := historyFormsService.FetchAll(params)
+ if err != nil {
+ logx.Errorf("DownloadHistory FetchAll err:%v", err)
+ util.ResponseFormat(c, code.InternalError, "鏌ヨ澶辫触")
+ return
+ }
+ filename, err := historyFormsService.Export(list, params)
+ if err != nil {
+ logx.Errorf("DownloadHistory 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)
}
// GetLocationForms
@@ -302,11 +308,6 @@
return
}
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, "瀵煎嚭澶辫触")
- return
- }
-
fileContentDisposition := "attachment;filename=\"" + url.QueryEscape(filename) + "\""
c.Header("Content-Type", "application/xlsx")
c.Header("Content-Disposition", fileContentDisposition)
@@ -329,13 +330,89 @@
return
}
- list, total, err := models.NewMonthStatsSearch().SetPage(params.Page, params.PageSize).SetKeyword(params.Keyword).SetDate(params.Date).Find()
+ monthFormsService := service.NewMonthFormsService()
+ total, err := monthFormsService.Count(params)
if err != nil {
+ logx.Errorf("MonthStats count err:%v", err)
+ util.ResponseFormat(c, code.InternalError, "鏌ヨ鎬绘暟澶辫触")
+ return
+ }
+
+ result, err := monthFormsService.Query(params)
+ if err != nil {
+ logx.Errorf("MonthStats query err:%v", err)
util.ResponseFormat(c, code.InternalError, "鏌ヨ澶辫触")
return
}
- util.ResponseFormatList(c, code.Success, list, int(total))
+ 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)
+ if err != nil {
+ 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))
+}
+
+// DownloadMonthStats
+// @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/downloadMonthStats [post]
+func (slf ReportFormsController) DownloadMonthStats(c *gin.Context) {
+ var params request.GetMonthStats
+ if err := c.BindJSON(¶ms); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+ return
+ }
+
+ monthFormsService := service.NewMonthFormsService()
+ list, err := monthFormsService.FetchAll(params)
+ if err != nil {
+ logx.Errorf("DownloadMonthStats FetchAll err:%v", err)
+ 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)
}
// DoMonthStats
@@ -360,3 +437,94 @@
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.MonthStats} "鎴愬姛"
+// @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
+ }
+
+ result, err := monthFormsService.Query(params)
+ if err != nil {
+ logx.Errorf("MonthStats query err:%v", err)
+ util.ResponseFormat(c, code.InternalError, "鏌ヨ澶辫触")
+ 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.GetCurrentWarehouseStats(params.Date, params.WarehouseID, productIds)
+ if err != nil {
+ util.ResponseFormat(c, code.InternalError, "鍐呴儴閿欒")
+ return
+ }
+ statsMap := models.WarehouseMonthStatsMap(statsRecords)
+ for k, v := range result {
+ if statsMap[v.ProductId] == nil {
+ continue
+ }
+
+ result[k].OutputAmount = statsMap[v.ProductId].OutputAmount
+ result[k].EndAmount = statsMap[v.ProductId].EndAmount
+ result[k].InputAmount = statsMap[v.ProductId].InputAmount
+ result[k].InputItems = statsMap[v.ProductId].InputItems
+ result[k].OutputItems = statsMap[v.ProductId].OutputItems
+ }
+
+ }
+
+ 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)
+}
--
Gitblit v1.8.0