借贷方都是0不用生成一条分录

hr/hr/src/client/nc/ui/hr/baod_orders/view/ServiceChargeAllocationUI.java

@@ -1112,47 +1112,53 @@ public class ServiceChargeAllocationUI extends ToftPanel {
 			if ("管理费用/办公费".equals(key)) {
 				km_code = "660209";// 管理费用/办公费
 				debitamount = entry.getValue();// 借方发生额
-				pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
-				DetailVO itemVO = new DetailVO();
-				getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher,  "缴纳" + yearperiod + "年" + monthperiod + "月 人事代理服务费");
-				// 辅助核算
-				AssVO[] assvos = getAss(pk_accasoa, "0001", "其他-虚拟（财务成本归结）", pk_org);// 部门：其他虚拟财务
-				ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
-				arrassvo.add(assvos[0]);
-				itemVO.setAss((AssVO[]) arrassvo.toArray(new AssVO[0]));
-				itemarr.add(itemVO);
-			} else if ("其他应收款/个人往来".equals(key)) {
-				km_code = "122102";// 其他应收款/个人往来
-				debitamount = entry.getValue();// 借方发生额
-				pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
-				// 查询表一员工明细
-				List<String> ycode = querygcode(orgCode, period);
-				for (int i = 0; i < ycode.size(); i++) {
+				if (debitamount.doubleValue() != 0) {
+					pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
 					DetailVO itemVO = new DetailVO();
-					getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, "服务分摊费");
+					getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher,  "缴纳" + yearperiod + "年" + monthperiod + "月 人事代理服务费");
 					// 辅助核算
-					AssVO[] assvos = getAss(pk_accasoa, "0002", psndocCode(ycode.get(i)), pk_org);// 人员
+					AssVO[] assvos = getAss(pk_accasoa, "0001", "其他-虚拟（财务成本归结）", pk_org);// 部门：其他虚拟财务
 					ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
 					arrassvo.add(assvos[0]);
 					itemVO.setAss((AssVO[]) arrassvo.toArray(new AssVO[0]));
-					// itemarr.add(itemVO);
+					itemarr.add(itemVO);
+				}
+			} else if ("其他应收款/个人往来".equals(key)) {
+				km_code = "122102";// 其他应收款/个人往来
+				debitamount = entry.getValue();// 借方发生额
+				if (debitamount.doubleValue() != 0) {
+					pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
+					// 查询表一员工明细
+					List<String> ycode = querygcode(orgCode, period);
+					for (int i = 0; i < ycode.size(); i++) {
+						DetailVO itemVO = new DetailVO();
+						getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, "服务分摊费");
+						// 辅助核算
+						AssVO[] assvos = getAss(pk_accasoa, "0002", psndocCode(ycode.get(i)), pk_org);// 人员
+						ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
+						arrassvo.add(assvos[0]);
+						itemVO.setAss((AssVO[]) arrassvo.toArray(new AssVO[0]));
+						// itemarr.add(itemVO);
+					}
 				}
 			} else if ("应付账款/预估成本/办公费".equals(key)) {
 				km_code = "22020205";// 应付账款/预估成本/办公费
 				debitamount = entry.getValue();// 借方发生额
-				pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
-				DetailVO itemVO = new DetailVO();
-				getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher,  "缴纳" + yearperiod + "年" + monthperiod + "月 人事代理服务费");
-				// 辅助核算
-				AssVO[] assvos1 = getAss(pk_accasoa, "0001", "其他-虚拟（财务成本归结）", pk_org);// 部门：其他虚拟财务
-				AssVO[] assvos = getAss(pk_accasoa, "0010", "PM201601130001", pk_org);// 项目：其他
-				AssVO[] assvos2 = getAss(pk_accasoa, "0043", "99", pk_org);// 项目专业：不涉及
-				ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
-				arrassvo.add(assvos[0]);
-				arrassvo.add(assvos1[0]);
-				arrassvo.add(assvos2[0]);
-				itemVO.setAss((AssVO[]) arrassvo.toArray(new AssVO[0]));
-				// itemarr.add(itemVO);// 姜艳由部门全额代缴，个人不承担分摊费
+				if (debitamount.doubleValue() != 0) {
+					pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
+					DetailVO itemVO = new DetailVO();
+					getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher,  "缴纳" + yearperiod + "年" + monthperiod + "月 人事代理服务费");
+					// 辅助核算
+					AssVO[] assvos1 = getAss(pk_accasoa, "0001", "其他-虚拟（财务成本归结）", pk_org);// 部门：其他虚拟财务
+					AssVO[] assvos = getAss(pk_accasoa, "0010", "PM201601130001", pk_org);// 项目：其他
+					AssVO[] assvos2 = getAss(pk_accasoa, "0043", "99", pk_org);// 项目专业：不涉及
+					ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
+					arrassvo.add(assvos[0]);
+					arrassvo.add(assvos1[0]);
+					arrassvo.add(assvos2[0]);
+					itemVO.setAss((AssVO[]) arrassvo.toArray(new AssVO[0]));
+					// itemarr.add(itemVO);// 姜艳由部门全额代缴，个人不承担分摊费
+				}
 			} else if ("其他应收款/单位往来".equals(key)) {
 				km_code = "122101";// 其他应收款/单位往来
 				debitamount = entry.getValue();// 借方发生额
@@ -1180,18 +1186,20 @@ public class ServiceChargeAllocationUI extends ToftPanel {
 				// km_code= "220201";
 				km_code = "11230101";// 预付账款/待摊费用
 				creditamount = entry.getValue();// 贷方发生额
-				pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
-				DetailVO itemVO = new DetailVO();
-				getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher,  "缴纳" + yearperiod + "年" + monthperiod + "月 人事代理服务费");
-				// 辅助核算
-				AssVO[] assvos = getAss(pk_accasoa, "05", "11", pk_org);// 待摊事项：人事代理费摊销
-				// AssVO[] assvos = getAss(pk_accasoa, "0004","G000371",pk_org);//客商：上海国际企业商务咨询服务有限公司
-				// AssVO[] assvos1 = getAss(pk_accasoa, "X01","1122",pk_org);//现金流
-				ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
-				arrassvo.add(assvos[0]);
-				// arrassvo.add(assvos1[0]);
-				itemVO.setAss((AssVO[]) arrassvo.toArray(new AssVO[0]));
-				itemarr.add(itemVO);
+				if (creditamount.doubleValue() != 0) {
+					pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
+					DetailVO itemVO = new DetailVO();
+					getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher,  "缴纳" + yearperiod + "年" + monthperiod + "月 人事代理服务费");
+					// 辅助核算
+					AssVO[] assvos = getAss(pk_accasoa, "05", "11", pk_org);// 待摊事项：人事代理费摊销
+					// AssVO[] assvos = getAss(pk_accasoa, "0004","G000371",pk_org);//客商：上海国际企业商务咨询服务有限公司
+					// AssVO[] assvos1 = getAss(pk_accasoa, "X01","1122",pk_org);//现金流
+					ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
+					arrassvo.add(assvos[0]);
+					// arrassvo.add(assvos1[0]);
+					itemVO.setAss((AssVO[]) arrassvo.toArray(new AssVO[0]));
+					itemarr.add(itemVO);
+				}
 			}
 		}
 		voucher.setDetails((DetailVO[]) itemarr.toArray(new DetailVO[0]));

