diff --git a/WebContent/WEB-INF/etc/jbo/jbo_app.xml b/WebContent/WEB-INF/etc/jbo/jbo_app.xml index 081cf3b45..cde657581 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_app.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_app.xml @@ -4116,6 +4116,7 @@ + diff --git a/src_jbo/jbo/app/VI_VOUCHER_V8.java b/src_jbo/jbo/app/VI_VOUCHER_V8.java index a06a697d6..7e2732f85 100644 --- a/src_jbo/jbo/app/VI_VOUCHER_V8.java +++ b/src_jbo/jbo/app/VI_VOUCHER_V8.java @@ -18,6 +18,10 @@ public interface VI_VOUCHER_V8{ */ public static final String f3 = "f3"; /** + * DOUBLE(22)
+ */ + public static final String MONEY = "MONEY"; + /** * STRING(20)
*/ public static final String id = "id"; diff --git a/src_sql/view/vi_voucher_v8.sql b/src_sql/view/vi_voucher_v8.sql index 0e71f30bc..ae946435b 100644 --- a/src_sql/view/vi_voucher_v8.sql +++ b/src_sql/view/vi_voucher_v8.sql @@ -1,59 +1,74 @@ -create view vi_voucher_v8 as ( -SELECT V8.F3 AS F3, - V8.F60 AS F60, - V8.ID AS ID, - V8.MODULE_NAME AS MODULE_NAME, - V8.DEPT_NAME AS DEPT_NAME, - V8.F1 AS F1, - V8.F15 AS F15, - V8.F2 AS F2, - V8.EVIDENCE_TYPE AS EVIDENCE_TYPE, - V8.V8_STATUS AS V8_STATUS, - V8.V8_FLAG AS V8_FLAG, - V8.DETAIL AS DETAIL, - V8.F21 AS F21, - V8.V8_MEMO AS V8_MEMO, - V8.F5 AS F5, - V8.EXP_DATE AS EXP_DATE, - date_format(V8.GENERATE_DATE, '%Y/%m/%d %H:%i:%s') AS GENERATE_DATE, - V8.F6 AS F6, - V8.F16 AS F16, - V8.F67 AS F67, - V8.F19 AS F19, - V8.F89 AS F89, - V8.F47 AS F47, - V8.F48 AS F48, - V8.F49 AS F49, - V8.F50 AS F50, - (CASE WHEN (NDR.FLAG = '1') THEN 'ɹ' WHEN ((NDR.FLAG <> '1') AND (NDR.FLAG IS NOT NULL)) THEN 'ʧ' ELSE 'δ' END) AS FLAG, - NDR.BATCH AS BATCH, - date_format(NDR.CREATE_TIME, '%Y/%m/%d') AS CREATE_TIME -FROM ((( - SELECT APZL.VOUCHER_V8.F3 AS F3, - max(APZL.VOUCHER_V8.F60) AS F60, - max(APZL.VOUCHER_V8.ID) AS ID, - max(APZL.VOUCHER_V8.MODULE_NAME) AS MODULE_NAME, - max(APZL.VOUCHER_V8.DEPT_NAME) AS DEPT_NAME, - max(APZL.VOUCHER_V8.F1) AS F1, - max(APZL.VOUCHER_V8.F15) AS F15, - max(APZL.VOUCHER_V8.F2) AS F2, - max(APZL.VOUCHER_V8.EVIDENCE_TYPE) AS EVIDENCE_TYPE, - max(APZL.VOUCHER_V8.V8_STATUS) AS V8_STATUS, - max(APZL.VOUCHER_V8.V8_FLAG) AS V8_FLAG, - max('') AS DETAIL, - max(APZL.VOUCHER_V8.F21) AS F21, - max(APZL.VOUCHER_V8.V8_MEMO) AS V8_MEMO, - max(APZL.VOUCHER_V8.F5) AS F5, - max(APZL.VOUCHER_V8.EXP_DATE) AS EXP_DATE, - max(APZL.VOUCHER_V8.GENERATE_DATE) AS GENERATE_DATE, - max(APZL.VOUCHER_V8.F6) AS F6, - max(APZL.VOUCHER_V8.F16) AS F16, - max(APZL.VOUCHER_V8.F67) AS F67, - max(APZL.VOUCHER_V8.F19) AS F19, - max(APZL.VOUCHER_V8.F89) AS F89 - FROM APZL.VOUCHER_V8 - GROUP BY APZL.VOUCHER_V8.F3 -) - ) V8 -LEFT JOIN APZL.NCXML_DETAIL_RECORDS NDR ON ((NDR.BILLID = V8.ID))) -ORDER BY (substr(V8.F3, 2) + 0) DESC); \ No newline at end of file +DELIMITER $$ + +ALTER ALGORITHM=UNDEFINED DEFINER=`apzl`@`%` SQL SECURITY DEFINER VIEW `vi_voucher_v8` AS ( +SELECT + V8.MONEY, + `v8`.`f3` AS `f3`, + `v8`.`f60` AS `f60`, + `v8`.`id` AS `id`, + `v8`.`module_name` AS `module_name`, + `v8`.`dept_name` AS `dept_name`, + `v8`.`f1` AS `f1`, + `v8`.`f15` AS `f15`, + `v8`.`f2` AS `f2`, + `v8`.`evidence_type` AS `evidence_type`, + `v8`.`v8_status` AS `v8_status`, + `v8`.`v8_flag` AS `v8_flag`, + `v8`.`detail` AS `detail`, + `v8`.`f21` AS `f21`, + `v8`.`v8_memo` AS `v8_memo`, + `v8`.`f5` AS `f5`, + `v8`.`exp_date` AS `exp_date`, + DATE_FORMAT(`v8`.`generate_date`,'%Y/%m/%d %H:%i:%s') AS `generate_date`, + `v8`.`f6` AS `f6`, + `v8`.`f16` AS `f16`, + `v8`.`f67` AS `f67`, + `v8`.`f19` AS `f19`, + `v8`.`f89` AS `f89`, + `v8`.`f47` AS `f47`, + `v8`.`f48` AS `f48`, + `v8`.`f49` AS `f49`, + `v8`.`f50` AS `f50`, + (CASE WHEN (`ndr`.`FLAG` = '1') THEN 'ɹ' WHEN ((`ndr`.`FLAG` <> '1') AND (`ndr`.`FLAG` IS NOT NULL)) THEN 'ʧ' ELSE 'δ' END) AS `FLAG`, + `ndr`.`BATCH` AS `BATCH`, + DATE_FORMAT(`ndr`.`CREATE_TIME`, '%Y/%m/%d') AS `CREATE_TIME` +FROM + ( + ( + (SELECT + `apzl`.`voucher_v8`.`f3` AS `f3`, + SUM(IFNULL(F7,0)) AS MONEY, + MAX(`apzl`.`voucher_v8`.`f60`) AS `f60`, + MAX(`apzl`.`voucher_v8`.`id`) AS `id`, + MAX(`apzl`.`voucher_v8`.`module_name`) AS `module_name`, + MAX(`apzl`.`voucher_v8`.`dept_name`) AS `dept_name`, + MAX(`apzl`.`voucher_v8`.`f1`) AS `f1`, + MAX(`apzl`.`voucher_v8`.`f15`) AS `f15`, + MAX(`apzl`.`voucher_v8`.`f2`) AS `f2`, + MAX(`apzl`.`voucher_v8`.`evidence_type`) AS `evidence_type`, + MAX(`apzl`.`voucher_v8`.`v8_status`) AS `v8_status`, + MAX(`apzl`.`voucher_v8`.`v8_flag`) AS `v8_flag`, + MAX('') AS `detail`, + MAX(`apzl`.`voucher_v8`.`f21`) AS `f21`, + MAX(`apzl`.`voucher_v8`.`v8_memo`) AS `v8_memo`, + MAX(`apzl`.`voucher_v8`.`f5`) AS `f5`, + MAX(`apzl`.`voucher_v8`.`exp_date`) AS `exp_date`, + MAX(`apzl`.`voucher_v8`.`generate_date`) AS `generate_date`, + MAX(`apzl`.`voucher_v8`.`f6`) AS `f6`, + MAX(`apzl`.`voucher_v8`.`f16`) AS `f16`, + MAX(`apzl`.`voucher_v8`.`f67`) AS `f67`, + MAX(`apzl`.`voucher_v8`.`f19`) AS `f19`, + MAX(`apzl`.`voucher_v8`.`f89`) AS `f89`, + MAX(`apzl`.`voucher_v8`.`f47`) AS `f47`, + MAX(`apzl`.`voucher_v8`.`f48`) AS `f48`, + MAX(`apzl`.`voucher_v8`.`f49`) AS `f49`, + MAX(`apzl`.`voucher_v8`.`f50`) AS `f50` + FROM + `apzl`.`voucher_v8` + GROUP BY `apzl`.`voucher_v8`.`f3`) + ) `v8` + LEFT JOIN `apzl`.`ncxml_detail_records` `ndr` ON ((`ndr`.`BILLID` = `v8`.`id`)) + ) +ORDER BY (SUBSTR(`v8`.`f3`, 2) + 0) DESC )$$ + +DELIMITER ; \ No newline at end of file