From a78a5acb3f9de2295c8159fcdbdeab93c1815b39 Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Mon, 23 Aug 2021 09:53:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=EF=BC=8C=E5=8D=A1bin?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bui/etc/cap/OBUICAP1/2040883_CTL.XML |  60 ++++++++++++++++
 bui/etc/cap/OBUICAP1/2040884_CTL.XML |  98 +++++++++++++++++++++++++++
 bui/etc/cap/OBUICAP1_CTL.XML         |   2 +
 cap/etc/OCAPRPT2/RPT_D_010_d.raq     | Bin 5038 -> 11543 bytes
 cap/etc/OCAPRPT2/RPT_D_010_m.raq     | Bin 5111 -> 11616 bytes
 cap/etc/OCAPRPT2_CTL.XML             |   1 -
 6 files changed, 160 insertions(+), 1 deletion(-)
 create mode 100644 bui/etc/cap/OBUICAP1/2040883_CTL.XML
 create mode 100644 bui/etc/cap/OBUICAP1/2040884_CTL.XML

diff --git a/bui/etc/cap/OBUICAP1/2040883_CTL.XML b/bui/etc/cap/OBUICAP1/2040883_CTL.XML
new file mode 100644
index 0000000..e316e31
--- /dev/null
+++ b/bui/etc/cap/OBUICAP1/2040883_CTL.XML
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<Root>
+   <!--卡BIN信息新增-->
+   <Transaction code="2040883" log_switch="1">
+
+      <DynSentence name="QRY_CMMTUFIT_INF">
+         <Sentence>
+            SELECT  'Y' YN from CMMTUFIT WHERE FIT_CTT=?
+         </Sentence>
+         <Fields>FIT_CTT|</Fields>
+      </DynSentence>
+
+      <FlowCtrl>
+         <Exec func="PUB:DumpETF" />
+         <Set>FIT_TRK=2</Set>
+         <Set>FIT_OFS=2</Set>
+         <Set>CRD_OFS=2</Set>
+         <Set>CRD_TRK=2</Set>
+         <Set>EXP_DT_FLG=22</Set>
+         <Set>INT_MOD=1</Set>
+         <Set>TM_SMP=GETDATETIME()</Set>
+         <!--组信息新增-->
+         <Exec func="PUB:ReadRecord" error="IGNORE">
+            <Arg name="SqlCmd"       value="QRY_CMMTUFIT_INF"/>
+         </Exec>
+         <If condition="~RetCod=2">
+            <Exec func="PUB:InsertRecord" error="IGNORE">
+               <Arg name="TblNam" value="CMMTUFIT" />
+            </Exec>
+            <If condition="~RetCod!=0">
+               <Exec func="PUB:GWASetMsg">
+                  <Arg name="MsgCd" value="CAP99999"/>
+                  <Arg name="MsgDat" value="数据库错误"/>
+               </Exec>
+               <Return/>
+            </If>
+         </If>
+         <ElseIf condition="~RetCod=0">
+            <Exec func="PUB:GWASetMsg">
+               <Arg name="MsgCd" value="CAP00026"/>
+               <Arg name="MsgDat" value="信息已存在"/>
+            </Exec>
+            <Return/>
+         </ElseIf>
+         <Else><!--数据库查询错误-->
+            <Exec func="PUB:GWASetMsg">
+               <Arg name="MsgCd" value="CAP99999"/>
+               <Arg name="MsgDat" value="数据库错误"/>
+            </Exec>
+            <Return/>
+         </Else>
+         <Exec func="PUB:DumpETF" />
+         <Exec func="PUB:GWASetMsg">
+            <Arg name="MsgCd" value="CAP00000" />
+         </Exec>
+
+      </FlowCtrl>
+   </Transaction>
+
+</Root>
diff --git a/bui/etc/cap/OBUICAP1/2040884_CTL.XML b/bui/etc/cap/OBUICAP1/2040884_CTL.XML
new file mode 100644
index 0000000..3675f44
--- /dev/null
+++ b/bui/etc/cap/OBUICAP1/2040884_CTL.XML
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<Root>
+   <!--卡BIN信息修改-->
+   <Transaction code="2040884" log_switch="1">
+
+      <DynSentence name="UPD_CMMTUFIT_INF">
+         <Sentence>
+            FIT_CTT=?
+         </Sentence>
+         <Fields>O_FIT_CTT|</Fields>
+      </DynSentence>
+
+      <DynSentence name="QRY_CMMTUFIT_INF">
+         <Sentence>
+            SELECT  'Y' YN from CMMTUFIT WHERE FIT_CTT=?
+         </Sentence>
+         <Fields>O_FIT_CTT|</Fields>
+      </DynSentence>
+
+      <DynSentence name="QRY_CMMTUFIT_NEWINF">
+         <Sentence>
+            SELECT  'Y' YN from CMMTUFIT WHERE FIT_CTT=?
+         </Sentence>
+         <Fields>FIT_CTT|</Fields>
+      </DynSentence>
+      <FlowCtrl>
+         <Exec func="PUB:DumpETF" />
+         <Set>FIT_TRK=2</Set>
+         <Set>FIT_OFS=2</Set>
+         <Set>CRD_OFS=2</Set>
+         <Set>CRD_TRK=2</Set>
+         <Set>EXP_DT_FLG=22</Set>
+         <Set>INT_MOD=1</Set>
+         <Set>TM_SMP=GETDATETIME()</Set>
+         <!--休息修改-->
+         <Exec func="PUB:ReadRecord" error="IGNORE">
+            <Arg name="SqlCmd"       value="QRY_CMMTUFIT_INF"/>
+         </Exec>
+         <If condition="~RetCod=0">
+
+            <If condition="IS_NOEQUAL_STRING($FIT_CTT,$O_FIT_CTT)">
+               <Exec func="PUB:ReadRecord" error="IGNORE">
+                  <Arg name="SqlCmd"       value="QRY_CMMTUFIT_NEWINF"/>
+               </Exec>
+               <If condition="~RetCod=0">
+                  <Exec func="PUB:GWASetMsg">
+                     <Arg name="MsgCd" value="CAP00026"/>
+                     <Arg name="MsgDat" value="信息已存在出现重复记录"/>
+                  </Exec>
+                  <Return/>
+               </If>
+               <ElseIf condition="~RetCod=-1">
+                  <Exec func="PUB:GWASetMsg">
+                     <Arg name="MsgCd" value="CAP99999"/>
+                     <Arg name="MsgDat" value="数据库错误"/>
+                  </Exec>
+                  <Return/>
+               </ElseIf>
+            </If>
+
+
+
+
+            <Exec func="PUB:UpdateRecord" error="IGNORE">
+               <Arg name="TblNam" value="CMMTUFIT" />
+               <Arg name="CndSts" value="UPD_CMMTUFIT_INF" />
+            </Exec>
+            <If condition="~RetCod!=0">
+               <Exec func="PUB:GWASetMsg">
+                  <Arg name="MsgCd" value="CAP99999"/>
+                  <Arg name="MsgDat" value="数据库错误"/>
+               </Exec>
+               <Return/>
+            </If>
+         </If>
+         <ElseIf condition="~RetCod=2">
+            <Exec func="PUB:GWASetMsg">
+               <Arg name="MsgCd" value="CAP00023"/>
+               <Arg name="MsgDat" value="信息不存在"/>
+            </Exec>
+            <Return/>
+         </ElseIf>
+         <Else><!--数据库查询错误-->
+            <Exec func="PUB:GWASetMsg">
+               <Arg name="MsgCd" value="CAP99999"/>
+               <Arg name="MsgDat" value="数据库错误"/>
+            </Exec>
+            <Return/>
+         </Else>
+         <Exec func="PUB:DumpETF" />
+         <Exec func="PUB:GWASetMsg">
+            <Arg name="MsgCd" value="CAP00000" />
+         </Exec>
+
+      </FlowCtrl>
+   </Transaction>
+
+</Root>
diff --git a/bui/etc/cap/OBUICAP1_CTL.XML b/bui/etc/cap/OBUICAP1_CTL.XML
index 916e1b7..99d58f8 100644
--- a/bui/etc/cap/OBUICAP1_CTL.XML
+++ b/bui/etc/cap/OBUICAP1_CTL.XML
@@ -143,5 +143,7 @@
    <Include file="etc/cap/OBUICAP1/2040880_CTL.XML" />  <!-- 客户风控规则解除 -->  
    <Include file="etc/cap/OBUICAP1/2040881_CTL.XML" />  <!-- 客户登记下拉列表查询 -->  
    <Include file="etc/cap/OBUICAP1/2040882_CTL.XML" />  <!-- 组信息多页查询 -->  
