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

Administrator

2023-09-25 4a3d9ec9b4d11f096fc24cfeee40246492dc08fd

 _Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl

@@ -1,7 +1,8 @@
Quintiq file version 2.0
#parent: #root
Method MappingUnitData (
  Strings businesstypes
  Strings businesstypes,
  GlobalOTDTable globalOTDTable
)
{
  Description: 'Get unit data from operation mapping'
@@ -9,12 +10,12 @@
  [*
    // Administrator Aug-21-2023 (created)
    // list to deal
    listtodeal := construct( structured[MappingOperation] );
    listtodeal := construct( Global_MappingOperations);
    
    if( isnull( businesstypes ) or businesstypes.Size() = 0 ) {
        listtodeal := selectset( this, MappingOperation, item, true );
        listtodeal := selectset( globalOTDTable, Global_MappingOperation, item, true );
    } else {
        listtodeal := selectset( this, MappingOperation, item, 
        listtodeal := selectset( globalOTDTable, Global_MappingOperation, item, 
    //                             businesstypes.Difference( businesstypes.Difference( item.BusinessType().Tokenize( ", " ) ) ).Size() > 0
                                 businesstypes.Find( item.BusinessType() ) >= 0
                                );
@@ -41,12 +42,13 @@
                          infinite, 
                          unitofmeasurename );
    
    Unit::CreateOrUpdate( this, 
    supplyunit := Unit::CreateOrUpdate( this, 
                          "供应商", 
                          "供应商", 
                          "天马集团", 
                          infinite, 
                          unitofmeasurename );
    supplyunit.IsSupplier(true);
    
    Unit::CreateOrUpdate( this, 
                          "整车运输",