Commit a71a08ca authored by panhong18943's avatar panhong18943

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

 Conflicts:
	pom.xml
	src/main/database/Init/Layout_db_object/INITIALIZE_LAYOUT_DB_OBJECT.sql
	src/main/resources/com/hand/hls/hlcm/cont/mapper/ConExportMapper.xml
	src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_cf_v_new.lwm
	src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_create.lwm
	src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_penalty_create.lwm
	src/main/webapp/WEB-INF/classes/acr/ACR512/acr_invoice_update_query.lwm
	src/main/webapp/WEB-INF/classes/acr/ACR515/acr515_invoice_hd_v.lwm
	src/main/webapp/WEB-INF/classes/acr/ACR604/acr_invoice_claim_application_new.lwm
	src/main/webapp/WEB-INF/classes/acr/ACR605/acr_invoice_claim_confirm_new.lwm
	src/main/webapp/WEB-INF/classes/acr/ACR620/acr_invoice_reverse_apply_detail.lwm
	src/main/webapp/WEB-INF/classes/basic/hls_bp_master_v_for_agent_lov.lwm
	src/main/webapp/WEB-INF/classes/cont/CON2000/contract_phone_approval.lwm
	src/main/webapp/WEB-INF/classes/csh/CSH531/get_trans_review_status.lwm
	src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_maintain_query.lwm
	src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/hls_bp_master_bank_account_lov.lwm
	src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106N/csh_transaction_maintain_query.lwm
	src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT110/csh_transaction_maintain_query.lwm
	src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_record_query.lwm
	src/main/webapp/WEB-INF/classes/hls/HLS301/hls_journal_header_v.lwm
	src/main/webapp/WEB-INF/classes/hls/HLS500N/hls_fin_calc_config_hd_n.lwm
	src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_header.lwm
	src/main/webapp/WEB-INF/classes/hsbc/HSBC100/csh_bank_account.lwm
	src/main/webapp/WEB-INF/classes/hsbc/HSBC110/get_limited_user.lwm
	src/main/webapp/WEB-INF/classes/layout/server_layout_common.lwm
	src/main/webapp/WEB-INF/classes/paraconfig.properties
	src/main/webapp/WEB-INF/classes/prj/PRJ500D/bp_tenant_old_r_query.lwm
	src/main/webapp/WEB-INF/classes/prj/PRJ500N/prj_project_lease_import_list.lwm
	src/main/webapp/WEB-INF/classes/prj/PRJ500N/prj_project_lease_import_temp.lwm
	src/main/webapp/WEB-INF/classes/prj/PRJ500N/prj_project_lease_item_delete.lwm
	src/main/webapp/WEB-INF/classes/prj/PRJ500N/prj_project_lease_update_temp.lwm
	src/main/webapp/WEB-INF/classes/rpt/RPT5012/rpt5012_csh_result_query.lwm
	src/main/webapp/WEB-INF/classes/rpt/RPT5012/rpt5012_result_query.lwm
	src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_current_query.lwm
	src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_query.lwm
	src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_total_query.lwm
	src/main/webapp/WEB-INF/classes/sys/sys_page_menu.lwm
	src/main/webapp/WEB-INF/classes/wx/WX100/con_contract_query.lwm
	src/main/webapp/WEB-INF/classes/zjwfl/ZJWFL1060/zj_wfl_monitoring_query.lwm
	src/main/webapp/WEB-INF/server-script/layoutconfig/con_tenant_change_modify_t_history_ingo_queryfields.js
	src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc110_r_result_queryfields.js
	src/main/webapp/WEB-INF/server-script/layoutconfig/layout_config.js
	src/main/webapp/leafresource/leaf.ui.std/hap/base/Leaf-all-min.css
	src/main/webapp/modules/acp/ACP522/ap_invoice_import_detail.lview
	src/main/webapp/modules/acr/ACR510/acr_invoice_create_invoice.lview
	src/main/webapp/modules/acr/ACR510/acr_invoice_penalty_invoice.lview
	src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
	src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview
	src/main/webapp/modules/acr/ACR514/acr_invoice_reverse_apply_temp_detail.lview
	src/main/webapp/modules/acr/ACR515/acr_invoice_vat.lview
	src/main/webapp/modules/acr/ACR515/hls_acr_vat_zip_file_upload_handle.lview
	src/main/webapp/modules/acr/ACR516/acr_invoice_claim_application.lview
	src/main/webapp/modules/acr/ACR517/acr_invoice_claim_confirm.lview
	src/main/webapp/modules/cont/CON2000/collection_sms_query.lview
	src/main/webapp/modules/cont/CON301N/con_contract_query_entrance.lview
	src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview
	src/main/webapp/modules/cont/CON3400/contract_sales_report.lview
	src/main/webapp/modules/cont/CON3500/contract_ifrs9_report_query.lview
	src/main/webapp/modules/cont/CON4000/business_daily_email.lsc
	src/main/webapp/modules/cont/CON500/con_contract_get_layout_code.lview
	src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc
	src/main/webapp/modules/cont/CON505/con_contract_modify.lview
	src/main/webapp/modules/cont/CON620/create_content_for_collection.lsc
	src/main/webapp/modules/cont/CON620/create_content_for_collection_signatures.lsc
	src/main/webapp/modules/cont/CON731/hls_before_sign_change_detail.lview
	src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview
	src/main/webapp/modules/cont/CON733/hls_con_contract_et_create_entrance.lview
	src/main/webapp/modules/cont/CON930/con_contract_cashflow_monthly.lview
	src/main/webapp/modules/csh/CSH501/csh_payment_req.lview
	src/main/webapp/modules/csh/CSH501/csh_payment_req_selected.lview
	src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update.lview
	src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview
	src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview
	src/main/webapp/modules/csh/CSH515/csh_transaction_receipt_return_maintain.lview
	src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview
	src/main/webapp/modules/csh/CSH560/vender_deposit_return.lview
	src/main/webapp/modules/cus_deposit/CUS_DEPOSIT102/csh_transfer_review_detail.lview
	src/main/webapp/modules/cus_deposit/CUS_DEPOSIT102/cus_transfer_review_maintain.lview
	src/main/webapp/modules/hls/HLS203N/hls_lease_item_modify_entrance.lview
	src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
	src/main/webapp/modules/hls/HLS213N/hls_bp_master_create_entrance.lview
	src/main/webapp/modules/hls/HLS214N/hls_bp_master_billing.lview
	src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify.lview
	src/main/webapp/modules/hls/HLS214N/hls_bp_master_req_modify.lview
	src/main/webapp/modules/hls/HLS303/bp_agent_create.lview
	src/main/webapp/modules/hls/HLS303/bp_agent_modify.lview
	src/main/webapp/modules/hls/HLS303/bp_asset_create.lview
	src/main/webapp/modules/hls/HLS500/hls_fin_calculator_dynamic.lview
	src/main/webapp/modules/hls/HLS530/manual_journal_create.lview
	src/main/webapp/modules/hls/HLS801/hls_monthly_statement.lview
	src/main/webapp/modules/hsbc/HSBC100/csh_bank_account_choose.lview
	src/main/webapp/modules/hsbc/HSBC100/hsbc_paying_batch_create.lview
	src/main/webapp/modules/hsbc/HSBC110/hsbc_paying_batch_modify.lview
	src/main/webapp/modules/hsbc/HSBC120/hsbc_downing_file.lsc
	src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
	src/main/webapp/modules/prj/PRJ500N/prj_project_create_entrance.lview
	src/main/webapp/modules/prj/PRJ501N/prj_project_lease_import.lview
	src/main/webapp/modules/prj/PRJ501N/prj_project_lease_import_details.lview
	src/main/webapp/modules/prj/PRJ501N/prj_project_lease_import_upload.lview
	src/main/webapp/modules/rpt/RPT555/con_je_vat_query.lview
	src/main/webapp/modules/sys/SYS420/sms_batch_send.lsc
