Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-11-11 198108cc439ee17bdbb4c809e63bd911846e971d

Merge remote-tracking branch 'origin/dev' into dev

 _Main/BL/Type_CCEngineLogisticsCostReport/Method_Generate.qbl

@@ -58,7 +58,7 @@
        yearcell.AllCost( yearcell.EstimateTotalCost() * [Real]yearcell.CoefficientValue() );
      }
    }
    Transaction::Transaction().Propagate( attribute( CCEngineLogisticsCostCell, EstimateTotalCost ) );
    
    traverse( yearcolumn, Cell, cell ){
      cell.EstimateTotalCost( cell.CalcEstimateTotalCost() );
      cell.AllCost( cell.EstimateTotalCost() * [Real]cell.CoefficientValue() );

 _Main/BL/Type_CCEngineLogisticsCostReport0/Method_Generate.qbl

@@ -83,7 +83,7 @@
        yearcell.AllCost( yearcell.EstimateTotalCost() * [Real]yearcell.CoefficientValue() );
      }
    }
    Transaction::Transaction().Propagate( attribute( DLEngineLogisticsCostCell, EstimateTotalCost ) );
    
    traverse( yearcolumn, Cell, cell ){
      cell.EstimateTotalCost( cell.CalcEstimateTotalCost() );
      cell.AllCost( cell.EstimateTotalCost() * [Real]cell.CoefficientValue() );

 _Main/BL/Type_DispatchShiftPlan/StaticMethod_Dispatch.qbl

@@ -38,14 +38,8 @@
    now := DateTime::Now();
    macroPlanName := macroPlan.MDSMacroPlan().Description();
    traverse( macroPlan,Unit.UnitPeriod.astype( UnitPeriodTime ).ShiftPlan,shiftPlan ,shiftPlan.UnitPeriodTime().Period_MP().StartDate() >= macroPlan.StartOfPlanning().Date()){
       factory := shiftPlan.UnitPeriodTime().Unit();
       while( factory.HasParent() ){
         temp1 := factory;
         factory := factory.Parent();
         if( not factory.HasParent() ){
           factory := temp1;
         }
       }
       factory := LocalTool::GetFactoryByUnit( shiftPlan.UnitPeriodTime().Unit() );
       
       productLine :=  shiftPlan.UnitPeriodTime().Unit().ID();
       shiftDate := shiftPlan.UnitPeriodTime().Period_MP().StartDate();
       factoryName := factory.ID();

 _Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl

@@ -46,13 +46,7 @@
        unitIndex := guard( unitIndexTree.Root().Child( unitHandle ), null( NamedValue ));
        if( not isnull( unitIndex )){
          unit := units.Element( unitIndex.GetValueAsNumber() );
          temp1 := unit;
          temp2 := unit.Parent();
          while( not isnull( temp1.Parent())){
            temp2 := temp1;
            temp1 := temp1.Parent();
          }
          factory := temp2;
          factory := LocalTool::GetFactoryByUnit( unit );
        }
      }
      

 _Main/BL/Type_InventorySummarySource/StaticMethod_Initialize.qbl

@@ -86,7 +86,31 @@
      }
    }
      
        
    //库存在途数据
    traverse( owner, Unit.Lane.LaneLeg, laneleg ){
      originspid             := laneleg.OriginStockingPointID();
      //起始地是长春
      isccorigin             := originspid.StartsWith( '长春' ) or originspid.StartsWith( 'CC' );
      //起始地是大连
      isdlorigin             :=  originspid.StartsWith( '大连' ) or originspid.StartsWith( 'DL' );
      if( isccorigin and isdlorigin ){
        traverse( laneleg, Trip, trip, trip.LeadTime().Days() > 1 ){
          for( transferdate := trip.Departure() + Duration::Days( 1 ); transferdate < trip.Arrival(); transferdate := transferdate + Duration::Days( 1 ) ){
            daycolumn        := selectobject( table, InventorySummaryColumn, column, column.StartDate() = transferdate.Date(), column.TimeUnit() = Translations::MP_GlobalParameters_Day() );
            traverse( trip, ProductInTrip, pit, pit.Quantity() <> 0 ){
              //获取工厂行
              factoryrow     := table.GetRow( ifexpr( isccorigin, ccunit, dlunit ), pit.Product_MP() );
              //获取合计行
              allrow              := table.GetRow( allunit, pit.Product_MP() );
              quantity       := [Number]pit.Quantity();
              factoryrow.SetCellValue( daycolumn, quantity );
              allrow.SetCellValue( daycolumn, quantity );
            }
          }
        }
      }
    }
    
    rows                      := selectsortedset( table, InventroySummaryRow, row, row.Name() );
    i                         := 0;
    traverse( rows, Elements, e ){

 _Main/BL/Type_LocalTool/StaticMethod_GetFactoryByUnit.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
Quintiq file version 2.0
#parent: #root
StaticMethod GetFactoryByUnit (
  const Unit unit
) const as const Unit
{
  TextBody:
  [*
    // Akari Nov-11-2024 (created)
    factory := constnull( Unit );
    
    if( isnull( unit ) or isnull( unit.Parent())){
      factory := unit;
    }else{
      temp1 := unit;
      temp2 := unit.Parent();
      while( not isnull( temp1.Parent())){
        temp2 := temp1;
        temp1 := temp1.Parent();
      }
      factory := temp2;
    }
    
    return factory;
  *]
}

 _Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl

@@ -33,7 +33,7 @@
      actproductionhandle  := actproductiontree.GetHandle( actproductionKey );
      actproductiontree.Root().AddChild( actproductionhandle,i ); 
    }
    traverse( noptable, NewOfflinePlanRow, noprow ){
    traverse( noptable, NewOfflinePlanRow, noprow, noprow.Type() = '1' ){
      row                  := table.GetRow( noprow );
      if( not isnull( row ) ){
        traverse( noprow, NewOfflinePlanCell, nopcell ){

 _Main/BL/Type_Test/StaticMethod_Test.qbl

@@ -11,10 +11,8 @@
{
  TextBody:
  [*
    traverse( archive,ArchiveFile,object ){
    //  object.Name();
    //  object.FilePath();
    //  object.SourceFileBinaryValue();
    traverse( macroPlan,Unit,unit ){
      info( LocalTool::GetFactoryByUnit( unit ).ID() ); 
    }
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_FormFinancialProductionReport/Component_MatrixEditorTable#97.def

@@ -18,7 +18,6 @@
          Properties:
          [
            DataType: 'FinancialProductionReport'
            FixedFilter: 'not object.FinancialProductionColumn().IsDay()'
            Source: 'DataHolderTable'
            Taborder: 0
            Transformation: 'FinancialProductionColumn.FinancialProductionCell'
@@ -72,7 +71,6 @@
          Properties:
          [
            DataType: 'FinancialProductionReport'
            FixedFilter: 'not object.IsDay()'
            Source: 'DataHolderTable'
            Taborder: 0
            Transformation: 'FinancialProductionColumn'

 _Main/UI/MacroPlannerWebApp/Component_FormFinancialSalesReport/Component_MatrixEditorTable.def

@@ -18,7 +18,6 @@
          Properties:
          [
            DataType: 'FinancialSalesReport'
            FixedFilter: 'not object.FinancialSalesColumn().IsDay()'
            Source: 'DataHolderTable'
            Taborder: 0
            Transformation: 'FinancialSalesColumn.FinancialSalesCell'
@@ -72,7 +71,6 @@
          Properties:
          [
            DataType: 'FinancialSalesReport'
            FixedFilter: 'not object.IsDay()'
            Source: 'DataHolderTable'
            Taborder: 0
            Transformation: 'FinancialSalesColumn'

 _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelOperation_ButtonSearch_OnClick.def

ÎļþÃû´Ó _Main/UI/MacroPlannerWebApp/Component_FormOfflinePlanArchive/Response_PanelOperation_ButtonSearch_OnCreated.def ÐÞ¸Ä
@@ -1,10 +1,10 @@
Quintiq file version 2.0
#parent: PanelOperation/ButtonSearch
Response OnCreated () id:Response_PanelOperation_ButtonSearch_OnCreated
Response OnClick () id:Response_PanelOperation_ButtonSearch_OnClick
{
  #keys: '[415136.0.1286390995]'
  #keys: '[415136.0.1294002009]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebComponent_OnCreated'
  DefinitionID: 'Responsedef_WebButton_OnClick'
  QuillAction
  {
    Body: