From f4508a84236a4aff1c7b5bfa17a14a8ff95728ba Mon Sep 17 00:00:00 2001 From: yinbentan <yinbentan@live.com> Date: 星期一, 08 七月 2024 09:45:10 +0800 Subject: [PATCH] 接口调用报错处理 --- controllers/report_forms_controller.go | 135 ++++++++++++++++++++++++++++----------------- 1 files changed, 84 insertions(+), 51 deletions(-) diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go index afe8111..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) @@ -444,7 +457,7 @@ // @Produce application/json // @Param object body request.GetMonthStats true "鏌ヨ鍙傛暟" // @Param Authorization header string true "token" -// @Success 200 {object} util.ResponseList{data=[]models.MonthStats} "鎴愬姛" +// @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 @@ -475,37 +488,22 @@ return } - now := time.Now().Local() - today := now.Day() - nowMonth := now.Format("2006-01") + if len(result) == 0 { + util.ResponseFormatList(c, code.Success, result, int(total)) + return + } - 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) + 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, "鍐呴儴閿欒") + 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 @@ -551,6 +549,7 @@ return } + params.Preload = true monthFormsService := service.NewWarehouseMonthFormsService() list, err := monthFormsService.FetchAll(params) if err != nil { @@ -558,6 +557,16 @@ 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) @@ -571,3 +580,27 @@ 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