parents b748d130 9762c958
...@@ -216,6 +216,47 @@ ...@@ -216,6 +216,47 @@
<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>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<version>2.0.23</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3.5</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.4</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.2</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>hlcm</finalName> <finalName>hlcm</finalName>
......
...@@ -25,6 +25,12 @@ values ('CONTRACT', 'CON_CONTRACT_CCR_Q_LV', 'VIEW', -1, sysdate, -1, sysdate); ...@@ -25,6 +25,12 @@ values ('CONTRACT', 'CON_CONTRACT_CCR_Q_LV', 'VIEW', -1, sysdate, -1, sysdate);
insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE) insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE)
values ('CONTRACT', 'con_contract_history_lv', 'VIEW', -1, sysdate, -1, sysdate); values ('CONTRACT', 'con_contract_history_lv', 'VIEW', -1, sysdate, -1, sysdate);
insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE)
values ('CONTRACT', 'con_contract_con733_lv', 'VIEW', -1, sysdate, -1, sysdate);
insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE)
values ('CONTRACT', 'CON_CONTRACT_LEASE_ITEM_CCR_LV', 'VIEW', -1, sysdate, -1, sysdate);
end; end;
/ /
commit; commit;
......
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool REGISTER_ACP522.log
set feedback off
set define off
begin
--页面注册
sys_function_assign_pkg.service_load('modules/cont/CON731/hls_before_sign_change_detail.lview','签约前合同变更',1,1,0);
--功能定义
--分配页面
sys_function_assign_pkg.func_service_load('CON733','modules/cont/CON731/hls_before_sign_change_detail.lview');
sys_function_assign_pkg.func_service_load('CON736','modules/cont/CON731/hls_before_sign_change_detail.lview');
sys_function_assign_pkg.func_service_load('ZJWFL5110','modules/cont/CON731/hls_before_sign_change_detail.lview');
sys_function_assign_pkg.func_service_load('CON733','modules/hls/HLS500N/hls_fin_calculator_update_n.lview');
sys_function_assign_pkg.func_service_load('CON736','modules/hls/HLS500N/hls_fin_calculator_update_n.lview');
sys_function_assign_pkg.func_service_load('ZJWFL5110','modules/hls/HLS500N/hls_fin_calculator_update_n.lview');
--分配bm
sys_function_assign_pkg.func_bm_load('CON733','check_after_save_bm.check_change_con_lease_item');
sys_function_assign_pkg.func_bm_load('CON736','check_after_save_bm.check_change_con_lease_item');
sys_function_assign_pkg.func_bm_load('ZJWFL5110','check_after_save_bm.check_change_con_lease_item');
end;
/
commit;
set feedback on
set define on
spool off
exit
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.MultipartRequestEntity;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.springframework.http.HttpHeaders;
import org.springframework.web.client.RestTemplate;
import java.io.File;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
/**
* description
*
* @author Administrator 2023/01/03 15:07
*/
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" +
"}";
}
}
public static String UploadFile(String url, Map<String, String> param, File file, String token, String tokentype ) throws Exception {
try {
StringBuffer stringBuffer = new StringBuffer();
stringBuffer.append( url)
.append("?");
int i=1;
Set<Map.Entry<String, String>> set = param.entrySet();
Iterator<Map.Entry<String, String>> it = set.iterator();
while (it.hasNext()) {
Map.Entry<String, String> entry = (Map.Entry<String, String>) it.next();
if(i==1){
stringBuffer.append(entry.getKey()+"="+entry.getValue());
i++;
}else{
stringBuffer.append("&"+entry.getKey()+"="+entry.getValue());
}
}
String post_url = stringBuffer.toString();
System.out.println(post_url);
CloseableHttpClient httpClient = HttpClients.createDefault();
HttpPost httpPost = new HttpPost(post_url);
MultipartEntityBuilder builder=MultipartEntityBuilder.create();
builder.addBinaryBody("file",file);
HttpEntity httpEntity=(HttpEntity)builder.build();
httpPost.setHeader("Authorization", tokentype+" "+token);
httpPost.setEntity(httpEntity);//设置请求参数
HttpResponse response = httpClient.execute(httpPost);
HttpEntity responseEntity = response.getEntity();
String result = EntityUtils.toString(responseEntity, java.nio.charset.Charset.forName("UTF-8"));
return result;
} catch (Exception ex) {
return ex.getMessage() ;
}
}
public static void main(String[] args) throws Exception {
//String resPonse=httpPostAttImport("http://apistage.huilianyi.com/gateway/e-archives/api/open/v1/import/document","[{\"companyCode\":\"0001\",\"particularYear\":\"2022\",\"documentTypeCode\":\"DT002002\",\"originalNumber\":\"1234567890\",\"primaryField\":\"SAP_TEST0000001\",\"isPaper\":\"true\",\"documentSource\":\"SAP\",\"attachmentList\":[{\"fileURL\":\"https://gss0.baidu.com/-vo3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/314e251f95cad1c8ea88af74793e6709c93d51b5.jpg\",\"fileName\":\"314e251f95cad1c8ea88af74793e6709c93d51b5.jpg\",\"attachmentOID\":\"\"},{\"fileURL\":\"https://gss0.baidu.com/-vo3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/314e251f95cad1c8ea88af74793e6709c93d51b5.jpg\",\"fileName\":\"314e251f95cad1c8ea88af74793e6709c93d51b5.jpg\",\"attachmentOID\":\"\",\"attachTypeCode\":\"0\"}],\"ruleOID\":\"684fb42f-1df4-4710-8ac7-ea0146786a05\",\"securityLevelCode\":\"CONFIDENTIAL\",\"fieldValueList\":[{\"fieldCode\":\"AMOUNT\",\"value\":\"13\"},{\"fieldCode\":\"COMPANY\",\"value\":\"阳光照明\"},{\"fieldCode\":\"DOC_NAME\",\"value\":\"日常报销单\"},{\"fieldCode\":\"CURRENCY\",\"value\":\"CNY\"},{\"fieldCode\":\"CREATED_DATE\",\"value\":\"2021-01-01 12:00:00\"},{\"fieldCode\":\"CREATION_NAME\",\"value\":\"张三\"},{\"fieldCode\":\"REMARK\",\"value\":\"去年的报销\"}]}]","4557fa35-d2da-479a-be68-323b6be619d9","Bearer");
File file=new File("D:\\aurora_reference.pdf");
HashMap mmp = new HashMap();
mmp.put("documentTypeCode", "workflow_QC01");
mmp.put("primaryField", "CF-4252CE7A665C4562BF8E8AC3AD79BF1D");
mmp.put("documentSource", "CF");
mmp.put("companyCode", "HL");
//String resPonse1=doPostFile1("http://apistage.huilianyi.com/gateway/e-archives/api/open/v1/attachment/upload",mmp,file,"4557fa35-d2da-479a-be68-323b6be619d9","Bearer");
String resPonse2=UploadFile("http://apistage.huilianyi.com/gateway/e-archives/api/open/v1/attachment/upload",mmp,file,"4557fa35-d2da-479a-be68-323b6be619d9","Bearer");
System.out.println(resPonse2);
}
}
package com.hand.attDownload;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
public class attDownload {
public static void downloadFile(HttpServletRequest request, HttpServletResponse response,String filePath,String fileName)
throws IOException {
// 本地文件地址,文件名称,我是在本机运行,如果是服务器的话,地址可能是 ../fileServer/file/deploy2.sh
// String filePath = "D:\\project\\hl_leasing\\file\\2023\\02\\8DAA574FA8714BE9B22B861A6F55AE01";
// String fileName = "8DAA574FA8714BE9B22B861A6F55AE01";
// 获取浏览器的信息
String agent = request.getHeader("USER-AGENT");
if (agent != null && agent.toLowerCase().indexOf("FIRE_FOX") > 0) {
//火狐浏览器自己会对URL进行一次URL转码所以区别处理
response.setHeader("Content-Disposition",
"attachment; filename=" + new String(fileName.getBytes("GB2312"), "ISO-8859-1"));
} else if (agent.toLowerCase().indexOf("SAFARI") > 0) {
//苹果浏览器需要用ISO 而且文件名得用UTF-8
response.setHeader("Content-Disposition",
"attachment; filename=" + new String(fileName.getBytes("UTF-8"), "ISO-8859-1"));
} else {
//其他的浏览器
response.setHeader("Content-Disposition",
"attachment; filename=\"" + java.net.URLEncoder.encode(fileName, "UTF-8"));
}
response.setContentType("charset=utf-8");
String result = "{\"statusCode\":\"00000\",\"message\":\"success\"}";
// 返回数据
response.getWriter().print(result);
File file = new File(filePath);
FileInputStream fileInputStream = new FileInputStream(file);
byte[] fileByte = new byte[(int) file.length()];
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
byte[] bytes = new byte[1024];
int len;
while ((len = fileInputStream.read(bytes, 0, bytes.length)) != -1) {
byteArrayOutputStream.write(bytes, 0, len);
}
byteArrayOutputStream.close();
fileByte = byteArrayOutputStream.toByteArray();
OutputStream outputStream = null;
outputStream = response.getOutputStream();
outputStream.write(fileByte);
outputStream.flush();
outputStream.close();
}
public static void downloadUitl(HttpServletResponse response,String filePath,String fileName)
throws IOException {
// 本地文件地址,文件名称,我是在本机运行,如果是服务器的话,地址可能是 ../fileServer/file/deploy2.sh
// String filePath = "D:\\project\\hl_leasing\\file\\2023\\02\\8DAA574FA8714BE9B22B861A6F55AE01";
// String fileName = "8DAA574FA8714BE9B22B861A6F55AE01";
File file = new File(filePath);
FileInputStream fileInputStream = new FileInputStream(file);
byte[] fileByte = new byte[(int) file.length()];
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
byte[] bytes = new byte[1024];
int len;
while ((len = fileInputStream.read(bytes, 0, bytes.length)) != -1) {
byteArrayOutputStream.write(bytes, 0, len);
}
byteArrayOutputStream.close();
fileByte = byteArrayOutputStream.toByteArray();
OutputStream outputStream = null;
outputStream = response.getOutputStream();
outputStream.write(fileByte);
outputStream.flush();
outputStream.close();
}
public static void main(String[] args) throws Exception {
File file=new File("D:\\aurora_reference.pdf");
String filePath = "D:\\project\\hl_leasing\\file\\2023\\02\\8DAA574FA8714BE9B22B861A6F55AE01";
String fileName = "8DAA574FA8714BE9B22B861A6F55AE01";
}
}
package com.hand.hl;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.RequestEntity;
import org.apache.commons.httpclient.methods.StringRequestEntity;
/**
* description
*
* @author lcl 2023/02/15 15:07
*/
public class HttpPostUtilNew {
public HttpPostUtilNew() {
}
public static String httpPostDocImport(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);
entity = new StringRequestEntity(data, "application/json", "UTF-8");
postMethod.setRequestEntity(entity);
System.out.println(data);
httpClient.executeMethod(postMethod);
String result = postMethod.getResponseBodyAsString();
return result;
} catch (Exception var9) {
return "{\n \"error\": \"interError\",\n \"message\": \"请求接口失败\",\n \"path\": \"/oauth/token\"\n}";
}
}
public static void main(String[] args) throws Exception {
String resPonse = httpPostDocImport("http://apistage.huilianyi.com/gateway/e-archives/api/open/v1/import/document", "[{\"companyCode\":\"0001\",\"particularYear\":\"2022\",\"documentTypeCode\":\"DT002002\",\"originalNumber\":\"1234567890\",\"primaryField\":\"SAP_TEST0000001\",\"isPaper\":\"true\",\"documentSource\":\"SAP\",\"attachmentList\":[{\"fileURL\":\"https://gss0.baidu.com/-vo3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/314e251f95cad1c8ea88af74793e6709c93d51b5.jpg\",\"fileName\":\"314e251f95cad1c8ea88af74793e6709c93d51b5.jpg\",\"attachmentOID\":\"\"},{\"fileURL\":\"https://gss0.baidu.com/-vo3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/314e251f95cad1c8ea88af74793e6709c93d51b5.jpg\",\"fileName\":\"314e251f95cad1c8ea88af74793e6709c93d51b5.jpg\",\"attachmentOID\":\"\",\"attachTypeCode\":\"0\"}],\"ruleOID\":\"684fb42f-1df4-4710-8ac7-ea0146786a05\",\"securityLevelCode\":\"CONFIDENTIAL\",\"fieldValueList\":[{\"fieldCode\":\"AMOUNT\",\"value\":\"13\"},{\"fieldCode\":\"COMPANY\",\"value\":\"阳光照明\"},{\"fieldCode\":\"DOC_NAME\",\"value\":\"日常报销单\"},{\"fieldCode\":\"CURRENCY\",\"value\":\"CNY\"},{\"fieldCode\":\"CREATED_DATE\",\"value\":\"2021-01-01 12:00:00\"},{\"fieldCode\":\"CREATION_NAME\",\"value\":\"张三\"},{\"fieldCode\":\"REMARK\",\"value\":\"去年的报销\"}]}]", "4557fa35-d2da-479a-be68-323b6be619d9", "Bearer");
System.out.println(resPonse);
}
}
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 java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URLDecoder;
import java.nio.charset.Charset;
import java.util.Base64;
/**
* description
*
* @author Administrator 2023/01/03 15:07
*/
public class HttpPostUtil {
public static String httpPostGetToken(String postUrl,String appId,String appSecret){
try {
PostMethod postMethod = null;
postMethod = new PostMethod(postUrl) ;
postMethod.setRequestHeader("Content-Type", "application/x-www-form-urlencoded") ;
postMethod.setRequestHeader("Authorization", "Basic "+ Base64.getUrlEncoder().encodeToString((appId + ":" + appSecret).getBytes())) ;
//参数设置,需要注意的就是里边不能传NULL,要传空字符串
NameValuePair[] data = {
new NameValuePair("grant_type","client_credentials"),
new NameValuePair("scope","write")
};
postMethod.setRequestBody(data);
HttpClient httpClient = new HttpClient();
// 执行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" +
"}";
}
}
public static void main(String[] args) throws Exception {
String resPonse=httpPostGetToken("http://apistage.huilianyi.com/gateway/oauth/token","a92074ce-ff45-409e-8ff9-3516415d8f82","NTY4ZmUyY2QtOTc3YS00MTU0LWIxNTEtYmZiNjQ5M2ZjYjY0");
System.out.println(resPonse);
}
}
...@@ -107,9 +107,11 @@ public class WordToPdf { ...@@ -107,9 +107,11 @@ public class WordToPdf {
* *
* @param inFilePath * @param inFilePath
* @param outFilePath * @param outFilePath
* @param fitToPagesTall 所有行为一页
* @param fitToPagesWide 所有列为一页
* @return * @return
*/ */
public static boolean excel2pdf(String inFilePath, String outFilePath) { public static boolean excel2pdf(String inFilePath, String outFilePath,Object fitToPagesTall,Object fitToPagesWide) {
ActiveXComponent activeXComponent = new ActiveXComponent("Excel.Application"); ActiveXComponent activeXComponent = new ActiveXComponent("Excel.Application");
activeXComponent.setProperty("Visible", false); activeXComponent.setProperty("Visible", false);
...@@ -117,6 +119,13 @@ public class WordToPdf { ...@@ -117,6 +119,13 @@ public class WordToPdf {
Dispatch excels = activeXComponent.getProperty("Workbooks").toDispatch(); Dispatch excels = activeXComponent.getProperty("Workbooks").toDispatch();
Dispatch excel = Dispatch.call(excels, "Open", inFilePath, false, true).toDispatch(); Dispatch excel = Dispatch.call(excels, "Open", inFilePath, false, true).toDispatch();
Dispatch currentSheet = Dispatch.get((Dispatch) excel,
"ActiveSheet").toDispatch();
Dispatch pageSetup = Dispatch.get(currentSheet, "PageSetup")
.toDispatch();
//Dispatch.put(pageSetup, "Zoom", 50);
Dispatch.put(pageSetup, "FitToPagesTall", fitToPagesTall);
Dispatch.put(pageSetup, "FitToPagesWide", fitToPagesWide);
Dispatch.call(excel, "ExportAsFixedFormat", 0, outFilePath); Dispatch.call(excel, "ExportAsFixedFormat", 0, outFilePath);
Dispatch.call(excel, "Close", false); Dispatch.call(excel, "Close", false);
activeXComponent.invoke("Quit"); activeXComponent.invoke("Quit");
...@@ -144,6 +153,7 @@ public class WordToPdf { ...@@ -144,6 +153,7 @@ public class WordToPdf {
Dispatch pageSetup = Dispatch.get(currentSheet, "PageSetup") Dispatch pageSetup = Dispatch.get(currentSheet, "PageSetup")
.toDispatch(); .toDispatch();
Dispatch.put(pageSetup, "Orientation", new Variant(2)); Dispatch.put(pageSetup, "Orientation", new Variant(2));
//设置缩放,值为100或false
Dispatch.call(excel, "ExportAsFixedFormat", 0, outFilePath); Dispatch.call(excel, "ExportAsFixedFormat", 0, outFilePath);
Dispatch.call(excel, "Close", false); Dispatch.call(excel, "Close", false);
...@@ -175,14 +185,13 @@ public class WordToPdf { ...@@ -175,14 +185,13 @@ public class WordToPdf {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// String jacobDllPath = "D:\\ideaProjects\\leaf-hlcm\\src\\main\\webapp\\WEB-INF\\server-script\\jacob\\jacob-1.18-x64.dll"; String jacobDllPath = "E:\\idea_workspace\\leaf-hlcm\\src\\main\\webapp\\WEB-INF\\server-script\\jacob\\jacob-1.19-x64.dll";
// System.setProperty("jacob.dll.path", jacobDllPath); System.setProperty("jacob.dll.path", jacobDllPath);
// System.setProperty("com.jacob.debug", "true"); System.setProperty("com.jacob.debug", "true");
// word2pdf("D:\\u01\\hls_file\\excel\\8F5D12B0B1504518928FDD193C67A0A5con28168", // word2pdf("D:\\u01\\hls_file\\excel\\8F5D12B0B1504518928FDD193C67A0A5con28168",
// "D:\\hand-Prpjects\\融资租赁合同文本-4pdf.pdf"); // "D:\\hand-Prpjects\\融资租赁合同文本-4pdf.pdf");
// cutPdf("D:\\\\hand-Prpjects\\\\付款请求书打印.pdf"); // cutPdf("D:\\\\hand-Prpjects\\\\付款请求书打印.pdf");
// excel2pdf("D:\\work\\leafProjects\\YondaTl\\src\\test.xlsx", excel2pdf("C:\\Users\\Administrator\\Desktop\\对账单(白云BJJ22120045).xlsx", "C:\\Users\\Administrator\\Desktop\\c.pdf",1,1);
// "D:\\work\\leafProjects\\YondaTl\\src\\付款通知书NEW.pdf");
// excel2pdfOrientation("D:\\work\\leafProjects\\YondaTl\\src\\test.xlsx", // excel2pdfOrientation("D:\\work\\leafProjects\\YondaTl\\src\\test.xlsx",
// "D:\\work\\leafProjects\\YondaTl\\src\\付款通知书NEW.pdf"); // "D:\\work\\leafProjects\\YondaTl\\src\\付款通知书NEW.pdf");
} }
......
...@@ -135,12 +135,15 @@ ...@@ -135,12 +135,15 @@
and hbm.bp_id = t2.bill_object_bp_id and hbm.bp_id = t2.bill_object_bp_id
and nvl(t2.billing_status, 'NOT') != 'FULL' and nvl(t2.billing_status, 'NOT') != 'FULL'
--合同状态为结束中(不论是否做过提前结清或解约回购)、提前结清中、提前结清完成、正常结清的合同 --合同状态为结束中(不论是否做过提前结清或解约回购)、提前结清中、提前结清完成、正常结清的合同
and ((t2.cf_item = 2 and cc.payment_deduction in ('TRI_AGREEMENT','TRADE_IN') and
((t2.cf_item = 2 and cc.payment_deduction in ('TRI_AGREEMENT','TRADE_IN')
and ((cc.contract_status in ('TERMINATING', 'ETING','ET','INCEPT', 'TERMINATE','REPURING','REPUR') and hbm.invoice_method = 'BILLING') and ((cc.contract_status in ('TERMINATING', 'ETING','ET','INCEPT', 'TERMINATE','REPURING','REPUR') and hbm.invoice_method = 'BILLING')
or (cc.contract_status in ('TERMINATING', 'ETING', 'ETING', 'TERMINATE') and hbm.invoice_method = 'NO_BILLING')) or (cc.contract_status in ('TERMINATING', 'ETING', 'ETING', 'TERMINATE') and hbm.invoice_method = 'NO_BILLING'))
) )
or (cc.contract_status in
('TERMINATING', 'ETING', 'ETING', 'TERMINATE') or
(cc.contract_status in
('TERMINATING', 'ET', 'ETING', 'TERMINATE')
--合同状态为起租做过承租人变更的合同 --合同状态为起租做过承租人变更的合同
or or
(cc.contract_status = 'INCEPT' and t2.document_type = 'LEASE_CHAG' and (cc.contract_status = 'INCEPT' and t2.document_type = 'LEASE_CHAG' and
...@@ -190,8 +193,12 @@ ...@@ -190,8 +193,12 @@
(cc.contract_status = 'INCEPT' and (cc.contract_status = 'INCEPT' and
trunc(t2.due_date) >= trunc(nvl(cc.CCR_LEASE_DATE, t2.due_date)) and trunc(t2.due_date) >= trunc(nvl(cc.CCR_LEASE_DATE, t2.due_date)) and
hbm.taxpayer_type = 'SMALL_SCALE_TAXPAYER' and hbm.taxpayer_type = 'SMALL_SCALE_TAXPAYER' and
hbm.invoice_method = 'BILLING' and hbm.invoice_method = 'BILLING'
trunc(t2.due_date) <= trunc(sysdate)))) and
nvl(t2.write_off_flag, 'NOT') = 'FULL'
/* and
trunc(t2.due_date) <= trunc(sysdate)*/
)))
--合同状态为起租→开票对象:一般纳税人(法人),小规模纳税人(法人)和深圳美鹏HCS小规模纳税人(自然人)→暂不开票→暂不展示 --合同状态为起租→开票对象:一般纳税人(法人),小规模纳税人(法人)和深圳美鹏HCS小规模纳税人(自然人)→暂不开票→暂不展示
and not exists and not exists
(select 1 (select 1
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<bm:field name="project_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="PROJECT_ID"/> <bm:field name="project_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="PROJECT_ID"/>
<bm:field name="project_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROJECT_NUMBER" prompt="HLS.PROJECT_NUMBER"/> <bm:field name="project_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROJECT_NUMBER" prompt="HLS.PROJECT_NUMBER"/>
<bm:field name="project_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROJECT_NAME" prompt="HLS.PROJECT_NAME"/> <bm:field name="project_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PROJECT_NAME" prompt="HLS.PROJECT_NAME"/>
<bm:field name="product_name_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PRODUCT_NAME_DESC" forInsert="false" forUpdate="false"/>
<bm:field name="contract_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CONTRACT_ID"/> <bm:field name="contract_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CONTRACT_ID"/>
<bm:field name="contract_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_NUMBER" prompt="HLS.CONTRACT_NUMBER"/> <bm:field name="contract_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_NUMBER" prompt="HLS.CONTRACT_NUMBER"/>
<bm:field name="contract_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_NAME" prompt="HLS.CONTRACT_NAME"/> <bm:field name="contract_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_NAME" prompt="HLS.CONTRACT_NAME"/>
...@@ -96,8 +95,7 @@ ...@@ -96,8 +95,7 @@
(select i.description (select i.description
from hls_cashflow_item i from hls_cashflow_item i
where i.cf_item = t.cf_item) as cf_item_desc, where i.cf_item = t.cf_item) as cf_item_desc,
decode(con.contract_number,'HLL23120001','租赁费',decode(t.cf_item,250,'融资租赁挖掘机','融资租赁费'))as product_name, decode(con.contract_number,'HLL23120001','租赁费',decode(t.cf_item,250,'设备款','融资租赁费')) as product_name,
decode(con.contract_number,'HLL23120001','租赁费',decode(t.cf_item,250,'融资租赁挖掘机','融资租赁费')) as product_name_desc,
con.contract_status contract_status, con.contract_status contract_status,
cf.cf_status cf_status, cf.cf_status cf_status,
t.invoice_kind_type, t.invoice_kind_type,
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
<bm:field name="invoice_kind_type_n" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_TYPE_N" prompt="发票种类"/> <bm:field name="invoice_kind_type_n" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_TYPE_N" prompt="发票种类"/>
<bm:field name="full_elec_invoice_flag"/> <bm:field name="full_elec_invoice_flag"/>
<bm:field name="full_elec_invoice_flag_n"/> <bm:field name="full_elec_invoice_flag_n"/>
<bm:field name="business_type" />
</bm:fields> </bm:fields>
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
...@@ -68,6 +69,7 @@ ...@@ -68,6 +69,7 @@
con.project_id, con.project_id,
con.project_number, con.project_number,
con.project_name, con.project_name,
con.business_type,
t.invoice_kind, t.invoice_kind,
(SELECT v.code_value_name (SELECT v.code_value_name
FROM sys_code_values_v v FROM sys_code_values_v v
......
...@@ -29,6 +29,5 @@ ...@@ -29,6 +29,5 @@
<bm:data-filters> <bm:data-filters>
<bm:data-filter name="code" expression="t1.code =decode(${@lease_channel},&apos;00&apos;,&apos;CON500_CONTRACT_STATUS&apos;,&apos;01&apos;,&apos;CON660_CONTRACT_STATUS&apos;,&apos;CON500_CONTRACT_STATUS&apos;)"/> <bm:data-filter name="code" expression="t1.code =decode(${@lease_channel},&apos;00&apos;,&apos;CON500_CONTRACT_STATUS&apos;,&apos;01&apos;,&apos;CON660_CONTRACT_STATUS&apos;,&apos;CON500_CONTRACT_STATUS&apos;)"/>
<bm:data-filter name="code_value" enforceOperations="query" expression="t1.code_value in(&apos;INCEPT&apos;,&apos;ETING&apos;,&apos;REPURING&apos;,&apos;TERMINATE&apos;,&apos;TERMINATING&apos;,&apos;ET&apos;,&apos;REPUR&apos;)"/> <bm:data-filter name="code_value" enforceOperations="query" expression="t1.code_value in(&apos;INCEPT&apos;,&apos;ETING&apos;,&apos;REPURING&apos;,&apos;TERMINATE&apos;,&apos;TERMINATING&apos;,&apos;ET&apos;,&apos;REPUR&apos;)"/>
</bm:data-filters> </bm:data-filters>
</bm:model> </bm:model>
...@@ -116,7 +116,6 @@ ...@@ -116,7 +116,6 @@
<bm:query-field name="lease_channel" queryExpression="t1.lease_channel = ${@lease_channel}"/> <bm:query-field name="lease_channel" queryExpression="t1.lease_channel = ${@lease_channel}"/>
<bm:query-field name="invoice_kind_type" queryExpression="t1.invoice_kind_type = ${@invoice_kind_type}"/> <bm:query-field name="invoice_kind_type" queryExpression="t1.invoice_kind_type = ${@invoice_kind_type}"/>
<bm:query-field name="full_elec_invoice_flag" queryExpression="t1.full_elec_invoice_flag = ${@full_elec_invoice_flag}"/> <bm:query-field name="full_elec_invoice_flag" queryExpression="t1.full_elec_invoice_flag = ${@full_elec_invoice_flag}"/>
</bm:query-fields> </bm:query-fields>
<bm:data-filters> <bm:data-filters>
<bm:data-filter enforceOperations="query" expression="t1.invoice_status in( &apos;NEW&apos;,&apos;REJECT&apos;)"/> <bm:data-filter enforceOperations="query" expression="t1.invoice_status in( &apos;NEW&apos;,&apos;REJECT&apos;)"/>
......
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
<bm:query-field name="confirmed_by" queryExpression="t1.confirmed_by = ${@confirmed_by}"/> <bm:query-field name="confirmed_by" queryExpression="t1.confirmed_by = ${@confirmed_by}"/>
<bm:query-field name="query_contract_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, con_contract cc where df.contract_id = cc.contract_id and df.ar_invoice_hd_id = t1.invoice_hd_id and cc.contract_number between nvl(${@contract_number_f}, cc.contract_number) and nvl(${@contract_number_t}, cc.contract_number))"/> <bm:query-field name="query_contract_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, con_contract cc where df.contract_id = cc.contract_id and df.ar_invoice_hd_id = t1.invoice_hd_id and cc.contract_number between nvl(${@contract_number_f}, cc.contract_number) and nvl(${@contract_number_t}, cc.contract_number))"/>
<bm:query-field name="query_project_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, prj_project pp where df.ar_invoice_hd_id = t1.invoice_hd_id and df.project_id = pp.project_id and pp.project_number between nvl(${@project_number_f}, pp.project_number) and nvl(${@project_number_t}, pp.project_number))"/> <bm:query-field name="query_project_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, prj_project pp where df.ar_invoice_hd_id = t1.invoice_hd_id and df.project_id = pp.project_id and pp.project_number between nvl(${@project_number_f}, pp.project_number) and nvl(${@project_number_t}, pp.project_number))"/>
<bm:query-field name="invoice_apply_num" queryExpression="( exists(select 1 from acr_invoice_apply ap, acr_invoice_hd_wfl aw where ap.wfl_apply_status = 'APPROVED' and ap.apply_mode = 'APPLY' and ap.invoice_apply_id = aw.invoice_apply_id and aw.invoice_hd_id = t1.invoice_hd_id and ap.invoice_apply_num=${@invoice_apply_num}) or exists(select ap.invoice_apply_num from acr_invoice_apply ap, acr_invoice_hd_wfl aw where ap.wfl_apply_status = 'APPROVED' and ap.apply_mode = 'REVERSE' and ap.invoice_apply_id = aw.invoice_apply_id and aw.invoice_hd_id = t1.source_invoice_header_id and ap.invoice_apply_num=${@invoice_apply_num}) )"/> <bm:query-field name="invoice_apply_num" queryExpression="(exists(select 1 from acr_invoice_apply ap, acr_invoice_hd_wfl aw where ap.wfl_apply_status = 'APPROVED' and ap.apply_mode = 'APPLY' and ap.invoice_apply_id = aw.invoice_apply_id and aw.invoice_hd_id = t1.invoice_hd_id and ap.invoice_apply_num=${@invoice_apply_num}) or exists(select ap.invoice_apply_num from acr_invoice_apply ap, acr_invoice_hd_wfl aw where ap.wfl_apply_status = 'APPROVED' and ap.apply_mode = 'REVERSE' and ap.invoice_apply_id = aw.invoice_apply_id and aw.invoice_hd_id = t1.source_invoice_header_id and ap.invoice_apply_num=${@invoice_apply_num}) )"/>
<bm:query-field name="invoice_kind_type" queryExpression="t1.invoice_kind_type = ${@invoice_kind_type}"/> <bm:query-field name="invoice_kind_type" queryExpression="t1.invoice_kind_type = ${@invoice_kind_type}"/>
<bm:query-field name="full_elec_invoice_flag" queryExpression="t1.full_elec_invoice_flag = ${@full_elec_invoice_flag}"/> <bm:query-field name="full_elec_invoice_flag" queryExpression="t1.full_elec_invoice_flag = ${@full_elec_invoice_flag}"/>
......
...@@ -2,52 +2,7 @@ ...@@ -2,52 +2,7 @@
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[select <bm:query-sql><![CDATA[select *
l.invoice_hd_id,
l.bp_code,
l.description,
l.vat_red_notice_num,
l.ref_vat_invoice_code,
l.ref_invoice_number,
l.created_by_name,
l.confirmed_by_name,
l.received_by_name,
l.invoice_kind_n,
l.invoice_title,
l.invoice_bp_address_phone_num,
l.document_number,
l.invoice_date,
l.invoice_number,
l.bp_name,
l.bp_tax_registry_num,
l.bp_address_phone_num,
replace(l.bp_bank_account,' ','')bp_bank_account,
l.product_name,
l.product_code,
l.specification,
l.uom,
l.quantity,
l.price,
l.tax_type_rate,
l.tax_amount,
l.total_amount,
l.discount_amount,
l.dicount_tax_amount,
l.discount_rate,
l.rec_man,
l.rec_man_tax_num,
l.del_man,
l.del_man_tax_num,
l.place_of_sending,
l.car_type_num,
l.car_ship_tonnage,
l.product_info,
l.code_version,
l.tax_type_code,
l.preferential_policy_flag,
l.preferential_policy_content,
l.zero_tax_rate_flag,
l.reduce_amount
from acr_invoice_interface_lv l from acr_invoice_interface_lv l
where l.invoice_hd_id in where l.invoice_hd_id in
(select t.invoice_hd_id (select t.invoice_hd_id
......
...@@ -9,6 +9,19 @@ end;]]></bm:update-sql> ...@@ -9,6 +9,19 @@ end;]]></bm:update-sql>
<bm:parameters> <bm:parameters>
<bm:parameter inputPath="/session/@session_id"/> <bm:parameter inputPath="/session/@session_id"/>
</bm:parameters> </bm:parameters>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
BEGIN
hls_vat_import_pkg.update_vat_tmp_file_name (
p_session_id => ${/session/@session_id},
p_vat_code =>${@vat_code},
p_vat_number =>${@vat_number},
p_file_name =>${@file_name}
);
END;
]]></bm:update-sql>
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
</bm:model> </bm:model>
...@@ -73,7 +73,6 @@ ...@@ -73,7 +73,6 @@
<bm:data-filters> <bm:data-filters>
<bm:data-filter enforceOperations="query" expression="t1.contract_id = t2.contract_id"/> <bm:data-filter enforceOperations="query" expression="t1.contract_id = t2.contract_id"/>
<bm:data-filter enforceOperations="query" expression="t2.write_off_flag = &apos;FULL&apos;"/> <bm:data-filter enforceOperations="query" expression="t2.write_off_flag = &apos;FULL&apos;"/>
<bm:data-filter enforceOperations="query" expression="t1.vat_interface_status = &apos;BACK&apos;"/> <bm:data-filter name="query" expression="rownum &lt;=1000"/>
<!-- <bm:data-filter name="query" expression="rownum &lt;=1000"/>-->
</bm:data-filters> </bm:data-filters>
</bm:model> </bm:model>
...@@ -176,6 +176,7 @@ ...@@ -176,6 +176,7 @@
<bm:query-field name="query_project_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, prj_project pp where df.ar_invoice_hd_id = t1.invoice_hd_id and df.project_id = pp.project_id and pp.project_number between nvl(${@project_number_f}, pp.project_number) and nvl(${@project_number_t}, pp.project_number))"/> <bm:query-field name="query_project_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, prj_project pp where df.ar_invoice_hd_id = t1.invoice_hd_id and df.project_id = pp.project_id and pp.project_number between nvl(${@project_number_f}, pp.project_number) and nvl(${@project_number_t}, pp.project_number))"/>
<bm:query-field name="invoice_kind_type" queryExpression="t1.invoice_kind_type = ${@invoice_kind_type}"/> <bm:query-field name="invoice_kind_type" queryExpression="t1.invoice_kind_type = ${@invoice_kind_type}"/>
<bm:query-field name="full_elec_invoice_flag" queryExpression="t1.full_elec_invoice_flag = ${@full_elec_invoice_flag}"/> <bm:query-field name="full_elec_invoice_flag" queryExpression="t1.full_elec_invoice_flag = ${@full_elec_invoice_flag}"/>
</bm:query-fields> </bm:query-fields>
<bm:data-filters> <bm:data-filters>
<bm:data-filter enforceOperations="query" expression="nvl(t1.reversed_flag ,'N')= &apos;N&apos;"/> <bm:data-filter enforceOperations="query" expression="nvl(t1.reversed_flag ,'N')= &apos;N&apos;"/>
......
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
<bm:data-filters> <bm:data-filters>
<bm:data-filter enforceOperations="query" expression="t1.contract_id = t2.contract_id"/> <bm:data-filter enforceOperations="query" expression="t1.contract_id = t2.contract_id"/>
<bm:data-filter enforceOperations="query" expression="t2.write_off_flag = &apos;FULL&apos;"/> <bm:data-filter enforceOperations="query" expression="t2.write_off_flag = &apos;FULL&apos;"/>
<bm:data-filter enforceOperations="query" expression="t1.claim_status in(&apos;CLAIMING&apos;,&apos;CONFIRMED&apos;)"/> <bm:data-filter name="query" expression="rownum &lt;=1000"/>
<!-- <bm:data-filter name="query" expression="rownum &lt;=1000"/>-->
</bm:data-filters> </bm:data-filters>
</bm:model> </bm:model>
...@@ -137,6 +137,7 @@ ...@@ -137,6 +137,7 @@
bp_id_agent_level1, bp_id_agent_level1,
full_elec_invoice_flag, full_elec_invoice_flag,
full_elec_invoice_flag_n full_elec_invoice_flag_n
FROM acr_invoice_hd_v t) t1 FROM acr_invoice_hd_v t) t1
#WHERE_CLAUSE# #WHERE_CLAUSE#
ORDER BY t1.invoice_date desc , t1.document_number desc ORDER BY t1.invoice_date desc , t1.document_number desc
...@@ -174,6 +175,7 @@ ...@@ -174,6 +175,7 @@
<bm:query-field name="query_project_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, prj_project pp where df.ar_invoice_hd_id = t1.invoice_hd_id and df.project_id = pp.project_id and pp.project_number between nvl(${@project_number_f}, pp.project_number) and nvl(${@project_number_t}, pp.project_number))"/> <bm:query-field name="query_project_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, prj_project pp where df.ar_invoice_hd_id = t1.invoice_hd_id and df.project_id = pp.project_id and pp.project_number between nvl(${@project_number_f}, pp.project_number) and nvl(${@project_number_t}, pp.project_number))"/>
<bm:query-field name="invoice_kind_type" queryExpression="t1.invoice_kind_type = ${@invoice_kind_type}"/> <bm:query-field name="invoice_kind_type" queryExpression="t1.invoice_kind_type = ${@invoice_kind_type}"/>
<bm:query-field name="full_elec_invoice_flag" queryExpression="t1.full_elec_invoice_flag = ${@full_elec_invoice_flag}"/> <bm:query-field name="full_elec_invoice_flag" queryExpression="t1.full_elec_invoice_flag = ${@full_elec_invoice_flag}"/>
</bm:query-fields> </bm:query-fields>
<bm:data-filters> <bm:data-filters>
<!-- <bm:data-filter enforceOperations="query" expression="t1.contract_id = t2.contract_id"/>--> <!-- <bm:data-filter enforceOperations="query" expression="t1.contract_id = t2.contract_id"/>-->
......
...@@ -36,12 +36,13 @@ ...@@ -36,12 +36,13 @@
From con_contract_cashflow t From con_contract_cashflow t
Where t.cashflow_id = al.cashflow_id)) times, Where t.cashflow_id = al.cashflow_id)) times,
(Select to_char(h.journal_date, 'yyyy-mm') nvl((Select to_char(h.journal_date, 'yyyy-mm')
From hls_journal_header h, hls_journal_detail l From hls_journal_header h, hls_journal_detail l
Where h.journal_header_id = l.journal_header_id Where h.journal_header_id = l.journal_header_id
And ((l.cashflow_id = al.cashflow_id And ((l.cashflow_id = al.cashflow_id
and al.cf_item<>9) or (al.ref_n04=l.journal_line_id and al.cf_item=9)) and al.cf_item<>9) or (al.ref_n04=l.journal_line_id and al.cf_item=9))
And rownum = 1) journal_month, And rownum = 1),(select to_char(t.invoice_date, 'yyyymm')
from acr_invoice_hd t where t.invoice_hd_id=ah.invoice_hd_id)) journal_month,
(Select h.sbo_num (Select h.sbo_num
From hls_journal_header h, hls_journal_detail l From hls_journal_header h, hls_journal_detail l
Where h.journal_header_id = l.journal_header_id Where h.journal_header_id = l.journal_header_id
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<a:service xmlns:ns1="leaf.application.action" xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true"> <a:service xmlns:ns1="leaf.application.action" 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="app/app_login_check.js"><![CDATA[ <s:server-script import="app/app_login_check.js"><![CDATA[
function app_calc() { function app_calc() {
var app_calc_bm = $bm('app.app_calc'); var app_calc_bm = $bm('app.app_calc');
......
...@@ -10,7 +10,9 @@ ...@@ -10,7 +10,9 @@
<bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_V.BP_ID"/> <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_V.BP_ID"/>
<bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" physicalName="BP_CODE" prompt="HLS.BP_TITLE"/> <bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" physicalName="BP_CODE" prompt="HLS.BP_TITLE"/>
<bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="HLS.BP_NAME_SHORT"/> <bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="HLS.BP_NAME_SHORT"/>
<bm:field name="bp_category" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY"/> <!--<bm:field name="bp_category" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY"/>-->
<!--modify by 18938 I-7214-->
<bm:field name="bp_category" expression= "(SELECT h.bp_category FROM hls_bp_master h where h.bp_id = t1.bp_id)"/>
<bm:field name="bp_category_name" expression= "(SELECT h.description FROM hls_bp_category h where h.bp_category = t1.bp_category )" prompt="商业伙伴类型"/> <bm:field name="bp_category_name" expression= "(SELECT h.description FROM hls_bp_category h where h.bp_category = t1.bp_category )" prompt="商业伙伴类型"/>
</bm:fields> </bm:fields>
<bm:features> <bm:features>
......
...@@ -40,6 +40,6 @@ ...@@ -40,6 +40,6 @@
<bm:data-filters> <bm:data-filters>
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/> <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
<bm:data-filter name="query" expression="(t1.enabled_flag=&apos;Y&apos;)"/> <bm:data-filter name="query" expression="(t1.enabled_flag=&apos;Y&apos;)"/>
<bm:data-filter name="query" expression="(t1.bp_category in ('TENANT','AGENT','RENTER','MAN_FACTURER') or exists(select 1 from hls_bp_master_role br where br.bp_id = t1.bp_id and br.enabled_flag = 'Y' and br.bp_category in('TENANT','AGENT','RENTER','MAN_FACTURER') and br.bp_type in('TENANT','AGENT','RENTER','MAN_FACTURER')))"/> <bm:data-filter name="query" expression="(t1.bp_category in ('TENANT','AGENT') or exists(select 1 from hls_bp_master_role br where br.bp_id = t1.bp_id and br.enabled_flag = 'Y' and br.bp_category in('TENANT','AGENT') and br.bp_type in('TENANT','AGENT')))"/>
</bm:data-filters> </bm:data-filters>
</bm:model> </bm:model>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
prj_cdd_item pci prj_cdd_item pci
WHERE doc.document_id = ${@table_pk_value} WHERE doc.document_id = ${@table_pk_value}
AND doc.document_table = ${@table_name} AND doc.document_table = ${@table_name}
AND fam.table_name = 'PRJ_CDD_ITEM_CHECK' --AND fam.table_name = 'PRJ_CDD_ITEM_CHECK'
AND fam.table_pk_value = TO_CHAR(doc.check_id) AND fam.table_pk_value = TO_CHAR(doc.check_id)
AND fam.attachment_id = faa.attachment_id AND fam.attachment_id = faa.attachment_id
and lgt.tab_group_id = tg.tab_group_id and lgt.tab_group_id = tg.tab_group_id
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
and pck.check_id=doc.check_id and pck.check_id=doc.check_id
and pci.cdd_item_id = pck.cdd_item_id and pci.cdd_item_id = pck.cdd_item_id
and tg.tab_group=${@group_code} and tg.tab_group=${@group_code}
union all union
SELECT fam.table_name, SELECT fam.table_name,
fam.table_pk_value, fam.table_pk_value,
fam.record_id, fam.record_id,
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: wangwei
$Date: 2022-12_06 上午11:00:06
$Revision: 3.0
$Purpose:合同变更租赁物保存校验
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
con_contract_workflow_pkg.check_change_con_lease_item(
p_contract_id =>${@contract_id},
p_machine_number =>${@machine_number},
p_user_id => ${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<bm:operation name="update"> <bm:operation name="update">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
begin begin
contract_phone_change.phone_commit(p_contract_id => ${@contract_id}, contract_phone_change_pkg.phone_commit(p_contract_id => ${@contract_id},
p_user_id => ${/session/@user_id} p_user_id => ${/session/@user_id}
); );
end; end;
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
t.write_off_amount received_amount t.write_off_amount received_amount
FROM business_write_detail t FROM business_write_detail t
#WHERE_CLAUSE# #WHERE_CLAUSE#
order by extra_name, bp_code_tenant, contract_id,times,transaction_date,write_off_date order by extra_name,bp_code_tenant,contract_id,times,transaction_date,write_off_date
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
<bm:operation name="execute"> <bm:operation name="execute">
......
...@@ -169,6 +169,10 @@ ...@@ -169,6 +169,10 @@
0 0
END) monthly_purchase_amount, END) monthly_purchase_amount,
--当月回租金 --当月回租金
--modify by 18938 I-7310
decode(t.contract_number,
'SXJ21040016',
1170220.13,
nvl((SELECT SUM(cwo.write_off_due_amount) nvl((SELECT SUM(cwo.write_off_due_amount)
FROM csh_write_off cwo, csh_transaction ct FROM csh_write_off cwo, csh_transaction ct
WHERE cwo.contract_id = t.contract_id WHERE cwo.contract_id = t.contract_id
...@@ -179,7 +183,7 @@ ...@@ -179,7 +183,7 @@
TRUNC(last_day(to_date(${@start_calc_date}, 'yyyy-mm-dd'))) TRUNC(last_day(to_date(${@start_calc_date}, 'yyyy-mm-dd')))
AND trunc(ct.transaction_date) >= AND trunc(ct.transaction_date) >=
TRUNC(to_date(${@start_calc_date}, 'yyyy-mm-dd'))), TRUNC(to_date(${@start_calc_date}, 'yyyy-mm-dd'))),
0) write_off_amount, 0)) write_off_amount,
--当月回收首付款 --当月回收首付款
contract_item_query_pkg.calc_down_payment_write(p_contract_id=> t.contract_id, contract_item_query_pkg.calc_down_payment_write(p_contract_id=> t.contract_id,
...@@ -212,6 +216,10 @@ ...@@ -212,6 +216,10 @@
trunc(to_date(${@start_calc_date}, 'yyyy-mm-dd'))), trunc(to_date(${@start_calc_date}, 'yyyy-mm-dd'))),
0) write_off_penalty, 0) write_off_penalty,
--期末数据 --期末数据
--modify by 18938 I-7310
decode(t.contract_number,
'SXJ21040016',
0,
(SELECT SUM(nvl(ccc.due_amount, 0)) (SELECT SUM(nvl(ccc.due_amount, 0))
FROM con_contract_cashflow ccc FROM con_contract_cashflow ccc
WHERE ccc.contract_id = t.contract_id WHERE ccc.contract_id = t.contract_id
...@@ -228,14 +236,17 @@ ...@@ -228,14 +236,17 @@
and exists(select 1 and exists(select 1
from con_contract_cashflow cc from con_contract_cashflow cc
where cc.CASHFLOW_ID = cwo.CASHFLOW_ID where cc.CASHFLOW_ID = cwo.CASHFLOW_ID
and cc.CF_STATUS = 'RELEASE') and cc.CF_STATUS = 'RELEASE')),
), 0)) rest_unpayment_amount,
0) rest_unpayment_amount,
--保证金后 --保证金后
--modify by 18938 I-7310
decode(t.contract_number,
'SXJ21040016',
0,
contract_item_query_pkg.calc_rest_rent_by_dudt(p_contract_id => t.contract_id, contract_item_query_pkg.calc_rest_rent_by_dudt(p_contract_id => t.contract_id,
p_calc_date => last_day( p_calc_date => last_day(
to_date(${@start_calc_date}, 'yyyy-mm-dd')), to_date(${@start_calc_date}, 'yyyy-mm-dd')),
p_user_id => -1) rest_unpayment_amount_af, p_user_id => -1)) rest_unpayment_amount_af,
contract_item_query_pkg.calc_down_payment_balance(p_contract_id=>t.contract_id, contract_item_query_pkg.calc_down_payment_balance(p_contract_id=>t.contract_id,
p_calc_date =>last_day( p_calc_date =>last_day(
...@@ -259,6 +270,10 @@ ...@@ -259,6 +270,10 @@
TRUNC(last_day(to_date(${@start_calc_date}, 'yyyy-mm-dd')))), TRUNC(last_day(to_date(${@start_calc_date}, 'yyyy-mm-dd')))),
0) rest_unpurchase_amount, 0) rest_unpurchase_amount,
--逾期租金 --逾期租金
--modify by 18938 I-7310
decode(t.contract_number,
'SXJ21040016',
0,
(CASE (CASE
WHEN (nvl((SELECT SUM(nvl(ccc.due_amount, 0)) WHEN (nvl((SELECT SUM(nvl(ccc.due_amount, 0))
FROM con_contract_cashflow ccc FROM con_contract_cashflow ccc
...@@ -308,14 +323,18 @@ ...@@ -308,14 +323,18 @@
0)) 0))
ELSE ELSE
0 0
END) rest_overdue_amount, END)) rest_overdue_amount,
--modify by 18938 I-7310
decode(t.contract_number,
'SXJ21040016',
0,
contract_item_query_pkg.calc_overdue_amount_by_dudt(p_contract_id => t.contract_id, contract_item_query_pkg.calc_overdue_amount_by_dudt(p_contract_id => t.contract_id,
p_calc_date =>comparedate(p_date1 => last_day( p_calc_date =>comparedate(p_date1 => last_day(
to_date(${@start_calc_date}, to_date(${@start_calc_date},
'yyyy-mm-dd')), 'yyyy-mm-dd')),
p_date2 =>sysdate, p_date2 =>sysdate,
p_type =>'SMALL'), p_type =>'SMALL'),
p_user_id => -1) rest_overdue_amount_af, p_user_id => -1)) rest_overdue_amount_af,
--逾期违约金 --逾期违约金
(contract_item_query_pkg.calc_penalty_by_contract(p_contract_id => t.contract_id, (contract_item_query_pkg.calc_penalty_by_contract(p_contract_id => t.contract_id,
p_calc_date =>last_day(to_date( p_calc_date =>last_day(to_date(
...@@ -387,11 +406,11 @@ ...@@ -387,11 +406,11 @@
And v1.code_enabled_flag = 'Y' And v1.code_enabled_flag = 'Y'
And v1.code_value_enabled_flag = 'Y' And v1.code_value_enabled_flag = 'Y'
and v1.CODE_VALUE = t.is_buyout) is_buyout_n, and v1.CODE_VALUE = t.is_buyout) is_buyout_n,
(select sh.large_balance from prj_quotation sh where sh.DOCUMENT_ID = t.project_id) large_balance, t.large_balance,
(select v.code_value_name (select v.code_value_name
from sys_code_values_v v from sys_code_values_v v
where v.code = 'SECONDARY_LEASE' where v.code = 'SECONDARY_LEASE'
and v.code_value = (select sh.large_balance from prj_quotation sh where sh.DOCUMENT_ID = t.project_id)) large_balance_n, and v.code_value = t.large_balance) large_balance_n,
t.branch_code, t.branch_code,
(Select v.code_value_name (Select v.code_value_name
From sys_code_values_v v From sys_code_values_v v
...@@ -405,7 +424,8 @@ ...@@ -405,7 +424,8 @@
AND (t.contract_status IN ('INCEPT', AND (t.contract_status IN ('INCEPT',
'TERMINATING', 'TERMINATING',
'ETING', 'ETING',
'REPURING') or 'REPURING',
'PENDING') or
(to_char(t.et_date, 'yyyy-mm') >= ${@period_name} and t.contract_status in ('TERMINATE', (to_char(t.et_date, 'yyyy-mm') >= ${@period_name} and t.contract_status in ('TERMINATE',
'ET'))) 'ET')))
and trunc(t.lease_start_date) <= trunc(last_day(to_date(${@start_calc_date}, 'yyyy-mm-dd'))) and trunc(t.lease_start_date) <= trunc(last_day(to_date(${@start_calc_date}, 'yyyy-mm-dd')))
......
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
--支付预定日 --支付预定日
ccc.due_date, ccc.due_date,
--应收款金额 --应收款金额
--modify by 18938 I-7310
(case
when t.contract_number = 'SXJ21040016' and ccc.times = 36 and
ccc.cf_item = 200 then
1170220.13
else
(ccc.due_amount - (ccc.due_amount -
nvl((SELECT SUM(cwo.write_off_due_amount) nvl((SELECT SUM(cwo.write_off_due_amount)
FROM csh_transaction t, csh_write_off cwo FROM csh_transaction t, csh_write_off cwo
...@@ -31,16 +37,28 @@ ...@@ -31,16 +37,28 @@
AND nvl(cwo.reversed_flag, 'N') = 'N' AND nvl(cwo.reversed_flag, 'N') = 'N'
AND trunc(t.transaction_date) < AND trunc(t.transaction_date) <
trunc(to_date(${@start_calc_date}, 'yyyy-mm-dd'))), trunc(to_date(${@start_calc_date}, 'yyyy-mm-dd'))),
0)) net_amount, 0)) end) net_amount,
--当月已收款金额 --当月已收款金额
--modify by 18938 I-7310
(case
when t.contract_number = 'SXJ21040016' and ccc.times = 36 and
ccc.cf_item = 200 then
1170220.13
else
nvl((SELECT SUM(cwo.write_off_due_amount) nvl((SELECT SUM(cwo.write_off_due_amount)
FROM csh_transaction t, csh_write_off cwo FROM csh_transaction t, csh_write_off cwo
WHERE cwo.cashflow_id = ccc.cashflow_id WHERE cwo.cashflow_id = ccc.cashflow_id
AND t.transaction_id = cwo.csh_transaction_id AND t.transaction_id = cwo.csh_transaction_id
AND nvl(cwo.reversed_flag, 'N') = 'N' AND nvl(cwo.reversed_flag, 'N') = 'N'
AND to_char(t.transaction_date, 'yyyy-mm') = ${@period_name}), AND to_char(t.transaction_date, 'yyyy-mm') = ${@period_name}),
0) write_off_amount, 0) end ) write_off_amount,
--剩余金额 --剩余金额
--modify by 18938 I-7310
(case
when t.contract_number = 'SXJ21040016' and ccc.times = 36 and
ccc.cf_item = 200 then
0
else
(ccc.due_amount - (ccc.due_amount -
nvl((SELECT SUM(cwo.write_off_due_amount) nvl((SELECT SUM(cwo.write_off_due_amount)
FROM csh_transaction t, csh_write_off cwo FROM csh_transaction t, csh_write_off cwo
...@@ -49,8 +67,11 @@ ...@@ -49,8 +67,11 @@
AND nvl(cwo.reversed_flag, 'N') = 'N' AND nvl(cwo.reversed_flag, 'N') = 'N'
AND trunc(t.transaction_date) <= AND trunc(t.transaction_date) <=
trunc(to_date(${@last_month_date}, 'yyyy-mm-dd'))), trunc(to_date(${@last_month_date}, 'yyyy-mm-dd'))),
0)) unrecived_amount, 0)) end) unrecived_amount,
--逾期天数 --逾期天数
--modify by 18938 I-7310
decode(t.contract_number , 'SXJ21040016',
0,
(CASE (CASE
WHEN (ccc.due_amount - WHEN (ccc.due_amount -
nvl((SELECT SUM(cwo.write_off_due_amount) nvl((SELECT SUM(cwo.write_off_due_amount)
...@@ -65,7 +86,7 @@ ...@@ -65,7 +86,7 @@
floor(to_date(${@last_month_date}, 'yyyy-mm-dd') - ccc.due_date) floor(to_date(${@last_month_date}, 'yyyy-mm-dd') - ccc.due_date)
ELSE ELSE
0 0
END) overdue_days, END)) overdue_days,
NVL((select sum((nvl(tt.transaction_amount, 0) - nvl(tt.write_off_amount, 0) - NVL((select sum((nvl(tt.transaction_amount, 0) - nvl(tt.write_off_amount, 0) -
nvl(tt.returned_amount, 0))) nvl(tt.returned_amount, 0)))
from csh_transaction tt from csh_transaction tt
...@@ -101,11 +122,11 @@ ...@@ -101,11 +122,11 @@
else else
0 0
end as write_of_penalty_amount, end as write_of_penalty_amount,
(select sh.large_balance from prj_quotation sh where sh.DOCUMENT_ID = t.project_id) large_balance, t.large_balance,
(select v.code_value_name (select v.code_value_name
from sys_code_values_v v from sys_code_values_v v
where v.code = 'SECONDARY_LEASE' where v.code = 'SECONDARY_LEASE'
and v.code_value = (select sh.large_balance from prj_quotation sh where sh.DOCUMENT_ID = t.project_id)) large_balance_n, and v.code_value = t.large_balance) large_balance_n,
t.branch_code, t.branch_code,
(Select v.code_value_name (Select v.code_value_name
From sys_code_values_v v From sys_code_values_v v
......
...@@ -186,8 +186,126 @@ ...@@ -186,8 +186,126 @@
FROM FROM
CON_CONTRACT_CONTENT_V t1 CON_CONTRACT_CONTENT_V t1
WHERE WHERE
t1.templet_usage in ('CON_SALE', 'CONTRACT') t1.templet_code !='GH_WITHHOLD_AGREE'
)t UNION ALL
SELECT
t1.content_id,
t1.contract_id,
t1.con_contract_bp_id,
t1.mortgage_id,
t1.content_number,
t1.content_print_flag,
t1.content_print_flag_name,
t1.bp_category,
t1.bp_category_desc,
t1.bp_class,
t1.bp_class_desc,
t1.bp_id,
t1.bp_name,
t1.available_flag,
t1.employee_id_witness_name,
t1.sign_date,
t1.sign_place,
t1.signer_opposite_side,
t1.notary,
t1.templet_id,
t1.templet_code,
t1.templet_name,
t1.templet_usage,
t1.clause_usage,
t1.clause_usage_name,
t1.ref_v01,
t1.ref_v02,
t1.ref_v03,
t1.ref_v04,
t1.ref_v05,
t1.ref_n01,
t1.ref_n02,
t1.ref_n03,
t1.ref_n04,
t1.ref_n05,
t1.ref_d01,
t1.ref_d02,
t1.ref_d03,
t1.ref_d04,
t1.ref_d05,
t1.couple_guarantee_flag,
(SELECT
COUNT(1)
FROM
fnd_atm_attachment_multi m
WHERE
m.table_name = 'CON_CONTRACT_CONTENT_WORKFLOW' AND
m.table_pk_value = TO_CHAR(t1.content_id)
) AS attach_count,
(SELECT
'Y'
FROM
fnd_atm_attachment_multi m1
WHERE
m1.table_name = 'CON_CONTRACT_CONTENT' AND
m1.table_pk_value = t1.content_id
) AS file_exists_flag,
CASE
WHEN (SELECT COUNT(*)
FROM con_contract_signature s
WHERE s.content_id = t1.content_id
AND s.status = 2) >= 1 THEN
'2'
WHEN (SELECT COUNT(*)
FROM con_contract_signature s
WHERE s.content_id = t1.content_id
AND s.status = 3) >= 1 THEN
'3'
WHEN (SELECT COUNT(*)
FROM con_contract_signature s
WHERE s.content_id = t1.content_id
AND s.status = 4) >= 1 THEN
'4'
WHEN (SELECT COUNT(*)
FROM con_contract_signature s
WHERE s.content_id = t1.content_id
AND s.status = 5) >= 1 THEN
'5'
ELSE
'1'
END AS status,
CASE
WHEN (SELECT COUNT(*)
FROM con_contract_signature s
WHERE s.content_id = t1.content_id
AND s.status = 2) >= 1 THEN
'部分签署'
WHEN (SELECT COUNT(*)
FROM con_contract_signature s
WHERE s.content_id = t1.content_id
AND s.status = 3) >= 1 THEN
'全部签署'
WHEN (SELECT COUNT(*)
FROM con_contract_signature s
WHERE s.content_id = t1.content_id
AND s.status = 4) >= 1 THEN
'已盖章'
WHEN (SELECT COUNT(*)
FROM con_contract_signature s
WHERE s.content_id = t1.content_id
AND s.status = 5) >= 1 THEN
'已拒绝'
ELSE
'未签署'
END AS status_desc,
(SELECT COUNT(*) FROM con_contract_signature s WHERE s.content_id = t1.content_id AND s.status = 4)download_flag,
t1.agent_content_flag,
t1.download_content_flag,
t1.agent_content_flag_name,
t1.download_content_flag_name,
t1.print_date,
t1.order_seq
FROM
CON_CONTRACT_CONTENT_V t1
WHERE
t1.templet_code='GH_WITHHOLD_AGREE'
AND NVL(t1.withhold_way,'0') = 'SPD')t
#WHERE_CLAUSE# #WHERE_CLAUSE#
ORDER BY t.order_seq,decode(t.bp_category,'TENANT',0,'GUARANTOR',1,'VENDER',2,'') ORDER BY t.order_seq,decode(t.bp_category,'TENANT',0,'GUARANTOR',1,'VENDER',2,'')
]]></bm:query-sql> ]]></bm:query-sql>
......
...@@ -148,7 +148,6 @@ ...@@ -148,7 +148,6 @@
<bm:field name="telex_transfer_bank_id" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TELEX_TRANSFER_BANK_ID" prompt="CON301.CON_CONTRACT_V.TELEX_TRANSFER_BANK_ID"/> <bm:field name="telex_transfer_bank_id" databaseType="NUMBER" datatype="java.lang.Double" physicalName="TELEX_TRANSFER_BANK_ID" prompt="CON301.CON_CONTRACT_V.TELEX_TRANSFER_BANK_ID"/>
<bm:field name="tt_bank_branch_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TT_BANK_BRANCH_NAME" prompt="CON301.CON_CONTRACT_V.TT_BANK_BRANCH_NAME"/> <bm:field name="tt_bank_branch_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TT_BANK_BRANCH_NAME" prompt="CON301.CON_CONTRACT_V.TT_BANK_BRANCH_NAME"/>
<bm:field name="tt_bank_account_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TT_BANK_ACCOUNT_NUM" prompt="CON301.CON_CONTRACT_V.TT_BANK_ACCOUNT_NUM"/> <bm:field name="tt_bank_account_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TT_BANK_ACCOUNT_NUM" prompt="CON301.CON_CONTRACT_V.TT_BANK_ACCOUNT_NUM"/>
<bm:field name="insurance_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="insurance_number" prompt="保单编号"/>
<bm:field name="tt_bank_account_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TT_BANK_ACCOUNT_NAME" prompt="CON301.CON_CONTRACT_V.TT_BANK_ACCOUNT_NAME"/> <bm:field name="tt_bank_account_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TT_BANK_ACCOUNT_NAME" prompt="CON301.CON_CONTRACT_V.TT_BANK_ACCOUNT_NAME"/>
<bm:field name="tt_remark" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TT_REMARK" prompt="CON301.CON_CONTRACT_V.TT_REMARK"/> <bm:field name="tt_remark" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="TT_REMARK" prompt="CON301.CON_CONTRACT_V.TT_REMARK"/>
<bm:field name="direct_debit_bank_id" databaseType="NUMBER" datatype="java.lang.Double" physicalName="DIRECT_DEBIT_BANK_ID" prompt="CON301.CON_CONTRACT_V.DIRECT_DEBIT_BANK_ID"/> <bm:field name="direct_debit_bank_id" databaseType="NUMBER" datatype="java.lang.Double" physicalName="DIRECT_DEBIT_BANK_ID" prompt="CON301.CON_CONTRACT_V.DIRECT_DEBIT_BANK_ID"/>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="HLS_BP_MASTER_V" defaultOrderBy="bp_code" needAccessControl="false"> <bm:model xmlns:s="leaf.plugin.script" xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="HLS_BP_MASTER_V" defaultOrderBy="bp_code" needAccessControl="false">
<bm:fields> <bm:fields>
<bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_V.BP_ID"/> <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_V.BP_ID"/>
<bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="210" forDisplay="true" forQuery="true" physicalName="BP_CODE" prompt="HLS.BP_CODE"/> <bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="210" forDisplay="true" forQuery="true" physicalName="BP_CODE" prompt="HLS.BP_CODE"/>
...@@ -20,9 +20,7 @@ ...@@ -20,9 +20,7 @@
<bm:field name="bp_class_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CLASS_NAME"/> <bm:field name="bp_class_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CLASS_NAME"/>
<!-- <bm:field name="created_by" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CREATED_BY" prompt="HLS_BP_MASTER_V.CREATED_BY"/> --> <!-- <bm:field name="created_by" databaseType="NUMBER" datatype="java.lang.Long" physicalName="CREATED_BY" prompt="HLS_BP_MASTER_V.CREATED_BY"/> -->
</bm:fields> </bm:fields>
<bm:features>
<f:standard-who/>
</bm:features>
<bm:query-fields> <bm:query-fields>
<!-- <bm:query-field field="created_by" queryOperator="="/> --> <!-- <bm:query-field field="created_by" queryOperator="="/> -->
<bm:query-field field="bp_code" queryOperator="like"/> <bm:query-field field="bp_code" queryOperator="like"/>
...@@ -34,5 +32,12 @@ ...@@ -34,5 +32,12 @@
<bm:data-filters> <bm:data-filters>
<bm:data-filter name="company_id" enforceOperations="query" expression="(t1.company_id=${/session/@company_id})"/> <bm:data-filter name="company_id" enforceOperations="query" expression="(t1.company_id=${/session/@company_id})"/>
<bm:data-filter name="enabled_flag" enforceOperations="query" expression="(t1.enabled_flag=&apos;Y&apos;)"/> <bm:data-filter name="enabled_flag" enforceOperations="query" expression="(t1.enabled_flag=&apos;Y&apos;)"/>
<bm:data-filter enforceOperations="query" expression="( exists (select 1 from aut_trx_user_authorize a1,aut_owner_user_authorize a2 where a1.trx_category =&apos;BP&apos;
and a1.trx_id = t1.bp_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))) )"/>
</bm:data-filters> </bm:data-filters>
</bm:model> </bm:model>
...@@ -372,7 +372,7 @@ ...@@ -372,7 +372,7 @@
</bm:operations> </bm:operations>
<bm:query-fields> <bm:query-fields>
<bm:query-field name="contract_number" <bm:query-field name="contract_number"
queryExpression="contract_number like &apos;%&apos;|| ${@contract_number} ||&apos;%&apos;"/> queryExpression="contract_number like &apos;%&apos;|| ${@contract_number}||&apos;%&apos;"/>
<!--<bm:query-field name="bp_id_tenant" queryExpression="t1.bp_id_tenant = ${@bp_id_tenant}"/>--> <!--<bm:query-field name="bp_id_tenant" queryExpression="t1.bp_id_tenant = ${@bp_id_tenant}"/>-->
<bm:query-field name="bp_id_tenant_desc" queryExpression="t1.bp_id_tenant_desc like &apos;%&apos;|| ${@bp_id_tenant_desc}||&apos;%&apos;"/> <bm:query-field name="bp_id_tenant_desc" queryExpression="t1.bp_id_tenant_desc like &apos;%&apos;|| ${@bp_id_tenant_desc}||&apos;%&apos;"/>
<!-- <bm:query-field name="contract_name" queryExpression="t1.contract_name like ${@contract_name} "/>--> <!-- <bm:query-field name="contract_name" queryExpression="t1.contract_name like ${@contract_name} "/>-->
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
$Revision: 1.0 $Revision: 1.0
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: shenyamin
$Date: 2018-11_03 上午11:00:06
$Revision: 3.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT cr.req_status sign_contract_status
From con_contract_change_req cr
Where cr.change_req_id= ${@change_req_id}
]]>
</bm:query-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="sign_contract_status" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="sign_contract_status"/>
</bm:fields>
</bm:model>
...@@ -18,6 +18,60 @@ ...@@ -18,6 +18,60 @@
to_char(add_months(sysdate, -1), 'YYYY') || '-' || to_char(add_months(sysdate, -1), 'YYYY') || '-' ||
to_char(add_months(sysdate, -1), 'MM') period_name, to_char(add_months(sysdate, -1), 'MM') period_name,
trunc(last_day(add_months(sysdate,-1)))end_date trunc(last_day(add_months(sysdate,-1)))end_date
from dual
union
select to_number(to_char(add_months(sysdate, -2), 'YYYYMM')) internal_period_num,
to_char(add_months(sysdate, -2), 'YYYY') || '-' ||
to_char(add_months(sysdate, -2), 'MM') period_name,
trunc(last_day(add_months(sysdate,-2)))end_date
from dual
union
select to_number(to_char(add_months(sysdate, -3), 'YYYYMM')) internal_period_num,
to_char(add_months(sysdate, -3), 'YYYY') || '-' ||
to_char(add_months(sysdate, -3), 'MM') period_name,
trunc(last_day(add_months(sysdate,-3)))end_date
from dual
union
select to_number(to_char(add_months(sysdate, -4), 'YYYYMM')) internal_period_num,
to_char(add_months(sysdate, -4), 'YYYY') || '-' ||
to_char(add_months(sysdate, -4), 'MM') period_name,
trunc(last_day(add_months(sysdate,-4)))end_date
from dual
union
select to_number(to_char(add_months(sysdate, -5), 'YYYYMM')) internal_period_num,
to_char(add_months(sysdate, -5), 'YYYY') || '-' ||
to_char(add_months(sysdate, -5), 'MM') period_name,
trunc(last_day(add_months(sysdate,-5)))end_date
from dual
union
select to_number(to_char(add_months(sysdate, -6), 'YYYYMM')) internal_period_num,
to_char(add_months(sysdate, -6), 'YYYY') || '-' ||
to_char(add_months(sysdate, -6), 'MM') period_name,
trunc(last_day(add_months(sysdate,-6)))end_date
from dual
union
select to_number(to_char(add_months(sysdate, -7), 'YYYYMM')) internal_period_num,
to_char(add_months(sysdate, -7), 'YYYY') || '-' ||
to_char(add_months(sysdate, -7), 'MM') period_name,
trunc(last_day(add_months(sysdate,-7)))end_date
from dual
union
select to_number(to_char(add_months(sysdate, -8), 'YYYYMM')) internal_period_num,
to_char(add_months(sysdate, -8), 'YYYY') || '-' ||
to_char(add_months(sysdate, -8), 'MM') period_name,
trunc(last_day(add_months(sysdate,-8)))end_date
from dual
union
select to_number(to_char(add_months(sysdate, -9), 'YYYYMM')) internal_period_num,
to_char(add_months(sysdate, -9), 'YYYY') || '-' ||
to_char(add_months(sysdate, -9), 'MM') period_name,
trunc(last_day(add_months(sysdate,-9)))end_date
from dual
union
select to_number(to_char(add_months(sysdate, -10), 'YYYYMM')) internal_period_num,
to_char(add_months(sysdate, -10), 'YYYY') || '-' ||
to_char(add_months(sysdate, -10), 'MM') period_name,
trunc(last_day(add_months(sysdate,-10)))end_date
from dual from dual
order by internal_period_num desc) t1 #WHERE_CLAUSE# order by internal_period_num desc) t1 #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
......
...@@ -135,13 +135,10 @@ ...@@ -135,13 +135,10 @@
hlc.enabled_flag = 'Y' hlc.enabled_flag = 'Y'
) lease_channel_n, ) lease_channel_n,
t.division, t.division,
(SELECT (SELECT v.code_value_name
t2.description FROM sys_code_values_v v
FROM where v.code = 'DIVISION'
hls_division t2 and v.code_value = t.division
WHERE
t2.enabled_flag = 'Y' AND
t2.division = t.division
) division_n ) division_n
FROM FROM
con_contract t, con_contract t,
......
...@@ -135,11 +135,11 @@ ...@@ -135,11 +135,11 @@
hlc.enabled_flag = 'Y' hlc.enabled_flag = 'Y'
) lease_channel_n, ) lease_channel_n,
t.division, t.division,
-- add by lihh 20210323 租赁物
(SELECT v.code_value_name (SELECT v.code_value_name
FROM sys_code_values_v v FROM sys_code_values_v v
where v.code = 'DIVISION' where v.code = 'DIVISION'
and v.code_value = t.division) division_n, and v.code_value = t.division
) division_n,
r.change_req_number, r.change_req_number,
r.change_req_id, r.change_req_id,
r.req_status, r.req_status,
......
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
csh_abc_import_pkg.abc_save(
p_receipt_no =>${@receipt_no},
p_user_id =>${/session/@user_id},
p_paid_byother_flag_desc =>${@paid_byother_flag_desc},
p_payer_name =>${@payer_name},
p_collection_classes_desc =>${@collection_classes_desc},
p_guarantor_name_duty =>${@guarantor_name_duty},
p_bank_receipt_date =>to_date(${@bank_receipt_date},'yyyy-MM-dd'),
p_bank_num =>${@bank_num},
p_payer_number =>${@payer_number},
p_bank_name =>${@bank_name},
p_beneficiary_name =>${@beneficiary_name},
p_total_amount =>${@total_amount},
p_import_itfc_id =>${@import_itfc_id});
end;
]]>
</bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT t1.*
FROM (SELECT li.line_id,
li.error_message,
li.status,
li.header_id,
li.line_number,
hd.created_by,
li.source_table,
'03399500040009165' bank_num, --update by xsh35973
'人民币' currency_type, --update by xsh35973
li.attribute_1,
li.attribute_2,
li.attribute_3,
li.attribute_4,
li.attribute_5,
li.attribute_6,
li.attribute_7,
li.attribute_8,
li.attribute_9,
li.attribute_10,
li.attribute_11,
li.attribute_12,
li.attribute_13,
li.attribute_14,
li.attribute_15,
li.attribute_16,
li.attribute_17,
li.attribute_18,
li.attribute_19,
li.attribute_20,
li.attribute_21,
li.attribute_22,
li.attribute_23,
li.attribute_24,
li.attribute_25,
li.attribute_26,
t.csh_bank_account_num,
t.transaction_date,
t.bank_slip_num,
t.bp_bank_account_num,
t.bp_bank_account_name,
t.bp_bank_name,
t.bp_category,
t.transaction_amount,
t.collection_classes,
(select v.code_value_name from sys_code_values_v v where v.code='DS_COLLECTION_CLASSES'and v.code_value=t.collection_classes)collection_classes_desc,
t.bp_id ,
(select bp_name from hls_bp_master where bp_id = t.bp_id) bp_name,
t.paid_byother_flag,
decode(t.paid_byother_flag,'T','是','F','否')paid_byother_flag_desc,
t.csh_bank_account_id bank_account_id,
t.exists_flag,
t.temp_id,
(
case when
(select count(v.unit_id) from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_id = t.bp_id) = 1
then
(Select u.unit_name From exp_org_unit_v u Where u.unit_id = (select v.unit_id from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_id = t.bp_id))
else
' '
end
) extra_nam,
(Select u.bp_code From hls_bp_master u Where u.unit_id = (select v.unit_id from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_id = t.bp_id) and u.bp_type = 'AGENT') bp_code,
t.guarantor_name_duty,
decode(t.guarantor_name_duty,'Y','是','N','否') guarantor_name_duty_desc
FROM fnd_interface_headers hd,
fnd_interface_lines li,
csh_transaction_import_temp t
WHERE hd.header_id = li.header_id and li.line_id = t.line_id and hd.header_id = t.header_id
AND hd.template_code = 'CSH_TRX_BANK'
AND li.line_number >0
AND HD.CREATED_BY = ${/session/@user_id}
) t1
#WHERE_CLAUSE#
order by t1.line_number
]]></bm:query-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
csh_transaction_pkg.csh_transaction_import_check(
p_header_id => ${/model/header/record/@header_id},
p_user_id => ${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="insert">
<bm:update-sql><![CDATA[
begin
delete from csh_transaction_import_temp where header_id = ${@header_id};
csh_abc_import_pkg.save_abc_import(
p_transaction_id =>${@transaction_id},
p_transaction_num =>${@transaction_num},
p_transaction_category =>'BUSINESS',
p_transaction_type =>${@transaction_type},
p_transaction_date =>to_date(${@transaction_date}, 'yyyy-mm-dd'),
p_penalty_calc_date =>to_date(${@transaction_date}, 'yyyy-mm-dd'),
p_bank_slip_num =>${@bank_slip_num},
p_company_id =>${/session/@company_id},
p_internal_period_num =>${@internal_period_num},
p_period_name =>${@period_name},
p_payment_method_id =>${@payment_method_id},
p_distribution_set_id =>${@distribution_set_id},
p_cashflow_amount =>${@transaction_amount},
p_currency_code =>${@currency_code},
p_transaction_amount =>${@transaction_amount},
p_exchange_rate_type =>${@exchange_rate_type},
p_exchange_rate_quotation =>${@exchange_rate_quotation},
p_exchange_rate =>${@exchange_rate},
p_bank_account_id =>${@bank_account_id},
p_bp_category =>${@bp_category},
p_bp_id =>${@bp_id},
p_bp_bank_account_id =>${@bp_bank_account_id},
p_bp_bank_account_num =>${@bp_bank_account_num},
p_description =>${@description},
p_handling_charge =>${@handling_charge},
p_posted_flag =>nvl(${@posted_flag}, 'N'),
p_reversed_flag =>nvl(${@reversed_flag}, 'N'),
p_reversed_date =>to_date(${@reversed_date}, 'yyyy-mm-dd 24hh:mi:ss'),
p_returned_flag =>nvl(${@returned_flag}, 'NOT'),
p_returned_amount =>${@returned_amount},
p_write_off_flag =>nvl(${@write_off_flag}, 'NOT'),
p_write_off_amount =>${@write_off_amount},
p_full_write_off_date =>to_date(${@full_write_off_date}, 'yyyy-mm-dd 24hh:mi:ss'),
p_twin_csh_trx_id =>${@twin_csh_trx_id},
p_return_from_csh_trx_id =>${@return_from_csh_trx_id},
p_reversed_csh_trx_id =>${@reversed_csh_trx_id},
p_source_csh_trx_type =>${@source_csh_trx_type},
p_source_csh_trx_id =>${@source_csh_trx_id},
p_source_doc_category =>${@source_doc_category},
p_source_doc_type =>${@source_doc_type},
p_source_doc_id =>${@source_doc_id},
p_source_doc_line_id =>${@source_doc_line_id},
p_create_je_mothed =>${@create_je_mothed},
p_create_je_flag =>nvl(${@create_je_flag}, 'N'),
p_gld_interface_flag =>nvl(${@gld_interface_flag}, 'N'),
p_user_id =>${/session/@user_id},
p_ref_contract_id => ${@ref_contract_id},
p_receipt_type => ${@receipt_type},
p_csh_bp_name => ${@csh_bp_name},
p_bp_name => ${@bp_name},
p_ref_n01 =>${@ref_n01},
p_bp_bank_name =>${@bp_bank_name},
p_bp_bank_branch_name =>${@bp_bank_branch_name},
p_collection_classes =>${@collection_classes},
p_bp_bank_account_name =>${@bp_bank_account_name},
p_opposite_band_na =>${@opposite_band_na},
p_banka =>${@banka},
p_purpose =>${@purpose},
p_gsber =>${@gsber},
p_sus_belnr =>${@sus_belnr},
p_bp_virtual_bank_account =>${@bp_virtual_bank_account},
p_zuonr =>${@bank_slip_num},
p_paid_byother_flag =>${@paid_byother_flag},
p_ref_v05 =>${@ref_v05},
p_status =>${@status},
p_bank_account_num =>${@bank_account_num},
p_guarantor_name_duty =>${@guarantor_name_duty},
p_bank_receipt_date =>${@bank_receipt_date},
p_paid_byother_flag_desc =>${@paid_byother_flag_desc},
p_collection_classes_desc =>${@collection_classes_desc},
p_extra_nam =>${@extra_nam},
p_import_source => 'EXCEL_ADD'
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
csh_transaction_pkg.get_bank_account_id(p_bank_account_num =>${@bank_account_num},
p_bp_bank_account_num =>${@bp_bank_account_num},
p_bank_account_id =>${@bank_account_id},
p_bp_category =>${@bp_category},
p_bp_id =>${@bp_id},
p_csh_bp_name =>${@csh_bp_name},
p_user_id =>${session/@user_id}
);
end;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="bank_account_id" dataType="java.lang.Long" output="true"
outputPath="@bank_account_id"/>
<bm:parameter name="bp_category" dataType="java.lang.String" output="true" outputPath="@bp_category"/>
<bm:parameter name="bp_id" dataType="java.lang.Long" output="true" outputPath="@bp_id"/>
<bm:parameter name="csh_bp_name" dataType="java.lang.String" output="true" outputPath="@csh_bp_name"/>
</bm:parameters>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="header_id" queryExpression="t1.header_id=${@header_id}"/>
</bm:query-fields>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
csh_abc_import_pkg.import_transaction(
p_transaction_id =>${@transaction_id},
p_transaction_num =>${@transaction_num},
p_transaction_category =>'BUSINESS',
p_transaction_type =>${@transaction_type},
p_transaction_date =>to_date(${@bank_receipt_date}, 'yyyy-mm-dd'),
p_penalty_calc_date =>to_date(${@bank_receipt_date}, 'yyyy-mm-dd'),
p_bank_slip_num =>${@bank_slip_num},
p_company_id =>${/session/@company_id},
p_internal_period_num =>${@internal_period_num},
p_period_name =>${@period_name},
p_payment_method_id =>${@payment_method_id},
p_distribution_set_id =>${@distribution_set_id},
p_cashflow_amount =>${@transaction_amount},
p_currency_code =>${@currency_code},
p_transaction_amount =>${@transaction_amount},
p_exchange_rate_type =>${@exchange_rate_type},
p_exchange_rate_quotation =>${@exchange_rate_quotation},
p_exchange_rate =>${@exchange_rate},
p_bank_account_id =>${@bank_account_id},
p_bp_category =>${@bp_category},
p_bp_id =>${@bp_id},
p_bp_bank_account_id =>${@bp_bank_account_id},
p_bp_bank_account_num =>${@bp_bank_account_num},
p_description =>${@description},
p_handling_charge =>${@handling_charge},
p_posted_flag =>nvl(${@posted_flag}, 'N'),
p_reversed_flag =>nvl(${@reversed_flag}, 'N'),
p_reversed_date =>to_date(${@reversed_date}, 'yyyy-mm-dd 24hh:mi:ss'),
p_returned_flag =>nvl(${@returned_flag}, 'NOT'),
p_returned_amount =>${@returned_amount},
p_write_off_flag =>nvl(${@write_off_flag}, 'NOT'),
p_write_off_amount =>${@write_off_amount},
p_full_write_off_date =>to_date(${@full_write_off_date}, 'yyyy-mm-dd 24hh:mi:ss'),
p_twin_csh_trx_id =>${@twin_csh_trx_id},
p_return_from_csh_trx_id =>${@return_from_csh_trx_id},
p_reversed_csh_trx_id =>${@reversed_csh_trx_id},
p_source_csh_trx_type =>${@source_csh_trx_type},
p_source_csh_trx_id =>${@source_csh_trx_id},
p_source_doc_category =>${@source_doc_category},
p_source_doc_type =>${@source_doc_type},
p_source_doc_id =>${@source_doc_id},
p_source_doc_line_id =>${@source_doc_line_id},
p_create_je_mothed =>${@create_je_mothed},
p_create_je_flag =>nvl(${@create_je_flag}, 'N'),
p_gld_interface_flag =>nvl(${@gld_interface_flag}, 'N'),
p_user_id =>${/session/@user_id},
p_ref_contract_id => ${@ref_contract_id},
p_receipt_type => ${@receipt_type},
p_csh_bp_name => ${@csh_bp_name},
p_bp_name => ${@bp_name},
p_ref_n01 =>${@ref_n01},
p_bp_bank_name =>${@bp_bank_name},
p_bp_bank_branch_name =>${@bp_bank_branch_name},
p_collection_classes =>${@collection_classes},
p_bp_bank_account_name =>${@bp_bank_account_name},
p_opposite_band_na =>${@opposite_band_na},
p_banka =>${@banka},
p_purpose =>${@purpose},
p_gsber =>${@gsber},
p_sus_belnr =>${@sus_belnr},
p_bp_virtual_bank_account =>${@bp_virtual_bank_account},
p_zuonr =>${@bank_slip_num},
p_paid_byother_flag =>${@paid_byother_flag_desc},
p_ref_v05 =>${@ref_v05},
p_status =>${@status},
p_bank_account_num =>${@bank_account_num},
p_guarantor_name_duty =>${@guarantor_name_duty},
p_bank_receipt_date =>${@bank_receipt_date},
p_paid_byother_flag_desc =>${@paid_byother_flag_desc},
p_collection_classes_desc =>${@collection_classes_desc},
p_extra_nam =>${@extra_nam},
p_import_source => 'EXCEL_ADD'
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" needAccessControl="false"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select ccw.due_amount a,ccw.due_amount b from con_contract_cashflow ccw where rownum<=5 select *
]]></bm:query-sql> from SYS_ROLE_VL t1
#WHERE_CLAUSE#
]]>
</bm:query-sql>
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
<bm:query-fields>
<bm:query-field name="role_code" queryOperator="="/>
</bm:query-fields>
</bm:model> </bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT *
FROM (SELECT hc.import_itfc_id,
hc.bank_num,
hc.beneficiary_number,
to_char(hc.bank_receipt_date, 'yyyy-MM-dd') bank_receipt_date,
hc.receipt_no,
hc.payer_number,
hc.payer_name,
hc.bank_name,
hc.beneficiary_name,
decode(hc.paid_byother_flag_desc, 'Y', '是', 'N', '否') paid_byother_flag_desc,
decode(hc.collection_classes_desc,
'DEPOSIT',
'保证金类',
'NON_DEPOSIT',
'非保证金类',
'COMBINED',
'混合类',
'REFUND',
'日立为优质客户付租金') collection_classes_desc,
hc.total_amount,
hc.zy,
hc.remark,
hc.extra_nam,
decode(hc.guarantor_name_duty, 'Y', '是', 'N', '否') guarantor_name_duty,
hc.create_trx_flag,
hc.creation_date,
hc.created_by,
hc.last_update_date,
hc.last_updated_by,
hc.bp_id,
hc.bank_account_id,
hc.bp_category,
'N' re_flag,
NULL AS bank_num_r,
NULL AS bank_receipt_date_r,
NULL AS payer_number_r,
NULL AS payer_name_r,
NULL AS bank_name_r,
NULL AS total_amount_r
FROM hlcm_ele_trx_import_itfc hc
where hc.create_trx_flag = 'Y'
and not exists (select 1
from hlcm_ele_abc_bank_slip_trx a
where a.receipt_no = hc.receipt_no)
union all
SELECT hc.import_itfc_id,
hc.bank_num,
hc.beneficiary_number,
to_char(hc.bank_receipt_date, 'yyyy-MM-dd') bank_receipt_date,
hc.receipt_no,
hc.payer_number,
hc.payer_name,
hc.bank_name,
hc.beneficiary_name,
decode(hc.paid_byother_flag_desc, 'Y', '是', 'N', '否') paid_byother_flag_desc,
decode(hc.collection_classes_desc,
'DEPOSIT',
'保证金类',
'NON_DEPOSIT',
'非保证金类',
'COMBINED',
'混合类',
'REFUND',
'日立为优质客户付租金') collection_classes_desc,
hc.total_amount,
hc.zy,
hc.remark,
hc.extra_nam,
decode(hc.guarantor_name_duty, 'Y', '是', 'N', '否') guarantor_name_duty,
hc.create_trx_flag,
hc.creation_date,
hc.created_by,
hc.last_update_date,
hc.last_updated_by,
hc.bp_id,
hc.bank_account_id,
hc.bp_category,
'Y' re_flag,
a.bank_num bank_num_r,
to_char(a.bank_receipt_date, 'yyyy-MM-dd') bank_receipt_date_r,
a.payer_number payer_number_r,
a.payer_name payer_name_r,
a.payer_bank bank_name_r,
a.total_amount total_amount_r
FROM hlcm_ele_trx_import_itfc hc, hlcm_ele_abc_bank_slip_trx a
where hc.create_trx_flag = 'Y'
and a.receipt_no = hc.receipt_no
order by receipt_no desc) t1
#WHERE_CLAUSE#
]]>
</bm:query-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="exchange_hour_from" queryExpression="t1.bank_receipt_date &gt;= ${@exchange_hour_from} "/>
<bm:query-field name="exchange_hour_to" queryExpression="t1.bank_receipt_date &lt;= ${@exchange_hour_to} "/>
<bm:query-field name="money_from" queryExpression="t1.total_amount &gt;= ${@money_from} "/>
<bm:query-field name="money_to" queryExpression="t1.total_amount &lt;= ${@money_to} "/>
</bm:query-fields>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false" >
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
sELECT t1.*
FROM (SELECT to_char(hx.bank_receipt_date, 'yyyy-MM-dd') bank_receipt_date,
hx.slip_trx_id,
hx.receipt_no,
hx.payer_name,
hx.payer_number,
hx.payer_bank,
(case
when (select count(bp_name)
from hls_bp_master
where bp_name = hx.payer_name) = 1 then
(select bp_name
from hls_bp_master
where bp_name = hx.payer_name)
else
' '
end) bp_name,
(case
when (select count(bp_name)
from hls_bp_master
where bp_name = hx.payer_name) = 1 then
(Select u.unit_name
From exp_org_unit_v u
Where u.unit_id =
(select v.unit_id
from hls_bp_master v
where v.enabled_flag = 'Y'
and v.bp_id =
(select bp_id
from hls_bp_master
where bp_name = hx.payer_name)))
else
' '
end) extra_nam,
(case
when (select count(bp_name)
from hls_bp_master
where bp_name = hx.payer_name) = 1 then
'否'
else
' '
end) paid_byother_flag_desc,
hx.total_amount,
hx.zy,
hx.remark,
hx.bank_num,
'N' re_flag,
NULL AS bank_num_r,
NULL AS bank_receipt_date_r,
NULL AS payer_number_r,
NULL AS payer_name_r,
NULL AS payer_bank_r,
NULL AS total_amount_r,
COALESCE((SELECT v.code_value_name
FROM sys_code_values_v v,
csh_transaction_import_temp ct
WHERE v.code = 'DS_COLLECTION_CLASSES'
AND v.code_value = ct.collection_classes
and ct.bp_bank_name = hx.payer_name),
'非保证金类') AS collection_classes_desc,
(SELECT ct.guarantor_name_duty
FROM csh_transaction_import_temp ct
WHERE ct.bp_bank_name = hx.payer_name) guarantor_name_duty
FROM hlcm_ele_abc_bank_slip_trx hx
where hx.create_trx_flag = 'Y'
and not exists (select 1
from hlcm_ele_trx_import_itfc a
where hx.receipt_no = a.receipt_no)
union all
SELECT to_char(hx.bank_receipt_date, 'yyyy-MM-dd') bank_receipt_date,
hx.slip_trx_id,
hx.receipt_no,
hx.payer_name,
hx.payer_number,
hx.payer_bank,
(case
when (select count(bp_name)
from hls_bp_master
where bp_name = hx.payer_name) = 1 then
(select bp_name
from hls_bp_master
where bp_name = hx.payer_name)
else
' '
end) bp_name,
(case
when (select count(bp_name)
from hls_bp_master
where bp_name = hx.payer_name) = 1 then
(Select u.unit_name
From exp_org_unit_v u
Where u.unit_id =
(select v.unit_id
from hls_bp_master v
where v.enabled_flag = 'Y'
and v.bp_id =
(select bp_id
from hls_bp_master
where bp_name = hx.payer_name)))
else
' '
end) extra_nam,
(case
when (select count(bp_name)
from hls_bp_master
where bp_name = hx.payer_name) = 1 then
'否'
else
' '
end) paid_byother_flag_desc,
hx.total_amount,
hx.zy,
hx.remark,
hx.bank_num,
'Y' re_flag,
a.bank_num bank_num_r,
to_char(a.bank_receipt_date, 'yyyy-MM-dd') bank_receipt_date_r,
a.payer_number payer_number_r,
a.payer_name payer_name_r,
a.bank_name payer_bank_r,
a.total_amount total_amount_r,
COALESCE((SELECT v.code_value_name
FROM sys_code_values_v v,
csh_transaction_import_temp ct
WHERE v.code = 'DS_COLLECTION_CLASSES'
AND v.code_value = ct.collection_classes
and ct.bp_bank_name = hx.payer_name),
'非保证金类') AS collection_classes_desc,
(SELECT ct.guarantor_name_duty
FROM csh_transaction_import_temp ct
WHERE ct.bp_bank_name = hx.payer_name) guarantor_name_duty
FROM hlcm_ele_abc_bank_slip_trx hx, hlcm_ele_trx_import_itfc a
where hx.create_trx_flag = 'Y'
and a.receipt_no = hx.receipt_no
order by receipt_no desc) t1
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="exchange_hour_from" queryExpression="t1.bank_receipt_date &gt;= ${@exchange_hour_from} "/>
<bm:query-field name="exchange_hour_to" queryExpression="t1.bank_receipt_date &lt;= ${@exchange_hour_to} "/>
<bm:query-field name="money_from" queryExpression="t1.total_amount &gt;= ${@money_from} "/>
<bm:query-field name="money_to" queryExpression="t1.total_amount &lt;= ${@money_to} "/>
</bm:query-fields>
</bm:model>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select to_char(add_months(req_date,-1),'yyyy')||'年'||to_char(add_months(req_date,-1),'mm')||'月' req_date select to_char(req_date,'yyyy')||'年'||to_char(req_date,'mm')||'月' req_date
from csh_payment_req_hd v from csh_payment_req_hd v
where v.payment_req_id=${@payment_req_id} where v.payment_req_id=${@payment_req_id}
......
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/> <bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/>
<bm:query-field field="bp_bank_account_name" queryOperator="like"/> <bm:query-field field="bp_bank_account_name" queryOperator="like"/>
<bm:query-field field="receipt_type" queryOperator="="/> <bm:query-field field="receipt_type" queryOperator="="/>
<bm:query-field name="confirmed" queryExpression="((${@confirmed} = 'Y' and t1.confirmed_flag in ('ACCAUDITED','ACCAUDITING')) or (${@confirmed} = 'N' and t1.confirmed_flag in ('NEW','CT_REJECTED','ACCAUDITING','ACCAUDITED')))"/> <bm:query-field name="confirmed" queryExpression="((${@confirmed} = 'Y' and t1.confirmed_flag in ('ACCAUDITED','ACCAUDITING')) or (${@confirmed} = 'N' and t1.confirmed_flag in ('NEW','CT_REJECTED','ACCAUDITING','ACCAUDITED','ACCAUDITED_RECOI')))"/>
<bm:query-field field="opposite_band_na" queryOperator="="/> <bm:query-field field="opposite_band_na" queryOperator="="/>
<bm:query-field name="transaction_num" queryExpression="t1.transaction_num like ${@transaction_num}"/> <bm:query-field name="transaction_num" queryExpression="t1.transaction_num like ${@transaction_num}"/>
<bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/> <bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
or t.trans_review_status ='REVIEWING1') or t.trans_review_status ='REVIEWING1')
and cc.contract_id = t.source_contract_id and cc.contract_id = t.source_contract_id
and cc.data_class = 'NORMAL' and cc.data_class = 'NORMAL'
and to_char(t.je_date,'yyyy-mm') = ${@csh_date}
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
......
...@@ -71,6 +71,6 @@ ...@@ -71,6 +71,6 @@
</bm:query-fields> </bm:query-fields>
<bm:data-filters> <bm:data-filters>
<bm:data-filter name="query" <bm:data-filter name="query"
expression="t.cf_status = 'RELEASE' and t.write_off_flag != 'FULL' and t.cf_direction = 'INFLOW'"/> expression="t.cf_status = 'RELEASE' and t.write_off_flag != 'FULL' and t.cf_direction = 'INFLOW' and t.cf_item not in(251)"/>
</bm:data-filters> </bm:data-filters>
</bm:model> </bm:model>
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<bm:operation name="update"> <bm:operation name="update">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
begin begin
csh_transaction_interface_pkg.post_interface(p_transaction_id =>${@transaction_id}, csh_transaction_interface_pkg.post_interface(p_transaction_id =>${@transaction_id},
p_user_id =>${/session/@user_id}, p_user_id =>${/session/@user_id},
p_err_count =>${@err_count}); p_err_count =>${@err_count});
...@@ -15,8 +16,11 @@ ...@@ -15,8 +16,11 @@
</bm:operation> </bm:operation>
<bm:operation name="execute"> <bm:operation name="execute">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
declare
v_transaction_num varchar2(400);
begin begin
if ${@flag} = 'SUBMIT' then if ${@flag} = 'SUBMIT' then
csh_transaction_interface_pkg.check_operat_flag(p_transaction_id =>${@transaction_id} );
update CSH_TRANSACTION update CSH_TRANSACTION
set confirmed_flag = 'WF_APPROVING' set confirmed_flag = 'WF_APPROVING'
where transaction_id = ${@transaction_id}; where transaction_id = ${@transaction_id};
......
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
<bm:field name="acc_confirmed_by"/> <bm:field name="acc_confirmed_by"/>
<bm:field name="acc_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.acc_confirmed_by)" forInsert="false" forUpdate="false"/> <bm:field name="acc_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.acc_confirmed_by)" forInsert="false" forUpdate="false"/>
<bm:field name="receipt_type_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECEIPT_TYPE' and v.code_value =t1.receipt_type)" forInsert="false" forUpdate="false"/> <bm:field name="receipt_type_n" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'RECEIPT_TYPE' and v.code_value =t1.receipt_type)" forInsert="false" forUpdate="false"/>
<bm:field name="deposit_trans_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="DEPOSIT_TRANS_TYPE" prompt="CSH511.CSH_TRANSACTION.TRANSACTION_NUM"/>
</bm:fields> </bm:fields>
<bm:features> <bm:features>
<f:standard-who/> <f:standard-who/>
...@@ -110,8 +111,9 @@ ...@@ -110,8 +111,9 @@
<bm:data-filter name="query" expression="(t1.transaction_type in (&apos;DEPOSIT&apos;))"/> <bm:data-filter name="query" expression="(t1.transaction_type in (&apos;DEPOSIT&apos;))"/>
<bm:data-filter name="query" expression="(t1.ref_contract_id is null)"/> <bm:data-filter name="query" expression="(t1.ref_contract_id is null)"/>
<bm:data-filter name="query" expression="(nvl(t1.reversed_flag,'N') = 'N')"/> <bm:data-filter name="query" expression="(nvl(t1.reversed_flag,'N') = 'N')"/>
<bm:data-filter name="query" expression="(t1.confirmed_flag not in('ACCAUDITING','NEW','CT_REJECTED'))"/> <bm:data-filter name="query" expression="(t1.confirmed_flag not in('ACCAUDITING','NEW','CT_REJECTED','ACCAUDITED_RECOI'))"/>
<bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/> <bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/>
<bm:data-filter name="query" expression="not exists(select 1 from csh_transaction ct where ct.transaction_id =t1.transaction_id and ct.deposit_trans_type in('vender_deposit'))"/>
</bm:data-filters> </bm:data-filters>
<bm:query-fields> <bm:query-fields>
<bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/> <bm:query-field field="confirmed_flag" queryExpression="t1.confirmed_flag =${@confirmed_flag}"/>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
where ha.bp_id(+) = hb.bp_id where ha.bp_id(+) = hb.bp_id
and ha.enabled_flag(+) = 'Y' and ha.enabled_flag(+) = 'Y'
and hb.enabled_flag = 'Y' and hb.enabled_flag = 'Y'
and hb.bp_category in ('TENANT', 'AGENT', 'THIRD_PARTY','VENDER'))t #WHERE_CLAUSE# and hb.bp_category in ('TENANT', 'AGENT', 'THIRD_PARTY','VENDER','RENTER','MAN_FACTURER'))t #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
......
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/> <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
<bm:data-filter name="query" expression="(t1.transaction_num not in('R23120500038'))"/> <bm:data-filter name="query" expression="(t1.transaction_num not in('R23120500038'))"/>
<bm:data-filter name="query" expression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) not in('XND24010001')"/> <bm:data-filter name="query" expression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) not in('XND24010001')"/>
<!--<bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/>--> <!--<bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/>-->
<!-- <bm:data-filter name="query" expression="(t1.ref_contract_id is not null)"/>--> <!-- <bm:data-filter name="query" expression="(t1.ref_contract_id is not null)"/>-->
<bm:data-filter name="query" expression="(t1.transaction_type ='DEPOSIT')"/> <bm:data-filter name="query" expression="(t1.transaction_type ='DEPOSIT')"/>
......
<?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="insert">
<bm:update-sql><![CDATA[
BEGIN
csh_abc_import_pkg.att_import_bank(
p_start_date => TO_DATE(${@start_date}, 'YYYY-MM-DD HH24:MI:SS'),
p_end_date => TO_DATE(${@end_date}, 'YYYY-MM-DD HH24:MI:SS'),
p_request_url => ${@request_url},
p_request_json => ${@request_json},
p_page_number => ${@page_number},
p_user_id =>${/session/@user_id}
);
END;
]]>
</bm:update-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
BEGIN
csh_abc_import_pkg.att_import_bank_update(
p_code => ${@code},
p_message => ${@message},
p_response_json => ${@response_json},
p_return_page_size => ${@return_page_size},
p_page_size => ${@page_size},
p_user_id =>${/session/@user_id}
);
END;
]]>
</bm:update-sql>
</bm:operation>
</bm:operations>
</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="insert">
<bm:update-sql><![CDATA[
BEGIN
csh_abc_import_pkg.att_import_bank_update_trx(
p_doc_code => ${@doc_code},
p_receipt_no => ${@receipt_no},
p_bank_name => ${@bank_name},
p_beneficiary_name => ${@beneficiary_name},
p_bank_num => ${@bank_num},
p_beneficiary_bank => ${@beneficiary_bank},
p_payer_name => ${@payer_name},
p_payer_number => ${@payer_number},
p_payer_bank => ${@payer_bank},
p_bank_receipt_date =>to_date(${@bank_receipt_date}, 'YYYY-MM-DD'),
p_total_amount => ${@total_amount},
p_purpose => ${@purpose},
p_remark => ${@remark},
p_zy => ${@zy},
p_business_type => ${@business_type},
p_contract1 => ${@contract1},
p_gl_code => ${@gl_code},
p_agencycode => ${@agencycode},
p_client => ${@client},
p_preprocess_code => ${@preprocess_code},
p_agency => ${@agency},
p_blcode => ${@blcode},
p_slip_batch_id => ${@slip_batch_id},
p_user_id => ${/session/@user_id}
);
END;
]]>
</bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:o="leaf.database.local.oracle" xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT *
FROM hlcm_ele_abc_bank_slip_bacth b
WHERE b.start_date = TO_DATE('${:@parameter_code}', 'YYYY-MM-DD')
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<bm:query-field name="description" queryExpression="t1.description like &apos;%&apos;||${@description}||&apos;%&apos;"/> <bm:query-field name="description" queryExpression="t1.description like &apos;%&apos;||${@description}||&apos;%&apos;"/>
<bm:query-field name="query_reversed_flag" queryExpression="(${@query_reversed_flag}=&apos;Y&apos; and nvl(t1.reversed_flag,&apos;N&apos;)=&apos;N&apos;)"/> <bm:query-field name="query_reversed_flag" queryExpression="(${@query_reversed_flag}=&apos;Y&apos; and nvl(t1.reversed_flag,&apos;N&apos;)=&apos;N&apos;)"/>
<bm:query-field name="status_list_flag" queryExpression="(${@status_list_flag}=&apos;Y&apos; and t1.status in (&apos;U&apos;,&apos;B&apos;))"/> <bm:query-field name="status_list_flag" queryExpression="(${@status_list_flag}=&apos;Y&apos; and t1.status in (&apos;U&apos;,&apos;B&apos;))"/>
<!-- <bm:query-field name="gld_flag" queryExpression="exists (select 1 from gld_je_transaction d where d.je_transaction_code = t1.je_transaction_code and d.gld_flag = ${@gld_flag})"/>--> <!--<bm:query-field name="gld_flag" queryExpression="exists (select 1 from gld_je_transaction d where d.je_transaction_code = t1.je_transaction_code and d.gld_flag = ${@gld_flag})"/>-->
<bm:query-field name="gld_flag" queryExpression="((nvl(t1.manual_flag,'N')=&apos;N&apos; and exists (select 1 from gld_je_transaction d where d.je_transaction_code = t1.je_transaction_code and d.gld_flag = ${@gld_flag})) or nvl(t1.manual_flag,&apos;N&apos;)=&apos;Y&apos;)"/> <bm:query-field name="gld_flag" queryExpression="((nvl(t1.manual_flag,'N')=&apos;N&apos; and exists (select 1 from gld_je_transaction d where d.je_transaction_code = t1.je_transaction_code and d.gld_flag = ${@gld_flag})) or nvl(t1.manual_flag,&apos;N&apos;)=&apos;Y&apos;)"/>
<bm:query-field name="bp_id_tenant" queryExpression="exists (select 1 from hls_journal_detail_v dv where dv.reference1=(select a.bp_code from hls_bp_master a where a.bp_id=${@bp_id_tenant} )and dv.journal_header_id=t1.journal_header_id )"/> <bm:query-field name="bp_id_tenant" queryExpression="exists (select 1 from hls_journal_detail_v dv where dv.reference1=(select a.bp_code from hls_bp_master a where a.bp_id=${@bp_id_tenant} )and dv.journal_header_id=t1.journal_header_id )"/>
<bm:query-field name="desc" queryExpression="t1.description like &apos;%&apos;||${@desc}||&apos;%&apos; "/> <bm:query-field name="desc" queryExpression="t1.description like &apos;%&apos;||${@desc}||&apos;%&apos; "/>
......
...@@ -53,7 +53,8 @@ ...@@ -53,7 +53,8 @@
FROM hls_bp_master bp FROM hls_bp_master bp
WHERE bp.bp_category = 'AGENT' WHERE bp.bp_category = 'AGENT'
AND NVL(bp.agent_instance_status, 'NEW') IN AND NVL(bp.agent_instance_status, 'NEW') IN
('NEW', 'APPROVING', 'REJECT', 'APPROVED', 'APPROVED_RETURN')) t1 ('NEW', 'APPROVING', 'REJECT', 'APPROVED', 'APPROVED_RETURN')
AND bp.enabled_flag = 'Y') t1
#WHERE_CLAUSE# #WHERE_CLAUSE#
]]></bm:update-sql> ]]></bm:update-sql>
</bm:operation> </bm:operation>
......
...@@ -22,13 +22,38 @@ ...@@ -22,13 +22,38 @@
t.validation_type, t.validation_type,
t.validation_sql, t.validation_sql,
t.layout_area_seq, t.layout_area_seq,
t.input_mode, (CASE
decode(t.input_mode, 'REQUIRED', 'TRUE', 'FALSE') required_input_mode, WHEN T.COLUMN_CODE = 'H54' AND
nvl((select h.hd_user_col_v06
from hls_fin_calculator_hd h
where h.calc_session_id = ${@calc_session_id}),
'N') = 'Y' then
'READONLY'
else
t.input_mode
end) input_mode,
(CASE
WHEN T.COLUMN_CODE = 'H54' AND
nvl((select h.hd_user_col_v06
from hls_fin_calculator_hd h
where h.calc_session_id = ${@calc_session_id}),
'N') = 'Y' then
'FALSE'
else
decode(t.input_mode, 'REQUIRED', 'TRUE', 'FALSE')
end) required_input_mode,
(case when ${@maintain_type}='READONLY' then (case when ${@maintain_type}='READONLY' then
'TRUE' 'TRUE'
when T.COLUMN_CODE = 'H54' AND
nvl((select h.hd_user_col_v06
from hls_fin_calculator_hd h
where h.calc_session_id = ${@calc_session_id}),
'N') = 'Y' then
'TRUE'
else else
decode(t.input_mode, 'READONLY', 'TRUE', 'FALSE') decode(t.input_mode, 'READONLY', 'TRUE', 'FALSE')
end) readonly_input_mode, end) readonly_input_mode,
nvl(t.allow_format,'FALSE') allow_format, nvl(t.allow_format,'FALSE') allow_format,
nvl(t.allow_decimal,'FALSE') allow_decimal, nvl(t.allow_decimal,'FALSE') allow_decimal,
nvl(t.zero_fill,'FALSE') zero_fill, nvl(t.zero_fill,'FALSE') zero_fill,
...@@ -111,5 +136,6 @@ ...@@ -111,5 +136,6 @@
</bm:query-fields> </bm:query-fields>
<bm:data-filters> <bm:data-filters>
<bm:data-filter enforceOperations="query" expression="(t.layout_area_seq = &apos;H&apos; and t.price_list=p.price_list and t.price_list = nvl(${@price_list},(select h.price_list from hls_fin_calculator_hd h where h.calc_session_id=${@calc_session_id})))"/> <bm:data-filter enforceOperations="query" expression="(t.layout_area_seq = &apos;H&apos; and t.price_list=p.price_list and t.price_list = nvl(${@price_list},(select h.price_list from hls_fin_calculator_hd h where h.calc_session_id=${@calc_session_id})))"/>
<bm:data-filter enforceOperations="query" expression=" ((t.column_name not in('BTB_INT_RATE') and nvl((select h.hd_user_col_v06 from hls_fin_calculator_hd h where h.calc_session_id=${@calc_session_id}),'N')!='Y') OR nvl((select h.hd_user_col_v06 from hls_fin_calculator_hd h where h.calc_session_id=${@calc_session_id}),'N')='Y')"></bm:data-filter>
</bm:data-filters> </bm:data-filters>
</bm:model> </bm:model>
...@@ -94,48 +94,6 @@ ...@@ -94,48 +94,6 @@
where ${/session/@user_id}=10418 where ${/session/@user_id}=10418
and(t1.wfl_status in ('APPROVING', 'REJECT', 'APPROVED') and(t1.wfl_status in ('APPROVING', 'REJECT', 'APPROVED')
) )
union
select t1.journal_header_id,
t1.batch_id,
t1.batch_number,
t1.reverse_batch_number,
t1.journal_submit_batch_id,
t1.journal_num,
t1.error_message,
t1.total_amount_dr,
t1.total_amount_cr,
(select c.company_short_name
from fnd_companies_vl c
where c.company_id = t1.je_company_id) js_company_short_name,
t1.period_name,
to_char(t1.journal_date,'yyyy-mm-dd') journal_date,
t1.currency_code,
(SELECT gc.currency_name
FROM gld_currency_v gc
WHERE gc.currency_code = t1.currency_code) currency_desc,
t1.total_amount_fuc_dr,
(SELECT d.je_transaction_desc
FROM gld_je_transaction d
WHERE d.je_transaction_code = t1.je_transaction_code) je_transaction_desc,
t1.description,
(SELECT COUNT(1)
FROM hls_journal_detail_imp t
WHERE t.journal_header_id = t1.journal_header_id) je_detail_count,
t1.wfl_status,
(select v.code_value_name value_name
from sys_code_values_v v
where v.code = 'HLS536_WFL_STATUS'
and v.code_value = t1.wfl_status) wfl_status_n,
t1.reversed_flag,
t1.reverse_wfl_status,
(select v.code_value_name value_name
from sys_code_values_v v
where v.code = 'HLS536_WFL_STATUS_REVERSE'
and v.code_value = t1.reverse_wfl_status) reverse_wfl_status_n,
t1.journal_type
FROM hls_journal_header_imp t1
where ${/session/@user_id}=10417
) t1 ) t1
......
...@@ -41,6 +41,6 @@ ...@@ -41,6 +41,6 @@
<bm:query-field name="bank_branch_name" queryExpression="v.bank_branch_name like ${@bank_branch_name}"/> <bm:query-field name="bank_branch_name" queryExpression="v.bank_branch_name like ${@bank_branch_name}"/>
</bm:query-fields> </bm:query-fields>
<bm:data-filters> <bm:data-filters>
<bm:data-filter enforceOperations="query" expression="v.bank_code IN ('019')"/> <bm:data-filter enforceOperations="query" expression="v.bank_code IN ('021')"/>
</bm:data-filters> </bm:data-filters>
</bm:model> </bm:model>
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
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','HAND')) and u.user_name in ('XUEJINGYAN','WUYING','KATO'))
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
$Author: sf $Author: 38823
$Date: 2019-12-06 上午09:52:30 $Date: 2023-12-25
$Revision: 1.0 $Revision: 1
$Purpose: $Purpose:
--> -->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
...@@ -10,14 +10,13 @@ ...@@ -10,14 +10,13 @@
<bm:operation name="update"> <bm:operation name="update">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
begin begin
csh_transaction_return_pkg.csh_return_print( HL_CM_PAYMENT_JOURNAL_PKG.payment_save(
p_document_id =>${@document_id}, p_payment_journal_id =>${@payment_journal_id},
p_user_id =>${/session/@user_id}, p_user_id => ${/session/@user_id},
p_document_table=>${@document_table} p_invoice_series =>${@invoice_series}
); );
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
</bm:model> </bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: 38823
$Date: 2023-12-25
$Revision: 1
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="insert">
<bm:parameters>
<bm:parameter name="payment_batch_id" output="true" outputPath="@payment_batch_id"/>
</bm:parameters>
<bm:update-sql><![CDATA[
declare
v_payment_batch_id hl_cm_payment_journal_batch.payment_batch_id%TYPE := hl_cm_payment_journal_batch_s.nextval;
begin
${@payment_batch_id} := v_payment_batch_id;
insert into hl_cm_payment_journal_batch
(payment_batch_id,
instance_id,
wfl_status,
created_by,
creation_date,
last_updated_by,
last_update_date)
values
(v_payment_batch_id,
null,
null,
${/session/@user_id},
sysdate,
${/session/@user_id},
sysdate
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
update hl_cm_payment_journal hc
set hc.payment_batch_id =${/parameter/@payment_batch_id},
hc.last_updated_by = ${/session/@user_id},
hc.last_update_date = sysdate
where hc.payment_journal_id = ${@payment_journal_id}
]]></bm:update-sql>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
HL_CM_PAYMENT_JOURNAL_PKG.payment_wfl_start(p_payment_batch_id =>${/parameter/@payment_batch_id},
p_user_id =>${/session/@user_id});
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
...@@ -7,15 +7,15 @@ PORT=10022 ...@@ -7,15 +7,15 @@ PORT=10022
#sftp根路径 #sftp根路径
ROOT_PATH=\\ ROOT_PATH=\\
#sftp秘钥路径 在这里就正常路径,在svc 或者java 要双斜杠转义 #sftp秘钥路径 在这里就正常路径,在svc 或者java 要双斜杠转义
KEY_PATH=F:\\jjhf\\hsbc_key\\hsbstestnew KEY_PATH=D:\\install_soft\\hlcm20230228\\file\\hsbc_key\\hsbstestnew
#sftp待上传文件存放路径 #sftp待上传文件存放路径
UPLOAD_FILEDIR=F:\\jjhf\\upload\\ UPLOAD_FILEDIR=D:\\install_soft\\hlcm20230228\\file\\upload\\
#sftp 加密方式 RSA秘钥 PASSWORD 密码 #sftp 加密方式 RSA秘钥 PASSWORD 密码
AUTH_CODE=RSA AUTH_CODE=RSA
#sftp 待下载文件存放路径 #sftp 待下载文件存放路径
DOWN_FILEDIR=F:\\jjhf\\down_confirm\\ DOWN_FILEDIR=D:\\install_soft\\hlcm20230228\\file\\down_confirm\\
#sftp 日中对账单文件存放路径 #sftp 日中对账单文件存放路径
DAY_MID_FILEDIR=F:\\jjhf\\down_day_mid_result\\ DAY_MID_FILEDIR=D:\\install_soft\\hlcm20230228\\file\\down_day_mid_result\\
#sftp 汇丰银行账号 #sftp 汇丰银行账号
HSBC_BANK_CODE=715009700011 HSBC_BANK_CODE=715009700011
#sftp 区分汽车系统和建机系统,01:汽车系统;02:建机系统 #sftp 区分汽车系统和建机系统,01:汽车系统;02:建机系统
......
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL,
NULL, NULL,
NULL NULL
FROM hls_bp_master h) FROM hls_bp_master h)
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" needAccessControl="false">
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select ccw.due_amount a,ccw.due_amount b from con_contract_cashflow ccw where rownum<=2 select prj_project_check_pkg.get_prj_record(${/parameter/@project_id}) as residual_value from dual
]]></bm:query-sql> ]]>
</bm:query-sql>
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
</bm:model> </bm:model>
...@@ -17,7 +17,14 @@ ...@@ -17,7 +17,14 @@
rct.contract_number contract_number_af, rct.contract_number contract_number_af,
rct.cshflow_id cshflow_id_af, rct.cshflow_id cshflow_id_af,
nvl(rct.deposit_amount,0) deposit_amount_af, nvl(rct.deposit_amount,0) deposit_amount_af,
rct.due_amount due_amount_af, --modify by 18938 I-7310
(case
when rct.contract_number = 'SXJ21040016' and rct.times = '36' and
rct.cshflow_id = 259314 then
1170220.13
else
rct.due_amount
end) due_amount_af,
to_char(rct.due_date,'yyyy-mm-dd') due_date_af, to_char(rct.due_date,'yyyy-mm-dd') due_date_af,
(NVL(rct.int_rate_display, 0) * 100 ||'%') int_rate_display_af, (NVL(rct.int_rate_display, 0) * 100 ||'%') int_rate_display_af,
rct.is_buyout, rct.is_buyout,
...@@ -31,10 +38,31 @@ ...@@ -31,10 +38,31 @@
rct.machine_number machine_number_af, rct.machine_number machine_number_af,
to_char(rct.lease_start_date,'yyyy-mm-dd') lease_start_date_af, to_char(rct.lease_start_date,'yyyy-mm-dd') lease_start_date_af,
rct.modelcd modelcd_af, rct.modelcd modelcd_af,
nvl(rct.overdue_days,0) overdue_days_af, --modify by 18938 I-7310
nvl(rct.received_amount,0) received_amount_af, (case
when rct.contract_number = 'SXJ21040016' and rct.times = '36' and
rct.cshflow_id = 259314 then
0
else
nvl(rct.overdue_days,0)
end) overdue_days_af,
--modify by 18938 I-7310
(case
when rct.contract_number = 'SXJ21040016' and rct.times = '36' and
rct.cshflow_id = 259314 then
1170220.13
else
nvl(rct.received_amount,0)
end) received_amount_af,
rct.times times_af, rct.times times_af,
nvl(rct.unreceived_amount,0) unreceived_amount_af, --modify by 18938 I-7310
(case
when rct.contract_number = 'SXJ21040016' and rct.times = '36' and
rct.cshflow_id = 259314 then
0
else
nvl(rct.unreceived_amount,0)
end) unreceived_amount_af,
rct.rent_type rct.rent_type
from from
rpt5012_csh_result_after_temp rct rpt5012_csh_result_after_temp rct
...@@ -82,5 +110,8 @@ ...@@ -82,5 +110,8 @@
<bm:field name="deposit_amount_af" datatype="java.lang.Double"/> <bm:field name="deposit_amount_af" datatype="java.lang.Double"/>
<bm:field name="is_buyout_af"/> <bm:field name="is_buyout_af"/>
<bm:field name="rent_type"/> <bm:field name="rent_type"/>
<bm:field name="large_balance_af"/>
<bm:field name="branch_code_af"/>
</bm:fields> </bm:fields>
</bm:model> </bm:model>
...@@ -89,11 +89,11 @@ ...@@ -89,11 +89,11 @@
And v1.code_enabled_flag = 'Y' And v1.code_enabled_flag = 'Y'
And v1.code_value_enabled_flag = 'Y' And v1.code_value_enabled_flag = 'Y'
and v1.CODE_VALUE = t.is_buyout) is_buyout_n, and v1.CODE_VALUE = t.is_buyout) is_buyout_n,
(select sh.large_balance from prj_quotation sh where sh.DOCUMENT_ID = t.project_id) large_balance, t.large_balance,
(select v.code_value_name (select v.code_value_name
from sys_code_values_v v from sys_code_values_v v
where v.code = 'SECONDARY_LEASE' where v.code = 'SECONDARY_LEASE'
and v.code_value = (select sh.large_balance from prj_quotation sh where sh.DOCUMENT_ID = t.project_id)) large_balance_n, and v.code_value = t.large_balance) large_balance_n,
t.branch_code, t.branch_code,
(Select v.code_value_name (Select v.code_value_name
From sys_code_values_v v From sys_code_values_v v
...@@ -102,11 +102,12 @@ ...@@ -102,11 +102,12 @@
And v.code_value_enabled_flag = 'Y' And v.code_value_enabled_flag = 'Y'
And v.code_value = t.branch_code) branch_code_n, And v.code_value = t.branch_code) branch_code_n,
(CASE (CASE
WHEN to_char(ccc.due_date,'MM') = to_char(to_date(${@cur_begin}, 'yyyy-mm-dd'),'MM') THEN WHEN to_char(ccc.due_date,'YYYYMM') = to_char(to_date(${@cur_begin}, 'yyyy-mm-dd'),'YYYYMM') THEN
'新增租金' '新增租金'
ELSE ELSE
'往期租金' '往期租金'
END) rent_type END) rent_type
from con_contract_cashflow ccc, con_contract t, con_contract_lease_item ccli from con_contract_cashflow ccc, con_contract t, con_contract_lease_item ccli
WHERE ccc.contract_id = t.contract_id WHERE ccc.contract_id = t.contract_id
AND ccli.contract_id (+) = t.contract_id AND ccli.contract_id (+) = t.contract_id
...@@ -162,6 +163,8 @@ ...@@ -162,6 +163,8 @@
<bm:field name="deposit_amount" datatype="java.lang.Double"/> <bm:field name="deposit_amount" datatype="java.lang.Double"/>
<bm:field name="is_buyout_n"/> <bm:field name="is_buyout_n"/>
<bm:field name="rent_type"/> <bm:field name="rent_type"/>
<bm:field name="large_balance_n"/>
<bm:field name="branch_code_n"/>
</bm:fields> </bm:fields>
<!-- <bm:query-fields>--> <!-- <bm:query-fields>-->
<!-- <bm:query-field field="bp_id_tenant_n" queryExpression="t1.bp_id_tenant_n = ${@bp_id_tenant_n}"/>--> <!-- <bm:query-field field="bp_id_tenant_n" queryExpression="t1.bp_id_tenant_n = ${@bp_id_tenant_n}"/>-->
......
...@@ -9,43 +9,52 @@ ...@@ -9,43 +9,52 @@
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
SELECT select
(SELECT m.extra_nam (SELECT m.extra_nam
FROM hls_bp_master m FROM hls_bp_master m
WHERE m.bp_id = ct.bp_id_agent_level1) agent_extra_name, WHERE m.bp_id = ct.bp_id_agent_level1) agent_extra_name,
--代理店简称 --代理店简称
(SELECT m.bp_name FROM hls_bp_master m WHERE m.bp_id = ct.bp_id_tenant) AS bp_tenant_name, (SELECT m.bp_name
FROM hls_bp_master m
WHERE m.bp_id =
ct.bp_id_tenant) AS bp_tenant_name,
--承租人名称 --承租人名称
ct.contract_number, ct.contract_number,
--合同编号 --合同编号
to_char(ct.lease_start_date, 'yyyy-mm-dd') lease_start_date, to_char(ct.lease_start_date,
'yyyy-mm-dd') lease_start_date,
--租赁期开始日 --租赁期开始日
(SELECT ccli.modelcd (SELECT ccli.modelcd
FROM con_contract_lease_item ccli FROM con_contract_lease_item ccli
WHERE ccli.contract_id = ct.contract_id) modelcd, WHERE ccli.contract_id =
ct.contract_id) modelcd,
--机型 --机型
(SELECT nvl(i.machine_number,i.machine_number_70) (SELECT nvl(i.machine_number,i.machine_number_70)
FROM con_contract_lease_item i FROM con_contract_lease_item i
WHERE i.contract_id = ct.contract_id WHERE i.contract_id = ct.contract_id
AND i.equipment_type = 'MAIN') machine_number, AND i.equipment_type =
'MAIN') machine_number,
--机号 --机号
to_char(NVL(ct.int_rate_display, 0) * 100, 'FM99,999,999,990.00') || '%' int_rate_display, (NVL(ct.int_rate_display, 0) * 100 ||
-- (NVL(ct.int_rate_display, 0) * 100 || '%') int_rate_display,
-- '%') int_rate_display,
--利率 --利率
ct.lease_times, ct.lease_times,
--租赁期间 --租赁期间
(NVL(ct.down_payment_ratio, 0) * 100 || '%') down_payment_ratio, (NVL(ct.down_payment_ratio, 0) * 100 ||
'%') down_payment_ratio,
--首付比例 --首付比例
ct.lease_item_amount AS lease_item_amount, ct.lease_item_amount as lease_item_amount,
--设备款 --设备款
NVL(ct.residual_value, 0) residual_amount, NVL(ct.residual_value,
0) residual_amount,
--留购金 --留购金
NVL(ct.total_rental, 0) + NVL(ct.down_payment, 0) + NVL(ct.total_rental, 0) + NVL(ct.down_payment, 0) +
NVL(ct.residual_value, 0) contract_amount, NVL(ct.residual_value,
0) contract_amount,
--合同金额 --合同金额
NVL(ct.down_payment, 0) down_payment, NVL(ct.down_payment,
0) down_payment,
--首付款 --首付款
(case when ((CASE (case when ((CASE
WHEN ct.contract_status IN ('TERMINATE', 'REPUR', 'ET') THEN WHEN ct.contract_status IN ('TERMINATE', 'REPUR', 'ET') THEN
...@@ -263,6 +272,7 @@ ...@@ -263,6 +272,7 @@
WHERE cw.csh_transaction_id = cn.transaction_id WHERE cw.csh_transaction_id = cn.transaction_id
AND cw.cf_item IN (1, 200, 250) AND cw.cf_item IN (1, 200, 250)
AND cw.contract_id = ct.contract_id AND cw.contract_id = ct.contract_id
AND NVL(cw.reversed_flag, 'N') = 'N'
AND trunc(cn.transaction_date) <= AND trunc(cn.transaction_date) <=
trunc(to_date(${@cur_end}, 'yyyy-mm-dd'))), trunc(to_date(${@cur_end}, 'yyyy-mm-dd'))),
0)) 0))
...@@ -496,7 +506,18 @@ ...@@ -496,7 +506,18 @@
And ccw.cf_item In (1, 200,250) And ccw.cf_item In (1, 200,250)
and ccw.cf_status = 'RELEASE' and ccw.cf_status = 'RELEASE'
And ccw.times > 0 And ccw.times > 0
and ccw.due_amount > ccw.received_amount) --and ccw.due_amount > nvl(ccw.received_amount,0)
and ccw.due_amount>(SELECT nvl(SUM(nvl(cwo.write_off_due_amount, 0)),0)
FROM csh_write_off cwo, csh_transaction cn
WHERE nvl(cwo.reversed_flag, 'N') = 'N'
AND cwo.contract_id = ccw.contract_id
AND cwo.times = ccw.times
AND cwo.csh_transaction_id = cn.transaction_id
AND cwo.cf_item = ccw.cf_item
AND trunc(cn.transaction_date) <=
trunc(to_date(${@cur_end}, 'yyyy-mm-dd'))
)
)
END) business_due_times, END) business_due_times,
--逾期期数(保证金前) --逾期期数(保证金前)
(case when ((CASE (case when ((CASE
...@@ -550,6 +571,7 @@ ...@@ -550,6 +571,7 @@
END) END)
end) business_due_amount, end) business_due_amount,
--当月末逾期金额(合计) --当月末逾期金额(合计)
(case when (CASE (case when (CASE
WHEN ct.contract_status IN ('TERMINATE', 'REPUR', 'ET') THEN WHEN ct.contract_status IN ('TERMINATE', 'REPUR', 'ET') THEN
0 0
...@@ -618,6 +640,7 @@ ...@@ -618,6 +640,7 @@
END) END)
end) business_due_amount_after, end) business_due_amount_after,
--当月末逾期金额(合计)保证金后 --当月末逾期金额(合计)保证金后
((SELECT SUM(nvl(tt.transaction_amount, 0)) ((SELECT SUM(nvl(tt.transaction_amount, 0))
FROM csh_transaction tt FROM csh_transaction tt
WHERE tt.transaction_type = 'DEPOSIT' WHERE tt.transaction_type = 'DEPOSIT'
...@@ -625,12 +648,13 @@ ...@@ -625,12 +648,13 @@
AND tt.ref_contract_id = ct.contract_id AND tt.ref_contract_id = ct.contract_id
AND tt.transaction_date <= trunc(to_date(${@cur_end}, 'yyyy-mm-dd'))) AND tt.transaction_date <= trunc(to_date(${@cur_end}, 'yyyy-mm-dd')))
- -
(SELECT sum(nvl(cwo.WRITE_OFF_DUE_AMOUNT,0)) (SELECT sum(nvl(cwo.WRITE_OFF_DUE_AMOUNT,0))
FROM csh_write_off cwo FROM csh_write_off cwo
where cwo.write_off_type in ('CSH_RETURN','DEPOSIT_TRANSFER','DEPOSIT_CREDIT') where cwo.write_off_type in ('CSH_RETURN','DEPOSIT_TRANSFER','DEPOSIT_CREDIT')
AND cwo.csh_transaction_id in (select cts.transaction_id from csh_transaction cts where cts.ref_contract_id = ct.contract_id) AND cwo.csh_transaction_id in (select cts.transaction_id from csh_transaction cts where cts.ref_contract_id = ct.contract_id)
AND cwo.write_off_date <= trunc(to_date(${@cur_end}, 'yyyy-mm-dd')))) deposit_amount, AND cwo.write_off_date <= trunc(to_date(${@cur_end}, 'yyyy-mm-dd')))) deposit_amount,
--保证金金额 --保证金金额
(SELECT v.code_value_name (SELECT v.code_value_name
FROM sys_code_values_v v FROM sys_code_values_v v
WHERE v.code = 'CON500_CONTRACT_STATUS' WHERE v.code = 'CON500_CONTRACT_STATUS'
...@@ -666,16 +690,12 @@ ...@@ -666,16 +690,12 @@
AND v.code_enabled_flag = 'Y' AND v.code_enabled_flag = 'Y'
AND v.code_value_enabled_flag = 'Y' AND v.code_value_enabled_flag = 'Y'
AND v.CODE_VALUE = ct.is_buyout) is_buyout_n, AND v.CODE_VALUE = ct.is_buyout) is_buyout_n,
(SELECT sh.large_balance ct.large_balance,
FROM prj_quotation sh
WHERE sh.DOCUMENT_ID = ct.project_id) large_balance,
(SELECT v.code_value_name (SELECT v.code_value_name
FROM sys_code_values_v v FROM sys_code_values_v v
WHERE v.code = 'SECONDARY_LEASE' WHERE v.code = 'SECONDARY_LEASE'
AND v.code_value = AND v.code_value =
(SELECT sh.large_balance ct.large_balance) large_balance_n,
FROM prj_quotation sh
WHERE sh.DOCUMENT_ID = ct.project_id)) large_balance_n,
ct.branch_code, ct.branch_code,
(SELECT v.code_value_name (SELECT v.code_value_name
FROM sys_code_values_v v FROM sys_code_values_v v
...@@ -713,13 +733,14 @@ ...@@ -713,13 +733,14 @@
and ccc.times <= 12 and ccc.times <= 12
and ccc.contract_id = ct.contract_id and ccc.contract_id = ct.contract_id
and ccc.write_off_flag != 'FULL' and ccc.write_off_flag != 'FULL'
and ccc.due_amount != 0
and ccc.cf_direction = 'INFLOW') and ccc.cf_direction = 'INFLOW')
and exists (select 1 and exists (select 1
from con_contract_cashflow ccc from con_contract_cashflow ccc
where ccc.cf_item = 1 where ccc.cf_item = 1
and ccc.times = 12 and ccc.times = 12
and ccc.contract_id = ct.contract_id and ccc.contract_id = ct.contract_id
and ccc.write_off_flag = 'FULL' and (ccc.write_off_flag = 'FULL' or ccc.due_amount=0)
and ccc.cf_direction = 'INFLOW')), and ccc.cf_direction = 'INFLOW')),
'否') rental_12_pay_flag, '否') rental_12_pay_flag,
nvl((select '是' nvl((select '是'
...@@ -832,6 +853,8 @@ ...@@ -832,6 +853,8 @@
<bm:field name="residual_date"/> <bm:field name="residual_date"/>
<bm:field name="terminate_date"/> <bm:field name="terminate_date"/>
<bm:field name="is_buyout_n"/> <bm:field name="is_buyout_n"/>
<bm:field name="large_balance_n"/>
<bm:field name="branch_code_n"/>
<bm:field name="bp_class_n"/> <bm:field name="bp_class_n"/>
<bm:field name="business_type_n"/> <bm:field name="business_type_n"/>
<bm:field name="division_n"/> <bm:field name="division_n"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: WangYu
$Date: 2014-4-25 上午09:30:21
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select t.*
from con_rental_balance_rpt t
where t.month = ${@month}
order by t.contract_id desc
]]></bm:query-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
rpt5012_rental_balance_pkg.rental_balance_insert(
p_month =>${@month},
p_user_id =>${/session/@user_id},
p_batch_id =>${@batch_id}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="agent_extra_name"/>
<bm:field name="bp_tenant_name"/>
<bm:field name="contract_number"/>
<bm:field name="lease_start_date"/>
<bm:field name="modelcd"/>
<bm:field name="machine_number"/>
<bm:field name="int_rate_diaplay"/>
<bm:field name="lease_times"/>
<bm:field name="down_payment_ratio"/>
<bm:field name="lease_item_amount"/>
<bm:field name="residual_amount"/>
<bm:field name="contract_amount"/>
<bm:field name="down_payment"/>
<bm:field name="month_due_amount"/>
<bm:field name="month_due_principal"/>
<bm:field name="month_interest"/>
<bm:field name="month_residual"/>
<bm:field name="business_due_times"/>
<bm:field name="business_due_amount"/>
<bm:field name="deposit_amount"/>
<bm:field name="contract_status_n"/>
<bm:field name="residual_date"/>
<bm:field name="terminate_date"/>
</bm:fields>
<!-- <bm:query-fields>-->
<!-- <bm:query-field field="bp_id_tenant_n" queryExpression="t1.bp_id_tenant_n = ${@bp_id_tenant_n}"/>-->
<!-- <bm:query-field field="account_name" queryExpression="t1.account_name = ${@account_name}"/>-->
<!-- <bm:query-field field="account_id_n" queryExpression="t1.account_id_n = ${@account_id_n}"/>-->
<!-- </bm:query-fields>-->
</bm:model>
...@@ -462,18 +462,15 @@ SELECT h.period_year, ...@@ -462,18 +462,15 @@ SELECT h.period_year,
and ah.invoice_kind in ('0', '2') and ah.invoice_kind in ('0', '2')
AND to_char(ah.invoice_date,'yyyymm') <= ${@base_period} AND to_char(ah.invoice_date,'yyyymm') <= ${@base_period}
and ah.invoice_status = 'CONFIRM'),0) vat_due_amount, and ah.invoice_status = 'CONFIRM'),0) vat_due_amount,
(select case (select
when nvl(ccc.interest, 0) != 0 and (ccc.interest -ccc.vat_interest) != 0 then case when nvl(ccc.interest,0)!=0 then
round(ccc.vat_interest / (ccc.interest -ccc.vat_interest), 2) round(ccc.vat_interest/ccc.interest,2)
when nvl(ccc.due_amount - ccc.vat_due_amount, 0) != 0 then when nvl(ccc.due_amount-ccc.vat_due_amount,0)!=0 then
round(ccc.vat_due_amount / round(ccc.vat_due_amount/(ccc.due_amount-ccc.vat_due_amount),2)
(ccc.due_amount - ccc.vat_due_amount),
2)
else else
null null
end end
from con_contract_cashflow ccc from con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id) vat_rate,
where ccc.cashflow_id = l.cashflow_id) vat_rate,
h.je_transaction_code, h.je_transaction_code,
l.cashflow_id l.cashflow_id
FROM hls_journal_header h, hls_journal_detail l,gld_accounts ga FROM hls_journal_header h, hls_journal_detail l,gld_accounts ga
......
...@@ -496,18 +496,15 @@ SELECT h.period_year, ...@@ -496,18 +496,15 @@ SELECT h.period_year,
and ah.invoice_kind in ('0', '2') and ah.invoice_kind in ('0', '2')
AND to_char(ah.invoice_date,'yyyymm') <= ${@base_period} AND to_char(ah.invoice_date,'yyyymm') <= ${@base_period}
and ah.invoice_status = 'CONFIRM'),0) vat_due_amount, and ah.invoice_status = 'CONFIRM'),0) vat_due_amount,
(select case (select
when nvl(ccc.interest, 0) != 0 and (ccc.interest -ccc.vat_interest) != 0 then case when nvl(ccc.interest,0)!=0 then
round(ccc.vat_interest / (ccc.interest -ccc.vat_interest), 2) round(ccc.vat_interest/ccc.interest,2)
when nvl(ccc.due_amount - ccc.vat_due_amount, 0) != 0 then when nvl(ccc.due_amount-ccc.vat_due_amount,0)!=0 then
round(ccc.vat_due_amount / round(ccc.vat_due_amount/(ccc.due_amount-ccc.vat_due_amount),2)
(ccc.due_amount - ccc.vat_due_amount),
2)
else else
null null
end end
from con_contract_cashflow ccc from con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id) vat_rate,
where ccc.cashflow_id = l.cashflow_id) vat_rate,
h.je_transaction_code, h.je_transaction_code,
l.cashflow_id, l.cashflow_id,
'N' fixed_data_flag 'N' fixed_data_flag
......
...@@ -60,16 +60,14 @@ ...@@ -60,16 +60,14 @@
</bm:operation> </bm:operation>
</bm:operations> </bm:operations>
<bm:data-filters> <bm:data-filters>
<!-- <bm:data-filter enforceOperations="query" expression="to_char(t1.invoice_date,'yyyymm') = ${@base_period}"/>--> <!-- <bm:data-filter enforceOperations="query" expression="to_char(t1.invoice_date,'yyyymm') = ${@base_period}"/>-->
</bm:data-filters> </bm:data-filters>
<bm:query-fields> <bm:query-fields>
<bm:query-field name="contract_number" queryExpression="t1.contract_number = ${@contract_number}"/> <bm:query-field name="contract_number" queryExpression="t1.contract_number = ${@contract_number}"/>
<bm:query-field name="bp_name" queryExpression="t1.bp_name = ${@bp_name}"/> <bm:query-field name="bp_name" queryExpression="t1.bp_name = ${@bp_name}"/>
<!-- <bm:query-field name="journal_date" queryExpression="to_char(t1.journal_date,'yyyy-mm-dd') = ${@journal_date}"/>--> <!-- <bm:query-field name="journal_date" queryExpression="to_char(t1.journal_date,'yyyy-mm-dd') = ${@journal_date}"/>-->
<bm:query-field name="invoice_date" queryExpression="to_char(t1.invoice_date,'yyyy-mm-dd') = ${@invoice_date}"/> <bm:query-field name="invoice_date" queryExpression="to_char(t1.invoice_date,'yyyy-mm-dd') = ${@invoice_date}"/>
<bm:query-field name="invoice_kind" queryExpression="t1.invoice_kind = ${@invoice_kind}"/> <bm:query-field name="invoice_kind" queryExpression="t1.invoice_kind = ${@invoice_kind}"/>
<bm:query-field name="vat_6_flag" queryExpression="((${@vat_6_flag}='Y' and t1.tax_type_rate=0.06) or(${@vat_6_flag}!='Y' and t1.tax_type_rate!=0.06))"/> <bm:query-field name="vat_6_flag" queryExpression="((${@vat_6_flag}='Y' and t1.tax_type_rate=0.06) or(${@vat_6_flag}!='Y' and t1.tax_type_rate!=0.06))"/>
<bm:query-field name="journal_date_f" queryExpression="to_char(t1.je_date,'yyyy-mm-dd') &gt;= ${@journal_date_f}"/>
<bm:query-field name="journal_date_t" queryExpression="to_char(t1.je_date,'yyyy-mm-dd') &lt;= ${@journal_date_t}"/>
</bm:query-fields> </bm:query-fields>
</bm:model> </bm:model>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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