计算工资 11.13-1

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -368,7 +368,7 @@ namespace OASystem.API.Controllers
                 decimal actualTotal = salary - totalDeduction;
                 pm_WageSheet.Should = salary;
                 pm_WageSheet.TotalDeductions = totalDeduction;
-                pm_WageSheet.TotalRealHair = actualTotal;
+                pm_WageSheet.TotalRealHair = actualTotal - pm_WageSheet.WithholdingTax;
                 pm_WageSheet.AfterTax = actualTotal - pm_WageSheet.WithholdingTax;
 
                 #endregion
@@ -738,10 +738,10 @@ namespace OASystem.API.Controllers
                                             .Select(it =>
                                              {
                                                  //修改 绩效不等于0.00M的数据
-
-                                                 decimal tax = Convert.ToDecimal(taxData.Rows[i][1].ToString());
-                                                 it.WithholdingTax = tax;
-                                                 it.AfterTax -= tax;
+                                                 decimal oldTax = it.WithholdingTax;
+                                                 decimal newTax = Convert.ToDecimal(taxData.Rows[i][1].ToString());
+                                                 it.WithholdingTax = newTax;
+                                                 it.TotalRealHair = it.Should - it.TotalDeductions - newTax;
                                                  return it;
                                              })
                                             .ToList();
@@ -751,7 +751,7 @@ namespace OASystem.API.Controllers
                                     wageSheets1 = _mapper.Map<List<Pm_WageSheet>>(wageSheetList);
                                     var updateStatus = _wageSheetRep._sqlSugar
                                         .Updateable(wageSheets1)
-                                        .UpdateColumns(it => it.WithholdingTax)
+                                        .UpdateColumns(it => new { it.WithholdingTax,it.TotalRealHair})
                                         .ExecuteCommand();
 
                                     if (updateStatus<0)

OASystem/OASystem.Api/OAMethodLib/PayrollComputation.cs

@@ -1363,7 +1363,7 @@ namespace OASystem.API.OAMethodLib
 
                     pm_wsInfo.Should = salaryTotal;               //应发合计
                     pm_wsInfo.TotalDeductions = eductionTotal;    //扣款合计
-                    pm_wsInfo.TotalRealHair = actualReleaseTotal; //实发合计
+                    pm_wsInfo.TotalRealHair = actualReleaseTotal - pm_wsInfo.WithholdingTax; //实发合计
                     pm_wsInfo.AfterTax = actualReleaseTotal - pm_wsInfo.WithholdingTax; //税后工资
 
                     pm_wsInfo.LastUpdateUserId = userId;

OASystem/OASystem.Domain/Entities/PersonnelModule/Pm_WageSheet.cs

@@ -197,7 +197,7 @@ namespace OASystem.Domain.Entities.PersonnelModule
         public decimal TotalDeductions { get; set; }
 
         /// <summary>
-        /// 实发合计
+        /// 实发合计(税后工资)
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "decimal(8,2)")]
         public decimal TotalRealHair { get; set; }
@@ -209,7 +209,7 @@ namespace OASystem.Domain.Entities.PersonnelModule
         public decimal WithholdingTax { get; set; }
 
         /// <summary>
-        /// 税后工资
+        /// 税后工资 弃用
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "decimal(8,2)")]
         public decimal AfterTax { get; set; }

OASystem/OASystem.Domain/ViewModels/PersonnelModule/WageSheetView.cs

@@ -163,9 +163,15 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
         public decimal TotalDeductions { get; set; }
 
         /// <summary>
-        /// 实发合计
+        /// 税前合计
         /// </summary>
-        public decimal TotalRealHair { get; set; }
+        public decimal BeforeTax
+        {
+            get
+            {
+                return Should - TotalDeductions;
+            }
+        }
 
         /// <summary>
         /// 代扣个税
@@ -173,9 +179,9 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
         public decimal WithholdingTax { get; set; }
 
         /// <summary>
-        /// 税后工资
+        /// 实发合计(税后工资)
         /// </summary>
-        public decimal AfterTax { get; set; }
+        public decimal TotalRealHair { get; set; }
 
         /// <summary>
         /// 最后操作人
@@ -280,11 +286,6 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
         /// </summary>
         public string? Ex_ItemsRemark { get; set; }
 
-        /// <summary>
-        /// 实发合计
-        /// </summary>
-        public decimal TotalRealHair { get; set; }
-
         /// <summary>
         /// 代扣个税
         /// </summary>
@@ -297,14 +298,14 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
         {
             get
             {
-                return WithholdingTax + AfterTax;
+                return Should - TotalDeductions;
             }
         }
 
         /// <summary>
-        /// 税后工资
+        /// 实发合计(税后工资)
         /// </summary>
-        public decimal AfterTax { get; set; }
+        public decimal TotalRealHair { get; set; }
 
         /// <summary>
         /// 最后操作人
@@ -380,7 +381,6 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
         /// </summary>
         public string? Name { get; set; }
 
-
         /// <summary>
         /// 税前合计
         /// </summary>
@@ -388,10 +388,15 @@ namespace OASystem.Domain.ViewModels.PersonnelModule
         {
             get
             {
-                return WithholdingTax + AfterTax;
+                return Should - TotalDeductions;
             }
         }
 
+        /// <summary>
+        /// 实发合计(税后工资)
+        /// </summary>
+        public decimal TotalRealHair { get; set; }
+
         /// <summary>
         /// 最后操作人
         /// </summary>