From c0048dc17d4fdb06ed42d8dc084bb7cf0bdb11c9 Mon Sep 17 00:00:00 2001
From: yanyuan <yuan.yan@capgemini.com>
Date: 星期三, 01 十一月 2023 17:28:02 +0800
Subject: [PATCH] Fix log

---
 _Main/BL/Type_Global_MappingLaneLeg/StaticMethod_SynchronizeMacroPlanData.qbl                              |    3 
 _Main/BL/Type_ProductInLane/StaticMethod_FindById.qbl                                                      |   16 ++++
 _Main/BL/Type_Global_MappingProductInLane/StaticMethod_SynchronizeMacroPlanData.qbl                        |    3 
 _Main/BL/Type_Global_MappingUnitOfMeasure_MP/StaticMethod_SynchronizeMacroPlanData.qbl                     |   14 ++
 _Main/BL/Type_Global_MappingForecast/StaticMethod_SynchronizeMacroPlanData.qbl                             |    3 
 _Main/BL/Type_Global_MappingCurrency_MP/StaticMethod_SynchronizeMacroPlanData.qbl                          |    3 
 _Main/BL/Type_Global_MappingOperationBOM/StaticMethod_SynchronizeMacroPlanData.qbl                         |    3 
 _Main/BL/Type_ProductInLane/StaticMethod_CreateOrUpdate.qbl                                                |    6 
 _Main/BL/Type_Global_MappingProduct_MP/StaticMethod_SynchronizeMacroPlanData.qbl                           |    3 
 _Main/BL/Type_Global_MappingCurrencyRate_MP/StaticMethod_SynchronizeMacroPlanData.qbl                      |    3 
 _Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan#127.qbl                                     |  144 ++++++++++++++++++------------------
 _Main/BL/Type_Global_MappingCustomOrder/StaticMethod_SynchronizeMacroPlanData.qbl                          |    3 
 _Main/BL/Type_Global_MappingInventorySupply/StaticMethod_SynchronizeMacroPlanData.qbl                      |    3 
 _Main/BL/Type_Global_MappingStockingPoint_MP/StaticMethod_SynchronizeMacroPlanData.qbl                     |    3 
 _Main/BL/Type_Global_MappingActualProductInStockingPointInPeriod/StaticMethod_SynchronizeMacroPlanData.qbl |    3 
 _Main/BL/Type_Global_MappingOperation/StaticMethod_SynchronizeMacroPlanData.qbl                            |    3 
 _Main/BL/Type_Global_MappingConversionFactor/StaticMethod_SynchronizeMacroPlanData.qbl                     |    3 
 _Main/BL/Type_Global_MappingStockingPointCost/StaticMethod_SynchronizeMacroPlanData.qbl                    |    3 
 _Main/BL/Type_Global_MappingLane/StaticMethod_SynchronizeMacroPlanData.qbl                                 |    3 
 _Main/BL/Type_Global_MappingUnitCost/StaticMethod_SynchronizeMacroPlanData.qbl                             |    3 
 _Main/BL/Type_Global_MappingSalesSegment_MP/StaticMethod_SynchronizeMacroPlanData.qbl                      |    3 
 21 files changed, 136 insertions(+), 95 deletions(-)

diff --git "a/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl" "b/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl"
index f20706a..089f24c 100644
--- "a/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl"
+++ "b/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl"
@@ -50,77 +50,77 @@
     
     macroPlan.InitialUnitAndStockingPoint();
     info( organcodelist.Element( 0 ) );
