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_EnginePipelineSource/StaticMethod_Initialize.qbl | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl b/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl
index b18fbac..727038c 100644
--- a/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_EnginePipelineSource/StaticMethod_Initialize.qbl
@@ -8,8 +8,12 @@
[*
// 鐢勫叞楦� Jun-24-2024 (created)
owner.EnginePipelineSource( relflush );
- ccunit := EnginePipelineReport::GetDefaultCCUnit();
- dlunit := EnginePipelineReport::GetDefaultDLUnit();
+ //ccunit := EnginePipelineReport::GetDefaultCCUnit();
+ //dlunit := EnginePipelineReport::GetDefaultDLUnit();
+ ccalineunit := FinancialProductionReport::GetDefaultCCALineUnit();
+ dlalienunit := FinancialProductionReport::GetDefaultDLALineUnit()
+ ccmplineunit := FinancialProductionReport::GetDefaultCCMPLineUnit()
+ dlmplineunit := FinancialProductionReport::GetDefaultDLMPLineUnit();
//allunit := EnginePipelineReport::GetDefaultAllUnit();
source := owner.EnginePipelineSource( relnew, Name := EnginePipelineReport::GetDefaultName() );
table := source.Report( relnew, ID := source.Name(), Name := source.Name() );
@@ -27,9 +31,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 );
traverse( stockingpoint, ProductInStockingPoint_MP, pisp, pisp.Product_MP().IsLeaf() and not pisp.IsSystem() ){
weekstart := owner.StartOfPlanning().Date();
@@ -41,20 +45,20 @@
daycolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Day(), pispip.Start().Date() );
//鍛�
weekcolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Week(), weekstart );
- supplyquantity := [Real]ceil( pispip.NewSupplyQuantity() );//鍚戜笂鍙栨暣
- inventoryquantity := [Real]ceil( pispip.PlannedInventoryLevelEnd() );//鍚戜笂鍙栨暣
+ supplyquantity := [Number]pispip.NewSupplyQuantity();//鍥涜垗浜斿叆
+ inventoryquantity := [Number]pispip.PlannedInventoryLevelEnd();//鍥涜垗浜斿叆
//浜ч噺鏄姞鎬�
if( iscc or isdl ){
- row.SetCellProductionValue( daycolumn, iscc, supplyquantity );
- row.SetCellProductionValue( weekcolumn, iscc, supplyquantity );
+ row.SetCellProductionValue( daycolumn, iscc, [Real]supplyquantity );
+ row.SetCellProductionValue( weekcolumn, iscc, [Real]supplyquantity );
}
//搴撳瓨闇�瑕佸彇鏈�鍚庝竴澶�
- row.SetCellInventoryValue( daycolumn, pispip.PlannedInventoryLevelEnd() );
+ row.SetCellInventoryValue( daycolumn, [Real]inventoryquantity );
if( pispip.Start() = weekstart + Duration::Days( 6 ) or pispip.Period_MP() = endperiod ){
weekstart := ( weekstart + Duration::Days( 7 ) ).Date();
- row.SetCellInventoryValue( weekcolumn, inventoryquantity );
+ row.SetCellInventoryValue( weekcolumn, [Real]inventoryquantity );
}
}
}
--
Gitblit v1.9.3