Browse Source

计算工资
新增/修改 增加应付字段

leiy 1 year ago
parent
commit
46650560e6

+ 1 - 2
OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -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)

+ 5 - 0
OASystem/OASystem.Domain/Dtos/PersonnelModule/WageSheetDto.cs

@@ -111,6 +111,11 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         /// </summary>
         public decimal InformationSecurityFee { get; set; }
 
+        /// <summary>
+        /// 其他应发
+        /// </summary>
+        public decimal OtherHandle { get; set; }
+
         /// <summary>
         /// 月度补贴/其他补贴
         /// </summary>