【fix】修改bug

src/main/webapp/WEB-INF/classes/cont/CON1300/get_contract_print_grid_info.lwm

@@ -4,13 +4,19 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-      SELECT *
+     SELECT *
     FROM (SELECT to_char(cw.times) times,
                  to_char(cw.due_date, 'yyyy-mm-dd') due_date,
                  to_char(cw.contract_id) contract_id,
                  to_char(cw.due_amount,'FM999,999,999,990.00')due_amount,
-                 to_char(nvl(cw.vat_due_amount, 0),'FM999,999,999,990.00') vat_due_amount,
+                 --to_char(nvl(cw.vat_due_amount, 0),'FM999,999,999,990.00') vat_due_amount,
                  to_char(cw.cf_item) cf_item,
+                 --租金增值税
+                 to_char(NVL(cw.vat_due_amount,0),'FM999,999,999,990.00')  vat_due_amount,
+                 to_char(NVL(cw.principal,0),'FM999,999,999,990.00')  principal,
+                 to_char(NVL(cw.vat_principal,0),'FM999,999,999,990.00') vat_principal,
+
+
                  --上下端利息
                  to_char(nvl((SELECT cu.interest
                        FROM con_unearned_finance_income cu
@@ -104,8 +110,13 @@
                  '合计' due_date,
                  '' contract_id,
                  to_char(nvl(SUM(cw.due_amount), 0),'FM999,999,999,990.00') due_amount,
-                 to_char(SUM(nvl(cw.vat_due_amount, 0)),'FM999,999,999,990.00') vat_due_amount,
+               --  to_char(SUM(nvl(cw.vat_due_amount, 0)),'FM999,999,999,990.00') vat_due_amount,
                  '' cf_item,
+                   --租金增值税
+                 to_char(SUM(NVL(cw.vat_due_amount,0)),'FM999,999,999,990.00')  vat_due_amount,
+                 to_char(SUM(NVL(cw.principal,0)),'FM999,999,999,990.00')  principal,
+                 to_char(SUM(NVL(cw.vat_principal,0)),'FM999,999,999,990.00') vat_principal,
+
                  --上下端利息
                  to_char(SUM(nvl((SELECT cu.interest
                            FROM con_unearned_finance_income cu

src/main/webapp/modules/cont/CON3200/contract_receipt_detail_print.lsc

@@ -84,6 +84,9 @@
                             <dr:table-column cellStyle="grid_cell" titleStyle="grid_title" column_id="439" field="times" title="期数"  type="content"/>
                             <dr:table-column cellStyle="grid_cell" titleStyle="grid_title" column_id="440" field="due_date" title="预定收款日"  type="content" groupDesc="计数" />
                             <dr:table-column cellStyle="grid_cell" titleStyle="grid_title" column_id="441" field="due_amount" title="预定收款金额"  type="content"/>
+                            <dr:table-column cellStyle="grid_cell" titleStyle="grid_title" column_id="441" field="vat_due_amount" title="租金增值税"  type="content"/>
+                            <dr:table-column cellStyle="grid_cell" titleStyle="grid_title" column_id="441" field="principal" title="本金"  type="content"/>
+                            <dr:table-column cellStyle="grid_cell" titleStyle="grid_title" column_id="441" field="vat_principal" title="本金增值税"  type="content"/>
                             <dr:table-column cellStyle="grid_cell" titleStyle="grid_title" column_id="448" field="total_interest" title="利息合计"  type="content"/>
                             <dr:table-column cellStyle="grid_cell" titleStyle="grid_title" column_id="442" field="up_interest" title="利息上段"  type="content"/>
                             <dr:table-column cellStyle="grid_cell" titleStyle="grid_title" column_id="443" field="down_interest" title="利息下段"  type="content"/>