Merge branch 'feature/acr_invoice_v3' into develop

src/main/database/Table/ACP_INVOICE_LN.sql

+WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
+WHENEVER OSERROR  EXIT FAILURE ROLLBACK;
+
+spool ACP_INVOICE_LN.log
+
+PROMPT
+PROMPT CREATING TABLE TRAIN_CONFIG
+PROMPT ============================
+PROMPT
+WHENEVER SQLERROR CONTINUE
+ DROP TABLE ACP_INVOICE_LN;
+WHENEVER SQLERROR EXIT FAILURE ROLLBACK
+
+alter table acp_invoice_ln add (CONTRACT_NAME  varchar2(200));
+comment on column acp_invoice_ln.CONTRACT_NAME is '合同名称';
+
+alter table acp_invoice_ln add (BP_NAME  varchar2(200));
+comment on column acp_invoice_ln.BP_NAME is '客户名称';
+
+alter table acp_invoice_ln add (CONTRACT_STATUS   varchar2(30));
+comment on column acp_invoice_ln.CONTRACT_STATUS  is '合同状态';
+
+alter table acp_invoice_ln add (CONFIRMATION_STATUS  varchar2(30));
+comment on column acp_invoice_ln.CONFIRMATION_STATUS is '确认状态';
+
+
+
+
+SPOOL OFF
+
+EXIT
\ No newline at end of file

src/main/webapp/modules/acp/ACP522/ap_invoice_import.lview

@@ -5,6 +5,19 @@
         <a:link id="hn9040_project_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
                 modelaction="update"/>
         <script><![CDATA[
+        window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
+        }
+
+        //超链接渲染
+        window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) {
+            //
+            var link_function = '';
+            var invoice_line_id = record.get('invoice_line_id');
+            window['${/parameter/@bp_seq}${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
+            if (name == 'attachment') {
+                return '<a href="javascript:attachment_window_open(\'' + invoice_line_id + '\',\'' + record.id + '\',\'' + record.ds.id + '\');">' + '上传' + '</a>';
+            }
+        };
 
             ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>

src/main/webapp/modules/acp/ACP523/ap_invoice_confirm.lview

@@ -5,7 +5,8 @@
         <a:link id="hn9040_project_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
                 modelaction="update"/>
         <script><![CDATA[
-
+        window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
+        }
             ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>

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

@@ -338,7 +338,7 @@
             <a:screenTopToolbar>
                 <a:screenTitle/>
                 <a:gridButton click="contractDs_grid_query" text="HLS.QUERY"/>
-                <a:gridButton click="allConditionDs_reset" text="重置条件"/>
+                <a:gridButton click="allConditionDs_reset" text="重置"/>
 <!--                <a:gridButton click="contractDs_grid_clear" text="ACR510.BUTTON.CLEAR_CONTRACT"/>-->
                 <a:gridButton click="invoiceHd_confirm" text="ACR510.BUTTON.COMFIRM"/>
                 <!--<a:gridButton click="acr510n_excel" text="导出"/>-->
@@ -368,7 +368,7 @@
 
                     </a:hBox>
                     <a:hBox>
-                        <a:comboBox name="lease_channel_desc" bindTarget="allConditionDs" prompt="商业模式"/>
+                        <a:comboBox name="lease_channel_desc" bindTarget="allConditionDs" prompt="业务类型"/>
                         <a:textField name="bp_name" bindTarget="allConditionDs" prompt="HLS.TENANT_NAME"/>
                         <!--<a:comboBox name="document_type_desc" bindTarget="allConditionDs" prompt="HLS.CONTRACT_TYPE"/>-->
                         <a:lov name="cf_item_desc" bindTarget="allConditionDs" prompt="HLS.RECEIVE_PROJECT"/>
@@ -462,7 +462,7 @@
                                 <a:column name="contract_name" lock="true" width="150" prompt="合同名称"/>
                                 <a:column name="bp_name" prompt="承租人名称"/>
                                 <a:column name="contract_status_desc" width="80" prompt="合同状态"/>
-                                <a:column name="billing_method" prompt="开票规则"/>
+                                <a:column name="billing_method_desc" prompt="开票规则"/>
                                 <a:column name="billing_way_n" prompt="开票方式" width="80"/>
                                 <a:column name="billing_frequency_n" prompt="开票频率" width="80"/>
                                 <a:column name="billing_object_name" prompt="开票对象" autoAdjust="true"

src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview

@@ -30,7 +30,7 @@
                 param['document_id'] = invoice_hd_id;
                 param['function_usage'] = 'MODIFY';
                 param['maintain_type'] = maintain_type;
-                param['url_title'] = '${l:ACR.INVOICE_DETAIL}';
+                param['url_title'] = '销项发票明细';
                 hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'acr512_invoice_update_page', 'acr512_invoice_result_ds');
             }
             
