From 6a2ff3a6a9a82a70651d36cb9d21652296865f77 Mon Sep 17 00:00:00 2001
From: admin <admin@DESKTOP-M120RON.sinopharmholding.com>
Date: Tue, 14 Aug 2018 12:02:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8E=E7=BB=BC=E5=90=88=E9=A6=96=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E5=AD=97=E7=9B=B8=E5=85=B3=E8=A1=A8=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=B7=BB=E5=8A=A0,?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/etc/jbo/jbo_calc.xml  | 13 +++++++++++--
 WebContent/WEB-INF/etc/jbo/jbo_lease.xml |  7 ++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index ee64c1e15..ddaa9b4cf 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -663,6 +663,8 @@
 				<attribute name="CORPUS" label="期限内本金" type="DOUBLE" length="22" scale="2"/>
 				<attribute name="CORPUS_RATIO" label="期限内本金比例" type="DOUBLE" length="22" scale="6"/>
 				<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
+				<attribute name="ALL_FIRST_PAYMENT" 		label="综合首付款" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="ALL_FIRST_PAYMENT_RATIO" 	label="综合首付款比例" type="DOUBLE" length="22" scale="6"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -921,7 +923,9 @@
 				<attribute name="FACTORY_ACCESSORIES_FINA" label="原厂配件费是否参与融资" type="STRING" length="32"/>
 				<attribute name="CORPUS" label="期限内本金" type="DOUBLE" length="22" scale="2"/>
 				<attribute name="CORPUS_RATIO" label="期限内本金比例" type="DOUBLE" length="22" scale="6"/>
-				<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
+				<attribute name="ALL_FIRST_PAYMENT" 			label="综合首付款" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="ALL_FIRST_PAYMENT_RATIO" 		label="综合首付款比例" type="DOUBLE" length="22" scale="6"/>
+				<attribute name="HANDLING_CHARGE_MONEY_TYPE" 	label="手续费类型" type="STRING" length="32" />
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -1222,6 +1226,8 @@
 				<attribute name="CORPUS" label="期限内本金" type="DOUBLE" length="22" scale="2"/>
 				<attribute name="CORPUS_RATIO" label="期限内本金比例" type="DOUBLE" length="22" scale="6"/>
 				<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
+				<attribute name="ALL_FIRST_PAYMENT" 		label="综合首付款" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="ALL_FIRST_PAYMENT_RATIO" 	label="综合首付款比例" type="DOUBLE" length="22" scale="6"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -2437,6 +2443,8 @@
 				<attribute name="CORPUS" label="期限内本金" type="DOUBLE" length="22" scale="2"/>
 				<attribute name="CORPUS_RATIO" label="期限内本金比例" type="DOUBLE" length="22" scale="6"/>
 				<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
+				<attribute name="ALL_FIRST_PAYMENT" 			label="综合首付款" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="ALL_FIRST_PAYMENT_RATIO" 		label="综合首付款比例" type="DOUBLE" length="22" scale="6"/>
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -2971,7 +2979,8 @@
 				<attribute name="CAUTION_MONEY_METHOD" label="期末保证金处理方式" type="STRING" length="32"/>
 				<attribute name="ALL_FIRST_PAYMENT" label="综合首付款" type="DOUBLE" length="22" scale="2"/>
 				<attribute name="ALL_FIRST_PAYMENT_RATIO" label="综合首付款比例 " type="DOUBLE" length="22" scale="6"/>
-				<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
+				<attribute name="HANDLING_CHARGE_MONEY_TYPE" label="手续费类型" type="STRING" length="32" />
+				
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index d9256240d..d1f0641ae 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -790,7 +790,9 @@
 				<attribute name="UPDATEUSERID" label="更新人" type="STRING" length="32"/>
 				<attribute name="UPDATEORGID" label="更新部门" type="STRING" length="32"/>
 				<attribute name="UPDATETIME" label="更新时间" type="STRING" length="32"/>
-				<attribute name="ISIMPORT" label="是否是导入" type="STRING" length="32"/>
+				<attribute name="ALL_FIRST_PAYMENT" 			label="综合首付款" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="ALL_FIRST_PAYMENT_RATIO" 		label="综合首付款比例" type="DOUBLE" length="22" scale="6"/>
+				<attribute name="HANDLING_CHARGE_MONEY_TYPE" 	label="手续费类型" type="STRING" length="32" />
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -822,6 +824,9 @@
 				<attribute name="UPDATEORGID" label="更新部门" type="STRING" length="32"/>
 				<attribute name="UPDATETIME" label="更新时间" type="STRING" length="32"/>
 				<attribute name="ISIMPORT" label="是否是导入" type="STRING" length="32"/>
+				<attribute name="ALL_FIRST_PAYMENT" 			label="综合首付款" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="ALL_FIRST_PAYMENT_RATIO" 		label="综合首付款比例" type="DOUBLE" length="22" scale="6"/>
+				<attribute name="HANDLING_CHARGE_MONEY_TYPE" 	label="手续费类型" type="STRING" length="32" />			
 			</attributes>
 			<manager>
 				<managerProperties>