+   <Include file="etc/cap/OBUICAP1/2040883_CTL.XML" />  <!-- 卡BIN新增 -->  
+   <Include file="etc/cap/OBUICAP1/2040884_CTL.XML" />  <!-- 卡BIN修改 -->  
    
 </Application>
diff --git a/cap/etc/OCAPRPT2/RPT_D_010_d.raq b/cap/etc/OCAPRPT2/RPT_D_010_d.raq
index c488a3c9a920cca8b85d62278ed79aa3e6189be7..1352255f8db959881909c9c7719e5e0bc4ddab01 100644
GIT binary patch
delta 1366
zcmZ3dK0S&rC@?UHfkCI7fq{XYfo~&U9OGm?Mmr?z#>oqmV+7&JfozJC=P|CEY{12W
z4{!Eiie+TvoxF;9*<?*FZfr_7`?CZwPxfKcVC|Ujv}^w4v#iUx!K|0<6JIWxJGp_S
z5-6+A_H@a{7h9GBrI+zQm}v4Z8ycQ3T>+MdFwx|n&ROxYVG2Y)n2C_zypa7cGYimP
zJ0?Hitd>$>VANn_kV+{w)GJQSNlh-%2o802j`s`oo$Sb=#)wyuqi+aaMQ)CsJ_Jny
zD}tG{733yyS+JYLk=zsnHwL!~LS}@bnjws7OXy}>?#E1%_w%$fx=l{xPo2Dj+iLOz
z9&Sc=6rKkP&l82`g~Ibj;rXEOe1SaW%?f-+K^8hqmgaW_Te=Et*(yemC94=ghOc4-
z8M=xQWY{W3kRhuW!I~#O6)0z7-ZeQ+(42|6aq@IQWu`y7C+`sq;^0z%fXRG9!Sy;Y
zUU6xzMsi|tszP~2YMw$!gkOAcNU(yff_kvJLJ3I7P$4x3C~csSnwO%f080lt1oeT8
z0){@OZlIt}JwfZ;uv!mGJh-ig>BD9{ELG`n)kDJqr!RuAS`SWfxb22%!e)06C@|om
zUXR`4y!;Y{%sd4RbvJb#U<Bx>15MP#77gHJi^Cy!41qh02PsNJC&voeS|sMBC^-8E
zxySqYD`XZcfDFki&B;-Ki@OASgXG|*8vvcBpsqQ2rckTE!P+_Ba!L=W^+di7Og-OZ
NG1*YKmKj)@003kFshj`+

delta 150
zcmbOpwN9NcC@?UHfkBv$fq{XYfo&sS93$s>Ae)DQk%4t`F4OhRDa^5qoUA}0CJ>%H
zQOa)eKOxJ>{A}`*6IeMmcd!OBZ?@z+%)I%6_#URsPvnm>O=i?6XJX8qT%}>o#Aq^k
zvxYL$e~!sFG=e4@X$DW8sBJl!S*Jz7@gXa>*<6Rc?`E5Au{irjaPmT(vdJ5CxBw2}
BEVcju

diff --git a/cap/etc/OCAPRPT2/RPT_D_010_m.raq b/cap/etc/OCAPRPT2/RPT_D_010_m.raq
index dd142d66e9b7d0b510233587bb3edcb9b1c20111..38f3fe5f79f47e4df828c997a1d29ebde352af93 100644
GIT binary patch
delta 1380
zcmeya{ve7kC@?UHfkEd00|Ns)1K&ozIL66(jCM%ajguEB#|XlcH!{mlp2N67;6EDJ
zY{Qhp$jCc+CG#=~G$}ZDvpY*9^JH%}4c3kcPrK$%KEt{k%2H&n2a2n+JzcW##g?T&
ziDfV*Oy*@n!}Fypz%o!KOy=pF6)zj6K=go_n-$reSXh9r-7z_UNqO=G<_IYT21X4=
z2C0-{L%rhEoYdqJjo?sc=Xk$R-^mUfYK#OGI{JnXROsgD=|hx>V1+Ofx5C^gE(>;}
zIFcKK;Kt!sMT}XYm}UuM+8DaohWjzo<b6EtjBb+;3MhkF?r@d|oaG5;dBIuUaF!38
z<qKkMmghSPGSq3Z6u&FnU<eOpID`kY0K$V=0^z|dg79FLL3l6=Av}<!hnSe}Ol}o4
zXJTGFd7q#%)1SqY9}5O?a4A5*WK*HwdL0<AxHMNIIk7lZp*$lsPa!12FFrUVSix37
zJy>0#1SDjrkeUOOHc&{-OVLz-r5zoD`anhjV+T_=P*A6yp!IH8t%oHv+}6YNVY42V
z`gFMJp<#j37eQF92d7HhcEdDbvpWbB81PW9$8K?6eu+Y6o`QzDo4O7#0(8`YCTe1f
z25^$b;SfBAz#Ybe6s4h)TZBR_67y0Noc)8`<Nf><GK&>JhUAsz<S4+!U4p$qa&XfP
ofX-7;*PMJqs9)fhP=Fn)kGy+^-t%X7WIX3hZWJz?JVBTX0A}9Be*gdg

