From 4f426fd0938d68df759fff7570ad6ec2e62bac96 Mon Sep 17 00:00:00 2001 From: renhao <renhui.hao@capgemini.com> Date: 星期三, 18 十月 2023 09:08:32 +0800 Subject: [PATCH] Merge branch 'dev' --- _Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan#127.qbl | 52 ++++++++++++++++++++++------------------------------ 1 files changed, 22 insertions(+), 30 deletions(-) diff --git "a/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl" "b/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl" index 6d84c07..12a5633 100644 --- "a/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl" +++ "b/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl" @@ -47,6 +47,8 @@ organcodelist := selectvalues( this, Global_MappingOperationBOM, bom,true, bom.OrganCode() ); } + macroPlan.InitialUnitAndStockingPoint(); + if ( isUnitOfMeasure_MP ) { Global_MappingUnitOfMeasure_MP::SynchronizeMacroPlanData( this, macroPlan ); } @@ -106,35 +108,25 @@ //if ( isCustomerGrade ) { // Global_MappingCustomerGrade::SynchronizeInterfaceData( this, executionUser, "GlobalOTDTable_CustomerGrade" ); //} - // - //if ( isStockingPoint_MP ) { - // this.Global_MappingStockingPoint_MP( relflush ); - // Global_BrokerExecuteLog::CreateInOperation( this, "StockingPoint_MP", executionUser ); - //// this -> Global_MappingStockingPoint_MP::CreateByAPI() -> Exception() -> Global_MappingStockingPoint_MP::OnException( this ); - //} - // - //if ( isCurrency_MP ) { - // this.Global_MappingCurrency_MP( relflush ); - // Global_BrokerExecuteLog::CreateInOperation( this, "Currency_MP", executionUser ); - //// this -> Global_MappingCurrency_MP::CreateByAPI() -> Exception() -> Global_MappingCurrency_MP::OnException( this ); - //} - // - //if ( isCurrencyRate_MP ) { - // this.Global_MappingCurrencyRate_MP( relflush ); - // Global_BrokerExecuteLog::CreateInOperation( this, "CurrencyRate_MP", executionUser ); - //// this -> Global_MappingCurrencyRate_MP::CreateByAPI() -> Exception() -> Global_MappingCurrencyRate_MP::OnException( this ); - //} - // - //if ( isLane ) { - // this.Global_MappingLane( relflush ); - // Global_BrokerExecuteLog::CreateInOperation( this, "Lane", executionUser ); - //// this -> Global_MappingLane::CreateByAPI() -> Exception() -> Global_MappingLane::OnException( this ); - //} - // - //if ( isLaneLeg ) { - // this.Global_MappingLaneLeg( relflush ); - // Global_BrokerExecuteLog::CreateInOperation( this, "LaneLeg", executionUser ); - //// this -> Global_MappingLaneLeg::CreateByAPI() -> Exception() -> Global_MappingLaneLeg::OnException( this ); - //} + + 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 ); + } *] } -- Gitblit v1.9.3