diff --git a/cap/applib/ctg.jar b/cap/applib/ctg.jar
index 4653f45..9a48cd0 100644
Binary files a/cap/applib/ctg.jar and b/cap/applib/ctg.jar differ
diff --git a/cap/etc/api/SMSPROXY_ATR.XML b/cap/etc/api/SMSPROXY_ATR.XML
new file mode 100644
index 0000000..a6547dc
--- /dev/null
+++ b/cap/etc/api/SMSPROXY_ATR.XML
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Server PUBLIC "-//HISUN//DTD//ATR" "">
+<Server name="SMSPROXY" type="CCA" trace = "DEBUG">
+    <Declare  name = "listener1"    class = "com.murong.ctg.protocol.http.server.hro.SmsServerListener">
+        <Param name = "msgType"         value = "${_MSG_TYPE}"/>
+        <Param name = "port"       value = "${_PORT}"/>             <!--监听端口-->
+        <Param name = "minThreads"      value = "${_MIN_THREADS}"/>       <!--最小接入量-->
+        <Param name = "maxThreads"      value = "${_MAX_THREADS}"/>       <!--最大接入量-->
+        <Param name = "contextName"      value = "${_CONTEXT_NAME}"/>       <!--上下文-->
+    </Declare>
+
+    <Declare  name = "itfengine"    class = "com.hisun.engine.HiEngine">
+        <Param name = "ITF"          value = "etc/api/SMSPROXY_ITF.XML"/> <!--接口配置文件-->
+    </Declare>
+
+    <Process    name = "dd" msgtype = "PLTIN0">
+        <!--验签-->
+        <Handler name = "itfengine"/>
+        <SystemHandler name = "callService"/>
+        <Handler name = "itfengine"/>
+    </Process>
+</Server>
diff --git a/cap/etc/api/SMSPROXY_ITF.XML b/cap/etc/api/SMSPROXY_ITF.XML
new file mode 100644
index 0000000..4b9210c
--- /dev/null
+++ b/cap/etc/api/SMSPROXY_ITF.XML
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Application name="CAP" server="SCAHRO2" timeout="36000">
+    <GetTxnCode>
+        <Item type="xml" value="code"/>
+    </GetTxnCode>
+    <Transaction code="SENDSMS" service="SendSms" desc="短信代理" log_switch="1" timeout="60">
+        <Request>
+            <ReadElement name="status" ETF_name="status" necessary="no"/> <!-- 状态-->
+            <ReadElement name="phoneSplits" ETF_name="phoneSplits" necessary="no"/> <!-- 状态-->
+            <ReadElement name="commonLabels" necessary="no">
+                <ReadElement name="alertname" ETF_name="alertname" necessary="no"/> <!-- 报警名称-->
+            </ReadElement>
+
+            <ReadElement name="commonAnnotations" necessary="no">
+                <ReadElement name="summary" ETF_name="summary" necessary="no"/> <!-- 概述-->
+                <ReadElement name="description" ETF_name="text" necessary="no"/> <!-- 概述-->
+            </ReadElement>
+        </Request>
+        <Response>
+            <WriteElement name="Response">
+                <ReadElement name="code" ETF_name="code" value="success" necessary="no"/>
+            </WriteElement>
+        </Response>
+    </Transaction>
+</Application>
diff --git a/cap/etc/batch/204025_CTL.XML b/cap/etc/batch/204025_CTL.XML
index 51af874..810db66 100644
--- a/cap/etc/batch/204025_CTL.XML
+++ b/cap/etc/batch/204025_CTL.XML
@@ -101,16 +101,20 @@
                 </DynSentence>
                 <DynSentence name="QRY_LBNKNO">
                         <Sentence>
+                                select * from (
                                 select A.BNK_CD,B.PTY_ID,B.PTY_NM,B.PTYALS_NM from CMMTBKTYP A,CAPCOMPTY B
                                 WHERE A.BNK_TYP = ? AND A.BNK_CD = B.BKCTGY_CD AND B.PTY_KND = 'PBC' AND trim(A.BNK_CD) is not null
+                                ) where  rownum = '1'
                         </Sentence>
                         <Fields>BNK_TYP|</Fields>
                 </DynSentence>
 
                 <DynSentence name="QRY_LBNKNO2">
                         <Sentence>
+                                select * from (
                                 select B.PTY_ID,B.PTY_NM,B.PTYALS_NM from CAPCOMPTY B
                                 WHERE B.BKCTGY_CD = ? AND B.PTY_KND = 'PBC'
+                                ) where  rownum = '1'
                         </Sentence>
                         <Fields>BNK_CD|</Fields>
                 </DynSentence>
@@ -377,7 +381,7 @@
 
                     <Set>RTR_IN.BNK_TYP=$BNK_TYP</Set>
                     <Set>CAPTXNJNL.BNK_TYP=$BNK_TYP</Set>
-                    <Exec func="PUB:ReadRecord">
+                    <Exec func="PUB:ReadRecord" error="IGNORE">
                             <Arg name="SqlCmd" value="QRY_LBNKNO2"/>
                     </Exec>
                     <If condition="~RetCod !=0">
@@ -404,7 +408,7 @@
                     <Set>CAPTXNJNL.CRD_FLG=$CRD_FLG</Set>
                     <Set>CAPTXNJNL.CRD_NM=$CRD_NM</Set>
 
-                    <Exec func="PUB:ReadRecord">
+                    <Exec func="PUB:ReadRecord" error="IGNORE">
                             <Arg name="SqlCmd" value="QRY_LBNKNO"/>
                     </Exec>
                     <If condition="~RetCod !=0">
diff --git a/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML b/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML
index 4ba0aae..f2ff6e8 100644
--- a/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML
+++ b/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML
@@ -14,13 +14,14 @@
                 unfinished_num ,(case when BAT_STS in ('4','2') then 1 else 0 end) finish_num
                 from CAPBATINF b where b.dsk_nam in
                 (select DSK_NAM from CAPDSKINF a where a.dsk_sts = '1' and ORD_DT &gt;= ? )) group by dsk_nam) c
-                where c.unfinished_num = 0 and c.finish_num &gt; 0)
+                where c.unfinished_num = 0 and c.finish_num &gt; 0 
+                union select DSK_NAM from CAPDSKINF a where a.dsk_sts = '9' and ORD_DT &gt;= ?)
                 AND A.Customer_Id = B.Customer_Id
                 order by rank )
                 where ROWNUM &lt;= '1')
                 FOR UPDATE skip locked
             </Sentence>
-            <Fields>DT_BEFER|</Fields>
+            <Fields>DT_BEFER|DT_BEFER|</Fields>
         </DynSentence>
         <DynSentence name="UpdCapdskinf">
         <Sentence>
@@ -30,7 +31,7 @@
             MD5_RESULT=?,
             FILE_ID_RESULT=?
             WHERE DSK_NAM = ?
-            AND dsk_sts = '1'
+            AND dsk_sts in ('1','9')
         </Sentence>
         <Fields>END_DT|END_TM|MD5_RESULT|FILE_ID|DSK_NAM|</Fields>
         </DynSentence>
@@ -42,7 +43,7 @@
                 FAL_CNT = ?,
                 FAL_AMT = ?
                 WHERE DSK_NAM = ?
-                AND dsk_sts = '1'
+                AND dsk_sts in ('1','9')
             </Sentence>
             <Fields>SUC_CNT|SUC_AMT|FAL_CNT|FAL_AMT|DSK_NAM|</Fields>
         </DynSentence>
diff --git a/cap/etc/channel/cmb/Batch_CMB.XML b/cap/etc/channel/cmb/Batch_CMB.XML
index febcabe..6af1e68 100644
--- a/cap/etc/channel/cmb/Batch_CMB.XML
+++ b/cap/etc/channel/cmb/Batch_CMB.XML
@@ -1029,8 +1029,8 @@
                            <Return/>
                         </If>
                         <Set>UNDO_CNT=$UNDO_CNT</Set>
