From fb831ea047e945f47c0269ba05fd3f04921c643f Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Tue, 26 Feb 2019 18:24:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3-=E4=BC=A0?= =?UTF-8?q?=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...eateVoucherContractChangeForTradition.java | 9 +- .../ContractOnhireChangeForTradition.java | 6 +- .../ContractPranayamaForTradition.java | 6 +- .../IncomeVoucherForTradition.java | 1 + .../RedIncomeVoucherForTradition.java | 22 +-- .../CreateVoucherMonthSettlement.java | 2 +- .../CreateVoucherOnhireTradition.java | 2 +- ...CreateVoucherRedDashedIncomeTradition.java | 38 ++--- .../CreateVoucherRedRentIncomeTradition.java | 134 +++++++++--------- .../serviceImp/CreateVoucherServiceImpl.java | 15 ++ 10 files changed, 126 insertions(+), 109 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractChangeForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractChangeForTradition.java index 18aba8800..5552ef00b 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractChangeForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractChangeForTradition.java @@ -41,13 +41,8 @@ public class CreateVoucherContractChangeForTradition { param.clear(); map.put("FlowUnid", FlowUnid); // 未实现利息总额 - if("PZ2018100900000269".equals(VOUCHERNO)||"PZ2018100900000270".equals(VOUCHERNO) || "PZ2018100900000288".equals(VOUCHERNO)||"PZ2018100900000289".equals(VOUCHERNO)){ - sql="SELECT IFNULL(ROUND(LRPT.SUMINTE / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) - ROUND(LRP.SUMINTE / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS MONEY,0 AS MONEYNOTAX,0 AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCI.ID AS CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN (SELECT FLOWUNID,MAX(CONTRACT_ID) AS CONTRACT_ID,SUM(INTEREST) SUMINTE FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID = LCCT.FLOWUNID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) SUMINTE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP ON LRP.CONTRACT_ID = LRPT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRPT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '2' AND LCCT.FLOWUNID = :FLOWUNID "; - // 未实现利息税金 - }else if("PZ2018100900000271".equals(VOUCHERNO)||"PZ2018100900000272".equals(VOUCHERNO) || "PZ2018100900000290".equals(VOUCHERNO)||"PZ2018100900000291".equals(VOUCHERNO)){ - sql="SELECT IFNULL((LRPT.SUMINTE - ROUND(LRPT.SUMINTE / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) - (LRP.SUMINTE - ROUND(LRP.SUMINTE / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)),0) AS MONEY,0 AS MONEYNOTAX,0 AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCI.ID AS CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN (SELECT FLOWUNID,MAX(CONTRACT_ID) AS CONTRACT_ID,SUM(INTEREST) SUMINTE FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID = LCCT.FLOWUNID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) SUMINTE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP ON LRP.CONTRACT_ID = LRPT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRPT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '2' AND LCCT.FLOWUNID = :FLOWUNID "; - }else { - sql="SELECT IFNULL(LRP.INTEREST,0) AS MONEY,IFNULL(ROUND(LRP.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL(LRP.INTEREST - ROUND(LRP.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCI.ID CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA LEFT JOIN (SELECT CONTRACT_ID,MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER,SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP ON LRP.PAYMENT_NUMBER = LFRA.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '2' AND LFRA.FLOWUNID = :FLOWUNID "; + if("PZ2018100900000269".equals(VOUCHERNO) || "PZ2018100900000288".equals(VOUCHERNO)){ + sql="SELECT IFNULL(LRPT.SUMINTE,0) - IFNULL(LRP.SUMINTE,0) AS MONEY,0 AS MONEYNOTAX,0 AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCI.ID AS CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN (SELECT FLOWUNID,MAX(CONTRACT_ID) AS CONTRACT_ID,SUM(INTEREST) SUMINTE FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID = LCCT.FLOWUNID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) SUMINTE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP ON LRP.CONTRACT_ID = LRPT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRPT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '2' AND LCCT.FLOWUNID = :FLOWUNID "; } //sql="SELECT LRPT.SUMINTE AS MONEY,ROUND(LRPT.SUMINTE / getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) AS MONEYNOTAX,(LRPT.SUMINTE-ROUND(LRPT.SUMINTE / getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCI.ID AS CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) SUMINTE FROM LC_RENT_PLAN_TEMP GROUP BY CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '2' AND LCCT.FLOWUNID =:FLOWUNID "; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireChangeForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireChangeForTradition.java index 857bc56c3..b03f372d4 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireChangeForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireChangeForTradition.java @@ -17,10 +17,10 @@ public class ContractOnhireChangeForTradition extends BaseBussiness { CreateVoucherContractChangeForTradition cvco=new CreateVoucherContractChangeForTradition(); cvco.CreateVoucher(FlowUnid, "PZ2018100900000269"); //合同变更-调整未实现利息收入--回租 - cvco.CreateVoucher(FlowUnid, "PZ2018100900000270"); //合同变更-调整未实现利息收入--直租 + //cvco.CreateVoucher(FlowUnid, "PZ2018100900000270"); //合同变更-调整未实现利息收入--直租 - cvco.CreateVoucher(FlowUnid, "PZ2018100900000271"); //合同变更-调整利息的税--回租 - cvco.CreateVoucher(FlowUnid, "PZ2018100900000272"); //合同变更-调整利息的税--直租 + //cvco.CreateVoucher(FlowUnid, "PZ2018100900000271"); //合同变更-调整利息的税--回租 + //cvco.CreateVoucher(FlowUnid, "PZ2018100900000272"); //合同变更-调整利息的税--直租 return "true"; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractPranayamaForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractPranayamaForTradition.java index e3bf246dd..ca8c22469 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractPranayamaForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractPranayamaForTradition.java @@ -16,10 +16,10 @@ public class ContractPranayamaForTradition extends BaseBussiness { CreateVoucherContractChangeForTradition cvco=new CreateVoucherContractChangeForTradition(); cvco.CreateVoucher(FlowUnid, "PZ2018100900000288"); // 调息流程-调整未实现利息收入--回租 - cvco.CreateVoucher(FlowUnid, "PZ2018100900000289"); // 调息流程-调整未实现利息收入--直租 + //cvco.CreateVoucher(FlowUnid, "PZ2018100900000289"); // 调息流程-调整未实现利息收入--直租 - cvco.CreateVoucher(FlowUnid, "PZ2018100900000290"); // 调息流程-调整利息的税--回租 - cvco.CreateVoucher(FlowUnid, "PZ2018100900000291"); // 调息流程-调整利息的税--直租 + //cvco.CreateVoucher(FlowUnid, "PZ2018100900000290"); // 调息流程-调整利息的税--回租 + //cvco.CreateVoucher(FlowUnid, "PZ2018100900000291"); // 调息流程-调整利息的税--直租 return "true"; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucherForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucherForTradition.java index 5f72fd653..a14e90ea8 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucherForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucherForTradition.java @@ -26,6 +26,7 @@ public class IncomeVoucherForTradition extends BaseBussiness { //cvci.CreateVoucher(FlowUnid, "PZ2018100900000294", "feetype30");//回款-收到的违约金/罚款--直租 cvci.CreateVoucher(FlowUnid, "PZ2018092500000174", "feetype4"); //回款-收到名义货价--回租 //cvci.CreateVoucher(FlowUnid, "PZ2018100900000295", "feetype4"); //回款-收到名义货价--直租 + return "true"; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucherForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucherForTradition.java index 4ed0ad4bf..38c116fbe 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucherForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucherForTradition.java @@ -20,29 +20,29 @@ public class RedIncomeVoucherForTradition extends BaseBussiness { CreateVoucherRedDashedIncomeTradition cvrdit=new CreateVoucherRedDashedIncomeTradition(); cvrdit.CreateVoucher(FlowUnid, "PZ2018092500000175", "feetype2");// 收到客户记录保证金--回租 - cvrdit.CreateVoucher(FlowUnid, "PZ2018100900000257", "feetype2");// 收到客户记录保证金--直租 + //cvrdit.CreateVoucher(FlowUnid, "PZ2018100900000257", "feetype2");// 收到客户记录保证金--直租 cvrdit.CreateVoucher(FlowUnid, "PZ2018092500000176", "feetype1");// 收到客户手续费--回租 - cvrdit.CreateVoucher(FlowUnid, "PZ2018100900000258", "feetype1");// 收到客户手续费--直租 + //cvrdit.CreateVoucher(FlowUnid, "PZ2018100900000258", "feetype1");// 收到客户手续费--直租 cvrdit.CreateVoucher(FlowUnid, "PZ2018092500000177", "feetype5");// 收到客户预付款(首付)--回租 - cvrdit.CreateVoucher(FlowUnid, "PZ2018100900000259", "feetype5");// 收到客户预付款(首付)--直租 - - cvrdit.CreateVoucher(FlowUnid, "PZ2018092500000178", "feetype24");// 记录GPS安装服务费（不参融）--回租 - cvrdit.CreateVoucher(FlowUnid, "PZ2018100900000260", "feetype24");// 记录GPS安装服务费（不参融）--直租 + //cvrdit.CreateVoucher(FlowUnid, "PZ2018100900000259", "feetype5");// 收到客户预付款(首付)--直租 cvrdit.CreateVoucher(FlowUnid, "PZ2018092500000181", "feetype30");// 收到的违约金/罚款--回租 - cvrdit.CreateVoucher(FlowUnid, "PZ2018100900000261", "feetype30");// 收到的违约金/罚款--直租 + //cvrdit.CreateVoucher(FlowUnid, "PZ2018100900000261", "feetype30");// 收到的违约金/罚款--直租 cvrdit.CreateVoucher(FlowUnid, "PZ2018092500000182", "feetype4");// 收到名义货价--回租 - cvrdit.CreateVoucher(FlowUnid, "PZ2018100900000262", "feetype4");// 收到名义货价--直租 + //cvrdit.CreateVoucher(FlowUnid, "PZ2018100900000262", "feetype4");// 收到名义货价--直租 CreateVoucherRedRentIncomeTradition cvrict=new CreateVoucherRedRentIncomeTradition(); - cvrict.CreateVoucher(FlowUnid, "PZ2018092500000179");//收到的租金--回租 - cvrict.CreateVoucher(FlowUnid, "PZ2018100900000263");//收到的租金--直租 + cvrict.CreateVoucher(FlowUnid, "PZ2018092500000179");//收到的租金-月付-3--回租 + cvrict.CreateVoucher(FlowUnid, "PZ2018100900000263");//收到的租金-月付-6--回租 + + cvrict.CreateVoucher(FlowUnid, "PZ2018092500000178");//收到的租金-季付-3--回租 + cvrict.CreateVoucher(FlowUnid, "PZ2018100900000260");//收到的租金-季付-6--回租 cvrict.CreateVoucher(FlowUnid, "PZ2018092500000180");//收到逾期利息--回租 - cvrict.CreateVoucher(FlowUnid, "PZ2018100900000264");//收到逾期利息--直租 + //cvrict.CreateVoucher(FlowUnid, "PZ2018100900000264");//收到逾期利息--直租 return "true"; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java index a95fcd91b..196db3be6 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java @@ -67,7 +67,7 @@ public class CreateVoucherMonthSettlement{ // 月结利息 if("PZ2018071200000016".equals(voucherNo)) { // sql="SELECT CRM.ID,CRM.INTEREST_TAX AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE='1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(SYSDATE(), '%Y/%m') AND DATEDIFF(SYSDATE(),LRP.PLAN_DATE)>3 AND (IFNULL(LRP.INTEREST,0)-IFNULL(LRI.INTEREST,0))<>0 AND CRM.ID NOT IN (SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%"+modular+"%')"; - sql="SELECT CRM.ID,CRM.INTEREST_TAX AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID)LRI2 ON LRI2.CONTRACT_ID=lci.id LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(SYSDATE(), '%Y/%m') AND DATEDIFF(SYSDATE(), LRP.PLAN_DATE) > 3 AND (IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 AND (CAST(CRM.RENT_LIST AS SIGNED)-CAST(IFNULL(LRI2.PLAN_LIST,0) AS SIGNED))<=2 AND CRM.ID NOT IN (SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%"+modular+"%') "; + sql="SELECT CRM.ID,CRM.INTEREST_TAX AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID)LRI2 ON LRI2.CONTRACT_ID=lci.id LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(SYSDATE(), '%Y/%m') AND (IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 AND (CAST(CRM.RENT_LIST AS SIGNED)-CAST(IFNULL(LRI2.PLAN_LIST,0) AS SIGNED))<=2 AND CRM.ID NOT IN (SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%"+modular+"%') "; // 手续费(按月分摊) }else if("PZ2018071200000017".equals(voucherNo)){ sql="SELECT CRM.ID,CRM.INTEREST AS MONEY,ROUND(CRM.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST - ROUND(CRM.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,CRM.FEE AS FEEMONEY,IFNULL((CRM.FEE - ROUND(CRM.FEE / getTax (LCI.LEAS_FORM,'手续费',LCCT.START_DATE))),0) AS FEE_NOTAX,CRM.DISCOUNT AS DISCOUNT,IFNULL((CRM.DISCOUNT - ROUND(CRM.DISCOUNT / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE))),0) AS DISCOUNT_NOTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.RENT_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE='1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(SYSDATE(), '%Y/%m') AND lcct.HANDLING_CHARGE_MONEY_TYPE='0020' AND CRM.ID NOT IN (SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%"+modular+"%') "; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java index 3a60147bc..be78b839a 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java @@ -43,7 +43,7 @@ public class CreateVoucherOnhireTradition extends BaseBussiness{ String sql=""; //客户支付的应收账款总金额 --回租 - if("PZ2018092500000170".equals(VOUCHERNO) || "PZ2018092800000247".equals(VOUCHERNO)) { + if("PZ2018092500000170".equals(VOUCHERNO)) { sql="SELECT IFNULL(LCCT.EQUIP_AMT,0) - IFNULL(LCCT.FIRST_PAYMENT,0) + IFNULL(LCCT.OTHER_MONEY,0) AS MONEY,IFNULL(LRPT.INTEREST, 0) AS INTEREST,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID,CONTRACT_ID) LRPT ON LRPT.FLOWUNID = LCCT.FLOWUNID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRPT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '2' AND LCCT.FLOWUNID = :FLOWUNID "; }else { sql="SELECT IFNULL((LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT + LCCT.INSURANCE_PREMIUM + LCCT.OTHER_MONEY),0) AS OTHERSMONEY,IFNULL((LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT),0) AS EQUIP_SUBFIRST,IFNULL((LCCT.INSURANCE_PREMIUM + LCCT.OTHER_MONEY),0) AS INSURANCE_OTHER,IFNULL(LRPT.INTEREST,0) AS INTEREST,IFNULL(ROUND(LRPT.INTEREST / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS INTERESTNOTAX,IFNULL((LRPT.INTEREST - ROUND(LRPT.INTEREST / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)),0) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN (SELECT FLOWUNID,MAX(CONTRACT_ID) AS CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID = LCCT.FLOWUNID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRPT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '3' AND LCCT.FLOWUNID = :FLOWUNID "; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeTradition.java index cb3f05b0d..64cfa7971 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeTradition.java @@ -47,24 +47,22 @@ public class CreateVoucherRedDashedIncomeTradition extends BaseBussiness { map.put("FlowUnid", FlowUnid); map.put("FEE_TYPE", FeeType); - if("PZ2018092500000175".equals(VOUCHERNO) || "PZ2018100900000257".equals(VOUCHERNO) || "PZ2018092500000177".equals(VOUCHERNO) || "PZ2018100900000259".equals(VOUCHERNO)) { + if("PZ2018092500000175".equals(VOUCHERNO) || "PZ2018092500000177".equals(VOUCHERNO)) { TaxType="本金"; - }else if("PZ2018092500000176".equals(VOUCHERNO) || "PZ2018100900000258".equals(VOUCHERNO)) { + }else if("PZ2018092500000176".equals(VOUCHERNO)) { TaxType="手续费"; - }else if("PZ2018092500000178".equals(VOUCHERNO) || "PZ2018100900000260".equals(VOUCHERNO)) { - TaxType="GPS"; - }else if("PZ2018092500000181".equals(VOUCHERNO) || "PZ2018100900000261".equals(VOUCHERNO)) { + }else if("PZ2018092500000181".equals(VOUCHERNO)) { TaxType="违约金"; - }else if("PZ2018092500000182".equals(VOUCHERNO) || "PZ2018100900000262".equals(VOUCHERNO)) { + }else if("PZ2018092500000182".equals(VOUCHERNO)) { TaxType="留购价"; } sql = "SELECT IFNULL(LFIT.FACT_MONEY,0) AS MONEY,IFNULL(ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax (LCI.LEAS_FORM,'"+TaxType+"',LCCT.START_DATE),2)),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LPI.BUSINESSTYPE = '2' AND LFIT.FEE_TYPE = :FEE_TYPE AND LFIT.FLOWUNID = :FLOWUNID "; - // GPS不参融 + /*// GPS不参融 if("PZ2018092500000178".equals(VOUCHERNO) || "PZ2018100900000260".equals(VOUCHERNO)) { sql+=" AND LCCT.GPS_FEE_FINA='finatype01'"; - } + }*/ // 查询sql, 将结果集封装到list集合中 List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); @@ -111,16 +109,20 @@ public class CreateVoucherRedDashedIncomeTradition extends BaseBussiness { param.put("ACC_NUMBER", ACC_NUMBER); param.put("VOUCHERNO", VOUCHERNO); - // 定义辅助账信息 - // 融资租赁资产 - param.put("LEASFORMASSET", "02/03/05/06"); - // 业务一部 - param.put("DEPT", "01"); - // 汽车融资租赁收入 - param.put("LEASINCOMEFORM", "06"); - - // param.put("FUNDTYPE", ""); // 主营类型 - param.put("BUSINESSTYPE", "06"); + //收到客户手续费--回租 + if("PZ2018092500000176".equals(VOUCHERNO)) { + param.put("BUSINESSTYPE", "0604");// 主营类型 + } + //收到名义货价--回租 + if("PZ2018092500000182".equals(VOUCHERNO)) { + param.put("BUSINESSTYPE", "0605");// 主营类型 + } + //收到的违约金/罚款--回租 + if("PZ2018092500000181".equals(VOUCHERNO)) { + param.put("BUSINESSTYPE", "0602");// 主营类型 + } + param.put("CASHFLOW", "");// 现金流项目 + param.put("FlowUnid", FlowUnid); map.clear(); map.put("PROJ_TYPE", LEAS_FORM); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeTradition.java index fe41a72b0..090098b92 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeTradition.java @@ -28,6 +28,8 @@ public class CreateVoucherRedRentIncomeTradition { String MONEY=null; String MONEYNOTAX=null; String MONEYTAX=null; + String RENT=null; + String CORPUS=null; String ACCOUNT_DATE=null; String FACT_DATE=null; String CONTRACT_ID=null; @@ -48,14 +50,21 @@ public class CreateVoucherRedRentIncomeTradition { map.clear(); map.put("FLOWUNID", FlowUnid); - // 租金 - if("PZ2018092500000179".equals(VOUCHERNO)||"PZ2018100900000263".equals(VOUCHERNO)){ - sql= "SELECT LRIT.rent AS MONEY,0 AS MONEYNOTAX,0 AS MONEYTAX, DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LrIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LrIT.OWN_NUMBER FROM LC_rent_INCOME_temp LrIT LEFT JOIN LB_CONTRACT_INFO LCI ON LrIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '2' AND LrIT.FLOWUNID=:FLOWUNID"; - } - - // 逾期利息 - if("PZ2018092500000180".equals(VOUCHERNO)||"PZ2018100900000264".equals(VOUCHERNO)){ - sql= "SELECT IFNULL(LrIT.penalty,0) AS MONEY,IFNULL(ROUND(LrIT.penalty / getTax(LCI.LEAS_FORM,'逾期利息',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL(LrIT.penalty - ROUND(LrIT.penalty / getTax(LCI.LEAS_FORM,'逾期利息',LCCT.START_DATE),2),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LrIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LrIT.OWN_NUMBER FROM LC_rent_INCOME_temp LrIT LEFT JOIN LB_CONTRACT_INFO LCI ON LrIT.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '2' AND LrIT.FLOWUNID = :FLOWUNID "; + // 收到的租金-月付-3--回租 + if("PZ2018092500000179".equals(VOUCHERNO)){ + sql= "SELECT IFNULL(LRIT.INTEREST,0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST,0)/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST,0)-ROUND(IFNULL(LRIT.INTEREST,0)/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2))AS MONEYTAX,IFNULL(LRIT.RENT,0) AS RENT,IFNULL(LRIT.CORPUS,0) AS CORPUS,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LRIT.FLOWUNID,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LRIT.OWN_NUMBER FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRIT.CONTRACT_ID AND LRP.PLAN_LIST=LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LCI.BUSINESSTYPE = '2' AND LrIT.FLOWUNID = :FLOWUNID AND LCCT.INCOME_NUMBER_YEAR ='income_1' AND DATE_FORMAT(LRP.PLAN_DATE,'%Y-%m') > dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); @@ -64,68 +73,63 @@ public class CreateVoucherRedRentIncomeTradition { String VOUCHER_TYPE="1";// 凭证分类 金蝶 String userid ="admin"; for (int i=0;i0){ + MONEY=dataList.get(i).get("MONEY").toString(); MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString(); MONEYTAX=dataList.get(i).get("MONEYTAX").toString(); - ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE").toString(); - FACT_DATE =dataList.get(i).get("FACT_DATE").toString(); - CONTRACT_ID=dataList.get(i).get("CONTRACT_ID").toString(); - CONTRACT_NUMBER=dataList.get(i).get("CONTRACT_NUMBER").toString(); - PROJECT_NAME=dataList.get(i).get("PROJECT_NAME").toString(); - leas_form=dataList.get(i).get("LEAS_FORM").toString(); - DISTRIBUTOR_ID=dataList.get(i).get("DISTRIBUTOR_ID"); - DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME"); - CARID=dataList.get(i).get("CARID"); - CARMODEL=dataList.get(i).get("MODEL"); - CUSTID=dataList.get(i).get("CUSTOMERID"); - CUSTNAME=dataList.get(i).get("CUSTOMERNAME"); - CUSTOMERTYPE=dataList.get(i).get("CUSTOMERTYPE"); - BUSINESSTYPE=dataList.get(i).get("BUSINESSTYPE"); - ACC_NUM=dataList.get(i).get("OWN_NUMBER"); - - param.put("FACT_MONEY",MONEY); - param.put("INTERESTNOTAX",MONEYNOTAX); - param.put("TAX",MONEYTAX); - param.put("ACCOUNT_DATE",ACCOUNT_DATE); - param.put("FACT_DATE",FACT_DATE); - param.put("CONTRACT_ID",CONTRACT_ID); - param.put("CONTRACT_NUMBER",CONTRACT_NUMBER); - param.put("PROJECT_NAME",PROJECT_NAME); - param.put("LEAS_FORM",leas_form); - param.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID); - param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME); - param.put("CARID",CARID); - param.put("CARMODEL",CARMODEL); - param.put("CUSTID",CUSTID); - param.put("CUSTNAME",CUSTNAME); - param.put("CUSTOMERTYPE",CUSTOMERTYPE); - param.put("BUSINESSTYPE",BUSINESSTYPE); - param.put("ACC_NUMBER",ACC_NUM); - param.put("VOUCHERNO",VOUCHERNO); + RENT=dataList.get(i).get("RENT").toString(); + CORPUS=dataList.get(i).get("CORPUS").toString(); + ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE").toString(); + FACT_DATE =dataList.get(i).get("FACT_DATE").toString(); + CONTRACT_ID=dataList.get(i).get("CONTRACT_ID"); + CONTRACT_NUMBER=dataList.get(i).get("CONTRACT_NUMBER"); + PROJECT_NAME=dataList.get(i).get("PROJECT_NAME"); + leas_form=dataList.get(i).get("LEAS_FORM"); + DISTRIBUTOR_ID=dataList.get(i).get("DISTRIBUTOR_ID"); + DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME"); + CARID=dataList.get(i).get("CARID"); + CARMODEL=dataList.get(i).get("MODEL"); + CUSTID=dataList.get(i).get("CUSTOMERID"); + CUSTNAME=dataList.get(i).get("CUSTOMERNAME"); + CUSTOMERTYPE=dataList.get(i).get("CUSTOMERTYPE"); + BUSINESSTYPE=dataList.get(i).get("BUSINESSTYPE"); + ACC_NUM=dataList.get(i).get("OWN_NUMBER"); + + param.put("INTEREST",MONEY); + param.put("INTERESTNOTAX",MONEYNOTAX); + param.put("TAX",MONEYTAX); + param.put("RENT",RENT); + param.put("CORPUS",CORPUS); + param.put("ACCOUNT_DATE",ACCOUNT_DATE); + param.put("FACT_DATE",FACT_DATE); + param.put("CONTRACT_ID",CONTRACT_ID); + param.put("CONTRACT_NUMBER",CONTRACT_NUMBER); + param.put("PROJECT_NAME",PROJECT_NAME); + param.put("LEAS_FORM",leas_form); + param.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID); + param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME); + param.put("CARID",CARID); + param.put("CARMODEL",CARMODEL); + param.put("CUSTID",CUSTID); + param.put("CUSTNAME",CUSTNAME); + param.put("CUSTOMERTYPE",CUSTOMERTYPE); + param.put("BUSINESSTYPE",BUSINESSTYPE); + param.put("ACC_NUMBER",ACC_NUM); + param.put("VOUCHERNO",VOUCHERNO); - // 定义辅助账信息 - // 融资租赁资产 - param.put("LEASFORMASSET", "02/03/05/06"); - // 业务一部 - param.put("DEPT", "01"); - // 汽车融资租赁收入 - param.put("LEASINCOMEFORM", "06"); + if("PZ2018100900000263".equals(VOUCHERNO)) { + param.put("BUSINESSTYPE", "0604");// 主营类型 + } + param.put("CASHFLOW", "");// 现金流项目 - //param.put("FUNDTYPE", ""); // 主营类型 - param.put("BUSINESSTYPE", "06"); + map.clear(); + map.put("PROJ_TYPE", leas_form); + map.put("VOUCHER_NO", VOUCHERNO); + BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); - map.clear(); - map.put("PROJ_TYPE", leas_form); - map.put("VOUCHER_NO", VOUCHERNO); - BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); - - if(vouch!=null){ - vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); - }} - } + if(vouch!=null){ + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); + } + } if(Sqlca!=null){ Sqlca.commit(); diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index 9d9a7267e..79b1d7f3b 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -362,12 +362,26 @@ public class CreateVoucherServiceImpl { }else if("PZ2018072100000038".equals(VOUCHERNO) || "PZ2018072100000039".equals(VOUCHERNO) || "PZ2018072100000043".equals(VOUCHERNO)) { subData.put("CUSTID","APZL00000000DC");//虚拟客户 subData.put("CUSTNAME","汽车C端待查客户");//虚拟客户 + // 起租前网银回款 }else if("PZ2018092500000156".equals(VOUCHERNO) || "PZ2018092500000157".equals(VOUCHERNO) || "PZ2018092500000158".equals(VOUCHERNO)) { subData.put("CUSTID","APZL00000000CT");//虚拟客户 subData.put("CUSTNAME","传统B端待查客户");//虚拟客户 + // 传统-回款-资金 }else if("PZ2018092500000173".equals(VOUCHERNO) || "PZ2018092500000174".equals(VOUCHERNO) ) { subData.put("CUSTID","APZL00000000CT");//虚拟客户 subData.put("CUSTNAME","传统B端待查客户");//虚拟客户 + // 传统-回款-租金 + }else if("PZ2018100900000298".equals(VOUCHERNO) || "PZ2018092500000171".equals(VOUCHERNO) || "PZ2019022500000012".equals(VOUCHERNO) || "PZ2019022500000011".equals(VOUCHERNO) || "PZ2018092500000172".equals(VOUCHERNO)) { + subData.put("CUSTID","APZL00000000CT");//虚拟客户 + subData.put("CUSTNAME","传统B端待查客户");//虚拟客户 + // 传统资金红冲 + }else if("PZ2018092500000175".equals(VOUCHERNO) || "PZ2018092500000176".equals(VOUCHERNO) || "PZ2018092500000177".equals(VOUCHERNO) || "PZ2018092500000181".equals(VOUCHERNO) || "PZ2018092500000182".equals(VOUCHERNO)) { + subData.put("CUSTID","APZL00000000CT");//虚拟客户 + subData.put("CUSTNAME","传统B端待查客户");//虚拟客户 + // 传统租金红冲 + }else if("PZ2018092500000179".equals(VOUCHERNO) || "PZ2018100900000263".equals(VOUCHERNO) || "PZ2018092500000178".equals(VOUCHERNO) || "PZ2018100900000260".equals(VOUCHERNO) || "PZ2018092500000180".equals(VOUCHERNO)) { + subData.put("CUSTID","APZL00000000CT");//虚拟客户 + subData.put("CUSTNAME","传统B端待查客户");//虚拟客户 } /*else { @@ -382,6 +396,7 @@ public class CreateVoucherServiceImpl { if("PZ2018081600000120".equals(VOUCHERNO)){ subData.put("CUSTID","APZL00000000DC"); // 虚拟客户 subData.put("CUSTNAME","汽车C端待查客户"); // 虚拟客户 + // 传统-网银导入 }else if("PZ2018092500000155".equals(VOUCHERNO)) { subData.put("CUSTID","APZL00000000CT"); subData.put("CUSTNAME","传统B端待查客户");