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

Merge pull request 'Prod process' (#15) from dev_chapal into devqc

Browse Source 
Reviewed-on: http://103.197.204.162:3025/CelHRTeam/EchoTex_Payroll/pulls/15
This commit is contained in:
chapal 2024-11-24 15:25:30 +06:00
commit 4488b66be3
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; bonusIntime = dailyAtt.InTime;
bonusOuttime = dailyAtt.OutTime; 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); // oShift = oShifts.FirstOrDefault(x => x.ID == dailyAtt.ShiftID);
if (oProductionBonusSetup.FromDate.Date == dailyAtt.AttnDate.Date) if (oProductionBonusSetup.FromDate.Date == dailyAtt.AttnDate.Date)
@ -770,7 +770,7 @@ namespace HRM.DA
double wh = 0; double wh = 0;
if (dailyAtt != null) 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; bonusIntime = dailyAtt.InTime;
bonusOuttime = dailyAtt.OutTime; bonusOuttime = dailyAtt.OutTime;

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

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