Author: bleny Date: 2013-08-05 17:06:30 +0200 (Mon, 05 Aug 2013) New Revision: 363 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: fixes #3038 : reception task should not include locations in another building so restrict fixed sites to current building Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-08-01 15:07:06 UTC (rev 362) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-08-05 15:06:30 UTC (rev 363) @@ -24,6 +24,7 @@ */ import com.google.common.base.Objects; +import com.google.common.collect.Sets; import javax.persistence.Entity; import java.util.Set; @@ -50,4 +51,17 @@ .add(PROPERTY_ID, id) .toString(); } -} //Article + + public Set<Location> getFixedLocationsInBuilding(Building building) { + Set<Location> fixedLocationsInBuilding = Sets.newHashSet(); + if (getFixedLocations() != null) { + for (Location location : getFixedLocations()) { + if (location.getWarehouse().getBuilding().equals(building)) { + fixedLocationsInBuilding.add(location); + } + } + } + return fixedLocationsInBuilding; + } + +} Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-08-01 15:07:06 UTC (rev 362) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-08-05 15:06:30 UTC (rev 363) @@ -256,12 +256,11 @@ Set<Location> locations = Sets.newLinkedHashSet(); - if (article.getFixedLocations() != null) { + Set<Location> fixedLocationsInBuilding = + article.getFixedLocationsInBuilding(warehouse.getBuilding()); - locations.addAll(article.getFixedLocations()); + locations.addAll(fixedLocationsInBuilding); - } - // second step, add locations where there is already quantities stored // we will suggest locations with highest quantities first ArticleStorageService articleStorageService =