Merge branch 'feature/optimization' into develop

# Conflicts:
#	src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview

src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_miantain_query.lwm

@@ -118,6 +118,7 @@
         <bm:query-field field="receipt_type" queryOperator="="/>
         <bm:query-field name="confirmed" queryExpression="((${@confirmed} = 'Y' and t1.confirmed_flag in ('ACCAUDITED','ACCAUDITING')) or (${@confirmed} = 'N' and t1.confirmed_flag in ('NEW','CT_REJECTED','ACCAUDITING','ACCAUDITED')))"/>
         <bm:query-field field="opposite_band_na" queryOperator="="/>
+        <bm:query-field name="transaction_num" queryExpression="t1.transaction_num like ${@transaction_num}"/>
         <bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/>
         <bm:query-field name="transaction_num_to" queryExpression="t1.transaction_num &lt;= ${@transaction_num_to}"/>
         <bm:query-field name="bank_slip_num" queryExpression="t1.bank_slip_num like &apos;%&apos;||${@bank_slip_num}||&apos;%&apos;"/>

src/main/webapp/WEB-INF/classes/csh/CSH510N/csh_transaction_list_tmp.lwm

@@ -49,6 +49,7 @@
                t.bp_bank_account_num,
                t.bp_bank_account_name,
                t.bp_bank_name,
+               t.bp_category,
                t.transaction_amount,
                t.collection_classes,
                t.bp_id,

src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_plan_query.lwm

@@ -31,6 +31,6 @@
     </bm:features>
     <bm:data-filters>
         <bm:data-filter name="query" expression="(t1.transaction_id=${@transaction_id} and t1.company_id=${/session/@company_id} and t1.write_off_type = ${@write_off_type})"/>
-        <bm:data-filter name="query" expression="(nvl(t1.create_wf_flag,'N') = 'N')" />
+        <bm:data-filter name="query" expression="(nvl(t1.create_wf_flag,'N') = DECODE((select write_off_flag from csh_transaction where transaction_id = t1.transaction_id),'FULL','Y','N'))" />
     </bm:data-filters>
 </bm:model>
\ No newline at end of file

src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_query.lwm

@@ -173,6 +173,6 @@
 <!--        <bm:data-filter name="type" expression="t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT') and t1.returned_flag != 'FULL' and t1.reversed_flag = 'N' and nvl(t1.deposit_flag,'N')='N' "/>-->
         <bm:data-filter name="query" expression="(t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT',DECODE(${@cw_flag},'Y',NULL,DECODE(t1.source_type,NULL,NULL,'DEPOSIT')))  and t1.confirmed_flag in ('WF_APPROVING','ACCAUDITED','APPROVED','WF_REJECTED')) "/>
 <!--        <bm:data-filter name="position_code" expression="(((${@position_code} = '009' and t1.bp_category = 'TENANT' and t1.paid_byother_flag = 'N') or ((${@position_code} = '014' and t1.bp_category != 'TENANT') or (${@position_code} = '014' and t1.paid_byother_flag != 'N')) and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1))" />-->
-        <bm:data-filter name="position_code" expression="((${@cw_flag} = 'Y') or (${@position_code} = '009' and (t1.paid_byother_flag = 'F' and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1)) or (${@position_code} = '014' and ((t1.paid_byother_flag != 'F') and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1)))"/>
+        <bm:data-filter name="position_code" expression="(((${@cw_flag} = 'Y') or (${@position_code} = '009' and t1.created_by != ${/session/@user_id} and (t1.paid_byother_flag = 'F' and t1.bp_category = 'TENANT' and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1)) or (${@position_code} = '014' and t1.created_by != ${/session/@user_id} and ((((t1.paid_byother_flag != 'F' or t1.bp_category != 'TENANT')) or t1.transaction_type = 'DEPOSIT') and t1.confirmed_flag != 'ACCAUDITED' and t1.created_by != ${/session/@user_id}) or (${/session/@user_id} = 1))))"/>
     </bm:data-filters>
 </bm:model>
\ No newline at end of file

src/main/webapp/modules/cont/CON560/con_contract_finish_maintain_wfl.lview

@@ -221,7 +221,7 @@
             <a:tabPanel marginHeight="420" marginWidth="30">
                 <a:tabs>
                     <a:tab prompt="未收金额" width="110">
-                        <a:grid bindTarget="unreceivedAmountDs" marginHeight="470" marginWidth="55" navBar="true">
+                        <a:grid bindTarget="unreceivedAmountDs" marginHeight="325" marginWidth="55" navBar="true">
                             <a:columns>
                                 <a:column name="times" prompt="期数"/>
                                 <a:column name="cf_type_dis" prompt="类型"/>
@@ -238,7 +238,7 @@
                         </a:grid>
                     </a:tab>
                     <a:tab prompt="已收金额" width="110">
-                        <a:grid bindTarget="receivedAmountDs" marginHeight="450" marginWidth="55" navBar="true">
+                        <a:grid bindTarget="receivedAmountDs" marginHeight="325" marginWidth="55" navBar="true">
                             <a:columns>
                                 <a:column name="times" prompt="期数"/>
                                 <a:column name="cf_type_dis" prompt="类型"/>

src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview

@@ -595,6 +595,7 @@
                     <a:field name="bp_id_to"/>
                     <a:field name="transaction_num_from"/>
                     <a:field name="transaction_num_to"/>
+                    <a:field name="transaction_num"/>
                     <a:field name="bank_slip_num_from"/>
                     <a:field name="bank_slip_num_to"/>
                     <a:field name="transaction_date_from" validator="dateValidator"/>
@@ -721,7 +722,8 @@
                         <a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
                         <!--对方账户账号-->
                         <a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
-                        <a:textField style="display:none"/>
+                        <a:textField name="transaction_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="现金事务编号"/>
+<!--                        <a:textField style="display:none"/>-->
                         <a:lov name="bp_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BUSINESS_PARTNER"/>
                         <a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="单据审批状态"/>
                         <!--                        <a:comboBox name="write_off_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"/>-->

src/main/webapp/modules/hls/HLS215N/hls_bp_master_query_entrance.lview

@@ -18,7 +18,7 @@
                 url="${/request/@context_path}/modules/hls/HLS236/hls_bp_master_query_ccx_report.lview"/>
         <a:link id="hls_bp_ccx_icinfo_link"
                 url="${/request/@context_path}/modules/hls/HLS236/hls_bp_master_query_ccx_icinfo.lview"/>
-        <script src="${/request/@context_path}/javascripts/hap/dynamicStopAutoQuery.js" type="text/javascript"/>
+<!--        <script src="${/request/@context_path}/javascripts/hap/dynamicStopAutoQuery.js" type="text/javascript"/>-->
         <script type="text/javascript"><![CDATA[
         // stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_BP_RESULT', 'hls_bp_master');
 
@@ -125,7 +125,7 @@
             }
 
             //异步打印
-            ds.setQueryParameter('__async__', 'Y');
+            // ds.setQueryParameter('__async__', 'Y');
         };
         ]]></script>
         <a:screen-include