凭证相关--起租生成凭证调整

This commit is contained in:
xiezhiwen 2018-10-13 14:30:55 +08:00
parent e980fbc93d
commit 3e734428d1
2 changed files with 7 additions and 11 deletions

View File

@ -19,7 +19,6 @@ public class ContractOnhireVoucherTradition extends BaseBussiness {
// 汽车类传统
cvot.CreateVoucher(FlowUnid, "PZ2018092500000202"); //客户支付的应收账款总金额 --回租
cvot.CreateVoucher(FlowUnid, "PZ2018092800000248"); //客户支付的应收账款总金额 --直租
return "true";
}
}

View File

@ -357,7 +357,6 @@ public class CreateVoucherServiceImpl {
if(sub.getAttribute("AUXILIARY_TYPE").getString().length()>0){
subData.putAll(this.getAuxiliaryData(tx, param, sub.getAttribute("AUXILIARY_TYPE").getString()));
}
// 获取直租/回租类型
String LEAS_FORM = param.get("LEAS_FORM");
// 获取当前凭证借贷序号
@ -372,9 +371,8 @@ public class CreateVoucherServiceImpl {
}
}
}
// 汽车类应收账款总金额根据分录配置辅助核算值---除了没有的和其他(10), 其他都是默认汽车(04)
if("PZ2018071000000005".equals(voucherid) || "PZ2018080300000069".equals(voucherid)) {
if("PZ2018071000000005".equals(VOUCHERNO) || "PZ2018080300000069".equals(VOUCHERNO)) {
if("01".equals(LEAS_FORM)) {//直租
if("5".equals(SORT_NUMBER)) {
subData.put("LEASFORMASSET", "10");
@ -389,24 +387,23 @@ public class CreateVoucherServiceImpl {
}
}
}
// 传统应收账款总金额 辅助账调整
if("PZ2018092500000170".equals(voucherid) || "PZ2018092800000247".equals(voucherid)) {
if("PZ2018092500000170".equals(VOUCHERNO) || "PZ2018092800000247".equals(VOUCHERNO)) {
if("4".equals(SORT_NUMBER)) {
subData.put("LEASFORMASSET", "10");
}else if("1".equals(SORT_NUMBER) || "2".equals(SORT_NUMBER) || "6".equals(SORT_NUMBER)) {
subData.remove("LEASFORMASSET");
}
}
// 汽车传统应收账款总金额 辅助账调整
if("PZ2018092500000202".equals(voucherid) || "PZ2018092800000248".equals(voucherid)) {
if("3".equals(SORT_NUMBER) || "5".equals(SORT_NUMBER)) {
// ´«Í³ÈÚ×Ê×âÁÞÊÕÈë
subData.put("LEASINCOMEFORM", "03");
if("PZ2018092500000202".equals(VOUCHERNO) || "PZ2018092800000248".equals(VOUCHERNO)) {
if("3".equals(SORT_NUMBER)) {
subData.put("LEASFORMASSET", "04");
}else if("4".equals(SORT_NUMBER)) {
subData.put("LEASFORMASSET", "10");
}else if("5".equals(SORT_NUMBER)) {
subData.put("LEASINCOMEFORM", "03");
subData.put("LEASFORMASSET", "04");
}else {
subData.remove("LEASFORMASSET");
}