diff --git a/WebContent/Tenwa/Customer/customer_list/cust_list.jsp b/WebContent/Tenwa/Customer/customer_list/cust_list.jsp index 1cdb831f1..53f9dafe8 100644 --- a/WebContent/Tenwa/Customer/customer_list/cust_list.jsp +++ b/WebContent/Tenwa/Customer/customer_list/cust_list.jsp @@ -15,7 +15,7 @@ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] = { - {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + {"false","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'')","","","","btn_icon_delete",""}, }; diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index f64bc40a3..326f6aa18 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -65,6 +65,8 @@ + + diff --git a/src_core/com/tenwa/officetempalte/importcallback/impl/LCEbankCallBack.java b/src_core/com/tenwa/officetempalte/importcallback/impl/LCEbankCallBack.java index 7b7344dd5..cfb038d3f 100644 --- a/src_core/com/tenwa/officetempalte/importcallback/impl/LCEbankCallBack.java +++ b/src_core/com/tenwa/officetempalte/importcallback/impl/LCEbankCallBack.java @@ -116,20 +116,21 @@ public class LCEbankCallBack extends BaseImportExcelCallBack { throw new BusinessException("网银编号不能重复"); } - /*//检验本方帐号 - String own_acc_number=importObject.getAttribute("ownacc_number").toString(); - //与已有的本方帐号比较 + //检验本方帐户 + String OWN_BANK=importObject.getAttribute("OWN_BANK").toString(); + String OWNACC_NUMBER=importObject.getAttribute("OWNACC_NUMBER").toString(); + //与已有的本方帐户比较 BizObjectManager bm=JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME); tx.join(bm); - String sql1="select acc_number from O where acc_number="+own_acc_number; + String sql1="select acc_number,acc_bank from O where acc_bank='"+OWN_BANK+"' AND acc_number='"+OWNACC_NUMBER+"'"; List oalist=bm.createQuery(sql1).getResultList(false); boolean flag=false; if(oalist.size()>0){ flag=true; } if(flag==false){ - throw new BusinessException("本方帐号不存在"); - }*/ + throw new BusinessException("本方账户信息不匹配"); + } } @Override diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java index c19c95f08..7effdbd2b 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java @@ -4,10 +4,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import jbo.app.tenwa.customer.CUSTOMER_LIST; 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.awe.util.Transaction; import com.amarsoft.dict.als.cache.CacheLoaderFactory; import com.tenwa.comm.util.jboutil.DataOperatorUtil; @@ -54,16 +56,16 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{ String ACC_NUMBER=null; // 银行账号 String sql=""; - sql="SELECT IFNULL(LFIT1.EQUIP,0) AS EQUIP,IFNULL(ROUND(LFIT1.EQUIP / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS EQUIPNOTAX,IFNULL(LFIT1.EQUIP - ROUND(LFIT1.EQUIP / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS EQUIPTAX,IFNULL(LFIT2.OTHER_MONEY,0) AS OTHER_MONEY,IFNULL(ROUND(LFIT2.OTHER_MONEY / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS OTHERNOTAX,IFNULL(LFIT2.OTHER_MONEY - ROUND(LFIT2.OTHER_MONEY / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS OTHERTAX,IFNULL((LFIT1.EQUIP + LFIT2.OTHER_MONEY),0) AS EQUIP_OTHER,IFNULL(LFIT3.FIRST_PAYMENT,0) AS FIRST_PAYMENT,IFNULL(LFIT4.GUARANTY,0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY,0) AS HANDLING_CHARGE_MONEY,IFNULL(ROUND(LFIT5.HANDLING_CHARGE_MONEY / getTax (LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2),0) AS HANDLING_CHARGE_MONEY_NOTAX,IFNULL((LFIT5.HANDLING_CHARGE_MONEY - ROUND(LFIT5.HANDLING_CHARGE_MONEY / getTax (LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2)),0) AS HANDLING_CHARGE_MONEY_TAX,IFNULL((LFIT1.EQUIP + LFIT2.OTHER_MONEY - LFIT3.FIRST_PAYMENT - LFIT4.GUARANTY - LFIT5.HANDLING_CHARGE_MONEY),0) AS OTHERS_MATH,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN (SELECT FLOWUNID,MAX(CONTRACT_ID) AS CONTRACT_ID,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID) LFIT1 ON LFIT1.FLOWUNID=LCCT.FLOWUNID LEFT JOIN (SELECT FLOWUNID,FACT_MONEY AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29') LFIT2 ON LFIT2.FLOWUNID = LFIT1.FLOWUNID LEFT JOIN (SELECT FLOWUNID,FACT_MONEY AS FIRST_PAYMENT,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5') LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID LEFT JOIN (SELECT FLOWUNID,FACT_MONEY AS GUARANTY,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2') LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID LEFT JOIN (SELECT FLOWUNID,FACT_MONEY AS HANDLING_CHARGE_MONEY,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1') LFIT5 ON LFIT5.FLOWUNID = LFIT1.FLOWUNID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.`ID` LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '2' AND LCCT.FLOWUNID = :FLOWUNID "; + sql="SELECT IFNULL(LFIT1.EQUIP, 0) AS EQUIP,IFNULL(ROUND(LFIT1.EQUIP / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS EQUIPNOTAX,IFNULL(LFIT1.EQUIP - ROUND(LFIT1.EQUIP / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS EQUIPTAX,IFNULL(LFIT2.OTHER_MONEY, 0) AS OTHER_MONEY,IFNULL(ROUND(LFIT2.OTHER_MONEY / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS OTHERNOTAX,IFNULL(LFIT2.OTHER_MONEY - ROUND(LFIT2.OTHER_MONEY / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS OTHERTAX,IFNULL((LFIT1.EQUIP + LFIT2.OTHER_MONEY),0) AS EQUIP_OTHER,IFNULL(LFIT3.FIRST_PAYMENT, 0) AS FIRST_PAYMENT,IFNULL(LFIT4.GUARANTY, 0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY, 0) AS HANDLING_CHARGE_MONEY,IFNULL(ROUND(LFIT5.HANDLING_CHARGE_MONEY / getTax (LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2),0) AS HANDLING_CHARGE_MONEY_NOTAX,IFNULL((LFIT5.HANDLING_CHARGE_MONEY - ROUND(LFIT5.HANDLING_CHARGE_MONEY / getTax (LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2)),0) AS HANDLING_CHARGE_MONEY_TAX,IFNULL((LFIT1.EQUIP + LFIT2.OTHER_MONEY - LFIT3.FIRST_PAYMENT - LFIT4.GUARANTY - LFIT5.HANDLING_CHARGE_MONEY),0) AS OTHERS_MATH,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT1.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT1.ACC_NUMBER FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID,CONTRACT_ID) LFIT1 ON LFIT1.FLOWUNID = LCCT.FLOWUNID LEFT JOIN (SELECT FLOWUNID,FACT_MONEY AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29') LFIT2 ON LFIT2.FLOWUNID = LFIT1.FLOWUNID LEFT JOIN (SELECT FLOWUNID,FACT_MONEY AS FIRST_PAYMENT,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5') LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID LEFT JOIN (SELECT FLOWUNID,FACT_MONEY AS GUARANTY,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2') LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID LEFT JOIN (SELECT FLOWUNID,FACT_MONEY AS HANDLING_CHARGE_MONEY,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1') LFIT5 ON LFIT5.FLOWUNID = LFIT1.FLOWUNID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '2' AND LCCT.FLOWUNID = :FLOWUNID "; // 非差额放款部分 - if("PZ2018092500000161".equals(VOUCHERNO) || "PZ2018092600000225".equals(VOUCHERNO)){ + if("PZ2018092500000161".equals(VOUCHERNO)){ sql+=" AND (LFIT3.SETTLE_METHOD !='settlemethod11' OR LFIT3.SETTLE_METHOD IS NULL) AND (LFIT4.SETTLE_METHOD !='settlemethod11' OR LFIT4.SETTLE_METHOD IS NULL) AND (LFIT5.SETTLE_METHOD !='settlemethod11' OR LFIT5.SETTLE_METHOD IS NULL)"; - }else if("PZ2018092500000162".equals(VOUCHERNO) || "PZ2018092600000226".equals(VOUCHERNO) || "PZ2018092500000163".equals(VOUCHERNO) || "PZ2018092600000227".equals(VOUCHERNO)) {// 差额-经销商支付的预付款(首付)/给经销商放款-首付冲抵--回租 + }else if("PZ2018092500000162".equals(VOUCHERNO) || "PZ2018092500000163".equals(VOUCHERNO)) {// 差额-经销商支付的预付款(首付)/给经销商放款-首付冲抵--回租 sql+=" AND LFIT3.SETTLE_METHOD='settlemethod11'"; - }else if("PZ2018092500000164".equals(VOUCHERNO) || "PZ2018092600000229".equals(VOUCHERNO) || "PZ2018092500000165".equals(VOUCHERNO) || "PZ2018092600000230".equals(VOUCHERNO)) {// 客户记录保证金/给经销商放款-保证金冲抵 + }else if("PZ2018092500000164".equals(VOUCHERNO) || "PZ2018092500000165".equals(VOUCHERNO)) {// 客户记录保证金/给经销商放款-保证金冲抵 sql+=" AND LFIT4.SETTLE_METHOD='settlemethod11'"; - }else if("PZ2018092500000166".equals(VOUCHERNO) || "PZ2018092600000231".equals(VOUCHERNO) || "PZ2018092500000167".equals(VOUCHERNO) || "PZ2018092600000232".equals(VOUCHERNO)) {// 收到客户手续费 / 给经销商放款-手续费冲抵 + }else if("PZ2018092500000166".equals(VOUCHERNO) || "PZ2018092500000167".equals(VOUCHERNO)) {// 收到客户手续费 / 给经销商放款-手续费冲抵 sql+=" AND LFIT5.SETTLE_METHOD='settlemethod11'"; }else if("PZ2018092500000169".equals(VOUCHERNO) || "PZ2018092600000233".equals(VOUCHERNO)) {// 给经销商放款-差额放款 sql+=" AND (LFIT3.SETTLE_METHOD ='settlemethod11' OR LFIT4.SETTLE_METHOD ='settlemethod11' OR LFIT5.SETTLE_METHOD ='settlemethod11')"; @@ -138,31 +140,25 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{ param.put("ACC_NUMBER",ACC_NUMBER); param.put("VOUCHERNO",VOUCHERNO); - // 判断传统类型 - if("PZ2018092500000159".equals(VOUCHERNO) || "PZ2018092600000223".equals(VOUCHERNO)){ - // 融资租赁资产 - param.put("LEASFORMASSET", "02/03/05/06"); - // 业务一部 - param.put("DEPT", "01"); - // 传统融资租赁收入 - param.put("LEASINCOMEFORM", "06"); - }else if("PZ2018092500000160".equals(VOUCHERNO) || "PZ2018092600000224".equals(VOUCHERNO)){ - // 融资租赁资产 - param.put("LEASFORMASSET", "10"); - // 业务一部 - param.put("DEPT", "01"); - // 传统融资租赁收入 - param.put("LEASINCOMEFORM", "06"); - }else { - // 融资租赁资产 - param.put("LEASFORMASSET", "02/03/05/06"); - // 业务一部 - param.put("DEPT", "01"); - // 传统融资租赁收入 - param.put("LEASINCOMEFORM", "06"); - } + + // 通过客户名称获取客户编码维护里面的数据, 如果有数据说明是集团内, 如果没有数据说明是集团外 + BizObject cust_list=JBOFactory.createBizObjectQuery(CUSTOMER_LIST.CLASS_NAME, "CUST_ID='"+DISTRIBUTOR_ID+"'").getSingleResult(false); + // 收到客户手续费 + if("PZ2018092500000166".equals(VOUCHERNO)){ + param.put("CASHFLOW", "");// 现金流项目 + param.put("BUSINESSTYPE", "0604");// 主营类型 + } + + // 给供应商放款-非差额放款/给经销商放款-差额放款, 用来判断集团内外的现金流辅助项 + if("PZ2018092500000161".equals(VOUCHERNO) || "PZ2018092500000169".equals(VOUCHERNO)) { + if(cust_list != null) {// 集团内 + param.put("CASHFLOW", "11212");// 现金流项目 + }else {// 集团外 + param.put("CASHFLOW", "11213");// 现金流项目 + } + param.put("BUSINESSTYPE", "");// 主营类型 + } - param.put("BUSINESSTYPE", "06"); param.put("FlowUnid", FlowUnid); map.clear(); map.put("PROJ_TYPE", LEAS_FORM); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractBeforeOnhireToVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractBeforeOnhireToVoucher.java index 255147a0d..b3c62b874 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractBeforeOnhireToVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractBeforeOnhireToVoucher.java @@ -15,16 +15,16 @@ public class ContractBeforeOnhireToVoucher extends BaseBussiness { CreateVoucherToBeforeOnhire cvbo = new CreateVoucherToBeforeOnhire(); // 传统 cvbo.CreateVoucher(FlowUnid, "PZ2018092500000156","feetype2"); // 收到客户保证金--回租 - cvbo.CreateVoucher(FlowUnid, "PZ2018092600000244","feetype2"); // 收到客户保证金--直租 + // cvbo.CreateVoucher(FlowUnid, "PZ2018092600000244","feetype2"); // 收到客户保证金--直租 cvbo.CreateVoucher(FlowUnid, "PZ2018092500000157","feetype1"); // 收到客户手续费--回租 - cvbo.CreateVoucher(FlowUnid, "PZ2018092600000245","feetype1"); // 收到客户手续费--直租 + // cvbo.CreateVoucher(FlowUnid, "PZ2018092600000245","feetype1"); // 收到客户手续费--直租 cvbo.CreateVoucher(FlowUnid, "PZ2018092500000158","feetype5"); // 收到客户预付款(首付)--回租 - cvbo.CreateVoucher(FlowUnid, "PZ2018092600000246","feetype5"); // 收到客户预付款(首付)--直租 + // cvbo.CreateVoucher(FlowUnid, "PZ2018092600000246","feetype5"); // 收到客户预付款(首付)--直租 // 汽车类传统 - cvbo.CreateVoucher(FlowUnid, "PZ2018092500000192","feetype2"); // 收到客户记录保证金--回租 + /*cvbo.CreateVoucher(FlowUnid, "PZ2018092500000192","feetype2"); // 收到客户记录保证金--回租 cvbo.CreateVoucher(FlowUnid, "PZ2018092600000240","feetype2"); // 收到客户记录保证金--直租 cvbo.CreateVoucher(FlowUnid, "PZ2018092500000193","feetype1"); // 收到客户手续费--回租 @@ -35,6 +35,6 @@ public class ContractBeforeOnhireToVoucher extends BaseBussiness { cvbo.CreateVoucher(FlowUnid, "PZ2018092500000195","feetype24");// 记录GPS安装服务费（不参融）--回租 cvbo.CreateVoucher(FlowUnid, "PZ2018092600000243","feetype24");// 记录GPS安装服务费（不参融）--直租 - return "true"; +*/ return "true"; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java index 075a1b104..9b45543f4 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java @@ -66,7 +66,8 @@ public class CreateVoucherMonthSettlement{ */ // 月结利息 if("PZ2018071200000016".equals(voucherNo)) { - sql="SELECT CRM.ID,CRM.INTEREST_TAX AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE='1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(SYSDATE(), '%Y/%m') AND DATEDIFF(SYSDATE(),LRP.PLAN_DATE)>3 AND (IFNULL(LRP.INTEREST,0)-IFNULL(LRI.INTEREST,0))<>0 AND CRM.ID NOT IN (SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%"+modular+"%')"; + // sql="SELECT CRM.ID,CRM.INTEREST_TAX AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID=LRP.CONTRACT_ID AND LRI.PLAN_LIST=LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE='1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(SYSDATE(), '%Y/%m') AND DATEDIFF(SYSDATE(),LRP.PLAN_DATE)>3 AND (IFNULL(LRP.INTEREST,0)-IFNULL(LRI.INTEREST,0))<>0 AND CRM.ID NOT IN (SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%"+modular+"%')"; + sql="SELECT CRM.ID,CRM.INTEREST_TAX AS MONEY,ROUND(CRM.INTEREST_TAX / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST_TAX - ROUND(CRM.INTEREST_TAX / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = CRM.CONTRACT_ID AND LRP.PLAN_LIST = CRM.rent_list LEFT JOIN LC_RENT_INCOME LRI ON LRI.CONTRACT_ID = LRP.CONTRACT_ID AND LRI.PLAN_LIST = LRP.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LRP.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,MAX(PLAN_LIST) AS PLAN_LIST FROM LC_RENT_INCOME GROUP BY CONTRACT_ID)LRI2 ON LRI2.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 LPI.BUSINESSTYPE = '1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(SYSDATE(), '%Y/%m') AND DATEDIFF(SYSDATE(), LRP.PLAN_DATE) > 3 AND (IFNULL(LRP.INTEREST, 0) - IFNULL(LRI.INTEREST, 0)) <> 0 AND (CAST(CRM.RENT_LIST AS SIGNED)-CAST(IFNULL(LRI2.PLAN_LIST,0) AS SIGNED))<=2 AND CRM.ID NOT IN (SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%"+modular+"%') "; }else { sql="SELECT CRM.ID,CRM.INTEREST AS MONEY,ROUND(CRM.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(CRM.INTEREST - ROUND(CRM.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS TAX,CRM.FEE AS FEEMONEY,IFNULL((CRM.FEE - ROUND(CRM.FEE / getTax (LCI.LEAS_FORM,'手续费',LCCT.START_DATE))),0) AS FEE_NOTAX,CRM.DISCOUNT AS DISCOUNT,IFNULL((CRM.DISCOUNT - ROUND(CRM.DISCOUNT / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE))),0) AS DISCOUNT_NOTAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=CRM.CONTRACT_ID AND LRP.PLAN_LIST=CRM.RENT_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID = LCI.ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE='1' AND DATE_FORMAT(CRM.END_DATE, '%Y/%m') = DATE_FORMAT(SYSDATE(), '%Y/%m') AND IFNULL(LRP.INTEREST,0)<>0 AND CRM.ID NOT IN (SELECT f58 AS ID FROM voucher_v8 WHERE module_name LIKE '%"+modular+"%') "; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToBeforeOnhire.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToBeforeOnhire.java index 106ab796a..f770ba238 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToBeforeOnhire.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToBeforeOnhire.java @@ -89,7 +89,7 @@ public class CreateVoucherToBeforeOnhire extends BaseBussiness { CUSTOMERNAME = 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"); + // ACC_NUM = dataList.get(i).get("ACC_NUMBER"); param.put("FACT_MONEY", MONEY); param.put("INTERESTNOTAX", MONEYNOTAX); @@ -106,19 +106,19 @@ public class CreateVoucherToBeforeOnhire extends BaseBussiness { param.put("CUSTNAME", CUSTOMERNAME); param.put("CUSTOMERTYPE", CUSTOMERTYPE); param.put("BUSINESSTYPE", BUSINESSTYPE); - if(!"PZ2018092500000157".equals(VOUCHERNO) || !"PZ2018092600000245".equals(VOUCHERNO) || !"PZ2018092500000158".equals(VOUCHERNO) || !"PZ2018092600000246".equals(VOUCHERNO)) { + /*if(!"PZ2018092500000157".equals(VOUCHERNO) || !"PZ2018092600000245".equals(VOUCHERNO) || !"PZ2018092500000158".equals(VOUCHERNO) || !"PZ2018092600000246".equals(VOUCHERNO)) { param.put("ACC_NUMBER", ACC_NUM); - } + }*/ param.put("VOUCHERNO", VOUCHERNO); // 传统类型 if("2".equals(BUSINESSTYPE)){ - // 融资租赁资产 - param.put("LEASFORMASSET", ""); - // 部门,业务二部 - param.put("DEPT", "01"); - // 传统融资租赁收入 - param.put("LEASINCOMEFORM", "06"); + // 收到客户手续费 + if("PZ2018092500000157".equals(VOUCHERNO)){ + param.put("CASHFLOW", "");// 现金流项目 + param.put("BUSINESSTYPE", "0604");// 主营类型 + } + }else if("3".equals(BUSINESSTYPE)){ // 融资租赁资产 param.put("LEASFORMASSET", "04"); @@ -127,10 +127,8 @@ public class CreateVoucherToBeforeOnhire extends BaseBussiness { // 汽车类传统融资租赁收入 param.put("LEASINCOMEFORM", "05"); } - - // param.put("FUNDTYPE", ""); // 主营类型 - param.put("BUSINESSTYPE", "06"); param.put("FlowUnid", FlowUnid); + map.clear(); map.put("PROJ_TYPE", LEAS_FORM); map.put("VOUCHER_NO", VOUCHERNO); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java index 7b2d8192f..13726d04d 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java @@ -15,7 +15,6 @@ public class ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst implements Vouc MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取设备款 - returnValue.put("FUNDTYPE","01"); String EQUIP_PREMIUM_OTHER_SUBFIRST=param.get("EQUIP_PREMIUM_OTHER_SUBFIRST")==null?"0.00":param.get("EQUIP_PREMIUM_OTHER_SUBFIRST"); returnValue.put("MONEY",EQUIP_PREMIUM_OTHER_SUBFIRST); return returnValue; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToINTEREST.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToINTEREST.java index 6b224a1e9..e628c7530 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToINTEREST.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToINTEREST.java @@ -14,7 +14,6 @@ public class ContractGetMoneyToINTEREST implements VoucherJavaParamService{ public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); - returnValue.put("FUNDTYPE","02"); returnValue.put("MONEY",param.get("INTEREST")); return returnValue; } diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index 5215232c8..f52b5a9a8 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -262,7 +262,7 @@ public class CreateVoucherServiceImpl { /** * 网银存款转预收银行科目 */ - if("PZ2018121800000005".equals(VOUCHERNO) || "PZ2018081600000120".equals(VOUCHERNO)) { + if("PZ2018121800000005".equals(VOUCHERNO) || "PZ2018081600000120".equals(VOUCHERNO) || "PZ2018092500000155".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); @@ -354,14 +354,20 @@ public class CreateVoucherServiceImpl { subData.put("CUSTID",dataTemp.get("DISTRIBUTOR_ID"));//经销商id subData.put("CUSTNAME",dataTemp.get("DISTRIBUTOR_NAME"));//经销商名称 }else if("PZ2018072100000026".equals(VOUCHERNO) || "PZ2018072100000051".equals(VOUCHERNO) || "PZ2018072100000052".equals(VOUCHERNO) || "PZ2018072100000031".equals(VOUCHERNO)){ - subData.put("CUSTID","APZL00000000DC");//虚拟账户 - subData.put("CUSTNAME","业务系统待查客户");//虚拟账户 + subData.put("CUSTID","APZL00000000DC");//虚拟客户 + subData.put("CUSTNAME","汽车C端待查客户");//虚拟客户 }else if("PZ2018081700000134".equals(VOUCHERNO) || "PZ2018081700000138".equals(VOUCHERNO) || "PZ2018072100000047".equals(VOUCHERNO) || "PZ2018081700000132".equals(VOUCHERNO) || "PZ2018081700000130".equals(VOUCHERNO) || "PZ2018081700000128".equals(VOUCHERNO)){ - subData.put("CUSTID","APZL00000000DC");//虚拟账户 - subData.put("CUSTNAME","业务系统待查客户");//虚拟账户 + subData.put("CUSTID","APZL00000000DC");//虚拟客户 + subData.put("CUSTNAME","汽车C端待查客户");//虚拟客户 }else if("PZ2018072100000038".equals(VOUCHERNO) || "PZ2018072100000039".equals(VOUCHERNO) || "PZ2018072100000043".equals(VOUCHERNO)) { - subData.put("CUSTNAME","业务系统待查客户");//虚拟账户 - }/*else { + subData.put("CUSTID","APZL00000000DC");//虚拟客户 + subData.put("CUSTNAME","汽车C端待查客户");//虚拟客户 + }else if("PZ2018092500000156".equals(VOUCHERNO) || "PZ2018092500000157".equals(VOUCHERNO) || "PZ2018092500000158".equals(VOUCHERNO)) { + subData.put("CUSTID","APZL00000000CT");//虚拟客户 + subData.put("CUSTNAME","传统B端待查客户");//虚拟客户 + } + + /*else { subData.put("CUSTID",dataTemp.get("CUSTID"));//客商id subData.put("CUSTNAME",dataTemp.get("CUSTNAME"));//客商名称 }*/ @@ -371,8 +377,11 @@ public class CreateVoucherServiceImpl { subData.put("ENTRYDC", "-1"); //凭证信息是经销商名称 if("PZ2018081600000120".equals(VOUCHERNO)){ - subData.put("CUSTID","APZL00000000DC"); - subData.put("CUSTNAME","业务系统待查客户"); + subData.put("CUSTID","APZL00000000DC"); // 虚拟客户 + subData.put("CUSTNAME","汽车C端待查客户"); // 虚拟客户 + }else if("PZ2018092500000155".equals(VOUCHERNO)) { + subData.put("CUSTID","APZL00000000CT"); + subData.put("CUSTNAME","传统B端待查客户"); } /*else { subData.put("CUSTID",dataTemp.get("CUSTID"));//客商id @@ -416,7 +425,7 @@ public class CreateVoucherServiceImpl { if("PZ2018081700000127".equals(VOUCHERNO)) { if("1".equals(SORT_NUMBER)) { subData.put("CUSTID","APZL00000000DC");//虚拟账户 - subData.put("CUSTNAME","业务系统待查客户");//虚拟账户 + subData.put("CUSTNAME","汽车C端待查客户");//虚拟账户 } } @@ -424,7 +433,7 @@ public class CreateVoucherServiceImpl { if("PZ2018081700000136".equals(VOUCHERNO)) { if("2".equals(SORT_NUMBER)) { subData.put("CUSTID","APZL00000000DC");//虚拟账户 - subData.put("CUSTNAME","业务系统待查客户");//虚拟账户 + subData.put("CUSTNAME","汽车C端待查客户");//虚拟账户 } } @@ -435,7 +444,7 @@ public class CreateVoucherServiceImpl { if("PZ2018072100000037".equals(VOUCHERNO)) { if("1".equals(SORT_NUMBER)) { subData.put("CUSTID","APZL00000000DC");//虚拟账户 - subData.put("CUSTNAME","业务系统待查客户");//虚拟账户 + subData.put("CUSTNAME","汽车C端待查客户");//虚拟账户 } } diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java index 6007b0edd..ee745a599 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java @@ -59,7 +59,8 @@ public class VoucherToV8Impl implements VoucherService { private static final String Return_Dealer_Margin="放款-退回经销商保证金"; private static final String Return_surplus_income="合同到期申请-将多余还款确认为收入"; private static final String Return_surplus_send="合同到期申请-将多余还款退回"; - private static final String ebank_income="回款-银行存款转预收"; + private static final String ebank_income="回款-银行存款转预收";// 汽车网银导入 + private static final String Eband_Returned_Money="网银回款(传统)";// 传统网银导入 public String saveMessage(List> list,Map param,BizObject user,JBOTransaction tx) throws Exception{ try{ @@ -90,14 +91,15 @@ public class VoucherToV8Impl implements VoucherService { String contracid=list.get(i).get("CONTRACT_ID");//合同号 String modularNumber=param.get("MODULAR_NUMBER");//凭证模板名称 //网银导入、代收租金 的凭证不需要合同号 - if(!Return_Dealer_Margin.equals(modularNumber)&&!Receive_Dealer_Margin.equals(modularNumber)&&!moduleName_value.equals(modularNumber) - && !SPECIAL_MODULENAME.equals(modularNumber)&&!Return_surplus_income.equals(modularNumber) &&!Return_surplus_send.equals(modularNumber) && !ebank_income.equals(modularNumber)&& Tools.isNullOrEmpty(contracid) - ){ + if(!Return_Dealer_Margin.equals(modularNumber)&&!Receive_Dealer_Margin.equals(modularNumber)&&!moduleName_value.equals(modularNumber) && !Eband_Returned_Money.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber) + && !Return_surplus_income.equals(modularNumber) && !Return_surplus_send.equals(modularNumber) && !ebank_income.equals(modularNumber)&& Tools.isNullOrEmpty(contracid)){ log.error("合同号为空,无法构建对应的凭证信息!"); + return null; } //检查合同ID是否是正确的 - if(!Return_Dealer_Margin.equals(modularNumber)&&!Receive_Dealer_Margin.equals(modularNumber)&& !ebank_income.equals(modularNumber)&&!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber)){ + if(!Return_Dealer_Margin.equals(modularNumber)&&!Receive_Dealer_Margin.equals(modularNumber)&&!moduleName_value.equals(modularNumber) && !Eband_Returned_Money.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber) + && !Return_surplus_income.equals(modularNumber) && !Return_surplus_send.equals(modularNumber) && !ebank_income.equals(modularNumber)){ BizObject contract=JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME, "id=:id").setParameter("id", contracid).getSingleResult(false); if(contract==null){ message = message + "合同信息为空!"; diff --git a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java index f76189016..79fc19ab7 100644 --- a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java +++ b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java @@ -6,6 +6,7 @@ import java.util.Map; import jbo.app.tenwa.calc.LC_EBANK; import jbo.app.tenwa.calc.LC_EBANK_PROCESS; +import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; import jbo.sys.USER_INFO; import jbo.voucher.LV_STACTS_CONFIG; import jbo.voucher.LV_VOUCHER_CONFIG; @@ -33,15 +34,13 @@ public class EbankUse { public String getVOUCHERNO() { return VOUCHERNO; } - public void setVOUCHERNO(String vOUCHERNO) { VOUCHERNO = vOUCHERNO; } - + public String getSUMMARY() { return SUMMARY; } - public void setSUMMARY(String sUMMARY) { SUMMARY = sUMMARY; } @@ -49,7 +48,6 @@ public class EbankUse { public String getEbdataid() { return ebdataid; } - public void setEbdataid(String ebdataid) { this.ebdataid = ebdataid; } @@ -102,6 +100,10 @@ public class EbankUse { String EBANK_SUBJECTS = ""; // 流水号 String CONTRACT_NUMBER=""; + // 业务类型 + String BUSINESS_TYPE=""; + // 客商类型 + String CUSTOMER_TYPE=""; // 查询新增或者导入的网银 List bolist = ebankbom.createQuery("DEBIT_MONEY IS NULL or DEBIT_MONEY=0.00").getResultList(true); CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); @@ -110,12 +112,31 @@ public class EbankUse { for (BizObject bo : bolist) { fact_money = bo.getAttribute("fact_money").getString(); + // 银行名称 OWN_BANK = bo.getAttribute("OWN_BANK").getString(); + // 日期 fact_date = bo.getAttribute("fact_date").getString(); + // 银行账号 ownnumber = bo.getAttribute("ownacc_number").getString(); + // 网银流水号 CONTRACT_NUMBER=bo.getAttribute("EBANK_SN").getString(); + // 根据银行名称获取银行科目 BizObject lsc=JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME, "SUBJECTS_NAME='"+OWN_BANK+"'").getSingleResult(false); EBANK_SUBJECTS=lsc.getAttribute("SUBJECTS_CODE").getString(); + // 业务类型 + BUSINESS_TYPE=bo.getAttribute("BUSINESS_TYPE").getString();; + // 客商类型 + CUSTOMER_TYPE=bo.getAttribute("CUSTOMER_TYPE").getString();; + + // BizObject RESULT = JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME,"CONTRACT_NO=:CONTRACT_NO").setParameter("CONTRACT_NO", CONTRACT_NUMBER).getSingleResult(false); + // String BUSINESSTYPE= RESULT.getAttribute("BUSINESSTYPE").getString(); + + // 判断是汽车类还是传统类, 如果是传统, 则生成传统的分录 + if("传统".equals(BUSINESS_TYPE)) { + voucherNo="PZ2018092500000155"; + }else if("汽车类传统".equals(BUSINESS_TYPE)) { + voucherNo="PZ2018092500000155"; + } // 如果金额小于0, 则为反冲凭证 Map map = new HashMap(); @@ -129,7 +150,13 @@ public class EbankUse { param.put("ACC_NUMBER", ownnumber); param.put("CONTRACT_NUMBER", CONTRACT_NUMBER); param.put("EBANK_SUBJECTS", EBANK_SUBJECTS); - param.put("CASHFLOW", "11113"); + + // 根据客商类型判断现金流编码 + if("内部客商".equals(CUSTOMER_TYPE)) { + param.put("CASHFLOW", "11112"); + }else if("外部客商".equals(CUSTOMER_TYPE)) { + param.put("CASHFLOW", "11113"); + } param.put("VOUCHERNO",voucherNo); map.put("PROJ_TYPE", "02");