薪酬计提汇总分录计算

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

@@ -20,12 +20,19 @@ import java.util.*;
 public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
 
     private static String nckd_staffentry="nckd_staffentry";//通用薪酬一般员工
+    private static String nckd_a_staffentry="nckd_a_staffentry";//通用薪酬一般员工汇总分录标识
     private static String nckd_earlyretiredentry="nckd_earlyretiredentry";//通用薪酬内退
+    private static String nckd_a_earlyretiredentry="nckd_a_earlyretiredentry";//通用薪酬内退分录标识
     private static String nckd_retireentry="nckd_retireentry";//通用薪酬退休
+    private static String nckd_a_retireentry="nckd_a_retireentry";//通用薪酬退休分录标识
     private static String nckd_salaryentry="nckd_salaryentry";//人力薪酬
+    private static String nckd_a_salaryentry="nckd_a_salaryentry";//人力薪酬分录标识
     private static String nckd_salaryentryre="nckd_salaryentryre";//人力薪酬内退
-    private static String nckd_allentry="nckd_allentry";//汇总分录
+    private static String nckd_a_salaryentryre="nckd_a_salaryentryre";//人力薪酬内退标识
 
+
+
+    //控件标识
     private static String nckd_a_generalemployees="nckd_a_generalemployees";//通用一般汇总
     private static String nckd_a_earlyretired="nckd_a_earlyretired";//通用内退汇总
     private static String nckd_a_retired="nckd_a_retired";//通用退休汇总
@@ -53,14 +60,6 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
                 ,"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_allemployees=Arrays.asList("nckd_all_allbsry","nckd_all_basicsry","nckd_all_acmsry","nckd_all_reacmsry"
-                ,"nckd_all_bsnrwd","nckd_all_otreward","nckd_all_cmcsbd","nckd_all_otherpysry","nckd_all_clearrwd","nckd_all_awareward"
-                ,"nckd_all_odevreward","nckd_all_coldsbad","nckd_all_warmsbad","nckd_all_nursabd","nckd_all_oallowance","nckd_all_salarypaya"
-                ,"nckd_all_per_endins","nckd_all_per_hopins","nckd_all_per_bhopins","nckd_all_per_ljins","nckd_all_per_hosins","nckd_all_per_cmymey"
-                ,"nckd_all_unionmey","nckd_all_tax","nckd_all_otherreduce","nckd_all_desalary","nckd_all_netsalary","nckd_all_cpy_endins"
-                ,"nckd_all_cpy_hopins","nckd_all_cpy_bhopins","nckd_all_cpy_ljins","nckd_all_cpy_birthins","nckd_all_cpy_dmgins","nckd_all_cpy_hosins"
-                ,"nckd_all_cpy_cmymey");
 
         //薪酬明细（一般员工）汇总分录
         List<String> nckd_a_employees=Arrays.asList("nckd_ase_allbasicsry","nckd_ase_basicsry","nckd_ase_acmsry"
@@ -78,20 +77,22 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
                 ,"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_allearlytired=Arrays.asList("nckd_all_allbasicsry","nckd_all_allowqance","nckd_all_owance","nckd_all_reduceitem"
-                ,"nckd_all_sumsry","nckd_all_laryreduce","nckd_all_pushreduce","nckd_all_lrulereduce","nckd_all_badreduce","nckd_all_oreduce","nckd_all_reducesry"
-                ,"nckd_all_salarypaya","nckd_all_nesalary","nckd_all_per_endins","nckd_all_per_hopins","nckd_all_per_bhopins","nckd_all_per_ljins"
-                ,"nckd_all_per_hosins","nckd_all_per_cmymey","nckd_all_sumins","nckd_all_workamount","nckd_all_tax","nckd_all_alltaxt"
-                ,"nckd_all_charge","nckd_all_netsalary");
+
+        //薪酬明细（内退）汇总分录
+        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_retired=Arrays.asList("nckd_re_livallowance","nckd_re_otherallowance","nckd_re_reward"
                 ,"nckd_re_salarypayable","nckd_re_desalary","nckd_re_netsalary");
