[fix] 销项发票创建

77112fbe · lijingjing · 01a0a9e1 · 77112fbe · 77112fbe · 77112fbe
Commit 77112fbe authored Nov 21, 2019 by lijingjing
18 changed files
--- a/src/main/webapp/WEB-INF/classes/acr/ACR510/acr_bp_agent_ds.lwm
+++ b/src/main/webapp/WEB-INF/classes/acr/ACR510/acr_bp_agent_ds.lwm
@@ -5,6 +5,7 @@
    $Revision: 1.0  
    $Purpose: 
 -->
+
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
    <bm:operations>
        <bm:operation name="query">

--- a/src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_billing_object_lov.lwm
+++ b/src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_billing_object_lov.lwm
@@ -5,6 +5,7 @@
    $Revision: 1.0  
    $Purpose: 
 -->
+
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
    <bm:fields>
        <bm:field name="contract_id"/>

--- a/src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_cf_v_new.lwm
+++ b/src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_cf_v_new.lwm
@@ -145,6 +145,7 @@
        <bm:field name="lease_channel"/>
    </bm:fields>
    <bm:query-fields>
+
        <bm:query-field name="cf_item" queryExpression="t2.cf_item = ${@cf_item}"/>
        <bm:query-field name="due_date_from" queryExpression="t2.due_date &gt;= to_date(${@due_date_from},&apos;yyyy-mm-dd&apos;)"/>
        <bm:query-field name="due_date_to" queryExpression="t2.due_date &lt;= to_date(${@due_date_to},&apos;yyyy-mm-dd&apos;)"/>

--- a/src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_create.lwm
+++ b/src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_create.lwm
@@ -9,76 +9,33 @@
    <bm:fields>
        <bm:field name="record_id"/>
        <bm:field name="cashflow_id"/>
-        <bm:field name="product_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PRODUCT_NAME"
-                  prompt="ACR.PRODUCT_NAME"/>
+        <bm:field name="product_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PRODUCT_NAME" prompt="ACR.PRODUCT_NAME"/>
        <bm:field name="project_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="PROJECT_ID"/>
-        <bm:field name="project_number" databaseType="VARCHAR2" datatype="java.lang.String"
-                  physicalName="PROJECT_NUMBER" prompt="HLS.PROJECT_NUMBER"/>
-        <bm:field name="project_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROJECT_NAME"
-                  prompt="HLS.PROJECT_NAME"/>
+        <bm:field name="project_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROJECT_NUMBER" prompt="HLS.PROJECT_NUMBER"/>
+        <bm:field name="project_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROJECT_NAME" prompt="HLS.PROJECT_NAME"/>
        <bm:field name="contract_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CONTRACT_ID"/>
-        <bm:field name="contract_number" databaseType="VARCHAR2" datatype="java.lang.String"
-                  physicalName="CONTRACT_NUMBER" prompt="HLS.CONTRACT_NUMBER"/>
-        <bm:field name="contract_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_NAME"
-                  prompt="HLS.CONTRACT_NAME"/>
+        <bm:field name="contract_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_NUMBER" prompt="HLS.CONTRACT_NUMBER"/>
+        <bm:field name="contract_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_NAME" prompt="HLS.CONTRACT_NAME"/>
        <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="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"/>
