工资条导入表格必填验证标识减少

工资条导入顺序出错

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WageSchedule/WageScheduleService.cs

@@ -364,7 +364,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         try
                         {
                             //检测是否有空值
-                            if (dr[1].ToString() == "" || dr[3].ToString() == "" || dr[4].ToString() == "" || dr[5].ToString() == "" || dr[6].ToString() == "" || dr[26].ToString() == "" || dr[35].ToString() == "")
+                            if (dr[1].ToString() == "" || dr[3].ToString() == "" || dr[6].ToString() == "" || dr[26].ToString() == "" || dr[35].ToString() == "")
                             {
                                 throw (new Exception("行内必填项数据有空值，不能为空！"));
                             }
@@ -421,8 +421,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 OccupationalAnnuities = dr[29].ToDecimalOrNull(),
                                 MedicalInsurance = dr[30].ToDecimalOrNull(),
                                 UnemploymentInsurance = dr[31].ToDecimalOrNull(),
-                                PersonalIncomeTax = dr[32].ToDecimalOrNull(),
-                                LaborUnionWage = dr[33].ToDecimalOrNull(),
+                                LaborUnionWage = dr[32].ToDecimalOrNull(),
+                                PersonalIncomeTax = dr[33].ToDecimalOrNull(),
                                 Other = dr[34].ToDecimalOrNull(),
                                 NetCombined = dr[35].ToDecimalOrNull(),
                                 IssueMonth = dr[36].ToInt(),