From d91f181819984ed68d928bec6e926da6566e7a3f Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期五, 05 七月 2024 14:53:02 +0800 Subject: [PATCH] 当操作为出库或调拨时,操作详情明细返回产品相应位置的实时库存 --- controllers/report_forms_controller.go | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go index a30a05d..334e1d7 100644 --- a/controllers/report_forms_controller.go +++ b/controllers/report_forms_controller.go @@ -475,17 +475,18 @@ 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 { //鏈湀鏈嚦缁撶畻鏃堕棿鐐� + 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 @@ -506,6 +507,7 @@ } util.ResponseFormatList(c, code.Success, result, int(total)) + } // DoWareHouseMonthStats -- Gitblit v1.8.0