Author: bleny Date: 2013-04-26 10:49:46 +0200 (Fri, 26 Apr 2013) New Revision: 140 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: review usage of 'SANS' and 'REC' locations Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-04-25 15:45:53 UTC (rev 139) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-04-26 08:49:46 UTC (rev 140) @@ -30,7 +30,6 @@ import com.franciaflex.magalie.persistence.entity.StoredArticle; import javax.persistence.EntityManager; -import javax.persistence.Query; import javax.persistence.TypedQuery; import java.util.List; @@ -47,11 +46,10 @@ @Override public List<StoredArticle> findAllForArticleInBuilding(Article article, Building building) { - Query query = entityManager.createQuery("from StoredArticle sa where sa.article = :article and sa.location.warehouse.building = :building and sa.location.code != :receptionLocationCode"); + TypedQuery<StoredArticle> query = createQuery("from StoredArticle sa where sa.article = :article and sa.location.warehouse.building = :building"); query.setParameter("article", article); query.setParameter("building", building); - query.setParameter("receptionLocationCode", Locations.codeForReceptionLocations()); - List<StoredArticle> resultList = query.getResultList(); + List<StoredArticle> resultList = findAll(query); for (StoredArticle storedArticle : resultList) { entityManager.detach(storedArticle); } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-04-25 15:45:53 UTC (rev 139) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-04-26 08:49:46 UTC (rev 140) @@ -257,8 +257,8 @@ Ordering.compound( Lists.newArrayList( StoredArticles.fixedLocationForArticleComparator(), - StoredArticles.locationWithLowestQuantityFirstComparator() - //StoredArticles.articleStoredInLocationsRequiringDriverLicenseFirstComparator() + StoredArticles.locationWithLowestQuantityFirstComparator(), + StoredArticles.articleStoredInLocationsRequiringDriverLicenseFirstComparator() ) );