-        <bm:field name="times" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TIMES"
-                  prompt="HLS.PERIOD_NUMBER"/>
-        <bm:field name="last_received_date" databaseType="DATE" datatype="java.util.Date"
-                  physicalName="LAST_RECEIVED_DATE" prompt="ACR.RECEIVED_DATE"/>
-        <bm:field name="cf_item" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CF_ITEM"
-                  prompt="HLS.RECEIVE_PROJECT"/>
-        <bm:field name="cf_item_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CF_ITEM_DESC"
-                  prompt="HLS.RECEIVE_PROJECT"/>
-        <bm:field name="currency" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY"
-                  prompt="HLS.CURRENCY"/>
-        <bm:field name="currency_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_DESC"
-                  prompt="HLS.CURRENCY"/>
-        <bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE"
-                  prompt="HLS.EXCHANGE_RATE"/>
-        <bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String"
-                  physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE"/>
-        <bm:field name="exchange_rate_type_desc" databaseType="VARCHAR2" datatype="java.lang.String"
-                  physicalName="EXCHANGE_RATE_TYPE_DESC" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
-        <bm:field name="invoice_bp_tax_registry_num" databaseType="VARCHAR2" datatype="java.lang.String"/>
-        <bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String"/>
-        <bm:field name="billing_method" databaseType="VARCHAR2" datatype="java.lang.String"/>
-        <bm:field name="billing_way_n" databaseType="VARCHAR2" datatype="java.lang.String"/>
-        <bm:field name="billing_frequency_n" databaseType="VARCHAR2" datatype="java.lang.String"/>
-        <bm:field name="billing_object_name" databaseType="VARCHAR2" datatype="java.lang.String"/>
-        <bm:field name="invoice_title" databaseType="VARCHAR2" datatype="java.lang.String"/>
-        <bm:field name="object_taxpayer_type" databaseType="VARCHAR2" datatype="java.lang.String"/>
-        <bm:field name="invoice_bp_address_phone_num" databaseType="VARCHAR2" datatype="java.lang.String"/>
-        <bm:field name="invoice_bp_bank_account" databaseType="VARCHAR2" datatype="java.lang.String"/>
-        <bm:field name="billing_method_desc" databaseType="VARCHAR2" datatype="java.lang.String"/>
-        <bm:field name="object_taxpayer_type_desc" databaseType="VARCHAR2" datatype="java.lang.String"/>
-
+        <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="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"/>
+        <bm:field name="times" databaseType="NUMBER" datatype="java.lang.Long" physicalName="TIMES" prompt="HLS.PERIOD_NUMBER"/>
+        <bm:field name="last_received_date" databaseType="DATE" datatype="java.util.Date" physicalName="LAST_RECEIVED_DATE" prompt="ACR.RECEIVED_DATE"/>
+        <bm:field name="cf_item" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CF_ITEM" prompt="HLS.RECEIVE_PROJECT"/>
+        <bm:field name="cf_item_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CF_ITEM_DESC" prompt="HLS.RECEIVE_PROJECT"/>
+        <bm:field name="currency" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY" prompt="HLS.CURRENCY"/>
+        <bm:field name="currency_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CURRENCY_DESC" prompt="HLS.CURRENCY"/>
+        <bm:field name="exchange_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="EXCHANGE_RATE" prompt="HLS.EXCHANGE_RATE"/>
+        <bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE"/>
+        <bm:field name="exchange_rate_type_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE_DESC" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
    </bm:fields>
    <bm:operations>
        <bm:operation name="query">
            <bm:query-sql><![CDATA[
            	select t.cashflow_id,
-                t.bp_name,--承租人姓名
-               con.billing_method,--开票规则
-                con.billing_method_desc,
-               con.billing_way_n,--开票方式
-               con.billing_frequency_n,--开票频率
-               aic.billing_object_name,--开票对象
-               t.invoice_title,--发票抬头
-               aic.object_taxpayer_type,--纳税人类型
-               aic.object_taxpayer_type_desc,--纳税人类型
-               t.invoice_bp_address_phone_num,--开票地址电话
-               t.invoice_bp_bank_account,--开户行及账号
 				       t.record_id,
 				       t.billing_object,
 				       (select c.code_value_name
@@ -115,65 +72,23 @@
 				       (select i.description
 				          from hls_cashflow_item i
 				         where i.cf_item = t.cf_item) as cf_item_desc,
-                CASE
-                WHEN con.division = '10' THEN
-                (SELECT ci.oem_type
-                FROM con_contract_lease_item ci
-                WHERE ci.contract_id = con.contract_id
-                AND ci.equipment_type = 'MAIN')|| nvl((SELECT ci.billing_desc
-                FROM con_contract_cf_item ci
-                WHERE ci.contract_id = con.contract_id
-                AND ci.cf_item = t.cf_item),
-                (SELECT iv.billing_desc
-                FROM hls_cashflow_item_company_v iv
-                WHERE iv.cf_item = t.cf_item
-                AND iv.company_id = con.company_id))
-                ELSE
-                CASE
-                WHEN t.cf_item IN (2,
-                3,
-                8,
-                9,
-                304,
-                100,
-                101) THEN
-                (SELECT decode(con.division,
-                '00',
-                '挖掘机',
-                '01',
-                '装载机') || nvl((SELECT ci.billing_desc
-                FROM con_contract_cf_item ci
-                WHERE ci.contract_id = con.contract_id
-                AND ci.cf_item = t.cf_item),
-                (SELECT iv.billing_desc
-                FROM hls_cashflow_item_company_v iv
-                WHERE iv.cf_item = t.cf_item
-                AND iv.company_id = con.company_id))
-                FROM dual)
-                ELSE
-                nvl((SELECT ci.billing_desc
-                FROM con_contract_cf_item ci
-                WHERE ci.contract_id = con.contract_id
-                AND ci.cf_item = t.cf_item),
-                (SELECT iv.billing_desc
-                FROM hls_cashflow_item_company_v iv
-                WHERE iv.cf_item = t.cf_item
-                AND iv.company_id = con.company_id))
-                END
-                END AS product_name,
-                t.invoice_bp_tax_registry_num
+				       nvl((select ci.billing_desc
+						  from con_contract_cf_item ci
+						 where ci.contract_id = con.contract_id
+						   and ci.cf_item =t.cf_item),(select iv.billing_desc
+				          from hls_cashflow_item_company_v iv
+				         where iv.cf_item = t.cf_item
+				           and iv.company_id = con.company_id)) as product_name 
 				  from acr_invoice_create_tmp      t,
 				       con_contract_v              con,
-                con_contract_cashflow_all_v cf,
-                acr_invoice_contract_v      aic
+				       con_contract_cashflow_all_v cf
 				 where t.session_id = ${/session/@session_id}
 				   and t.contract_id = con.contract_id
 				   and t.cashflow_id = cf.cashflow_id
-                and con.contract_id = aic.contract_id
 				 order by con.contract_id,cf.times,t.cf_item
-                ]]>
-            </bm:query-sql>
+			]]></bm:query-sql>
        </bm:operation>