-    //
-    //if ( isUnitOfMeasure_MP ) {
-    //  Global_MappingUnitOfMeasure_MP::SynchronizeMacroPlanData( this, macroPlan );
-    //}
-    //
-    //if ( isCustomOrder ) {
-    //  Global_MappingCustomOrder::SynchronizeMacroPlanData( this, macroPlan, businessTypes, organcodelist, executionUser );
-    //}
-    //
-    //if ( isForeacst ) {
-    //  Global_MappingForecast::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes, organcodelist );
-    //}
-    //
-    //if ( isSalesSegment_MP ) {
-    //  Global_MappingSalesSegment_MP::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes );
-    //}
-    //
-    //if ( isProduct_MP ) {
-    //  Global_MappingProduct_MP::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes, macroPlan.IsKeyProduct() );
-    //}
-    //
-    //if ( isConversionFactor ) {
-    //  Global_MappingConversionFactor::SynchronizeMacroPlanData( this, macroPlan, executionUser );
-    //}
-    //
-    //if ( isOperation ) {
-    //  Global_MappingOperation::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes, organcodelist );
-    //}
-    //
-    //if ( isOperationBOM ) {
-    //  Global_MappingOperationBOM::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes, organcodelist, macroPlan.IsKeyProduct(), macroPlan.CreatePurchaseSupplyMaterial() );
-    //}
-    //
-    //if ( isProductInLane ) {
-    //  Global_MappingProductInLane::SynchronizeMacroPlanData( this, macroPlan, businessTypes, executionUser );
-    //}
-    //
-    //if ( isAIPISPIP ) {
-    //  Global_MappingActualProductInStockingPointInPeriod::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes, organcodelist, macroPlan.IsKeyProduct() );
-    //}
-    //
-    //if ( isInventorySupply ) {
-    //  Global_MappingInventorySupply::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes, organcodelist, macroPlan.IsKeyProduct() );
-    //}
-    //
-    //if ( isStockingPointCost ) {
-    //  Global_MappingStockingPointCost::SynchronizeMacroPlanData( this, macroPlan, businessTypes, executionUser );
-    //}
-    //
-    //if ( isOperationCost ) {
-    //  Global_MappingOperationCost::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes, organcodelist );
-    //}
-    //
-    //if ( isStockingPoint_MP ) {
-    //  Global_MappingStockingPoint_MP::SynchronizeMacroPlanData( this, macroPlan, executionUser );
-    //}
-    //
-    //if ( isCurrency_MP ) {
-    //  Global_MappingCurrency_MP::SynchronizeMacroPlanData( this, macroPlan, executionUser );
-    //}
-    //
-    //if ( isCurrencyRate_MP ) {
-    //  Global_MappingCurrencyRate_MP::SynchronizeMacroPlanData( this, macroPlan, executionUser );
-    //}
-    //
-    //if ( isLane ) {
-    //  Global_MappingLane::SynchronizeMacroPlanData( this, macroPlan, executionUser );
-    //}
-    //
-    //if ( isLaneLeg ) {
-    //  Global_MappingLaneLeg::SynchronizeMacroPlanData( this, macroPlan, executionUser );
-    //}
+    
+    if ( isUnitOfMeasure_MP ) {
+      Global_MappingUnitOfMeasure_MP::SynchronizeMacroPlanData( this, macroPlan, executionUser );
+    }
+    
+    if ( isCustomOrder ) {
+      Global_MappingCustomOrder::SynchronizeMacroPlanData( this, macroPlan, businessTypes, organcodelist, executionUser );
+    }
+    
+    if ( isForeacst ) {
+      Global_MappingForecast::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes, organcodelist );
+    }
+    
+    if ( isSalesSegment_MP ) {
+      Global_MappingSalesSegment_MP::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes );
+    }
+    
+    if ( isProduct_MP ) {
+      Global_MappingProduct_MP::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes, macroPlan.IsKeyProduct() );
+    }
+    
+    if ( isConversionFactor ) {
+      Global_MappingConversionFactor::SynchronizeMacroPlanData( this, macroPlan, executionUser );
+    }
+    
+    if ( isOperation ) {
+      Global_MappingOperation::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes, organcodelist );
+    }
+    
+    if ( isOperationBOM ) {
+      Global_MappingOperationBOM::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes, organcodelist, macroPlan.IsKeyProduct(), macroPlan.CreatePurchaseSupplyMaterial() );
+    }
+    
+    if ( isProductInLane ) {
+      Global_MappingProductInLane::SynchronizeMacroPlanData( this, macroPlan, businessTypes, executionUser );
+    }
+    
+    if ( isAIPISPIP ) {
+      Global_MappingActualProductInStockingPointInPeriod::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes, organcodelist, macroPlan.IsKeyProduct() );
+    }
+    
+    if ( isInventorySupply ) {
+      Global_MappingInventorySupply::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes, organcodelist, macroPlan.IsKeyProduct() );
+    }
+    
+    if ( isStockingPointCost ) {
+      Global_MappingStockingPointCost::SynchronizeMacroPlanData( this, macroPlan, businessTypes, executionUser );
+    }
+    
+    if ( isOperationCost ) {
+      Global_MappingOperationCost::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes, organcodelist );
+    }
+    
+    if ( isStockingPoint_MP ) {
+      Global_MappingStockingPoint_MP::SynchronizeMacroPlanData( this, macroPlan, executionUser );
+    }
+    
+    if ( isCurrency_MP ) {
+      Global_MappingCurrency_MP::SynchronizeMacroPlanData( this, macroPlan, executionUser );
+    }
+    
+    if ( isCurrencyRate_MP ) {
+      Global_MappingCurrencyRate_MP::SynchronizeMacroPlanData( this, macroPlan, executionUser );
+    }
+    
+    if ( isLane ) {
+      Global_MappingLane::SynchronizeMacroPlanData( this, macroPlan, executionUser );
+    }
+    
+    if ( isLaneLeg ) {
+      Global_MappingLaneLeg::SynchronizeMacroPlanData( this, macroPlan, executionUser );
+    }
   *]
 }