delta 127
zcmV-_0D%ACTK6XoQc+P-000wL0000700yxRUI7Wu0000C00966lWhXmvt$EY0RaV*
z!33tWhXqjsvp5dJ1GCQ;yaKc1AH@QaD4zlWkCUM&Hv$1xliDaF0{-xm|0q(ESt(PK
hxGPbULM)CDn|uJDLK~+qbtt!t{V5iZli@6X0RV<tDzg9p

diff --git a/cap/etc/OCAPRPT2_CTL.XML b/cap/etc/OCAPRPT2_CTL.XML
index d95a8e9..16d3f42 100644
--- a/cap/etc/OCAPRPT2_CTL.XML
+++ b/cap/etc/OCAPRPT2_CTL.XML
@@ -35,7 +35,6 @@
           <Arg name="MsgCd"  value="CAP00000"/>
           <Arg name="MsgDat" value="插入报表登记表成功"/>
         </Exec>
-        <Return/>
       </If>
       <Else>
         <Exec func="PUB:GWASetMsg">
-- 
2.54.0


From 42821c76e3e58742f8a886f8dcb2bdf540936185 Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Wed, 25 Aug 2021 13:49:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bui/etc/cap/OBUICAP1/2040801_CTL.XML | 35 ++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

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 @@
          <Fields>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|</Fields>
       </DynSentence>
 
+      <DynSentence name="QRY_CAPTXNJNL_R">   <!-- 查询退票状态 -->
+         <Sentence>
+            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 &gt;='%s' OR '%s' IS NULL)
+            AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
+         </Sentence>
+         <Fields>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|</Fields>
+      </DynSentence>
+
       <DynSentence name="QRY_CAPTXNJNL_U">   <!-- 查询预计状态 -->
          <Sentence>
             SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC  FROM  CAPTXNJNL J
@@ -98,7 +122,7 @@
       </DynSentence>
 
 
-      <DynSentence name="QRY_CAPTXNJNL_PT">   <!-- 查询超时/处理中状态 -->
+      <DynSentence name="QRY_CAPTXNJNL_P">   <!-- 查询超时/处理中状态 -->
          <Sentence>
             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 @@
          <ElseIf condition="IS_EQUAL_STRING($TXN_STS,F)">
             <Set>QRY_SQL=QRY_CAPTXNJNL_F</Set>
          </ElseIf>
-         <ElseIf condition="IS_EQUAL_STRING($TXN_STS,PT)">
-            <Set>QRY_SQL=QRY_CAPTXNJNL_PT</Set>
+         <ElseIf condition="IS_EQUAL_STRING($TXN_STS,R)">
+            <Set>QRY_SQL=QRY_CAPTXNJNL_R</Set>
+         </ElseIf>         
+         <ElseIf condition="IS_EQUAL_STRING($TXN_STS,P)">
+            <Set>QRY_SQL=QRY_CAPTXNJNL_P</Set>
          </ElseIf>
          <Else>
             <Set>QRY_SQL=QRY_CAPTXNJNL_A</Set>
-- 
2.54.0