Author: bleny Date: 2013-04-04 15:38:01 +0200 (Thu, 04 Apr 2013) New Revision: 71 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: consider actual quantity Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.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/entity/StorageMovement.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-04-04 12:52:29 UTC (rev 70) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-04-04 13:38:01 UTC (rev 71) @@ -1,5 +1,7 @@ package com.franciaflex.magalie.persistence.entity; +import com.google.common.base.Objects; + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; @@ -109,4 +111,9 @@ public void setActualQuantity(Double actualQuantity) { this.actualQuantity = actualQuantity; } + + public double getQuantity() { + double quantity = Objects.firstNonNull(actualQuantity, expectedQuantity); + return quantity; + } } 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-04 12:52:29 UTC (rev 70) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-04-04 13:38:01 UTC (rev 71) @@ -209,10 +209,8 @@ StoredArticle storedArticle = storedArticlesBySite.get(originSite); - // TODO brendan 28/03/13 consider actual quantity + double actualQuantity = storedArticle.getQuantity() - storageMovement.getQuantity(); - double actualQuantity = storedArticle.getQuantity() - storageMovement.getExpectedQuantity(); - if (actualQuantity > 0.) { storedArticle.setQuantity(actualQuantity);