@@ -183,14 +183,14 @@
                     <a:numberField name="total_amount_t" allowFormat="true" bindTarget="acr512_invoice_query_ds" prompt="发票金额到" width="135"/>
                     <a:textField name="bp_agent_name"  bindTarget="acr512_invoice_query_ds" prompt="代理商" width="135"/>
             </a:form>
-            <a:grid id="acr512_invoice_update_grid_ds" bindTarget="acr512_invoice_result_ds" marginHeight="325" marginWidth="30" navBar="true">
+            <a:grid id="acr512_invoice_update_grid_ds" bindTarget="acr512_invoice_result_ds" marginHeight="225" marginWidth="30" navBar="true">
                 <a:columns>
                     <a:column name="document_number" lock="true" prompt="HLS.DOCUMENT_NUMBER" renderer="acr512_document_number_render" width="120"/>
                     <a:column name="invoice_bp_name" autoAdjust="false" prompt="HLS.CUSTOMER_NAME" showTitle="true" width="100"/>
                     <a:column name="contract_number" autoAdjust="false" prompt="HLS.CONTRACT_NUMBER" showTitle="true" width="150"/>
                     <a:column name="contract_name"  width="150" prompt="合同名称"/>
                     <!-- <a:column name="business_type_desc" prompt="HLS.BUSINESS_TYPE_DESC" width="80"/>-->
-                    <a:column name="bp_agent_name" prompt="代理商" width="100"/>
+                    <a:column name="bp_agent_name" prompt="代理店" width="100"/>
                     <a:column name="invoice_kind_desc" prompt="ACR.INVOICE_KIND" width="100"/>
                     <a:column name="invoice_number" prompt="ACR.INVOICE_NUMBER" width="120"/>
                     <a:column name="invoice_date" prompt="ACR.INVOICE_DATE" width="100"/>

src/main/webapp/modules/acr/ACR513/acr_invoice_confirm.lview

@@ -105,7 +105,7 @@
             param['document_id'] = invoice_hd_id;
             param['function_usage'] = 'QUERY';
             param['maintain_type'] = maintain_type;
-            param['url_title'] = '${l:ACR.INVOICE_DETAIL}';
+            param['url_title'] = '销项发票明细';
             hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'acr513_invoice_readonly_page', 'acr513_invoice_result_ds');
         }
 

src/main/webapp/modules/acr/ACR514/acr_invoice_reverse.lview

@@ -84,7 +84,7 @@
             param['document_id'] = invoice_hd_id;
             param['function_usage'] = 'QUERY';
             param['maintain_type'] = maintain_type;
-            param['url_title'] = '${l:ACR.INVOICE_DETAIL}';
+            param['url_title'] = '销项发票明细';
             hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'acr514_invoice_readonly_page', 'acr514_invoice_result_ds');
         }
 
@@ -308,20 +308,20 @@
             </a:screenTopToolbar>
             <a:form marginWidth="30" padding="0" title="销项发票反冲" column="6">
                 <a:textField name="document_number_f" bindTarget="acr514_invoice_query_ds"
-                             prompt="单据号" width="135"/>
-                <a:textField name="document_number_t" bindTarget="acr514_invoice_query_ds" prompt="TO" width="135"/>
+                             prompt="单据编号从" width="135"/>
+                <a:textField name="document_number_t" bindTarget="acr514_invoice_query_ds" prompt="单据编号到" width="135"/>
 
                 <a:textField name="invoice_number_f" bindTarget="acr514_invoice_query_ds"
-                             prompt="发票号" width="135"/>
-                <a:textField name="invoice_number_t" bindTarget="acr514_invoice_query_ds" prompt="TO" width="135"/>
-                <a:lov name="contract_number_f" bindTarget="acr514_invoice_query_ds" prompt="合同号"
+                             prompt="发票号码从" width="135"/>
+                <a:textField name="invoice_number_t" bindTarget="acr514_invoice_query_ds" prompt="发票号码到" width="135"/>
+                <a:lov name="contract_number_f" bindTarget="acr514_invoice_query_ds" prompt="合同号码从"
                        width="135"/>
-                <a:lov name="contract_number_t" bindTarget="acr514_invoice_query_ds" prompt="TO" width="135"/>
+                <a:lov name="contract_number_t" bindTarget="acr514_invoice_query_ds" prompt="合同号码到" width="135"/>
 
 
-                <a:datePicker name="invoice_date_f" bindTarget="acr514_invoice_query_ds" prompt="发票日期"
+                <a:datePicker name="invoice_date_f" bindTarget="acr514_invoice_query_ds" prompt="发票日期从"
                               width="135"/>
