[建机]农行汇款导入新模板

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

@@ -17,6 +17,8 @@
                li.line_number,
                hd.created_by,
                li.source_table,
+               '03399500040009165' bank_num,    --update by xsh35973
+               '人民币' currency_type,           --update by xsh35973
                li.attribute_1,
                li.attribute_2,
                li.attribute_3,
@@ -165,7 +167,8 @@
                         p_ref_v05 =>${@ref_v05},
                         p_status =>${@status},
                         p_bank_account_num =>${@bank_account_num},
-                        p_guarantor_name_duty =>${@guarantor_name_duty}
+                        p_guarantor_name_duty =>${@guarantor_name_duty},
+                        p_import_source => 'EXCEL_ADD'
                     );
             end;
             ]]></bm:update-sql>

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

@@ -63,17 +63,17 @@
                     }
                     //否则的话添加必要的字段
                     record.set('receipt_type', 'IMPORT');
-                    record.set('bank_account_num', record.get('attribute_1'));
+                    record.set('bank_account_num', record.get('bank_num'));
                     // record.set('transaction_date', Leaf.formatDate(record.get('attribute_3')));
-                    record.set('bank_slip_num', record.get('attribute_5'));
+                    record.set('bank_slip_num', record.get('attribute_17'));
                     record.set('currency_code', 'CNY');
-                    record.set('transaction_amount', record.get('attribute_14'));
+                    record.set('transaction_amount', record.get('attribute_3'));
                     record.set('exchange_rate', 1);
-                    record.set('bp_bank_account_num', record.get('attribute_8'));
-                    record.set('bp_bank_account_name', record.get('attribute_9'));
-                    record.set('opposite_band_na', record.get('attribute_10'));
-                    record.set('description', record.get('attribute_23'));
-                    record.set('ref_v05', record.get('attribute_24'));
+                    record.set('bp_bank_account_num', record.get('attribute_11'));
+                    record.set('bp_bank_account_name', record.get('attribute_12'));
+                    record.set('opposite_band_na', record.get('attribute_8'));
+                    record.set('description', record.get('attribute_14'));
+                    record.set('ref_v05', record.get('attribute_15'));
 
                     record.set('write_off_flag', 'DISABLED');
 
@@ -456,25 +456,25 @@
                         width="980" rowRenderer="change_background_color">
                     <a:columns>
                         <a:column name="error_message" editor="textArea_e" prompt="错误信息" width="180"/>
-                        <a:column name="attribute_1" prompt="账号" width="80"/>
-                        <a:column name="attribute_2" prompt="货币" width="80"/>
-                        <a:column name="transaction_date" prompt="交易日期" renderer="Leaf.formatDate" width="80"/>
+                        <a:column name="bank_num" prompt="账号" width="80"/>
+                        <a:column name="currency_type" prompt="货币" width="80"/>
+                        <a:column name="attribute_1" prompt="交易日期" renderer="Leaf.formatDate" width="80"/>
                         <!--   <a:column name="attribute_4" prompt="交易时间" width="80"/>-->
-                        <a:column name="attribute_5" prompt="日志号" width="80"/>
-                        <a:column name="attribute_8" prompt="对方账号" width="80"/>
-                        <a:column name="attribute_9" prompt="对方账号户名" width="80"/>
-                        <a:column name="attribute_10" prompt="对方银行名称" width="80"/>
+                        <a:column name="attribute_17" prompt="日志号" width="80"/>
+                        <a:column name="attribute_11" prompt="对方账号" width="80"/>
+                        <a:column name="attribute_12" prompt="对方账号户名" width="80"/>
+                        <a:column name="attribute_8" prompt="对方银行名称" width="80"/>
 
                         <a:column name="bp_name" prompt="收款对象" editor="grid_lov" width="120"/>
                         <a:column name="paid_byother_flag_desc" prompt="是否代付" editor="grid_cb"/>
 
-                        <a:column name="attribute_14" prompt="收款金额" renderer="Leaf.formatMoney" align="right"
+                        <a:column name="attribute_3" prompt="收款金额" renderer="Leaf.formatMoney" align="right"
                                   width="80"/>
-                        <a:column name="attribute_23" prompt="摘要" width="80"/>
+                        <a:column name="attribute_14" prompt="摘要" width="80"/>
 
                         <a:column name="collection_classes_desc" prompt="款项分类" editor="grid_cb"/>
 
-                        <a:column name="attribute_24" prompt="附言" width="80"/>
+                        <a:column name="attribute_15" prompt="附言" width="80"/>
 
                         <a:column name="extra_nam" prompt="代理店简称" width="80" editor="grid_lov" />
                         <a:column name="bp_code" prompt="代理店简称code" hidden="true"/>

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

@@ -575,7 +575,7 @@
                     <a:field name="functional_currency_code"
                              defaultValue="${/model/default_exchange_rate_type_path/record/@functional_currency_code}"/>
                     <a:field name="bp_name" required="true" lovGridHeight="350" lovHeight="500" lovLabelWidth="90"
-                             lovService="basic.hls_bp_master_v_for_lov?bp_category=TENANT" lovWidth="550" title="HLS.BP_TITLE">
+                             lovService="basic.hls_bp_master_v_for_agent_lov" lovWidth="550" title="HLS.BP_TITLE">
                         <a:mapping>
                             <a:map from="bp_id" to="bp_id"/>
                             <a:map from="bp_name" to="bp_name"/>