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

Merge branch 'devqc' into dev_mashfiq

Browse Source
This commit is contained in:
mashfiq 2024-11-25 10:07:13 +06:00
commit d3a7d1be86
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HRM.DA/Service/Bonus/ProdBonusProcessService.cs
View File

@ -710,7 +710,7 @@ namespace HRM.DA
{
bonusIntime = dailyAtt.InTime;
bonusOuttime = dailyAtt.OutTime;
if (dailyAtt.OutTime != DateTime.MinValue && dailyAtt.InTime != DateTime.MinValue)
if (dailyAtt.OutTime != null && dailyAtt.InTime != null && dailyAtt.OutTime != DateTime.MinValue && dailyAtt.InTime != DateTime.MinValue)
{
// oShift = oShifts.FirstOrDefault(x => x.ID == dailyAtt.ShiftID);
if (oProductionBonusSetup.FromDate.Date == dailyAtt.AttnDate.Date)
@ -770,7 +770,7 @@ namespace HRM.DA
double wh = 0;
if (dailyAtt != null)
{
if (dailyAtt.OutTime != DateTime.MinValue && dailyAtt.InTime != DateTime.MinValue)
if (dailyAtt.OutTime != null && dailyAtt.InTime != null && dailyAtt.OutTime != DateTime.MinValue && dailyAtt.InTime != DateTime.MinValue)
{
bonusIntime = dailyAtt.InTime;
bonusOuttime = dailyAtt.OutTime;

21
HRM.Report/Class/rptBonus.cs
View File

@ -358,28 +358,31 @@ namespace HRM.Report
}
if (prodAttn != null && prodAttn.Count > 0)
{
foreach (Employee item in attnEmp)
{
List<ProdBonusAttn> tempAttn = prodAttn.Where(o => o.EmployeeID == item.ID).ToList();//.Sum(x => x.BonusHour);
double hour = 0;
foreach (ProdBonusAttn tAtt in tempAttn)
{
DailyAttnProcess dailyAtt = oDailyAttnProsess.FirstOrDefault(o => o.AttnDate.Date == tAtt.InTime.Date &&
o.EmployeeID == item.ID &&
(o.AttenType == EnumAttendanceType.Present ||
o.AttenType == EnumAttendanceType.HalfDay ||
o.AttenType == EnumAttendanceType.Delay ||
o.AttenType == EnumAttendanceType.Early ||
o.AttenType == EnumAttendanceType.Late ||
o.AttenType == EnumAttendanceType.OutSideDuty));
o.EmployeeID == item.ID &&
(o.AttenType == EnumAttendanceType.Present ||
o.AttenType == EnumAttendanceType.HalfDay ||
o.AttenType == EnumAttendanceType.Delay ||
o.AttenType == EnumAttendanceType.Early ||
o.AttenType == EnumAttendanceType.Late ||
o.AttenType == EnumAttendanceType.OutSideDuty));
double wh = 0;
if (dailyAtt != null)
{
if (dailyAtt.OutTime != DateTime.MinValue && dailyAtt.InTime != DateTime.MinValue)
if (dailyAtt.OutTime != null && dailyAtt.InTime != null && dailyAtt.OutTime != DateTime.MinValue && dailyAtt.InTime != DateTime.MinValue)
{
bonusIntime = dailyAtt.InTime;
bonusOuttime = dailyAtt.OutTime;
@ -430,6 +433,7 @@ namespace HRM.Report
}
}
if (dTable.Rows.Count > 0)
@ -453,6 +457,7 @@ namespace HRM.Report
//form.CommonReportViewer(null, RDLC, dSet, _reportParameters, true);
ReportProcessor reportProcessor = new ReportProcessor();
return reportProcessor.CommonReportViewForReports(null, dSet, null, RDLC, _reportParameters, true, payrollTypeId, reportType);
}
#endregion Production Bonus