Merge branch 'feature/保证金功能优化' into develop

src/main/webapp/WEB-INF/classes/csh/CSH514/csh_write_off.lwm

@@ -80,6 +80,6 @@
         <bm:query-field field="write_off_id" queryOperator="="/>
         <bm:query-field field="csh_transaction_id" queryOperator="="/>
         <bm:query-field field="reversed_flag" queryOperator="="/>
-        <bm:query-field name="reverse_detail_flag" queryExpression="(${@deposit_type}=&apos;Y&apos; and t1.write_off_type=&apos;DEPOSIT_CREDIT&apos;)or(${@reverse_detail_flag}=&apos;Y&apos; and ${@deposit_type} in(&apos;N&apos;,null) and t1.write_off_type in (&apos;RECEIPT_CREDIT&apos;,&apos;RECEIPT_ADVANCE_RECEIPT&apos;,&apos;ADVANCE_RECEIPT_CREDIT&apos;,&apos;DEPOSIT&apos;,&apos;RISK&apos;,&apos;DEPOSIT_CUS&apos;,&apos;RECEIPT_NONBUSINESS&apos;))"/>
+        <bm:query-field name="reverse_detail_flag" queryExpression="(nvl(${@deposit_type},'N')=&apos;Y&apos; and t1.write_off_type=&apos;DEPOSIT_CREDIT&apos;)or(${@reverse_detail_flag}=&apos;Y&apos; and nvl(${@deposit_type},'N') in(&apos;N&apos;,null) and t1.write_off_type in (&apos;RECEIPT_CREDIT&apos;,&apos;RECEIPT_ADVANCE_RECEIPT&apos;,&apos;ADVANCE_RECEIPT_CREDIT&apos;,&apos;DEPOSIT&apos;,&apos;RISK&apos;,&apos;DEPOSIT_CUS&apos;,&apos;RECEIPT_NONBUSINESS&apos;))"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT100/csh_transaction_miantain_query.lwm

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num asc" needAccessControl="false">
+<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
     <bm:fields>
         <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
         <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
@@ -21,7 +21,7 @@
         <bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/>
         <bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/>
         <bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/>
-        <bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" expression="(select to_char(transaction_amount,'99999999.99') from dual)"/>
+        <bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT"/>
         <bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
         <bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/>
         <bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT100/csh_write_off_tmp_execute.lwm

@@ -32,7 +32,7 @@
 			              p_description=>${@description},
 			              p_user_id=>${/session/@user_id},
 			              p_transaction_id=>${@transaction_id},
-			              p_bp_id	=> ${@bp_id},
+			              p_bp_id	=> ${@bp_id_agent_level1},
 			              p_year_flag =>${@year_flag},
 			              p_quarter_flag =>${@quarter_flag},
 			              p_month_flag =>${@month_flag},

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_transaction_query.lwm

@@ -11,6 +11,16 @@
             	end;
             ]]></bm:update-sql>
         </bm:operation>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+            	begin
