Skip to content

L
leaf-hlcm
Commit 4cb74d5c authored by gzj34291's avatar gzj34291
Browse files
Options

Merge remote-tracking branch 'origin/remote_dev' into remote_dev 

# Conflicts:
#	src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview
parents 0bcdddf7 c07dc76d
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 42 deletions
src/main/webapp/WEB-INF/classes/efile/EFILE1030/efile_pool_att_para_sql.lwm
View file @ 4cb74d5c
......@@ -9,7 +9,7 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select '{'||pt.atm_data_json||'}' sql_content
select pt.atm_data_json sql_content
from hl_e_archives_pool_data pt
where pt.pool_id = ${@pool_id}
]]></bm:query-sql>
......
src/main/webapp/WEB-INF/classes/efile/EFILE1030/efile_pool_para_sql.lwm
View file @ 4cb74d5c
......@@ -9,7 +9,7 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select '{'||pt.stru_data_json||'}' sql_content
select pt.stru_data_json sql_content
from hl_e_archives_pool_data pt
where pt.pool_id = ${@pool_id}
]]></bm:query-sql>
......
src/main/webapp/WEB-INF/classes/hls/HLS220/prj_cdd_item_templet.lwm
View file @ 4cb74d5c
......@@ -35,6 +35,8 @@
<bm:field name="cdd_class" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CDD_CLASS"/>
<bm:field name="required_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="REQUIRED_FLAG"/>
<bm:field name="doc_require" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DOC_REQUIRE"/>
<bm:field name="archive_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ARCHIVE_TYPE" />
<bm:field name="archive_type_desc" forInsert="false" expression="(SELECT c.code_value_name FROM sys_code_values_v c where c.code=&apos;ARCHIVE_TYPE&apos; and c.code_value = t1.archive_type)" forUpdate="false"/>
<bm:field name="amount" databaseType="NUMBER" datatype="java.lang.Long" physicalName="AMOUNT"/>
<bm:field name="doc_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DOC_TYPE"/>
<bm:field name="app_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="APP_CODE"/>
......
src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_current_query.lwm
View file @ 4cb74d5c
......@@ -245,7 +245,7 @@ SELECT h.period_year,
where ccc.cashflow_id = l.cashflow_id
and ccc.contract_id = cc.contract_id) interest,
l.amount_cr-nvl((select sum(al.tax_amount) from acr_invoice_hd ah,acr_invoice_ln al where
ah.invoice_hd_id=al.invoice_hd_id
ah.invoice_hd_id=al.invoice_hd_id
and ah.reversed_flag='N'
and al.cashflow_id=l.cashflow_id
and ah.invoice_kind in ('0', '2')
......@@ -428,7 +428,7 @@ SELECT h.period_year,
li.ref_n03 = l.journal_header_id)
AND ROWNUM = 1) invoice_date,
l.amount_cr-nvl((select sum(al.tax_amount) from acr_invoice_hd ah,acr_invoice_ln al where
ah.invoice_hd_id=al.invoice_hd_id
ah.invoice_hd_id=al.invoice_hd_id
and ah.reversed_flag='N'
and al.cashflow_id=l.cashflow_id
and ah.invoice_kind in ('0', '2')
......@@ -442,7 +442,7 @@ SELECT h.period_year,
(select
case when ccc.cf_item=200 then
ccc.due_amount-nvl((select sum(al.total_amount) from acr_invoice_hd ah,acr_invoice_ln al where
ah.invoice_hd_id=al.invoice_hd_id
ah.invoice_hd_id=al.invoice_hd_id
and ah.reversed_flag='N'
and al.cashflow_id=l.cashflow_id
and ah.invoice_kind in ('0', '2')
......@@ -454,7 +454,7 @@ SELECT h.period_year,
from con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id) due_amount,
(select case when ccc.cf_item=200 then
ccc.due_amount-nvl((select sum(al.total_amount) from acr_invoice_hd ah,acr_invoice_ln al where
ah.invoice_hd_id=al.invoice_hd_id
ah.invoice_hd_id=al.invoice_hd_id
and ah.reversed_flag='N'
and al.cashflow_id=l.cashflow_id
and ah.invoice_kind in ('0', '2')
......@@ -464,17 +464,19 @@ SELECT h.period_year,
0
end
from con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id) principal,
(select decode(ccc.cf_item,'200',0,ccc.due_amount)
(select decode(ccc.cf_item,'200',ccc.interest,ccc.due_amount)
from con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id) interest,
l.amount_cr-nvl((select sum(al.tax_amount) from acr_invoice_hd ah,acr_invoice_ln al where
ah.invoice_hd_id=al.invoice_hd_id
ah.invoice_hd_id=al.invoice_hd_id
and ah.reversed_flag='N'
and al.cashflow_id=l.cashflow_id
and ah.invoice_kind in ('0', '2')
AND to_char(ah.invoice_date,'yyyymm') <= ${@base_period}
and ah.invoice_status = 'CONFIRM'),0) vat_due_amount,
(select
case when nvl(ccc.due_amount-ccc.vat_due_amount,0)!=0 then
case when nvl(ccc.interest,0)!=0 then
round(ccc.vat_interest/ccc.interest,2)
when nvl(ccc.due_amount-ccc.vat_due_amount,0)!=0 then
round(ccc.vat_due_amount/(ccc.due_amount-ccc.vat_due_amount),2)
else
null
......@@ -498,7 +500,13 @@ SELECT h.period_year,
('HL_CON_TAX_ET',
'HL_CON_TAX_ET_N',
'HL_CON_FIN_ETFEE',
'HL_CON_FIN_ETFEE_N'))
'HL_CON_FIN_ETFEE_N',
'HL_CON_ETREPUR_TAX',
'HL_CON_ETREPUR_TAX_LB',
'HL_CON_ETFEE',
'HL_CON_ETFEE_LB',
'HL_CON_ET_TAX',
'HL_CON_ET_TAX_LB'))
and( (trunc(h.journal_date)<=trunc(to_date('2020-01-31','yyyy-mm-dd')) and h.description='MANUAL_IMPORT')or(trunc(h.journal_date)>trunc(to_date('2020-01-31','yyyy-mm-dd'))))
union
......@@ -571,7 +579,9 @@ SELECT h.period_year,
'HL_FIN_INCOME_REPURCHASE_N',
'HL_FIN_INCOME_REPURCHASE_ET',
'HL_CON_FIN_ETREPUR_INT',
'HL_CON_FIN_ETREPUR_INT_N'))
'HL_CON_FIN_ETREPUR_INT_N',
'HL_CON_ETREPUR_FEE',
'HL_CON_ETREPUR_FEE_LB'))
and( (trunc(h.journal_date)<=trunc(to_date('2020-01-31','yyyy-mm-dd')) and h.description='MANUAL_IMPORT')or(trunc(h.journal_date)>trunc(to_date('2020-01-31','yyyy-mm-dd'))))
union
......@@ -669,7 +679,7 @@ SELECT h.period_year,
FROM con_contract cc,con_contract_cashflow ccc
where cc.contract_number=l.reference3
and cc.data_class='NORMAL'
and cc.contract_id=ccc.contract_id
and cc.contract_id=ccc.contract_id
and ccc.cf_item=250
and ccc.cf_status='RELEASE'
and ccc.cf_direction='INFLOW'
......
src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_query.lwm
View file @ 4cb74d5c
......@@ -109,7 +109,7 @@ SELECT h.period_year,
li.ref_n03 = l.journal_header_id)
AND ROWNUM = 1) invoice_date,
l.amount_cr-nvl((select sum(al.tax_amount) from acr_invoice_hd ah,acr_invoice_ln al where
ah.invoice_hd_id=al.invoice_hd_id
ah.invoice_hd_id=al.invoice_hd_id
and ah.reversed_flag='N'
and al.cashflow_id=l.cashflow_id
and ah.invoice_kind in ('0', '2')
......@@ -253,7 +253,7 @@ SELECT h.period_year,
where ccc.cashflow_id = l.cashflow_id
and ccc.contract_id = cc.contract_id) interest,
l.amount_cr-nvl((select sum(al.tax_amount) from acr_invoice_hd ah,acr_invoice_ln al where
ah.invoice_hd_id=al.invoice_hd_id
ah.invoice_hd_id=al.invoice_hd_id
and ah.reversed_flag='N'
and al.cashflow_id=l.cashflow_id
and ah.invoice_kind in ('0', '2')
......@@ -467,7 +467,7 @@ SELECT h.period_year,
li.ref_n03 = l.journal_header_id)
AND ROWNUM = 1) invoice_date,
l.amount_cr-nvl((select sum(al.tax_amount) from acr_invoice_hd ah,acr_invoice_ln al where
ah.invoice_hd_id=al.invoice_hd_id
ah.invoice_hd_id=al.invoice_hd_id
and ah.reversed_flag='N'
and al.cashflow_id=l.cashflow_id
and ah.invoice_kind in ('0', '2')
......@@ -481,7 +481,7 @@ SELECT h.period_year,
(select
case when ccc.cf_item=200 then
ccc.due_amount-nvl((select sum(al.total_amount) from acr_invoice_hd ah,acr_invoice_ln al where
ah.invoice_hd_id=al.invoice_hd_id
ah.invoice_hd_id=al.invoice_hd_id
and ah.reversed_flag='N'
and al.cashflow_id=l.cashflow_id
and ah.invoice_kind in ('0', '2')
......@@ -493,7 +493,7 @@ SELECT h.period_year,
from con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id) due_amount,
(select case when ccc.cf_item=200 then
ccc.due_amount-nvl((select sum(al.total_amount) from acr_invoice_hd ah,acr_invoice_ln al where
ah.invoice_hd_id=al.invoice_hd_id
ah.invoice_hd_id=al.invoice_hd_id
and ah.reversed_flag='N'
and al.cashflow_id=l.cashflow_id
and ah.invoice_kind in ('0', '2')
......@@ -503,17 +503,19 @@ SELECT h.period_year,
0
end
from con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id) principal,
(select decode(ccc.cf_item,'200',0,ccc.due_amount)
(select decode(ccc.cf_item,'200',ccc.interest,ccc.due_amount)
from con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id) interest,
l.amount_cr-nvl((select sum(al.tax_amount) from acr_invoice_hd ah,acr_invoice_ln al where
ah.invoice_hd_id=al.invoice_hd_id
ah.invoice_hd_id=al.invoice_hd_id
and ah.reversed_flag='N'
and al.cashflow_id=l.cashflow_id
and ah.invoice_kind in ('0', '2')
AND to_char(ah.invoice_date,'yyyymm') <= ${@base_period}
and ah.invoice_status = 'CONFIRM'),0) vat_due_amount,
(select
case when nvl(ccc.due_amount-ccc.vat_due_amount,0)!=0 then
case when nvl(ccc.interest,0)!=0 then
round(ccc.vat_interest/ccc.interest,2)
when nvl(ccc.due_amount-ccc.vat_due_amount,0)!=0 then
round(ccc.vat_due_amount/(ccc.due_amount-ccc.vat_due_amount),2)
else
null
......@@ -538,7 +540,13 @@ SELECT h.period_year,
('HL_CON_TAX_ET',
'HL_CON_TAX_ET_N',
'HL_CON_FIN_ETFEE',
'HL_CON_FIN_ETFEE_N'))
'HL_CON_FIN_ETFEE_N',
'HL_CON_ETREPUR_TAX',
'HL_CON_ETREPUR_TAX_LB',
'HL_CON_ETFEE',
'HL_CON_ETFEE_LB',
'HL_CON_ET_TAX',
'HL_CON_ET_TAX_LB'))
and( (trunc(h.journal_date)<=trunc(to_date('2020-01-31','yyyy-mm-dd')) and h.description='MANUAL_IMPORT')or(trunc(h.journal_date)>trunc(to_date('2020-01-31','yyyy-mm-dd'))))
AND ( not EXISTS (SELECT 1
FROM acr_invoice_hd hi, acr_invoice_ln li
......@@ -623,7 +631,9 @@ SELECT h.period_year,
'HL_FIN_INCOME_REPURCHASE_N',
'HL_FIN_INCOME_REPURCHASE_ET',
'HL_CON_FIN_ETREPUR_INT',
'HL_CON_FIN_ETREPUR_INT_N'))
'HL_CON_FIN_ETREPUR_INT_N',
'HL_CON_ETREPUR_FEE',
'HL_CON_ETREPUR_FEE_LB'))
and( (trunc(h.journal_date)<=trunc(to_date('2020-01-31','yyyy-mm-dd')) and h.description='MANUAL_IMPORT')or(trunc(h.journal_date)>trunc(to_date('2020-01-31','yyyy-mm-dd'))))
AND not EXISTS (SELECT 1
FROM acr_invoice_hd hi, acr_invoice_ln li
......@@ -674,8 +684,8 @@ SELECT h.period_year,
and t.session_id=${/session/@session_id}
and nvl(t.un_bill_principal,0)>0
and h.internal_period_num < to_number(${@base_period})
union
SELECT h.period_year,
union
SELECT h.period_year,
h.period_num,
h.internal_period_num,
h.journal_date,
......@@ -730,7 +740,7 @@ SELECT h.period_year,
FROM con_contract cc,con_contract_cashflow ccc
where cc.contract_number=l.reference3
and cc.data_class='NORMAL'
and cc.contract_id=ccc.contract_id
and cc.contract_id=ccc.contract_id
and ccc.cf_item=250
and ccc.cf_status='RELEASE'
and ccc.cf_direction='INFLOW'
......
src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview
View file @ 4cb74d5c
......@@ -115,9 +115,9 @@
$('acr512_invoice_query_ds').reset();
}
function acr512_grid_update(reocrd_id, invoice_hd_id, status) {
function acr512_grid_update(record_id, invoice_hd_id) {
var maintain_type = 'UPDATE';
var currency_reocrd = $('acr512_invoice_result_ds').findById(reocrd_id);
var currency_reocrd = $('acr512_invoice_result_ds').findById(record_id);
var param = currency_reocrd.data;
param['function_code'] = 'ACR512';
param['winid'] = 'confirm_invoice_win';
......@@ -139,9 +139,9 @@
function acr512_document_number_render(value, record, name) {
if (name == 'document_number') {
if (record.get('compare_date_flag') == 'Y') {
return '<a style="color:red" href="javascript:acr512_grid_update(' + record.id + ',' + record.get('invoice_hd_id') + ',\'' + record.get('invoice_status') + '\');">' + value + '</a>';
return '<a style="color:red" href="javascript:acr512_grid_update(\'' + record.id + '\',\'' + record.get('invoice_hd_id') + '\');">' + value + '</a>';
} else {
return '<a href="javascript:acr512_grid_update(' + record.id + ',' + record.get('invoice_hd_id') + ',\'' + record.get('invoice_status') + '\');">' + value + '</a>';
return '<a href="javascript:acr512_grid_update(\'' + record.id + '\',\'' + record.get('invoice_hd_id') + '\');">' + value + '</a>';
}
}
......@@ -340,25 +340,25 @@
<a:dataSet id="acr512_business_type_ds">
<a:datas dataSource="/model/acr512_business_type_list"/>
</a:dataSet>
<!--<a:dataSet id="acr512_invoice_kind_ds" lookupCode="ACR510_INVOICE_KIND"/>-->
<!--<a:dataSet id="acr512_invoice_kind_ds" lookupCode="ACR510_INVOICE_KIND"/>-->
<a:dataSet id="acr512_invoice_kind_type_ds" lookupCode="ACR512_INVOICE_KIND_TYPE"/>
<a:dataSet id="acr512_invoice_status_ds" lookupCode="ACR510_AR_INVOICE_STATUS"/>
<a:dataSet id="hls_lease_channel_ds" loadData="true" model="basic.hls_lease_channel_for_lov"/>
<a:dataSet id="overdue_status_ds" lookupCode="YES_NO"/>
<a:dataSet id="overdue_status_ds" lookupCode="YES_NO"/>
<a:dataSet id="acr512_invoice_query_ds">
<a:fields>
<a:field name="currency_name" displayField="currency_name" options="acr512_currency_ds"
returnField="currency" valueField="currency_code"/>
<a:field name="invoice_status_n" displayField="code_value_name" options="acr512_invoice_status_ds"
returnField="invoice_status" valueField="code_value"/>
<a:field name="full_elec_invoice_flag"/>
<a:field name="full_elec_invoice_flag_n" displayField="code_value_name" options="overdue_status_ds"
<a:field name="full_elec_invoice_flag"/>
<a:field name="full_elec_invoice_flag_n" displayField="code_value_name" options="overdue_status_ds"
returnField="full_elec_invoice_flag" valueField="code_value"/>
<!--<a:field name="invoice_kind"/>-->
<a:field name="invoice_kind_type"/>
<a:field name="contract_name"/>
<a:field name="invoice_bp_name"/>
<!--<a:field name="invoice_kind_desc" displayField="code_value_name" options="acr512_invoice_kind_ds"-->
<!--<a:field name="invoice_kind_desc" displayField="code_value_name" options="acr512_invoice_kind_ds"-->
<!--returnField="invoice_kind" valueField="code_value"/>-->
<a:field name="invoice_kind_type_n" displayField="code_value_name" options="acr512_invoice_kind_type_ds"
returnField="invoice_kind_type" valueField="code_value"/>
......@@ -470,7 +470,7 @@
<a:lov name="created_by_name" bindTarget="acr512_invoice_query_ds" prompt="创建人" width="135"/>
<a:textField name="invoice_title" bindTarget="acr512_invoice_query_ds" prompt="ACR.INVOICE_TITLE"
width="135"/>
<a:comboBox name="full_elec_invoice_flag_n" bindTarget="acr512_invoice_query_ds" prompt="是否全电发票" width="135"/>
<a:comboBox name="full_elec_invoice_flag_n" bindTarget="acr512_invoice_query_ds" prompt="是否全电发票" width="135"/>
</a:hBox>
<a:hBox labelSeparator=" ">
......@@ -487,7 +487,7 @@
-->
<!-- <a:lov name="invoice_bp_code_t" bindTarget="acr512_invoice_query_ds" prompt="客户编号到" width="135"/>-->
<a:textField name="invoice_bp_name" bindTarget="acr512_invoice_query_ds" prompt="客户名称" width="135"/>
<!--<a:comboBox name="invoice_kind_desc" bindTarget="acr512_invoice_query_ds" prompt="ACR.INVOICE_KIND"-->
<!--<a:comboBox name="invoice_kind_desc" bindTarget="acr512_invoice_query_ds" prompt="ACR.INVOICE_KIND"-->
<!--width="135"/>-->
<a:comboBox name="invoice_kind_type_n" bindTarget="acr512_invoice_query_ds" prompt="发票种类" width="135"/>
<a:comboBox name="invoice_status_n" bindTarget="acr512_invoice_query_ds" prompt="发票状态" width="135"/>
......@@ -505,7 +505,7 @@
<!--
<a:column name="business_type_desc" prompt="HLS.BUSINESS_TYPE_DESC" width="80"/>
-->
<!--<a:column name="invoice_type_n" prompt="开票类型" width="100"/>-->
<!--<a:column name="invoice_type_n" prompt="开票类型" width="100"/>-->
<!--<a:column name="invoice_kind_desc" prompt="ACR.INVOICE_KIND" width="100"/>-->
<a:column name="invoice_kind_type_n" prompt="发票种类" width="200"/>
<!-- <a:column name="invoice_number" prompt="ACR.INVOICE_NUMBER" width="120"/> -->
......@@ -522,8 +522,7 @@
<a:column name="accounting_date" prompt="HLS.ACCOUNT_DATE" width="100"/>
<!-- <a:column name="compare_date_flag" prompt="比较日期" width="100"/> -->
<!-- <a:column name="project_number" prompt="HLS.PROJECT_NUMBER" width="120"/> -->
<a:column name="full_elec_invoice_flag_n" prompt="是否全电发票" width="200"/>
<a:column name="full_elec_invoice_flag_n" prompt="是否全电发票" width="200"/>
</a:columns>
</a:grid>
</a:screenBody>
......
src/main/webapp/modules/efile/EFILE1030/efile_att_json_lov.lview
View file @ 4cb74d5c
......@@ -22,9 +22,10 @@
para.sql_content = sql_content;
}
//println(sql_content);
var obj;
var obj;
var dataSet_id='att_json_ds';
if(sql_content.length>2){
if(typeof(sql_content)!="undefined"){
sql_content = '{'+sql_content+'}';
obj = JSON.parse(sql_content).attachmentList;
}else{
obj='';
......
src/main/webapp/modules/efile/EFILE1030/efile_post_stru_json_lov.lview
View file @ 4cb74d5c
......@@ -23,7 +23,8 @@
}
//println(sql_content);
var dataSet_id='post_stur_json_ds';
if(sql_content.length>2){
if(typeof(sql_content)!="undefined"){
sql_content = '{'+sql_content+'}';
obj = JSON.parse(sql_content).fieldValueList;
}else{
obj='';
......
src/main/webapp/modules/hls/HLS220/prj_cdd_item_templet.lview
View file @ 4cb74d5c
......@@ -65,6 +65,8 @@
}
]]></style>
<a:dataSets>
<a:dataSet id="yes_no_ds" lookupCode="YES_NO"/>
<a:dataSet id="archive_type_code" lookupCode="ARCHIVE_TYPE"/>
<a:dataSet id="con202_clause_templet_tmplet_class_ds" lookupCode="CON202_TEMPLET_CLASS"/>
<a:dataSet id="hls220_templet_head_ds">
<a:fields>
......@@ -79,6 +81,10 @@
<a:field name="required_flag" checkedValue="Y" defaultValue="Y" uncheckedValue="N"/>
<a:field name="cdd_item" prompt="HLS220.CDD_ITEM" required="true"/>
<a:field name="order_seq"/>
<a:field name="is_archive"/>
<a:field name="archive_type"/>
<a:field name="is_archive_desc" displayField="code_value_name" options="yes_no_ds" returnField="is_archive" valueField="code_value"/>
<a:field name="archive_type_desc" displayField="code_value_name" options="archive_type_code" returnField="archive_type" valueField="code_value"/>
<a:field name="templet_head_id" defaultValue="${/parameter/@templet_head_id}"/>
<a:field name="description" prompt="HLS220.DESCRIPTION" required="true"/>
<a:field name="enabled_flag" checkedValue="Y" defaultValue="Y" prompt="HLS.ENABLED_FLAG" uncheckedValue="N"/>
......@@ -142,6 +148,8 @@
<!-- <a:column name="incept_tab_group" editor="hls220_templet_line_grid_tf" width="40"/> -->
<a:column name="lender_required_flag" editor="hls220_templet_line_grid_ck" width="60"/>
<a:column name="enabled_flag" editor="hls220_templet_line_grid_ck" width="40"/>
<a:column name="is_archive_desc" editor="con202_clause_templet_grid_cb" prompt="电子档案传输对象" width="120"/>
<a:column name="archive_type_desc" editor="con202_clause_templet_grid_cb" prompt="附件类型" width="120"/>
<!-- <a:column name="lender_display_flag" editor="hls220_templet_line_grid_ck" width="60"/> -->
<!-- <a:column name="lender_tab_group" editor="hls220_templet_line_grid_tf" width="40"/> -->
</a:columns>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment