diff --git a/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML b/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML
index 93f3118..81d1190 100644
--- a/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML
+++ b/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML
@@ -9,7 +9,7 @@
                 select dsk_nam from (select A.dsk_nam,B.rank from CAPDSKINF A,CAPCUSINF B
                 where A.dsk_nam in (select dsk_nam from
                 (select dsk_nam,sum(unfinished_num) unfinished_num,sum(finish_num) finish_num
-                from (select dsk_nam,(case when BAT_STS not in ('4','0') then 1 else 0 end)
+                from (select dsk_nam,(case when BAT_STS not in ('4','2') then 1 else 0 end)
                 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 >= ? )) group by dsk_nam) c
@@ -21,12 +21,20 @@
             <Fields>DT_BEFER|</Fields>
         </DynSentence>
         <DynSentence name="UpdCapdskinf">
+        <Sentence>
+            UPDATE CAPDSKINF SET dsk_sts = '4',
+            END_DT=?,
+            END_TM=?,
+            MD5_RESULT=?,
+            FILE_ID_RESULT=?
+            WHERE DSK_NAM = ?
+            AND dsk_sts = '1'
+        </Sentence>
+        <Fields>END_DT|END_TM|MD5_RESULT|FILE_ID|DSK_NAM|</Fields>
+        </DynSentence>
+        <DynSentence name="UpdCapdskinf2">
             <Sentence>
-                UPDATE CAPDSKINF SET dsk_sts = '4',
-                END_DT=?,
-                END_TM=?,
-                MD5_RESULT=?,
-                FILE_ID_RESULT=?,
+                UPDATE CAPDSKINF SET
                 SUC_CNT = ?,
                 SUC_AMT = ?,
                 FAL_CNT = ?,
@@ -34,7 +42,7 @@
                 WHERE DSK_NAM = ?
                 AND dsk_sts = '1'
             </Sentence>
-            <Fields>END_DT|END_TM|MD5_RESULT|FILE_ID|SUC_CNT|SUC_AMT|FAL_CNT|FAL_AMT|DSK_NAM|</Fields>
+            <Fields>SUC_CNT|SUC_AMT|FAL_CNT|FAL_AMT|DSK_NAM|</Fields>
         </DynSentence>
         <DynSentence name="QRY_CAPDSKINF_DSK_NAM">
             <Sentence>
@@ -159,6 +167,16 @@
                     <Set>FAL_AMT=FDIV($FAIL_TXN_AMT,100,2)</Set>
                 </Else>
 
+                <!--更新批次状态为已完成（终态）-->
+                <Exec func="PUB:ExecSql" error="IGNORE">
+                    <Arg name="SqlCmd" value="UpdCapdskinf2"/>
+                </Exec>
+                <If condition="~RetCod&lt;0">
+                    <Set>Rsp_Cd=80</Set>
+                    <Set>Rsp_Msg="数据库错误"</Set>
+                    <Break/>
+                </If>
+
                 <!--所有参数由节点RTR_IN传进路由-->
                 <Set>RTR_IN.DSK_NAM=$DSK_NAM</Set>
                 <!--生成文件-->
@@ -276,4 +294,4 @@
             <Set>Rsp_Msg=交易成功</Set>
         </FlowCtrl>
     </Transaction>
-</Tran>
\ No newline at end of file
+</Tran>
diff --git a/cap/etc/batch/BAT_GET_TIMER_CTL.XML b/cap/etc/batch/BAT_GET_TIMER_CTL.XML
index f01be43..40de1e2 100644
--- a/cap/etc/batch/BAT_GET_TIMER_CTL.XML
+++ b/cap/etc/batch/BAT_GET_TIMER_CTL.XML
@@ -8,7 +8,7 @@
             <Sentence>
                 SELECT TXN_CNL,DSK_NAM ODSK_NAM,ORD_DT OORD_DT,CORG_MERC_ID OCORG_MERC_ID,CORG_NO OCORG_NO,CORG_DSK_NO OCORG_DSK_NO
                 ,AC_DT OAC_DT,SND_DT OSND_DT,SND_TM OSND_TM,BAT_STS OBAT_STS,BAT_ORN_AMT OBAT_ORN_AMT,BAT_ORN_CNT OBAT_ORN_CNT,
-                BAT_TYP OBAT_TYP,CORG_FIL_NAM OCORG_FIL_NAM,SND_DT,SND_TM,MERC_ID OMERC_ID,TCORG_DSK_NO,'批量代发' RMK ,GET_TIME,CORG_JRN_NO
+                BAT_TYP OBAT_TYP,CORG_FIL_NAM OCORG_FIL_NAM,SND_DT,SND_TM,MERC_ID OMERC_ID,TCORG_DSK_NO,'批量代发' RMK ,GET_TIME,CORG_JRN_NO,SND_TIME  OSND_TIME
                 FROM CAPBATINF  
                 where Corg_Dsk_No in (select Corg_Dsk_No from ( SELECT A.Corg_Dsk_No
                 FROM  CAPBATINF A,CAPDSKINF B,CAPCUSINF C
diff --git a/cap/etc/batch/DISKRESULLT_PKG.XML b/cap/etc/batch/DISKRESULLT_PKG.XML
index 736576b..4b6cc42 100644
--- a/cap/etc/batch/DISKRESULLT_PKG.XML
+++ b/cap/etc/batch/DISKRESULLT_PKG.XML
@@ -15,7 +15,7 @@
         <DynSentence name="QRY_CAPBATINF">
             <Sentence>
                 SELECT count(1) BAT_NUM FROM CAPBATINF
-                WHERE DSK_NAM = ? AND (BAT_STS &lt;4 OR BAT_STS &gt;4)
+                WHERE DSK_NAM = ? AND BAT_STS not in('4','2')
             </Sentence>
             <Fields>DSK_NAM|</Fields>
         </DynSentence>
diff --git a/cap/etc/batch/GET_TOKEN_CTL.XML b/cap/etc/batch/GET_TOKEN_CTL.XML
index 4d3522d..99208ed 100644
--- a/cap/etc/batch/GET_TOKEN_CTL.XML
+++ b/cap/etc/batch/GET_TOKEN_CTL.XML
@@ -59,7 +59,9 @@
                 <Return/>
             </If>
 
-
+            <Exec func="PUB:GWASetMsg">
+                <Arg name="MsgCd" value="BAT00000" />
+            </Exec>
             <Set>Rsp_Cd=00</Set>
             <Set>Rsp_Msg=交易成功</Set>
         </FlowCtrl>
diff --git a/cap/etc/batch/ZLL_TEST_CTL.XML b/cap/etc/batch/ZLL_TEST_CTL.XML
index 61c87b0..f52c47c 100644
--- a/cap/etc/batch/ZLL_TEST_CTL.XML
+++ b/cap/etc/batch/ZLL_TEST_CTL.XML
@@ -71,7 +71,7 @@
          </ElseIf>
          <ElseIf condition="IS_EQUAL_STRING($TESTNO,7)">
             <Set>TESTNAME=initBatch_CMB</Set>
-            <Set>DSK_NAM=2021031500002</Set>
+            <Set>DSK_NAM=3021031500002</Set>
             <Set>ORD_DT=GETDATE()</Set>
             <Set>TXN_MOD=02</Set>
             <Set>MERC_ID=769346321368612</Set>
diff --git a/cap/etc/channel/cmb/Batch_CMB.XML b/cap/etc/channel/cmb/Batch_CMB.XML
index 85d49b3..ec8a32d 100644
--- a/cap/etc/channel/cmb/Batch_CMB.XML
+++ b/cap/etc/channel/cmb/Batch_CMB.XML
@@ -239,7 +239,7 @@
       </DynSentence>
       <DynSentence name="QRYCAPTXNJNL"> <!--查询批次信息-->
          <Sentence>
-            SELECT TAC_TYP,ROUT_FLG,BR_NO,TAC_NO,substrb(POSTSCRIPT,0,40) POSTSCRIPT
+            SELECT TAC_TYP,ROUT_FLG,BR_NO,TAC_NO, case when TAC_TYP='N' AND POSTSCRIPT='工资' then '薪资' ELSE  substrb(POSTSCRIPT,0,40) END POSTSCRIPT
             FROM CAPTXNJNL
             WHERE DSK_NAM=?
             AND CORG_DSK_NO=? and ORD_DT = ? and rownum=1
@@ -249,7 +249,7 @@
       <DynSentence name="Qry_Export"> <!--招行代发工资/其它 查询打包记录 -->
          <Sentence>
             SELECT trx_seq trxseq,
-            ac_no accnbr,cus_nam accnam,TXN_AMT trsamt,substrb(POSTSCRIPT,0,40) trsdsp,bnk_flg bnkflg,
+            ac_no accnbr,cus_nam accnam,TXN_AMT trsamt,case when TAC_TYP='N' AND POSTSCRIPT='工资' then '薪资' ELSE  substrb(POSTSCRIPT,0,40) END trsdsp,bnk_flg bnkflg,
             ' ' cprref,decode(ROUT_FLG,'SMALL','N','LARGE','Y','') fstflg,
             decode(bnk_flg,'N',LBNK_NO,'') rcvbnk,decode(bnk_flg,'N',nvl(bank_nam,' '),'') eacbnk,city eaccty
             FROM CAPTXNJNL
@@ -266,8 +266,8 @@
       <DynSentence name="Qry_Export_CW"> <!--招行超网代发工资/其它 查询打包记录 -->
          <Sentence>
             SELECT trx_seq trxseq,
-            ac_no eacnbr,cus_nam eacnam,TXN_AMT rcvamt,substrb(POSTSCRIPT,0,40) trsdsp,bnk_flg bnkflg,
-            ' ' cprref,substrb(POSTSCRIPT,0,40) trxtxt
+            ac_no eacnbr,cus_nam eacnam,TXN_AMT rcvamt,case when TAC_TYP='N' AND POSTSCRIPT='工资' then '薪资' ELSE  substrb(POSTSCRIPT,0,40) END trsdsp,bnk_flg bnkflg,
+            ' ' cprref,case when TAC_TYP='N' AND POSTSCRIPT='工资' then '薪资' ELSE  substrb(POSTSCRIPT,0,40) END trxtxt
             FROM CAPTXNJNL
             WHERE DSK_NAM='%s'
             AND CORG_NO = '%s'
@@ -294,21 +294,22 @@
          </Sentence>
          <Fields>DSK_NAM|ORD_DT|CORG_NO|CORG_DSK_NO|TXN_MOD|</Fields>
       </DynSentence>
-      <!--更新批次状态 -->
       <DynSentence name="UpdBatSts">
          <Sentence>
             UPDATE CAPBATINF
             SET BAT_STS=?,
             RSP_CD = ?,
             RSP_MSG = ?,
-            CORG_JRN_NO=?
+            CORG_JRN_NO=?,
+            BAT_FAL_CNT =?,
+            BAT_FAL_AMT=?
             WHERE
             ORD_DT=?
             AND CORG_NO=?
             AND CORG_DSK_NO=?
             AND BAT_STS='0'
          </Sentence>
-         <Fields>BAT_STS|RSP_CD|RSP_MSG|CORG_JRN_NO|ORD_DT|CORG_NO|CORG_DSK_NO|
+         <Fields>BAT_STS|RSP_CD|RSP_MSG|CORG_JRN_NO|BAT_FAL_CNT|BAT_FAL_AMT|ORD_DT|CORG_NO|CORG_DSK_NO|
          </Fields>
       </DynSentence>
       <DynSentence name="InitPRO_JRL"> <!--初始化PRO_JRL-->
@@ -326,7 +327,7 @@
             TXN_STS='F',
             TTXN_ST='F',
             RSP_CD = '80',
-            RSP_MSG = ?,
+            RSP_MSG = ?
             WHERE DSK_NAM=?
             AND
             ORD_DT=?
@@ -411,7 +412,8 @@
             <Arg name="SqlCmd" value="QRYCAPTXNJNL"/>
          </Exec>
          <Set>reqid=STRCAT(GETDATETIME(),$CORG_DSK_NO)</Set>
-         <Set>userid=N002980574</Set>
+         <Quote name="Batch_Cfg_CMB"/>         
+         <Set>userid=$PARA.USERID</Set>
          <Set>TAC_NO=$TAC_NO</Set>
          <!--超网代发工资-->
          <If condition="AND(IS_EQUAL_STRING($ROUT_FLG,SUPER),IS_EQUAL_STRING($TAC_TYP,B))">
@@ -420,7 +422,7 @@
             <Set>trxrmk=$POSTSCRIPT</Set><!--交易摘要-->
             <Set>sql_cmd=Qry_Export_CW</Set>
             <Set>grp_nam=ntagcsaix2</Set>
-            <Set>busmod=00001</Set>
+            <Set>busmod=$PARA.BUSMOD1</Set>
             <Set>payacc=$tac_no</Set>
          </If>
          <!--超网代发其它-->
@@ -430,7 +432,7 @@
             <Set>trxrmk=$POSTSCRIPT</Set><!--交易摘要-->
             <Set>sql_cmd=Qry_Export_CW</Set>
             <Set>grp_nam=ntagcsaix2</Set>
-            <Set>busmod=00001</Set>
+            <Set>busmod=$PARA.BUSMOD2</Set>
             <Set>payacc=$tac_no</Set>
          </ElseIf>
          <!--代发工资-->
@@ -440,17 +442,17 @@
             <Set>nusage=$POSTSCRIPT</Set><!--用途-->
             <Set>sql_cmd=Qry_Export</Set>
             <Set>grp_nam=ntagcdtly1</Set>
-            <Set>busmod=00001</Set><!--业务模式 接口查得-->
+            <Set>busmod=$PARA.BUSMOD1</Set><!--业务模式 接口查得-->
             <Set>accnbr=$tac_no</Set><!--付款账号-->
          </ElseIf>
          <!--代发其它-->
          <ElseIf condition="AND(IS_NOEQUAL_STRING($ROUT_FLG,SUPER),IS_EQUAL_STRING($TAC_TYP,N))">
             <Set>TX_COD=NTAGCAPY</Set>
-            <Set>trstyp=BYSA</Set><!--交易类型-->
+            <Set>trstyp=BYBK</Set><!--交易类型-->
             <Set>nusage=$POSTSCRIPT</Set><!--用途-->
             <Set>sql_cmd=Qry_Export</Set>
             <Set>grp_nam=ntagcdtly1</Set>
-            <Set>busmod=00001</Set>
+            <Set>busmod=$PARA.BUSMOD2</Set>
             <Set>accnbr=$tac_no</Set><!--付款账号-->
          </ElseIf>
          <Else>
@@ -484,7 +486,7 @@
          <Set>RSP_MSG=STRCAT( , )</Set>
 
 
-         <Quote name="Batch_Cfg_CMB"/>
+
          <Set>MAX_CNT=$PARA.MAX_CNT</Set>
          <Exec func="PUB:QueryInGroup" error="IGNORE">
             <Arg name="SqlCmd" value="$sql_cmd"/>
@@ -530,9 +532,11 @@
                   <Set>TRSP_CD=$resultcode</Set>
                   <If condition="IS_EQUAL_STRING($RET_CODE,NCB1101)">
                      <Set>BAT_STS=2</Set>
+                     <Set>BAT_FAL_CNT=$BAT_ORN_CNT</Set>
+                     <Set>BAT_FAL_AMT=$BAT_ORN_AMT</Set>
                      <!-- 更新流水状态为发送处理完成 -->
                      <Exec func="PUB:ExecSql" error="IGNORE">
-                        <Arg name="SqlCmd" value="UpdJnlSts"/>
+                        <Arg name="SqlCmd" value="UpdJnlStsF"/>
                      </Exec>
                      <If condition="~RetCod=-1">
                         <Set>Rsp_Cd=80</Set>
@@ -570,10 +574,7 @@
          <Exec func="PUB:ExecSql" error="IGNORE">
             <Arg name="SqlCmd" value="UpdJnlSts"/>
          </Exec>
-         <If condition="~RetCod!=0">
-            <Set>Rsp_Cd=80</Set>
-            <Set>Rsp_Msg=更新该批次流水处理状态失败</Set>
-         </If>
+
          <!-- 更新批次状态 -->
          <Set>CORG_JRN_NO=$reqnbr</Set><!--客户返回的流程实例号-->
          <Quote name="UpdSendBatSts"/>
@@ -836,7 +837,7 @@
          <Set>yurref=$OCORG_DSK_NO</Set>
          <Set>TX_COD=NTAGCINY</Set><!--按业务参考号查询交易码-->
          <Set>reqid=STRCAT(GETDATETIME(),$OCORG_DSK_NO)</Set>
-         <Set>userid=N002980574</Set>
+         <Set>userid=$PARA.USERID</Set>
          <Exec func="PUB:CallThirdComm" error="IGNORE">
             <Arg name="HTxnCd" value="NTAGCINY"/>
             <Arg name="ObjSvr" value="SCMBPAY1"/>            <!-- 交易发往银行 -->
@@ -1096,7 +1097,7 @@
 
       <DynSentence name="QRY_CAPCMBRFD">
          <Sentence>
-            SELECT 'Y' YN FROM CAPCMBRFD WHERE YUR_REF=? AND BTH_DTL=? AND TRS_DAT=? 
+            SELECT 'Y' YN FROM CAPCMBRFD WHERE YUR_REF=? AND BTH_DTL=? AND TRS_DAT=?
          </Sentence>
          <Fields>YUR_REF|BTH_DTL|TRS_DAT|</Fields>
       </DynSentence>
@@ -1106,7 +1107,9 @@
          <Delete>TRSP_MSG</Delete>
          <Delete>rep_num</Delete>
          <Delete>ntagdrfdz1_NUM</Delete>
-
+         <!--读取参数配置 -->
+         <Quote name="Batch_Cfg_CMB"/> 
+         <!--获取序号 -->
          <Quote name="GET_CUP_BAT_NO"/>
          <Set>CORG_DSK_NO=STRCAT(GETDATETIME(),$CORG_DSK_NO)</Set>
          <Set>bbknbr=$brNo</Set><!--分行号-->
@@ -1117,7 +1120,7 @@
          <Set>ctnkey=</Set><!--续传字段-->
          <Set>TX_COD=NTAGDRFD</Set><!--退票查询交易码-->
          <Set>reqid=STRCAT(GETDATETIME(),$CORG_DSK_NO)</Set>
-         <Set>userid=N002980574</Set>
+         <Set>userid=$PARA.USERID</Set>
          <If condition="IS_EQUAL_STRING($ACCT_TYPE,B)">
             <Set>trstyp=BYSA</Set><!--代发种类 工资-->
          </If>
@@ -1218,10 +1221,16 @@
    <!--心跳检查 -->
    <Transaction code="HEARTBEAT_CMB" log_switch='1' desc="心跳检查">
       <FlowCtrl>
+         <!--读取参数配置 -->
+         <Quote name="Batch_Cfg_CMB"/>
          <Set>TX_COD=DCLISMOD</Set><!--查询交易码-->
          <Set>reqid=STRCAT(GETDATETIME(),000000)</Set>
-         <Set>userid=N002980574</Set>
-         <Set>buscod=N03020</Set>
+         <Set>userid=$PARA.USERID</Set>
+         <Set>buscod=$buscod</Set>
+         <If condition="ISNULL($buscod)">
+            <Set>buscod=N03020</Set>
+         </If>
+
          <Exec func="PUB:CallThirdComm" error="IGNORE">
             <Arg name="HTxnCd"           value="DCLISMOD"/>
             <Arg name="ObjSvr"           value="SCMBPAY1"/>
diff --git a/cap/etc/channel/icbc/BATCH_ICBC.XML b/cap/etc/channel/icbc/BATCH_ICBC.XML
index ad01287..e5f75cc 100644
--- a/cap/etc/channel/icbc/BATCH_ICBC.XML
+++ b/cap/etc/channel/icbc/BATCH_ICBC.XML
@@ -2,7 +2,7 @@
 <Tran>
    <Transaction code="initBatch_ICBC" log_switch='1' desc="生成工行批次">
       <Quote name="SQL_RcvConfirm" />
-      
+
       <DynSentence name="QryBatCnt"><!-- 查询该批次有多少记录 -->
          <Sentence>
             SELECT COUNT(*) BAT_CNT FROM CAPTXNJNL
@@ -10,7 +10,7 @@
          </Sentence>
          <Fields>DSK_NAM|ORD_DT|CORG_NO|TXN_MOD|BNK_FLG|MAX_CNT|</Fields>
       </DynSentence>
-      
+
       <DynSentence name="QryBatCnt1"><!-- 查询该批次有多少记录 -->
          <Sentence>
             SELECT COUNT(*) BAT_CNT FROM CAPTXNJNL
@@ -18,7 +18,7 @@
          </Sentence>
          <Fields>DSK_NAM|ORD_DT|CORG_NO|TXN_MOD|BNK_FLG|ROUT_FLG|MAX_CNT|</Fields>
       </DynSentence>
-      
+
       <DynSentence name="UpdDskNo">
          <Sentence>
             UPDATE CAPTXNJNL SET CORG_DSK_NO = ?,CORG_BUS_TYP =?,TXN_CD = '204020', TTXN_CD = ?,ACC_VER_STS= 'S'
@@ -33,8 +33,8 @@
             WHERE DSK_NAM=? AND ORD_DT=? AND CORG_NO=? AND TXN_MOD=?  AND BNK_FLG=? AND ROUT_FLG=? AND DSK_NAM_STS='0' AND TXN_STS='U' AND CORG_DSK_NO = '0' AND ROWNUM &lt;= ?
          </Sentence>
          <Fields>CORG_DSK_NO|CORG_BUS_TYP|TTXN_CD|DSK_NAM|ORD_DT|CORG_NO|TXN_MOD|BNK_FLG|ROUT_FLG|MAX_CNT|</Fields>
-      </DynSentence>       
-       
+      </DynSentence>
+
       <DynSentence name="QryBatAmt">
          <Sentence>
             SELECT COUNT(*) BAT_CNT,NVL(SUM(TXN_AMT),0) BAT_SUM FROM CAPTXNJNL
@@ -71,25 +71,7 @@
          <Set>CORG_NO=ICBC</Set>
          <Set>MAX_CNT=$PARA.MAX_CNT</Set>
 
-         <!--查询合作机构检查-->
-         <!--Exec func="PUB:ReadRecord" error="IGNORE">
-            <Arg name="SqlCmd"       value="QryBnkInf"/>
-         </Exec>
-         <If condition="~RetCod=2">
-            <Set>Rsp_Cd=31</Set>
-            <Set>Rsp_Msg=该合作机构不存在</Set>
-            <Return/>
-         </If>
-         <ElseIf condition="~RetCod!=0">
-            <Set>Rsp_Cd=80</Set>
-            <Set>Rsp_Msg=查询数据库失败</Set>
-            <Return/>
-         </ElseIf>
-         <If condition="INTCMP($ENB_FLG,4,1)">
-            <Set>Rsp_Cd=31</Set>
-            <Set>Rsp_Msg=该合作机构未启用</Set>
-            <Return/>
-         </If-->
+
 
          <!--获取第三方业务种类编号1到999  当日不重复 每一个大批次获取一个-->
          <Exec func="PUB:ReadRecord" error="IGNORE">
@@ -296,14 +278,16 @@
             SET BAT_STS=?,
             RSP_CD = ?,
             RSP_MSG = ?,
-            CORG_JRN_NO=?
+            CORG_JRN_NO=?,
+            BAT_FAL_CNT =?,
+            BAT_FAL_AMT=?
             WHERE
             ORD_DT=?
             AND CORG_NO=?
             AND CORG_DSK_NO=?
             AND BAT_STS='0'
          </Sentence>
-         <Fields>BAT_STS|RSP_CD|RSP_MSG|CORG_JRN_NO|ORD_DT|CORG_NO|CORG_DSK_NO
+         <Fields>BAT_STS|RSP_CD|RSP_MSG|CORG_JRN_NO|BAT_FAL_CNT|BAT_FAL_AMT|ORD_DT|CORG_NO|CORG_DSK_NO
          </Fields>
       </DynSentence>
 
@@ -383,17 +367,17 @@
       </Function>
       <FlowCtrl>
          <!--清理数据 -->
-         <Delete>serial_no</Delete>
+         <Delete>SERIAL_NO</Delete>
          <Delete>RSP_CD</Delete>
          <Delete>RSP_MSG</Delete>
          <Delete>SUM</Delete>
          <Delete>REC</Delete>
-         <Delete>rd</Delete>
+         <Delete>RD</Delete>
          <Exec func="PUB:DeleteGroup" error="IGNORE">
             <Arg name="GroupName"         value="REC"/>
          </Exec>
          <Exec func="PUB:DeleteGroup" error="IGNORE">
-            <Arg name="GroupName"         value="rd"/>
+            <Arg name="GroupName"         value="RD"/>
          </Exec>
          <Exec func="PUB:DumpETF" />
 
@@ -475,8 +459,6 @@
          <Set>summary_total=$summary_total</Set>  <!-- 合并记账使用 具体取值 待定 -->
          <Set>batch_sum_flag=$batch_sum_flag</Set>  <!--批量合并记账使用-->
 
-
-
          <Exec func="PUB:QueryInGroup" error="IGNORE">
             <Arg name="SqlCmd" value="$QryExport"/>
             <Arg name="RecordName" value="REC"/>
@@ -505,18 +487,31 @@
                <Break/>
             </Case>
             <Case value="3">
-               <Set>BAT_STS=2</Set>
-               <Set>RSP_CD=$TRSP_CD</Set>
-               <Set>RSP_MSG=$TRSP_MSG</Set>
-               <!--更新流水状态为处理-->
-               <Exec func="PUB:ExecSql" error="IGNORE">
-                  <Arg name="SqlCmd"    value="UpdJnlStsF"/>
-               </Exec>
-               <If condition="~RetCod != 0">
-                  <Set>Rsp_Cd=80</Set>
-                  <Set>Rsp_Msg=更新该批次状态失败</Set>
+               <Set>TRSP_CD=$TRSP_CD</Set>
+               <If condition="INTCMP($TRSP_CD,1,0)"> <!--错误码小于0时 默认为疑账处理-->
+                  <Set>BAT_STS=3</Set>
+                  <Set>RSP_CD=80</Set>
+                  <Set>RSP_MSG=批次已发送</Set>
+                  <Break/>
                </If>
-               <Break/>
+               <Else>
+                  <Set>BAT_STS=2</Set>
+                  <Set>RSP_CD=$TRSP_CD</Set>
+                  <Set>RSP_MSG=$TRSP_MSG</Set>
+                  <Set>BAT_FAL_CNT=$BAT_ORN_CNT</Set>
+                  <Set>BAT_FAL_AMT=$BAT_ORN_AMT</Set>
+                  <!--更新流水状态为处理-->
+                  <Exec func="PUB:ExecSql" error="IGNORE">
+                     <Arg name="SqlCmd"    value="UpdJnlStsF"/>
+                  </Exec>
+                  <If condition="~RetCod != 0">
+                     <Set>Rsp_Cd=80</Set>
+                     <Set>Rsp_Msg=更新该批次状态失败</Set>
+                  </If>
+                  <Break/>
+               </Else>
+
+
             </Case>
             <Case value="0"> <!--查询成功-->
                <Set>SMS_FLAG=0</Set><!-- 取消发送预警短信 -->
@@ -538,7 +533,7 @@
             </Case>
             <Default>
                <!--第三方失败-->
-               <Set>BAT_STS=3</Set> 
+               <Set>BAT_STS=3</Set>
                <Set>RSP_CD=80</Set>
                <Set>RSP_MSG=批次已发送</Set>
             </Default>
@@ -555,14 +550,14 @@
             <Arg name="GroupName"         value="REC"/>
          </Exec>
          <Exec func="PUB:DeleteGroup" error="IGNORE">
-            <Arg name="GroupName"         value="rd"/>
+            <Arg name="GroupName"         value="RD"/>
          </Exec>
-         <Delete>serial_no</Delete>
+         <Delete>SERIAL_NO</Delete>
          <Delete>RSP_CD</Delete>
          <Delete>RSP_MSG</Delete>
          <Delete>SUM</Delete>
          <Delete>REC</Delete>
-         <Delete>rd</Delete>
+         <Delete>RD</Delete>
       </FlowCtrl>
    </Transaction>
 
@@ -588,18 +583,7 @@
          <Fields>BAT_STS|END_TM|END_DT|BAT_SUC_AMT|BAT_SUC_CNT|BAT_FAL_AMT|BAT_FAL_CNT|RSP_CD|RSP_MSG|OORD_DT|OCORG_NO|OCORG_DSK_NO|OBAT_STS|
          </Fields>
       </DynSentence>
-      <DynSentence name="UpdBatErrMsg">  <!--更新批次错误信息 -->
-         <Sentence>
-            UPDATE CAPBATINF
-            SET RSP_CD=? ,
-            RSP_MSG=?
-            WHERE ORD_DT=?
-            AND
-            CORG_NO=?
-            AND CORG_DSK_NO=?
-         </Sentence>
-         <Fields>RSP_CD|RSP_MSG|OORD_DT|OCORG_NO|OCORG_DSK_NO|</Fields>
-      </DynSentence>
+
       <DynSentence name="UpdICBCTxnJnl"> <!--更新批扣流水 -->
          <Sentence>
             UPDATE CAPTXNJNL A
@@ -695,6 +679,30 @@
          <Fields>OCORG_DSK_NO|OORD_DT|</Fields>
       </DynSentence>
 
+      <!--更新该批次失败记录 -->
+      <DynSentence name="UpdJnlStsF">
+         <Sentence>
+            UPDATE CAPTXNJNL
+            SET DSK_NAM_STS='4',
+            TXN_STS='F',
+            TTXN_ST='F',
+            RSP_CD = '80',
+            RSP_MSG = ?,
+            TRSP_CD = ?,
+            TRSP_MSG = ?
+            WHERE DSK_NAM=?
+            AND
+            ORD_DT=?
+            AND CORG_NO=?
+            AND CORG_DSK_NO = ?
+            AND
+            DSK_NAM_STS='0'
+            AND TXN_STS='U'
+         </Sentence>
+         <Fields>RSP_MSG|TRSP_CD|TRSP_MSG|ODSK_NAM|OORD_DT|OCORG_NO|OCORG_DSK_NO|</Fields>
+      </DynSentence>
+
+
       <DynSentence name="DelCAPICBCPERD">  <!-- 导入临时表数据之前删除临时表数据 -->
          <Sentence>
             DELETE FROM CAPICBCPERDTMP
@@ -841,6 +849,7 @@
                <Set>RSP_CD=$TRSP_CD</Set>
                <Set>RSP_MSG=$TRSP_MSG</Set>
                <If condition="IS_EQUAL_STRING($TRSP_CD,BIB008,D0055)"> <!--交易请求已受理，处理中-->
+                  <Set>SMS_FLAG=0</Set>  <!--取消短信告警-->
                   <Set>BAT_STS=3</Set>
                   <!--更新批次信息-->
                   <Exec func="PUB:ExecSql" error="IGNORE">
@@ -852,6 +861,51 @@
                      <Break/>
                   </If>
                </If>
+               <ElseIf condition="IS_EQUAL_STRING($TRSP_CD,10660116)"> <!--无符合条件的数据 根据发送时间判断-->
+
+                  <Set>TIME_TEMP= SUBSTR(CALCTIME(GETDATETIME(MMDDHHMISS),-,m,30),3,8)</Set>
+                  <If condition="INTCMP($OSND_TIME,2,$TIME_TEMP)"> <!--时间间隔大于等于30分钟时认为该批次整批提交失败 否则继续查询-->
+
+                     <Set>RSP_MSG=STRCAT(发往工行批次,$OCORG_DSK_NO,整批失败)</Set>
+                     <Set>BAT_STS=2</Set>
+                     <!--更新流水状态为处理-->
+                     <Exec func="PUB:ExecSql" error="IGNORE">
+                        <Arg name="SqlCmd"    value="UpdJnlStsF"/>
+                     </Exec>
+                     <If condition="~RetCod != 0">
+                        <Set>Rsp_Cd=80</Set>
+                        <Set>Rsp_Msg=更新该批次状态失败</Set>
+                        <Break/>
+                     </If>
+                     <Set>BAT_FAL_AMT=$OBAT_ORN_AMT</Set>
+                     <Set>BAT_FAL_CNT=$OBAT_ORN_CNT</Set>
+                     <!--更新批次信息-->
+                     <Exec func="PUB:ExecSql" error="IGNORE">
+                        <Arg name="SqlCmd"    value="UpdCUPS_DSK_NO"/>
+                     </Exec>
+                     <If condition="~RetCod != 0">
+                        <Exec func="PUB:RollbackWork" />
+                        <Set>Rsp_Cd=80</Set>
+                        <Set>Rsp_Msg=更新该批次为发送处理状态失败</Set>
+                        <Break/>
+                     </If>
+                  </If>
+                  <Else>
+                     <Set>SMS_FLAG=0</Set>  <!--取消短信告警-->
+                     <Set>BAT_STS=3</Set>
+                     <!--更新批次信息-->
+                     <Exec func="PUB:ExecSql" error="IGNORE">
+                        <Arg name="SqlCmd"    value="UpdCUPS_DSK_NO"/>
+                     </Exec>
+                     <If condition="~RetCod != 0">
+                        <Set>Rsp_Cd=80</Set>
+                        <Set>Rsp_Msg=更新该批次为发送处理状态失败</Set>
+                        <Break/>
+                     </If>
+                  </Else>
+
+
+               </ElseIf>
                <Else> <!--其他错误-->
                   <Set>BAT_STS=5</Set>
                   <!--更新批次信息-->
@@ -863,7 +917,6 @@
                      <Set>Rsp_Msg=更新该批次为发送处理状态失败</Set>
                      <Break/>
                   </If>
-                  <!-- 代付交易失败需要解冻 该部分已经废止 待确认-->
 
                </Else>
                <Break/>
@@ -982,7 +1035,11 @@
          <Delete>RSP_MSG</Delete>
          <Delete>SUM</Delete>
          <Delete>REC</Delete>
-         <Delete>rd</Delete>
+         <Delete>RD</Delete>
+         <Exec func="PUB:DeleteGroup" error="IGNORE">
+            <Arg name="GroupName"         value="RD"/>
+         </Exec>
+
       </FlowCtrl>
    </Transaction>
 
diff --git a/cap/etc/channel/icbc/OFRTCAPZ_CTL.XML b/cap/etc/channel/icbc/OFRTCAPZ_CTL.XML
index 70bff99..1880ff5 100644
--- a/cap/etc/channel/icbc/OFRTCAPZ_CTL.XML
+++ b/cap/etc/channel/icbc/OFRTCAPZ_CTL.XML
@@ -340,7 +340,7 @@
          <Set>bank_code=102</Set>
 
          <Set>account_no=$AC_NO</Set>  <!--查询账户 -->
-         <Set>begin_date=20210317</Set>  <!--起始时间 -->
+         <Set>begin_date=20210225</Set>  <!--起始时间 -->
          <Set>end_date=$TXN_DT</Set>  <!--结束时间 -->
 
 
@@ -367,4 +367,22 @@
 
       </FlowCtrl>
    </Transaction>
+    
+     <Transaction code="TESTNTAGTLS_CMB" log_switch='1' desc="NTAGTLS2">
+      <FlowCtrl>
+         <Set>TX_COD=NTAGTLS2</Set><!--查询交易码-->
+         <Set>reqid=STRCAT(GETDATETIME(),000000)</Set>
+         <Set>userid=N002980574</Set>
+         <Set>buscod=N03020</Set>
+         <Exec func="PUB:CallThirdComm" error="IGNORE">
+            <Arg name="HTxnCd"           value="NTAGTLS2"/>
+            <Arg name="ObjSvr"           value="SCMBPAY1"/>
+         </Exec>
+       
+
+         <!-- 交易成功 -->
+         <Set>RSP_CD=00</Set>
+         <Set>RSP_MSG=交易成功</Set>
+      </FlowCtrl>
+   </Transaction>  
 </Application>
diff --git a/cap/etc/channel/icbc/SCAICBC_ITF.XML b/cap/etc/channel/icbc/SCAICBC_ITF.XML
index 49ce713..d4f3013 100644
--- a/cap/etc/channel/icbc/SCAICBC_ITF.XML
+++ b/cap/etc/channel/icbc/SCAICBC_ITF.XML
@@ -226,7 +226,7 @@
             <WriteElement name="min_amount"  ETF_name="min_amount"   necessary="no"/>
             <WriteElement name="max_amount"  ETF_name="max_amount"   necessary="no"/>
             <WriteElement name="bank_type"   ETF_name="bank_type"   necessary="no"/>
-            <WriteElement name="next_tag"    ETF_name="account_no"   necessary="no"/>
+            <WriteElement name="next_tag"    ETF_name="next_tag"   necessary="no"/>
             <WriteElement name="currency"    ETF_name="currency"   necessary="no"/>
             <WriteElement name="due_bill_no" ETF_name="due_bill_no"   necessary="no"/>
          </WriteElement>
diff --git a/cap/etc/common/MACRO_BNK_CFG.XML b/cap/etc/common/MACRO_BNK_CFG.XML
index 0308729..6c7de40 100644
--- a/cap/etc/common/MACRO_BNK_CFG.XML
+++ b/cap/etc/common/MACRO_BNK_CFG.XML
@@ -1,13 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <FrontTab>
 
-    <Macro name="Batch_Cfg_CMB" desc="招行批量参数">
-        <Set>PARA.MAX_CNT=1000</Set> <!--最大笔数-->
-    </Macro>
-    <Macro name="Batch_Cfg_ICBC" desc="工行批量参数">
-        <Set>GRP_CIS=020090002434552</Set>      <!--集团CIS号-->
-        <Set>ATTACH_NO=102</Set>                <!--归属银行编号-->
-        <Set>PARA.MAX_CNT=1000</Set>            <!--最大笔数 默认1000-->
-    </Macro>
+   <Macro name="Batch_Cfg_CMB" desc="招行批量参数">
+      <Set>PARA.MAX_CNT=1000</Set> <!--最大笔数-->
+      <Set>PARA.USERID=N002980574</Set><!--用户ID-->
+      <Set>PARA.BUSMOD1=00001</Set> <!--代发工资模式-->
+      <Set>PARA.BUSMOD2=00001</Set> <!--代发其他模式-->
+   </Macro>
+   <Macro name="Batch_Cfg_ICBC" desc="工行批量参数">
+      <Set>GRP_CIS=020090002434552</Set>      <!--集团CIS号-->
+      <Set>ATTACH_NO=102</Set>                <!--归属银行编号-->
+      <Set>PARA.MAX_CNT=1000</Set>            <!--最大笔数 默认1000-->
+   </Macro>
 </FrontTab>
 
diff --git a/cap/sql/cre_cmm.sql b/cap/sql/cre_cmm.sql
index dd59fd0..58cc149 100644
--- a/cap/sql/cre_cmm.sql
+++ b/cap/sql/cre_cmm.sql
@@ -847,7 +847,7 @@ create table CMMTRTRULE_BATCH
 	WEIGHT NUMBER(3) default 0,
 	TXN_CNL VARCHAR2(20) default 'HRO' not null,
 	TXN_CNLNA VARCHAR2(64) default '易才批量代付' not null,
-	ROUT_FLG VARCHAR2(5) default 0,
+	ROUT_FLG VARCHAR2(5) default 'SUPER',
 	GRP_NM VARCHAR2(20) default ' ' not null,
     SKIP_HLD CHAR(1) default 'N' not null,
 	constraint CMMTRTRULE_BATCH_FK
@@ -884,7 +884,7 @@ create table CMMTEMRULE_BATCH
 	WEIGHT NUMBER(3) default 0,
 	TXN_CNL VARCHAR2(20) default 'CAP' not null,
 	TXN_CNLNA VARCHAR2(64) default '易才批量代付' not null,
-	ROUT_FLG VARCHAR2(5) default 0,
+	ROUT_FLG VARCHAR2(5) default 'SUPER',
 	GRP_NM VARCHAR2(20) default ' ' not null,
     SKIP_HLD CHAR(1) default 'N' not null,   
 	constraint CMMTEMRULE_BATCH_FK