diff --git a/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML b/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML index 8854fff..330c6ad 100644 --- a/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML +++ b/cap/etc/batch/BAT_GET_DISK_RESULT_CTL.XML @@ -7,11 +7,12 @@ select DSK_NAM from capdskinf where DSK_NAM in + (select DSK_NAM from (select DSK_NAM, row_number() over (order by RCV_DT||RCV_TM asc) tm from capdskinf where DSK_NAM in (select DSK_NAM from capdskinf a where dsk_sts = '1' and ord_dt >= ? and (dsk_nam,0) in (select dsk_nam,sum(case when bat_sts not in ('4', '2') then 1 else 0 end) notfinal from capbatinf where ord_dt = a.ord_dt and dsk_nam = a.DSK_NAM group by dsk_nam having sum(case when bat_sts not in ('4', '2') then 1 else 0 end) = 0) - union all select DSK_NAM from CAPDSKINF a where a.dsk_sts = '9' and ORD_DT >= ?) - and rownum = 1 for update skip locked + union all select DSK_NAM from CAPDSKINF a where a.dsk_sts = '9' and ORD_DT >= ?)) where tm = 1) + for update skip locked DT_BEFER|DT_BEFER| diff --git a/cap/etc/channel/cmb/Batch_CMB.XML b/cap/etc/channel/cmb/Batch_CMB.XML index ae74834..81f6389 100644 --- a/cap/etc/channel/cmb/Batch_CMB.XML +++ b/cap/etc/channel/cmb/Batch_CMB.XML @@ -598,7 +598,7 @@ EVENT.DSK_NO=$DSK_NAM EVENT.BAT_NO=$CORG_DSK_NO EVENT.ERR_MSG=招行送盘通道返回异常! - EVT_TYP=EVT_CMB_SENDBATCH_CHANEL + EVT_TYP=EVT_BATCH_SEND_FAILURE @@ -886,7 +886,7 @@ EVENT.DSK_NO=$ODSK_NAM EVENT.BAT_NO=$OCORG_DSK_NO EVENT.ERR_MSG=招行回盘通道返回异常! - EVT_TYP=EVT_CMB_GETBATCH_CHANEL + EVT_TYP=EVT_BATCH_BACK_FAILURE @@ -909,7 +909,7 @@ EVENT.DRW_AC_BAL=0.01 EVENT.UDRW_AC_BAL=0.02 - EVT_TYP=EVT_ORG_AMT_OFW + EVT_TYP=EVT_BALANCE_INSUFFICIENT