博雷顿设备类型数据展示

src/main/webapp/WEB-INF/classes/cont/CON930/con_contract_cashflow_monthly.lwm

@@ -119,7 +119,20 @@
                t.agent_bp_id,
                ((select v.bp_name from hls_bp_master v where v.bp_id = t.vender_id)||'/'||(SELECT v.code_value_name
              FROM sys_code_values_v v
-            WHERE v.code = 'DIVISION' AND v.code_value = t.division))division_n,t.division
+            WHERE v.code = 'DIVISION' AND v.code_value = t.division))division_n,
+            t.division,
+               decode(t.division,
+                      '70',
+                      (select ccli.type_name
+                         from con_contract_lease_item ccli
+                        where ccli.contract_id = t.contract_id),
+                      '92',
+                      (select ccli.type_name
+                         from con_contract_lease_item ccli
+                        where ccli.contract_id = t.contract_id),
+                      (select ccli.full_name
+                         from con_contract_lease_item ccli
+                        where ccli.contract_id = t.contract_id)) full_name
           from con_cashflow_monthly_temp t, hls_bp_master m, gld_accounts g
          where m.bp_id = t.agent_bp_id
            and g.account_id(+) = t.account_id
@@ -232,7 +245,20 @@
                tt.agent_bp_id,
                ((select v.bp_name from hls_bp_master v where v.bp_id = tt.vender_id)||'/'||(SELECT v.code_value_name
              FROM sys_code_values_v v
-            WHERE v.code = 'DIVISION' AND v.code_value = tt.division))division_n,tt.division
+            WHERE v.code = 'DIVISION' AND v.code_value = tt.division))division_n,
+            tt.division,
+            decode(tt.division,
+                      '70',
+                      (select ccli.type_name
+                         from con_contract_lease_item ccli
+                        where ccli.contract_id = tt.contract_id),
+                      '92',
+                      (select ccli.type_name
+                         from con_contract_lease_item ccli
+                        where ccli.contract_id = tt.contract_id),
+                      (select ccli.full_name
+                         from con_contract_lease_item ccli
+                        where ccli.contract_id = tt.contract_id)) full_name
           from (select sum(nvl(t.unreceived_sum_amount, 0)) unreceived_sum_amount,
                        sum(nvl(t.overdue_sum_amount, 0)) overdue_sum_amount,
                        sum(nvl(t.not_due_sum_amount, 0)) not_due_sum_amount,
@@ -450,6 +476,7 @@
         <bm:field name="not_due_amount_year_4"/>
         <bm:field name="not_due_amount_year_5"/>
         <bm:field name="not_due_amount_year_5_left"/>
+        <bm:field name="full_name"/>
 
 
 

src/main/webapp/modules/cont/CON3400/contract_sales_report.lview

@@ -244,6 +244,7 @@
                     <a:column name="sale_penalty"  prompt="逾期利息收入"  align="center" width="220"/>
                     <a:column name="sale_other"  prompt="其他收入"  align="center" width="220"/>
                     <a:column name="deposit_value_amount"  prompt="保证金时间价值收益"  align="center" width="220"/>
+                    <a:column name="full_name" prompt="设备名称" align="center" width="220"/>
                 </a:columns>
             </a:grid>
 

src/main/webapp/modules/cont/CON930/con_contract_cashflow_monthly.lview

@@ -307,7 +307,7 @@
                                 <a:column name="not_due_amount_42" align="center" prompt="未到期42个月" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_43" align="center" prompt="未到期43个月" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_44" align="center" prompt="未到期44个月" renderer="Leaf.formatMoney" width="80"/>
-                                <a:column name="not_due_amount_45" align="center" prompt="未到期45个月" renderer="Leaf.formatMoney" width="80"/>
+                            `    <a:column name="not_due_amount_45" align="center" prompt="未到期45个月" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_46" align="center" prompt="未到期46个月" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_47" align="center" prompt="未到期47个月" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_48" align="center" prompt="未到期48个月" renderer="Leaf.formatMoney" width="80"/>
@@ -341,6 +341,7 @@
                                 <a:column name="not_due_amount_year_4" align="center" prompt="未到期4年" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_year_5" align="center" prompt="未到期5年" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_year_5_left" align="center" prompt="未到期5年以上" renderer="Leaf.formatMoney" width="80"/>
+                                <a:column name="full_name" align="center" prompt="设备名称" width="220"/>
                             </a:columns>
                         </a:grid>
                     </a:tab>