diff --git a/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp b/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp index bf80c608b..50e2574ef 100644 --- a/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp +++ b/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp @@ -109,9 +109,7 @@ reloadSelf();}); } function importExcelNew(){ - var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createEbankVoucher",""); - } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractAcc.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractAcc.java index d3ebdc553..9cc91e24c 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractAcc.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractAcc.java @@ -18,7 +18,7 @@ public class auxiliaryContractAcc implements VoucherJavaParamService { MapreturnValue=new HashMap(); String ACC_NUMBER=param.get("ACC_NUMBER"); returnValue.put("ACC_NUMBER",ACC_NUMBER); - String FbSdk="Y"; + /*String FbSdk="Y"; String state_="0010"; BizObject bo=null; try { @@ -29,7 +29,7 @@ public class auxiliaryContractAcc implements VoucherJavaParamService { } } catch (JBOException e) { e.printStackTrace(); - } + }*/ return returnValue; } } diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index c7af8ce7f..d28d5cf0d 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -253,6 +253,15 @@ public class CreateVoucherServiceImpl { sub=JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME,"SUBJECTS_CODE=:SUBJECTS_CODE").setParameter("SUBJECTS_CODE", SUBJECTCODE).getSingleResult(false); } } + /** + * 网银存款转预收银行科目 + */ + if("PZ2018121800000005".equals(VOUCHERNO)) { + if("1".equals(SORT_NUMBER)) { + String EBANK_SUBJECTS = param.get("EBANK_SUBJECTS"); + sub=JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME,"SUBJECTS_CODE=:EBANK_SUBJECTS").setParameter("EBANK_SUBJECTS", EBANK_SUBJECTS).getSingleResult(false); + } + } subData.put("F2", sub.getAttribute("SUBJECTS_CODE").getString()); if(sub.getAttribute("SUBJECTS_CODE").getString().endsWith("****")){ diff --git a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java index f029d56fd..fd0355c49 100644 --- a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java +++ b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java @@ -88,6 +88,7 @@ public class EbankUse { String fact_money = ""; String fact_date = ""; String ownnumber = ""; + String EBANK_SUBJECTS = ""; String CONTRACT_NUMBER=""; List bolist = ebankbom.createQuery("DEBIT_MONEY IS NULL or DEBIT_MONEY=0.00").getResultList(true); CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); @@ -98,6 +99,7 @@ public class EbankUse { fact_date = bo.getAttribute("fact_date").getString(); ownnumber = bo.getAttribute("ownacc_number").getString(); CONTRACT_NUMBER=bo.getAttribute("EBANK_SN").getString(); + EBANK_SUBJECTS=bo.getAttribute("EBANK_SUBJECTS").getString(); param.put("FACT_MONEY", fact_money); param.put("ACCOUNT_DATE", fact_date); @@ -105,6 +107,7 @@ public class EbankUse { param.put("ACC_NUMBER", ownnumber); param.put("CONTRACT_NUMBER", CONTRACT_NUMBER); param.put("VOUCHERNO", voucherNo); + param.put("EBANK_SUBJECTS", EBANK_SUBJECTS); param.put("CASHFLOW", "11113"); Map map = new HashMap();