diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java index 53018e48c..54190e886 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java @@ -65,7 +65,7 @@ public class CreateVoucherMonthSettlement{ if("PZ2018100900000278".equals(voucherNo)||"PZ2018100900000279".equals(voucherNo)) { moneyType="MONEYNOTAX";modular="月结--确认未实现利息收入(汽车传统)";businessType=" LPI.BUSINESSTYPE='3' AND ";}//月结-确认未实现利息收入 // 通用sql - 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 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+"%')"; + 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 lr.leftcorpus>0 AND DATE_FORMAT(lr.plan_date,'%Y%m')