diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java index cbc7e5a4a..7983e6eee 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java @@ -85,12 +85,7 @@ public class CreateVoucherContractTerminate { String VOUCHER_TYPE="1";// 凭证分类 金蝶 String userid ="admin"; for (int i=0;i0){ + MONEY=dataList.get(i).get("MONEY"); MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString(); MONEYTAX=dataList.get(i).get("MONEYTAX").toString(); if("PZ2018081700000127".equals(VOUCHERNO)) { @@ -157,7 +152,6 @@ public class CreateVoucherContractTerminate { vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); } } - } if(Sqlca!=null){ Sqlca.commit(); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java index a07ee913d..b067e3608 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java @@ -18,8 +18,8 @@ public class ContractOnhireVoucher extends BaseBussiness { cvld.CreateVoucher(FlowUnid, "PZ2018070900000003",Sqlca);// 收取首付款-回租 //cvld.CreateVoucher(FlowUnid, "PZ2018080200000065",Sqlca);// 收取首付款-直租 - cvld.CreateVoucher(FlowUnid, "PZ2018070900000002",Sqlca);// 购置融资租赁资产-回 + //cvld.CreateVoucher(FlowUnid, "PZ2018122000000010",Sqlca);// 购置融资租赁资产-回 //cvld.CreateVoucher(FlowUnid, "PZ2018072400000060",Sqlca);// 购置融资租赁资产-直 cvld.CreateVoucher(FlowUnid, "PZ2018071000000005",Sqlca);// 合同起租(一次性确认收入)-回租 @@ -36,6 +36,8 @@ public class ContractOnhireVoucher extends BaseBussiness { cvld.CreateVoucher(FlowUnid, "PZ2018071000000009",Sqlca);// 收取客户手续费(按月分摊收入)--回租 //cvld.CreateVoucher(FlowUnid, "PZ2018080300000073",Sqlca);// 收取客户手续费(按月分摊收入)--直租 + + //String a = ProductParamUtil.getProductParameterValue(dataList.get(i).get("PRODUCT_ID"), "PRD0315", "DISCOUNT", "isBalance"); return "true"; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java index 2573f0087..9a78a52cb 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java @@ -66,7 +66,7 @@ public class CreateVoucherMonthSettlement{ */ // 月结利息 if("PZ2018071200000016".equals(voucherNo)) { - sql="SELECT CRM.ID,CRM.INTEREST AS MONEY,ROUND(CRM.INTEREST/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST - ROUND(CRM.INTEREST/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,CRM.FEE AS FEEMONEY,IFNULL((CRM.FEE-ROUND(CRM.FEE/getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE))),0) AS FEE_NOTAX,CRM.DISCOUNT AS DISCOUNT ,IFNULL((CRM.DISCOUNT-ROUND(CRM.DISCOUNT/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE))),0) AS DISCOUNT_NOTAX,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.CUSTOMER_NUM 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 LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN (SELECT lrp.contract_id,lrp.plan_list,lrp.plan_date,lrp.corpus-nvl(lri.corpus,0) AS leftcorpus FROM lc_rent_plan lrp LEFT JOIN (SELECT contract_id,plan_list,SUM(corpus) corpus FROM lc_rent_income GROUP BY contract_id,plan_list) lri ON lri.contract_id=lrp.contract_id AND lri.plan_list=lrp.plan_list) lr ON lr.contract_id=crm.contract_id AND crm.rent_list=lr.plan_list 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 "+businessType+" DATE_FORMAT(CRM.END_DATE,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AND CRM.ID NOT IN(SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%"+modular+"%') AND DATE_FORMAT(lr.plan_date,'%Y%m')