VWED PPPS项目
上一版本: d4a08c8d | 补丁 | 提交 | 忽略空白
xiaoding721
2024-12-30 f8d325f163f1aa7b968a0c9f1ffc03b3c86c00c2 
修复一些bug
已修改4个文件
已添加1个文件
22 ■■■■■ 文件已修改
_Main/BL/EDI/Broker_MP_ExportSingleShiftConfigBroker.qbl 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_SingleShiftConfig/Attribute_MaintenanceDeduction.qbl 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_SingleShiftConfig/StaticMethod_Import.qbl 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FormSingleShiftConfig/Component_ListSingleShiftConfig.def 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 _Main/BL/EDI/Broker_MP_ExportSingleShiftConfigBroker.qbl


@@ -14,6 +14,7 @@


      TypeIndex: SingleShiftConfigTypeIndex


      EDIMLColumn FirstSingleShiftQuantity { Attribute: FirstSingleShiftQuantity ValueType: Real }


      EDIMLColumn ID { Attribute: ID ValueType: String }


      EDIMLColumn MaintenanceDeduction { Attribute: MaintenanceDeduction ValueType: Real }


      EDIMLColumn SecondSingleShiftQuantity { Attribute: SecondSingleShiftQuantity ValueType: Real }


      EDIMLColumn ShiftName { Attribute: ShiftName ValueType: String }


      EDIMLColumn ThirdSingleShiftQuantity { Attribute: ThirdSingleShiftQuantity ValueType: Real }


@@ -28,6 +29,7 @@


      OutputTable: SingleShiftConfig


      EDIColumnMatch { InputColumn: FirstSingleShiftQuantity OutputColumn: FirstSingleShiftQuantity }


      EDIColumnMatch { InputColumn: ID OutputColumn: ID }


      EDIColumnMatch { InputColumn: MaintenanceDeduction OutputColumn: MaintenanceDeduction }


      EDIColumnMatch { InputColumn: SecondSingleShiftQuantity OutputColumn: SecondSingleShiftQuantity }


      EDIColumnMatch { InputColumn: ShiftName OutputColumn: ShiftName }


      EDIColumnMatch { InputColumn: ThirdSingleShiftQuantity OutputColumn: ThirdSingleShiftQuantity }


@@ -47,6 +49,7 @@


        EDIXLSLinkColumn FirstSingleShiftQuantity { ValueType: Real }


        EDIXLSLinkColumn SecondSingleShiftQuantity { ValueType: Real }


        EDIXLSLinkColumn ThirdSingleShiftQuantity { ValueType: Real }


        EDIXLSLinkColumn MaintenanceDeduction { ValueType: Real }


      ]


    }


  }




 _Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl


@@ -170,7 +170,7 @@


        singleShiftConfig := select( unit,SingleShiftConfig,config,config.ShiftName() = "3" );


        if( not isnull( singleShiftConfig ) ){


          if( line.Tips().LikeUserLocale( "保养" )){


            singleShiftVolume1 := 0.0;


            singleShiftVolume1 := singleShiftConfig.FirstSingleShiftQuantity() - singleShiftConfig.MaintenanceDeduction();


            singleShiftVolume2 := singleShiftConfig.SecondSingleShiftQuantity();


            singleShiftVolume3 := singleShiftConfig.ThirdSingleShiftQuantity();


          }else{


@@ -230,7 +230,7 @@


        singleShiftConfig := select( unit,SingleShiftConfig,config,config.ShiftName() = line.ShiftName() );


        if( not isnull( singleShiftConfig )){


          if( line.Tips().LikeUserLocale( "保养" )){


            singleShiftVolume1 := 0.0;


            singleShiftVolume1 := singleShiftConfig.FirstSingleShiftQuantity() - singleShiftConfig.MaintenanceDeduction();


            singleShiftVolume2 := singleShiftConfig.SecondSingleShiftQuantity();


          }else{


            singleShiftVolume1 := singleShiftConfig.FirstSingleShiftQuantity();




 _Main/BL/Type_SingleShiftConfig/Attribute_MaintenanceDeduction.qbl


¶Ô±ÈÐÂÎļþ


@@ -0,0 +1,8 @@


Quintiq file version 2.0


#parent: #root


Attribute MaintenanceDeduction


{


  #keys: '3[414996.1.280050054][414996.1.280050053][414996.1.280050055]'


  Description: '保养扣除数量'


  ValueType: Real


}




 _Main/BL/Type_SingleShiftConfig/StaticMethod_Import.qbl


@@ -33,7 +33,7 @@


      firstSingleShiftQuantityCell := select( row, GeneralExcelImportAndExportDataCell, tempGEIAEDC, tempGEIAEDC.GeneralExcelImportAndExportDataColumn().ColumnIndex() = 3 );


      secondSingleShiftQuantityCell := select( row, GeneralExcelImportAndExportDataCell, tempGEIAEDC, tempGEIAEDC.GeneralExcelImportAndExportDataColumn().ColumnIndex() = 4 );


      thirdSingleShiftQuantityCell := select( row, GeneralExcelImportAndExportDataCell, tempGEIAEDC, tempGEIAEDC.GeneralExcelImportAndExportDataColumn().ColumnIndex() = 5 );


      


      maintenanceDeduction := select( row, GeneralExcelImportAndExportDataCell, tempGEIAEDC, tempGEIAEDC.GeneralExcelImportAndExportDataColumn().ColumnIndex() = 6 );


      


      unitID := guard( unitIDCell.Value(), "" );


      if( unitID = "" ){


@@ -48,7 +48,8 @@


                                ShiftName := guard( shiftNameCell.Value(), "" ),


                                FirstSingleShiftQuantity := guard( [Real]firstSingleShiftQuantityCell.Value(), 0.0 ),


                                SecondSingleShiftQuantity := guard( [Real]secondSingleShiftQuantityCell.Value(), 0.0 ),


                                ThirdSingleShiftQuantity := guard( [Real]thirdSingleShiftQuantityCell.Value(), 0.0 ) );


                                ThirdSingleShiftQuantity := guard( [Real]thirdSingleShiftQuantityCell.Value(), 0.0 ),


                                MaintenanceDeduction := guard( [Real]maintenanceDeduction.Value(), 0.0 ) );


      }else{


        error( "无法在【" + macroPlan.MDSMacroPlan().Description() + "】内找到产线【" + unitID + "】。");


      }




 _Main/UI/MacroPlannerWebApp/Component_FormSingleShiftConfig/Component_ListSingleShiftConfig.def


@@ -28,7 +28,7 @@


      ]


      Properties:


      [


        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Unit.ID","title":"产线","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"Unit.ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftName","title":"班次名称","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"ShiftName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"FirstSingleShiftQuantity","title":"白班","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"FirstSingleShiftQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SecondSingleShiftQuantity","title":"二班","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"SecondSingleShiftQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ThirdSingleShiftQuantity","title":"三班","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"ThirdSingleShiftQuantity"}}]'


        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Unit.ID","title":"产线","subtotals":"","tooltip":"","width":-1,"display":"always","attribute":"Unit.ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ShiftName","title":"班次名称","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"ShiftName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"FirstSingleShiftQuantity","title":"白班","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"FirstSingleShiftQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SecondSingleShiftQuantity","title":"二班","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"SecondSingleShiftQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ThirdSingleShiftQuantity","title":"三班","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"ThirdSingleShiftQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MaintenanceDeduction","title":"保养扣除数量","subtotals":"","tooltip":"","width":-1,"display":"always","editable":false,"attribute":"MaintenanceDeduction"}}]'


        ContextMenu: 'listContextMenuSingleShiftConfig'


        Taborder: 2


      ]