Skip to content

L
leaf-hlcm
Commit e03b9789 authored by xsh241908's avatar xsh241908
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 34ed876f 63348f13
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 10 deletions
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_create.lwm
View file @ e03b9789
......@@ -13,6 +13,7 @@
<bm:field name="project_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="PROJECT_ID"/>
<bm:field name="project_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROJECT_NUMBER" prompt="HLS.PROJECT_NUMBER"/>
<bm:field name="project_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROJECT_NAME" prompt="HLS.PROJECT_NAME"/>
<bm:field name="product_name_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PRODUCT_NAME_DESC" forInsert="false" forUpdate="false"/>
<bm:field name="contract_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CONTRACT_ID"/>
<bm:field name="contract_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_NUMBER" prompt="HLS.CONTRACT_NUMBER"/>
<bm:field name="contract_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_NAME" prompt="HLS.CONTRACT_NAME"/>
......@@ -91,7 +92,8 @@
(select i.description
from hls_cashflow_item i
where i.cf_item = t.cf_item) as cf_item_desc,
decode(t.cf_item,250,'设备款','融资租赁费') as product_name,
decode(t.cf_item,250,'融资租赁挖掘机','融资租赁费') as product_name,
decode(t.cf_item,250,'融资租赁挖掘机','融资租赁费') as product_name_desc,
con.contract_status contract_status,
cf.cf_status cf_status,
t.invoice_kind_type,
......
src/main/webapp/WEB-INF/classes/acr/ACR610/acr_invoice_apply_detail.lwm
View file @ e03b9789
......@@ -22,6 +22,7 @@
al.cashflow_id,
al.cf_item,
ah.document_number,
(Select c.contract_number
From con_contract c
Where c.contract_id = ah.contract_id) contract_number,
......@@ -69,7 +70,7 @@
and al.cashflow_id = cw.cashflow_id
and cw.reversed_flag='N'
and cw.cf_item<>2
and ctr.paid_byother_flag='T'),0,'F','T')) paid_byother_flag_n,
and ctr.paid_byother_flag='T'),0,'F','T')) paid_byother_flag_n,
(case when al.cf_item<>'9' then cwo.received_amount else
al.total_amount end)received_amount,
ah.invoice_hd_id,
......@@ -100,15 +101,32 @@
and ctr.paid_byother_flag='T'
and cw.cf_item<>2
and nvl(ctr.guarantor_name_duty,'N')='N')paid_byother_sum_flag,
(select aw.product_name from acr_invoice_batch_ln_wfl aw
where ah.invoice_hd_wfl_id = aw.invoice_hd_wfl_id
and rownum =1) product_name_n,
(select v.code_value_id from sys_code_values_v v
where
v.code = 'ACR510_PRODUCT_NAME'
And v.code_value = (select aw.product_name from acr_invoice_batch_ln_wfl aw
where ah.invoice_hd_wfl_id = aw.invoice_hd_wfl_id
and rownum =1)
and v.code_enabled_flag = 'Y'
and v.code_value_enabled_flag = 'Y') product_name_order,
null attachment
From acr_invoice_apply aa,
acr_invoice_hd_wfl ah,
acr_invoice_ln_wfl al,
con_contract_cashflow cwo
con_contract_cashflow cwo,
sys_code_values_v v
Where aa.invoice_apply_id = ah.invoice_apply_id
And ah.invoice_hd_wfl_id = al.invoice_hd_wfl_id
And al.cashflow_id = cwo.cashflow_id(+)
order by cwo.contract_id desc, cwo.times asc) t1 #WHERE_CLAUSE# #ORDER_BY_CLAUSE#
and v.code = 'ACR510_PRODUCT_NAME'
And v.code_value = al.product_name
and v.code_enabled_flag = 'Y'
and v.code_value_enabled_flag = 'Y'
order by product_name_order asc,cwo.contract_id desc,cwo.times asc) t1 #WHERE_CLAUSE# #ORDER_BY_CLAUSE#
]]></bm:query-sql>
</bm:operation>
......@@ -127,6 +145,7 @@
<bm:query-field name="bp_code" queryExpression="t1.bp_code = ${@bp_code}"/>
<bm:query-field name="journal_month" queryExpression="t1.journal_month = ${@journal_month}"/>
<bm:query-field name="paid_byother_flag_n" queryExpression="t1.paid_byother_flag = ${@paid_byother_flag}"/>
<bm:query-field name="product_name_n" queryExpression="t1.product_name_n = ${@product_name_n}"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="t1.invoice_apply_id = ${@invoice_apply_id}"/>
......
src/main/webapp/modules/acr/ACR510/acr_invoice_create_invoice.lview
View file @ e03b9789
......@@ -81,9 +81,9 @@
}
var datas = ds.getJsonData();
Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认开票？',function()
Leaf.showConfirm('${l:HLS.PROMPT}','是否确认开票？',function()
{
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
Leaf.Masker.mask(Ext.getBody(),'${l:HLS.EXECUTING}');
Leaf.request({
url: $('svcLink_create_invoice').getUrl(),
para: datas,
......@@ -92,7 +92,7 @@
createScreen_close();
contractDs_grid_query();
},
failure: function() {
failure: function(){
Leaf.Masker.unmask(Ext.getBody());
},
......@@ -154,6 +154,7 @@
<a:dataSet id="invoiceKindDs">
<a:datas dataSource="/model/acr512_invoice_kind_type"/>
</a:dataSet>
<a:dataSet id="product_name_ds" lookupCode="ACR510_PRODUCT_NAME"/>
<a:dataSet id="headDs" autoCreate="true">
<a:fields>
<a:field name="company_id" defaultValue="${/parameter/@company_id}"/>
......@@ -166,7 +167,9 @@
<a:dataSet id="selectedDs" autoQuery="true" bindName="line_info" bindTarget="headDs" fetchAll="true" model="acr.ACR510.acr_invoice_create" selectable="true">
<a:fields>
<a:field name="billing_amount" required="true"/>
<a:field name="product_name" required="true"/>
<!-- <a:field name="product_name" required="true"/>-->
<a:field name="product_name" displayField="code_value_name" options="product_name_ds" returnField="p_name" valueField="code_value"/>
<!--<a:field name="invoice_kind"/>
<a:field name="invoice_kind_desc" displayField="code_value_name" options="invoiceKindDs" required="true" returnField="invoice_kind" valueField="code_value"/>-->
<a:field name="invoice_kind_type"/>
......@@ -199,7 +202,7 @@
<a:column name="contract_number" width="150"/>
<a:column name="times" align="right" width="40"/>
<a:column name="cf_item_desc"/>
<a:column name="product_name" editor="selectedDs_grid_editor_tf" width="150"/>
<a:column name="product_name" editor="selectedDs_grid_editor_tf_box" width="150"/>
<!--<a:column name="invoice_kind_desc" editor="selectedDs_grid_editor_comb"/>-->
<a:column name="invoice_kind_type_n" editorFunction="" editor="selectedDs_grid_editor_comb" width="150"/>
<a:column name="billing_object_name" width="150"/>
......@@ -219,6 +222,7 @@
</a:events>
</a:comboBox>
<a:textField id="selectedDs_grid_editor_tf"/>
<a:comboBox id="selectedDs_grid_editor_tf_box"/>
<a:numberField id="selectedDs_grid_editor_nf"/>
</a:editors>
</a:grid>
......@@ -231,7 +235,7 @@
<a:column name="cf_item_desc"/>
<a:column name="contract_name" width="200"/>
<a:column name="project_number" width="150" prompt="报单编号"/>
<!-- <a:column name="project_name" width="200" prompt="报单名称"/>-->
<!-- <a:column name="project_name" width="200" prompt="报单名称"/>-->
<a:column name="last_received_date" renderer="Leaf.formatDate" width="80"/>
<!-- <a:column name="exchange_rate" align="right"/>
<a:column name="exchange_rate_type_desc"/>-->
......
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