-                        
-                         <!--统计成功，失败笔数 -->
+
+                        <!--统计成功，失败笔数 -->
                         <Exec func="PUB:ReadRecord" error="IGNORE">
                            <Arg name="SqlCmd" value="TotSuc"/>
                         </Exec>
@@ -1041,8 +1041,8 @@
                         <Set>BAT_SUC_AMT=$BAT_SUC_AMT</Set>
                         <Set>BAT_SUC_CNT=$BAT_SUC_CNT</Set>
                         <Set>BAT_FAL_AMT=$BAT_FAL_AMT</Set>
-                        <Set>BAT_FAL_CNT=$BAT_FAL_CNT</Set>                        
-                         
+                        <Set>BAT_FAL_CNT=$BAT_FAL_CNT</Set>
+
                         <If condition="$UNDO_CNT != 0">
                            <Set>BAT_STS=3</Set>
                            <Set>Rsp_Cd=00</Set>
@@ -1149,6 +1149,13 @@
          <Fields>YUR_REF|BTH_DTL|TRS_DAT|</Fields>
       </DynSentence>
 
+      <DynSentence name="QRY_CAPCMBRFD_OLDTXN">
+         <Sentence>
+            select 'Y' AS YN from CAPTXNJNL where trx_seq=? and corg_dsk_no=? and CORG_NO='CMB'
+         </Sentence>
+         <Fields>BTH_DTL|YUR_REF|</Fields>
+      </DynSentence>
+
       <FlowCtrl>
          <Delete>TRSP_CD</Delete>
          <Delete>TRSP_MSG</Delete>
@@ -1163,7 +1170,7 @@
          <Set>accnbr=$acctNo</Set><!--对公账号-->
          <Set>bgndat=CALCDATE(GETDATE(),-,d,10)</Set><!--起始日期T-1-->
          <Set>enddat=GETDATE()</Set><!--交易结束日期-->
-                  
+
          <Set>reqnbr=</Set><!--流程实例号-->
          <Set>ctnkey=</Set><!--续传字段-->
          <Set>TX_COD=NTAGDRFD</Set><!--退票查询交易码-->
@@ -1228,15 +1235,22 @@
                      <Set>Rsp_Msg=登记流水失败</Set>
                      <Return/>
                   </If>
-
-                  <Exec func="PUB:ExecSql" error="IGNORE">
-                     <Arg name="SqlCmd" value="updRfd"/>
+                  <!--查询退票信息原交易是否存在-->
+                  <Exec func="PUB:ReadRecord" error="IGNORE">
+                     <Arg name="SqlCmd"       value="QRY_CAPCMBRFD_OLDTXN"/>
                   </Exec>
-                  <If condition="~RetCod!=0">
-                     <Set>Rsp_Cd=80</Set>
-                     <Set>Rsp_Msg=更新退票流水失败</Set>
-                     <Break/>
+                  <If condition="~RetCod=0">
+                  
+                     <Exec func="PUB:ExecSql" error="IGNORE">
+                        <Arg name="SqlCmd" value="updRfd"/>
+                     </Exec>
+                     
                   </If>
+                  <ElseIf condition='~RetCod=-1'>
+                     <Set>Rsp_Cd=80</Set>
+                     <Set>Rsp_Msg=数据库执行错误</Set>
+                     <Return/>
+                  </ElseIf>
                </ElseIf>
 
                <Delete>req_nbr</Delete>
