From 8195bbd2b1a4c943cb37904a9d74c66691b18499 Mon Sep 17 00:00:00 2001 From: liuz Date: Sun, 24 Jun 2018 11:10:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LDistributorInfoSecond.jsp | 39 +++- WebContent/WEB-INF/etc/jbo/jbo_comm.xml | 2 + WebContent/WEB-INF/etc/jbo/jbo_customer.xml | 189 ++++++++++-------- WebContent/WEB-INF/etc/jbo/jbo_prd.xml | 5 + 4 files changed, 148 insertions(+), 87 deletions(-) diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfoSecond.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfoSecond.jsp index 08d9179ce..e46dad979 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfoSecond.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfoSecond.jsp @@ -83,7 +83,7 @@ function saveproj_name(){ } //省市 - function selectRegionCode(){ +/* function selectRegionCode(){ var area_code = getItemValue(0,getRow(),"DISTRIBUTOR_ADDRESS"); AsDialog.PopView("/Common/ToolsA/AreaVFrame.jsp","AreaCode="+area_code,"dialogWidth=850px;dialogHeight=450px;center:yes;status:no;statusbar:no",function(sAreaCodeInfo){ //增加清空功能的判断 @@ -103,6 +103,43 @@ function saveproj_name(){ } } },'请选择省市'); + } */ + + var province="";//定义一个全局变量 + // 选择省份 + function selectProvinceCode(){ + AsDialog.OpenSelector("selectProvinceCode","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", + function(sReturn){ + if(!sReturn||sReturn=="_CANCEL_"||sReturn==""){ + //alert(getHtmlMessage('1'));//请选择一条信息！ + return; + } + sReturn = sReturn.split("@"); +// alert(sReturn[1]); + setItemValue(0,0,"provinces",sReturn[1]); + province=sReturn[0]; + setCertType(); + },"请选择省份",''); + } + // 选择市区 + function selectCityCode(){ + //alert("参数："+province); + if(province=="" || province==null){ + alert("请先选择省份。"); + return; + }else{ + AsDialog.OpenSelector("selectCityCode","province,"+province,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", + function(sReturn){ + + if(!sReturn||sReturn=="_CANCEL_"||sReturn==""){ + //alert(getHtmlMessage('1'));//请选择一条信息！ + return; + } + sReturn = sReturn.split("@"); + setItemValue(0,0,"DISTRIBUTOR_ADDRESS",sReturn[0]);//地区区号 + setItemValue(0,0,"DISTRIBUTOR_ADDRESSNAME",sReturn[1]);//地区 + },"请选择地区",''); + } } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml index 740c4979c..11b59a18d 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml @@ -687,6 +687,7 @@ + @@ -714,6 +715,7 @@ + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml index 84cfd532c..77c817422 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml @@ -494,92 +494,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2647,5 +2562,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml index 4f0d80d73..41ffc93e2 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_prd.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_prd.xml @@ -72,6 +72,11 @@ + + + + + From 3f182f8bfa5ec936e64f2a315cfd330d92f1b8a2 Mon Sep 17 00:00:00 2001 From: liuzhao Date: Sun, 24 Jun 2018 11:23:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=BE=E6=AC=BE=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherLoan/FinancialLeasCar.java | 18 +++- .../CreateVoucherLoanDistributor.java | 98 +++++++++++++++++++ 2 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FinancialLeasCar.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FinancialLeasCar.java index 67dca31d8..15ab4028c 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FinancialLeasCar.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FinancialLeasCar.java @@ -1,5 +1,21 @@ package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan; -public class FinancialLeasCar { +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; + +public class FinancialLeasCar implements VoucherJavaParamService{ + + @Override + public Map getJavaParam(JBOTransaction tx, + Map param) throws BusinessException { + MapreturnValue=new HashMap(); + returnValue.putAll(param); + returnValue.put("MONEY",param.get("FACT_MONEY")); + return returnValue; + } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java new file mode 100644 index 000000000..fc4371d55 --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java @@ -0,0 +1,98 @@ +package com.tenwa.voucher.CreateVoucherProcess; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jbo.voucher.LV_VOUCHER_CONFIG; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.flow.baseBussion.BaseBussiness; +import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; + +public class CreateVoucherLoanDistributor extends BaseBussiness{ + @Override + public Object run(Transaction Sqlca) throws Exception { + this.initBussinessParam(Sqlca); + Map map=new HashMap(); + Map param=new HashMap(); + + 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 ORGNAME=null; + String ORGID=null; + String MONEY=null; + String ACCOUNTNO=null; + String CUSTOMERID=null; + String CUSTOMERNAME=null; + String FlowUnid=this.getAttribute("FlowUnid").toString(); + param.clear(); + map.put("FlowUnid", FlowUnid); + map.put("FEE_TYPE", "feetype10"); + String sql= + " SELECT LFIT.FACT_MONEY AS MONEY,LFIT.ACCOUNTING_DATE AS ACCOUNT_DATE, " + +" LFIT.FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER, " + +" LCI.PROJECT_NAME,LCI.LEAS_FORM,IFNULL(LFIT.acc_number,'000000000000000') as ACCOUNTNO, " + +" ORG.ORGNAME,ORG.ORGID,LESS.CUSTOMER_ID as CUSTOMERID,LESS.CUSTOMER_NAME AS CUSTOMERNAME " + +" FROM LC_FUND_INCOME_TEMP LFIT " + +" LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID=LCI.ID " + +" LEFT JOIN ORG_INFO ORG ON ORG.ORGID=LCI.PROJECT_DEPT " + +" LEFT JOIN LB_UNION_LESSEE LESS ON LESS.CONTRACT_ID=LCI.ID " + +" where LFIT.FEE_TYPE=:FEE_TYPE and LFIT.FLOWUNID=:FlowUnid "; + List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); + + CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); + String VOUCHER_TYPE="1";// 凭证分类 金蝶 + String userid ="admin"; + for (int i=0;i