From 0b4af892fcbaee586002e5bcdb10ae44d806249a Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Fri, 10 Apr 2020 17:02:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E7=A7=9F=E7=9B=B8=E5=85=B3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherLoanDistributor.java | 60 ++++++++++++++++++- .../ContractOnhireVoucher.java | 1 + .../IncomeVoucher.java | 3 +- .../serviceImp/CreateVoucherServiceImpl.java | 2 +- src_sql/鎶曚骇SQL/V20200404/xzw_20200410.sql | 46 ++++++++++++++ 5 files changed, 107 insertions(+), 5 deletions(-) create mode 100644 src_sql/鎶曚骇SQL/V20200404/xzw_20200410.sql diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java index 09c8f4db9..cc387bcb0 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java @@ -53,6 +53,7 @@ public class CreateVoucherLoanDistributor { String PRODUCT_ID=null; String TAX_TYPE=null; String TAX_NUM=null; + String OTHERNOTAX=null; String sql=""; String moneyDataSource=""; @@ -77,7 +78,7 @@ public class CreateVoucherLoanDistributor { sql="SELECT IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,IFNULL(LRPT.INTEREST, 0) AS INTEREST,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS FIRST_ADD_FINANCING,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) - IFNULL(LCCT.CAUTION_MONEY, 0) - IFNULL(LCCT.GPS_FEE, 0) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) AS FIRST_ADD_HANDLING,IFNULL(LRPT.INTEREST, 0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY/getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE),0) AS INTEREST_ADD_HANDLING,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,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT WHERE lfit.FEE_TYPE = 'feetype10' AND LFIT.EBANK_STATUS = '05' GROUP BY FLOWUNID,CONTRACT_ID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM lc_pay_rent_plan GROUP BY CONTRACT_ID)LRPT ON LRPT.CONTRACT_ID = LFIT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.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 = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID "; // 合同起租-直租 }else if("PZ2019070100000004".equals(VOUCHERNO)) { - sql="SELECT (IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.GPS_FEE, 0)) AS MONEY,ROUND((IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0)) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS MONEYNOTAX,((IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0)) - ROUND((IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRPT.INTEREST, 0) AS INTEREST,IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(LCCT.PURCHASE_TAX, 0) AS PURCHASE_TAX,ROUND(IFNULL(LCCT.PURCHASE_TAX, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS PURCHASE_TAX_NOTAX,(IFNULL(LCCT.PURCHASE_TAX, 0)-ROUND(IFNULL(LCCT.PURCHASE_TAX, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS PURCHASE_TAX_TAX,IFNULL(LCCT.INSURANCE_PREMIUM, 0) AS INSURANCE_PREMIUM,ROUND(IFNULL(LCCT.INSURANCE_PREMIUM, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2) AS INSURANCE_PREMIUM_NOTAX,(IFNULL(LCCT.INSURANCE_PREMIUM, 0)-ROUND(IFNULL(LCCT.INSURANCE_PREMIUM, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS INSURANCE_PREMIUM_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,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT WHERE lfit.FEE_TYPE = 'feetype10' AND LFIT.EBANK_STATUS = '05' GROUP BY FLOWUNID,CONTRACT_ID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM lc_pay_rent_plan GROUP BY CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = LFIT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.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 = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID "; + sql="SELECT (IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.GPS_FEE, 0)) AS MONEY,IFNULL(ROUND((IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYNOTAX,((IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0)) - ROUND((IFNULL(LCCT.EQUIP_AMT, 0) - IFNULL(LCCT.FIRST_PAYMENT, 0)) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRPT.INTEREST, 0) AS INTEREST,IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(LCCT.PURCHASE_TAX, 0) AS PURCHASE_TAX,IFNULL(ROUND(IFNULL(LCCT.PURCHASE_TAX, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS PURCHASE_TAX_NOTAX,(IFNULL(LCCT.PURCHASE_TAX, 0) - ROUND(IFNULL(LCCT.PURCHASE_TAX, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS PURCHASE_TAX_TAX,IFNULL(LCCT.INSURANCE_PREMIUM, 0) AS INSURANCE_PREMIUM,IFNULL(ROUND(IFNULL(LCCT.INSURANCE_PREMIUM, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS INSURANCE_PREMIUM_NOTAX,(IFNULL(LCCT.INSURANCE_PREMIUM, 0) - ROUND(IFNULL(LCCT.INSURANCE_PREMIUM, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)) AS INSURANCE_PREMIUM_TAX,IFNULL(LCCT.INCIDENTAL,0) AS INCIDENTAL,IFNULL(ROUND(IFNULL(LCCT.INCIDENTAL, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS INCIDENTAL_NO_TAX,IFNULL(LCCT.TABLEWARE_FEE,0) AS TABLEWARE_FEE,IFNULL(ROUND(IFNULL(LCCT.TABLEWARE_FEE, 0) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS TABLEWARE_FEE_NO_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,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT WHERE lfit.FEE_TYPE = 'feetype10' AND LFIT.EBANK_STATUS = '05' GROUP BY FLOWUNID,CONTRACT_ID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM lc_pay_rent_plan GROUP BY CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = LFIT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.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 = '1' AND LFIT.EBANK_STATUS = '05' AND LFIT.FLOWUNID = :FLOWUNID "; // 购置融资租赁产-回租 }else if("PZ2018070900000002".equals(VOUCHERNO)) { sql="SELECT IFNULL(LCCT.GPS_FEE, 0) AS GPS_FEE_FINANCE,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS FIRST_ADD_FINANCING,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) - IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) - IFNULL(LCCT.CAUTION_MONEY, 0) - IFNULL(LCCT.GPS_FEE, 0) AS FINANCING_SUB_OTHERS,IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.HANDLING_CHARGE_MONEY, 0) AS FIRST_ADD_HANDLING,IFNULL(LCCT.HANDLING_CHARGE_MONEY,0) AS HANDLING_CHARGE_MONEY,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,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LFIT.REQNBR,LPI.PRODUCT_ID,PSL.payType FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN lc_fund_income_callback_detail_temp LFICDT ON LFICDT.cmb_pay_no = LFIT.CMB_PAY_NO AND LFIT.CONTRACT_ID=LFICDT.CONTRACT_ID WHERE lfit.FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.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 LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID=LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND (PSL.operationType <>'DYCD' OR PSL.operationType IS NULL) AND LFIT.FLOWUNID = :FLOWUNID "; @@ -87,6 +88,8 @@ public class CreateVoucherLoanDistributor { // 第一车贷购置融资租赁资产-回租 }else if("PZ2018073100000062".equals(VOUCHERNO)){ sql="SELECT IFNULL(LCCT.FIRST_PAYMENT, 0) + IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS MONEY,IFNULL(LCCT.FIRST_PAYMENT, 0) AS MONEYNOTAX,IFNULL(LCCT.CLEAN_LEASE_MONEY, 0) AS MONEYTAX,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,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LFIT.REQNBR,LPI.PRODUCT_ID,PSL.payType FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT LFIT.FLOWUNID,LFIT.CONTRACT_ID,MIN(LFIT.ACC_NUMBER) ACC_NUMBER,MIN(LFICDT.REQNBR) AS REQNBR,MIN(LFIT.EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN lc_fund_income_callback_detail_temp LFICDT ON LFICDT.cmb_pay_no = LFIT.CMB_PAY_NO WHERE lfit.FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.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 LEFT JOIN PRD_SPECIFIC_LIBRARY PSL ON PSL.PRODUCTID = LPI.PRODUCT_ID WHERE LPI.BUSINESSTYPE = '1' AND LFIT.EBANK_STATUS = '05' AND PSL.operationType = 'DYCD' AND LFIT.FLOWUNID = :FLOWUNID "; + }else if("PZ2020041000000002".equals(VOUCHERNO)) { + sql="SELECT ROUND((getTax (lci.LEAS_FORM,'本金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LCCT.TABLEWARE_FEE, 0) AS MONEY,IFNULL(ROUND(IFNULL(LCCT.TABLEWARE_FEE, 0)/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL(IFNULL(LCCT.TABLEWARE_FEE, 0)- ROUND(IFNULL(LCCT.TABLEWARE_FEE, 0)/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYTAX,IFNULL(LCCT.INCIDENTAL, 0) AS INCIDENTAL,IFNULL(ROUND(IFNULL(LCCT.INCIDENTAL, 0)/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS INCIDENTAL_NO_TAX,IFNULL(IFNULL(LCCT.INCIDENTAL, 0)- ROUND(IFNULL(LCCT.INCIDENTAL, 0)/getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS INCIDENTAL_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,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER,MIN(EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.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 = '1' AND LFIT.EBANK_STATUS = '05' AND lfit.FLOWUNID = :FLOWUNID "; }else{ sql="SELECT ROUND((getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL("+moneyDataSource+", 0) AS MONEY,IFNULL(ROUND("+moneyDataSource+" / getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL("+moneyDataSource+" - ROUND("+moneyDataSource+" / getTax(lci.LEAS_FORM,'"+TAX_TYPE+"',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,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER,LPI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MIN(ACC_NUMBER) ACC_NUMBER,MIN(EBANK_STATUS) AS EBANK_STATUS FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT ON LFIT.CONTRACT_ID = LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.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 = '1' AND LFIT.EBANK_STATUS = '05' AND lfit.FLOWUNID = :FLOWUNID "; } @@ -178,6 +181,10 @@ public class CreateVoucherLoanDistributor { String FINAN1 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "PURCHASE_TAX","FINAN"); // 判断保险费是否参融 String FINAN2 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "INSURANCE_PREMIUM","FINAN"); + // 判断加装费是否参融 + String FINAN3 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "TABLEWARE_FEE","FINAN"); + // 判断杂费是否参融 + String FINAN4 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "INCIDENTAL","FINAN"); // 判断手续费是否差额 String isBalance1 = ProductParamUtil.getProductParameterValue(PRODUCT_ID, "PRD0315", "HANDLING_CHARGE_MONEY","isBalance"); // 判断保证金是否差额 @@ -195,6 +202,8 @@ public class CreateVoucherLoanDistributor { if("no".equals(isBalance2)) { MONEY="0.00"; } + }else if("PZ2020041000000002".equals(VOUCHERNO)) { + MONEY="1"; } if("".equals(MONEY)||MONEY==null) MONEY="0.00"; double mon=Double.parseDouble(MONEY); @@ -211,6 +220,10 @@ public class CreateVoucherLoanDistributor { double PURCHASE_TAX_TAX=0.00; double INSURANCE_PREMIUM=0.00;//保险费 double INSURANCE_PREMIUM_TAX=0.00; + double TABLEWARE_FEE=0.00;//购置税 + double TABLEWARE_FEE_NO_TAX=0.00; + double INCIDENTAL=0.00;//保险费 + double INCIDENTAL_NO_TAX=0.00; // 如果参融， 获取对应金额 if("Y".equals(FINAN1)){ PURCHASE_TAX=Double.parseDouble(dataList.get(i).get("PURCHASE_TAX")); @@ -222,7 +235,14 @@ public class CreateVoucherLoanDistributor { INSURANCE_PREMIUM_NOTAX=dataList.get(i).get("INSURANCE_PREMIUM_NOTAX"); INSURANCE_PREMIUM_TAX=Double.parseDouble(dataList.get(i).get("INSURANCE_PREMIUM_TAX")); } - + if("Y".equals(FINAN3)){ + TABLEWARE_FEE=Double.parseDouble(dataList.get(i).get("INSURANCE_PREMIUM"));; + TABLEWARE_FEE_NO_TAX=Double.parseDouble(dataList.get(i).get("INSURANCE_PREMIUM"));; + } + if("Y".equals(FINAN4)){ + INCIDENTAL=Double.parseDouble(dataList.get(i).get("INSURANCE_PREMIUM"));; + INCIDENTAL_NO_TAX=Double.parseDouble(dataList.get(i).get("INSURANCE_PREMIUM"));; + } if("Y".equals(FINAN1) && !"Y".equals(FINAN2)){ MONEYTAX=Double.parseDouble(dataList.get(i).get("MONEYTAX"))+PURCHASE_TAX_TAX+""; }else if(!"Y".equals(FINAN1) && "Y".equals(FINAN2)){ @@ -233,7 +253,35 @@ public class CreateVoucherLoanDistributor { MONEYTAX=dataList.get(i).get("MONEYTAX"); } // 如果参融， 获取上边的对应金额， 如果不参融+0， 不影响 - MONEY=(mon+PURCHASE_TAX+INSURANCE_PREMIUM)+""; + MONEY=(mon+PURCHASE_TAX+INSURANCE_PREMIUM+TABLEWARE_FEE+INCIDENTAL)+""; + OTHERNOTAX=(TABLEWARE_FEE_NO_TAX+INCIDENTAL_NO_TAX)+""; + // 直租购置融资租赁资产 + }else if("PZ2019070100000003".equals(VOUCHERNO)) { + if("no".equals(isBalance2)) { + // 贷1如果保证金不是差额放款，不应该-保证金， 所以加回来 + FINANCING_SUB_OTHERS=Double.parseDouble(FINANCING_SUB_OTHERS)+Double.parseDouble(CAUTION_MONEY)+"";; + CAUTION_MONEY="0.00"; + } + }else if("PZ2020041000000002".equals(VOUCHERNO)) { + double TABLEWARE_FEE=0.00;// 加装费 + double TABLEWARE_FEE_NO_TAX=0.00;//加装费 + double TABLEWARE_FEE_TAX=0.00;//加装费 + double INCIDENTAL=0.00;//杂费 + double INCIDENTAL_NO_TAX=0.00;//杂费 + double INCIDENTAL_TAX=0.00;//杂费 + if("Y".equals(FINAN3)){ + TABLEWARE_FEE=Double.parseDouble(dataList.get(i).get("MONEY")); + TABLEWARE_FEE_NO_TAX=Double.parseDouble(dataList.get(i).get("MONEYNOTAX")); + TABLEWARE_FEE_TAX=Double.parseDouble(dataList.get(i).get("MONEYTAX")); + } + if("Y".equals(FINAN4)){ + INCIDENTAL=Double.parseDouble(dataList.get(i).get("INCIDENTAL")); + INCIDENTAL_NO_TAX=Double.parseDouble(dataList.get(i).get("INCIDENTAL_NO_TAX")); + INCIDENTAL_TAX=Double.parseDouble(dataList.get(i).get("INCIDENTAL_TAX")); + } + MONEY=TABLEWARE_FEE+INCIDENTAL+""; + MONEYNOTAX=TABLEWARE_FEE_NO_TAX+INCIDENTAL_NO_TAX+""; + MONEYTAX=TABLEWARE_FEE_TAX+INCIDENTAL_TAX+""; } // 购置融资租赁资产配置差额, 非差额 @@ -289,6 +337,7 @@ public class CreateVoucherLoanDistributor { param.put("FINANCING_SUB_OTHERS",FINANCING_SUB_OTHERS); param.put("FIRST_ADD_HANDLING",FIRST_ADD_HANDLING); param.put("INTEREST_ADD_HANDLING",INTEREST_ADD_HANDLING); + param.put("OTHERNOTAX",OTHERNOTAX); param.put("ACCOUNT_DATE",ACCOUNT_DATE); param.put("FACT_DATE",FACT_DATE); param.put("CONTRACT_ID",CONTRACT_ID); @@ -348,6 +397,11 @@ public class CreateVoucherLoanDistributor { if("Y".equals(FINAN1)){ vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); } + // 加装及杂费-直租 + }else if("PZ2020041000000002".equals(VOUCHERNO)) { + if("Y".equals(FINAN3) || "Y".equals(FINAN4)){ + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); + } }else{ vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java index cea2831f8..b9a71d20e 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java @@ -35,6 +35,7 @@ public class ContractOnhireVoucher extends BaseBussiness { cvld.CreateVoucher(FlowUnid, "PZ2019070100000002",userid);// 收取首付款-直租 cvld.CreateVoucher(FlowUnid, "PZ2019082600000002",userid);// 购入保险-直租 cvld.CreateVoucher(FlowUnid, "PZ2019082600000003",userid);// 购入购置税-直租 + cvld.CreateVoucher(FlowUnid, "PZ2020041000000002",userid);// 加装及杂费-直租 cvld.CreateVoucher(FlowUnid, "PZ2019070100000003",userid);// 购置融资租赁资产-直租 cvld.CreateVoucher(FlowUnid, "PZ2019070100000004",userid);// 合同起租-直租 cvld.CreateVoucher(FlowUnid, "PZ2019070100000005",userid);// 收取客户手续费（一次性确认收入）--直租 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java index a95c0c55d..87c7e6347 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java @@ -31,7 +31,8 @@ public class IncomeVoucher extends BaseBussiness { // 汽车直租 cvci.CreateVoucher(FlowUnid, "PZ2019070100000015", "feetype30",userid);//收到的违约金/罚款 --回租 - cvci.CreateVoucher(FlowUnid, "PZ2019070100000019", "feetype4",userid); //收到名义货价 --直租 + cvci.CreateVoucher(FlowUnid, "PZ2019070100000019", "feetype4",userid); //收到名义货价--直租 + cvci.CreateVoucher(FlowUnid, "PZ2020041000000003", "feetype2",userid); //直租-收到客户保证金 /** * 汽车网银回款-租金部分 diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index eb1284d82..7f3a5243f 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -413,7 +413,7 @@ public class CreateVoucherServiceImpl { subData.put("CUSTID",dataTemp.get("DISTRIBUTOR_ID"));//经销商id subData.put("CUSTNAME",dataTemp.get("DISTRIBUTOR_NAME"));//经销商名称 }else */ - if("PZ2018072100000026".equals(VOUCHERNO) || "PZ2018072100000031".equals(VOUCHERNO) || "PZ2018072100000028".equals(VOUCHERNO) || "PZ2018072100000041".equals(VOUCHERNO) || "PZ2019070100000015".equals(VOUCHERNO) || "PZ2019070100000019".equals(VOUCHERNO) || "PZ2019070100000018".equals(VOUCHERNO) || "PZ2019070100000024".equals(VOUCHERNO)){ + if("PZ2018072100000026".equals(VOUCHERNO) || "PZ2018072100000031".equals(VOUCHERNO) || "PZ2018072100000028".equals(VOUCHERNO) || "PZ2018072100000041".equals(VOUCHERNO) || "PZ2019070100000015".equals(VOUCHERNO) || "PZ2019070100000019".equals(VOUCHERNO) || "PZ2019070100000018".equals(VOUCHERNO) || "PZ2019070100000024".equals(VOUCHERNO) || "PZ2020041000000003".equals(VOUCHERNO)){ subData.put("CUSTID","APZL00000000DC");//虚拟客户 subData.put("CUSTNAME","汽车C端待查客户");//虚拟客户 }else if("PZ2018081700000134".equals(VOUCHERNO) || "PZ2018081700000138".equals(VOUCHERNO) || "PZ2018072100000047".equals(VOUCHERNO) || "PZ2018081700000132".equals(VOUCHERNO) || "PZ2018081700000130".equals(VOUCHERNO) || "PZ2018081700000128".equals(VOUCHERNO)){ diff --git a/src_sql/鎶曚骇SQL/V20200404/xzw_20200410.sql b/src_sql/鎶曚骇SQL/V20200404/xzw_20200410.sql new file mode 100644 index 000000000..34b44acf3 --- /dev/null +++ b/src_sql/鎶曚骇SQL/V20200404/xzw_20200410.sql @@ -0,0 +1,46 @@ +-- 直租-加装及杂费凭证配置 +DELETE FROM LV_VOUCHER_CONFIG WHERE VOUCHER_NO='PZ2020041000000002'; +insert into `LV_VOUCHER_CONFIG` (`ID`, `MODULAR_NUMBER`, `OWNED_COMPANY`, `PROJ_TYPE`, `INIT_CLASS`, `VOUCHER_TYPE`, `VOUCHER_NO`, `FIR_KEY`) values('8af0569acde14863a87ddd6b3b4249a6','起租-加装及杂费','cae44920253511e9bb6c00163e0ad612','01','','1','PZ2020041000000002',NULL); + +DELETE FROM LV_VOUCHER_LOAN WHERE VOUCHER_ID='8af0569acde14863a87ddd6b3b4249a6'; +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('4b374bcefe644f5282c42d367f1c3b2f','1','e23b8befe59a4fd5b3bfb1fdaf15944d','1','1','加装及杂费','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.ContractInterestNoTax','8af0569acde14863a87ddd6b3b4249a6'); +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('9fe802c8a0c74a9ea2ce23af4ea3aca7','2','8b776e48250511e9bb6c00163e0ad612','1','1','加装及杂费','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.ContractInterestTax','8af0569acde14863a87ddd6b3b4249a6'); +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('3647b49f08844277b1dd4125dfa1bfa3','3','8b77613b250511e9bb6c00163e0ad612','2','1','加装及杂费','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.CommLoanFactMoneyToMoney','8af0569acde14863a87ddd6b3b4249a6'); + +-- 直租-收到客户保证金凭证配置 +DELETE FROM LV_VOUCHER_CONFIG WHERE VOUCHER_NO='PZ2020041000000003'; +insert into `LV_VOUCHER_CONFIG` (`ID`, `MODULAR_NUMBER`, `OWNED_COMPANY`, `PROJ_TYPE`, `INIT_CLASS`, `VOUCHER_TYPE`, `VOUCHER_NO`, `FIR_KEY`) values('b8809d9a4c1642559ad7264daa493c06','回款-收到客户保证金','cae44920253511e9bb6c00163e0ad612','01','','1','PZ2020041000000003',NULL); + +DELETE FROM LV_VOUCHER_LOAN WHERE VOUCHER_ID='b8809d9a4c1642559ad7264daa493c06'; +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('db48e487fdb84e7ab003ad89f7f9b4c0','1','8b7761a7250511e9bb6c00163e0ad612','1','1','收到客户保证金','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.CommLoanFactMoneyToMoney','b8809d9a4c1642559ad7264daa493c06'); +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('7dcfa5341da84c6db30c0af24626f5c6','2','8b775c68250511e9bb6c00163e0ad612','2','1','收到客户保证金','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.CommLoanFactMoneyToMoney','b8809d9a4c1642559ad7264daa493c06'); + +-- 直租-购置融资租赁资产凭证配置 +DELETE FROM LV_VOUCHER_CONFIG WHERE VOUCHER_NO='PZ2019070100000003'; +insert into `LV_VOUCHER_CONFIG` (`ID`, `MODULAR_NUMBER`, `OWNED_COMPANY`, `PROJ_TYPE`, `INIT_CLASS`, `VOUCHER_TYPE`, `VOUCHER_NO`, `FIR_KEY`) values('371df099c99943fa9cd24cc24bd6faa3','起租-购置融资租赁资产','cae44920253511e9bb6c00163e0ad612','01','','1','PZ2019070100000003',NULL); + +DELETE FROM LV_VOUCHER_LOAN WHERE VOUCHER_ID='371df099c99943fa9cd24cc24bd6faa3'; +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('3cfef9f1d66b49179aef529b088daf4f','1','8b774961250511e9bb6c00163e0ad612','1','1','购置融资租赁资产','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.CommLoanFactMoneyToMoney','371df099c99943fa9cd24cc24bd6faa3'); +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('dc5c263c782649ba9e237a22d24c4048','2','8b776e48250511e9bb6c00163e0ad612','1','1','购置融资租赁资产','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.ContractInterestTax','371df099c99943fa9cd24cc24bd6faa3'); +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('8c6ad5d52bae47f8bb9cbd48da53d2c9','3','8b77331f250511e9bb6c00163e0ad612','2','1','购置融资租赁资产','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.CommLoanFinancingSubOthersMoney','371df099c99943fa9cd24cc24bd6faa3'); +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('7d9ff1ab38f2438a8e4dd6579808daa9','4','8b77613b250511e9bb6c00163e0ad612','2','1','购置融资租赁资产','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.CommLoanFirstAddHandlingMoney','371df099c99943fa9cd24cc24bd6faa3'); +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('758ae27a728d493cae1ef85a0cbee1af','5','8b775c68250511e9bb6c00163e0ad612','2','1','购置融资租赁资产','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.CommLoanCautionMoney','371df099c99943fa9cd24cc24bd6faa3'); + +-- 直租-合同起租凭证配置 +DELETE FROM LV_VOUCHER_CONFIG WHERE VOUCHER_NO='PZ2019070100000004'; +insert into `LV_VOUCHER_CONFIG` (`ID`, `MODULAR_NUMBER`, `OWNED_COMPANY`, `PROJ_TYPE`, `INIT_CLASS`, `VOUCHER_TYPE`, `VOUCHER_NO`, `FIR_KEY`) values('d0db7a990ad5424ca39761e0898385d2','起租-合同起租','cae44920253511e9bb6c00163e0ad612','01','','1','PZ2019070100000004',NULL); + +DELETE FROM LV_VOUCHER_LOAN WHERE VOUCHER_ID='d0db7a990ad5424ca39761e0898385d2'; +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('3081131637dc4cf4a2f8c99ac9ac8c8b','1','8b774d00250511e9bb6c00163e0ad612','1','1','合同起租','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.CommLoanFactMoneyToMoney','d0db7a990ad5424ca39761e0898385d2'); +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('a7ce3562cf21495db32391f56628231b','2','8b774d73250511e9bb6c00163e0ad612','1','1','合同起租','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.ContractInterest','d0db7a990ad5424ca39761e0898385d2'); +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('cd89d5d12f9646ce9c128504f66cd3bf','3','510a2bc12c7b4df297bf72d6282bb439','2','1','合同起租','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.ContractInterestTax','d0db7a990ad5424ca39761e0898385d2'); +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('24502d818fff4257bb750de764fa2404','4','8b774881250511e9bb6c00163e0ad612','2','1','合同起租','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.FundGPSFee','d0db7a990ad5424ca39761e0898385d2'); +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('457755a437b545c2b46d30e4c191e274','5','030f9fd1404c416ea6082720431277cb','2','1','合同起租','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.ContractInsurancePremiumMoney','d0db7a990ad5424ca39761e0898385d2'); +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('e8b19885236842e1aeb68f1688db01fa','6','23448ad6510745819ee0262ae2d6e578','2','1','合同起租','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.ContractPurchaseTaxMoney','d0db7a990ad5424ca39761e0898385d2'); +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('931cacd74e294731ad7bae89b68ec2d1','7','8b774961250511e9bb6c00163e0ad612','2','1','合同起租','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.ContractInterestNoTax','d0db7a990ad5424ca39761e0898385d2'); +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('10aa3e96dec8438bb6daf962f1e8b90b','8','8b7759e6250511e9bb6c00163e0ad612','2','1','合同起租','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.ContractInterest','d0db7a990ad5424ca39761e0898385d2'); +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('d2400fb02f4d4132a95fdd92aff527aa','9','e23b8befe59a4fd5b3bfb1fdaf15944d','2','1','合同起租','1','com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition.ContractGetMoneyToOtherNoTax','d0db7a990ad5424ca39761e0898385d2'); + +-- 新增科目14610105-融资租赁资产\直租\其他 +DELETE FROM LV_STACTS_CONFIG WHERE SUBJECTS_CODE='14610105'; +insert into `LV_STACTS_CONFIG` (`ID`, `OWNED_COMPANY`, `SUBJECTS_NAME`, `SUBJECTS_CODE`, `AUXILIARY_TYPE`, `ABSTRACT_TEMPLATE`, `IS_USE`, `VALUE_MODE`) values('e23b8befe59a4fd5b3bfb1fdaf15944d','cae44920253511e9bb6c00163e0ad612','融资租赁资产\\直租\\其他','14610105','185b89e22dba458491306a647468d2a5,1869733a51f1486a97df402e8d899980','','1','fc74b67c4c8549fcbdc514201842ff89'); \ No newline at end of file