From b262ab5a8021b0a3b9bb4bab78c52981ac39e35e Mon Sep 17 00:00:00 2001 From: yanyuan <yuan.yan@capgemini.com> Date: 星期二, 05 九月 2023 16:00:50 +0800 Subject: [PATCH] Merge branch 'dev_yy' into dev --- _Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl b/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl index 3f014f2..5b22e41 100644 --- a/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl +++ b/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl @@ -63,8 +63,8 @@ //todo: 鏁版嵁鏈夐噸澶嶏紝鍏堢暐杩� macroPlan.Broker_OTD_Product().Execute(); info( "Start data mapping of product" ); - testproduct := construct( Strings ); - macroPlan.MappingProductData( testproduct, false ); + //testproduct := construct( Strings ); + macroPlan.MappingProductData( businessTypes, false ); //鍗曚綅杞崲-7 info( "BaseConversionFactor::DoSync" ) BaseConversionFactor::DoSync( macroPlan ); @@ -98,28 +98,28 @@ port := 443; data := macroPlan.ApiResponesCheck( address, url, port, postrequestbody ); macroPlan.ApiLaneLegsData( data ); - //// 渚涘簲缃戠粶锛堣溅閬擄級-12 - //info( "ProductInLane::DoSync" ) - //macroPlan.Broker_OTD_ProductInLane().Execute(); - //macroPlan.MappingProductInLaneData(); + // 渚涘簲缃戠粶锛堣溅閬擄級-12 + info( "ProductInLane::DoSync" ) + macroPlan.Broker_OTD_ProductInLane().Execute(); + macroPlan.MappingProductInLaneData(); // 鍦ㄥ簱搴撳瓨鏁版嵁-13 info( "ActualPISPIP::DoSync" ) macroPlan.Broker_OTD_ActualPISPIP().Execute(); //macroPlan.MappingActualPISPIPData( businessTypes, true ); macroPlan.MappingActualPISPIPData( businessTypes, false ); - //// 鍦ㄩ�斿簱瀛�-14 - //info( "ExternalSupply::DoSync" ) - //info( "Start data broker of External supply" ); - //macroPlan.Broker_OTD_ExternalSupply().Execute(); - ////macroPlan.MappingExternalSupplyData( businessTypes, true ); - //info( "Start data mapping of External supply" ); - //macroPlan.MappingExternalSupplyData( businessTypes, false ); - //// 搴撳瓨鎴愭湰-15 - //info( "InventoryCost::DoSync" ); - //InventoryValueAndCost::DoSync( macroPlan ); - //// todo 鍒堕�犳垚鏈�-16 - //info( "OperationCost::DoSync" ); - //macroPlan.MappingOperationCostData( businessTypes ); + // 鍦ㄩ�斿簱瀛�-14 + info( "ExternalSupply::DoSync" ) + info( "Start data broker of External supply" ); + macroPlan.Broker_OTD_ExternalSupply().Execute(); + //macroPlan.MappingExternalSupplyData( businessTypes, true ); + info( "Start data mapping of External supply" ); + macroPlan.MappingExternalSupplyData( businessTypes, false ); + // 搴撳瓨鎴愭湰-15 + info( "InventoryCost::DoSync" ); + InventoryValueAndCost::DoSync( macroPlan ); + // todo 鍒堕�犳垚鏈�-16 + info( "OperationCost::DoSync" ); + macroPlan.MappingOperationCostData( businessTypes ); // 璁㈠崟棰勬祴-17 info( "Forecast::DoSync" ); Forecast::DoSync( macroPlan, businessTypes ); -- Gitblit v1.9.3