Commit f0d9a374 authored by panhong18943's avatar panhong18943

Merge branch 'remote_dev' of https://hel.hand-china.com/hlcm/leaf-hlcm into remote_dev

parents 3b9a3a68 9b816e8c
...@@ -216,11 +216,6 @@ ...@@ -216,11 +216,6 @@
<artifactId>spring-core</artifactId> <artifactId>spring-core</artifactId>
<version>5.3.14</version> <version>5.3.14</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>5.3.14</version>
</dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
...@@ -232,7 +227,7 @@ ...@@ -232,7 +227,7 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId> <artifactId>httpmime</artifactId>
<version>4.5.2</version> <version>4.2.5</version>
</dependency> </dependency>
......
package com.hand.att; package com.hand.att;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.RequestEntity;
import org.apache.commons.httpclient.methods.StringRequestEntity;
import org.apache.commons.httpclient.methods.multipart.FilePart;
import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
import org.apache.commons.httpclient.methods.multipart.Part;
import org.apache.commons.httpclient.methods.multipart.StringPart;
import org.apache.commons.httpclient.params.HttpMethodParams;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.mime.MultipartEntity;
import org.apache.http.entity.mime.content.FileBody;
import org.apache.http.entity.mime.content.StringBody;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.util.EntityUtils;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
...@@ -30,32 +24,7 @@ import java.util.*; ...@@ -30,32 +24,7 @@ import java.util.*;
*/ */
public class HttpPostAttUtil { public class HttpPostAttUtil {
public static String httpPostAttImport(String postUrl, String data,String token,String tokentype){
try {
PostMethod postMethod = null;
HttpClient httpClient = new HttpClient();
postMethod = new PostMethod(postUrl) ;
RequestEntity entity = null;
postMethod.setRequestHeader("Content-Type", "application/json") ;
postMethod.setRequestHeader("Authorization", tokentype+" "+token) ;
//参数设置,需要注意的就是里边不能传NULL,要传空字符串
entity = new StringRequestEntity(data, "application/json", "UTF-8");
// 设置请求体信息
postMethod.setRequestEntity(entity);
// 执行POST方法
int response = httpClient.executeMethod(postMethod);
String result = postMethod.getResponseBodyAsString() ;
return result;
} catch (Exception e) {
return "{\n" +
" \"error\": \"interError\",\n" +
" \"message\": \"请求接口失败\",\n" +
" \"path\": \"/oauth/token\"\n" +
"}";
}
}
...@@ -99,7 +68,7 @@ public class HttpPostAttUtil { ...@@ -99,7 +68,7 @@ public class HttpPostAttUtil {
}*/ }*/
public static String UploadFile(String url, Map<String, String> param, File file, String token, String tokentype ) throws Exception { public static String UploadFile(String url, Map<String, String> param, File file, String token, String tokentype ) throws Exception {
HttpClient httpClient = new HttpClient(); /* HttpClient httpClient = new HttpClient();
HttpServletResponse response = null; HttpServletResponse response = null;
PostMethod post = new PostMethod(url); PostMethod post = new PostMethod(url);
String resultString = ""; String resultString = "";
...@@ -125,9 +94,31 @@ public class HttpPostAttUtil { ...@@ -125,9 +94,31 @@ public class HttpPostAttUtil {
} finally { } finally {
post.releaseConnection(); post.releaseConnection();
} }
return ""; return "";*/
HttpClient client =null;
String result=null;
try {
HttpPost postMethod = new HttpPost(url);
client = new DefaultHttpClient();
FileBody filebody = new FileBody(file);
MultipartEntity multipartEntity = new MultipartEntity();
multipartEntity.addPart("file", filebody);
multipartEntity.addPart("documentTypeCode",new StringBody(param.get("documentTypeCode")));
multipartEntity.addPart("primaryField", new StringBody(param.get("primaryField")));
multipartEntity.addPart("documentSource", new StringBody(param.get("documentSource")));
multipartEntity.addPart("companyCode", new StringBody(param.get("companyCode")));
postMethod.setEntity(multipartEntity);
HttpResponse response = client.execute(postMethod);
HttpEntity httpEntity = response.getEntity();
result = EntityUtils.toString(httpEntity);
}catch (Exception e){
e.printStackTrace();
}finally {
client.getConnectionManager().shutdown(); // 关闭连接.
return result;
}
} }
......
package com.hand.hlcm;
import com.alibaba.fastjson.JSON;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import org.apache.http.util.EntityUtils;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class HttpPostDocQuery {
public HttpPostDocQuery() {
}
public static String httpPostDocImport(String postUrl, String data, String token, String tokentype) {
HttpClient client = null;
String result = "error";
try {
client = new DefaultHttpClient();
HttpPost post = new HttpPost(postUrl);
//设置超时时间
HttpParams params = client.getParams();
HttpConnectionParams.setConnectionTimeout(params, (int) 10 * 1000);
HttpConnectionParams.setSoTimeout(params, 10 * 1000);
post.setHeader("Content-Type", "application/json");
post.setHeader("Authorization", tokentype + " " + token);
post.setEntity(new StringEntity(data, "UTF-8"));
HttpResponse response = null;
response = client.execute(post);
HttpEntity entity = response.getEntity();
result = EntityUtils.toString(entity, "UTF-8");
EntityUtils.consume(entity); //1. 关闭响应流
if (entity != null) {
InputStream instream = entity.getContent();
try {
BufferedReader reader = new BufferedReader(new InputStreamReader(instream, "UTF-8"));
} catch (Exception e) {
e.printStackTrace();
} finally {
instream.close();
}
}
} catch (Exception e) {
e.printStackTrace();
} finally {
client.getConnectionManager().shutdown(); // 关闭连接.
}
return result;
}
public static void main(String[] args) throws Exception {
Map<String, Object> map = new HashMap<>();
map.put("startCreatedDate", "2023-06-20 00:00:00");
map.put("endCreatedDate", "2023-06-21 00:00:00");
List<String> list = new ArrayList<>();
list.add("receiptD");
map.put("documentTypeCodeList", list);
String json = JSON.toJSONString(map);
System.out.println("--------------------" + json);
String response = httpPostDocImport("http://apistage.huilianyi.com/gateway/e-archives/api/open/v1/documents/query?page=1&size=20", json, "6de63d6c-1acd-4b1c-89b8-e91c19442ab9", "Bearer");
System.out.println(response);
}
}
package com.hand.hlcm; package com.hand.hlcm;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.NameValuePair;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.RequestEntity;
import org.apache.commons.httpclient.methods.StringRequestEntity;
import java.io.BufferedReader; import org.apache.http.HttpEntity;
import java.io.IOException; import org.apache.http.HttpResponse;
import java.io.InputStream; import org.apache.http.client.HttpClient;
import java.io.InputStreamReader; import org.apache.http.client.entity.UrlEncodedFormEntity;
import java.net.URLDecoder; import org.apache.http.client.methods.HttpPost;
import java.nio.charset.Charset; import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import org.apache.http.util.EntityUtils;
import java.util.ArrayList;
import java.util.Base64; import java.util.Base64;
import java.util.List;
/** /**
* description * description
...@@ -22,7 +23,7 @@ import java.util.Base64; ...@@ -22,7 +23,7 @@ import java.util.Base64;
public class HttpPostUtil { public class HttpPostUtil {
public static String httpPostGetToken(String postUrl,String appId,String appSecret){ public static String httpPostGetToken(String postUrl,String appId,String appSecret){
try { /*try {
PostMethod postMethod = null; PostMethod postMethod = null;
postMethod = new PostMethod(postUrl) ; postMethod = new PostMethod(postUrl) ;
postMethod.setRequestHeader("Content-Type", "application/x-www-form-urlencoded") ; postMethod.setRequestHeader("Content-Type", "application/x-www-form-urlencoded") ;
...@@ -44,6 +45,32 @@ public class HttpPostUtil { ...@@ -44,6 +45,32 @@ public class HttpPostUtil {
" \"message\": \"请求接口失败\",\n" + " \"message\": \"请求接口失败\",\n" +
" \"path\": \"/oauth/token\"\n" + " \"path\": \"/oauth/token\"\n" +
"}"; "}";
}*/
HttpClient client = null;
String result=null;
try {
client = new DefaultHttpClient();
HttpPost post = new HttpPost(postUrl);
//设置超时时间
HttpParams params = client.getParams();
HttpConnectionParams.setConnectionTimeout(params, (int) 10 * 1000);
HttpConnectionParams.setSoTimeout(params, 10 * 1000);
post.setHeader("Content-Type", "application/x-www-form-urlencoded");
post.setHeader("Authorization", "Basic "+ Base64.getUrlEncoder().encodeToString((appId + ":" + appSecret).getBytes()));
//post.setEntity(new StringEntity(data, "UTF-8"));
List<BasicNameValuePair> pairs = new ArrayList<>();
pairs.add(new BasicNameValuePair("grant_type", "client_credentials"));
pairs.add(new BasicNameValuePair("scope", "write"));
post.setEntity(new UrlEncodedFormEntity(pairs, "utf-8"));
HttpResponse response =client.execute(post);
HttpEntity entity = response.getEntity();
result = EntityUtils.toString(entity);
EntityUtils.consume(entity); //1. 关闭响应流
} catch (Exception e) {
e.printStackTrace();
} finally {
client.getConnectionManager().shutdown(); // 关闭连接.
return result;
} }
} }
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2024-05-20 下午2:57:45
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" extend="hls.HLS103.hls_division_detail" extendMode="reference">
<bm:fields>
<bm:field name="division_detail_code" forDisplay="true" forQuery="true"/>
<bm:field name="division_detail_name" forDisplay="true" forQuery="true"/>
</bm:fields>
<bm:data-filters>
<bm:data-filter expression="t1.division = &apos;70&apos;"/>
</bm:data-filters>
<bm:query-fields>
<bm:query-field field="division_detail_code" queryOperator="like"/>
<bm:query-field field="division_detail_name" queryOperator="like"/>
</bm:query-fields>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: ericyin
$Date: 2013-3-19 下午4:55:00
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="SYS_USER_V" defaultOrderBy="user_name" needAccessControl="false">
<bm:fields>
<bm:field name="user_id" databaseType="NUMBER" datatype="java.lang.Long" forInsert="ture" physicalName="USER_ID" prompt="HLS.USER_ID"/>
<bm:field name="user_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="100" forDisplay="true" forQuery="true" physicalName="USER_NAME" prompt="HLS.USER_NAME"/>
<bm:field name="description" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="120" forDisplay="true" forQuery="true" physicalName="DESCRIPTION" prompt="HLS.EMPLOYEE_NAME"/> <!--HLS.DESCRIPTION-->
<bm:field name="start_date" databaseType="DATE" datatype="java.util.Date" physicalName="START_DATE" prompt="HLS.START_DATE"/>
<bm:field name="end_date" databaseType="DATE" datatype="java.util.Date" physicalName="END_DATE" prompt="HLS.END_DATE"/>
<bm:field name="employee_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="false" physicalName="EMPLOYEE_CODE" prompt="HLS.EMPLOYEE_CODE"/>
<bm:field name="employee_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="100" forDisplay="false" physicalName="EMPLOYEE_NAME" prompt="HLS.EMPLOYEE_NAME"/>
<bm:field name="frozen_flag" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="100" forDisplay="false" physicalName="FROZEN_FLAG" prompt="HLS.FROZEN_FLAG"/>
<bm:field name="enabled_flag" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="100" forDisplay="false" physicalName="ENABLED_FLAG" prompt="HLS.ENABLED_FLAG"/>
</bm:fields>
<bm:query-fields>
<bm:query-field field="user_name" queryOperator="like"/>
<bm:query-field field="description" queryOperator="like"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="t1.start_date &lt;= sysdate and (t1.end_date &gt;= sysdate or t1.end_date is null)"/>
<bm:data-filter enforceOperations="query" expression="t1.frozen_flag != &apos;Y&apos;"/>
<bm:data-filter enforceOperations="query" expression="t1.enabled_flag = &apos;Y&apos;"/>
</bm:data-filters>
</bm:model>
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
<bm:field name="business_type_n" expression="(select v.description from HLS_BUSINESS_TYPE_V v where v.business_type = t1.business_type)" forInsert="false" forUpdate="false"/> <bm:field name="business_type_n" expression="(select v.description from HLS_BUSINESS_TYPE_V v where v.business_type = t1.business_type)" forInsert="false" forUpdate="false"/>
<bm:field name="document_type_n" expression="(select v.document_type_desc from hls_document_type_v v where v.document_type = t1.document_type)" forInsert="false" forUpdate="false"/> <bm:field name="document_type_n" expression="(select v.document_type_desc from hls_document_type_v v where v.document_type = t1.document_type)" forInsert="false" forUpdate="false"/>
<bm:field name="division_n" expression="(select v.description from HLS_DIVISION v where v.division = t1.division)" forInsert="false" forUpdate="false"/> <bm:field name="division_n" expression="(select v.description from HLS_DIVISION v where v.division = t1.division)" forInsert="false" forUpdate="false"/>
<bm:field name="division_detail" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DIVISION_DETAIL" prompt="CON_CONTRACT_TMPT_CLAUSE.DIVISION_DETAIL"/>
<bm:field name="division_detail_n" expression="(select v.division_detail_name from hls_division_detail v where v.division_detail_code = t1.division_detail and v.enable_flag='Y')" forInsert="false" forUpdate="false"/>
<bm:field name="lease_channel_n" expression="(select v.description from HLS_LEASE_CHANNEL v where v.lease_channel = t1.lease_channel)" forInsert="false" forUpdate="false"/> <bm:field name="lease_channel_n" expression="(select v.description from HLS_LEASE_CHANNEL v where v.lease_channel = t1.lease_channel)" forInsert="false" forUpdate="false"/>
<bm:field name="lease_organization_n" expression="(select v.description from hls_lease_organization v where v.lease_organization = t1.lease_organization)" forInsert="false" forUpdate="false"/> <bm:field name="lease_organization_n" expression="(select v.description from hls_lease_organization v where v.lease_organization = t1.lease_organization)" forInsert="false" forUpdate="false"/>
<bm:field name="price_list_n" expression="(select v.description from HLS_PRICE_LIST v where v.price_list = t1.price_list)" forInsert="false" forUpdate="false"/> <bm:field name="price_list_n" expression="(select v.description from HLS_PRICE_LIST v where v.price_list = t1.price_list)" forInsert="false" forUpdate="false"/>
......
...@@ -26,5 +26,12 @@ ...@@ -26,5 +26,12 @@
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
</bm:operation> </bm:operation>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select con_contract_workflow_pkg.get_rsc_upload_flag(p_contract_id =>${@contract_id}) as is_rsc_upload_flag
from dual
]]></bm:query-sql>
</bm:operation>
</bm:operations> </bm:operations>
</bm:model> </bm:model>
...@@ -704,7 +704,7 @@ ...@@ -704,7 +704,7 @@
AND a2.authorized_user_id = ${/session/@user_id} AND a2.authorized_user_id = ${/session/@user_id}
AND trunc(SYSDATE) BETWEEN a2.start_date AND AND trunc(SYSDATE) BETWEEN a2.start_date AND
nvl(a2.end_date, trunc(SYSDATE)))) nvl(a2.end_date, trunc(SYSDATE))))
And ((decode(1, 10600, 1, 2) = 1 And ((decode(${/session/@user_id}, 10600, 1, 2) = 1
And exists(select 1 And exists(select 1
from hls_bp_master hb from hls_bp_master hb
where hb.bp_id = cc.bp_id_agent_level1 where hb.bp_id = cc.bp_id_agent_level1
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: 18083
$Date:
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
Select decode(cc.division,'70',nvl(had.division_detail,'01'),'') division_detail
From csh_payment_req_ln t, con_contract cc,hls_bp_master_agent_division had
Where t.payment_req_id = ${/parameter/@payment_req_id}
And t.ref_doc_category = 'CONTRACT'
and t.ref_doc_id = cc.contract_id
and cc.division= had.division
and cc.bp_id_agent_level1= had.bp_id
and rownum = 1
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
p_total_amount => ${@total_amount}, p_total_amount => ${@total_amount},
p_invoice_date => ${@invoice_date}, p_invoice_date => ${@invoice_date},
p_payment_req_id => ${@payment_req_id}, p_payment_req_id => ${@payment_req_id},
p_user_id => ${/session/@user_id} p_user_id => ${/session/@user_id});
end; end;
]]> ]]>
</bm:update-sql> </bm:update-sql>
......
...@@ -37,8 +37,16 @@ ...@@ -37,8 +37,16 @@
from con_contract cc,hls_division hd from con_contract cc,hls_division hd
where cc.division= hd.division and cc.contract_id = hc.contract_id) con_business_type_n, where cc.division= hd.division and cc.contract_id = hc.contract_id) con_business_type_n,
hc.rental_re_times, hc.rental_re_times,
hc.overdue_max_days, nvl((select trunc(sysdate) - min(trunc(cc.due_date))
hc.comsn_rate*100||'%' comsn_rate, from con_contract_cashflow cc
where cc.contract_id = hc.contract_id
and cc.cf_item = 1
and cc.cf_direction = 'INFLOW'
and cc.cf_status = 'RELEASE'
and trunc(cc.due_date) < trunc(sysdate)
and cc.write_off_flag != 'FULL'),
0) overdue_max_days,
round(hc.comsn_rate*100,2)||'%' comsn_rate,
hc.comsn_amount, hc.comsn_amount,
(select sum(i.unearned_finance_income) (select sum(i.unearned_finance_income)
from con_unearned_finance_income i from con_unearned_finance_income i
...@@ -56,27 +64,7 @@ ...@@ -56,27 +64,7 @@
WHERE l.ref_doc_line_id=hc.cashflow_id WHERE l.ref_doc_line_id=hc.cashflow_id
AND l.ref_doc_category='CONTRACT' AND l.ref_doc_category='CONTRACT'
and l.payment_req_id=hd.payment_req_id and l.payment_req_id=hd.payment_req_id
and hd.approval_status in ('NEW','REJECT','APPROVED','APPROVING','RETURN') and hd.approval_status in ('NEW','APPROVED','APPROVING','RETURN')
)
AND ('Y' = 'Y' AND EXISTS
(SELECT 1
FROM aut_trx_user_authorize a1, aut_owner_user_authorize a2
WHERE a1.trx_category = 'CONTRACT'
AND a1.trx_id = hc.contract_id
AND trunc(SYSDATE) BETWEEN a1.start_date AND
nvl(a1.end_date, trunc(SYSDATE))
AND a1.user_id = a2.owner_user_id
AND a1.trx_category = a2.trx_category
AND a2.authorized_user_id = ${/session/@user_id}
AND trunc(SYSDATE) BETWEEN a2.start_date AND
nvl(a2.end_date, trunc(SYSDATE))))
AND NOT EXISTS (
SELECT 1
FROM csh_payment_req_ln l,csh_payment_req_hd hd
WHERE l.ref_doc_line_id=hc.cashflow_id
AND l.ref_doc_category='CONTRACT'
and l.payment_req_id=hd.payment_req_id
and hd.approval_status in ('NEW','REJECT','APPROVED','APPROVING','RETURN')
) )
AND ('Y' = 'Y' AND EXISTS AND ('Y' = 'Y' AND EXISTS
(SELECT 1 (SELECT 1
...@@ -91,10 +79,11 @@ ...@@ -91,10 +79,11 @@
AND trunc(SYSDATE) BETWEEN a2.start_date AND AND trunc(SYSDATE) BETWEEN a2.start_date AND
nvl(a2.end_date, trunc(SYSDATE)))) nvl(a2.end_date, trunc(SYSDATE))))
order by hc.overdue_max_days desc
) t1 ) t1
#WHERE_CLAUSE# #WHERE_CLAUSE#
#ORDER_BY_CLAUSE# order by t1.overdue_max_days desc
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
...@@ -103,11 +92,13 @@ order by hc.overdue_max_days desc ...@@ -103,11 +92,13 @@ order by hc.overdue_max_days desc
<bm:query-field name="batch_number" <bm:query-field name="batch_number"
queryExpression="t1.batch_number like &apos;%&apos;||${@batch_number}||&apos;%&apos;"/> queryExpression="t1.batch_number like &apos;%&apos;||${@batch_number}||&apos;%&apos;"/>
<bm:query-field name="contract_number" <bm:query-field name="contract_number"
queryExpression="t1.batch_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/> queryExpression="t1.contract_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
<bm:query-field name="bp_id_agent_level1_n" queryExpression="t1.bp_id_agent_level1_n like &apos;%&apos;||${@bp_id_agent_level1_n}||&apos;%&apos;"/> <bm:query-field name="bp_id_agent_level1_n" queryExpression="t1.bp_id_agent_level1_n like &apos;%&apos;||${@bp_id_agent_level1_n}||&apos;%&apos;"/>
<bm:query-field name="division_n" queryExpression="t1.division_n like &apos;%&apos;||${@division_n}||&apos;%&apos;"/> <bm:query-field name="division_n" queryExpression="t1.division_n like &apos;%&apos;||${@division_n}||&apos;%&apos;"/>
<bm:query-field name="policy_name" queryExpression="t1.policy_name=${@policy_name}"/> <bm:query-field name="policy_name" queryExpression="t1.policy_name=${@policy_name}"/>
<bm:query-field name="overdue_max_days_f" queryExpression="t1.overdue_max_days &gt;= ${@overdue_max_days_f}"/> <bm:query-field name="overdue_max_days_f" queryExpression="t1.overdue_max_days &gt;= ${@overdue_max_days_f}"/>
<bm:query-field name="overdue_max_days_t" queryExpression="t1.overdue_max_days &lt;= ${@overdue_max_days_t}"/> <bm:query-field name="overdue_max_days_t" queryExpression="t1.overdue_max_days &lt;= ${@overdue_max_days_t}"/>
<bm:query-field name="lease_start_date_f" queryExpression="t1.lease_start_date &gt;= TO_CHAR(TO_DATE(${@lease_start_date_f}, 'YYYY-MM-DD'), 'YYYY/MM/DD')"/>
<bm:query-field name="lease_start_date_t" queryExpression="t1.lease_start_date &lt;= TO_CHAR(TO_DATE(${@lease_start_date_t}, 'YYYY-MM-DD'), 'YYYY/MM/DD')"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
update CSH_TRANSACTION update CSH_TRANSACTION
set confirmed_flag = 'WF_REJECTED' set confirmed_flag = 'WF_REJECTED'
where transaction_id = ${@transaction_id}; where transaction_id = ${@transaction_id};
select a.transaction_num into v_transaction_num from CSH_TRANSACTION a where transaction_id = ${@transaction_id};
end if; end if;
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
......
...@@ -19,6 +19,17 @@ ...@@ -19,6 +19,17 @@
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
</bm:operation> </bm:operation>
<bm:operation name="insert">
<bm:update-sql><![CDATA[
begin
csh_deposit_transfer_pkg.create_archives_post_list(
p_user_id =>${/session/@user_id},
p_review_type =>${@review_type},
p_batch_id =>${@batch_id}
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="execute"> <bm:operation name="execute">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
begin begin
......
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
where v.code = 'DONE_FLAG_STATUS' where v.code = 'DONE_FLAG_STATUS'
and v.code_value = t.done_flag) done_flag_desc, and v.code_value = t.done_flag) done_flag_desc,
t.error_message, t.error_message,
to_char(t.last_update_date,'yyyy-mm-dd') last_update_date to_char(t.last_update_date,'yyyy-mm-dd') last_update_date,
to_char(t.creation_date,'yyyy-mm-dd') creation_date
from hl_e_archives_post_list t from hl_e_archives_post_list t
#WHERE_CLAUSE# #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
...@@ -42,6 +43,8 @@ ...@@ -42,6 +43,8 @@
<bm:query-field name="archive_type" queryExpression="t.archive_type like ${@archive_type}"/> <bm:query-field name="archive_type" queryExpression="t.archive_type like ${@archive_type}"/>
<bm:query-field name="done_flag" queryExpression="t.done_flag=${@done_flag}"/> <bm:query-field name="done_flag" queryExpression="t.done_flag=${@done_flag}"/>
<bm:query-field name="document_info" queryExpression="t.document_info like ${@document_info}"/> <bm:query-field name="document_info" queryExpression="t.document_info like ${@document_info}"/>
<bm:query-field name="creation_date_from" queryExpression="trunc(t.creation_date) &gt;= to_date(${@creation_date_from},&apos;yyyy-mm-dd hh24:mi:ss&apos;)"/>
<bm:query-field name="creation_date_to" queryExpression="trunc(t.creation_date) &lt;= to_date(${@creation_date_to},&apos;yyyy-mm-dd hh24:mi:ss&apos;)"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" alias="t1" baseTable="HLS_ARCHIVE_POOL_TMP">
<bm:fields>
<bm:field name="session_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="SESSION_ID" prompt="HLS_CCB_MANUAL_DOC_TMP.SESSION_ID"/>
<bm:field name="document_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DOCUMENT_ID" prompt="HLS_CCB_MANUAL_DOC_TMP.DOCUMENT_ID"/>
</bm:fields>
<bm:features>
<f:standard-who/>
</bm:features>
<bm:operations>
<bm:operation name="insert">
<bm:update-sql><![CDATA[
BEGIN
INSERT
INTO
hls_archive_pool_tmp
(
session_id,
document_id
)
VALUES
(
${/session/@session_id},
${@document_id},
);
COMMIT;
END;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="delete">
<bm:update-sql><![CDATA[
BEGIN
--update by 5390 采用session分批的方式,这里删session需要取整
delete hls_archive_pool_tmp where floor(session_id) = ${/session/@session_id};
commit;
END;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
BEGIN
efile_pool_job_pkg.job_efile_pool_submit(
${/session/@session_id},
${/session/@user_id},
${/session/@company_id});
END;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
...@@ -19,37 +19,36 @@ ...@@ -19,37 +19,36 @@
t1.document_info, t1.document_info,
t1.post_status, t1.post_status,
t1.e_archives_id, t1.e_archives_id,
(SELECT DISTINCT zwi.workflow_id (SELECT hl.workflow_id FROM hl_e_archives_post_list hl
FROM zj_wfl_workflow_instance zwi, WHERE hl.e_archives_id = t1.e_archives_id) workflow_id,
zj_wfl_workflow zww
WHERE zww.workflow_id = zwi.workflow_id
AND zwi.instance_id = t1.document_id) workflow_id,
(SELECT e.je_check_flag (SELECT e.je_check_flag
FROM e_archives_define e FROM e_archives_define e
WHERE e.base_archive_code = t1.base_archive_code WHERE e.base_archive_code = t1.base_archive_code
AND e.workflow_id = (SELECT DISTINCT zwi.workflow_id AND nvl(e.workflow_id,'-1') = nvl((SELECT hl.workflow_id
FROM zj_wfl_workflow_instance zwi, FROM hl_e_archives_post_list hl
zj_wfl_workflow zww WHERE hl.e_archives_id = t1.e_archives_id),'-1')
WHERE zww.workflow_id = zwi.workflow_id and nvl(e.func_type,'-1')=nvl((select hl.func_type from hl_e_archives_post_list hl where hl.e_archives_id=t1.e_archives_id),'-1')) je_check_flag,
AND zwi.instance_id = t1.document_id)) je_check_flag, (SELECT e.post_stru_data_flag
FROM e_archives_define e
WHERE e.base_archive_code = t1.base_archive_code
AND nvl(e.workflow_id,'-1') = nvl((SELECT hl.workflow_id
FROM hl_e_archives_post_list hl
WHERE hl.e_archives_id = t1.e_archives_id),'-1')
and nvl(e.func_type,'-1')=nvl((select hl.func_type from hl_e_archives_post_list hl where hl.e_archives_id=t1.e_archives_id),'-1')) post_stru_data_flag,
(SELECT e.post_atm_flag
FROM e_archives_define e
WHERE e.base_archive_code = t1.base_archive_code
AND nvl(e.workflow_id,'-1') = nvl((SELECT hl.workflow_id
FROM hl_e_archives_post_list hl
WHERE hl.e_archives_id = t1.e_archives_id),'-1')
and nvl(e.func_type,'-1')=nvl((select hl.func_type from hl_e_archives_post_list hl where hl.e_archives_id=t1.e_archives_id),'-1')) post_atm_flag,
(SELECT e.base_archive_id (SELECT e.base_archive_id
FROM e_archives_define e FROM e_archives_define e
WHERE e.base_archive_code = t1.base_archive_code WHERE e.base_archive_code = t1.base_archive_code
AND e.workflow_id = (SELECT DISTINCT zwi.workflow_id AND nvl(e.workflow_id,'-1') = nvl((SELECT hl.workflow_id
FROM zj_wfl_workflow_instance zwi, FROM hl_e_archives_post_list hl
zj_wfl_workflow zww WHERE hl.e_archives_id = t1.e_archives_id),'-1')
WHERE zww.workflow_id = zwi.workflow_id and nvl(e.func_type,'-1')=nvl((select hl.func_type from hl_e_archives_post_list hl where hl.e_archives_id=t1.e_archives_id),'-1')) base_archive_id,
AND zwi.instance_id = t1.document_id)) base_archive_id,
nvl((SELECT gps.monthly_closed_flag
FROM gld_periods gp,
gld_period_status gps
WHERE REPLACE(gp.period_name,
'-',
'') = t1.internal_period_num
AND gps.company_id = ${ / session / @company_id}
AND gp.internal_period_num = gps.internal_period_num
AND gps.period_set_code = gp.period_set_code),
'N') monthly_closed_flag,
(SELECT c.code_value_name (SELECT c.code_value_name
FROM sys_code_values_v c FROM sys_code_values_v c
WHERE c.code = 'DATA_CLASSIFICATION' WHERE c.code = 'DATA_CLASSIFICATION'
...@@ -58,10 +57,11 @@ ...@@ -58,10 +57,11 @@
FROM sys_code_values_v c FROM sys_code_values_v c
WHERE c.code = 'YES_NO' WHERE c.code = 'YES_NO'
AND c.code_value = 'Y') suppl_trans_flag, AND c.code_value = 'Y') suppl_trans_flag,
t1.hly_req_number AS post_batch_num, t1.hly_req_number ,
t1.post_message t1.post_message
FROM hl_e_archives_pool t1 FROM hl_e_archives_pool t1
where t1.creation_date>=sysdate-30) where t1.internal_period_num = to_char(ADD_MONTHS(sysdate, -1), 'yyyymm')
AND t1.post_status <>'POST_SUCCESS')
#WHERE_CLAUSE# #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
...@@ -72,7 +72,6 @@ ...@@ -72,7 +72,6 @@
<bm:field name="workflow_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="WORKFLOW_ID" /> <bm:field name="workflow_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="WORKFLOW_ID" />
<bm:field name="je_check_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="JE_CHECK_FLAG"/> <bm:field name="je_check_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="JE_CHECK_FLAG"/>
<bm:field name="base_archive_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BASE_ARCHIVE_ID" /> <bm:field name="base_archive_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BASE_ARCHIVE_ID" />
<bm:field name="monthly_closed_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="MONTHLY_CLOSED_FLAG"/>
<bm:field name="pool_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="POOL_ID" /> <bm:field name="pool_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="POOL_ID" />
<bm:field name="primary_field" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PRIMARY_ID" /> <bm:field name="primary_field" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PRIMARY_ID" />
<bm:field name="internal_period_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INTERNAL_PERIOD_NUM"/> <bm:field name="internal_period_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INTERNAL_PERIOD_NUM"/>
......
...@@ -19,6 +19,10 @@ ...@@ -19,6 +19,10 @@
t1.document_info, t1.document_info,
t1.post_status, t1.post_status,
t1.e_archives_id, t1.e_archives_id,
(SELECT c.code_value_name
FROM sys_code_values_v c
WHERE c.code = 'POST_STATUS_DESC'
AND c.code_value = t1.post_status) post_status_desc,
(SELECT DISTINCT zwi.workflow_id (SELECT DISTINCT zwi.workflow_id
FROM zj_wfl_workflow_instance zwi, FROM zj_wfl_workflow_instance zwi,
zj_wfl_workflow zww zj_wfl_workflow zww
...@@ -40,16 +44,15 @@ ...@@ -40,16 +44,15 @@
zj_wfl_workflow zww zj_wfl_workflow zww
WHERE zww.workflow_id = zwi.workflow_id WHERE zww.workflow_id = zwi.workflow_id
AND zwi.instance_id = t1.document_id)) base_archive_id, AND zwi.instance_id = t1.document_id)) base_archive_id,
nvl((SELECT gps.monthly_closed_flag nvl( (select 1
FROM gld_periods gp, from gld_period_status s, gld_periods p
gld_period_status gps where s.monthly_closed_flag = 'Y'
WHERE REPLACE(gp.period_name, and s.company_id = ${/session/@company_id}
'-', and s.period_set_code = p.period_set_code
'') = t1.internal_period_num and s.period_name = p.period_name
AND gps.company_id = ${ / session / @company_id} and p.adjustment_flag = 'N'
AND gp.internal_period_num = gps.internal_period_num and trunc(to_date(t1.internal_period_num,'YYYY-MM')) between
AND gps.period_set_code = gp.period_set_code), p.start_date and p.end_date),0) monthly_closed_flag,
'N') monthly_closed_flag,
(SELECT c.code_value_name (SELECT c.code_value_name
FROM sys_code_values_v c FROM sys_code_values_v c
WHERE c.code = 'DATA_CLASSIFICATION' WHERE c.code = 'DATA_CLASSIFICATION'
...@@ -58,7 +61,7 @@ ...@@ -58,7 +61,7 @@
FROM sys_code_values_v c FROM sys_code_values_v c
WHERE c.code = 'YES_NO' WHERE c.code = 'YES_NO'
AND c.code_value = nvl(t1.suppl_trans_flag,'N')) suppl_trans_flag_desc, AND c.code_value = nvl(t1.suppl_trans_flag,'N')) suppl_trans_flag_desc,
t1.hly_req_number AS post_batch_num, t1.hly_req_number,
t1.suppl_trans_flag, t1.suppl_trans_flag,
t1.post_message t1.post_message
FROM hl_e_archives_pool t1 FROM hl_e_archives_pool t1
...@@ -117,12 +120,14 @@ ...@@ -117,12 +120,14 @@
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
<bm:query-fields> <bm:query-fields>
<bm:query-field name="internal_period_num" queryExpression="t1.internal_period_num =${@internal_period_num}"/> <bm:query-field name="internal_period_num_from" queryExpression="to_number(t1.internal_period_num) &gt;= to_number(${@internal_period_num_from})"/>
<bm:query-field name="archive_type_desc" queryExpression="t1.archive_type_desc =${@archive_type_desc}"/> <bm:query-field name="internal_period_num_to" queryExpression="to_number(t1.internal_period_num) &lt;= to_number(${@internal_period_num_to})"/>
<bm:query-field name="archive_type" queryExpression="t1.archive_type =${@archive_type}"/>
<bm:query-field name="primary_field" queryExpression="t1.primary_field =${@primary_field}"/> <bm:query-field name="primary_field" queryExpression="t1.primary_field =${@primary_field}"/>
<bm:query-field name="original_archive_no" queryExpression="t1.original_archive_no =${@original_archive_no}"/> <bm:query-field name="original_archive_no" queryExpression="t1.original_archive_no =${@original_archive_no}"/>
<bm:query-field name="post_status" queryExpression="t1.post_status =${@post_status}"/> <bm:query-field name="post_status" queryExpression="t1.post_status =${@post_status}"/>
<bm:query-field name="post_batch_num" queryExpression="t1.post_batch_num =${@post_batch_num}"/> <bm:query-field name="hly_req_number" queryExpression="t1.hly_req_number =${@hly_req_number}"/>
<bm:query-field name="suppl_trans_flag" queryExpression="t1.suppl_trans_flag =${@suppl_trans_flag}"/> <bm:query-field name="suppl_trans_flag" queryExpression="t1.suppl_trans_flag =${@suppl_trans_flag}"/>
<bm:query-field name="document_info" queryExpression="t1.document_info like ${@document_info}"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: luochenglong
$Date: 2023-02-10 下午3:03:31
$Revision: 1.0
$Purpose:电子档案池bm
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT *
FROM (SELECT t1.pool_id,
t1.primary_field,
t1.internal_period_num,
t1.base_archive_code,
t1.archive_type,
t1.document_id,
t1.document_number,
t1.document_info,
t1.post_status,
t1.e_archives_id,
(SELECT zwi.workflow_id FROM zj_wfl_workflow_instance zwi WHERE zwi.instance_id = t1.document_id) workflow_id,
(SELECT e.je_check_flag
FROM e_archives_define e
WHERE e.base_archive_code = t1.base_archive_code
AND nvl(e.workflow_id,
'-1') = nvl((SELECT zwi.workflow_id
FROM zj_wfl_workflow_instance zwi
WHERE zwi.instance_id = t1.document_id),
'-1')) je_check_flag,
(SELECT e.post_stru_data_flag
FROM e_archives_define e
WHERE e.base_archive_code = t1.base_archive_code
AND nvl(e.workflow_id,
'-1') = nvl((SELECT zwi.workflow_id
FROM zj_wfl_workflow_instance zwi
WHERE zwi.instance_id = t1.document_id),
'-1')) post_stru_data_flag,
(SELECT e.post_atm_flag
FROM e_archives_define e
WHERE e.base_archive_code = t1.base_archive_code
AND nvl(e.workflow_id,
'-1') = nvl((SELECT zwi.workflow_id
FROM zj_wfl_workflow_instance zwi
WHERE zwi.instance_id = t1.document_id),
'-1')) post_atm_flag,
(SELECT e.base_archive_id
FROM e_archives_define e
WHERE e.base_archive_code = t1.base_archive_code
AND nvl(e.workflow_id,
'-1') = nvl((SELECT zwi.workflow_id
FROM zj_wfl_workflow_instance zwi
WHERE zwi.instance_id = t1.document_id),
'-1')) base_archive_id,
(SELECT c.code_value_name
FROM sys_code_values_v c
WHERE c.code = 'DATA_CLASSIFICATION'
AND c.code_value = t1.archive_type) archive_type_desc,
(SELECT c.code_value_name
FROM sys_code_values_v c
WHERE c.code = 'YES_NO'
AND c.code_value = 'Y') suppl_trans_flag,
t1.hly_req_number ,
t1.post_message
FROM hl_e_archives_pool t1
WHERE to_char(SYSDATE,
'yyyymm') - t1.internal_period_num = 1
AND t1.post_status <>'POST_SUCCESS'
AND t1.pool_id IN
(SELECT tmp.document_id FROM hls_archive_pool_tmp tmp WHERE tmp.session_id = ${@session_id}))
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="e_archives_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="E_ARCHIVES_ID" />
<bm:field name="workflow_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="WORKFLOW_ID" />
<bm:field name="je_check_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="JE_CHECK_FLAG"/>
<bm:field name="base_archive_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BASE_ARCHIVE_ID" />
<bm:field name="monthly_closed_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="MONTHLY_CLOSED_FLAG"/>
<bm:field name="pool_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="POOL_ID" />
<bm:field name="primary_field" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PRIMARY_ID" />
<bm:field name="internal_period_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INTERNAL_PERIOD_NUM"/>
<bm:field name="base_archive_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BASE_ARCHIVE_CODE" />
<bm:field name="archive_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ARCHIVE_TYPE"/>
<bm:field name="document_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DOCUMENT_ID"/>
<bm:field name="document_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DOCUMENT_NUMBER"/>
<bm:field name="post_status" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DOCUMENT_NUMBER"/>
<bm:field name="document_info" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="POST_STATUS"/>
<bm:field name="post_message" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="POST_MESSAGE"/>
</bm:fields>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:f="leaf.database.features" xmlns:bm="http://www.leaf-framework.org/schema/bm" >
<bm:operations>
<bm:operation name="query">
<bm:update-sql><![CDATA[
select fnd_code_rule_pkg.get_rule_next_auto_num(p_document_category => 'CONFIG_REPORT',
p_document_type => 'EFILE_IMPORT',
p_company_id => 1,
p_operation_unit_id => null,
p_operation_date => sysdate,
p_created_by => 1) batch_id from dual
]]></bm:update-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="batch_id"/>
</bm:fields>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:e="leaf.service.exception" xmlns:o="leaf.database.local.oracle" xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="HLS_AGENT_DIVISION">
<bm:fields>
<bm:field name="agent_division_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="AGENT_DIVISION_ID" prompt="HLS_AGENT_DIVISION.AGENT_DIVISION_ID"/>
<bm:field name="division_detail_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DIVISION_DETAIL_ID" prompt="HLS_AGENT_DIVISION.DIVISION_DETAIL_ID"/>
<bm:field name="division_detail_code" forInsert="false" forUpdate="false" prompt="产品线细分编码"/>
<bm:field name="agent_bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="AGENT_BP_ID" prompt="HLS_AGENT_DIVISION.AGENT_BP_ID"/>
<bm:field name="agent_bp_code" databaseType="VARCHAR" datatype="java.lang.String" physicalName="AGENT_BP_CODE" prompt="HLS_AGENT_DIVISION.AGENT_BP_CODE"/>
<bm:field name="agent_bp_name" databaseType="VARCHAR" datatype="java.lang.String" physicalName="AGENT_BP_NAME" prompt="HLS_AGENT_DIVISION.AGENT_BP_NAME"/>
<bm:field name="enable_flag" databaseType="VARCHAR" datatype="java.lang.String" physicalName="ENABLE_FLAG" prompt="启用"/>
</bm:fields>
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT t1.agent_division_id,
t1.division_detail_id,
(SELECT d.division_detail_code
FROM hls_division_detail d
WHERE d.division_detail_id = t1.division_detail_id) division_detail_code,
t1.agent_bp_id,
t1.agent_bp_code,
t1.agent_bp_name,
t1.enable_flag,
t1.creation_date,
t1.created_by,
t1.last_update_date,
t1.last_updated_by
FROM HLS_AGENT_DIVISION t1 #WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
<bm:operation name="insert">
<bm:parameters>
<bm:parameter name="agent_division_id" input="false" output="true" outputPath="@agent_division_id"/>
</bm:parameters>
<bm:update-sql><![CDATA[
begin
HLS103_SAVE_PKG.hls_agent_division_manage(p_sql_type => 'INSERT',
p_agent_division_id => ${@agent_division_id},
p_division_detail_id => ${@division_detail_id},
p_agent_bp_id => ${@agent_bp_id},
p_agent_bp_code => ${@agent_bp_code},
p_agent_bp_name => ${@agent_bp_name},
p_enable_flag => ${@enable_flag},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
HLS103_SAVE_PKG.hls_agent_division_manage(p_sql_type => 'UPDATE',
p_agent_division_id => ${@agent_division_id},
p_division_detail_id => ${@division_detail_id},
p_agent_bp_id => ${@agent_bp_id},
p_agent_bp_code => ${@agent_bp_code},
p_agent_bp_name => ${@agent_bp_name},
p_enable_flag => ${@enable_flag},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="delete">
<bm:update-sql><![CDATA[
begin
HLS103_SAVE_PKG.hls_agent_division_manage(p_sql_type => 'DELETE',
p_agent_division_id => ${@agent_division_id},
p_division_detail_id => ${@division_detail_id},
p_agent_bp_id => ${@agent_bp_id},
p_agent_bp_code => ${@agent_bp_code},
p_agent_bp_name => ${@agent_bp_name},
p_enable_flag => ${@enable_flag},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
<bm:data-filters>
<bm:data-filter enforceOperations="query" expression="t1.division_detail_id=${@division_detail_id}"/>
</bm:data-filters>
<bm:features>
<f:standard-who/>
<!--<o:sequence-pk sequenceName="HLS_AGENT_DIVISION_S"/>-->
<o:sequence-pk/>
</bm:features>
<bm:primary-key>
<bm:pk-field name="agent_division_id"/>
</bm:primary-key>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:e="leaf.service.exception" xmlns:o="leaf.database.local.oracle" xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="HLS_DIVISION_DETAIL">
<bm:fields>
<bm:field name="division_detail_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="DIVISION_DETAIL_ID" prompt="HLS_DIVISION_DETAIL.DIVISION_DETAIL_ID"/>
<bm:field name="division" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DIVISION" prompt="产品线"/>
<bm:field name="description" databaseType="VARCHAR2" datatype="java.lang.String" expression="(select hls.description from hls_division hls where hls.division= t1.division)" prompt="产品线" forInsert="false" forUpdate="false"/>
<bm:field name="division_detail_code" databaseType="VARCHAR" datatype="java.lang.String" physicalName="DIVISION_DETAIL_CODE" prompt="产品线细分编码"/>
<bm:field name="division_detail_name" databaseType="VARCHAR" datatype="java.lang.String" physicalName="DIVISION_DETAIL_NAME" prompt="产品线细分名称"/>
<bm:field name="enable_flag" databaseType="VARCHAR" datatype="java.lang.String" physicalName="ENABLE_FLAG" prompt="启用"/>
</bm:fields>
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select t1.division_detail_id,
t1.division,
(select hd.description
from hls_division hd
where hd.division = t1.division) description,
t1.division_detail_code,
t1.division_detail_name,
t1.enable_flag
from hls_division_detail t1
#WHERE_CLAUSE#
order by t1.division_detail_id
]]></bm:query-sql>
</bm:operation>
<bm:operation name="insert">
<bm:parameters>
<bm:parameter name="division_detail_id" input="false" output="true" outputPath="@division_detail_id"/>
</bm:parameters>
<bm:update-sql><![CDATA[
begin
HLS103_SAVE_PKG.hls_division_detail_manage(p_sql_type => 'INSERT',
p_division_detail_id => ${@division_detail_id},
p_division => ${@division},
p_division_detail_code => ${@division_detail_code},
p_division_detail_name => ${@division_detail_name},
p_enable_flag => ${@enable_flag},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
HLS103_SAVE_PKG.hls_division_detail_manage(p_sql_type => 'UPDATE',
p_division_detail_id => ${@division_detail_id},
p_division => ${@division},
p_division_detail_code => ${@division_detail_code},
p_division_detail_name => ${@division_detail_name},
p_enable_flag => ${@enable_flag},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="delete">
<bm:update-sql><![CDATA[
begin
HLS103_SAVE_PKG.hls_division_detail_manage(p_sql_type => 'DELETE',
p_division_detail_id => ${@division_detail_id},
p_division => ${@division},
p_division_detail_code => ${@division_detail_code},
p_division_detail_name => ${@division_detail_name},
p_enable_flag => ${@enable_flag},
p_user_id => ${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
<bm:features>
<f:standard-who/>
<!--<o:sequence-pk sequenceName="HLS_DIVISION_DETAIL_S"/>-->
<o:sequence-pk/>
</bm:features>
<bm:primary-key>
<bm:pk-field name="division_detail_id"/>
</bm:primary-key>
</bm:model>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<bm:field name="reversed_19_flag"/> <bm:field name="reversed_19_flag"/>
<bm:field name="immediately_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="IMMEDIATELY_FLAG" prompt="HLS_JOURNAL_HEADER_V.IMMEDIATELY_FLAG"/> <bm:field name="immediately_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="IMMEDIATELY_FLAG" prompt="HLS_JOURNAL_HEADER_V.IMMEDIATELY_FLAG"/>
<bm:field name="immediately_flag_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="IMMEDIATELY_FLAG_DESC" prompt="HLS_JOURNAL_HEADER_V.IMMEDIATELY_FLAG_DESC"/> <bm:field name="immediately_flag_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="IMMEDIATELY_FLAG_DESC" prompt="HLS_JOURNAL_HEADER_V.IMMEDIATELY_FLAG_DESC"/>
<bm:field name="division" expression="(select hj.division from hls_payment_je_v hj where hj.journal_header_id = t1.journal_header_id)"/>
</bm:fields> </bm:fields>
<bm:features> <bm:features>
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
p_header_id => ${@header_id}, p_header_id => ${@header_id},
p_company_id => ${/session/@company_id}, p_company_id => ${/session/@company_id},
p_count =>${@v_count}, p_count =>${@v_count},
p_final_count =>${@v_final_count},
p_template_type=>${@template_type} p_template_type=>${@template_type}
); );
END; END;
...@@ -17,6 +18,7 @@ ...@@ -17,6 +18,7 @@
<bm:parameter inputPath="/session/@user_id"/> <bm:parameter inputPath="/session/@user_id"/>
<bm:parameter inputPath="/session/@session_id"/> <bm:parameter inputPath="/session/@session_id"/>
<bm:parameter inputPath="/session/@template_type"/> <bm:parameter inputPath="/session/@template_type"/>
<bm:parameter name="v_final_count" dataType="java.lang.Long" input="false" output="true" outputPath="@v_final_count"/>
<bm:parameter name="v_count" dataType="java.lang.Long" input="false" output="true" outputPath="@v_count"/> <bm:parameter name="v_count" dataType="java.lang.Long" input="false" output="true" outputPath="@v_count"/>
</bm:parameters> </bm:parameters>
......
...@@ -7,7 +7,17 @@ ...@@ -7,7 +7,17 @@
from (select u.user_id id from (select u.user_id id
from sys_user u from sys_user u
where u.user_id = ${/session/@user_id} where u.user_id = ${/session/@user_id}
and u.user_name in ('XUEJINGYAN','WUYING','KATO')) and (u.user_name in ('XUEJINGYAN','WUYING','LIUMENGCHEN') or exists
(select 1
from exp_employees e, exp_employee_assigns_v ea
where e.employee_id = ea.employee_id
and e.enabled_flag = 'Y'
and ea.position_enabled = 'Y'
and ea.position_code = '002'
and ea.enabled_flag = 'Y'
and e.employee_id = u.employee_id))
)
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
......
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="true">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select decode(t.division, 70, nvl(t.division_detail, '01'), '') division_detail
from hls_bp_master_agent_division t
where t.division = ${/parameter/@division}
and t.bp_id = ${/parameter/@invoice_agent_id}
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
...@@ -37,13 +37,15 @@ ...@@ -37,13 +37,15 @@
where cb.bp_id = hm.bp_id where cb.bp_id = hm.bp_id
and cb.contract_id = cs.contract_id and cb.contract_id = cs.contract_id
and hm.social_code = cs.id_no and hm.social_code = cs.id_no
and cb.bp_class = 'ORG') legal_person, and cb.bp_class = 'ORG'
and rownum=1) legal_person,
(select hm.id_card_no_leg (select hm.id_card_no_leg
from con_contract_bp cb, hls_bp_master hm from con_contract_bp cb, hls_bp_master hm
where cb.bp_id = hm.bp_id where cb.bp_id = hm.bp_id
and cb.contract_id = cs.contract_id and cb.contract_id = cs.contract_id
and hm.social_code = cs.id_no and hm.social_code = cs.id_no
and cb.bp_class = 'ORG') id_card_no_leg and cb.bp_class = 'ORG'
and rownum=1) id_card_no_leg
from con_contract_ele_signer cs, hls_doc_file_templet_signer hs,con_contract_content cc,con_clause_templet ct from con_contract_ele_signer cs, hls_doc_file_templet_signer hs,con_contract_content cc,con_clause_templet ct
where cs.templet_signer_id = hs.templet_signer_id where cs.templet_signer_id = hs.templet_signer_id
and ct.doc_template_id = hs.templet_id and ct.doc_template_id = hs.templet_id
......
...@@ -67,7 +67,58 @@ select fa.file_name,fa.file_path,fa.attachment_id ...@@ -67,7 +67,58 @@ select fa.file_name,fa.file_path,fa.attachment_id
'CON_CONTRACT_MORTGAGE_KJ_E','CON_CONTRACT_MORTGAGE_KJ_E', 'CON_CONTRACT_MORTGAGE_KJ_E','CON_CONTRACT_MORTGAGE_KJ_E',
'LEASE_CONTRACT_PAR_KJ_E','LEASE_CONTRACT_PAR_KJ_E', 'LEASE_CONTRACT_PAR_KJ_E','LEASE_CONTRACT_PAR_KJ_E',
'LEASE_CONTRACT_PAR_KJ_1_E','LEASE_CONTRACT_PAR_KJ_1_E', 'LEASE_CONTRACT_PAR_KJ_1_E','LEASE_CONTRACT_PAR_KJ_1_E',
'CON_COLLECTION_PAYMENT_KJ_E','CON_COLLECTION_PAYMENT_KJ_E' 'CON_COLLECTION_PAYMENT_KJ_E','CON_COLLECTION_PAYMENT_KJ_E',
--博雷顿
'PERSONAL_CREDIT_BLD_E',
'CREDIT_AUTHOR',
'ENTERPRISE_CREDIT_BLD_E',
'CREDIT_AUTHOR',
'PERSONAL_CREDIT_GUTA_BLD_E',
'CREDIT_AUTHOR',
'ENTERPRISE_CREDIT_GUTA_BLD_E',
'CREDIT_AUTHOR',
'ACCEPTANCE_BLD_E',
'GUARANTEE_LETTER_OEC',
'PAR_TENANT_BLD_E',
'SPOUSE_COMMITMENT',
'PAR_GUTA_BLD_E',
'SPOUSE_COMMITMENT',
'SURE_LEASE_GR_BLD_E',
'GUARANTEE_LETTER_OEC',
'SURE_LEASE_FR_BLD_E',
'GUARANTEE_LETTER_OEC',
'PROOF_RECEIPT_LEASE_BLD_E',
'CHECK_INFO',
'LEASE_SALE_BLD_E',
'PUR_CONTRACT',
'FINANCE_LEASE_CONTRACT_BLD_E',
'CONTRACT',
'SURE_LEASEBACK_GR_BLD_E',
'GUARANTEE_LETTER_OEC',
'SURE_LEASEBACK_FR_BLD_E',
'GUARANTEE_LETTER_OEC',
'PROOF_RECEIPT_LEASEBACK_BLD_E',
'CHECK_INFO',
'LEASE_ORDER_LEASEBACK_BLD_E',
'ITEM_TRAN_NOTICE',
'CON_CONTRACT_MORTGAGE_BLD_E',
'MORT_CONTRACT',
'CON_CONTRACT_LEASEBACK_BLD_E',
'CONTRACT',
--云南铁拳合同文本匹配关系 18083 2024/5/22
'CON_CONTRACT_LEASEBACK_YNTQ','FINANCE_LEASE_CONTRACT_TJ_E',
'CON_CONTRACT_MORTGAGE_YNTQ','CON_CONTRACT_MORTGAGE_TJ_E',
'CON_COLLECTION_PAYMENT_YNTQ','CON_COLLECTION_PAYMENT_TJ_E',
'CSH_LEASEBACK_YNTQ','CSH_PAYMENT_REQ_TJ_E',
'PAR_TENANT_YNTQ','SPOUSE_COMMITMENT',
'PAR_GUTA_YNTQ','GUARANTEE_COMMITMENT',
'SURE_LEASEBACK_GR_YNTQ','FINANCE_LEASE_CONTRACT_TJ_S_E',
'SURE_LEASEBACK_FR_YNTQ','FINANCE_LEASE_CONTRACT_FR_TJ_E',
'SURE_LEASEBACK_FR_HLJ_YNTQ','FINANCE_LEASE_CONTRACT_TJ_FR_E',
'PERSONAL_CREDIT_YNTQ','PERSONAL_CREDIT',
'ENTERPRISE_CREDIT_YNTQ','ENTERPRISE_CREDIT',
'PERSONAL_CREDIT_GUTA_YNTQ','PERSONAL_CREDIT',
'ENTERPRISE_CREDIT_GUTA_YNTQ','ENTERPRISE_CREDIT'
) )
from con_ele_signer_file cf, con_contract_ele_signer cs from con_ele_signer_file cf, con_contract_ele_signer cs
where cf.con_ele_signer_id = cs.con_ele_signer_id where cf.con_ele_signer_id = cs.con_ele_signer_id
...@@ -87,9 +138,20 @@ select fa.file_name,fa.file_path,fa.attachment_id ...@@ -87,9 +138,20 @@ select fa.file_name,fa.file_path,fa.attachment_id
and ht.templet_code = ct.templet_code and ht.templet_code = ct.templet_code
and ct.templet_id = cf.templet_id and ct.templet_id = cf.templet_id
and hs.enable_flag = 'Y' and hs.enable_flag = 'Y'
and hs.signer_category not in ('AGENCY_STORE_SEAL','AGENCY_STORE_SIGN','HONGLING_SEAL','HONGLING_SIGN'))) and hs.signer_category not in ('AGENCY_STORE_SEAL','AGENCY_STORE_SIGN','HONGLING_SEAL','HONGLING_SIGN',
'MAN_FACTURER_SEAL',
'MAN_FACTURER_SIGN',
'SUPPLIER_SEAL',
'SUPPLIER_SIGN',
'LEASE_SUPPLIER_SEAL',
'LEASE_SUPPLIER_SIGN')))
or 'AGENT' in (select cb.bp_category or 'AGENT' in (select cb.bp_category
from con_contract_bp cb, hls_bp_master hm from con_contract_bp cb, hls_bp_master hm
where cb.bp_id = hm.bp_id
and hm.social_code = ${@id_no}
and cb.contract_id = cs.contract_id)
or 'VENDER' in (select cb.bp_category
from con_contract_bp cb, hls_bp_master hm
where cb.bp_id = hm.bp_id where cb.bp_id = hm.bp_id
and hm.social_code = ${@id_no} and hm.social_code = ${@id_no}
and cb.contract_id = cs.contract_id))) and cb.contract_id = cs.contract_id)))
......
...@@ -47,9 +47,21 @@ select fa.file_name, fa.file_path, fa.file_size, ct.order_seq ...@@ -47,9 +47,21 @@ select fa.file_name, fa.file_path, fa.file_size, ct.order_seq
('AGENCY_STORE_SEAL', ('AGENCY_STORE_SEAL',
'AGENCY_STORE_SIGN', 'AGENCY_STORE_SIGN',
'HONGLING_SEAL', 'HONGLING_SEAL',
'HONGLING_SIGN'))) or 'HONGLING_SIGN',
'MAN_FACTURER_SEAL',
'MAN_FACTURER_SIGN',
'SUPPLIER_SEAL',
'SUPPLIER_SIGN',
'LEASE_SUPPLIER_SEAL',
'LEASE_SUPPLIER_SIGN'))) or
'AGENT' in (select cb.bp_category 'AGENT' in (select cb.bp_category
from con_contract_bp cb, hls_bp_master hm from con_contract_bp cb, hls_bp_master hm
where cb.bp_id = hm.bp_id
and hm.social_code = ${@id_no}
and cb.contract_id = cc.contract_id)
or
'VENDER' in (select cb.bp_category
from con_contract_bp cb, hls_bp_master hm
where cb.bp_id = hm.bp_id where cb.bp_id = hm.bp_id
and hm.social_code = ${@id_no} and hm.social_code = ${@id_no}
and cb.contract_id = cc.contract_id))) and cb.contract_id = cc.contract_id)))
......
importClass(Packages.com.hand.attDownload.attDownload);
importPackage(Packages.java.io); importPackage(Packages.java.io);
importPackage(Packages.java.util); importPackage(Packages.java.util);
//importClass(Packages.leaf.plugin.util.Base64); //importClass(Packages.leaf.plugin.util.Base64);
function attDownloadUtil(response,filePath,fileName) { function attDownloadUtil(response,filePath,fileName) {
try { try {
var result = new attDownload().downloadUitl(response,filePath,fileName); var dl=new com.hand.attDownload.attDownload();
var result = dl.downloadUitl(response,filePath,fileName);
return result; return result;
} catch (e) { } catch (e) {
println(e); println(e);
return false; return false;
} }
}attDownload }
\ No newline at end of file \ No newline at end of file
...@@ -14,7 +14,7 @@ var override_queryfields = [ ...@@ -14,7 +14,7 @@ var override_queryfields = [
}, },
{ {
name : 'req_date_to', name : 'req_date_to',
queryexpression : "trunc(T1.req_date)<=to_date(${@req_date_to},'yyyy-mm-dd')" queryexpression : "T1.req_date<to_date(${@req_date_to},'yyyy-mm-dd')+1"
}, },
{ {
name:'payment_req_number', name:'payment_req_number',
...@@ -29,10 +29,8 @@ var add_datafilters = [ ...@@ -29,10 +29,8 @@ var add_datafilters = [
{ {
name : '', name : '',
expression : "exists(select 1\n" + expression : "exists(select 1\n" +
" from csh_payment_req_ln l,con_contract cc,con_contract_cashflow cf\n" + " from csh_payment_req_ln l,con_contract_cashflow cf\n" +
" where l.payment_req_id = t1.payment_req_id\n" + " where l.payment_req_id = t1.payment_req_id\n" +
" and l.ref_doc_category = 'CONTRACT'\n" +
" and l.ref_doc_id = cc.contract_id\n" +
" and l.ref_doc_line_id = cf.cashflow_id\n" + " and l.ref_doc_line_id = cf.cashflow_id\n" +
" and cf.cf_item in ('40'))" " and cf.cf_item in ('40'))"
......
...@@ -6,7 +6,7 @@ var override_queryfields = [ ...@@ -6,7 +6,7 @@ var override_queryfields = [
}, },
{ {
name : 'req_date_to', name : 'req_date_to',
queryexpression : "trunc(T1.req_date)<=to_date(${@req_date_to},'yyyy-mm-dd')" queryexpression : "T1.req_date<to_date(${@req_date_to},'yyyy-mm-dd')+1"
}, },
{ {
name:'payment_req_number', name:'payment_req_number',
...@@ -18,13 +18,16 @@ var override_queryfields = [ ...@@ -18,13 +18,16 @@ var override_queryfields = [
} }
]; ];
var add_datafilters = [ var add_datafilters = [
{
name : 'approval_status',
expression : "(t1.approval_status NOT in ('RETURN','CANCEL'))"
},
{ {
name : '', name : '',
expression : "exists(select 1\n" + expression : "exists(select 1\n" +
" from csh_payment_req_ln l,con_contract cc,con_contract_cashflow cf\n" + " from csh_payment_req_ln l,con_contract_cashflow cf\n" +
" where l.payment_req_id = t1.payment_req_id\n" + " where l.payment_req_id = t1.payment_req_id\n" +
" and l.ref_doc_category = 'CONTRACT'\n" +
" and l.ref_doc_id = cc.contract_id\n" +
" and l.ref_doc_line_id = cf.cashflow_id\n" + " and l.ref_doc_line_id = cf.cashflow_id\n" +
" and cf.cf_item in ('911'))" " and cf.cf_item in ('911'))"
......
var add_datafilters = [ var add_datafilters = [
{
name: '',
expression: "((t1.credit_status in ('REJECT','APPROVING_OP','APPROVED') and ${/session/@user_id}=11319) or (t1.credit_status in ('REJECT','APPROVING_OP','APPROVED','APPROVING') and ${/session/@user_id}!=11319))"
},
{ {
name : "unit_code", name : "unit_code",
expression: "(t1.unit_code != '1011' or t1.unit_code is null)" expression: "(t1.unit_code != '1011' or t1.unit_code is null)"
......
var add_datafilters = [ var add_datafilters = [
{
name: '',
expression: "((t1.credit_status in ('REJECT','APPROVING_OP','APPROVED') and ${/session/@user_id}=11319) or (t1.credit_status in ('REJECT','APPROVING_OP','APPROVED','APPROVING') and ${/session/@user_id}!=11319))"
},
{ {
name : "unit_code", name : "unit_code",
expression: "t1.unit_code = '1011'" expression: "t1.unit_code = '1011'"
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<a:field name="authorized_user_desc" prompt="HLS.DESCRIPTION"/> <a:field name="authorized_user_desc" prompt="HLS.DESCRIPTION"/>
<a:field name="session_id"/> <a:field name="session_id"/>
<a:field name="user_id"/> <a:field name="user_id"/>
<a:field name="user_name" lovGridHeight="300" lovHeight="450" lovService="basic.sys_user_for_lov" lovWidth="500" prompt="HLS.USER_NAME" required="true" title="AUT106.CHOOSE_USER"> <a:field name="user_name" lovGridHeight="300" lovHeight="450" lovService="basic.sys_user_for_lov_aut106" lovWidth="500" prompt="HLS.USER_NAME" required="true" title="AUT106.CHOOSE_USER">
<a:mapping> <a:mapping>
<a:map from="user_name" to="user_name"/> <a:map from="user_name" to="user_name"/>
<a:map from="description" to="authorized_user_desc"/> <a:map from="description" to="authorized_user_desc"/>
......
...@@ -81,6 +81,12 @@ ...@@ -81,6 +81,12 @@
<a:map from="description" to="division_n"/> <a:map from="description" to="division_n"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="division_detail_n" lovGridHeight="300" lovHeight="480" lovService="basic.hls_division_detail_for_lov" lovWidth="500">
<a:mapping>
<a:map from="division_detail_name" to="division_detail_n"/>
<a:map from="division_detail_code" to="division_detail"/>
</a:mapping>
</a:field>
<a:field name="lease_channel_n" lovGridHeight="260" lovHeight="480" lovService="basic.hls_lease_channel_for_lov" lovWidth="500"> <a:field name="lease_channel_n" lovGridHeight="260" lovHeight="480" lovService="basic.hls_lease_channel_for_lov" lovWidth="500">
<a:mapping> <a:mapping>
<a:map from="lease_channel" to="lease_channel"/> <a:map from="lease_channel" to="lease_channel"/>
...@@ -140,6 +146,7 @@ ...@@ -140,6 +146,7 @@
<a:column name="document_type_n" editor="lov" prompt="单据类型" width="80"/> <a:column name="document_type_n" editor="lov" prompt="单据类型" width="80"/>
<a:column name="finance_type_n" editor="cb" prompt="融资业务类型" width="80"/> <a:column name="finance_type_n" editor="cb" prompt="融资业务类型" width="80"/>
<a:column name="division_n" editor="lov" prompt="产品线" width="100"/> <a:column name="division_n" editor="lov" prompt="产品线" width="100"/>
<a:column name="division_detail_n" editor="lov" prompt="产品线细分" width="100"/>
<a:column name="lease_channel_n" editor="lov" prompt="商业模式" width="100"/> <a:column name="lease_channel_n" editor="lov" prompt="商业模式" width="100"/>
<a:column name="lease_organization_n" editor="lov" prompt="事业部" width="100"/> <a:column name="lease_organization_n" editor="lov" prompt="事业部" width="100"/>
<a:column name="district_n" editor="cb" prompt="区域" width="120"/> <a:column name="district_n" editor="cb" prompt="区域" width="120"/>
......
...@@ -202,6 +202,7 @@ ...@@ -202,6 +202,7 @@
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var records = $(ds_id).getSelected(); var records = $(ds_id).getSelected();
var division=records[0].data.division; var division=records[0].data.division;
var division_detail = records[0].data.division_detail;
if(division == '95'){ if(division == '95'){
Leaf.showErrorMessage('提示','经营性租赁暂不支持线上生成合同文本!'); Leaf.showErrorMessage('提示','经营性租赁暂不支持线上生成合同文本!');
return; return;
...@@ -210,6 +211,12 @@ ...@@ -210,6 +211,12 @@
Leaf.showMessage('${l:PROMPT}','${l:HLS.SELECT_RECORD}'); Leaf.showMessage('${l:PROMPT}','${l:HLS.SELECT_RECORD}');
return; return;
} }
if(division == '70'){
if(division_detail=='03'){
Leaf.showErrorMessage('提示','当前合同不支持打印纸质合同文本!');
return;
}
}
var record=records[0]; var record=records[0];
new Leaf.Window({ new Leaf.Window({
id: 'con_contract_update_print_detail_winid', id: 'con_contract_update_print_detail_winid',
......
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
<a:link id="prj2000_pur_order_deteail_link_id" url="${/request/@context_path}/modules/prj/PRJ2000/purchase_order_deteail.lview"></a:link> <a:link id="prj2000_pur_order_deteail_link_id" url="${/request/@context_path}/modules/prj/PRJ2000/purchase_order_deteail.lview"></a:link>
<script src="${/request/@context_path}/modules/viewerjs/viewer.js"/> <script src="${/request/@context_path}/modules/viewerjs/viewer.js"/>
<script src="${/request/@context_path}/modules/viewerjs/viewer_tool.js"/> <script src="${/request/@context_path}/modules/viewerjs/viewer_tool.js"/>
<a:link id="con_get_rsc_upload" model="cont.CON505.con505_contract_content" modelaction="query"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
function lock_current_window() { function lock_current_window() {
...@@ -89,11 +90,33 @@ ...@@ -89,11 +90,33 @@
}); });
}; };
//查看财报
window['${/parameter/@layout_code}_user_button9_layout_dynamic_click'] = function () {
var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var record = $(bp_ds_id).getAt(0)
new Leaf.Window({
id: 'rsc303_fin_statement_query',
url: $('rsc303_fin_statement_link').getUrl(),
title: '查看财报',
fullScreen: true,
params: {
bp_id: record.get('bp_id_tenant')
}
});
}
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
debugger; debugger;
if('${/parameter/@cond_para2}'=='N' || '${/parameter/@cond_para2}'==''){ if('${/parameter/@cond_para2}'=='N' || '${/parameter/@cond_para2}'==''){
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
if (ds_id == ds.id && ds_id) { if (ds_id == ds.id && ds_id) {
//自然人不展示财报按钮
if((record.get('bp_class') == 'NP' &&
document.getElementById('${/parameter/@layout_code}_user_button9')
|| record.get('contract_status') == 'INCEPT')){
document.getElementById('${/parameter/@layout_code}_user_button9').style.display = 'none';
}
// if (record.get('business_type') == 'LEASEBACK'&&'${/parameter/@function_usage}'=='MODIFY') { // if (record.get('business_type') == 'LEASEBACK'&&'${/parameter/@function_usage}'=='MODIFY') {
// record.set('submit_date',null); // record.set('submit_date',null);
// record.set('guarantee_letter_f','N'); // record.set('guarantee_letter_f','N');
...@@ -137,6 +160,17 @@ ...@@ -137,6 +160,17 @@
document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_OTHER_FEE2_prompt').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_OTHER_FEE2_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_OTHER_FEE2').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_OTHER_FEE2').style.display = 'none';
if(record.get('division_detail')=='03'){
if(document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_CUSTOMER_MARGIN')){
document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_CUSTOMER_MARGIN_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_CUSTOMER_MARGIN').style.display = 'none';
}
if(document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_WRITE_OFF_AMOUNT')){
document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_WRITE_OFF_AMOUNT_prompt').style.display = 'none';
document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_WRITE_OFF_AMOUNT').style.display = 'none';
}
}
} }
if(record.get('division')=='92'){ if(record.get('division')=='92'){
document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_CUSTOMER_MARGIN_prompt').style.display = 'none'; document.getElementById('${/parameter/@layout_code}_LEASE_FIN_INFO_1_CON_CONTRACT_CUSTOMER_MARGIN_prompt').style.display = 'none';
...@@ -643,7 +677,7 @@ ...@@ -643,7 +677,7 @@
debugger; debugger;
if ($(ds_id).validate()) { if ($(ds_id).validate()) {
if('${/model/wfl_status/record/@mar_status}' == 'Y' || Ext.isEmpty('${/model/wfl_status/record/@mar_status}')){ if('${/model/wfl_status/record/@mar_status}' == 'Y' || Ext.isEmpty('${/model/wfl_status/record/@mar_status}')){
if(record.get('division')=='70'&&record.get('write_off_amount')<record.get('customer_margin')){ if(record.get('division')=='70'&&record.get('write_off_amount')<record.get('customer_margin') &&record.get('division_detail')=='01'){
// Leaf.showMessage('${l:PROMPT}', '铁甲业务需要保证金入账后才能起租'); // Leaf.showMessage('${l:PROMPT}', '铁甲业务需要保证金入账后才能起租');
Leaf.showMessage('${l:PROMPT}', '二手机业务需要保证金入账后才能起租'); Leaf.showMessage('${l:PROMPT}', '二手机业务需要保证金入账后才能起租');
return; return;
...@@ -657,6 +691,44 @@ ...@@ -657,6 +691,44 @@
// Leaf.showMessage('${l:PROMPT}', '北京卡家业务需要保证金入账后才能起租'); // Leaf.showMessage('${l:PROMPT}', '北京卡家业务需要保证金入账后才能起租');
// return; // return;
// } // }
//为法人且不为95时,财报是否上传提示
var is_rsc_flag = '';
if (record.get('division') != '95' && record.get('bp_class') == 'ORG'){
Leaf.request({
url: $('con_get_rsc_upload').getUrl(),
para: {
contract_id: contract_id
},
scope: this,
sync: true,
success: function (res) {
is_rsc_flag = res.result.record.is_rsc_upload_flag;
}
});
}
if (is_rsc_flag == 'N'){
Leaf.showConfirm('${HLS.PROMPT}', '当前承租人未上传财报,是否提交工作流?', function () {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
url: $('con_approval_link_id').getUrl(),
para: {
contract_id: contract_id
},
scope: this,
success: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$('${/parameter/@winid}').close();
},
failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}
});
});
}else{
Leaf.showConfirm('${HLS.PROMPT}', '确认要提交工作流吗?', function () { Leaf.showConfirm('${HLS.PROMPT}', '确认要提交工作流吗?', function () {
window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({ Leaf.request({
...@@ -665,6 +737,7 @@ ...@@ -665,6 +737,7 @@
contract_id: contract_id contract_id: contract_id
}, },
scope: this, scope: this,
sync: true,
success: function () { success: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$('${/parameter/@winid}').close(); $('${/parameter/@winid}').close();
...@@ -677,6 +750,8 @@ ...@@ -677,6 +750,8 @@
} }
}); });
}); });
}
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -42,6 +42,13 @@ ...@@ -42,6 +42,13 @@
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER").style.display = "none"; document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_MACHINE_NUMBER").style.display = "none";
} }
} }
if('${/parameter/@repurchase_types}' == 'ONE_TIME_REPURCHASE'){
if(document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_LEASE_TIMES")){
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_LEASE_TIMES_prompt").style.display = "none";
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_LEASE_TIMES").style.display = "none";
}
}
}); });
]]></script> ]]></script>
......
...@@ -246,6 +246,13 @@ ...@@ -246,6 +246,13 @@
$('CON_DUE_DETAIL_G_SEAL_INFO_hls_document_use_seal_layout_grid_id').hide(); $('CON_DUE_DETAIL_G_SEAL_INFO_hls_document_use_seal_layout_grid_id').hide();
} }
} }
if('${/parameter/@repurchase_types}' == 'ONE_TIME_REPURCHASE'){
if(document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_LEASE_TIMES")){
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_LEASE_TIMES_prompt").style.display = "none";
document.getElementById("${/parameter/@layout_code}_F_BASIC_CON_CONTRACT_LEASE_TIMES").style.display = "none";
}
}
}); });
//新增催款函pdf打印(盖章) //新增催款函pdf打印(盖章)
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
function CON601_con_contract_query() { function CON601_con_contract_query() {
$('CON620_contract_result_ds').query(); $('CON620_contract_result_ds').query();
$('CON620_contract_repur_result_ds').query(); $('CON620_contract_repur_result_ds').query();
$('con620_one_time_repurchase_result_ds').query();
} }
...@@ -157,6 +158,7 @@ ...@@ -157,6 +158,7 @@
param['document_id'] = current_record.get('contract_id'); param['document_id'] = current_record.get('contract_id');
// con601_param_set_value(param); // con601_param_set_value(param);
param['document_category'] = 'CONTRACT'; param['document_category'] = 'CONTRACT';
param['repurchase_types'] = current_record.get('repurchase_types');
if (current_record.get('contract_status') == 'REPURING') { if (current_record.get('contract_status') == 'REPURING') {
param['function_code'] = 'CON620QRP'; param['function_code'] = 'CON620QRP';
} else { } else {
...@@ -195,7 +197,6 @@ ...@@ -195,7 +197,6 @@
} }
function contract_business_link(record_id, ds_id) { function contract_business_link(record_id, ds_id) {
debugger;
var current_record = $(ds_id).findById(record_id); var current_record = $(ds_id).findById(record_id);
var record = current_record; var record = current_record;
var saveData = []; var saveData = [];
...@@ -209,6 +210,7 @@ ...@@ -209,6 +210,7 @@
param['document_id'] = current_record.get('contract_id'); param['document_id'] = current_record.get('contract_id');
// con601_param_set_value(param); // con601_param_set_value(param);
param['document_category'] = 'CONTRACT'; param['document_category'] = 'CONTRACT';
param['repurchase_types'] = current_record.get('repurchase_types');
if (current_record.get('contract_status') == 'REPURING') { if (current_record.get('contract_status') == 'REPURING') {
param['function_code'] = 'CON620RP'; param['function_code'] = 'CON620RP';
} else { } else {
...@@ -379,8 +381,9 @@ ...@@ -379,8 +381,9 @@
function CON601_dun_msg_money() { function CON601_dun_msg_money() {
var records = $('CON620_contract_result_ds').getSelected(); var records = $('CON620_contract_result_ds').getSelected();
var records_repur = $('CON620_contract_repur_result_ds').getSelected(); var records_repur = $('CON620_contract_repur_result_ds').getSelected();
var records_repur_one = $('con620_one_time_repurchase_result_ds').getSelected();
if (records_repur.length > 0) { if (records_repur.length > 0||records_repur_one.length > 0) {
$L.showInfoMessage('提示', '解约回购合同不在催收短信发送范围!'); $L.showInfoMessage('提示', '解约回购合同不在催收短信发送范围!');
return; return;
} }
...@@ -462,7 +465,8 @@ ...@@ -462,7 +465,8 @@
function CON601_dun_msg_no_money() { function CON601_dun_msg_no_money() {
var records = $('CON620_contract_result_ds').getSelected(); var records = $('CON620_contract_result_ds').getSelected();
var records_repur = $('CON620_contract_repur_result_ds').getSelected(); var records_repur = $('CON620_contract_repur_result_ds').getSelected();
if (records_repur.length > 0) { var records_repur_one = $('con620_one_time_repurchase_result_ds').getSelected();
if (records_repur.length > 0||records_repur_one.length > 0) {
$L.showInfoMessage('提示', '解约回购合同不在催收短信发送范围!'); $L.showInfoMessage('提示', '解约回购合同不在催收短信发送范围!');
return; return;
} }
...@@ -621,6 +625,11 @@ ...@@ -621,6 +625,11 @@
selectable="true" selectionModel="multiple"> selectable="true" selectionModel="multiple">
</a:dataSet> </a:dataSet>
<!--<a:dataSet id="bgt_contract_payment_detail_line_ds" fetchAll="true" model="cont.CON620.bgt_contract_payment_detail_line"/>--> <!--<a:dataSet id="bgt_contract_payment_detail_line_ds" fetchAll="true" model="cont.CON620.bgt_contract_payment_detail_line"/>-->
<a:dataSet id="con620_one_time_repurchase_result_ds" autoPageSize="true" autoQuery="true"
model="cont.CON620.con_contract_dun_for_repur_one_time_query" queryDataSet="CON620_contract_query_ds"
queryUrl="${/request/@context_path}/autocrud/cont.CON620.con_contract_dun_for_repur_one_time_query/query"
selectable="true" selectionModel="multiple">
</a:dataSet>
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
<a:screenTopToolbar> <a:screenTopToolbar>
...@@ -844,6 +853,50 @@ ...@@ -844,6 +853,50 @@
</a:columns> </a:columns>
</a:grid> </a:grid>
</a:tab> </a:tab>
<a:tab prompt="一次性回购逾期租金" width="130" >
<a:grid id="CON620_contract_repur_result_one_rid_ds" bindTarget="con620_one_time_repurchase_result_ds"
marginHeight="215"
marginWidth="50" navBar="true" >
<a:columns>
<a:column name="bp_id_agent_desc" align="center" prompt="代理店" lock="true" width="100"/>
<a:column name="contract_number" lock="true" prompt="HLS.CONTRACT_NUMBER"
renderer="CON620_render_contract_dun_grid" width="100"/>
<a:column name="bp_id_tenant_desc" lock="true" prompt="承租人名称" showTitle="true"
width="100"
align="center"/>
<a:column name="min_overdue_date" align="center" prompt="预定支付日" width="100"
renderer="render_formatDate"/>
<a:column name="min_overdue_times" align="center" prompt="预定支付期数" width="100"/>
<a:column prompt="营业">
<a:column name="business_due_times" align="center" prompt="逾期期数"
width="100"/>
<a:column name="business_due_days" align="center" prompt="逾期天数"
width="100"/>
<a:column name="business_due_amount" align="right" prompt="逾期金额"
renderer="CON620_render_contract_dun_grid"
footerRenderer="summaryRenderer"
width="100"/>
<a:column name="over_due_amount" align="right" prompt="违约金"
renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"
width="100"/>
<a:column name="business_received_amount" align="right" prompt="已收租金"
renderer="CON620_render_contract_dun_grid"
footerRenderer="summaryRenderer"
width="100"/>
<a:column name="business_unreceived_amount" align="right" prompt="未收租金"
renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"
width="100"/>
</a:column>
<a:column name="business_type_n" align="center" prompt="业务类型" width="60"/>
<a:column name="division_n" align="center" prompt="租赁物" width="120"/>
<a:column name="modelcd" align="center" prompt="机型" width="100"/>
<a:column name="machine_number" align="center" prompt="机器号码" width="100"/>
<a:column name="send_message_n" align="center" prompt="发送催收短信" width="120"/>
<a:column name="dun_date" align="center" prompt="催收短信发送日期" width="120"/>
</a:columns>
</a:grid>
</a:tab>
</a:tabs> </a:tabs>
</a:tabPanel> </a:tabPanel>
</a:screenBody> </a:screenBody>
......
...@@ -50,12 +50,13 @@ ...@@ -50,12 +50,13 @@
}); });
new Ext.Template('<iframe id ="_input_window" name="_input_window" border="0" frameborder="0" height="100%" width="100%" style="border:none;padding:0px;margin:0px;"></iframe>').insertFirst(_input_window.body.dom, {}, true); new Ext.Template('<iframe id ="_input_window" name="_input_window" border="0" frameborder="0" height="100%" width="100%" style="border:none;padding:0px;margin:0px;"></iframe>').insertFirst(_input_window.body.dom, {}, true);
var form = document.getElementById('importForm'); var form = document.getElementById('importForm');
var url = '${/request/@context_path}/modules/csh/CSH1400/csh_abc_excel_import.lview?session_id=${/parameter/@session_id}&winid=${/parameter/@winid}&abc_ds=${/parameter/@abc_ds}&batch_id=${/parameter/@batch_id}&_csrf=${/session/@_csrf.token}'; var url = '${/request/@context_path}/modules/csh/CSH1400/csh_abc_excel_import.lview?session_id=${/parameter/@session_id}&winid=${/parameter/@winid}&abc_ds=${/parameter/@abc_ds}&ocr_ds=${/parameter/@ocr_ds}&batch_id=${/parameter/@batch_id}&_csrf=${/session/@_csrf.token}';
form.action = url; form.action = url;
form.submit(); form.submit();
$('${/parameter/@winid}').close(); $('${/parameter/@winid}').close();
_input_window.on('close', function() { _input_window.on('close', function() {
$('${/parameter/@abc_ds}').query(); $('${/parameter/@abc_ds}').query();
$('${/parameter/@ocr_ds}').query();
}); });
} }
]]></script> ]]></script>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
// var record = $('AbcBankDs').getSelected(); // var record = $('AbcBankDs').getSelected();
function change_background_color(record) { function change_background_color(record) {
if (record.get('re_flag') == 'Y') { if (record.get('re_flag') == 'N') {
return 'background-color:#99FF99;' return 'background-color:#99FF99;'
} }
} }
...@@ -223,6 +223,7 @@ ...@@ -223,6 +223,7 @@
params: { params: {
winid: 'agricultural_bank_import_wind', winid: 'agricultural_bank_import_wind',
abc_ds:'AbcBankDs', abc_ds:'AbcBankDs',
ocr_ds:'OcrQueryDs',
}, },
url: $('agricultural_bank_import_link').getUrl(), url: $('agricultural_bank_import_link').getUrl(),
title: '农行回单', title: '农行回单',
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
fetchAll="true" model="hls.HLS003.hls_document_type" rootPath="default_payment_document_type"/> fetchAll="true" model="hls.HLS003.hls_document_type" rootPath="default_payment_document_type"/>
<a:model-query fetchAll="true" model="csh.CSH501.get_loan_flag" rootPath="loan_flag_path"/> <a:model-query fetchAll="true" model="csh.CSH501.get_loan_flag" rootPath="loan_flag_path"/>
<a:model-query fetchAll="true" model="csh.CSH501.get_vender_bank_info" rootPath="vender_account_path"/> <a:model-query fetchAll="true" model="csh.CSH501.get_vender_bank_info" rootPath="vender_account_path"/>
<a:model-query fetchAll="true" model="csh.CSH501.get_csh_division_detail" rootPath="division_detail_path"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="csh_payment_req_word_print_link_id" <a:link id="csh_payment_req_word_print_link_id"
...@@ -77,6 +78,10 @@ ...@@ -77,6 +78,10 @@
if ('${/parameter/@source_type}' == 'WFL') { if ('${/parameter/@source_type}' == 'WFL') {
document.getElementById('${/parameter/@layout_code}_save').style.display = "none"; document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
} }
if('${/parameter/@division}' =='70' &&'${/model/division_detail_path/record/@division_detail}'=='03' ){
document.getElementById('${/parameter/@layout_code}_print').style.display = "none";
}
var lnds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln'); var lnds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd'); var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
var payment_req_id = '${/parameter/@payment_req_id}'; var payment_req_id = '${/parameter/@payment_req_id}';
...@@ -236,7 +241,7 @@ ...@@ -236,7 +241,7 @@
} }
var lnds_records = $(ds_id).getAll(); var lnds_records = $(ds_id).getAll();
if (con_business_type == 'LEASEBACK'){ if (con_business_type == 'LEASEBACK'){
if ('${/parameter/@division}' ==91||'${/parameter/@division}' =='神钢建机'||'${/parameter/@division}' ==93||'${/parameter/@division}' =='新业务-厂商担保'){ if ('${/parameter/@division}' ==91||'${/parameter/@division}' ==93){
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var records = $(ds_id).getAll(); var records = $(ds_id).getAll();
for (i = 0; i < records.length; i++) { for (i = 0; i < records.length; i++) {
...@@ -334,7 +339,7 @@ ...@@ -334,7 +339,7 @@
} }
} }
} }
if ('${/parameter/@division}' ==91||'${/parameter/@division}' =='神钢建机'||'${/parameter/@division}' ==92||'${/parameter/@division}' =='北京心诚' ){ if ('${/parameter/@division}' ==91||'${/parameter/@division}' ==92 ){
if (con_business_type == 'LEASEBACK'){ if (con_business_type == 'LEASEBACK'){
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var records = $(ds_id).getAll(); var records = $(ds_id).getAll();
...@@ -386,7 +391,7 @@ ...@@ -386,7 +391,7 @@
records[i].getField('amount_tenant').setRequired(false); records[i].getField('amount_tenant').setRequired(false);
records[i].getField('amount_tenant').setReadOnly(true); records[i].getField('amount_tenant').setReadOnly(true);
if(con_business_type == 'LEASEBACK'){ if(con_business_type == 'LEASEBACK'){
if ('${/parameter/@division}' ==91||'${/parameter/@division}' =='神钢建机'||'${/parameter/@division}' ==93||'${/parameter/@division}' =='新业务-厂商担保'){ if ('${/parameter/@division}' ==91||'${/parameter/@division}' ==93){
records[i].getField('tenant_bank_account_number').setRequired(false); records[i].getField('tenant_bank_account_number').setRequired(false);
records[i].getField('tenant_bank_account_number_n').setRequired(false); records[i].getField('tenant_bank_account_number_n').setRequired(false);
}else{ }else{
...@@ -639,14 +644,7 @@ ...@@ -639,14 +644,7 @@
} }
//end //end
} }
//新业务厂商全部支付给代理店且买断机为否,增加弱校验 18083
/*if (amount_vender == 0 && line_data.get('division') == '93' && line_data.get('is_buyout')=='N') {
$L.showConfirm('提示','是否买断机为否,请确认全部支付代理店!', function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return true;
});
$L.showInfoMessage('提示', '是否买断机为否,请确认全部支付代理店!');
}*/
//本次申请金额等于委托加我司加应付承租人金额 //本次申请金额等于委托加我司加应付承租人金额
var this_apply_amount = plus(plus(amount_agent, amount_vender),amount_tenant); var this_apply_amount = plus(plus(amount_agent, amount_vender),amount_tenant);
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<a:link id="csh_payment_comm_create_link" url="${/request/@context_path}/modules/csh/CSH501R/csh_payment_comm_selected.lview"/> <a:link id="csh_payment_comm_create_link" url="${/request/@context_path}/modules/csh/CSH501R/csh_payment_comm_selected.lview"/>
<a:link id="csh501_csh_comm_req_link_id" <a:link id="csh501_csh_comm_req_link_id"
url="${/request/@context_path}/modules/csh/CSH501R/csh_payment_comm_req.lview"/> url="${/request/@context_path}/modules/csh/CSH501R/csh_payment_comm_req.lview"/>
<a:link id="delete_comm_payment_req_link_id" model="csh.CSH501.delete_payment_req" modelaction="batch_update"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
//新增 //新增
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () { window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
...@@ -28,6 +29,54 @@ ...@@ -28,6 +29,54 @@
}); });
}; };
//新建状态单据取消
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function () {
var ds_id = '${/parameter/@layout_code}_T_CSH_REQ_ASSET_csh_payment_req_hd_ds';
var records = $(ds_id).getSelected();
var param = {};
var datas = [];
if (!records.length) {
Leaf.showMessage('提示', '请至少选择一条数据!');
return;
}
Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认取消该笔申请?', function okFun() {
for (var i = 0; i < records.length; i++) {
if (records[i].get('payment_req_id')) {
if (records[i].get('approval_status') != 'NEW' ) {
Leaf.showWarningMessage('${l:HLS.PROMPT}', '该付款申请状态不为新建,不能取消!');
return;
}
data = {};
data['payment_req_id'] = records[i].get('payment_req_id');
data['_status'] = 'update';
datas.push(data);
}
}
param['details'] = datas;
var url_l = $('delete_comm_payment_req_link_id').getUrl();
Leaf.request({
url: url_l,
para: datas,
success: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$(ds_id).query();
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this
});
}, function cancelFun() {
Leaf.SideBar.enable = true;
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
});
};
function detail_link(id, name, query_only) { function detail_link(id, name, query_only) {
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name]; var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
...@@ -36,7 +85,7 @@ ...@@ -36,7 +85,7 @@
param['bp_id'] = record.get('bp_id_agent_level1'); param['bp_id'] = record.get('bp_id_agent_level1');
param['business_type'] = record.get('business_type'); param['business_type'] = record.get('business_type');
param['approval_status'] = record.get('approval_status'); param['approval_status'] = record.get('approval_status');
if (record.get('approval_status') == 'NEW' || record.get('approval_status') == 'RETURN' || record.get('approval_status') == 'REJECT') { if (record.get('approval_status') == 'NEW' || record.get('approval_status') == 'RETURN') {
param['function_usage'] = 'UPDATE'; param['function_usage'] = 'UPDATE';
param['function_code'] = 'CSH501D_COMM'; param['function_code'] = 'CSH501D_COMM';
} else{ } else{
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<a:link id="csh501d_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" <a:link id="csh501d_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
modelaction="update"/> modelaction="update"/>
<a:link id="con_rd_wfl_link" url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/> <a:link id="con_rd_wfl_link" url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
<!--<a:link id="update_csh_payment_comm_info_link" model="csh.CSH501.csh_payment_req_get_num" modelaction="execute"/>--> <a:link id="update_csh_payment_comm_info_link" model="csh.CSH501.csh_payment_req_get_num" modelaction="execute"/>
<link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/> <link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
<script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/> <script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>
<script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/> <script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/>
...@@ -106,10 +106,26 @@ ...@@ -106,10 +106,26 @@
qpara['payment_bp_id'] = '${/parameter/@payment_bp_id}'; qpara['payment_bp_id'] = '${/parameter/@payment_bp_id}';
} }
function setListInterval(record, grid_id) {
var btnListInterval = setTimeout(function() {
var field_color = null;
btnListInterval = null;
var overdue_max_days = record.get('overdue_max_days') ;
if (overdue_max_days>0) {
field_color = '#FF9965';
}else{
field_color = '';
}
if (Ext.get(grid_id) ) {
Ext.get(grid_id).select('tr[_row=' + record.id + ']').setStyle({
backgroundColor: field_color
});
}
}, 200);
}
//grid加载 //grid加载
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, line_record) {
var lnds_id_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln'); var lnds_id_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
if(lnds_id_ds_id == ds.id &&lnds_id_ds_id){ if(lnds_id_ds_id == ds.id &&lnds_id_ds_id){
if ('${/parameter/@source_type}' != 'WFL_ACCT') { if ('${/parameter/@source_type}' != 'WFL_ACCT') {
...@@ -118,6 +134,20 @@ ...@@ -118,6 +134,20 @@
$(gridId).hideColumn('journal_date'); $(gridId).hideColumn('journal_date');
} }
} }
var ds_length = $(lnds_id_ds_id).getAll().length;
var dsId = ds.id;
var grid_id = dsId.replace('ds', 'layout_grid_id');
if (!Ext.isEmpty(line_record)) {
for (i=0;i< ds_length ;i++) {
var overdue_max_days = $(lnds_id_ds_id).getAll()[i].get('overdue_max_days');
if (overdue_max_days != 'undefined' && overdue_max_days != null && overdue_max_days != '') {
if (overdue_max_days > 0) {
setListInterval(line_record, grid_id);
}
}
}
}
} }
var dirty_flag = 'N'; var dirty_flag = 'N';
...@@ -485,6 +515,48 @@ ...@@ -485,6 +515,48 @@
return check_flag || false; return check_flag || false;
}; };
//保存submitsuccess调用
window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function (ds, record, res, bp_seq) {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
dirty_flag = 'N';
var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
var hd_record = $(hdds_id).getCurrentRecord();
var payment_req_id = hd_record.get('payment_req_id');
//获得相应的行信息
var lnds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
if (payment_req_id) {
//更新头信息
Leaf.Masker.mask(Ext.getBody(), '正在保存中。。。');
Leaf.request({
url: $('update_csh_payment_comm_info_link').getUrl(),
para: {
payment_req_id: payment_req_id
},
success: function () {
Leaf.Masker.unmask(Ext.getBody());
$(hdds_id).setQueryParameter('payment_req_id', payment_req_id);
$(hdds_id).query();
},
failure: function () {
Leaf.Masker.unmask(detail_mask);
},
error: function () {
Leaf.Masker.unmask(detail_mask);
},
scope: this
});
$(lnds_id).setQueryParameter('payment_req_id', payment_req_id);
$(lnds_id).query();
} else {
Leaf.showMessage('${l:PROMPT}', '请先保存数据');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
};
//合同编号超链接 //合同编号超链接
function open_con_contract_readonly_win(record_id, ds_id) { function open_con_contract_readonly_win(record_id, ds_id) {
......
...@@ -228,6 +228,8 @@ ...@@ -228,6 +228,8 @@
<a:field name="division_n" displayField="value_name" options="comm_division_name_ds" <a:field name="division_n" displayField="value_name" options="comm_division_name_ds"
returnField="division" valueField="value_code"/> returnField="division" valueField="value_code"/>
<a:field name="overdue_max_days"/> <a:field name="overdue_max_days"/>
<a:field name="lease_start_date_f"/>
<a:field name="lease_start_date_t"/>
</a:fields> </a:fields>
<a:events> <a:events>
<a:event name="update" handler="headUpdateFunction"/> <a:event name="update" handler="headUpdateFunction"/>
...@@ -256,9 +258,12 @@ ...@@ -256,9 +258,12 @@
prompt="最新逾期天数从" allowDecimals="false"/> prompt="最新逾期天数从" allowDecimals="false"/>
<a:numberField name="overdue_max_days_t" allowFormat="true" bindTarget="csh_payment_req_comm_ds" <a:numberField name="overdue_max_days_t" allowFormat="true" bindTarget="csh_payment_req_comm_ds"
prompt="最新逾期天数到" allowDecimals="false"/> prompt="最新逾期天数到" allowDecimals="false"/>
<a:datePicker name="lease_start_date_f" bindTarget="csh_payment_req_comm_ds"
prompt="租赁开始日从" />
<a:datePicker name="lease_start_date_t" bindTarget="csh_payment_req_comm_ds"
prompt="租赁开始日到" />
</a:form> </a:form>
<a:grid id="csh_payment_commi_maintain_grid_ds" bindTarget="csh_payment_comm_selectedDs" marginHeight="200" <a:grid id="csh_payment_commi_maintain_grid_ds" bindTarget="csh_payment_comm_selectedDs" marginHeight="210"
marginWidth="40" navBar="true" rowRenderer="change_background_color"> marginWidth="40" navBar="true" rowRenderer="change_background_color">
<a:columns> <a:columns>
<a:column name="batch_number" prompt="计提单号" renderer="comm_req_detail_renderer" width="120"/> <a:column name="batch_number" prompt="计提单号" renderer="comm_req_detail_renderer" width="120"/>
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
params: { params: {
record_id: record_id record_id: record_id
}, },
height: 350, height: 420,
width: 420 width: 420
}); });
} }
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
params: { params: {
record_id: record_id record_id: record_id
}, },
height: 350, height: 420,
width: 420 width: 420
}); });
} }
......
...@@ -21,6 +21,14 @@ ...@@ -21,6 +21,14 @@
function efile1020_generated(){ function efile1020_generated(){
var datas = []; var datas = [];
var records = $('archives_pool_list_ds').getSelected(); var records = $('archives_pool_list_ds').getSelected();
for (var i=0;i<records.length;i++){
if(records[i].get('done_flag') == 'GENERATED'){
Leaf.showMessage('${l:PROMPT}', '已经生成电子档案的数据不能重复生成');
return;
}
}
for (var i=0;i<records.length;i++){ for (var i=0;i<records.length;i++){
var record = records[i]; var record = records[i];
datas.push(record.data); datas.push(record.data);
...@@ -62,6 +70,8 @@ ...@@ -62,6 +70,8 @@
<a:field name="archive_type_desc" displayField="code_value_name" options="archive_type_ds" returnField="archive_type" valueField="code_value"/> <a:field name="archive_type_desc" displayField="code_value_name" options="archive_type_ds" returnField="archive_type" valueField="code_value"/>
<a:field name="done_flag"/> <a:field name="done_flag"/>
<a:field name="done_flag_desc" displayField="code_value_name" options="done_flag_ds" returnField="done_flag" valueField="code_value"/> <a:field name="done_flag_desc" displayField="code_value_name" options="done_flag_ds" returnField="done_flag" valueField="code_value"/>
<a:field name="creation_date_from"/>
<a:field name="creation_date_to"/>
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
<a:dataSet id="archives_pool_list_ds" autoQuery="true" model="efile.EFILE1020.archives_post_list" queryDataSet="archives_post_list_query" selectable="true"> <a:dataSet id="archives_pool_list_ds" autoQuery="true" model="efile.EFILE1020.archives_post_list" queryDataSet="archives_post_list_query" selectable="true">
...@@ -74,10 +84,12 @@ ...@@ -74,10 +84,12 @@
<a:gridButton click="efile1020_reset" text="HLS.RESET"/> <a:gridButton click="efile1020_reset" text="HLS.RESET"/>
<a:gridButton click="efile1020_generated" text="生成电子档案"/> <a:gridButton click="efile1020_generated" text="生成电子档案"/>
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form column="4" marginWidth="200" title="查询条件"> <a:form column="3" marginWidth="200" title="查询条件">
<a:comboBox name="archive_type_desc" bindTarget="archives_post_list_query" prompt="资料类型"/> <a:comboBox name="archive_type_desc" bindTarget="archives_post_list_query" prompt="资料类型"/>
<a:textField name="document_info" bindTarget="archives_post_list_query" prompt="资料来源"/> <a:textField name="document_info" bindTarget="archives_post_list_query" prompt="资料来源"/>
<a:comboBox name="done_flag_desc" bindTarget="archives_post_list_query" prompt="生成状态"/> <a:comboBox name="done_flag_desc" bindTarget="archives_post_list_query" prompt="生成状态"/>
<a:datePicker name="creation_date_from" bindTarget="archives_post_list_query" prompt="创建时间从"/>
<a:datePicker name="creation_date_to" bindTarget="archives_post_list_query" prompt="创建时间到"/>
</a:form> </a:form>
<a:grid id="archives_pool_list_ds_id" bindTarget="archives_pool_list_ds" marginHeight="200" marginWidth="200" navBar="true"> <a:grid id="archives_pool_list_ds_id" bindTarget="archives_pool_list_ds" marginHeight="200" marginWidth="200" navBar="true">
<a:columns> <a:columns>
...@@ -85,6 +97,7 @@ ...@@ -85,6 +97,7 @@
<a:column name="document_info" prompt="资料来源" width="500"/> <a:column name="document_info" prompt="资料来源" width="500"/>
<a:column name="done_flag_desc" prompt="生成状态" width="100"/> <a:column name="done_flag_desc" prompt="生成状态" width="100"/>
<a:column name="error_message" prompt="日志" width="150"/> <a:column name="error_message" prompt="日志" width="150"/>
<a:column name="creation_date" renderer="Leaf.formatDate" prompt="创建时间" width="150"/>
<a:column name="last_update_date" renderer="Leaf.formatDate" prompt="最后更新时间" width="150"/> <a:column name="last_update_date" renderer="Leaf.formatDate" prompt="最后更新时间" width="150"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true"> <a:service xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">
<a:init-procedure> <a:init-procedure>
<s:server-script import="att_downloadUtil.js"><![CDATA[ <s:server-script ><![CDATA[
importPackage(java.util.zip); importPackage(java.util.zip);
importPackage(java.io); importPackage(java.io);
importPackage(java.net); importPackage(java.net);
importPackage(Packages.com.hand.attDownload);
var logger = $logger('server-script'); var logger = $logger('server-script');
$ctx["__request_type__"] = 'file'; $ctx["__request_type__"] = 'file';
...@@ -23,7 +24,9 @@ ...@@ -23,7 +24,9 @@
"attachment; filename=\"" + java.net.URLEncoder.encode(filename, "UTF-8")); "attachment; filename=\"" + java.net.URLEncoder.encode(filename, "UTF-8"));
resp.setDateHeader("Expires", 0); resp.setDateHeader("Expires", 0);
resp.setContentType("application/x-msdownload"); resp.setContentType("application/x-msdownload");
attDownloadUtil(resp,filepath,filename); var dl=new com.hand.attDownload.attDownload();
var result = dl.downloadUitl(resp,filepath,filename);
// attDownloadUtil(resp,filepath,filename);
} }
]]></s:server-script> ]]></s:server-script>
</a:init-procedure> </a:init-procedure>
......
<?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:p="uncertain.proc" trace="true">
<a:init-procedure>
<a:model-delete model="efile.EFILE1030.create_pool_temp" />
<batch-apply sourcePath="/parameter/details">
<a:model-insert model="efile.EFILE1030.create_pool_temp" />
</batch-apply>
<a:model-execute model="efile.EFILE1030.create_pool_temp" />
</a:init-procedure>
<a:service-output output="/parameter"/>
</a:service>
...@@ -6,36 +6,55 @@ ...@@ -6,36 +6,55 @@
$Purpose:电子档池定义 $Purpose:电子档池定义
--> -->
<a:screen xmlns:a="http://www.leaf-framework.org/application"> <a:screen xmlns:a="http://www.leaf-framework.org/application">
<a:init-procedure>
<!-- <a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" model="prj.PRJ500D.sys_user_lv" rootPath="user_name_path"/> -->
<a:model-query fetchAll="true" model="efile.EFILE1030.e_archive_pool_batch_query" rootPath="pool_data"/>
</a:init-procedure>
<a:view> <a:view>
<a:link id="att_link_id" url="${/request/@context_path}/modules/efile/EFILE1030/efile_att_json_lov.lview"/> <a:link id="att_link_id" url="${/request/@context_path}/modules/efile/EFILE1030/efile_att_json_lov.lview"/>
<a:link id="post_stru_link_id" url="${/request/@context_path}/modules/efile/EFILE1030/efile_post_stru_json_lov.lview"/> <a:link id="post_stru_link_id" url="${/request/@context_path}/modules/efile/EFILE1030/efile_post_stru_json_lov.lview"/>
<a:link id="doc_post_link" url="${/request/@context_path}/modules/efile/EFILE1040/efile_doc_import.svc"/> <a:link id="doc_post_link" url="${/request/@context_path}/modules/efile/EFILE1040/efile_doc_import.lsc"/>
<a:link id="efile_create_pool_temp_link" url="${/request/@context_path}/modules/efile/EFILE1030/create_pool_temp.lsc"/>
<a:link id="elec_file_save_link" model="efile.EFILE1010.elec_file_type" modelaction="batch_update"/>
<a:link id="elec_file_delete_link" model="efile.EFILE1010.elec_file_type" modelaction="batch_update"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
function efile_archive_pool_batch_trans() { function efile_archive_pool_batch_trans() {
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}'); var records=$('pool_temp_ds').getAll();
var saveData = [];
var param = {};
Leaf.showConfirm('${l:PROMPT}', '是否确定批量传输?', function() {
var detail_mask = Ext.getBody();
Leaf.Masker.mask(detail_mask, '${l:HLS.EXECUTING}');
for (var i = 0;i < records.length;i++) {
var record = records[i];
saveData.push({
'document_id': record.get('pool_id'),
'_status': 'insert'
});
}
param['details'] = saveData;
Leaf.request({ Leaf.request({
url: $('doc_post_link').getUrl(), url: $('efile_create_pool_temp_link').getUrl(),
para: { para: param,
batch_flag :'Y'
},
success: function() { success: function() {
Leaf.Masker.unmask(Ext.getBody()); Leaf.Masker.unmask(detail_mask);
Leaf.showMessage('提示','传输成功',function(){ Leaf.showMessage('提示','传输成功',function(){
$('efile_archive_pool_ds').query(); $('efile_archive_pool_ds').query();
}); });
}, },
failure: function() { failure: function() {
Leaf.Masker.unmask(Ext.getBody()); Leaf.Masker.unmask(detail_mask);
}, },
error: function() { error: function() {
Leaf.Masker.unmask(Ext.getBody()); Leaf.Masker.unmask(detail_mask);
}, },
scope: this scope: this
}); });
});
} }
...@@ -46,10 +65,14 @@ ...@@ -46,10 +65,14 @@
return; return;
} }
for (var i = 0; i < record.length; i++) { for (var i = 0; i < record.length; i++) {
if(record[i].get('monthly_closed_flag')=='N'){ if(record[i].get('monthly_closed_flag')=='0'){
Leaf.showMessage('提示','资料期间对应的会计期间必须是关账状态!'); Leaf.showMessage('提示','资料期间对应的会计期间必须是关账状态!');
return; return;
} }
if(record[i].get('post_status')=='POST_SUCCESS'){
Leaf.showMessage('提示','已传输成功不可重复传输!');
return;
}
} }
var records = new Array(); var records = new Array();
...@@ -82,8 +105,7 @@ ...@@ -82,8 +105,7 @@
} }
function efile_archive_pool_reset() { function efile_archive_pool_reset() {
$('for_query_ds').reset();
} }
function efile_archive_pool_query() { function efile_archive_pool_query() {
...@@ -91,6 +113,7 @@ ...@@ -91,6 +113,7 @@
} }
function att_update_renderer(value, record, name) { function att_update_renderer(value, record, name) {
if(name=='att'){ if(name=='att'){
return '<a href="javascript:efile_archive_att_list(\'' + record.get('pool_id') + '\')">附件</a>'; return '<a href="javascript:efile_archive_att_list(\'' + record.get('pool_id') + '\')">附件</a>';
} }
...@@ -109,9 +132,9 @@ ...@@ -109,9 +132,9 @@
id: 'att_id_winid', id: 'att_id_winid',
url: url, url: url,
params: { params: {
record_id: record_id pool_id: record_id
}, },
height: 200, height: 480,
width: 1100 width: 1100
}); });
} }
...@@ -126,7 +149,7 @@ ...@@ -126,7 +149,7 @@
id: 'post_stru_id_winid', id: 'post_stru_id_winid',
url: url, url: url,
params: { params: {
record_id: record_id pool_id: record_id
}, },
height: 550, height: 550,
width: 800 width: 800
...@@ -140,13 +163,18 @@ ...@@ -140,13 +163,18 @@
} }
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="pool_temp_ds">
<a:datas dataSource="/model/pool_data"/>
</a:dataSet>
<a:dataSet id="yes_no_ds" lookupCode="YES_NO"/> <a:dataSet id="yes_no_ds" lookupCode="YES_NO"/>
<a:dataSet id="data_cf_ds" lookupCode="DATA_CLASSIFICATION"/> <a:dataSet id="data_cf_ds" lookupCode="DATA_CLASSIFICATION"/>
<a:dataSet id="post_status_ds" lookupCode="POST_STATUS_DESC"/> <a:dataSet id="post_status_ds" lookupCode="POST_STATUS_DESC"/>
<a:dataSet id="for_query_ds" autoCreate="true"> <a:dataSet id="for_query_ds" autoCreate="true">
<a:fields> <a:fields>
<a:field name="internal_period_num_from" />
<a:field name="internal_period_num_to" />
<a:field name="internal_period_num" /> <a:field name="internal_period_num" />
<a:field name="post_batch_num" /> <a:field name="hly_req_number" />
<a:field name="primary_field" /> <a:field name="primary_field" />
<a:field name="document_info" /> <a:field name="document_info" />
<a:field name="post_status" /> <a:field name="post_status" />
...@@ -161,6 +189,7 @@ ...@@ -161,6 +189,7 @@
<a:fields> <a:fields>
<a:field name="monthly_closed_flag" /> <a:field name="monthly_closed_flag" />
<a:field name="post_message" readOnly="true" /> <a:field name="post_message" readOnly="true" />
<a:field name="post_status_desc" displayField="code_value_name" options="post_status_ds" returnField="post_status" valueField="code_value"/>
</a:fields> </a:fields>
</a:dataSet> </a:dataSet>
</a:dataSets> </a:dataSets>
...@@ -173,13 +202,14 @@ ...@@ -173,13 +202,14 @@
<a:gridButton click="efile_archive_pool_manual_trans" text="手动传输"/> <a:gridButton click="efile_archive_pool_manual_trans" text="手动传输"/>
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form column="4" marginWidth="30" title="查询条件"> <a:form column="4" marginWidth="30" title="查询条件">
<a:textField name="internal_period_num" bindTarget="for_query_ds" prompt="资料期间"/> <a:textField name="internal_period_num_from" bindTarget="for_query_ds" prompt="资料期间从"/>
<a:textField name="internal_period_num_to" bindTarget="for_query_ds" prompt="资料期间到"/>
<a:comboBox name="archive_type_desc" bindTarget="for_query_ds" prompt="资料类型"/> <a:comboBox name="archive_type_desc" bindTarget="for_query_ds" prompt="资料类型"/>
<a:textField name="primary_field" bindTarget="for_query_ds" prompt="主键"/> <a:textField name="primary_field" bindTarget="for_query_ds" prompt="主键"/>
<a:comboBox name="suppl_trans_flag_desc" bindTarget="for_query_ds" prompt="是否补传"/> <a:comboBox name="suppl_trans_flag_desc" bindTarget="for_query_ds" prompt="是否补传"/>
<a:textField name="document_info" bindTarget="for_query_ds" prompt="原始资料号"/> <a:textField name="document_info" bindTarget="for_query_ds" prompt="原始资料号"/>
<a:comboBox name="post_status_desc" bindTarget="for_query_ds" prompt="传输状态"/> <a:comboBox name="post_status_desc" bindTarget="for_query_ds" prompt="传输状态"/>
<a:textField name="post_batch_num" bindTarget="for_query_ds" prompt="传输批次号"/> <a:textField name="hly_req_number" bindTarget="for_query_ds" prompt="传输批次号"/>
</a:form> </a:form>
<a:grid id="efile_archive_pool_ds_id" bindTarget="efile_archive_pool_ds" marginHeight="200" marginWidth="30" navBar="true"> <a:grid id="efile_archive_pool_ds_id" bindTarget="efile_archive_pool_ds" marginHeight="200" marginWidth="30" navBar="true">
<a:columns> <a:columns>
...@@ -190,9 +220,9 @@ ...@@ -190,9 +220,9 @@
<a:column name="post_stru_data" prompt="结构化数据" renderer="att_update_renderer" width="110"/> <a:column name="post_stru_data" prompt="结构化数据" renderer="att_update_renderer" width="110"/>
<a:column name="att" align="center" prompt="附件" renderer="att_update_renderer"/> <a:column name="att" align="center" prompt="附件" renderer="att_update_renderer"/>
<a:column name="suppl_trans_flag_desc" align="center" width="120" prompt="是否补传"/> <a:column name="suppl_trans_flag_desc" align="center" width="120" prompt="是否补传"/>
<a:column name="post_status" align="center" width="120" prompt="传输状态"/> <a:column name="post_status_desc" align="center" width="120" prompt="传输状态"/>
<a:column name="post_message" align="center" editor="textarea_id" width="180" prompt="传输结果"/> <a:column name="post_message" align="center" editor="textarea_id" width="180" prompt="传输结果"/>
<a:column name="post_batch_num" align="center" width="120" prompt="传输批次号"/> <a:column name="hly_req_number" align="center" width="120" prompt="传输批次号"/>
</a:columns> </a:columns>
<a:editors> <a:editors>
<a:textField id="text_ed"/> <a:textField id="text_ed"/>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<a:init-procedure> <a:init-procedure>
<s:server-script><![CDATA[ <s:server-script><![CDATA[
function newMap(name) { function newMap(name) {
return new CompositeMap("a", 'http://www.aurora-framework.org/application', return new CompositeMap("a", 'http://www.leaf-framework.org/application',
name); name);
} }
var para = $ctx.current_parameter || $ctx.parameter; var para = $ctx.current_parameter || $ctx.parameter;
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<a:screenBody> <a:screenBody>
<a:grid id="att_para_ds_id" bindTarget="att_json_ds" height="180" width="1050" navBar="true"> <a:grid id="att_para_ds_id" bindTarget="att_json_ds" height="180" width="1050" navBar="true">
<a:columns> <a:columns>
<a:column name="action_type" prompt="附件类型" width="150"/> <a:column name="archive_type_desc" prompt="附件类型" width="150"/>
<a:column name="code_value" prompt="附件地址" width="650"/> <a:column name="code_value" prompt="附件地址" width="650"/>
<a:column name="code_value_name" prompt="附件名称" width="250"/> <a:column name="code_value_name" prompt="附件名称" width="250"/>
</a:columns> </a:columns>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<a:init-procedure> <a:init-procedure>
<s:server-script><![CDATA[ <s:server-script><![CDATA[
function newMap(name) { function newMap(name) {
return new CompositeMap("a", 'http://www.aurora-framework.org/application', return new CompositeMap("a", 'http://www.leaf-framework.org/application',
name); name);
} }
var para = $ctx.current_parameter || $ctx.parameter; var para = $ctx.current_parameter || $ctx.parameter;
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
var dataSet = CompositeUtil.findChild(dataSets, 'dataSet', 'id', dataSet_id); var dataSet = CompositeUtil.findChild(dataSets, 'dataSet', 'id', dataSet_id);
if (!dataSet) { if (!dataSet) {
dataSet = newMap("dataSet"); dataSet = newMap("dataSet");
dataSet.id = dataSet_id; dataSet.id = 'post_stur_json_ds';
dataSet.autocreate = 'true'; dataSet.autocreate = 'true';
dataSets.addChild(dataSet.getData()); dataSets.addChild(dataSet.getData());
var datas = newMap("datas"); var datas = newMap("datas");
...@@ -51,8 +51,13 @@ ...@@ -51,8 +51,13 @@
for (var k in obj) { for (var k in obj) {
// if (obj[k] instanceof Object) { // if (obj[k] instanceof Object) {
var datasRecord = newMap("record"); var datasRecord = newMap("record");
var str=obj[k].value;
str=str.replace('中左括号替换','(');
str=str.replace('中右括号替换',')');
str=str.replace('英左括号替换','(');
str=str.replace('英右括号替换',')');
datasRecord.code_value = obj[k].fieldCode; datasRecord.code_value = obj[k].fieldCode;
datasRecord.code_value_name = obj[k].value; datasRecord.code_value_name = str;
datas.addChild(datasRecord.getData()); datas.addChild(datasRecord.getData());
//println(datasRecord.code_value+":"+datasRecord.code_value_name); //println(datasRecord.code_value+":"+datasRecord.code_value_name);
//} else { //} else {
...@@ -76,11 +81,14 @@ ...@@ -76,11 +81,14 @@
<a:dataSets > <a:dataSets >
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
<a:grid id="post_stru_para_ds_id" bindTarget="post_stur_json_ds" marginHeight="480" width="740" navBar="true"> <a:grid id="post_stru_para_ds_id" bindTarget="post_stur_json_ds" height="480" width="740" navBar="true">
<a:columns> <a:columns>
<a:column name="code_value" prompt="字段代码" width="150"/> <a:column name="code_value" prompt="字段代码" width="150"/>
<a:column name="code_value_name" prompt="值内容" width="589"/> <a:column name="code_value_name" editor="textarea1_id" prompt="值内容" width="589" />
</a:columns> </a:columns>
<a:editors>
<a:textArea id="textarea1_id"/>
</a:editors>
</a:grid> </a:grid>
</a:screenBody> </a:screenBody>
</a:view> </a:view>
......
<?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:p="uncertain.proc" trace="true">
<a:init-procedure>
<a:batch-apply sourcepath="/parameter">
<p:switch test="@current_parameter/@_status">
<p:case value="insert">
<a:model-insert model="hls.HLS103.hls_division_detail"/>
</p:case>
<p:case value="update">
<a:model-update model="hls.HLS103.hls_division_detail"/>
</p:case>
<p:case value="delete">
<a:model-delete model="hls.HLS103.hls_division_detail"/>
</p:case>
</p:switch>
<a:model-batch-update model="hls.HLS103.hls_agent_division_detail" sourcePath="@current_parameter/agent_info"/>
</a:batch-apply>
</a:init-procedure>
<a:service-output output="/parameter"/>
</a:service>
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<a:init-procedure/> <a:init-procedure/>
<a:view> <a:view>
<a:link id="sys_service_welcome_link" url="${/request/@context_path}/welcome.lview"/> <a:link id="sys_service_welcome_link" url="${/request/@context_path}/welcome.lview"/>
<a:link id="query_division_detail_link" url="${/request/@context_path}/modules/hls/HLS103/hls_division_detail.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
function hls_103_queryDivision() { function hls_103_queryDivision() {
$('hls_division_result_ds').query(); $('hls_division_result_ds').query();
...@@ -52,6 +53,28 @@ ...@@ -52,6 +53,28 @@
return ''; return '';
} }
} }
function division_detail_renderer(value, record, name) {
if(record.get('division')=='70'){
return '<a href="javascript:open_division_detail_window(\'' + record.get('division') + '\',\'' + record.get('description') + '\')">' + '明细' + '</a>';
}
}
function open_division_detail_window(division,description) {
var win = new Leaf.Window({
id: 'query_division_detail_link_winId',
url: $('query_division_detail_link').getUrl(),
params: {
division: division,
description: description,
winid: 'query_division_detail_link_winId'
},
title: '产品线细分',
draggable: true,
width: 700,
height: 500
});
}
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="full_elec_sign_ds" lookupCode="YES_OR_NO"/> <a:dataSet id="full_elec_sign_ds" lookupCode="YES_OR_NO"/>
...@@ -81,6 +104,7 @@ ...@@ -81,6 +104,7 @@
<a:columns> <a:columns>
<a:column name="division" align="left" editorFunction="hls103divisionCodeFunction" sortable="true" width="250"/> <a:column name="division" align="left" editorFunction="hls103divisionCodeFunction" sortable="true" width="250"/>
<a:column name="description" align="left" editor="hls103_division_description_tf" width="300"/> <a:column name="description" align="left" editor="hls103_division_description_tf" width="300"/>
<a:column name="division_detail" align="center" prompt="产品线明细" renderer="division_detail_renderer" width="100"/>
<a:column name="full_elec_sign_desc" prompt="是否为全电子签约" align="center" editor="grid_id_comboBox_id" width="100"/> <a:column name="full_elec_sign_desc" prompt="是否为全电子签约" align="center" editor="grid_id_comboBox_id" width="100"/>
<a:column name="enabled_flag" align="center" editor="hls103_division_result_grid_cb" width="100"/> <a:column name="enabled_flag" align="center" editor="hls103_division_result_grid_cb" width="100"/>
</a:columns> </a:columns>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: trd
$Date: 2024-5-11 下午4:03:43
$Revision: 1.0
$Purpose: 二手机产品线细分
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application">
<a:init-procedure/>
<a:view>
<script type="text/javascript"><![CDATA[
function division_detail_add() {
$('hls_division_detail_grid').showEditorByRecord($('hls_division_detail_result_ds').create());
}
function division_detail_grid_clear() {
$('hls_division_detail_grid').clear();
}
function division_detail_grid_query() {
$('hls_division_detail_result_ds').query();
}
/*function division_detail_delete() {
$('hls_division_detail_grid').remove();
}*/
function agent_detail_add() {
var bankDs=$('hls_division_detail_result_ds');
var record=bankDs.getCurrentRecord();
if(Ext.isEmpty(record))
{
return ;
}
else if(record.isNew)
{
Leaf.showMessage('${l:HLS.PROMPT}','请先保存产品明细,才能新增代理店');
return ;
}
$('hls_agent_division_detail_grid').showEditorByRecord($('hls_agent_division_detail_result_ds').create({
division_detail_id:record.get('division_detail_id'),
division_detail_code:record.get('division_detail_code')
}));
}
function agent_detail_grid_clear() {
$('hls_agent_division_detail_grid').clear();
}
function division_detail_submit() {
var result_ds = $('hls_division_detail_result_ds');
if (result_ds.validate()) {
result_ds.submit();
}
}
function divisionCodeFunction(record, name) {
if (record.isNew) {
return 'division_detail_tf';
} else {
return '';
}
}
function agentCodeFunction(record, name) {
if (record.isNew) {
return 'agent_bp_code_lv';
} else {
return '';
}
}
]]></script>
<a:dataSets>
<a:dataSet id="hls_division_detail_result_ds" autoQuery="true" fetchAll="true" model="hls.HLS103.hls_division_detail" selectionModel="single" selectable="true" submitUrl="hls_detail.lsc">
<a:fields>
<a:field name="division" defaultValue="${/parameter/@division}" readOnly="true"/>
<a:field name="description" defaultValue="${/parameter/@description}" readOnly="true"/>
<a:field name="division_detail_code" required="true"/>
<a:field name="division_detail_name" required="true"/>
<a:field name="enable_flag" checkedValue="Y" defaultValue="Y" uncheckedValue="N"/>
</a:fields>
</a:dataSet>
<a:dataSet id="hls_agent_division_detail_result_ds" bindName="agent_info" bindTarget="hls_division_detail_result_ds" autoQuery="true" fetchAll="false" model="hls.HLS103.hls_agent_division_detail" queryUrl="${/request/@context_path}/autocrud/hls.HLS103.hls_agent_division_detail/query?division_detail_code=${/parameter/@division_detail_code}" selectable="true">
<a:fields>
<a:field name="division_detail_code" readOnly="true"/>
<a:field name="agent_bp_code" lovGridHeight="300" lovHeight="450" lovLabelWidth="120"
lovService="basic.hls_bp_master_v_for_lov?bp_category=AGENT" lovWidth="600" title="代理店">
<a:mapping>
<a:map from="bp_id" to="agent_bp_id"/>
<a:map from="bp_code" to="agent_bp_code"/>
<a:map from="bp_name" to="agent_bp_name"/>
</a:mapping>
</a:field>
<a:field name="enable_flag" checkedValue="Y" defaultValue="Y" uncheckedValue="N"/>
</a:fields>
</a:dataSet>
</a:dataSets>
<a:screenBody>
<a:screenTopToolbar>
<a:screenTitle/>
<a:gridButton click="division_detail_add" text="新增产品线细分"/>
<a:gridButton click="division_detail_grid_clear" text="移除产品线细分"/>
<a:gridButton click="division_detail_grid_query" text="HLS.QUERY"/>
<a:gridButton click="agent_detail_add" text="新增代理店"/>
<a:gridButton click="agent_detail_grid_clear" text="移除代理店"/>
<a:gridButton click="division_detail_submit" text="HLS.SAVE"/>
<!--<a:gridButton click="division_detail_delete" text="HLS.DELETE"/>-->
</a:screenTopToolbar>
<a:grid id="hls_division_detail_grid" bindTarget="hls_division_detail_result_ds" marginHeight="400" marginWidth="300">
<a:columns>
<a:column name="description" align="left" sortable="true" width="100"/>
<a:column name="division_detail_code" align="center" prompt="产品线细分编码" editorFunction="divisionCodeFunction" width="100"/>
<a:column name="division_detail_name" align="center" prompt="产品线细分名称" editorFunction="divisionCodeFunction" width="200"/>
<a:column name="enable_flag" align="center" prompt="启用" editor="division_detail_grid_editor_check" width="60"/>
</a:columns>
<a:editors>
<a:textField id="division_detail_tf"/>
<a:checkBox id="division_detail_grid_editor_check"/>
</a:editors>
</a:grid>
<a:grid id="hls_agent_division_detail_grid" bindTarget="hls_agent_division_detail_result_ds" marginHeight="200" marginWidth="300">
<a:columns>
<a:column name="division_detail_code" prompt="产品线细分编码" align="left" sortable="true" width="100"/>
<a:column name="agent_bp_code" align="center" prompt="代理店编码" editorFunction="agentCodeFunction" width="100"/>
<a:column name="agent_bp_name" align="center" prompt="代理店名称" width="250"/>
<a:column name="enable_flag" align="center" prompt="启用" editor="agent_division_grid_editor_check" width="60"/>
</a:columns>
<a:editors>
<a:lov id="agent_bp_code_lv"/>
<a:checkBox id="agent_division_grid_editor_check"/>
</a:editors>
</a:grid>
</a:screenBody>
</a:view>
</a:screen>
...@@ -282,8 +282,10 @@ ...@@ -282,8 +282,10 @@
return; return;
} }
if(records[i].get('je_transaction_code') == 'HL_PAYMENT_FEE' && records[i].get('immediately_flag') == 'N'){ if(records[i].get('je_transaction_code') == 'HL_PAYMENT_FEE' && records[i].get('immediately_flag') == 'N'){
if(!Ext.isEmpty(records[i].get('division')) && records[i].get('division') != '70' &&records[i].get('division') != '92'){
Leaf.showMessage('${l:HLS.PROMPT}','应付账款(建机)类凭证需要在付款凭证申请工作流CFO节点审批通过后才可以传输!'); Leaf.showMessage('${l:HLS.PROMPT}','应付账款(建机)类凭证需要在付款凭证申请工作流CFO节点审批通过后才可以传输!');
return;; return;
}
} }
je_detail_count = Number(records[i].get('je_detail_count')); je_detail_count = Number(records[i].get('je_detail_count'));
count = je_detail_count + Number(count); count = je_detail_count + Number(count);
......
...@@ -130,6 +130,19 @@ ...@@ -130,6 +130,19 @@
// record.getField('invoice_bp_bank_account_id').setRequired(false); // record.getField('invoice_bp_bank_account_id').setRequired(false);
// } // }
// } // }
var agent_division_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_agent_division');
if (agent_division_ds_id == ds.id &&agent_division_ds_id) {
var division = record.get('division');
if(division!='70'){
record.getField('division_detail').setReadOnly(true);
record.getField('division_detail_n').setReadOnly(true);
record.set('division_detail','');
record.set('division_detail_n','');
}else{
record.getField('division_detail').setReadOnly(false);
record.getField('division_detail_n').setReadOnly(false);
}
}
var role_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role'); var role_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_role');
if (role_ds == ds.id) { if (role_ds == ds.id) {
...@@ -336,7 +349,6 @@ ...@@ -336,7 +349,6 @@
//资产管理费 //资产管理费
function open_asset_management(record_id, ds_id) { function open_asset_management(record_id, ds_id) {
debugger;
var record = $(ds_id).findById(record_id); var record = $(ds_id).findById(record_id);
if(record.get('bp_id') == undefined || record.get('agent_division_id')==undefined){ if(record.get('bp_id') == undefined || record.get('agent_division_id')==undefined){
$L.showMessage('提示','请先保存!'); $L.showMessage('提示','请先保存!');
...@@ -358,7 +370,6 @@ ...@@ -358,7 +370,6 @@
//佣金政策 //佣金政策
window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() {
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_agent_division'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_agent_division');
var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master'); var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
var record = $(ds_id).getAll(); var record = $(ds_id).getAll();
...@@ -448,6 +459,17 @@ ...@@ -448,6 +459,17 @@
}; };
//加载时调用(grid,table,gridBox) //加载时调用(grid,table,gridBox)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
var agent_division_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_agent_division');
if (agent_division_ds_id == ds.id && agent_division_ds_id) {
var records = $(agent_division_ds_id).getAll();
for (i = 0;i < records.length;i++) {
if(records[i].get('division')!='70'){
records[i].getField('division_detail').setReadOnly(true);
records[i].getField('division_detail_n').setReadOnly(true);
}
}
}
var ds_renew_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_agent_renew'); var ds_renew_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_agent_renew');
if (ds_renew_id) { if (ds_renew_id) {
if (ds_renew_id == ds.id) { if (ds_renew_id == ds.id) {
...@@ -455,6 +477,7 @@ ...@@ -455,6 +477,7 @@
ds.getField('valid_date_from').setPropertity('validator', 'hls303d_record_field_validator'); ds.getField('valid_date_from').setPropertity('validator', 'hls303d_record_field_validator');
} }
} }
}; };
......
...@@ -8,7 +8,7 @@ $Purpose: 商业伙伴授信维护 ...@@ -8,7 +8,7 @@ $Purpose: 商业伙伴授信维护
--> -->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true"> <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure> <a:init-procedure>
<a:model-query defaultWhereClause="t1.user_id=${/session/@user_id} and position_code in(005,006)" fetchAll="true" model="csh.CSH509.query_roles_info" rootPath="position_code"/> <a:model-query defaultWhereClause="t1.user_id=${/session/@user_id} and position_code in(9062,006,005,9070)" fetchAll="true" model="csh.CSH509.query_roles_info" rootPath="position_code"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
...@@ -74,10 +74,25 @@ $Purpose: 商业伙伴授信维护 ...@@ -74,10 +74,25 @@ $Purpose: 商业伙伴授信维护
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
//授信额度变更 //授信额度变更
var param={}; var param={};
var credit_ds=get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_credit_hd'); var credit_ds=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_CREDIT_HD', 'hls_bp_master_credit_hd');
var datas=$(credit_ds).selected; var op_credit_ds=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_CREDIT_OP', 'hls_bp_master_credit_hd');
if(datas.length!=1){ var credit_datas = $(credit_ds).selected;
$L.showInfoMessage("提示",'请选择要变更的数据',null,null) var op_credit_datas = $(op_credit_ds).selected;
if(credit_datas == ''){
var datas=$(op_credit_ds).selected;
}else {
datas = $(credit_ds).selected;
}
if(credit_datas!='' && op_credit_datas!=''){
$L.showErrorMessage("提示",'只能选择一条数据进行维护!');
return;
}
if(datas.length==0){
$L.showInfoMessage("提示",'请选择要维护的数据',null,null)
return;
}
if(datas.length>1){
$L.showErrorMessage("提示",'只能选择一条数据进行维护!');
return; return;
} }
//启用和审批冻结判断 //启用和审批冻结判断
...@@ -93,7 +108,7 @@ $Purpose: 商业伙伴授信维护 ...@@ -93,7 +108,7 @@ $Purpose: 商业伙伴授信维护
$L.showInfoMessage("提示",'只有营业副部长和营业担当才能操作数据!'); $L.showInfoMessage("提示",'只有营业副部长和营业担当才能操作数据!');
return; return;
} }
if(datas[0].get('credit_status')=='APPROVING'){ if(datas[0].get('credit_status')=='APPROVING' || datas[0].get('credit_status')=='APPROVING_OP'){
$L.showInfoMessage("提示",'该授信记录审批中,无法维护!'); $L.showInfoMessage("提示",'该授信记录审批中,无法维护!');
return; return;
} }
......
...@@ -8,7 +8,7 @@ $Purpose: 商业伙伴授信维护 ...@@ -8,7 +8,7 @@ $Purpose: 商业伙伴授信维护
--> -->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true"> <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure> <a:init-procedure>
<a:model-query defaultWhereClause="t1.user_id=${/session/@user_id} and position_code in(003,9065)" fetchAll="true" model="csh.CSH509.query_roles_info" rootPath="position_code"/> <a:model-query defaultWhereClause="t1.user_id=${/session/@user_id} and position_code in(003,9070)" fetchAll="true" model="csh.CSH509.query_roles_info" rootPath="position_code"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
...@@ -25,7 +25,16 @@ $Purpose: 商业伙伴授信维护 ...@@ -25,7 +25,16 @@ $Purpose: 商业伙伴授信维护
var user_code=''; var user_code='';
Leaf.onReady(function(){ Leaf.onReady(function(){
user_code='${/model/position_code/record/@position_code}'; user_code='${/model/position_code/record/@position_code}';
}) if(user_code == 9070){
var ds_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_CREDIT_HD', 'hls_bp_master_credit_hd');
var op_ds_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_CREDIT_OP', 'hls_bp_master_credit_hd');
var record = 'JCREDIT_ENTRANCE_CONFIRM_F_QUERY__ds';
$(record).getCurrentRecord().set('credit_status','APPROVING_OP');
$(record).getCurrentRecord().set('credit_status_n','审批中(营业副部长-经租)');
$(ds_id).query();
$(op_ds_id).query();
}
});
//超链接渲染 //超链接渲染
...@@ -52,21 +61,26 @@ $Purpose: 商业伙伴授信维护 ...@@ -52,21 +61,26 @@ $Purpose: 商业伙伴授信维护
//变更确认 //变更确认
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
//授信额度变更 //授信额度变更
var credit_ds=get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_credit_hd'); var credit_ds=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_CREDIT_HD', 'hls_bp_master_credit_hd');
var datas=$(credit_ds).selected; var op_credit_ds=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_CREDIT_OP', 'hls_bp_master_credit_hd');
var credit_datas = $(credit_ds).selected;
var op_credit_datas = $(op_credit_ds).selected;
if(credit_datas == ''){
var datas=$(op_credit_ds).selected;
}else {
datas = $(credit_ds).selected;
}
if(credit_datas!='' && op_credit_datas!=''){
$L.showErrorMessage("提示",'请勾选同一业务类型的单据进行授信确认操作!');
return;
}
var param = {}; var param = {};
var saveData = []; var saveData = [];
//判断角色是否可以操作 //判断角色是否可以操作
//002 营业本部长 //002 营业本部长
for (var i = 0; i < datas.length; i++){ for (var i = 0; i < datas.length; i++){
if(user_code==''||user_code==undefined){ if(user_code==''||user_code==undefined){
$L.showInfoMessage("提示",'只有营业本部长才能操作数据!'); $L.showInfoMessage("提示",'只有营业本部长/营业副部长(经租)才能操作数据!');
return;
}else if (user_code =='9065' && datas[i].get('bp_category')!='RENTER' ){
$L.showInfoMessage("提示",'当前用户只能选择<font color="red">'+'租赁商'+'</font>类型进行授信操作');
return;
}else if (user_code =='003' && datas[i].get('bp_category')=='RENTER'){
$L.showInfoMessage("提示",'当前用户只能选择<font color="red">'+'非租赁商'+'</font>类型进行授信操作');
return; return;
} }
} }
...@@ -77,7 +91,7 @@ $Purpose: 商业伙伴授信维护 ...@@ -77,7 +91,7 @@ $Purpose: 商业伙伴授信维护
for (var i = 0; i < datas.length; i++) { for (var i = 0; i < datas.length; i++) {
//审批冻结判断 //审批冻结判断
var credit_status=datas[i].data.credit_status; var credit_status=datas[i].data.credit_status;
if(credit_status!='APPROVING'){ if(credit_status!='APPROVING' && credit_status!='APPROVING_OP'){
$L.showInfoMessage("提示",'请选择状态为审批中的数据!',null,null) $L.showInfoMessage("提示",'请选择状态为审批中的数据!',null,null)
return; return;
} }
...@@ -85,7 +99,11 @@ $Purpose: 商业伙伴授信维护 ...@@ -85,7 +99,11 @@ $Purpose: 商业伙伴授信维护
data_record = datas[i]; data_record = datas[i];
data_record.set('_status', 'update'); data_record.set('_status', 'update');
data_record.set('bp_credit_hd_id', datas[i].data.bp_credit_hd_id); data_record.set('bp_credit_hd_id', datas[i].data.bp_credit_hd_id);
if(user_code == 9070){
data_record.set('wanted_status', 'APPROVING');
}else {
data_record.set('wanted_status', 'APPROVED'); data_record.set('wanted_status', 'APPROVED');
}
saveData.push(data_record.data); saveData.push(data_record.data);
} }
param['details'] = saveData; param['details'] = saveData;
......
...@@ -340,8 +340,10 @@ ...@@ -340,8 +340,10 @@
return; return;
} }
if(records[i].get('je_transaction_code') == 'HL_PAYMENT_FEE' && records[i].get('immediately_flag') == 'N'){ if(records[i].get('je_transaction_code') == 'HL_PAYMENT_FEE' && records[i].get('immediately_flag') == 'N'){
if(!Ext.isEmpty(records[i].get('division')) && records[i].get('division') != '70' &&records[i].get('division') != '92'){
Leaf.showMessage('${l:HLS.PROMPT}','应付账款(建机)类凭证需要在付款凭证申请工作流CFO节点审批通过后才可以传输!'); Leaf.showMessage('${l:HLS.PROMPT}','应付账款(建机)类凭证需要在付款凭证申请工作流CFO节点审批通过后才可以传输!');
return;; return;
}
} }
je_detail_count = Number(records[i].get('je_detail_count')); je_detail_count = Number(records[i].get('je_detail_count'));
count = je_detail_count + Number(count); count = je_detail_count + Number(count);
......
...@@ -26,6 +26,10 @@ ...@@ -26,6 +26,10 @@
Leaf.showInfoMessage('成功','导入成功!',function(){ Leaf.showInfoMessage('成功','导入成功!',function(){
window.location.href = $('hls_journal_entrance_import_link').getUrl(); window.location.href = $('hls_journal_entrance_import_link').getUrl();
}); });
}else if (res.result.v_final_count>0){
Leaf.showInfoMessage('提示','贷款最终到期日为空,请检查!',function(){
window.location.href = $('hls_journal_entrance_import_link').getUrl();
});
}else{ }else{
Leaf.showInfoMessage('失败','导入失败!',function(){ Leaf.showInfoMessage('失败','导入失败!',function(){
window.location.href = $('hls_journal_entrance_import_link').getUrl(); window.location.href = $('hls_journal_entrance_import_link').getUrl();
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: wangwei5743
$Date: 2024-5-10 上午09:03:15
$Revision: 1.0
$Purpose: 机号比对展示明细页面
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
<a:init-procedure/>
<a:view>
<script type="text/javascript"><![CDATA[
]]></script>
<a:dataSets>
<a:dataSet id="label_ds" autoCreate="true">
<a:fields>
<!--<a:field name="label1" defaultValue="注意:"/>-->
<a:field name="label2" defaultValue="1.当前页面仅机号存在重复风险会弹出,二次租赁情况下不弹出"/>
<a:field name="label3" defaultValue="2.如弹出该窗口以为该机号存在重复性风险,请核查机号重复实际情况"/>
<a:field name="label4" defaultValue="3.一但点击确认并正常审批流程代表您已完成风险核对"/>
<a:field name="label5" defaultValue="仔细阅读上述事项,并检查确认无误。请谨慎审批通过该笔单据!"/>
</a:fields>
</a:dataSet>
</a:dataSets>
<a:fieldSet style="margin-left:10px;margin-top:10px;font-weight:bold;" title="机号重复性检验提示" width="400">
<!--<a:label name="label1" bindTarget="label_ds" width="380"/>-->
<a:label name="label2" bindTarget="label_ds" style="margin-left:10px;" width="380"/>
<a:label name="label3" bindTarget="label_ds" style="margin-left:10px;" width="380"/>
<a:label name="label4" bindTarget="label_ds" style="margin-left:10px;" width="380"/>
<a:label name="label5" bindTarget="label_ds" style="color:#055A78;font-weight:bold;margin-left:10px;" width="380"/>
</a:fieldSet>
</a:view>
</a:screen>
...@@ -153,12 +153,16 @@ ...@@ -153,12 +153,16 @@
var userInfoList = []; var userInfoList = [];
for (var k = 0 ; k < ele_signer_data.length;k++){ for (var k = 0 ; k < ele_signer_data.length;k++){
var signer_record_data = ele_signer_data[k]; var signer_record_data = ele_signer_data[k];
if(signer_record_data.signer_category == 'AGENCY_STORE_SEAL' || signer_record_data.signer_category == 'MAN_FACTURER_SEAL'){ if(signer_record_data.signer_category == 'AGENCY_STORE_SEAL' || signer_record_data.signer_category == 'MAN_FACTURER_SEAL'||signer_record_data.signer_category == 'SUPPLIER_SEAL'||signer_record_data.signer_category == 'LEASE_SUPPLIER_SEAL'){
var signer_category; var signer_category;
if (signer_record_data.signer_category == 'AGENCY_STORE_SEAL'){ if (signer_record_data.signer_category == 'AGENCY_STORE_SEAL'){
signer_category = 'AGENCY_STORE_SIGN'; signer_category = 'AGENCY_STORE_SIGN';
}else if (signer_record_data.signer_category == 'MAN_FACTURER_SEAL') { }else if (signer_record_data.signer_category == 'MAN_FACTURER_SEAL') {
signer_category = 'MAN_FACTURER_SIGN'; signer_category = 'MAN_FACTURER_SIGN';
}else if (signer_record_data.signer_category == 'SUPPLIER_SEAL') {
signer_category = 'SUPPLIER_SIGN';
}else if (signer_record_data.signer_category == 'LEASE_SUPPLIER_SEAL') {
signer_category = 'LEASE_SUPPLIER_SIGN';
} }
var ele_org_signer_map = ele_signer_bm.queryAsMap({ var ele_org_signer_map = ele_signer_bm.queryAsMap({
contract_id: $ctx.parameter.contract_id, contract_id: $ctx.parameter.contract_id,
......
...@@ -171,12 +171,16 @@ ...@@ -171,12 +171,16 @@
"agentType": "1", "agentType": "1",
"signerCategory":signer_record_data.signer_category "signerCategory":signer_record_data.signer_category
}); });
} else if (signer_record_data.signer_category == 'AGENCY_STORE_SEAL' || signer_record_data.signer_category == 'MAN_FACTURER_SEAL') { } else if (signer_record_data.signer_category == 'AGENCY_STORE_SEAL' || signer_record_data.signer_category == 'MAN_FACTURER_SEAL'|| signer_record_data.signer_category == 'SUPPLIER_SEAL'|| signer_record_data.signer_category == 'LEASE_SUPPLIER_SEAL') {
var signer_category; var signer_category;
if (signer_record_data.signer_category == 'AGENCY_STORE_SEAL'){ if (signer_record_data.signer_category == 'AGENCY_STORE_SEAL'){
signer_category = 'AGENCY_STORE_SIGN'; signer_category = 'AGENCY_STORE_SIGN';
}else if (signer_record_data.signer_category == 'MAN_FACTURER_SEAL') { }else if (signer_record_data.signer_category == 'MAN_FACTURER_SEAL') {
signer_category = 'MAN_FACTURER_SIGN'; signer_category = 'MAN_FACTURER_SIGN';
}else if (signer_record_data.signer_category == 'SUPPLIER_SEAL') {
signer_category = 'SUPPLIER_SIGN';
}else if (signer_record_data.signer_category == 'LEASE_SUPPLIER_SEAL') {
signer_category = 'LEASE_SUPPLIER_SIGN';
} }
var ele_org_signer_map = ele_signer_bm.queryAsMap({ var ele_org_signer_map = ele_signer_bm.queryAsMap({
contract_id: $ctx.parameter.contract_id, contract_id: $ctx.parameter.contract_id,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true"> <a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">
<a:init-procedure> <a:init-procedure>
<s:server-script import="con_print_path.js"><![CDATA[ <s:server-script import="con_print_path.js"><![CDATA[
set_parameter_file_path(); set_pdf_parameter_file_path();
]]></s:server-script> ]]></s:server-script>
<s:server-script><![CDATA[ <s:server-script><![CDATA[
importPackage(java.io); importPackage(java.io);
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
} catch (e) { } catch (e) {
raise_app_error(e); raise_app_error(e);
} }
logger.info(to_file_path.toString());
word_to_pdf_sign(record_data.content_id,to_file_path.toString()); word_to_pdf_sign(record_data.content_id,to_file_path.toString());
//得到生成的pdf文件的大小 //得到生成的pdf文件的大小
......
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