|
@@ -360,7 +360,7 @@ namespace OASystem.API.Controllers
|
|
|
#region 计算工资
|
|
|
|
|
|
//月工资
|
|
|
- decimal salary = pm_WageSheet.Basic + pm_WageSheet.Floats + pm_WageSheet.PostAllowance + pm_WageSheet.InformationSecurityFee + pm_WageSheet.OtherSubsidies;
|
|
|
+ decimal salary = pm_WageSheet.Basic + pm_WageSheet.Floats + pm_WageSheet.PostAllowance + pm_WageSheet.InformationSecurityFee + pm_WageSheet.OtherSubsidies + pm_WageSheet.OtherHandle;
|
|
|
//扣款合计
|
|
|
decimal totalDeduction = pm_WageSheet.SickLeave + pm_WageSheet.SomethingFalse + pm_WageSheet.LateTo + pm_WageSheet.LeaveEarly + pm_WageSheet.Absenteeism + pm_WageSheet.NotPunch +
|
|
|
pm_WageSheet.ReservedFunds + pm_WageSheet.WithholdingInsurance + pm_WageSheet.OtherDeductions + pm_WageSheet.OtherDeductions;
|
|
@@ -397,7 +397,6 @@ namespace OASystem.API.Controllers
|
|
|
if (_result.Code != 0)
|
|
|
{
|
|
|
return Ok(JsonView(false, _result.Msg));
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
catch (Exception ex)
|