diff --git a/_Main/BL/Type_Global_MappingActualProductInStockingPointInPeriod/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingActualProductInStockingPointInPeriod/StaticMethod_SynchronizeMacroPlanData.qbl
index 12c950a..ad249d7 100644
--- a/_Main/BL/Type_Global_MappingActualProductInStockingPointInPeriod/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingActualProductInStockingPointInPeriod/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -12,7 +12,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾瀹為檯搴撳瓨鏁版嵁",
+                                                                       BrokerName := "鍚屾瀹為檯搴撳瓨鏁版嵁",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingConversionFactor/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingConversionFactor/StaticMethod_SynchronizeMacroPlanData.qbl
index 7147599..51aa067 100644
--- a/_Main/BL/Type_Global_MappingConversionFactor/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingConversionFactor/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -9,7 +9,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾鍗曚綅杞崲鏁版嵁",
+                                                                       BrokerName := "鍚屾鍗曚綅杞崲鏁版嵁",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingCurrencyRate_MP/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingCurrencyRate_MP/StaticMethod_SynchronizeMacroPlanData.qbl
index c42db35..e30d9ef 100644
--- a/_Main/BL/Type_Global_MappingCurrencyRate_MP/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingCurrencyRate_MP/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -9,7 +9,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾璐у竵姹囩巼鏁版嵁",
+                                                                       BrokerName := "鍚屾璐у竵姹囩巼鏁版嵁",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingCurrency_MP/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingCurrency_MP/StaticMethod_SynchronizeMacroPlanData.qbl
index 94f4a07..31f2109 100644
--- a/_Main/BL/Type_Global_MappingCurrency_MP/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingCurrency_MP/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -9,7 +9,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾璐у竵鏁版嵁",
+                                                                       BrokerName := "鍚屾璐у竵鏁版嵁",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingCustomOrder/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingCustomOrder/StaticMethod_SynchronizeMacroPlanData.qbl
index b4df4f3..7e2f51f 100644
--- a/_Main/BL/Type_Global_MappingCustomOrder/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingCustomOrder/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -11,7 +11,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾璁㈠崟鏁版嵁",
+                                                                       BrokerName := "鍚屾璁㈠崟鏁版嵁",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingForecast/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingForecast/StaticMethod_SynchronizeMacroPlanData.qbl
index 3b437f4..cb14755 100644
--- a/_Main/BL/Type_Global_MappingForecast/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingForecast/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -11,7 +11,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾棰勬祴鏁版嵁",
+                                                                       BrokerName := "鍚屾棰勬祴鏁版嵁",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingInventorySupply/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingInventorySupply/StaticMethod_SynchronizeMacroPlanData.qbl
index 9a8c68c..7de7b35 100644
--- a/_Main/BL/Type_Global_MappingInventorySupply/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingInventorySupply/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -12,7 +12,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾鍦ㄩ�斿簱瀛樻暟鎹�",
+                                                                       BrokerName := "鍚屾鍦ㄩ�斿簱瀛樻暟鎹�",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingLane/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingLane/StaticMethod_SynchronizeMacroPlanData.qbl
index 2f0d00e..6cfc45e 100644
--- a/_Main/BL/Type_Global_MappingLane/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingLane/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -9,7 +9,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾杞﹂亾鏁版嵁",
+                                                                       BrokerName := "鍚屾杞﹂亾鏁版嵁",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingLaneLeg/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingLaneLeg/StaticMethod_SynchronizeMacroPlanData.qbl
index ba3f97e..dacd193 100644
--- a/_Main/BL/Type_Global_MappingLaneLeg/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingLaneLeg/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -9,7 +9,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾杞﹂亾璺嚎鏁版嵁",
+                                                                       BrokerName := "鍚屾杞﹂亾璺嚎鏁版嵁",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingOperation/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingOperation/StaticMethod_SynchronizeMacroPlanData.qbl
index 1a44c1c..59d2808 100644
--- a/_Main/BL/Type_Global_MappingOperation/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingOperation/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -11,7 +11,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾宸ヨ壓璺嚎鏁版嵁",
+                                                                       BrokerName := "鍚屾宸ヨ壓璺嚎鏁版嵁",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingOperationBOM/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingOperationBOM/StaticMethod_SynchronizeMacroPlanData.qbl
index 41ade06..86e1e89 100644
--- a/_Main/BL/Type_Global_MappingOperationBOM/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingOperationBOM/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -13,7 +13,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾BOM鏁版嵁",
+                                                                       BrokerName := "鍚屾BOM鏁版嵁",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingProductInLane/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingProductInLane/StaticMethod_SynchronizeMacroPlanData.qbl
index 1d10ded..00eddb8 100644
--- a/_Main/BL/Type_Global_MappingProductInLane/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingProductInLane/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -10,7 +10,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾杩愯緭璺嚎浜у搧鏁版嵁",
+                                                                       BrokerName := "鍚屾杩愯緭璺嚎浜у搧鏁版嵁",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingProduct_MP/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingProduct_MP/StaticMethod_SynchronizeMacroPlanData.qbl
index 5978c66..47d8f21 100644
--- a/_Main/BL/Type_Global_MappingProduct_MP/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingProduct_MP/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -11,7 +11,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾浜у搧鏁版嵁",
+                                                                       BrokerName := "鍚屾浜у搧鏁版嵁",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingSalesSegment_MP/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingSalesSegment_MP/StaticMethod_SynchronizeMacroPlanData.qbl
index f8eab75..636f6a8 100644
--- a/_Main/BL/Type_Global_MappingSalesSegment_MP/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingSalesSegment_MP/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -10,7 +10,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾閿�鍞儴闂ㄦ暟鎹�",
+                                                                       BrokerName := "鍚屾閿�鍞儴闂ㄦ暟鎹�",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingStockingPointCost/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingStockingPointCost/StaticMethod_SynchronizeMacroPlanData.qbl
index e0a583a..adfe937 100644
--- a/_Main/BL/Type_Global_MappingStockingPointCost/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingStockingPointCost/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -10,7 +10,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾搴撳瓨鎴愭湰鏁版嵁",
+                                                                       BrokerName := "鍚屾搴撳瓨鎴愭湰鏁版嵁",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingStockingPoint_MP/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingStockingPoint_MP/StaticMethod_SynchronizeMacroPlanData.qbl
index 3ee5b0b..a388711 100644
--- a/_Main/BL/Type_Global_MappingStockingPoint_MP/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingStockingPoint_MP/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -9,7 +9,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾搴撳瓨鐐规暟鎹�",
+                                                                       BrokerName := "鍚屾搴撳瓨鐐规暟鎹�",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingUnitCost/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingUnitCost/StaticMethod_SynchronizeMacroPlanData.qbl
index ff5d6bb..2b7b644 100644
--- a/_Main/BL/Type_Global_MappingUnitCost/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingUnitCost/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -11,7 +11,8 @@
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name        := "鍚屾鍒堕�犳垚鏈暟鎹�",
+                                                                       BrokerName := "鍚屾鍒堕�犳垚鏈暟鎹�",
+                                                                       ExecutionStatus := "InOperation",
                                                                        IsSuccess   := true,
                                                                        ExecuteUser := executionUser
                                                                       );
