From face55e7f35130d29d7f395a4b4501d57b97ef81 Mon Sep 17 00:00:00 2001
From: yanweiyuan3 <yanweiyuan3@gmail.com>
Date: 星期二, 17 十月 2023 18:07:35 +0800
Subject: [PATCH] Merge branch 'dev' into dev_yy
---
_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration.qbl | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration.qbl b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration.qbl
index af2857c..92e3c7f 100644
--- a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration.qbl
+++ b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod IterativeGeneration (
- GlobalOTDTable globalOTDTable,
+ GlobalOTDSOP globalOTDSOP,
ProductInStockingPoint_MP pisp,
Number numberOfLayers,
NewSupply finaleNewSupply,
@@ -27,7 +27,7 @@
oi := dd.ProcessInput().astype( OperationInput );
finaleDependentDemand := finaleDependentDemand * oo.Quantity() * oi.Quantity();
// info( "渚濊禆闇�姹備骇鍝両D锛�", dd.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP().ProductID(), " 渚濊禆鏁伴噺锛�", dd.Quantity(), " 褰撳墠鍛ㄦ湡浠诲姟Key锛�", dd.PeriodTask_MP().astype( PeriodTaskOperation ).Key() );
- CapacityAllocationResults::IterativeGeneration( globalOTDTable, dd.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP(), numberOfLayers, finaleNewSupply, finaleDependentDemand, targetDate );
+ CapacityAllocationResults::IterativeGeneration( globalOTDSOP, dd.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP(), numberOfLayers, finaleNewSupply, finaleDependentDemand, targetDate );
}
// info( "----------------------------------------------------" );
} else {
@@ -35,17 +35,17 @@
// info( "======" );
pispPanel := ns.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP();
pispModule := finaleNewSupply.ProductInStockingPointInPeriodPlanningLeaf().ProductInStockingPoint_MP();
- globalOTDTable.CapacityAllocationResults( relnew,
- PanelBase := pispPanel.StockingPointID(),
- PanelMaterialCode := pispPanel.ProductID(),
- NumberOfPanels := finaleDependentDemand,
- PanelMeasurementUnit := pispPanel.UnitOfMeasure_MP().Name(),
- ModuleMaterialCode := pispModule.ProductID(),
- NumberOfModules := finaleNewSupply.Quantity(),
- ModuleMeasurementUnit := pispModule.UnitOfMeasure_MP().Name(),
- ModuleBase := pispModule.StockingPointID(),
- RequirementDate := finaleNewSupply.Start().Date()
- );
+ globalOTDSOP.CapacityAllocationResults( relnew,
+ PanelBase := pispPanel.StockingPointID(),
+ PanelMaterialCode := pispPanel.ProductID(),
+ NumberOfPanels := finaleDependentDemand,
+ PanelMeasurementUnit := pispPanel.UnitOfMeasure_MP().Name(),
+ ModuleMaterialCode := pispModule.ProductID(),
+ NumberOfModules := finaleNewSupply.Quantity(),
+ ModuleMeasurementUnit := pispModule.UnitOfMeasure_MP().Name(),
+ ModuleBase := pispModule.StockingPointID(),
+ RequirementDate := finaleNewSupply.Start().Date()
+ );
}
finaleNewSupply := null( NewSupply );
}
--
Gitblit v1.9.3