Просмотр исходного кода

计算工资
增加字段 其他应付

leiy 1 год назад
Родитель
Сommit
baca47c4b9

+ 2 - 1
OASystem/OASystem.Api/OAMethodLib/PayrollComputation.cs

@@ -141,7 +141,8 @@ namespace OASystem.API.OAMethodLib
                     #region 计算日工资 正常日薪 事假日薪 病假日薪
 
                     //月 - 应发工资
-                    decimal amountPayable = pm_wsInfo.Basic + pm_wsInfo.Floats + pm_wsInfo.PostAllowance + pm_wsInfo.InformationSecurityFee + pm_wsInfo.OtherSubsidies;
+                    decimal amountPayable = pm_wsInfo.Basic + pm_wsInfo.Floats + pm_wsInfo.PostAllowance + pm_wsInfo.InformationSecurityFee + 
+                                            pm_wsInfo.OtherSubsidies + pm_wsInfo.OtherHandle;
 
                     // 日薪 = *计算方式:日平均工资 = 月工资/当月应出勤天数。
                     decimal dailyWage = amountPayable / work_days;

+ 6 - 2
OASystem/OASystem.Domain/Dtos/PersonnelModule/WageSheetDto.cs

@@ -268,6 +268,12 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         /// </summary>
         public decimal InformationSecurityFee { get; set; }
 
+        /// <summary>
+        /// 其他应付
+        /// 主要用来填比如补发工资之类
+        /// </summary>
+        public decimal otherHandle { get; set; }
+
         /// <summary>
         /// 月度补贴/其他补贴
         /// </summary>
@@ -290,6 +296,4 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         /// <summary>
        /// 其他扣款
        /// </summary>                                 
        public decimal OtherDeductions { get; set; }
 
     }
-
-   
 }

+ 7 - 0
OASystem/OASystem.Domain/Entities/PersonnelModule/Pm_WageSheet.cs

@@ -73,6 +73,13 @@ namespace OASystem.Domain.Entities.PersonnelModule
         [SugarColumn(IsNullable = true, ColumnDataType = "decimal(8,2)")]
         public decimal InformationSecurityFee { get; set; }
 
+        /// <summary>
+        /// 其他应付
+        /// 主要用来填比如补发工资之类
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(8,2)")]
+        public decimal OtherHandle { get; set; }
+
         /// <summary>
         /// 服装洗理补贴 弃用
         /// </summary>