Author: bleny Date: 2013-07-04 16:15:09 +0200 (Thu, 04 Jul 2013) New Revision: 291 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: when using PreparedArticleReception, we look for something stored in reception location but in the same building Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleJpaDao.java trunk/magalie-persistence/src/main/resources/magalie.properties trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferLocationAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-07-04 14:15:09 UTC (rev 291) @@ -42,6 +42,6 @@ List<StoredArticle> findAllByLocation(Location location); - StoredArticle findInReception(Article article); + StoredArticle findInReception(Building building, Article article); } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleJpaDao.java 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleJpaDao.java 2013-07-04 14:15:09 UTC (rev 291) @@ -95,8 +95,9 @@ } @Override - public StoredArticle findInReception(Article article) { - TypedQuery<StoredArticle> query = createQuery("from StoredArticle sa where sa.article = :article and sa.location.code = :codeForReceptionLocations"); + public StoredArticle findInReception(Building building, Article article) { + TypedQuery<StoredArticle> query = createQuery("from StoredArticle sa where sa.article = :article and sa.location.code = :codeForReceptionLocations and sa.location.warehouse.building = :building"); + query.setParameter("building", building); query.setParameter("article", article); query.setParameter("codeForReceptionLocations", Locations.codeForReceptionLocations()); return findUnique(query); Modified: trunk/magalie-persistence/src/main/resources/magalie.properties =================================================================== --- trunk/magalie-persistence/src/main/resources/magalie.properties 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-persistence/src/main/resources/magalie.properties 2013-07-04 14:15:09 UTC (rev 291) @@ -26,7 +26,7 @@ javax.persistence.jdbc.password= hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.hbm2ddl.auto=update -hibernate.show_sql=true +hibernate.show_sql=false hibernate.format_sql=true hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java 2013-07-04 14:15:09 UTC (rev 291) @@ -96,7 +96,7 @@ } - public PreparedArticleReception getPreparedArticleReception(String barcode) + public PreparedArticleReception getPreparedArticleReception(Building building, String barcode) throws InvalidMagalieBarcodeException, PreparedArticleReceptionAlreadyStoredException { JpaMagaliePersistenceContext persistenceContext = @@ -118,7 +118,7 @@ Article article = preparedArticleReception.getArticle(); StoredArticle storedArticle = - storedArticleDao.findInReception(article); + storedArticleDao.findInReception(building, article); if (storedArticle == null) { throw new PreparedArticleReceptionAlreadyStoredException(preparedArticleReception); 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-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-04 14:15:09 UTC (rev 291) @@ -189,10 +189,10 @@ } - public ReceptionTask getReceptionTaskForPreparedArticleReception(String barcode) throws PreparedArticleReceptionAlreadyStoredException, InvalidMagalieBarcodeException { + public ReceptionTask getReceptionTaskForPreparedArticleReception(Building building, String barcode) throws PreparedArticleReceptionAlreadyStoredException, InvalidMagalieBarcodeException { PreparedArticleReception preparedArticleReception = - getPreparedArticleReception(barcode); + getPreparedArticleReception(building, barcode); JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); @@ -203,7 +203,7 @@ Article article = preparedArticleReception.getArticle(); StoredArticle storedArticle = - storedArticleDao.findInReception(article); + storedArticleDao.findInReception(building, article); ReceptionTask receptionTask = buildReceptionTask( storedArticle, @@ -297,7 +297,7 @@ ); if (log.isDebugEnabled()) { - log.debug(result.size() + "locations to receive articles for article " + log.debug(result.size() + " locations to receive articles for article " + article + " in warehouse " + warehouse + " are " + StringUtils.join(result, ", ")); } @@ -379,13 +379,13 @@ } - public PreparedArticleReception getPreparedArticleReception(String barcode) throws InvalidMagalieBarcodeException, PreparedArticleReceptionAlreadyStoredException { + public PreparedArticleReception getPreparedArticleReception(Building building, String barcode) throws InvalidMagalieBarcodeException, PreparedArticleReceptionAlreadyStoredException { MagalieBarcodeService magalieBarcodeService = serviceContext.newService(MagalieBarcodeService.class); PreparedArticleReception preparedArticleReception = - magalieBarcodeService.getPreparedArticleReception(barcode); + magalieBarcodeService.getPreparedArticleReception(building, barcode); return preparedArticleReception; Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-07-04 14:15:09 UTC (rev 291) @@ -238,7 +238,7 @@ try { PreparedArticleReception preparedArticleReception = - service.getPreparedArticleReception(barcode); + service.getPreparedArticleReception(building, barcode); Assert.assertNotNull(preparedArticleReception); @@ -256,7 +256,7 @@ ReceptionTask receptionTask = null; try { - receptionTask = service.getReceptionTaskForPreparedArticleReception(barcode); + receptionTask = service.getReceptionTaskForPreparedArticleReception(building, barcode); } catch (PreparedArticleReceptionAlreadyStoredException e) { if (log.isErrorEnabled()) { log.error("unexpected exception", e); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java 2013-07-04 14:15:09 UTC (rev 291) @@ -23,6 +23,7 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; import com.franciaflex.magalie.services.exception.PreparedArticleReceptionAlreadyStoredException; import com.franciaflex.magalie.services.service.ReceptionService; @@ -60,9 +61,11 @@ session.setActivity(Activity.PREPARED_RECEPTIONS); + Building building = session.getBuilding(); + try { - receptionService.getPreparedArticleReception(barcode); + receptionService.getPreparedArticleReception(building, barcode); } catch (PreparedArticleReceptionAlreadyStoredException e) { Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-07-04 14:15:09 UTC (rev 291) @@ -24,6 +24,7 @@ */ import com.franciaflex.magalie.MagalieTechnicalException; +import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; import com.franciaflex.magalie.services.exception.PreparedArticleReceptionAlreadyStoredException; @@ -83,6 +84,8 @@ @Override public String input() { + Building building = session.getBuilding(); + if (storedArticleId != null) { receptionTask = service.getReceptionTask(storedArticleId); @@ -93,7 +96,7 @@ try { - receptionTask = service.getReceptionTaskForPreparedArticleReception(preparedArticleReceptionBarcode); + receptionTask = service.getReceptionTaskForPreparedArticleReception(building, preparedArticleReceptionBarcode); } catch (PreparedArticleReceptionAlreadyStoredException e) { Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-07-04 14:15:09 UTC (rev 291) @@ -64,7 +64,7 @@ protected StoredArticle storedArticle; - protected String destinationBarCode; + protected String destinationBarcode; protected double quantity; @@ -120,16 +120,16 @@ return quantity; } - public String getDestinationBarCode (){ - return destinationBarCode; + public String getDestinationBarcode(){ + return destinationBarcode; } public void setStoredArticleId(String storedArticleId) { this.storedArticleId = storedArticleId; } - public void setDestinationBarCode(String destinationBarCode) { - this.destinationBarCode = destinationBarCode; + public void setDestinationBarcode(String destinationBarcode) { + this.destinationBarcode = destinationBarcode; } public void setQuantity(double quantity) { @@ -143,10 +143,9 @@ log.debug("originId : " + originId + "\n" + "storedArticleId : " + storedArticleId + "\n" + "quantity : " + quantity + "\n" + - "destinationBarCode : " + destinationBarCode); + "destinationBarcode : " + destinationBarcode); } - origin = service.getLocationById(originId); storedArticle = service.findStoredArticle(storedArticleId); @@ -161,8 +160,8 @@ return INPUT; } - if (destinationBarCode.isEmpty()) { - addFieldError("destinationBarCode", "L'emplacement de destination doit être renseigné"); + if (destinationBarcode.isEmpty()) { + addFieldError("destinationBarcode", "L'emplacement de destination doit être renseigné"); return INPUT; } @@ -174,24 +173,24 @@ try { - destination = service.getLocation(building, magalieUser, destinationBarCode); + destination = service.getLocation(building, magalieUser, destinationBarcode); } catch (InvalidMagalieBarcodeException e) { - addFieldError("destinationBarCode", "Le code barre n'est pas un code valide"); + addFieldError("destinationBarcode", "Le code barre n'est pas un code valide"); return INPUT; } catch (InaccessibleLocationException e) { - addFieldError("destinationBarCode", "Vous n'êtes pas autorisé à accéder à l'emplacement"); + addFieldError("destinationBarcode", "Vous n'êtes pas autorisé à accéder à l'emplacement"); return INPUT; } if (destination.equals(storedArticle.getLocation())) { - addFieldError("destinationBarCode", "la destination doit être différente de l'origine"); + addFieldError("destinationBarcode", "la destination doit être différente de l'origine"); return INPUT; } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferLocationAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferLocationAction.java 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferLocationAction.java 2013-07-04 14:15:09 UTC (rev 291) @@ -54,7 +54,7 @@ protected StorageTransferService service; - protected String originBarCode; + protected String originBarcode; protected Location origin; @@ -66,15 +66,15 @@ this.session = session; } - public void setOriginBarCode(String originBarCode) { - this.originBarCode = originBarCode; + public void setOriginBarcode(String originBarcode) { + this.originBarcode = originBarcode; } @Override public String execute() { if (log.isDebugEnabled()) { - log.debug("origin BarCode : " + originBarCode); + log.debug("origin BarCode : " + originBarcode); } Building building = session.getBuilding(); @@ -83,17 +83,17 @@ try { - origin = service.getLocation(building, magalieUser, originBarCode); + origin = service.getLocation(building, magalieUser, originBarcode); } catch (InvalidMagalieBarcodeException e) { - addFieldError("originBarCode", "Le code barre n'est pas un code valide"); + addFieldError("originBarcode", "Le code barre n'est pas un code valide"); return INPUT; } catch (InaccessibleLocationException e) { - addFieldError("originBarCode", "Vous n'êtes pas autorisé à accéder à l'emplacement"); + addFieldError("originBarcode", "Vous n'êtes pas autorisé à accéder à l'emplacement"); return INPUT; Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-04 14:15:09 UTC (rev 291) @@ -100,7 +100,7 @@ <s:textfield name="quantity" label="Qté" inputAppend="%{storedArticle.article.unit}" type="number" step="any" min="0" cssClass="input-mini" /> - <s:textfield key="destinationBarCode" label="Destination" inputAppendIcon="barcode" cssClass="input-small" /> + <s:textfield key="destinationBarcode" label="Destination" inputAppendIcon="barcode" cssClass="input-small" /> <div class="btn-group"> <s:a href="%{cancelUrl}" cssClass="btn" id="CancelLink" >Quitter (Esc)</s:a> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp 2013-07-04 14:15:09 UTC (rev 291) @@ -37,7 +37,7 @@ <s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/> <s:form> - <s:textfield key="originBarCode" label="Emplacement de prélévement" inputAppendIcon="barcode" cssClass="input-medium" /> + <s:textfield key="originBarcode" label="Emplacement de prélévement" inputAppendIcon="barcode" cssClass="input-medium" /> <div class="btn-group"> <s:a href="%{chooseActivityUrl}" cssClass="btn" id="chooseActivityLink" >Changer d'activité (Esc)</s:a>