diff --git a/bui/etc/cap/OBUICAP1/2040801_CTL.XML b/bui/etc/cap/OBUICAP1/2040801_CTL.XML index 52ab0af..88af059 100644 --- a/bui/etc/cap/OBUICAP1/2040801_CTL.XML +++ b/bui/etc/cap/OBUICAP1/2040801_CTL.XML @@ -73,6 +73,30 @@ MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|CORG_DSK_NO|CORG_DSK_NO|BEG_DT|BEG_DT|END_DT|END_DT| + + + SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC FROM CAPTXNJNL J + left join CAPCUSINF M on J.MERC_ID=M.CUSTOMER_ID + left join CAPDSKINF B on J.DSK_NAM=B.DSK_NAM + where + ('%s' IS NULL OR J.MERC_ID LIKE '%s%') + AND ('%s' IS NULL OR J.MERC_ORD_NO LIKE '%s%') + AND ('%s' IS NULL OR J.DSK_NAM LIKE '%s%') + AND ('%s' IS NULL OR J.JRN_NO LIKE '%s%') + AND ( J.TXN_STS = 'R') + AND ('%s' IS NULL OR J.CRD_NO LIKE '%s%') + AND ('%s' IS NULL OR J.CORG_NO LIKE '%s%') + AND ('%s' IS NULL OR J.TXN_MOD = '%s') + AND ('%s' IS NULL OR J.ORD_TYP = '%s') + AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s') + AND ('%s' IS NULL OR J.TXN_CNL = '%s') + AND ('%s' IS NULL OR J.CORG_DSK_NO = '%s') + AND (J.ORD_DT >='%s' OR '%s' IS NULL) + AND (J.ORD_DT <='%s' OR '%s' IS NULL) order by J.TXN_TM desc + + MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|CORG_DSK_NO|CORG_DSK_NO|BEG_DT|BEG_DT|END_DT|END_DT| + + SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC FROM CAPTXNJNL J @@ -98,7 +122,7 @@ - + SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC FROM CAPTXNJNL J left join CAPCUSINF M on J.MERC_ID=M.CUSTOMER_ID @@ -108,7 +132,7 @@ AND ('%s' IS NULL OR J.MERC_ORD_NO LIKE '%s%') AND ('%s' IS NULL OR J.DSK_NAM LIKE '%s%') AND ('%s' IS NULL OR J.JRN_NO LIKE '%s%') - AND ( J.TXN_STS = 'P' OR J.TXN_STS = 'T') + AND ( J.TXN_STS = 'P') AND ('%s' IS NULL OR J.CRD_NO LIKE '%s%') AND ('%s' IS NULL OR J.CORG_NO LIKE '%s%') AND ('%s' IS NULL OR J.TXN_MOD = '%s') @@ -132,8 +156,11 @@ QRY_SQL=QRY_CAPTXNJNL_F - - QRY_SQL=QRY_CAPTXNJNL_PT + + QRY_SQL=QRY_CAPTXNJNL_R + + + QRY_SQL=QRY_CAPTXNJNL_P QRY_SQL=QRY_CAPTXNJNL_A