anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into zhouyh2

Browse Source
This commit is contained in:
zhouyahui 2018-09-25 12:34:55 +08:00
commit b826dc9acc
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
WebContent/Accounting/LoanSimulation/FundPlanList.jsp
View File

@ -1,6 +1,10 @@
<%@ page contentType="text/html; charset=GBK"%>
<%@page import="com.tenwa.reckon.util.TbBeanTools"%>
<%@page import="com.tenwa.reckon.bean.TabCalBean"%>
<%@page import="com.amarsoft.are.jbo.BizObject"%>
<%@page import="com.amarsoft.are.jbo.JBOException"%>
<%@page import="com.amarsoft.are.jbo.JBOFactory"%>
<%@page import="jbo.prd.BUSINESS_TYPE"%>
<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
String flowunid=CurPage.getParameter("flowunid");//Á÷³Ì±àºÅ
BizObject flow=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT","flow_unid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
@ -19,6 +23,10 @@
String taskno=CurPage.getParameter("TaskNo");
String ishistory=CurPage.getParameter("IsHistory");
String nodeNo=CurPage.getParameter("NodeNo");
//判断是传统还是汽车业务
BizObject bo = JBOFactory.createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,"typeno=:productID")
.setParameter("productID", productId).getSingleResult(false);
String productType = (bo==null)?"":bo.getAttribute("attribute2").getString();
ASObjectModel doTemp = new ASObjectModel("LCFundPlanTemp");
doTemp.appendJboWhere(" and "+planCName+"='"+plannumber+"'");
if(null!=ishistory&&ishistory.equals("true")){
@ -100,7 +108,14 @@
var param="FlowUnid=<%=flowunid%>&calType=<%=calType%>&plannumber=<%=plannumber%>&ProductId=<%=productId%>";
window.parent.parent.ischeck=false;
ischeck=false;
window.parent.parent.AsControl.OpenView("/Accounting/LoanSimulation/LoanBasicInfo.jsp",param, "_self");
var url="";
debugger;
if("<%=productType%>"=="car_product"){
url="/Accounting/LoanSimulation/LoanBasicInfo.jsp";
}else {
url="/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp";
}
window.parent.parent.AsControl.OpenView(url,param, "_self");
}
var ischeck=true;
function checkModified(){

4
src_invoice/com/tenwa/app/invoice/action/InvoiceRequest.java
View File

@ -32,7 +32,7 @@ public class InvoiceRequest {
private String url ="" ;
private String appId="" ;
private String fplxdm="026";
private String fplxdm="";
public InvoiceRequest(String fplxdm) {
this.fplxdm = fplxdm;
@ -63,7 +63,7 @@ public class InvoiceRequest {
InvoiceRequestBody body = new InvoiceRequestBody();
InvoiceRequestInput input = new InvoiceRequestInput();
input.setFplxdm(this.fplxdm);
input.setFplxdm(confirmBizObject.getAttribute("fplxdm").toString());
input.setKplx("0");
input.setTspz("00");
input.setXhdwdzdh(confirmBizObject.getAttribute("xhdwdzdh").toString());