Merge branch 'dev_yy'

yy

2023-09-04 be9f9a2d52ae6147f35f5227c960770ef1bb41ab

Merge branch 'dev_yy'

 _Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl

@@ -29,11 +29,13 @@
        if( routingRows.Size() > 0 ) {
            firstRow := routingRows.Element( 0 );
            stockingPointId := firstRow.OrganCode()  + "_" + firstRow.ProductType() + "_STOCK";
            inputStockingPointId := firstRow.OrganCode()  + "_" + firstRow.ComponentType() + "_STOCK";
            // ========检查========
            product := Product_MP::FindById( this, firstRow.ProductCode() );
            if( not isnull( product ) ) {
    //              error( "product : " + firstRow.ProductCode() + " not found" );
              stockingPoint := StockingPoint_MP::FindById( this, stockingPointId );
              inputStockingPoint := StockingPoint_MP::FindById( this, inputStockingPointId );
    //          info( stockingPointId.AsQUILL() );
      //        if( isnull( stockingPoint ) ) {
      //            error( "stockingPoint : " + stockingPointId + " not found" );
@@ -50,7 +52,10 @@
                      operationsInLastStep.GetOperationBOM( product.ID(), stockingPoint.ID(), false ).Quantity( 1 );
                  }
                  // ========分组处理输入========
                  this.MappingOperationBOMDataRouting( routing, routingRows, stockingPoint, keyProductList );
                  
                }
                if( not isnull( inputStockingPoint)){
                  this.MappingOperationBOMDataRouting( routing,routingRows,inputStockingPoint,keyProductList);
                }
              }
           }
@@ -62,7 +67,7 @@
        traverse( toCreateBomList, Elements, key ) {
            boms := selectset( bomList, Elements, item, item.ProductType() = "P" and item.OrganCode() + item.ComponentCode() = key );
            bom := boms.First();
            this.MappingOperationBOMDataSupplyPurchase( bom.OrganCode(), bom.ComponentCode(), bom.ProductType() );
            this.MappingOperationBOMDataSupplyPurchase( bom.OrganCode(), bom.ComponentCode(), bom.ComponentType());
        }
    }
  *]

 _Main/BL/Type_MacroPlan/Method_MappingOperationBOMDataSupplyPurchase.qbl

@@ -8,8 +8,8 @@
{
  TextBody:
  [*
    routingId := orgCode + "_" + productId;
    unitId := orgCode + "_PR_" + productId;
    routingId := "PR_"+orgCode + "_" + productId;
    unitId := "供应商";
    routingStepName := "Purchase";
    operationId := orgCode + "_PR_" + productId;
    routing := Routing::CreateOrUpdate( this, routingId );

 _Main/BL/Type_MacroPlan/Method_MappingProductData.qbl

@@ -129,7 +129,7 @@
            Product_MP::Create( this, 
                                item.ID(), 
                                productsubclasstype, 
                                item.Name(), 
                                item.ID(), 
                                item.UnitOfMeasureName(), 
                                isbyproduct, 
                                item.Name(),

 _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 );