+
        <bm:operation name="update">
            <bm:update-sql><![CDATA[
 				begin
@@ -183,8 +98,7 @@
 						                            p_product_name          => ${@product_name},
 						                            p_user_id			  	=> ${/session/@user_id});
 				end;
-                ]]>
-            </bm:update-sql>
+			]]></bm:update-sql>
        </bm:operation>
        <bm:operation name="execute">
            <bm:update-sql><![CDATA[
@@ -197,8 +111,7 @@
 						                           p_user_id			  => ${/session/@user_id},
 						                           p_role_id			  => ${/session/@role_id});
 				end;
-                ]]>
-            </bm:update-sql>
+			]]></bm:update-sql>
        </bm:operation>
    </bm:operations>
 </bm:model>
--- a/src/main/webapp/WEB-INF/classes/acr/ACR510/contract_status_lov.lwm
+++ b/src/main/webapp/WEB-INF/classes/acr/ACR510/contract_status_lov.lwm
 <?xml version="1.0" encoding="UTF-8"?>
+
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
    <bm:operations>
        <bm:operation name="query">

--- a/src/main/webapp/WEB-INF/classes/acr/ACR510/hls_cashflow_item_v_lov.lwm
+++ b/src/main/webapp/WEB-INF/classes/acr/ACR510/hls_cashflow_item_v_lov.lwm
@@ -5,6 +5,7 @@
    $Revision: 1.0  
    $Purpose: 
 -->
+
 <ns1:model xmlns:ns1="http://www.leaf-framework.org/schema/bm" alias="t1" extend="hls.HLS005.hls_cashflow_item_v" extendMode="reference">
    <ns1:fields>
        <ns1:field name="cf_item" forDisplay="false" forQuery="false"/>

--- a/src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_bp_master_list.lwm
+++ b/src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_bp_master_list.lwm
@@ -5,6 +5,7 @@
    $Revision: 1.0  
    $Purpose: 
 -->
+
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
    <bm:fields>
        <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER.BP_ID"/>

