From f8a0a1c5393a7b614585eaee5e7b3b890ab62d6b Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Thu, 29 Jun 2023 18:48:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8B=9B=E8=A1=8C=E4=B8=80?=
 =?UTF-8?q?=E8=88=AC=E6=88=B7=E9=99=84=E8=A8=80=E8=BD=AC=E8=AF=91=E8=A7=84?=
 =?UTF-8?q?=E5=88=99,=E4=B8=80=E8=88=AC=E6=88=B7=E5=8F=91=E6=94=BE?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E9=99=84=E8=A8=80=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=B8=BA=E3=80=90=E5=B7=A5=E8=B5=84=E3=80=91=EF=BC=8C?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=BD=AC=E6=8D=A2=E4=B8=BA=E3=80=90=E6=94=B6?=
 =?UTF-8?q?=E5=85=A5=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cap/etc/channel/cmb/Batch_CMB.XML | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cap/etc/channel/cmb/Batch_CMB.XML b/cap/etc/channel/cmb/Batch_CMB.XML
index b590be2..5ce83e2 100644
--- a/cap/etc/channel/cmb/Batch_CMB.XML
+++ b/cap/etc/channel/cmb/Batch_CMB.XML
@@ -264,9 +264,9 @@
          </Sentence>
          <Fields>CORG_DSK_NO|ORD_DT|</Fields>
       </DynSentence>
-      <DynSentence name="QRYCAPTXNJNL"> <!--查询批次信息-->
+      <DynSentence name="QRYCAPTXNJNL"> <!-- 查询批次信息 modify 20230629 -->
          <Sentence>
-            SELECT TAC_TYP,ROUT_FLG,BR_NO,TAC_NO, case when TAC_TYP='N' AND POSTSCRIPT='工资' then '薪资' ELSE  substrb(POSTSCRIPT,0,40) END 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
@@ -276,7 +276,7 @@
       <DynSentence name="Qry_Export"> <!--招行代发工资/其它 查询打包记录 -->
          <Sentence>
             SELECT trx_seq trxseq,
-            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,
+            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
@@ -293,8 +293,8 @@
       <DynSentence name="Qry_Export_CW"> <!--招行超网代发工资/其它 查询打包记录 -->
          <Sentence>
             SELECT trx_seq trxseq,
-            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
+            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'