Commit df6f0575 authored by gzj34291's avatar gzj34291

核销反冲提交审批校验改到工作流节点

parent 70939c50
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
t.ref_d04, t.ref_d04,
t.ref_d05, t.ref_d05,
t.wfl_instance_id, t.wfl_instance_id,
t.approval_status t.approval_status,
nvl(t.ignore_invoice_check_flag,'N') ignore_invoice_check_flag
From csh_transaction_wfl t #WHERE_CLAUSE# From csh_transaction_wfl t #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gzj
$Date: 2022年6月14日
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="update">
<!-- <bm:parameters>-->
<!-- <bm:parameter name="con_check_flag" datatype="java.lang.String" input="false" output="true"/>-->
<!-- </bm:parameters>-->
<bm:update-sql><![CDATA[
begin
csh_transaction_wfl_pkg.check_contract_invoice(
p_transaction_wfl_id => ${../../@transaction_wfl_id},
p_write_off_id => ${@write_off_id},
p_user_id => ${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
csh_transaction_wfl_pkg.save_check_invoice_flag(
p_transaction_wfl_id =>${@transaction_wfl_id},
p_check_flag =>${@check_flag},
p_user_id => ${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: likun
$Date: 2011-8-18 下午03:25:19
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select t1.instance_id, t1.workflow_id, t1.workflow_code, t1.current_seq
from zj_wfl_workflow_instance_v t1,csh_transaction_wfl t2
#WHERE_CLAUSE#
and t1.instance_id = t2.wfl_instance_id
order by t1.instance_id desc
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="instance_id" databaseType="NUMBER" datatype="java.lang.Long" forDisplay="false"/>
<bm:field name="workflow_id" databaseType="NUMBER" datatype="java.lang.Long" forDisplay="false"/>
<bm:field name="workflow_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" />
<bm:field name="current_seq" databaseType="NUMBER" datatype="java.lang.Long" forDisplay="false"/>
</bm:fields>
</bm:model>
...@@ -6,16 +6,77 @@ ...@@ -6,16 +6,77 @@
$Purpose: $Purpose:
--> -->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true"> <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
<a:init-procedure>
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
<a:model-query model="csh.CSH514.workflow_info" defaultWhereClause="t2.transaction_wfl_id=${/parameter/@transaction_wfl_id}" rootPath="wolkflow_path"></a:model-query>
</a:init-procedure>
<a:view> <a:view>
<a:link id="csh_transaction_write_off_reverse_link_id" url="${/request/@context_path}/modules/csh/CSH514/csh_transaction_write_off_reverse_new.lsc"/> <a:link id="csh_transaction_write_off_reverse_link_id" url="${/request/@context_path}/modules/csh/CSH514/csh_transaction_write_off_reverse_new.lsc"/>
<!--<a:link id="csh514_write_off_reverse_link_id" model="csh.CSH514.csh_transaction_write_off_reverse" modelaction="batch_update"/>--> <!--<a:link id="csh514_write_off_reverse_link_id" model="csh.CSH514.csh_transaction_write_off_reverse" modelaction="batch_update"/>-->
<a:link id="csh514_write_off_reverse_link_id" url="${/request/@context_path}/modules/csh/CSH514/csh_transaction_write_off_reverse.lsc"/> <a:link id="csh514_write_off_reverse_link_id" url="${/request/@context_path}/modules/csh/CSH514/csh_transaction_write_off_reverse.lsc"/>
<a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/> <a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/>
<a:link id="csh514_check_contract_invoice_link_id" model="csh.CSH514.check_contract_invoice" modelaction="batch_update"/>
<a:link id="csh514_save_invoice_flag_id" model="csh.CSH514.check_contract_invoice" modelaction="execute"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
function csh514_write_off_reverse_return() { function csh514_write_off_reverse_return() {
$('${/parameter/@winId}').close(); $('${/parameter/@winId}').close();
} }
if("${/model/role_info/record/@role_code}"=="0014") {
zjwfl5110_ApproveChecker_add('zjwfl5110_submit', function (type) {
var root_ds = $('${/parameter/@layout_code}_virtual_ds');
if (type == 'agree') {
var headers_ds = $('csh_transaction_receipt_write_off_reverse_detail_head_ds');
var record = headers_ds.getAt(0);
Leaf.request({
url: $('csh514_save_invoice_flag_id').getUrl(),
para: {
transaction_wfl_id:record.get('transaction_wfl_id'),
check_flag :record.get('ignore_invoice_check_flag')
},
success: function () {
},
sync: true,
scope: this
});
if (record.get('ignore_invoice_check_flag')=='Y') {
return true;
} else {
var head_record = $('csh_transaction_receipt_write_off_reverse_detail_head_ds').getAt(0);
var records = $('csh_transaction_receipt_write_off_reverse_detail_result_ds').getAll();
var saveData = [];
var con_check_flag ;
for (var i = 0; i < records.length; i++) {
var a= records[i].get('write_off_id');
records[i].set('write_off_id',records[i].get('write_off_id'));
records[i].set('_status', 'update');
saveData.push(records[i].data);
}
Leaf.request({
url: $('csh514_check_contract_invoice_link_id').getUrl(),
para: saveData,
success: function () {
con_check_flag ='N';
},
failure: function () {
con_check_flag ='Y';
},
error: function () {
con_check_flag ='Y';
},
sync: true,
scope: this
});
if(con_check_flag == 'N'){
return true;
}else{
return false;
}
}
}else return true;
});
}
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
...@@ -27,6 +88,7 @@ ...@@ -27,6 +88,7 @@
<a:field name="transaction_date" readOnly="true"/> <a:field name="transaction_date" readOnly="true"/>
<a:field name="description" readOnly="true"/> <a:field name="description" readOnly="true"/>
<a:field name="note" readOnly="true"/> <a:field name="note" readOnly="true"/>
<a:field name="ignore_invoice_check_flag"/>
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
<a:dataSet id="csh_transaction_receipt_write_off_reverse_detail_result_ds" autoQuery="true" fetchAll="true" <a:dataSet id="csh_transaction_receipt_write_off_reverse_detail_result_ds" autoQuery="true" fetchAll="true"
...@@ -49,7 +111,7 @@ ...@@ -49,7 +111,7 @@
<!--<a:screenTopToolbar> <!--<a:screenTopToolbar>
<a:gridButton click="csh514_write_off_reverse_return" text="HLS.RETURN"/> <a:gridButton click="csh514_write_off_reverse_return" text="HLS.RETURN"/>
</a:screenTopToolbar>--> </a:screenTopToolbar>-->
<a:form title="CSH514.CSH_WRITE_OFF_DETAIL"> <a:form title="CSH514.CSH_WRITE_OFF_DETAIL" >
<a:hBox> <a:hBox>
<a:datePicker name="reversed_date" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" renderer="Leaf.formatDate" <a:datePicker name="reversed_date" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" renderer="Leaf.formatDate"
prompt="HLS.REVERSE_DATE"/> prompt="HLS.REVERSE_DATE"/>
...@@ -60,6 +122,7 @@ ...@@ -60,6 +122,7 @@
bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" renderer="Leaf.formatDate" prompt="收款日期"/> bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" renderer="Leaf.formatDate" prompt="收款日期"/>
<a:textField name="description" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" <a:textField name="description" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds"
prompt="HLS.NOTE" width="300"/> prompt="HLS.NOTE" width="300"/>
<a:checkBox name="ignore_invoice_check_flag" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" prompt="是否跳过合同开票校验"/>
</a:hBox> </a:hBox>
<a:hBox> <a:hBox>
<a:textArea name="note" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds" <a:textArea name="note" bindTarget="csh_transaction_receipt_write_off_reverse_detail_head_ds"
...@@ -85,5 +148,15 @@ ...@@ -85,5 +148,15 @@
</a:columns> </a:columns>
</a:grid> </a:grid>
</a:screenBody> </a:screenBody>
<script>
Leaf.onReady(init);
function init() {
var headers_ds = $('csh_transaction_receipt_write_off_reverse_detail_head_ds');
if ('${/model/wolkflow_path/record/@current_seq}' != '10'){
headers_ds.getField('ignore_invoice_check_flag').setReadOnly(true);
}
}
</script>
</a:view> </a:view>
</a:screen> </a:screen>
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