_Main/BL/Type_EmployeeCost/StaticMethod_Export.qbl
@@ -11,8 +11,8 @@ columnXML1 := "<column><name>人åç±»å«</name><type>String</type>"; columnXML2 := "<column><name>人æ°</name><type>Number</type>"; columnXML3 := "<column><name>产线</name><type>String</type>"; columnXML4 := "<column><name>å¼å§æ¶é´</name><type>String</type>"; columnXML5 := "<column><name>æ¶é´åä½</name><type>String</type>"; //columnXML4 := "<column><name>å¼å§æ¶é´</name><type>String</type>"; //columnXML5 := "<column><name>æ¶é´åä½</name><type>String</type>"; columnXML6 := "<column><name>åºæ¬å·¥èµ</name><type>Number</type>"; costs := selectsortedset( owner,Elements.EmployeeCost,cost,cost.Unit().Name() ); @@ -27,11 +27,11 @@ columnXML1 := columnXML1 + "</column>"; columnXML2 := columnXML2 + "</column>"; columnXML3 := columnXML3 + "</column>"; columnXML4 := columnXML4 + "</column>"; columnXML5 := columnXML5 + "</column>"; //columnXML4 := columnXML4 + "</column>"; //columnXML5 := columnXML5 + "</column>"; columnXML6 := columnXML6 + "</column>"; xmlTemplate := xmlTemplate + columnXML1 + columnXML2 + columnXML3 + columnXML4 + columnXML5 + columnXML6 + "</table>"; xmlTemplate := xmlTemplate + columnXML1 + columnXML2 + columnXML3 + columnXML6 + "</table>"; tableGroupHandle := TableGroupHandle::Create( "tableGroupHandle" ); tableHandle := TableHandle::ImportXML( BinaryValue::Construct( xmlTemplate )); tableGroupHandle.Add( tableHandle ); _Main/BL/Type_EmployeeCost/StaticMethod_Import.qbl
@@ -27,8 +27,6 @@ employeeType := null( EmployeeType ); employeeNumber := 0; unit := null( Unit ); startDate := Date::MinDate(); timeUnit := ""; baseSalary := 0.0; traverse( row,GeneralExcelImportAndExportDataCell,cell ){ if( cell.GeneralExcelImportAndExportDataColumn().Name() = "人åç±»å«" ){ @@ -59,12 +57,6 @@ unitIndexTree.Root().AddChild( unitHandle,units.Size() - 1 ); } } } if( cell.GeneralExcelImportAndExportDataColumn().Name() = "å¼å§æ¶é´" ){ startDate := cnv2.Convert( cell.Value() ); } if( cell.GeneralExcelImportAndExportDataColumn().Name() = "æ¶é´åä½" ){ timeUnit := cell.Value(); } if( cell.GeneralExcelImportAndExportDataColumn().Name() = "åºæ¬å·¥èµ" ){ baseSalary := [Real]cell.Value(); _Main/BL/Type_LocalCell_Default/StaticMethod_GenerateStandardHoursReport.qbl
@@ -88,15 +88,16 @@ workingDayCell.RealValue( workingDayCell.RealValue() + 1 ); if( shiftPlan.IsHoliday() ){ // èåæ¥å ç overtime := shiftPlan.GetBreakDayOvertimeHour( false ); overtime := shiftPlan.GetHolidayOvertimeHour( false ); holidayOvertimeHourCell.RealValue( holidayOvertimeHourCell.RealValue() + overtime ); if( not isnull( nextShiftPlan )){ nextDayOvertime := shiftPlan.GetBreakDayOvertimeHour( true ); if( nextShiftPlan.IsHoliday()){ // ä¸ä¸å¤©æ¯èåæ¥ nextDayOvertime := shiftPlan.GetHolidayOvertimeHour( true ); holidayOvertimeHourCell.RealValue( holidayOvertimeHourCell.RealValue() + nextDayOvertime ); }else if( shiftPlan.DefaultRemark().LikeUserLocale( "å¨å " ) or shiftPlan.DefaultRemark().LikeUserLocale( "å¨æ¥" ) ){ // ä¸ä¸å¤©æ¯å¨å æå¨æ¥ nextDayOvertime := shiftPlan.GetBreakDayOvertimeHour( true ); breakDayOvertimeHourCell.RealValue( breakDayOvertimeHourCell.RealValue() + nextDayOvertime ); }else{ // ä¸ä¸å¤©æ¯å¹³å¸¸çå·¥ä½æ¥ @@ -109,12 +110,13 @@ overtime := shiftPlan.GetBreakDayOvertimeHour( false ); breakDayOvertimeHourCell.RealValue( breakDayOvertimeHourCell.RealValue() + overtime ); if( not isnull( nextShiftPlan )){ nextDayOvertime := shiftPlan.GetBreakDayOvertimeHour( true ); if( nextShiftPlan.IsHoliday()){ // ä¸ä¸å¤©æ¯èåæ¥ nextDayOvertime := shiftPlan.GetHolidayOvertimeHour( true ); holidayOvertimeHourCell.RealValue( holidayOvertimeHourCell.RealValue() + nextDayOvertime ); }else if( shiftPlan.DefaultRemark().LikeUserLocale( "å¨å " ) or shiftPlan.DefaultRemark().LikeUserLocale( "å¨æ¥" ) ){ // ä¸ä¸å¤©æ¯å¨å æå¨æ¥ nextDayOvertime := shiftPlan.GetBreakDayOvertimeHour( true ); breakDayOvertimeHourCell.RealValue( breakDayOvertimeHourCell.RealValue() + nextDayOvertime ); }else{ // ä¸ä¸å¤©æ¯å¹³å¸¸çå·¥ä½æ¥ _Main/BL/Type_ShiftPlan/Method_GetBreakDayOvertimeHour.qbl
@@ -7,28 +7,33 @@ TextBody: [* // Akari Sep-6-2024 (created) //å½å¤©çå çæ¶é¿ overtime := 0.0; //å½å¤©è¦ç®å¨æ天çå çæ¶é¿ nextDayOvertime := 0.0; if( this.Outcome() = "1" ){ overtime := 0; overtime := 8.0; nextDayOvertime := 0.0; }else if( this.Outcome() = "2" ){ overtime := 0; overtime := 16.0; nextDayOvertime := 0.0; }else if(this.Outcome() = "9+9"){ overtime := 1; nextDayOvertime := 1; overtime := 18.0; nextDayOvertime := 0.0; }else if(this.Outcome() = "10+10"){ overtime := 2; nextDayOvertime := 2; overtime := 20.0; nextDayOvertime := 0.0; }else if(this.Outcome() = "11+11"){ overtime := 22.0; nextDayOvertime := 0.0; }else if(this.Outcome() = "1(9)" or this.Outcome() = "1ï¼9ï¼"){ overtime := 1; nextDayOvertime := 0; overtime := 9.0; nextDayOvertime := 0.0; }else if(this.Outcome() = "1(10)" or this.Outcome() = "1ï¼10ï¼"){ overtime := 2; nextDayOvertime := 0; overtime := 10.0; nextDayOvertime := 0.0; }else if(this.Outcome() = "3"){ overtime := 0; overtime := 22.5; nextDayOvertime := 0; } result := 0.0; _Main/BL/Type_ShiftPlan/Method_GetDefaultDayOvertimeHour.qbl
@@ -10,26 +10,29 @@ overtime := 0.0; nextDayOvertime := 0.0; if( this.Outcome() = "1" ){ overtime := 0; overtime := 0.0; nextDayOvertime := 0.0; }else if( this.Outcome() = "2" ){ overtime := 0; overtime := 0.0; nextDayOvertime := 0.0; }else if(this.Outcome() = "9+9"){ overtime := 1; nextDayOvertime := 1; overtime := 2.0; nextDayOvertime := 0.0; }else if(this.Outcome() = "10+10"){ overtime := 2; nextDayOvertime := 2; overtime := 4.0; nextDayOvertime := 0.0; }else if(this.Outcome() = "11+11"){ overtime := 6.0; nextDayOvertime := 0.0; }else if(this.Outcome() = "1(9)" or this.Outcome() = "1ï¼9ï¼"){ overtime := 1; nextDayOvertime := 0; overtime := 1.0; nextDayOvertime := 0.0; }else if(this.Outcome() = "1(10)" or this.Outcome() = "1ï¼10ï¼"){ overtime := 2; nextDayOvertime := 0; overtime := 2.0; nextDayOvertime := 0.0; }else if(this.Outcome() = "3"){ overtime := 0; nextDayOvertime := 0; overtime := 0.0; nextDayOvertime := 0.0; } result := 0.0; if( isGetNextDay ){ _Main/BL/Type_ShiftPlan/Method_GetHolidayOvertimeHour#0.qbl
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,47 @@ Quintiq file version 2.0 #parent: #root Method GetHolidayOvertimeHour ( Boolean isGetNextDay ) const declarative remote as Real { TextBody: [* // Akari Sep-6-2024 (created) //å½å¤©çå çæ¶é¿ overtime := 0.0; //å½å¤©è¦ç®å¨æ天çå çæ¶é¿ nextDayOvertime := 0.0; if( this.Outcome() = "1" ){ overtime := 8.0; nextDayOvertime := 0.0; }else if( this.Outcome() = "2" ){ overtime := 15.0; nextDayOvertime := 1.0; }else if(this.Outcome() = "9+9"){ overtime := 16.0; nextDayOvertime := 2.0; }else if(this.Outcome() = "10+10"){ overtime := 17.0; nextDayOvertime := 3.0; }else if(this.Outcome() = "11+11"){ overtime := 18.0; nextDayOvertime := 4.0; }else if(this.Outcome() = "1(9)" or this.Outcome() = "1ï¼9ï¼"){ overtime := 9.0; nextDayOvertime := 0.0; }else if(this.Outcome() = "1(10)" or this.Outcome() = "1ï¼10ï¼"){ overtime := 10.0; nextDayOvertime := 0.0; }else if(this.Outcome() = "3"){ overtime := 15.0; nextDayOvertime := 7.5; } result := 0.0; if( isGetNextDay ){ result := nextDayOvertime; }else{ result := overtime; } return result; *] } _Main/UI/MacroPlannerWebApp/Component_DialogEditEmployeeCost/Method_New.def
@@ -14,5 +14,7 @@ cbUnit.Checked( true ); ApplicationMacroPlanner.ShowFormModal( this ); this.Title( "Create" ); *] } _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionBudget_dhBaseVersionBudget_OnDataChanged.def
@@ -11,10 +11,11 @@ Body: [* if( not isnull( this.Data())){ if( this.Data().Name().LikeUserLocale( "M" )){ dhDateUnitBudget.Data( "M" ); name := this.Data().Name().ReplaceAll( "VWED","vwed" ); if( name.LikeUserLocale( "W" )){ dhDateUnitBudget.Data( "W" ); }else{ dhDateUnitBudget.Data( "W" ); dhDateUnitBudget.Data( "M" ); } } *] _Main/UI/MacroPlannerWebApp/Component_FormDemandComparison/Response_pSelectionPP_dhBaseVersionPP_OnDataChanged.def
@@ -10,10 +10,11 @@ Body: [* if( not isnull( this.Data())){ if( this.Data().Name().LikeUserLocale( "M" )){ dhDateUnitPP.Data( "M" ); name := this.Data().Name().ReplaceAll( "VWED","vwed" ); if( name.LikeUserLocale( "W" )){ dhDateUnitPP.Data( "W" ); }else{ dhDateUnitPP.Data( "W" ); dhDateUnitPP.Data( "M" ); } } *]