+           hlcm_cux_deposit_pkg.check_transaction_status_new(
+			              p_transaction_id=>${@transaction_id},
+			              p_user_id=>${/session/@user_id}
+            		);
+            	end;
+            ]]></bm:update-sql>
+        </bm:operation>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
             select * from ( select v1.contract_id,

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT104/csh_transaction_maintain_query.lwm

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num asc" needAccessControl="false">
+<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
     <bm:fields>
         <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
         <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
@@ -21,7 +21,7 @@
         <bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/>
         <bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/>
         <bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/>
-        <bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" expression="(select to_char(transaction_amount,'99999999.99') from dual)"/>
+        <bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT"/>
         <bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
         <bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/>
         <bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/>
@@ -101,8 +101,8 @@
         <bm:field name="deposit_trans_type"/>
         <bm:field name="paid_byother_flag"/>
         <bm:field name="deposit_trans_type_desc"  expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DEPOSIT_TRANS_TYPE' and v.code_value =t1.deposit_trans_type)" forInsert="false" forUpdate="false"/>
-        <bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
-        <bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/>
+        <bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
+        <bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/>
     </bm:fields>
     <bm:features>
         <f:standard-who/>
@@ -161,7 +161,7 @@
         <!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
         <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
         <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
-        <bm:query-field name="bp_name_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1) like ${@bp_name_n} "/>
+        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
         <bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_maintain_query.lwm

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num asc" needAccessControl="false">
+<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
     <bm:fields>
         <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
         <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
@@ -21,7 +21,7 @@
         <bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/>
         <bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/>
         <bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/>
-        <bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" expression="(select to_char(transaction_amount,'99999999.99') from dual)"/>
+        <bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" />
         <bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
         <bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/>
         <bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/>
@@ -159,7 +159,7 @@
         <!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
         <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
         <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
-        <bm:query-field name="bp_name_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1) like ${@bp_name_n} "/>
+        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
         <bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT110/csh_transaction_maintain_query.lwm

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num asc" needAccessControl="false">
+<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
     <bm:fields>
         <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
         <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
@@ -21,7 +21,7 @@
         <bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/>
         <bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/>
         <bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/>
-        <bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" expression="(select to_char(transaction_amount,'99999999.99') from dual)"/>
+        <bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" />
         <bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
         <bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/>
         <bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/>
@@ -158,7 +158,7 @@
         <!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
         <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
         <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
-        <bm:query-field name="bp_name_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1) like ${@bp_name_n} "/>
+        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
         <bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_deposit_purpose_query.lwm

@@ -3,20 +3,13 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-            select * from (select decode(cw.write_off_type,
-            'DEPOSIT_ENTRY',
-                      '入账',
-                      'DEPOSIT_TRANSFER',
-                      '划转',
-                      'DEPOSIT_CREDIT',
-                      '抵扣',
-                      '退款') write_off_type_n,
+            select * from (select
                (select cc.contract_number
                   from con_contract cc
                  where cc.contract_id = cw.contract_id) contract_number,
                cw.times,
                cw.write_off_due_amount,
-               to_char(cw.creation_date, 'YYYY_MM_DD') creation_date,
+               to_char(cw.creation_date, 'YYYY-MM-DD') creation_date,
                (select v.code_value_name
                   from sys_code_values_v v
                  where v.code = 'DEPOSIT_TRANS_TYPE'
@@ -24,7 +17,11 @@
                     (select t.bp_name
           from hls_bp_master t, con_contract ct
          where t.bp_id = ct.bp_id_tenant
-           and ct.contract_id = cw.contract_id) bp_id_telnet_n
+           and ct.contract_id = cw.contract_id) bp_id_telnet_n,
+           (select v.code_value_name
+                  from sys_code_values_v v
+                 where v.code = 'CSH513_WRITE_OFF_TYPE'
+                   and v.code_value = cw.write_off_type) write_off_type_n
           from csh_write_off cw
           where cw.csh_transaction_id=${@transaction_id})v
                 #WHERE_CLAUSE#

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_deposit_source_query.lwm

@@ -6,33 +6,28 @@
 
            select *
    from (
-  select decode(cw.write_off_type,
-                      'DEPOSIT_ENTRY',
-                      '入账',
-                      'DEPOSIT_TRANSFER',
-                      '划转',
-                      'DEPOSIT_CREDIT',
-                      '抵扣',
-                      '退款')write_off_type_n,
-               (select cc.contract_number
+              select (select cc.contract_number
                   from con_contract cc
-                 where cc.contract_id = cw.contract_id) contract_number,
-               cw.times,
-               cw.write_off_due_amount,
-               to_char(cw.creation_date, 'YYYY_MM_DD') creation_date,
+                 where cc.contract_id = ctn.ref_contract_id) contract_number,
+
+               ctn.transaction_amount,
+               to_char(cw.creation_date, 'YYYY-MM-DD') creation_date,
                (select v.code_value_name
                   from sys_code_values_v v
                  where v.code = 'DEPOSIT_TRANS_TYPE'
-                   and v.code_value = cw.deposit_trans_type) deposit_trans_type_n,
-                   (select cn.transaction_num
-           from csh_transaction cn
-          where cn.transaction_id = cw.csh_transaction_id) transaction_number,
+                   and v.code_value = ctn.deposit_trans_type) deposit_trans_type_n,
+                    ctn.transaction_num transaction_number,
           (select t.bp_name
           from hls_bp_master t, con_contract ct
          where t.bp_id = ct.bp_id_tenant
-           and ct.contract_id = cw.contract_id) bp_id_telnet_n
-          from csh_write_off cw
-         where cw.write_off_id = ${@source_doc_id}) v
+           and ct.contract_id = ctn.ref_contract_id) bp_id_telnet_n,
+           (select v.code_value_name
+                  from sys_code_values_v v
+                 where v.code = 'CSH513_WRITE_OFF_TYPE'
+                   and v.code_value = cw.write_off_type) write_off_type_n
+          from csh_write_off cw ,csh_transaction ctn
+         where cw.write_off_id = ${@source_doc_id}
+         and ctn.transaction_id=cw.csh_transaction_id) v
 
                 ]]></bm:query-sql>
         </bm:operation>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_record_query.lwm

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num asc" needAccessControl="false">
+<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="CSH_TRANSACTION" defaultOrderBy="t1.transaction_num desc" needAccessControl="false">
     <bm:fields>
         <bm:field name="transaction_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TRANSACTION_ID" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_ID"/>
         <bm:field name="transaction_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TRANSACTION_NUM" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
