From 515c864bd9b38f1426e6ccd56fbf1d2f51aaff05 Mon Sep 17 00:00:00 2001 From: liuzhao Date: Fri, 23 Nov 2018 16:17:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86=E8=B4=A6=E6=88=B7=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../importcallback/impl/DistributorAccountImportCallback.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src_core/com/tenwa/officetempalte/importcallback/impl/DistributorAccountImportCallback.java b/src_core/com/tenwa/officetempalte/importcallback/impl/DistributorAccountImportCallback.java index e1d55848d..a10c45a5d 100644 --- a/src_core/com/tenwa/officetempalte/importcallback/impl/DistributorAccountImportCallback.java +++ b/src_core/com/tenwa/officetempalte/importcallback/impl/DistributorAccountImportCallback.java @@ -11,6 +11,7 @@ import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.awe.util.Transaction; import com.amarsoft.context.ASUser; +import com.tenwa.comm.exception.BusinessException; public class DistributorAccountImportCallback extends BaseImportExcelCallBack { @@ -27,6 +28,8 @@ public class DistributorAccountImportCallback extends BaseImportExcelCallBack { importObject.setAttributeValue("distributor_id", distributor_no); importObject.setAttributeValue("CRTPVC", ""); + }else{ + throw new BusinessException("请填写已经存在的经销商编码！"); } From 57a960e3c7a64f42f37654071166cb2dc699329d Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Fri, 23 Nov 2018 18:10:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3--?= =?UTF-8?q?=E6=96=B0=E5=88=86=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/META-INF/context.xml | 32 +--- .../Lease/App/Interface/Ebank/LCEbankList.jsp | 36 ++++- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 2 + .../CreateVoucherDepositDeductionToMoney.java | 39 ++--- .../CreateVoucherDistCautionMoneyRe.java | 13 +- ...CreateVoucherForInterestSubsidyImport.java | 8 +- .../ContractCorpusMoney.java | 23 +++ .../ContractToDeditMoneyNoTax.java | 20 +++ .../CreateVoucherDepositDeduction.java | 5 +- .../IncomeVoucher.java | 19 ++- .../InsertVoucherRentIncome.java | 16 +- .../serviceImp/CreateVoucherServiceImpl.java | 28 +++- .../com/tenwa/lease/app/ebank/EbankUse.java | 148 +++++++++++------- 13 files changed, 246 insertions(+), 143 deletions(-) create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCorpusMoney.java create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractToDeditMoneyNoTax.java diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml index 7cee037b2..17151bd2c 100644 --- a/WebContent/META-INF/context.xml +++ b/WebContent/META-INF/context.xml @@ -1,28 +1,12 @@ - - + + diff --git a/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp b/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp index bf3cb0554..bf80c608b 100644 --- a/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp +++ b/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp @@ -100,7 +100,7 @@ var importCondition={};//导入配置 importCondition["templateNo"]="2017060200000001";//导入的模板编号必填 //增加其他配置参数 - importCondition["inputuserid"]="<%=userid%>";; + importCondition["inputuserid"]="<%=userid%>";; importCondition["inputorgid"]="<%=department%>"; var sparam=JSON.stringify(importCondition).replace(/,/g,"@");//生成模板的参数据 AsDialog.PopView("/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcel.jsp","importparam="+sparam, @@ -173,26 +173,60 @@ // 确认收入 function confirmIncome(){ + // 获取ID var sPara = getItemValue(0,getRow(0),'ID'); + // 获取摘要 + var SUMMARY = getItemValue(0,getRow(0),'SUMMARY'); if(typeof(sPara)=="undefined" || sPara.length==0 ){ alert("参数不能为空！"); return ; } + // 重复操作的校验 + if(SUMMARY.toString().indexOf("确认收入")!= -1){ + alert("该笔网银已确认收入,无法重复提交"); + return ; + }else if(SUMMARY.toString().indexOf("确认退回") != -1){ + alert("该笔网银已确认退回,无法重复提交"); + return ; + } + var VOUCHERNO="PZ2018072100000052"; var SUMMARY="确认收入"; var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createLeftEbankIncomeVoucher","ebdataid="+sPara +",VOUCHERNO="+VOUCHERNO +",SUMMARY="+SUMMARY); + if(res=="true"){ + alert("确认收入成功"); + location.reload(true); + }else if(res=="false"){ + alert("确认收入失败"); + } } //确认退回 function confirmpayback(){ var sPara = getItemValue(0,getRow(0),'ID'); + var SUMMARY = getItemValue(0,getRow(0),'SUMMARY'); + // alert(SUMMARY.toString()); if(typeof(sPara)=="undefined" || sPara.length==0 ){ alert("参数不能为空！"); return ; } + + if(SUMMARY.toString().indexOf("确认收入")!= -1){ + alert("该笔网银已确认收入,无法重复提交"); + return ; + }else if(SUMMARY.toString().indexOf("确认退回") != -1){ + alert("该笔网银已确认退回,无法重复提交"); + return ; + } var VOUCHERNO="PZ2018072100000051"; var SUMMARY="确认退回"; var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createLeftEbankIncomeVoucher","ebdataid="+sPara +",VOUCHERNO="+VOUCHERNO +",SUMMARY="+SUMMARY); + if(res=="true"){ + alert("确认退回成功"); + location.reload(true); + }else if(res=="false"){ + alert("确认退回失败"); + } } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 003592094..6a6a662bb 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -4172,6 +4172,8 @@ + + diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java index a3d16daaf..334889158 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java @@ -25,6 +25,9 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness { String MONEY = null; String MONEYNOTAX = null; String MONEYTAX = null; + String DEDITMONEY_NOTAX = null; + String CORPUS = null; + String INTEREST = null; String ACCOUNT_DATE = null; String FACT_DATE = null; String CONTRACT_ID = null; @@ -37,11 +40,10 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness { String CUSTNAME = null; String CUSTOMERTYPE = null; String BUSINESSTYPE = null; - String ACC_NUM = null; String sql = ""; param.clear(); map.put("FlowUnid", FlowUnid); - sql = "SELECT IFNULL(LFIT.FACT_MONEY,0) AS MONEY,IFNULL(ROUND(LFIT.FACT_MONEY / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LFIT.FACT_MONEY - ROUND(LFIT.FACT_MONEY / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)),0) AS MONEYTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT.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,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.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 LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LFIT.FEE_TYPE = 'feetype16' AND LFIT.SETTLE_METHOD = 'settlemethod7' AND LFIT.FLOWUNID = :FLOWUNID "; + sql = "SELECT IFNULL(LFIT.FACT_MONEY, 0) AS MONEY,IFNULL(ROUND(LRIT.PENALTY /getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LRIT.PENALTY - ROUND(LRIT.PENALTY /getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)),0) AS MONEYTAX,'0.00' AS DEDITMONEY_NOTAX,IFNULL(LRIT.CORPUS,0) AS CORPUS,IFNULL(LRIT.INTEREST,0) AS INTEREST,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,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_CALC_CONDITION LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LCCT.CONTRACT_ID LEFT JOIN (SELECT LRIT.CORPUS,LRIT.INTEREST,LRIT.PENALTY,LRIT.FLOWUNID FROM LC_RENT_INCOME_TEMP LRIT WHERE LRIT.SETTLE_METHOD='settlemethod7')LRIT ON LRIT.CONTRACT_ID=LCI.ID LEFT JOIN (SELECT LFIT.FACT_MONEY FROM LC_FUND_INCOME_TEMP LFIT WHERE LFIT.FEE_TYPE = 'feetype16' AND LFIT.SETTLE_METHOD = 'settlemethod7' )LFIT ON LFIT.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 LRIT.FLOWUNID = :FLOWUNID "; // 查询sql, 将结果集封装到list集合中 List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); @@ -54,25 +56,30 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness { double mon = Double.parseDouble(MONEY); // 判断有金额, 封装值到map中 if (Math.abs(mon) > 0) { - MONEYNOTAX = dataList.get(i).get("MONEYNOTAX").toString(); - MONEYTAX = dataList.get(i).get("MONEYTAX").toString(); + MONEYNOTAX = dataList.get(i).get("MONEYNOTAX"); + MONEYTAX = dataList.get(i).get("MONEYTAX"); + DEDITMONEY_NOTAX = dataList.get(i).get("DEDITMONEY_NOTAX"); + CORPUS = dataList.get(i).get("CORPUS"); + INTEREST = dataList.get(i).get("INTEREST"); 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(); + CONTRACT_ID = dataList.get(i).get("CONTRACT_ID"); + CONTRACT_NUMBER = dataList.get(i).get("CONTRACT_NUMBER"); + PROJECT_NAME = dataList.get(i).get("PROJECT_NAME"); + leas_form = dataList.get(i).get("LEAS_FORM"); DISTRIBUTOR_ID = dataList.get(i).get("DISTRIBUTOR_ID"); DISTRIBUTOR_NAME = dataList.get(i).get("DISTRIBUTOR_NAME"); CUSTID = dataList.get(i).get("CUSTOMERID"); CUSTNAME = dataList.get(i).get("CUSTOMERNAME"); CUSTOMERTYPE = dataList.get(i).get("CUSTOMERTYPE"); BUSINESSTYPE = dataList.get(i).get("BUSINESSTYPE"); - ACC_NUM = dataList.get(i).get("ACC_NUMBER"); param.put("FACT_MONEY", MONEY); param.put("INTERESTNOTAX", MONEYNOTAX); param.put("TAX", MONEYTAX); + param.put("DEDITMONEY_NOTAX", DEDITMONEY_NOTAX); + param.put("CORPUS", CORPUS); + param.put("INTEREST", INTEREST); param.put("ACCOUNT_DATE", ACCOUNT_DATE); param.put("FACT_DATE", FACT_DATE); param.put("CONTRACT_ID", CONTRACT_ID); @@ -84,19 +91,7 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness { param.put("CUSTID", CUSTID); param.put("CUSTNAME", CUSTNAME); param.put("CUSTOMERTYPE", CUSTOMERTYPE); - param.put("BUSINESSTYPE", BUSINESSTYPE); - param.put("ACC_NUMBER", ACC_NUM); - - 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("BUSINESSTYPE", "06"); + param.put("BUSINESSTYPE", "0603"); param.put("FlowUnid", FlowUnid); map.clear(); map.put("PROJ_TYPE", leas_form); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java index 7ba56230d..67a1fbf7f 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java @@ -37,19 +37,10 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { param.clear(); map.put("FLOWUNID", FlowUnid); if("PZ2018071100000011".equals(VOUCHERNO)||"PZ2018081500000118".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"; + 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)||"PZ2018081500000119".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," - + "DIF.DISTRIBUTOR_NAME,DDIT.LOCAL_ACCOUNT AS ACC_NUMBER FROM D_DEPOSITCHARGE_INFO_TEMP " - + "DDIT LEFT JOIN DISTRIBUTOR_INFO DIF ON " - + "DIF.DISTRIBUTOR_NO=DDIT.DISTRIBUTOR_ID WHERE DDIT.FLOWUNID=:FLOWUNID"; + 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,DIF.DISTRIBUTOR_NAME,DDIT.LOCAL_ACCOUNT AS ACC_NUMBER FROM D_DEPOSITCHARGE_INFO_TEMP DDIT LEFT JOIN DISTRIBUTOR_INFO DIF ON DIF.DISTRIBUTOR_NO=DDIT.DISTRIBUTOR_ID WHERE DDIT.FLOWUNID=:FLOWUNID"; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java index c969c15be..01cabd8e0 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java @@ -31,11 +31,13 @@ public class CreateVoucherForInterestSubsidyImport { String DISTRIBUTOR_NAME=null; String CUSTID=null; String CUSTNAME=null; + String SUBJECTCODE=null; + String ACC_NUMBER=null; String voucherNo = "PZ2018072100000028"; Map param = new HashMap(); // 获取新导入的贴息数据 - String sql = "SELECT IFNULL(LD.DISCOUNT_MONEY, 0) AS MONEY,IFNULL(ROUND(LD.DISCOUNT_MONEY/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LD.DISCOUNT_MONEY- ROUND(LD.DISCOUNT_MONEY/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)),0) AS MONEYTAX,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,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME FROM LB_DISCOUNT LD LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.FRAME_NUMBER=LD.FRAME_NUMBER LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LEC.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LCCT.CONTRACT_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 WHERE IS_VOUCHER IS NULL "; + String sql = "SELECT IFNULL(LD.DISCOUNT_MONEY, 0) AS MONEY,IFNULL(ROUND(LD.DISCOUNT_MONEY/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LD.DISCOUNT_MONEY- ROUND(LD.DISCOUNT_MONEY/getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)),0) AS MONEYTAX,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,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,LD.BANK_SUBJECT AS SUBJECTCODE,LD.ACC_NUMBER FROM LB_DISCOUNT LD LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.FRAME_NUMBER=LD.FRAME_NUMBER LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID=LEC.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LCCT.CONTRACT_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 WHERE IS_VOUCHER IS NULL "; // 查询sql, 将结果集封装到list集合中 List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, null); CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); @@ -55,6 +57,8 @@ public class CreateVoucherForInterestSubsidyImport { DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME"); CUSTID=dataList.get(i).get("CUSTOMERID"); CUSTNAME=dataList.get(i).get("CUSTOMERNAME"); + SUBJECTCODE=dataList.get(i).get("SUBJECTCODE"); + ACC_NUMBER=dataList.get(i).get("ACC_NUMBER"); param.put("FACT_MONEY",MONEY); param.put("INTERESTNOTAX",MONEYNOTAX); @@ -69,6 +73,8 @@ public class CreateVoucherForInterestSubsidyImport { param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME); param.put("CUSTID",CUSTID); param.put("CUSTNAME",CUSTNAME); + param.put("SUBJECTCODE",SUBJECTCODE); + param.put("ACC_NUMBER",ACC_NUMBER); param.put("VOUCHERNO",voucherNo); Map map = new HashMap(); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCorpusMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCorpusMoney.java new file mode 100644 index 000000000..9c7290129 --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCorpusMoney.java @@ -0,0 +1,23 @@ +package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan; +/*** + * 获取本金 + */ +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; + +public class ContractCorpusMoney implements VoucherJavaParamService{ + + @Override + public Map getJavaParam(JBOTransaction tx, + Map param) 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/CreateVoucherLoan/ContractToDeditMoneyNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractToDeditMoneyNoTax.java new file mode 100644 index 000000000..24413e5de --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractToDeditMoneyNoTax.java @@ -0,0 +1,20 @@ +package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan; + +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; + +public class ContractToDeditMoneyNoTax implements VoucherJavaParamService{ + + @Override + public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + MapreturnValue=new HashMap(); + returnValue.putAll(param); + returnValue.put("MONEY",param.get("DEDITMONEY_NOTAX")); + return returnValue; + } + +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CreateVoucherDepositDeduction.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CreateVoucherDepositDeduction.java index 7ca474fde..e9b62d482 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CreateVoucherDepositDeduction.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CreateVoucherDepositDeduction.java @@ -2,7 +2,6 @@ package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle; import com.amarsoft.awe.util.Transaction; import com.tenwa.flow.baseBussion.BaseBussiness; -import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherCustCautionMoneyIncome; import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherDepositDeductionToMoney; /** * 保证金抵扣流成结束后生成 @@ -15,8 +14,8 @@ public class CreateVoucherDepositDeduction extends BaseBussiness { this.initBussinessParam(Sqlca); String FlowUnid=this.getAttribute("FlowUnid").toString(); CreateVoucherDepositDeductionToMoney cvdd=new CreateVoucherDepositDeductionToMoney(); - cvdd.CreateVoucher(FlowUnid, "PZ2018083000000153");//收到客户保证金 --回租 - cvdd.CreateVoucher(FlowUnid, "PZ2018083000000154");//收到客户保证金 --回租 + cvdd.CreateVoucher(FlowUnid, "PZ2018072100000053");//保证金抵扣--回租 + cvdd.CreateVoucher(FlowUnid, "PZ2018112300000003");//保证金抵扣--回租 return "true"; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java index b01afa713..ab0922f55 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java @@ -15,17 +15,20 @@ public class IncomeVoucher extends BaseBussiness { String FlowUnid=this.getAttribute("FlowUnid").toString(); CreateVoucherCustCautionMoneyIncome cvci=new CreateVoucherCustCautionMoneyIncome(); - cvci.CreateVoucher(FlowUnid, "PZ2018071100000012", "feetype2");//收到客户保证金 --回租 - cvci.CreateVoucher(FlowUnid, "PZ2018080400000078", "feetype2");//收到客户保证金 --直租 + cvci.CreateVoucher(FlowUnid, "PZ2018072100000026", "feetype30");//收到的违约金/罚款 --回租 + cvci.CreateVoucher(FlowUnid, "PZ2018080400000083", "feetype30");//收到的违约金/罚款--直租 - cvci.CreateVoucher(FlowUnid, "PZ2018072100000023", "feetype1");//确认收到手续费（按月分摊收入）--回租 - cvci.CreateVoucher(FlowUnid, "PZ2018080400000080", "feetype1");//确认收到手续费（按月分摊收入）--直租 + //cvci.CreateVoucher(FlowUnid, "PZ2018071100000012", "feetype2");//收到客户保证金 --回租 + //cvci.CreateVoucher(FlowUnid, "PZ2018080400000078", "feetype2");//收到客户保证金 --直租 - cvci.CreateVoucher(FlowUnid, "PZ2018071100000014", "feetype1");//确认收到手续费（一次性确认收入）--直租 - cvci.CreateVoucher(FlowUnid, "PZ2018080400000079", "feetype1");//确认收到手续费（一次性确认收入）--直租 + //cvci.CreateVoucher(FlowUnid, "PZ2018072100000023", "feetype1");//确认收到手续费（按月分摊收入）--回租 + //cvci.CreateVoucher(FlowUnid, "PZ2018080400000080", "feetype1");//确认收到手续费（按月分摊收入）--直租 - cvci.CreateVoucher(FlowUnid, "PZ2018072100000031", "feetype4");//回款-收到名义货价--回租 - cvci.CreateVoucher(FlowUnid, "PZ2018080400000087", "feetype4");//回款-收到名义货价--直租 + //cvci.CreateVoucher(FlowUnid, "PZ2018071100000014", "feetype1");//确认收到手续费（一次性确认收入）--直租 + //cvci.CreateVoucher(FlowUnid, "PZ2018080400000079", "feetype1");//确认收到手续费（一次性确认收入）--直租 + + //cvci.CreateVoucher(FlowUnid, "PZ2018072100000031", "feetype4");//回款-收到名义货价--回租 + //cvci.CreateVoucher(FlowUnid, "PZ2018080400000087", "feetype4");//回款-收到名义货价--直租 //cvci.CreateVoucher(FlowUnid, "PZ2018072100000028", "feetype27");//收到的贴息--回租 //cvci.CreateVoucher(FlowUnid, "PZ2018080400000085", "feetype27");//收到的贴息--直租 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java index 6e6a12d10..1bbb86b47 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java @@ -51,38 +51,38 @@ public class InsertVoucherRentIncome { 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,f67) 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,CASE WHEN lv.loan_direction='1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction='2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction='1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,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,CASE WHEN lv.loan_direction = '2' THEN lci.leas_form ELSE '' END 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 ('PZ2018072100000024','PZ2018080400000081')) lv ON lv.proj_type=lci.LEAS_FORM WHERE LCI.BUSINESSTYPE='1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' and f58 is not null) and lvri.rent>0 and lvri.EBANK_NUMBER is not null and lvri.EBANK_NUMBER<>'' ORDER BY lvri.voucher_f3 "; } - //收到的租金--网银(汽车传统) + /*//收到的租金--网银(汽车传统) if("PZ2018092500000203".equals(VOUCHERNO)||"PZ2018100900000296".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,f67) 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,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.loan_direction = '2' THEN lci.leas_form ELSE '' END 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 ('PZ2018092500000203','PZ2018100900000296')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE='3' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 "; } //收到的租金--网银(传统) if("PZ2018092500000171".equals(VOUCHERNO)||"PZ2018100900000298".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,f67) 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,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '06' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.loan_direction = '2' THEN lci.leas_form ELSE '' END 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 ('PZ2018092500000171','PZ2018100900000298')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE='2' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 "; - } + }*/ //收到的租金--卡扣 if("PZ2018082100000142".equals(VOUCHERNO)||"PZ2018082100000143".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,f67) 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 AS 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,CASE WHEN lv.loan_direction = '2' THEN lci.leas_form ELSE '' END 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 ('PZ2018082100000142','PZ2018082100000143')) 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 and (lvri.EBANK_NUMBER is null or lvri.EBANK_NUMBER='') 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,f67) 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.sort_number='1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number='2' THEN ROUND(lvri.penalty/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) WHEN lv.sort_number='3' THEN lvri.penalty-(ROUND(lvri.penalty/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) ELSE 0.00 END AS f8,'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,CASE WHEN lv.loan_direction='1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction='2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction='1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,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,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_penalty_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','PZ2018080400000082')) lv ON lv.proj_type=lci.LEAS_FORM WHERE LCI.BUSINESSTYPE='1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.penalty>0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER<>'' ORDER BY lvri.voucher_f3"; + 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,f67) 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.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) ELSE 0.00 END AS f8,'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,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '0603' 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,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_penalty_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','PZ2018080400000082'))lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 "; } //收到的逾期利息--网银(汽车传统) - if("PZ2018092500000204".equals(VOUCHERNO)||"PZ2018100900000297".equals(VOUCHERNO)){ + /*if("PZ2018092500000204".equals(VOUCHERNO)||"PZ2018100900000297".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,f67) 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.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax(LCI.LEAS_FORM,'逾期利息',LCI.INPUTTIME),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax(LCI.LEAS_FORM,'逾期利息',LCI.INPUTTIME),2)) ELSE 0.00 END AS f8,'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,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '05' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_penalty_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 ('PZ2018092500000204','PZ2018100900000297')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE='3' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.penalty > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 "; } //收到的逾期利息--网银(传统) if("PZ2018092500000172".equals(VOUCHERNO)||"PZ2018100900000299".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,f67) 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.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax(LCI.LEAS_FORM,'逾期利息',LCI.INPUTTIME),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax(LCI.LEAS_FORM,'逾期利息',LCI.INPUTTIME),2)) ELSE 0.00 END AS f8,'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,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '06' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_penalty_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 ('PZ2018092500000172','PZ2018100900000299')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE='2' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.penalty > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 "; - } + }*/ //收到的逾期利息--卡扣 if("PZ2018082100000144".equals(VOUCHERNO)||"PZ2018082100000145".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,f67) 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.sort_number='1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number='2' THEN ROUND(lvri.penalty/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) WHEN lv.sort_number='3' THEN lvri.penalty-(ROUND(lvri.penalty/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) ELSE 0.00 END AS f8,'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 AS 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,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_penalty_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 ('PZ2018082100000144','PZ2018082100000145')) 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 and (lvri.EBANK_NUMBER is null or lvri.EBANK_NUMBER='') ORDER BY lvri.voucher_f3"; + 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,f67) 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.sort_number='1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number='2' THEN ROUND(lvri.penalty/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) WHEN lv.sort_number='3' THEN lvri.penalty-(ROUND(lvri.penalty/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) ELSE 0.00 END AS f8,'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 AS 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 '0603' 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,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_penalty_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 ('PZ2018082100000144','PZ2018082100000145')) 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 AND (lvri.EBANK_NUMBER IS NULL OR lvri.EBANK_NUMBER='') ORDER BY lvri.voucher_f3"; } // 收到的贴息 - if("PZ2018072100000028".equals(VOUCHERNO)||"PZ2018080400000085".equals(VOUCHERNO)){ + /*if("PZ2018072100000028".equals(VOUCHERNO)||"PZ2018080400000085".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,f67) 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.sort_number='1' THEN lvri.rent ELSE 0.00 END as f7,CASE WHEN lv.sort_number='2' THEN round(lvri.rent/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) WHEN lv.sort_number='3' then lvri.rent-(ROUND(lvri.rent/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) ELSE 0.00 END as f8,'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,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_discount_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 ('PZ2018080400000085','PZ2018072100000028')) 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"; - } + }*/ SqlObject asql = new SqlObject(sql_where); Sqlca.executeSQL(asql); diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index 9f6400301..11dbb783b 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -225,8 +225,22 @@ public class CreateVoucherServiceImpl { for(BizObject bo:subList){ Map subData=new HashMap(); String subId=bo.getAttribute("LOAN_SUBJECT").getString(); - - BizObject sub=JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME,"id=:id").setParameter("id", subId).getSingleResult(false); + BizObject sub=null; + // 获取当前凭证借贷序号 + String SORT_NUMBER = bo.getAttribute("SORT_NUMBER").getString(); + // 获取传入的凭证编号 + String VOUCHERNO = param.get("VOUCHERNO"); + // 贴息根据导入的科目编码获取科目信息, 其他的正常 + if("PZ2018072100000028".equals(VOUCHERNO)) { + if("1".equals(SORT_NUMBER)) { + String SUBJECTCODE = param.get("SUBJECTCODE"); + sub=JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME,"SUBJECTS_CODE=:SUBJECTS_CODE").setParameter("SUBJECTS_CODE", SUBJECTCODE).getSingleResult(false); + }else { + sub=JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME,"id=:id").setParameter("id", subId).getSingleResult(false); + } + }else { + sub=JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME,"id=:id").setParameter("id", subId).getSingleResult(false); + } subData.put("F2", sub.getAttribute("SUBJECTS_CODE").getString()); if(sub.getAttribute("SUBJECTS_CODE").getString().endsWith("****")){ //如果是银行存款科目则根据账号取对应该的科目 @@ -293,7 +307,7 @@ public class CreateVoucherServiceImpl { subData.put("F5", abs);//摘要 subData.put("F6",sub.getAttribute("id").getString());//科目编码 subData.put("F1",dataTemp.get("ACCOUNT_DATE"));//会计处理日 - String VOUCHERNO = param.get("VOUCHERNO"); + if("1".equals(bo.getAttribute("LOAN_DIRECTION").getString())){//借贷方向 subData.put("F7", dataTemp.get("MONEY"));//借方金额 @@ -315,12 +329,15 @@ public class CreateVoucherServiceImpl { }else if("PZ2018092500000164".equals(VOUCHERNO)||"PZ2018092600000229".equals(VOUCHERNO) || "PZ2018092500000166".equals(VOUCHERNO) || "PZ2018092600000231".equals(VOUCHERNO) || "PZ2018092500000209".equals(VOUCHERNO) || "PZ2018100900000251".equals(VOUCHERNO) || "PZ2018092500000210".equals(VOUCHERNO) || "PZ2018100900000252".equals(VOUCHERNO)){ subData.put("CUSTID","APZL00000000DC");//虚拟账户 subData.put("CUSTNAME","业务系统待查客户");//虚拟账户 - }else if("PZ2018092500000156".equals(VOUCHERNO)||"PZ2018092500000157".equals(VOUCHERNO) || "PZ2018092500000158".equals(VOUCHERNO) || "PZ2018092600000244".equals(VOUCHERNO) || "PZ2018092600000245".equals(VOUCHERNO) || "PZ2018092600000246".equals(VOUCHERNO)){ + }else if("PZ2018092500000156".equals(VOUCHERNO)||"PZ2018092500000157".equals(VOUCHERNO) || "PZ2018092500000158".equals(VOUCHERNO) || "PZ2018092600000244".equals(VOUCHERNO) || "PZ2018092600000245".equals(VOUCHERNO) || "PZ2018092600000246".equals(VOUCHERNO) || "PZ2018072100000026".equals(VOUCHERNO) || "PZ2018072100000051".equals(VOUCHERNO)){ subData.put("CUSTID","APZL00000000DC");//虚拟账户 subData.put("CUSTNAME","业务系统待查客户");//虚拟账户 }else if("PZ2018092500000175".equals(VOUCHERNO)||"PZ2018100900000257".equals(VOUCHERNO) || "PZ2018092500000176".equals(VOUCHERNO) || "PZ2018100900000258".equals(VOUCHERNO) || "PZ2018092500000177".equals(VOUCHERNO) || "PZ2018100900000259".equals(VOUCHERNO) || "PZ2018092500000178".equals(VOUCHERNO) || "PZ2018100900000260".equals(VOUCHERNO)){ subData.put("CUSTID","APZL00000000DC");//虚拟账户 subData.put("CUSTNAME","业务系统待查客户");//虚拟账户 + }else if("PZ2018072100000052".equals(VOUCHERNO)){ + subData.put("CUSTID","APZL00000000DC");//虚拟账户 + subData.put("CUSTNAME","业务系统待查客户");//虚拟账户 }else { subData.put("CUSTID",dataTemp.get("CUSTID"));//客商id subData.put("CUSTNAME",dataTemp.get("CUSTNAME"));//客商名称 @@ -352,8 +369,7 @@ public class CreateVoucherServiceImpl { } // 获取直租/回租类型 String LEAS_FORM = param.get("LEAS_FORM"); - // 获取当前凭证借贷序号 - String SORT_NUMBER = bo.getAttribute("SORT_NUMBER").getString(); + if("PZ2018070900000002".equals(VOUCHERNO) || "PZ2018072400000060".equals(VOUCHERNO)) { if("3".equals(SORT_NUMBER)) { subData.put("CUSTID",dataTemp.get("DISTRIBUTOR_ID"));//经销商id diff --git a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java index a1acaeece..cd07449a5 100644 --- a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java +++ b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java @@ -18,6 +18,7 @@ import com.amarsoft.awe.util.ASResultSet; import com.amarsoft.awe.util.SqlObject; import com.amarsoft.awe.util.Transaction; import com.amarsoft.dict.als.cache.CacheLoaderFactory; +import com.amarsoft.dict.als.manage.NameManager; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; @@ -125,72 +126,101 @@ public class EbankUse { * @param tx * @throws Exception */ - public String createLeftEbankIncomeVoucher(JBOTransaction tx) throws Exception { + public String createLeftEbankIncomeVoucher(JBOTransaction tx) { Transaction Sqlca = null; - Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + String sMessage = ""; + try { + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); - Map map = new HashMap(); - Map param = new HashMap(); + Map map = new HashMap(); + Map param = new HashMap(); - // 获取页面传入参数 - String VOUCHERNO = this.getVOUCHERNO(); - String ID = this.getEbdataid(); - - // 通过传入id查询所需数据 - map.put("ID", ID); - String sql1 = "SELECT LE.MAYOPE_MONEY AS MONEY,ROUND(LE.MAYOPE_MONEY / 1.06, 2) AS MONEYNOTAX,LE.MAYOPE_MONEY - ROUND(LE.MAYOPE_MONEY / 1.06, 2) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LE.OWNACC_NUMBER AS ACC_NUMBER,LE.EBANK_SN FROM LC_EBANK LE WHERE ID = :ID "; - List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, map); + // 获取页面传入参数 + String VOUCHERNO = this.getVOUCHERNO(); + String ID = this.getEbdataid(); + + // 通过传入id查询所需数据 + map.put("ID", ID); + String sql1 = "SELECT LE.MAYOPE_MONEY AS MONEY,ROUND(LE.MAYOPE_MONEY / 1.06, 2) AS MONEYNOTAX,LE.MAYOPE_MONEY - ROUND(LE.MAYOPE_MONEY / 1.06, 2) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LE.OWNACC_NUMBER AS ACC_NUMBER,LE.EBANK_SN AS CONTRACT_NUMBER,CI.CUSTOMER_NUM as CUSTOMERID,CI.CUSTOMERNAME FROM LC_EBANK LE LEFT JOIN CUSTOMER_INFO CI ON CI.CUSTOMERID=LE.CUSTOMER_ID WHERE ID = :ID "; + List> dataList; - // 获取所需数据 - String VOUCHER_TYPE = "1";// 凭证分类 金蝶 - String userid = "admin"; - - for (Map jbo : dataList) { - String MONEY = jbo.get("MONEY").toString(); - if ("".equals(MONEY) || MONEY == null)MONEY = "0.00"; - double mon = Double.parseDouble(MONEY); - if (mon > 0) { - String MONEYNOTAX = jbo.get("MONEYNOTAX").toString(); - String TAX = jbo.get("TAX").toString(); - String ACCOUNT_DATE = jbo.get("ACCOUNT_DATE").toString(); - String FACT_DATE = jbo.get("FACT_DATE").toString(); - String ACC_NUMBER = jbo.get("ACC_NUMBER").toString(); - String CONTRACT_NUMBER = jbo.get("EBANK_SN").toString(); - - // 将数据封装如param中 - param.put("FACT_MONEY", MONEY); - param.put("INTERESTNOTAX", MONEYNOTAX); - param.put("TAX", TAX); - param.put("ACCOUNT_DATE", ACCOUNT_DATE); - param.put("FACT_DATE", FACT_DATE); - param.put("ACC_NUMBER", ACC_NUMBER); - param.put("CONTRACT_NUMBER", CONTRACT_NUMBER); - param.put("DEPT", "02"); // 部门 - - // 通过凭证编号获取对应编号的凭证信息 - map.clear(); - map.put("VOUCHER_NO", VOUCHERNO); - BizObject voucher = DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); - - // 如果有有此凭证, 生成当前凭证 - CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); - if (voucher != null) { - vs.createVoucher(voucher.getAttribute("MODULAR_NUMBER").getString(),voucher.getAttribute("OWNED_COMPANY").getString(), "02", VOUCHER_TYPE, userid, param,Sqlca); + dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, map); + + // 获取所需数据 + String VOUCHER_TYPE = "1";// 凭证分类 金蝶 + String userid = "admin"; + + for (Map jbo : dataList) { + String MONEY = jbo.get("MONEY").toString(); + if ("".equals(MONEY) || MONEY == null)MONEY = "0.00"; + double mon = Double.parseDouble(MONEY); + if (mon > 0) { + String MONEYNOTAX = jbo.get("MONEYNOTAX").toString(); + String TAX = jbo.get("TAX").toString(); + String ACCOUNT_DATE = jbo.get("ACCOUNT_DATE").toString(); + String FACT_DATE = jbo.get("FACT_DATE").toString(); + String ACC_NUMBER = jbo.get("ACC_NUMBER").toString(); + String CONTRACT_NUMBER = jbo.get("CONTRACT_NUMBER").toString(); + String CUSTOMERID = jbo.get("CUSTOMERID"); + String CUSTOMERNAME = jbo.get("CUSTOMERNAME"); + //NameManager.getCustomerName(CUSTOMERID); + // 将数据封装如param中 + param.put("FACT_MONEY", MONEY); + param.put("INTERESTNOTAX", MONEYNOTAX); + param.put("TAX", TAX); + param.put("ACCOUNT_DATE", ACCOUNT_DATE); + param.put("FACT_DATE", FACT_DATE); + param.put("ACC_NUMBER", ACC_NUMBER); + param.put("CONTRACT_NUMBER", CONTRACT_NUMBER); + param.put("CUSTID", CUSTOMERID); + param.put("CUSTNAME", CUSTOMERNAME); + param.put("VOUCHERNO", VOUCHERNO); + param.put("DEPT", "02"); // 部门 + + // 通过凭证编号获取对应编号的凭证信息 + map.clear(); + map.put("VOUCHER_NO", VOUCHERNO); + BizObject voucher = DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); + + // 如果有有此凭证, 生成当前凭证 + CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); + if (voucher != null) { + vs.createVoucher(voucher.getAttribute("MODULAR_NUMBER").getString(),voucher.getAttribute("OWNED_COMPANY").getString(), "02", VOUCHER_TYPE, userid, param,Sqlca); + } + } + } + + // 获取参数, 按需修改数据 + String SUMMARY = this.getSUMMARY(); + // 执行确认收入时, 可核销金额转入已核销金额 + if("PZ2018072100000052".equals(VOUCHERNO)) { + String sql2="UPDATE LC_EBANK SET HAD_MONEY=(MAYOPE_MONEY+HAD_MONEY),MAYOPE_MONEY='0.00',SUMMARY=CONCAT_WS(',',SUMMARY,'"+ SUMMARY + "') WHERE ID='" + ID + "'"; + SqlObject s2= new SqlObject(sql2); + Sqlca.executeSQL(s2); + }else if("PZ2018072100000051".equals(VOUCHERNO)) {// 执行确认退回时, 可核销金额转入非业务金额 + String sql3="UPDATE LC_EBANK SET NOWITH_MONEY=(MAYOPE_MONEY+NOWITH_MONEY),MAYOPE_MONEY='0.00',SUMMARY=CONCAT_WS(',',SUMMARY,'"+ SUMMARY + "') WHERE ID='" + ID + "'"; + SqlObject s3= new SqlObject(sql3); + Sqlca.executeSQL(s3); + } + Sqlca.commit(); + sMessage = "true"; + } catch (Exception e) { + try { + sMessage="false"; + Sqlca.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + }finally { + if(Sqlca!=null) { + try { + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); } } } - - // 获取参数, 按需修改数据 - String SUMMARY = this.getSUMMARY(); - // 执行确认收入时, 可核销金额转入非业务金额 - String sql2 = "UPDATE LC_EBANK SET NOWITH_MONEY=(NOWITH_MONEY+MAYOPE_MONEY),MAYOPE_MONEY='0.00',SUMMARY=CONCAT_WS(',',SUMMARY,'"+ SUMMARY + "') WHERE ID='" + ID + "'"; - SqlObject sql3= new SqlObject(sql2); - Sqlca.executeSQL(sql3); - if (Sqlca != null) { - Sqlca.commit(); - } - - String sMessage = "true"; return sMessage; } } From 4aa28eeb9e5461cefc4adfe32cfc8aa8d5cc4a77 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Sat, 24 Nov 2018 17:54:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=8F=AF=E4=BB=A5=E5=8D=95=E4=B8=AA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow/project/validate/SoapRequest.java | 43 ++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java b/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java index 3fc4dab08..a213b7ee7 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java +++ b/src_tenwa/com/tenwa/lease/flow/project/validate/SoapRequest.java @@ -8,7 +8,46 @@ public class SoapRequest { //自然人拼接请求XML方法 public static String FirstXMLConfiguration(BizObject biz1,BizObject biz2,List bizList) throws Exception { StringBuffer sb = new StringBuffer(""); - if(bizList.size()>0 && biz2 != null){ + sb.append(""); + sb.append(""); + sb.append(""); + sb.append("安鹏国际融资租赁有限公司"); + sb.append(""); + sb.append(""); + sb.append("公民身份号码"); + sb.append("姓名"); + sb.append(""); + //将申请人信息添加xml文件中 + if(biz1!=null){ + sb.append(""); + //入参申请人身份证号码 + sb.append(""+biz1.getAttribute("CERTID").getString()+""); + //入参申请人姓名 + sb.append(""+biz1.getAttribute("FULLNAME").getString()+""); + sb.append(""); + } + //将共同申请人信息添加xml文件中 + if(biz2!=null){ + sb.append(""); + //入参共同申请人身份证号码 + sb.append(""+biz2.getAttribute("certid").getString()+""); + //入参共同申请人姓名 + sb.append(""+biz2.getAttribute("name").getString()+""); + sb.append(""); + } + //将担保人信息添加xml文件中 + if(bizList!=null && bizList.size()>0 ){ + for(int i=0;i"); + //入参共同申请人身份证号码 + sb.append(""+bizList.get(i).getAttribute("CERTID").getString()+""); + //入参共同申请人姓名 + sb.append(""+bizList.get(i).getAttribute("FULLNAME").getString()+""); + sb.append(""); + } + } + sb.append(""); + /*if(bizList.size()>0 && biz2 != null){ sb.append(BaseXMLConfiguration(biz1)); sb.append(""); //入参共同申请人身份证号码 @@ -48,7 +87,7 @@ public class SoapRequest { }else{ sb.append(BaseXMLConfiguration(biz1)); sb.append(""); - } + }*/ System.out.println("HttpClient 发送SOAP请求"); String xmldata = sb.toString(); System.out.println(xmldata); From 9402e3bfee54aded37e67cc530e9ad52689b7f02 Mon Sep 17 00:00:00 2001 From: tangft <32189@DESKTOP-M6TAG3K> Date: Mon, 26 Nov 2018 15:36:02 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=8C=E6=89=BF=E7=A7=9F=E4=BA=BA=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/LBContractTemplate/contract_template.jsp | 14 ++++++++++++-- 1 file changed, 12 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 dc4fbc68c..da96a1669 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp @@ -3,6 +3,7 @@ <%@page import="jbo.app.tenwa.customer.CUSTOMER_COMPANY_TEMP"%> <%@page import="jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP"%> <%@page import="jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP"%> +<%@page import="jbo.app.tenwa.customer.CUSTOMER_ADDRESS_TEMP"%> <%@page import="com.amarsoft.app.check.CheckFLowPhaseNo"%> <%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% /* @@ -59,11 +60,20 @@ NetMortgagor=cct.getAttribute("company_name").getString(); }else{ BizObjectManager cptm = JBOFactory.getBizObjectManager(CUSTOMER_PERSON_TEMP.CLASS_NAME); - String sSql = "select o.certid,o.mobile,o.nativeplace,o.fullname FROM o where o.customerid =:customerid and o.flowunid=:flowunid"; + BizObjectManager catm = JBOFactory.getBizObjectManager(CUSTOMER_ADDRESS_TEMP.CLASS_NAME); + String sSql = "select o.certid,o.mobile,o.nativeplace,o.MAILING_ADDRESS,o.fullname,o.WORKADD FROM o where o.customerid =:customerid and o.flowunid=:flowunid"; + String catSql = "select o.FULLADDRESS FROM o where o.customerid =:customerid and o.flowunid=:flowunid"; BizObject cpt = cptm.createQuery(sSql).setParameter("customerid", customerid).setParameter("flowunid", flowunid).getSingleResult(false); + BizObject cat = catm.createQuery(catSql).setParameter("customerid", customerid).setParameter("flowunid", flowunid).getSingleResult(false); certid=cpt.getAttribute("certid").getString(); mobile=cpt.getAttribute("mobile").getString(); - address=cpt.getAttribute("nativeplace").getString(); + if("居住地址".equals(cpt.getAttribute("MAILING_ADDRESS").getString())){ + address=cat.getAttribute("FULLADDRESS").getString(); + }else if("户籍地址".equals(cpt.getAttribute("MAILING_ADDRESS").getString())){ + address=cpt.getAttribute("nativeplace").getString(); + }else if("单位地址".equals(cpt.getAttribute("MAILING_ADDRESS").getString())){ + address=cpt.getAttribute("WORKADD").getString(); + } NetMortgagor=cpt.getAttribute("fullname").getString(); } //给网约车模板 From 8081dfd6e92ae5b86293897fdd439028f72dd2cf Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Mon, 26 Nov 2018 15:51:50 +0800 Subject: [PATCH 5/5] =?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 --- .../ContractInterestTax.java | 1 - .../CreateVoucherMonthSettlement.java | 42 +++++++++------- .../CreateVoucherDaySettlementMission.java | 49 +++++++++++++++++++ .../CreateVoucherMonthSettlementMission.java | 4 +- 4 files changed, 75 insertions(+), 21 deletions(-) create mode 100644 src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherDaySettlementMission.java diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java index a5aa7c816..8fc97897e 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java @@ -17,7 +17,6 @@ public class ContractInterestTax implements VoucherJavaParamService{ Map param) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); - returnValue.put("FUNDTYPE","02"); returnValue.put("MONEY",param.get("TAX")); return returnValue; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java index 6cd301732..60f0d0e6e 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java @@ -27,6 +27,8 @@ public class CreateVoucherMonthSettlement{ Map param=new HashMap(); // 定义全局变量 String MONEY=null; + String MONEYNOTAX=null; + String TAX=null; String ACCOUNT_DATE=null; String FACT_DATE=null; String CONTRACT_ID=null; @@ -48,9 +50,9 @@ public class CreateVoucherMonthSettlement{ String modular="";// v8表互斥名称 String businessType="";// 业务类型 // 汽车类 - if("PZ2018071200000017".equals(voucherNo)||"PZ2018080400000104".equals(voucherNo)) { moneyType="FEEMONEY"; modular="月结-确认手续费";businessType=" LPI.BUSINESSTYPE='1' AND ";}//月结-确认手续费 + if("PZ2018071200000017".equals(voucherNo)||"PZ2018080400000104".equals(voucherNo)) { moneyType="FEE_NOTAX"; modular="月结-确认手续费";businessType=" LPI.BUSINESSTYPE='1' AND ";}//月结-确认手续费 if("PZ2018071200000016".equals(voucherNo)||"PZ2018080400000102".equals(voucherNo)) { moneyType="MONEY";modular="月结-确认未实现利息收入";businessType=" LPI.BUSINESSTYPE='1' AND ";}//月结-确认未实现利息收入 - if("PZ2018072100000048".equals(voucherNo)||"PZ2018080400000103".equals(voucherNo)) { moneyType="DISCOUNT";modular="月结-确认贴息收入";businessType=" LPI.BUSINESSTYPE='1' AND ";}//月结-确认贴息收入 + if("PZ2018072100000048".equals(voucherNo)||"PZ2018080400000103".equals(voucherNo)) { moneyType="DISCOUNT_NOTAX";modular="月结-确认贴息收入";businessType=" LPI.BUSINESSTYPE='1' AND ";}//月结-确认贴息收入 // 传统 if("PZ2018092500000183".equals(voucherNo)||"PZ2018100900000280".equals(voucherNo)) { moneyType="MONEYNOTAX";modular="日结--确认未实现利息收入(传统)";businessType=" LPI.BUSINESSTYPE='2' AND ";}//日结-确认未实现利息收入 @@ -63,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,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 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 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+"%')"; //租金的利息税金 if("PZ2018072100000055".equals(voucherNo)){ @@ -85,23 +87,27 @@ public class CreateVoucherMonthSettlement{ if("".equals(MONEY)||MONEY==null) MONEY="0.00"; double mon=Double.parseDouble(MONEY); if(mon>0){ - 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"); - F58=dataList.get(i).get("ID"); + MONEYNOTAX=dataList.get(i).get("MONEYNOTAX"); + TAX=dataList.get(i).get("TAX"); + 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"); + F58=dataList.get(i).get("ID"); param.put("FACT_MONEY",MONEY); + param.put("INTERESTNOTAX",MONEYNOTAX); + param.put("TAX",TAX); //param.put("FACT_MONEY",FEEMONEY); param.put("ACCOUNT_DATE",ACCOUNT_DATE); param.put("FACT_DATE",FACT_DATE); diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherDaySettlementMission.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherDaySettlementMission.java new file mode 100644 index 000000000..aeb19a69f --- /dev/null +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherDaySettlementMission.java @@ -0,0 +1,49 @@ +package com.tenwa.lease.app.quartzmession; + +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; + +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.util.StringFunction; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; +import com.base.util.QuartzUtil; +import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMonthSettlement; + +public class CreateVoucherDaySettlementMission implements Job { + + @Override + public void execute(JobExecutionContext arg0) throws JobExecutionException { + // 获取当前系统时间 + String startime = StringFunction.getTodayNow(); + // 获取用户id + Object userId = arg0.getTrigger().getJobDataMap().get("CurUserId"); + String curUserId = userId == null? "system" : userId.toString(); + + try{ + CreateVoucherMonthSettlement vouchermanage=new CreateVoucherMonthSettlement(); + + vouchermanage.CreateVoucher("PZ2018072100000055");//日结税金--回租 + vouchermanage.CreateVoucher("PZ2018080200000063");//日结税金--直租 + + // 汽车类传统类日结-月结 + vouchermanage.CreateVoucher("PZ2018092500000215");//日结-确认未实现利息收入--回租 + vouchermanage.CreateVoucher("PZ2018100900000275");//日结-确认未实现利息收入--直租 + + vouchermanage.CreateVoucher("PZ2018092500000216");//日结-确认租金利息税金--回租 + vouchermanage.CreateVoucher("PZ2018100900000277");//日结-确认租金利息税金--直租 + + // 传统类日结-月结 + vouchermanage.CreateVoucher("PZ2018092500000183");//日结-确认未实现利息收入--回租 + vouchermanage.CreateVoucher("PZ2018100900000280");//日结-确认未实现利息收入--直租 + + vouchermanage.CreateVoucher("PZ2018092500000184");//日结-确认租金利息税金--回租 + vouchermanage.CreateVoucher("PZ2018100900000281");//日结-确认租金利息税金--直租 + + QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.CreateVoucherDaySettlementMission", "success", "成功", curUserId); + } catch (Exception e) { + QuartzUtil.insertLog(startime,"com.tenwa.lease.app.quartzmession.CreateVoucherDaySettlementMission", "error", "失败", curUserId); + } + } +} diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java index 892c39c27..ea5dde4dd 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherMonthSettlementMission.java @@ -40,8 +40,8 @@ public class CreateVoucherMonthSettlementMission implements Job { vouchermanage.CreateVoucher("PZ2018071200000016");//月结-确认未实现利息收入--回租 vouchermanage.CreateVoucher("PZ2018080400000102");//月结-确认未实现利息收入--直租 - vouchermanage.CreateVoucher("PZ2018072100000055");//日结税金--回租 - vouchermanage.CreateVoucher("PZ2018080200000063");//日结税金--直租 + //vouchermanage.CreateVoucher("PZ2018072100000055");//日结税金--回租 + //vouchermanage.CreateVoucher("PZ2018080200000063");//日结税金--直租 // 汽车类传统类日结-月结 vouchermanage.CreateVoucher("PZ2018092500000215");//日结-确认未实现利息收入--回租