Merge branch 'feature/start_fixs' into develop

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

@@ -31,5 +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-filters>
 </bm:model>
\ No newline at end of file

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

@@ -168,11 +168,11 @@
         <!--end-->
     </bm:query-fields>
     <bm:data-filters>
-        <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
-        <bm:data-filter name="query" expression="(not exists(select 1 from csh_transaction t where t.transaction_type = 'RECEIPT' and t.paid_byother_flag = 'T' and t.write_off_flag = 'FULL' and t.transaction_id = t1.transaction_id))"/>
+        <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id} AND t1.reversed_flag = 'N' and t1.returned_flag != 'FULL')"/>
+<!--        <bm:data-filter name="query" expression="(not exists(select 1 from csh_transaction t where t.transaction_type = 'RECEIPT' and t.paid_byother_flag = 'T' and t.write_off_flag = 'FULL' and t.transaction_id = t1.transaction_id))"/>-->
 <!--        <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.returned_flag != 'FULL' and t1.confirmed_flag in ('WF_APPROVING','ACCAUDITED','APPROVED','WF_REJECTED')) "/>
+        <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.bp_category = 'TENANT' and t1.paid_byother_flag = 'F' and t1.confirmed_flag != 'ACCAUDITED') or (${/session/@user_id} = 1)) or (${@position_code} = '014' and ((t1.bp_category != 'TENANT' or 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.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-filters>
 </bm:model>
\ No newline at end of file

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

@@ -34,7 +34,7 @@
                 url: $('hn2050_upload_win_link').getUrl(),
                 params: {
                     winid: 'hn2050_upload_win',
-                    table_name: 'csh_transaction',
+                    table_name: 'CSH_TRANSACTION',
                     header_id: record.get('transaction_id')
                 },
                 width: 900,

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

@@ -35,7 +35,7 @@
                 url: $('hn2050_upload_win_link').getUrl(),
                 params: {
                     winid: 'hn2050_upload_win',
-                    table_name: 'csh_transaction',
+                    table_name: 'CSH_TRANSACTION',
                     header_id: record.get('transaction_id')
                 },
                 width: 900,

src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview

@@ -137,7 +137,7 @@
                     <a:field name="collection_classes_desc" required="true" options="collection_classes_ds"
                              displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
                     <a:field name="collection_classes"/>
-                    <a:field name="bp_name" lovGridHeight="350" lovHeight="500" lovLabelWidth="90"
+                    <a:field name="bp_name" required="true" lovGridHeight="350" lovHeight="500" lovLabelWidth="90"
                              lovService="basic.hls_bp_master_v_for_lov" lovWidth="550" title="HLS.BP_TITLE">
                         <a:mapping>
                             <a:map from="bp_id" to="bp_id"/>

src/main/webapp/modules/csh/CSH511/csh_transaction_receipt.lview

@@ -44,7 +44,7 @@
                     url: $('hn2050_upload_win_link').getUrl(),
                     params: {
                         winid: 'hn2050_upload_win',
-                        table_name: 'csh_transaction',
+                        table_name: 'CSH_TRANSACTION',
                         header_id: transaction_id
                     },
                     width: 900,

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

@@ -72,14 +72,14 @@
             parent.shMenu('show');
         }
 
-        function seedetail_transaction_num(value, record, name) {
+        function seedetail_tractnum(value, record, name) {
             if (record.get('transaction_id')) {
                 url = $('csh_write_off_reverse_detail_link').getUrl() + '?transaction_id=' + record.get('transaction_id') + '&transaction_type=' + record.get('transaction_type') + '&ref_n01=' + record.get('ref_n01') + '&receipt_type=' + record.get('receipt_type') + '&bp_category=' + record.get('bp_category') + '&paid_byother_flag=' + record.get('paid_byother_flag');
-                return '<a href="javascript:openWindow(\'' + url + '\');">' + value + '</a>';
+                return '<a href="javascript:openReverseDetailWin(\'' + url + '\');">' + value + '</a>';
             }
         }
 
-        function openWindow(url) {
+        function openReverseDetailWin(url) {
             var win = new Leaf.Window({
                 id: 'csh_write_off_reverse_detail_link_winid',
                 params: {
@@ -90,7 +90,7 @@
                 fullScreen: true
             });
             win.on('close',function(){
-                $('csh_transaction_receipt_write_off_reverse').query();
+                $('csh_transaction_receipt_write_off_reverse_result_ds').query();
             });
         }
 
@@ -108,7 +108,7 @@
             return obj;
         }
 
-        function csh514_receipt_write_off_update(ds, record, name, value, oldvalue) {
+        function csh514_reversed_update(ds, record, name, value, oldvalue) {
             var from_to = construct_from_to();
             var opposite_name = from_to[name];
             if (!Ext.isEmpty(opposite_name)) {
@@ -238,7 +238,7 @@
                     </a:field>
                 </a:fields>
                 <a:events>
-                    <a:event name="update" handler="csh514_receipt_write_off_update"/>
+                    <a:event name="update" handler="csh514_reversed_update"/>
                 </a:events>
             </a:dataSet>
             <a:dataSet id="csh_transaction_receipt_write_off_reverse_result_ds" model="csh.CSH510.csh_transaction_query"
@@ -318,7 +318,7 @@
                     bindTarget="csh_transaction_receipt_write_off_reverse_result_ds" marginHeight="260" marginWidth="35"
                     navBar="true">
                 <!-- <a:columns>
-                    <a:column name="transaction_num" align="center" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM" renderer="seedetail_transaction_num" width="120"/>
+                    <a:column name="transaction_num" align="center" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM" renderer="seedetail_tractnum" width="120"/>
                     <a:column name="transaction_date" align="center" renderer="Leaf.formatDate" width="120"/>
                     <a:column name="currency_name" align="center" width="120"/>
                     <a:column name="transaction_amount" renderer="Leaf.formatMoney" width="120"/>
@@ -332,7 +332,7 @@
                 <!--                    <a:button type="excel"/>-->
                 <!--                </a:toolBar>-->
                 <a:columns>
-                    <a:column name="transaction_num" align="center" renderer="seedetail_transaction_num" prompt="现金事务编号"
+                    <a:column name="transaction_num" align="center" renderer="seedetail_tractnum" prompt="现金事务编号"
                               width="120"/>
                     <a:column name="transaction_date" align="center" renderer="Leaf.formatDate" width="120"/>
                     <!--<a:column name="bp_code" align="center" width="120"/>-->

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

@@ -79,10 +79,7 @@
 
                 } else {
                     var saveData = [];
-                    var receipt_type = '${/parameter/@receipt_type}';
-                    var paid_byother_flag = '${/parameter/paid_byother_flag}';
-                    var bp_category = '${/parameter/bp_category}';
-                    var transaction_type = head_record.get('transaction_type');
+                    var transaction_type = '${/parameter/transaction_type}';
                     // if (receipt_type == 'WITHHOLD') { //划扣
                     //     if (all.length != records.length) {
                     //         Leaf.showInfoMessage("提示", "该现金事务不支付部分反冲");

src/main/webapp/modules/csh/CSH531N/csh_write_off_ref_contract.lview

@@ -120,7 +120,7 @@
 <!--                <a:textField name="bp_name" bindTarget="csh_query_con_ds" prompt="客户名"/>-->
                 <a:datePicker name="due_date_from" bindTarget="csh_query_cf_ds" prompt="CSH531.DATE_FROM"/>
                 <a:datePicker name="due_date_to" bindTarget="csh_query_cf_ds" prompt="CSH531.DATE_TO"/>
-                <a:comboBox name="cf_item_desc" bindTarget="csh_query_cf_ds" prompt="CSH531.CF_ITEM"/>
+<!--                <a:comboBox name="cf_item_desc" bindTarget="csh_query_cf_ds" prompt="CSH531.CF_ITEM"/>-->
             </a:form>
             <a:hBox>
                 <a:vBox>

src/main/webapp/modules/sys/SYS406/sys_mail_body.lview

@@ -54,8 +54,8 @@
         <a:dataSets>
             <a:dataSet id="mailBodyDs">
                 <a:datas dataSource="/model/mail_body"/>
-                <a:fields><![CDATA[
-                ]]></a:fields>
+<!--                <a:fields><![CDATA[-->
+<!--                ]]></a:fields>-->
             </a:dataSet>
         </a:dataSets>
         <a:screenBody>