From cd32231c9cb0983c947fac2a12a23e2e920fb7f9 Mon Sep 17 00:00:00 2001
From: liuzhao <liuzhao@DESKTOP-NULDTFM>
Date: Thu, 9 Aug 2018 19:14:08 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0JBO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/etc/jbo/jbo_calc.xml  | 26 ++++++++++++++++++++++
 WebContent/WEB-INF/etc/jbo/jbo_comm.xml  |  1 +
 WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 28 ++++++++++++++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index 2c370a692..7b9429a81 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -3392,5 +3392,31 @@
 				</managerProperties>
 			</manager>
 		</class>
+		<class name="VI_LI_INVOICE_RENT" label="" keyAttributes="contract_id">
+			<attributes>
+				<attribute name="contract_id" label="contract_id" type="STRING"/>
+				<attribute name="contract_no" label="contract_no" type="STRING"/>
+				<attribute name="payment_number" label="payment_number" type="STRING"/>
+				<attribute name="customer_id" label="customer_id" type="STRING"/>
+				<attribute name="customer_name" label="customer_name" type="STRING"/>
+				<attribute name="plan_list" label="plan_list" type="STRING"/>
+				<attribute name="plan_id" label="plan_id" type="STRING"/>
+				<attribute name="plan_date" label="plan_date" type="STRING"/>
+				<attribute name="plan_money" label="plan_money" type="STRING"/>
+				<attribute name="invoice_money" label="invoice_money" type="STRING"/>
+				<attribute name="cert_id" label="cert_id" type="STRING"/>
+				<attribute name="account" label="account" type="STRING"/>
+				<attribute name="acc_number" label="acc_number" type="STRING"/>
+				<attribute name="bank_name" label="bank_name" type="STRING"/>
+				<attribute name="telephone" label="telephone" type="STRING"/>
+				<attribute name="customer_type" label="customer_type" type="STRING"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="vi_li_invoice_rent" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
 	</package>
 </jbo>
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
index a9e93b17a..d508bc92a 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
@@ -772,6 +772,7 @@
 				<attribute name="NOMINAL_INVOICE_TYPE" label="留购价发票类型" type="STRING" length="32"/>
 				<attribute name="CAUTION_RATE" label="保证金税率" type="STRING" length="32"/>
 				<attribute name="CAUTION_INVOICE_TYPE" label="保证金发开票类型" type="STRING" length="32"/>
+				<attribute name="gps_install_fee" label="GPS安装服务费" type="STRING" length="32"/>
 				<attribute name="INPUTUSERID" label="登记人" type="STRING" length="32"/>
 				<attribute name="INPUTORGID" label="登记部门" type="STRING" length="32"/>
 				<attribute name="INPUTTIME" label="登记时间" type="STRING" length="32"/>
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index e417ecbf3..007478a5a 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -4179,6 +4179,34 @@
 				</managerProperties>
 			</manager>
 		</class>
+		<class name="LB_CAR_LICENSE_PLATE_INFO_TEMP" label="" keyAttributes="id">
+			<attributes>
+				<attribute name="id" label="标识" type="STRING" length="100"/>
+				<attribute name="car_id" label="车辆编号" type="STRING" length="40"/>
+				<attribute name="orgid" label="机构编号" type="STRING" length="40"/>
+				<attribute name="contract_id" label="合同id" type="STRING" length="100"/>
+				<attribute name="plate_status" label="上牌状态" type="STRING" length="100"/>
+				<attribute name="frame_number" label="车架号" type="STRING" length="100"/>
+				<attribute name="engine_number" label="发动机号" type="STRING" length="100"/>
+				<attribute name="plate_number" label="上牌号" type="STRING" length="100"/>
+				<attribute name="platetime" label="上牌时间" type="STRING" length="100"/>
+				<attribute name="inputuserid" label="登记人" type="STRING" length="100"/>
+				<attribute name="inputorgid" label="登记部门" type="STRING" length="100"/>
+				<attribute name="inputtime" label="登记时间" type="STRING" length="100"/>
+				<attribute name="updateuserid" label="更新人" type="STRING" length="100"/>
+				<attribute name="updateorgid" label="更新部门" type="STRING" length="100"/>
+				<attribute name="updatetime" label="更新时间" type="STRING" length="100"/>
+				<attribute name="car_unit" label="上牌单位" type="STRING" length="100"/>
+				<attribute name="car_location" label="上牌地点" type="STRING" length="100"/>
+				<attribute name="contract_no" label="合同编号" type="STRING" length="100"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="lb_car_license_plate_info_temp" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
 	</package>
 	<package name="jbo.com.tenwa.lease.carbrand" >
 	<class name="LB_CLAIMS_BOOK_DETAIL" label="索赔申请书详情表" keyAttributes="ID">

From c18e0e993551631dec6b4bdba825bc32333eff93 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Thu, 9 Aug 2018 19:53:04 +0800
Subject: [PATCH 2/4] =?UTF-8?q?1.=E6=9C=AC=E6=96=B9=E8=B4=A6=E6=88=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=92=E6=96=A5=E3=80=82=202.=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E4=BB=98=E6=AC=BE=E6=98=8E=E7=BB=86=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E5=8F=B7=E5=8F=96=E6=B6=88=E9=93=BE=E6=8E=A5=E3=80=82=203.?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=85=8D=E7=BD=AEGPS=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E9=85=8D=E6=B7=BB=E5=8A=A0=E9=87=91=E9=A2=9D=E9=99=90=E5=AE=9A?=
 =?UTF-8?q?=E5=92=8C=E6=98=AF=E5=90=A6=E5=8F=AA=E8=AF=BB=E3=80=82=204.jbo?=
 =?UTF-8?q?=5Flease.xml=E4=B8=AD=E5=90=88=E5=90=8C=E6=AD=A3=E5=BC=8F/?=
 =?UTF-8?q?=E4=B8=B4=E6=97=B6/=E5=8E=86=E5=8F=B2=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0LENDING=5FTYPE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OwnConfig/BOwnAccount/BOwnAccount.jsp     | 15 ++++++-
 .../ActualPaymentCarTempList.jsp              |  4 +-
 .../etc/app/component/component-config.xml    |  2 +-
 WebContent/WEB-INF/etc/jbo/jbo_lease.xml      |  6 +++
 .../reckon/copydata/CalcRentCompare.java      | 44 +++++++++++++++++++
 5 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
index 7b7ea5305..1c2095dce 100644
--- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
+++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
@@ -68,8 +68,19 @@
 <%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=Info06;Describe=���尴ť�¼�-;]~*/%>
 <script type="text/javascript">
 /*~[Describe=�����¼;InputParam=��;OutPutParam=��;]~*/
-	function saveRecord(){	 	
-		as_save("myiframe0","parent.AsDialog.ClosePage()");
+	function saveRecord(){
+	debugger;
+		var accountType = getItemValue(0, 0, "account_type");
+		var accType = getItemValue(0, 0, "acc_type");
+		var state = getItemValue(0, 0, "state_");
+		var FbSdk = getItemValue(0,0,"FbSdk");
+		var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk;
+		var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams );
+		if(sReturn=="null"||(sReturn=="notNull"&&state!="0010")||(sReturn=="notNull"&&state=="0010"&&FbSdk!="Y")){
+			as_save("myiframe0","parent.AsDialog.ClosePage()");
+		}else{
+			alert("����״̬�µ��˻��˺������Ѵ��ڣ����飡");
+		} 
 	}
 	
 	//��ѡ�������
diff --git a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp
index 8d5107430..785cb0ed1 100644
--- a/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Fund/ActualPayment/ActualPaymentCarTempList.jsp
@@ -105,7 +105,7 @@
 		setColRequired();
 	})
 	function afterSearch(){
-		var rows = getRowCount(0);
+		/* var rows = getRowCount(0);
 		for(var i=0;i<rows;i++){
 			var CONTRACT_ID = getItemValue(0,i,"CONTRACT_ID");
 			var result = RunJavaMethodTrans("com.tenwa.flow.fund.fundcollection.FundIncomeMethod","getContactId","CONTRACT_ID="+CONTRACT_ID);
@@ -114,7 +114,7 @@
 			sPars=result.split("@"); //�ַ��ָ� 
 			sRun = "<a style='color:blue;font-size:15px;font-family:����;' onclick='opeTrigger("+ps+")'>" +sPars[1]+ "</a>";
 			getObj(0,i,"CONTRACT_ID").innerHTML = sRun;
-		}		
+		}	 */	
 	}
 	function createFundIncomeExcel(){
 		var rows = getCheckedRows(0);
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index 199396fa0..5bd437301 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -1097,7 +1097,7 @@
 	
 	<Component FORMAT="1" ID="DISCOUNT" NAME="��Ϣ" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��ȡ����" PARAMETERID="CostType01" PARAMETERNAME="��ȡ����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="�ո��ڵ�" PARAMETERID="CostType02" PARAMETERNAME="�ո��ڵ�" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո�����" PARAMETERID="CostType03" PARAMETERNAME="�ո�����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="��Ŀ����" PARAMETERID="CostType04" PARAMETERNAME="��Ŀ����" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="��̨����޶�" PARAMETERID="CostType08" PARAMETERNAME="����޶�" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="�Ƿ����IRR/XIRR����" PARAMETERID="CostType10" PARAMETERNAME="�Ƿ����IRR/XIRR����" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="�����޶�" PARAMETERID="CostType09" PARAMETERNAME="�����޶�" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="���뷽ʽ" PARAMETERID="CostType06" PARAMETERNAME="���뷽ʽ" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="�������շ���" PARAMETERID="CostType07" PARAMETERNAME="�������շ���" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="����Ϣ���" PARAMETERID="DISCOUNT_ALL" PARAMETERNAME="����Ϣ���" PRIGHTTYPE="All"/></Parameters></Component>
 	<Component FORMAT="1" ID="PURCHASE_TAX" NAME="����˰" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��ȡ����" PARAMETERID="CostType01" PARAMETERNAME="��ȡ����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո��ڵ�" PARAMETERID="CostType02" PARAMETERNAME="�ո��ڵ�" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո�����" PARAMETERID="CostType03" PARAMETERNAME="�ո�����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="����޶�" PARAMETERID="CostType08" PARAMETERNAME="����޶�" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="�����޶�" PARAMETERID="CostType09" PARAMETERNAME="�����޶�" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ��������" PARAMETERID="FINAN" PARAMETERNAME="�Ƿ��������" PRIGHTTYPE="Required" VALUE="Y"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="�׸������" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="�׸������" PRIGHTTYPE="None"/></Parameters></Component>
-	<Component FORMAT="1" ID="VEHICLE_TAX" NAME="����˰" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո��ڵ�" PARAMETERID="CostType02" PARAMETERNAME="�ո��ڵ�" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="�ո�����" PARAMETERID="CostType03" PARAMETERNAME="�ո�����" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="��Ŀ����" PARAMETERID="CostType04" PARAMETERNAME="��Ŀ����" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="����޶�" PARAMETERID="CostType08" PARAMETERNAME="����޶�" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ����IRR/XIRR����" PARAMETERID="CostType10" PARAMETERNAME="�Ƿ����IRR/XIRR����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ���Ҫѡ������" PARAMETERID="FINAN" PARAMETERNAME="�Ƿ���Ҫѡ������" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="GPS_FEE" NAME="GPS��װ�����" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��ȡ����" PARAMETERID="CostType01" PARAMETERNAME="��ȡ����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո��ڵ�" PARAMETERID="CostType02" PARAMETERNAME="�ո��ڵ�" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո�����" PARAMETERID="CostType03" PARAMETERNAME="�ո�����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="����޶�" PARAMETERID="CostType08" PARAMETERNAME="����޶�" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="�����޶�" PARAMETERID="CostType09" PARAMETERNAME="�����޶�" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ��������" PARAMETERID="FINAN" PARAMETERNAME="�Ƿ��������" PRIGHTTYPE="Required" VALUE="Y"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="�׸������" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="�׸������" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ�ֻ��" PARAMETERID="RentMonthReadOnly" PARAMETERNAME="�Ƿ�ֻ��" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="TABLEWARE_FEE" NAME="��װ��" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��ȡ����" PARAMETERID="CostType01" PARAMETERNAME="��ȡ����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո��ڵ�" PARAMETERID="CostType02" PARAMETERNAME="�ո��ڵ�" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո�����" PARAMETERID="CostType03" PARAMETERNAME="�ո�����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="����޶�" PARAMETERID="CostType08" PARAMETERNAME="����޶�" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="�����޶�" PARAMETERID="CostType09" PARAMETERNAME="�����޶�" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ��������" PARAMETERID="FINAN" PARAMETERNAME="�Ƿ��������" PRIGHTTYPE="Required" VALUE="Y"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="�������շ���" PARAMETERID="CostType07" PARAMETERNAME="�������շ���" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="�׸������" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="�׸������" PRIGHTTYPE="None"/></Parameters></Component><Component FORMAT="1" ID="MAINTAIN_FEE" NAME="������" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո��ڵ�" PARAMETERID="CostType02" PARAMETERNAME="�ո��ڵ�" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="�ո�����" PARAMETERID="CostType03" PARAMETERNAME="�ո�����" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="��Ŀ����" PARAMETERID="CostType04" PARAMETERNAME="��Ŀ����" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="����޶�" PARAMETERID="CostType08" PARAMETERNAME="����޶�" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ����IRR/XIRR����" PARAMETERID="CostType10" PARAMETERNAME="�Ƿ����IRR/XIRR����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ���Ҫѡ������" PARAMETERID="FINAN" PARAMETERNAME="�Ƿ���Ҫѡ������" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="INSURANCE_PREMIUM" NAME="���շ�" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��ȡ����" PARAMETERID="CostType01" PARAMETERNAME="��ȡ����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո��ڵ�" PARAMETERID="CostType02" PARAMETERNAME="�ո��ڵ�" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո�����" PARAMETERID="CostType03" PARAMETERNAME="�ո�����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="����޶�" PARAMETERID="CostType08" PARAMETERNAME="����޶�" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="�����޶�" PARAMETERID="CostType09" PARAMETERNAME="�����޶�" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ��������" PARAMETERID="FINAN" PARAMETERNAME="�Ƿ��������" PRIGHTTYPE="Required" VALUE="Y"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="�׸������" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="�׸������" PRIGHTTYPE="None"/></Parameters></Component>
+	<Component FORMAT="1" ID="VEHICLE_TAX" NAME="����˰" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո��ڵ�" PARAMETERID="CostType02" PARAMETERNAME="�ո��ڵ�" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="�ո�����" PARAMETERID="CostType03" PARAMETERNAME="�ո�����" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="��Ŀ����" PARAMETERID="CostType04" PARAMETERNAME="��Ŀ����" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="����޶�" PARAMETERID="CostType08" PARAMETERNAME="����޶�" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ����IRR/XIRR����" PARAMETERID="CostType10" PARAMETERNAME="�Ƿ����IRR/XIRR����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ���Ҫѡ������" PARAMETERID="FINAN" PARAMETERNAME="�Ƿ���Ҫѡ������" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="GPS_FEE" NAME="GPS��װ�����" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��ȡ����" PARAMETERID="CostType01" PARAMETERNAME="��ȡ����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո��ڵ�" PARAMETERID="CostType02" PARAMETERNAME="�ո��ڵ�" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո�����" PARAMETERID="CostType03" PARAMETERNAME="�ո�����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="����޶�" PARAMETERID="CostType08" PARAMETERNAME="����޶�" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="�����޶�" PARAMETERID="CostType09" PARAMETERNAME="�����޶�" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ��������" PARAMETERID="FINAN" PARAMETERNAME="�Ƿ��������" PRIGHTTYPE="Required" VALUE="Y"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="�׸������" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="�׸������" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ�ֻ��" PARAMETERID="RentMonthReadOnly" PARAMETERNAME="�Ƿ�ֻ��" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="TABLEWARE_FEE" NAME="��װ��" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��ȡ����" PARAMETERID="CostType01" PARAMETERNAME="��ȡ����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո��ڵ�" PARAMETERID="CostType02" PARAMETERNAME="�ո��ڵ�" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո�����" PARAMETERID="CostType03" PARAMETERNAME="�ո�����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="����޶�" PARAMETERID="CostType08" PARAMETERNAME="����޶�" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="�����޶�" PARAMETERID="CostType09" PARAMETERNAME="�����޶�" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ��������" PARAMETERID="FINAN" PARAMETERNAME="�Ƿ��������" PRIGHTTYPE="Required" VALUE="Y"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="�������շ���" PARAMETERID="CostType07" PARAMETERNAME="�������շ���" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="�׸������" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="�׸������" PRIGHTTYPE="None"/></Parameters></Component><Component FORMAT="1" ID="MAINTAIN_FEE" NAME="������" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո��ڵ�" PARAMETERID="CostType02" PARAMETERNAME="�ո��ڵ�" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="�ո�����" PARAMETERID="CostType03" PARAMETERNAME="�ո�����" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="��Ŀ����" PARAMETERID="CostType04" PARAMETERNAME="��Ŀ����" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="����޶�" PARAMETERID="CostType08" PARAMETERNAME="����޶�" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ����IRR/XIRR����" PARAMETERID="CostType10" PARAMETERNAME="�Ƿ����IRR/XIRR����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ���Ҫѡ������" PARAMETERID="FINAN" PARAMETERNAME="�Ƿ���Ҫѡ������" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="INSURANCE_PREMIUM" NAME="���շ�" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��ȡ����" PARAMETERID="CostType01" PARAMETERNAME="��ȡ����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո��ڵ�" PARAMETERID="CostType02" PARAMETERNAME="�ո��ڵ�" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�ո�����" PARAMETERID="CostType03" PARAMETERNAME="�ո�����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="����޶�" PARAMETERID="CostType08" PARAMETERNAME="����޶�" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="�����޶�" PARAMETERID="CostType09" PARAMETERNAME="�����޶�" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ��������" PARAMETERID="FINAN" PARAMETERNAME="�Ƿ��������" PRIGHTTYPE="Required" VALUE="Y"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="�׸������" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="�׸������" PRIGHTTYPE="None"/></Parameters></Component>
 	<Component FORMAT="1" ID="telephone_home_visit" NAME="��˼ҷ�" STATUS="1" TYPE="PRD0382"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��˼ҷ�" PARAMETERID="TelephoneHomeVisit" PARAMETERNAME="��˼ҷ�" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="investment_rate" NAME="�����ʱ���" STATUS="1" TYPE="PRD0384"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�����ʱ���" PARAMETERID="InvestmentRate" PARAMETERNAME="�����ʱ���" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="Interest_days" NAME="��Ϣ����" STATUS="1" TYPE="PRD0383"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��Ϣ����" PARAMETERID="InterestDays" PARAMETERNAME="��Ϣ����" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="Invoice_processing" NAME="��Ʊ����" STATUS="2" TYPE="PRD0381"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="˰��" PARAMETERID="TaxRate" PARAMETERNAME="˰��" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��Ʊʱ��" PARAMETERID="BillingPoint" PARAMETERNAME="��Ʊʱ��" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ����ڿ�Ʊ" PARAMETERID="PeriodInvoice" PARAMETERNAME="�Ƿ����ڿ�Ʊ" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��ǰ��Ʊ����" PARAMETERID="AdvanceInvoicing" PARAMETERNAME="��ǰ��Ʊ����" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="Residual_value_limit" NAME="��ֵ�޶�" STATUS="2" TYPE="PRD0380"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��д��ʽ" PARAMETERID="ReadWriteMode" PARAMETERNAME="��д��ʽ" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="Ĭ��ֵ" PARAMETERID="DefaultValue" PARAMETERNAME="Ĭ��ֵ" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��ֵ�����޶�" PARAMETERID="EndValueRatio" PARAMETERNAME="��ֵ�����޶�" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��ֵ���뷽ʽ" PARAMETERID="InputType" PARAMETERNAME="��ֵ���뷽ʽ" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="Residual_method" NAME="��ֵ������ʽ" STATUS="1" TYPE="PRD0380"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��ֵ������ʽ" PARAMETERID="ResidualMethod" PARAMETERNAME="��ֵ������ʽ" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="PayDisparity" NAME="�Ƿ���ſ�" STATUS="1" TYPE="PRD0385"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�Ƿ���ſ�" PARAMETERID="isBalance" PARAMETERNAME="�Ƿ���ſ�" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="ChannelGuarantee" NAME="����������" STATUS="1" TYPE="PRD0386"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="����������" PARAMETERID="GuaranteeName" PARAMETERNAME="����������" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�����˵绰" PARAMETERID="GuaranteePhone" PARAMETERNAME="�����˵绰" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�����˵�ַ" PARAMETERID="GuaranteeAddress" PARAMETERNAME="�����˵�ַ" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="������֤����" PARAMETERID="GuaranteeNumber" PARAMETERNAME="������֤����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="����������" PARAMETERID="GuaranteeLegalName" PARAMETERNAME="����������" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��������" PARAMETERID="GuaranteeType" PARAMETERNAME="��������" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��ϵ" PARAMETERID="Relationship" PARAMETERNAME="��ϵ" PRIGHTTYPE="Required"/></Parameters></Component>
 	<Component FORMAT="1" ID="CHANNEL_CAUTION_MONEY" NAME="�������յ�Ѻ��" STATUS="2" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="��ȡ����" PARAMETERID="CostType01" PARAMETERNAME="��ȡ����" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="�ո��ڵ�" PARAMETERID="CostType02" PARAMETERNAME="�ո��ڵ�" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="�ո�����" PARAMETERID="CostType03" PARAMETERNAME="�ո�����" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="��Ŀ����" PARAMETERID="CostType04" PARAMETERNAME="��Ŀ����" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="�Ƿ���ʾ����" PARAMETERID="CostType05" PARAMETERNAME="�Ƿ���ʾ����" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="���뷽ʽ" PARAMETERID="CostType06" PARAMETERNAME="���뷽ʽ" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="�������շ���" PARAMETERID="CostType07" PARAMETERNAME="�������շ���" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="����޶�" PARAMETERID="CostType08" PARAMETERNAME="����޶�" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="�����޶�" PARAMETERID="CostType09" PARAMETERNAME="�����޶�" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="�Ƿ����IRR/XIRR����" PARAMETERID="CostType10" PARAMETERNAME="�Ƿ����IRR/XIRR����" PRIGHTTYPE="Hide"/></Parameters></Component> 
 	<Component FORMAT="1" ID="SigningAddress" NAME="ǩԼ�ص�" STATUS="1" TYPE="PRD0386"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="ǩԼ�ص�" PARAMETERID="SigningAddress" PARAMETERNAME="ǩԼ�ص�" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="MoneyLimits" NAME="���ʶ�������" STATUS="1" TYPE="PRD0350"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="���ʶ�����" PARAMETERID="MoneyLowLimits" PARAMETERNAME="���ʶ�����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="���ʶ�����" PARAMETERID="EquipUplimpits" PARAMETERNAME="���ʶ�����" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="�����������" PARAMETERID="MoneyUpLimits" PARAMETERNAME="�����������" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="GuarantorPeople" NAME="��֤��" STATUS="1" TYPE="PRD0386"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="��֤������" PARAMETERID="GuarantorName" PARAMETERNAME="��֤������" PRIGHTTYPE="Required"/></Parameters></Component>
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 007478a5a..0e83bad69 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -715,6 +715,7 @@
 				<attribute name="BUSINESSTYPE" label="业务类型" type="STRING" length="64"/>
 				<attribute name="AREA_CODE" label="车牌号对应所在区号" type="STRING" length="32"/>
 				<attribute name="CAR_TYPE" label="车辆类型" type="STRING" length="64"/>
+				<attribute name="LENDING_TYPE" label="保单放款方法" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -951,6 +952,7 @@
 				<attribute name="BUSINESSTYPE" label="业务类型" type="STRING" length="64"/>
 				<attribute name="AREA_CODE" label="车牌号对应所在区号" type="STRING" length="32"/>
 				<attribute name="CAR_TYPE" label="车辆类型" type="STRING" length="64"/>
+				<attribute name="LENDING_TYPE" label="保单放款方法" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -2596,6 +2598,10 @@
 				<attribute name="CONTRACT_INVOICE_STATUS" label="合同开票状态" type="STRING" length="32"/>
 				<attribute name="VERSIONID" label="版本号" type="STRING" length="64"/>
 				<attribute name="distributor_id" label="distributor_id" type="STRING" length="32"/>
+				<attribute name="BUSINESSTYPE" label="业务类型" type="STRING" length="64"/>
+				<attribute name="AREA_CODE" label="车牌号对应所在区号" type="STRING" length="32"/>
+				<attribute name="CAR_TYPE" label="车辆类型" type="STRING" length="64"/>
+				<attribute name="LENDING_TYPE" label="保单放款方法" type="STRING" length="10"/>
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java
index d36a717dc..3d8bb8e49 100644
--- a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java
+++ b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java
@@ -1,9 +1,19 @@
 package com.tenwa.reckon.copydata;
 
+import jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT;
+
 import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
 import com.tenwa.comm.util.jboutil.BizObjectCompare;
 
 public class CalcRentCompare implements BizObjectCompare{
+	private String accountType;
+	private String accType;
+	private String state;
+	private String FbSdk;
+
 
 	@Override
 	public boolean ObjectCompare(BizObject cObject, BizObject toObject)
@@ -13,5 +23,39 @@ public class CalcRentCompare implements BizObjectCompare{
 		}
 		return false;
 	}
+	
+	public String getAccountType() {
+		return accountType;
+	}
+	public void setAccountType(String accountType) {
+		this.accountType = accountType;
+	}
+	public String getAccType() {
+		return accType;
+	}
+	public void setAccType(String accType) {
+		this.accType = accType;
+	}
+	public String getState() {
+		return state;
+	}
+	public void setState(String state) {
+		this.state = state;
+	}
+	public String getFbSdk() {
+		return FbSdk;
+	}
+	public void setFbSdk(String fbSdk) {
+		FbSdk = fbSdk;
+	}
+	public String compare(JBOTransaction tx) throws JBOException{
+		String sql ="select * from O where O.state_='0010' and O.ACC_TYPE=:accType and ACCOUNT_TYPE=:accountType and FbSdk='Y'";
+		BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql)
+				.setParameter("accType", accType).setParameter("accountType", accountType).getSingleResult(false);
+		if(bo==null||"".equals(bo)){
+			return "null";
+		}
+		return "notNull";
+	}
 
 }

