From 42d7cdf41a8ec495523a52c144abea15e24c8ff4 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Tue, 9 Oct 2018 17:52:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3--=E6=97=A5?= =?UTF-8?q?=E7=BB=93,=E6=9C=88=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherMonthSettlement.java | 21 ++++++++++++++++++- .../CreateVoucherMonthSettlementMission.java | 21 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java index ea99cee69..397bf54cd 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java @@ -50,7 +50,17 @@ public class CreateVoucherMonthSettlement{ if("PZ2018071200000017".equals(voucherNo)||"PZ2018080400000104".equals(voucherNo)) { moneyType="FEEMONEY"; modular="月结-确认手续费";}//月结-确认手续费 if("PZ2018071200000016".equals(voucherNo)||"PZ2018080400000102".equals(voucherNo)) { moneyType="MONEY";modular="月结-确认未实现利息收入";}//月结-确认未实现利息收入 if("PZ2018072100000048".equals(voucherNo)||"PZ2018080400000103".equals(voucherNo)) { moneyType="DISCOUNT";modular="月结-确认贴息收入";}//月结-确认贴息收入 - sql="SELECT CRM.ID,CRM.INTEREST AS MONEY,CRM.FEE AS FEEMONEY,CRM.DISCOUNT AS DISCOUNT ,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 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 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+"%')"; + + // 汽车传统 + if("PZ2018092500000215".equals(voucherNo)||"PZ2018100900000275".equals(voucherNo)) { moneyType="MONEYNOTAX";modular="日结--确认未实现利息收入(汽车传统)";}//日结-确认未实现利息收入 + if("PZ2018092500000216".equals(voucherNo)||"PZ2018100900000277".equals(voucherNo)) { moneyType="TAX";modular="日结--确认租金利息税金(汽车传统)";}//日结-确认租金利息税金 + if("PZ2018100900000278".equals(voucherNo)||"PZ2018100900000279".equals(voucherNo)) { moneyType="MONEYNOTAX";modular="月结--确认未实现利息收入(汽车传统)";}//月结-确认未实现利息收入 + + // 传统 + if("PZ2018092500000183".equals(voucherNo)||"PZ2018100900000280".equals(voucherNo)) { moneyType="MONEYNOTAX";modular="日结--确认未实现利息收入(传统)";}//日结-确认未实现利息收入 + if("PZ2018092500000184".equals(voucherNo)||"PZ2018100900000281".equals(voucherNo)) { moneyType="TAX";modular="日结--确认租金利息税金(传统)";}//日结-确认租金利息税金 + if("PZ2018100900000282".equals(voucherNo)||"PZ2018100900000283".equals(voucherNo)) { moneyType="MONEYNOTAX";modular="月结--确认未实现利息收入(传统)";}//月结-确认未实现利息收入 + sql="SELECT CRM.ID,CRM.INTEREST AS MONEY,ROUND(CRM.INTEREST/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) AS MONEYNOTAX,(CRM.INTEREST - ROUND(CRM.INTEREST/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) AS TAX,CRM.FEE AS FEEMONEY,CRM.DISCOUNT AS DISCOUNT ,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 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 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+"%')"; //租金的利息税金 if("PZ2018072100000055".equals(voucherNo)){ sql="SELECT LRP.ID,LRP.INTEREST-ROUND(LRP.INTEREST/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) AS MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCI.ID AS 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 FROM LC_RENT_PLAN LRP INNER JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LRP.CONTRACT_ID INNER 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 WHERE DATE_FORMAT(SYSDATE(),'%Y/%m/%d')=DATE_FORMAT(LRP.PLAN_DATE,'%Y/%m/%d') AND LRP.ID NOT IN(SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%日结-确认租金利息税金%')"; @@ -114,7 +124,16 @@ public class CreateVoucherMonthSettlement{ }else if("01".equals(CUSTOMERTYPE)){ param.put("LEASINCOMEFORM", "01"); // B端 } + }else if("2".equals(BUSINESSTYPE)){ + param.put("LEASFORMASSET", "02/03/05/06"); // 融资租赁资产 + param.put("DEPT", "01"); // 部门 + param.put("LEASINCOMEFORM", "06"); // C端 + }else if("3".equals(BUSINESSTYPE)){ + param.put("LEASFORMASSET", "04"); // 融资租赁资产 + param.put("DEPT", "01"); // 部门 + param.put("LEASINCOMEFORM", "05"); // C端 } + param.put("FUNDTYPE", "02"); // 主营类型 param.put("BUSINESSTYPE", "06"); diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java index 5105bcaeb..892c39c27 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java @@ -42,6 +42,27 @@ public class CreateVoucherMonthSettlementMission implements Job { vouchermanage.CreateVoucher("PZ2018072100000055");//日结税金--回租 vouchermanage.CreateVoucher("PZ2018080200000063");//日结税金--直租 + + // 汽车类传统类日结-月结 + vouchermanage.CreateVoucher("PZ2018092500000215");//日结-确认未实现利息收入--回租 + vouchermanage.CreateVoucher("PZ2018100900000275");//日结-确认未实现利息收入--直租 + + vouchermanage.CreateVoucher("PZ2018092500000216");//日结-确认租金利息税金--回租 + vouchermanage.CreateVoucher("PZ2018100900000277");//日结-确认租金利息税金--直租 + + vouchermanage.CreateVoucher("PZ2018100900000278");//月结-确认未实现利息收入--回租 + vouchermanage.CreateVoucher("PZ2018100900000279");//月结-确认未实现利息收入--直租 + + // 传统类日结-月结 + vouchermanage.CreateVoucher("PZ2018092500000183");//日结-确认未实现利息收入--回租 + vouchermanage.CreateVoucher("PZ2018100900000280");//日结-确认未实现利息收入--直租 + + vouchermanage.CreateVoucher("PZ2018092500000184");//日结-确认租金利息税金--回租 + vouchermanage.CreateVoucher("PZ2018100900000281");//日结-确认租金利息税金--直租 + + vouchermanage.CreateVoucher("PZ2018100900000282");//月结-确认未实现利息收入--回租 + vouchermanage.CreateVoucher("PZ2018100900000283");//月结-确认未实现利息收入--直租 + QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.CreateVoucherMonthSettlementMission", "success", "成功", curUserId); } catch (Exception e) { try {