diff --git a/cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML b/cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML index 4853686..9d5d330 100644 --- a/cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML +++ b/cap/etc/batch/BAT_DSK_CORG_TIMEOUT_CTL.XML @@ -10,7 +10,7 @@ select listagg(dsk) WITHIN GROUP(ORDER BY dsk) dsk from (select '['||DSK_NAM||','||CORG_DSK_NO||','||BAT_STS||','||CORG_NO||']' dsk from CAPBATINF where BAT_STS <> '4' and BAT_STS <> '2' and - TO_CHAR(TO_DATE(snd_dt||snd_tm, 'yyyymmddHH24MISS')+'%s'/24/60, 'yyyymmddHH24MISS') <= TO_CHAR(sysdate,'yyyymmddHH24MISS')) + TO_CHAR(TO_DATE(decode(SND_DT||SND_TM,' ',null,SND_DT||SND_TM), 'yyyymmddHH24MISS')+'%s'/24/60, 'yyyymmddHH24MISS') <= TO_CHAR(sysdate,'yyyymmddHH24MISS')) MINUTE diff --git a/cap/etc/batch/BAT_DSK_TIMEOUT_CTL.XML b/cap/etc/batch/BAT_DSK_TIMEOUT_CTL.XML index d3b05ad..6edeee7 100644 --- a/cap/etc/batch/BAT_DSK_TIMEOUT_CTL.XML +++ b/cap/etc/batch/BAT_DSK_TIMEOUT_CTL.XML @@ -9,7 +9,7 @@ select listagg(DSK) WITHIN GROUP(ORDER BY DSK) DSK from (select '['||DSK_NO||','||DSK_STS||']' DSK from CAPDSKINF where dsk_sts <> '4' and - TO_CHAR(TO_DATE(rcv_dt||rcv_tm, 'yyyymmddHH24MISS')+'%s'/24/60, 'yyyymmddHH24MISS') <= TO_CHAR(sysdate,'yyyymmddHH24MISS')) + TO_CHAR(TO_DATE(decode(RCV_DT||RCV_TM,' ',null,RCV_DT||RCV_TM), 'yyyymmddHH24MISS')+'%s'/24/60, 'yyyymmddHH24MISS') <= TO_CHAR(sysdate,'yyyymmddHH24MISS')) MINUTE diff --git a/cap/etc/batch/BAT_GET_TIMER_CTL.XML b/cap/etc/batch/BAT_GET_TIMER_CTL.XML index d56c618..25e90af 100644 --- a/cap/etc/batch/BAT_GET_TIMER_CTL.XML +++ b/cap/etc/batch/BAT_GET_TIMER_CTL.XML @@ -57,7 +57,7 @@ - + Rsp_Cd=80 @@ -73,7 +73,7 @@ Rsp_Cd=80 Rsp_Msg="数据库错误" - + Rsp_Cd=STRCAT( , ) diff --git a/cap/etc/batch/BAT_SEND_TIMER_CTL.XML b/cap/etc/batch/BAT_SEND_TIMER_CTL.XML index b46f301..f9f97b6 100644 --- a/cap/etc/batch/BAT_SEND_TIMER_CTL.XML +++ b/cap/etc/batch/BAT_SEND_TIMER_CTL.XML @@ -53,12 +53,12 @@ - + Rsp_Cd=80 Rsp_Msg="查询数据库错误" - + TMP_SND_TIME=GETDATETIME() N_SND_TIME=SUBSTR($TMP_SND_TIME,7,8) @@ -71,7 +71,7 @@ Rsp_Cd=80 Rsp_Msg="数据库错误" - + diff --git a/cap/etc/scheduler/TIMCON_PUB.XML b/cap/etc/scheduler/TIMCON_PUB.XML index 2134b69..85f64d4 100644 --- a/cap/etc/scheduler/TIMCON_PUB.XML +++ b/cap/etc/scheduler/TIMCON_PUB.XML @@ -38,11 +38,11 @@ - CMB2SYS + CMBSYS - ICBC2SYS + ICBCSYS