diff --git a/cap/etc/channel/monitor/SCAALERT_ATR.XML b/cap/etc/channel/monitor/SCAALERT_ATR.XML
new file mode 100644
index 0000000..c0493e9
--- /dev/null
+++ b/cap/etc/channel/monitor/SCAALERT_ATR.XML
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Server PUBLIC "-//HISUN//DTD//ATR" "ATR.dtd">
+<Server name="SCAALERT" type="SCA" trace="DEBUG">
+
+    <Declare name = "connector" class = "com.murong.ctg.protocol.http.client.alert.AlertHttpConnector" >
+        <Param name = "url"     value = "${_URL}" />
+        <Param name = "method"  value = "${_METHOD}"/>
+        <Param name = "tmOut"   value = "${_TM_OUT}"/>
+        <Param name = "charSet" value = "${_CHAR_SET}"/>
+    </Declare>
+
+    <Declare name="itfengine" class="com.hisun.engine.HiEngine">
+        <Param name="ITF" value="etc/channel/monitor/SCAALERT_ITF.XML" />
+    </Declare>
+
+    <Declare name="jsonxmlfmtconvert" class="com.hisun.handler.HiJsonXmlConvertHandler"/>
+
+    <Process name="proc1" msgtype="DEFAULT">
+        <Handler name="itfengine" />
+        <!--Handler name="jsonxmlfmtconvert" method="xml2json" /-->
+        <Handler name="connector" />
+        <!--Handler name="jsonxmlfmtconvert" method="json2xml" /-->
+        <Handler name="itfengine" />
+    </Process>
+</Server>
+
diff --git a/cap/etc/channel/monitor/SCAALERT_ITF.XML b/cap/etc/channel/monitor/SCAALERT_ITF.XML
new file mode 100644
index 0000000..6d16dc3
--- /dev/null
+++ b/cap/etc/channel/monitor/SCAALERT_ITF.XML
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Application name="hro">
+    <Transaction code="alert" desc="ALERT">
+        <Request necessary="no">
+            <WriteElement name="root">
+                <WriteElement name="status"  ETF_name="status"      value="firing"    necessary="no" />
+                <WriteElement name="receiver"  ETF_name="receiver"  value="webhook"   necessary="no" />
+
+                <WriteElement name="labels">
+                    <WriteElement name="job"       ETF_name="job"       necessary="no" />
+                    <WriteElement name="alertname" ETF_name="SUMMARY" necessary="no" />
+                    <WriteElement name="severity"  ETF_name="severity"  value="warning" necessary="no" />
+                    <WriteElement name="instance"  ETF_name="instance"  necessary="no" />
+                </WriteElement>
+
+                <WriteElement name="annotations">
+                    <WriteElement name="summary"      ETF_name="SUMMARY"       necessary="no" />
+                    <WriteElement name="description"  ETF_name="DESCRIPTION"   necessary="no" />
+                </WriteElement>
+
+                <WriteElement name="startsAt"       ETF_name="startsAt"     necessary="no" />
+                <WriteElement name="endsAt"         ETF_name="endsAt"       necessary="no" />
+                <WriteElement name="generatorURL"   ETF_name="generatorURL" necessary="no" />
+            </WriteElement>
+        </Request>
+        <Response necessary="no">
+            <ReadElement name="status" ETF_name="status" necessary="no"/>
+            <!--请求时间-->
+        </Response>
+    </Transaction>
+</Application>
diff --git a/cap/etc/rrc/PUSH_EVENT.XML b/cap/etc/rrc/PUSH_EVENT.XML
index 7d6e918..8a15be0 100644
--- a/cap/etc/rrc/PUSH_EVENT.XML
+++ b/cap/etc/rrc/PUSH_EVENT.XML
@@ -27,6 +27,14 @@
          </Sentence>
          <Fields>EVT_TYP|ROL_TYP|</Fields>
       </DynSentence>
+      <DynSentence name="QRY_SMSTTMPS_MAL">  <!--查询邮件或短信模版及相关参数-->
+         <Sentence>
+            SELECT A.SM_TYP,A.SMS_CLS,A.SMS_MO,A.SMS_TMP,A.REP_FLD,A.ID_KEY,A.PSW_FLG
+            FROM SMSTTMPS A
+            WHERE A.SMS_CD=?
+         </Sentence>
+         <Fields>SMS_CD|</Fields>
+      </DynSentence> 
       <FlowCtrl>
          <Set>EVT_TYP=$EVT_TYP</Set>             <!-- 事务类型 -->
 
