Skip to content

L
leaf-hlcm
Commit fd6fc38c authored by 18083's avatar 18083
Browse files
Options

全电发票改造

parent 1816f19c
Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 22 deletions
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_cf_v_new.lwm
View file @ fd6fc38c
......@@ -124,7 +124,10 @@
FROM sys_code_values_v v
WHERE v.code = 'DIVISION'
AND v.code_value = cc.division
AND v.code_enabled_flag = 'Y') division_n
AND v.code_enabled_flag = 'Y') division_n,
hbm.full_elec_invoice_flag,
(select v.code_value_name value_name from sys_code_values_v v where v.code = 'YES_NO' and v.code_value = hbm.full_elec_invoice_flag) full_elec_invoice_flag_n
from con_contract cc, hls_bp_master hbm, CUS_ACR_INVOICE_V t2
where cc.contract_id = t2.contract_id
and hbm.bp_wfl_status = 'APPROVED'
......@@ -338,7 +341,8 @@
<bm:query-field name="invoice_type" queryExpression="vv.invoice_type = ${@invoice_type}"/>
<bm:query-field name="rl_flag" queryExpression="vv.rl_flag = ${@rl_flag}"/>
<bm:query-field name="billing_status" queryExpression="vv.billing_status = ${@billing_status}"/>
</bm:query-fields>
<bm:query-field name="full_elec_invoice_flag" queryExpression="vv.full_elec_invoice_flag = ${@full_elec_invoice_flag}"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="vv.contract_status not in ('CANCEL')"/>
<!--<bm:data-filter enforceOperations="query" expression="t1.contract_id = vv.contract_id"/>-->
......
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_create.lwm
View file @ fd6fc38c
......@@ -40,6 +40,8 @@
<bm:field name="invoice_kind_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_TYPE"/>
<bm:field name="invoice_kind_type_n" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_TYPE_N" prompt="发票种类"/>
<bm:field name="rl_flag"/>
<bm:field name="full_elec_invoice_flag"/>
<bm:field name="full_elec_invoice_flag_n"/>
<bm:field name="business_type" />
</bm:fields>
<bm:operations>
......@@ -114,7 +116,10 @@
else
''
end rl_flag,
con.business_type
con.business_type,
t.full_elec_invoice_flag,
(select v.code_value_name value_name from sys_code_values_v v where v.code = 'YES_NO' and v.code_value = t.full_elec_invoice_flag) full_elec_invoice_flag_n
from acr_invoice_create_tmp t,
con_contract_v con,
con_contract_cashflow_all_v cf,
......
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_penalty_create.lwm
View file @ fd6fc38c
......@@ -38,7 +38,8 @@
<bm:field name="billing_object_name" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="invoice_kind_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_TYPE"/>
<bm:field name="invoice_kind_type_n" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_TYPE_N" prompt="发票种类"/>
<bm:field name="full_elec_invoice_flag"/>
<bm:field name="full_elec_invoice_flag_n"/>
</bm:fields>
<bm:operations>
<bm:operation name="query">
......@@ -93,8 +94,10 @@
(select v.code_value_name
from sys_code_values_v v
where v.code = 'ACR512_INVOICE_KIND_TYPE'
and v.code_value = t.invoice_kind_type) invoice_kind_type_n
FROM acr_invoice_create_tmp t, con_contract_v con,hls_bp_master t1
and v.code_value = t.invoice_kind_type) invoice_kind_type_n,
t.full_elec_invoice_flag,
(select v.code_value_name value_name from sys_code_values_v v where v.code = 'YES_NO' and v.code_value = t.full_elec_invoice_flag) full_elec_invoice_flag_n
FROM acr_invoice_create_tmp t, con_contract_v con,hls_bp_master t1
WHERE t.session_id = ${/session/@session_id}
AND t.contract_id = con.contract_id
and t1.bp_id = t.bp_id
......
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_selected_cashflow.lwm
View file @ fd6fc38c
......@@ -30,6 +30,7 @@
p_exchange_rate_type => ${@exchange_rate_type},
p_exchange_rate_quotation => ${@exchange_rate_quotation},
p_exchange_rate => ${@exchange_rate},
p_full_elec_invoice_flag => ${@full_elec_invoice_flag},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
......@@ -53,6 +54,7 @@ begin
p_exchange_rate_type => ${@exchange_rate_type},
p_exchange_rate_quotation => ${@exchange_rate_quotation},
p_exchange_rate => ${@exchange_rate},
p_full_elec_invoice_flag => ${@full_elec_invoice_flag},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
......
src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_update_query.lwm
View file @ fd6fc38c
......@@ -55,7 +55,9 @@
t1.spv_company_id,
t1.invoice_type,
t1.invoice_kind_type,
t1.invoice_kind_type_n
t1.invoice_kind_type_n,
t1.full_elec_invoice_flag,
t1.full_elec_invoice_flag_n
FROM acr_invoice_hd_v t1
ORDER BY t1.invoice_date DESC, t1.document_number DESC) t1 #WHERE_CLAUSE#
ORDER BY invoice_date DESC, document_number DESC
......@@ -113,6 +115,7 @@
<bm:query-field name="query_project_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, prj_project pp where df.ar_invoice_hd_id = t1.invoice_hd_id and df.project_id = pp.project_id and pp.project_number between nvl(${@project_number_f}, pp.project_number) and nvl(${@project_number_t}, pp.project_number))"/>
<bm:query-field name="lease_channel" queryExpression="t1.lease_channel = ${@lease_channel}"/>
<bm:query-field name="invoice_kind_type" queryExpression="t1.invoice_kind_type = ${@invoice_kind_type}"/>
<bm:query-field name="full_elec_invoice_flag" queryExpression="t1.full_elec_invoice_flag = ${@full_elec_invoice_flag}"/>
</bm:query-fields>
<bm:data-filters>
......
src/main/webapp/WEB-INF/classes/acr/ACR515/acr515_invoice_hd_v.lwm
View file @ fd6fc38c
......@@ -116,6 +116,8 @@
<bm:field name="invoice_apply_id" databaseType="NUMBER" datatype="java.lang.Long"/>
<bm:field name="invoice_kind_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="invoice_kind_type" prompt="发票种类"/>
<bm:field name="invoice_kind_type_n" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="invoice_kind_type_n" prompt="发票种类"/>
<bm:field name="full_elec_invoice_flag" databaseType="VARCHAR2" datatype="java.lang.String" />
<bm:field name="full_elec_invoice_flag_n" databaseType="VARCHAR2" datatype="java.lang.String"/>
</bm:fields>
<bm:query-fields>
<bm:query-field name="document_number_f" queryExpression="t1.document_number &gt;= ${@document_number_f}"/>
......@@ -146,6 +148,7 @@
<bm:query-field name="query_project_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, prj_project pp where df.ar_invoice_hd_id = t1.invoice_hd_id and df.project_id = pp.project_id and pp.project_number between nvl(${@project_number_f}, pp.project_number) and nvl(${@project_number_t}, pp.project_number))"/>
<bm:query-field name="invoice_apply_num" queryExpression="( exists(select 1 from acr_invoice_apply ap, acr_invoice_hd_wfl aw where ap.wfl_apply_status = 'APPROVED' and ap.apply_mode = 'APPLY' and ap.invoice_apply_id = aw.invoice_apply_id and aw.invoice_hd_id = t1.invoice_hd_id and ap.invoice_apply_num=${@invoice_apply_num}) or exists(select ap.invoice_apply_num from acr_invoice_apply ap, acr_invoice_hd_wfl aw where ap.wfl_apply_status = 'APPROVED' and ap.apply_mode = 'REVERSE' and ap.invoice_apply_id = aw.invoice_apply_id and aw.invoice_hd_id = t1.source_invoice_header_id and ap.invoice_apply_num=${@invoice_apply_num}) )"/>
<bm:query-field name="invoice_kind_type" queryExpression="t1.invoice_kind_type = ${@invoice_kind_type}"/>
<bm:query-field name="full_elec_invoice_flag" queryExpression="t1.full_elec_invoice_flag = ${@full_elec_invoice_flag}"/>
</bm:query-fields>
<bm:data-filters>
......
src/main/webapp/WEB-INF/classes/acr/ACR604/acr_invoice_claim_application_new.lwm
View file @ fd6fc38c
......@@ -135,7 +135,9 @@
invoice_type,
invoice_kind_type,
invoice_kind_type_n,
bp_id_agent_level1
bp_id_agent_level1,
full_elec_invoice_flag,
full_elec_invoice_flag_n
FROM acr_invoice_hd_v t) t1
#WHERE_CLAUSE#
......@@ -173,7 +175,8 @@
<bm:query-field name="query_contract_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, con_contract cc where df.contract_id = cc.contract_id and df.ar_invoice_hd_id = t1.invoice_hd_id and cc.contract_number between nvl(${@contract_number_f}, cc.contract_number) and nvl(${@contract_number_t}, cc.contract_number))"/>
<bm:query-field name="query_project_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, prj_project pp where df.ar_invoice_hd_id = t1.invoice_hd_id and df.project_id = pp.project_id and pp.project_number between nvl(${@project_number_f}, pp.project_number) and nvl(${@project_number_t}, pp.project_number))"/>
<bm:query-field name="invoice_kind_type" queryExpression="t1.invoice_kind_type = ${@invoice_kind_type}"/>
</bm:query-fields>
<bm:query-field name="full_elec_invoice_flag" queryExpression="t1.full_elec_invoice_flag = ${@full_elec_invoice_flag}"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="nvl(t1.reversed_flag ,'N')= &apos;N&apos;"/>
<!-- <bm:data-filter enforceOperations="query" expression="t2.write_off_flag = &apos;FULL&apos;"/>-->
......
src/main/webapp/WEB-INF/classes/acr/ACR605/acr_invoice_claim_confirm_new.lwm
View file @ fd6fc38c
......@@ -134,8 +134,9 @@
invoice_type,
invoice_kind_type,
invoice_kind_type_n,
bp_id_agent_level1
bp_id_agent_level1,
full_elec_invoice_flag,
full_elec_invoice_flag_n
FROM acr_invoice_hd_v t) t1
#WHERE_CLAUSE#
ORDER BY t1.invoice_date desc , t1.document_number desc
......@@ -172,6 +173,7 @@
<bm:query-field name="query_contract_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, con_contract cc where df.contract_id = cc.contract_id and df.ar_invoice_hd_id = t1.invoice_hd_id and cc.contract_number between nvl(${@contract_number_f}, cc.contract_number) and nvl(${@contract_number_t}, cc.contract_number))"/>
<bm:query-field name="query_project_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, prj_project pp where df.ar_invoice_hd_id = t1.invoice_hd_id and df.project_id = pp.project_id and pp.project_number between nvl(${@project_number_f}, pp.project_number) and nvl(${@project_number_t}, pp.project_number))"/>
<bm:query-field name="invoice_kind_type" queryExpression="t1.invoice_kind_type = ${@invoice_kind_type}"/>
<bm:query-field name="full_elec_invoice_flag" queryExpression="t1.full_elec_invoice_flag = ${@full_elec_invoice_flag}"/>
</bm:query-fields>
<bm:data-filters>
<!-- <bm:data-filter enforceOperations="query" expression="t1.contract_id = t2.contract_id"/>-->
......
src/main/webapp/WEB-INF/classes/acr/ACR620/acr_invoice_reverse_apply_detail.lwm
View file @ fd6fc38c
......@@ -37,7 +37,12 @@
From sys_code_values_v v
Where v.code = 'ACR510_AR_INVOICE_STATUS'
And v.code_value = h.invoice_status) invoice_status_n,
(Select ahd.vat_interface_status
h.invoice_kind_type,
(Select v.code_value_name
From sys_code_values_v v
Where v.code = 'ACR512_INVOICE_KIND_TYPE'
And v.code_value = h.invoice_kind_type) invoice_kind_type_n,
(Select ahd.vat_interface_status
From acr_invoice_hd ahd
Where ahd.invoice_hd_id=h.invoice_hd_id) vat_interface_status,
(Select v.code_value_name
......
src/main/webapp/modules/acr/ACR510/acr_invoice_create_invoice.lview
View file @ fd6fc38c
......@@ -87,6 +87,12 @@
$L.showErrorMessage("提示","本次开票金额+已开票金额不能超过已核销金额！");
return;
}
//全电发票只能选择电子增值税普通发票和电子增值税专用发票
var full_elec_invoice_flag= selectedDs[i].get('full_elec_invoice_flag');
if(full_elec_invoice_flag=='Y'&&(kind_type!='ELECTRONIC_GENERAL'&&kind_type!='ELECTRONIC_SPECIAL')){
Leaf.showMessage("提示","全电发票只能选择电子增值税普通发票和电子增值税专用发票!");
return;
}
}
......@@ -241,7 +247,8 @@
<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"/>
</a:columns>
<a:column name="full_elec_invoice_flag_n" prompt="是否全电发票" align="center"/>
</a:columns>
<a:editors>
<a:comboBox id="selectedDs_grid_editor_comb">
<a:events>
......
src/main/webapp/modules/acr/ACR510/acr_invoice_penalty_invoice.lview
View file @ fd6fc38c
......@@ -194,7 +194,8 @@
<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"/>
</a:columns>
<a:column name="full_elec_invoice_flag_n" prompt="是否全电发票" align="center"/>
</a:columns>
<a:editors>
<a:comboBox id="selectedDs_grid_editor_comb">
<a:events>
......
src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
View file @ fd6fc38c
......@@ -449,6 +449,9 @@
<a:field name="billing_status"/>
<a:field name="billing_status_n" displayField="code_value_name" options="billing_status_ds"
returnField="billing_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"
returnField="full_elec_invoice_flag" valueField="code_value"/>
</a:fields>
<a:events>
<a:event name="update" handler="queryUpdateFunction"/>
......@@ -524,6 +527,8 @@
</a:hBox>
<a:hBox>
<a:comboBox bindTarget="allConditionDs" name="billing_status_n" prompt="开票状态"/>
<a:comboBox bindTarget="allConditionDs" name="full_elec_invoice_flag_n" prompt="是否全电发票"/>
</a:hBox>
<!-- <a:formBody column="4" labelWidth="400">
<a:lov name="contract_number_from" bindTarget="allConditionDs" prompt="HLS.CONTRACT_NUMBER_FROM"/>
......@@ -593,7 +598,8 @@
<a:column name="write_off_flag_desc" width="100" align="center" prompt="核销标记" />
<a:column name="rl_flag_n" width="100" align="center" prompt="是否日立返还金" />
<a:column name="billing_status_n" width="100" align="center" prompt="开票状态" />
</a:columns>
<a:column name="full_elec_invoice_flag_n" width="100" align="center" prompt="是否全电发票" />
</a:columns>
</a:grid>
</a:tab>
<a:tab prompt="抬头信息" width="150">
......
src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview
View file @ fd6fc38c
......@@ -267,7 +267,10 @@
$L.showErrorMessage("提示", '纸质发票与电子发票不能同时勾选！');
return;
}
if(full_elec_invoice_flag != records[i].get('full_elec_invoice_flag')){
$L.showErrorMessage("提示", '全电发票与非全电发票不能同时勾选！');
return;
}
if (invoice_hd_ids == '') {
invoice_hd_ids = records[i].get('invoice_hd_id');
} else {
......@@ -333,12 +336,16 @@
<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="acr512_invoice_query_ds">
<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"
returnField="full_elec_invoice_flag" valueField="code_value"/>
<!--<a:field name="invoice_kind"/>-->
<a:field name="invoice_kind_type"/>
<a:field name="contract_name"/>
......@@ -455,6 +462,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:hBox>
<a:hBox labelSeparator=" ">
......@@ -506,6 +514,8 @@
<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:columns>
</a:grid>
</a:screenBody>
......
src/main/webapp/modules/acr/ACR514/acr_invoice_reverse_apply_temp_detail.lview
View file @ fd6fc38c
......@@ -153,6 +153,12 @@
Leaf.showMessage('${l:HLS.PROMPT}', '认领中的发票无法申请反冲');
return;
}
if (records[i].get('invoice_kind_type') == 'ELECTRONIC_GENERAL' || records[i].get('invoice_kind_type') == 'ELECTRONIC_SPECIAL') {
if(head_record.get('reverse_method')=='INVALID'){
Leaf.showMessage('${l:HLS.PROMPT}', '电子专票或者电子普票只能选择红冲！');
return;
}
}
select_reversed_count += 1;
if (invoice_hd_ids == '') {
invoice_hd_ids = records[i].get('invoice_hd_id');
......
src/main/webapp/modules/acr/ACR515/acr_invoice_vat.lview
View file @ fd6fc38c
......@@ -350,6 +350,7 @@
<!--<a:dataSet id="acr515_invoiceKindDs" lookupCode="ACR510_INVOICE_KIND"/>-->
<a:dataSet id="acr515_invoiceKindDs" lookupCode="ACR512_INVOICE_KIND_TYPE"/>
<a:dataSet id="acr515_invoiceStatusDs" lookupCode="ACR510_AR_INVOICE_STATUS"/>
<a:dataSet id="overdue_status_ds" lookupCode="YES_NO"/>
<a:dataSet id="acr515_express_status_ds" lookupCode="ACR518_EXPRESS_STATUS"/>
<a:dataSet id="acr515_vat_interface_status_ds" lookupCode="ACR515_VAT_INTERFACE_STATUS"/>
<a:dataSet id="acr515_businessTypeDs">
......@@ -369,6 +370,10 @@
<a:field name="invoice_kind_type"/>
<a:field name="invoice_kind_type_n" displayField="code_value_name" options="acr515_invoiceKindDs"
returnField="invoice_kind_type" 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"
returnField="full_elec_invoice_flag" valueField="code_value"/>
<a:field name="invoice_status_desc" displayField="code_value_name" options="acr515_invoiceStatusDs"
returnField="invoice_status" valueField="code_value"/>
<a:field name="vat_interface_status" defaultValue="UNTRANSFERED"/>
......@@ -513,6 +518,8 @@
<a:lov name="invoice_bp_code_f" bindTarget="acr515_invoiceVatParaDs" prompt="客户编号" width="150"/>
<a:textField name="invoice_apply_num" bindTarget="acr515_invoiceVatParaDs" prompt="申请编号"
width="120"/>
<a:comboBox name="full_elec_invoice_flag_n" bindTarget="acr515_invoiceVatParaDs" width="150" prompt="是否全电发票"/>
</a:hBox>
</a:form>
<a:grid id="acr515_invoiceVatDs_grid" bindTarget="acr515_invoiceVatDs" marginWidth="30" navBar="true"
......@@ -549,6 +556,7 @@
<a:column name="vat_interface_status_desc" width="100"/>
<a:column name="accounting_date" renderer="Leaf.formatDate" width="100"/>
<!-- <a:column name="create_je_flag" width="60"/> -->
<a:column name="full_elec_invoice_flag_n" width="200" prompt="是否全电发票"/>
</a:columns>
</a:grid>
</a:screenBody>
......
src/main/webapp/modules/acr/ACR515/hls_acr_vat_zip_file_upload_handle.lview
View file @ fd6fc38c
......@@ -96,13 +96,15 @@
sub_temp_map = $bm('acr.ACR515.hls_vat_import_tmp').queryAsMap().getChildren();
for (var j = 0;j < sub_temp_map.length;j++) {
//println(sub_temp_map[j].vat_code+'_'+sub_temp_map[j].vat_number);
var filePdf=new File(String(file_path+sub_temp_map[j].vat_code+'_'+sub_temp_map[j].vat_number+'.pdf'));
if(filePdf.exists()){
// var filePdf=new File(String(file_path+sub_temp_map[j].vat_code+'_'+sub_temp_map[j].vat_number+'.pdf'));
var filePdf=new File(String(file_path+sub_temp_map[j].vat_number+'.pdf'));
if(filePdf.exists()){
//存在则更新临时表 对应文件名字段
$bm('acr.ACR515.check_vat_tmp').update({
"vat_code": sub_temp_map[j].vat_code,
"vat_number": sub_temp_map[j].vat_number,
"file_name": String(sub_temp_map[j].vat_code+'_'+sub_temp_map[j].vat_number+'.pdf')
//"file_name": String(sub_temp_map[j].vat_code+'_'+sub_temp_map[j].vat_number+'.pdf')
"file_name": String(sub_temp_map[j].vat_number+'.pdf')
})
}else{
//存在则更新临时表 对应文件名字段
......@@ -206,7 +208,16 @@
//把所有文件解压到当前目录层级，不使用压缩包中的目录结构
var fileName = zn.getName().substring(zn.getName().lastIndexOf("/")+1);  
          fileName = fileName.substring(fileName.lastIndexOf("\\")+1);  
//修改解压后文件名 
var newStr = new Array();
newStr = fileName.split("_");
//println(newStr[1]);
//如果是G3则拼接上.pdf,保持文件名一致
if(fileName.indexOf('dzfp') >= 0){
fileName=newStr[1]+'.pdf';
}else{
fileName=newStr[1];
}
var f = new File(String(path + fileName));
//println(zn.getName());
// var file = f.getParentFile();
......
src/main/webapp/modules/acr/ACR516/acr_invoice_claim_application.lview
View file @ fd6fc38c
......@@ -150,6 +150,7 @@
<a:dataSets>
<!--<a:dataSet id="acr516_invoice_kind_ds" lookupCode="ACR510_INVOICE_KIND"/>-->
<a:dataSet id="acr516_invoice_kind_ds" lookupCode="ACR512_INVOICE_KIND_TYPE"/>
<a:dataSet id="overdue_status_ds" lookupCode="YES_NO"/>
<a:dataSet id="acr516_invoice_statu_ds" lookupCode="ACR510_AR_INVOICE_STATUS"/>
<a:dataSet id="acr516_claim_status_ds" lookupCode="CLAIM_STATUS"/>
<a:dataSet id="cf_item_options">
......@@ -172,7 +173,10 @@
<a:field name="invoice_kind_type"/>
<a:field name="invoice_kind_type_n" displayField="code_value_name" options="acr516_invoice_kind_ds"
returnField="invoice_kind_type" valueField="code_value"/>
<a:field name="invoice_status_desc" displayField="code_value_name" options="acr516_invoice_statu_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_status_desc" displayField="code_value_name" options="acr516_invoice_statu_ds"
returnField="invoice_status" valueField="code_value"/>
<a:field name="total_amount"/>
<a:field name="csh_transaction_flag"/>
......@@ -234,6 +238,8 @@
<a:textField name="invoice_apply_num" bindTarget="acr516_invoice_query_ds" prompt="申请编号" width="120"/>
<a:datePicker name="invoice_date_from" bindTarget="acr516_invoice_query_ds" prompt="发票日期从" width="120"/>
<a:datePicker name="invoice_date_to" bindTarget="acr516_invoice_query_ds" prompt="发票日期到" width="120"/>
<a:comboBox name="full_elec_invoice_flag_n" bindTarget="acr516_invoice_query_ds" prompt="是否全电发票"
width="120"/>
</a:form>
<a:grid id="acr516_invoice_grid_id" bindTarget="acr516_invoice_result_ds" marginHeight="225"
marginWidth="30" navBar="true">
......@@ -265,6 +271,7 @@
<a:column name="claim_status_n" prompt="认领状态" width="100"/>
<a:column name="invoice_apply_num" prompt="申请编号" width="120"/>
<a:column name="csh_transaction_flag_desc" prompt="收款标记" width="80"/>
<a:column name="full_elec_invoice_flag_n" prompt="是否全电发票" width="80"/>
</a:columns>
</a:grid>
</a:screenBody>
......
src/main/webapp/modules/acr/ACR517/acr_invoice_claim_confirm.lview
View file @ fd6fc38c
......@@ -176,6 +176,7 @@
<a:dataSets>
<!-- <a:dataSet id="acr517_invoice_kind_ds" lookupCode="ACR510_INVOICE_KIND"/>-->
<a:dataSet id="acr517_invoice_kind_ds" lookupCode="ACR512_INVOICE_KIND_TYPE"/>
<a:dataSet id="overdue_status_ds" lookupCode="YES_NO"/>
<a:dataSet id="acr517_invoice_statu_ds" lookupCode="ACR510_AR_INVOICE_STATUS"/>
<a:dataSet id="acr517_claim_status_ds" lookupCode="CLAIM_STATUS"/>
<a:dataSet id="cf_item_options">
......@@ -200,6 +201,9 @@
<a:field name="invoice_kind_type"/>
<a:field name="invoice_kind_type_n" displayField="code_value_name" options="acr517_invoice_kind_ds"
returnField="invoice_kind_type" 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"
returnField="full_elec_invoice_flag" valueField="code_value"/>
<a:field name="invoice_status_desc" displayField="code_value_name" options="acr517_invoice_statu_ds" returnField="invoice_status" valueField="code_value"/>
<a:field name="total_amount"/>
<a:field name="csh_transaction_flag"/>
......@@ -252,6 +256,7 @@
<a:textField name="invoice_apply_num" bindTarget="acr517_invoice_query_ds" prompt="申请编号" width="120"/>
<a:datePicker name="invoice_date_from" bindTarget="acr517_invoice_query_ds" prompt="发票日期从" width="120"/>
<a:datePicker name="invoice_date_to" bindTarget="acr517_invoice_query_ds" prompt="发票日期到" width="120"/>
<a:comboBox name="full_elec_invoice_flag_n" bindTarget="acr517_invoice_query_ds" prompt="是否全电发票" width="120"/>
</a:form>
<a:grid id="acr516_invoice_grid_id" bindTarget="acr517_invoice_result_ds" marginHeight="225" marginWidth="30" navBar="true">
<a:columns>
......@@ -282,6 +287,7 @@
<a:column name="claim_status_n" prompt="认领状态" width="100"/>
<a:column name="invoice_apply_num" prompt="申请编号" width="120"/>
<a:column name="csh_transaction_flag_desc" prompt="收款标记" width="80"/>
<a:column name="full_elec_invoice_flag_n" prompt="是否全电发票" width="80"/>
</a:columns>
</a:grid>
</a:screenBody>
......
src/main/webapp/modules/hls/HLS303/bp_agent_create.lview
View file @ fd6fc38c
......@@ -130,6 +130,14 @@
}else{
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}
//若选择开票类型为“纸质发票”，则系统校验无法选择“是否全电发票”为“是” 2022/11/30
if (head_record.get('invoice_type')=='PAPER'){
if(head_record.get('full_elec_invoice_flag')=='Y'){
$L.showErrorMessage('错误','开票类型为纸质发票，不能选择【是否全电发票】为是!',null,null);
return false;
}
}
if(patrn.test(english_name)==false){
$L.showErrorMessage('错误','代理店代码为三位大写字母!',null,null);
......@@ -190,6 +198,24 @@
});
return check_flag;
};
//变更时调用 18083 2022/11/30 新增变更方法
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
var f_bp_create_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
if (ds.id == f_bp_create_ds_id) {
if(name == 'invoice_type'){
//设置是否全电发票默认值 18083
if(value == 'PAPER'){
record.set('full_elec_invoice_flag','N');
record.set('full_elec_invoice_flag_n','否');
}else{
record.set('full_elec_invoice_flag','Y');
record.set('full_elec_invoice_flag_n','是');
}
}
}
}
//财务报表导入
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
......
src/main/webapp/modules/hls/HLS303/bp_agent_modify.lview
View file @ fd6fc38c
......@@ -142,6 +142,18 @@
}
}
if (ds_id == ds.id) {
if(name == 'invoice_type'){
//设置是否全电发票默认值 18083
if(value == 'PAPER'){
record.set('full_elec_invoice_flag','N');
record.set('full_elec_invoice_flag_n','否');
}else{
record.set('full_elec_invoice_flag','Y');
record.set('full_elec_invoice_flag_n','是');
}
}
}
};
//保存前调用
......@@ -189,6 +201,13 @@
}else{
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}
//若选择开票类型为“纸质发票”，则系统校验无法选择“是否全电发票”为“是” 18083 2022/11/21
if (head_record.get('invoice_type')=='PAPER'){
if(head_record.get('full_elec_invoice_flag')=='Y'){
Leaf.showErrorMessage('${l:PROMPT}', '开票类型为纸质发票，不能选择【是否全电发票】为是');
return false;
}
}
var social_code=head_record.get('social_code');
var id_card_no_leg=head_record.get('id_card_no_leg');
if(id_card_no_leg){
......
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