From 489022017f8b581ab413455b41ec841879a75e03 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期六, 12 十月 2024 17:48:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
index 4ac90f8..f5a173d 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
@@ -12,32 +12,43 @@
allunit := '<All>';
//娓呯┖涔嬪墠瀛樺偍鐨勬樉绀烘暟鎹�
this.Clear();
+ //骞存眹鎬�
+ yearcolumn := this.Column( relnew, Name := '姹囨��', StartDate := search.MacroPlan().StartOfPlanning().StartOfNextYear().Date() );
//杩囨护鍚庣殑浜у搧id
productids := selectuniquevalues( products, Elements, product, ( search.Generation() = allunit or product.Generation() = search.Generation() )
and ( search.MqbMlb() = allunit or product.MQBMLB() = search.MqbMlb() )
and ( search.Power() = allunit or product.Power() = search.Power() ), product.ID() );
sumrow := this.Row( relnew, Name := 'SUM', RowNr := table.Row( relsize ) );
+ sumyearcell := sumrow.Initialize( yearcolumn );
traverse( table, Row, row ){
productid := construct( Strings );
productid.Add( row.Name() );
if( productids.ContainsAll( productid ) ){
showrow := this.Row( relnew, Name := row.Name(), RowNr := row.RowNr() );
+ yearcell := showrow.Initialize( yearcolumn );
traverse( row, Cell, cell ){
column := selectobject( this, Column, column, column.Name() = cell.Column().Name() );
sumcell := selectobject( column, Cell, c, c.Row() = sumrow );
if( isnull( sumcell ) ){
- sumcell := sumrow.Cell( relnew, RentInCost := 0
- , RentOutOfCost := 0
- , WerkToRentTransCost := 0
- , RentStorCost := 0 );
- column.Cell( relinsert, sumcell );
+ sumcell := sumrow.Initialize( column );
}
-
+ //鏄剧ず鏈堝崟鍏冩牸
showcell := showrow.Cell( relnew, RentInCost := cell.RentInCost(), RentOutOfCost := cell.RentOutOfCost(), WerkToRentTransCost := cell.WerkToRentTransCost(), RentStorCost := cell.RentStorCost() );
column.Cell( relinsert, showcell );
+ //鏄剧ず骞村崟鍏冩牸
+ yearcell.RentInCost( cell.RentInCost() + yearcell.RentInCost() );
+ yearcell.RentOutOfCost( cell.RentOutOfCost() + yearcell.RentOutOfCost() );
+ yearcell.WerkToRentTransCost( cell.WerkToRentTransCost() + yearcell.WerkToRentTransCost() );
+ yearcell.RentStorCost( cell.RentStorCost() + yearcell.RentStorCost() );
+ //鏄剧ず鍚堣骞村崟鍏冩牸
+ sumyearcell.RentInCost( cell.RentInCost() + sumyearcell.RentInCost() );
+ sumyearcell.RentOutOfCost( cell.RentOutOfCost() + sumyearcell.RentOutOfCost() );
+ sumyearcell.WerkToRentTransCost( cell.WerkToRentTransCost() + sumyearcell.WerkToRentTransCost() );
+ sumyearcell.RentStorCost( cell.RentStorCost() + sumyearcell.RentStorCost() );
+ //鏄剧ず鍚堣鏈堝崟鍏冩牸
sumcell.RentInCost( cell.RentInCost() + sumcell.RentInCost() );
sumcell.RentOutOfCost( cell.RentOutOfCost() + sumcell.RentOutOfCost() );
sumcell.WerkToRentTransCost( cell.WerkToRentTransCost() + sumcell.WerkToRentTransCost() );
--
Gitblit v1.9.3