保证金台账增加 设备名称字段

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_record_query.lwm

@@ -90,6 +90,10 @@
         <bm:field name="receipt_type_des" expression="(select v.code_value_name from sys_code_values_v v where v.code=&apos;RECEIPT_TYPE&apos; and v.code_value=t1.receipt_type)"/>
         <bm:field name="ref_contract_id"/>
         <bm:field name="contract_number" expression="(select cc.contract_number from con_contract cc where cc.contract_id = t1.ref_contract_id)"/>
+        <bm:field name="full_name" expression="(decode(select cc.division from con_contract cc where cc.contract_id=t1.ref_contract_id),
+                                                '70',(select ccli.type_name from con_contract_lease_item ccli where ccli.contract_id=t1.ref_contract_id and rownum=1),
+                                                '92',(select ccli.type_name from con_contract_lease_item ccli where ccli.contract_id=t1.ref_contract_id and rownum=1),
+                                                 (select ccli.full_name from con_contract_lease_item ccli where ccli.contract_id=t1.ref_contract_id and rownum=1) )"/>
         <bm:field name="collection_classes"/>
         <bm:field name="collection_classes_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'DS_COLLECTION_CLASSES' and v.code_value =t1.collection_classes)" 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"/>

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT122/cus_deposit_record_maintain.lview

@@ -472,6 +472,7 @@
                         <a:column name="approve_status" prompt="状态" width="120" align="center"/>
                         <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"
                                   />
+                        <a:column name="full_name" prompt="机种名称" width="200" align="center"/>
                         <a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
                             <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name"
                                       align="center" />