From 6ea5d4567f7d8ee8c8fc5195345183f8ca6de4e9 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Tue, 25 Sep 2018 10:33:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BC=A0=E7=BB=9F?=
 =?UTF-8?q?=E5=95=86=E5=8A=A1=E6=9D=A1=E4=BB=B6=E9=A1=B5=E9=9D=A2=E8=B5=84?=
 =?UTF-8?q?=E9=87=91=E8=AE=A1=E5=88=92=E4=BF=9D=E5=AD=98=E5=8F=98=E6=88=90?=
 =?UTF-8?q?=E6=B1=BD=E8=BD=A6=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Accounting/LoanSimulation/FundPlanList.jsp  | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/WebContent/Accounting/LoanSimulation/FundPlanList.jsp b/WebContent/Accounting/LoanSimulation/FundPlanList.jsp
index a1b6e03ec..3155e3e46 100644
--- a/WebContent/Accounting/LoanSimulation/FundPlanList.jsp
+++ b/WebContent/Accounting/LoanSimulation/FundPlanList.jsp
@@ -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(){

From 6595701d47f0509facb528391929a2d25b339b93 Mon Sep 17 00:00:00 2001
From: liuzhao <liuzhao@DESKTOP-NULDTFM>
Date: Tue, 25 Sep 2018 11:09:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src_invoice/com/tenwa/app/invoice/action/InvoiceRequest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src_invoice/com/tenwa/app/invoice/action/InvoiceRequest.java b/src_invoice/com/tenwa/app/invoice/action/InvoiceRequest.java
index 43a822254..d006f1206 100644
--- a/src_invoice/com/tenwa/app/invoice/action/InvoiceRequest.java
+++ b/src_invoice/com/tenwa/app/invoice/action/InvoiceRequest.java
@@ -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());