BUG修复

admin

2024-08-21 399b1733fce10c0afefe36167f499d9e1e31e7b3

BUG修复

 _Main/BL/Relations/Relation_ShiftDayTime_ShiftDay_ShiftDay_ShiftDayTime.qbl

文件已删除

 _Main/BL/Relations/Relation_ShiftDayTime_ShiftPattern_ShiftPattern_ShiftDayTime.qbl

对比新文件
@@ -0,0 +1,23 @@
Quintiq file version 2.0
#parent: #root
Relation ShiftDayTime_ShiftPattern_ShiftPattern_ShiftDayTime
{
  #keys: '1[415754.0.123915968]'
  DefaultRelationStrategy
  {
  }
  RelationSide.LeftSide ShiftPattern
  {
    #keys: '3[415754.0.123915970][415754.0.123915969][415754.0.123915971]'
    Cardinality: '0to1'
    ObjectDefinition: ShiftDayTime
    OwningSide: 'Reference'
  }
  RelationSide.RightSide ShiftDayTime
  {
    #keys: '3[415754.0.123915973][415754.0.123915972][415754.0.123915974]'
    Cardinality: '1toN'
    ObjectDefinition: ShiftPattern
    OwningSide: 'Owned'
  }
}

 _Main/BL/Type_OfflinePlanCell/StaticMethod_RefreshOfflinePlan.qbl

