diff --git a/cap/etc/api/CCAHRO1_ITF.XML b/cap/etc/api/CCAHRO1_ITF.XML
index 1ebeb98..15bcc48 100644
--- a/cap/etc/api/CCAHRO1_ITF.XML
+++ b/cap/etc/api/CCAHRO1_ITF.XML
@@ -108,6 +108,7 @@
+
diff --git a/cap/etc/api/CCAHRO2_ITF.XML b/cap/etc/api/CCAHRO2_ITF.XML
index b528efb..c14c519 100644
--- a/cap/etc/api/CCAHRO2_ITF.XML
+++ b/cap/etc/api/CCAHRO2_ITF.XML
@@ -132,7 +132,7 @@
-
+
@@ -143,7 +143,7 @@
-
+
@@ -168,6 +168,41 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cap/etc/batch/BAT_GETBILLSP_TIMER_CTL.XML b/cap/etc/batch/BAT_GETBILLSP_TIMER_CTL.XML
new file mode 100644
index 0000000..dda8fa9
--- /dev/null
+++ b/cap/etc/batch/BAT_GETBILLSP_TIMER_CTL.XML
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+ SELECT * FROM (
+ SELECT TASK_ID,PRT_ID FROM CAPPRINTTASK WHERE PRT_STS='1' AND PRT_DAT >=? AND (SND_TM <=?))
+ ORDER BY PRT_DAT,TASK_ID
+
+ CHECK_DATE|C_SND_TIME|
+
+
+
+
+
+ CHECK_DATE=CALCDATE(GETDATE(),-,d,3)
+
+
+ SND_TIME_INTERVAL=2
+
+ C_SND_TIME=CALCTIME(GETDATETIME(MMDDHHMISS),-,m,$SND_TIME_INTERVAL)
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=数据库错误
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=循环游标失败
+
+
+ TTXN_CD=GET_CMBBILL_SPECIAL
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=发送批次失败
+
+
+
+
+
+
+
+
+ Rsp_Cd=00
+ Rsp_Msg=交易成功
+
+
+
diff --git a/cap/etc/batch/BAT_ICBCRECEIPT_TIMER_CTL.XML b/cap/etc/batch/BAT_ICBCRECEIPT_TIMER_CTL.XML
index c987dcf..337836e 100644
--- a/cap/etc/batch/BAT_ICBCRECEIPT_TIMER_CTL.XML
+++ b/cap/etc/batch/BAT_ICBCRECEIPT_TIMER_CTL.XML
@@ -7,14 +7,17 @@
- SELECT * FROM (
- SELECT ACCOUNT_NO,TRS_DATE FROM CAPICBCJNLTOT WHERE ACC_RPT_STS='1' AND TOT_CNT!='0' )
+ SELECT * FROM (
+ SELECT ACCOUNT_NO,TRS_DATE FROM CAPICBCJNLTOT WHERE ACC_RPT_STS='1' AND TOT_CNT!='0' AND TRS_DATE >=?)
-
+ CHECK_DATE|
+
+ CHECK_DATE=CALCDATE(GETDATE(),-,d,4)
+
diff --git a/cap/etc/batch/BAT_QRYBILLSP_TIMER_CTL.XML b/cap/etc/batch/BAT_QRYBILLSP_TIMER_CTL.XML
new file mode 100644
index 0000000..87348cc
--- /dev/null
+++ b/cap/etc/batch/BAT_QRYBILLSP_TIMER_CTL.XML
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+ SELECT * FROM (
+ SELECT TASK_ID,STR_DAT,END_DAT,ACC_NBR,ACC_NAM,ACCT_TYPE TAC_TYP FROM CAPPRINTTASK WHERE PRT_STS='0' AND PRT_DAT >=? )
+ ORDER BY PRT_DAT,TASK_ID
+
+ CHECK_DATE|
+
+
+
+
+
+ CHECK_DATE=CALCDATE(GETDATE(),-,d,3)
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=数据库错误
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=循环游标失败
+
+
+ TTXN_CD=QRY_CMBBILL_SPECIAL
+
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=发送批次失败
+
+
+
+
+
+
+
+
+ Rsp_Cd=00
+ Rsp_Msg=交易成功
+
+
+
diff --git a/cap/etc/batch/BAT_QRYRECEIPT_TIMER_CTL.XML b/cap/etc/batch/BAT_QRYRECEIPT_TIMER_CTL.XML
index a7b150e..10b8722 100644
--- a/cap/etc/batch/BAT_QRYRECEIPT_TIMER_CTL.XML
+++ b/cap/etc/batch/BAT_QRYRECEIPT_TIMER_CTL.XML
@@ -7,15 +7,18 @@
- SELECT * FROM (
- SELECT ACC_NBR EAC_NBR,TRS_DAT FROM CAPCMBJNLTOT WHERE ACC_RPT_STS='0' AND TOT_CNT!='0'
- AND ACC_NBR IN (SELECT ACCT_NO ACC_NBR FROM CAPRECEIPTACCT WHERE RPT_SYC_FLG='Y'))
+ SELECT * FROM (
+ SELECT ACC_NBR EAC_NBR,TRS_DAT FROM CAPCMBJNLTOT WHERE ACC_RPT_STS='0' AND TOT_CNT!='0' AND TRS_DAT >=?
+ AND ACC_NBR IN (SELECT ACCT_NO ACC_NBR FROM CAPRECEIPTACCT WHERE RPT_SYC_FLG='Y'))
-
+ CHECK_DATE|
+
+ CHECK_DATE=CALCDATE(GETDATE(),-,d,3)
+
diff --git a/cap/etc/batch/BAT_ULDRECEIPTORI_TIMER_CTL.XML b/cap/etc/batch/BAT_ULDRECEIPTORI_TIMER_CTL.XML
new file mode 100644
index 0000000..a909b7d
--- /dev/null
+++ b/cap/etc/batch/BAT_ULDRECEIPTORI_TIMER_CTL.XML
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+ SELECT * FROM (
+ SELECT ACC_NBR,TRS_DAT FROM CAPCMBJNLTOT WHERE ACC_RPT_STS='4' AND TOT_CNT!='0' AND TRS_DAT >=?)
+ ORDER BY ACC_NBR
+
+ CHECK_DATE|
+
+
+
+
+
+ CHECK_DATE=CALCDATE(GETDATE(),-,d,3)
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=数据库错误
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=循环游标失败
+
+
+ TTXN_CD=GET_CMBRECEIPT
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=发送批次失败
+
+
+
+
+
+
+
+
+ Rsp_Cd=00
+ Rsp_Msg=交易成功
+
+
+
diff --git a/cap/etc/batch/OFRTCAP3_CTL.XML b/cap/etc/batch/OFRTCAP3_CTL.XML
index a786bfb..2e33075 100644
--- a/cap/etc/batch/OFRTCAP3_CTL.XML
+++ b/cap/etc/batch/OFRTCAP3_CTL.XML
@@ -54,5 +54,11 @@
+
+
+
+
+
+
diff --git a/cap/etc/batch/PRINT_RECEIPT_APPLY.XML b/cap/etc/batch/PRINT_RECEIPT_APPLY.XML
new file mode 100644
index 0000000..7da140f
--- /dev/null
+++ b/cap/etc/batch/PRINT_RECEIPT_APPLY.XML
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+ SELECT 'Y' YN FROM CAPPRINTTASK
+ WHERE TASK_ID=?
+
+ TASK_ID|
+
+
+
+
+
+ SELECT ACCT_TYPE FROM CAPRECEIPTACCT WHERE BIL_SYC_FLG='Y' AND ACC_NBR=?
+
+ ACC_NBR|
+
+
+
+ RSP_CD
+ RSP_MSG
+ ACC_NBR=$PAYER_ACCT_NO
+ ACC_NAM=$ACCT_NAME
+ STR_DAT=$START_DATE
+ END_DAT=$END_DATE
+
+ TM_SMP=GETDATETIME()
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=付款账户不支持获取明细对账单
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=查询付款账户信息数据库异常
+
+
+
+
+
+
+
+
+ CRE_DT=$UPD_DT
+ CRE_TM=$UPD_TM
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=数据库操作错误
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=该任务申请已经存在
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=查询数据库失败
+
+
+
+
+ RSP_CD=00
+ RSP_MSG=交易成功
+
+
+
+
diff --git a/cap/etc/batch/PRINT_RECEIPT_RESULT.XML b/cap/etc/batch/PRINT_RECEIPT_RESULT.XML
new file mode 100644
index 0000000..098fa59
--- /dev/null
+++ b/cap/etc/batch/PRINT_RECEIPT_RESULT.XML
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+ SELECT PRT_STS TASK_RESULT,LCL_FIL_ID FILE_PATH FROM CAPPRINTTASK
+ WHERE TASK_ID=?
+
+ TASK_ID|
+
+
+
+
+ RSP_CD
+ RSP_MSG
+
+ TM_SMP=GETDATETIME()
+
+
+
+
+
+
+ RSP_CD=00
+ RSP_MSG=交易成功
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=该任务申请不存在
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=查询数据库失败
+
+
+
+
+
+
+
+
diff --git a/cap/etc/batch/REFUND_QUERY_CTL.XML b/cap/etc/batch/REFUND_QUERY_CTL.XML
index fa17bd5..f361719 100644
--- a/cap/etc/batch/REFUND_QUERY_CTL.XML
+++ b/cap/etc/batch/REFUND_QUERY_CTL.XML
@@ -8,7 +8,7 @@
SELECT DSK_NAM AS DISK_NO,CAP_ORD_NO AS TRANS_ID,MERC_ORD_NO REF_ID,BTH_DTL BANK_REFID,EAC_NBR ACCT_NO,EAC_NAM ACCT_NAME,
TRS_DAT TRANS_DATE,STS_COD TRANS_STS,TRS_AMT * 100 AMOUNT,RTN_COD REFUND_CODE,RTN_TXT REFUND_PS,
TAC_NO PAYER_ACCT_NO,TAC_NAM PAYER_ACCT_NAME,TXT_CLT REMARK,
- decode(STS_COD,'A','待处理','C','取消','E','失败','I','待复核','S','成功','其他') AS transStsMsg
+ decode(STS_COD,'A','待处理','C','取消','E','失败','I','待复核','S','成功','其他') AS transStsMsg,SUBSTR(TM_SMP,1,8) REFUND_DATE
FROM CAPCMBRFD
WHERE trs_dat between ? and ?
diff --git a/cap/etc/batch/TRANS_QUERY.XML b/cap/etc/batch/TRANS_QUERY.XML
index f18d617..bee749c 100644
--- a/cap/etc/batch/TRANS_QUERY.XML
+++ b/cap/etc/batch/TRANS_QUERY.XML
@@ -13,7 +13,7 @@
rpy_bnk AS BANK_NAME,
yur_ref AS BATCH_ID,
ref_nbr AS BANK_REF_ID,
- (trs_amt * 100) AS AMOUNT,
+ (trs_amt * 100) AS AMOUNT,
L_POSTSCRIPT AS POSTSCRIPT,
acc_nbr AS TITLE_ACCT_NO,
ACC_NAM AS TITLE_ACCT_NAME,
@@ -50,7 +50,7 @@
rpy_bnk AS BANK_NAME,
yur_ref AS BATCH_ID,
ref_nbr AS BANK_REF_ID,
- (trs_amt * 100) AS AMOUNT,
+ (trs_amt * 100) AS AMOUNT,
L_POSTSCRIPT AS POSTSCRIPT,
acc_nbr AS TITLE_ACCT_NO,
ACC_NAM AS TITLE_ACCT_NAME,
@@ -189,6 +189,7 @@
+ BANK_DC_FLAG=$DC_FLAG
@@ -206,6 +207,13 @@
QRY_SQL=QRY_CAPICBCCURJNL_INF
+
+ BANK_DC_FLAG=2
+
+
+ BANK_DC_FLAG=1
+
+
RSP_CD=80
diff --git a/cap/etc/channel/cmb/QUERY_CMB.XML b/cap/etc/channel/cmb/QUERY_CMB.XML
index cf24c2a..488aa80 100644
--- a/cap/etc/channel/cmb/QUERY_CMB.XML
+++ b/cap/etc/channel/cmb/QUERY_CMB.XML
@@ -886,8 +886,8 @@
-
-
+
+
@@ -972,6 +972,15 @@
BIL_SND_TM|BIL_PRT_ID|BIL_TOT_CNT|ACC_NBR|TRS_DAT|REF_NBR|
+
+
+ UPDATE CAPCMBHIJNL
+ SET BIL_RPT_STS='5',BIL_SND_TM=?
+ WHERE ACC_NBR=? AND TRS_DAT=? AND REF_NBR=? AND BIL_RPT_STS='0'
+
+ BIL_SND_TM|ACC_NBR|TRS_DAT|REF_NBR|
+
+
UPDATE CAPCMBJNLTOT
@@ -1008,8 +1017,8 @@
-
-
+
+
TRSP_CD
TRSP_MSG
@@ -1134,7 +1143,18 @@
BIL_PRT_ID=$PRINTID
BIL_TOT_CNT=$TOTAL
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=更新数据失败
+
+
+
Rsp_Cd=80
Rsp_Msg=该笔明细对账单任务ID为空
@@ -1238,7 +1258,7 @@
UPDATE CAPCMBJNLTOT
SET BIL_STS='4'
- WHERE ACC_NBR=? AND TRS_DAT=?
+ WHERE ACC_NBR=? AND TRS_DAT=? AND BIL_STS='1'
ACC_NBR|TRS_DAT|
@@ -1434,7 +1454,7 @@
-
+
Rsp_Cd=80
Rsp_Msg=登记明细信息表失败
@@ -1819,4 +1839,461 @@
RSP_MSG=交易成功
+
+
+
+
+
+
+
+ UPDATE CAPPRINTTASK"
+ SET PRT_STS=?,SND_TM=?,PRT_ID=?,TOT_CNT=?,PRT_RMK=?
+ WHERE TASK_ID=? AND PRT_STS='0'
+
+ SND_TM|PRT_ID|TOT_CNT|RSP_MSG|TASK_ID|
+
+
+
+
+
+ LockKey=STRCAT($TXN_CD,$TASK_ID)
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=加锁失败
+
+
+ IS_LOCKED=TRUE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ TRSP_CD
+ TRSP_MSG
+ PRT_STS
+
+
+ ACC_NBR=$ACC_NBR
+ begdat=$STR_DAT
+ enddat=$END_DAT
+
+ begdat=FMTDATE($begdat,0,4)
+ enddat=FMTDATE($enddat,0,4)
+
+ TAC_TYP=$TAC_TYP
+
+
+ busmod=$PARA.BUSMOD1
+ buscod=N03010
+
+
+
+ busmod=$PARA.BUSMOD2
+ buscod=N03020
+
+
+ Rsp_Cd=80
+ Rsp_Msg=无此路由
+
+
+
+
+ RESULTCODE
+ RESULTMSG
+ BEGIDX
+ PRINTID
+ TOTAL
+
+
+ TX_COD=DCAGPPDF
+ TMP_TM=GETDATETIME()
+ reqid=STRCAT($TMP_TM,$TASK_ID)
+ userid=$PARA.USERID
+ payeac=$ACC_NBR
+ begdat=$begdat
+ enddat=$enddat
+ eacnam=$ACC_NAM
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=查询失败
+
+
+ RSP_MSG=查询成功
+ PRT_STS=1
+
+ RESULTCODE=$RESULTCODE
+
+ Rsp_Cd=80
+ Rsp_Msg=$RESULTMSG
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=等待处理的任务数超过上限
+
+
+
+ PRT_STS=2
+ Rsp_Msg=$RESULTMSG
+
+
+
+ BEGIDX=$BEGIDX
+
+ PRT_STS=2
+ Rsp_Msg=对账单查询超限
+
+ SND_TM=GETDATETIME(MMDDHHMISS)
+ PRT_ID=$PRINTID
+ TOT_CNT=$TOTAL
+
+
+ PRT_STS=2
+ Rsp_Msg=无此用户对账单
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=更新数据失败
+
+
+
+
+
+
+ STR_DAT
+ END_DAT
+ ACC_NBR
+ TAC_TYP
+
+
+ RSP_CD=00
+ RSP_MSG=交易成功
+
+
+
+
+
+
+
+
+ UPDATE CAPPRINTTASK
+ SET PRT_STS='4',GET_TM=?,FIL_NAM=?,FIL_URL=?,LCL_FIL_ID=?,LCL_FIL_URL=?,FIN_TIM=?
+ WHERE TASK_ID=? AND PRT_STS='1'
+
+ GET_TM|FIL_NAM|FIL_URL|LCL_FIL_ID|LCL_FIL_URL|FIN_TIM|TASK_ID|
+
+
+
+
+
+ LockKey=STRCAT($TXN_CD,$TASK_ID)
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=加锁失败
+
+
+ IS_LOCKED=TRUE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ TRSP_CD
+ TRSP_MSG
+
+
+ ACC_NBR=$ACC_NBR
+ trs_dat=$trs_dat
+ CHK_DAT_TMP=GETDATE()
+ CHK_DAT=CALCDATE($CHK_DAT_TMP,-,d,1)
+
+ trs_dat=$CHK_DAT
+
+
+ RESULTCODE
+ RESULTMSG
+ fileurl
+ fintim
+ FIL_NAM
+ FIL_URL
+ LCL_FIL_ID
+ LCL_FIL_URL
+ OUT_DAT
+ TM_SMP=GETDATETIME()
+ GET_TM=$TM_SMP
+ TX_COD=DCTASKID
+ reqid=STRCAT($TM_SMP,002,$TASK_ID)
+ taskid=$PRT_ID
+ userid=$PARA.USERID
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=获取文件失败
+
+
+
+ RESULTCODE=$RESULTCODE
+
+ Rsp_Cd=80
+ Rsp_Msg=$RESULTMSG
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=$RESULTMSG
+
+
+
+ FIL_URL=$fileurl
+ FIN_TIM=$fintim
+
+
+ Rsp_Cd=80
+ Rsp_Msg=银行返回文件URL为空
+
+
+
+
+ FIL_DIR=STRCAT(/home/capadm/dat/receipt/cmb,/,special,/)
+ BIL_FIL_NAM=STRCAT(PRT,_,$TASK_ID,.,zip)
+ SHELL_NAME=STRCAT(/home/capadm/app/cap/etc/common/shell/,downloadCMBBILL.sh)
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=下载文件失败
+
+
+
+
+ FILE_NAME=STRCAT($FIL_DIR,$BIL_FIL_NAM)
+
+
+
+
+ LCLFIL_URL=$OUT_DAT.FILE_URL
+ LCL_FIL_ID=$OUT_DAT.FILE_ID
+
+ Rsp_Cd=80
+ Rsp_Msg=文件上传失败
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=文件上传失败
+
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=更新数据失败
+
+
+
+
+ TASK_ID
+
+
+ RSP_CD=00
+ RSP_MSG=交易成功
+
+
+
+
+
+
+
+
+
+
+
+ SELECT RTN_NUM,RTN_DAT,ACC_NBR
+ FROM CAPCMBRECEIPT
+ WHERE ACC_NBR=? AND TRS_DAT=? AND RPT_STS='2'
+
+ ACC_NBR|TRS_DAT|
+
+
+
+
+
+ UPDATE CAPCMBRECEIPT
+ SET RPT_STS='4',LCL_FIL_URL=?,LCL_FIL_ID=?,ULD_TM=?
+ WHERE ACC_NBR=? AND TRS_DAT=? AND RPT_STS='2' AND RTN_NUM =?
+
+ LCL_FIL_URL|LCL_FIL_ID|ULD_TM|ACC_NBR|TRS_DAT|RTN_NUM|
+
+
+
+
+
+ TRSP_CD
+ TRSP_MSG
+ RTN_NUM
+ RTN_DAT
+
+
+
+
+ userid=$PARA.USERID
+
+ ACC_NBR=$ACC_NBR
+ trs_dat=$trs_dat
+
+ CHK_DAT_TMP=GETDATE()
+ CHK_DAT=CALCDATE($CHK_DAT_TMP,-,d,1)
+
+
+ trs_dat=$CHK_DAT
+
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=游标查询失败
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=循环游标失败
+
+
+
+ RESULTCODE
+ RESULTMSG
+ LCL_FIL_ID
+ LCL_FIL_URL
+ OUT_DAT
+
+ FIL_DIR
+ FIL_NAM
+ TM_SMP=GETDATETIME()
+ ULD_TM=$TM_SMP
+ FIL_DIR=STRCAT(/home/capadm/dat/receipt/cmb,/,$TRS_DAT,/,$ACC_NBR,/)
+ FIL_NAM=STRCAT($ACC_NBR,$TRS_DAT,$RTN_NUM,.,zip)
+
+
+ FILE_NAME=STRCAT($FIL_DIR,$FIL_NAM)
+
+
+
+
+ LCL_FIL_URL=$OUT_DAT.FILE_URL
+ LCL_FIL_ID=$OUT_DAT.FILE_ID
+
+ UPD_FLG=0
+ Rsp_Cd=80
+ Rsp_Msg=文件上传失败进行下一笔
+
+
+
+ UPD_FLG=0
+ Rsp_Cd=80
+ Rsp_Msg=文件上传失败进行下一笔
+
+
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=更新数据失败
+
+
+
+
+
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=关闭游标失败
+
+
+
+
+ TRS_DAT
+ ACC_NBR
+
+
+
+ RSP_CD=00
+ RSP_MSG=交易成功
+
+
+