|
|
@@ -536,12 +536,14 @@ public class PushPayBillMethod {
|
|
|
" on ww.pk_periodscheme = wp.pk_periodscheme\n" +
|
|
|
" inner join wa_period wpi\n" +
|
|
|
" on wp.pk_periodscheme = wpi.pk_periodscheme\n" +
|
|
|
+ " and wpi.cyear||wpi.cperiod<=ww.cyear||ww.cperiod\n" +
|
|
|
" left join wa_periodstate wps\n" +
|
|
|
" on ww.pk_wa_class = wps.pk_wa_class\n" +
|
|
|
" and wpi.pk_wa_period = wps.pk_wa_period\n" +
|
|
|
" where nvl(ww.dr, 0) = 0\n" +
|
|
|
" and nvl(wp.dr, 0) = 0\n" +
|
|
|
" and nvl(wpi.dr, 0) = 0 \n"+
|
|
|
+ " and ww.stopflag ='N' \n"+
|
|
|
" and ww.pk_org = '"+pk_org+ "'\n"+
|
|
|
" and wpi.cyear = '"+cyear+"' \n"+
|
|
|
" and wpi.cperiod = '"+cperiod+"' \n" +
|
|
|
@@ -561,12 +563,14 @@ public class PushPayBillMethod {
|
|
|
" on ww.pk_periodscheme = wp.pk_periodscheme\n" +
|
|
|
" inner join wa_period wpi\n" +
|
|
|
" on wp.pk_periodscheme = wpi.pk_periodscheme\n" +
|
|
|
+ " and wpi.cyear||wpi.cperiod<=ww.cyear||ww.cperiod\n" +
|
|
|
" left join wa_periodstate wps\n" +
|
|
|
" on ww.pk_wa_class = wps.pk_wa_class\n" +
|
|
|
" and wpi.pk_wa_period = wps.pk_wa_period\n" +
|
|
|
" where nvl(ww.dr, 0) = 0\n" +
|
|
|
" and nvl(wp.dr, 0) = 0\n" +
|
|
|
" and nvl(wpi.dr, 0) = 0 \n"+
|
|
|
+ " and ww.stopflag ='N' \n"+
|
|
|
" and ww.pk_org = '"+pk_org+ "'\n"+
|
|
|
" and wpi.cyear = '"+lastmonth.substring(0, 4)+"' \n"+
|
|
|
" and wpi.cperiod = '"+lastmonth.substring(4, 6)+"' \n" +
|
