diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java index 7c07fd123..b108046b7 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java @@ -150,7 +150,7 @@ public class CreateVoucherActualPaymentCarTradition extends BaseBussiness{ 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), LEAS_FORM, VOUCHER_TYPE, userid,param, Sqlca); } } if(Sqlca!=null){ diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java index 4a963a2c0..c19c95f08 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java @@ -169,7 +169,7 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{ 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), LEAS_FORM, VOUCHER_TYPE, userid,param, Sqlca); } } if(Sqlca!=null){ diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractChangeForCarTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractChangeForCarTradition.java index 6d548bcd4..1f0fbeb10 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractChangeForCarTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractChangeForCarTradition.java @@ -104,7 +104,7 @@ public class CreateVoucherContractChangeForCarTradition { 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); } } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractChangeForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractChangeForTradition.java index 4cb3b690f..18aba8800 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractChangeForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractChangeForTradition.java @@ -107,7 +107,7 @@ public class CreateVoucherContractChangeForTradition { 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); } } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java index 3471c1896..f75d054f2 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java @@ -107,7 +107,7 @@ public class CreateVoucherContractOnhireChange { 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); } } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java index 9fa7355c3..ef8bf1d11 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java @@ -149,7 +149,7 @@ public class CreateVoucherContractTerminate { 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java index 6de82cbac..039eebe1e 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java @@ -122,7 +122,7 @@ public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness { // 如果结果不为空, if (vouch != null) { //将创建凭证的参数传入在下一层 - vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid, param,Sqlca); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid, param,Sqlca); } } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java index 5be98838f..ae02acc98 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java @@ -155,7 +155,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); } } if(Sqlca!=null){ diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionForTradition.java index c5cd26574..9bab54f08 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionForTradition.java @@ -124,7 +124,7 @@ public class CreateVoucherDepositDeductionForTradition extends BaseBussiness { // 如果结果不为空, if (vouch != null) { //将创建凭证的参数传入在下一层 - vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid, param,Sqlca); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid, param,Sqlca); } } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java index 334889158..39f2ef771 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java @@ -101,7 +101,7 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness { // 如果结果不为空, if (vouch != null) { //将创建凭证的参数传入在下一层 - vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid, param,Sqlca); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid, param,Sqlca); } } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java index 3b67b6a53..a645acff5 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java @@ -84,7 +84,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); }} } if(Sqlca!=null){ diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherEarlySettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherEarlySettlement.java index e9afd6c48..c7880bef4 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherEarlySettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherEarlySettlement.java @@ -132,7 +132,7 @@ public class CreateVoucherEarlySettlement { 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); } } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherEarlySettlementForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherEarlySettlementForTradition.java index ca309be24..3adf026fc 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherEarlySettlementForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherEarlySettlementForTradition.java @@ -133,7 +133,7 @@ public class CreateVoucherEarlySettlementForTradition { 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); } } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java index 01cabd8e0..bc76fda1b 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java @@ -82,8 +82,7 @@ public class CreateVoucherForInterestSubsidyImport { 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(), "02", VOUCHER_TYPE, userid, param, Sqlca); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), "02", VOUCHER_TYPE, userid, param, Sqlca); } String updSql="UPDATE LB_DISCOUNT SET IS_VOUCHER='1'"; Sqlca.executeSQL(updSql); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java index b465d16a8..457ab2a53 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java @@ -119,7 +119,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); }} } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherIncomeForTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherIncomeForTradition.java index 534b0d174..502f86de8 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherIncomeForTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherIncomeForTradition.java @@ -129,7 +129,7 @@ public class CreateVoucherIncomeForTradition extends BaseBussiness { // 如果结果不为空, if (vouch != null) { //将创建凭证的参数传入在下一层 - vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid, param,Sqlca); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid, param,Sqlca); } } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceForCarTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceForCarTradition.java index 04b293c68..70f66827d 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceForCarTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceForCarTradition.java @@ -122,7 +122,7 @@ public class CreateVoucherInsuranceForCarTradition{ 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); } } if(Sqlca!=null){ diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceSettlement.java index fd3ae9d60..98b177382 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceSettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceSettlement.java @@ -117,7 +117,7 @@ public class CreateVoucherInsuranceSettlement{ 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); } } if(Sqlca!=null){ diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java index 6b2297498..32eae2f89 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java @@ -1,27 +1,21 @@ package com.tenwa.voucher.CreateVoucherProcess; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import jbo.app.tenwa.customer.CUSTOMER_LIST; -import jbo.sys.USER_INFO; import jbo.voucher.LV_VOUCHER_CONFIG; -import com.amarsoft.app.util.ProductParamUtil; import com.amarsoft.are.jbo.BizObject; import com.amarsoft.are.jbo.JBOFactory; -import com.amarsoft.are.lang.DataElement; import com.amarsoft.awe.util.Transaction; import com.amarsoft.dict.als.cache.CacheLoaderFactory; import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; public class CreateVoucherLoanDistributor { - @SuppressWarnings("deprecation") - public String CreateVoucher(String FlowUnid,String VOUCHERNO, Transaction sqlca2) throws Exception { + public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { Transaction Sqlca =null; Map map=new HashMap(); @@ -54,7 +48,6 @@ public class CreateVoucherLoanDistributor { String BUSINESSTYPE=null; String ACC_NUMBER=null; String REQNBR=null; - String PRODUCT_ID=null; String TAX_TYPE=null; String sql=""; String moneyDataSource=""; @@ -106,7 +99,7 @@ public class CreateVoucherLoanDistributor { sql+=" AND lcct.HANDLING_CHARGE_MONEY_TYPE='0020' "; } - List> dataList=DataOperatorUtil.getDataBySql(sqlca2, sql, map); + List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); String VOUCHER_TYPE="1";// 凭证分类 金蝶 @@ -236,7 +229,7 @@ public class CreateVoucherLoanDistributor { 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java index abf84108c..398f391a1 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java @@ -13,33 +13,33 @@ public class ContractOnhireVoucher extends BaseBussiness { this.initBussinessParam(Sqlca); String FlowUnid=this.getAttribute("FlowUnid").toString(); CreateVoucherLoanDistributor cvld=new CreateVoucherLoanDistributor(); - cvld.CreateVoucher(FlowUnid, "PZ2018073100000061",Sqlca);// 确认GPS收入 --回租 + cvld.CreateVoucher(FlowUnid, "PZ2018073100000061");// 确认GPS收入 --回租 //cvld.CreateVoucher(FlowUnid, "PZ2018080300000068",Sqlca);// 确认GPS收入 --直租 - cvld.CreateVoucher(FlowUnid, "PZ2018070900000003",Sqlca);// 收取首付款-回租 + cvld.CreateVoucher(FlowUnid, "PZ2018070900000003");// 收取首付款-回租 //cvld.CreateVoucher(FlowUnid, "PZ2018080200000065",Sqlca);// 收取首付款-直租 - cvld.CreateVoucher(FlowUnid, "PZ2018070900000002",Sqlca);// 购置融资租赁资产-回 + cvld.CreateVoucher(FlowUnid, "PZ2018070900000002");// 购置融资租赁资产-回 - cvld.CreateVoucher(FlowUnid, "PZ2018073100000062",Sqlca);// 购置融资租赁资产-回--第一车贷 + cvld.CreateVoucher(FlowUnid, "PZ2018073100000062");// 购置融资租赁资产-回--第一车贷 - //cvld.CreateVoucher(FlowUnid, "PZ2018122000000010",Sqlca);// 购置融资租赁资产-回 - //cvld.CreateVoucher(FlowUnid, "PZ2018072400000060",Sqlca);// 购置融资租赁资产-直 + //cvld.CreateVoucher(FlowUnid, "PZ2018122000000010");// 购置融资租赁资产-回 + //cvld.CreateVoucher(FlowUnid, "PZ2018072400000060");// 购置融资租赁资产-直 - cvld.CreateVoucher(FlowUnid, "PZ2018071000000005",Sqlca);// 合同起租（一次性确认收入）-回租 - //cvld.CreateVoucher(FlowUnid, "PZ2018080300000069",Sqlca);// 合同起租（一次性确认收入）-直租 + cvld.CreateVoucher(FlowUnid, "PZ2018071000000005");// 合同起租（一次性确认收入）-回租 + //cvld.CreateVoucher(FlowUnid, "PZ2018080300000069");// 合同起租（一次性确认收入）-直租 - cvld.CreateVoucher(FlowUnid, "PZ2018071000000006",Sqlca);// 合同起租（按月分摊收入）--回租 - //cvld.CreateVoucher(FlowUnid, "PZ2018080300000071",Sqlca);// 合同起租（按月分摊收入）--直租 + cvld.CreateVoucher(FlowUnid, "PZ2018071000000006");// 合同起租（按月分摊收入）--回租 + //cvld.CreateVoucher(FlowUnid, "PZ2018080300000071");// 合同起租（按月分摊收入）--直租 - cvld.CreateVoucher(FlowUnid, "PZ2018071000000004",Sqlca);// 收取客户保证金--回租 - //cvld.CreateVoucher(FlowUnid, "PZ2018080300000070",Sqlca);// 收取客户保证金--直租 + cvld.CreateVoucher(FlowUnid, "PZ2018071000000004");// 收取客户保证金--回租 + //cvld.CreateVoucher(FlowUnid, "PZ2018080300000070");// 收取客户保证金--直租 - cvld.CreateVoucher(FlowUnid, "PZ2018071000000007",Sqlca);// 收取客户手续费（一次性确认收入）--回租 - //cvld.CreateVoucher(FlowUnid, "PZ2018080300000072",Sqlca);// 收取客户手续费（一次性确认收入）--直租 + cvld.CreateVoucher(FlowUnid, "PZ2018071000000007");// 收取客户手续费（一次性确认收入）--回租 + //cvld.CreateVoucher(FlowUnid, "PZ2018080300000072");// 收取客户手续费（一次性确认收入）--直租 - cvld.CreateVoucher(FlowUnid, "PZ2018071000000009",Sqlca);// 收取客户手续费（按月分摊收入）--回租 - //cvld.CreateVoucher(FlowUnid, "PZ2018080300000073",Sqlca);// 收取客户手续费（按月分摊收入）--直租 + cvld.CreateVoucher(FlowUnid, "PZ2018071000000009");// 收取客户手续费（按月分摊收入）--回租 + //cvld.CreateVoucher(FlowUnid, "PZ2018080300000073");// 收取客户手续费（按月分摊收入）--直租 //String a = ProductParamUtil.getProductParameterValue(dataList.get(i).get("PRODUCT_ID"), "PRD0315", "DISCOUNT", "isBalance"); return "true"; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java index 3f12ac7b6..e5c275fc7 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java @@ -138,7 +138,7 @@ public class CreateVoucherMonthSettlement{ 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); } } if(Sqlca!=null){ diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java index 2d27f8171..ce8d616cd 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java @@ -123,7 +123,7 @@ public class CreateVoucherOnhireTradition extends BaseBussiness{ 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), LEAS_FORM, VOUCHER_TYPE, userid,param, Sqlca); } } if(Sqlca!=null){ diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeCarTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeCarTradition.java index f67a2822d..1f1e5d277 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeCarTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeCarTradition.java @@ -130,7 +130,7 @@ public class CreateVoucherRedDashedIncomeCarTradition extends BaseBussiness { // 如果结果不为空, if (vouch != null) { //将创建凭证的参数传入在下一层 - vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), LEAS_FORM, VOUCHER_TYPE, userid, param,Sqlca); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), LEAS_FORM, VOUCHER_TYPE, userid, param,Sqlca); } } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeTradition.java index 643a598ac..cb3f05b0d 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedDashedIncomeTradition.java @@ -130,7 +130,7 @@ public class CreateVoucherRedDashedIncomeTradition extends BaseBussiness { // 如果结果不为空, if (vouch != null) { //将创建凭证的参数传入在下一层 - vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), LEAS_FORM, VOUCHER_TYPE, userid, param,Sqlca); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), LEAS_FORM, VOUCHER_TYPE, userid, param,Sqlca); } } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java index eb14b724a..539b7ef08 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java @@ -124,7 +124,7 @@ public class CreateVoucherRedRentIncome { 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeCarTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeCarTradition.java index 7db0605b1..eddbf61ea 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeCarTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeCarTradition.java @@ -120,7 +120,7 @@ public class CreateVoucherRedRentIncomeCarTradition { 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); }} } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeTradition.java index 0cb22c40f..fe41a72b0 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncomeTradition.java @@ -123,7 +123,7 @@ public class CreateVoucherRedRentIncomeTradition { 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); }} } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java index 2f213ddae..211b17a95 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java @@ -107,7 +107,7 @@ public class CreateVoucherRentIncome { 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); }} } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToBeforeOnhire.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToBeforeOnhire.java index c56bc9a62..106ab796a 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToBeforeOnhire.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToBeforeOnhire.java @@ -139,7 +139,7 @@ public class CreateVoucherToBeforeOnhire extends BaseBussiness { // 如果结果不为空, if (vouch != null) { //将创建凭证的参数传入在下一层 - vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), LEAS_FORM, VOUCHER_TYPE, userid, param,Sqlca); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), LEAS_FORM, VOUCHER_TYPE, userid, param,Sqlca); } } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToCommission.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToCommission.java index 96d1d86a6..879fc3238 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToCommission.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToCommission.java @@ -140,7 +140,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { 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); + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca); } } } diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index 03f45bdda..b92698324 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -80,7 +80,7 @@ public class CreateVoucherServiceImpl { param.put("FlowUnid", "FBO2017101600000061"); CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); - vs.createVoucher("网银收款", "2017032800000009", "02", null, "admin", param, tx); + //vs.createVoucher("","网银收款", "2017032800000009", "02", null, "admin", param, tx); } /** @@ -94,7 +94,8 @@ public class CreateVoucherServiceImpl { * @param tx * @throws Exception */ - public void createVoucher(String vouNumber,String owned,String projtype,String voucherType,String userid,Map param,JBOTransaction tx) throws Exception{ + public void createVoucher(String voucher_id,String vouNumber,String owned,String projtype,String voucherType,String userid,Map param,JBOTransaction tx) throws Exception{ + param.put("voucher_id", voucher_id); param.put("MODULAR_NUMBER", vouNumber); param.put("OWNED_COMPANY", owned); param.put("PROJ_TYPE", projtype); @@ -122,9 +123,9 @@ public class CreateVoucherServiceImpl { throw e; } //2:根据参数获取要生成的凭证配置 - BizObject voucherConfig=JBOFactory.createBizObjectQuery(jbo.voucher.LV_VOUCHER_CONFIG.CLASS_NAME,"MODULAR_NUMBER=:MODULAR_NUMBER and OWNED_COMPANY=:OWNED_COMPANY and PROJ_TYPE=:PROJ_TYPE and VOUCHER_TYPE=:VOUCHER_TYPE") + BizObject voucherConfig=JBOFactory.createBizObjectQuery(jbo.voucher.LV_VOUCHER_CONFIG.CLASS_NAME,"MODULAR_NUMBER=:MODULAR_NUMBER and OWNED_COMPANY=:OWNED_COMPANY and PROJ_TYPE=:PROJ_TYPE and VOUCHER_TYPE=:VOUCHER_TYPE and ID=:ID") .setParameter("MODULAR_NUMBER",param.get("MODULAR_NUMBER")).setParameter("OWNED_COMPANY", param.get("OWNED_COMPANY")).setParameter("VOUCHER_TYPE",param.get("VOUCHER_TYPE")) - .setParameter("PROJ_TYPE", param.get("PROJ_TYPE")).getSingleResult(false); + .setParameter("PROJ_TYPE", param.get("PROJ_TYPE")).setParameter("ID", param.get("voucher_id")).getSingleResult(false); param.put("MODULAR_NUMBER", voucherConfig.getAttribute("MODULAR_NUMBER").getString());// 凭证名称 param.put("F49", voucherConfig.getAttribute("OWNED_COMPANY").getString());// 所属公司编码 param.put("F50", voucherConfig.getAttribute("OWNED_COMPANY").getString());// 所属公司编码 diff --git a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java index fd0355c49..564792f3f 100644 --- a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java +++ b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java @@ -118,7 +118,7 @@ public class EbankUse { 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(), + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), "02", VOUCHER_TYPE, userid, param, Sqlca); } bo.setAttributeValue("DEBIT_MONEY", fact_money); @@ -191,7 +191,7 @@ public class EbankUse { // 如果有有此凭证, 生成当前凭证 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); + vs.createVoucher(voucher.getAttribute("id").getString(),voucher.getAttribute("MODULAR_NUMBER").getString(),voucher.getAttribute("OWNED_COMPANY").getString(), "02", VOUCHER_TYPE, userid, param,Sqlca); } } }