From 52255086a46fd5b607c6fdfd895561c60db6c60f Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Sat, 4 Aug 2018 09:57:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=B7=E7=A7=9F=E5=87=AD=E8=AF=81--=E7=9B=B4?= =?UTF-8?q?=E7=A7=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContractInterestTax.java | 1 - .../SynthesizeLeaseMoney.java | 4 +-- .../CreateVoucherLoanDistributor.java | 8 ++--- .../ContractOnhireVoucher.java | 32 ++++++++++++++----- 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java index edec4c1ab..abd19f784 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java @@ -18,5 +18,4 @@ public class ContractInterestTax implements VoucherJavaParamService{ returnValue.put("MONEY",param.get("TAX")); return returnValue; } - } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoney.java index 41ef7d55d..3839790b1 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoney.java @@ -24,11 +24,11 @@ public class SynthesizeLeaseMoney implements VoucherJavaParamService{ 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 GPS_FEE_FINANCE=param.get("GPS_FEE_FINANCE")==null?"0.00":param.get("GPS_FEE_FINANCE"); + String TABLEWARE_FEE=param.get("TABLEWARE_FEE")==null?"0.00":param.get("TABLEWARE_FEE"); BigDecimal factmoney=factmoney1.add(new BigDecimal(INSURANCE_PREMIUM)) .add(new BigDecimal(PURCHASE_TAX)) .add(new BigDecimal(INCIDENTAL)) - .add(new BigDecimal(GPS_FEE_FINANCE)); + .add(new BigDecimal(TABLEWARE_FEE)); returnValue.putAll(param); returnValue.put("MONEY",factmoney.toString()); return returnValue; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java index a039c52cc..fcc0a71c3 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java @@ -48,16 +48,16 @@ public class CreateVoucherLoanDistributor { moneyDataSource="LCCT.EQUIP_AMT"; } //起租-经销商支付的预付款(首付) - if("PZ2018070900000003".equals(VOUCHERNO)){ + if("PZ2018070900000003".equals(VOUCHERNO)||"PZ2018080200000065".equals(VOUCHERNO)){ moneyDataSource="LCCT.FIRST_PAYMENT"; } - if("PZ2018071000000004".equals(VOUCHERNO)||"PZ2018071000000006".equals(VOUCHERNO)){ + if("PZ2018071000000004".equals(VOUCHERNO)||"PZ2018071000000006".equals(VOUCHERNO)||"PZ2018080300000070".equals(VOUCHERNO)||"PZ2018080300000071".equals(VOUCHERNO)){ moneyDataSource="LCCT.CAUTION_MONEY"; } - if("PZ2018073100000061".equals(VOUCHERNO)){ + if("PZ2018073100000061".equals(VOUCHERNO)||"PZ2018080300000068".equals(VOUCHERNO)){ moneyDataSource="LCCT.GPS_FEE"; } - if("PZ2018073100000062".equals(VOUCHERNO)){ + if("PZ2018073100000062".equals(VOUCHERNO)||"PZ2018080300000066".equals(VOUCHERNO)){ moneyDataSource="(LCCT.PURCHASE_TAX+LCCT.INSURANCE_PREMIUM+LCCT.INCIDENTAL+LCCT.TABLEWARE_FEE)"; } //sql= "SELECT "+moneyDataSource+ " AS 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,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMERID,CIF.CUSTOMERNAME FROM LC_CALC_CONDITION_TEMP LCCT 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 WHERE LCCT.FLOWUNID=:FLOWUNID"; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java index 9eaa363fb..0fcfc8a0b 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java @@ -16,19 +16,35 @@ public class ContractOnhireVoucher extends BaseBussiness { CreateVoucherLoanDistributor cvld=new CreateVoucherLoanDistributor(); cvld.CreateVoucher(FlowUnid, "PZ2018070900000002");//记录给经销商放款-车款全款-回 cvld.CreateVoucher(FlowUnid, "PZ2018072400000060");//记录给经销商放款-车款全款-直 - cvld.CreateVoucher(FlowUnid, "PZ2018070900000003");//经销商支付的预付款(首付) - cvld.CreateVoucher(FlowUnid, "PZ2018071000000004");//记录保证金（合同结束后要退回给客户，或者冲抵其他款项） - cvld.CreateVoucher(FlowUnid, "PZ2018071000000006");//给经销商放款冲抵客户保证金 - cvld.CreateVoucher(FlowUnid, "PZ2018073100000062");//购置税+保险+装饰 - cvld.CreateVoucher(FlowUnid, "PZ2018073100000061");//GPS + + cvld.CreateVoucher(FlowUnid, "PZ2018070900000003");//经销商支付的预付款(首付)-回租 + cvld.CreateVoucher(FlowUnid, "PZ2018080200000065");//经销商支付的预付款(首付)-直租 + + cvld.CreateVoucher(FlowUnid, "PZ2018071000000004");//记录保证金（合同结束后要退回给客户，或者冲抵其他款项）--回租 + cvld.CreateVoucher(FlowUnid, "PZ2018080300000070");//记录保证金（合同结束后要退回给客户，或者冲抵其他款项）--直租 + + cvld.CreateVoucher(FlowUnid, "PZ2018071000000006");//给经销商放款冲抵客户保证金--回租 + cvld.CreateVoucher(FlowUnid, "PZ2018080300000071");//给经销商放款冲抵客户保证金--直租 + + cvld.CreateVoucher(FlowUnid, "PZ2018073100000062");//购置税+保险+装饰 --回租 + cvld.CreateVoucher(FlowUnid, "PZ2018080300000066");//购置税+保险+装饰 --直租 + + cvld.CreateVoucher(FlowUnid, "PZ2018073100000061");//GPS--回租 + cvld.CreateVoucher(FlowUnid, "PZ2018080300000068");//GPS--直租 CreateVoucherCustomerRentOrFee cvcr=new CreateVoucherCustomerRentOrFee(); cvcr.CreateVoucher(FlowUnid, "PZ2018071000000005");//客户支付的应收账款总金额 - cvcr.CreateVoucher(FlowUnid, "PZ2018071100000010");//给经销商放款-车款及其他绑定款项 + cvcr.CreateVoucher(FlowUnid, "PZ2018080300000069");//客户支付的应收账款总金额 + + cvcr.CreateVoucher(FlowUnid, "PZ2018071100000010");//给经销商放款-车款及其他绑定款项--回租 + cvcr.CreateVoucher(FlowUnid, "PZ2018080300000074");//给经销商放款-车款及其他绑定款项--直租 CreateVoucherHandlingMoney cvhl=new CreateVoucherHandlingMoney(); - cvhl.CreateVoucher(FlowUnid, "PZ2018071000000007");//给经销商放款冲抵确认手续费收入（一次性确认收入） - cvhl.CreateVoucher(FlowUnid, "PZ2018071000000009");//给经销商放款冲抵确认收到手续费（按月分摊收入） + cvhl.CreateVoucher(FlowUnid, "PZ2018071000000007");//给经销商放款冲抵确认手续费收入（一次性确认收入）--回租 + cvhl.CreateVoucher(FlowUnid, "PZ2018080300000072");//给经销商放款冲抵确认手续费收入（一次性确认收入）--回租 + + cvhl.CreateVoucher(FlowUnid, "PZ2018071000000009");//给经销商放款冲抵确认收到手续费（按月分摊收入）--直租 + cvhl.CreateVoucher(FlowUnid, "PZ2018080300000073");//给经销商放款冲抵确认收到手续费（按月分摊收入）--回租 //CreateVoucherCustCautionMoneyIncome cvci=new CreateVoucherCustCautionMoneyIncome();