收款反冲调整05

src/main/webapp/WEB-INF/classes/csh/CSH531F/csh_transaction_recoi_query.lwm

@@ -98,12 +98,11 @@
         <!--end-->
         <!--add by lisitong-->
         <bm:field name="approving_return_amount" datatype="java.lang.Double" expression="(select nvl(sum(ctr.this_return_amount),0) from csh_transaction_return ctr where ctr.transaction_id = t1.transaction_id and ctr.status = 'APPROVING')" forInsert="false" forUpdate="false" prompt="审批中退款金额"/>
-        <bm:field name="created_user_name" expression="(select description from sys_user where user_id = t1.created_by)" forceUpdate="false" forInsert="false"/>
         <bm:field name="confirm_user_name" expression="(select description from sys_user where user_id = t1.confirmed_by)" forceUpdate="false" forInsert="false"/>
         <bm:field name="confirmed_flag"/>
         <bm:field name="import_source"/>
         <bm:field name="import_source_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CSH510_IMPORT_SOURCE' and v.code_value =t1.import_source)" forInsert="false" forUpdate="false"/>
-        <bm:field name="recoi_status" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECOI_FLAG' and v.code_value =t1.recoi_status)" forInsert="false" forUpdate="false"/>
+        <bm:field name="recoi_status" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECOI_FLAG' and v.code_value =nvl(t1.recoi_status,'NEW'))" forInsert="false" forUpdate="false"/>
         <bm:field name="recoi_status_n" expression="(select v.code_value from sys_code_values_v v where v.code = 'RECOI_FLAG' and v.code_value =t1.recoi_status)" forInsert="false" forUpdate="false"/>
         <bm:field name="confirmed_flag_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CONFIRMED_FLAG' and v.code_value =t1.confirmed_flag)" forInsert="false" forUpdate="false"/>
         <!--end-->

src/main/webapp/modules/csh/CSH531F/csh_bank_recoi_processing.lview

@@ -166,7 +166,7 @@
                     <a:field name="cw_flag" defaultValue="Y"/>
                     <a:field name="recoi_status_n"/>
                     <a:field name="recoi_status" options="recoi_flag_ds" valueField="code_value"
-                             displayField="code_value_name" returnField="recoi_status" defaultValue="未反冲"/>
+                             displayField="code_value_name" returnField="recoi_status"/>
 <!--                    <a:field name="confirmed_flag" defaultValue="ACCAUDITED"/>-->
                     <a:field name="write_off_flag_desc"  displayField="code_value_name" options="con_write_off_flag_ds"
                              returnField="write_off_flag" valueField="code_value" defaultValue="未核销"/>
@@ -261,8 +261,7 @@
                     <a:column name="write_off_flag_desc" prompt="核销状态" width="120" align="center"/>
                     <a:column name="import_source_desc"   prompt="新增路径" align="center"/>
                     <a:column name="confirmed_flag_desc" prompt="单据审批状态" align="center"/>
-                    <a:column name="created_user_name" prompt="制单人" width="120" align="center"/>
-                    <a:column name="recoi_status" prompt="反冲状态" width="90" align="center"/>
+                    <a:column name="recoi_status" prompt="审批状态" width="90" align="center"/>
                 </a:columns>
             </a:grid>
         </a:screenBody>