From 64082d58cfcc0abea780a6f76c6c667b937033c6 Mon Sep 17 00:00:00 2001 From: zhangbb Date: Mon, 10 Sep 2018 19:57:14 +0800 Subject: [PATCH 01/11] =?UTF-8?q?1.=E5=8E=BB=E6=8E=89=E5=BC=95=E5=85=A5?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=202.=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=9C=9F=E7=A7=9F=E7=94=B3=E8=AF=B7=E5=A2=9E=E5=8A=A0=E6=B1=BD?= =?UTF-8?q?=E8=BD=A6=E8=BF=98=E6=98=AF=E4=BC=A0=E7=BB=9F=E5=88=A4=E6=96=AD?= =?UTF-8?q?=203.=E4=BA=A7=E5=93=81=E5=A2=9E=E5=8A=A0=E7=A7=9F=E5=89=8D?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp | 2 +- .../Flow/Contract/ContractOnhire/ContractOnhireApplyList.jsp | 2 +- WebContent/WEB-INF/etc/app/component/component-config.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp index c2d742fd0..66d0c3b4e 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp @@ -157,7 +157,7 @@ String sButtons[][] = { //{"true","All","Button","重置","重置","reloadSelf()","","","",""}, {"true","","Button","租金测算","租金测算","saveRecord()","","","","btn_icon_save"}, - {((isCarProduct) && ("proj_process".equals(calType)||"cont_process".equals(calType)))?"true":"false","","Button","引入客户报价","引入客户报价","importCustomerQuot()","","","","btn_icon_edit"} + // {((isCarProduct) && ("proj_process".equals(calType)||"cont_process".equals(calType)))?"true":"false","","Button","引入客户报价","引入客户报价","importCustomerQuot()","","","","btn_icon_edit"} }; %><%@ 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/Fund/TraditionFundPayment/ActualPaymentTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp new file mode 100644 index 000000000..25bf4fc8d --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ActualPaymentTempList.jsp @@ -0,0 +1,171 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2017-06-06 + Content: + History Log: + */ + String phaseNo = CurPage.getParameter("PhaseNo"); + String rightType = CurComp.getParameter("RightType"); + String flowunid = CurPage.getParameter("FlowUnid"); + String ishistory = CurPage.getParameter("IsHistory"); + ASObjectModel doTemp = new ASObjectModel("ActualPaymentTempList"); + if(null!=ishistory&&ishistory.equals("true")){ + doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory"); + } + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.MultiSelect = true; + dwTemp.ReadOnly = "0"; + dwTemp.ShowSummary = "1"; + if("0030".equals(phaseNo)){ + rightType = "ReadOnly"; + dwTemp.ReadOnly = "1"; + } + if("ReadOnly".equals(rightType)){ + dwTemp.MultiSelect = false; + } + dwTemp.setPageSize(10); + ASDataObject ado = dwTemp.getDataObject(); + ado.setLockCount(4); + ado.setReadOnly("PAYMENT_NUMBER", true); + ado.setReadOnly("PROJECT_NAME", true); + ado.setReadOnly("PLAN_ID", true); + ado.setReadOnly("FEE_TYPE", true); + ado.setReadOnly("SETTLE_METHOD", true); + ado.setReadOnly("PLAN_DATE", true); + ado.setReadOnly("ACCOUNT", true); + ado.setReadOnly("ACC_NUMBER", true); + ado.setHtmlEvent("FACT_MONEY", "onchange", "checkEquipAmtMoney"); + ado.setHtmlEvent("FEE_ADJUST", "onchange", "checkEquipAmtMoney"); + ado.setHtmlEvent("MEMO", "onmouseover", "showMemo"); + ado.setHtmlEvent("MEMO", "onmouseout", "hideMemo"); + ado.setHtmlEvent("MEMO", "onkeyup", "synchMemo"); + dwTemp.genHTMLObjectWindow(flowunid); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String[][] sButtons = null; + if("ReadOnly".equals(rightType)){ + sButtons = new String[][]{ + }; + }else{ + sButtons = new String[][]{ + {"true","","Button","保存","保存","as_save(0,'setColRequired()')","","","","btn_icon_save",""}, + {"true","","Button","批量修改","批量修改","batchModify()","","","","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/Fund/TraditionFundPayment/ContractInfo.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ContractInfo.jsp new file mode 100644 index 000000000..7c8a590ba --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/ContractInfo.jsp @@ -0,0 +1,30 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% + /* + Author: undefined 2017-06-17 + Content: 示例详情页面 + History Log: + */ + String ishistory = CurPage.getParameter("IsHistory"); + String flowunid = CurPage.getParameter("FlowUnid"); + String productid = Sqlca.getString("select PRODUCT_ID from LB_CONTRACT_INFO_TEMP where flowunid = '"+flowunid+"'"); + String sTempletNo = "LBContractInfoTemp";//--模板号-- + if("004".equals(productid)){ + sTempletNo = "LBContractInfoTemp_Car"; + } + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + if(null!=ishistory&&ishistory.equals("true")){ + doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据 + } + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2"; + dwTemp.ReadOnly = "-2"; + dwTemp.genHTMLObjectWindow(CurPage.getParameter("FlowUnid")); + + String sButtons[][] = { + }; + 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/Fund/TraditionFundPayment/FundPaymentApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/FundPaymentApplyList.jsp new file mode 100644 index 000000000..84cb78418 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/FundPaymentApplyList.jsp @@ -0,0 +1,35 @@ +<%@ page contentType="text/html; charset=GBK"%> + <%@ include file="/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListStart.jspf"%> +<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=自定义函数;]~*/%> + + <%@ include file="/Tenwa/Core/FlowManager/BaseFlowList/BaseFlowApplyListEnd.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/FundPaymentPayCondition.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/FundPaymentPayCondition.jsp new file mode 100644 index 000000000..2791ab7ad --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/FundPaymentPayCondition.jsp @@ -0,0 +1,47 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_simplelist.jspf"%> +<%@ page import="com.tenwa.doc.action.DocListInitAction" %> +<% + /* + Author: undefined 2016-09-01 + Content: + History Log: + */ + + String FlowUnid=CurPage.getParameter("FlowUnid"); + if(FlowUnid==""||FlowUnid==null){ + FlowUnid="flowunid"; + } + String rightType = CurPage.getParameter("RightType"); + String ishistory = CurPage.getParameter("IsHistory"); + String phaseNo = CurPage.getParameter("PhaseNo"); + String compClientID = request.getParameter("CompClientID"); + ASObjectModel doTemp = new ASObjectModel("FundPaymentPayCondition"); + if(null!=ishistory&&ishistory.equals("true")){ + doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory"); + } + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; + dwTemp.ReadOnly="0"; + if("0030".equals(phaseNo)){ + dwTemp.getDataObject().setReadOnly("BUSINESS_CHECK", true); + dwTemp.getDataObject().setReadOnly("OPERATE_CHECK", false); + } + dwTemp.setPageSize(50); + dwTemp.genHTMLObjectWindow(FlowUnid); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + }; + +%> +<%@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/Fund/TraditionFundPayment/LCFundIncomeList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/LCFundIncomeList.jsp new file mode 100644 index 000000000..d8c393112 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/LCFundIncomeList.jsp @@ -0,0 +1,22 @@ +<%@page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + + String flowunid = CurPage.getParameter("FlowUnid"); + String contract_id = JBOFactory.createBizObjectQuery(FLOW_BUSSINESS_OBJECT.CLASS_NAME, "flow_unid=:FlowUnid") + .setParameter("FlowUnid", flowunid).getSingleResult(false).getAttribute("contract_id").getString(); + ASObjectModel doTemp = new ASObjectModel("LCFundIncomeList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.ShowSummary = "1"; + dwTemp.genHTMLObjectWindow(contract_id); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + }; +%><%@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/Fund/TraditionFundPayment/LCFundPaymentList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/LCFundPaymentList.jsp new file mode 100644 index 000000000..a82ec1ffc --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/LCFundPaymentList.jsp @@ -0,0 +1,27 @@ +<%@page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2017-06-06 + Content: + History Log: + */ + String flowunid = CurPage.getParameter("FlowUnid"); + String contract_id = JBOFactory.createBizObjectQuery(FLOW_BUSSINESS_OBJECT.CLASS_NAME, "flow_unid=:FlowUnid") + .setParameter("FlowUnid", flowunid).getSingleResult(false).getAttribute("contract_id").getString(); + ASObjectModel doTemp = new ASObjectModel("LCFundPaymentList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(10); + dwTemp.ShowSummary = "1"; + dwTemp.genHTMLObjectWindow(contract_id); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = { + }; +%><%@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/Fund/TraditionFundPayment/VILCFundEquipAMTList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/VILCFundEquipAMTList.jsp new file mode 100644 index 000000000..2cf242340 --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/VILCFundEquipAMTList.jsp @@ -0,0 +1,73 @@ +<%@page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2017-06-06 + Content: + History Log: + */ + String phaseNo = CurPage.getParameter("PhaseNo"); + String rightType = CurComp.getParameter("RightType"); + String flowunid = CurPage.getParameter("FlowUnid"); + String contract_id = JBOFactory.createBizObjectQuery(FLOW_BUSSINESS_OBJECT.CLASS_NAME, "flow_unid=:FlowUnid") + .setParameter("FlowUnid", flowunid).getSingleResult(false).getAttribute("contract_id").getString(); + ASObjectModel doTemp = new ASObjectModel("VILCFundEquipAMTList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; + dwTemp.ShowSummary = "1"; + if("0030".equals(phaseNo)){ + rightType = "ReadOnly"; + dwTemp.ReadOnly = "1"; + dwTemp.MultiSelect = false; + } + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(contract_id); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] = null; + if("ReadOnly".equals(rightType)){ + sButtons = new String[][]{ + }; + }else{ + sButtons = new String[][]{ + {"true","","Button","生成本次付款","生成本次付款","openFundPlanList()","","","","btn_icon_add",""} + }; + } +%><%@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/Fund/TraditionFundPayment/VILCFundOtherList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/VILCFundOtherList.jsp new file mode 100644 index 000000000..dca8f131b --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Fund/TraditionFundPayment/VILCFundOtherList.jsp @@ -0,0 +1,65 @@ +<%@page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + /* + Author: undefined 2017-06-06 + Content: + History Log: + */ + String phaseNo = CurPage.getParameter("PhaseNo"); + String rightType = CurComp.getParameter("RightType"); + String flowunid = CurPage.getParameter("FlowUnid"); + String contract_id = JBOFactory.createBizObjectQuery(FLOW_BUSSINESS_OBJECT.CLASS_NAME, "flow_unid=:FlowUnid") + .setParameter("FlowUnid", flowunid).getSingleResult(false).getAttribute("contract_id").getString(); + ASObjectModel doTemp = new ASObjectModel("VILCFundOtherList"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; + dwTemp.ShowSummary = "1"; + dwTemp.MultiSelect = true; + if("0030".equals(phaseNo)){ + rightType = "ReadOnly"; + dwTemp.ReadOnly = "1"; + dwTemp.MultiSelect = false; + } + dwTemp.setPageSize(10); + dwTemp.genHTMLObjectWindow(contract_id); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String[][] sButtons = null; + if("ReadOnly".equals(rightType)){ + sButtons = new String[][]{ + }; + }else{ + sButtons = new String[][]{ + {"true","","Button","生成本次付款","生成本次付款","createFundIncome()","","","","btn_icon_add",""} + }; + } +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file From 8c6765651d4d8fa7dd9abbae507c26ec489cf40d Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Tue, 11 Sep 2018 14:21:20 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=A1=A8=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tenwa/Lease/voucher/voucherass_detail.jsp | 2 +- .../CreateVoucherCustomerRentOrFee.java | 2 +- .../serviceImp/CreateVoucherServiceImpl.java | 10 ++++++++-- .../serviceImp/VoucherSysJointNCServiceImpl.java | 14 +++++++------- src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java | 4 +++- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp b/WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp index f6055785e..c1ae6c155 100644 --- a/WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp +++ b/WebContent/Tenwa/Lease/voucher/voucherass_detail.jsp @@ -34,12 +34,12 @@ // 凭证NC接口生成xml文件 function NCInterface(){ alert("传输开始"); + 　　　//$.post('http://172.16.0.19/com.tenwa.voucher.serviceImp.VoucherSysJointNCServiceImpl/sendVoucherData' , function (text, status) { alert(text); }); var mes = RunJavaMethodTrans("com.tenwa.voucher.serviceImp.VoucherSysJointNCServiceImpl","sendVoucherData",""); alert("传输成功"); } function synVoucherCode(){ - var ids=getItemValue(0,'f3')+""; if(ids==""){ layer.alert("请先选择凭证信息！",{icon:7},function(index){ diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java index c4dcdbd25..fba46256b 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java @@ -55,7 +55,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { //String FlowUnid=this.getAttribute("FlowUnid").toString(); //String VOUCHERNO="PZ2018071000000005"; //String VOUCHERNO=this.getAttribute("VoucherNo").toString(); - if("PZ2018080300000069".equals(VOUCHERNO)||"PZ2018071000000005".equals(VOUCHERNO)) { + if("PZ2018080300000069".equals(VOUCHERNO)||"PZ2018071100000010".equals(VOUCHERNO)) { sql="SELECT LCCT.EQUIP_AMT,LCCT.FIRST_PAYMENT,LCCT.HANDLING_CHARGE_MONEY,LCCT.CLEAN_LEASE_MONEY,IFNULL(LCCT.CAUTION_MONEY,0)AS CAUTION_MONEY,LCCT.INSURANCE_PREMIUM,LCCT.PURCHASE_TAX,LCCT.INCIDENTAL,LCCT.GPS_FEE as GPS_FEE_FINANCE,LCCT.TABLEWARE_FEE,LRPT.INTEREST,LRPT.INTERESTNOTAX,LRPT.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,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,lfit.ACC_NUMBER,LCCT.GPS_FEE_FINA 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=LCCT.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,SUM(INTEREST) AS INTEREST,SUM(ROUND((INTEREST/1.16),2)) AS INTERESTNOTAX,SUM(INTEREST-ROUND((INTEREST/1.16),2)) AS TAX 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_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 lfit.FLOWUNID=:FLOWUNID"; }else { sql="SELECT LCCT.EQUIP_AMT,LCCT.FIRST_PAYMENT,LCCT.HANDLING_CHARGE_MONEY,LCCT.CLEAN_LEASE_MONEY,IFNULL(LCCT.CAUTION_MONEY,0)AS CAUTION_MONEY,LCCT.INSURANCE_PREMIUM,LCCT.PURCHASE_TAX,LCCT.INCIDENTAL,LCCT.GPS_FEE as GPS_FEE_FINANCE,LCCT.TABLEWARE_FEE,LRPT.INTEREST,LRPT.INTERESTNOTAX,LRPT.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,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,lfit.ACC_NUMBER,LCCT.GPS_FEE_FINA 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=LCCT.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,SUM(INTEREST) AS INTEREST,SUM(ROUND((INTEREST/1.06),2)) AS INTERESTNOTAX,SUM(INTEREST-ROUND((INTEREST/1.06),2)) AS TAX 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_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 lfit.FLOWUNID=:FLOWUNID"; diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index fb48d73ef..d3b22b386 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -301,7 +301,10 @@ public class CreateVoucherServiceImpl { if("PZ2018071000000006".equals(VOUCHERNO) || "PZ2018080300000071".equals(VOUCHERNO) || "PZ2018071100000010".equals(VOUCHERNO) || "PZ2018080300000074".equals(VOUCHERNO)) { subData.put("CUSTID",dataTemp.get("DISTRIBUTOR_ID"));//经销商id subData.put("CUSTNAME",dataTemp.get("DISTRIBUTOR_NAME"));//经销商名称 - }else if("PZ2018072100000037".equals(VOUCHERNO)||"PZ2018080400000091".equals(VOUCHERNO)){ + }else if("PZ2018082600000149".equals(VOUCHERNO) || "PZ2018082600000150".equals(VOUCHERNO) || "PZ2018070900000003".equals(VOUCHERNO) || "PZ2018080200000065".equals(VOUCHERNO)) { + subData.put("CUSTID",dataTemp.get("DISTRIBUTOR_ID"));//经销商id + subData.put("CUSTNAME",dataTemp.get("DISTRIBUTOR_NAME"));//经销商名称 + }else if("PZ2018072100000037".equals(VOUCHERNO)||"PZ2018080400000091".equals(VOUCHERNO) || "PZ2018072100000038".equals(VOUCHERNO)||"PZ2018080400000092".equals(VOUCHERNO)){ subData.put("CUSTID","0203440110");//经销商id subData.put("CUSTNAME","业务系统待查客户");//经销商名称 }else { @@ -313,7 +316,10 @@ public class CreateVoucherServiceImpl { subData.put("F8",dataTemp.get("MONEY"));//贷方金额 subData.put("ENTRYDC", "-1"); //凭证信息像是经销商名称 - if("PZ2018071000000006".equals(VOUCHERNO) || "PZ2018080300000071".equals(VOUCHERNO) || "PZ2018071100000010".equals(VOUCHERNO) || "PZ2018080300000074".equals(VOUCHERNO) || "PZ2018082600000149".equals(VOUCHERNO) || "PZ2018082600000150".equals(VOUCHERNO)) { + if("PZ2018071000000006".equals(VOUCHERNO) || "PZ2018080300000071".equals(VOUCHERNO) || "PZ2018071100000010".equals(VOUCHERNO) || "PZ2018080300000074".equals(VOUCHERNO)) { + subData.put("CUSTID",dataTemp.get("DISTRIBUTOR_ID"));//经销商id + subData.put("CUSTNAME",dataTemp.get("DISTRIBUTOR_NAME"));//经销商名称 + }else if("PZ2018070900000003".equals(VOUCHERNO) || "PZ2018080200000065".equals(VOUCHERNO)) { subData.put("CUSTID",dataTemp.get("DISTRIBUTOR_ID"));//经销商id subData.put("CUSTNAME",dataTemp.get("DISTRIBUTOR_NAME"));//经销商名称 }else if("PZ2018081600000120".equals(VOUCHERNO)){ diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherSysJointNCServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/VoucherSysJointNCServiceImpl.java index 8dd1e8d32..a64ad0193 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherSysJointNCServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherSysJointNCServiceImpl.java @@ -140,7 +140,7 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { Element year = voucherHead.addElement("year");// 会计年度/非空 year.setText(ACC_YEAR); Element pk_system = voucherHead.addElement("pk_system");// 来源系统/非空 - pk_system.setText(own.getAttribute("OWN_NAME").getString());//---------------------------------------- + pk_system.setText(own.getAttribute("OWN_NAME").getString()==null?"":own.getAttribute("OWN_NAME").getString());//---------------------------------------- Element voucherkind = voucherHead.addElement("voucherkind");// 凭证类型值/非空 voucherkind.setText("0"); Element pk_accountingbook = voucherHead.addElement("pk_accountingbook");// 核算核算账簿/非空 @@ -817,9 +817,9 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { Element item1 = suplinkman.addElement("item");// 编码,最大长度为64,类型为:String Element linkmanvo = item1.addElement("linkmanvo"); Element code2 = linkmanvo.addElement("code"); // 编码,最大长度为64,类型为:String - code2.setText(""); + code2.setText(DISTRIBUTOR_CODING); Element name2 = linkmanvo.addElement("name"); // 名称,最大长度为64,类型为:String - name2.setText(""); + name2.setText(DISTRIBUTOR_NAME); Element sex = linkmanvo.addElement("sex"); // 性别,最大长度为64,类型为:Integer sex.setText(""); Element vjob2 = linkmanvo.addElement("vjob"); // 职位,最大长度为64,类型为:String @@ -839,7 +839,7 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { Element address = linkmanvo.addElement("address"); // 住址,最大长度为64,类型为:String address.setText(""); Element postcode = linkmanvo.addElement("postcode"); // 邮编,最大长度为64,类型为:String - postcode.setText(""); + postcode.setText(POSTCODE); Element memo2 = linkmanvo.addElement("memo"); // 其它,最大长度为64,类型为:String memo2.setText(""); Element pk_linkman = item1.addElement("pk_linkman");// 联系人,最大长度为20,类型为:String @@ -944,11 +944,11 @@ public class VoucherSysJointNCServiceImpl implements VoucherSysJointNCService { Element shortname = billhead.addElement("shortname");// 简称,最大长度为200,类型为:String shortname.setText(contract_name); Element mnecode = billhead.addElement("mnecode");// 助记码,最大长度为50,类型为:String - mnecode.setText("助记码,最大长度为50,类型为:String"); + mnecode.setText(""); Element pid = billhead.addElement("pid");// 上级档案,最大长度为20,类型为:String - pid.setText("上级档案,最大长度为20,类型为:String"); + pid.setText(""); Element memo = billhead.addElement("memo");// 备注,最大长度为200,类型为:String - memo.setText("备注,最大长度为200,类型为:String"); + memo.setText(""); } String URL="D:\\voucher\\"+"APleasing_"+(i+1)+"_Defdoc_"+year_month_day+".xml"; file=new File(URL); diff --git a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java index 8d3e326bc..8139d23a6 100644 --- a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java +++ b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java @@ -15,6 +15,7 @@ import com.amarsoft.are.jbo.JBOException; import com.amarsoft.are.jbo.JBOFactory; import com.amarsoft.are.jbo.JBOTransaction; import com.amarsoft.awe.util.ASResultSet; +import com.amarsoft.awe.util.SqlObject; import com.amarsoft.awe.util.Transaction; import com.amarsoft.dict.als.cache.CacheLoaderFactory; import com.tenwa.comm.util.jboutil.DataOperatorUtil; @@ -182,7 +183,8 @@ public class EbankUse { String SUMMARY = this.getSUMMARY(); // 执行确认收入时, 可核销金额转入非业务金额 String sql2 = "UPDATE LC_EBANK SET NOWITH_MONEY=(NOWITH_MONEY+MAYOPE_MONEY),MAYOPE_MONEY='0.00',SUMMARY=CONCAT_WS(',',SUMMARY,'"+ SUMMARY + "') WHERE ID='" + ID + "'"; - Sqlca.executeSQL(sql2); + SqlObject sql3= new SqlObject(sql2); + Sqlca.executeSQL(sql3); if (Sqlca != null) { Sqlca.commit(); } From ea58737db81971e7c1b8c08d26d50aecbcdf41de Mon Sep 17 00:00:00 2001 From: liuz Date: Tue, 11 Sep 2018 14:33:32 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=B5=84=E6=96=99=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=B3=95=E4=BA=BA?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E=E5=B8=A6?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Tenwa/Comm/DocList/DocListMain.jsp | 2 +- .../Tenwa/Customer/Lessee/Comm/Account/CustomerAccount.jsp | 6 ++++++ .../Customer/Lessee/Company/CustomerCompanyRegister.jsp | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/WebContent/Tenwa/Comm/DocList/DocListMain.jsp b/WebContent/Tenwa/Comm/DocList/DocListMain.jsp index 1c920156f..fbd31e2a3 100644 --- a/WebContent/Tenwa/Comm/DocList/DocListMain.jsp +++ b/WebContent/Tenwa/Comm/DocList/DocListMain.jsp @@ -40,7 +40,7 @@ var docList="<%=docList%>"; myleft.width=1; if("SingleRow"=="<%=type%>"){ - if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"||"MortgageFileFlow"=="<%=sFlowNo%>"||"ProjectCreditFlow"=="<%=sFlowNo%>"){ + if("FundPaymentCarFlow"=="<%=sFlowNo%>"||"BusinessApplyFlow"=="<%=sFlowNo%>"||"MortgageFileFlow"=="<%=sFlowNo%>"||"ProjectCreditFlow"=="<%=sFlowNo%>"||"ContractSupportFlow"=="<%=sFlowNo%>"){ AsControl.OpenView("/Tenwa/Comm/DocList/PayDocList.jsp","docList="+docList,"right",""); }else{ AsControl.OpenView("/Tenwa/Comm/DocList/BussinessApproveDocList.jsp","docList="+docList,"right",""); diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/Account/CustomerAccount.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/Account/CustomerAccount.jsp index ade36cba2..42327773c 100644 --- a/WebContent/Tenwa/Customer/Lessee/Comm/Account/CustomerAccount.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Comm/Account/CustomerAccount.jsp @@ -24,6 +24,12 @@ sButtonPosition = "south"; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>