From c6b26991704713d4a4d88e520759f02cd337219f Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期四, 04 七月 2024 22:59:53 +0800 Subject: [PATCH] fix --- controllers/report_forms_controller.go | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go index 1fdb840..ed57a90 100644 --- a/controllers/report_forms_controller.go +++ b/controllers/report_forms_controller.go @@ -475,12 +475,8 @@ 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 { //鏈湀鏈嚦缁撶畻鏃堕棿鐐� + nowMonth := time.Now().Local().Format("2006-01") + if nowMonth == params.Date { productIds := make([]string, 0, len(result)) for _, item := range result { productIds = append(productIds, item.ProductId) @@ -551,6 +547,7 @@ return } + params.Preload = true monthFormsService := service.NewWarehouseMonthFormsService() list, err := monthFormsService.FetchAll(params) if err != nil { -- Gitblit v1.8.0