From 9d9b7d6217f0118025f68339f37ad54ae50cf346 Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期二, 22 十月 2024 18:17:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl
index 8ed89f7..108b822 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl
@@ -45,7 +45,8 @@
, DLRentOutOfCost := cell.DLRentOutOfCost()
, WerkToDLRentTransCost := cell.WerkToDLRentTransCost()
, DLRentStorCost := cell.DLRentStorCost()
- , CoefficientValue := cell.CoefficientValue() );
+ , CoefficientValue := cell.CoefficientValue()
+ , AllCost := cell.EstimateTotalCost() * [Real]cell.CoefficientValue() );
column.Cell( relinsert, showcell );
//鏄剧ず骞村崟鍏冩牸
yearcell.CCRentInCost( cell.CCRentInCost() + yearcell.CCRentInCost() );
@@ -78,6 +79,17 @@
sumcell.WerkToDLRentTransCost( cell.WerkToDLRentTransCost() + sumcell.WerkToDLRentTransCost() );
sumcell.DLRentStorCost( cell.DLRentStorCost() + sumcell.DLRentStorCost() );
}
+ yearcell.AllCost( yearcell.EstimateTotalCost() * [Real]yearcell.CoefficientValue() );
+ }
+ }
+ Transaction::Transaction().Propagate( attribute( DLEngineLogisticsCostCell, EstimateTotalCost ) );
+ traverse( yearcolumn, Cell, cell ){
+ cell.AllCost( cell.EstimateTotalCost() * [Real]cell.CoefficientValue() );
+ }
+ traverse( sumrow, Cell, cell ){
+ cell.AllCost( cell.EstimateTotalCost() * [Real]cell.CoefficientValue() );
+ if( exists( cell.Column(), Cell, acell, acell.IsUpdate() ) ){
+ cell.IsUpdate( true );
}
}
info( '-------------------------g------------end---------------------------------' );
--
Gitblit v1.9.3