Merge remote-tracking branch 'refs/remotes/origin/dev'

hongjli

2023-09-05 c70ff9aa94e34f968851e813a0b80a25a7b4ea74

 _Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl

@@ -63,7 +63,8 @@
    //todo: 数据有重复，先略过
    macroPlan.Broker_OTD_Product().Execute();
    info( "Start data mapping of product" );
    macroPlan.MappingProductData( businessTypes, false );
    testproduct := construct( Strings );
    macroPlan.MappingProductData( testproduct, false );
    //单位转换-7
    info( "BaseConversionFactor::DoSync" )
    BaseConversionFactor::DoSync( macroPlan );
@@ -97,25 +98,25 @@
    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 );
    //// 在途库存-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 );