diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractChangeForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractChangeForTradition.java index 5552ef00b..f37cfb788 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractChangeForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractChangeForTradition.java @@ -88,12 +88,9 @@ public class CreateVoucherContractChangeForTradition { param.put("BUSINESSTYPE",BUSINESSTYPE); if("2".equals(BUSINESSTYPE)){ - param.put("LEASFORMASSET", ""); // 融资租赁资产 - param.put("DEPT", "01"); // 部门 - param.put("LEASINCOMEFORM", ""); + param.put("CASHFLOW", "");// 现金流项目 + param.put("BUSINESSTYPE", "");// 主营类型 } - param.put("FUNDTYPE", "01"); // 主营类型 - param.put("BUSINESSTYPE", "06"); param.put("FlowUnid", FlowUnid); map.clear(); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionForTradition.java index 9bab54f08..3b2e4fe4f 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionForTradition.java @@ -47,11 +47,11 @@ public class CreateVoucherDepositDeductionForTradition extends BaseBussiness { if("PZ2018092500000217".equals(VOUCHERNO) || "PZ2018101000000336".equals(VOUCHERNO)) {// 保证金抵扣租金(汽车类传统) feeType="LRIT.RENT"; taxType="租金"; businessType=" LPI.BUSINESSTYPE='3' AND "; - }else if("PZ2018092500000185".equals(VOUCHERNO) || "PZ2018101000000338".equals(VOUCHERNO)) {// 保证金抵扣租金(传统) + }else if("PZ2018092500000185".equals(VOUCHERNO)) {// 保证金抵扣租金(传统) feeType="LRIT.RENT"; taxType="租金"; businessType=" LPI.BUSINESSTYPE='2' AND "; }else if("PZ2018092500000219".equals(VOUCHERNO) || "PZ2018101000000337".equals(VOUCHERNO)) {// 保证金抵扣罚金(汽车类传统) feeType="LRIT.PENALTY"; taxType="违约金"; businessType=" LPI.BUSINESSTYPE='3' AND "; - }else if("PZ2018092500000187".equals(VOUCHERNO) || "PZ2018101000000339".equals(VOUCHERNO)) {// 保证金抵扣罚金(传统) + }else if("PZ2018092500000187".equals(VOUCHERNO)) {// 保证金抵扣罚金(传统) feeType="LRIT.PENALTY"; taxType="违约金"; businessType=" LPI.BUSINESSTYPE='2' AND "; } sql = "SELECT "+feeType+" AS MONEY,ROUND("+feeType+" / getTax(LCI.LEAS_FORM,'"+taxType+"',LCCT.START_DATE),2) AS MONEYNOTAX,("+feeType+" - ROUND("+feeType+" / getTax(LCI.LEAS_FORM,'"+taxType+"',LCCT.START_DATE),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,CIF.CUSTOMER_NUM 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_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 "+businessType+" LRIT.SETTLE_METHOD = 'settlemethod7' AND LRIT.FLOWUNID = :FLOWUNID "; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/VoucherDepositDeductionForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/VoucherDepositDeductionForTradition.java index 2fba3ff14..cd775629a 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/VoucherDepositDeductionForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/VoucherDepositDeductionForTradition.java @@ -18,27 +18,27 @@ public class VoucherDepositDeductionForTradition extends BaseBussiness { CreateVoucherDepositDeductionForTradition cvdd=new CreateVoucherDepositDeductionForTradition(); // 汽车类传统 - cvdd.CreateVoucher(FlowUnid, "PZ2018092500000217");//保证金抵扣租金 --回租 - cvdd.CreateVoucher(FlowUnid, "PZ2018101000000336");//保证金抵扣租金--直租 + //cvdd.CreateVoucher(FlowUnid, "PZ2018092500000217");//保证金抵扣租金 --回租 + //cvdd.CreateVoucher(FlowUnid, "PZ2018101000000336");//保证金抵扣租金--直租 //cvdd.CreateVoucher(FlowUnid, "PZ2018092500000218");//保证金抵扣违约金 --回租 //cvdd.CreateVoucher(FlowUnid, "");//保证金抵扣违约金 --直租 - cvdd.CreateVoucher(FlowUnid, "PZ2018092500000219");//保证金抵扣罚金 --回租 - cvdd.CreateVoucher(FlowUnid, "PZ2018101000000337");//保证金抵扣罚金 --直租 + //cvdd.CreateVoucher(FlowUnid, "PZ2018092500000219");//保证金抵扣罚金 --回租 + //cvdd.CreateVoucher(FlowUnid, "PZ2018101000000337");//保证金抵扣罚金 --直租 //cvdd.CreateVoucher(FlowUnid, "PZ2018092500000220");//保证金抵扣名义货价 --回租 //cvdd.CreateVoucher(FlowUnid, "");//保证金抵扣名义货价--直租 // 传统 cvdd.CreateVoucher(FlowUnid, "PZ2018092500000185");//保证金抵扣租金 --回租 - cvdd.CreateVoucher(FlowUnid, "PZ2018101000000338");//保证金抵扣租金--直租 + //cvdd.CreateVoucher(FlowUnid, "PZ2018101000000338");//保证金抵扣租金--直租 //cvdd.CreateVoucher(FlowUnid, "PZ2018092500000186");//保证金抵扣违约金 --回租 //cvdd.CreateVoucher(FlowUnid, "");//保证金抵扣违约金 --直租 cvdd.CreateVoucher(FlowUnid, "PZ2018092500000187");//保证金抵扣罚金 --回租 - cvdd.CreateVoucher(FlowUnid, "PZ2018101000000339");//保证金抵扣罚金--直租 + //cvdd.CreateVoucher(FlowUnid, "PZ2018101000000339");//保证金抵扣罚金--直租 //cvdd.CreateVoucher(FlowUnid, "PZ2018092500000188");//保证金抵扣名义货价 --回租 //cvdd.CreateVoucher(FlowUnid, "");//保证金抵扣名义货价--直租 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToCORPUS.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToCORPUS.java new file mode 100644 index 000000000..0b9dadb1e --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToCORPUS.java @@ -0,0 +1,20 @@ +package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition; + +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; +/** + * 获取FACT_MONEY + * @author xiezhiwen + */ +public class ContractGetMoneyToCORPUS implements VoucherJavaParamService{ + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { + MapreturnValue=new HashMap(); + returnValue.putAll(param); + returnValue.put("MONEY",param.get("CORPUS")); + return returnValue; + } +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToRENT.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToRENT.java new file mode 100644 index 000000000..d31851fb0 --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToRENT.java @@ -0,0 +1,20 @@ +package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition; + +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; +/** + * 获取FACT_MONEY + * @author xiezhiwen + */ +public class ContractGetMoneyToRENT implements VoucherJavaParamService{ + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { + MapreturnValue=new HashMap(); + returnValue.putAll(param); + returnValue.put("MONEY",param.get("RENT")); + return returnValue; + } +}