From 6de5fa411b8139c3cd5948295d7ea934f01d0215 Mon Sep 17 00:00:00 2001
From: liuzhao <liuzhao@DESKTOP-NULDTFM>
Date: Thu, 9 Aug 2018 20:44:12 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Flow/RentCollection/overduedunning/OverdueDunningList.jsp  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp
index 05683c53e..23f3e7497 100644
--- a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp
@@ -14,7 +14,8 @@
 	dwTemp.Style="1";      	     //--����ΪGrid���--
 	dwTemp.MultiSelect = true;	 //��ѡ
 	dwTemp.ReadOnly = "1";	 //ֻ��ģʽ
-	dwTemp.setPageSize(10);
+	//dwTemp.setPageSize(10);
+	dwTemp.setPageSize(pageSize==null?10:Integer.parseInt(pageSize));
 	dwTemp.genHTMLObjectWindow("");
 
 	//0���Ƿ�չʾ 1��	Ȩ�޿���  2�� չʾ���� 3����ť��ʾ���� 4����ť�������� 5����ť�����¼�����	6��	7��	8��	9��ͼ�꣬CSS�����ʽ 10�����

From 030d1da6ae05def493223870bed15968a098134a Mon Sep 17 00:00:00 2001
From: xiezhiwen <xiezhiwen@xiezhiwen-PC>
Date: Thu, 9 Aug 2018 20:51:45 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/TestCase/BizletTest.jsp            |   2 +-
 WebContent/WEB-INF/etc/jbo/jbo_voucher.xml    |   1 +
 .../CreateVoucherContractTerminate.java       |   8 +-
 .../CreateVoucherCustCautionMoneyIncome.java  | 202 +++++++++---------
 .../CreateVoucherDistCautionMoneyRe.java      |   2 +-
 .../CreateVoucherInsuranceSettlement.java     |  18 +-
 .../CreateVoucherLoan/CleanLeaseMoney.java    |   2 +-
 .../ContractCapitalToTaxToJust.java           |   3 +-
 .../ContractEquipToJust.java                  |   1 +
 .../ContractMoneyToRent.java                  |  23 ++
 .../CreateVoucherLoan/FundGPSFee.java         |   1 +
 .../CreateVoucherLoan/OtherFee.java           |   5 +-
 .../CreateVoucherLoan/OtherFeeAddGps.java     |  32 +++
 .../OtherFeeMoneyToLoan.java                  |  28 +++
 .../CreateVoucherLoan/OtherFees.java          |  34 +++
 ...ToJust.java => SynthesizeMoneyToJust.java} |  11 +-
 .../CautionMoneyVoucher.java                  |   4 +-
 .../ContractOnhireVoucher.java                |  21 +-
 .../ContractTerminate.java                    |   9 +-
 .../IncomeVoucher.java                        |   7 +-
 .../RedIncomeVoucher.java                     |  23 +-
 .../CreateVoucherMonthSettlement.java         |   2 +-
 .../serviceImp/CreateVoucherServiceImpl.java  |  11 +-
 .../voucher/serviceImp/VoucherToV8Impl.java   |   3 -
 .../CreateVoucherRentIncomeMission.java       |   1 +
 25 files changed, 311 insertions(+), 143 deletions(-)
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractMoneyToRent.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeAddGps.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeMoneyToLoan.java
 create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFees.java
 rename src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/{SynthesizeLeaseMoneyToJust.java => SynthesizeMoneyToJust.java} (85%)