-                <a:datePicker name="invoice_date_t" bindTarget="acr514_invoice_query_ds" prompt="TO" width="135"/>
+                <a:datePicker name="invoice_date_t" bindTarget="acr514_invoice_query_ds" prompt="发票日期到" width="135"/>
 
              <!--   <a:lov name="invoice_bp_code_f" bindTarget="acr514_invoice_query_ds" prompt="HLS.CUSTOMER_NUMBER_FROM"
                        width="135"/>
@@ -330,15 +330,15 @@
                 <!-- <a:lov name="confirmed_by_name" bindTarget="acr514_invoice_query_ds" prompt="ACR.CHECKER" width="135"/>-->
 
                 <a:datePicker name="accounting_date_f" bindTarget="acr514_invoice_query_ds"
-                              prompt="记账日期" width="135"/>
-                <a:datePicker name="accounting_date_t" bindTarget="acr514_invoice_query_ds" prompt="TO" width="135"/>
+                              prompt="记账日期从" width="135"/>
+                <a:datePicker name="accounting_date_t" bindTarget="acr514_invoice_query_ds" prompt="记账日期到" width="135"/>
                 <a:textField name="invoice_title" bindTarget="acr514_invoice_query_ds" prompt="ACR.INVOICE_TITLE"
                              width="135"/>
                 <a:lov name="created_by_name" bindTarget="acr514_invoice_query_ds" prompt="ACR.CREATED_BY_NAME"
                        width="135"/>
                 <a:numberField name="total_amount_f" allowFormat="true" bindTarget="acr514_invoice_query_ds"
-                               prompt="发票金额" width="135"/>
-                <a:numberField name="total_amount_t" allowFormat="true" bindTarget="acr514_invoice_query_ds" prompt="TO"
+                               prompt="发票金额从" width="135"/>
+                <a:numberField name="total_amount_t" allowFormat="true" bindTarget="acr514_invoice_query_ds" prompt="发票金额到"
                                width="135"/>
                 <a:comboBox name="vat_interface_status_desc" bindTarget="acr514_invoice_query_ds"
                             prompt="金税状态" width="135"/>
@@ -346,11 +346,11 @@
                             width="135"/>
                 <a:numberField name="vat_red_notice_num" bindTarget="acr514_invoice_query_ds" prompt="红票通知单"
                             width="135"/>
-                <a:textField name="bp_agent_name"  bindTarget="acr514_invoice_query_ds" prompt="代理商" width="135"/>
+                <a:textField name="bp_agent_name"  bindTarget="acr514_invoice_query_ds" prompt="代理店" width="135"/>
 
 
             </a:form>
-            <a:grid id="acr514_invoice_grid_id" bindTarget="acr514_invoice_result_ds" marginHeight="325"
+            <a:grid id="acr514_invoice_grid_id" bindTarget="acr514_invoice_result_ds" marginHeight="225"
                     marginWidth="30" navBar="true">
                 <a:columns>
                     <a:column name="document_number" lock="true" prompt="HLS.DOCUMENT_NUMBER"

