Skip to content

L
leaf-hlcm
Commit 64d82828 authored by stone's avatar stone
Browse files
Options

Merge branch 'feature/gld_interface_feat' into develop

parents 4d8b4d51 d333231c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 702 additions and 886 deletions
src/main/database/Table/ACR_INVOICE_BATCH_LN.sql 0 → 100644
View file @ 64d82828
-- Create table
create table ACR_INVOICE_BATCH_LN
(
invoice_batch_ln_id NUMBER not null,
invoice_hd_id NUMBER not null,
line_type VARCHAR2(30) not null,
line_number NUMBER,
cashflow_id NUMBER,
cf_item NUMBER,
cf_type NUMBER,
product_id NUMBER,
product_name VARCHAR2(2000),
specification VARCHAR2(2000),
quantity NUMBER,
uom VARCHAR2(30),
price NUMBER,
price_quantity NUMBER,
price_quantity_uom VARCHAR2(30),
net_price NUMBER,
tax_type_id NUMBER,
tax_type_rate NUMBER,
tax_included_flag VARCHAR2(1),
tax_amount NUMBER,
net_amount NUMBER,
total_amount NUMBER,
responsibility_center_id NUMBER,
account_id NUMBER,
description VARCHAR2(1000),
ref_v01 VARCHAR2(2000),
ref_v02 VARCHAR2(2000),
ref_v03 VARCHAR2(2000),
ref_v04 VARCHAR2(2000),
ref_v05 VARCHAR2(2000),
ref_v06 VARCHAR2(2000),
ref_v07 VARCHAR2(2000),
ref_v08 VARCHAR2(2000),
ref_v09 VARCHAR2(2000),
ref_v10 VARCHAR2(2000),
ref_n01 NUMBER,
ref_n02 NUMBER,
ref_n03 NUMBER,
ref_n04 NUMBER,
ref_n05 NUMBER,
ref_n06 NUMBER,
ref_n07 NUMBER,
ref_n08 NUMBER,
ref_n09 NUMBER,
ref_n10 NUMBER,
ref_d01 DATE,
ref_d02 DATE,
ref_d03 DATE,
ref_d04 DATE,
ref_d05 DATE,
created_by NUMBER,
creation_date DATE,
last_updated_by NUMBER,
last_update_date DATE,
lease_channel VARCHAR2(30)
);
-- Add comments to the table
comment on table ACR_INVOICE_BATCH_LN
is '应收发票行(行合并)';
-- Add comments to the columns
comment on column ACR_INVOICE_BATCH_LN.invoice_batch_ln_id
is '发票行ID';
comment on column ACR_INVOICE_BATCH_LN.invoice_hd_id
is '发票ID';
comment on column ACR_INVOICE_BATCH_LN.line_type
is '行类型';
comment on column ACR_INVOICE_BATCH_LN.line_number
is '行号';
comment on column ACR_INVOICE_BATCH_LN.cashflow_id
is '现金流ID';
comment on column ACR_INVOICE_BATCH_LN.cf_item
is '现金流项目';
comment on column ACR_INVOICE_BATCH_LN.cf_type
is '现金流类型';
comment on column ACR_INVOICE_BATCH_LN.product_id
is '商品ID';
comment on column ACR_INVOICE_BATCH_LN.product_name
is '商品名称';
comment on column ACR_INVOICE_BATCH_LN.specification
is '规格型号';
comment on column ACR_INVOICE_BATCH_LN.quantity
is '数量';
comment on column ACR_INVOICE_BATCH_LN.uom
is '计量单位';
comment on column ACR_INVOICE_BATCH_LN.price
is '单价（金税能算就不使用）';
comment on column ACR_INVOICE_BATCH_LN.price_quantity
is '价格数量（暂不需要）';
comment on column ACR_INVOICE_BATCH_LN.price_quantity_uom
is '价格数量单位（暂不需要）';
comment on column ACR_INVOICE_BATCH_LN.net_price
is '税前单价';
comment on column ACR_INVOICE_BATCH_LN.tax_type_id
is '税种';
comment on column ACR_INVOICE_BATCH_LN.tax_type_rate
is '税率';
comment on column ACR_INVOICE_BATCH_LN.tax_included_flag
is '含税标志';
comment on column ACR_INVOICE_BATCH_LN.tax_amount
is '税额';
comment on column ACR_INVOICE_BATCH_LN.net_amount
is '税前金额';
comment on column ACR_INVOICE_BATCH_LN.total_amount
is '含税金额';
comment on column ACR_INVOICE_BATCH_LN.responsibility_center_id
is '责任中心';
comment on column ACR_INVOICE_BATCH_LN.account_id
is '科目';
comment on column ACR_INVOICE_BATCH_LN.description
is '行备注/行摘要';
comment on column ACR_INVOICE_BATCH_LN.created_by
is '创建者';
comment on column ACR_INVOICE_BATCH_LN.creation_date
is '创建日期';
comment on column ACR_INVOICE_BATCH_LN.last_updated_by
is '最后更新者';
comment on column ACR_INVOICE_BATCH_LN.last_update_date
is '最后更新日期';
comment on column ACR_INVOICE_BATCH_LN.lease_channel
is '商业模式';
alter table ACR_INVOICE_BATCH_LN
add constraint ACR_INVOICE_BATCH_LN_PK primary key (INVOICE_BATCH_LN_ID);
CREATE SEQUENCE ACR_INVOICE_BATCH_LN_s;
\ No newline at end of file
src/main/database/Table/Alter/ACR_INVOICE_HD.sql
View file @ 64d82828
......@@ -4,3 +4,16 @@ is '认领状态';
alter table acr_invoice_hd add (invoice_code varchar2(200));
comment on column acr_invoice_hd.invoice_code is '发票代码';
ALTER TABLE acr_invoice_hd ADD merge_flag VARCHAR2(30) default 'N';
ALTER TABLE acr_invoice_hd ADD status VARCHAR2(20);
ALTER TABLE acr_invoice_hd ADD batch_id NUMBER ;
ALTER TABLE acr_invoice_hd ADD ref_merge_flag VARCHAR2(30);
comment on column ACR_INVOICE_HD.merge_flag
is '是否进行行合并';
comment on column ACR_INVOICE_HD.status
is '审批状态';
comment on column ACR_INVOICE_HD.batch_id
is '审批批次ID';
\ No newline at end of file
src/main/database/Table/Alter/HLS_VAT_IMPORT_TMP.sql 0 → 100644
View file @ 64d82828
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment21 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment22 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment23 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment24 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment25 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment26 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment27 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment28 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment29 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment30 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment31 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment32 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment33 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment34 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment35 VARCHAR2(200);
\ No newline at end of file
src/main/database/Table/Alter/con_contract_case_record.sql 0 → 100644
View file @ 64d82828
ALTER TABLE con_contract_case_record ADD wfl_instance_id NUMBER;
COMMENT ON COLUMN con_contract_case_record.wfl_instance_id IS '罚息减免工作流id';
\ No newline at end of file
src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_contract_list.lwm
View file @ 64d82828
......@@ -27,4 +27,7 @@
<bm:query-field field="contract_number" queryOperator="like"/>
<bm:query-field field="contract_name" queryOperator="like"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter name="data_class" expression="t.data_Class=&apos;NORMAL&apos;"/>
</bm:data-filters>
</bm:model>
src/main/webapp/WEB-INF/classes/acr/ACR515/acr_invoice_interface_ln.lwm
View file @ 64d82828
......@@ -12,7 +12,16 @@
</bm:operations>
<bm:fields>
<bm:field name="invoice_hd_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="INVOICE_HD_ID"/>
<bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="bp_code"/>
<bm:field name="description" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="description"/>
<bm:field name="vat_red_notice_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="vat_red_notice_num"/>
<bm:field name="ref_vat_invoice_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ref_vat_invoice_code"/>
<bm:field name="ref_invoice_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ref_invoice_number"/>
<bm:field name="created_by_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="created_by_name"/>
<bm:field name="confirmed_by_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="confirmed_by_name"/>
<bm:field name="invoice_kind_n" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_N"/>
<bm:field name="invoice_title" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="invoice_title"/>
<bm:field name="invoice_bp_address_phone_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="invoice_bp_address_phone_num"/>
<bm:field name="document_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DOCUMENT_NUMBER"/>
<bm:field name="invoice_date" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_DATE"/>
<bm:field name="invoice_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_NUMBER"/>
......@@ -21,6 +30,7 @@
<bm:field name="bp_address_phone_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_ADDRESS_PHONE_NUM"/>
<bm:field name="bp_bank_account" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_BANK_ACCOUNT"/>
<bm:field name="product_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PRODUCT_NAME"/>
<bm:field name="product_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="product_code"/>
<bm:field name="specification" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SPECIFICATION"/>
<bm:field name="uom" databaseType="CHAR" datatype="java.lang.String" physicalName="UOM"/>
<bm:field name="quantity" databaseType="NUMBER" datatype="java.lang.Long" physicalName="QUANTITY"/>
......@@ -28,18 +38,33 @@
<bm:field name="tax_type_rate" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TAX_TYPE_RATE"/>
<bm:field name="tax_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TAX_AMOUNT"/>
<bm:field name="total_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TOTAL_AMOUNT"/>
<bm:field name="product_item" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PRODUCT_ITEM"/>
<bm:field name="discount" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DISCOUNT"/>
<bm:field name="discount_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="discount_amount"/>
<bm:field name="dicount_tax_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="dicount_tax_amount"/>
<!-- <bm:field name="product_item" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PRODUCT_ITEM"/>-->
<!-- <bm:field name="discount" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DISCOUNT"/>-->
<bm:field name="discount_rate" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DISCOUNT_RATE"/>
<bm:field name="discount_tax" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DISCOUNT_TAX"/>
<bm:field name="line_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="LINE_NAME"/>
<!-- <bm:field name="discount_tax" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DISCOUNT_TAX"/>-->
<!-- <bm:field name="line_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="LINE_NAME"/>-->
<bm:field name="rec_man" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="REC_MAN"/>
<bm:field name="check_man" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CHECK_MAN"/>
<bm:field name="notes" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="NOTES"/>
<bm:field name="blue_number"/>
<bm:field name="blue_code"/>
<bm:field name="tax_number"/>
<bm:field name="benefit"/>
<bm:field name="benefit_notes"/>
<bm:field name="rec_man_tax_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="rec_man_tax_num"/>
<bm:field name="del_man" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="del_man"/>
<bm:field name="del_man_tax_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="del_man_tax_num"/>
<bm:field name="place_of_sending" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="place_of_sending"/>
<bm:field name="car_type_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="car_type_num"/>
<bm:field name="car_ship_tonnage" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="car_ship_tonnage"/>
<bm:field name="product_info" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="product_info"/>
<bm:field name="code_version" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="code_version"/>
<bm:field name="tax_type_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="tax_type_code"/>
<bm:field name="preferential_policy_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="preferential_policy_flag"/>
<bm:field name="preferential_policy_content" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="preferential_policy_content"/>
<bm:field name="zero_tax_rate_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="zero_tax_rate_flag"/>
<bm:field name="reduce_amount" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="reduce_amount"/>
<!-- <bm:field name="check_man" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CHECK_MAN"/>-->
<!-- <bm:field name="notes" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="NOTES"/>-->
<!-- <bm:field name="blue_number"/>-->
<!-- <bm:field name="blue_code"/>-->
<!-- <bm:field name="tax_number"/>-->
<!-- <bm:field name="benefit"/>-->
<!-- <bm:field name="benefit_notes"/>-->
</bm:fields>
</bm:model>
src/main/webapp/WEB-INF/classes/acr/ACR515/check_vat_tmp.lwm
View file @ 64d82828
......@@ -2,6 +2,7 @@
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="execute">
<!--包没有改变-->
<bm:update-sql><![CDATA[
BEGIN
hls_vat_import_pkg.check_vat_tmp(p_batch_id => ${/session/@session_id},
......
src/main/webapp/WEB-INF/classes/acr/ACR515/delete_vat_tmp.lwm
View file @ 64d82828
......@@ -3,7 +3,7 @@
<bm:operations>
<bm:operation name="execute">
<bm:update-sql><![CDATA[begin
hls_vat_import_pkg.delete_vat_tmp(
hls_vat_import_bak_pkg.delete_vat_tmp(
p_batch_id => ${/session/@session_id});
end;]]></bm:update-sql>
<bm:parameters>
......
src/main/webapp/WEB-INF/classes/acr/ACR515/hls_vat_confirm.lwm
View file @ 64d82828
......@@ -2,6 +2,7 @@
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="execute">
<!--没有改变-->
<bm:update-sql><![CDATA[
BEGIN
hls_vat_import_pkg.hls_vat_confirm(p_batch_id => ${/session/@session_id},
......
src/main/webapp/WEB-INF/classes/acr/ACR515/hls_vat_import_tmp.lwm
View file @ 64d82828
......@@ -11,9 +11,9 @@
<bm:field name="vat_date" databaseType="DATE" datatype="java.util.Date" physicalName="VAT_DATE" prompt="HLS_VAT_IMPORT_TMP.VAT_DATE"/>
<bm:field name="segment1" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SEGMENT1" prompt="HLS_VAT_IMPORT_TMP.SEGMENT1"/>
<bm:field name="segment2" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SEGMENT2" prompt="HLS_VAT_IMPORT_TMP.SEGMENT2"/>
<bm:field name="segment3" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SEGMENT3" prompt="HLS_VAT_IMPORT_TMP.SEGMENT3"/>
<bm:field name="segment4" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SEGMENT4" prompt="HLS_VAT_IMPORT_TMP.SEGMENT4"/>
<bm:field name="segment5" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SEGMENT5" prompt="HLS_VAT_IMPORT_TMP.SEGMENT5"/>
<bm:field name="segment3" datatype="java.lang.String" physicalName="SEGMENT3" prompt="HLS_VAT_IMPORT_TMP.SEGMENT3"/>
<bm:field name="segment4" datatype="java.lang.String" physicalName="SEGMENT4" prompt="HLS_VAT_IMPORT_TMP.SEGMENT4"/>
<bm:field name="segment5" datatype="java.lang.String" physicalName="SEGMENT5" prompt="HLS_VAT_IMPORT_TMP.SEGMENT5"/>
<bm:field name="segment6" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SEGMENT6" prompt="HLS_VAT_IMPORT_TMP.SEGMENT6"/>
<bm:field name="segment7" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SEGMENT7" prompt="HLS_VAT_IMPORT_TMP.SEGMENT7"/>
<bm:field name="segment8" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SEGMENT8" prompt="HLS_VAT_IMPORT_TMP.SEGMENT8"/>
......@@ -25,10 +25,25 @@
<bm:field name="segment14" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SEGMENT14" prompt="HLS_VAT_IMPORT_TMP.SEGMENT14"/>
<bm:field name="segment15" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SEGMENT15" prompt="HLS_VAT_IMPORT_TMP.SEGMENT15"/>
<bm:field name="segment16" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SEGMENT16" prompt="HLS_VAT_IMPORT_TMP.SEGMENT16"/>
<bm:field name="segment17" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SEGMENT17" prompt="HLS_VAT_IMPORT_TMP.SEGMENT17"/>
<bm:field name="segment18" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SEGMENT18" prompt="HLS_VAT_IMPORT_TMP.SEGMENT18"/>
<bm:field name="segment19" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SEGMENT19" prompt="HLS_VAT_IMPORT_TMP.SEGMENT19"/>
<bm:field name="segment20" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SEGMENT20" prompt="HLS_VAT_IMPORT_TMP.SEGMENT20"/>
<bm:field name="segment17" datatype="java.lang.String" physicalName="SEGMENT17" prompt="HLS_VAT_IMPORT_TMP.SEGMENT17"/>
<bm:field name="segment18" physicalName="SEGMENT18" prompt="HLS_VAT_IMPORT_TMP.SEGMENT18"/>
<bm:field name="segment19" datatype="java.lang.Double" physicalName="SEGMENT19" prompt="HLS_VAT_IMPORT_TMP.SEGMENT19"/>
<bm:field name="segment20" datatype="java.lang.Double" physicalName="SEGMENT20" prompt="HLS_VAT_IMPORT_TMP.SEGMENT20"/>
<bm:field name="segment21" datatype="java.lang.Double"/>
<bm:field name="segment22"/>
<bm:field name="segment23"/>
<bm:field name="segment24"/>
<bm:field name="segment25"/>
<bm:field name="segment26"/>
<bm:field name="segment27"/>
<bm:field name="segment28" datatype="java.lang.Double"/>
<bm:field name="segment29"/>
<bm:field name="segment30"/>
<bm:field name="segment31"/>
<bm:field name="segment32"/>
<bm:field name="segment33"/>
<bm:field name="segment34"/>
<bm:field name="segment35" datatype="java.lang.Double"/>
<bm:field name="status" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="STATUS" prompt="HLS_VAT_IMPORT_TMP.STATUS"/>
</bm:fields>
<bm:features>
......
src/main/webapp/WEB-INF/classes/acr/ACR515/insert_vat_tmp.lwm
View file @ 64d82828
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<!-- 将hls_vat_import_pkg改为hls_vat_import_bak_pkg-->
<bm:operation name="execute">
<bm:update-sql><![CDATA[
BEGIN
hls_vat_import_pkg.insert_vat_tmp(p_user_id => ${/session/@user_id},
hls_vat_import_bak_pkg.insert_vat_tmp(p_user_id => ${/session/@user_id},
p_header_id => ${/session/@session_id},
p_batch_id => ${/session/@session_id},
p_kind =>${/parameter/@kind});
......
src/main/webapp/WEB-INF/classes/cont/CON1020/con_contract_penalty_reduction.lwm
View file @ 64d82828
......@@ -2,15 +2,16 @@
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="execute">
<bm:parameters >
<!--<bm:parameters >
<bm:parameter name ="v_status" dataType="java.lang.Long" input ="false" output ="true" outputPath="@v_status" />
</bm:parameters >
</bm:parameters >-->
<bm:update-sql><![CDATA[
DECLARE
v_status number;
begin
v_status := contract_penalty_reduction.contract_penalty_status(p_record_id => ${@record_id});
${@v_status}:=v_status;
contract_penalty_reduction.remit_workflow_start(p_record_id =>${@record_id},
p_company_id=>${/session/@company_id},
p_user_id =>${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
......
src/main/webapp/WEB-INF/leaf.plugin.export.word/1.xml deleted 100644 → 0
View file @ 4d8b4d51
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<doc readOnly="true" pageSize="A4" header="1.5" footer="1.75" top="2.54" bottom="2.54" left="3.17" right="3.17" >
<body>
<p align="left" line="400" >
<t fontFamily="黑体" fontSize="24" fontColor="000000" >附件二</t>
</p>
<p align="center" line="400" >
<t fontFamily="宋体" fontSize="32" fontColor="000000" >实际租金支付表</t>
</p>
<p indFirstLine="1" line="400" >
<t fontFamily="仿宋" fontSize="24" fontColor="000000" >注:《租金支付概算表》与《实际租金支付表》不一致的,以本《实际租金支付表》为准。</t>
</p>
<p line="400" >
<t fontFamily="宋体" fontSize="24" fontColor="000000" >甲方（承租人）:（盖章） 乙方（出租人）: （盖章）</t>
</p>
<p line="400" >
<t fontFamily="宋体" fontSize="24" fontColor="000000" >法定代表人（负责人）或授权代表: 法定代表人（负责人）或授权代表:</t>
</p>
<p line="400" >
<t fontFamily="宋体" fontSize="24" fontColor="000000" >年 月 日 年 月 日 </t>
</p>
</body>
</doc>
\ No newline at end of file
src/main/webapp/modules/acr/ACR510/acr_invoice_create_invoice.lview
View file @ 64d82828
......@@ -29,6 +29,7 @@
f_hls.winNoMask(win);
return;
}
debugger
var datas = ds.getJsonData();
winNoMask(win);
......
src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
View file @ 64d82828
......@@ -109,12 +109,14 @@
winNoMask();
return;
}
debugger
var datas = ds.getJsonData(true);
for (var i = 0; i < datas.length; i++) {
datas[i].final_bill_flag = final_bill_flag;
datas[i].cat_ini_flag = cat_ini_flag;
}
Leaf.request({
url: $('svcLink_save_selected').getUrl(),
para: datas,
......@@ -340,7 +342,7 @@
<a:gridButton click="contractDs_grid_query" text="HLS.QUERY"/>
<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="invoiceHd_confirm" text="继续"/>
<!--<a:gridButton click="acr510n_excel" text="导出"/>-->
</a:screenTopToolbar>
<a:queryForm id="condition_queryForm" bindTarget="allConditionDs" createSearchButton="false"
......
src/main/webapp/modules/acr/ACR515/acr_invoice_vat.screen
View file @ 64d82828
......@@ -5,7 +5,7 @@
$Revision: 1.0
$Purpose:
-->
<a:screen xmlns:a="http://www.aurora-framework.org/application" customizationEnabled="true">
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true">
<a:init-procedure>
<a:model-query fetchAll="true" model="gld.gld_currency_vl" rootPath="acr515_currency_list"/>
<a:model-query fetchAll="true" model="acr.ACR512.acr_invoice_business_type_list" rootPath="acr515_business_type_list"/>
......
src/main/webapp/modules/acr/ACR515/hls_acr_vat_import_data.lview
View file @ 64d82828
......@@ -6,7 +6,7 @@
<a:link id="hls_acr_vat_import_shw_err_link" url="${/request/@context_path}/modules/acr/ACR515/hls_acr_vat_import_showerrors.lview"/>
<a:link id="acr515_check_import_link" model="acr.ACR515.check_vat_tmp" modelaction="execute"/>
<a:link id="acr515_confirm_import_link" model="acr.ACR515.hls_vat_confirm" modelaction="execute"/>
<script type="text/javascript"><![CDATA[
<script><![CDATA[
//$('submitbtn').disable();
function importbtn() {
......@@ -51,9 +51,9 @@
new Leaf.Window({
id: 'show_error_window',
url: $('hls_acr_vat_import_shw_err_link').getUrl(),
title: '错误数据',
width: 570,
height: 300
prompt: '错误数据',
width: 900,
height: 470
});
}
]]></script>
......@@ -67,16 +67,51 @@
<a:button id="submitbtn_id" click="submitbtn" text="确定"/>
<a:button click="showerrorbtn" text="显示错误信息"/>
</a:hBox>
<a:grid bindTarget="import_data_ds" height="300" width="600">
<a:grid bindTarget="import_data_ds" height="500" marginWidth="30">
<a:columns>
<a:column name="vat_doc_number" prompt="系统单据号" width="150"/>
<a:column name="segment1" prompt="作废标志" width="150"/>
<a:column name="segment2" prompt="发票种类" width="150"/>
<a:column name="vat_doc_number" prompt="单据号" width="150"/>
<a:column name="vat_code" prompt="发票代码" width="150"/>
<a:column name="vat_number" prompt="发票号码" width="150"/>
<a:column name="vat_date_str" prompt="发票日期" width="100"/>
<a:column name="segment3" prompt="客户编号" width="150"/>
<a:column name="segment4" prompt="客户名称" width="150"/>
<a:column name="segment5" prompt="客户税号" width="150"/>
<a:column name="segment6" prompt="客户地址电话" width="150"/>
<a:column name="segment7" prompt="客户银行及帐号" width="150"/>
<a:column name="vat_date_str" prompt="开票日期" width="150"/>
<a:column name="segment8" prompt="备注" width="150"/>
<a:column name="segment9" prompt="开票人" width="150"/>
<a:column name="segment10" prompt="收款人" width="150"/>
<a:column name="segment11" prompt="复核人" width="150"/>
<a:column name="segment12" prompt="销方银行及帐号" width="150"/>
<a:column name="segment13" prompt="销方地址电话" width="150"/>
<a:column name="segment14" prompt="商品编号" width="150"/>
<a:column name="segment15" prompt="商品名称" width="150"/>
<a:column name="segment16" prompt="规格型号" width="150"/>
<a:column name="segment17" prompt="计量单位" width="150"/>
<a:column name="segment18" prompt="数量" width="150"/>
<a:column name="segment19" prompt="金额（含税）" width="150"/>
<a:column name="segment20" prompt="税率" width="150"/>
<a:column name="segment21" prompt="税额" width="150"/>
<a:column name="segment22" prompt="收货人" width="150"/>
<a:column name="segment23" prompt="收货人纳税人识别号" width="150"/>
<a:column name="segment24" prompt="发货人" width="150"/>
<a:column name="segment25" prompt="发货人纳税人识别号" width="150"/>
<a:column name="segment26" prompt="起运地、经由、到达地" width="150"/>
<a:column name="segment27" prompt="车种车号" width="150"/>
<a:column name="segment28" prompt="车船吨位" width="150"/>
<a:column name="segment29" prompt="运输货物信息" width="150"/>
<a:column name="segment30" prompt="编码版本号" width="150"/>
<a:column name="segment31" prompt="税收分类编码" width="150"/>
<a:column name="segment32" prompt="是否享受优惠政策" width="150"/>
<a:column name="segment33" prompt="享受税收优惠政策内容" width="150"/>
<a:column name="segment34" prompt="零税率标识" width="150"/>
<a:column name="segment35" prompt="扣除额" width="150"/>
</a:columns>
</a:grid>
</a:screenBody>
<script type="text/javascript"><![CDATA[
<script><![CDATA[
$('submitbtn_id').disable();
]]></script>
</a:view>
......
src/main/webapp/modules/acr/ACR515/hls_acr_vat_import_showerrors.lview
View file @ 64d82828
......@@ -5,11 +5,11 @@
<a:dataSet id="hls_vat_import_error_ds" autoQuery="true" model="acr.ACR515.hls_vat_import_logs"/>
</a:dataSets>
<a:screenBody>
<a:grid bindTarget="hls_vat_import_error_ds" height="270" width="554">
<a:grid bindTarget="hls_vat_import_error_ds" height="370" width="880">
<a:columns>
<a:column name="batch_line_id" prompt="序号" width="100"/>
<a:column name="vat_doc_number" prompt="单据号" width="150"/>
<a:column name="message" prompt="错误信息" width="300"/>
<a:column name="message" prompt="错误信息" width="630"/>
</a:columns>
</a:grid>
</a:screenBody>
......
src/main/webapp/modules/acr/ACR515/hls_acr_vat_import_upload.lview
View file @ 64d82828
......@@ -7,11 +7,11 @@
if (document.getElementById('importFile').value) {
var fileName = document.getElementById('importFile').value;
var fileType = fileName.substr(fileName.lastIndexOf("."));
/*if (fileType != '.xls') {
if (fileType != '.xls') {
alert('请选择正确的导入文件！');
} else {*/
} else {
document.getElementById('importForm').submit();
/*}*/
}
}
}
]]></script>
......@@ -34,7 +34,9 @@
<a:label name="label6" bindTarget="label_ds" style="color:#055A78;font-weight:bold;margin-left:10px;" width="380"/>
</a:fieldSet>
<a:fieldSet style="margin-left:10px;margin-top:10px;" title="导入文件" width="400">
<form name="upload" id="importForm" action="hls_acr_vat_import_trans_upload.lview?kind=${/parameter/@kind}" enctype="multipart/form-data" method="post">
<!-- modules/prj/PRJ501N/prj_lease_item_trans_upload.lview?session_id=${/parameter/@session_id}&amp;kind=${/parameter/@kind}&amp;parent_ds_id=${/parameter/@parent_ds_id}&amp;type=${/parameter/@type}&amp;_csrf=${/session/@_csrf.token}-->
<form name="upload" id="importForm" action="hls_acr_vat_import_trans_upload.lview?session_id=${/parameter/@session_id}&amp;kind=${/parameter/@kind}&amp;parent_ds_id=${/parameter/@parent_ds_id}&amp;type=${/parameter/@type}&amp;_csrf=${/session/@_csrf.token}" enctype="multipart/form-data" method="post">
<label style="margin-left:10px;margin-top:10px;"><![CDATA[请选择文件:]]></label>
<input name="CONTENT" id="importFile" style="margin-bottom:4px;width:160px;height:22px;" type="file"/>
<input onclick="saveClick()" style="margin-left:10px;margin-top:10px;width:60px;" type="button" value="导入"/>
......
src/main/webapp/modules/cont/CON1020/contract_penalty_reduction_create.lview
View file @ 64d82828
......@@ -28,7 +28,10 @@
// }
// });
Leaf.onReady(function(){
var ds_id1 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_case_record');
console.log(ds_id1)
})
function open_detail_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
if (record.dirty || !record.data.contract_id) {
......@@ -37,6 +40,7 @@
}
var param = record.data;
var case_status_submit = '${/parameter/@case_status_submit}';
if (case_status_submit == 'APPROVED' || case_status_submit == 'APPROVING') {
param['function_code'] = 'CON1020_M_R';
param['maintain_type'] = 'QUERY';
......@@ -45,6 +49,13 @@
param['function_code'] = 'CON1020_M';
param['maintain_type'] = 'UPDATE';
param['function_usage'] = 'UPDATE';
}
//如果是工作流页面进入，设为只读
if ( '${/parameter/@function_usage}'=='QUERY'){
param['function_code'] = 'CON1020_M_R';
param['maintain_type'] = 'QUERY';
param['function_usage'] = 'QUERY';
}
param['penalty_reduce_id'] = record.data.penalty_reduce_id;
param['copy_contract_id'] = record.data.copy_contract_id;
......@@ -99,6 +110,8 @@
//提交起案
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function () {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
getXml();
$('${/parameter/@layout_code}_user_button1').disable();
$('${/parameter/@layout_code}_user_button2').disable();
......@@ -115,17 +128,20 @@
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return;
}
/*小额不用审批直接通过*/
//将小额审批改为工作工作流审批
//所有的单据都默认为小额审批
Leaf.request({
url: $('con_contract_penalty_reduction_link').getUrl(),
para: {
record_id: record_id
},
success: function (res) {
var v_status = res.result.v_status;
if (v_status == 1) {
// var v_status = res.result.v_status;
//if (v_status == 1) {
Leaf.showMessage('${l:PROMPT}', '提交成功');
}
else {
//}
/*else {
Leaf.request({
url: $('get_xml').getUrl(),
para: {
......@@ -143,7 +159,7 @@
},
scope: this
});
}
}*/
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
failure: function () {
......@@ -234,20 +250,25 @@
var ds_id1 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_case_record');
var record1 = $(ds_id1).getCurrentRecord();
var ds_id2 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_penalty_reduce');
var record2 = $(ds_id2).getSelected();
var record2 = $(ds_id2).getAll();
if (record2.length == 0) {
Leaf.showMessage('提示', '请选择一条数据！');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return;
}
var param_list = [];
var param = {};
for (var i = 0; i < record2.length; i++) {
//放在外面程序会报错，由于param是同一个对象，第二次penalty_reduce_id会将第一次的覆盖
var param = {};
param['record_id'] = record1.data.record_id;
param['penalty_reduce_id'] = record2[i].get('penalty_reduce_id');
param['_status'] = 'update';
param_list.push(param);
}
$L.showConfirm('提示','确认取消该批次的修改信息?',function () {
Leaf.request({
url: $('con_contract_penalty_cancle_link').getUrl(),
para: param_list,
......@@ -266,6 +287,11 @@
},
scope: this
});
},function () {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
})
};
//保存submitsuccess调用
......
src/main/webapp/modules/cont/CON1021/contract_penalty_reduction_create.lview
View file @ 64d82828
......@@ -15,6 +15,24 @@
<script type="text/javascript"><![CDATA[
jQuery.noConflict();
//取消按钮
/* window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_case_record');
var records=$(ds_id).getSelected();
//只有新建的单据才能够取消操作
if(records.length<1){
$L.showInfoMessage("提示",'至少选择一条记录为新建的记录！');
return ;
}
///
for (var i=0;i<records.length;i++){
}
}*/
function open_contract_win123() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_case_record');
var param = {};
......@@ -29,7 +47,7 @@
function open_contract_detail_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
var param = record.data;
if (record.data.status == 'APPROVED' || record.data.status == 'APPROVING') {
if (record.data.status == 'APPROVED' || record.data.status == 'APPROVING'||record.data.status == 'CANCEL') {
param['function_code'] = 'CON1020_C_R';
param['function_usage'] = 'QUERY';
param['maintain_type'] = 'QUERY';
......
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