@@ -42,6 +50,40 @@
             </Exec>
             <Return/>
          </If>
+         
+         <Set>SMS_CD=$EVT.MAL_TPL</Set>
+         <Exec func="PUB:ReadRecord" error="IGNORE">
+            <Arg name="SqlCmd" value="QRY_SMSTTMPS_MAL"/>
+         </Exec>
+         <If condition="~RetCod&lt;0">
+            <Set>Rsp_Cd=80</Set>
+            <Set>Rsp_Msg="查询模板失败"</Set>
+            <Break/>
+         </If>
+
+         <Set>AC_DT=GETDATE()</Set>
+         <!--Exec func="PUB:DumpETF"/-->
+         <!-- 设置短信模版变量 -->
+         <Set>IND1=\[</Set>
+         <Set>IND2=\]</Set>
+         <Set>IND3=\$</Set>
+         <Set>IND4=STRCAT($IND1,$IND3,$IND2)</Set>
+         <!--替换邮件模版中的变量，组织下发邮件内容-->
+         <Exec func="SMS:ReplaceWithSMSTemplate">
+            <Arg name="template" value="$SMS_TMP"/>    <!--邮件模版-->
+            <Arg name="repl" value="$IND4"/>       <!--变量符号-->
+            <Arg name="text" value="$REP_FLD"/>    <!--变量列表-->
+            <Arg name="objNam" value="SMS_INF"/>     <!--邮件内容-->
+         </Exec>
+
+         <Set>ALERT_NAME=$EVT.EVT_TYP</Set>
+         <Set>SUMMARY=$EVT.EVT_DSC</Set>
+         <Set>DESCRIPTION=$SMS_INF</Set>
+         <Exec func="PUB:CallThirdComm" error="IGNORE">
+            <Arg name="HTxnCd" value="alert" />
+            <Arg name="ObjSvr" value="SCAALERT" />            <!-- 发往监控系统告警 -->
+         </Exec>
+
          <Set>EVT.IS_SND_MERC=$EVT.IS_SND_MERC</Set> <!-- 是否发送给商户 已废止 -->
          <Set>EVT.IS_SND_DEV=$EVT.IS_SND_DEV</Set>   <!-- 是否发送开发    -->
          <Set>EVT.IS_SND_BUS=$EVT.IS_SND_BUS</Set>   <!-- 是否发送给业务  -->
@@ -75,6 +117,7 @@
                   <Set>EVENT.SMS_CD=$EVT.MAL_TPL</Set>
                   <Set>EVENT.IS_SND_SMS=$EVT.IS_SND_SMS</Set>
                   <Set>EVENT.IS_SND_MAL=$EVT.IS_SND_MAL</Set>
+                  <Set>EVENT.SMS_INF=$SMS_INF</Set>
                   <!--调用短信发送-->
                   <Call package="SMS_PUB" function="SEND_MAL">
                      <Input>EVENT|</Input>
@@ -122,6 +165,7 @@
                   <Set>EVENT.SMS_CD=$EVT.MAL_TPL</Set>
                   <Set>EVENT.IS_SND_SMS=$EVT.IS_SND_SMS</Set>
                   <Set>EVENT.IS_SND_MAL=$EVT.IS_SND_MAL</Set>
+                  <Set>EVENT.SMS_INF=$SMS_INF</Set>
                   <!--调用短信发送-->
                   <Call package="SMS_PUB" function="SEND_MAL">
                      <Input>EVENT|</Input>
@@ -167,6 +211,7 @@
                   <Set>EVENT.SMS_CD=$EVT.MAL_TPL</Set>
                   <Set>EVENT.IS_SND_SMS=$EVT.IS_SND_SMS</Set>
                   <Set>EVENT.IS_SND_MAL=$EVT.IS_SND_MAL</Set>
