From ad242bf0203ebb1236bd2cb5c1da1dd8619aedce Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 25 九月 2024 11:44:55 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl b/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
index f8cbebb..4ac90f8 100644
--- a/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
+++ b/_Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl
@@ -29,19 +29,19 @@
sumcell := selectobject( column, Cell, c, c.Row() = sumrow );
if( isnull( sumcell ) ){
- sumcell := sumrow.Cell( relnew, RentEnterCost := 0
- , RentOutCost := 0
- , FactoryToRentTransCost := 0
- , RentStorageCost := 0 );
+ sumcell := sumrow.Cell( relnew, RentInCost := 0
+ , RentOutOfCost := 0
+ , WerkToRentTransCost := 0
+ , RentStorCost := 0 );
column.Cell( relinsert, sumcell );
}
- showcell := showrow.Cell( relnew, RentEnterCost := cell.RentEnterCost(), RentOutCost := cell.RentOutCost(), FactoryToRentTransCost := cell.FactoryToRentTransCost(), RentStorageCost := cell.RentStorageCost() );
+ showcell := showrow.Cell( relnew, RentInCost := cell.RentInCost(), RentOutOfCost := cell.RentOutOfCost(), WerkToRentTransCost := cell.WerkToRentTransCost(), RentStorCost := cell.RentStorCost() );
column.Cell( relinsert, showcell );
- sumcell.RentEnterCost( cell.RentEnterCost() + sumcell.RentEnterCost() );
- sumcell.RentOutCost( cell.RentOutCost() + sumcell.RentOutCost() );
- sumcell.FactoryToRentTransCost( cell.FactoryToRentTransCost() + sumcell.FactoryToRentTransCost() );
- sumcell.RentStorageCost( cell.RentStorageCost() + sumcell.RentStorageCost() );
+ sumcell.RentInCost( cell.RentInCost() + sumcell.RentInCost() );
+ sumcell.RentOutOfCost( cell.RentOutOfCost() + sumcell.RentOutOfCost() );
+ sumcell.WerkToRentTransCost( cell.WerkToRentTransCost() + sumcell.WerkToRentTransCost() );
+ sumcell.RentStorCost( cell.RentStorCost() + sumcell.RentStorCost() );
}
}
}
--
Gitblit v1.9.3