-        //薪酬明细（退休）汇总分录字段标识
-        List<String> nckd_allretired=Arrays.asList("nckd_all_livallowance","nckd_all_otherwance","nckd_all_reward","nckd_all_salarypaya"
-                ,"nckd_all_desalary","nckd_all_netsalary");
+
+        //薪酬明细（退休）汇总分录
+        List<String> nckd_a_retired=Arrays.asList("nckd_are_livallowance","nckd_are_ollowance","nckd_are_reward","nckd_are_salarypayable"
+                ,"nckd_are_desalary","nckd_are_netsalary");
 
 
         //人力薪酬分录标识金额字段，金额字段
@@ -107,20 +108,20 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
                 ,"nckd_sae_per_ins","nckd_sae_unionmey","nckd_sae_tax","nckd_sae_allamount","nckd_sae_cash","nckd_sae_wages","nckd_sae_cpy_endins"
                 ,"nckd_sae_cpy_hopins","nckd_sae_cpy_bhopins","nckd_sae_cpy_birthins","nckd_sae_cpy_ljins","nckd_sae_cpy_dmgins","nckd_sae_cpy_hosins"
                 ,"nckd_sae_cpy_cmymey");
-        //人力薪酬汇总分录字段标识
-        List<String> nckd_allpay=Arrays.asList("nckd_all_levelsry","nckd_all_dutiessry","nckd_all_updutiessry","nckd_all_workyearsry"
-                ,"nckd_all_depyear","nckd_all_eduasry","nckd_all_transry","nckd_all_jobsry","nckd_all_rebasicsry","nckd_all_allbacsry"
-                ,"nckd_all_allcmsry","nckd_all_mountsry","nckd_all_reacmamount","nckd_all_balyearsry","nckd_all_blastyearsry","nckd_all_allsry"
-                ,"nckd_all_bsnreda","nckd_all_cpmrwd","nckd_all_psrwd","nckd_all_comrwd","nckd_all_cardrwd","nckd_all_intwrd","nckd_all_clearwd"
-                ,"nckd_all_allrwd","nckd_all_retainsry","nckd_all_owance","nckd_all_otrewardam","nckd_all_rlcmcsbd","nckd_all_trfsbd"
-                ,"nckd_all_housesbd","nckd_all_warmsbd","nckd_all_edusbd","nckd_all_trafficsbd","nckd_all_othersbd","nckd_all_reduce"
-                ,"nckd_all_othersry","nckd_all_sickreduce","nckd_all_sickhopreduce","nckd_all_eventreduce","nckd_all_afwreduce","nckd_all_latereduce"
-                ,"nckd_all_cwasry","nckd_all_cwareduce","nckd_all_dgreduce","nckd_all_dcpreduce","nckd_all_badredu","nckd_all_othereduce"
-                ,"nckd_all_allreduce","nckd_all_salarypaya","nckd_all_nesalary","nckd_all_per_endins","nckd_all_per_hopins","nckd_all_per_bhopins"
-                ,"nckd_all_per_ljins","nckd_all_per_hosins","nckd_all_per_cmymey","nckd_all_sumins","nckd_all_workamount","nckd_all_tax"
-                ,"nckd_all_alltaxt","nckd_all_charge","nckd_all_netsalary","nckd_all_cpy_endins","nckd_all_cpy_hopins","nckd_all_cpy_bhopins"
-                ,"nckd_all_cpy_birthins","nckd_all_cpy_ljins","nckd_all_cpy_dmgins","nckd_all_cpy_hosins","nckd_all_cpy_cmymey");
 