+                  <Set>EVENT.SMS_INF=$SMS_INF</Set>
                   <!--调用短信发送-->
                   <Call package="SMS_PUB" function="SEND_MAL">
                      <Input>EVENT|</Input>
@@ -212,6 +257,7 @@
                   <Set>EVENT.SMS_CD=$EVT.MAL_TPL</Set>
                   <Set>EVENT.IS_SND_SMS=$EVT.IS_SND_SMS</Set>
                   <Set>EVENT.IS_SND_MAL=$EVT.IS_SND_MAL</Set>
+                  <Set>EVENT.SMS_INF=$SMS_INF</Set>
                   <!--调用短信发送-->
                   <Call package="SMS_PUB" function="SEND_MAL">
                      <Input>EVENT|</Input>
@@ -238,4 +284,4 @@
          <Set>MSG_CD=$Rsp_Cd</Set>
       </FlowCtrl>
    </Transaction>
-</Tran>
\ No newline at end of file
+</Tran>
diff --git a/cap/etc/rrc/SEND_MAL.XML b/cap/etc/rrc/SEND_MAL.XML
index 405260c..daad063 100644
--- a/cap/etc/rrc/SEND_MAL.XML
+++ b/cap/etc/rrc/SEND_MAL.XML
@@ -5,46 +5,17 @@
       <Input>EVENT|</Input>
       <Output>Rsp_Cd|Rsp_Msg</Output>
       <Process>
-         <DynSentence name="QRY_SMSTTMPS_MAL">  <!--查询邮件或短信模版及相关参数-->
-            <Sentence>
-               SELECT A.SM_TYP,A.SMS_CLS,A.SMS_MO,A.SMS_TMP,A.REP_FLD,A.ID_KEY,A.PSW_FLG
-               FROM SMSTTMPS A
-               WHERE A.SMS_CD=?
-            </Sentence>
-            <Fields>SMS_CD|</Fields>
-         </DynSentence>
+    
+ 
          <!--查询邮件模板-->
          <Set>SMS_CD=$EVENT.SMS_CD</Set>
-         <Exec func="PUB:ReadRecord" error="IGNORE">
-            <Arg name="SqlCmd" value="QRY_SMSTTMPS_MAL"/>
-         </Exec>
-         <If condition="~RetCod&lt;0">
-            <Set>Rsp_Cd=80</Set>
-            <Set>Rsp_Msg="查询模板失败"</Set>
-            <Break/>
-         </If>
-         
+     
          <Set>AC_DT=GETDATE()</Set>
-         <Exec func="PUB:DumpETF"/>
-         <!-- 设置短信模版变量 -->
-         <Set>IND1=\[</Set>
-         <Set>IND2=\]</Set>
-         <Set>IND3=\$</Set>
-         <Set>IND4=STRCAT($IND1,$IND3,$IND2)</Set>
-         <!--替换邮件模版中的变量，组织下发邮件内容-->
-         <Exec func="SMS:ReplaceWithSMSTemplate">
-            <Arg name="template" value="$SMS_TMP"/>    <!--邮件模版-->
-            <Arg name="repl" value="$IND4"/>       <!--变量符号-->
-            <Arg name="text" value="$REP_FLD"/>    <!--变量列表-->
-            <Arg name="objNam" value="SMS_INF"/>     <!--邮件内容-->
-         </Exec>
+         <Set>SMS_INF=$EVENT.SMS_INF</Set>
          <If condition="IS_EQUAL_STRING($EVENT.IS_SND_MAL,Y)">
             <!--发邮件-->
             <Set>SMS_INF=$SMS_INF</Set>
 
-
-
-
             <Exec func="PUB:PARAM_GRP_GET" error="IGNORE">
                <Arg name="ParamNam" value="CAPPARAMTER"/>
                <Arg name="KeyNam" value="MAIL_HOST"/>