From ad81ba0fcc6ff3ca0576056bc494a110a6a691ea Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 23 十月 2024 17:50:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
index 0d48222..62befe8 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
@@ -36,7 +36,7 @@
sumcell := sumrow.Initialize( column );
}
//鏄剧ず鏈堝崟鍏冩牸
- showcell := showrow.Cell( relnew, RentInCost := cell.RentInCost(), RentOutOfCost := cell.RentOutOfCost(), WerkToRentTransCost := cell.WerkToRentTransCost(), RentStorCost := cell.RentStorCost(), CoefficientValue := cell.CoefficientValue() );
+ showcell := showrow.Cell( relnew, RentInCost := cell.RentInCost(), RentOutOfCost := cell.RentOutOfCost(), WerkToRentTransCost := cell.WerkToRentTransCost(), RentStorCost := cell.RentStorCost(), CoefficientValue := cell.CoefficientValue(), AllCost := cell.EstimateTotalCost() * [Real]cell.CoefficientValue() );
column.Cell( relinsert, showcell );
//鏄剧ず骞村崟鍏冩牸
yearcell.RentInCost( cell.RentInCost() + yearcell.RentInCost() );
@@ -54,6 +54,17 @@
sumcell.WerkToRentTransCost( cell.WerkToRentTransCost() + sumcell.WerkToRentTransCost() );
sumcell.RentStorCost( cell.RentStorCost() + sumcell.RentStorCost() );
}
+ yearcell.AllCost( yearcell.EstimateTotalCost() * [Real]yearcell.CoefficientValue() );
+ }
+ }
+ Transaction::Transaction().Propagate( attribute( CCEngineLogisticsCostCell, 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 );
}
}
*]
--
Gitblit v1.9.3