From 5fa4a6a06c62fd41731ff6cc1f1f6e031bd7436f Mon Sep 17 00:00:00 2001
From: yypsybs <yypsybs@foxmail.com>
Date: 星期三, 18 十月 2023 09:50:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration3.qbl | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration3.qbl b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration3.qbl
index 1c16b4d..a10d437 100644
--- a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration3.qbl
+++ b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_IterativeGeneration3.qbl
@@ -2,7 +2,7 @@
#parent: #root
StaticMethod IterativeGeneration3 (
MacroPlan macroPlan,
- GlobalOTDTable globalOTDTable,
+ GlobalOTDSOP globalOTDSOP,
Supply_MP smp,
Supply_MP firstSMP,
Number numberOfPlies,
@@ -27,9 +27,9 @@
fulfillmentQuantity := ( dd.Quantity() / ns.Quantity() ) * fulfillmentQuantity;
info( "--------------------------------------------------------------" );
if ( not isnull( capacityAllocationResultsRuleConfiguration ) ) {
- CapacityAllocationResults::CreateDate1( macroPlan, globalOTDTable, dd, ns, firstSMP, capacityAllocationResultsRuleConfiguration, fulfillmentQuantity );
+ CapacityAllocationResults::CreateDate1( macroPlan, globalOTDSOP, dd, ns, firstSMP, capacityAllocationResultsRuleConfiguration, fulfillmentQuantity );
}
- CapacityAllocationResults::IterativeGeneration3( macroPlan, globalOTDTable, smp1, firstSMP, numberOfPlies, fulfillmentQuantity, capacityAllocationResultsRuleConfiguration );
+ CapacityAllocationResults::IterativeGeneration3( macroPlan, globalOTDSOP, smp1, firstSMP, numberOfPlies, fulfillmentQuantity, capacityAllocationResultsRuleConfiguration );
numberOfPlies--;
}
}
@@ -45,9 +45,9 @@
numberOfPlies++;
info( "--------------------------------------------------------------" );
if ( not isnull( capacityAllocationResultsRuleConfiguration ) ) {
- CapacityAllocationResults::CreateDate1( macroPlan, globalOTDTable, targetDependentDemand, ns, firstSMP, capacityAllocationResultsRuleConfiguration, f.Quantity() );
+ CapacityAllocationResults::CreateDate1( macroPlan, globalOTDSOP, targetDependentDemand, ns, firstSMP, capacityAllocationResultsRuleConfiguration, f.Quantity() );
}
- CapacityAllocationResults::IterativeGeneration3( macroPlan, globalOTDTable, smp1, firstSMP, numberOfPlies, f.Quantity(), capacityAllocationResultsRuleConfiguration );
+ CapacityAllocationResults::IterativeGeneration3( macroPlan, globalOTDSOP, smp1, firstSMP, numberOfPlies, f.Quantity(), capacityAllocationResultsRuleConfiguration );
numberOfPlies--;
}
}
--
Gitblit v1.9.3