From fcb37049e9b46fbb54eb6c40464bc94fe9006c0c Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Mon, 13 Aug 2018 11:02:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E5=9B=9E=E7=A7=9F=E7=A7=91?= =?UTF-8?q?=E7=9B=AE=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherCustCautionMoneyIncome.java | 8 +++- .../CreateVoucherCustomerRentOrFee.java | 5 ++- .../CreateVoucherHandlingMoney.java | 2 +- .../CleanLeaseMoneyAddOtherNoGps.java | 42 +++++++++++++++++++ .../CleanLeaseMoneyAddOthers.java | 41 ++++++++++++++++++ .../CreateVoucherLoanDistributor.java | 4 +- .../ContractOnhireVoucher.java | 1 + .../IncomeVoucher.java | 2 + .../RedIncomeVoucher.java | 7 +++- 9 files changed, 105 insertions(+), 7 deletions(-) create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOtherNoGps.java create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOthers.java diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java index 7e21a43b4..35a4e38b0 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java @@ -46,7 +46,13 @@ public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness { map.put("FEE_TYPE", FeeType); //sql= "SELECT LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY/1.06,2)AS MONEYNOTAX,(LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/1.06,2)) 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,LEC.ID AS CARID,LEC.MODEL,CIF.CERTID 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 WHERE LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID AND DATE_FORMAT(LFIT.FACT_DATE,'%Y/%m')=DATE_FORMAT(SYSDATE(),'%Y/%m')"; - sql = "SELECT LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY/1.06,2) AS MONEYNOTAX,(LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/1.06,2)) 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,LEC.ID AS CARID,LEC.MODEL ,CIF.CERTID 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 WHERE LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID "; + sql = "SELECT LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY/1.06,2) AS MONEYNOTAX,(LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/1.06,2)) 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,LEC.ID AS CARID,LEC.MODEL ,CIF.CERTID 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 LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID "; + // 区分一次性收入和按月分摊--0010=一次性/0020=按月分摊 + if("PZ2018071100000014".equals(VOUCHERNO)||"PZ2018080400000079".equals(VOUCHERNO)||"PZ2018072100000035".equals(VOUCHERNO)||"PZ2018080400000111".equals(VOUCHERNO)) { + sql+=" AND LCCT.HANDLING_CHARGE_MONEY_TYPE='0010'"; + }else if("PZ2018072100000023".equals(VOUCHERNO)||"PZ2018080400000080".equals(VOUCHERNO)||"PZ2018072100000036".equals(VOUCHERNO)||"PZ2018080400000090".equals(VOUCHERNO)){ + sql+=" AND LCCT.HANDLING_CHARGE_MONEY_TYPE='0020'"; + } // 查询sql, 将结果集封装到list集合中 List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java index 95e2a09e7..3a106997c 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java @@ -25,6 +25,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { String EQUIP_AMT=null; String FIRST_PAYMENT=null; String CLEAN_LEASE_MONEY=null; + String HANDLING_CHARGE_MONEY=null; String INSURANCE_PREMIUM=null; String PURCHASE_TAX=null; String INCIDENTAL=null; @@ -51,7 +52,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { //String FlowUnid=this.getAttribute("FlowUnid").toString(); //String VOUCHERNO="PZ2018071000000005"; //String VOUCHERNO=this.getAttribute("VoucherNo").toString(); - String sql="SELECT LCCT.EQUIP_AMT,LCCT.FIRST_PAYMENT,LCCT.CLEAN_LEASE_MONEY,LCCT.INSURANCE_PREMIUM,LCCT.PURCHASE_TAX,LCCT.INCIDENTAL,LCCT.GPS_FEE as GPS_FEE_FINANCE,LCCT.TABLEWARE_FEE,LRPT.INTEREST,LRPT.INTERESTNOTAX,LRPT.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,LEC.ID AS CARID,LEC.MODEL,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,lfit.ACC_NUMBER FROM LC_CALC_CONDITION LCCT inner join (SELECT contract_id,FLOWUNID,min(ACC_NUMBER) ACC_NUMBER 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=LCCT.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,SUM(INTEREST) AS INTEREST,SUM(ROUND((INTEREST/1.06),2)) AS INTERESTNOTAX,SUM(INTEREST-ROUND((INTEREST/1.06),2)) AS TAX FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID=LCCT.FLOWUNID 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"; + String sql="SELECT LCCT.EQUIP_AMT,LCCT.FIRST_PAYMENT,LCCT.HANDLING_CHARGE_MONEY,LCCT.CLEAN_LEASE_MONEY,LCCT.INSURANCE_PREMIUM,LCCT.PURCHASE_TAX,LCCT.INCIDENTAL,LCCT.GPS_FEE as GPS_FEE_FINANCE,LCCT.TABLEWARE_FEE,LRPT.INTEREST,LRPT.INTERESTNOTAX,LRPT.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,LEC.ID AS CARID,LEC.MODEL,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,lfit.ACC_NUMBER FROM LC_CALC_CONDITION LCCT inner join (SELECT contract_id,FLOWUNID,min(ACC_NUMBER) ACC_NUMBER 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=LCCT.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,SUM(INTEREST) AS INTEREST,SUM(ROUND((INTEREST/1.06),2)) AS INTERESTNOTAX,SUM(INTEREST-ROUND((INTEREST/1.06),2)) AS TAX FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID=LCCT.FLOWUNID 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"; param.clear(); map.put("FLOWUNID", FlowUnid); @@ -64,6 +65,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { EQUIP_AMT=dataList.get(i).get("EQUIP_AMT").toString(); FIRST_PAYMENT=dataList.get(i).get("FIRST_PAYMENT").toString(); CLEAN_LEASE_MONEY=dataList.get(i).get("CLEAN_LEASE_MONEY").toString(); + HANDLING_CHARGE_MONEY=dataList.get(i).get("HANDLING_CHARGE_MONEY").toString(); INSURANCE_PREMIUM=dataList.get(i).get("INSURANCE_PREMIUM").toString(); PURCHASE_TAX=dataList.get(i).get("PURCHASE_TAX").toString(); INCIDENTAL=dataList.get(i).get("INCIDENTAL").toString(); @@ -93,6 +95,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { param.put("EQUIP_AMT",EQUIP_AMT); param.put("FIRST_PAYMENT",FIRST_PAYMENT); param.put("FACT_MONEY",CLEAN_LEASE_MONEY); + param.put("HANDLING_CHARGE_MONEY",HANDLING_CHARGE_MONEY); param.put("INSURANCE_PREMIUM",INSURANCE_PREMIUM); param.put("PURCHASE_TAX",PURCHASE_TAX); param.put("INCIDENTAL",INCIDENTAL); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java index 3b749638b..a9e1fceec 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java @@ -49,7 +49,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { sql+=" AND lcct.HANDLING_CHARGE_MONEY='0020'"; } if("PZ2018071000000007".equals(VOUCHERNO)||"PZ2018080300000072".equals(VOUCHERNO)){ - //sql+="AND lcct.HANDLING_CHARGE_MONEY='0010'"; + sql+="AND lcct.HANDLING_CHARGE_MONEY='0010'"; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOtherNoGps.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOtherNoGps.java new file mode 100644 index 000000000..7804f0251 --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOtherNoGps.java @@ -0,0 +1,42 @@ +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 CleanLeaseMoneyAddOtherNoGps 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"); + // 保险费 + 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 HANDLING_CHARGE_MONEY=param.get("HANDLING_CHARGE_MONEY")==null?"0.00":param.get("GPS_FEE_FINANCE"); + // 运算 + BigDecimal factmoney=new BigDecimal(EQUIP_AMT) + .subtract(new BigDecimal(FIRST_PAYMENT)) + .add(new BigDecimal(PURCHASE_TAX)) + .add(new BigDecimal(INSURANCE_PREMIUM)) + .add(new BigDecimal(TABLEWARE_FEE)) + .add(new BigDecimal(HANDLING_CHARGE_MONEY)); + returnValue.putAll(param); + returnValue.put("FUNDTYPE","01"); + returnValue.put("MONEY",factmoney.toString()); + return returnValue; + } +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOthers.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOthers.java new file mode 100644 index 000000000..2f0faaeb2 --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOthers.java @@ -0,0 +1,41 @@ +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 CleanLeaseMoneyAddOthers implements VoucherJavaParamService { + public Map getJavaParam(JBOTransaction tx, + Map param) throws BusinessException { + MapreturnValue=new HashMap(); + // 融资租赁产 + String CLEAN_LEASE_MONEY=param.get("FACT_MONEY")==null?"0.00":param.get("FACT_MONEY"); + // 保险费 + 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"); + // gps + String GPS_FEE_FINANCE=param.get("GPS_FEE_FINANCE")==null?"0.00":param.get("GPS_FEE_FINANCE"); + BigDecimal factmoney=new BigDecimal(CLEAN_LEASE_MONEY) + .add(new BigDecimal(INSURANCE_PREMIUM)) + .add(new BigDecimal(PURCHASE_TAX)) + .add(new BigDecimal(INCIDENTAL)) + .add(new BigDecimal(TABLEWARE_FEE)) + .add(new BigDecimal(GPS_FEE_FINANCE)); + returnValue.putAll(param); + returnValue.put("FUNDTYPE","01"); + 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 4e4f19e02..46944373b 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java @@ -73,8 +73,8 @@ public class CreateVoucherLoanDistributor { if("".equals(MONEY)||MONEY==null) MONEY="0.00"; double mon=Double.parseDouble(MONEY); if(mon>0){ - MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString(); - MONEYTAX=dataList.get(i).get("MONEYTAX").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(); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java index 1a347e064..52c4c1929 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java @@ -24,6 +24,7 @@ public class ContractOnhireVoucher extends BaseBussiness { cvld.CreateVoucher(FlowUnid, "PZ2018071000000006");//给经销商放款冲抵客户保证金--回租 cvld.CreateVoucher(FlowUnid, "PZ2018080300000071");//给经销商放款冲抵客户保证金--直租 + cvld.CreateVoucher(FlowUnid, "PZ2018073100000062");//记录给经销商放款-其他（购置税/保险/装饰装潢等） --回租 cvld.CreateVoucher(FlowUnid, "PZ2018080300000066");//记录给经销商放款-其他（购置税/保险/装饰装潢等）--直租 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java index 5785427b9..277cc3dd0 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java @@ -19,6 +19,8 @@ public class IncomeVoucher extends BaseBussiness { cvci.CreateVoucher(FlowUnid, "PZ2018072100000023", "feetype1");//确认收到手续费（按月分摊收入）--回租 cvci.CreateVoucher(FlowUnid, "PZ2018080400000080", "feetype1");//确认收到手续费（按月分摊收入）--直租 + cvci.CreateVoucher(FlowUnid, "PZ2018071100000014", "feetype1");//确认收到手续费（一次性确认收入）--直租 + cvci.CreateVoucher(FlowUnid, "PZ2018080400000079", "feetype1");//确认收到手续费（一次性确认收入）--直租 cvci.CreateVoucher(FlowUnid, "PZ2018072100000031", "feetype4");//回款-收到名义货价--回租 cvci.CreateVoucher(FlowUnid, "PZ2018080400000087", "feetype4");//回款-收到名义货价--直租 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java index cef44f390..02b1a63d1 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java @@ -22,8 +22,11 @@ public class RedIncomeVoucher extends BaseBussiness { cvci.CreateVoucher(FlowUnid, "PZ2018072100000034", "feetype2");//收到客户保证金--回租 cvci.CreateVoucher(FlowUnid, "PZ2018080400000089", "feetype2");//收到客户保证金--直租 - cvci.CreateVoucher(FlowUnid, "PZ2018072100000036", "feetype1");//回款反冲-确认收到手续费（按月分摊收入--回租 - cvci.CreateVoucher(FlowUnid, "PZ2018080400000090", "feetype1");//回款反冲-确认收到手续费（按月分摊收入--直租 + cvci.CreateVoucher(FlowUnid, "PZ2018072100000036", "feetype1");//回款反冲-确认收到手续费（按月分摊收入)--回租 + cvci.CreateVoucher(FlowUnid, "PZ2018080400000090", "feetype1");//回款反冲-确认收到手续费（按月分摊收入)--直租 + + cvci.CreateVoucher(FlowUnid, "PZ2018072100000035", "feetype1");//回款反冲-确认收到手续费（一次性收入)--回租 + cvci.CreateVoucher(FlowUnid, "PZ2018080400000111", "feetype1");//回款反冲-确认收到手续费（一次性收入)--直租 cvci.CreateVoucher(FlowUnid, "PZ2018072100000043", "feetype4");//回款反冲-收到名义货价--回租 cvci.CreateVoucher(FlowUnid, "PZ2018080400000097", "feetype4");//回款反冲-收到名义货价--直租