From 42a4bbaa0a3ffaea1e2fd247dbfb4bb1288a325e Mon Sep 17 00:00:00 2001
From: xiezhiwen <xiezhiwen@xiezhiwen-PC>
Date: Fri, 2 Nov 2018 13:57:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3--=E6=9C=AC?=
 =?UTF-8?q?=E6=96=B9=E8=B4=A6=E6=88=B7=E9=93=B6=E8=A1=8C=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=80=89=E5=8F=96=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OwnConfig/BOwnAccount/BOwnAccount.jsp     |  6 +--
 .../OwnConfig/BOwnAccount/BOwnAccountList.jsp |  1 +
 .../ContractOnhireVoucher.java                |  1 +
 .../serviceImp/ExprotVoucherToXML.java        | 39 +++++--------------
 4 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
index 382ec68a3..fbecf4506 100644
--- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
+++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
@@ -10,7 +10,6 @@
 		Input Param:
 		Output param:
 		History Log: 
-
 	 */
 	%>
 <%/*~END~*/%>
@@ -110,7 +109,8 @@
 	    	}
 	    	sReturn = sReturn.split("@");
 	    	setItemValue(0,getRow(0),"acc_title",sReturn[0]);
-	    	setItemValue(0,getRow(0),"SUBJECTS_CODED",sReturn[1]);
+	    	setItemValue(0,getRow(0),"SUBJECTS_CODE",sReturn[1]);
+	    	setItemValue(0,getRow(0),"SUBJECTS_NAME",sReturn[2]);
 // 	    	setItemValue(0,getRow(0),"acc_title",sReturn[2]);
 	    	//setItemValue(0,getRow(),"SUBJECTS_NAME",sReturn[1]);
 	    	//setItemValue(0,getRow(),"SUBJECTS_NAME",sReturn[1]);
@@ -133,7 +133,7 @@
 		if(acc_title.length==32){
 			var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "changAcc_title","id=" + acc_title );
 			if(sReturn!="null"){
-				document.getElementById("SUBJECTS_CODED").value = sReturn;
+				//document.getElementById("SUBJECTS_NAME").value = sReturn;
 			}
 		}
 	}
diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccountList.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccountList.jsp
index 9911c2d61..f3c51a46a 100644
--- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccountList.jsp
+++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccountList.jsp
@@ -61,6 +61,7 @@
 <script type="text/javascript">
 /*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/
 function newRecord(){
+	
 	 var sUrl = "/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp";
 	 AsDialog.PopView(sUrl,'',"resizable=yes;dialogWidth=900px;dialogHeight=400px;center:yes;status:no;statusbar:no",function(){
 		   reloadSelf();		   
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java
index 532c30535..a360a6a37 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java
@@ -36,6 +36,7 @@ public class ContractOnhireVoucher  extends BaseBussiness {
 			
 			cvld.CreateVoucher(FlowUnid, "PZ2018071000000009",Sqlca);// 收取客户手续费（按月分摊收入）--回租
 			cvld.CreateVoucher(FlowUnid, "PZ2018080300000073",Sqlca);// 收取客户手续费（按月分摊收入）--直租
+			
 		return "true";
 	}
 }
diff --git a/src_core/com/tenwa/voucher/serviceImp/ExprotVoucherToXML.java b/src_core/com/tenwa/voucher/serviceImp/ExprotVoucherToXML.java
index 85324a58c..0a2656d76 100644
--- a/src_core/com/tenwa/voucher/serviceImp/ExprotVoucherToXML.java
+++ b/src_core/com/tenwa/voucher/serviceImp/ExprotVoucherToXML.java
@@ -44,7 +44,6 @@ public class ExprotVoucherToXML {
 			String f3="";
 		try {
 			Sqlca = Transaction.createTransaction(tx);
-			System.out.println(ids);
 			String year_month_day = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
 			/**
 			 * 定义全局变量
@@ -69,7 +68,7 @@ public class ExprotVoucherToXML {
 					 map.clear();
 					 map.put("F3",F3);
 					 // 获取v8表数据
-					 String sql1 = "SELECT ID,F5,F6,F49,F51,F52,F59,F63,F64,F73,F74,F75,F76,F67 FROM VOUCHER_V8 WHERE F3=:F3 ORDER BY F59 ";
+					 String sql1 = "SELECT ID,F5,F6,F49,F51,F52,F59,F73,F74,F75,F76 FROM VOUCHER_V8 WHERE F3=:F3 ORDER BY F59 ";
 					 List<Map<String, String>> v1 = DataOperatorUtil.getDataBySql(Sqlca,sql1,map);
 					 String ownId = v1.get(0).get("F49");
 					 // 获取本方信息
@@ -171,40 +170,20 @@ public class ExprotVoucherToXML {
 									List<Map<String, String>> A1 = DataOperatorUtil.getDataBySql(Sqlca,AUXILIARYSQL,map);
 									for (Map<String, String> fuzhu : A1) {
 										// 后期调整, 辅助账名称变更好需要更改此处代码***
-										if("租赁类型辅助核算".equals(fuzhu.get("AUX_NAME"))) {
-											Element item = auxiliary_accounting.addElement("item");
-												item.addAttribute("name", fuzhu.get("AUX_NAME"));
-												item.setText(v8.get("F67"));
-										}
-										if("融资租赁资产辅助核算".equals(fuzhu.get("AUX_NAME"))) {
-											Element item = auxiliary_accounting.addElement("item");
-												item.addAttribute("name", fuzhu.get("AUX_NAME"));
-												item.setText(v8.get("F64"));
-										}
-										if("部门辅助核算".equals(fuzhu.get("AUX_NAME"))) {
-											Element item = auxiliary_accounting.addElement("item");
-											item.addAttribute("name", fuzhu.get("AUX_NAME"));
-											item.setText(v8.get("F63"));
-										}
-										if("融资租赁收入类型辅助核算".equals(fuzhu.get("AUX_NAME"))) {
-											Element item = auxiliary_accounting.addElement("item");
-											item.addAttribute("name", fuzhu.get("AUX_NAME"));
-											item.setText(v8.get("F73"));
-										}
-										if("资金类型辅助核算".equals(fuzhu.get("AUX_NAME"))) {
-											Element item = auxiliary_accounting.addElement("item");
-											item.addAttribute("name", fuzhu.get("AUX_NAME"));
-											item.setText(v8.get("F74"));
-										}
 										if("主营类型辅助核算".equals(fuzhu.get("AUX_NAME"))) {
 											Element item = auxiliary_accounting.addElement("item");
-											item.addAttribute("name", fuzhu.get("AUX_NAME"));
-											item.setText(v8.get("F75"));
+												item.addAttribute("name", fuzhu.get("AUX_NAME"));
+												item.setText(v8.get("F73"));
+										}
+										if("现金流量项目辅助核算".equals(fuzhu.get("AUX_NAME"))) {
+											Element item = auxiliary_accounting.addElement("item");
+												item.addAttribute("name", fuzhu.get("AUX_NAME"));
+												item.setText(v8.get("F74"));
 										}
 										if("银行账户辅助核算".equals(fuzhu.get("AUX_NAME"))) {
 											Element item = auxiliary_accounting.addElement("item");
 											item.addAttribute("name", fuzhu.get("AUX_NAME"));
-											item.setText(v8.get("F76"));
+											item.setText(v8.get("F75"));
 										}
 									}
 								Element detail = entry.addElement("detail");