diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java index 4963b23aa..b44b12045 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java @@ -41,11 +41,11 @@ public class CreateVoucherContractOnhireChange { param.clear(); map.put("FlowUnid", FlowUnid); - if("PZ2018072100000049".equals(VOUCHERNO)){ + if("PZ2018072100000049".equals(VOUCHERNO)||"PZ2018080400000105".equals(VOUCHERNO)){ sql="SELECT LRPT.SUMINTE - LRP.SUMINTE 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,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LB_CONTRACT_INFO LCI INNER JOIN (SELECT MAX(CONTRACT_ID) CONTRACT_ID,SUM(ROUND(INTEREST / 1.06, 2)) SUMINTE,FLOWUNID FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.CONTRACT_ID = LCI.ID INNER JOIN (SELECT CONTRACT_ID,SUM(ROUND(INTEREST / 1.06, 2)) SUMINTE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP 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 LRPT.FLOWUNID = :FLOWUNID "; } - if("PZ2018072100000050".equals(VOUCHERNO)){ + if("PZ2018072100000050".equals(VOUCHERNO)||"PZ2018080400000106".equals(VOUCHERNO)){ sql="SELECT LRPT.SUMINTE-LRP.SUMINTE 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,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME ,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LB_CONTRACT_INFO LCI INNER JOIN (SELECT MAX(CONTRACT_ID) CONTRACT_ID,SUM(INTEREST-ROUND(INTEREST/1.06,2))SUMINTE, FLOWUNID FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.CONTRACT_ID=LCI.ID INNER JOIN (SELECT CONTRACT_ID,SUM(INTEREST-ROUND(INTEREST/1.06,2)) SUMINTE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP 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 LRPT.FLOWUNID=:FLOWUNID"; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java index d63abb426..d059c94d7 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java @@ -39,21 +39,26 @@ public class CreateVoucherContractTerminate { param.clear(); map.put("FlowUnid", FlowUnid); //回款--收到违约金 - if("PZ2018072100000026".equals(VOUCHERNO)){ + if("PZ2018072100000026".equals(VOUCHERNO)||"PZ2018080400000083".equals(VOUCHERNO)){ sql= "SELECT IFNULL(HANDLING_CHARGE,0) AS MONEY ,ROUND(IFNULL(HANDLING_CHARGE,0)/1.06,2) AS MONEYNOTAX,(IFNULL(HANDLING_CHARGE,0)-ROUND(IFNULL(HANDLING_CHARGE,0)/1.06,2)) 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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.ID INNER 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 LFRA.FLOWUNID=:FLOWUNID"; } //收到的提前还款 - if("PZ2018072100000027".equals(VOUCHERNO)){ + if("PZ2018072100000027".equals(VOUCHERNO)||"PZ2018080400000084".equals(VOUCHERNO)){ sql= "SELECT IFNULL(CORPUS_OVERAGE,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 CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.ID INNER 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 LFRA.FLOWUNID=:FLOWUNID"; } - //提前还款-调整未实现利息收入 + //提前还款-调整未实现利息收入(不含税金) if("PZ2018072100000045".equals(VOUCHERNO)){ sql="SELECT ROUND(IFNULL(AGREED_INTEREST,0)/1.06,2) 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 CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.ID INNER 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 LFRA.FLOWUNID=:FLOWUNID"; } //提前还款-调整未实现利息收入税金 - if("PZ2018072100000046".equals(VOUCHERNO)){ + if("PZ2018072100000046".equals(VOUCHERNO)||"PZ2018080400000100".equals(VOUCHERNO)){ sql="SELECT IFNULL(AGREED_INTEREST,0)-ROUND(IFNULL(AGREED_INTEREST,0)/1.06,2) 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 CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.ID INNER 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 LFRA.FLOWUNID=:FLOWUNID"; } + //提前还款-调整未实现利息收入(全部) + if("PZ2018080400000099".equals(VOUCHERNO)){ + sql="SELECT IFNULL(AGREED_INTEREST,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 CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.ID INNER 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 LFRA.FLOWUNID=:FLOWUNID"; + } + List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java index 1299b1d29..d210a0ec9 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java @@ -35,14 +35,14 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { String sql=""; param.clear(); map.put("FLOWUNID", FlowUnid); - if("PZ2018071100000011".equals(VOUCHERNO)){ + if("PZ2018071100000011".equals(VOUCHERNO)||"PZ2018080400000076".equals(VOUCHERNO)){ sql= "SELECT DDIT.CAUTION_MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') " + "AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE," + "DDIT.REFUND_PERSON,DIF.DISTRIBUTOR_CODING DISTRIBUTOR_NO,DIF.DISTRIBUTOR_NAME FROM D_DEPOSITRETURN_INFO_TEMP" + " DDIT LEFT JOIN DISTRIBUTOR_INFO DIF ON DIF.DISTRIBUTOR_NO=DDIT.DISTRIBUTOR_ID " + "WHERE DDIT.FLOWUNID=:FLOWUNID"; } - if("PZ2018072100000032".equals(VOUCHERNO)){ + if("PZ2018072100000032".equals(VOUCHERNO)||"PZ2018080400000088".equals(VOUCHERNO)){ sql= "SELECT DDIT.CAUTION_MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d')" + " AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') " + "AS FACT_DATE,DDIT.payer,DIF.DISTRIBUTOR_CODING DISTRIBUTOR_NO," diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java index 53e9166b8..10410d718 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java @@ -44,7 +44,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { //String VOUCHERNO=this.getAttribute("VoucherNo").toString(); param.clear(); map.put("FlowUnid", FlowUnid); - sql= "SELECT LCCT.HANDLING_CHARGE_MONEY AS MONEY,LCCT.HANDLING_CHARGE_MONEY/1.06 AS HANDLFEENOTAX,(LCCT.HANDLING_CHARGE_MONEY-LCCT.HANDLING_CHARGE_MONEY/1.06)AS HANDLTAX,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,LEC.ID AS CARID,LEC.MODEL ,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_CALC_CONDITION LCCT INNER JOIN lc_fund_income_temp lfit ON lfit.contract_id=lcct.contract_id AND lfit.fee_type='feetype10' LEFT JOIN LB_CONTRACT_INFO LCI 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 lfit.FLOWUNID=:FLOWUNID"; + sql= "SELECT LCCT.HANDLING_CHARGE_MONEY AS MONEY,LCCT.HANDLING_CHARGE_MONEY/1.06 AS HANDLFEENOTAX,(LCCT.HANDLING_CHARGE_MONEY-ROUND(LCCT.HANDLING_CHARGE_MONEY/1.06,2))AS HANDLTAX,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,LEC.ID AS CARID,LEC.MODEL ,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_CALC_CONDITION LCCT INNER JOIN lc_fund_income_temp lfit ON lfit.contract_id=lcct.contract_id AND lfit.fee_type='feetype10' LEFT JOIN LB_CONTRACT_INFO LCI 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 lfit.FLOWUNID=:FLOWUNID"; List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java index ebc8f50ef..23352b077 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java @@ -7,10 +7,11 @@ import java.util.Map; import com.amarsoft.are.jbo.JBOTransaction; import com.tenwa.comm.exception.BusinessException; import com.tenwa.voucher.service.VoucherJavaParamService; - +/** + * 车款-首付款 + * @author xiezhiwen + */ public class CleanLeaseMoney implements VoucherJavaParamService { - - @Override public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { MapreturnValue=new HashMap(); @@ -18,7 +19,6 @@ public class CleanLeaseMoney implements VoucherJavaParamService { String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT"); String FIRST_PAYMENT=param.get("FIRST_PAYMENT")==null?"0.00":param.get("FIRST_PAYMENT"); BigDecimal factmoney=new BigDecimal(EQUIP_AMT).subtract(new BigDecimal(FIRST_PAYMENT)); - returnValue.putAll(param); returnValue.put("MONEY",factmoney.toString()); return returnValue; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCapitalToTaxToJust.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCapitalToTaxToJust.java new file mode 100644 index 000000000..3fb080deb --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCapitalToTaxToJust.java @@ -0,0 +1,27 @@ +package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan; + +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.Map; + +import com.amarsoft.are.jbo.JBOTransaction; +import com.tenwa.comm.exception.BusinessException; +import com.tenwa.voucher.service.VoucherJavaParamService; +/** + * 车款-首付款的税金 + * @author xiezhiwen + */ +public class ContractCapitalToTaxToJust implements VoucherJavaParamService{ + public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + MapreturnValue=new HashMap(); + returnValue.putAll(param); + String FIRST_PAYMENT=param.get("FIRST_PAYMENT")==null?"0.00":param.get("FIRST_PAYMENT"); + String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT"); + String tax="1.06"; + BigDecimal divisor= new BigDecimal(tax); + BigDecimal sumMoney=new BigDecimal(FIRST_PAYMENT).subtract(new BigDecimal(EQUIP_AMT)); + BigDecimal taxMoney=sumMoney.subtract(sumMoney.divide(divisor, 2, BigDecimal.ROUND_HALF_UP)); + returnValue.put("MONEY",taxMoney.toString()); + return returnValue; + } +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractEquipToJust.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractEquipToJust.java new file mode 100644 index 000000000..b462a660e --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractEquipToJust.java @@ -0,0 +1,21 @@ +package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan; + +import java.util.HashMap; +import java.util.Map; + +import com.amarsoft.are.jbo.JBOTransaction; +import com.tenwa.comm.exception.BusinessException; +import com.tenwa.voucher.service.VoucherJavaParamService; +/** + * 获取设备款 + * @author xiezhiwen + */ +public class ContractEquipToJust implements VoucherJavaParamService{ + public Map getJavaParam(JBOTransaction tx, + Map param) throws BusinessException { + MapreturnValue=new HashMap(); + returnValue.putAll(param); + returnValue.put("MONEY",param.get("EQUIP_AMT")); + return returnValue; + } +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java index abd19f784..a5aa7c816 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java @@ -6,7 +6,10 @@ import java.util.Map; import com.amarsoft.are.jbo.JBOTransaction; import com.tenwa.comm.exception.BusinessException; import com.tenwa.voucher.service.VoucherJavaParamService; - +/** + * 获取税金 + * @author xiezhiwen + */ public class ContractInterestTax implements VoucherJavaParamService{ @Override diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FirstPaymentToTaxToJust.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FirstPaymentToTaxToJust.java new file mode 100644 index 000000000..4ff052b47 --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FirstPaymentToTaxToJust.java @@ -0,0 +1,28 @@ +package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan; + +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.Map; + +import com.amarsoft.are.jbo.JBOTransaction; +import com.tenwa.comm.exception.BusinessException; +import com.tenwa.voucher.service.VoucherJavaParamService; +/** + * 获取首付款的税金 + * @author xiezhiwen + */ +public class FirstPaymentToTaxToJust implements VoucherJavaParamService{ + + @Override + public Map getJavaParam(JBOTransaction tx, + Map param) throws BusinessException { + MapreturnValue=new HashMap(); + returnValue.putAll(param); + String FIRST_PAYMENT=param.get("FIRST_PAYMENT")==null?"0.00":param.get("FIRST_PAYMENT"); + String tax="1.06"; + BigDecimal divisor= new BigDecimal(tax); + BigDecimal factmoney=new BigDecimal(FIRST_PAYMENT).subtract(new BigDecimal(FIRST_PAYMENT).divide(divisor, 2, BigDecimal.ROUND_HALF_UP)); + returnValue.put("MONEY",factmoney.toString()); + return returnValue; + } +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java index ad63f7093..617c5d73d 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java @@ -7,27 +7,26 @@ import java.util.Map; import com.amarsoft.are.jbo.JBOTransaction; import com.tenwa.comm.exception.BusinessException; import com.tenwa.voucher.service.VoucherJavaParamService; - +/** + * 获取购置税+保险+装潢费+其它费用的和 + * @author xiezhiwen + */ public class OtherFee implements VoucherJavaParamService{ - - @Override public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { MapreturnValue=new HashMap(); - //其他（购置税/保险/GPS/装饰装潢等） + // 保险费 String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM"); + // 购置税 String PURCHASE_TAX=param.get("PURCHASE_TAX")==null?"0.00":param.get("PURCHASE_TAX"); + // 杂费 String INCIDENTAL=param.get("INCIDENTAL")==null?"0.00":param.get("INCIDENTAL"); + // 装潢费 String TABLEWARE_FEE=param.get("TABLEWARE_FEE")==null?"0.00":param.get("TABLEWARE_FEE"); - BigDecimal factmoney=new BigDecimal(INSURANCE_PREMIUM) - .add(new BigDecimal(PURCHASE_TAX)) - .add(new BigDecimal(INCIDENTAL)) - .add(new BigDecimal(TABLEWARE_FEE)); - + BigDecimal factmoney=new BigDecimal(INSURANCE_PREMIUM).add(new BigDecimal(PURCHASE_TAX)).add(new BigDecimal(INCIDENTAL)).add(new BigDecimal(TABLEWARE_FEE)); returnValue.putAll(param); returnValue.put("FUNDTYPE","01"); returnValue.put("MONEY",factmoney.toString()); return returnValue; } - } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoneyToJust.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoneyToJust.java new file mode 100644 index 000000000..e95bc1883 --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoneyToJust.java @@ -0,0 +1,31 @@ +package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan; + +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.Map; + +import com.amarsoft.are.jbo.JBOTransaction; +import com.tenwa.comm.exception.BusinessException; +import com.tenwa.voucher.service.VoucherJavaParamService; +/** + * 车款-首付款+购置税+保险+GPS+装饰装潢 + * @author xiezhiwen + */ +public class SynthesizeLeaseMoneyToJust implements VoucherJavaParamService{ + public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + MapreturnValue=new HashMap(); + String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT"); + String FIRST_PAYMENT=param.get("FIRST_PAYMENT")==null?"0.00":param.get("FIRST_PAYMENT"); + //车款-首付款 + BigDecimal factmoney1=new BigDecimal(EQUIP_AMT).subtract(new BigDecimal(FIRST_PAYMENT)); + String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM"); + String PURCHASE_TAX=param.get("PURCHASE_TAX")==null?"0.00":param.get("PURCHASE_TAX"); + String TABLEWARE_FEE=param.get("TABLEWARE_FEE")==null?"0.00":param.get("TABLEWARE_FEE"); + String GPS_FEE_FINANCE=param.get("GPS_FEE_FINANCE")==null?"0.00":param.get("GPS_FEE_FINANCE"); + // 各种款项相加 + BigDecimal factmoney=factmoney1.add(new BigDecimal(INSURANCE_PREMIUM)).add(new BigDecimal(PURCHASE_TAX)).add(new BigDecimal(TABLEWARE_FEE)).add(new BigDecimal(GPS_FEE_FINANCE)); + returnValue.putAll(param); + returnValue.put("MONEY",factmoney.toString()); + return returnValue; + } +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java index 75a097f02..f21b05295 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java @@ -10,7 +10,8 @@ public class CautionMoneyVoucher extends BaseBussiness { this.initBussinessParam(Sqlca); String FlowUnid=this.getAttribute("FlowUnid").toString(); CreateVoucherCustCautionMoneyIncome cvcc=new CreateVoucherCustCautionMoneyIncome(); - cvcc.CreateVoucher(FlowUnid, "PZ2018072400000059", "feetype17");//退回保证金 + cvcc.CreateVoucher(FlowUnid, "PZ2018072400000059", "feetype17");//退回保证金--回租 + cvcc.CreateVoucher(FlowUnid, "PZ2018080400000075", "feetype17");//退回保证金--直租 return "true"; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireChange.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireChange.java index 7284a0c24..d1af62fd6 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireChange.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireChange.java @@ -12,8 +12,11 @@ public class ContractOnhireChange extends BaseBussiness { String FlowUnid=this.getAttribute("FlowUnid").toString(); CreateVoucherContractOnhireChange cvco=new CreateVoucherContractOnhireChange(); - cvco.CreateVoucher(FlowUnid, "PZ2018072100000049"); - cvco.CreateVoucher(FlowUnid, "PZ2018072100000050"); + cvco.CreateVoucher(FlowUnid, "PZ2018072100000049");//合同变更-调整未实现利息收入--回租 + cvco.CreateVoucher(FlowUnid, "PZ2018080400000105");//合同变更-调整未实现利息收入--直租 + + cvco.CreateVoucher(FlowUnid, "PZ2018072100000050");//合同变更-调整利息的税--回租 + cvco.CreateVoucher(FlowUnid, "PZ2018080400000106");//合同变更-调整的税--直租 return "true"; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractTerminate.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractTerminate.java index 9366f4725..d664674c3 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractTerminate.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractTerminate.java @@ -12,10 +12,17 @@ public class ContractTerminate extends BaseBussiness { String FlowUnid=this.getAttribute("FlowUnid").toString(); CreateVoucherContractTerminate cvct=new CreateVoucherContractTerminate(); - cvct.CreateVoucher(FlowUnid, "PZ2018072100000026");//收到违约金 - cvct.CreateVoucher(FlowUnid, "PZ2018072100000027");//收到提前还款 - cvct.CreateVoucher(FlowUnid, "PZ2018072100000045");//未实现的利息（不含税） - cvct.CreateVoucher(FlowUnid, "PZ2018072100000046");//未实现的利息的税金 + cvct.CreateVoucher(FlowUnid, "PZ2018072100000026");//收到违约金/罚款--回租 + cvct.CreateVoucher(FlowUnid, "PZ2018080400000083");//收到违约金/罚款--直租 + + cvct.CreateVoucher(FlowUnid, "PZ2018072100000027");//收到提前还款--回租 + cvct.CreateVoucher(FlowUnid, "PZ2018080400000084");//收到提前还款--直租 + + cvct.CreateVoucher(FlowUnid, "PZ2018072100000045");//未实现的利息（不含税）--回租 + cvct.CreateVoucher(FlowUnid, "PZ2018080400000099");//未实现的利息（不含税）--直租 + + cvct.CreateVoucher(FlowUnid, "PZ2018072100000046");//未实现的利息的税金--回租 + cvct.CreateVoucher(FlowUnid, "PZ2018080400000100");//未实现的利息的税金--直租 return "true"; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/DistributorCautionMoneyVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/DistributorCautionMoneyVoucher.java index 6dce81ed6..cc24c56d4 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/DistributorCautionMoneyVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/DistributorCautionMoneyVoucher.java @@ -12,8 +12,11 @@ public class DistributorCautionMoneyVoucher extends BaseBussiness { String FlowUnid=this.getAttribute("FlowUnid").toString(); CreateVoucherDistCautionMoneyRe cvdc=new CreateVoucherDistCautionMoneyRe(); - cvdc.CreateVoucher(FlowUnid, "PZ2018071100000011");//退回经销商保证金 - cvdc.CreateVoucher(FlowUnid, "PZ2018072100000032");//收取经销商保证金 + cvdc.CreateVoucher(FlowUnid, "PZ2018071100000011");//退回经销商保证金 --回租 + cvdc.CreateVoucher(FlowUnid, "PZ2018080400000076");//退回经销商保证金 --直租 + + cvdc.CreateVoucher(FlowUnid, "PZ2018072100000032");//收到经销商保证金--回租 + cvdc.CreateVoucher(FlowUnid, "PZ2018080400000088");//收到经销商保证金--直租 return "true"; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java index 09ac4c392..f28e1ccf3 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java @@ -13,10 +13,18 @@ public class IncomeVoucher extends BaseBussiness { String FlowUnid=this.getAttribute("FlowUnid").toString(); CreateVoucherCustCautionMoneyIncome cvci=new CreateVoucherCustCautionMoneyIncome(); - cvci.CreateVoucher(FlowUnid, "PZ2018071100000012", "feetype2");//收到客户保证金 - cvci.CreateVoucher(FlowUnid, "PZ2018072100000023", "feetype1");//按月分摊的保证金 - cvci.CreateVoucher(FlowUnid, "PZ2018072100000031", "feetype4");//都到留购价款 - cvci.CreateVoucher(FlowUnid, "PZ2018072100000028", "feetype27");//贴息 + cvci.CreateVoucher(FlowUnid, "PZ2018071100000012", "feetype2");//收到客户保证金 --回租 + cvci.CreateVoucher(FlowUnid, "PZ2018080400000078", "feetype2");//收到客户保证金 --直租 + + cvci.CreateVoucher(FlowUnid, "PZ2018072100000023", "feetype1");//确认收到手续费（按月分摊收入）--回租 + cvci.CreateVoucher(FlowUnid, "PZ2018080400000080", "feetype1");//确认收到手续费（按月分摊收入）--直租 + + + cvci.CreateVoucher(FlowUnid, "PZ2018072100000031", "feetype4");//回款-收到名义货价--回租 + cvci.CreateVoucher(FlowUnid, "PZ2018080400000087", "feetype4");//回款-收到名义货价--直租 + + cvci.CreateVoucher(FlowUnid, "PZ2018072100000028", "feetype27");//贴息--回租 + cvci.CreateVoucher(FlowUnid, "PZ2018080400000085", "feetype27");//贴息--直租 /*CreateVoucherRentIncome cvri=new CreateVoucherRentIncome(); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java index d63d9402b..4082eb2f5 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java @@ -15,15 +15,26 @@ public class RedIncomeVoucher extends BaseBussiness { * 回款反冲的凭证生成 */ CreateVoucherCustCautionMoneyIncome cvci=new CreateVoucherCustCautionMoneyIncome(); - cvci.CreateVoucher(FlowUnid, "PZ2018072100000034", "feetype2");//收到客户保证金 - cvci.CreateVoucher(FlowUnid, "PZ2018072100000036", "feetype1");//按月分摊的保证金 - cvci.CreateVoucher(FlowUnid, "PZ2018072100000043", "feetype4");//都到留购价款 - cvci.CreateVoucher(FlowUnid, "PZ2018072100000041", "feetype27");//贴息 + cvci.CreateVoucher(FlowUnid, "PZ2018072100000034", "feetype2");//收到客户保证金--回租 + cvci.CreateVoucher(FlowUnid, "PZ2018080400000089", "feetype2");//收到客户保证金--直租 + + cvci.CreateVoucher(FlowUnid, "PZ2018072100000036", "feetype1");//回款反冲-确认收到手续费（按月分摊收入--回租 + cvci.CreateVoucher(FlowUnid, "PZ2018080400000090", "feetype1");//回款反冲-确认收到手续费（按月分摊收入--直租 + + cvci.CreateVoucher(FlowUnid, "PZ2018072100000043", "feetype4");//回款反冲-收到名义货价--回租 + cvci.CreateVoucher(FlowUnid, "PZ2018080400000097", "feetype4");//回款反冲-收到名义货价--回租 + + cvci.CreateVoucher(FlowUnid, "PZ2018072100000041", "feetype27");//回款反冲-收到的贴息--回租 + cvci.CreateVoucher(FlowUnid, "PZ2018080400000095", "feetype27");//回款反冲-收到的贴息--直租 + CreateVoucherRedRentIncome cvri=new CreateVoucherRedRentIncome(); - cvri.CreateVoucher(FlowUnid, "PZ2018072100000037");//收到租金 - cvri.CreateVoucher(FlowUnid, "PZ2018072100000038");//收到逾期利息 + cvri.CreateVoucher(FlowUnid, "PZ2018072100000037");//收到的租金--回租 + cvri.CreateVoucher(FlowUnid, "PZ2018080400000091");//收到的租金--直租 + + cvri.CreateVoucher(FlowUnid, "PZ2018072100000038");//收到逾期利息--回租 + cvri.CreateVoucher(FlowUnid, "PZ2018080400000092");//收到逾期利息--直租 return "true"; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java index 196e229f0..563984db3 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java @@ -45,13 +45,17 @@ public class CreateVoucherMonthSettlement{ param.clear(); String sql=""; String moneyType="MONEY"; - if("PZ2018071200000017".equals(voucherNo)) moneyType="FEEMONEY"; - if("PZ2018071200000016".equals(voucherNo)) moneyType="MONEY"; + if("PZ2018071200000017".equals(voucherNo)||"PZ2018080400000104".equals(voucherNo)) moneyType="FEEMONEY"; + if("PZ2018071200000016".equals(voucherNo)||"PZ2018080400000102".equals(voucherNo)) moneyType="MONEY"; sql="SELECT CRM.INTEREST AS MONEY,CRM.FEE AS FEEMONEY,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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.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 DATE_FORMAT(STR_TO_DATE(CRM.END_DATE,'%Y/%m/%d'),'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')"; - + //租金的利息税金 if("PZ2018072100000055".equals(voucherNo)){ sql="SELECT LRP.INTEREST-ROUND(LRP.INTEREST/1.06,2) AS MONEY,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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_RENT_PLAN LRP INNER JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LRP.CONTRACT_ID INNER 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 DATE_FORMAT(SYSDATE(),'%Y/%m/%d')=DATE_FORMAT(STR_TO_DATE(LRP.PLAN_DATE,'%Y/%m/%d'),'%Y/%m/%d')"; } + //租金的税金 + if("PZ2018080200000063".equals(voucherNo)){ + sql="SELECT LRP.RENT-ROUND(LRP.RENT/1.06,2) AS MONEY,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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_RENT_PLAN LRP INNER JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LRP.CONTRACT_ID INNER 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 DATE_FORMAT(SYSDATE(),'%Y/%m/%d')=DATE_FORMAT(STR_TO_DATE(LRP.PLAN_DATE,'%Y/%m/%d'),'%Y/%m/%d')"; + } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java index 031e98e33..523e4fd11 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java @@ -44,10 +44,10 @@ public class CreateVoucherRedRentIncome { param.clear(); map.clear(); map.put("FLOWUNID", FlowUnid); - if("PZ2018072100000037".equals(VOUCHERNO)){ + if("PZ2018072100000037".equals(VOUCHERNO)||"PZ2018080400000091".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.CERTID 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 LrIT.FLOWUNID=:FLOWUNID"; } - if("PZ2018072100000038".equals(VOUCHERNO)){ + if("PZ2018072100000038".equals(VOUCHERNO)||"PZ2018080400000092".equals(VOUCHERNO)){ sql= "SELECT LrIT.penalty AS MONEY,ROUND(LrIT.penalty/1.06,2) AS MONEYNOTAX,LrIT.penalty-ROUND(LrIT.penalty/1.06,2) 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.CERTID 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 LrIT.FLOWUNID=:FLOWUNID"; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java index ddc7c0603..c10182af2 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java @@ -42,10 +42,10 @@ public class CreateVoucherRentIncome { String ACC_NUM=null; String sql=""; param.clear(); - if("PZ2018072100000024".equals(VOUCHERNO)){ + if("PZ2018072100000024".equals(VOUCHERNO)||"PZ2018080400000081".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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LrIT.OWN_NUMBER FROM LC_rent_INCOME 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 DATE_FORMAT(LrIT.hire_date,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d') "; } - if("PZ2018072100000025".equals(VOUCHERNO)){ + if("PZ2018072100000025".equals(VOUCHERNO)||"PZ2018080400000082".equals(VOUCHERNO)){ sql= "SELECT LrIT.penalty AS MONEY,ROUND(LrIT.penalty/1.06,2) AS MONEYNOTAX,LrIT.penalty-ROUND(LrIT.penalty/1.06,2) 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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LrIT.OWN_NUMBER FROM LC_rent_INCOME 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 DATE_FORMAT(LrIT.hire_date,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')"; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java index ae23e6b34..e5fc0fd9f 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java @@ -13,9 +13,14 @@ public class CreateVoucherMonthSettlementMission implements Job { public void execute(JobExecutionContext arg0) throws JobExecutionException { try{ CreateVoucherMonthSettlement vouchermanage=new CreateVoucherMonthSettlement(); - vouchermanage.CreateVoucher("PZ2018071200000017");//月结手续费 - vouchermanage.CreateVoucher("PZ2018071200000016");//月结利息 - vouchermanage.CreateVoucher("PZ2018072100000055");//日结税金 + vouchermanage.CreateVoucher("PZ2018071200000017");//月结手续费--回租 + vouchermanage.CreateVoucher("PZ2018080400000104");//月结手续费--直租 + + vouchermanage.CreateVoucher("PZ2018071200000016");//月结-确认未实现利息收入--回租 + vouchermanage.CreateVoucher("PZ2018080400000102");//月结-确认未实现利息收入--直租 + + vouchermanage.CreateVoucher("PZ2018072100000055");//日结税金--回租 + vouchermanage.CreateVoucher("PZ2018080200000063");//日结税金--直租 QuartzUtil.insertLog("com.tenwa.lease.app.quartzmession.CreateVoucherMonthSettlementMission", "success", "成功"); } catch (Exception e) { QuartzUtil.insertLog("com.tenwa.lease.app.quartzmession.CreateVoucherMonthSettlementMission", "error", "失败"); diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java index a08c7ee4f..8b92ddcdf 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java @@ -15,12 +15,18 @@ public class CreateVoucherRentIncomeMission implements Job { public void execute(JobExecutionContext arg0) throws JobExecutionException { try{ CreateVoucherRentIncome cvri=new CreateVoucherRentIncome(); - cvri.CreateVoucher("PZ2018072100000024");//收到租金 - cvri.CreateVoucher("PZ2018072100000025");//收到逾期利息 + cvri.CreateVoucher("PZ2018072100000024");//收到租金--回租 + cvri.CreateVoucher("PZ2018080400000081");//收到租金--直租 + + cvri.CreateVoucher("PZ2018072100000025");//收到逾期利息--回租 + cvri.CreateVoucher("PZ2018080400000082");//收到逾期利息--直租 CreateVoucherInsuranceSettlement cvis=new CreateVoucherInsuranceSettlement(); - cvis.CreateVoucher("PZ2018072100000029");//收到理赔保险费 - cvis.CreateVoucher("PZ2018072100000054");//收到理赔保险费 + cvis.CreateVoucher("PZ2018072100000029");//收到理赔保险费 --回租 + cvis.CreateVoucher("PZ2018080400000086");//收到理赔保险费 --直租 + + cvis.CreateVoucher("PZ2018072100000054");//保险理赔 -记录理赔保险费--回租 + cvis.CreateVoucher("PZ2018080200000064");//保险理赔 -记录理赔保险费--直租 QuartzUtil.insertLog("com.tenwa.comm.message.controller.BusinessCancelJob", "success", "成功"); } catch (Exception e) {