Merge pull request 'uat' (#86) from uat into prd

Reviewed-on: #86

cap/etc/channel/cmb/Batch_CMB.XML

@@ -693,7 +693,7 @@
             ERR_DSP,
             decode(TTXN_ST,'S','00',80) rsp_cd,
             decode(TTXN_ST,'S','交易成功',ERR_DSP) RSP_MSG,
-            REQ_NBR CORG_JRN_NO,
+            B.TRX_SEQ CORG_JRN_NO,
             to_char(sysdate,'yyyymmddhh24miss')  TM_SMP
             FROM CAPCMBPERD B
             WHERE B.TRX_SEQ = A.TRX_SEQ AND B.YUR_REF=A.CORG_DSK_NO

cap/etc/channel/icbc/BATCH_ICBC.XML

@@ -598,7 +598,7 @@
          <Sentence>
             UPDATE CAPTXNJNL A
             SET
-            (TTXN_ST,TXN_STS,DSK_NAM_STS,TACC_DT,TACC_TM,TRSP_CD,TRSP_MSG,RSP_MSG,TM_SMP)
+            (TTXN_ST,TXN_STS,DSK_NAM_STS,TACC_DT,TACC_TM,TRSP_CD,TRSP_MSG,RSP_MSG,CORG_JRN_NO,TM_SMP)
             =
             ( SELECT TTXN_ST TTXN_ST,
             TTXN_ST TXN_STS,
@@ -608,6 +608,7 @@
             TRSP_CD,
             TRSP_MSG,
             TRSP_MSG,
+            I_SEQ_NO CORG_JRN_NO,
             to_char(sysdate,'yyyymmddhh24miss')  TM_SMP
             FROM CAPICBCPERDTMP B
             WHERE B.QRY_I_SEQ_NO = A.CAP_ORD_NO

cap/etc/rrc/PUSH_EVENT.XML

@@ -78,6 +78,7 @@
 
          <Set>ALERT_NAME=$EVT.EVT_TYP</Set>
          <Set>SUMMARY=$EVT.EVT_DSC</Set>
+         <Set>SMS_INF=STRCAT($SMS_INF,"(",instance=,@SYS.ics.sys.nodeid,;time=,GETDATETIME(yyyy-MM-dd HH:mm:ss),")")</Set>
          <Set>DESCRIPTION=$SMS_INF</Set>
          <Exec func="PUB:CallThirdComm" error="IGNORE">
             <Arg name="HTxnCd" value="alert" />