diff --git a/WebContent/TestCase/BizletTest.jsp b/WebContent/TestCase/BizletTest.jsp
index 78b3e4111..8156908be 100644
--- a/WebContent/TestCase/BizletTest.jsp
+++ b/WebContent/TestCase/BizletTest.jsp
@@ -5,7 +5,7 @@
 	/*
 	sExpression = "!CustomerManager.GetCustomerName(2000042779)";
 	sExpression = Expression.pretreatMethod(sExpression,Sqlca);
-	String sReturn = Expression.getExpressionValue(sExpression,Sqlca).stringValue();
+	String sReturn =  Expression.getExpressionValue(sExpression,Sqlca).stringValue();
 	out.println(sReturn);
 	*/
 	ASMethod asm = new ASMethod("CustomerManager","GetCustomerName",Sqlca);
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_voucher.xml b/WebContent/WEB-INF/etc/jbo/jbo_voucher.xml
index ed488e600..46276fe54 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_voucher.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_voucher.xml
@@ -82,6 +82,7 @@
 				<attribute name="INIT_CLASS" label="初始化类" type="STRING" length="1000"/>
 				<attribute name="VOUCHER_TYPE" label="凭证分类" type="STRING" length="32"/>
 				<attribute name="VOUCHER_NO" label="凭证编号" type="STRING" length="32"/>
