Merge branch 'dev'

renhao

2023-10-10 472c228ef6d7c8d877558ff90051b1fdb35ffb5c

 _Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl

@@ -2,7 +2,8 @@
#parent: #root
Method MappingUnitData (
  Strings businesstypes,
  GlobalOTDTable globalOTDTable
  GlobalOTDTable globalOTDTable,
  Strings organcodelist
)
{
  Description: 'Get unit data from operation mapping'
@@ -17,7 +18,8 @@
    } else {
        listtodeal := selectset( globalOTDTable, Global_MappingOperation, item, 
    //                             businesstypes.Difference( businesstypes.Difference( item.BusinessType().Tokenize( ", " ) ) ).Size() > 0
                                 businesstypes.Find( item.BusinessType() ) >= 0
                                 ( businesstypes.Find( item.BusinessType() ) >= 0 ) and 
                                 ( organcodelist.Find( item.OrganCode() ) >= 0 )
                                );
    }
    
@@ -42,12 +44,13 @@
                          infinite, 
                          unitofmeasurename );
    
    Unit::CreateOrUpdate( this, 
    supplyunit := Unit::CreateOrUpdate( this, 
                          "供应商", 
                          "供应商", 
                          "天马集团", 
                          infinite, 
                          unitofmeasurename );
    supplyunit.IsSupplier(true);
    
    Unit::CreateOrUpdate( this, 
                          "整车运输",