@@ -21,7 +21,7 @@
         <bm:field name="distribution_set_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DISTRIBUTION_SET_ID" prompt="CSH511.CSH_TRANSACTION.DISTRIBUTION_SET_ID"/>
         <bm:field name="cashflow_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CASHFLOW_AMOUNT" prompt="CSH511.CSH_TRANSACTION.CASHFLOW_AMOUNT"/>
         <bm:field name="currency_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_CODE" prompt="HLS.CURRENCY"/>
-        <bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT" expression="(select to_char(transaction_amount,'99999999.99') from dual)"/>
+        <bm:field name="transaction_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TRANSACTION_AMOUNT" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_AMOUNT"/>
         <bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
         <bm:field name="exchange_rate_quotation" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_QUOTATION" prompt="CSH511.CSH_TRANSACTION.EXCHANGE_RATE_QUOTATION"/>
         <bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/>
@@ -100,8 +100,8 @@
         <bm:field name="receipt_type_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECEIPT_TYPE' and v.code_value =t1.receipt_type)" forInsert="false" forUpdate="false"/>
         <bm:field name="deposit_trans_type"/>
         <bm:field name="deposit_trans_type_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DEPOSIT_TRANS_TYPE' and v.code_value =t1.deposit_trans_type)" forInsert="false" forUpdate="false"/>
-        <bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
-        <bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/>
+        <bm:field name="bp_id_telnet_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant)" forInsert="false" forUpdate="false"/>
+        <bm:field name="bp_name_n" expression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1)" forInsert="false" forUpdate="false"/>
         <bm:field name="source_type"/>
     </bm:fields>
     <bm:features>
@@ -162,7 +162,7 @@
         <bm:query-field name="bank_account_num" queryExpression="(select a.bank_account_num from csh_bank_account a where a.bank_account_id=t1.bank_account_id) like  &apos;%&apos;||upper(${@bank_account_num})||&apos;%&apos;"/>
         <!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>--> <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
         <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
-        <bm:query-field name="bp_name_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_agent_level1) like ${@bp_name_n} "/>
+        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
         <bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/csh_transaction_return.lview

@@ -157,7 +157,7 @@
                                  prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
                     <a:textField name="opposite_band_na" bindTarget="csh_transaction_deposit_return_maintain_ds"
                                  prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
-                    <a:numberField name="bp_bank_account_num" bindTarget="csh_transaction_deposit_return_maintain_ds"
+                    <a:textField name="bp_bank_account_num" bindTarget="csh_transaction_deposit_return_maintain_ds"
                                  prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
                     <!--<a:numberField name="return_amount" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_transaction_deposit_return_maintain_ds" prompt="CSH515.CSH_REFUND_AMOUNT"/>-->
                     <!--<a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_return_maintain_ds" prompt="银行流水号"/>-->

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/csh_transaction_return_wfl.lview

@@ -37,7 +37,7 @@
                                  prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME" readOnly="true"/>
                     <a:textField name="opposite_band_na" bindTarget="csh_transaction_return_wfl_ds"
                                  prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME" readOnly="true"/>
-                    <a:numberField name="bp_bank_account_num" bindTarget="csh_transaction_return_wfl_ds"
+                    <a:textField name="bp_bank_account_num" bindTarget="csh_transaction_return_wfl_ds"
                                    prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME" readOnly="true"/>
                     <!--<a:numberField name="return_amount" allowDecimals="true" allowFormat="true" allowNegative="false" bindTarget="csh_transaction_return_wfl_ds" prompt="CSH515.CSH_REFUND_AMOUNT" readOnly="true"/>-->
                     <!--<a:textField name="bank_slip_num" bindTarget="csh_transaction_return_wfl_ds" prompt="银行流水号" readOnly="true"/>-->

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT106/cus_deposit_write_off_return_maintain.lview

@@ -11,6 +11,8 @@
     </a:init-procedure>
     <a:view>
         <a:link id="csh_transaction_return_link" url="${/request/@context_path}/modules/cus_deposit/CUS_DEPOSIT106/csh_transaction_return.lview"/>
+        <a:link id="check_csh_transaction_status_link_id" model="cus_deposit.CUS_DEPOSIT102.csh_transaction_query"
+                modelaction="update"/>
         <script type="text/javascript"><![CDATA[
 
         //锁表
@@ -100,6 +102,39 @@
                 }
             }
         }
