公积金报表推凭证优化

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

@@ -1275,22 +1275,28 @@ public class AccumulationFundAllocationUI extends ToftPanel {
 			if ("管理费用/住房公积金".equals(key)) {
 				km_code = "660206";// 管理费用/住房公积金
 				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();// 借方发生额
@@ -1340,24 +1346,27 @@ public class AccumulationFundAllocationUI extends ToftPanel {
 			} 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 + "月 公积金 ");
-				// 辅助核算  2025-03-13
-				ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
-				AssVO[] assvos = getAss(pk_accasoa, "0010", "PM201601130001", pk_org);// 项目：其他
-				AssVO[] assvos2 = getAss(pk_accasoa, "0043", "99", pk_org);// 项目专业：不涉及
-				if("000101".equals(orgCode)){
-					AssVO[] assvos1 = getAss(pk_accasoa, "0001", "结构三所", pk_org);// 部门：结构三所
-					arrassvo.add(assvos1[0]);	
-				}else{
-					AssVO[] assvos1 = getAss(pk_accasoa, "0001", "其他-虚拟（财务成本归结）", pk_org);// 部门：其他虚拟财务
-					arrassvo.add(assvos1[0]);
+				if (debitamount.doubleValue() != 0) {
+					pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
+					DetailVO itemVO = new DetailVO();
+					getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, "缴纳" + yearperiod + "年" + monthperiod + "月 公积金 ");
+					// 辅助核算  2025-03-13
+					ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
+					AssVO[] assvos = getAss(pk_accasoa, "0010", "PM201601130001", pk_org);// 项目：其他
+					AssVO[] assvos2 = getAss(pk_accasoa, "0043", "99", pk_org);// 项目专业：不涉及
+					if("000101".equals(orgCode)){
+						AssVO[] assvos1 = getAss(pk_accasoa, "0001", "结构三所", pk_org);// 部门：结构三所
+						arrassvo.add(assvos1[0]);	
+					}else{
+						AssVO[] assvos1 = getAss(pk_accasoa, "0001", "其他-虚拟（财务成本归结）", pk_org);// 部门：其他虚拟财务
+						arrassvo.add(assvos1[0]);
+					}
+					arrassvo.add(assvos[0]);
+					arrassvo.add(assvos2[0]);
+					itemVO.setAss((AssVO[]) arrassvo.toArray(new AssVO[0]));
+					itemarr.add(itemVO);	
 				}
-				arrassvo.add(assvos[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();// 借方发生额
@@ -1402,24 +1411,30 @@ public class AccumulationFundAllocationUI extends ToftPanel {
 			else if ("应付职工薪酬/住房公积金".equals(key)) {
 				km_code = "221106";// 应付职工薪酬/住房公积金 无辅助核算
 				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 = "112301";// 预付账款/待摊费用
 				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", "G000371", pk_org);// 客商
-				AssVO[] assvos = getAss(pk_accasoa, "05", "10", 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", "G000371", pk_org);// 客商
+					AssVO[] assvos = getAss(pk_accasoa, "05", "10", 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();// 贷方发生额
@@ -1448,10 +1463,13 @@ public class AccumulationFundAllocationUI extends ToftPanel {
 			} else if ("应付职工薪酬/住房公积金/贷方".equals(key)) {
 				km_code = "221106";// 应付职工薪酬/住房公积金 无辅助核算
 				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]));