薪酬计提代码优化

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

@@ -49,67 +49,35 @@ public class SalaryDistributeEditPlugin extends AbstractListPlugin implements Pl
                 this.getView().setVisible(false,item);
             }
             //清空所有分录
-            //一般员工分录
-            this.getModel().deleteEntryData("nckd_staffentry");
-            //内退分录
-            this.getModel().deleteEntryData("nckd_earlyretiredentry");
-            //退休分录
-            this.getModel().deleteEntryData("nckd_retireentry");
-            //人力薪酬分录
-            this.getModel().deleteEntryData("nckd_salaryentry");
+            clearEntryData("");
         }
         //薪酬明细(一般员工)分录
         if (Viewflag.equals(nckd_generalemployees)) {
             for (String item:viewList) {
                 this.getView().setVisible(false,item);
             }
-            //内退分录
-            this.getModel().deleteEntryData("nckd_earlyretiredentry");
-            //退休分录
-            this.getModel().deleteEntryData("nckd_retireentry");
-            //人力薪酬分录
-            this.getModel().deleteEntryData("nckd_salaryentry");
-            this.getView().setVisible(true,nckd_generalemployees);
+            clearEntryData(nckd_generalemployees);
         }
         //薪酬明细(内退)分录
         if (Viewflag.equals(nckd_earlyretired)) {
             for (String item:viewList) {
                 this.getView().setVisible(false,item);
             }
-            //一般员工分录
-            this.getModel().deleteEntryData("nckd_staffentry");
-            //退休分录
-            this.getModel().deleteEntryData("nckd_retireentry");
-            //人力薪酬分录
-            this.getModel().deleteEntryData("nckd_salaryentry");
-            this.getView().setVisible(true,nckd_earlyretired);
+            clearEntryData(nckd_earlyretired);
         }
         //薪酬明细(退休)分录
         if (Viewflag.equals(nckd_retired)) {
             for (String item:viewList) {
                 this.getView().setVisible(false,item);
             }
-            //一般员工分录
-            this.getModel().deleteEntryData("nckd_staffentry");
-            //内退分录
-            this.getModel().deleteEntryData("nckd_earlyretiredentry");
-            //人力薪酬分录
-            this.getModel().deleteEntryData("nckd_salaryentry");
-            this.getView().setVisible(true,nckd_retired);
+            clearEntryData(nckd_retired);
         }
         //人力薪酬分录
         if (Viewflag.equals(nckd_pay)) {
             for (String item:viewList) {
                 this.getView().setVisible(false,item);
             }
-            //清空其他分录
-            //一般员工分录
-            this.getModel().deleteEntryData("nckd_staffentry");
-            //内退分录
-            this.getModel().deleteEntryData("nckd_earlyretiredentry");
-            //退休分录
-            this.getModel().deleteEntryData("nckd_retireentry");
-            this.getView().setVisible(true,nckd_pay);
+            clearEntryData(nckd_pay);
         }
     }
 
@@ -126,7 +94,6 @@ public class SalaryDistributeEditPlugin extends AbstractListPlugin implements Pl
         String name=e.getProperty().getName();
         //获取单据模型
         DynamicObject data=this.getModel().getDataEntity();
