diff --git a/cap/etc/api/CCAHRO2_ITF.XML b/cap/etc/api/CCAHRO2_ITF.XML
index c14c519..dbb3c70 100644
--- a/cap/etc/api/CCAHRO2_ITF.XML
+++ b/cap/etc/api/CCAHRO2_ITF.XML
@@ -14,11 +14,11 @@
+
-
-
+
diff --git a/cap/etc/batch/ACCT_RECEIPT_QUERY.XML b/cap/etc/batch/ACCT_RECEIPT_QUERY.XML
index 7072b07..b8aaabb 100644
--- a/cap/etc/batch/ACCT_RECEIPT_QUERY.XML
+++ b/cap/etc/batch/ACCT_RECEIPT_QUERY.XML
@@ -8,13 +8,24 @@
SELECT REF_NBR as BANK_REF_ID,YUR_REF as BATCH_ID,ACT_FIL_ID as FILE_PATH
FROM CAPCMBHIJNL
WHERE TRS_DAT=? AND ACT_RPT_STS='4'
- AND (DSK_NAM=? OR ? IS NULL)
- AND (REF_NBR=? OR ? IS NULL)
- AND (YUR_REF=? OR ? IS NULL)
+ AND (DSK_NAM=? OR ? IS NULL)
+ AND (REF_NBR=? OR ? IS NULL)
+ AND (YUR_REF=? OR ? IS NULL)
TRANS_DATE|DISK_NO|DISK_NO|BANK_REF_ID|BANK_REF_ID|BATCH_ID|BATCH_ID|
+
+
+ SELECT ONLY_SEQUENCE as BANK_REF_ID,' ' as BATCH_ID,ACT_FIL_ID as FILE_PATH
+ FROM CAPICBCHIJNL
+ WHERE TRS_DATE=? AND ACT_RPT_STS='4'
+ AND (DSK_NAM=? OR ? IS NULL)
+ AND (ONLY_SEQUENCE=? OR ? IS NULL)
+
+ TRANS_DATE|DISK_NO|DISK_NO|BANK_REF_ID|BANK_REF_ID|
+
+
@@ -27,6 +38,11 @@
QRY_SQL=QRY_CAPICBCHIJNL_INF
+
+ RSP_CD=80
+ RSP_MSG=工行大批号、银行流水号两个查询条件不能同时为空
+
+
RSP_CD=80
diff --git a/cap/etc/batch/DISK_APPLY_CTL.XML b/cap/etc/batch/DISK_APPLY_CTL.XML
index 706ae7c..8ba3236 100644
--- a/cap/etc/batch/DISK_APPLY_CTL.XML
+++ b/cap/etc/batch/DISK_APPLY_CTL.XML
@@ -40,6 +40,15 @@
TITLE_ID|
+
+
+ SELECT RTR_GRP GRP_NM FROM CAPSPECIALROUTE a,TITRTRGRP b
+ WHERE a.ENABLED = 'Y' AND a.TITLE_ID = ? AND a.CUSTOMER_ID = ?
+ AND a.TITLE_ID||a.CUSTOMER_ID = b.TITLE_ID
+
+ TITLE_ID|CUSTOMER_ID|
+
+
@@ -98,20 +107,6 @@
-
-
-
-
-
- Rsp_Cd=80
- Rsp_Msg=支付地路由未配置
-
-
-
- Rsp_Cd=80
- Rsp_Msg=数据库错误
-
-
CUSTOMER_ID=$CUSTOMER_ID
@@ -147,6 +142,32 @@
+
+
+
+
+
+
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=支付地路由未配置
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=数据库错误
+
+
+
+
+ Rsp_Cd=80
+ Rsp_Msg=数据库错误
+
+
+
diff --git a/cap/etc/batch/SPECIAL_ROUTE_SYNC.XML b/cap/etc/batch/SPECIAL_ROUTE_SYNC.XML
index 877abf2..704918d 100644
--- a/cap/etc/batch/SPECIAL_ROUTE_SYNC.XML
+++ b/cap/etc/batch/SPECIAL_ROUTE_SYNC.XML
@@ -13,7 +13,7 @@
- UPDATE CAPRECEIPTACCT
+ UPDATE CAPSPECIALROUTE
SET ENABLED=?,
UPD_DT=?,
UPD_TM=?,
diff --git a/cap/etc/batch/TRANS_QUERY.XML b/cap/etc/batch/TRANS_QUERY.XML
index bee749c..a8ea541 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,
+ abs((trs_amt * 100)) AS AMOUNT,
L_POSTSCRIPT AS POSTSCRIPT,
acc_nbr AS TITLE_ACCT_NO,
ACC_NAM AS TITLE_ACCT_NAME,
@@ -28,7 +28,7 @@
trs_blv AS BANK_BAL,
TM_SMP AS REFRESH_TIME,
vlt_dat AS BANK_VALUE_DATE,
- trscod AS BANK_TRSCODE
+ trs_cod AS BANK_TRSCODE
FROM CAPCMBHIJNL
WHERE ACC_NBR=? AND TRS_DAT BETWEEN ? AND ?
AND (ety_dat||ety_tim) BETWEEN ? AND ?
@@ -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,
+ abs((trs_amt * 100)) AS AMOUNT,
L_POSTSCRIPT AS POSTSCRIPT,
acc_nbr AS TITLE_ACCT_NO,
ACC_NAM AS TITLE_ACCT_NAME,
@@ -65,7 +65,7 @@
trs_blv AS BANK_BAL,
TM_SMP AS REFRESH_TIME,
vlt_dat AS BANK_VALUE_DATE,
- trscod AS BANK_TRSCODE
+ trs_cod AS BANK_TRSCODE
FROM CAPCMBCURJNL
WHERE ACC_NBR=?
AND (ety_dat||ety_tim) BETWEEN ? AND ?
@@ -80,12 +80,12 @@
SELECT t_date AS BANK_TRANS_DATE,
- t_time AS BANK_TRANS_TIME,
+ REPLACE(TRADE_TIME,'.','') AS BANK_TRANS_TIME,
decode(drcrf,'1','D','2','C') AS BANK_DC_FLAG,
recip_account_no AS ACCT_NO,
recip_name AS ACCT_NAME,
recip_bk_name AS BANK_NAME,
- ref AS BATCH_ID,
+ '' AS BATCH_ID,
only_sequence AS BANK_REF_ID,
(debit_amount + credit_amount) AS AMOUNT,
L_POSTSCRIPT AS POSTSCRIPT,
@@ -104,25 +104,25 @@
value_date AS BANK_VALUE_DATE,
TRX_CODE AS BANK_TRSCODE
FROM CAPICBCHIJNL
- WHERE ACCOUNT_NO=? AND TRS_DATE BETWEEN ? AND ?
- AND (T_DATE||T_TIME) BETWEEN ? AND ?
+ WHERE ACCOUNT_NO=? AND TRS_DATE BETWEEN ? AND ?
+ AND (T_DATE||REPLACE(TRADE_TIME,'.','')) BETWEEN ? AND ?
AND (DSK_NAM=? OR ? IS NULL)
AND (ONLY_SEQUENCE=? OR ? IS NULL)
AND (REF=? OR ? IS NULL)
AND (DRCRF=? OR ? IS NULL)
- ACCT_NO|START_DATE|END_DATE|START_TIME|END_TIME|DISK_NO|DISK_NO|BANK_REF_ID|BANK_REF_ID|BATCH_ID|BATCH_ID|BANK_DC_FLAG|BANK_DC_FLAG|
+ ACCT_NO|START_DATE|END_DATE|START_TIME|END_TIME|DISK_NO|DISK_NO|BANK_REF_ID|BANK_REF_ID|BANK_DC_FLAG|BANK_DC_FLAG|
SELECT t_date AS BANK_TRANS_DATE,
- t_time AS BANK_TRANS_TIME,
+ REPLACE(TRADE_TIME,'.','') AS BANK_TRANS_TIME,
decode(drcrf,'1','D','2','C') AS BANK_DC_FLAG,
recip_account_no AS ACCT_NO,
recip_name AS ACCT_NAME,
recip_bk_name AS BANK_NAME,
- ref AS BATCH_ID,
+ '' AS BATCH_ID,
only_sequence AS BANK_REF_ID,
(debit_amount + credit_amount) AS AMOUNT,
L_POSTSCRIPT AS POSTSCRIPT,
@@ -142,13 +142,12 @@
TRX_CODE AS BANK_TRSCODE
FROM CAPICBCCURJNL
WHERE ACCOUNT_NO=?
- AND (T_DATE||T_TIME) BETWEEN ? AND ?
+ AND (T_DATE||REPLACE(TRADE_TIME,'.','')) BETWEEN ? AND ?
AND (DSK_NAM=? OR ? IS NULL)
AND (ONLY_SEQUENCE=? OR ? IS NULL)
- AND (REF=? OR ? IS NULL)
AND (DRCRF=? OR ? IS NULL)
- ACCT_NO|START_TIME|END_TIME|DISK_NO|DISK_NO|BANK_REF_ID|BANK_REF_ID|BATCH_ID|BATCH_ID|BANK_DC_FLAG|BANK_DC_FLAG|
+ ACCT_NO|START_TIME|END_TIME|DISK_NO|DISK_NO|BANK_REF_ID|BANK_REF_ID|BANK_DC_FLAG|BANK_DC_FLAG|
@@ -201,6 +200,7 @@
+
QRY_SQL=QRY_CAPICBCHIJNL_INF