From 0dfba0cd8c0b0c9030bbafb07e39024829e12d35 Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Tue, 5 Jul 2022 20:59:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E8=A1=8C=E6=8B=89=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=B7=A5=E8=A1=8C?=
 =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/channel/cmb/QUERY_CMB.XML   | 19 ++++++++++---------
 cap/etc/channel/icbc/QUERY_ICBC.XML |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/cap/etc/channel/cmb/QUERY_CMB.XML b/cap/etc/channel/cmb/QUERY_CMB.XML
index 488aa80..a321fda 100644
--- a/cap/etc/channel/cmb/QUERY_CMB.XML
+++ b/cap/etc/channel/cmb/QUERY_CMB.XML
@@ -1145,16 +1145,17 @@
 
 
             <If condition="ISNULL(DELBOTHSPACE($PRINTID))">
-               <!--对于任务ID为空的情况认为查询不到对账单 一般此种情形 为整批次全部失败或退款-->
-               <Exec func="PUB:ExecSql" error="IGNORE">
-                  <Arg name="SqlCmd"    value="UPD_CAPCMBHIJNL_FAIL"/>
-               </Exec>
-               <If condition="~RetCod!=0">
-                  <Set>Rsp_Cd=80</Set>
-                  <Set>Rsp_Msg=更新数据失败</Set>
-                  <Return/>
+               <If condition="IS_NOEQUAL_STRING($begdat,$CHK_DAT)">
+                  <!--对于任务ID为空的情况认为查询不到对账单 一般此种情形 为整批次全部失败或退款-->
+                  <Exec func="PUB:ExecSql" error="IGNORE">
+                     <Arg name="SqlCmd"    value="UPD_CAPCMBHIJNL_FAIL"/>
+                  </Exec>
+                  <If condition="~RetCod!=0">
+                     <Set>Rsp_Cd=80</Set>
+                     <Set>Rsp_Msg=更新数据失败</Set>
+                     <Return/>
+                  </If>
                </If>
-
                <Set>Rsp_Cd=80</Set>
                <Set>Rsp_Msg=该笔明细对账单任务ID为空</Set>
                <Continue/>
diff --git a/cap/etc/channel/icbc/QUERY_ICBC.XML b/cap/etc/channel/icbc/QUERY_ICBC.XML
index 5e8efab..090c2d7 100644
--- a/cap/etc/channel/icbc/QUERY_ICBC.XML
+++ b/cap/etc/channel/icbc/QUERY_ICBC.XML
@@ -837,7 +837,7 @@
       <DynSentence name="UPD_CAPICBCRECEIPT_INF">
          <Sentence>
             UPDATE  CAPICBCRECEIPT SET ULD_STS='S',TM_SMP =?,LCL_FIL_NAM=?,LCL_FIL_URL=?,LCL_FIL_ID=?,ULD_TM=?
-            WHERE  TRS_DATE=? AND CORG_NO=?
+            WHERE  TRS_DATE=? AND CORG_NO =?
          </Sentence>
          <Fields>TM_SMP|LCL_FIL_NAM|LCL_FIL_URL|LCL_FIL_ID|ULD_TM|TRS_DATE|CORG_NO|</Fields>
       </DynSentence>
@@ -848,7 +848,7 @@
          <If condition="ISNULL($CHECK_DATE)">
             <Set>CHECK_DATE=CALCDATE(GETDATE(),-,d,3)</Set>
          </If>
-
+         <Set>CORG_NO=ICBC</Set>
          <!--读取未上传的交易信息 -->
          <Exec func="PUB:OpenCursor" error="IGNORE">
             <Arg name="SqlCmd" value="QRY_CAPICBCRECEIPT_INF"/>