+				<attribute name="FIR_KEY" label="关键字一" type="STRING" length="32"/>
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java
index d059c94d7..bcbee4944 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java
@@ -39,11 +39,11 @@ public class CreateVoucherContractTerminate {
 		param.clear();
 		map.put("FlowUnid", FlowUnid);
 		//�ؿ�--�յ�ΥԼ��
-		if("PZ2018072100000026".equals(VOUCHERNO)||"PZ2018080400000083".equals(VOUCHERNO)){
+		if("PZ2018072100000026".equals(VOUCHERNO)||"PZ2018080400000083".equals(VOUCHERNO)||"PZ2018080400000093".equals(VOUCHERNO)){
 			sql= "SELECT IFNULL(HANDLING_CHARGE,0) AS MONEY ,ROUND(IFNULL(HANDLING_CHARGE,0)/1.06,2) AS MONEYNOTAX,(IFNULL(HANDLING_CHARGE,0)-ROUND(IFNULL(HANDLING_CHARGE,0)/1.06,2)) AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCI.ID CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.ID INNER 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 LFRA.FLOWUNID=:FLOWUNID";
 		}
 		//�յ�����ǰ����
-		if("PZ2018072100000027".equals(VOUCHERNO)||"PZ2018080400000084".equals(VOUCHERNO)){
+		if("PZ2018072100000027".equals(VOUCHERNO)||"PZ2018080400000084".equals(VOUCHERNO)||"PZ2018080400000094".equals(VOUCHERNO)){
 			sql= "SELECT IFNULL(CORPUS_OVERAGE,0) AS MONEY ,0 AS MONEYNOTAX,0 AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCI.ID CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.ID INNER 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 LFRA.FLOWUNID=:FLOWUNID";
 		}
 		//��ǰ����-����δʵ����Ϣ����(����˰��)
@@ -69,8 +69,8 @@ public class CreateVoucherContractTerminate {
 			if("".equals(MONEY)||MONEY==null) MONEY="0.00";
 			double mon=Double.parseDouble(MONEY);
 			if(mon>0){
-				MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString();
-				MONEYTAX=dataList.get(i).get("MONEYTAX").toString();
+			MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString();
+			MONEYTAX=dataList.get(i).get("MONEYTAX").toString();
 			ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE").toString();
 			FACT_DATE =dataList.get(i).get("FACT_DATE").toString();
 			CONTRACT_ID=dataList.get(i).get("CONTRACT_ID").toString();
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java
index fa17bbba7..7e21a43b4 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java
@@ -13,114 +13,120 @@ import com.tenwa.comm.util.jboutil.DataOperatorUtil;
 import com.tenwa.flow.baseBussion.BaseBussiness;
 import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
 
-public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness{
+public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness {
 
-	public String CreateVoucher(String FlowUnid,String VOUCHERNO,String FeeType) throws Exception {
+	public String CreateVoucher(String FlowUnid, String VOUCHERNO, String FeeType) throws Exception {
+
+		Transaction Sqlca = null;
+		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> param = new HashMap<String, String>();
+		Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
 		
-		Transaction Sqlca =null;
-		Map<String,String> map=new HashMap<String, String>();
-		Map<String,String> param=new HashMap<String, String>();
-		Sqlca =  Transaction.createTransaction(CacheLoaderFactory.getDataSource());
-		String MONEY=null;
-		String MONEYNOTAX=null;
-		String MONEYTAX=null;
-		String ACCOUNT_DATE=null;
-		String FACT_DATE=null;
-		String CONTRACT_ID=null;
-		String CONTRACT_NUMBER=null;
-		String PROJECT_NAME=null;
-		String leas_form=null;
-		String DISTRIBUTOR_ID=null;
-		String DISTRIBUTOR_NAME=null;	
-		String CARID=null;
-		String CARMODEL=null;
-		String CUSTID=null;
-		String CUSTNAME=null;
-		String CUSTOMERTYPE=null;
-		String BUSINESSTYPE=null;
-		String ACC_NUM=null;
-		String sql="";
+		String MONEY = null;
+		String MONEYNOTAX = null;
+		String MONEYTAX = null;
+		String ACCOUNT_DATE = null;
+		String FACT_DATE = null;
+		String CONTRACT_ID = null;
+		String CONTRACT_NUMBER = null;
+		String PROJECT_NAME = null;
+		String leas_form = null;
+		String DISTRIBUTOR_ID = null;
+		String DISTRIBUTOR_NAME = null;
+		String CARID = null;
+		String CARMODEL = null;
+		String CUSTID = null;
+		String CUSTNAME = null;
+		String CUSTOMERTYPE = null;
+		String BUSINESSTYPE = null;
+		String ACC_NUM = null;
+		String sql = "";
 		param.clear();
 		map.put("FlowUnid", FlowUnid);
 		map.put("FEE_TYPE", FeeType);
 		
-		sql= "SELECT LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY/1.06,2) AS MONEYNOTAX,(LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/1.06,2)) AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LFIT.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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID=LCI.ID 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.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID ";
-		
-		List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);
+		//sql= "SELECT LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY/1.06,2)AS MONEYNOTAX,(LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/1.06,2)) AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LFIT.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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID=LCI.ID 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.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID AND DATE_FORMAT(LFIT.FACT_DATE,'%Y/%m')=DATE_FORMAT(SYSDATE(),'%Y/%m')";
+		sql = "SELECT LFIT.FACT_MONEY AS MONEY,ROUND(LFIT.FACT_MONEY/1.06,2) AS MONEYNOTAX,(LFIT.FACT_MONEY-ROUND(LFIT.FACT_MONEY/1.06,2)) AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LFIT.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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE,LFIT.ACC_NUMBER FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID=LCI.ID 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.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID ";
+		// ��ѯsql, ���������װ��list������
+		List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map);
 
-		CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl();
-		String VOUCHER_TYPE="1";// ƾ֤���� 	���
-		String userid ="admin";
-		for (int i=0;i<dataList.size();i++){
-			MONEY=dataList.get(i).get("MONEY").toString();
-			if("".equals(MONEY)||MONEY==null) MONEY="0.00";
-			double mon=Double.parseDouble(MONEY);
-			if(mon>0){
-				MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString();
-				MONEYTAX=dataList.get(i).get("MONEYTAX").toString();
-			ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE").toString();
-			FACT_DATE =dataList.get(i).get("FACT_DATE").toString();
-			CONTRACT_ID=dataList.get(i).get("CONTRACT_ID").toString();
-			CONTRACT_NUMBER=dataList.get(i).get("CONTRACT_NUMBER").toString();
-			PROJECT_NAME=dataList.get(i).get("PROJECT_NAME").toString();
-			leas_form=dataList.get(i).get("LEAS_FORM").toString();
-			DISTRIBUTOR_ID=dataList.get(i).get("DISTRIBUTOR_ID");
-			DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME");
-			CARID=dataList.get(i).get("CARID");
-			CARMODEL=dataList.get(i).get("MODEL");
-			CUSTID=dataList.get(i).get("CUSTOMERID");
-			CUSTNAME=dataList.get(i).get("CUSTOMERNAME");
-			CUSTOMERTYPE=dataList.get(i).get("CUSTOMERTYPE");
-			BUSINESSTYPE=dataList.get(i).get("BUSINESSTYPE");
-			ACC_NUM=dataList.get(i).get("ACC_NUMBER");
-			
-			param.put("FACT_MONEY",MONEY);
-			param.put("INTERESTNOTAX",MONEYNOTAX);
-			param.put("TAX",MONEYTAX);
-        	param.put("ACCOUNT_DATE",ACCOUNT_DATE);
-        	param.put("FACT_DATE",FACT_DATE);
-        	param.put("CONTRACT_ID",CONTRACT_ID);
-        	param.put("CONTRACT_NUMBER",CONTRACT_NUMBER);
-        	param.put("PROJECT_NAME",PROJECT_NAME);
-        	param.put("LEAS_FORM",leas_form);
-        	param.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID);
-        	param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME);
-        	param.put("CARID",CARID);
-        	param.put("CARMODEL",CARMODEL);
-        	param.put("CUSTID",CUSTID);
-        	param.put("CUSTNAME",CUSTNAME);
-        	param.put("CUSTOMERTYPE",CUSTOMERTYPE);
-        	param.put("BUSINESSTYPE",BUSINESSTYPE);
-        	param.put("ACC_NUMBER",ACC_NUM);
-        	
-        	if("1".equals(BUSINESSTYPE)){
-        		param.put("LEASFORMASSET", "04"); // ���������ʲ�
-            	param.put("DEPT", "02"); // ����
-            	if("03".equals(CUSTOMERTYPE)){ // ����Ǹ���ҵ��
-            		param.put("LEASINCOMEFORM", "02"); // C��
-            	}else if("01".equals(CUSTOMERTYPE)){
-            		param.put("LEASINCOMEFORM", "01"); // B��
-            	}
-            }
-            //param.put("FUNDTYPE", ""); // ��Ӫ����
-            param.put("BUSINESSTYPE", "06");
-        	
-        	param.put("FlowUnid", FlowUnid);
-        	map.clear();
-        	map.put("PROJ_TYPE", leas_form);
-        	map.put("VOUCHER_NO", VOUCHERNO);
-        	BizObject vouch=DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca);
-        	
-        	if(vouch!=null){
-        	 	vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(), vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid,param, Sqlca);
-            }}
+		CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl();
+		String VOUCHER_TYPE = "1";// ƾ֤���� ���
+		String userid = "admin";
+		//������ȡ�����, �����д��map��
+		for (int i = 0; i < dataList.size(); i++) {
+			MONEY = dataList.get(i).get("MONEY").toString();
+			if ("".equals(MONEY)||MONEY == null)MONEY = "0.00";
+			double mon = Double.parseDouble(MONEY);
+			// �ж��н��, ��װֵ��map��
+			if (Math.abs(mon) > 0) {
+				MONEYNOTAX = dataList.get(i).get("MONEYNOTAX").toString();
+				MONEYTAX = dataList.get(i).get("MONEYTAX").toString();
+				ACCOUNT_DATE = dataList.get(i).get("ACCOUNT_DATE").toString();
+				FACT_DATE = dataList.get(i).get("FACT_DATE").toString();
+				CONTRACT_ID = dataList.get(i).get("CONTRACT_ID").toString();
+				CONTRACT_NUMBER = dataList.get(i).get("CONTRACT_NUMBER").toString();
+				PROJECT_NAME = dataList.get(i).get("PROJECT_NAME").toString();
+				leas_form = dataList.get(i).get("LEAS_FORM").toString();
+				DISTRIBUTOR_ID = dataList.get(i).get("DISTRIBUTOR_ID");
+				DISTRIBUTOR_NAME = dataList.get(i).get("DISTRIBUTOR_NAME");
+				CARID = dataList.get(i).get("CARID");
+				CARMODEL = dataList.get(i).get("MODEL");
+				CUSTID = dataList.get(i).get("CUSTOMERID");
+				CUSTNAME = dataList.get(i).get("CUSTOMERNAME");
+				CUSTOMERTYPE = dataList.get(i).get("CUSTOMERTYPE");
+				BUSINESSTYPE = dataList.get(i).get("BUSINESSTYPE");
+				ACC_NUM = dataList.get(i).get("ACC_NUMBER");
+
+				param.put("FACT_MONEY", MONEY);
+				param.put("INTERESTNOTAX", MONEYNOTAX);
+				param.put("TAX", MONEYTAX);
+				param.put("ACCOUNT_DATE", ACCOUNT_DATE);
+				param.put("FACT_DATE", FACT_DATE);
+				param.put("CONTRACT_ID", CONTRACT_ID);
+				param.put("CONTRACT_NUMBER", CONTRACT_NUMBER);
+				param.put("PROJECT_NAME", PROJECT_NAME);
+				param.put("LEAS_FORM", leas_form);
+				param.put("DISTRIBUTOR_ID", DISTRIBUTOR_ID);
+				param.put("DISTRIBUTOR_NAME", DISTRIBUTOR_NAME);
+				param.put("CARID", CARID);
+				param.put("CARMODEL", CARMODEL);
+				param.put("CUSTID", CUSTID);
+				param.put("CUSTNAME", CUSTNAME);
+				param.put("CUSTOMERTYPE", CUSTOMERTYPE);
+				param.put("BUSINESSTYPE", BUSINESSTYPE);
+				param.put("ACC_NUMBER", ACC_NUM);
+				
+				if ("1".equals(BUSINESSTYPE)) {
+					param.put("LEASFORMASSET", "04"); // ���������ʲ�
+					param.put("DEPT", "02"); // ����
+					if ("03".equals(CUSTOMERTYPE)) { // ����Ǹ���ҵ��
+						param.put("LEASINCOMEFORM", "02"); // C��
+					} else if ("01".equals(CUSTOMERTYPE)) {
+						param.put("LEASINCOMEFORM", "01"); // B��
+					}
+				}
+				// param.put("FUNDTYPE", ""); // ��Ӫ����
+				param.put("BUSINESSTYPE", "06");
+				param.put("FlowUnid", FlowUnid);
+				map.clear();
+				map.put("PROJ_TYPE", leas_form);
+				map.put("VOUCHER_NO", VOUCHERNO);
+				// ����map�еIJ���, ��ѯLV_VOUCHER_CONFIG������
+				BizObject vouch = DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca);
+				// ����������, 
+				if (vouch != null) {
+					//������ƾ֤�IJ�����������һ��
+					vs.createVoucher(vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid, param,Sqlca);
+				}
+			}
 		}
-		
-		if(Sqlca!=null){
+
+		if (Sqlca != null) {
 			Sqlca.commit();
 		}
-		
-        String sMessage="true"; 
+
+		String sMessage = "true";
 		return sMessage;
 	}
 }
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java
index d210a0ec9..b530b582e 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java
@@ -42,7 +42,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
 				+ " DDIT LEFT JOIN DISTRIBUTOR_INFO DIF ON DIF.DISTRIBUTOR_NO=DDIT.DISTRIBUTOR_ID "
 				+ "WHERE DDIT.FLOWUNID=:FLOWUNID";
 		}
-		if("PZ2018072100000032".equals(VOUCHERNO)||"PZ2018080400000088".equals(VOUCHERNO)){
+		if("PZ2018072100000032".equals(VOUCHERNO)||"PZ2018080400000088".equals(VOUCHERNO)||"PZ2018080400000098".equals(VOUCHERNO)){
 			sql= "SELECT DDIT.CAUTION_MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d')"
 				+ " AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') "
 				+ "AS FACT_DATE,DDIT.payer,DIF.DISTRIBUTOR_CODING DISTRIBUTOR_NO,"
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceSettlement.java
index f6977926e..74394a3fc 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceSettlement.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherInsuranceSettlement.java
@@ -27,7 +27,9 @@ public class CreateVoucherInsuranceSettlement{
 		Map<String,String> param=new HashMap<String, String>();
 		
 		String MONEY=null;
-		String FEEMONEY=null;
+		String MONEYNOTAX=null;
+		String MONEYTAX=null;
+		String RENTMONEY=null;
 		String ACCOUNT_DATE=null;
 		String FACT_DATE=null;
 		String CONTRACT_ID=null;
@@ -46,7 +48,11 @@ public class CreateVoucherInsuranceSettlement{
 		String sql="";
 		String moneyType="MONEY";
 		
-		sql="SELECT lic.claims_money AS MONEY,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS FACT_DATE,lii.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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LB_INSURANCE_CLAIM lic inner  join LB_INSURANCE_INFO lii on lic.INSURANCE_ID=lii.INSURANCE_ID LEFT JOIN LB_CONTRACT_INFO LCI ON lii.CONTRACT_ID=LCI.ID 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 DATE_FORMAT(lic.inputtime,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')";
+		if("PZ2018080600000114".equals(voucherNo)){
+			sql="SELECT lic.claims_money AS MONEY,ROUND(nvl(LrIT.penalty / 1.06, 0),2) AS MONEYNOTAX,ROUND(nvl(LrIT.penalty,0),2) - ROUND(nvl(LrIT.penalty / 1.06, 0),2) AS MONEYTAX,ROUND(nvl(LrIT.RENT,0),2) AS RENTMONEY,DATE_FORMAT(claims_start_date, '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(claims_start_date, '%Y/%m/%d') AS FACT_DATE,lii.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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LB_INSURANCE_CLAIM lic INNER JOIN LB_INSURANCE_INFO lii ON lic.INSURANCE_ID = lii.INSURANCE_ID LEFT JOIN LB_CONTRACT_INFO LCI ON lii.CONTRACT_ID = LCI.ID LEFT JOIN LC_rent_INCOME_temp LrIT ON LrIT.`CONTRACT_ID`=LCI.ID 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 DATE_FORMAT(lic.inputtime, '%Y/%m') = DATE_FORMAT(SYSDATE(), '%Y/%m')";
+		}else{
+			sql="SELECT lic.claims_money AS MONEY,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS FACT_DATE,lii.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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LB_INSURANCE_CLAIM lic inner  join LB_INSURANCE_INFO lii on lic.INSURANCE_ID=lii.INSURANCE_ID LEFT JOIN LB_CONTRACT_INFO LCI ON lii.CONTRACT_ID=LCI.ID 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 DATE_FORMAT(lic.inputtime,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')";
+		}
 	
 		List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);
 
@@ -56,10 +62,12 @@ public class CreateVoucherInsuranceSettlement{
 		for (int i=0;i<dataList.size();i++){
 			
 			MONEY=dataList.get(i).get(moneyType).toString();
-			//FEEMONEY=dataList.get(i).get(FEEMONEY).toString();
 			if("".equals(MONEY)||MONEY==null) MONEY="0.00";
 			double mon=Double.parseDouble(MONEY);
 			if(mon>0){
+			MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString();
+			MONEYTAX=dataList.get(i).get("MONEYTAX").toString();
+			RENTMONEY=dataList.get(i).get("RENTMONEY").toString();
 			ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE").toString();
 			FACT_DATE =dataList.get(i).get("FACT_DATE").toString();
 			CONTRACT_ID=dataList.get(i).get("CONTRACT_ID").toString();
@@ -76,7 +84,9 @@ public class CreateVoucherInsuranceSettlement{
 			BUSINESSTYPE=dataList.get(i).get("BUSINESSTYPE");
 			
 			param.put("FACT_MONEY",MONEY);
-			//param.put("FACT_MONEY",FEEMONEY);
+			param.put("INTERESTNOTAX",MONEYNOTAX);
+			param.put("TAX",MONEYTAX);
+			param.put("RENTMONEY",RENTMONEY);
         	param.put("ACCOUNT_DATE",ACCOUNT_DATE);
         	param.put("FACT_DATE",FACT_DATE);
         	param.put("CONTRACT_ID",CONTRACT_ID);
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java
index 23352b077..91511b474 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java
@@ -20,8 +20,8 @@ public class CleanLeaseMoney implements VoucherJavaParamService {
 		String FIRST_PAYMENT=param.get("FIRST_PAYMENT")==null?"0.00":param.get("FIRST_PAYMENT");
 		BigDecimal factmoney=new BigDecimal(EQUIP_AMT).subtract(new BigDecimal(FIRST_PAYMENT));
 		returnValue.putAll(param);
+		returnValue.put("FUNDTYPE","01");
 		returnValue.put("MONEY",factmoney.toString());
 		return returnValue;
 	}
-
 }
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCapitalToTaxToJust.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCapitalToTaxToJust.java
index 3fb080deb..0754e365c 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCapitalToTaxToJust.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCapitalToTaxToJust.java
@@ -19,8 +19,9 @@ public class ContractCapitalToTaxToJust implements VoucherJavaParamService{
 		String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT");
 		String tax="1.06";
 		BigDecimal divisor= new BigDecimal(tax);
-		BigDecimal sumMoney=new BigDecimal(FIRST_PAYMENT).subtract(new BigDecimal(EQUIP_AMT));
+		BigDecimal sumMoney=new BigDecimal(EQUIP_AMT).subtract(new BigDecimal(FIRST_PAYMENT));
 		BigDecimal taxMoney=sumMoney.subtract(sumMoney.divide(divisor, 2, BigDecimal.ROUND_HALF_UP));
+		returnValue.put("FUNDTYPE","01");
 		returnValue.put("MONEY",taxMoney.toString());
 		return returnValue;
 	}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractEquipToJust.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractEquipToJust.java
index b462a660e..a120361b4 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractEquipToJust.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractEquipToJust.java
@@ -15,6 +15,7 @@ public class ContractEquipToJust implements VoucherJavaParamService{
 			Map<String, String> param) throws BusinessException {
 		Map<String,String>returnValue=new HashMap<String,String>();
 		returnValue.putAll(param);
+		returnValue.put("FUNDTYPE","01");
 		returnValue.put("MONEY",param.get("EQUIP_AMT"));
 		return returnValue;
 	}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractMoneyToRent.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractMoneyToRent.java
new file mode 100644
index 000000000..56dfbf9ce
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractMoneyToRent.java
@@ -0,0 +1,23 @@
+package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan;
+
+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 ContractMoneyToRent implements VoucherJavaParamService{
+
+	@Override
+	public Map<String, String> getJavaParam(JBOTransaction tx,
+			Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		returnValue.putAll(param);
+		returnValue.put("MONEY",param.get("RENTMONEY"));
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundGPSFee.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundGPSFee.java
index a2be1230d..5896ca7b6 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundGPSFee.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundGPSFee.java
@@ -14,6 +14,7 @@ public class FundGPSFee implements VoucherJavaParamService{
 			Map<String, String> param) throws BusinessException {
 		Map<String,String>returnValue=new HashMap<String,String>();
 		returnValue.putAll(param);
+		returnValue.put("FUNDTYPE","01");
 		returnValue.put("MONEY",param.get("GPS_FEE_FINANCE"));
 		return returnValue;
 	}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java
index 617c5d73d..efb5ff60b 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java
@@ -23,7 +23,10 @@ public class OtherFee implements VoucherJavaParamService{
 		String INCIDENTAL=param.get("INCIDENTAL")==null?"0.00":param.get("INCIDENTAL");
 		// װ���
 		String TABLEWARE_FEE=param.get("TABLEWARE_FEE")==null?"0.00":param.get("TABLEWARE_FEE");
-		BigDecimal factmoney=new BigDecimal(INSURANCE_PREMIUM).add(new BigDecimal(PURCHASE_TAX)).add(new BigDecimal(INCIDENTAL)).add(new BigDecimal(TABLEWARE_FEE));
+		BigDecimal factmoney=new BigDecimal(INSURANCE_PREMIUM)
+				.add(new BigDecimal(PURCHASE_TAX))
+				.add(new BigDecimal(INCIDENTAL))
+				.add(new BigDecimal(TABLEWARE_FEE));
 		returnValue.putAll(param);
 		returnValue.put("FUNDTYPE","01");
 		returnValue.put("MONEY",factmoney.toString());
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeAddGps.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeAddGps.java
new file mode 100644
index 000000000..bb0792e2f
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeAddGps.java
@@ -0,0 +1,32 @@
+package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan;
+
+import java.math.BigDecimal;
+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;
+/**
+ * ����˰+����+GPS+װ��װ��
+ * @author xiezhiwen
+ */
+public class OtherFeeAddGps implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx,
+			Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM");
+		String PURCHASE_TAX=param.get("PURCHASE_TAX")==null?"0.00":param.get("PURCHASE_TAX");
+		String GPS_FEE_FINANCE=param.get("GPS_FEE_FINANCE")==null?"0.00":param.get("GPS_FEE_FINANCE");
+		String TABLEWARE_FEE=param.get("TABLEWARE_FEE")==null?"0.00":param.get("TABLEWARE_FEE");
+		BigDecimal factmoney=new BigDecimal(INSURANCE_PREMIUM)
+				.add(new BigDecimal(PURCHASE_TAX))
+				.add(new BigDecimal(GPS_FEE_FINANCE))
+				.add(new BigDecimal(TABLEWARE_FEE));
+		returnValue.putAll(param);
+		returnValue.put("FUNDTYPE","01");
+		returnValue.put("MONEY",factmoney.toString());
+		return returnValue;
+	}
+
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeMoneyToLoan.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeMoneyToLoan.java
new file mode 100644
index 000000000..33489251b
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeMoneyToLoan.java
@@ -0,0 +1,28 @@
+package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan;
+
+import java.math.BigDecimal;
+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;
+/**
+ * ����˰+����+GPS
+ * @author xiezhiwen
+ */
+public class OtherFeeMoneyToLoan implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx,
+			Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM");
+		String PURCHASE_TAX=param.get("PURCHASE_TAX")==null?"0.00":param.get("PURCHASE_TAX");
+		String GPS_FEE_FINANCE=param.get("GPS_FEE_FINANCE")==null?"0.00":param.get("GPS_FEE_FINANCE");
+		BigDecimal factmoney=new BigDecimal(INSURANCE_PREMIUM).add(new BigDecimal(PURCHASE_TAX)).add(new BigDecimal(GPS_FEE_FINANCE));
+		returnValue.putAll(param);
+		returnValue.put("FUNDTYPE","01");
+		returnValue.put("MONEY",factmoney.toString());
+		return returnValue;
+	}
+
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFees.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFees.java
new file mode 100644
index 000000000..4dad7805e
--- /dev/null
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFees.java
@@ -0,0 +1,34 @@
+package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan;
+
+import java.math.BigDecimal;
+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;
+/**
+ * ����˰/����/GPS/װ��װ���
+ * @author xiezhiwen
+ */
+public class OtherFees implements VoucherJavaParamService{
+	public Map<String, String> getJavaParam(JBOTransaction tx,
+			Map<String, String> param) throws BusinessException {
+		Map<String,String>returnValue=new HashMap<String,String>();
+		// ���շ�
+		String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM");
+		// ����˰
+		String PURCHASE_TAX=param.get("PURCHASE_TAX")==null?"0.00":param.get("PURCHASE_TAX");
+		// �ӷ�
+		String INCIDENTAL=param.get("INCIDENTAL")==null?"0.00":param.get("INCIDENTAL");
+		// װ���
+		String TABLEWARE_FEE=param.get("TABLEWARE_FEE")==null?"0.00":param.get("TABLEWARE_FEE");
+		// gps
+		String GPS_FEE_FINANCE=param.get("GPS_FEE_FINANCE")==null?"0.00":param.get("GPS_FEE_FINANCE");
+		BigDecimal factmoney=new BigDecimal(INSURANCE_PREMIUM).add(new BigDecimal(PURCHASE_TAX)).add(new BigDecimal(INCIDENTAL)).add(new BigDecimal(TABLEWARE_FEE)).add(new BigDecimal(GPS_FEE_FINANCE));
+		returnValue.putAll(param);
+		returnValue.put("FUNDTYPE","01");
+		returnValue.put("MONEY",factmoney.toString());
+		return returnValue;
+	}
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoneyToJust.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeMoneyToJust.java
similarity index 85%
rename from src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoneyToJust.java
rename to src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeMoneyToJust.java
index e95bc1883..515772381 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoneyToJust.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeMoneyToJust.java
@@ -11,19 +11,22 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
  * ����-�׸���+����˰+����+GPS+װ��װ��
  * @author xiezhiwen
  */
-public class SynthesizeLeaseMoneyToJust implements VoucherJavaParamService{
+public class SynthesizeMoneyToJust implements VoucherJavaParamService{
 	public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
 		Map<String,String>returnValue=new HashMap<String,String>();
 		String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT");
 		String FIRST_PAYMENT=param.get("FIRST_PAYMENT")==null?"0.00":param.get("FIRST_PAYMENT");
-		//����-�׸���
 		BigDecimal factmoney1=new BigDecimal(EQUIP_AMT).subtract(new BigDecimal(FIRST_PAYMENT));
+		
 		String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM");
 		String PURCHASE_TAX=param.get("PURCHASE_TAX")==null?"0.00":param.get("PURCHASE_TAX");
-		String TABLEWARE_FEE=param.get("TABLEWARE_FEE")==null?"0.00":param.get("TABLEWARE_FEE");
 		String GPS_FEE_FINANCE=param.get("GPS_FEE_FINANCE")==null?"0.00":param.get("GPS_FEE_FINANCE");
+		String TABLEWARE_FEE=param.get("TABLEWARE_FEE")==null?"0.00":param.get("TABLEWARE_FEE");
 		// ���ֿ������
-		BigDecimal factmoney=factmoney1.add(new BigDecimal(INSURANCE_PREMIUM)).add(new BigDecimal(PURCHASE_TAX)).add(new BigDecimal(TABLEWARE_FEE)).add(new BigDecimal(GPS_FEE_FINANCE));
+		BigDecimal factmoney=factmoney1.add(new BigDecimal(INSURANCE_PREMIUM))
+				.add(new BigDecimal(PURCHASE_TAX))
+				.add(new BigDecimal(TABLEWARE_FEE))
+				.add(new BigDecimal(GPS_FEE_FINANCE));
 		returnValue.putAll(param);
 		returnValue.put("MONEY",factmoney.toString());
 		return returnValue;
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java
index f21b05295..aa58c38d2 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java
@@ -11,7 +11,7 @@ public class CautionMoneyVoucher extends BaseBussiness {
 		String FlowUnid=this.getAttribute("FlowUnid").toString();
 		CreateVoucherCustCautionMoneyIncome cvcc=new CreateVoucherCustCautionMoneyIncome();
 		cvcc.CreateVoucher(FlowUnid, "PZ2018072400000059", "feetype17");//�˻ر�֤��--����
-		cvcc.CreateVoucher(FlowUnid, "PZ2018080400000075", "feetype17");//�˻ر�֤��--ֱ��
+		cvcc.CreateVoucher(FlowUnid, "PZ2018080400000075", "feetype17");//�˻��û���֤��--ֱ��
 		return "true";
 	}
-}
+}
\ No newline at end of file
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java
index 0fcfc8a0b..ed5ffb64e 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucher.java
@@ -2,14 +2,13 @@ package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle;
 
 import com.amarsoft.awe.util.Transaction;
 import com.tenwa.flow.baseBussion.BaseBussiness;
-import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherCustCautionMoneyIncome;
 import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherCustomerRentOrFee;
 import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherHandlingMoney;
 import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoanDistributor;
+import com.tenwa.voucher.service.VoucherJavaParamService;
 
 public class ContractOnhireVoucher  extends BaseBussiness {
 
-	@Override
 	public Object run(Transaction Sqlca) throws Exception {
 		this.initBussinessParam(Sqlca);
 		String FlowUnid=this.getAttribute("FlowUnid").toString();
@@ -25,12 +24,11 @@ public class ContractOnhireVoucher  extends BaseBussiness {
 		
 		cvld.CreateVoucher(FlowUnid, "PZ2018071000000006");//�������̷ſ��ֿͻ���֤��--����
 		cvld.CreateVoucher(FlowUnid, "PZ2018080300000071");//�������̷ſ��ֿͻ���֤��--ֱ��
+		cvld.CreateVoucher(FlowUnid, "PZ2018073100000062");//��¼�������̷ſ�-����������˰/����/װ��װ��ȣ� --����
+		cvld.CreateVoucher(FlowUnid, "PZ2018080300000066");//��¼�������̷ſ�-����������˰/����/װ��װ��ȣ�--ֱ��
 		
-		cvld.CreateVoucher(FlowUnid, "PZ2018073100000062");//����˰+����+װ�� --����
-		cvld.CreateVoucher(FlowUnid, "PZ2018080300000066");//����˰+����+װ�� --ֱ��
-		
-		cvld.CreateVoucher(FlowUnid, "PZ2018073100000061");//GPS--����
-		cvld.CreateVoucher(FlowUnid, "PZ2018080300000068");//GPS--ֱ��
+		cvld.CreateVoucher(FlowUnid, "PZ2018073100000061");//��¼�������̷ſ�-GPS--����
+		cvld.CreateVoucher(FlowUnid, "PZ2018080300000068");//��¼�������̷ſ�-GPS--ֱ��
 		
 		CreateVoucherCustomerRentOrFee cvcr=new CreateVoucherCustomerRentOrFee();
 		cvcr.CreateVoucher(FlowUnid, "PZ2018071000000005");//�ͻ�֧����Ӧ���˿��ܽ��
@@ -39,16 +37,17 @@ public class ContractOnhireVoucher  extends BaseBussiness {
 		cvcr.CreateVoucher(FlowUnid, "PZ2018071100000010");//�������̷ſ�-��������󶨿���--����
 		cvcr.CreateVoucher(FlowUnid, "PZ2018080300000074");//�������̷ſ�-��������󶨿���--ֱ��
 		
+		cvcr.CreateVoucher(FlowUnid, "PZ2018080600000116");//�������̷ſ�-���մ�������--ֱ��
+		
 		CreateVoucherHandlingMoney cvhl=new CreateVoucherHandlingMoney();
 		cvhl.CreateVoucher(FlowUnid, "PZ2018071000000007");//�������̷ſ���ȷ�����������루һ����ȷ�����룩--����
-		cvhl.CreateVoucher(FlowUnid, "PZ2018080300000072");//�������̷ſ���ȷ�����������루һ����ȷ�����룩--����
+		cvhl.CreateVoucher(FlowUnid, "PZ2018080300000072");//�������̷ſ���ȷ�����������루һ����ȷ�����룩--ֱ��
 		
-		cvhl.CreateVoucher(FlowUnid, "PZ2018071000000009");//�������̷ſ���ȷ���յ������ѣ����·�̯���룩--ֱ��
-		cvhl.CreateVoucher(FlowUnid, "PZ2018080300000073");//�������̷ſ���ȷ���յ������ѣ����·�̯���룩--����
+		cvhl.CreateVoucher(FlowUnid, "PZ2018071000000009");//�������̷ſ���ȷ���յ������ѣ����·�̯���룩--����
+		cvhl.CreateVoucher(FlowUnid, "PZ2018080300000073");//�������̷ſ���ȷ���յ������ѣ����·�̯���룩--ֱ��
 		
 		//CreateVoucherCustCautionMoneyIncome cvci=new CreateVoucherCustCautionMoneyIncome();
 		
 		return "true";
 	}
-
 }
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractTerminate.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractTerminate.java
index d664674c3..42395974b 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractTerminate.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractTerminate.java
@@ -3,7 +3,11 @@ package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle;
 import com.amarsoft.awe.util.Transaction;
 import com.tenwa.flow.baseBussion.BaseBussiness;
 import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherContractTerminate;
-
+import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherCustomerRentOrFee;
+/**
+ * �ؿ�
+ * @author xiezhiwen
+ */
 public class ContractTerminate extends BaseBussiness {
 
 	@Override
@@ -24,6 +28,9 @@ public class ContractTerminate extends BaseBussiness {
 		cvct.CreateVoucher(FlowUnid, "PZ2018072100000046");//δʵ�ֵ���Ϣ��˰��--����
 		cvct.CreateVoucher(FlowUnid, "PZ2018080400000100");//δʵ�ֵ���Ϣ��˰��--ֱ��
 		
+		CreateVoucherCustomerRentOrFee cvcr = new CreateVoucherCustomerRentOrFee();
+		cvcr.CreateVoucher(FlowUnid, "PZ2018080600000117");//�յ����մ�����--ֱ��
+		
 		return "true";
 	}
 }
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java
index f28e1ccf3..5785427b9 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java
@@ -25,13 +25,8 @@ public class IncomeVoucher extends BaseBussiness {
 		
 		cvci.CreateVoucher(FlowUnid, "PZ2018072100000028", "feetype27");//��Ϣ--����
 		cvci.CreateVoucher(FlowUnid, "PZ2018080400000085", "feetype27");//��Ϣ--ֱ��
-
-		
-		/*CreateVoucherRentIncome cvri=new CreateVoucherRentIncome();
-		cvri.CreateVoucher(FlowUnid, "PZ2018072100000024");//�յ����
-		cvri.CreateVoucher(FlowUnid, "PZ2018072100000025");//�յ�������Ϣ
-*/		
 		
+		cvci.CreateVoucher(FlowUnid, "PZ2018080400000103", "feetype27");//ȷ����Ϣ����--ֱ��
 		return "true";
 	}
 
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java
index 4082eb2f5..7cd955724 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java
@@ -2,7 +2,11 @@ package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle;
 
 import com.amarsoft.awe.util.Transaction;
 import com.tenwa.flow.baseBussion.BaseBussiness;
+import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherContractTerminate;
 import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherCustCautionMoneyIncome;
+import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherCustomerRentOrFee;
+import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherDistCautionMoneyRe;
+import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherInsuranceSettlement;
 import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRedRentIncome;
 import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherRentIncome;
 
@@ -22,13 +26,12 @@ public class RedIncomeVoucher extends BaseBussiness {
 		cvci.CreateVoucher(FlowUnid, "PZ2018080400000090", "feetype1");//�ؿ��-ȷ���յ������ѣ����·�̯����--ֱ��
 		
 		cvci.CreateVoucher(FlowUnid, "PZ2018072100000043", "feetype4");//�ؿ��-�յ��������--����
-		cvci.CreateVoucher(FlowUnid, "PZ2018080400000097", "feetype4");//�ؿ��-�յ��������--����
+		cvci.CreateVoucher(FlowUnid, "PZ2018080400000097", "feetype4");//�ؿ��-�յ��������--ֱ��
 		
 		cvci.CreateVoucher(FlowUnid, "PZ2018072100000041", "feetype27");//�ؿ��-�յ�����Ϣ--����
 		cvci.CreateVoucher(FlowUnid, "PZ2018080400000095", "feetype27");//�ؿ��-�յ�����Ϣ--ֱ��
 		
 		
-		
 		CreateVoucherRedRentIncome cvri=new CreateVoucherRedRentIncome();
 		cvri.CreateVoucher(FlowUnid, "PZ2018072100000037");//�յ������--����
 		cvri.CreateVoucher(FlowUnid, "PZ2018080400000091");//�յ������--ֱ��
@@ -36,6 +39,22 @@ public class RedIncomeVoucher extends BaseBussiness {
 		cvri.CreateVoucher(FlowUnid, "PZ2018072100000038");//�յ�������Ϣ--����
 		cvri.CreateVoucher(FlowUnid, "PZ2018080400000092");//�յ�������Ϣ--ֱ��
 		
+		
+		CreateVoucherContractTerminate cvct=new CreateVoucherContractTerminate();
+		cvct.CreateVoucher(FlowUnid, "PZ2018080400000094");//�յ�����ǰ����--ֱ��
+		cvct.CreateVoucher(FlowUnid, "PZ2018080400000093");//�յ���ΥԼ��/����--ֱ��
+		
+		CreateVoucherInsuranceSettlement cvis=new CreateVoucherInsuranceSettlement();
+		cvis.CreateVoucher("PZ2018080400000096");//�յ����Ᵽ�շ� --ֱ��
+		
+		
+		CreateVoucherCustomerRentOrFee cvcr = new CreateVoucherCustomerRentOrFee();
+		cvcr.CreateVoucher(FlowUnid, "PZ2018080400000077");//�յ����մ�����--ֱ��
+		
+		
+		CreateVoucherDistCautionMoneyRe cvdc=new CreateVoucherDistCautionMoneyRe();
+		cvdc.CreateVoucher(FlowUnid, "PZ2018080400000098");//�յ������̱�֤��--ֱ��
+		
 		return "true";
 	}
 }
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java
index 563984db3..e12e2990f 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java
@@ -47,7 +47,7 @@ public class CreateVoucherMonthSettlement{
 		String moneyType="MONEY";
 		if("PZ2018071200000017".equals(voucherNo)||"PZ2018080400000104".equals(voucherNo)) moneyType="FEEMONEY";
 		if("PZ2018071200000016".equals(voucherNo)||"PZ2018080400000102".equals(voucherNo)) moneyType="MONEY";
-		sql="SELECT CRM.INTEREST AS MONEY,CRM.FEE AS FEEMONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,CRM.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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID=LCI.ID 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 DATE_FORMAT(STR_TO_DATE(CRM.END_DATE,'%Y/%m/%d'),'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')";
+		sql="SELECT ROUND(CRM.INTEREST/1.06,2) AS MONEY,CRM.FEE AS FEEMONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,CRM.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.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID=LCI.ID 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 DATE_FORMAT(STR_TO_DATE(CRM.END_DATE,'%Y/%m/%d'),'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')";
 		//������Ϣ˰��
 		if("PZ2018072100000055".equals(voucherNo)){
 			sql="SELECT LRP.INTEREST-ROUND(LRP.INTEREST/1.06,2) AS MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCI.ID AS CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_RENT_PLAN LRP INNER JOIN LB_CONTRACT_INFO LCI ON  LCI.ID=LRP.CONTRACT_ID INNER 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 DATE_FORMAT(SYSDATE(),'%Y/%m/%d')=DATE_FORMAT(STR_TO_DATE(LRP.PLAN_DATE,'%Y/%m/%d'),'%Y/%m/%d')";
diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
index 99ab5a0c9..9cd9a0082 100644
--- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
+++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
@@ -104,6 +104,7 @@ public class CreateVoucherServiceImpl {
 		}
 		param.put("VOUCHER_TYPE",voucherType);
 		BizObject user=JBOFactory.createBizObjectQuery(USER_INFO.CLASS_NAME, "USERID='"+userid+"'").getSingleResult(false);
+		// ���÷�������ƾ֤��Ϣ
 		this.createVoucher(tx, param,user);
 	}
 	
@@ -115,8 +116,8 @@ public class CreateVoucherServiceImpl {
 	 */
 	@SuppressWarnings("unchecked")
 	private void createVoucher(JBOTransaction tx,Map<String,String> param,BizObject user) throws Exception{
-		//1:�������ƾ֤�����Ƿ���ȫ
 		try{
+			//1:�������ƾ֤�����Ƿ���ȫ
 			checkParam(param);
 		}catch(BusinessException e){
 			e.printStackTrace();
@@ -154,6 +155,7 @@ public class CreateVoucherServiceImpl {
 			vs=new VoucherToV8Impl();
 		}
 		if(vs!=null){
+			// ����ƾ֤���ɵķ���
 			vs.saveMessage(subList, param, user, tx);
 		}else{
 			logger.info("ƾ֤������δʵ����");
@@ -272,6 +274,9 @@ public class CreateVoucherServiceImpl {
 			if("1".equals(bo.getAttribute("IS_CUSTOM_VALUE").getString())){//�Ƿ��Զ���ȡֵ
 				VoucherJavaParamService ps=null;
 				try{
+					
+					String valuemode=bo.getAttribute("VALUE_MODE").getString();
+					System.out.println(valuemode);
 					Class<VoucherJavaParamService> c=(Class<VoucherJavaParamService>)Class.forName(bo.getAttribute("VALUE_MODE").getString());
 					ps=c.newInstance();
 				}catch(Exception e){
@@ -287,7 +292,7 @@ public class CreateVoucherServiceImpl {
 				dataTemp=psi.getParamBasic(tx, basic, param);
 			}
 			
-			subData.put("F5", abs);//ժҪ
+			subData.put("F5", abs);//ժҪ 
 			subData.put("F6",sub.getAttribute("id").getString());//��Ŀ����
 			subData.put("F1",dataTemp.get("ACCOUNT_DATE"));//��ƴ�����
 			subData.put("CUSTID",dataTemp.get("CUSTID"));//��ƴ�����
@@ -309,6 +314,7 @@ public class CreateVoucherServiceImpl {
 			if(dataTemp.containsKey("CONTRACT_ID")){
 				subData.put("CONTRACT_ID", dataTemp.get("CONTRACT_ID"));
 			}
+			param.put("FUNDTYPE", dataTemp.get("FUNDTYPE"));
 			if(sub.getAttribute("AUXILIARY_TYPE").getString().length()>0){
 				subData.putAll(this.getAuxiliaryData(tx, param, sub.getAttribute("AUXILIARY_TYPE").getString()));
 			}
@@ -327,6 +333,7 @@ public class CreateVoucherServiceImpl {
 			VoucherJavaParamService ps=null;
 			try{
 				Class<VoucherJavaParamService> c=(Class<VoucherJavaParamService>)Class.forName(con.getAttribute("VALUE_MODE").getString());
+				System.out.println(con.getAttribute("VALUE_MODE").getString());
 				ps=c.newInstance();
 			}catch(Exception e){
 				ps=null;
diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java
index d9eb0ec8d..639190ad9 100644
--- a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java
+++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java
@@ -92,10 +92,8 @@ public class VoucherToV8Impl implements VoucherService {
 					log.error("��ͬ��Ϊ��,�޷�������Ӧ��ƾ֤��Ϣ!");
 					return null;
 				}
-				
 				//����ͬID�Ƿ�����ȷ��
 				if(!Return_Dealer_Margin.equals(modularNumber)&&!Receive_Dealer_Margin.equals(modularNumber)&&!moduleName_value.equals(modularNumber) && !SPECIAL_MODULENAME.equals(modularNumber)){
-					
 					BizObject contract=JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME, "id=:id").setParameter("id", contracid).getSingleResult(false);
 					if(contract==null){
 						message = message + "��ͬ��ϢΪ��!";
@@ -107,7 +105,6 @@ public class VoucherToV8Impl implements VoucherService {
 							d.put("dept_name", org.getAttribute("orgname").getString());
 						}
 					}
-					
 				}
 				
 				v8.setAttributesValue(list.get(i));
diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java
index 712d55fd7..d348ea845 100644
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java
@@ -30,6 +30,7 @@ public class CreateVoucherRentIncomeMission implements Job {
 			cvis.CreateVoucher("PZ2018072100000054");//�������� -��¼���Ᵽ�շ�--����
 			cvis.CreateVoucher("PZ2018080200000064");//�������� -��¼���Ᵽ�շ�--ֱ��
 			
+			cvis.CreateVoucher("PZ2018080600000114");//���Ᵽ�շѳ��������Ϣ���������--ֱ��
 			QuartzUtil.insertLog(startime,"com.tenwa.comm.message.controller.BusinessCancelJob", "success", "�ɹ�");
 		} catch (Exception e) {
 			QuartzUtil.insertLog(startime,"com.tenwa.comm.message.controller.BusinessCancelJob", "error", "ʧ��");