薪酬改

src/main/java/fi/em/formPlugin/SalaryFileUploadEditPlugin.java

@@ -145,11 +145,11 @@ public class SalaryFileUploadEditPlugin extends AbstractBillPlugIn implements Up
                 ,"nckd_se_cpy_cmymey");
         //薪酬明细（内退）分录字段标识
         List<String> nckd_earlyretired=Arrays.asList("nckd_ee_institution","nckd_ee_empname","nckd_ee_empnumber","nckd_ee_idnumber","nckd_ee_banknumber"
-                ,"nckd_ee_unit","nckd_ee_org","nckd_ee_department","nckd_ee_allbasicsry","nckd_ee_allowance","nckd_ee_otherallowance","nckd_ee_per_endins"
+                ,"nckd_ee_unit","nckd_ee_org","nckd_ee_department","nckd_ee_allbasicsry","nckd_ee_allowance","nckd_ee_orallowance","nckd_ee_per_endins"
+                ,"nckd_ee_otherreduce","nckd_ee_cpy_endins","nckd_ee_cpy_bhopins","nckd_ee_cpy_ljins","nckd_ee_cpy_birthins","nckd_ee_cpy_dmgins"
+                ,"nckd_ee_cpy_cmymey","nckd_ee_cpy_hosins","nckd_ee_taxt","nckd_ee_alltaxt","nckd_ee_charge","nckd_ee_finallsys"
                 ,"nckd_ee_per_ljins","nckd_ee_per_hopins","nckd_ee_per_bhopins","nckd_ee_per_hosins","nckd_ee_per_cmymey","nckd_ee_unionmey"
-                ,"nckd_ee_tax","nckd_ee_desalary","nckd_ee_netsalary","nckd_ee_otherreduce","nckd_ee_cpy_endins","nckd_ee_cpy_bhopins"
-                ,"nckd_ee_cpy_ljins","nckd_ee_cpy_birthins","nckd_ee_cpy_dmgins","nckd_ee_cpy_cmymey","nckd_ee_cpy_hosins","nckd_ee_taxt"
-                ,"nckd_ee_alltaxt","nckd_ee_charge","nckd_ee_finallsys");
+                );
         //薪酬明细（退休）分录字段标识
         List<String> nckd_retired=Arrays.asList("nckd_re_institution","nckd_re_empname","nckd_re_empnumber","nckd_re_idnumber","nckd_re_banknumber"
                 ,"nckd_re_unit","nckd_re_org","nckd_re_department","nckd_re_livallowance","nckd_re_otherallowance","nckd_re_reward"
@@ -550,7 +550,7 @@ public class SalaryFileUploadEditPlugin extends AbstractBillPlugIn implements Up
         //薪酬明细（内退）
         if (billtype.equals("nckd_earlyretiredentry")) {
             flag=headList.get(0).getCell(9).getStringCellValue();
-            if (!flag.equals("内退生活费")) {
+            if (!flag.equals("基本养老保险个人缴费")) {
                 throw new KDBizException("上传的文件格式有误，请检查！");
             }
             for (int i=0;i<rowList.size();i++) {

src/main/java/fi/em/formPlugin/SubAndAudFormPlugin.java

@@ -50,7 +50,7 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
 
     //根据输入的list名，返回对应list
     public List<String> entryList(String nckdentry)
-    {
+      {
         //薪酬明细（一般员工）分录字段标识,金额字段
         List<String> nckd_generalemployees = Arrays.asList("nckd_se_allbasicsry"
                 ,"nckd_se_basicsry","nckd_se_acmsry","nckd_se_reacmsry","nckd_se_bsnrwd","nckd_se_otreward","nckd_se_cmcsbd"
@@ -72,18 +72,17 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
 
 
         //薪酬明细（内退）分录字段标识,金额字段
-        List<String> nckd_earlyretired=Arrays.asList("nckd_ee_allbasicsry","nckd_ee_allowance","nckd_ee_otherallowance","nckd_ee_per_endins"
+        List<String> nckd_earlyretired=Arrays.asList("nckd_ee_allbasicsry","nckd_ee_allowance","nckd_ee_orallowance","nckd_ee_per_endins"
+                ,"nckd_ee_otherreduce","nckd_ee_cpy_endins","nckd_ee_cpy_bhopins","nckd_ee_cpy_ljins","nckd_ee_cpy_birthins","nckd_ee_cpy_dmgins"
+                ,"nckd_ee_cpy_cmymey","nckd_ee_cpy_hosins","nckd_ee_taxt","nckd_ee_alltaxt","nckd_ee_charge","nckd_ee_finallsys"
                 ,"nckd_ee_per_ljins","nckd_ee_per_hopins","nckd_ee_per_bhopins","nckd_ee_per_hosins","nckd_ee_per_cmymey","nckd_ee_unionmey"
-                ,"nckd_ee_tax","nckd_ee_desalary","nckd_ee_netsalary","nckd_ee_otherreduce","nckd_ee_cpy_endins","nckd_ee_cpy_bhopins"
-                ,"nckd_ee_cpy_ljins","nckd_ee_cpy_birthins","nckd_ee_cpy_dmgins","nckd_ee_cpy_cmymey","nckd_ee_cpy_hosins","nckd_ee_taxt"
-                ,"nckd_ee_alltaxt","nckd_ee_charge","nckd_ee_finallsys");
+        );
 
         //薪酬明细（内退）汇总分录
-        List<String> nckd_a_earlyretired=Arrays.asList("nckd_aee_allbasicsry","nckd_aee_allowance","nckd_aee_ollowance","nckd_aee_per_endins"
-                ,"nckd_aee_per_ljins","nckd_aee_per_hopins","nckd_aee_per_bhopins","nckd_aee_per_hosins","nckd_aee_per_cmymey","nckd_aee_unionmey"
-                ,"nckd_aee_tax","nckd_aee_desalary","nckd_aee_netsalary","nckd_aee_otherreduce","nckd_aee_cpy_endins","nckd_aee_cpy_bhopins","nckd_aee_cpy_ljins"
-                ,"nckd_aee_cpy_birthins","nckd_aee_cpy_dmgins","nckd_aee_cpy_cmymey","nckd_aee_cpy_hosins","nckd_aee_taxt","nckd_aee_alltaxt","nckd_aee_charge"
-                ,"nckd_aee_finallsys");
+        List<String> nckd_a_earlyretired=Arrays.asList("nckd_aee_allbasicsry","nckd_aee_otherallowance","nckd_aee_orallowance","nckd_aee_per_endins"
+                ,"nckd_aee_otherreduce","nckd_aee_cpy_endins","nckd_aee_cpy_bhopins","nckd_aee_cpy_ljins","nckd_aee_cpy_birthins","nckd_aee_cpy_dmgins"
+                ,"nckd_aee_cpy_cmymey","nckd_aee_cpy_hosins","nckd_aee_taxt","nckd_aee_alltaxt","nckd_aee_charge","nckd_aee_finallsys","nckd_aee_per_ljins"
+                ,"nckd_aee_per_hopins","nckd_aee_per_bhopins","nckd_aee_per_hosins","nckd_aee_per_cmymey","nckd_aee_unionmey");
 
 
         //薪酬明细（退休）分录字段标识，金额字段