src/main/webapp/modules/acr/ACR516/acr_invoice_claim_application.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true">
+    <a:init-procedure>
+
+    </a:init-procedure>
+    <a:view>
+       <script type="text/javascript"><![CDATA[
+       function acr516_invoice_query() {
+           $('acr516_invoice_result_ds').query();
+       }
+
+       function acr516_invoice_reset() {
+           $('acr516_invoice_query_ds').reset();
+       }
+
+       ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
+        <a:dataSets>
+            <a:dataSet id="acr516_invoice_kind_ds" lookupCode="ACR510_INVOICE_KIND"/>
+            <a:dataSet id="acr516_invoice_statu_ds" lookupCode="ACR510_AR_INVOICE_STATUS"/>
+            <a:dataSet id="cf_item_options">
+                <a:datas dataSource="/model/hls_cashflow_item_list"/>
+            </a:dataSet>
+            <a:dataSet id="claim_status_ds" loadData="true" lookupCode="CLAIM_STATUS"/>
+
+            <a:dataSet id="acr516_invoice_query_ds" autoCreate="true">
+                <a:fields>
+                    <a:field name="invoice_kind_desc" displayField="code_value_name" options="acr516_invoice_kind_ds"
+                             returnField="invoice_kind" valueField="code_value"/>
+                    <a:field name="invoice_status_desc" displayField="code_value_name" options="acr516_invoice_statu_ds" returnField="invoice_status" valueField="code_value"/>
+                    <a:field name="cf_item"/>
+                    <a:field name="cf_item_n" options="cf_item_options" displayField="description" returnField="cf_item"
+                             valueField="cf_item"/>
+                    <a:field name="claim_status" options="claim_status_ds" displayField="code_value_name" valueField="code_value" returnField="claim_status"/>
+
+                </a:fields>
+            </a:dataSet>
+            <a:dataSet id="acr516_invoice_result_ds" autoPageSize="true" autoQuery="true"
+                       model="" queryDataSet="acr516_invoice_query_ds" selectable="true">
+            </a:dataSet>
+        </a:dataSets>
+        <a:screenBody>
+            <a:screenTopToolbar>
+                <a:screenTitle/>
+                <a:toolbarButton click="acr516_invoice_query" text="HLS.QUERY"/>
+                <a:toolbarButton click="acr516_invoice_reset" text="HLS.RESET"/>
+                <a:toolbarButton click="" text="申请"/>
+            </a:screenTopToolbar>
+            <a:form marginWidth="30" padding="0" title="查询条件" column="6">
+                <a:textField name="document_number" bindTarget="" prompt="单据编号" width="135"/>
+                <a:textField name="contract_number" bindTarget="" prompt="合同编号" width="135"/>
+                <a:textField name="contract_name" bindTarget="" prompt="合同名称" width="135"/>
+                <a:lov name="cf_item" bindTarget="" prompt="现金流项目" width="135"/>
+                <a:numberField name="total_amount_f" allowFormat="true" bindTarget="" prompt="开票金额含税额从" width="135"/>
+                <a:numberField name="total_amount_t" allowFormat="true" bindTarget="" prompt="开票金额含税额到" width="135"/>
+                <a:textField name="invoice_title" bindTarget="" prompt="发票抬头"/>
+                <a:comboBox name="invoice_kind_desc" bindTarget="" prompt="ACR.INVOICE_KIND" width="135"/>
+                <a:comboBox name="invoice_status_desc" bindTarget="" prompt="发票状态" width="135"/>
+                <a:textField name="invoice_code" bindTarget="" prompt="发票代码"/>
+                <a:textField name="invoice_number" bindTarget="" prompt="发票号码" width="135"/>
+                <a:textField name="claim_status" bindTarget="" prompt="认领状态" width="135"/>
+            </a:form>
+            <a:grid id="" bindTarget="" marginHeight="325" marginWidth="30" navBar="true">
+                <a:columns>
+                    <a:column name="document_number" lock="true" prompt="HLS.DOCUMENT_NUMBER" width="120"/>
+                    <a:column name="contract_number" autoAdjust="false" prompt="HLS.CONTRACT_NUMBER" showTitle="true" width="150"/>
+                    <a:column name="contract_name" width="150" prompt="合同名称"/>
+                    <a:column name="bp_agent_name" prompt="代理商" width="100"/>
+                    <a:column name="invoice_kind_desc" prompt="发票种类" width="100"/>
+                    <a:column name="invoice_number" width="120" prompt="发票号码"/>
+                    <a:column name="vat_invoice_code" width="120" prompt="发票代码"/>
+                    <a:column name="invoice_date" renderer="Leaf.formatDate" prompt="发票日期" width="100"/>
+                    <a:column name="invoice_bp_code" prompt="开票客户编号" width="100"/>
+                    <a:column name="invoice_bp_name" autoAdjust="false" showTitle="true" prompt="开票客户名称" width="150"/>
+                    <a:column name="invoice_title" autoAdjust="false" footerRenderer="summaryRenderer" showTitle="true"
+                              prompt="发票抬头" width="150"/>
+                    <a:column name="total_amount" align="right" footerRenderer="summaryRenderer"
+                              renderer="Leaf.formatMoney"  prompt="发票金额"width="100"/>
+                    <a:column name="tax_amount" align="right" footerRenderer="summaryRenderer"
+                              renderer="Leaf.formatMoney" prompt="税额" width="100"/>
+                    <a:column name="net_amount" align="right" footerRenderer="summaryRenderer"
+                              renderer="Leaf.formatMoney" prompt="不含税金额" width="100"/>
+                    <a:column name="currency" prompt="币种" width="80"/>
+                    <a:column name="created_by_name" autoAdjust="false" showTitle="true" prompt="开票人" width="150"/>
+                    <a:column name="invoice_status_desc" prompt="发票状态" width="100"/>
+                    <a:column name="vat_interface_status_desc"  prompt="金税状态" width="100"/>
+                    <a:column name="accounting_date" renderer="Leaf.formatDate" prompt="期间序号" width="100"/>
+                    <a:column name="create_je_flag" prompt="凭证标志" width="60"/>
+                    <a:column name="bp_tax_registry_num" prompt="纳税人识别号"/>
+                    <a:column name="ele_invoice_status_desc" prompt="电子发票状态"/>
+                    <a:column name="swno" prompt="电子发票流水号" width="100"/>
+                    <a:column name="claim_status" prompt="认领状态" width="100"/>
+                </a:columns>
+            </a:grid>
+        </a:screenBody>
+    </a:view>
+</a:screen>
\ No newline at end of file