diff --git a/bui/etc/cap/OBUICAP1/0040008_CTL.XML b/bui/etc/cap/OBUICAP1/0040008_CTL.XML index 368d239..e35585c 100644 --- a/bui/etc/cap/OBUICAP1/0040008_CTL.XML +++ b/bui/etc/cap/OBUICAP1/0040008_CTL.XML @@ -10,6 +10,7 @@ WHERE RUL_STS = 2 AND (BNK_TYP = '%s' OR BNK_TYP IS NULL OR BNK_TYP = '') AND + (GRP_NM = '%s' OR GRP_NM IS NULL OR GRP_NM = '') AND (TRA_CD = '%s' OR TRA_CD IS NULL OR TRA_CD = '') AND (CRD_FLG = '%s' OR CRD_FLG IS NULL or CRD_FLG = '') AND (TO_NUMBER(NVL(ATM_LOW,0)) <= '%s') AND @@ -20,7 +21,7 @@ (TIM_UP >= '%s' OR TIM_UP = 0) ORDER BY RUL_LVL ASC - BNK_TYP|TRA_CD|CRD_FLG|ATM|ATM|DAT|DAT|TIM|TIM| + BNK_TYP|GRP_NM|TRA_CD|CRD_FLG|ATM|ATM|DAT|DAT|TIM|TIM| diff --git a/bui/etc/cap/OBUICAP1/2040861_CTL.XML b/bui/etc/cap/OBUICAP1/2040861_CTL.XML index 2975278..b850d55 100644 --- a/bui/etc/cap/OBUICAP1/2040861_CTL.XML +++ b/bui/etc/cap/OBUICAP1/2040861_CTL.XML @@ -12,13 +12,14 @@ AND ('%s' IS NULL OR CAP_ORD_NO LIKE '%s%') AND ('%s' IS NULL OR DSK_NAM LIKE '%s%') AND (TRS_DAT BETWEEN ? AND ?) + AND (TM_SMP BETWEEN ? AND ?) - EAC_NBR|EAC_NBR|EAC_NAM|EAC_NAM|MERC_ORD_NO|MERC_ORD_NO|CAP_ORD_NO|CAP_ORD_NO|DSK_NAM|DSK_NAM|BEG_DT|END_DT| + EAC_NBR|EAC_NBR|EAC_NAM|EAC_NAM|MERC_ORD_NO|MERC_ORD_NO|CAP_ORD_NO|CAP_ORD_NO|DSK_NAM|DSK_NAM|BEG_DT|END_DT|BEG_TM|END_TM| - +