From 464b91d4d82c2c748bb03a02b30190b0fc64ef93 Mon Sep 17 00:00:00 2001 From: 58261 <58261@DESKTOP-AAAC71Q> Date: Fri, 28 Sep 2018 15:50:17 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=8F=AA=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/Comm/LBContract/LBContractInfo.jsp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp index 052e11a0f..6af56c002 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp @@ -80,6 +80,9 @@ doTemp.setColInnerBtEvent("PROJECT_ASSIST_NAME", ""); } doTemp.setDefaultValue("FlowUnid", sFlowUnid);//赋值流程编号 + if("TAssetsDisposalFeeFlow".equals(FlowNo)){ + doTemp.setReadOnly("CONTRACT_NUMBER", true); + } %> <%@ include file="/Tenwa/Lease/Flow/Comm/baseShowFormal.jspf"%> <% @@ -105,23 +108,14 @@ isAll=""; } String sButtons[][] =null; + + + // 原版的 sButtons= new String[][]{ {"true",isAll,"Button","保存","保存所有修改","saveRecord()","","","",""} }; - //改动如下 如有问题可删除恢复 - /* if(!"ContractApprovalFlow".equals(FlowNo)||!"ContractChangeFlow".equals(FlowNo)){ - sButtons= new String[][]{ - //{"true",isAll,"Button","保存","保存所有修改","saveRecord()","","","",""} - }; - - }else{ - - sButtons= new String[][]{ - {"true",isAll,"Button","保存","保存所有修改","saveRecord()","","","",""} - }; - } */ From 60ad17fa8c56e8db504aa9a34a111b93015a3f29 Mon Sep 17 00:00:00 2001 From: jianghongdong Date: Fri, 28 Sep 2018 16:16:52 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E5=90=8C=E5=8F=AA=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=8F=E7=90=86=E5=81=9A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Frame/page/tools/dialog/SelectCatalogGrid.jsp | 15 ++++++++++----- WebContent/fileTemplate/鎶ヤ环鏂规.xlsx | 0 .../comm/dataRightmanager/DataRightManager.java | 10 +++++----- 3 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 WebContent/fileTemplate/鎶ヤ环鏂规.xlsx diff --git a/WebContent/Frame/page/tools/dialog/SelectCatalogGrid.jsp b/WebContent/Frame/page/tools/dialog/SelectCatalogGrid.jsp index 74466d41f..1156c307b 100644 --- a/WebContent/Frame/page/tools/dialog/SelectCatalogGrid.jsp +++ b/WebContent/Frame/page/tools/dialog/SelectCatalogGrid.jsp @@ -113,11 +113,13 @@ //将Sql中的变量用相对应的值替换 StringTokenizer stArgs = new StringTokenizer(sParaString,","); + Map paramap = new HashMap(); while (stArgs.hasMoreTokens()) { try{ String sArgName = stArgs.nextToken().trim(); String sArgValue = stArgs.nextToken().trim(); - sSelCode = StringFunction.replace(sSelCode,"#"+sArgName,sArgValue ); + sSelCode = StringFunction.replace(sSelCode,"#"+sArgName,sArgValue ); + paramap.put(sArgName, sArgValue); }catch(NoSuchElementException ex){ throw new Exception("输入参数格式错误！"); } @@ -128,9 +130,12 @@ String[] params=param.split(","); if(params.length==2){ String sCondtion=DataRightManager.getRightConditionSelect(CurUser,params[0],params[1],"1"); - //sSelCode = StringFunction.replace(sSelCode,"{"+param+"}",sCondtion ); - //汽车业务经销商发起没有跟单人员不需要加权限条件 - sSelCode = StringFunction.replace(sSelCode,"{"+param+"}"," and 1=1 " ); + if("2".equals(paramap.get("businessType"))||"3".equals(paramap.get("businessType"))){ + sSelCode = StringFunction.replace(sSelCode,"{"+param+"}",sCondtion ); + }else{ + //汽车业务经销商发起没有跟单人员不需要加权限条件 + sSelCode = StringFunction.replace(sSelCode,"{"+param+"}"," and 1=1 " ); + } } } //实例化DataObject @@ -236,7 +241,7 @@ { doTemp.WhereClauseNoFilter+=" "+sAttribute4; } - + doTemp.WhereClauseNoFilter +=""; if(!sMutilOrSingle.equals("Single")) doTemp.multiSelectionEnabled=true; //实例化DataWindow diff --git a/WebContent/fileTemplate/鎶ヤ环鏂规.xlsx b/WebContent/fileTemplate/鎶ヤ环鏂规.xlsx new file mode 100644 index 000000000..e69de29bb diff --git a/src_core/com/tenwa/comm/dataRightmanager/DataRightManager.java b/src_core/com/tenwa/comm/dataRightmanager/DataRightManager.java index effa0c6d6..4abe253bc 100644 --- a/src_core/com/tenwa/comm/dataRightmanager/DataRightManager.java +++ b/src_core/com/tenwa/comm/dataRightmanager/DataRightManager.java @@ -60,11 +60,11 @@ public class DataRightManager { public static String getRightConditionByProj(ASUser curUser,String table) throws JBOException{ StringBuilder sb=new StringBuilder(" and ("); - sb.append(getRightCondition(curUser,table,"PROJECT_REGISTRAR","PROJECT_DEPT")) - .append(" or ") - .append(getRightCondition(curUser,table,"PROJECT_MANAGE","PROJECT_DEPT")) - .append(" or ") - .append(getRightCondition(curUser,table,"PROJECT_ASSIST","PROJECT_DEPT")) +// sb.append(getRightCondition(curUser,table,"PROJECT_REGISTRAR","PROJECT_DEPT")) +// .append(" or ") + sb.append(getRightCondition(curUser,table,"PROJECT_MANAGE","PROJECT_DEPT")) +// .append(" or ") +// .append(getRightCondition(curUser,table,"PROJECT_ASSIST","PROJECT_DEPT")) .append(")"); return sb.toString(); } From cc20781b9107ebdece7f4b54b1cc7cf26066edd9 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 28 Sep 2018 17:45:22 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=90=88=E4=BD=9C=E6=96=B9=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=B6=EF=BC=8C=E7=8A=B6=E6=80=81=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=B8=BA=E8=8D=89=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RentNotify/TriditionRentNotifyAdjust.jsp | 13 +++++++++++-- WebContent/fileTemplate/绉熼噾鏀粯閫氱煡涔.docx | Bin 38739 -> 38705 bytes .../action/ContractSignAction.java | 2 +- .../partner/NewPartnerCompanyController.java | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp index 152f7ce14..76948ebdb 100644 --- a/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentNotify/TriditionRentNotifyAdjust.jsp @@ -143,9 +143,18 @@ } - function stamp(){ - var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","TcollectionSignA","FlowUnid=<%=flowunid%>,flagType=AdjustmentNotice"); + var filename = getItemValue(0,getRow(),"FILENAME"); + if(filename==""){ + alert("请先生成租金调整通知书！！"); + return; + }; + var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","TcollectionSignA","FlowUnid=<%=flowunid%>,flagType=AdjustmentNotice,contract_id="+getItemValue(0,getRow(),"ID")); + if("success"==result){ + alert("盖章成功！！"); + }else{ + alert("盖章失败！！"); + } } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/fileTemplate/绉熼噾鏀粯閫氱煡涔.docx b/WebContent/fileTemplate/绉熼噾鏀粯閫氱煡涔.docx index 7063cfea12eece40d39d99e42d40ddeeb79f3742..bfad625675028d17eb4c72b98f162bd4aec8cc72 100644 GIT binary patch delta 6677 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 JPySEN{{sfZsGa}- diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java index bdb6702e5..bf2e8747b 100644 --- a/src/com/tenwa/channelportal/action/ContractSignAction.java +++ b/src/com/tenwa/channelportal/action/ContractSignAction.java @@ -2452,7 +2452,7 @@ public String claimSign(JBOTransaction tx) throws Exception { if("transfer".equals(flagType)){ DOCRELATIVE=bom.createQuery(" OBJECTTYPE='transfer' and FLOW_UNID=:flowunid and CONTRACT_ID=:contractid ").setParameter("flowunid",FlowUnid).setParameter("contractid",contract_id).getSingleResult(false); }else if("AdjustmentNotice".equals(flagType)){ - DOCRELATIVE=bom.createQuery(" OBJECTTYPE='AdjustmentNotice' and FLOW_UNID=:flowunid ").setParameter("flowunid",FlowUnid).getSingleResult(false); + DOCRELATIVE=bom.createQuery(" OBJECTTYPE='AdjustmentNotice' and FLOW_UNID=:flowunid and CONTRACT_ID=:contractid ").setParameter("flowunid",FlowUnid).setParameter("contractid",contract_id).getSingleResult(false); }else if("TriditionCollection".equals(flagType)){ DOCRELATIVE=bom.createQuery("plan_number=:plan_number and objecttype='TriditionCollection' ").setParameter("plan_number",PAYMENT_NUMBER).getSingleResult(false); }else if("TriditionSuspension".equals(flagType)){ diff --git a/src_tenwa/com/tenwa/customer/controller/partner/NewPartnerCompanyController.java b/src_tenwa/com/tenwa/customer/controller/partner/NewPartnerCompanyController.java index 3b22e4a29..2f7394999 100644 --- a/src_tenwa/com/tenwa/customer/controller/partner/NewPartnerCompanyController.java +++ b/src_tenwa/com/tenwa/customer/controller/partner/NewPartnerCompanyController.java @@ -174,7 +174,7 @@ public class NewPartnerCompanyController{ BizObject newCustomerType = typeManager.newObject(); newCustomerType.setAttributeValue("customerid",newCustomer.getAttribute("customerid").getString()); newCustomerType.setAttributeValue("custtype",partnerType); - newCustomerType.setAttributeValue("custstatus","status02"); + newCustomerType.setAttributeValue("custstatus","status04"); newCustomerType.setAttributeValue("status","valid"); newCustomerType.setAttributeValue("isoriginal","yes"); newCustomerType.setAttributeValue("inputuserid", userId); From 0f9f006c1a2874ad1d35d5b044c8a8730b47ba08 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Fri, 28 Sep 2018 17:56:31 +0800 Subject: [PATCH 04/16] =?UTF-8?q?1.=E6=8F=90=E5=89=8D=E7=BB=93=E6=B8=85?= =?UTF-8?q?=E7=A7=9F=E9=87=91=E6=B5=8B=E7=AE=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanBasicInfoBusiness.jsp | 1269 +++++++++++++++++ .../LoanBasicInfoBusiness.jsp | 1269 +++++++++++++++++ .../LoanSimulation_old/condition_plan.jsp | 2 +- .../LoanBasicInfoBusiness.jsp | 15 +- 4 files changed, 2548 insertions(+), 7 deletions(-) create mode 100644 WebContent/Accounting/LoanSimulation_new/LoanBasicInfoBusiness.jsp create mode 100644 WebContent/Accounting/LoanSimulation_old/LoanBasicInfoBusiness.jsp diff --git a/WebContent/Accounting/LoanSimulation_new/LoanBasicInfoBusiness.jsp b/WebContent/Accounting/LoanSimulation_new/LoanBasicInfoBusiness.jsp new file mode 100644 index 000000000..77139aa56 --- /dev/null +++ b/WebContent/Accounting/LoanSimulation_new/LoanBasicInfoBusiness.jsp @@ -0,0 +1,1269 @@ +<%@page import="jbo.prd.BUSINESS_TYPE"%> +<%@page import="com.tenwa.reckon.util.TbBeanTools"%> +<%@page import="com.tenwa.reckon.bean.TabCalBean"%> +<%@page import="com.amarsoft.awe.control.model.Parameter"%> +<%@page import="com.amarsoft.app.base.util.DateHelper"%> +<%@page import="com.tenwa.util.SerialNumberUtil"%> +<%@page import="com.tenwa.reckon.product.ProductCondition"%> +<%@page import="com.amarsoft.app.util.ProductParamUtil"%> +<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %> +<%@ page import="java.util.Vector" %> +<%@ page import="com.amarsoft.awe.dw.ui.validator.ValidateRule" %> +<%@ page import="com.tenwa.reckon.product.ASObjectWindowCalc" %> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%> +<% + /*获取参数*/ + String flowunid = CurPage.getParameter("FlowUnid"); + String plannumber=CurPage.getParameter("plannumber"); + String productId=CurPage.getParameter("ProductId"); + String ishistory=CurPage.getParameter("IsHistory"); + String nodeNo=CurPage.getParameter("NodeNo"); + String RightType= CurPage.getParameter("RightType"); + String calType = CurPage.getParameter("calType"); + //判断是否为汽车业务 + boolean isCarProduct = "004".equals(productId) ? false : true; + /*获取参数*/ + /*根据参数判断 是否去数据库查询*/ + BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid); + if(productId==null){ + productId=flow.getAttribute("productId").getString(); + } + if(calType == null){ + calType = "proj_process"; + } + TabCalBean tcb=TbBeanTools.getTabInfo(calType); + String planCName=tcb.getPlanCName(); + //方案编号 + if(plannumber==null){ + if("pay_process".equals(calType)||"onHire_process".equals(calType)){ + BizObject condtion=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid and PAYMENT_NUMBER is not null and length(PAYMENT_NUMBER)>0 ").setParameter("flowunid", flowunid).getSingleResult(false); + if(condtion!=null){ + plannumber=condtion.getAttribute(planCName).getString(); + } + }else{ + String planType=ProductParamUtil.getProductParameterValue(productId, "PRD0314", "planinformation"); + if("SinglePlan".equals(planType)){ + BizObject condtion=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); + if(condtion!=null){ + plannumber=condtion.getAttribute(planCName).getString(); + } + } + } + } + //新增数据 自动生成方案编号 + if(plannumber==null){ + String sSerialType=""; + JBOTransaction tx=JBOFactory.createJBOTransaction(); + if("proj_process".equals(calType)){ + BizObject proj=JBOFactory.createBizObjectQuery("jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); + sSerialType=proj.getAttribute("PROJECT_NO").getString(); + }else{ + BizObject contract=JBOFactory.createBizObjectQuery("jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); + sSerialType=contract.getAttribute("CONTRACT_NO").getString(); + } + plannumber=SerialNumberUtil.getPlannumber(sSerialType,calType,tx); + tx.commit(); + } + /*根据参数判断 是否去数据库查询*/ + + String sTempletNo = "LoanSimulationBasicInfoBusiness";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + + + + /*设置字段事件*/ + doTemp.setHtmlEvent("SETTLE_METHOD", "onchange", "changeSettleMethod");//租金计算方式 + doTemp.setHtmlEvent("RENT_OR_RATE", "onchange", "rentOrRateChange");//租金推算方法 + doTemp.setHtmlEvent("INCOME_NUMBER_YEAR", "onchange", "changeIncomeNumber");//还款间隔 + doTemp.setHtmlEvent("INCOME_INTERVAL_MONTH", "onchange", "changeIntervalMonth");//还款间隔(月) + doTemp.setHtmlEvent("INCOME_NUMBER", "onchange", "changeNumber");//还款次数 + doTemp.setHtmlEvent("PERIOD_TYPE", "onchange", "changePeriod");//期初/期末 + doTemp.setHtmlEvent("GRACE", "onchange", "changeGrace");//宽限期RATTermID + doTemp.setHtmlEvent("RATE_FLOAT_TYPE", "onchange", "changeRateFloat");//利率计算方式 + doTemp.setHtmlEvent("BASE_RATE", "onchange", "changeBaseRate");//基准利率 + doTemp.setHtmlEvent("RATE_FLOAT_AMT", "onchange", "changeRateFloatAmt");//利率调整值 + doTemp.setHtmlEvent("CAUTION_MONEY", "onchange", "cautionMoney");//保证金 + doTemp.setHtmlEvent("CAUTION_DEDUCTION_MONEY", "onchange", "cautionDeductionMoney");//保证金抵扣金额 + doTemp.setHtmlEvent("LEASE_AMT_DATE", "onchange", "changeLeaseAmtDate");//投放日 + doTemp.setHtmlEvent("START_DATE", "onchange", "changeStartDate");//起租日 + doTemp.setHtmlEvent("FIRST_PLAN_DATE", "onchange", "changeFistPlanDate");//第一期计划日期 + doTemp.setHtmlEvent("CORPUS_RATIO", "onchange", "changeCorpusRatio");//期限内本金比例 + doTemp.setHtmlEvent("RATE_TYPE", "onchange", "changeRateTypeNew");//利率类型 + /*设置字段事件*/ + + /*设置模板属性*/ + Vector vali=new Vector(); + //费用规则 + ProductCondition pc=new ProductCondition(); + pc.getProductFundRules(doTemp, productId); + String calcRules=pc.getProductRulesBusiness(doTemp, productId,vali); + + if("quoted_price".equals(calType)){//客户报价 流程号存的是客户主键 + doTemp.setDefaultValue("cust_id", flowunid); + } + doTemp.setColumnAttribute(planCName,"isipdate","1"); + doTemp.setJboClass(tcb.getCondition_tb()); + doTemp.setDefaultValue(planCName, plannumber); + doTemp.setDefaultValue("flowunid", flowunid); + doTemp.appendJboWhere(" and "+planCName+"='"+plannumber+"'"); + if(null!=ishistory&&ishistory.equals("true")){ + doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcCondtionInfoArachiveShow");//如果是历史则新显示历史数据 + } + /*设置模板属性*/ + + /*设置页面属性*/ + CurPage.getCurComp().setAttribute("RightType", null); + Parameter p=new Parameter("plannumber",plannumber); + Vector v=CurPage.parameterList; + v.add(p); + /*设置页面属性*/ + + + ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request); + + + dwTemp.Style = "2";//freeform + if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ + dwTemp.ReadOnly = "-2";//只读模式 + }else{ + } + isShowButton=false; + dwTemp.setVali(vali); + dwTemp.setAttr("inputWidth","120"); + dwTemp.setAttr("spanWidth","107"); + dwTemp.setAttr("showRatio", true); + dwTemp.genHTMLObjectWindow(flowunid); + CurPage.getCurComp().setAttribute("RightType", RightType); + + String compClientID = request.getParameter("CompClientID"); + dwTemp.replaceColumn("condition_plan", "", CurPage.getObjectWindowOutput()); + dwTemp.replaceColumn("even_subsection", "", CurPage.getObjectWindowOutput()); + dwTemp.replaceColumn("knowing_config", "", CurPage.getObjectWindowOutput()); + String sButtons[][] = { + + }; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Accounting/LoanSimulation_old/LoanBasicInfoBusiness.jsp b/WebContent/Accounting/LoanSimulation_old/LoanBasicInfoBusiness.jsp new file mode 100644 index 000000000..dad3956dc --- /dev/null +++ b/WebContent/Accounting/LoanSimulation_old/LoanBasicInfoBusiness.jsp @@ -0,0 +1,1269 @@ +<%@page import="jbo.prd.BUSINESS_TYPE"%> +<%@page import="com.tenwa.reckon.util.TbBeanTools"%> +<%@page import="com.tenwa.reckon.bean.TabCalBean"%> +<%@page import="com.amarsoft.awe.control.model.Parameter"%> +<%@page import="com.amarsoft.app.base.util.DateHelper"%> +<%@page import="com.tenwa.util.SerialNumberUtil"%> +<%@page import="com.tenwa.reckon.product.ProductCondition"%> +<%@page import="com.amarsoft.app.util.ProductParamUtil"%> +<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %> +<%@ page import="java.util.Vector" %> +<%@ page import="com.amarsoft.awe.dw.ui.validator.ValidateRule" %> +<%@ page import="com.tenwa.reckon.product.ASObjectWindowCalc" %> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%> +<% + /*获取参数*/ + String flowunid = CurPage.getParameter("FlowUnid"); + String plannumber=CurPage.getParameter("plannumber"); + String productId=CurPage.getParameter("ProductId"); + String ishistory=CurPage.getParameter("IsHistory"); + String nodeNo=CurPage.getParameter("NodeNo"); + String RightType= CurPage.getParameter("RightType"); + String calType = CurPage.getParameter("calType"); + //判断是否为汽车业务 + boolean isCarProduct = "004".equals(productId) ? false : true; + /*获取参数*/ + /*根据参数判断 是否去数据库查询*/ + BizObject flow=GetFlowAction.getFlowBussinessObject(flowunid); + if(productId==null){ + productId=flow.getAttribute("productId").getString(); + } + if(calType == null){ + calType = "proj_process"; + } + TabCalBean tcb=TbBeanTools.getTabInfo(calType); + String planCName=tcb.getPlanCName(); + //方案编号 + if(plannumber==null){ + if("pay_process".equals(calType)||"onHire_process".equals(calType)){ + BizObject condtion=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid and PAYMENT_NUMBER is not null and length(PAYMENT_NUMBER)>0 ").setParameter("flowunid", flowunid).getSingleResult(false); + if(condtion!=null){ + plannumber=condtion.getAttribute(planCName).getString(); + } + }else{ + String planType=ProductParamUtil.getProductParameterValue(productId, "PRD0314", "planinformation"); + if("SinglePlan".equals(planType)){ + BizObject condtion=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); + if(condtion!=null){ + plannumber=condtion.getAttribute(planCName).getString(); + } + } + } + } + //新增数据 自动生成方案编号 + if(plannumber==null){ + String sSerialType=""; + JBOTransaction tx=JBOFactory.createJBOTransaction(); + if("proj_process".equals(calType)){ + BizObject proj=JBOFactory.createBizObjectQuery("jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); + sSerialType=proj.getAttribute("PROJECT_NO").getString(); + }else{ + BizObject contract=JBOFactory.createBizObjectQuery("jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false); + sSerialType=contract.getAttribute("CONTRACT_NO").getString(); + } + plannumber=SerialNumberUtil.getPlannumber(sSerialType,calType,tx); + tx.commit(); + } + /*根据参数判断 是否去数据库查询*/ + + String sTempletNo = "TLoanSimulationBasicInfo_old";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + + + + /*设置字段事件*/ + doTemp.setHtmlEvent("SETTLE_METHOD", "onchange", "changeSettleMethod");//租金计算方式 + doTemp.setHtmlEvent("RENT_OR_RATE", "onchange", "rentOrRateChange");//租金推算方法 + doTemp.setHtmlEvent("INCOME_NUMBER_YEAR", "onchange", "changeIncomeNumber");//还款间隔 + doTemp.setHtmlEvent("INCOME_INTERVAL_MONTH", "onchange", "changeIntervalMonth");//还款间隔(月) + doTemp.setHtmlEvent("INCOME_NUMBER", "onchange", "changeNumber");//还款次数 + doTemp.setHtmlEvent("PERIOD_TYPE", "onchange", "changePeriod");//期初/期末 + doTemp.setHtmlEvent("GRACE", "onchange", "changeGrace");//宽限期RATTermID + doTemp.setHtmlEvent("RATE_FLOAT_TYPE", "onchange", "changeRateFloat");//利率计算方式 + doTemp.setHtmlEvent("BASE_RATE", "onchange", "changeBaseRate");//基准利率 + doTemp.setHtmlEvent("RATE_FLOAT_AMT", "onchange", "changeRateFloatAmt");//利率调整值 + doTemp.setHtmlEvent("CAUTION_MONEY", "onchange", "cautionMoney");//保证金 + doTemp.setHtmlEvent("CAUTION_DEDUCTION_MONEY", "onchange", "cautionDeductionMoney");//保证金抵扣金额 + doTemp.setHtmlEvent("LEASE_AMT_DATE", "onchange", "changeLeaseAmtDate");//投放日 + doTemp.setHtmlEvent("START_DATE", "onchange", "changeStartDate");//起租日 + doTemp.setHtmlEvent("FIRST_PLAN_DATE", "onchange", "changeFistPlanDate");//第一期计划日期 + doTemp.setHtmlEvent("CORPUS_RATIO", "onchange", "changeCorpusRatio");//期限内本金比例 + doTemp.setHtmlEvent("RATE_TYPE", "onchange", "changeRateTypeNew");//利率类型 + /*设置字段事件*/ + + /*设置模板属性*/ + Vector vali=new Vector(); + //费用规则 + ProductCondition pc=new ProductCondition(); + pc.getProductFundRules(doTemp, productId); + String calcRules=pc.getProductRulesBusiness(doTemp, productId,vali); + + if("quoted_price".equals(calType)){//客户报价 流程号存的是客户主键 + doTemp.setDefaultValue("cust_id", flowunid); + } + doTemp.setColumnAttribute(planCName,"isipdate","1"); + doTemp.setJboClass(tcb.getCondition_tb()); + doTemp.setDefaultValue(planCName, plannumber); + doTemp.setDefaultValue("flowunid", flowunid); + doTemp.appendJboWhere(" and "+planCName+"='"+plannumber+"'"); + if(null!=ishistory&&ishistory.equals("true")){ + doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcCondtionInfoArachiveShow");//如果是历史则新显示历史数据 + } + /*设置模板属性*/ + + /*设置页面属性*/ + CurPage.getCurComp().setAttribute("RightType", null); + Parameter p=new Parameter("plannumber",plannumber); + Vector v=CurPage.parameterList; + v.add(p); + /*设置页面属性*/ + + + ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request); + + + dwTemp.Style = "2";//freeform + if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory.equals("true"))){ + dwTemp.ReadOnly = "-2";//只读模式 + }else{ + } + isShowButton=false; + dwTemp.setVali(vali); + dwTemp.setAttr("inputWidth","120"); + dwTemp.setAttr("spanWidth","107"); + dwTemp.setAttr("showRatio", true); + dwTemp.genHTMLObjectWindow(plannumber); + CurPage.getCurComp().setAttribute("RightType", RightType); + + String compClientID = request.getParameter("CompClientID"); + dwTemp.replaceColumn("condition_plan", "", CurPage.getObjectWindowOutput()); + dwTemp.replaceColumn("even_subsection", "", CurPage.getObjectWindowOutput()); + dwTemp.replaceColumn("knowing_config", "", CurPage.getObjectWindowOutput()); + String sButtons[][] = { + + }; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Accounting/LoanSimulation_old/condition_plan.jsp b/WebContent/Accounting/LoanSimulation_old/condition_plan.jsp index 32bd5c4a8..e2e882de5 100644 --- a/WebContent/Accounting/LoanSimulation_old/condition_plan.jsp +++ b/WebContent/Accounting/LoanSimulation_old/condition_plan.jsp @@ -10,7 +10,7 @@ String sTabStrip[][] = { {"true", "租金计划", "/Accounting/LoanSimulation_old/RentPlanList.jsp",params, "", "", "false"}, {"true", "资金计划", "/Accounting/LoanSimulation_old/FundPlanList.jsp",params, "", "", "false"}, - {"true", "现金流", "/Accounting/LoanSimulation_old/RentPlanList.jsp",params, "", "", "false"}, + {"true", "现金流", "/Accounting/LoanSimulation_old/CashFlowList.jsp",params, "", "", "false"}, }; %> <%@ include file="/Resources/CodeParts/Tab01.jsp"%> diff --git a/WebContent/Accounting/LoanSimulation_onhire/LoanBasicInfoBusiness.jsp b/WebContent/Accounting/LoanSimulation_onhire/LoanBasicInfoBusiness.jsp index 5db307d87..bbd3cba0e 100644 --- a/WebContent/Accounting/LoanSimulation_onhire/LoanBasicInfoBusiness.jsp +++ b/WebContent/Accounting/LoanSimulation_onhire/LoanBasicInfoBusiness.jsp @@ -156,6 +156,7 @@ var incomeNumberYear; var adjustType; var count = 0; $(function(){ + changeRateTypeNew(); //document.getElementById('div_my0').innerHTML = '
'+document.getElementById('div_my0').innerHTML+'
'; if("ReadOnly"!="<%=RightType%>"){ changeRateTypeNew(); @@ -184,8 +185,10 @@ $(function(){ count++; }else{ changeSettleMethod3(); + changeRateTypeNew(); } getRatioByMoney(getObj(0, "EQUIP_AMT")); + changeRateTypeNew(); }); function importCustomerQuot(){ @@ -207,12 +210,12 @@ function importCustomerQuot(){ } -function changeRateTypeNew() { + function changeRateTypeNew() { if("ratetype01" == getItemValue(0, 0, "RATE_TYPE")) { - setItemRequired(0, "ADJUST_STYLE", true); - setItemReadOnly(0, 0, "ADJUST_STYLE", false); - setItemRequired(0, "ADJUST_TYPE", true); - setItemReadOnly(0, 0, "ADJUST_TYPE", false); + // setItemRequired(0, "ADJUST_STYLE", true); + // setItemReadOnly(0, 0, "ADJUST_STYLE", false); + // setItemRequired(0, "ADJUST_TYPE", true); + // setItemReadOnly(0, 0, "ADJUST_TYPE", false); } else { setItemValue(0, 0, "ADJUST_STYLE", ""); setItemRequired(0, "ADJUST_STYLE", false); @@ -221,7 +224,7 @@ function changeRateTypeNew() { setItemRequired(0, "ADJUST_TYPE", false); setItemReadOnly(0, 0, "ADJUST_TYPE", true); } -} +} var CalcControl={}; CalcControl.IncomeNumberView=function(){ From 6ca894fedf06f3128fb4de4206d1af9644503f22 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 28 Sep 2018 18:01:04 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=96=B9=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=AD=A3=E5=BC=8F=E6=97=B6=E4=B8=80=E4=BA=9B=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/Company/PartnerCompanyViewInfo.jsp | 39 ++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/WebContent/Tenwa/Customer/Partner/Comm/Company/PartnerCompanyViewInfo.jsp b/WebContent/Tenwa/Customer/Partner/Comm/Company/PartnerCompanyViewInfo.jsp index cc5e5b846..f1436b530 100644 --- a/WebContent/Tenwa/Customer/Partner/Comm/Company/PartnerCompanyViewInfo.jsp +++ b/WebContent/Tenwa/Customer/Partner/Comm/Company/PartnerCompanyViewInfo.jsp @@ -5,7 +5,8 @@ String sTempletNo = "PartnerCompany";//--模板号-- ASObjectModel doTemp = new ASObjectModel(sTempletNo); doTemp.setHtmlEvent("registercapital,paiclupcapital","onchange","changeCurrencyRequired"); - //doTemp.setHtmlEvent("status","onchange","changeOtherRequired"); +// doTemp.setHtmlEvent("status","onchange","changeOtherRequired"); + doTemp.setHtmlEvent("status", "onchange", "changeRegisterInfo"); //初始化客户类别字段 BizObjectManager typeManager = JBOFactory.getBizObjectManager(CUSTOMER_TYPE.CLASS_NAME); List types = typeManager.createQuery("customerid=:customerid and status='valid' ").setParameter("customerid",customerId).getResultList(false); @@ -116,5 +117,41 @@ } },"请选择行业分类"); } + + function changeRegisterInfo(){//客户状态为正式时注册信息必填，否则不必填 + var status = getItemValue(0,getRow(),"status"); + if(status == "status02"){ + setItemRequired(0,"economytypename",true); + setItemRequired(0,"orgnaturename",true); + setItemRequired(0,"orgnaturecategoryname",true); + setItemRequired(0,"industrytypename",true); + setItemRequired(0,"scope",true); + setItemRequired(0,"rccurrency",true); + setItemRequired(0,"registercapital",true); + setItemRequired(0,"pccurrency",true); + setItemRequired(0,"paiclupcapital",true); + setItemRequired(0,"establish_date",true); + setItemRequired(0,"licensematurity",true); + setItemRequired(0,"operationperiod",true); + + }else{ + setItemRequired(0,"economytypename",false); + setItemRequired(0,"orgnaturename",false); + setItemRequired(0,"orgnaturecategoryname",false); + setItemRequired(0,"industrytypename",false); + setItemRequired(0,"scope",false); + setItemRequired(0,"rccurrency",false); + setItemRequired(0,"registercapital",false); + setItemRequired(0,"pccurrency",false); + setItemRequired(0,"paiclupcapital",false); + setItemRequired(0,"establish_date",false); + setItemRequired(0,"licensematurity",false); + setItemRequired(0,"operationperiod",false); + setItemRequired(0,"custsource",false); + setItemRequired(0,"certtype",false); + setItemRequired(0,"custkind",false); + + } + } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file From 357143d379f542d4895da9f359496a1c5885e933 Mon Sep 17 00:00:00 2001 From: jianghongdong Date: Fri, 28 Sep 2018 18:03:20 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=EF=BC=8C=E9=9A=90=E8=97=8F=E4=B8=8B=E9=83=A8?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=9C=8B=E4=B8=8D=E5=88=B0=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Frame/page/js/widget/frame_lrud.js | 1 + 1 file changed, 1 insertion(+) diff --git a/WebContent/Frame/page/js/widget/frame_lrud.js b/WebContent/Frame/page/js/widget/frame_lrud.js index 9fc169176..97f24f01c 100644 --- a/WebContent/Frame/page/js/widget/frame_lrud.js +++ b/WebContent/Frame/page/js/widget/frame_lrud.js @@ -58,6 +58,7 @@ }else{ second.hide(); changeLayout(); + $('#FirstFrame').attr('style','width: 100%; height: '+eval(FirstFrame.offsetHeight-5)+'px;'); } })).mousedown(AsLink.stopEvent); From 0fae953461a5af4699240e50632de5e0e6f24d80 Mon Sep 17 00:00:00 2001 From: 58261 <58261@DESKTOP-AAAC71Q> Date: Fri, 28 Sep 2018 18:49:48 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp b/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp index a319b50a3..0802c3bbd 100644 --- a/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp +++ b/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp @@ -25,7 +25,9 @@ //doTemp.setColTips("", "测试"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform + // if("0020".equals(CurPage.getParameter("PhaseNo"))){ //dwTemp.ReadOnly = "-2";//只读模式 + //} dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid")); String sButtons[][] = { From 06fae721bcc790ffecd959df786376219920a3b0 Mon Sep 17 00:00:00 2001 From: 58261 <58261@DESKTOP-AAAC71Q> Date: Fri, 28 Sep 2018 18:50:50 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MortgageFile/LbFileArchivingInfoTemp.jsp | 5 +- .../LbFileArchivingList_CTTemp.jsp | 37 ++++++++++++++ .../MortgageFile/LbFileArchiving_CTInfo.jsp | 49 +++++++++++++++++++ 3 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingList_CTTemp.jsp create mode 100644 WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchiving_CTInfo.jsp diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp index 8652646d9..a2660ff14 100644 --- a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp +++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp @@ -22,12 +22,13 @@ String sButtons[][] = { {"true","All","Button","保存","保存所有修改","as_save(0)","","","",""}, - {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""} + {"true","All","Button","返回","返回列表","returnList()","","","",""} }; sButtonPosition = "south"; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingList_CTTemp.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingList_CTTemp.jsp new file mode 100644 index 000000000..3715052a3 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingList_CTTemp.jsp @@ -0,0 +1,37 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2018-07-17 + Content: + History Log: + */ + ASObjectModel doTemp = new ASObjectModel("LbFileArchivingListTemp"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(""); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, + {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, + }; +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchiving_CTInfo.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchiving_CTInfo.jsp new file mode 100644 index 000000000..cf5a798a7 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchiving_CTInfo.jsp @@ -0,0 +1,49 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% + /* + Author: undefined 2018-07-17 + Content: 示例详情页面 + History Log: + */ + String sPrevUrl = CurPage.getParameter("PrevUrl"); + if(sPrevUrl == null) sPrevUrl = ""; + String inputuserid = CurUser.getUserID(); + String inputusername = CurUser.getUserName(); + String inputorgid = CurOrg.getOrgID(); + String inputorgname = CurOrg.getOrgName(); + + String sTempletNo = "LbFileArchivingInfoTemp";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + doTemp.setColTips("", ""); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + //dwTemp.ReadOnly = "-2";//只读模式 + dwTemp.genHTMLObjectWindow(CurPage.getParameter("SerialNo")); + + String sButtons[][] = { + {"true","All","Button","保存","保存所有修改","as_save(0)","","","",""}, + {"true","All","Button","返回","返回列表","returnList()","","","",""} + }; + sButtonPosition = "south"; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file From 7fd0358faa74329ba42966fa4f5965f18d042ec5 Mon Sep 17 00:00:00 2001 From: 58261 <58261@DESKTOP-AAAC71Q> Date: Sat, 29 Sep 2018 09:41:54 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E6=8A=B5=E6=8A=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/DocList/LbCarLicensePlateInfoTemp.jsp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp b/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp index 0802c3bbd..7217a820e 100644 --- a/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp +++ b/WebContent/Tenwa/Comm/DocList/LbCarLicensePlateInfoTemp.jsp @@ -25,15 +25,22 @@ //doTemp.setColTips("", "测试"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform - // if("0020".equals(CurPage.getParameter("PhaseNo"))){ - //dwTemp.ReadOnly = "-2";//只读模式 - //} + if("0020".equals(CurPage.getParameter("PhaseNo"))){ + dwTemp.ReadOnly = "-2";//只读模式 + } dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid")); - - String sButtons[][] = { + String sButtons[][]=null; + if("0020".equals(CurPage.getParameter("PhaseNo"))){ + sButtons =new String[][] { + //{"true","All","Button","保存","保存所有修改","as_save(0)","","","",""}, + {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""} + }; + }else{ + sButtons =new String[][] { {"true","All","Button","保存","保存所有修改","as_save(0)","","","",""}, {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""} }; + } sButtonPosition = "south"; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> +<%@ include file="/IncludeEnd.jsp"%> --%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% + /* + Author: undefined 2018-05-29 + Content: 示例详情页面 + History Log: + */ + + + String sTempletNo = "sourceOfFundsInfoMultiUpdate";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + /* doTemp.setColTips("", "测试"); */ + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + //dwTemp.ReadOnly = "-2";//只读模式 + dwTemp.genHTMLObjectWindow(""); + + String sButtons[][] = { + {"true","All","Button","保存","保存所有修改","save()","","","",""}, + {"true","All","Button","返回","返回列表","returnList()","","","",""} + }; + sButtonPosition = "south"; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/money/sourceOfFunds.jsp b/WebContent/money/sourceOfFunds.jsp index d36ddfb92..35fb6af9d 100644 --- a/WebContent/money/sourceOfFunds.jsp +++ b/WebContent/money/sourceOfFunds.jsp @@ -5,21 +5,58 @@ Content: History Log: */ + String userid=CurUser.getUserID(); + String department=CurUser.getOrgID(); ASObjectModel doTemp = new ASObjectModel("sourceOfFunds"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 dwTemp.setPageSize(10); dwTemp.genHTMLObjectWindow(""); - + dwTemp.MultiSelect = true; + doTemp.setLockCount(2); //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 String sButtons[][] = { {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""}, + {"true","","Button","数据导入","数据导入","importExcel()","","","","btn_icon_import",""}, + {"true","","Button","批量修改","批量修改","MultiUpdate()","","","","btn_icon_detail",""}, }; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%> +<%/*~END~*/%> + + + + +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info07;Describe=自定义函数;]~*/%> + +<%/*~END~*/%> + + + + +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info08;Describe=页面装载时，进行初始化;]~*/%> + +<%/*~END~*/%> + + + + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp index 33adca868..cf47c4d37 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/QuotationList.jsp @@ -21,6 +21,8 @@ docname = "结清模板"; }else if("transfer".equals(docname)){ docname = "产权转移证书"; + }else if("settletradition".equals(docname)){ + docname = "提前结清（传统）"; }; String sTempletNo = CurPage.getParameter("TempletNo");//模板号 sTempletNo = "DevolutionList"; diff --git a/WebContent/fileTemplate/琛ㄥ崟8锛氱粨娓呰瘉鏄(1).docx b/WebContent/fileTemplate/琛ㄥ崟8锛氱粨娓呰瘉鏄(1).docx new file mode 100644 index 0000000000000000000000000000000000000000..79986d837573ac424192f8a3135a1fb18d823122 GIT binary patch literal 16572 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 Date: Sat, 29 Sep 2018 16:03:31 +0800 Subject: [PATCH 15/16] =?UTF-8?q?1.=E5=B0=8F=E8=AE=A1=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E2=80=9C=E7=94=B5=E6=B1=87=E5=B0=8F=E8=AE=A1=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E8=B0=83=E8=AF=95=E9=A1=B5=E9=9D=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp index 00a1ea762..6d0ffe8d0 100644 --- a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp @@ -65,6 +65,10 @@ } } $('.list_gridCell_standard.list_div_pagecount').text(FormatKNumber(sumethod6,2)); + $('.list_smallcount_color').children('.list_all_no').children('.list_gridCell_narrow').text("电汇小计"); + $('table tr th').eq(1).children('.list_gridCell_narrow').width(50); + $('.list_all_no').children('.list_gridCell_narrow').width(50); + $('#myiframe0_static').width(399); }) function setColRequired(){ From 60ec9781f4f5213d061c4000dac07315cf804d71 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Sat, 29 Sep 2018 16:31:13 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3--?= =?UTF-8?q?=E8=B5=B7=E7=A7=9F=E5=89=8D=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...reateVoucherActualPaymentCarTradition.java | 104 ++++++------- .../CreateVoucherActualPaymentTradition.java | 106 +++++++------ .../ContractOnhireVoucherTradition.java | 26 ++++ .../CreateVoucherOnhireTradition.java | 139 ++++++++++++++++++ .../ContractGetMoneyToCautionMoney.java | 4 +- .../ContractGetMoneyToEquip.java | 4 +- ...eyToEquipAddInsuranceAddOtherSubFirst.java | 5 +- .../ContractGetMoneyToEquipAddOthers.java | 11 +- .../ContractGetMoneyToEquipNoTax.java | 4 +- .../ContractGetMoneyToEquipSubFirst.java | 21 +++ .../ContractGetMoneyToEquipTax.java | 4 +- .../ContractGetMoneyToINTEREST.java | 21 +++ .../ContractGetMoneyToInsuranceAddOther.java | 4 +- ...tractGetMoneyToInsuranceAddOtherNoTax.java | 4 +- ...ontractGetMoneyToInsuranceAddOtherTax.java | 4 +- .../ContractGetMoneyToMoneyNoTax.java | 1 + .../ContractGetMoneyToMoneyTax.java | 1 + .../ContractGetMoneyToOther.java | 1 - .../ContractGetMoneyToOtherNoTax.java | 4 +- .../ContractGetMoneyToOtherTax.java | 4 +- .../ContractGetMoneyToOthersMath.java | 16 +- .../serviceImp/CreateVoucherServiceImpl.java | 45 +++++- 22 files changed, 388 insertions(+), 145 deletions(-) create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucherTradition.java create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipSubFirst.java create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToINTEREST.java diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java index ebf50b945..d0db5af40 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java @@ -26,18 +26,18 @@ public class CreateVoucherActualPaymentCarTradition extends BaseBussiness{ Map map=new HashMap(); Map param=new HashMap(); // 定义全局对象 - String EQUIP_AMT=null; // 设备款 - String EQUIP_AMT_NOTAX=null; // 设备款(不含税) - String EQUIP_AMT_TAX=null; // 设备款(税金) - String FIRST_PAYMENT=null; // 首付款 - String FIRST_PAYMENT_NOTAX=null; // 首付款(不含税) - String FIRST_PAYMENT_TAX=null; // 首付款(税金) - String INSURANCE_PREMIUM_ADD_OTHER=null;// 保险费+其他金额 - String INSURANCE_PREMIUM_ADD_OTHER_NOTAX=null;// 保险费+其他金额(不含税) - String INSURANCE_PREMIUM_ADD_OTHER_TAX=null; // 保险费+其他金额(税金) - String EQUIP_INSURACE_PREMIUM_OTHER=null;// 设备款+保险费+其他 - String OTHERSMONEY=null; // 车款+保险+其他-首付款 - String ACCOUNT_DATE=null; // 会计日期 + String EQUIP=null; // 设备款 + String EQUIPNOTAX=null; // 设备款(不含税) + String EQUIPTAX=null; // 设备款(税金) + String INSURANCE_PREMIUM_OTHER=null; // 保险+其他 + String INSURANCE_PREMIUM_OTHER_NOTAX=null;// 保险+其他(不含税) + String INSURANCE_PREMIUM_OTHER_TAX=null;// 保险+其他(税金) + String EQUIP_INSURACE_PREMIUM_OTHER=null;// 设备款+保险+其他 + String FIRST_PAYMENT=null; // 首付款 + String FIRST_PAYMENT_NOTAX=null; // 首付款(不含税) + String FIRST_PAYMENT_TAX=null; // 首付款(税金) + String EQUIP_PREMIUM_OTHER_SUBFIRST=null;// 设备款+保险 + 其他-首付款 + String ACCOUNT_DATE=null; // 记账日期 String FACT_DATE=null; // 实际付款日期 String CONTRACT_ID=null; // 合同id String CONTRACT_NUMBER=null; // 合同编号 @@ -50,11 +50,16 @@ public class CreateVoucherActualPaymentCarTradition extends BaseBussiness{ String CUSTOMERTYPE=null; // 客户类别 String BUSINESSTYPE=null; // 业务类型 String ACC_NUMBER=null; // 银行账号 - String PRODUCT_ID=null; // 产品编号 String sql=""; - sql="SELECT LCCT.EQUIP_AMT,ROUND(LCCT.EQUIP_AMT / getTax (LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2) AS EQUIP_AMT_NOTAX,(LCCT.EQUIP_AMT - ROUND(LCCT.EQUIP_AMT / getTax (LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2)) AS EQUIP_AMT_TAX,LCCT.FIRST_PAYMENT,ROUND(LCCT.FIRST_PAYMENT/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2) AS FIRST_PAYMENT_NOTAX,(LCCT.FIRST_PAYMENT - ROUND(LCCT.FIRST_PAYMENT/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2)) AS FIRST_PAYMENT_TAX,(LCCT.INSURANCE_PREMIUM+LCCT.OTHER_MONEY) AS INSURANCE_PREMIUM_ADD_OTHER,ROUND((LCCT.INSURANCE_PREMIUM+LCCT.OTHER_MONEY) / getTax (LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2) AS INSURANCE_PREMIUM_ADD_OTHER_NOTAX,((LCCT.INSURANCE_PREMIUM+LCCT.OTHER_MONEY) - ROUND((LCCT.INSURANCE_PREMIUM+LCCT.OTHER_MONEY) / getTax (LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2)) AS INSURANCE_PREMIUM_ADD_OTHER_TAX,(LCCT.EQUIP_AMT+LCCT.INSURANCE_PREMIUM+LCCT.OTHER_MONEY) AS EQUIP_INSURACE_PREMIUM_OTHER,(LCCT.EQUIP_AMT+LCCT.INSURANCE_PREMIUM+LCCT.OTHER_MONEY-LCCT.FIRST_PAYMENT) AS OTHERSMONEY,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,lfit.ACC_NUMBER,LPDI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT INNER JOIN (SELECT contract_id,FLOWUNID,MIN(ACC_NUMBER) ACC_NUMBER FROM lc_fund_income_temp WHERE fee_type = 'feetype10' GROUP BY contract_id,FLOWUNID) lfit ON lfit.contract_id = lcct.contract_id LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_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 LEFT JOIN LB_PRODUCT_INFO LPDI ON LPDI.PRODUCT_ID = LPI.PRODUCT_ID WHERE LCI.BUSINESSTYPE = '3' AND lfit.FLOWUNID = :FLOWUNID "; + sql="SELECT LFIT1.EQUIP,ROUND(LFIT1.EQUIP / getTax (LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2) AS EQUIPNOTAX,(LFIT1.EQUIP - ROUND(LFIT1.EQUIP / getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2)) AS EQUIPTAX,(LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY) AS INSURANCE_PREMIUM_OTHER,ROUND((LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY)/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2) AS INSURANCE_PREMIUM_OTHER_NOTAX,((LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY) - ROUND((LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY)/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2)) AS INSURANCE_PREMIUM_OTHER_TAX,(LFIT1.EQUIP + LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY) AS EQUIP_INSURACE_PREMIUM_OTHER,LFIT3.FIRST_PAYMENT,ROUND(LFIT3.FIRST_PAYMENT/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2) AS FIRST_PAYMENT_NOTAX,(LFIT3.FIRST_PAYMENT - ROUND(LFIT3.FIRST_PAYMENT/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2)) AS FIRST_PAYMENT_TAX,(LFIT1.EQUIP + LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY - LFIT3.FIRST_PAYMENT) AS EQUIP_PREMIUM_OTHER_SUBFIRST,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 LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID = LCI.`ID` 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 GROUP BY FLOWUNID) LFIT1 ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29') LFIT2 ON LFIT2.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS FIRST_PAYMENT,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5') LFIT3 ON LFIT3.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS INSURANCE_PREMIUM,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype21') LFIT4 ON LFIT4.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 LCI.BUSINESSTYPE = '3' AND LFIT1.FLOWUNID=:FLOWUNID "; + // 非差额放款部分 + if("PZ2018092500000198".equals(VOUCHERNO) || "PZ2018092600000236".equals(VOUCHERNO)){ + sql+=" AND LFIT3.SETTLE_METHOD !='settlemethod11'"; + }else{// 差额部分 + sql+=" AND LFIT3.SETTLE_METHOD='settlemethod11'"; + } param.clear(); map.put("FLOWUNID", FlowUnid); @@ -69,17 +74,17 @@ public class CreateVoucherActualPaymentCarTradition extends BaseBussiness{ String userid ="admin"; for (int i=0;i map=new HashMap(); Map param=new HashMap(); // 定义全局对象 - String EQUIP_AMT=null; // 设备款 - String EQUIP_AMT_NOTAX=null; // 设备款(不含税) - String EQUIP_AMT_TAX=null; // 设备款(税金) - String FIRST_PAYMENT=null; // 首付款 + String EQUIP=null; // 设备款 + String EQUIPNOTAX=null; // 设备款(不含税) + String EQUIPTAX=null; // 设备款(税金) + String OTHER_MONEY=null; // 其他款 + String OTHERNOTAX=null; // 其它金额(不含税) + String OTHERTAX=null; // 其它金额(税金) + String EQUIP_OTHER=null; // 设备款+其他 + String FIRST_PAYMENT=null; // 首付款 + String GUARANTY=null; // 保证金 String HANDLING_CHARGE_MONEY=null; // 手续费 - String HANDLING_CHARGE_MONEY_NOTAX=null;// 不含税手续费 - String HANDLING_CHARGE_MONEY_TAX=null; // 手续费税金 - String CAUTION_MONEY=null; // 保证金 - String OTHER_MONEY=null; // 其它金额 - String OTHER_MONEY_NOTAX=null; // 其它金额(不含税) - String OTHER_MONEY_TAX=null; // 其它金额(税金) - String ACCOUNT_DATE=null; // 会计日期 + String HANDLING_CHARGE_MONEY_NOTAX=null;// 手续费(不含税) + String HANDLING_CHARGE_MONEY_TAX=null; // 手续费(税金) + String OTHERS_MATH=null; // 设备款+其他-首付款-保证金-手续费 + String ACCOUNT_DATE=null; // 记账日期 String FACT_DATE=null; // 实际付款日期 String CONTRACT_ID=null; // 合同id String CONTRACT_NUMBER=null; // 合同编号 @@ -50,11 +52,22 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{ String CUSTOMERTYPE=null; // 客户类别 String BUSINESSTYPE=null; // 业务类型 String ACC_NUMBER=null; // 银行账号 - String PRODUCT_ID=null; // 产品编号 String sql=""; - sql="SELECT LCCT.EQUIP_AMT,ROUND(LCCT.EQUIP_AMT/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2) AS EQUIP_AMT_NOTAX,(LCCT.EQUIP_AMT-ROUND(LCCT.EQUIP_AMT/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2)) AS EQUIP_AMT_TAX,LCCT.FIRST_PAYMENT,LCCT.HANDLING_CHARGE_MONEY,ROUND(LCCT.HANDLING_CHARGE_MONEY/ getTax(LCI.LEAS_FORM,'手续费',LCI.INPUTTIME),2) AS HANDLING_CHARGE_MONEY_NOTAX,(LCCT.HANDLING_CHARGE_MONEY - ROUND(LCCT.HANDLING_CHARGE_MONEY/ getTax(LCI.LEAS_FORM,'手续费',LCI.INPUTTIME),2)) AS HANDLING_CHARGE_MONEY_TAX,IFNULL(LCCT.CAUTION_MONEY, 0) AS CAUTION_MONEY,LCCT.OTHER_MONEY,ROUND(LCCT.OTHER_MONEY/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2) AS OTHER_MONEY_NOTAX,(LCCT.OTHER_MONEY - ROUND(LCCT.OTHER_MONEY/getTax(LCI.LEAS_FORM,'本金',LCI.INPUTTIME),2)) AS OTHER_MONEY_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING AS DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,lfit.ACC_NUMBER,LPDI.PRODUCT_ID FROM LC_CALC_CONDITION LCCT INNER JOIN (SELECT contract_id,FLOWUNID,MIN(ACC_NUMBER) ACC_NUMBER FROM lc_fund_income_temp WHERE fee_type = 'feetype10' GROUP BY contract_id,FLOWUNID) lfit ON lfit.contract_id = lcct.contract_id LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = lfit.CONTRACT_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 LEFT JOIN LB_PRODUCT_INFO LPDI ON LPDI.PRODUCT_ID=LPI.PRODUCT_ID WHERE LCI.BUSINESSTYPE='2' AND lfit.FLOWUNID = :FLOWUNID "; + sql="SELECT LFIT1.EQUIP,ROUND(LFIT1.EQUIP / getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2) AS EQUIPNOTAX,(LFIT1.EQUIP - ROUND(LFIT1.EQUIP/getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2)) AS EQUIPTAX,LFIT2.OTHER_MONEY,ROUND(LFIT2.OTHER_MONEY/getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2) AS OTHERNOTAX,(LFIT2.OTHER_MONEY-ROUND(LFIT2.OTHER_MONEY/getTax(LCI.LEAS_FORM,'本金',LCI.`INPUTTIME`),2)) AS OTHERTAX,(LFIT1.EQUIP + LFIT2.OTHER_MONEY) AS EQUIP_OTHER,LFIT3.FIRST_PAYMENT,LFIT4.GUARANTY,LFIT5.HANDLING_CHARGE_MONEY,ROUND(LFIT5.HANDLING_CHARGE_MONEY/getTax(LCI.LEAS_FORM,'手续费',LCI.INPUTTIME),2) AS HANDLING_CHARGE_MONEY_NOTAX,(LFIT5.HANDLING_CHARGE_MONEY -ROUND(LFIT5.HANDLING_CHARGE_MONEY/getTax(LCI.LEAS_FORM,'手续费',LCI.INPUTTIME),2)) AS HANDLING_CHARGE_MONEY_TAX,(LFIT1.EQUIP + LFIT2.OTHER_MONEY - LFIT3.FIRST_PAYMENT - LFIT4.GUARANTY - LFIT5.HANDLING_CHARGE_MONEY) 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 LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID=LCI.`ID` 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 GROUP BY FLOWUNID)LFIT1 ON LFIT1.CONTRACT_ID=LCI.ID LEFT JOIN(SELECT CONTRACT_ID,FACT_MONEY AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE='feetype29')LFIT2 ON LFIT2.CONTRACT_ID=LCI.ID LEFT JOIN(SELECT CONTRACT_ID,FACT_MONEY AS FIRST_PAYMENT,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE='feetype5')LFIT3 ON LFIT3.CONTRACT_ID=LCI.ID LEFT JOIN(SELECT CONTRACT_ID,FACT_MONEY AS GUARANTY,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE='feetype2')LFIT4 ON LFIT4.CONTRACT_ID=LCI.ID LEFT JOIN(SELECT CONTRACT_ID,FACT_MONEY AS HANDLING_CHARGE_MONEY,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE='feetype1')LFIT5 ON LFIT5.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 LCI.BUSINESSTYPE='2' AND LFIT1.FLOWUNID=:FLOWUNID "; + // 非差额放款部分 + if("PZ2018092500000161".equals(VOUCHERNO) || "PZ2018092600000225".equals(VOUCHERNO)){ + sql+=" AND (LFIT3.SETTLE_METHOD !='settlemethod11' AND LFIT4.SETTLE_METHOD !='settlemethod11' AND LFIT5.SETTLE_METHOD !='settlemethod11')"; + }else if("PZ2018092500000162".equals(VOUCHERNO) || "PZ2018092600000226".equals(VOUCHERNO) || "PZ2018092500000163".equals(VOUCHERNO) || "PZ2018092600000227".equals(VOUCHERNO)) {// 差额-经销商支付的预付款(首付)/给经销商放款-首付冲抵--回租 + sql+=" AND LFIT3.SETTLE_METHOD='settlemethod11'"; + }else if("PZ2018092500000164".equals(VOUCHERNO) || "PZ2018092600000229".equals(VOUCHERNO) || "PZ2018092500000165".equals(VOUCHERNO) || "PZ2018092600000230".equals(VOUCHERNO)) {// 客户记录保证金/给经销商放款-保证金冲抵 + sql+=" AND LFIT4.SETTLE_METHOD='settlemethod11'"; + }else if("PZ2018092500000166".equals(VOUCHERNO) || "PZ2018092600000231".equals(VOUCHERNO) || "PZ2018092500000167".equals(VOUCHERNO) || "PZ2018092600000232".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')"; + } param.clear(); map.put("FLOWUNID", FlowUnid); @@ -69,17 +82,19 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{ String userid ="admin"; for (int i=0;i map=new HashMap(); + Map param=new HashMap(); + // 定义全局对象 + String OTHERSMONEY=null; // 车款-首付款+保险+其他 + String EQUIP_SUBFIRST=null; // 车款-首付款 + String INSURANCE_PREMIUM_ADD_OTHER=null; // 保险+其他 + String INTEREST=null; // 利息 + String INTERESTNOTAX=null; // 利息(不含税) + String TAX=null; // 利息的税金 + String ACCOUNT_DATE=null; // 会计日期 + String FACT_DATE=null; // 实际付款日期 + String CONTRACT_ID=null; // 合同id + String CONTRACT_NUMBER=null; // 合同编号 + String PROJECT_NAME=null; // 项目名称 + String LEAS_FORM=null; // 项目类别 + String DISTRIBUTOR_ID=null; // 经销商编号 + String DISTRIBUTOR_NAME=null; // 经销商名称 + String CUSTOMERID=null; // 客户编号 + String CUSTOMERNAME=null; // 客户名称 + String CUSTOMERTYPE=null; // 客户类别 + String BUSINESSTYPE=null; // 业务类型 + String ACC_NUMBER=null; // 银行账号 + String sql=""; + + if("PZ2018092500000170".equals(VOUCHERNO) || "PZ2018092800000247".equals(VOUCHERNO)) { + sql="SELECT (LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT + LCCT.INSURANCE_PREMIUM +LCCT.OTHER_MONEY) AS OTHERSMONEY,(LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT ) AS EQUIP_SUBFIRST,( LCCT.INSURANCE_PREMIUM +LCCT.OTHER_MONEY) AS INSURANCE_OTHER,LRPT.INTEREST,ROUND(LRPT.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) AS INTERESTNOTAX,(LRPT.INTEREST - ROUND(LRPT.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.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,LFIT.ACC_NUMBER FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,MIN(CONTRACT_ID) AS CONTRACT_ID,MIN(ACC_NUMBER) AS ACC_NUMBER FROM LC_FUND_INCOME_TEMP GROUP BY FLOWUNID) LFIT ON LFIT.CONTRACT_ID=LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID = LCCT.FLOWUNID 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 LCI.BUSINESSTYPE='2' AND LFIT.FLOWUNID=:FLOWUNID "; + }else { + + sql="SELECT (LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT + LCCT.INSURANCE_PREMIUM +LCCT.OTHER_MONEY) AS OTHERSMONEY,(LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT ) AS EQUIP_SUBFIRST,( LCCT.INSURANCE_PREMIUM +LCCT.OTHER_MONEY) AS INSURANCE_OTHER,LRPT.INTEREST,ROUND(LRPT.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) AS INTERESTNOTAX,(LRPT.INTEREST - ROUND(LRPT.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.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,LFIT.ACC_NUMBER FROM LC_CALC_CONDITION LCCT LEFT JOIN (SELECT FLOWUNID,MIN(CONTRACT_ID) AS CONTRACT_ID,MIN(ACC_NUMBER) AS ACC_NUMBER FROM LC_FUND_INCOME_TEMP GROUP BY FLOWUNID) LFIT ON LFIT.CONTRACT_ID=LCCT.CONTRACT_ID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID = LCCT.FLOWUNID 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 LCI.BUSINESSTYPE='3' AND LFIT.FLOWUNID=:FLOWUNID "; + } + + param.clear(); + map.put("FLOWUNID", FlowUnid); + + // 查询sql, 将结果集封装到map中 + List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); + + // 创建生成凭证的类对象 + CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl(); + + // 设置常用参数 + String VOUCHER_TYPE="1"; // 凭证分类 金蝶 + String userid ="admin"; + + for (int i=0;ireturnValue=new HashMap(); returnValue.putAll(param); // 获取保证金 - String CAUTION_MONEY=param.get("CAUTION_MONEY")==null?"0.00":param.get("CAUTION_MONEY"); - returnValue.put("MONEY",CAUTION_MONEY); + String GUARANTY=param.get("GUARANTY")==null?"0.00":param.get("GUARANTY"); + returnValue.put("MONEY",GUARANTY); return returnValue; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java index b167ec291..808ee199c 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java @@ -15,8 +15,8 @@ public class ContractGetMoneyToEquip implements VoucherJavaParamService{ MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取设备款 - String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT"); - returnValue.put("MONEY",EQUIP_AMT); + String EQUIP=param.get("EQUIP")==null?"0.00":param.get("EQUIP"); + returnValue.put("MONEY",EQUIP); return returnValue; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java index 7ac999967..d04e0f50f 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java @@ -15,8 +15,9 @@ public class ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst implements Vouc MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取设备款 - String OTHERSMONEY=param.get("OTHERSMONEY")==null?"0.00":param.get("OTHERSMONEY"); - returnValue.put("MONEY",OTHERSMONEY); + 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/ContractGetMoneyToEquipAddOthers.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddOthers.java index dbb16374e..8e66546d8 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddOthers.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddOthers.java @@ -15,14 +15,9 @@ public class ContractGetMoneyToEquipAddOthers implements VoucherJavaParamService public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); - // 获取设备款 - String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT"); - // 获取其它金额 - String OTHER_MONEY=param.get("OTHER_MONEY")==null?"0.00":param.get("OTHER_MONEY"); - - // 其他款项+设备款 - BigDecimal FactMoney=new BigDecimal(EQUIP_AMT).add(new BigDecimal(OTHER_MONEY)); - returnValue.put("MONEY",FactMoney.toString()); + // 设备款+其他金额 + String EQUIP_OTHER=param.get("EQUIP_OTHER")==null?"0.00":param.get("EQUIP_OTHER"); + returnValue.put("MONEY",EQUIP_OTHER); return returnValue; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java index d743e1d8b..dd14fd0df 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java @@ -15,8 +15,8 @@ public class ContractGetMoneyToEquipNoTax implements VoucherJavaParamService{ MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取设备款 - String EQUIP_AMT_NOTAX=param.get("EQUIP_AMT_NOTAX")==null?"0.00":param.get("EQUIP_AMT_NOTAX"); - returnValue.put("MONEY",EQUIP_AMT_NOTAX); + String EQUIPNOTAX=param.get("EQUIPNOTAX")==null?"0.00":param.get("EQUIPNOTAX"); + returnValue.put("MONEY",EQUIPNOTAX); return returnValue; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipSubFirst.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipSubFirst.java new file mode 100644 index 000000000..35e67cf9c --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipSubFirst.java @@ -0,0 +1,21 @@ +package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition; + +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; +/** + * 车款-首付款 + * @author xiezhiwen + */ +public class ContractGetMoneyToEquipSubFirst implements VoucherJavaParamService{ + public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + MapreturnValue=new HashMap(); + returnValue.putAll(param); + String EQUIP_SUBFIRST=param.get("EQUIP_SUBFIRST")==null?"0.00":param.get("EQUIP_SUBFIRST"); + returnValue.put("MONEY",EQUIP_SUBFIRST); + return returnValue; + } +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java index 20aa09da3..ca9e17315 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java @@ -15,8 +15,8 @@ public class ContractGetMoneyToEquipTax implements VoucherJavaParamService{ MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取设备款 - String EQUIP_AMT_TAX=param.get("EQUIP_AMT_TAX")==null?"0.00":param.get("EQUIP_AMT_TAX"); - returnValue.put("MONEY",EQUIP_AMT_TAX); + String EQUIPTAX=param.get("EQUIPTAX")==null?"0.00":param.get("EQUIPTAX"); + returnValue.put("MONEY",EQUIPTAX); return returnValue; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToINTEREST.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToINTEREST.java new file mode 100644 index 000000000..263990866 --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToINTEREST.java @@ -0,0 +1,21 @@ +package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition; + +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; +/** + * 获取INTEREST + * @author xiezhiwen + */ +public class ContractGetMoneyToINTEREST implements VoucherJavaParamService{ + public Map getJavaParam(JBOTransaction tx,Map param) 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/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java index 5ccac5085..7f498e928 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java @@ -15,8 +15,8 @@ public class ContractGetMoneyToInsuranceAddOther implements VoucherJavaParamServ MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取设备款 - String INSURANCE_PREMIUM_ADD_OTHER=param.get("INSURANCE_PREMIUM_ADD_OTHER")==null?"0.00":param.get("INSURANCE_PREMIUM_ADD_OTHER"); - returnValue.put("MONEY",INSURANCE_PREMIUM_ADD_OTHER); + String INSURANCE_PREMIUM_OTHER=param.get("INSURANCE_PREMIUM_OTHER")==null?"0.00":param.get("INSURANCE_PREMIUM_OTHER"); + returnValue.put("MONEY",INSURANCE_PREMIUM_OTHER); return returnValue; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherNoTax.java index 1c7109ae7..778dec909 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherNoTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherNoTax.java @@ -15,8 +15,8 @@ public class ContractGetMoneyToInsuranceAddOtherNoTax implements VoucherJavaPara MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取设备款 - String INSURANCE_PREMIUM_ADD_OTHER_NOTAX=param.get("INSURANCE_PREMIUM_ADD_OTHER_NOTAX")==null?"0.00":param.get("INSURANCE_PREMIUM_ADD_OTHER_NOTAX"); - returnValue.put("MONEY",INSURANCE_PREMIUM_ADD_OTHER_NOTAX); + String INSURANCE_PREMIUM_OTHER_NOTAX=param.get("INSURANCE_PREMIUM_OTHER_NOTAX")==null?"0.00":param.get("INSURANCE_PREMIUM_OTHER_NOTAX"); + returnValue.put("MONEY",INSURANCE_PREMIUM_OTHER_NOTAX); return returnValue; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherTax.java index 79defb5d9..487f23ccb 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherTax.java @@ -15,8 +15,8 @@ public class ContractGetMoneyToInsuranceAddOtherTax implements VoucherJavaParamS MapreturnValue=new HashMap(); returnValue.putAll(param); // 保险+其他(税金) - String INSURANCE_PREMIUM_ADD_OTHER_TAX=param.get("INSURANCE_PREMIUM_ADD_OTHER_TAX")==null?"0.00":param.get("INSURANCE_PREMIUM_ADD_OTHER_TAX"); - returnValue.put("MONEY",INSURANCE_PREMIUM_ADD_OTHER_TAX); + String INSURANCE_PREMIUM_OTHER_TAX=param.get("INSURANCE_PREMIUM_OTHER_TAX")==null?"0.00":param.get("INSURANCE_PREMIUM_OTHER_TAX"); + returnValue.put("MONEY",INSURANCE_PREMIUM_OTHER_TAX); return returnValue; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java index 06cc158e3..37cab07a1 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java @@ -14,6 +14,7 @@ public class ContractGetMoneyToMoneyNoTax implements VoucherJavaParamService{ public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); + returnValue.put("FUNDTYPE","02"); returnValue.put("MONEY",param.get("INTERESTNOTAX")); return returnValue; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyTax.java index 3f3dc12ac..b8f5ab032 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyTax.java @@ -14,6 +14,7 @@ public class ContractGetMoneyToMoneyTax implements VoucherJavaParamService{ public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); + returnValue.put("FUNDTYPE","02"); returnValue.put("MONEY",param.get("TAX")); return returnValue; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOther.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOther.java index 6ba47bc76..69a796e86 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOther.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOther.java @@ -1,6 +1,5 @@ package com.tenwa.voucher.CreateVoucherProcess.VoucherGetMoneyForTradition; -import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java index 46d5feade..48f72774e 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java @@ -15,8 +15,8 @@ public class ContractGetMoneyToOtherNoTax implements VoucherJavaParamService{ MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取其它金额 - String OTHER_MONEY_NOTAX=param.get("OTHER_MONEY_NOTAX")==null?"0.00":param.get("OTHER_MONEY_NOTAX"); - returnValue.put("MONEY",OTHER_MONEY_NOTAX); + String OTHERNOTAX=param.get("OTHERNOTAX")==null?"0.00":param.get("OTHERNOTAX"); + returnValue.put("MONEY",OTHERNOTAX); return returnValue; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java index be577072a..b417d773c 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java @@ -15,8 +15,8 @@ public class ContractGetMoneyToOtherTax implements VoucherJavaParamService{ MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取其它金额 - String OTHER_MONEY_TAX=param.get("OTHER_MONEY_TAX")==null?"0.00":param.get("OTHER_MONEY_TAX"); - returnValue.put("MONEY",OTHER_MONEY_TAX); + String OTHERTAX=param.get("OTHERTAX")==null?"0.00":param.get("OTHERTAX"); + returnValue.put("MONEY",OTHERTAX); return returnValue; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java index 3df614451..95d183658 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java @@ -15,20 +15,8 @@ public class ContractGetMoneyToOthersMath implements VoucherJavaParamService{ public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); - // 获取设备款 - String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT"); - // 获取其它金额 - String OTHER_MONEY=param.get("OTHER_MONEY")==null?"0.00":param.get("OTHER_MONEY"); - // 获取首付款 - String FIRST_PAYMENT=param.get("FIRST_PAYMENT")==null?"0.00":param.get("FIRST_PAYMENT"); - // 获取保证金 - String CAUTION_MONEY=param.get("CAUTION_MONEY")==null?"0.00":param.get("CAUTION_MONEY"); - // 获取手续费 - String HANDLING_CHARGE_MONEY=param.get("HANDLING_CHARGE_MONEY")==null?"0.00":param.get("HANDLING_CHARGE_MONEY"); - // 其他款项+设备款 - BigDecimal FactMoney=new BigDecimal(EQUIP_AMT).add(new BigDecimal(OTHER_MONEY)).subtract(new BigDecimal(FIRST_PAYMENT)).subtract(new BigDecimal(CAUTION_MONEY)).subtract(new BigDecimal(HANDLING_CHARGE_MONEY)); - - returnValue.put("MONEY",FactMoney.toString()); + String OTHERS_MATH=param.get("OTHERS_MATH")==null?"0.00":param.get("OTHERS_MATH"); + returnValue.put("MONEY",OTHERS_MATH); return returnValue; } } diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index 163bfa481..ce68e79da 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -225,6 +225,7 @@ public class CreateVoucherServiceImpl { for(BizObject bo:subList){ Map subData=new HashMap(); String subId=bo.getAttribute("LOAN_SUBJECT").getString(); + BizObject sub=JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME,"id=:id").setParameter("id", subId).getSingleResult(false); subData.put("F2", sub.getAttribute("SUBJECTS_CODE").getString()); if(sub.getAttribute("SUBJECTS_CODE").getString().endsWith("****")){ @@ -267,7 +268,6 @@ public class CreateVoucherServiceImpl { abs=abs.replaceAll(para, StringUtil.nullToString( param.get(para.replaceAll("#", "")))); } - Map dataTemp=new HashMap(); VoucherParamServiceImpl psi=new VoucherParamServiceImpl(); //获取数据 @@ -360,6 +360,49 @@ public class CreateVoucherServiceImpl { if(sub.getAttribute("AUXILIARY_TYPE").getString().length()>0){ subData.putAll(this.getAuxiliaryData(tx, param, sub.getAttribute("AUXILIARY_TYPE").getString())); } + + // 获取直租/回租类型 + String LEAS_FORM = param.get("LEAS_FORM"); + // 获取当前凭证借贷序号 + String SORT_NUMBER = bo.getAttribute("SORT_NUMBER").getString(); + // 汽车类应收账款总金额根据分录配置辅助核算值---除了没有的和其他(10), 其他都是默认汽车(04) + if("PZ2018071000000005".equals(voucherid) || "PZ2018080300000069".equals(voucherid)) { + if("01".equals(LEAS_FORM)) {//直租 + if("5".equals(SORT_NUMBER)) { + subData.put("LEASFORMASSET", "10"); + }else if("1".equals(SORT_NUMBER) || "2".equals(SORT_NUMBER) || "6".equals(SORT_NUMBER) || "7".equals(SORT_NUMBER)) { + subData.remove("LEASFORMASSET"); + } + }else {// 回租 + if("4".equals(SORT_NUMBER)){ + subData.put("LEASFORMASSET", "10"); + }else if("1".equals(SORT_NUMBER) || "2".equals(SORT_NUMBER) || "6".equals(SORT_NUMBER)){ + subData.remove("LEASFORMASSET"); + } + } + } + + // 传统应收账款总金额 辅助账调整 + if("PZ2018092500000170".equals(voucherid) || "PZ2018092800000247".equals(voucherid)) { + if("4".equals(SORT_NUMBER)) { + subData.put("LEASFORMASSET", "10"); + }else if("1".equals(SORT_NUMBER) || "2".equals(SORT_NUMBER) || "6".equals(SORT_NUMBER)) { + subData.remove("LEASFORMASSET"); + } + } + + // 汽车传统应收账款总金额 辅助账调整 + if("PZ2018092500000202".equals(voucherid) || "PZ2018092800000248".equals(voucherid)) { + if("3".equals(SORT_NUMBER) || "5".equals(SORT_NUMBER)) { + // 传统融资租赁收入 + subData.put("LEASINCOMEFORM", "03"); + subData.put("LEASFORMASSET", "04"); + }else if("4".equals(SORT_NUMBER)) { + subData.put("LEASFORMASSET", "10"); + }else { + subData.remove("LEASFORMASSET"); + } + } list.add(subData); } return list;