Merge branch 'dev_hrh_global'

yy

2023-09-25 ab6a21c73e6507923beb22611af772641321c256

 _Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl

@@ -3,7 +3,8 @@
Method MappingOperationBOMData (
  Strings businessTypes,
  Boolean isKeyProduct,
  Boolean createPurchaseSupplyMaterial
  Boolean createPurchaseSupplyMaterial,
  GlobalOTDTable globalOTDTable
)
{
  TextBody:
@@ -12,9 +13,9 @@
    
    keyProductList := construct( Strings );
    if( isKeyProduct ) {
        keyProductList := selectuniquevalues( this, MappingProduct, item, item.ProductMajorType()="成品" or item.ProductMajorType()="半成品", item.ID() );
        keyProductList := selectuniquevalues( globalOTDTable, Global_MappingProduct_MP, item, item.ProductMajorType()="成品" or item.ProductMajorType()="半成品", item.ID() );
    }
    bomList := selectsortedset(  this, MappingBOM, item,
    bomList := selectsortedset(  globalOTDTable, Global_MappingOperationBOM, item,
                                 ifexpr( isnull( businessTypes ) or businessTypes.Size() = 0, 
                                         true, 
    //                                     businessTypes.Difference( businessTypes.Difference( item.BusinessType().Tokenize( ", " ) ) ).Size() > 0 )
@@ -61,9 +62,9 @@
                if( not isnull( stockingPoint)){
                  if( isKeyProduct){
                      keyRows := selectset( routingRows,Elements,routingrow,keyProductList.Find( routingrow.ComponentCode())>=0);
                      this.MappingOperationBOMDataRouting( routing,keyRows);
                      this.MappingOperationBOMDataRouting( routing,globalOTDTable,keyRows);
                    }else{
                      this.MappingOperationBOMDataRouting( routing,routingRows);
                      this.MappingOperationBOMDataRouting( routing,globalOTDTable,routingRows);
                    }
                    
                }