From 7e382a08641b42fcb7ede5f6e5e6d5288e8d97d3 Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Thu, 29 Apr 2021 14:48:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=81=E7=9B=98=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=A4=E4=B8=AA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/batch/204025_CTL.XML        | 14 ++++++++++++++
 cap/etc/channel/hro/SCAHRO3_ITF.XML | 20 ++++++++++----------
 cap/etc/common/CAP01_FMT.XML        |  3 ++-
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/cap/etc/batch/204025_CTL.XML b/cap/etc/batch/204025_CTL.XML
index 4a77a36..11c1ba6 100644
--- a/cap/etc/batch/204025_CTL.XML
+++ b/cap/etc/batch/204025_CTL.XML
@@ -142,6 +142,20 @@
                     <Exec func="PUB:InvokeService" error="IGNORE">
                         <Arg name="ServiceName" value="PUSH_EVENT"/>
                     </Exec>
+                
+                    <Set>DISK_NO=$DSK_NAM</Set>
+                    <Set>DISK_STS=4</Set>
+                    <If condition="ISNULL($Rsp_Msg)">
+                        <Set>Rsp_Msg=接入批次异常</Set>
+                    </If>
+                    <Set>DISK_MESSAGE=STRCAT($Rsp_Msg,（,$Rsp_Cd,）,$ERR_MSG)</Set>
+                    <Delete>FILE_PATH</Delete>
+                    <Delete>MD5</Delete> 
+                    <!--调用HRO送盘接口-->
+                    <Exec func="PUB:CallThirdComm" error="IGNORE">
+                        <Arg name="HTxnCd" value="diskNotify"/>
+                        <Arg name="ObjSvr" value="SCAHRO3"/>
+                    </Exec>
                 </If>
             </Process>
         </Function>
diff --git a/cap/etc/channel/hro/SCAHRO3_ITF.XML b/cap/etc/channel/hro/SCAHRO3_ITF.XML
index 625635c..8bdac35 100644
--- a/cap/etc/channel/hro/SCAHRO3_ITF.XML
+++ b/cap/etc/channel/hro/SCAHRO3_ITF.XML
@@ -8,16 +8,16 @@
                 <WriteElement name="diskNo" ETF_name="DISK_NO" necessary="yes"/>   <!--批次状态-->
                 <WriteElement name="diskSts" ETF_name="DISK_STS" necessary="yes"/>   <!--批次状态-->
                 <WriteElement name="diskMessage" ETF_name="DISK_MESSAGE" necessary="yes"/>   <!--批次结果信息-->
-                <WriteElement name="lastDate" ETF_name="LAST_DATE" necessary="yes"/>   <!--最后更新日期-->
-                <WriteElement name="lastTime" ETF_name="LAST_TIME" necessary="yes"/>   <!--最后更新时间-->
-                <WriteElement name="totalCount" ETF_name="TOTAL_COUNT" necessary="yes"/> <!--总笔数-->
-                <WriteElement name="totalAmount" ETF_name="TOTAL_AMOUNT" necessary="yes"/> <!--总金额-->
-                <WriteElement name="succCount" ETF_name="SUCC_COUNT" necessary="yes"/> <!--成功笔数-->
-                <WriteElement name="succAmount" ETF_name="SUCC_AMOUNT" necessary="yes"/> <!--成功金额-->
-                <WriteElement name="failCount" ETF_name="FAIL_COUNT" necessary="yes"/><!--失败笔数-->
-                <WriteElement name="failAmount" ETF_name="FAIL_AMOUNT" necessary="yes"/> <!--失败笔数-->
-                <WriteElement name="filePath" ETF_name="FILE_PATH" necessary="yes"/><!--文件路径-->
-                <WriteElement name="md5" ETF_name="md5" necessary="yes"/> <!--磁盘MD5值-->
+                <WriteElement name="lastDate" ETF_name="LAST_DATE" necessary="no" />   <!--最后更新日期-->
+                <WriteElement name="lastTime" ETF_name="LAST_TIME" necessary="no" />   <!--最后更新时间-->
+                <WriteElement name="totalCount" ETF_name="TOTAL_COUNT" necessary="no" /> <!--总笔数-->
+                <WriteElement name="totalAmount" ETF_name="TOTAL_AMOUNT" necessary="no" /> <!--总金额-->
+                <WriteElement name="succCount" ETF_name="SUCC_COUNT" necessary="no" /> <!--成功笔数-->
+                <WriteElement name="succAmount" ETF_name="SUCC_AMOUNT" necessary="no" /> <!--成功金额-->
+                <WriteElement name="failCount" ETF_name="FAIL_COUNT" necessary="no" /><!--失败笔数-->
+                <WriteElement name="failAmount" ETF_name="FAIL_AMOUNT" necessary="no" /> <!--失败笔数-->
+                <WriteElement name="filePath" ETF_name="FILE_PATH" necessary="no" /><!--文件路径-->
+                <WriteElement name="md5" ETF_name="md5" necessary="no"/> <!--磁盘MD5值-->
             </WriteElement>
         </Request>
         <Response necessary="no">
diff --git a/cap/etc/common/CAP01_FMT.XML b/cap/etc/common/CAP01_FMT.XML
index fd43fbd..064d7cf 100644
--- a/cap/etc/common/CAP01_FMT.XML
+++ b/cap/etc/common/CAP01_FMT.XML
@@ -35,9 +35,10 @@
             <Item name="REF_ID"/>           <!-- 参考号 HRO明细流水号 -->
             <Item name="TXN_AMT" />          <!-- 	金额 分为单位，分转元 -->
             <AddItem name="AMOUNT" expression="FDIV($TXN_AMT,100,2)"/>
-            <!--Item name="BANK_TYPE"/-->            <!-- 银行名称 -->
+            <Item name="BANK_CODE"/>            <!-- 银行名称 -->
             <Item name="BANK_CITY"/>           <!-- 开户行所在城市 -->
             <Item name="BANK_NAME"/>            <!-- 开户银行网点 -->
+            <Item name="BANK_NO"/>            <!-- 开户银行网点 -->
             <Item name="REMARK" necessary="no"  deli_asc="-1"/>             <!-- 	备注 -->
         </Data>
     </Process>