478 |
short modifyCounter = 0; |
short modifyCounter = 0; |
479 |
|
|
480 |
if (targetAddress.distributor.equals("DAO")) { |
if (targetAddress.distributor.equals("DAO")) { |
481 |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingMandag, targetAddress.routingMandag, korelisteHelper); |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingMandag, targetAddress.routingMandag, ruteHelper); |
482 |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingTirsdag, targetAddress.routingTirsdag, korelisteHelper); |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingTirsdag, targetAddress.routingTirsdag, ruteHelper); |
483 |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingOnsdag, targetAddress.routingOnsdag, korelisteHelper); |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingOnsdag, targetAddress.routingOnsdag, ruteHelper); |
484 |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingTorsdag, targetAddress.routingTorsdag, korelisteHelper); |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingTorsdag, targetAddress.routingTorsdag, ruteHelper); |
485 |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingFredag, targetAddress.routingFredag, korelisteHelper); |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingFredag, targetAddress.routingFredag, ruteHelper); |
486 |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingLordag, targetAddress.routingLordag, korelisteHelper); |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingLordag, targetAddress.routingLordag, ruteHelper); |
487 |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingSondag, targetAddress.routingSondag, korelisteHelper); |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingSondag, targetAddress.routingSondag, ruteHelper); |
488 |
} |
} |
489 |
|
|
490 |
if (targetAddress.distributor.equals("BK")) { |
if (targetAddress.distributor.equals("BK")) { |
497 |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingSondag, targetAddress.routingSondag, korelisteHelper); |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingSondag, targetAddress.routingSondag, korelisteHelper); |
498 |
} |
} |
499 |
|
|
500 |
|
|
501 |
if (modifyCounter > 0) { |
if (modifyCounter > 0) { |
502 |
orgAddress.extTarget = targetAddress; |
orgAddress.extTarget = targetAddress; |
503 |
orgAddress.extAfstand = eb.afstand; |
orgAddress.extAfstand = eb.afstand; |
621 |
} |
} |
622 |
} |
} |
623 |
|
|
624 |
public short updateRoutingExtendedDAO(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper<String> korelisteHelper) { |
public short updateRoutingExtendedDAO(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper<String> ruteHelper) { |
625 |
if (source.rute != null) { |
if (source.rute != null) { |
626 |
return 0; |
return 0; |
627 |
} |
} |
628 |
|
|
629 |
source.rute = calculateExtendedDaoRoute(bean, target); |
source.rute = calculateExtendedDaoRoute(bean, target); |
630 |
source.rute = korelisteHelper.getInstance(source.rute); |
source.rute = ruteHelper.getInstance(source.rute); |
631 |
|
|
632 |
if (source.rute != null) { |
if (source.rute != null) { |
633 |
source.koreliste = target.koreliste; |
source.koreliste = target.koreliste; |