From 5ae534ab606e6f2ba5ea60914224d665b0447d5a Mon Sep 17 00:00:00 2001
From: Kevin Kok Khah Whey <khahwhey.kok@3ds.com>
Date: 星期二, 07 十一月 2023 22:48:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_Kevin

---
 _Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan#127.qbl |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)

diff --git "a/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl" "b/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl"
index 12a5633..d4f4029 100644
--- "a/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl"
+++ "b/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl"
@@ -44,17 +44,17 @@
       }
     
     if( organcodelist.Size() = 0 ){
-      organcodelist := selectvalues( this, Global_MappingOperationBOM, bom,true, bom.OrganCode() );
+      organcodelist := selectuniquevalues( this, Global_MappingOperationBOM, bom,true, bom.OrganCode() );
       }
     
     macroPlan.InitialUnitAndStockingPoint();
     
     if ( isUnitOfMeasure_MP ) {
-      Global_MappingUnitOfMeasure_MP::SynchronizeMacroPlanData( this, macroPlan );
+      Global_MappingUnitOfMeasure_MP::SynchronizeMacroPlanData( this, macroPlan, executionUser );
     }
     
     if ( isCustomOrder ) {
-      Global_MappingCustomOrder::SynchronizeMacroPlanData( this, macroPlan, executionUser );
+      Global_MappingCustomOrder::SynchronizeMacroPlanData( this, macroPlan, businessTypes, organcodelist, executionUser );
     }
     
     if ( isForeacst ) {
@@ -82,7 +82,7 @@
     }
     
     if ( isProductInLane ) {
-      Global_MappingProductInLane::SynchronizeMacroPlanData( this, macroPlan, executionUser );
+      Global_MappingProductInLane::SynchronizeMacroPlanData( this, macroPlan, businessTypes, executionUser );
     }
     
     if ( isAIPISPIP ) {
@@ -94,20 +94,12 @@
     }
     
     if ( isStockingPointCost ) {
-      Global_MappingStockingPointCost::SynchronizeMacroPlanData( this, macroPlan, executionUser );
+      Global_MappingStockingPointCost::SynchronizeMacroPlanData( this, macroPlan, businessTypes, executionUser );
     }
     
     if ( isOperationCost ) {
       Global_MappingOperationCost::SynchronizeMacroPlanData( this, macroPlan, executionUser, businessTypes, organcodelist );
     }
-    
-    //if ( isDOI_DSI ) {
-    //  Global_MappingDOI_DSI::SynchronizeInterfaceData( this, executionUser, "GlobalOTDTable_DOI_DSI" );
-    //}
-    //
-    //if ( isCustomerGrade ) {
-    //  Global_MappingCustomerGrade::SynchronizeInterfaceData( this, executionUser, "GlobalOTDTable_CustomerGrade" );
-    //}
     
     if ( isStockingPoint_MP ) {
       Global_MappingStockingPoint_MP::SynchronizeMacroPlanData( this, macroPlan, executionUser );

--
Gitblit v1.9.3