diff --git a/_Main/BL/Type_Global_MappingUnitOfMeasure_MP/StaticMethod_SynchronizeMacroPlanData.qbl b/_Main/BL/Type_Global_MappingUnitOfMeasure_MP/StaticMethod_SynchronizeMacroPlanData.qbl
index 5c7cf69..30bfa48 100644
--- a/_Main/BL/Type_Global_MappingUnitOfMeasure_MP/StaticMethod_SynchronizeMacroPlanData.qbl
+++ b/_Main/BL/Type_Global_MappingUnitOfMeasure_MP/StaticMethod_SynchronizeMacroPlanData.qbl
@@ -2,22 +2,30 @@
 #parent: #root
 StaticMethod SynchronizeMacroPlanData (
   GlobalOTDTable globalOTDTable,
-  MacroPlan macroPlan
+  MacroPlan macroPlan,
+  String executionUser
 )
 {
   TextBody:
   [*
     global_BrokerExecuteLog := globalOTDTable.Global_BrokerExecuteLog( relnew,
-                                                                       Name := "鍚屾鍗曚綅鏁版嵁",
-                                                                       IsSuccess := true
+                                                                       BrokerName := "鍚屾鍗曚綅鏁版嵁",
+                                                                       ExecutionStatus := "InOperation",
+                                                                       IsSuccess   := true,
+                                                                       ExecuteUser := executionUser
                                                                       );
                                             
     try {
       macroPlan.DoASyncMappingUnitOfMeasureData(globalOTDTable);
+      
+      global_BrokerExecuteLog.ExecutionStatus( "Complete" );
+      global_BrokerExecuteLog.SuccessDateTime( DateTime::ActualTime().Format( "Y-M-D H2:m:s" ) );
     } onerror {
       global_BrokerExecuteLog.IsSuccess( false );
       global_BrokerExecuteLog.ErrorNo( e.ErrorNr() );
       global_BrokerExecuteLog.ErrorMessage( e.GeneralInformation() );
+      global_BrokerExecuteLog.ErrorDateTime( DateTime::ActualTime().Format( "Y-M-D H2:m:s" ) );
+      global_BrokerExecuteLog.ExecutionStatus( "Complete" );
     }
   *]
 }
