From ab26e959e6575d4ad317434ec5e178cd34b81cc3 Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Tue, 9 Nov 2021 16:40:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E8=A7=84=E5=88=99=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=EF=BC=8C=E9=80=80=E7=A5=A8=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bui/etc/cap/OBUICAP1/0040008_CTL.XML | 3 ++-
 bui/etc/cap/OBUICAP1/2040861_CTL.XML | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

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)) &lt;= '%s') AND
@@ -20,7 +21,7 @@
 				(TIM_UP &gt;= '%s' OR TIM_UP = 0)  
 				ORDER BY RUL_LVL ASC
 			</Sentence>
-			<Fields>BNK_TYP|TRA_CD|CRD_FLG|ATM|ATM|DAT|DAT|TIM|TIM|
+			<Fields>BNK_TYP|GRP_NM|TRA_CD|CRD_FLG|ATM|ATM|DAT|DAT|TIM|TIM|
 			</Fields>
 		</DynSentence>
 
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 ?)            
          </Sentence>
-         <Fields>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|</Fields>
+         <Fields>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|</Fields>
       </DynSentence>
       <FlowCtrl>
 
          <!--交易记录查询-->
-         <Exec func="PUB:DBMultiQueryPage" >
+         <Exec func="PUB:DBMultiQueryPage" error="IGNORE">
             <Arg name="PageNo" value="$PAG_NO"/>
             <Arg name="SqlCmd" value="QRY_CAPCMBRFD"/>
             <Arg name="RecNumPerPage" value="$PAG_NUM"/>