From c50dfb6b7295e461fc548cf4eb5d4922fddc6bab Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Mon, 13 Aug 2018 20:31:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherCustomerRentOrFee.java | 5 +- .../CreateVoucherDistCautionMoneyRe.java | 11 +- .../CreateVoucherHandlingMoney.java | 2 +- .../CreateVoucherLoan/CleanLeaseMoney.java | 15 ++- .../CleanLeaseMoneyAddOtherNoGps.java | 7 +- .../CleanLeaseMoneyAddOthers.java | 4 +- .../CommLoanFactMoneyToMoney.java | 1 - .../ContractOnhireVoucher.java | 8 +- .../DistributorCautionMoneyVoucher.java | 6 +- .../RedIncomeVoucher.java | 2 +- .../CreateVoucherToCommission.java | 126 ++++++++++++++++++ 11 files changed, 160 insertions(+), 27 deletions(-) create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToCommission.java diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java index 3a106997c..53ceb6c80 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java @@ -49,10 +49,11 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { String CUSTOMERTYPE=null; String BUSINESSTYPE=null; String ACC_NUM=null; + String CAUTION_MONEY=null; //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.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"; + String sql="SELECT LCCT.EQUIP_AMT,LCCT.FIRST_PAYMENT,LCCT.HANDLING_CHARGE_MONEY,LCCT.CLEAN_LEASE_MONEY,IFNULL(LCCT.CAUTION_MONEY,0)AS CAUTION_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); @@ -65,6 +66,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(); + CAUTION_MONEY=dataList.get(i).get("CAUTION_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(); @@ -95,6 +97,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("CAUTION_MONEY",CAUTION_MONEY); param.put("HANDLING_CHARGE_MONEY",HANDLING_CHARGE_MONEY); param.put("INSURANCE_PREMIUM",INSURANCE_PREMIUM); param.put("PURCHASE_TAX",PURCHASE_TAX); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java index af8b0492c..1fbfc305f 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java @@ -36,14 +36,14 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { String sql=""; param.clear(); map.put("FLOWUNID", FlowUnid); - if("PZ2018071100000011".equals(VOUCHERNO)||"PZ2018080400000076".equals(VOUCHERNO)){ + if("PZ2018071100000011".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.LOCAL_ACCOUNT AS ACC_NUMBER," + "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)||"PZ2018080400000088".equals(VOUCHERNO)||"PZ2018080400000098".equals(VOUCHERNO)){ + if("PZ2018072100000032".equals(VOUCHERNO)||"PZ2018072100000044".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," @@ -63,15 +63,10 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { if(mon>0){ ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE").toString(); FACT_DATE =dataList.get(i).get("FACT_DATE").toString(); - if("PZ2018080400000098".equals(VOUCHERNO)) { - leas_form="01"; - }else { - leas_form="02"; - } DISTRIBUTOR_ID=dataList.get(i).get("DISTRIBUTOR_NO"); DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME"); ACC_NUMBER=dataList.get(i).get("ACC_NUMBER"); - + leas_form="02"; param.put("FACT_MONEY",MONEY); param.put("ACCOUNT_DATE",ACCOUNT_DATE); param.put("FACT_DATE",FACT_DATE); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java index a9e1fceec..d359c8d7b 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/CleanLeaseMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java index 91511b474..2f72d8d02 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java @@ -8,17 +8,26 @@ import com.amarsoft.are.jbo.JBOTransaction; import com.tenwa.comm.exception.BusinessException; import com.tenwa.voucher.service.VoucherJavaParamService; /** - * 车款-首付款 + * 车辆款-首付+其他+GPS（含税） * @author xiezhiwen */ public class CleanLeaseMoney implements VoucherJavaParamService { public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { MapreturnValue=new HashMap(); - //subtract + // 车款 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)); + // 杂费 + String INCIDENTAL=param.get("INCIDENTAL")==null?"0.00":param.get("INCIDENTAL"); + // GPS + String GPS_FEE_FINANCE=param.get("GPS_FEE_FINANCE")==null?"0.00":param.get("GPS_FEE_FINANCE"); + + BigDecimal factmoney=new BigDecimal(EQUIP_AMT) + .subtract(new BigDecimal(FIRST_PAYMENT)) + .add(new BigDecimal(INCIDENTAL)) + .add(new BigDecimal(GPS_FEE_FINANCE)); returnValue.putAll(param); returnValue.put("FUNDTYPE","01"); returnValue.put("MONEY",factmoney.toString()); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOtherNoGps.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOtherNoGps.java index 7804f0251..72e4b3014 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOtherNoGps.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOtherNoGps.java @@ -8,7 +8,7 @@ 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 { @@ -27,13 +27,16 @@ public class CleanLeaseMoneyAddOtherNoGps implements VoucherJavaParamService { 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"); + // 保证金 + String CAUTION_MONEY=param.get("CAUTION_MONEY")==null?"0.00":param.get("CAUTION_MONEY"); // 运算 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)); + .subtract(new BigDecimal(HANDLING_CHARGE_MONEY)) + .subtract(new BigDecimal(CAUTION_MONEY)); returnValue.putAll(param); returnValue.put("FUNDTYPE","01"); returnValue.put("MONEY",factmoney.toString()); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOthers.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOthers.java index 2f0faaeb2..b5825e625 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOthers.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOthers.java @@ -8,7 +8,7 @@ import com.amarsoft.are.jbo.JBOTransaction; import com.tenwa.comm.exception.BusinessException; import com.tenwa.voucher.service.VoucherJavaParamService; /** - * 车款-首付款 + * 融资金额+GPS+其他（购置税/保险/装饰装潢等） * @author xiezhiwen */ public class CleanLeaseMoneyAddOthers implements VoucherJavaParamService { @@ -25,7 +25,7 @@ public class CleanLeaseMoneyAddOthers implements VoucherJavaParamService { 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 + // 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)) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java index 562779e6e..709574d4d 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java @@ -13,7 +13,6 @@ public class CommLoanFactMoneyToMoney implements VoucherJavaParamService{ public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); - returnValue.put("FUNDTYPE","01"); returnValue.put("MONEY",param.get("FACT_MONEY")); return returnValue; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java index a509eba20..a793593ca 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java @@ -29,15 +29,15 @@ public class ContractOnhireVoucher extends BaseBussiness { cvld.CreateVoucher(FlowUnid, "PZ2018073100000062");//记录给经销商放款-其他（购置税/保险/装饰装潢等） --回租 cvld.CreateVoucher(FlowUnid, "PZ2018080300000066");//记录给经销商放款-其他（购置税/保险/装饰装潢等）--直租 - cvld.CreateVoucher(FlowUnid, "PZ2018073100000061");//记录给经销商放款-GPS--回租 - cvld.CreateVoucher(FlowUnid, "PZ2018080300000068");//记录给经销商放款-GPS--直租 + cvld.CreateVoucher(FlowUnid, "PZ2018073100000061");//记录GPS安装服务费（GPS 参融）--回租 + cvld.CreateVoucher(FlowUnid, "PZ2018080300000068");//记录GPS安装服务费（GPS 参融）--直租 CreateVoucherCustomerRentOrFee cvcr=new CreateVoucherCustomerRentOrFee(); cvcr.CreateVoucher(FlowUnid, "PZ2018071000000005");//客户支付的应收账款总金额 cvcr.CreateVoucher(FlowUnid, "PZ2018080300000069");//客户支付的应收账款总金额 - cvcr.CreateVoucher(FlowUnid, "PZ2018071100000010");//给经销商放款-车款及其他绑定款项--回租 - cvcr.CreateVoucher(FlowUnid, "PZ2018080300000074");//给经销商放款-车款及其他绑定款项--直租 + cvcr.CreateVoucher(FlowUnid, "PZ2018071100000010");//给经销商放款-差额放款--回租 + cvcr.CreateVoucher(FlowUnid, "PZ2018080300000074");//给经销商放款-差额放款--直租 // cvcr.CreateVoucher(FlowUnid, "PZ2018080600000116");//给经销商放款-代收代付部分--直租 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/DistributorCautionMoneyVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/DistributorCautionMoneyVoucher.java index 8ad02ed07..a60056153 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/DistributorCautionMoneyVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/DistributorCautionMoneyVoucher.java @@ -11,11 +11,9 @@ public class DistributorCautionMoneyVoucher extends BaseBussiness { this.initBussinessParam(Sqlca); String FlowUnid=this.getAttribute("FlowUnid").toString(); CreateVoucherDistCautionMoneyRe cvdc=new CreateVoucherDistCautionMoneyRe(); - cvdc.CreateVoucher(FlowUnid, "PZ2018071100000011");//退回经销商保证金 --回租 - cvdc.CreateVoucher(FlowUnid, "PZ2018080400000076");//退回经销商保证金 --直租 + cvdc.CreateVoucher(FlowUnid, "PZ2018071100000011");//退回经销商保证金 - cvdc.CreateVoucher(FlowUnid, "PZ2018072100000032");//收到经销商保证金--回租 - cvdc.CreateVoucher(FlowUnid, "PZ2018080400000088");//收到经销商保证金--直租 + cvdc.CreateVoucher(FlowUnid, "PZ2018072100000032");//收到经销商保证金 return "true"; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java index 02b1a63d1..297c3fd6e 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java @@ -56,7 +56,7 @@ public class RedIncomeVoucher extends BaseBussiness { CreateVoucherDistCautionMoneyRe cvdc=new CreateVoucherDistCautionMoneyRe(); - cvdc.CreateVoucher(FlowUnid, "PZ2018080400000098");//收到经销商保证金--直租 + cvdc.CreateVoucher(FlowUnid, "PZ2018072100000044");//收到经销商保证金 return "true"; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToCommission.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToCommission.java new file mode 100644 index 000000000..5b2a72f9a --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToCommission.java @@ -0,0 +1,126 @@ +package com.tenwa.voucher.CreateVoucherProcess; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jbo.voucher.LV_VOUCHER_CONFIG; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.CacheLoaderFactory; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.flow.baseBussion.BaseBussiness; +import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; + +public class CreateVoucherToCommission extends BaseBussiness{ + +public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { + + Transaction Sqlca =null; + //this.initBussinessParam(Sqlca); + Map map=new HashMap(); + Map param=new HashMap(); + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + String MONEY=null; + String MONEYNOTAX=null; + String MONEYTAX=null; + String ACCOUNT_DATE=null; + String FACT_DATE=null; + String CONTRACT_ID=null; + String CONTRACT_NUMBER=null; + String PROJECT_NAME=null; + String leas_form=null; + String DISTRIBUTOR_ID=null; + String DISTRIBUTOR_NAME=null; + String CARID=null; + String CARMODEL=null; + String CUSTID=null; + String CUSTNAME=null; + String CUSTOMERTYPE=null; + String BUSINESSTYPE=null; + //String FlowUnid=this.getAttribute("FlowUnid").toString(); + String sql=""; + //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-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); + + CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); + String VOUCHER_TYPE="1";// 凭证分类 金蝶 + String userid ="admin"; + for (int i=0;i0){ + MONEYNOTAX=dataList.get(i).get("HANDLFEENOTAX").toString(); + MONEYTAX=dataList.get(i).get("HANDLTAX").toString(); + + ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE").toString(); + FACT_DATE =dataList.get(i).get("FACT_DATE").toString(); + CONTRACT_ID=dataList.get(i).get("CONTRACT_ID").toString(); + CONTRACT_NUMBER=dataList.get(i).get("CONTRACT_NUMBER").toString(); + PROJECT_NAME=dataList.get(i).get("PROJECT_NAME").toString(); + leas_form=dataList.get(i).get("LEAS_FORM").toString(); + DISTRIBUTOR_ID=dataList.get(i).get("DISTRIBUTOR_ID"); + DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME"); + CARID=dataList.get(i).get("CARID"); + CARMODEL=dataList.get(i).get("MODEL"); + CUSTID=dataList.get(i).get("CUSTOMERID"); + CUSTNAME=dataList.get(i).get("CUSTOMERNAME"); + CUSTOMERTYPE=dataList.get(i).get("CUSTOMERTYPE"); + BUSINESSTYPE=dataList.get(i).get("BUSINESSTYPE"); + + param.put("FACT_MONEY",MONEY); + param.put("INTERESTNOTAX",MONEYNOTAX); + param.put("TAX",MONEYTAX); + param.put("ACCOUNT_DATE",ACCOUNT_DATE); + param.put("FACT_DATE",FACT_DATE); + param.put("CONTRACT_ID",CONTRACT_ID); + param.put("CONTRACT_NUMBER",CONTRACT_NUMBER); + param.put("PROJECT_NAME",PROJECT_NAME); + param.put("LEAS_FORM",leas_form); + param.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID); + param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME); + param.put("CARID",CARID); + param.put("CARMODEL",CARMODEL); + param.put("CUSTID",DISTRIBUTOR_ID); + param.put("CUSTNAME",DISTRIBUTOR_NAME); + param.put("CUSTOMERTYPE",CUSTOMERTYPE); + param.put("BUSINESSTYPE",BUSINESSTYPE); + + if("1".equals(BUSINESSTYPE)){ + param.put("LEASFORMASSET", "04"); // 融资租赁资产 + param.put("DEPT", "02"); // 部门 + if("03".equals(CUSTOMERTYPE)){ // 如果是个人业务 + param.put("LEASINCOMEFORM", "02"); // C端 + }else if("01".equals(CUSTOMERTYPE)){ + param.put("LEASINCOMEFORM", "01"); // B端 + } + } + //param.put("FUNDTYPE", ""); // 主营类型 + param.put("BUSINESSTYPE", "06"); + + param.put("FlowUnid", FlowUnid); + map.clear(); + map.put("PROJ_TYPE", leas_form); + map.put("VOUCHER_NO", VOUCHERNO); + BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); + + if(vouch!=null){ + vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); + }} + } + + + if(Sqlca!=null){ + Sqlca.commit(); + } + + String sMessage="true"; + return sMessage; + } +} From af4f3ad4174e29850041e0c3a0c63c4d6eae8e42 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Mon, 13 Aug 2018 20:39:09 +0800 Subject: [PATCH 2/6] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9APP=E7=9A=84GPS?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=82=E4=B8=8E=E8=9E=8D=E8=B5=84=E7=9A=84?= =?UTF-8?q?=E5=8F=AA=E8=AF=BB=E4=B8=8E=E5=90=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc/com/tenwa/reckon/product/ProductConditionService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calc/com/tenwa/reckon/product/ProductConditionService.java b/calc/com/tenwa/reckon/product/ProductConditionService.java index 8f6362151..1c0acf453 100644 --- a/calc/com/tenwa/reckon/product/ProductConditionService.java +++ b/calc/com/tenwa/reckon/product/ProductConditionService.java @@ -314,8 +314,8 @@ public class ProductConditionService { ProductBaseLoanTools.addAppList(appList, col+"_RATIO", "colreadonly", "1"); if(defaultValue.length()>0){ ProductBaseLoanTools.addAppList(appList, col, "defaultValue", defaultValue); - ProductBaseLoanTools.addAppList(appList, col, "colreadonly", "1"); - ProductBaseLoanTools.addAppList(appList, col+"_FINA", "colreadonly", "1"); + // ProductBaseLoanTools.addAppList(appList, col, "colreadonly", "1"); + // ProductBaseLoanTools.addAppList(appList, col+"_FINA", "colreadonly", "1"); } if("N".equals(isShowRatio)){ ProductBaseLoanTools.addAppList(appList, col, "colfilterrefid", ""); From 45cc9488611b1fd2b5ceb76745aee3255c839616 Mon Sep 17 00:00:00 2001 From: amarsoft Date: Mon, 13 Aug 2018 20:39:43 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InsertVoucherRentIncome.java | 108 ++++++++++++++++++ .../CreateVoucherRentIncomeMission.java | 7 +- 2 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java new file mode 100644 index 000000000..daa665982 --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java @@ -0,0 +1,108 @@ +package com.tenwa.voucher.CreateVoucherProcess; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jbo.voucher.LV_VOUCHER_CONFIG; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.CacheLoaderFactory; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; + +public class InsertVoucherRentIncome { + private String sys_date; + private String[] voucher_nos={"PZ2018072100000024","PZ2018080400000081","PZ2018072100000025","PZ2018080400000082"}; + + public String getSys_date() { + return sys_date; + } + + public void setSys_date(String sys_date) { + this.sys_date = sys_date; + } + + /*//回款-收到的租金 复制--回款-收到的租金 + "PZ2018072100000024" "PZ2018080400000081" + //回款-收到的逾期利息 复制--回款-收到的逾期利息 + "PZ2018072100000025" "PZ2018080400000082"*/ + /*** + * + * @param VOUCHERNO + * @throws Exception + */ + public void CreateVoucher(String VOUCHERNO) throws Exception{ + Transaction Sqlca =null; + String sql_where=""; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + Map map=new HashMap(); + map.put("VOUCHER_NO", VOUCHERNO); + BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); + if(vouch!=null){ + if("PZ2018072100000024".equals(VOUCHERNO)||"PZ2018080400000081".equals(VOUCHERNO)){ + sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58) SELECT REPLACE(UUID(),'-','') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4) periodyear,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') f1,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.LOAN_DIRECTION='1' THEN lvri.rent ELSE 0.00 END,CASE WHEN lv.LOAN_DIRECTION='2' THEN lvri.rent ELSE 0.00 END,'IT管理员',DATE_FORMAT(SYSDATE(),'%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4),SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),5,2),lv.sort_number,lci.contract_number,lvri.cust_name,lv.loan_subject,CASE WHEN lv.loan_direction='2' THEN '04' ELSE '' END,lvri.cust_id,CASE WHEN lv.loan_direction='2' THEN '02' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction='1' THEN '1' ELSE '-1' END,'admin',lvri.income_id FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id=lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY ,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID=lvc.id WHERE lvc.voucher_no IN ('PZ2018080400000081','PZ2018072100000024')) lv ON lv.proj_type=lci.LEAS_FORM WHERE lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' and f58 is not null) and lvri.rent>0 ORDER BY lvri.voucher_f3 "; + } + if("PZ2018072100000025".equals(VOUCHERNO)||"PZ2018080400000082".equals(VOUCHERNO)){ + sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58) SELECT REPLACE(UUID(),'-','') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4) periodyear,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') f1,lvri.voucher_f3,'收到的逾期利息',lv.LOAN_SUBJECT,CASE WHEN lv.LOAN_DIRECTION='1' THEN lvri.penalty ELSE 0.00 END,CASE WHEN lv.LOAN_DIRECTION='2' THEN lvri.penalty ELSE 0.00 END,'IT管理员',DATE_FORMAT(SYSDATE(),'%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4),SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),5,2),lv.sort_number,lci.contract_number,lvri.cust_name,lv.loan_subject,CASE WHEN lv.loan_direction='2' THEN '04' ELSE '' END,lvri.cust_id,CASE WHEN lv.loan_direction='2' THEN '02' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction='1' THEN '1' ELSE '-1' END,'admin',lvri.income_id FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id=lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY ,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID=lvc.id WHERE lvc.voucher_no IN ('PZ2018072100000025','PZ2018080400000092')) lv ON lv.proj_type=lci.LEAS_FORM WHERE lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' and f58 is not null) and lvri.penalty>0 ORDER BY lvri.voucher_f3"; + } + SqlObject asql = new SqlObject(sql_where); + Sqlca.executeSQL(asql); + Sqlca.commit(); + + }}catch(Exception e){ + Sqlca.rollback(); + e.printStackTrace(); + }finally{ + if(Sqlca!=null){ + Sqlca.disConnect(); + Sqlca=null; + } + } + } + /** + *f16存凭证编号，f17寸凭证关键字 关键字的配发 表的别名 .过滤关键字段 + *f17也会存进表中 + *查询sql 用逗号关联的方法，查询乘积条数 where 1=1 + */ + + + public void initLVRentIncome() throws Exception{ + Transaction Sqlca =null; + try{ + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + String sql="INSERT INTO lv_rent_income (SELECT REPLACE(UUID(),'-',''),CONCAT('k',getSerialNumber ()),cif.certid,cif.customername,lci.id,lci.contract_number,lri.ID,lri.HIRE_DATE ,lri.RENT ,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER FROM lc_rent_income lri LEFT JOIN lb_contract_info lci ON lci.id=lri.contract_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 (lri.rent>=0 AND lri.penalty>=0) AND DATE_FORMAT(LrI.hire_date,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d'))"; + String sql1="insert into lv_rent_income (select replace(uuid(),'-',''),CONCAT('k',getSerialNumber ()),cif.certid,cif.customername,lci.id,lci.contract_number,lri.ID,lri.HIRE_DATE ,0.00,0.00,0.00,lri.PENALTY,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER from lc_rent_income lri left join lb_contract_info lci on lci.id=lri.contract_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 (lri.rent>=0 and lri.penalty>=0) and DATE_FORMAT(LrI.hire_date,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d') )"; + + SqlObject asql = new SqlObject(sql); + SqlObject asql1 = new SqlObject(sql1); + Sqlca.executeSQL(asql); + Sqlca.executeSQL(asql1); + Sqlca.commit(); + }catch(Exception e){ + Sqlca.rollback(); + e.printStackTrace(); + }finally{ + if(Sqlca!=null){ + Sqlca.disConnect(); + Sqlca=null; + } + } + } + + public void execute(){ + try{ + initLVRentIncome(); + for(String voucherno:voucher_nos){ + CreateVoucher(voucherno); + } + }catch (Exception e){ + e.printStackTrace(); + } + + } +} diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java index d348ea845..778fc7703 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java @@ -9,6 +9,7 @@ import com.base.util.QuartzUtil; import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherInsuranceSettlement; import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMonthSettlement; import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRentIncome; +import com.tenwa.voucher.CreateVoucherProcess.InsertVoucherRentIncome; public class CreateVoucherRentIncomeMission implements Job { @@ -16,12 +17,16 @@ public class CreateVoucherRentIncomeMission implements Job { public void execute(JobExecutionContext arg0) throws JobExecutionException { String startime = StringFunction.getTodayNow(); try{ - CreateVoucherRentIncome cvri=new CreateVoucherRentIncome(); + /*CreateVoucherRentIncome cvri=new CreateVoucherRentIncome(); cvri.CreateVoucher("PZ2018072100000024");//收到租金--回租 cvri.CreateVoucher("PZ2018080400000081");//收到租金--直租 cvri.CreateVoucher("PZ2018072100000025");//收到逾期利息--回租 cvri.CreateVoucher("PZ2018080400000082");//收到逾期利息--直租 +*/ + + InsertVoucherRentIncome ivri=new InsertVoucherRentIncome(); + ivri.execute(); CreateVoucherInsuranceSettlement cvis=new CreateVoucherInsuranceSettlement(); cvis.CreateVoucher("PZ2018072100000029");//收到理赔保险费 --回租 From 671db23795b2960d02dc645e00279854b5af8290 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Mon, 13 Aug 2018 20:58:09 +0800 Subject: [PATCH 4/6] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=B8=A6=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Accounting/LoanSimulation/LoanBasicInfo.jsp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index 5d84b9024..82a752922 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -108,6 +108,11 @@ pc.getProductFundRules(doTemp, productId); String calcRules=pc.getProductRules(doTemp, productId,vali); + //获取产品名称 + BizObject bo = JBOFactory.createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,"typeno=:productID") + .setParameter("productID", productId).getSingleResult(false); + String productName = (bo==null)?"":bo.getAttribute("typename").getString(); + //非车辆产品，融资额可编辑 String productType = Sqlca.getString(new SqlObject("select attribute2 from business_type where typeno='"+productId+"'")); if("2".equals(productType)){ @@ -124,6 +129,7 @@ doTemp.setJboClass(tcb.getCondition_tb()); doTemp.setDefaultValue(planCName, plannumber); doTemp.setDefaultValue("flowunid", flowunid); + doTemp.setDefaultValue("PRODUCT_NAME", productName); doTemp.appendJboWhere(" and "+planCName+"='"+plannumber+"'"); if(null!=ishistory&&ishistory.equals("true")){ doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcCondtionInfoArachiveShow");//如果是历史则新显示历史数据 @@ -169,10 +175,7 @@ //dwTemp.replaceColumn("even_subsection", "", CurPage.getObjectWindowOutput()); //dwTemp.replaceColumn("knowing_config", "", CurPage.getObjectWindowOutput()); String businessDate = DateHelper.getBusinessDate(); - //获取产品名称 - BizObject bo = JBOFactory.createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,"typeno=:productID") - .setParameter("productID", productId).getSingleResult(false); - String productName = (bo==null)?"":bo.getAttribute("typename").getString(); + //获取对应车辆指导价 BizObject bo1 = JBOFactory.createBizObjectQuery(LB_EQUIPMENT_CAR_TEMP.CLASS_NAME,"PROJECT_ID=:projectId") .setParameter("projectId",projectId).getSingleResult(false); @@ -191,8 +194,6 @@ var adjustType; var count = 0; $(function(){ changgeCompare(); - var productName="<%=productName%>"; - setItemValue(0,0,"PRODUCT_NAME",productName); //document.getElementById('div_my0').innerHTML = '
'+document.getElementById('div_my0').innerHTML+'
'; if("ReadOnly"!="<%=RightType%>"){ CalcControl.InitStartDate(); From 173807f2f48466b20aacfc052a8c2ee8530437e0 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Mon, 13 Aug 2018 21:11:06 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=87=AD=E8=AF=812018/08/13=E7=A7=91?= =?UTF-8?q?=E7=9B=AE=E5=8F=98=E6=9B=B4=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContractOtherMoneyNoTax.java | 43 +++++++++++++++++++ ...Just.java => ContractOtherMoneyToTax.java} | 22 +++++++--- .../FirstPaymentToTaxToJust.java | 28 ------------ .../CreateVoucherLoan/OtherFees.java | 2 +- 4 files changed, 61 insertions(+), 34 deletions(-) create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractOtherMoneyNoTax.java rename src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/{ContractCapitalToTaxToJust.java => ContractOtherMoneyToTax.java} (55%) delete mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FirstPaymentToTaxToJust.java diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractOtherMoneyNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractOtherMoneyNoTax.java new file mode 100644 index 000000000..8f7ff2843 --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractOtherMoneyNoTax.java @@ -0,0 +1,43 @@ +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 ContractOtherMoneyNoTax implements VoucherJavaParamService{ + + @Override + public Map getJavaParam(JBOTransaction tx, + Map param) throws BusinessException { + MapreturnValue=new HashMap(); + returnValue.putAll(param); + // 保险费 + 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 sumMoney=new BigDecimal(INSURANCE_PREMIUM) + .add(new BigDecimal(PURCHASE_TAX)) + .add(new BigDecimal(INCIDENTAL)) + .add(new BigDecimal(TABLEWARE_FEE)) + .add(new BigDecimal(GPS_FEE_FINANCE)); + + String tax="1.06"; + BigDecimal divisor= new BigDecimal(tax); + BigDecimal factmoney=sumMoney.divide(divisor, 2, BigDecimal.ROUND_HALF_UP); + 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/ContractOtherMoneyToTax.java similarity index 55% rename from src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCapitalToTaxToJust.java rename to src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractOtherMoneyToTax.java index 0754e365c..2ffd00033 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCapitalToTaxToJust.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractOtherMoneyToTax.java @@ -8,19 +8,31 @@ import com.amarsoft.are.jbo.JBOTransaction; import com.tenwa.comm.exception.BusinessException; import com.tenwa.voucher.service.VoucherJavaParamService; /** - * 车款-首付款的税金 + * 本金的税金（车款-首付款+其他+GPS的税金） * @author xiezhiwen */ -public class ContractCapitalToTaxToJust implements VoucherJavaParamService{ +public class ContractOtherMoneyToTax 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 FIRST_PAYMENT=param.get("FIRST_PAYMENT")==null?"0.00":param.get("FIRST_PAYMENT"); + // 杂费 + String INCIDENTAL=param.get("INCIDENTAL")==null?"0.00":param.get("INCIDENTAL"); + // GPS + String GPS_FEE_FINANCE=param.get("GPS_FEE_FINANCE")==null?"0.00":param.get("GPS_FEE_FINANCE"); + BigDecimal sumMoney=new BigDecimal(EQUIP_AMT) + .subtract(new BigDecimal(FIRST_PAYMENT)) + .add(new BigDecimal(INCIDENTAL)) + .add(new BigDecimal(GPS_FEE_FINANCE)); + String tax="1.06"; BigDecimal divisor= new BigDecimal(tax); - BigDecimal sumMoney=new BigDecimal(EQUIP_AMT).subtract(new BigDecimal(FIRST_PAYMENT)); - BigDecimal taxMoney=sumMoney.subtract(sumMoney.divide(divisor, 2, BigDecimal.ROUND_HALF_UP)); + BigDecimal noTaxMoney=sumMoney.divide(divisor, 2, BigDecimal.ROUND_HALF_UP); + BigDecimal taxMoney = sumMoney.subtract(noTaxMoney); + returnValue.put("FUNDTYPE","01"); returnValue.put("MONEY",taxMoney.toString()); return returnValue; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FirstPaymentToTaxToJust.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FirstPaymentToTaxToJust.java deleted file mode 100644 index 4ff052b47..000000000 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FirstPaymentToTaxToJust.java +++ /dev/null @@ -1,28 +0,0 @@ -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/OtherFees.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFees.java index 4dad7805e..d4ce07279 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFees.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFees.java @@ -23,7 +23,7 @@ public class OtherFees implements VoucherJavaParamService{ 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 + // GPS String GPS_FEE_FINANCE=param.get("GPS_FEE_FINANCE")==null?"0.00":param.get("GPS_FEE_FINANCE"); BigDecimal factmoney=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); From 89e2d38075de0a90d8e1ed58db1c301d2c3ba807 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Mon, 13 Aug 2018 21:35:39 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B3=95=E4=BA=BA?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=90=88=E5=90=8C=E5=88=B6=E4=BD=9C=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/Comm/LBContractTemplate/contract_template.jsp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp index 2e08809b7..3c3e4eb25 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp @@ -240,8 +240,11 @@ var message = RunJavaMethodTrans("com.tenwa.app.baseFileTemplate.handle.FileTemplateUtil","CheckCar","contractId="+"<%=sContractId%>"+",templateIds="+tempids+",flowunid="+"<%=flowunid%>"); if(""!=message){ if("01"=="<%=customertype%>"){ - alert("合同已生成，无法再次生成！"); - return; + if(message.indexOf("请先删除后再生成")>0){ + alert("合同已生成，无法再次生成！"); + location.reload(); + return; + } } alert(message); location.reload();