+        //人力薪酬汇总分录
+        List<String>nckd_a_allpay=Arrays.asList("nckd_asae_levelsry","nckd_asae_dutiessry","nckd_asae_updutiessry","nckd_asae_workyearsry"
+                ,"nckd_asae_depyear","nckd_asae_eduasry","nckd_asae_transry","nckd_asae_jobsry","nckd_asae_basicsry","nckd_asae_allbasicsry"
+                ,"nckd_asae_acmsry","nckd_asae_mountsry","nckd_asae_reacmsry","nckd_asae_balyearsry","nckd_asae_blastyearsry","nckd_asae_allsry"
+                ,"nckd_asae_bsnrwd","nckd_asae_cpmrwd","nckd_asae_psrwd","nckd_asae_comrwd","nckd_asae_cardrwd","nckd_asae_intwrd","nckd_asae_clearrwd"
+                ,"nckd_asae_allrwd","nckd_asae_retainsry","nckd_asae_reward","nckd_asae_otreward","nckd_asae_cmcsbd","nckd_asae_trfsbd","nckd_asae_housesbd"
+                ,"nckd_asae_warmsbd","nckd_asae_edusbd","nckd_asae_trafficsbd","nckd_asae_othersbd","nckd_asae_reduce","nckd_asae_othersry","nckd_asae_sickreduce"
+                ,"nckd_asae_shopreduce","nckd_asae_eventreduce","nckd_asae_afwreduce","nckd_asae_latereduce","nckd_asae_cwasry","nckd_asae_cwareduce"
+                ,"nckd_asae_dgreduce","nckd_asae_dcpreduce","nckd_asae_badreduce","nckd_asae_otherreduce","nckd_asae_allreduce","nckd_asae_lastsry"
+                ,"nckd_asae_allpay","nckd_asae_per_endins","nckd_asae_per_ljins","nckd_asae_per_hopins","nckd_asae_per_bhopins","nckd_asae_per_hosins"
+                ,"nckd_asae_per_cmymey","nckd_asae_per_ins","nckd_asae_unionmey","nckd_asae_tax","nckd_asae_allamount","nckd_asae_cash","nckd_asae_wages"
+                ,"nckd_asae_cpy_endins","nckd_asae_cpy_hopins","nckd_asae_cpy_bhopins","nckd_asae_cpy_birthins","nckd_asae_cpy_ljins","nckd_asae_cpy_dmgins"
+                ,"nckd_asae_cpy_hosins","nckd_asae_cpy_cmymey");
 
         //人力薪酬内退分录标识，金额字段
         List<String> nckd_payretird=Arrays.asList("nckd_see_allbasicsry"
@@ -131,33 +132,39 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
                 ,"nckd_see_taxt","nckd_see_alltaxt","nckd_see_charge","nckd_see_finallsys","nckd_see_cpy_oldins","nckd_see_cpy_hop"
                 ,"nckd_see_cpy_bhop","nckd_see_cpy_bir","nckd_see_cpy_ljob","nckd_see_cpy_dwork","nckd_see_cpy_hos","nckd_see_cpy_cmy");
 
