CelHRTeam/EchoTex_Payroll
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ok #42

Merged
chapal merged 1 commits from dev_chapal into devqc 2025-05-06 11:17:19 +06:00
Conversation 0 Commits 1 Files Changed 1 +18 -15
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7b04c7a3e5 - Show all commits

33
HRM.DA/Service/Attendance/AttendanceProcess.cs
View File

@ -2454,23 +2454,26 @@ namespace HRM.DA
DataSet EmpOTHours = new ShiftTermService().GetEmpOT(oPayrollType.NextPayProcessDate, trm.ID); DataSet EmpOTHours = new ShiftTermService().GetEmpOT(oPayrollType.NextPayProcessDate, trm.ID);
foreach (DataRow Dr in EmpOTHours.Tables[0].Rows) foreach (DataRow Dr in EmpOTHours.Tables[0].Rows)
{ {
Employee tempEmployee = employees.Where(emp => emp.ID.ToString() == Dr["EmployeeID"].ToString()).FirstOrDefault(); //if (Convert.ToDouble(Dr["TotalOT"])>0)
if (tempEmployee == null || tempEmployee.IsEligibleOT == false) continue; //{
Employee tempEmployee = employees.Where(emp => emp.ID.ToString() == Dr["EmployeeID"].ToString()).FirstOrDefault();
if (tempEmployee.GradeID == null) if (tempEmployee == null || tempEmployee.IsEligibleOT == false) continue;
{
ErrorList.Add(new SalaryProcessStatus(tempEmployee.EmployeeNo, tempEmployee.Name, "Grade not assinged"));
continue;
} if (tempEmployee.GradeID == null)
if (Dr["TotalOT"] == DBNull.Value) {
{ ErrorList.Add(new SalaryProcessStatus(tempEmployee.EmployeeNo, tempEmployee.Name, "Grade not assinged"));
// ErrorList.Add(new SalaryProcessStatus(tempEmployee.EmployeeNo, tempEmployee.Name, "value can't be null ")); continue;
continue;
}
EmpOverTimes = MakeEmployeeOvertimeObj(ref EmpOverTimes, ref ErrorList, tempEmployee, termParameters, }
oPayrollType, trm.ID, Convert.ToDouble(Dr["TotalOT"]), userid); if (Dr["TotalOT"] == DBNull.Value)
{
// ErrorList.Add(new SalaryProcessStatus(tempEmployee.EmployeeNo, tempEmployee.Name, "value can't be null "));
continue;
}
EmpOverTimes = MakeEmployeeOvertimeObj(ref EmpOverTimes, ref ErrorList, tempEmployee, termParameters,
oPayrollType, trm.ID, Convert.ToDouble(Dr["TotalOT"]), userid);
//}
} }
} }
} }