From a9ad4cabc4d303532fbd743538f7480c0eef5a69 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 05 七月 2024 14:58:42 +0800
Subject: [PATCH] 库存盘点验证时的出入库数量使用盘点时的库存数量计算
---
service/warehouse_month_forms.go | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/service/warehouse_month_forms.go b/service/warehouse_month_forms.go
index 3a60cd3..9af8677 100644
--- a/service/warehouse_month_forms.go
+++ b/service/warehouse_month_forms.go
@@ -25,7 +25,8 @@
}
func (slf *WarehouseMonthFormsService) BuildSearch(params request.GetMonthStats) (search *models.WarehouseMonthStatsSearch) {
- search = models.NewWarehouseMonthStatsSearch().SetKeyword(params.Keyword).SetDate(params.Date)
+ search = models.NewWarehouseMonthStatsSearch().
+ SetKeyword(params.Keyword).SetDate(params.Date).SetWarehouseId(params.WarehouseID)
if params.Preload {
search = search.SetPreload(true)
}
@@ -161,7 +162,7 @@
return
}
-func GetCurrentWarehouseStats(date string, warehouseId int, productIds []string) (statRecords []*models.WarehouseMonthStats, err error) {
+func GetCurrentWarehouseStats(date string, warehouseId int, productIds []string, realTime bool) (statRecords []*models.WarehouseMonthStats, err error) {
//鏈湀鏈熷垵鏁伴噺/涓婃湀缁撲綑鏁伴噺
groupSumList, err := models.NewLocationProductAmountSearch().SetProductIds(productIds).GroupSum("product_id", "amount")
productIds = make([]string, 0, len(groupSumList))
@@ -177,6 +178,10 @@
//鎸夐厤缃彇寮�濮嬫椂闂村拰缁撴潫鏃堕棿
beginTime, endTime, err := NewSystemConfigService().GetInventoryCutOffTime()
+ if realTime {
+ beginTime = endTime
+ endTime = time.Now()
+ }
if err != nil {
logx.Errorf("MonthStats GetCurrentStats get GetInventoryCutOffTime err:%v", err)
return
--
Gitblit v1.8.0