[建机]虚拟代理店-付款申请创建维护

src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm

@@ -88,7 +88,9 @@
         v.write_off_date,
         v.write_off_amount,
         v.division,
-		v.finance_amount
+		v.finance_amount,
+		v.lease_item_amount,
+		v.is_buyout
   FROM (SELECT t.contract_id,
                 (SELECT hbbc.bank_account_id
                        FROM hls_bp_master_bank_account hbbc
@@ -220,7 +222,9 @@
                 from csh_write_off cwo
                  where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=t.contract_id),0) write_off_amount,
                t.division,
-			   t.finance_amount
+			   t.finance_amount,
+			   t.lease_item_amount,
+			   nvl(t.is_buyout,'N') is_buyout
           FROM con_contract_cashflow f
           join con_contract t
             on t.contract_id = f.contract_id

src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query_after_save.lwm

@@ -60,7 +60,7 @@
               cpr.bp_bank_account_name BP_BANK_ACCOUNT_NAME,
 
                --应付我司金额
-               cpr.amount_agent,
+               nvl(cpr.amount_agent,0) amount_agent,
                cpr.amount_vender,
                to_char(cpr.amount_agent,'FM999,999,999,990.00')  amount_agent_print,
               to_char(cpr.amount_vender,'FM999,999,999,990.00')  amount_vender_print,
@@ -131,7 +131,8 @@
         nvl((select  sum(cwo.write_off_due_amount) write_off_amount
                 from csh_write_off cwo
                  where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=c.contract_id),0) write_off_amount,
-        c.division
+        c.division,
+        nvl(c.is_buyout,'N') is_buyout
           from csh_payment_req_ln cpr,
                con_contract c,
                hls_bp_master hbm,

src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm

@@ -158,6 +158,11 @@
                 (select bp_name
                    from hls_bp_master
                   where hls_bp_master.bp_id = t.bp_id_agent_level1) bp_id_agent_n,
+                --add by 18938
+                (select nvl(is_constru_unit,'N')
+                   from hls_bp_master
+                  where hls_bp_master.bp_id = t.bp_id_agent_level1) is_constru_unit,
+                 nvl(t.is_buyout,'N') is_buyout,
                 --查找厂商
                 (SELECT bp_name FROM hls_bp_master h WHERE h.bp_id=hli.vender_id) vender_name_n,
                 hli.vender_name,
@@ -255,6 +260,8 @@
         <bm:field name="con_business_type_n"/>
         <bm:field name="cdd_list_id"/>
         <bm:field name="bp_id_agent_n"/>
+        <bm:field name="is_constru_unit"/>
+        <bm:field name="is_buyout"/>
         <bm:field name="bp_id_tenant"/>
 <!--        <bm:field name="vender_name"/>-->
         <bm:field name="vender_name_n"/>

src/main/webapp/modules/csh/CSH501/csh_payment_create_entrance.lview

@@ -240,6 +240,8 @@
             param['approval_status'] = record.get('approval_status');
             param['con_business_type'] = record.get('con_business_type');
             param['division'] = record.get('division');
+            //add by 18938
+            param['is_constru_unit'] = record.get('is_constru_unit');
             if (record.get('business_type') == 'PAYMENT') {
                 param['function_code'] = 'CSH501D';
             } else if (record.get('business_type') == 'PREPAYMENT') {

src/main/webapp/modules/csh/CSH501/csh_payment_req_selected.lview

@@ -129,6 +129,9 @@
                             param['product_type_n'] = record.get('product_type_n');
                             param['product_name_write'] = record.get('product_name_write');
                         }
+                        //add by 18938
+                        param['is_constru_unit'] = record.get('is_constru_unit');
+                        param['is_buyout'] = record.get('is_buyout');
                         param['winid'] = 'csh501_csh_payment_req_link_winid';
                         param['url_title'] = '付款申请';
                         hls_doc_get_layout_code('csh501_get_layout_code_link_id', param, 'csh501_csh_payment_req_link_id', 'csh_payment_req_selectedDs');