1.合作机构超时增加状态为2成功判断2.回盘文件修改银行名称3.工行查询结果增加错误码判断

cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML

@@ -9,7 +9,7 @@
             <Sentence>
                 select listagg(dsk) WITHIN GROUP(ORDER BY dsk) dsk from
                 (select  '['||DSK_NAM||','||CORG_DSK_NO||','||BAT_STS||','||CORG_NO||']' dsk from CAPBATINF
-                where BAT_STS &lt;&gt; '4' and
+                where BAT_STS &lt;&gt; '4' and  BAT_STS &lt;&gt; '2'  and 
                 TO_CHAR(TO_DATE(snd_dt||snd_tm, 'yyyymmddHH24MISS')+'%s'/24/60, 'yyyymmddHH24MISS') &lt;= TO_CHAR(sysdate,'yyyymmddHH24MISS'))
             </Sentence>
             <Fields>MINUTE</Fields>

cap/etc/batch/DISKRESULLT_PKG.XML

@@ -21,11 +21,11 @@
         </DynSentence>
         <DynSentence name="QRY_CAPTXNJNL">
             <Sentence>
-                select ORD_DT,tm_smp LAST_TIME,CRD_FLG ACCT_TYPE,AC_NO ACCT_NO,CUS_NAM ACCT_NAME,CAP_ORD_NO TRANS_ID,
-                MERC_ORD_NO REF_ID,CORG_JRN_NO BANK_REF_ID, TXN_AMT AMOUNT,BNK_TYP BANK_TYPE,POSTSCRIPT,
-                TAC_NO PAYER_ACCT_NO,TAC_NAM PAYER_ACCT_NAME, CORG_NO ORG_NO,RMK REMARK,
-                TXN_STS TRANS_STS,RSP_MSG RESP_MESSAGE
-                from CAPTXNJNL t where t.dsk_nam = '%s' and ORD_DT = '%s' order by MERC_ORD_NO
+                select t.ORD_DT,t.tm_smp LAST_TIME,t.CRD_FLG ACCT_TYPE,t.AC_NO ACCT_NO,t.CUS_NAM ACCT_NAME,t.CAP_ORD_NO TRANS_ID,
+                t.MERC_ORD_NO REF_ID,t.CORG_JRN_NO BANK_REF_ID, t.TXN_AMT AMOUNT,a.CORG_NM BANK_TYPE,t.POSTSCRIPT,
+                t.TAC_NO PAYER_ACCT_NO,t.TAC_NAM PAYER_ACCT_NAME, t.CORG_NO ORG_NO,t.RMK REMARK,
+                t.TXN_STS TRANS_STS,t.RSP_MSG RESP_MESSAGE
+                from CAPTXNJNL t,CMMTORGN a  where t.dsk_nam = '%s' and ORD_DT = '%s' and t.CORG_NO = a.CORP_ORG  order by MERC_ORD_NO
             </Sentence>
             <Fields>DSK_NAM|ORD_DT|</Fields>
         </DynSentence>

cap/etc/channel/icbc/BATCH_ICBC.XML

@@ -906,6 +906,18 @@
 
 
                </ElseIf>
+               <ElseIf condition="INTCMP($TRSP_CD,1,0)"> <!--错误码为负数，代表系统异常，存在可疑账需要重新获取交易明细-->
+                  <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>
+               </ElseIf>                  
                <Else> <!--其他错误-->
                   <Set>BAT_STS=5</Set>
                   <!--更新批次信息-->