From e7bc8bbe2fd47b348090552665233731d98fbaec Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 04 七月 2024 23:08:39 +0800
Subject: [PATCH] fix
---
controllers/report_forms_controller.go | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index afe8111..c14fd94 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -444,7 +444,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,17 +475,13 @@
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)
}
- statsRecords, err := service.GetCurrentWarehouseStats(params.Date, params.WarehouseID, productIds)
+ statsRecords, err := service.GetCurrentWarehouseStats(params.Date, params.WarehouseID, productIds, true)
if err != nil {
util.ResponseFormat(c, code.InternalError, "鍐呴儴閿欒")
return
@@ -551,6 +547,7 @@
return
}
+ params.Preload = true
monthFormsService := service.NewWarehouseMonthFormsService()
list, err := monthFormsService.FetchAll(params)
if err != nil {
--
Gitblit v1.8.0