-        //人力薪酬内退分录汇总字段
-        List<String> nckd_allpayretird=Arrays.asList("nckd_all_allbasicsry","nckd_all_allowqance","nckd_all_owance","nckd_all_reduceitem"
-                ,"nckd_all_sumsry","nckd_all_laryreduce","nckd_all_pushreduce","nckd_all_lrulereduce","nckd_all_badreduce","nckd_all_oreduce"
-                ,"nckd_all_reducesry","nckd_all_salarypaya","nckd_all_nesalary","nckd_all_per_endins","nckd_all_per_hopins","nckd_all_per_ljins"
-                ,"nckd_all_per_bhopins","nckd_all_per_hosins","nckd_all_per_cmymey","nckd_all_sumins","nckd_all_workamount","nckd_all_tax"
-                ,"nckd_all_alltaxt","nckd_all_charge","nckd_all_netsalary","nckd_all_cpy_endins","nckd_all_cpy_hopins","nckd_all_cpy_bhopins"
-                ,"nckd_all_cpy_birthins","nckd_all_cpy_ljins","nckd_all_cpy_dmgins","nckd_all_cpy_hosins","nckd_all_cpy_cmymey");
+
+        //人力薪酬内退分录
+        List<String> nckd_a_payretird=Arrays.asList("nckd_asee_allbasicsry","nckd_asee_allowance","nckd_asee_ollowanc","nckd_asee_per_endins"
+                ,"nckd_asee_per_ljins","nckd_asee_per_hopins","nckd_asee_per_bhopins","nckd_asee_per_hosins","nckd_asee_per_cmymey","nckd_asee_unionmey"
+                ,"nckd_asee_tax","nckd_asee_desalary","nckd_asee_netsalary","nckd_asee_otherreduce","nckd_asee_cpy_endins","nckd_asee_cpy_bhopins"
+                ,"nckd_asee_cpy_ljins","nckd_asee_cpy_birthins","nckd_asee_cpy_dmgins","nckd_asee_cpy_cmymey","nckd_asee_cpy_hosins","nckd_asee_taxt"
+                ,"nckd_asee_alltaxt","nckd_asee_charge","nckd_asee_finallsys","nckd_asee_cpy_oldins","nckd_asee_cpy_hop","nckd_asee_cpy_bhop","nckd_asee_cpy_bir"
+                ,"nckd_asee_cpy_ljob","nckd_asee_cpy_dwork","nckd_asee_cpy_hos","nckd_asee_cpy_cmy");
 
         Map<String,List<String>> mapList=new HashMap<>();
         mapList.put("nckd_generalemployees",nckd_generalemployees);
-        mapList.put("nckd_allemployees",nckd_allemployees);
+        mapList.put("nckd_a_employees",nckd_a_employees);
         mapList.put("nckd_earlyretired",nckd_earlyretired);
         mapList.put("nckd_retired",nckd_retired);
+        mapList.put("nckd_a_earlyretired",nckd_a_earlyretired);
         mapList.put("nckd_pay",nckd_pay);
         mapList.put("nckd_payretird",nckd_payretird);
-        mapList.put("nckd_allearlytired",nckd_allearlytired);
-        mapList.put("nckd_allretired",nckd_allretired);
-        mapList.put("nckd_allpay",nckd_allpay);
-        mapList.put("nckd_allpayretird",nckd_allpayretird);
+        mapList.put("nckd_a_retired",nckd_a_retired);
+        mapList.put("nckd_a_allpay",nckd_a_allpay);
+        mapList.put("nckd_a_payretird",nckd_a_payretird);
 
 
         //list名
         List<String> list=new ArrayList<>();
+        list.add("nckd_a_payretird");
+        list.add("nckd_a_allpay");
+        list.add("nckd_a_retired");
         list.add("nckd_generalemployees");
         list.add("nckd_allemployees");
+        list.add("nckd_a_employees");
         list.add("nckd_earlyretired");
         list.add("nckd_retired");
+        list.add("nckd_a_earlyretired");
         list.add("nckd_pay");
         list.add("nckd_payretird");
         list.add("nckd_allearlytired");
