客户需求存档bug

lazhen

2024-11-01 b068efe67a223c53e2d608b553d327ca61bfd1e9

客户需求存档bug

 _Main/BL/Relations/Relation_InterfaceForecast_InterfaceDataset_InterfaceDataset_InterfaceForeca.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl

@@ -29,7 +29,7 @@
                                                      , Name := Translations::InterfaceDataset_AOnlineAndMOfflinePlanMS64_Name()
                                                      , InterfaceDateTime := nowdate
                                                      , Message := '装配上线计划 + æœºåŠ ä¸‹çº¿è®¡åˆ’ - MS64'
                                                      , IsShow := false
    //                                                  , IsShow := false
                                                      , Last := true
                                                      , ReturnSuccess := true
                                                      , ReturnMsg := 'Success'

 _Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl

@@ -28,7 +28,7 @@
                                                      , Name := Translations::InterfaceDataset_AOnlineAndMOfflinePlanPIR_Name()
                                                      , InterfaceDateTime := nowdate
                                                      , Message := '装配上线计划 + æœºåŠ ä¸‹çº¿è®¡åˆ’ - PIR'
                                                      , IsShow := false
    //                                                  , IsShow := false
                                                      , Last := true
                                                      , ReturnSuccess := true
                                                      , ReturnMsg := 'Success'

 _Main/BL/Type_CustomerDemandIDS/Method_GenerateColumn.qbl

@@ -8,23 +8,33 @@
  [*
    // ç”„兰鸽 Jun-25-2024 (created)
    weekstart             := periods.Element( 0 );
    
    monthstart            := periods.Element( 0 );
    traverse( periods, Elements, periodtime ){
      periodname          := periodtime.Format( "M2/D2/Y" );
      
      this.Column( relnew, Name := periodname, StartDate := periodtime, EndDate := periodtime, TimeUnit := Translations::MP_GlobalParameters_Day() );
      
      weekend             := ( weekstart + Duration::Days( 6 ) ).Date();
      if( ( weekend.Year() <> periodtime.Year() and weekend.Month() > 1 ) or ( abs( weekstart.Week() - periodtime.Week() ) > 1 and weekend.Year() = periodtime.Year() ) ){
        weekstart         := periodtime;
      }
      if( periodtime = weekstart ){
        weekperiodname    := weekstart.Format( "M2/D2/Y" );
        this.Column( relnew, Name := weekperiodname, StartDate := weekstart, EndDate := ( weekstart + Duration::Days( 6 ) ).Date(), TimeUnit := Translations::MP_GlobalParameters_Week() );
        weekstart         := ( weekstart + Duration::Days( 7 ) ).Date();
        this.Column( relnew, Name := weekperiodname, StartDate := weekstart, EndDate := ( weekstart.StartOfNextWeek() - Duration::Days( 1 ) ).Date(), TimeUnit := Translations::MP_GlobalParameters_Week() );
        
      }
      if( ( monthstart.Year() <> periodtime.Year() and abs( monthstart.Month() - periodtime.Month() ) <> 11 ) or ( abs( monthstart.Month() - periodtime.Month() ) > 1 and monthstart.Year() = periodtime.Year() ) ){
        monthstart        := periodtime;
      }
      if( periodtime = monthstart ){
        monthperiodname   := monthstart.Format( "M2/D2/Y" );
        enddate           := ( monthstart.StartOfNextMonth() - Duration::Days( 1 ) ).Date();
        this.Column( relnew, Name := monthperiodname, StartDate := monthstart, EndDate := enddate, TimeUnit := Translations::MP_GlobalParameters_Month() );
        monthstart        := monthstart.StartOfNextMonth();
        
      }
      weekstart         := periodtime.StartOfNextWeek();
      monthstart        := periodtime.StartOfNextMonth();
    }
  *]
}

 _Main/BL/Type_CustomerDemandIDS/StaticMethod_GenerateData.qbl