-
         if (nckd_entrytype.equals(name)) {
             //获取当前分录类型
             ChangeData[] changeSet=e.getChangeSet();
@@ -134,10 +101,10 @@ public class SalaryDistributeEditPlugin extends AbstractListPlugin implements Pl
             oldentryNum=(String)changeData.getOldValue();
             newentryNum=(String)changeData.getNewValue();
             String entrytype=data.getString(nckd_entrytype);
-
             if (entrytype.isEmpty()) {
                 this.setVieeVisible("");
             }
+            //分录有数据则弹窗提示，无数据则直接切换分录
             //分录类型为薪酬明细（一般员工）
             if (entrytype.equals("A")) {
                 if (billIsNotEmpty(data)) {
@@ -207,8 +174,7 @@ public class SalaryDistributeEditPlugin extends AbstractListPlugin implements Pl
             }
         }
         //如果为取消，则
-        if (messageBoxClosedEvent.getResult()==MessageBoxResult.No)
-        {
+        if (messageBoxClosedEvent.getResult()==MessageBoxResult.No) {
             //设置回原来的值，不触发值改变事件
             this.getModel().beginInit();
             data.set("nckd_entrytype",oldentryNum);
@@ -230,4 +196,22 @@ public class SalaryDistributeEditPlugin extends AbstractListPlugin implements Pl
         }
         return false;
     }
+
+    //清空除传入以外的其他分录
+    public void clearEntryData(String nckd_entry)
+    {
+        //分录标识
+        List<String> nckd_generalemployees =Arrays.asList("nckd_staffentry","nckd_earlyretiredentry","nckd_retireentry","nckd_salaryentry");
+        for (String item:nckd_generalemployees) {
+            //不传入参数默认全部分录清除
+            if ("".equals(nckd_entry)){
+                this.getModel().deleteEntryData(item);
+            }
+            if (!item.equals(nckd_entry)) {
+                this.getModel().deleteEntryData(item);
+                this.getView().setVisible(true,nckd_entry);
+            }
+        }
+    }
+
 }

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

@@ -140,8 +140,6 @@ public class SalaryFileUploadEditPlugin extends AbstractBillPlugIn implements Up
                 ,"nckd_se_unionmey","nckd_se_tax","nckd_se_otherreduce","nckd_se_desalary","nckd_se_netsalary","nckd_se_cpy_endins"
                 ,"nckd_se_cpy_hopins","nckd_se_cpy_bhopins","nckd_se_cpy_ljins","nckd_se_cpy_birthins","nckd_se_cpy_dmgins","nckd_se_cpy_hosins"
                 ,"nckd_se_cpy_cmymey");
-
-
         //薪酬明细（内退）分录字段标识
         List<String> nckd_earlyretired=Arrays.asList("nckd_ee_institution","nckd_ee_emptype","nckd_ee_empnumber","nckd_ee_empname"
                 ,"nckd_ee_org","nckd_ee_department","nckd_ee_idnumber","nckd_ee_cost","nckd_ee_allbasicsry","nckd_ee_allowance"
@@ -149,12 +147,10 @@ public class SalaryFileUploadEditPlugin extends AbstractBillPlugIn implements Up
                 ,"nckd_ee_per_hosins","nckd_ee_per_cmymey","nckd_ee_unionmey","nckd_ee_tax","nckd_ee_otherreduce","nckd_ee_desalary"
                 ,"nckd_ee_netsalary","nckd_ee_cpy_endins","nckd_ee_cpy_hopins","nckd_ee_cpy_bhopins","nckd_ee_cpy_ljins","nckd_ee_cpy_birthins"
                 ,"nckd_ee_cpy_dmgins","nckd_ee_cpy_hosins","nckd_ee_cpy_cmymey");
-
         //薪酬明细（退休）分录字段标识
         List<String> nckd_retired=Arrays.asList("nckd_re_institution","nckd_re_emptype","nckd_re_empnumber","nckd_re_empname","nckd_re_org"
                 ,"nckd_re_department","nckd_re_idnumber","nckd_re_cost","nckd_re_livallowance","nckd_re_otherallowance","nckd_re_reward"
                 ,"nckd_re_salarypayable","nckd_re_desalary","nckd_re_netsalary");
-
         //人力薪酬分录标识
         List<String> nckd_pay=Arrays.asList("nckd_sae_institution","nckd_sae_empname","nckd_sae_jobid","nckd_sae_idnumber","nckd_sae_company"
                 ,"nckd_sae_institutions","nckd_sae_department","nckd_sae_levelsry","nckd_sae_dutiessry","nckd_sae_updutiessry","nckd_sae_workyearsry"