Merge branch 'dev'

renhao

2023-10-10 472c228ef6d7c8d877558ff90051b1fdb35ffb5c

 _Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl

@@ -3,7 +3,8 @@
Method MappingExternalSupplyData (
  Strings businessTypes,
  Boolean nuclear,
  GlobalOTDTable globalOTDTable
  GlobalOTDTable globalOTDTable,
  Strings organcodelist
)
{
  TextBody:
@@ -11,7 +12,12 @@
    // renhao Aug-14-2023 (created)
    queryStartDate := guard( min( this, Period_MP, item, true, item.StartDate() ) - Duration::Days( 30 ), DateTime::MinDateTime() ).Date();
    queryEndDate := guard( max( this, Period_MP, item, true, item.EndDate() ), Date::MaxDate() );
    listtodeal := selectset( globalOTDTable,Global_MappingInventorySupply,externalSupply, externalSupply.UserQuantity()>0 and externalSupply.Date() >= queryStartDate /*and externalSupply.Date() <= queryEndDate*/);
    listtodeal := selectset( globalOTDTable,
                             Global_MappingInventorySupply,
                             externalSupply, 
                             ( externalSupply.UserQuantity()>0 ) and 
                             ( externalSupply.Date() >= queryStartDate ) and 
                             ( organcodelist.Find( externalSupply.StockingPointID().SubString( 0, 3 ) ) >= 0 )/*and externalSupply.Date() <= queryEndDate*/);
    totalcount := listtodeal.Size();
    description := "在途在制";
    info( "ExternalSupply has " + totalcount.AsQUILL() + " rows in total" );
@@ -32,7 +38,7 @@
        if( not isnull(businessTypes)){
        
          for( i :=0 ;i < businessTypes.Size();i++ ){
            businessType := businessTypes.Element( i);
            businessType := businessTypes.Element( i );
            if( product.BusinessType() = businessType and not product.IsCommon()){
              InventorySupply::CreateOrUpdate( externalSupply.ID(),
                                               productMP,