Merge branch 'feature/write_off_reverse_ref' into develop

# Conflicts:
#	src/main/webapp/modules/hls/HLS303/bp_agent_entrance.lview

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

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="CSH_WRITE_OFF" defaultOrderBy="t1.write_off_id desc">
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="CSH_WRITE_OFF" defaultOrderBy="t1.write_off_id">
     <bm:fields>
         <bm:field name="write_off_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="WRITE_OFF_ID" prompt="CSH_WRITE_OFF.WRITE_OFF_ID"/>
         <bm:field name="write_off_type" databaseType="VARCHAR2" datatype="java.lang.String" lookupCode="CSH513_WRITE_OFF_TYPE" lookupField="write_off_type_name" physicalName="WRITE_OFF_TYPE" prompt="CSH_WRITE_OFF.WRITE_OFF_TYPE"/>

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

@@ -10,6 +10,7 @@
 	            		 t1.contract_number,
 			             t1.contract_name,
 			             t1.bp_id_tenant,
+			             t1.bp_id_agent_level1,
 			             (select bp_name from hls_bp_master where bp_id = t1.bp_id_tenant) bp_name,
 			             (SELECT sc.code_value_name
                             FROM sys_code_values_v sc
@@ -52,7 +53,7 @@ select t.parent_company_id company_id
                         queryExpression="due_date <= to_date(${@due_date_to},'yyyy-mm-dd')"/>
         <bm:query-field field="dd_bank_account_num" queryOperator="="/>
         <bm:query-field field="dd_bank_account_name" queryOperator="="/>
-        <bm:query-field name="bp_id" queryExpression="t.bp_id_tenant = ${@bp_id}"/>
+        <bm:query-field name="bp_id" queryExpression="(t.bp_id_tenant = ${@bp_id} or t.bp_id_agent_level1 = ${@bp_id})"/>
         <bm:query-field name="bp_name" queryExpression="t.bp_name like '%' || ${@bp_name} || '%'"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse_detail.lview

@@ -126,6 +126,11 @@
                         }
                     }
 
+                    //排序
+                    saveData.sort(function(a,b){
+                        return b.write_off_id - a.write_off_id;
+                    });
+
                     //区别批量核销和单笔核销
                     var url;
                     // if ('${/parameter/@ref_n01}' && '${/parameter/@ref_n01}' != 'undefined') {