From 4a3d9ec9b4d11f096fc24cfeee40246492dc08fd Mon Sep 17 00:00:00 2001
From: Administrator <renhui.hao@capgemini.com>
Date: 星期一, 25 九月 2023 22:43:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'

---
 _Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl |   65 ++++++++++++++++----------------
 1 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl b/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl
index 1375c53..b4361d5 100644
--- a/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl
+++ b/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl
@@ -4,7 +4,8 @@
   MacroPlan macroPlan,
   Strings businessTypes,
   Boolean isKeyProduct,
-  Boolean createPurchaseSupplyMaterial
+  Boolean createPurchaseSupplyMaterial,
+  GlobalOTDTable globalOTDTable
 )
 {
   Description: '鍗曟鍚屾'
@@ -27,10 +28,17 @@
     macroPlan.InitialUnitAndStockingPoint();
     
     // 鍗曚綅-1
-    UnitOfMeasure_MP::DoSync( macroPlan );
+    UnitOfMeasure_MP::DoSync( globalOTDTable,macroPlan );
     
     // 閿�鍞儴闂�-2
-    SalesSegment_MP::DoSync( macroPlan, businessTypes );
+    SalesSegment_MP::DoSync( macroPlan, businessTypes,globalOTDTable );
+    
+    // Unit-9 
+    // 涓嶰peration涓�鍚屽鐞�
+    //info( "BaseConversionFactor Finished, Start Operation Data Broker" );
+    //macroPlan.Broker_OTD_Operation().Execute();
+    info( "Operation Data Broker Finished, Start Unit Mapping" );
+    macroPlan.MappingUnitData( businessTypes ,globalOTDTable);
     
     // 搴撳瓨鐐�-3
     info( "Sales Segment Finished, Start Get StockingPoint From Api" )
@@ -63,29 +71,22 @@
     macroPlan.ApiCurencyRatesData( data );
     
     // 浜у搧鐗╂枡-6
-    info( "Get CurrencyRates From Api Finished, Start Product Data Broker" )
-    macroPlan.Broker_OTD_Product().Execute();
+    //info( "Get CurrencyRates From Api Finished, Start Product Data Broker" )
+    //macroPlan.Broker_OTD_Product().Execute();
     info( "Product Data Broker Finished, Start Product Mapping" );
     //testproduct := construct( Strings );
-    macroPlan.MappingProductData( businessTypes, isKeyProduct );
+    macroPlan.MappingProductData( businessTypes, globalOTDTable,isKeyProduct );
     
     //鍗曚綅杞崲-7
-    BaseConversionFactor::DoSync( macroPlan );
-    
-    // Unit-9 
-    // 涓嶰peration涓�鍚屽鐞�
-    info( "BaseConversionFactor Finished, Start Operation Data Broker" );
-    macroPlan.Broker_OTD_Operation().Execute();
-    info( "Operation Data Broker Finished, Start Unit Mapping" );
-    macroPlan.MappingUnitData( businessTypes );
+    BaseConversionFactor::DoSync( macroPlan ,globalOTDTable);
     
     // 宸ヨ壓璺嚎 + BOM-9
     info( "Unit Finished, Start Operation Mapping" );
-    macroPlan.MappingOperationData( businessTypes );  
-    info( "Operation Finished, Start BOM Data Broker" );
-    macroPlan.Broker_OTD_BOM().Execute();
+    macroPlan.MappingOperationData( businessTypes ,globalOTDTable);  
+    //info( "Operation Finished, Start BOM Data Broker" );
+    //macroPlan.Broker_OTD_BOM().Execute();
     info( "BOM Data Broker Finished, Start BOM Mapping" );
-    macroPlan.MappingOperationBOMData( businessTypes, isKeyProduct, createPurchaseSupplyMaterial );
+    macroPlan.MappingOperationBOMData( businessTypes, isKeyProduct, createPurchaseSupplyMaterial,globalOTDTable );
     
     //杞﹂亾淇℃伅-10
     info( "BOM Finished, Start Get Lanes From Api" );
@@ -108,37 +109,35 @@
     macroPlan.ApiLaneLegsData( data );
     
     // 渚涘簲缃戠粶锛堣溅閬擄級-12
-    info( "Get Lanelegs From Api Finished, Start ProductInLane Data Broker" );
-    macroPlan.Broker_OTD_ProductInLane().Execute();
+    //info( "Get Lanelegs From Api Finished, Start ProductInLane Data Broker" );
+    //macroPlan.Broker_OTD_ProductInLane().Execute();
     info( "ProductInLane Data Broker Finished, Start ProductInLane Mapping" );
-    macroPlan.MappingProductInLaneData();
+    macroPlan.MappingProductInLaneData(globalOTDTable);
     
     // 鍦ㄥ簱搴撳瓨鏁版嵁-13
-    info( "ProductInLane Finished, Start ActualPISPIP Data Broker" );
-    macroPlan.Broker_OTD_ActualPISPIP().Execute();
+    //info( "ProductInLane Finished, Start ActualPISPIP Data Broker" );
+    //macroPlan.Broker_OTD_ActualPISPIP().Execute();
     info( "ActualPISPIP Data Broker Finished, Start ActualPISPIP Mapping" );
-    //macroPlan.MappingActualPISPIPData( businessTypes, true );
-    macroPlan.MappingActualPISPIPData( businessTypes, isKeyProduct );
+    macroPlan.MappingActualPISPIPData( businessTypes, globalOTDTable,isKeyProduct );
     
     // 鍦ㄩ�斿簱瀛�-14
-    info( "ActualPISPIP Finished, Start ExternalSupply Data Broker" );
-    macroPlan.Broker_OTD_ExternalSupply().Execute();
-    //macroPlan.MappingExternalSupplyData( businessTypes, true );
+    //info( "ActualPISPIP Finished, Start ExternalSupply Data Broker" );
+    //macroPlan.Broker_OTD_ExternalSupply().Execute();
     info( "ExternalSupply Data Broker Finished, Start ExternalSupply Mapping" );
-    macroPlan.MappingExternalSupplyData( businessTypes, isKeyProduct );
+    macroPlan.MappingExternalSupplyData( businessTypes, isKeyProduct ,globalOTDTable);
     
     // 搴撳瓨鎴愭湰-15
-    InventoryValueAndCost::DoSync( macroPlan );
+    InventoryValueAndCost::DoSync( macroPlan,globalOTDTable );
     
     // todo 鍒堕�犳垚鏈�-16
     info( "InventoryCost Finished, Start OperationCost Mapping" );
-    //macroPlan.MappingOperationCostData( businessTypes );
+    macroPlan.MappingOperationCostData( businessTypes );
     
     // 璁㈠崟棰勬祴-17
-    Forecast::DoSync( macroPlan, businessTypes );
+    Forecast::DoSync( macroPlan, businessTypes ,globalOTDTable);
     
     // 璁㈠崟闇�姹�-18
-    CustomerOrder::DoSync( macroPlan, businessTypes );
+    CustomerOrder::DoSync( macroPlan, businessTypes, globalOTDTable);
     
     //鍒犻櫎澶氫綑鎶ラ敊鏁版嵁-19
     macroPlan.DeleteSnaityCheck();

--
Gitblit v1.9.3