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_EnginePipelineSource/StaticMethod_Initialize.qbl | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl b/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl
index f9e39e3..a024d30 100644
--- a/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl
@@ -11,16 +11,16 @@
//ccunit := EnginePipelineReport::GetDefaultCCUnit();
//dlunit := EnginePipelineReport::GetDefaultDLUnit();
productparent := EnginePipelineReport::GetDefaultProductParent();
- ccalineunit := EnginePipelineReport::GetDefaultCCALineUnit();
- dlalienunit := EnginePipelineReport::GetDefaultDLALineUnit()
- ccmplineunit := EnginePipelineReport::GetDefaultCCMPLineUnit()
- dlmplineunit := EnginePipelineReport::GetDefaultDLMPLineUnit();
+ //ccalineunit := EnginePipelineReport::GetDefaultCCALineUnit();
+ //dlalienunit := EnginePipelineReport::GetDefaultDLALineUnit()
+ //ccmplineunit := EnginePipelineReport::GetDefaultCCMPLineUnit()
+ //dlmplineunit := EnginePipelineReport::GetDefaultDLMPLineUnit();
//allunit := EnginePipelineReport::GetDefaultAllUnit();
source := owner.EnginePipelineSource( relnew, Name := EnginePipelineReport::GetDefaultName() );
table := source.Report( relnew, ID := source.Name(), Name := source.Name() );
showtable := source.Report( relnew, ID := source.Name() + 'Show', Name := source.Name(), IsShow := true );
- search := source.Search( relnew, StartDate := Date::MinDate(), EndDate := Date::MaxDate(), TimeUnit := Translations::MP_GlobalParameters_Day() );
+ search := owner.EnginePipelineSearch( relnew, StartDate := Date::MinDate(), EndDate := Date::MaxDate(), TimeUnit := Translations::MP_GlobalParameters_Day() );
products := construct( Product_MPs );
//鍒濆鍖栧垪
@@ -28,13 +28,16 @@
endperiod := maxobject( owner, Period_MP, period, not period.IsHistorical() and period.TimeUnit() = Translations::MP_GlobalParameters_Day(), period.StartDate() );
//鐢熸垚鐢熶骇鍜屽簱瀛樻暟鎹�
- 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 := unit.ID() = ccalineunit or unit.ID() = ccmplineunit or exists( parentunits, Elements, punit, punit.ID() = ccalineunit or punit.ID() = ccmplineunit );
+ iscc := stockingpoint.ID().StartsWith( 'CC' );
//鏄惁灞炰簬澶ц繛宸ュ巶
- isdl := unit.ID() = dlalienunit or unit.ID() = dlmplineunit or exists( parentunits, Elements, punit, punit.ID() = dlalienunit or punit.ID() = dlmplineunit );
+ // isdl := unit.ID() = dlalienunit or unit.ID() = dlmplineunit or exists( parentunits, Elements, punit, punit.ID() = dlalienunit or punit.ID() = dlmplineunit );
+ isdl := stockingpoint.ID().StartsWith( '澶ц繛' );
traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf() and not pisp.IsSystem()
and exists( pisp.Product_MP().GetAllParent(), Elements, e, e.ID() = productparent )
--
Gitblit v1.9.3