[TRASFERIMENTO UL]

corretto deposito testata movimento di scarico a PV
aggiunto rollback in errore trasferimento

ems-core/src/main/java/it/integry/ems/rules/businessLogic/LoadColliService.java

@@ -682,7 +682,7 @@ public class LoadColliService {
             mtbTcol.setOperation(OperationType.SELECT_OBJECT);
             mtbTcol.setCodTcol(mtbColt.getCodTcol());
 
-            entityProcessor.processEntity(mtbTcol, multiDBTransactionManager);
+            entityProcessor.processEntity(mtbTcol,true, multiDBTransactionManager);
 
             if (mtbColt.getPesoKg() == null) mtbColt.setPesoKg(BigDecimal.ZERO);
 
@@ -704,7 +704,7 @@ public class LoadColliService {
         MtbAart mtbAart = new MtbAart();
         mtbAart.setCodMart(mtbColr.getCodMart());
         mtbAart.setOperation(OperationType.SELECT_OBJECT);
-        entityProcessor.processEntity(mtbAart, multiDBTransactionManager);
+        entityProcessor.processEntity(mtbAart,true, multiDBTransactionManager);
 
         //Retrieve della riga ordine
         DtbOrdr dtbOrdr = null;
@@ -715,7 +715,7 @@ public class LoadColliService {
             dtbOrdr.setRigaOrd(mtbColr.getRigaOrd());
             dtbOrdr.setOperation(OperationType.SELECT_OBJECT);
 
-            entityProcessor.processEntity(dtbOrdr, multiDBTransactionManager);
+            entityProcessor.processEntity(dtbOrdr,true, multiDBTransactionManager);
         }
 
         DtbDocr dtbDocr = new DtbDocr();

ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java

@@ -44,7 +44,7 @@ public class WMSUtility {
         mtbDepoTipi.setCodTipoDepo(mtbDepo.getFlagTipoNegozio())
                 .setOperation(OperationType.SELECT_OBJECT);
 
-        entityProcessor.processEntity(mtbDepoTipi, multiDBTransactionManager);
+        entityProcessor.processEntity(mtbDepoTipi,true, multiDBTransactionManager);
 
         return mtbDepoTipi.getGestisciColli() == null || mtbDepoTipi.getGestisciColli();
     }

ems-engine/src/main/java/it/integry/ems/retail/wms/generic/controller/WMSGenericController.java

@@ -4,6 +4,7 @@ import it.integry.common.var.CommonConstants;
 import it.integry.ems.Import.dto.AnomalieDTO;
 import it.integry.ems.javabeans.RequestDataDTO;
 import it.integry.ems.properties.EmsProperties;
+import it.integry.ems.response.EsitoType;
 import it.integry.ems.response.ServiceRestResponse;
 import it.integry.ems.retail.dto.PrintOrderCloseDTO;
 import it.integry.ems.retail.pvmRetail.dto.GiacenzaColliInMagDTO;
@@ -552,7 +553,12 @@ public class WMSGenericController {
     public @ResponseBody
     ServiceRestResponse spostaULInPosizione(@RequestParam(CommonConstants.PROFILE_DB) String configuration,
                                             @RequestBody SpostaUlRequestDTO requestDTO) throws Exception {
-        wmsGenericService.spostaUL(requestDTO);
+        try {
+            wmsGenericService.spostaUL(requestDTO);
+        } catch (Exception e) {
+            multiDBTransactionManager.rollbackAll();
+            throw e;
+        }
         return ServiceRestResponse.createPositiveResponse();
 
     }
@@ -667,7 +673,7 @@ public class WMSGenericController {
     @RequestMapping(value = "wms/updatePosizioneUL", method = RequestMethod.POST)
     public @ResponseBody
     ServiceRestResponse updatePosizioneUL(@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
-                                     @RequestBody UpdatePosizioneULRequestDTO updatePosizioneULRequest) throws Exception {
+                                          @RequestBody UpdatePosizioneULRequestDTO updatePosizioneULRequest) throws Exception {
 
         wmsGenericService.cambiaPosizioneUL(updatePosizioneULRequest);
         return ServiceRestResponse.createPositiveResponse();
@@ -684,11 +690,11 @@ public class WMSGenericController {
     @RequestMapping(value = "wms/getArticoloByEan128", method = RequestMethod.GET)
     public @ResponseBody
     ServiceRestResponse getArticoloByEan128(HttpServletRequest request,
-                                             @RequestParam(CommonConstants.PROFILE_DB) String configuration,
-                                             @RequestParam("barcode") String barcode) throws Exception {
+                                            @RequestParam(CommonConstants.PROFILE_DB) String configuration,
+                                            @RequestParam("barcode") String barcode) throws Exception {
 
 
-      SearchArtFromEanResponseDTO response = wmsGenericService.getArticoloFromEan128(barcode);
+        SearchArtFromEanResponseDTO response = wmsGenericService.getArticoloFromEan128(barcode);
         return ServiceRestResponse.createPositiveResponse(response);
     }
 

ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java

@@ -2027,13 +2027,13 @@ public class WMSGenericService {
                 wmsGiacenzaULService.retrieveArtsInGiacenzaByBarcodeUls(multiDBTransactionManager.getPrimaryConnection(),
                         ulToMove,true);
 
+        if (UtilityList.isNullOrEmpty(currentItemSituationList)){
+            throw new Exception("Nessuna UL trovata in giacenza");
+        }
         List<String> codMdeps = currentItemSituationList.stream()
                 .map(MvwSitArtUdcDetInventarioDTO::getCodMdep)
                 .distinct()
                 .collect(Collectors.toList());
-        if (UtilityList.isNullOrEmpty(currentItemSituationList)){
-            throw new Exception("Nessuna UL trovata in giacenza");
-        }
         if (codMdeps.isEmpty()) {
             throw new Exception("Nessun deposito di partenza selezionato!");
         }
@@ -2045,7 +2045,7 @@ public class WMSGenericService {
         mtbDepoArrivo.setCodMdep(requestDTO.getCodMdep())
                 .setOperation(OperationType.SELECT_OBJECT);
 
-        entityProcessor.processEntity(mtbDepoArrivo, multiDBTransactionManager);
+        entityProcessor.processEntity(mtbDepoArrivo,true, multiDBTransactionManager);
 
         boolean gestisciColli = WMSUtility.isGestisciColli(mtbDepoArrivo, entityProcessor, multiDBTransactionManager);
 
@@ -2124,7 +2124,7 @@ public class WMSGenericService {
             movimento.getMtbColr().addAll(cambiaPosizioneUlMovements);
         } else { //se non gestisco i colli sul deposito creo il movimento di solo scarico
             CreateUDSRequestDTO createUDSRequest = new CreateUDSRequestDTO();
-            createUDSRequest.setCodMdep(mtbDepoArrivo.getCodMdep())
+            createUDSRequest.setCodMdep(codMdepDoc)
                     .setCausaleCollo(CreateUDSRequestDTO.Causale.SCARICO);
 
             movimento = wmsLavorazioneService.createUDS(createUDSRequest);
@@ -2153,7 +2153,6 @@ public class WMSGenericService {
 
             DtbDoct docTrasf = loadColliService.createDocFromColli(multiDBTransactionManager, docTrasfRequest,false);
             docTrasf.getDtbDocr().forEach(docr->docr.setOperation(OperationType.INSERT_OR_UPDATE));
-//            entitiesToSave.add(docTrasf);
 
 
             //<editor-fold desc="Trasferimento pallet">
@@ -3003,7 +3002,7 @@ public class WMSGenericService {
         MtbColt internalMovement = WMSUtility.createInternalMovement(userSession.getDefaultDepo().getCodMdep());
         internalMovement.setMtbColr(cambiaPosizioneUlMovements);
 
-        entityProcessor.processEntity(internalMovement, multiDBTransactionManager);
+        entityProcessor.processEntity(internalMovement,true, multiDBTransactionManager);
     }
 
     public void cambiaDepositoUL(UpdateDepositoULRequestDTO updateDepositoULRequestDTO, String newDeposito) throws Exception {