hr/hr/src/client/nc/ui/hr/baod_orders/view/SocialInsuranceAllocationUI.java

@@ -1385,34 +1385,40 @@ public class SocialInsuranceAllocationUI extends ToftPanel {
 			if ("管理费用/社会保险费".equals(key)) {
 				km_code = "660203";// 管理费用/社会保险费
 				debitamount = entry.getValue();// 借方发生额
-				pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
-				DetailVO itemVO = new DetailVO();
-				getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, "缴纳" + yearperiod + "年" + monthperiod + "月 社保");
-				// 辅助核算
-				AssVO[] assvos = getAss(pk_accasoa, "0001", "其他-虚拟（财务成本归结）", pk_org);// 部门：其他虚拟财务
-				ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
-				arrassvo.add(assvos[0]);
-				itemVO.setAss((AssVO[]) arrassvo.toArray(new AssVO[0]));
-				itemarr.add(itemVO);
+				if (debitamount.doubleValue() != 0) {
+					pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
+					DetailVO itemVO = new DetailVO();
+					getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, "缴纳" + yearperiod + "年" + monthperiod + "月 社保");
+					// 辅助核算
+					AssVO[] assvos = getAss(pk_accasoa, "0001", "其他-虚拟（财务成本归结）", pk_org);// 部门：其他虚拟财务
+					ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
+					arrassvo.add(assvos[0]);
+					itemVO.setAss((AssVO[]) arrassvo.toArray(new AssVO[0]));
+					itemarr.add(itemVO);
+				}
 			} else if ("管理费用/社会保险费/残疾".equals(key)) {
 				km_code = "660203";// 管理费用/社会保险费
 				debitamount = entry.getValue();// 借方发生额
-				pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
-				DetailVO itemVO = new DetailVO();
-				getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, "缴纳" + yearperiod + "年" + monthperiod + "月 社保 残疾员工");
-				// 辅助核算
-				AssVO[] assvos = getAss(pk_accasoa, "0001", "其他-虚拟（财务成本归结）", pk_org);// 部门：其他虚拟财务
-				ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
-				arrassvo.add(assvos[0]);
-				itemVO.setAss((AssVO[]) arrassvo.toArray(new AssVO[0]));
-				itemarr.add(itemVO);
+				if (debitamount.doubleValue() != 0) {
+					pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
+					DetailVO itemVO = new DetailVO();
+					getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, "缴纳" + yearperiod + "年" + monthperiod + "月 社保 残疾员工");
+					// 辅助核算
+					AssVO[] assvos = getAss(pk_accasoa, "0001", "其他-虚拟（财务成本归结）", pk_org);// 部门：其他虚拟财务
+					ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
+					arrassvo.add(assvos[0]);
+					itemVO.setAss((AssVO[]) arrassvo.toArray(new AssVO[0]));
+					itemarr.add(itemVO);
+				}
 			} else if ("其他应收款/五险一金".equals(key)) {
 				km_code = "122104";// 其他应收款/五险一金
 				debitamount = entry.getValue();// 借方发生额
-				pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
-				DetailVO itemVO = new DetailVO();
-				getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, "缴纳" + yearperiod + "年" + monthperiod + "月 社保");
-				itemarr.add(itemVO);
+				if (debitamount.doubleValue() != 0) {
+					pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
+					DetailVO itemVO = new DetailVO();
+					getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, "缴纳" + yearperiod + "年" + monthperiod + "月 社保");
+					itemarr.add(itemVO);
+				}
 			} else if ("其他应收款/个人往来".equals(key)) {
 				km_code = "122102";// 其他应收款/个人往来
 				debitamount = entry.getValue();// 借方发生额
@@ -1462,7 +1468,7 @@ public class SocialInsuranceAllocationUI extends ToftPanel {
 			} else if ("应付账款/预估成本/办公费".equals(key)) {
 				km_code = "22020205";// 应付账款/预估成本/办公费
 				debitamount = entry.getValue();// 借方发生额
-				if(null!=debitamount){
+				if(debitamount.doubleValue() != 0){
 					pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
 					DetailVO itemVO = new DetailVO();
 					getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, "缴纳" + yearperiod + "年" + monthperiod + "月 社保 姜艳-全额代付");
@@ -1526,24 +1532,28 @@ public class SocialInsuranceAllocationUI extends ToftPanel {
 			else if ("应付职工薪酬/社会保险费".equals(key)) {
 				km_code = "221103";// 应付职工薪酬/社会保险费 无辅助核算
 				debitamount = entry.getValue();// 借方发生额
-				pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
-				DetailVO itemVO = new DetailVO();
-				getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, "缴纳" + yearperiod + "年" + monthperiod + "月 社保 ");
-				itemarr.add(itemVO);
+				if(debitamount.doubleValue() != 0){
+					pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
+					DetailVO itemVO = new DetailVO();
+					getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, "缴纳" + yearperiod + "年" + monthperiod + "月 社保 ");
+					itemarr.add(itemVO);
+				}
 			} else if ("预付账款/待摊费用/贷方".equals(key)) {
-				// km_code = "220201";// 应付账款/实际应付款
+				//km_code = "220201";// 应付账款/实际应付款
 				km_code = "11230101";// 预付账款/待摊费用
 				creditamount = entry.getValue();// 贷方发生额
-				pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
-				DetailVO itemVO = new DetailVO();
-				getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, "缴纳" + yearperiod + "年" + monthperiod + "月 社保 ");
-				// 辅助核算
-				// AssVO[] assvos = getAss(pk_accasoa, "0004", "G007461", pk_org);// 客商：上海市社保险事业管理中心
-				AssVO[] assvos = getAss(pk_accasoa, "05", "09", pk_org);// 待摊事项：社保摊销
-				ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
-				arrassvo.add(assvos[0]);
-				itemVO.setAss((AssVO[]) arrassvo.toArray(new AssVO[0]));
-				itemarr.add(itemVO);
+				if(creditamount.doubleValue() != 0){
+					pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
+					DetailVO itemVO = new DetailVO();
+					getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, "缴纳" + yearperiod + "年" + monthperiod + "月 社保 ");
+					// 辅助核算
+					//AssVO[] assvos = getAss(pk_accasoa, "0004", "G007461", pk_org);// 客商：上海市社保险事业管理中心
+					AssVO[] assvos = getAss(pk_accasoa, "05", "09", pk_org);// 待摊事项：社保摊销
+					ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
+					arrassvo.add(assvos[0]);
+					itemVO.setAss((AssVO[]) arrassvo.toArray(new AssVO[0]));
+					itemarr.add(itemVO);
+				}
 			} else if ("其他应收款/个人往来/贷方".equals(key)) {
 				km_code = "122102";// 其他应收款/个人往来
 				creditamount = entry.getValue();// 贷方发生额
@@ -1572,10 +1582,12 @@ public class SocialInsuranceAllocationUI extends ToftPanel {
 			} else if ("应付职工薪酬/社会保险费/贷方".equals(key)) {
 				km_code = "221103";// 应付职工薪酬/社会保险费 无辅助核算
 				creditamount = entry.getValue();// 贷方发生额
-				pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
-				DetailVO itemVO = new DetailVO();
-				getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, "缴纳" + yearperiod + "年" + monthperiod + "月 社保 ");
-				itemarr.add(itemVO);
+				if(creditamount.doubleValue() != 0){
+					pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
+					DetailVO itemVO = new DetailVO();
+					getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, "缴纳" + yearperiod + "年" + monthperiod + "月 社保 ");
+					itemarr.add(itemVO);
+				}
 			}
 		}
 		voucher.setDetails((DetailVO[]) itemarr.toArray(new DetailVO[0]));