+        function cus100_receipt_return (){
+            var record = $('csh_transaction_receipt_return_maintain_ds').getSelected()[0];
+            url = $('csh_transaction_return_link').getUrl() + '?transaction_id=' + record.get('transaction_id') + '&update_flag=true';
+            Leaf.Masker.mask(Ext.getBody(), '正在执行...');
+            Leaf.request({
+                url: $('check_csh_transaction_status_link_id').getUrl(),
+                para: {
+                    transaction_id: record.get('transaction_id')
+                },
+                success: function () {
+                    Leaf.Masker.unmask(Ext.getBody());
+                    new Leaf.Window({
+                        id: 'csh_transaction_deposit_link_winid',
+                        params: {
+                            winId: 'csh_transaction_deposit_link_winid'
+                        },
+                        url: url,
+                        title: '退款详情',
+                        fullScreen: true
+                    }).on('close',function(){
+                        cus100_receipt_query();
+                    });
+
+                },
+                failure: function () {
+                    Leaf.Masker.unmask(Ext.getBody());
+                },
+                error: function () {
+                    Leaf.Masker.unmask(Ext.getBody());
+                },
+                scope: this
+            });
+        }
 
         ]]></script>
         <a:dataSets>
@@ -252,6 +287,7 @@
                 <a:screenTitle/>
                 <a:gridButton click="cus100_receipt_query" text="HLS.QUERY" id="cus100_receipt_query"/>
                 <a:gridButton click="cus100_receipt_reset" text="HLS.RESET"/>
+                <a:gridButton click="cus100_receipt_return" text="退款"/>
             </a:screenTopToolbar>
             <a:form  labelWidth="120" marginWidth="80"
                     title="查询条件" style="margin-left:20px">
@@ -286,11 +322,11 @@
                     <a:button click="csh510_export" text="导出"/>
                 </a:toolBar>-->
                     <a:columns>
-                        <a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="seedetail_transaction_num" width="110" align="center"/>
+                        <a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" width="110" align="center"/>
                         <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
                         <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
                         <a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/>
-                        <a:column name="bp_name_n" prompt="代理店" align="center"/>
+                        <a:column name="bp_name" prompt="代理店" align="center"/>
                         <a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
                         <a:column name="contract_number" prompt="合同编号" align="center"/>
                         <a:column name="deposit_trans_type_desc" prompt="保证金类型" width="110" align="center"/>

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT110/cus_deposit_write_off_reserve_maintain.lview

@@ -312,7 +312,7 @@
                         <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
                         <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
                         <a:column name="unwrite_off_amount" prompt="可退款金额" align="right" renderer="Leaf.formatMoney"/>
-                        <a:column name="bp_agent_name" prompt="代理店" align="center"/>
+                        <a:column name="bp_name" prompt="代理店" align="center"/>
                         <a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
                         <a:column name="contract_number" prompt="合同编号" align="center"/>
                         <a:column name="deposit_trans_type_desc" prompt="保证金类型" align="center"/>

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT122/cus_deposit_detail.lview

@@ -45,7 +45,7 @@
                     <!--<a:textField name="times" bindTarget="csh_transaction_receipt_maintain_result_ds" prompt="期数"/>-->
                     <!--<a:textField name="balance" bindTarget="csh_transaction_receipt_maintain_result_ds" prompt="保证金剩余余额"/>-->
                     <a:textField name="contract_number" prompt="合同编号" bindTarget="csh_transaction_receipt_maintain_result_ds" readOnly="true"/>
-                    <a:textField name="bp_agent_name" prompt="代理店" bindTarget="csh_transaction_receipt_maintain_result_ds" readOnly="true"/>
+                    <a:textField name="bp_name" prompt="代理店" bindTarget="csh_transaction_receipt_maintain_result_ds" readOnly="true"/>
                     <a:textField name="bp_id_telnet_n" prompt="承租人"  bindTarget="csh_transaction_receipt_maintain_result_ds" readOnly="true"/>
                     <a:textField name="deposit_trans_type_desc" prompt="保证金类型" bindTarget="csh_transaction_receipt_maintain_result_ds" readOnly="true"/>
                     <a:numberField name="unwrite_off_amount" bindTarget="csh_transaction_receipt_maintain_result_ds"
@@ -63,7 +63,7 @@
                         <a:column name="bp_id_telnet_n" prompt="承租人" width="150" align="center"/>
                         <a:column name="deposit_trans_type_n" prompt="保证金类型" width="100"/>
                         <a:column name="write_off_type_n" prompt="来源方式" width="100" align="center"/>
-                        <a:column name="write_off_due_amount" prompt="收款金额" align="right" width="100"/>
+                        <a:column name="transaction_amount" prompt="收款金额" align="right" width="100"/>
                         <a:column name="creation_date" prompt="操作时间" width="100"/>
                     </a:columns>
                 </a:grid>

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT122/cus_deposit_record_maintain.lview

@@ -349,7 +349,7 @@
                         <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
                         <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
                         <a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/>
-                        <a:column name="bp_name_n" prompt="代理店" align="center"/>
+                        <a:column name="bp_name" prompt="代理店" align="center"/>
                         <a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
                         <a:column name="contract_number" prompt="合同编号" align="center"/>
                         <a:column name="deposit_trans_type_desc" prompt="保证金类型" align="center"/>