【fix】修改开票信息显示

src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_cf_v_new.lwm

@@ -44,6 +44,12 @@
        t2.last_received_date,
        t2.due_date,
        t2.due_amount,
+         (SELECT wm_concat(distinct c.bp_bank_account_name)
+      FROM csh_transaction c
+     WHERE c.transaction_id IN
+           (SELECT coo.csh_transaction_id
+              FROM csh_write_off coo
+             WHERE coo.cashflow_id = t2.cashflow_id)) account_name,
        decode(t1.lease_channel,'01',null,t2.principal) principal,
        decode(t1.lease_channel,'01',null,t2.interest) interest,
        t2.received_amount,
@@ -102,6 +108,7 @@
         <bm:field name="inception_of_lease" databaseType="DATE" datatype="java.util.Date" physicalName="INCEPTION_OF_LEASE"/>
         <bm:field name="contract_status" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_STATUS" required="true"/>
         <bm:field name="contract_status_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_STATUS_DESC"/>
+        <bm:field name="account_name" databaseType="VARCHAR2" datatype="java.lang.String"/>
         <bm:field name="billing_method" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BILLING_METHOD"/>
         <bm:field name="billing_method_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BILLING_METHOD_DESC"/>
         <bm:field name="billing_object_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BILLING_OBJECT_ID"/>

src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_create.lwm

@@ -19,6 +19,8 @@
         <bm:field name="invoice_kind" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND"/>
         <bm:field name="invoice_kind_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_DESC" prompt="ACR.INVOICE_TYPE"/>
         <bm:field name="due_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="DUE_AMOUNT" prompt="ACR.DUE_AMOUNT"/>
+        <bm:field name="principal" databaseType="NUMBER" datatype="java.lang.Double" physicalName="PRINCIPAL" prompt="应收本金"/>
+        <bm:field name="interest" databaseType="NUMBER" datatype="java.lang.Double" physicalName="INTEREST" prompt="应收利息"/>
         <bm:field name="cf_billing_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="CF_BILLING_AMOUNT" prompt="ACR.BILLING_AMOUNT"/>
         <bm:field name="received_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="RECEIVED_AMOUNT" prompt="ACR.RECEIVED_AMOUNT"/>
         <bm:field name="billing_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="BILLING_AMOUNT" prompt="ACR.THIS_BILLING_AMOUNT"/>
@@ -53,6 +55,8 @@
 				       t.cf_billing_amount,
 				       t.received_amount,
 				       t.contract_id,
+				       cf.principal,
+                       cf.interest,
 				       con.contract_number,
 				       con.contract_name,
 				       con.project_id,

src/main/webapp/modules/acr/ACR510/acr_invoice_create_invoice.lview

@@ -49,6 +49,7 @@
                 Leaf.Masker.unmask(Ext.getBody());
                 return;
             }
+
             var datas = ds.getJsonData();
             Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认开票？',function()
             {
@@ -105,7 +106,7 @@
             <a:dataSet id="headDs" autoCreate="true">
                 <a:fields>
                     <a:field name="company_id" defaultValue="${/parameter/@company_id}"/>
-                    <a:field name="group_billing_method" defaultValue="GROUP_BY_CONTRACT"/>
+                    <a:field name="group_billing_method" defaultValue="GROUP_BY_TIMES"/>
                     <a:field name="accounting_date" defaultValue="${/model/default_value_record/record/@today}" required="true"/>
                     <a:field name="invoice_date" defaultValue="${/model/default_value_record/record/@today}" required="true"/>
                 </a:fields>
@@ -151,6 +152,8 @@
 
                                 <a:column name="currency_desc" align="center"/>
                                 <a:column name="due_amount" align="right" renderer="Leaf.formatMoney"/>
+                                <a:column name="principal" align="right" renderer="Leaf.formatMoney"/>
+                                <a:column name="interest" align="right" renderer="Leaf.formatMoney"/>
                                 <a:column name="received_amount" align="right" renderer="Leaf.formatMoney"/>
                                 <a:column name="cf_billing_amount" align="right" renderer="Leaf.formatMoney"/>
                                 <a:column name="billing_amount" align="right" editor="selectedDs_grid_editor_nf" renderer="Leaf.formatMoney" footerRenderer="sum_foot"/>

src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview

@@ -351,6 +351,7 @@
                                 <a:column name="due_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney"/>
                                 <a:column name="principal" align="right" prompt="本金" renderer="Leaf.formatMoney"/>
                                 <a:column name="interest" align="right" prompt="利息" renderer="Leaf.formatMoney"/>
+                                <a:column name="account_name"  prompt="收款户名"/>
                                 <a:column name="received_amount" align="right" prompt="已收金额" renderer="Leaf.formatMoney"/>
                                 <a:column name="received_principal" align="right" prompt="已收本金" renderer="Leaf.formatMoney"/>
                                 <a:column name="received_interest" align="right" prompt="已收利息" renderer="Leaf.formatMoney"/>