@@ -106,7 +106,7 @@
      traverse ( shiftStartDateOPRs, Elements, ssdOPR ) {
        shift := select( opc, OfflinePlanCell, tempOPC, tempOPC.OfflinePlanRow().ProductionLine() = ssdOPR.ProductionLine() and tempOPC.OfflinePlanRow().Type() = "1" ); 
        if ( not isnull( shift ) ) {
          startDate     := guard( minselect( macroPlan, ShiftPattern.ShiftDay.ShiftDayTime, tempSDT, tempSDT.ShiftDay().ShiftPatternName() = shift.Shift(), tempSDT.Sequence() ).StartDateTime().Format( "H:m" ), "" );
          startDate     := guard( minselect( macroPlan, ShiftPattern.ShiftDayTime, tempSDT, tempSDT.ShiftPattern().Name() = shift.Shift(), tempSDT.Sequence() ).StartDateTime().Format( "H:m" ), "" );
          startDateCell := opc.OfflinePlanCell( relnew, Value := startDate );
          startDateCell.OfflinePlanRow( relset, ssdOPR );
        }
@@ -115,7 +115,7 @@
      traverse ( shiftEndDateOPRs, Elements, sedOPR ) {
        shift := select( opc, OfflinePlanCell, tempOPC, tempOPC.OfflinePlanRow().ProductionLine() = sedOPR.ProductionLine() and tempOPC.OfflinePlanRow().Type() = "1" ); 
        if ( not isnull( shift ) ) {
          endDate     := guard( maxselect( macroPlan, ShiftPattern.ShiftDay.ShiftDayTime, tempSDT, tempSDT.ShiftDay().ShiftPatternName() = shift.Shift(), tempSDT.Sequence() ).EndDateTIme().Format( "H:m" ), "" );
          endDate     := guard( maxselect( macroPlan, ShiftPattern.ShiftDayTime, tempSDT, tempSDT.ShiftPattern().Name() = shift.Shift(), tempSDT.Sequence() ).EndDateTIme().Format( "H:m" ), "" );
          endDateCell := opc.OfflinePlanCell( relnew, Value := endDate );
          endDateCell.OfflinePlanRow( relset, sedOPR );
        }

 _Main/BL/Type_ShiftDayTime/StaticMethod_CreateData.qbl

对比新文件
@@ -0,0 +1,18 @@
Quintiq file version 2.0
#parent: #root
StaticMethod CreateData (
  MacroPlan macroPlan,
  DateTime startDateTime,
  DateTime endDateTime,
  String name
)
{
  TextBody:
  [*
    sp := select( macroPlan, ShiftPattern, tempSP, tempSP.Name() = name );
    sp.ShiftDayTime( relnew, 
                     StartDateTime := startDateTime,
                     EndDateTIme   := endDateTime,
                     Name          := name );
  *]
}

 _Main/BL/Type_ShiftDayTime/StaticMethod_EditData.qbl

对比新文件
@@ -0,0 +1,17 @@
Quintiq file version 2.0
#parent: #root
StaticMethod EditData (
  MacroPlan macroPlan,
  ShiftDayTime sdt,
  DateTime startDateTime,
  DateTime endDateTime,
  String name
)
{
  TextBody:
  [*
    sdt.Delete();
    
    ShiftDayTime::CreateData( macroPlan, startDateTime, endDateTime, name );
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Method_New.def

@@ -1,16 +1,10 @@
Quintiq file version 2.0
#parent: #root
Method New (
  ShiftDay selection
) id:Method_DialogCreateEditShiftDayTime_New
Method New () id:Method_DialogCreateEditShiftDayTime_New
{
  #keys: '[413988.0.1372696375]'
  Body:
  [*
    data := selection.ShiftDayTime( relnew );
    
    DataHolderDialogData.Data( data );
    
    ApplicationMacroPlanner.ShowFormModal( this );
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Method_OnOK.def

@@ -6,7 +6,14 @@
  Body:
  [*
    // On ok
    Form.ApplyChanges();
    
    if ( isnull( DataHolderDialogData.Data() ) ) {
      ShiftDayTime::CreateData( MacroPlan, dtsStart.DateTime(),
                                dtsEnd.DateTime(), ddslName.Text() );
    } else {
      ShiftDayTime::EditData( MacroPlan, DataHolderDialogData.Data(), dtsStart.DateTime(),
                                dtsEnd.DateTime(), ddslName.Text() );
    }
    
    Form.Close();
  *]

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Response_pnlActions_btnOk_OnClick.def

@@ -4,13 +4,12 @@
{
  #keys: '[413988.0.1372501452]'
  DefinitionID: 'Responsedef_WebButton_OnClick'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      Form.ApplyChanges();
      Form.Close();
      Form.OnOK();
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_FormShiftDayTime/Component_ListShiftDayTime.def

@@ -11,10 +11,10 @@
      BaseType: 'WebDataExtractor'
      Properties:
      [
        DataType: 'ShiftDay'
        Source: 'ApplicationMacroPlanner.dhSelectedShiftDay'
        DataType: 'MacroPlan'
        Source: 'MacroPlan'
        Taborder: 0
        Transformation: 'ShiftDayTime'
        Transformation: 'ShiftPattern.ShiftDayTime'
      ]
    }
    #child: listActionBarPageShiftDayTime

 _Main/UI/MacroPlannerWebApp/Component_FormShiftDayTime/Response_ListShiftDayTime_mNew_OnClick.def

@@ -6,17 +6,13 @@
  CanBindMultiple: false
  DefinitionID => /ListShiftDayTime/Responsedef_ListShiftDayTime_WebMenu_OnClick
  Initiator: 'mNew'
  Precondition:
  [*
    return not isnull( ApplicationMacroPlanner.dhSelectedShiftDay().Data() );
  *]
  QuillAction
  {
    Body:
    [*
      dlg := construct( DialogCreateEditShiftDayTime );
      
      dlg.New( ApplicationMacroPlanner.dhSelectedShiftDay().Data() );
      dlg.New();
    *]
    GroupServerCalls: false
  }

 _Main/UI/MacroPlannerWebApp/Views/Time_Capacities.vw

@@ -25,52 +25,6 @@
          rowSpan: 15
        }
      }
      form_FormProductionLineBatchData
      {
        title: 'QMacroPlanner::FormProductionLineBatchData'
        shown: true
        componentID: 'QMacroPlanner::FormProductionLineBatchData'
        layout
        {
          mode: 'open'
          rowPosition: 26
          rowSpan: 9
          columnPosition: 1
          columnSpan: 8
        }
        components
        {
          FormProductionLineBatchData_PanelProductionLineBatchData
          {
            sizeRatio: 1
          }
          FormProductionLineBatchData_ListProductionLineBatchData
          {
          }
          FormProductionLineBatchData_DataSetLevelProductionLineBatchData
          {
            groupDepth: -1
            column_StartDate
            {
              columnId: 'StartDate'
              dataPath: 'StartDate'
              dataType: 'date'
              index: 0
              subtotals: ''
              width: 150
            }
            column_EndDate
            {
              columnId: 'EndDate'
              dataPath: 'EndDate'
              dataType: 'date'
              index: 1
              subtotals: ''
              width: 150
            }
          }
        }
      }
      form_FormShiftDayTime
      {
        title: 'QMacroPlanner::FormShiftDayTime'
@@ -122,6 +76,52 @@
          }
        }
      }
      form_FormProductionLineBatchData
      {
        title: 'QMacroPlanner::FormProductionLineBatchData'
        shown: true
        componentID: 'QMacroPlanner::FormProductionLineBatchData'
        layout
        {
          mode: 'open'
          rowPosition: 26
          rowSpan: 9
          columnPosition: 1
          columnSpan: 8
        }
        components
        {
          FormProductionLineBatchData_PanelProductionLineBatchData
          {
            sizeRatio: 1
          }
          FormProductionLineBatchData_ListProductionLineBatchData
          {
          }
          FormProductionLineBatchData_DataSetLevelProductionLineBatchData
          {
            groupDepth: -1
            column_StartDate
            {
              columnId: 'StartDate'
              dataPath: 'StartDate'
              dataType: 'date'
              index: 0
              subtotals: ''
              width: 150
            }
            column_EndDate
            {
              columnId: 'EndDate'
              dataPath: 'EndDate'
              dataType: 'date'
              index: 1
              subtotals: ''
              width: 150
            }
          }
        }
      }
    }
  }
  formatversion: 2