@@ -2,6 +2,7 @@
#parent: #root
StaticMethod GenerateData (
  InterfaceDataset interface,
  const MacroPlan macroplan,
  RecycleBin recycle,
  const Archive archive
)
@@ -11,10 +12,16 @@
  [*
    // ç”„兰鸽 Aug-20-2024 (created)
    interface.CustomerDemandIDS( relflush );
    interface.CustomerDemandIDSSearch( relflush );
    //interface.CustomerDemandIDSSearch( relflush );
    info( '-------------------------Start---------------------');
    allunit               := CustomerDemandIDS::GetDefaultAllUnit();
    interface.CustomerDemandIDSSearch( relnew, Generation := allunit, MqbMlb := allunit, Power := allunit, TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit );
    idstable              := interface.CustomerDemandIDS( relnew, ID := '客户需求', Name := '客户需求' );
    if( isnull( interface.CustomerDemandIDSSearch() ) ){
      interface.CustomerDemandIDSSearch( relnew, Generation := allunit, MqbMlb := allunit, Power := allunit, TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit );
    }
    idstable              := selectobject( interface, CustomerDemandIDS, idstable, idstable.ID() = '客户需求' );
    if( isnull( idstable ) ){
      idstable            := interface.CustomerDemandIDS( relnew, ID := '客户需求', Name := '客户需求' );
    }
    binaryValue           := TemplateManager::GetIDSFullTable( archive, Date::ActualDate().Year() );
    source                := GeneralExcelImportAndExportDataSource::Upload( recycle, binaryValue, OS::TempPath() + "template.xlsx" );
    source.ReadStructure();
@@ -23,14 +30,12 @@
    cnv2.SetCustomConversion();
    cnv2.CustomFormatString( "yyyy/MM/dd" );
    idsdates              := selectuniquevalues( source, GeneralExcelImportAndExportDataTable.GeneralExcelImportAndExportDataColumn, column, column.ColumnIndex() > 2, cnv2.Convert( column.Name() ) );
    ppadates              := selectuniquevalues( interface, InterfaceForecast, forecast, forecast.Origin() = 'PPA', forecast.Date() );
    //ppadates              := construct( Dates );
    //traverse( macroplan, SalesDemand.astype( Forecast ), forecast, forecast.Origin() = 'PPA' ){
    //  ppadates            := ppadates.Union( selectuniquevalues( forecast, PlanningSalesDemandInPeriod, salesdemand, salesdemand.StartDate() ) );
    //}
    ppadates              := selectuniquevalues( macroplan, SalesDemand.astype( Forecast ), forecast, forecast.Origin() = 'PPA', forecast.StartDate() );
    periods               := idsdates.Union( ppadates );
    periods               := selectuniquevalues( periods, Elements, e, e );
    idstable.GenerateColumn( periods.Sort() );
    periods               := selectuniquevalues( periods, Elements, e, not exists( idstable, Column, column, column.StartDate() = e ), e );
    if( periods.Size() > 0 ){
      idstable.GenerateColumn( periods.Sort() );
    }
    traverse( recycle, GeneralExcelImportAndExportDataSource.GeneralExcelImportAndExportDataTable, table ){
      traverse( table, GeneralExcelImportAndExportDataRow, row ){
        productcell       := selectobject( row, GeneralExcelImportAndExportDataCell, cell, cell.GeneralExcelImportAndExportDataColumn().ColumnIndex() = 2 );
@@ -41,22 +46,27 @@
          daycolumn       := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Day(), period );
          weekcolumn      := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Week(), period );
          monthcolumn     := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Month(), period );
          
          idsrow.SetCellValue( daycolumn, [Number]cell.Value() );
          idsrow.SetCellValue( weekcolumn, [Number]cell.Value() );
          idsrow.SetCellValue( monthcolumn, [Number]cell.Value() );
          idsrow.SetCellValue( weekcolumn, [Number]cell.Value() ); 
          idsrow.SetCellValue( monthcolumn, [Number]cell.Value() ); 
        }
      }
    }
    traverse( interface, InterfaceForecast, forecast, forecast.Origin() = 'PPA' ){
      idsrow              := idstable.GetRowByUnit( forecast.PartNumber(), forecast.Factory() );
      daycolumn           := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Day(), forecast.Date() );
      weekcolumn          := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Week(), forecast.Date() );
      monthcolumn         := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Month(), forecast.Date() );
      idsrow.SetCellValue( daycolumn, [Number]forecast.Quantity() );
      idsrow.SetCellValue( weekcolumn, [Number]forecast.Quantity() );
      idsrow.SetCellValue( monthcolumn, [Number]forecast.Quantity() );
    traverse ( macroplan, SalesDemand.astype( Forecast ), forecast, not isnull( forecast.Product_MP() ) and forecast.Origin() = 'PPA' ){
      traverse( forecast, PlanningSalesDemandInPeriod, sdip ){
        idsrow              := idstable.GetRowByUnit( forecast.ProductID(), forecast.SalesSegmentName() );
        daycolumn           := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Day(), sdip.StartDate() );
        weekcolumn          := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Week(), sdip.StartDate() );
        monthcolumn         := idstable.GetColumnByTimeUnit( Translations::MP_GlobalParameters_Month(), sdip.StartDate() );
        info( '-----------------', isnull( idsrow ), isnull( daycolumn ), isnull( weekcolumn ), isnull( monthcolumn ), sdip.StartDate() );
        idsrow.SetCellValue( daycolumn, [Number]sdip.Quantity() );
        idsrow.SetCellValue( weekcolumn, [Number]sdip.Quantity() );
        idsrow.SetCellValue( monthcolumn, [Number]sdip.Quantity() );
      }
    }
    
    source.Delete();
    info( '-------------------------End---------------------');
  *]
}

 _Main/BL/Type_InterfaceDataset/Method_GenerateArchiveData.qbl

@@ -17,8 +17,8 @@
  TextBody:
  [*
    // ç”„兰鸽 Oct-30-2024 (created)
    if( iscustomdemand ){//全年日度需求/客户需求
      CustomerDemandIDS::GenerateData( this, recyclebin, archive );
    if( iscustomdemand ){//全年日度需求/客户需求 
      CustomerDemandIDS::GenerateData( this, macroplan, recyclebin, archive );
    }
    if( isofflineplan ){//各产线下线计划
      OfflinePlanArchiveVersion::RefreshData( this, macroplan, archive );

 _Main/BL/Type_InterfaceForecast/Attribute_Date.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_InterfaceForecast/Attribute_Factory.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_InterfaceForecast/Attribute_Generation.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_InterfaceForecast/Attribute_MLBMQB.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_InterfaceForecast/Attribute_Origin.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_InterfaceForecast/Attribute_PartNumber.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_InterfaceForecast/Attribute_Power.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_InterfaceForecast/Attribute_Quantity.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_InterfaceForecast/DefaultValue_Factory.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_InterfaceForecast/DefaultValue_Generation.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_InterfaceForecast/DefaultValue_MLBMQB.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_InterfaceForecast/DefaultValue_PartNumber.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_InterfaceForecast/DefaultValue_Power.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_InterfaceForecast/StaticMethod_ArchivedData.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_InterfaceForecast/_ROOT_Type_InterfaceForecast.qbl

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_DialogZEDPPSMS64/Response_pnlLeft_88_ddslFactory_OnCreated.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
Quintiq file version 2.0
#parent: pnlLeft_88/ddslFactory
Response OnCreated () id:Response_pnlLeft_88_ddslFactory_OnCreated
{
  #keys: '[415136.0.1271601330]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnCreated'
  QuillAction
  {
    Body:
    [*
      valueString := "All";
      
      this.Strings( valueString.Concat( ";" ).Concat( FinancialProductionReport::GetDefaultCCUnit().Concat( ";" ) ).Concat( FinancialProductionReport::GetDefaultDLUnit() ) );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_FormCustomerDemandPPAIDS/Response_OnCreated.def

@@ -10,7 +10,7 @@
    Body:
    [*
      //初始化 
      CustomerDemandIDS::GenerateData( InterfaceDataset, RecycleBin, Archive );
      //CustomerDemandIDS::GenerateData( InterfaceDataset, RecycleBin, Archive );
      
      dhSearch.Data( InterfaceDataset.CustomerDemandIDSSearch() );
    *]

 _Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Response_PanelExport_369_bRefresh_OnClick.def

@@ -14,7 +14,7 @@
    Body:
    [*
      FinancialProductionSource::Initialize( MacroPlan );
      excelsource               := selectobject( MacroPlan, FinancialProductionSource, excelsource, excelsource.IsImport() );
      excelsource               := maxobject( MacroPlan, FinancialProductionSource, excelsource, excelsource.IsImport(), excelsource.UploadDateTime() );
      if( not isnull( excelsource ) ){
        excelsource.AfterImport();
      }

 _Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Response_PanelExport_bRefresh_OnClick.def

@@ -14,7 +14,7 @@
    Body:
    [*
      FinancialSalesSource::InitializeNew( MacroPlan );
      excelsource               := selectobject( MacroPlan, FinancialSalesSource, excelsource, excelsource.IsImport() );
      excelsource               := maxobject( MacroPlan, FinancialSalesSource, excelsource, excelsource.IsImport(), excelsource.UploadDateTime() );
      if( not isnull( excelsource ) ){
        excelsource.AfterImport();
      }