Bladeren bron

计算工资 4.4

leiy 1 jaar geleden
bovenliggende
commit
552f8ea565

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

@@ -633,8 +633,8 @@ namespace OASystem.API.OAMethodLib
                 pm_wsInfo.Ex_ItemsRemark = JsonConvert.SerializeObject(ex_Items);  //
                 pm_wsInfo.Mealsupplement = mealTotal;          //餐补
 
-                pm_wsInfo.Should = salaryTotal;            //应发合计
-                pm_wsInfo.TotalDeductions = eductionTotal; //扣款合计
+                pm_wsInfo.Should = salaryTotal;               //应发合计
+                pm_wsInfo.TotalDeductions = eductionTotal;    //扣款合计
                 pm_wsInfo.TotalRealHair = actualReleaseTotal; //实发合计
                 pm_wsInfo.AfterTax = actualReleaseTotal - pm_wsInfo.WithholdingTax; //税后工资
 

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

@@ -337,5 +337,9 @@ namespace OASystem.Domain.Dtos.PersonnelModule
         /// </summary>
         public decimal GroupCost { get; set; }
 
+        /// <summary>
+        /// 个税
+        /// </summary>
+        public decimal WithholdingTax { get; set; }
     }
 }

+ 4 - 5
OASystem/OASystem.Domain/ViewModels/PersonnelModule/WageSheetView.cs

@@ -131,7 +131,6 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
 
         /// <summary>
         /// 迟到 
-        /// 计算次数
         /// </summary>
         public decimal LateTo { get; set; }
 
@@ -186,10 +185,10 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
         /// </summary>
         public decimal AfterTax { get; set; }
 
-        /// <summary>
-        /// 锁定标识
-        /// </summary>
-        public decimal IsLock { get; set; }
+        ///// <summary>
+        ///// 锁定标识
+        ///// </summary>
+        //public decimal IsLock { get; set; }
 
         /// <summary>
         /// 最后操作人