--- a/src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_hd_batch.lwm
+++ b/src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_hd_batch.lwm
@@ -6,6 +6,7 @@
        <bm:field name="creation_by" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CREATION_BY" prompt="ACR_INVOICE_HD_BATCH.CREATION_BY"/>
        <bm:field name="last_updated_date" databaseType="DATE" datatype="java.util.Date" physicalName="LAST_UPDATED_DATE" prompt="ACR_INVOICE_HD_BATCH.LAST_UPDATED_DATE"/>
    </bm:fields>
+
    <bm:features>
        <f:standard-who/>
    </bm:features>

--- a/src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_sys_user_lov.lwm
+++ b/src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_sys_user_lov.lwm
@@ -5,7 +5,7 @@
    $Revision: 1.0  
    $Purpose: 
 -->
-<bm:model xmlns:bm="http://www.aurora-framework.org/schema/bm">
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
    <bm:operations>
        <bm:operation name="query">
            <bm:query-sql><![CDATA[

--- a/src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_update_query.bm
+++ b/src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_update_query.bm
@@ -5,7 +5,7 @@
    $Revision: 1.0  
    $Purpose: 
 -->
-<bm:model xmlns:bm="http://www.aurora-framework.org/schema/bm">
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
    <bm:operations>
        <bm:operation name="query">
            <bm:query-sql><![CDATA[

--- a/src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_update_query.lwm
+++ b/src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_update_query.lwm
@@ -5,6 +5,7 @@
    $Revision: 1.0  
    $Purpose: 
 -->
+
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
    <bm:operations>
        <bm:operation name="query">

--- a/src/main/webapp/WEB-INF/classes/acr/ACR514/acr_invoice_reverse.lwm
+++ b/src/main/webapp/WEB-INF/classes/acr/ACR514/acr_invoice_reverse.lwm
@@ -5,6 +5,7 @@
    $Revision: 1.0  
    $Purpose: 
 -->
+
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
    <bm:operations>
        <bm:operation name="query">

--- a/src/main/webapp/modules/acr/ACR310/acr_invoice_query.lview
+++ b/src/main/webapp/modules/acr/ACR310/acr_invoice_query.lview
@@ -36,6 +36,7 @@


            
+            
            window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
                var tax_type_rate = $('ACR310_QUERY__ds').getAt(0).get('tax_type_rate');
                var product_name = $('ACR310_QUERY__ds').getAt(0).get('product_name');

--- a/src/main/webapp/modules/acr/ACR510/acr_invoice_create_invoice.lview
+++ b/src/main/webapp/modules/acr/ACR510/acr_invoice_create_invoice.lview
@@ -7,86 +7,73 @@
 <a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
    <a:init-procedure>
        <a:model-query model="basic.sys_session_info" rootPath="default_value_record"/>
-<!--        <a:model-query model="acr.ACR510.acr_invoice_group_billing_method" rootPath="group_billing_method_list"/>-->
+        <a:model-query model="acr.ACR510.acr_invoice_group_billing_method" rootPath="group_billing_method_list"/>
    </a:init-procedure>
    <a:view>
        <a:link id="svcLink_create_invoice" url="${/request/@context_path}/modules/acr/ACR510/acr_invoice_create.lsc"/>
-        <!-- <a:screen-include screen="modules/hls/hls_common_javascript.lview"/>-->
-        <script type="text/javascript"><![CDATA[
-
-        function createScreen_close() {
+        <a:screen-include screen="modules/hls/hls_common_javascript.lview"/>
+        <script><![CDATA[
+        function createScreen_close()
+        {
            var win = $('acr_invoice_create_invoice');
            win.close();
        }

-        function createScreen_create() {
+        function createScreen_create()
+        {
+            debugger;
            var win = $('acr_invoice_create_invoice');
-
-            winMask(win);
-
-            var ds = $('headDs');
-            if (!ds.validate(true)) {
-                f_hls.winNoMask(win);
+            var ds=$('headDs');
+            if(!ds.validate(true))
+            {
+                Leaf.Masker.unmask(Ext.getBody());
                return;
            }
-            debugger
            var datas = ds.getJsonData();
-
-            winNoMask(win);
-
-            Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认开票？', function () {
-                winMask(win);
+            Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认开票？',function()
+            {
                Leaf.request({
                    url: $('svcLink_create_invoice').getUrl(),
                    para: datas,
-                    success: function (res) {
-                        winNoMask(win);
+                    success: function(res) {
+                        debugger;
                        createScreen_close();
                        contractDs_grid_query();
                    },
-                    failure: function () {
-                        winNoMask(win);
+                    failure: function() {
+                        Leaf.Masker.unmask(Ext.getBody());
+
                    },
-                    error: function () {
-                        winNoMask(win);
+                    error: function() {
+                        Leaf.Masker.unmask(Ext.getBody());
+
                    },
                    scope: this
                });
-            }, function () {
-                winNoMask(win);
+            },function (){
+                Leaf.Masker.unmask(Ext.getBody());
+
            });

        }

-        function unSelect_selectedDs(ds, record) {
+        function unSelect_selectedDs(ds,record){
            record.dirty = false;
        }

-        function onSelect_selectedDs(ds, record) {
+        function onSelect_selectedDs(ds,record){
            record.dirty = true;
        }

-        function onLoad_selectedDs(ds) {
-            ds.selectAll.defer(5, ds);
-            var records = ds.getAll();
-            for (var i = 0; i < records.length; i++) {
-                if ( records[i].get('cf_item') && records[i].get('cf_item') == '51') {
-                    records[i].set('product_name', '保证金');
-                    records[i].set('invoice_kind', 'RECEIPT');
-                    records[i].set('invoice_kind_desc', '收据');
-                }
-
+        function onLoad_selectedDs(ds)
+        {
+            ds.selectAll.defer(5,ds);
+            var records=ds.getAll();
+            for (var i=0;i<records.length;i++) {
+                if (records[i].get('invoice_kind') && records[i].get('invoice_kind')=='RECEIPT' && records[i].get('cf_item') && records[i].get('cf_item')=='51') {
+                    records[i].set('product_name','保证金');
                }
            }
-
-
-        function winNoMask() {
-            Leaf.Masker.unmask(Ext.getBody());
-
-        }
-
-        function winMask() {
-            Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
        }
        ]]></script>
        <style><![CDATA[
@@ -100,26 +87,18 @@
                <a:fields>
                    <a:field name="company_id" defaultValue="${/parameter/@company_id}"/>
                    <a:field name="group_billing_method" defaultValue="GROUP_BY_CONTRACT"/>
-                    <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: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>
            </a:dataSet>
-            <a:dataSet id="selectedDs" autoQuery="true" bindName="line_info" bindTarget="headDs" fetchAll="true"
-                       model="acr.ACR510.acr_invoice_create" selectable="true">
+
+            <a:dataSet id="selectedDs" autoQuery="true" bindName="line_info" bindTarget="headDs" fetchAll="true" model="acr.ACR510.acr_invoice_create" selectable="true">
                <a:fields>
-                    <a:field name="product_name" lovGridHeight="360" lovHeight="540" lovService="acr.ACR510.acr_invoice_create_lov" lovWidth="680" required="true" title="货物及应税劳务名称">
-                        <a:mapping>
-                            <a:map from="code_value_name" to="product_name"/>
-                        </a:mapping>
-                    </a:field>
                    <a:field name="billing_amount" required="true"/>
+                    <a:field name="product_name" required="true"/>
                    <a:field name="invoice_kind"/>
-                    <a:field name="invoice_kind_desc" displayField="code_value_name" options="invoiceKindDs"
-                             required="true" returnField="invoice_kind" valueField="code_value"/>
+                    <a:field name="invoice_kind_desc" displayField="code_value_name" options="invoiceKindDs" required="true" returnField="invoice_kind" valueField="code_value"/>
                    <a:field name="billing_object"/>
-                    <a:field name="invoice_bp_tax_registry_num" prompt="纳税人识别号"/>
                </a:fields>
                <a:events>
                    <a:event name="load" handler="onLoad_selectedDs"/>
@@ -133,8 +112,8 @@
                <a:gridButton click="createScreen_close" text="HLS.CLOSE"/>
                <a:gridButton click="createScreen_create" text="HLS.CREATE"/>
            </a:screenTopToolbar>
-            <a:form column="3">
-                <a:datePicker name="invoice_date" bindTarget="headDs" prompt="ACR.INVOICE_DATE"/>
+            <a:form column="3" labelWidth="120">
+                <a:datePicker name="invoice_date" bindTarget="headDs" prompt="开票申请日期"/>
                <a:datePicker name="accounting_date" bindTarget="headDs" prompt="HLS.ACCOUNT_DATE"/>
            </a:form>
            <a:tabPanel marginHeight="220" marginWidth="30">
@@ -142,57 +121,44 @@
                    <a:tab prompt="ACR510.TAB.BILLING_INFO" width="100">
                        <a:grid id="selectedDs_grid" bindTarget="selectedDs" marginHeight="270" marginWidth="60">
                            <a:columns>
-                                <a:column name="contract_number" lock="true" width="150" prompt="合同编号" readOnly="true"/>
-                                <a:column name="contract_name" lock="true" width="150" prompt="合同名称" readOnly="true"/>
-                                <a:column name="bp_name" prompt="承租人名称" readOnly="true"/>
-                                <a:column name="times" align="right" lock="true" width="40" prompt="期数" readOnly="true"/>
-                                <a:column name="cf_item_desc" prompt="应收项目" readOnly="true"/>
-                                <a:column name="product_name" width="150" prompt="货物及应税劳务名称" editor="acr_invoice_create_lov"/>
-                                <a:column name="invoice_kind_desc" prompt="发票类型" editor="selectedDs_grid_editor_comb"/>
-                                <a:column name="currency" prompt="币种" readOnly="true"/>
-                                <a:column name="due_amount" align="right" renderer="Leaf.formatMoney" prompt="应收金额" readOnly="true"/>
-                                <a:column name="received_amount" align="right" renderer="Leaf.formatMoney" prompt="已收金额" readOnly="true"/>
-                                <a:column name="cf_billing_amount" align="right" renderer="Leaf.formatMoney" prompt="已开票金额" readOnly="true"/>
-                                <a:column name="billing_amount" align="right" prompt="本次开票金额" renderer="Leaf.formatMoney"
-                                          editor="selectedDs_grid_editor_tf"/>
+                                <a:column name="contract_number" width="150"/>
+                                <a:column name="times" align="right" width="40"/>
+                                <a:column name="cf_item_desc"/>
+                                <a:column name="product_name" editor="selectedDs_grid_editor_tf" width="150"/>
+                                <a:column name="invoice_kind_desc" editor="selectedDs_grid_editor_comb"/>
+                                <a:column name="currency_desc" align="center"/>
+                                <a:column name="due_amount" 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"/>
                            </a:columns>
                            <a:editors>
                                <a:comboBox id="selectedDs_grid_editor_comb"/>
                                <a:textField id="selectedDs_grid_editor_tf"/>
-                                <a:lov id="acr_invoice_create_lov"/>
+                                <a:numberField id="selectedDs_grid_editor_nf"/>
                            </a:editors>
                        </a:grid>
                    </a:tab>
                    <a:tab prompt="ACR510.TAB.ASSIST_INFO" width="100">
                        <a:grid id="selectedDs_grid_2" bindTarget="selectedDs" marginHeight="270" marginWidth="60">
                            <a:columns>
-                                <a:column name="contract_number" lock="true" width="150" prompt="合同编号" readOnly="true"/>
-                                <a:column name="contract_name" lock="true" width="150" prompt="合同名称" readOnly="true"/>
-                                <a:column name="bp_name" prompt="承租人名称" readOnly="true"/>
-                                <a:column name="times" align="right" lock="true" width="40" prompt="期数" readOnly="true"/>
-                                <a:column name="billing_method_desc" prompt="开票规则" readOnly="true"/>
-                                <a:column name="billing_way_n" prompt="开票方式" width="80" readOnly="true"/>
-                                <a:column name="billing_frequency_n" prompt="开票频率" width="80" readOnly="true"/>
-                                <a:column name="billing_object_name" prompt="开票对象" autoAdjust="false"
-                                          showTitle="true" width="200" readOnly="true"/>
-                                <a:column name="invoice_title" prompt="发票抬头" autoAdjust="false" editor=""
-                                          showTitle="true" width="200" readOnly="true"/>
-                                <a:column name="object_taxpayer_type_desc" prompt="纳税人类型" readOnly="true"/>
-                                <a:column name="invoice_bp_tax_registry_num" prompt="纳税人识别号" width="150" readOnly="true"/>
-                                <a:column name="invoice_bp_address_phone_num" prompt="开票地址电话" autoAdjust="false"
-                                          showTitle="true" width="200" readOnly="true"/>
-                                <a:column name="invoice_bp_bank_account" prompt="开户行及账号" autoAdjust="false"
-                                          showTitle="true" width="150" readOnly="true"/>
+                                <a:column name="contract_number" width="150"/>
+                                <a:column name="times" align="right" width="40"/>
+                                <a:column name="cf_item_desc"/>
+                                <a:column name="contract_name" width="200"/>
+                                <a:column name="project_number" width="150"/>
+                                <a:column name="project_name" width="200"/>
+                                <a:column name="last_received_date" renderer="Leaf.formatDate" width="80"/>
+                                <a:column name="exchange_rate" align="right"/>
+                                <a:column name="exchange_rate_type_desc"/>
                            </a:columns>
                        </a:grid>
                    </a:tab>
                </a:tabs>
            </a:tabPanel>
-<!--            <a:fieldSet title="ACR.GROUP_BILLING_METHOD">-->
-<!--                <a:radio name="group_billing_method" bindTarget="headDs" labelField="code_value_name"-->
-<!--                         options="/model/group_billing_method_list" prompt="" radioSeparator="" valueField="code_value"-->
-<!--                         width="600"/>-->
-<!--            </a:fieldSet>-->
+            <a:fieldSet title="ACR.GROUP_BILLING_METHOD">
+                <a:radio name="group_billing_method" bindTarget="headDs" labelField="code_value_name" options="/model/group_billing_method_list" prompt="" radioSeparator="" valueField="code_value" width="600"/>
+            </a:fieldSet>
        </a:screenBody>
    </a:view>
 </a:screen>
\ No newline at end of file
--- a/src/main/webapp/modules/acr/ACR512/acr_invoice_update_detail.lview
+++ b/src/main/webapp/modules/acr/ACR512/acr_invoice_update_detail.lview
@@ -77,6 +77,7 @@
                Leaf.request({
                    url: $('acr512_invoice_ln_update_1_link').getUrl(),
                    para: {
+
                        invoice_hd_id: invoice_hd_id,
                        merge_flag: $(acr_invoice_hd_ds_id).getCurrentRecord().get('merge_flag')
                    },

--- a/src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview
+++ b/src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview
@@ -247,6 +247,7 @@
 <!--
                <a:toolbarButton click="acr512_invoice_submit" text="HLS.SUBMIT"/>
 -->
+
            </a:screenTopToolbar>
            <a:form marginWidth="200" padding="0" title="应收发票维护">
                <a:hBox labelSeparator=" ">

--- a/src/main/webapp/modules/acr/ACR513/acr_invoice_confirm.lview
+++ b/src/main/webapp/modules/acr/ACR513/acr_invoice_confirm.lview
@@ -302,6 +302,7 @@
            <a:grid id="acr513_invoice_grid_id" bindTarget="acr513_invoice_result_ds" marginHeight="225"
                    marginWidth="30" navBar="true">
                <a:columns>
+
                    <a:column name="document_number" lock="true" prompt="HLS.DOCUMENT_NUMBER"
                              renderer="acr513_document_number_render" width="120"/>
                    <a:column name="invoice_bp_name" autoAdjust="false" prompt="HLS.CUSTOMER_NAME" showTitle="true"

--- a/src/main/webapp/modules/acr/ACR514/acr_invoice_reverse.lview
+++ b/src/main/webapp/modules/acr/ACR514/acr_invoice_reverse.lview
@@ -259,6 +259,7 @@
                    <a:field name="express_status_name" displayField="code_value_name" options="acr514_express_status_ds" returnField="express_status" valueField="code_value"/>
                </a:fields>
                <a:events>
+
                    <a:event name="update" handler="acr514_invoice_query_Onupdate"/>
                </a:events>
            </a:dataSet>