From b3f6939dda38b3e64406de983657a6db7ea077df Mon Sep 17 00:00:00 2001
From: yy <yuan.yan@capgemini.com>
Date: 星期一, 25 九月 2023 15:43:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_hrh_global'
---
_Main/BL/Type_MacroPlan/Method_MappingUnitOfMeasureData.qbl | 6 ++++--
_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl | 2 +-
_Main/BL/Type_UnitOfMeasure_MP/StaticMethod_DoSync.qbl | 5 +++--
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingUnitOfMeasureData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingUnitOfMeasureData.qbl
index 2c4ce55..f3118cb 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingUnitOfMeasureData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingUnitOfMeasureData.qbl
@@ -1,6 +1,8 @@
Quintiq file version 2.0
#parent: #root
-Method MappingUnitOfMeasureData
+Method MappingUnitOfMeasureData (
+ GlobalOTDTable globalotdtable
+)
{
Description: 'ETL鏁版嵁杞ā鍨嬫暟鎹�'
TextBody:
@@ -16,7 +18,7 @@
//error( "multi default unit of measure" )
}
- traverse( this, MappingUnitOfMeasure, item ) {
+ traverse( globalotdtable, Global_MappingUnitOfMeasure_MP, item ) {
UnitOfMeasure_MP::CreateOrUpdate( this, item.Name(), item.IsDefault() );
}
*]
diff --git a/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl b/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl
index 5b701fd..45c9fec 100644
--- a/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl
+++ b/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl
@@ -28,7 +28,7 @@
macroPlan.InitialUnitAndStockingPoint();
// 鍗曚綅-1
- UnitOfMeasure_MP::DoSync( macroPlan );
+ UnitOfMeasure_MP::DoSync( globalOTDTable,macroPlan );
// 閿�鍞儴闂�-2
SalesSegment_MP::DoSync( macroPlan, businessTypes,globalOTDTable );
diff --git a/_Main/BL/Type_UnitOfMeasure_MP/StaticMethod_DoSync.qbl b/_Main/BL/Type_UnitOfMeasure_MP/StaticMethod_DoSync.qbl
index 9894a2a..7393582 100644
--- a/_Main/BL/Type_UnitOfMeasure_MP/StaticMethod_DoSync.qbl
+++ b/_Main/BL/Type_UnitOfMeasure_MP/StaticMethod_DoSync.qbl
@@ -1,7 +1,8 @@
Quintiq file version 2.0
#parent: #root
StaticMethod DoSync (
- MacroPlan macroPlan
+ GlobalOTDTable globalotdtable,
+ MacroPlan macroplan
)
{
Description: '鍗曟鍚屾'
@@ -11,6 +12,6 @@
//info( "Inital Finished, Start UnitOfMeasure_MP Data Broker" )
//macroPlan.Broker_OTD_UnitOfMeasure().Execute();
info( "UnitOfMeasure_MP Data Broker Finished, Start UnitOfMeasure_MP Mapping" )
- macroPlan.MappingUnitOfMeasureData();
+ macroplan.MappingUnitOfMeasureData(globalotdtable);
*]
}
--
Gitblit v1.9.3