[fiX] 付款创建页面修改

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

@@ -72,9 +72,10 @@
                  where hbm.bank_account_id = cpr.bp_bank_account_id) BP_BANK_ACCOUNT_NAME,
 
                --应付我司金额
-
-                to_char(cpr.amount_agent,'FM999,999,999,990.00')  amount_agent,
-              to_char(cpr.amount_vender,'FM999,999,999,990.00')  amount_vender,
+               cpr.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,
 
 
                --未付金额
@@ -94,11 +95,22 @@
                   from hls_bp_master_bank_account hbm
                  where hbm.bank_account_id = cpr.vender_bank_account_id) vender_bank_account_name,
                cpr.amount,
-                to_char(c.lease_item_amount,'FM999,999,999,990.00')  lease_item_amount,
+               c.lease_item_amount,
+                  to_char(c.lease_item_amount,'FM999,999,999,990.00')  lease_item_amount_print,
 
                --首付款抵充金额
                (select  to_char( nvl(hd.other_payment2, 0),'FM999,999,999,990.00')
                   from hls_fin_calculator_hd hd
+                 where hd.calc_session_id =
+                       (select PQ.CALC_SESSION_ID
+                          from prj_quotation pq
+                         where pq.document_id =
+                               (select cc.project_id
+                                  from con_contract cc
+                                 where cc.contract_id = c.contract_id)
+                           and pq.document_category = 'PROJECT')) other_payment2_print,
+               (select   nvl(hd.other_payment2, 0)
+                  from hls_fin_calculator_hd hd
                  where hd.calc_session_id =
                        (select PQ.CALC_SESSION_ID
                           from prj_quotation pq

src/main/webapp/WEB-INF/leaf.plugin.export.word/payment_apply_content.xml

@@ -116,15 +116,15 @@
 				</tc>
 
 				<tc width="4">
-					<p align="center"><t fontSize="12" fontFamily="宋体">${detail_item_l.getString('lease_item_amount')!''}</t></p>
+					<p align="center"><t fontSize="12" fontFamily="宋体">${detail_item_l.getString('lease_item_amount_print')!''}</t></p>
 				</tc>
 
 				<tc width="4">
-					<p align="center"><t fontSize="12" fontFamily="宋体">${detail_item_l.getString('amount_vender')!''}</t></p>
+					<p align="center"><t fontSize="12" fontFamily="宋体">${detail_item_l.getString('amount_vender_print')!''}</t></p>
 				</tc>
 
 				<tc width="4">
-					<p align="center"><t fontSize="12" fontFamily="宋体">${detail_item_l.getString('amount_agent')!''}</t></p>
+					<p align="center"><t fontSize="12" fontFamily="宋体">${detail_item_l.getString('amount_agent_print')!''}</t></p>
 				</tc>
 
 				<tc width="4">
@@ -132,7 +132,7 @@
 				</tc>
 
 				<tc width="4">
-					<p align="center"><t fontSize="12" fontFamily="宋体">${detail_item_l.getString('other_payment2')!''}</t></p>
+					<p align="center"><t fontSize="12" fontFamily="宋体">${detail_item_l.getString('other_payment2_print')!''}</t></p>
 				</tc>
 
 				<tc width="4">