add new prop to contractTable - compute dailyWage

This commit is contained in:
SamSys
2025-08-23 04:27:04 +03:30
parent df1e6f62b8
commit 2f60883ea2
14 changed files with 10501 additions and 33 deletions

View File

@@ -17,7 +17,7 @@ public class Contract : EntityBase
public Contract(long personnelCode, long employeeId, long employerId,
long workshopIds, long yearlySalaryId, DateTime contarctStart, DateTime contractEnd, string dayliWage,
string archiveCode, DateTime getWorkDate, DateTime setContractDate, string jobType,
string contractType, string workshopAddress1, string workshopAddress2, string consumableItems, long jobTypeId, string housingAllowance, string agreementSalary, string workingHoursWeekly, string familyAllowance, string contractPeriod)
string contractType, string workshopAddress1, string workshopAddress2, string consumableItems, long jobTypeId, string housingAllowance, string agreementSalary, string workingHoursWeekly, string familyAllowance, string contractPeriod, double dailySalaryAffected, double baseYearAffected, double dailySalaryUnAffected, double baseYearUnAffected, bool hasManualDailyWage)
{
PersonnelCode = personnelCode;
EmployeeId = employeeId;
@@ -45,6 +45,17 @@ public class Contract : EntityBase
WorkingHoursWeekly = workingHoursWeekly;
FamilyAllowance = familyAllowance;
ContractPeriod = contractPeriod;
//پراپرتی های جدید برای دستمزد دلخواه
#region NewManualDailyWage
DailySalaryAffected = dailySalaryAffected;
BaseYearAffected = baseYearAffected;
DailySalaryUnAffected = dailySalaryUnAffected;
BaseYearUnAffected = baseYearUnAffected;
HasManualDailyWage = hasManualDailyWage;
#endregion
Signature = "0";
@@ -70,31 +81,31 @@ public class Contract : EntityBase
/// </summary>
public string DayliWage { get; private set; }
///// <summary>
///// دستمزد روزانه خام بعد از تاثیر ساعت کار
///// </summary>
//public double DailySalaryAffected { get; set; }
/// <summary>
/// دستمزد روزانه خام بعد از تاثیر ساعت کار
/// </summary>
public double DailySalaryAffected { get; set; }
///// <summary>
///// پایه سنوات بعد از تاثیر ساعت کار
///// </summary>
//public double BaseYearAffected { get; set; }
/// <summary>
/// پایه سنوات بعد از تاثیر ساعت کار
/// </summary>
public double BaseYearAffected { get; set; }
///// <summary>
///// دستمزد روزانه قبل از تاثیر ساعت کار
///// </summary>
//public double DailySalaryUnAffected { get; set; }
/// <summary>
/// دستمزد روزانه قبل از تاثیر ساعت کار
/// </summary>
public double DailySalaryUnAffected { get; set; }
///// <summary>
///// پایه سنوات قبل از تاثیر ساعت کار
///// </summary>
//public double BaseYearUnAffected { get; set; }
/// <summary>
/// پایه سنوات قبل از تاثیر ساعت کار
/// </summary>
public double BaseYearUnAffected { get; set; }
///// <summary>
///// آیا دستمزد روزانه دستی وارد شده است؟
///// </summary>
//public bool HasManualDailyWage { get; set; }
/// <summary>
/// آیا دستمزد روزانه دستی وارد شده است؟
/// </summary>
public bool HasManualDailyWage { get; set; }
public string IsActiveString { get; private set; }