Merge branch 'dev'

renhao

2023-10-10 472c228ef6d7c8d877558ff90051b1fdb35ffb5c

 _Main/BL/Type_MacroPlan/Method_MappingOperationData.qbl

@@ -2,7 +2,8 @@
#parent: #root
Method MappingOperationData (
  Strings businessTypes,
  GlobalOTDTable globalOTDTable
  GlobalOTDTable globalOTDTable,
  Strings organcodelist
)
{
  TextBody:
@@ -12,7 +13,8 @@
    toDealList := construct( Global_MappingOperations ) ;
    if( not isnull( businessTypes ) and businessTypes.Size() > 0 ) {
        toDealList := selectsortedset( globalOTDTable, Global_MappingOperation, item, 
                                       businessTypes.Find( item.BusinessType() ) >= 0, 
                                       ( businessTypes.Find( item.BusinessType() ) >= 0 ) and 
                                       ( organcodelist.Find( item.OrganCode() ) >= 0 ), 
    //                                   businessTypes.Difference( businessTypes.Difference( item.BusinessType().Tokenize( ", " ) ) ).Size() > 0, 
                                       item.SequenceNumber() );
    } else {
@@ -77,7 +79,7 @@
                                        0.0, 0.0, false, true );
        }
        
        ManufactureLTProcessSection::CreateOrUpdate( op );
    //    ManufactureLTProcessSection::CreateOrUpdate( op );
    }
    info( "========" )
    // 遍历routing，进行link