From 243c63f8a1409c5614fc29fd58f153ad45e41236 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Wed, 19 Aug 2020 11:25:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9A=82=E6=97=B6=E5=8E=BB=E6=8E=89=E5=A4=A9?=
 =?UTF-8?q?=E6=B4=A5=E8=88=AA=E4=BF=A1=E5=8F=91=E7=A5=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/etc/jbo/jbo_calc.xml       | 18 +++++++-------
 .../jbo/app/tenwa/calc/LC_FUND_INCOME.java    |  8 -------
 .../app/tenwa/calc/LC_FUND_INCOME_TEMP.java   |  8 -------
 .../jbo/app/tenwa/calc/LC_RENT_INCOME.java    | 24 -------------------
 .../app/tenwa/calc/LC_RENT_INCOME_TEMP.java   | 24 -------------------
 5 files changed, 10 insertions(+), 72 deletions(-)

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index e39605ba9..498c4f436 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -1638,8 +1638,8 @@
 			    <attribute name="DISTRIBUTOR_ID" label="经销商ID" type="STRING" length="32"/>
 			    <attribute name="DEDUCTION_ID" label="保证金抵扣编号" type="STRING" length="32"/>
 			    
-				<attribute name="FPDM" label="发票代码" type="STRING" length="10"/>
-				<attribute name="FPHM" label="发票号码" type="STRING" length="10"/>
+				<!-- <attribute name="FPDM" label="发票代码" type="STRING" length="10"/>
+				<attribute name="FPHM" label="发票号码" type="STRING" length="10"/> -->
 				<attribute name="isCompany" label="是否关联公司" type="STRING" length="2"/>
 			</attributes>
 			<manager>
@@ -1709,8 +1709,8 @@
 				<attribute name="DISTRIBUTOR_ID" label="经销商ID" type="STRING" length="32"/>
 				<attribute name="DEDUCTION_ID" label="保证金抵扣编号" type="STRING" length="32"/>
 				
-				<attribute name="FPDM" label="发票代码" type="STRING" length="10"/>
-				<attribute name="FPHM" label="发票号码" type="STRING" length="10"/>
+				<!-- <attribute name="FPDM" label="发票代码" type="STRING" length="10"/>
+				<attribute name="FPHM" label="发票号码" type="STRING" length="10"/> -->
 				<attribute name="isCompany" label="是否关联公司" type="STRING" length="2"/>
 			</attributes>
 			<manager>
@@ -1772,12 +1772,13 @@
 				<attribute name="SPARE_BATCH_NO" label="扣款批次号" type="STRING" length="32"/>
 				<attribute name="CHARGE_WAY" label="手续费方式" type="STRING" length="10"/>
 				
-				<attribute name="RENT_FPDM" label="发票代码" type="STRING" length="10"/>
+		<!--	<attribute name="RENT_FPDM" label="发票代码" type="STRING" length="10"/>
 				<attribute name="RENT_FPHM" label="发票号码" type="STRING" length="10"/>
 				<attribute name="INTEREST_FPDM" label="发票代码" type="STRING" length="10"/>
 				<attribute name="INTEREST_FPHM" label="发票号码" type="STRING" length="10"/>
 				<attribute name="PENALTY_FPDM" label="发票代码" type="STRING" length="10"/>
-				<attribute name="PENALTY_FPHM" label="发票号码" type="STRING" length="10"/>
+				<attribute name="PENALTY_FPHM" label="发票号码" type="STRING" length="10"/> 
+		-->
 			</attributes>
 			<manager>
 				<managerProperties>
@@ -1840,12 +1841,13 @@
 				<attribute name="SPARE_BATCH_NO" label="扣款批次号" type="STRING" length="32"/>
 				<attribute name="CHARGE_WAY" label="手续费方式" type="STRING" length="10"/>
 				
-				<attribute name="RENT_FPDM" label="发票代码" type="STRING" length="10"/>
+		<!--	<attribute name="RENT_FPDM" label="发票代码" type="STRING" length="10"/>
 				<attribute name="RENT_FPHM" label="发票号码" type="STRING" length="10"/>
 				<attribute name="INTEREST_FPDM" label="发票代码" type="STRING" length="10"/>
 				<attribute name="INTEREST_FPHM" label="发票号码" type="STRING" length="10"/>
 				<attribute name="PENALTY_FPDM" label="发票代码" type="STRING" length="10"/>