diff --git a/_Main/BL/Type_ProductInLane/StaticMethod_CreateOrUpdate.qbl b/_Main/BL/Type_ProductInLane/StaticMethod_CreateOrUpdate.qbl
index 0359b3f..8fd36c2 100644
--- a/_Main/BL/Type_ProductInLane/StaticMethod_CreateOrUpdate.qbl
+++ b/_Main/BL/Type_ProductInLane/StaticMethod_CreateOrUpdate.qbl
@@ -15,15 +15,15 @@
     
     // Get product&line
     product :=  Product_MP::FindById( owner, productid );
-    line :=  Lane::FindLaneTypeIndex( lineid );
+    line :=  Lane::FindById( owner, lineid );
     
     if( not isnull( product) and not isnull( line)){
-      productinline := ProductInLane::FindProductInLaneTypeIndex( lineid, productid );
+      productinline := ProductInLane::FindById( owner, productid, lineid );
     
       if( isnull( productinline ) ){
       ProductInLane::Create( product, line, isexcluded, isfromdb );
       }else{
-       productinline.Update( productid, lineid, isexcluded, isfromdb );
+        productinline.Update( lineid, productid, isexcluded, isfromdb );
         }
     }
   *]
diff --git a/_Main/BL/Type_ProductInLane/StaticMethod_FindById.qbl b/_Main/BL/Type_ProductInLane/StaticMethod_FindById.qbl
new file mode 100644
index 0000000..e0065ed
--- /dev/null
+++ b/_Main/BL/Type_ProductInLane/StaticMethod_FindById.qbl
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod FindById (
+  MacroPlan mp,
+  String id,
+  String laneid
+) as ProductInLane
+{
+  TextBody:
+  [*
+    // yy 2023-11-01
+    result := select( mp, Product_MP.ProductInLane, pil, true, pil.ProductID() = id and pil.LaneID() = laneid );
+    
+    return result;
+  *]
+}

--
Gitblit v1.9.3