diff --git a/WebContent/TestCase/BizletTest.jsp b/WebContent/TestCase/BizletTest.jsp index 78b3e4111..8156908be 100644 --- a/WebContent/TestCase/BizletTest.jsp +++ b/WebContent/TestCase/BizletTest.jsp @@ -5,7 +5,7 @@ /* sExpression = "!CustomerManager.GetCustomerName(2000042779)"; sExpression = Expression.pretreatMethod(sExpression,Sqlca); - String sReturn = Expression.getExpressionValue(sExpression,Sqlca).stringValue(); + String sReturn = Expression.getExpressionValue(sExpression,Sqlca).stringValue(); out.println(sReturn); */ ASMethod asm = new ASMethod("CustomerManager","GetCustomerName",Sqlca); diff --git a/WebContent/WEB-INF/etc/jbo/jbo_voucher.xml b/WebContent/WEB-INF/etc/jbo/jbo_voucher.xml index ed488e600..46276fe54 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_voucher.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_voucher.xml @@ -82,6 +82,7 @@ + diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java index d059c94d7..bcbee4944 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java @@ -39,11 +39,11 @@ public class CreateVoucherContractTerminate { param.clear(); map.put("FlowUnid", FlowUnid); //ؿ--յΥԼ - if("PZ2018072100000026".equals(VOUCHERNO)||"PZ2018080400000083".equals(VOUCHERNO)){ + if("PZ2018072100000026".equals(VOUCHERNO)||"PZ2018080400000083".equals(VOUCHERNO)||"PZ2018080400000093".equals(VOUCHERNO)){ sql= "SELECT IFNULL(HANDLING_CHARGE,0) AS MONEY ,ROUND(IFNULL(HANDLING_CHARGE,0)/1.06,2) AS MONEYNOTAX,(IFNULL(HANDLING_CHARGE,0)-ROUND(IFNULL(HANDLING_CHARGE,0)/1.06,2)) AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCI.ID CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.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 LFRA.FLOWUNID=:FLOWUNID"; } //յǰ - if("PZ2018072100000027".equals(VOUCHERNO)||"PZ2018080400000084".equals(VOUCHERNO)){ + if("PZ2018072100000027".equals(VOUCHERNO)||"PZ2018080400000084".equals(VOUCHERNO)||"PZ2018080400000094".equals(VOUCHERNO)){ sql= "SELECT IFNULL(CORPUS_OVERAGE,0) AS MONEY ,0 AS MONEYNOTAX,0 AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCI.ID CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.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 LFRA.FLOWUNID=:FLOWUNID"; } //ǰ-δʵϢ(˰) @@ -69,8 +69,8 @@ public class CreateVoucherContractTerminate { if("".equals(MONEY)||MONEY==null) MONEY="0.00"; double mon=Double.parseDouble(MONEY); if(mon>0){ - MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString(); - MONEYTAX=dataList.get(i).get("MONEYTAX").toString(); + MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString(); + MONEYTAX=dataList.get(i).get("MONEYTAX").toString(); 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(); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java index fa17bbba7..7e21a43b4 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java @@ -13,114 +13,120 @@ import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.flow.baseBussion.BaseBussiness; import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; -public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness{ +public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness { - public String CreateVoucher(String FlowUnid,String VOUCHERNO,String FeeType) throws Exception { + public String CreateVoucher(String FlowUnid, String VOUCHERNO, String FeeType) throws Exception { + + Transaction Sqlca = null; + Map map = new HashMap(); + Map param = new HashMap(); + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); - Transaction Sqlca =null; - Map map=new HashMap(); - Map param=new HashMap(); - Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); - String MONEY=null; - String MONEYNOTAX=null; - String MONEYTAX=null; - String ACCOUNT_DATE=null; - String FACT_DATE=null; - String CONTRACT_ID=null; - String CONTRACT_NUMBER=null; - String PROJECT_NAME=null; - String leas_form=null; - String DISTRIBUTOR_ID=null; - String DISTRIBUTOR_NAME=null; - String CARID=null; - String CARMODEL=null; - String CUSTID=null; - String CUSTNAME=null; - String CUSTOMERTYPE=null; - String BUSINESSTYPE=null; - String ACC_NUM=null; - String sql=""; + String MONEY = null; + String MONEYNOTAX = null; + String MONEYTAX = null; + String ACCOUNT_DATE = null; + String FACT_DATE = null; + String CONTRACT_ID = null; + String CONTRACT_NUMBER = null; + String PROJECT_NAME = null; + String leas_form = null; + String DISTRIBUTOR_ID = null; + String DISTRIBUTOR_NAME = null; + String CARID = null; + String CARMODEL = null; + String CUSTID = null; + String CUSTNAME = null; + String CUSTOMERTYPE = null; + String BUSINESSTYPE = null; + String ACC_NUM = null; + String sql = ""; param.clear(); map.put("FlowUnid", FlowUnid); map.put("FEE_TYPE", FeeType); - sql= "SELECT LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY/1.06,2) AS MONEYNOTAX,(LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/1.06,2)) 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.CERTID 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 WHERE LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID "; - - List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); + //sql= "SELECT LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY/1.06,2)AS MONEYNOTAX,(LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/1.06,2)) 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.CERTID 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 WHERE LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID AND DATE_FORMAT(LFIT.FACT_DATE,'%Y/%m')=DATE_FORMAT(SYSDATE(),'%Y/%m')"; + sql = "SELECT LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY/1.06,2) AS MONEYNOTAX,(LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/1.06,2)) 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.CERTID 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 WHERE LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID "; + // ѯsql, װlist + List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); - CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); - String VOUCHER_TYPE="1";// ƾ֤ - String userid ="admin"; - for (int i=0;i0){ - MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString(); - MONEYTAX=dataList.get(i).get("MONEYTAX").toString(); - 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"); - ACC_NUM=dataList.get(i).get("ACC_NUMBER"); - - param.put("FACT_MONEY",MONEY); - param.put("INTERESTNOTAX",MONEYNOTAX); - param.put("TAX",MONEYTAX); - param.put("ACCOUNT_DATE",ACCOUNT_DATE); - param.put("FACT_DATE",FACT_DATE); - param.put("CONTRACT_ID",CONTRACT_ID); - param.put("CONTRACT_NUMBER",CONTRACT_NUMBER); - param.put("PROJECT_NAME",PROJECT_NAME); - param.put("LEAS_FORM",leas_form); - param.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID); - param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME); - param.put("CARID",CARID); - param.put("CARMODEL",CARMODEL); - 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("FUNDTYPE", ""); // Ӫ - param.put("BUSINESSTYPE", "06"); - - param.put("FlowUnid", FlowUnid); - map.clear(); - map.put("PROJ_TYPE", leas_form); - map.put("VOUCHER_NO", VOUCHERNO); - BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); - - if(vouch!=null){ - vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); - }} + CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); + String VOUCHER_TYPE = "1";// ƾ֤ + String userid = "admin"; + //ȡ, дmap + for (int i = 0; i < dataList.size(); i++) { + MONEY = dataList.get(i).get("MONEY").toString(); + if ("".equals(MONEY)||MONEY == null)MONEY = "0.00"; + 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(); + 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"); + ACC_NUM = dataList.get(i).get("ACC_NUMBER"); + + param.put("FACT_MONEY", MONEY); + param.put("INTERESTNOTAX", MONEYNOTAX); + param.put("TAX", MONEYTAX); + param.put("ACCOUNT_DATE", ACCOUNT_DATE); + param.put("FACT_DATE", FACT_DATE); + param.put("CONTRACT_ID", CONTRACT_ID); + param.put("CONTRACT_NUMBER", CONTRACT_NUMBER); + param.put("PROJECT_NAME", PROJECT_NAME); + param.put("LEAS_FORM", leas_form); + param.put("DISTRIBUTOR_ID", DISTRIBUTOR_ID); + param.put("DISTRIBUTOR_NAME", DISTRIBUTOR_NAME); + param.put("CARID", CARID); + param.put("CARMODEL", CARMODEL); + 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("FUNDTYPE", ""); // Ӫ + param.put("BUSINESSTYPE", "06"); + param.put("FlowUnid", FlowUnid); + map.clear(); + map.put("PROJ_TYPE", leas_form); + map.put("VOUCHER_NO", VOUCHERNO); + // mapеIJ, ѯLV_VOUCHER_CONFIG + BizObject vouch = DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); + // Ϊ, + if (vouch != null) { + //ƾ֤IJһ + vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid, param,Sqlca); + } + } } - - if(Sqlca!=null){ + + if (Sqlca != null) { Sqlca.commit(); } - - String sMessage="true"; + + String sMessage = "true"; return sMessage; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java index d210a0ec9..b530b582e 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java @@ -42,7 +42,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { + " DDIT LEFT JOIN DISTRIBUTOR_INFO DIF ON DIF.DISTRIBUTOR_NO=DDIT.DISTRIBUTOR_ID " + "WHERE DDIT.FLOWUNID=:FLOWUNID"; } - if("PZ2018072100000032".equals(VOUCHERNO)||"PZ2018080400000088".equals(VOUCHERNO)){ + if("PZ2018072100000032".equals(VOUCHERNO)||"PZ2018080400000088".equals(VOUCHERNO)||"PZ2018080400000098".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," diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceSettlement.java index f6977926e..74394a3fc 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceSettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceSettlement.java @@ -27,7 +27,9 @@ public class CreateVoucherInsuranceSettlement{ Map param=new HashMap(); String MONEY=null; - String FEEMONEY=null; + String MONEYNOTAX=null; + String MONEYTAX=null; + String RENTMONEY=null; String ACCOUNT_DATE=null; String FACT_DATE=null; String CONTRACT_ID=null; @@ -46,7 +48,11 @@ public class CreateVoucherInsuranceSettlement{ String sql=""; String moneyType="MONEY"; - sql="SELECT lic.claims_money AS MONEY,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS FACT_DATE,lii.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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LB_INSURANCE_CLAIM lic inner join LB_INSURANCE_INFO lii on lic.INSURANCE_ID=lii.INSURANCE_ID LEFT JOIN LB_CONTRACT_INFO LCI ON lii.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(lic.inputtime,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')"; + if("PZ2018080600000114".equals(voucherNo)){ + sql="SELECT lic.claims_money AS MONEY,ROUND(nvl(LrIT.penalty / 1.06, 0),2) AS MONEYNOTAX,ROUND(nvl(LrIT.penalty,0),2) - ROUND(nvl(LrIT.penalty / 1.06, 0),2) AS MONEYTAX,ROUND(nvl(LrIT.RENT,0),2) AS RENTMONEY,DATE_FORMAT(claims_start_date, '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(claims_start_date, '%Y/%m/%d') AS FACT_DATE,lii.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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LB_INSURANCE_CLAIM lic INNER JOIN LB_INSURANCE_INFO lii ON lic.INSURANCE_ID = lii.INSURANCE_ID LEFT JOIN LB_CONTRACT_INFO LCI ON lii.CONTRACT_ID = LCI.ID LEFT JOIN LC_rent_INCOME_temp LrIT ON LrIT.`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(lic.inputtime, '%Y/%m') = DATE_FORMAT(SYSDATE(), '%Y/%m')"; + }else{ + sql="SELECT lic.claims_money AS MONEY,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS FACT_DATE,lii.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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LB_INSURANCE_CLAIM lic inner join LB_INSURANCE_INFO lii on lic.INSURANCE_ID=lii.INSURANCE_ID LEFT JOIN LB_CONTRACT_INFO LCI ON lii.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(lic.inputtime,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')"; + } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); @@ -56,10 +62,12 @@ public class CreateVoucherInsuranceSettlement{ for (int i=0;i0){ + MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString(); + MONEYTAX=dataList.get(i).get("MONEYTAX").toString(); + RENTMONEY=dataList.get(i).get("RENTMONEY").toString(); 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(); @@ -76,7 +84,9 @@ public class CreateVoucherInsuranceSettlement{ BUSINESSTYPE=dataList.get(i).get("BUSINESSTYPE"); param.put("FACT_MONEY",MONEY); - //param.put("FACT_MONEY",FEEMONEY); + param.put("INTERESTNOTAX",MONEYNOTAX); + param.put("TAX",MONEYTAX); + param.put("RENTMONEY",RENTMONEY); param.put("ACCOUNT_DATE",ACCOUNT_DATE); param.put("FACT_DATE",FACT_DATE); param.put("CONTRACT_ID",CONTRACT_ID); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java index 23352b077..91511b474 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java @@ -20,8 +20,8 @@ public class CleanLeaseMoney implements VoucherJavaParamService { String FIRST_PAYMENT=param.get("FIRST_PAYMENT")==null?"0.00":param.get("FIRST_PAYMENT"); BigDecimal factmoney=new BigDecimal(EQUIP_AMT).subtract(new BigDecimal(FIRST_PAYMENT)); returnValue.putAll(param); + returnValue.put("FUNDTYPE","01"); returnValue.put("MONEY",factmoney.toString()); return returnValue; } - } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCapitalToTaxToJust.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCapitalToTaxToJust.java index 3fb080deb..0754e365c 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCapitalToTaxToJust.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCapitalToTaxToJust.java @@ -19,8 +19,9 @@ public class ContractCapitalToTaxToJust implements VoucherJavaParamService{ String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT"); String tax="1.06"; BigDecimal divisor= new BigDecimal(tax); - BigDecimal sumMoney=new BigDecimal(FIRST_PAYMENT).subtract(new BigDecimal(EQUIP_AMT)); + BigDecimal sumMoney=new BigDecimal(EQUIP_AMT).subtract(new BigDecimal(FIRST_PAYMENT)); BigDecimal taxMoney=sumMoney.subtract(sumMoney.divide(divisor, 2, BigDecimal.ROUND_HALF_UP)); + returnValue.put("FUNDTYPE","01"); returnValue.put("MONEY",taxMoney.toString()); return returnValue; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractEquipToJust.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractEquipToJust.java index b462a660e..a120361b4 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractEquipToJust.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractEquipToJust.java @@ -15,6 +15,7 @@ public class ContractEquipToJust implements VoucherJavaParamService{ Map param) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); + returnValue.put("FUNDTYPE","01"); returnValue.put("MONEY",param.get("EQUIP_AMT")); return returnValue; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractMoneyToRent.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractMoneyToRent.java new file mode 100644 index 000000000..56dfbf9ce --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractMoneyToRent.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; +/** + * ȡ + * @author xiezhiwen + */ +public class ContractMoneyToRent implements VoucherJavaParamService{ + + @Override + public Map getJavaParam(JBOTransaction tx, + Map param) throws BusinessException { + MapreturnValue=new HashMap(); + returnValue.putAll(param); + returnValue.put("MONEY",param.get("RENTMONEY")); + return returnValue; + } +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundGPSFee.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundGPSFee.java index a2be1230d..5896ca7b6 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundGPSFee.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundGPSFee.java @@ -14,6 +14,7 @@ public class FundGPSFee implements VoucherJavaParamService{ Map param) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); + returnValue.put("FUNDTYPE","01"); returnValue.put("MONEY",param.get("GPS_FEE_FINANCE")); return returnValue; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java index 617c5d73d..efb5ff60b 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java @@ -23,7 +23,10 @@ public class OtherFee implements VoucherJavaParamService{ String INCIDENTAL=param.get("INCIDENTAL")==null?"0.00":param.get("INCIDENTAL"); // װ String TABLEWARE_FEE=param.get("TABLEWARE_FEE")==null?"0.00":param.get("TABLEWARE_FEE"); - BigDecimal factmoney=new BigDecimal(INSURANCE_PREMIUM).add(new BigDecimal(PURCHASE_TAX)).add(new BigDecimal(INCIDENTAL)).add(new BigDecimal(TABLEWARE_FEE)); + BigDecimal factmoney=new BigDecimal(INSURANCE_PREMIUM) + .add(new BigDecimal(PURCHASE_TAX)) + .add(new BigDecimal(INCIDENTAL)) + .add(new BigDecimal(TABLEWARE_FEE)); returnValue.putAll(param); returnValue.put("FUNDTYPE","01"); returnValue.put("MONEY",factmoney.toString()); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeAddGps.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeAddGps.java new file mode 100644 index 000000000..bb0792e2f --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeAddGps.java @@ -0,0 +1,32 @@ +package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan; + +import java.math.BigDecimal; +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; +/** + * ˰++GPS+װװ + * @author xiezhiwen + */ +public class OtherFeeAddGps implements VoucherJavaParamService{ + public Map getJavaParam(JBOTransaction tx, + Map param) throws BusinessException { + MapreturnValue=new HashMap(); + String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM"); + String PURCHASE_TAX=param.get("PURCHASE_TAX")==null?"0.00":param.get("PURCHASE_TAX"); + String GPS_FEE_FINANCE=param.get("GPS_FEE_FINANCE")==null?"0.00":param.get("GPS_FEE_FINANCE"); + String TABLEWARE_FEE=param.get("TABLEWARE_FEE")==null?"0.00":param.get("TABLEWARE_FEE"); + BigDecimal factmoney=new BigDecimal(INSURANCE_PREMIUM) + .add(new BigDecimal(PURCHASE_TAX)) + .add(new BigDecimal(GPS_FEE_FINANCE)) + .add(new BigDecimal(TABLEWARE_FEE)); + returnValue.putAll(param); + returnValue.put("FUNDTYPE","01"); + returnValue.put("MONEY",factmoney.toString()); + return returnValue; + } + +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeMoneyToLoan.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeMoneyToLoan.java new file mode 100644 index 000000000..33489251b --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeMoneyToLoan.java @@ -0,0 +1,28 @@ +package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan; + +import java.math.BigDecimal; +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; +/** + * ˰++GPS + * @author xiezhiwen + */ +public class OtherFeeMoneyToLoan implements VoucherJavaParamService{ + public Map getJavaParam(JBOTransaction tx, + Map param) throws BusinessException { + MapreturnValue=new HashMap(); + String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM"); + String PURCHASE_TAX=param.get("PURCHASE_TAX")==null?"0.00":param.get("PURCHASE_TAX"); + String GPS_FEE_FINANCE=param.get("GPS_FEE_FINANCE")==null?"0.00":param.get("GPS_FEE_FINANCE"); + BigDecimal factmoney=new BigDecimal(INSURANCE_PREMIUM).add(new BigDecimal(PURCHASE_TAX)).add(new BigDecimal(GPS_FEE_FINANCE)); + returnValue.putAll(param); + returnValue.put("FUNDTYPE","01"); + returnValue.put("MONEY",factmoney.toString()); + return returnValue; + } + +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFees.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFees.java new file mode 100644 index 000000000..4dad7805e --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFees.java @@ -0,0 +1,34 @@ +package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan; + +import java.math.BigDecimal; +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; +/** + * ˰//GPS/װװ + * @author xiezhiwen + */ +public class OtherFees implements VoucherJavaParamService{ + public Map getJavaParam(JBOTransaction tx, + Map param) throws BusinessException { + MapreturnValue=new HashMap(); + // շ + String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM"); + // ˰ + String PURCHASE_TAX=param.get("PURCHASE_TAX")==null?"0.00":param.get("PURCHASE_TAX"); + // ӷ + String INCIDENTAL=param.get("INCIDENTAL")==null?"0.00":param.get("INCIDENTAL"); + // װ + String TABLEWARE_FEE=param.get("TABLEWARE_FEE")==null?"0.00":param.get("TABLEWARE_FEE"); + // gps + String GPS_FEE_FINANCE=param.get("GPS_FEE_FINANCE")==null?"0.00":param.get("GPS_FEE_FINANCE"); + BigDecimal factmoney=new BigDecimal(INSURANCE_PREMIUM).add(new BigDecimal(PURCHASE_TAX)).add(new BigDecimal(INCIDENTAL)).add(new BigDecimal(TABLEWARE_FEE)).add(new BigDecimal(GPS_FEE_FINANCE)); + returnValue.putAll(param); + returnValue.put("FUNDTYPE","01"); + returnValue.put("MONEY",factmoney.toString()); + return returnValue; + } +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoneyToJust.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeMoneyToJust.java similarity index 85% rename from src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoneyToJust.java rename to src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeMoneyToJust.java index e95bc1883..515772381 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoneyToJust.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeMoneyToJust.java @@ -11,19 +11,22 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * -׸+˰++GPS+װװ * @author xiezhiwen */ -public class SynthesizeLeaseMoneyToJust implements VoucherJavaParamService{ +public class SynthesizeMoneyToJust implements VoucherJavaParamService{ public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { MapreturnValue=new HashMap(); String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT"); String FIRST_PAYMENT=param.get("FIRST_PAYMENT")==null?"0.00":param.get("FIRST_PAYMENT"); - //-׸ BigDecimal factmoney1=new BigDecimal(EQUIP_AMT).subtract(new BigDecimal(FIRST_PAYMENT)); + String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM"); String PURCHASE_TAX=param.get("PURCHASE_TAX")==null?"0.00":param.get("PURCHASE_TAX"); - String TABLEWARE_FEE=param.get("TABLEWARE_FEE")==null?"0.00":param.get("TABLEWARE_FEE"); String GPS_FEE_FINANCE=param.get("GPS_FEE_FINANCE")==null?"0.00":param.get("GPS_FEE_FINANCE"); + String TABLEWARE_FEE=param.get("TABLEWARE_FEE")==null?"0.00":param.get("TABLEWARE_FEE"); // ֿ - BigDecimal factmoney=factmoney1.add(new BigDecimal(INSURANCE_PREMIUM)).add(new BigDecimal(PURCHASE_TAX)).add(new BigDecimal(TABLEWARE_FEE)).add(new BigDecimal(GPS_FEE_FINANCE)); + BigDecimal factmoney=factmoney1.add(new BigDecimal(INSURANCE_PREMIUM)) + .add(new BigDecimal(PURCHASE_TAX)) + .add(new BigDecimal(TABLEWARE_FEE)) + .add(new BigDecimal(GPS_FEE_FINANCE)); returnValue.putAll(param); returnValue.put("MONEY",factmoney.toString()); return returnValue; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java index f21b05295..aa58c38d2 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java @@ -11,7 +11,7 @@ public class CautionMoneyVoucher extends BaseBussiness { String FlowUnid=this.getAttribute("FlowUnid").toString(); CreateVoucherCustCautionMoneyIncome cvcc=new CreateVoucherCustCautionMoneyIncome(); cvcc.CreateVoucher(FlowUnid, "PZ2018072400000059", "feetype17");//˻ر֤-- - cvcc.CreateVoucher(FlowUnid, "PZ2018080400000075", "feetype17");//˻ر֤--ֱ + cvcc.CreateVoucher(FlowUnid, "PZ2018080400000075", "feetype17");//˻û֤--ֱ return "true"; } -} +} \ No newline at end of file diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java index 0fcfc8a0b..ed5ffb64e 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java @@ -2,14 +2,13 @@ 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.CreateVoucherCustomerRentOrFee; import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherHandlingMoney; import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoanDistributor; +import com.tenwa.voucher.service.VoucherJavaParamService; public class ContractOnhireVoucher extends BaseBussiness { - @Override public Object run(Transaction Sqlca) throws Exception { this.initBussinessParam(Sqlca); String FlowUnid=this.getAttribute("FlowUnid").toString(); @@ -25,12 +24,11 @@ public class ContractOnhireVoucher extends BaseBussiness { cvld.CreateVoucher(FlowUnid, "PZ2018071000000006");//̷ſֿͻ֤-- cvld.CreateVoucher(FlowUnid, "PZ2018080300000071");//̷ſֿͻ֤--ֱ + cvld.CreateVoucher(FlowUnid, "PZ2018073100000062");//¼̷ſ-˰//װװȣ -- + cvld.CreateVoucher(FlowUnid, "PZ2018080300000066");//¼̷ſ-˰//װװȣ--ֱ - cvld.CreateVoucher(FlowUnid, "PZ2018073100000062");//˰++װ -- - cvld.CreateVoucher(FlowUnid, "PZ2018080300000066");//˰++װ --ֱ - - cvld.CreateVoucher(FlowUnid, "PZ2018073100000061");//GPS-- - cvld.CreateVoucher(FlowUnid, "PZ2018080300000068");//GPS--ֱ + cvld.CreateVoucher(FlowUnid, "PZ2018073100000061");//¼̷ſ-GPS-- + cvld.CreateVoucher(FlowUnid, "PZ2018080300000068");//¼̷ſ-GPS--ֱ CreateVoucherCustomerRentOrFee cvcr=new CreateVoucherCustomerRentOrFee(); cvcr.CreateVoucher(FlowUnid, "PZ2018071000000005");//ͻ֧Ӧ˿ܽ @@ -39,16 +37,17 @@ public class ContractOnhireVoucher extends BaseBussiness { cvcr.CreateVoucher(FlowUnid, "PZ2018071100000010");//̷ſ-󶨿-- cvcr.CreateVoucher(FlowUnid, "PZ2018080300000074");//̷ſ-󶨿--ֱ + cvcr.CreateVoucher(FlowUnid, "PZ2018080600000116");//̷ſ-մ--ֱ + CreateVoucherHandlingMoney cvhl=new CreateVoucherHandlingMoney(); cvhl.CreateVoucher(FlowUnid, "PZ2018071000000007");//̷ſȷ루һȷ룩-- - cvhl.CreateVoucher(FlowUnid, "PZ2018080300000072");//̷ſȷ루һȷ룩-- + cvhl.CreateVoucher(FlowUnid, "PZ2018080300000072");//̷ſȷ루һȷ룩--ֱ - cvhl.CreateVoucher(FlowUnid, "PZ2018071000000009");//̷ſȷյѣ·̯룩--ֱ - cvhl.CreateVoucher(FlowUnid, "PZ2018080300000073");//̷ſȷյѣ·̯룩-- + cvhl.CreateVoucher(FlowUnid, "PZ2018071000000009");//̷ſȷյѣ·̯룩-- + cvhl.CreateVoucher(FlowUnid, "PZ2018080300000073");//̷ſȷյѣ·̯룩--ֱ //CreateVoucherCustCautionMoneyIncome cvci=new CreateVoucherCustCautionMoneyIncome(); return "true"; } - } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractTerminate.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractTerminate.java index d664674c3..42395974b 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractTerminate.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractTerminate.java @@ -3,7 +3,11 @@ package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle; import com.amarsoft.awe.util.Transaction; import com.tenwa.flow.baseBussion.BaseBussiness; import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherContractTerminate; - +import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherCustomerRentOrFee; +/** + * ؿ + * @author xiezhiwen + */ public class ContractTerminate extends BaseBussiness { @Override @@ -24,6 +28,9 @@ public class ContractTerminate extends BaseBussiness { cvct.CreateVoucher(FlowUnid, "PZ2018072100000046");//δʵֵϢ˰-- cvct.CreateVoucher(FlowUnid, "PZ2018080400000100");//δʵֵϢ˰--ֱ + CreateVoucherCustomerRentOrFee cvcr = new CreateVoucherCustomerRentOrFee(); + cvcr.CreateVoucher(FlowUnid, "PZ2018080600000117");//յմ--ֱ + 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 f28e1ccf3..5785427b9 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java @@ -25,13 +25,8 @@ public class IncomeVoucher extends BaseBussiness { cvci.CreateVoucher(FlowUnid, "PZ2018072100000028", "feetype27");//Ϣ-- cvci.CreateVoucher(FlowUnid, "PZ2018080400000085", "feetype27");//Ϣ--ֱ - - - /*CreateVoucherRentIncome cvri=new CreateVoucherRentIncome(); - cvri.CreateVoucher(FlowUnid, "PZ2018072100000024");//յ - cvri.CreateVoucher(FlowUnid, "PZ2018072100000025");//յϢ -*/ + cvci.CreateVoucher(FlowUnid, "PZ2018080400000103", "feetype27");//ȷϢ--ֱ return "true"; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java index 4082eb2f5..7cd955724 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java @@ -2,7 +2,11 @@ package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle; import com.amarsoft.awe.util.Transaction; import com.tenwa.flow.baseBussion.BaseBussiness; +import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherContractTerminate; import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherCustCautionMoneyIncome; +import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherCustomerRentOrFee; +import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherDistCautionMoneyRe; +import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherInsuranceSettlement; import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRedRentIncome; import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRentIncome; @@ -22,13 +26,12 @@ public class RedIncomeVoucher extends BaseBussiness { cvci.CreateVoucher(FlowUnid, "PZ2018080400000090", "feetype1");//ؿ-ȷյѣ·̯--ֱ cvci.CreateVoucher(FlowUnid, "PZ2018072100000043", "feetype4");//ؿ-յ-- - cvci.CreateVoucher(FlowUnid, "PZ2018080400000097", "feetype4");//ؿ-յ-- + cvci.CreateVoucher(FlowUnid, "PZ2018080400000097", "feetype4");//ؿ-յ--ֱ cvci.CreateVoucher(FlowUnid, "PZ2018072100000041", "feetype27");//ؿ-յϢ-- cvci.CreateVoucher(FlowUnid, "PZ2018080400000095", "feetype27");//ؿ-յϢ--ֱ - CreateVoucherRedRentIncome cvri=new CreateVoucherRedRentIncome(); cvri.CreateVoucher(FlowUnid, "PZ2018072100000037");//յ-- cvri.CreateVoucher(FlowUnid, "PZ2018080400000091");//յ--ֱ @@ -36,6 +39,22 @@ public class RedIncomeVoucher extends BaseBussiness { cvri.CreateVoucher(FlowUnid, "PZ2018072100000038");//յϢ-- cvri.CreateVoucher(FlowUnid, "PZ2018080400000092");//յϢ--ֱ + + CreateVoucherContractTerminate cvct=new CreateVoucherContractTerminate(); + cvct.CreateVoucher(FlowUnid, "PZ2018080400000094");//յǰ--ֱ + cvct.CreateVoucher(FlowUnid, "PZ2018080400000093");//յΥԼ/--ֱ + + CreateVoucherInsuranceSettlement cvis=new CreateVoucherInsuranceSettlement(); + cvis.CreateVoucher("PZ2018080400000096");//յⱣշ --ֱ + + + CreateVoucherCustomerRentOrFee cvcr = new CreateVoucherCustomerRentOrFee(); + cvcr.CreateVoucher(FlowUnid, "PZ2018080400000077");//յմ--ֱ + + + CreateVoucherDistCautionMoneyRe cvdc=new CreateVoucherDistCautionMoneyRe(); + cvdc.CreateVoucher(FlowUnid, "PZ2018080400000098");//յ̱֤--ֱ + return "true"; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java index 563984db3..e12e2990f 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java @@ -47,7 +47,7 @@ public class CreateVoucherMonthSettlement{ String moneyType="MONEY"; if("PZ2018071200000017".equals(voucherNo)||"PZ2018080400000104".equals(voucherNo)) moneyType="FEEMONEY"; if("PZ2018071200000016".equals(voucherNo)||"PZ2018080400000102".equals(voucherNo)) moneyType="MONEY"; - sql="SELECT CRM.INTEREST AS MONEY,CRM.FEE AS FEEMONEY,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.CERTID 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(STR_TO_DATE(CRM.END_DATE,'%Y/%m/%d'),'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')"; + sql="SELECT ROUND(CRM.INTEREST/1.06,2) AS MONEY,CRM.FEE AS FEEMONEY,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.CERTID 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(STR_TO_DATE(CRM.END_DATE,'%Y/%m/%d'),'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')"; //Ϣ˰ if("PZ2018072100000055".equals(voucherNo)){ sql="SELECT LRP.INTEREST-ROUND(LRP.INTEREST/1.06,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.CERTID 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(STR_TO_DATE(LRP.PLAN_DATE,'%Y/%m/%d'),'%Y/%m/%d')"; diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index 99ab5a0c9..9cd9a0082 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -104,6 +104,7 @@ public class CreateVoucherServiceImpl { } param.put("VOUCHER_TYPE",voucherType); BizObject user=JBOFactory.createBizObjectQuery(USER_INFO.CLASS_NAME, "USERID='"+userid+"'").getSingleResult(false); + // ÷ƾ֤Ϣ this.createVoucher(tx, param,user); } @@ -115,8 +116,8 @@ public class CreateVoucherServiceImpl { */ @SuppressWarnings("unchecked") private void createVoucher(JBOTransaction tx,Map param,BizObject user) throws Exception{ - //1:ƾ֤Ƿȫ try{ + //1:ƾ֤Ƿȫ checkParam(param); }catch(BusinessException e){ e.printStackTrace(); @@ -154,6 +155,7 @@ public class CreateVoucherServiceImpl { vs=new VoucherToV8Impl(); } if(vs!=null){ + // ƾ֤ɵķ vs.saveMessage(subList, param, user, tx); }else{ logger.info("ƾ֤δʵ"); @@ -272,6 +274,9 @@ public class CreateVoucherServiceImpl { if("1".equals(bo.getAttribute("IS_CUSTOM_VALUE").getString())){//ǷԶȡֵ VoucherJavaParamService ps=null; try{ + + String valuemode=bo.getAttribute("VALUE_MODE").getString(); + System.out.println(valuemode); Class c=(Class)Class.forName(bo.getAttribute("VALUE_MODE").getString()); ps=c.newInstance(); }catch(Exception e){ @@ -287,7 +292,7 @@ public class CreateVoucherServiceImpl { dataTemp=psi.getParamBasic(tx, basic, param); } - subData.put("F5", abs);//ժҪ + subData.put("F5", abs);//ժҪ subData.put("F6",sub.getAttribute("id").getString());//Ŀ subData.put("F1",dataTemp.get("ACCOUNT_DATE"));//ƴ subData.put("CUSTID",dataTemp.get("CUSTID"));//ƴ @@ -309,6 +314,7 @@ public class CreateVoucherServiceImpl { if(dataTemp.containsKey("CONTRACT_ID")){ subData.put("CONTRACT_ID", dataTemp.get("CONTRACT_ID")); } + param.put("FUNDTYPE", dataTemp.get("FUNDTYPE")); if(sub.getAttribute("AUXILIARY_TYPE").getString().length()>0){ subData.putAll(this.getAuxiliaryData(tx, param, sub.getAttribute("AUXILIARY_TYPE").getString())); } @@ -327,6 +333,7 @@ public class CreateVoucherServiceImpl { VoucherJavaParamService ps=null; try{ Class c=(Class)Class.forName(con.getAttribute("VALUE_MODE").getString()); + System.out.println(con.getAttribute("VALUE_MODE").getString()); ps=c.newInstance(); }catch(Exception e){ ps=null; diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java index d9eb0ec8d..639190ad9 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java @@ -92,10 +92,8 @@ public class VoucherToV8Impl implements VoucherService { log.error("ͬΪ,޷Ӧƾ֤Ϣ!"); return null; } - //ͬIDǷȷ if(!Return_Dealer_Margin.equals(modularNumber)&&!Receive_Dealer_Margin.equals(modularNumber)&&!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber)){ - BizObject contract=JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME, "id=:id").setParameter("id", contracid).getSingleResult(false); if(contract==null){ message = message + "ͬϢΪ!"; @@ -107,7 +105,6 @@ public class VoucherToV8Impl implements VoucherService { d.put("dept_name", org.getAttribute("orgname").getString()); } } - } v8.setAttributesValue(list.get(i)); diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java index 712d55fd7..d348ea845 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java @@ -30,6 +30,7 @@ public class CreateVoucherRentIncomeMission implements Job { cvis.CreateVoucher("PZ2018072100000054");// -¼Ᵽշ-- cvis.CreateVoucher("PZ2018080200000064");// -¼Ᵽշ--ֱ + cvis.CreateVoucher("PZ2018080600000114");//ⱣշѳϢ--ֱ QuartzUtil.insertLog(startime,"com.tenwa.comm.message.controller.BusinessCancelJob", "success", "ɹ"); } catch (Exception e) { QuartzUtil.insertLog(startime,"com.tenwa.comm.message.controller.BusinessCancelJob", "error", "ʧ");