diff --git a/bui/etc/cap/OBUICAP1/2040801_CTL.XML b/bui/etc/cap/OBUICAP1/2040801_CTL.XML index 88af059..6f11d5d 100644 --- a/bui/etc/cap/OBUICAP1/2040801_CTL.XML +++ b/bui/etc/cap/OBUICAP1/2040801_CTL.XML @@ -4,7 +4,7 @@ - SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC,B.RCV_DT,B.RCV_TM,B.END_DT,B.END_TM FROM CAPTXNJNL J + SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC,B.RCV_DT,B.RCV_TM,B.END_DT,B.END_TM,M.CUSTOMER_CODE 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 @@ -27,7 +27,7 @@ - SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC FROM CAPTXNJNL J + SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC,B.RCV_DT,B.RCV_TM,B.END_DT,B.END_TM,M.CUSTOMER_CODE 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 @@ -51,7 +51,7 @@ - SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC FROM CAPTXNJNL J + SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC,B.RCV_DT,B.RCV_TM,B.END_DT,B.END_TM,M.CUSTOMER_CODE 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 @@ -75,7 +75,7 @@ - SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC FROM CAPTXNJNL J + SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC,B.RCV_DT,B.RCV_TM,B.END_DT,B.END_TM,M.CUSTOMER_CODE 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 @@ -99,7 +99,7 @@ - SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC FROM CAPTXNJNL J + SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC,B.RCV_DT,B.RCV_TM,B.END_DT,B.END_TM,M.CUSTOMER_CODE 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 @@ -124,7 +124,7 @@ - SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC FROM CAPTXNJNL J + SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC,B.RCV_DT,B.RCV_TM,B.END_DT,B.END_TM,M.CUSTOMER_CODE 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 diff --git a/bui/etc/cap/OBUICAP1/2040817_CTL.XML b/bui/etc/cap/OBUICAP1/2040817_CTL.XML index 841fd30..f1d1ad6 100644 --- a/bui/etc/cap/OBUICAP1/2040817_CTL.XML +++ b/bui/etc/cap/OBUICAP1/2040817_CTL.XML @@ -4,13 +4,13 @@ - select * from CAPDSKINF where - ('%s' IS NULL OR DSK_NAM LIKE '%s%') - AND ('%s' IS NULL OR MERC_ID LIKE '%s%') - AND ('%s' IS NULL OR MERC_NAM LIKE '%s%') - AND ('%s' IS NULL OR TXN_MOD = '%s') - AND (ORD_DT >='%s' OR '%s' IS NULL) - AND (ORD_DT <='%s' OR '%s' IS NULL) order by tm_smp DESC + select A.*,C.CUSTOMER_CODE from CAPDSKINF A left join CAPCUSINF C on C.CUSTOMER_ID=A.MERC_ID where + ('%s' IS NULL OR A.DSK_NAM LIKE '%s%') + AND ('%s' IS NULL OR A.MERC_ID LIKE '%s%') + AND ('%s' IS NULL OR A.MERC_NAM LIKE '%s%') + AND ('%s' IS NULL OR A.TXN_MOD = '%s') + AND (A.ORD_DT >='%s' OR '%s' IS NULL) + AND (A.ORD_DT <='%s' OR '%s' IS NULL) order by A.tm_smp DESC DSK_NAM|DSK_NAM|MERC_ID|MERC_ID|MERC_NAM|MERC_NAM|TXN_MOD|TXN_MOD|BEG_DT|BEG_DT|END_DT|END_DT| diff --git a/bui/etc/cap/OBUICAP1/2040818_CTL.XML b/bui/etc/cap/OBUICAP1/2040818_CTL.XML index a10bedc..f99b4fd 100644 --- a/bui/etc/cap/OBUICAP1/2040818_CTL.XML +++ b/bui/etc/cap/OBUICAP1/2040818_CTL.XML @@ -4,7 +4,7 @@ - select A.*,B.DISK_DESC,C.CUSTOMER_NAME from CAPBATINF A + select A.*,B.DISK_DESC,C.CUSTOMER_NAME,C.CUSTOMER_CODE from CAPBATINF A left join CAPDSKINF B on B.DSK_NAM=A.DSK_NAM left join CAPCUSINF C on C.CUSTOMER_ID=A.MERC_ID where