Commit f45db7dc authored by lijingjing's avatar lijingjing

[fix]销项发票创建

parent 967ff435
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:fields> <bm:fields>
<bm:field name="contract_id"/> <bm:field name="contract_id"/>
......
...@@ -145,6 +145,7 @@ ...@@ -145,6 +145,7 @@
<bm:field name="lease_channel"/> <bm:field name="lease_channel"/>
</bm:fields> </bm:fields>
<bm:query-fields> <bm:query-fields>
<bm:query-field name="cf_item" queryExpression="t2.cf_item = ${@cf_item}"/> <bm:query-field name="cf_item" queryExpression="t2.cf_item = ${@cf_item}"/>
<bm:query-field name="due_date_from" queryExpression="t2.due_date &gt;= to_date(${@due_date_from},&apos;yyyy-mm-dd&apos;)"/> <bm:query-field name="due_date_from" queryExpression="t2.due_date &gt;= to_date(${@due_date_from},&apos;yyyy-mm-dd&apos;)"/>
<bm:query-field name="due_date_to" queryExpression="t2.due_date &lt;= to_date(${@due_date_to},&apos;yyyy-mm-dd&apos;)"/> <bm:query-field name="due_date_to" queryExpression="t2.due_date &lt;= to_date(${@due_date_to},&apos;yyyy-mm-dd&apos;)"/>
......
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
order by con.contract_id,cf.times,t.cf_item order by con.contract_id,cf.times,t.cf_item
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
<bm:operation name="update"> <bm:operation name="update">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
begin begin
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<ns1:model xmlns:ns1="http://www.leaf-framework.org/schema/bm" alias="t1" extend="hls.HLS005.hls_cashflow_item_v" extendMode="reference"> <ns1:model xmlns:ns1="http://www.leaf-framework.org/schema/bm" alias="t1" extend="hls.HLS005.hls_cashflow_item_v" extendMode="reference">
<ns1:fields> <ns1:fields>
<ns1:field name="cf_item" forDisplay="false" forQuery="false"/> <ns1:field name="cf_item" forDisplay="false" forQuery="false"/>
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:fields> <bm:fields>
<bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER.BP_ID"/> <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER.BP_ID"/>
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<bm:field name="creation_by" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CREATION_BY" prompt="ACR_INVOICE_HD_BATCH.CREATION_BY"/> <bm:field name="creation_by" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CREATION_BY" prompt="ACR_INVOICE_HD_BATCH.CREATION_BY"/>
<bm:field name="last_updated_date" databaseType="DATE" datatype="java.util.Date" physicalName="LAST_UPDATED_DATE" prompt="ACR_INVOICE_HD_BATCH.LAST_UPDATED_DATE"/> <bm:field name="last_updated_date" databaseType="DATE" datatype="java.util.Date" physicalName="LAST_UPDATED_DATE" prompt="ACR_INVOICE_HD_BATCH.LAST_UPDATED_DATE"/>
</bm:fields> </bm:fields>
<bm:features> <bm:features>
<f:standard-who/> <f:standard-who/>
</bm:features> </bm:features>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.aurora-framework.org/schema/bm"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.aurora-framework.org/schema/bm"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
var tax_type_rate = $('ACR310_QUERY__ds').getAt(0).get('tax_type_rate'); var tax_type_rate = $('ACR310_QUERY__ds').getAt(0).get('tax_type_rate');
var product_name = $('ACR310_QUERY__ds').getAt(0).get('product_name'); var product_name = $('ACR310_QUERY__ds').getAt(0).get('product_name');
......
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
<a:field name="invoice_date" defaultValue="${/model/default_value_record/record/@today}" required="true"/> <a:field name="invoice_date" defaultValue="${/model/default_value_record/record/@today}" required="true"/>
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
<a:dataSet id="selectedDs" autoQuery="true" bindName="line_info" bindTarget="headDs" fetchAll="true" model="acr.ACR510.acr_invoice_create" selectable="true"> <a:dataSet id="selectedDs" autoQuery="true" bindName="line_info" bindTarget="headDs" fetchAll="true" model="acr.ACR510.acr_invoice_create" selectable="true">
<a:fields> <a:fields>
<a:field name="billing_amount" required="true"/> <a:field name="billing_amount" required="true"/>
......
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
}); });
} }
function invoiceHd_confirm() function invoiceHd_confirm()
{ {
Leaf.Masker.mask(Ext.getBody()); Leaf.Masker.mask(Ext.getBody());
......
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
Leaf.request({ Leaf.request({
url: $('acr512_invoice_ln_update_1_link').getUrl(), url: $('acr512_invoice_ln_update_1_link').getUrl(),
para: { para: {
invoice_hd_id: invoice_hd_id, invoice_hd_id: invoice_hd_id,
merge_flag: $(acr_invoice_hd_ds_id).getCurrentRecord().get('merge_flag') merge_flag: $(acr_invoice_hd_ds_id).getCurrentRecord().get('merge_flag')
}, },
......
...@@ -247,6 +247,7 @@ ...@@ -247,6 +247,7 @@
<!-- <!--
<a:toolbarButton click="acr512_invoice_submit" text="HLS.SUBMIT"/> <a:toolbarButton click="acr512_invoice_submit" text="HLS.SUBMIT"/>
--> -->
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form marginWidth="200" padding="0" title="应收发票维护"> <a:form marginWidth="200" padding="0" title="应收发票维护">
<a:hBox labelSeparator=" "> <a:hBox labelSeparator=" ">
......
...@@ -302,6 +302,7 @@ ...@@ -302,6 +302,7 @@
<a:grid id="acr513_invoice_grid_id" bindTarget="acr513_invoice_result_ds" marginHeight="225" <a:grid id="acr513_invoice_grid_id" bindTarget="acr513_invoice_result_ds" marginHeight="225"
marginWidth="30" navBar="true"> marginWidth="30" navBar="true">
<a:columns> <a:columns>
<a:column name="document_number" lock="true" prompt="HLS.DOCUMENT_NUMBER" <a:column name="document_number" lock="true" prompt="HLS.DOCUMENT_NUMBER"
renderer="acr513_document_number_render" width="120"/> renderer="acr513_document_number_render" width="120"/>
<a:column name="invoice_bp_name" autoAdjust="false" prompt="HLS.CUSTOMER_NAME" showTitle="true" <a:column name="invoice_bp_name" autoAdjust="false" prompt="HLS.CUSTOMER_NAME" showTitle="true"
......
...@@ -18,11 +18,13 @@ ...@@ -18,11 +18,13 @@
function open_contract_win(ds_id, record_id) { function open_contract_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id); var record = $(ds_id).findById(record_id);
var param = record.data; var param = record.data;
if(record.get('contract_status')=='NEW' || record.get('contract_status')=='INCEPT_RETURN'||record.get('sign_contract_status')=='SIGNING' || record.get('sign_contract_status') =='SIGN'){ debugger;
if((record.get('contract_status')=='NEW' || record.get('contract_status')=='INCEPT_RETURN') && (record.get('sign_contract_status')=='SIGNING' || record.get('sign_contract_status') =='SIGN')){
param['function_code'] = 'CON3200N'; param['function_code'] = 'CON3200N';
param['function_usage'] = 'MODIFY'; param['function_usage'] = 'MODIFY';
} }
else{ else{
debugger;
param['function_code'] = 'CON3200Q'; param['function_code'] = 'CON3200Q';
param['function_usage'] = 'QUERY'; param['function_usage'] = '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