-				<attribute name="PENALTY_FPHM" label="发票号码" type="STRING" length="10"/>
+				<attribute name="PENALTY_FPHM" label="发票号码" type="STRING" length="10"/> 
+		-->
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME.java b/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME.java
index d9ceaf735..468362d44 100644
--- a/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME.java
+++ b/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME.java
@@ -230,14 +230,6 @@ public interface LC_FUND_INCOME{
 	*/
 	public static final String DEDUCTION_ID = "DEDUCTION_ID";
 	/**
-	* ��Ʊ���� STRING(10)<br>
-	*/
-	public static final String FPDM = "FPDM";
-	/**
-	* ��Ʊ���� STRING(10)<br>
-	*/
-	public static final String FPHM = "FPHM";
-	/**
 	* �Ƿ������˾ STRING(2)<br>
 	*/
 	public static final String isCompany = "isCompany";
diff --git a/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME_TEMP.java b/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME_TEMP.java
index 515269412..046012e20 100644
--- a/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME_TEMP.java
+++ b/src_jbo/jbo/app/tenwa/calc/LC_FUND_INCOME_TEMP.java
@@ -242,14 +242,6 @@ public interface LC_FUND_INCOME_TEMP{
 	*/
 	public static final String DEDUCTION_ID = "DEDUCTION_ID";
 	/**
-	* ��Ʊ���� STRING(10)<br>
-	*/
-	public static final String FPDM = "FPDM";
-	/**
-	* ��Ʊ���� STRING(10)<br>
-	*/
-	public static final String FPHM = "FPHM";
-	/**
 	* �Ƿ������˾ STRING(2)<br>
 	*/
 	public static final String isCompany = "isCompany";
diff --git a/src_jbo/jbo/app/tenwa/calc/LC_RENT_INCOME.java b/src_jbo/jbo/app/tenwa/calc/LC_RENT_INCOME.java
index 7b005e5ac..fc1adf148 100644
--- a/src_jbo/jbo/app/tenwa/calc/LC_RENT_INCOME.java
+++ b/src_jbo/jbo/app/tenwa/calc/LC_RENT_INCOME.java
@@ -209,28 +209,4 @@ public interface LC_RENT_INCOME{
 	* �����ѷ�ʽ STRING(10)<br>
 	*/
 	public static final String CHARGE_WAY = "CHARGE_WAY";
-	/**
-	* ��Ʊ���� STRING(10)<br>
-	*/
-	public static final String RENT_FPDM = "RENT_FPDM";
-	/**
-	* ��Ʊ���� STRING(10)<br>
-	*/
-	public static final String RENT_FPHM = "RENT_FPHM";
-	/**
-	* ��Ʊ���� STRING(10)<br>
-	*/
-	public static final String INTEREST_FPDM = "INTEREST_FPDM";
-	/**
-	* ��Ʊ���� STRING(10)<br>
-	*/
-	public static final String INTEREST_FPHM = "INTEREST_FPHM";
-	/**
-	* ��Ʊ���� STRING(10)<br>
-	*/
-	public static final String PENALTY_FPDM = "PENALTY_FPDM";
-	/**
-	* ��Ʊ���� STRING(10)<br>
-	*/
-	public static final String PENALTY_FPHM = "PENALTY_FPHM";
 }
\ No newline at end of file
diff --git a/src_jbo/jbo/app/tenwa/calc/LC_RENT_INCOME_TEMP.java b/src_jbo/jbo/app/tenwa/calc/LC_RENT_INCOME_TEMP.java
index 883c5b3c4..c03e48d4a 100644
--- a/src_jbo/jbo/app/tenwa/calc/LC_RENT_INCOME_TEMP.java
+++ b/src_jbo/jbo/app/tenwa/calc/LC_RENT_INCOME_TEMP.java
@@ -217,28 +217,4 @@ public interface LC_RENT_INCOME_TEMP{
 	* �����ѷ�ʽ STRING(10)<br>
 	*/
 	public static final String CHARGE_WAY = "CHARGE_WAY";
-	/**
-	* ��Ʊ���� STRING(10)<br>
-	*/
-	public static final String RENT_FPDM = "RENT_FPDM";
-	/**
-	* ��Ʊ���� STRING(10)<br>
-	*/
-	public static final String RENT_FPHM = "RENT_FPHM";
-	/**
-	* ��Ʊ���� STRING(10)<br>
-	*/
-	public static final String INTEREST_FPDM = "INTEREST_FPDM";
-	/**
-	* ��Ʊ���� STRING(10)<br>
-	*/
-	public static final String INTEREST_FPHM = "INTEREST_FPHM";
-	/**
-	* ��Ʊ���� STRING(10)<br>
-	*/
-	public static final String PENALTY_FPDM = "PENALTY_FPDM";
-	/**
-	* ��Ʊ���� STRING(10)<br>
-	*/
-	public static final String PENALTY_FPHM = "PENALTY_FPHM";
 }
\ No newline at end of file