Merge branch 'dev'

renhao

2023-10-18 ff1d40a1a235da7c3bdfa26070af267f19c7a3d3

 _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--;
            }
          }