From a67dc2f0b8dd2803982cfa9c6ea42b77c191d22c Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期一, 11 十一月 2024 12:02:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
index 62befe8..6d71205 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
@@ -54,18 +54,25 @@
sumcell.WerkToRentTransCost( cell.WerkToRentTransCost() + sumcell.WerkToRentTransCost() );
sumcell.RentStorCost( cell.RentStorCost() + sumcell.RentStorCost() );
}
+ yearcell.EstimateTotalCost( yearcell.CalcEstimateTotalCost() );
yearcell.AllCost( yearcell.EstimateTotalCost() * [Real]yearcell.CoefficientValue() );
}
}
Transaction::Transaction().Propagate( attribute( CCEngineLogisticsCostCell, EstimateTotalCost ) );
traverse( yearcolumn, Cell, cell ){
+ cell.EstimateTotalCost( cell.CalcEstimateTotalCost() );
cell.AllCost( cell.EstimateTotalCost() * [Real]cell.CoefficientValue() );
}
traverse( sumrow, Cell, cell ){
+ cell.EstimateTotalCost( cell.CalcEstimateTotalCost() );
cell.AllCost( cell.EstimateTotalCost() * [Real]cell.CoefficientValue() );
- if( exists( cell.Column(), Cell, acell, acell.IsUpdate() ) ){
- cell.IsUpdate( true );
- }
+ cell.IsAllCostUpdate( exists( cell.Column(), Cell, acell, acell.IsAllCostUpdate() ) );
+ cell.IsCoefficientUpdate( exists( cell.Column(), Cell, acell, acell.IsCoefficientUpdate() ) );
+ cell.IsEstimateTotalCostUpdate( exists( cell.Column(), Cell, acell, acell.IsEstimateTotalCostUpdate() ) );
+ cell.IsRentInCostUpdate( exists( cell.Column(), Cell, acell, acell.IsRentInCostUpdate() ) );
+ cell.IsRentOutOfCostUpdate( exists( cell.Column(), Cell, acell, acell.IsRentOutOfCostUpdate() ) );
+ cell.IsRentStorCostUpdate( exists( cell.Column(), Cell, acell, acell.IsRentStorCostUpdate() ) );
+ cell.IsWerkToRentTransCostUpdate( exists( cell.Column(), Cell, acell, acell.IsWerkToRentTransCostUpdate() ) );
}
*]
}
--
Gitblit v1.9.3