@@ -165,8 +172,7 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
         list.add("nckd_allpay");
         list.add("nckd_allpayretird");
         for (String item:list) {
-            if (nckdentry.equals(item))
-            {
+            if (nckdentry.equals(item)) {
                 return mapList.get(nckdentry);
             }
         }
@@ -184,10 +190,10 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
 
         //保存前，计算汇总分录
         if ("save".equals(source.getOperateKey())||"countall".equals(source.getOperateKey())){
-            //先清空汇总分录分录
-            this.getModel().deleteEntryData("nckd_allentry");
             //分录类型为通用薪酬一般员工
             if ("A".equals(nckd_entrytype)) {
+                //先清空汇总分录分录
+                this.getModel().deleteEntryData("nckd_a_staffentry");
                 //字段标识
                 String entrylist="nckd_generalemployees";
                 //对应分录标识
@@ -195,18 +201,18 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
                 //对应部门标识
                 String dep="nckd_se_department";
                 //对应汇总分录字段标识
-//                String allentrtlist="nckd_allemployees";
-//                countEntry(dynamicObject,entrylist,propername,dep,allentrtlist);
                 String allentrtlist="nckd_a_employees";
-                allDataEntry(dynamicObject,entrylist,propername,dep,allentrtlist,"nckd_ase_department");
                 this.getView().setVisible(true,nckd_a_generalemployees);
                 this.getView().setVisible(false,nckd_a_earlyretired);
                 this.getView().setVisible(false,nckd_a_retired);
                 this.getView().setVisible(false,nckd_a_pay);
                 this.getView().setVisible(false,nckd_a_payretird);
+                allDataEntry(dynamicObject,entrylist,propername,dep,allentrtlist,"nckd_ase_department",nckd_a_staffentry);
             }
             //分录类型为通用薪酬内退
             if ("B".equals(nckd_entrytype)) {
+                //先清空汇总分录分录
+                this.getModel().deleteEntryData("nckd_a_earlyretiredentry");
                 //字段标识
                 String entrylist="nckd_earlyretired";
                 //对应分录标识
@@ -214,8 +220,8 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
                 //对应部门标识
                 String dep="nckd_ee_department";
                 //对应汇总分录字段标识
-                String allentrtlist="nckd_allearlytired";
-                countEntry(dynamicObject,entrylist,propername,dep,allentrtlist);
+                String allentrtlist="nckd_a_earlyretired";
+                allDataEntry(dynamicObject,entrylist,propername,dep,allentrtlist,"nckd_aee_department",nckd_a_earlyretiredentry);
                 this.getView().setVisible(false,nckd_a_generalemployees);
                 this.getView().setVisible(true,nckd_a_earlyretired);
                 this.getView().setVisible(false,nckd_a_retired);
@@ -224,6 +230,8 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
             }
             //分录类型为通用薪酬退休
             if ("C".equals(nckd_entrytype)) {
+                //先清空汇总分录分录
+                this.getModel().deleteEntryData("nckd_a_retireentry");
                 //字段标识
                 String entrylist="nckd_retired";
                 //对应分录标识
@@ -231,8 +239,8 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
                 //对应部门标识
                 String dep="nckd_re_department";
                 //对应汇总分录字段标识
-                String allentrtlist="nckd_allretired";
-                countEntry(dynamicObject,entrylist,propername,dep,allentrtlist);
+                String allentrtlist="nckd_a_retired";
+                allDataEntry(dynamicObject,entrylist,propername,dep,allentrtlist,"nckd_are_department",nckd_a_retireentry);
                 this.getView().setVisible(false,nckd_a_generalemployees);
                 this.getView().setVisible(false,nckd_a_earlyretired);
                 this.getView().setVisible(true,nckd_a_retired);
@@ -241,6 +249,8 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
             }
             //分录类型为人力薪酬(一般员工)
             if ("D".equals(nckd_entrytype)) {
+                //先清空汇总分录分录
+                this.getModel().deleteEntryData("nckd_a_salaryentry");
                 //字段标识
                 String entrylist="nckd_pay";
                 //对应分录标识
@@ -248,8 +258,8 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
                 //对应部门标识
                 String dep="nckd_sae_department";
                 //对应汇总分录字段标识
-                String allentrtlist="nckd_allpay";
-                countEntry(dynamicObject,entrylist,propername,dep,allentrtlist);
+                String allentrtlist="nckd_a_allpay";
+                allDataEntry(dynamicObject,entrylist,propername,dep,allentrtlist,"nckd_asae_department",nckd_a_salaryentry);
                 this.getView().setVisible(false,nckd_a_generalemployees);
                 this.getView().setVisible(false,nckd_a_earlyretired);
                 this.getView().setVisible(false,nckd_a_retired);
@@ -258,6 +268,8 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
             }
             //分录类型为人力薪酬(内退)
             if ("E".equals(nckd_entrytype)) {
+                //先清空汇总分录分录
+                this.getModel().deleteEntryData("nckd_a_salaryentryre");
                 //字段标识
                 String entrylist="nckd_payretird";
                 //对应分录标识
@@ -265,8 +277,8 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
                 //对应部门标识
                 String dep="nckd_see_department";
                 //对应汇总分录字段标识
-                String allentrtlist="nckd_allpayretird";
-                countEntry(dynamicObject,entrylist,propername,dep,allentrtlist);
+                String allentrtlist="nckd_a_payretird";
+                allDataEntry(dynamicObject,entrylist,propername,dep,allentrtlist,"nckd_asee_department",nckd_a_salaryentryre);
                 this.getView().setVisible(false,nckd_a_generalemployees);
                 this.getView().setVisible(false,nckd_a_earlyretired);
                 this.getView().setVisible(false,nckd_a_retired);
@@ -277,66 +289,6 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
 
     }
 
-    /**
-     * @dynamicObject 当前单据信息
-     * @entrylist 字段标识列表
-     * @propername 分录标识
-     * @dep 对应分录部门标识
-     * @allentrtlist 写入的汇总分录字段
-     * @description：根据分录类型不同计算汇总分录
-     */
-    public void countEntry(DynamicObject dynamicObject,String entrylist,String propername,String dep,String allentrtlist)
-    {
-        //字段标识
-        List<String> nckd_generalemployees = entryList(entrylist);
-        //获取一般员工分录
-        DynamicObjectCollection staffentry=dynamicObject.getDynamicObjectCollection(propername);
-        //分录部门list
-        List<DynamicObject> depList=new ArrayList<>();
-        //初始化值为第一行部门
-        depList.add(staffentry.get(0).getDynamicObject(dep));
-        for (DynamicObject item:staffentry) {
-            //将不同的值加入到部门的list中
-            if (!depList.contains(item.getDynamicObject(dep))) {
-                depList.add(item.getDynamicObject(dep));
-            }
-        }
-
-        //几个不同部门则循环几次
-        for (DynamicObject bumen : depList) {
-            //某部门总数据
-            List<BigDecimal> sumNum = new ArrayList<>();
-            //汇总表部门list初始化
-            for (int b = 0; b < nckd_generalemployees.size(); b++) {
-                sumNum.add(new BigDecimal("0.0"));
-            }
-            //计算一个部门汇总
-            for (DynamicObject object : staffentry) {
-                //获取所在部门
-                DynamicObject department = object.getDynamicObject(dep);
-                //相同部门则累加金额数据
-                if (department.equals(bumen)) {
-                    for (int a = 0; a < nckd_generalemployees.size(); a++) {
-                        BigDecimal cell = sumNum.get(a);
-                        //字段标识
-                        String entry = nckd_generalemployees.get(a);
-                        //i行的a列数据
-                        BigDecimal num = object.getBigDecimal(entry);
-                        cell = cell.add(num);
-                        sumNum.set(a, cell);
-                    }
-                }
-            }
-            //创建新的分录行
-            int rowIndex = this.getModel().createNewEntryRow(nckd_allentry);
-            //设置部门
-            this.getModel().setValue("nckd_all_department", bumen, rowIndex);
-            for (int c = 0; c < sumNum.size(); c++) {
-                this.getModel().setValue(entryList(allentrtlist).get(c), sumNum.get(c), rowIndex);
-            }
-        }
-    }
-
     /**
      * @dynamicObject 当前单据信息
      * @entrylist 字段标识列表
@@ -347,7 +299,7 @@ public class SubAndAudFormPlugin extends AbstractListPlugin implements Plugin {
      * @description：根据分录类型不同计算汇总分录
      */
     public void allDataEntry(DynamicObject dynamicObject
-            ,String entrylist,String propername,String dep,String allentrtlist,String nckd_dep)
+            ,String entrylist,String propername,String dep,String allentrtlist,String nckd_dep,String nckd_allentry)
     {
         //字段标识
         List<String> nckd_generalemployees = entryList(entrylist);