Author: bleny Date: 2013-04-04 16:55:54 +0200 (Thu, 04 Apr 2013) New Revision: 73 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: use best effort policy when fulfilling kanban Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-04-04 14:52:50 UTC (rev 72) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-04-04 14:55:54 UTC (rev 73) @@ -1,7 +1,9 @@ package com.franciaflex.magalie.services.service; +import com.franciaflex.magalie.persistence.dao.SiteDao; import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.persistence.entity.Site; import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; @@ -24,7 +26,8 @@ public StorageMovementOrder fulfilKanbanTask( String articleBarcode, - MagalieUser magalieUser) throws InvalidMagalieBarcodeException, + MagalieUser magalieUser, + String destinationSiteId) throws InvalidMagalieBarcodeException, UnavailableArticleException, RequiredDriverLicenceException { @@ -42,11 +45,16 @@ ArticleStorageService articleStorageService = serviceContext.newService(ArticleStorageService.class); + SiteDao siteDao = serviceContext.getSiteDao(); + + Site destinationSite = siteDao.findById(destinationSiteId); + StorageMovementOrder storageMovementOrder = - articleStorageService.bookArticle( + articleStorageService.bookArticleWithBestEffortPolicy( magalieUser, article, - quantityInKanban); + quantityInKanban, + destinationSite); return storageMovementOrder; Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-04-04 14:52:50 UTC (rev 72) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-04-04 14:55:54 UTC (rev 73) @@ -52,8 +52,10 @@ try { - storageMovementOrder = service.fulfilKanbanTask(articleBarcode, magalieUser); + // TODO brendan 04/04/13 add destination site != null + storageMovementOrder = service.fulfilKanbanTask(articleBarcode, magalieUser, null); + } catch (InvalidMagalieBarcodeException e) { addFieldError("articleBarcode", "Le code barre n'est pas un code valide");