From 4a2ac3c0dea7336a13ba24ba115c5adb640d81ee Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Tue, 11 Jan 2022 15:28:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E8=A1=8C=E7=94=B5=E5=AD=90=E5=9B=9E?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/channel/cmb/QUERY_CMB.XML | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/cap/etc/channel/cmb/QUERY_CMB.XML b/cap/etc/channel/cmb/QUERY_CMB.XML
index 610ac27..2e6cb52 100644
--- a/cap/etc/channel/cmb/QUERY_CMB.XML
+++ b/cap/etc/channel/cmb/QUERY_CMB.XML
@@ -394,9 +394,9 @@
             <While condition="IS_EQUAL_STRING($cotflg,Y)">
                <Set>cotflg=N</Set>
                <Set>NUM=ADD($NUM,1)</Set>
-               <Set>RTN_NUM=ADDCHAR($NUM,6,0,1)</Set>
+               <Set>RTN_NUM=STRCAT($RRCFLG,ADDCHAR($NUM,6,0,1))</Set>
                <Set>TM_SMP=GETDATETIME()</Set>
-               <Set>reqid=STRCAT($TM_SMP,$RRCFLG,$RTN_NUM)</Set>
+               <Set>reqid=STRCAT($TM_SMP,$RTN_NUM)</Set>
 
                <Set>TX_COD=ASYCALHD</Set>
 
@@ -552,9 +552,9 @@
          <Sentence>
             UPDATE CAPCMBRECEIPT
             SET   RPT_STS='2',FIL_URL=?,FIN_TIM=?,GET_TM=?
-            WHERE  ACC_NBR=? AND TRS_DAT=? AND RPT_STS='1'
+            WHERE  ACC_NBR=? AND TRS_DAT=? AND RPT_STS='1' AND RTN_NUM =?
          </Sentence>
-         <Fields>FIL_URL|FIN_TIM|GET_TM|ACC_NBR|TRS_DAT|</Fields>
+         <Fields>FIL_URL|FIN_TIM|GET_TM|ACC_NBR|TRS_DAT|RTN_NUM|</Fields>
       </DynSentence>
 
 
@@ -873,7 +873,12 @@
                <Set>Rsp_Msg=文件上传失败进行下一笔</Set>
                <Continue/>
             </If>
-
+            <ElseIf condition="ISNULL($ACT_FIL_ID)">
+               <Set>UPD_FLG=0</Set>
+               <Set>Rsp_Cd=80</Set>
+               <Set>Rsp_Msg=文件上传失败进行下一笔</Set>
+               <Continue/>
+            </ElseIf>
             <Exec func="PUB:DeleteFile" error="IGNORE">
                <Arg name="FilNam" value="$FILE_NAME"/>
             </Exec>
@@ -1321,7 +1326,12 @@
                <Set>Rsp_Msg=文件上传失败进行下一笔</Set>
                <Continue/>
             </If>
-
+            <ElseIf condition="ISNULL($BIL_FIL_ID)">
+               <Set>UPD_FLG=0</Set>
+               <Set>Rsp_Cd=80</Set>
+               <Set>Rsp_Msg=文件上传失败进行下一笔</Set>
+               <Continue/>
+            </ElseIf>
 
             <!--更新明细对账单信息-->
             <Exec func="PUB:ExecSql" error="IGNORE">