From 55f9c2a0d712f2adc1698f7a7cc114e224564e96 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Fri, 16 Nov 2018 17:18:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3--=E8=B4=B4?= =?UTF-8?q?=E6=81=AF=E5=AF=BC=E5=85=A5=E7=94=9F=E6=88=90=E5=87=AD=E8=AF=81?= =?UTF-8?q?=E5=8F=8A=E9=9B=86=E5=9B=A2=E5=86=85=E5=A4=96=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherForInterestSubsidyImport.java | 2 +- .../CreateVoucherLoanDistributor.java | 11 ++++++++++- .../ContractOnhireVoucher.java | 1 - 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java index 8164f691f..c969c15be 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java @@ -79,7 +79,7 @@ public class CreateVoucherForInterestSubsidyImport { vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), "02", VOUCHER_TYPE, userid, param, Sqlca); } - String updSql="UPDATE LD_DISCOUNT SET IS_VOUCHER='1'"; + String updSql="UPDATE LB_DISCOUNT SET IS_VOUCHER='1'"; Sqlca.executeSQL(updSql); } Sqlca.commit(); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java index d1db1267d..620fca0bb 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java @@ -4,9 +4,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import jbo.app.tenwa.customer.CUSTOMER_LIST; +import jbo.sys.USER_INFO; import jbo.voucher.LV_VOUCHER_CONFIG; 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; @@ -144,6 +148,11 @@ public class CreateVoucherLoanDistributor { param.put("ACC_NUMBER",ACC_NUMBER); param.put("VOUCHERNO",VOUCHERNO); + // 通过客户名称获取客户编码维护里面的数据, 如果有数据说明是集团内, 如果没有数据说明是集团外 + // String sql2="SELECT CUST_NAME FROM CUSTOMER_LIST WHERE CUST_NAME='"+CUSTNAME+"'"; + // List> lists=DataOperatorUtil.getDataBySql(sqlca2, sql, map); + BizObject cust_list=JBOFactory.createBizObjectQuery(CUSTOMER_LIST.CLASS_NAME, "CUST_ID='"+DISTRIBUTOR_ID+"'").getSingleResult(false); + // BizObject cust_list=JBOFactory.createBizObjectQuery(CUSTOMER_LIST.CLASS_NAME, "CUST_ID='8011100'").getSingleResult(false); if("1".equals(BUSINESSTYPE)){ if("PZ2018073100000061".equals(VOUCHERNO)||"PZ2018080300000068".equals(VOUCHERNO)){// 确认GPS收入 param.put("CASHFLOW", "");// 现金流项目 @@ -152,7 +161,7 @@ public class CreateVoucherLoanDistributor { param.put("CASHFLOW", "");// 现金流项目 param.put("BUSINESSTYPE", "0604"); }else if("PZ2018070900000002".equals(VOUCHERNO)||"PZ2018072400000060".equals(VOUCHERNO)){// 购置融资租赁资产 - if("f_i_type01".equals(F_I_TYPE)) {// 集团内 + if(cust_list != null) {// 集团内 param.put("CASHFLOW", "11212");// 现金流项目 }else {// 集团外 param.put("CASHFLOW", "11213");// 现金流项目 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java index a360a6a37..532c30535 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java @@ -36,7 +36,6 @@ public class ContractOnhireVoucher extends BaseBussiness { cvld.CreateVoucher(FlowUnid, "PZ2018071000000009",Sqlca);// 收取客户手续费（按月分摊收入）--回租 cvld.CreateVoucher(FlowUnid, "PZ2018080300000073",Sqlca);// 收取客户手续费（按月分摊收入）--直租 - return "true"; } }