From acf70acb5438a3358d07978afdc0eb28950f40d5 Mon Sep 17 00:00:00 2001 From: lihongji <3117313295@qq.com> Date: 星期一, 12 八月 2024 16:28:01 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev --- _Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl b/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl index 47f1246..b5bb158 100644 --- a/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl +++ b/_Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl @@ -14,6 +14,10 @@ allunit := InventorySummaryReport::GetDefaultAllUnit(); ccunit := InventorySummaryReport::GetDefaultCCUnit(); dlunit := InventorySummaryReport::GetDefaultDLUnit(); + 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() ); @@ -31,9 +35,9 @@ unit := stockingpoint.Unit(); parentunits := unit.GetAllParent(); //鏄惁灞炰簬闀挎槬宸ュ巶 - iscc := unit.ID() = ccunit or exists( parentunits, Elements, punit, punit.ID() = ccunit ); + iscc := unit.ID() = ccalineunit or unit.ID() = ccmplineunit or exists( parentunits, Elements, punit, punit.ID() = ccalineunit or punit.ID() = ccmplineunit ); //鏄惁灞炰簬澶ц繛宸ュ巶 - isdl := unit.ID() = dlunit or exists( parentunits, Elements, punit, punit.ID() = dlunit ); + isdl := unit.ID() = dlalienunit or unit.ID() = dlmplineunit or exists( parentunits, Elements, punit, punit.ID() = dlalienunit or punit.ID() = dlmplineunit ); if( iscc or isdl ){ traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf() ){ //鑾峰彇宸ュ巶琛� -- Gitblit v1.9.3