From 73b6baf6af3d88cdcb0e2df7932a9bd96b0b85c5 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期一, 01 七月 2024 22:32:34 +0800 Subject: [PATCH] 月度统计出入库按类型汇总报表定时任务和手动跑任务接口 --- proto/product_inventory/server.go | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/proto/product_inventory/server.go b/proto/product_inventory/server.go index 1113c11..41e54d1 100644 --- a/proto/product_inventory/server.go +++ b/proto/product_inventory/server.go @@ -176,7 +176,7 @@ operation.ReceiverAddr = req.Address operation.Source = req.Source operation.OperationSource = constvar.OperationSource(req.OperationSource) - operation.CompanyID = int(req.ClientId) + operation.CompanyID = strconv.FormatInt(req.ClientId, 10) operation.CompanyName = req.ClientName if req.DeliverType == 1 { for _, product := range req.ProductList { @@ -351,6 +351,9 @@ inputLocationAmountMap := make(map[int64]map[string]decimal.Decimal) outputLocationAmountMap := make(map[int64]map[string]decimal.Decimal) for _, v := range outputList { + if req.WarehouseId != 0 && v.WareHouseID != req.WarehouseId { + continue + } if outputProductMap[v.Number] == nil { simpleInfo := &OutputSimpleInfo{ Number: v.Number, @@ -364,6 +367,9 @@ } } for _, v := range inputList { + if req.WarehouseId != 0 && v.WareHouseID != req.WarehouseId { + continue + } if inputProductMap[v.Number] == nil { storeInfo := &StoreInfo{ Number: v.Number, @@ -402,6 +408,9 @@ LocationIDWarehouseIDMap := make(map[int64]int64) for _, output := range outputList { + if req.WarehouseId != 0 && output.WareHouseID != req.WarehouseId { + continue + } if outputLocationAmountMap[output.LocationID] == nil { outputLocationAmountMap[output.LocationID] = make(map[string]decimal.Decimal) } @@ -409,6 +418,9 @@ outputLocationAmountMap[output.LocationID][output.Number] = outputAmount } for _, input := range inputList { + if req.WarehouseId != 0 && input.WareHouseID != req.WarehouseId { + continue + } LocationIDWarehouseIDMap[input.LocationID] = input.WareHouseID if inputLocationAmountMap[input.LocationID] == nil { -- Gitblit v1.8.0