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_InventorySummarySource/StaticMethod_Initialize.qbl | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl b/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl
index b5bb158..5bdd2d7 100644
--- a/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl
@@ -14,10 +14,10 @@
allunit := InventorySummaryReport::GetDefaultAllUnit();
ccunit := InventorySummaryReport::GetDefaultCCUnit();
dlunit := InventorySummaryReport::GetDefaultDLUnit();
- ccalineunit := FinancialProductionReport::GetDefaultCCALineUnit();
- dlalienunit := FinancialProductionReport::GetDefaultDLALineUnit()
- ccmplineunit := FinancialProductionReport::GetDefaultCCMPLineUnit()
- dlmplineunit := FinancialProductionReport::GetDefaultDLMPLineUnit();
+ //ccalineunit := FinancialProductionReport::GetDefaultCCALineUnit();
+ //dlalienunit := FinancialProductionReport::GetDefaultDLALineUnit()
+ //ccmplineunit := FinancialProductionReport::GetDefaultCCMPLineUnit()
+ //dlmplineunit := FinancialProductionReport::GetDefaultDLMPLineUnit();
source := owner.InventorySummarySource( relnew, ID := InventorySummaryReport::GetDefaultName(), Name := InventorySummaryReport::GetDefaultName() );
table := source.InventorySummaryReport( relnew, ID := source.Name(), Name := source.Name() );
@@ -26,18 +26,21 @@
startofyear := startofplanning.StartOfYear();
startofnextyear := startofplanning.StartOfNextYear();
- search := source.InventorySummarySearch( relnew, Unit := allunit, Generation := allunit, MqbMlb := allunit, Power := allunit, StartDate := Date::MinDate(), EndDate := Date::MaxDate() );
+ search := owner.InventorySummarySearch( relnew, Unit := allunit, Generation := allunit, MqbMlb := allunit, Power := allunit, StartDate := Date::MinDate(), EndDate := Date::MaxDate() );
table.GenerateColumn( owner, 'All', startofyear, startofnextyear );
//info( '-----------------------------------', table.InventorySummaryColumn( relsize ) );
//搴撳瓨鏁伴噺涓篈ctual inventories閲岄潰鐨勭偣Planned inventories瀛楁搴撳瓨閲忓姞鎬�
- traverse( owner, StockingPoint_MP, stockingpoint ){
- unit := stockingpoint.Unit();
- parentunits := unit.GetAllParent();
+ //traverse( owner, StockingPoint_MP, stockingpoint ){
+ traverse( owner, StockingPoint_MP, stockingpoint, stockingpoint.ID().EndsWith( '鍘傚唴搴�' ) ){
+ // unit := stockingpoint.Unit();
+ // parentunits := unit.GetAllParent();
//鏄惁灞炰簬闀挎槬宸ュ巶
- iscc := unit.ID() = ccalineunit or unit.ID() = ccmplineunit or exists( parentunits, Elements, punit, punit.ID() = ccalineunit or punit.ID() = ccmplineunit );
+ iscc := stockingpoint.ID().StartsWith( 'CC' );//unit.ID() = ccalineunit or unit.ID() = ccmplineunit or exists( parentunits, Elements, punit, punit.ID() = ccalineunit or punit.ID() = ccmplineunit );
+ // iscc := stockingpoint.ID().StartsWith( 'CC' ) or unit.ID().StartsWith( 'CC' ) or exists( parentunits, Elements, punit, punit.ID().StartsWith( 'CC' ) );
//鏄惁灞炰簬澶ц繛宸ュ巶
- isdl := unit.ID() = dlalienunit or unit.ID() = dlmplineunit or exists( parentunits, Elements, punit, punit.ID() = dlalienunit or punit.ID() = dlmplineunit );
+ isdl := stockingpoint.ID().StartsWith( '澶ц繛' );//unit.ID() = dlalienunit or unit.ID() = dlmplineunit or exists( parentunits, Elements, punit, punit.ID() = dlalienunit or punit.ID() = dlmplineunit );
+ // isdl := stockingpoint.ID().StartsWith( 'DL' ) or unit.ID().StartsWith( 'DL' ) or exists( parentunits, Elements, punit, punit.ID().StartsWith( 'DL' ) );
if( iscc or isdl ){
traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf() ){
//鑾峰彇宸ュ巶琛�
@@ -144,8 +147,12 @@
rows := selectsortedset( table, InventroySummaryRow, row, row.Name() );
i := 0;
traverse( rows, Elements, e ){
- e.RowNr( i );
- i := i + 1;
+ if( exists( e, InventorySummaryCell, cell, cell.AverageInventory() <> 0 or cell.EndingInventory() <> 0 or cell.MaximumInventory() <> 0 or cell.MinimumInventory() <> 0 ) ){
+ e.RowNr( i );
+ i := i + 1;
+ }{
+ e.Delete();
+ }
}
showtable.Generate( search, products );
*]
--
Gitblit v1.9.3