From 933675b0668838c22d3b9764899ee01daadf7ff6 Mon Sep 17 00:00:00 2001 From: AnthonyS Date: Thu, 11 Dec 2025 16:47:47 +0100 Subject: [PATCH] Aggiunti num doc e cod vvet in creazione documento sposta ul --- .../service/DocumentiDirettiService.java | 4 +- .../ems/retail/wms/Utility/WMSUtility.java | 4 +- .../wms/generic/dto/SpostaUlRequestDTO.java | 41 ++++++++++++++----- .../generic/service/WMSGenericService.java | 6 ++- 4 files changed, 40 insertions(+), 15 deletions(-) diff --git a/ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java b/ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java index 96e02d764a..b3d9e6dd31 100644 --- a/ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java +++ b/ems-engine/src/main/java/it/integry/ems/document/service/DocumentiDirettiService.java @@ -318,7 +318,7 @@ public class DocumentiDirettiService { DtbDoct transferDocument = WMSUtility.createTransferDocumentAndAttachToMovement(multiDBTransactionManager, setupGest, - internalMovement, null, documentCodMdep, null, + internalMovement, null, null, null, documentCodMdep, null, requestDataDTO.getUsername(), false, SpostaUlRequestDTO.TransferGroupPolicy.NONE); @@ -601,7 +601,7 @@ public class DocumentiDirettiService { DtbDoct transferDocument = WMSUtility.createTransferDocumentAndAttachToMovement(multiDBTransactionManager, setupGest, - internalMovement, null, documentCodMdep, null, + internalMovement, null, null, null, documentCodMdep, null, requestDataDTO.getUsername(), false, SpostaUlRequestDTO.TransferGroupPolicy.NONE); documentsToSave.add(transferDocument); } diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java index e59c0884c3..a28fef542f 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/Utility/WMSUtility.java @@ -826,7 +826,7 @@ public class WMSUtility { public static DtbDoct createTransferDocumentAndAttachToMovement(MultiDBTransactionManager multiDBTransactionManager, SetupGest setupGest, MtbColt movementToAttach, - LocalDate dataTrasf, String codMdepArrivo, + LocalDate dataTrasf, Integer numTrasf, String codVvet, String codMdepArrivo, String annotazioni, String username, boolean groupDailyTransfer, SpostaUlRequestDTO.TransferGroupPolicy groupingPolicy) throws Exception { @@ -841,6 +841,8 @@ public class WMSUtility { LoadColliDTO docTrasfRequest = new LoadColliDTO(); docTrasfRequest .setDataDoc(dataDoc) + .setNumDoc(numTrasf) + .setCodVvet(codVvet) .setCodDtip(codDtipToUse) .setCodMdep(movementToAttach.getCodMdep()) .setCodAnag(movementToAttach.getCodAnag()) diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/SpostaUlRequestDTO.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/SpostaUlRequestDTO.java index 860416d56d..e0cd071b27 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/SpostaUlRequestDTO.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/SpostaUlRequestDTO.java @@ -5,28 +5,22 @@ import it.integry.ems_model.entity._enum.IBaseEnum; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Date; import java.util.List; public class SpostaUlRequestDTO { - private LocalDateTime dataTrasf; private String codMdep; private String posizione; private String annotazioni; + private LocalDateTime dataTrasf; + private Integer numTrasf; + private String codVvet; private boolean createDocAutomatically = true; private boolean groupDailyTransfers = false; private TransferGroupPolicy groupingPolicy = TransferGroupPolicy.NONE; private List barcodeUlList = new ArrayList<>(); - public LocalDateTime getDataTrasf() { - return dataTrasf; - } - - public SpostaUlRequestDTO setDataTrasf(LocalDateTime dataTrasf) { - this.dataTrasf = dataTrasf; - return this; - } - public String getCodMdep() { return codMdep; } @@ -63,6 +57,33 @@ public class SpostaUlRequestDTO { return this; } + public LocalDateTime getDataTrasf() { + return dataTrasf; + } + + public SpostaUlRequestDTO setDataTrasf(LocalDateTime dataTrasf) { + this.dataTrasf = dataTrasf; + return this; + } + + public Integer getNumTrasf() { + return numTrasf; + } + + public SpostaUlRequestDTO setNumTrasf(Integer numTrasf) { + this.numTrasf = numTrasf; + return this; + } + + public String getCodVvet() { + return codVvet; + } + + public SpostaUlRequestDTO setCodVvet(String codVvet) { + this.codVvet = codVvet; + return this; + } + public boolean isCreateDocAutomatically() { return createDocAutomatically; } diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java index beb5f4d468..a151dc8c7f 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java @@ -2192,8 +2192,10 @@ public class WMSGenericService { if (requestDTO.isCreateDocAutomatically() && !UtilityString.equalsIgnoreCase(codMdepPartenza, codMdepArrivo)) { DtbDoct transferDocument = - WMSUtility.createTransferDocumentAndAttachToMovement(multiDBTransactionManager, setupGest, movimento, requestDTO.getDataTrasf() != null ? requestDTO.getDataTrasf().toLocalDate() : null, - codMdepArrivo, requestDTO.getAnnotazioni(), requestDataDTO.getUsername(), requestDTO.isGroupDailyTransfers(), requestDTO.getGroupingPolicy()); + WMSUtility.createTransferDocumentAndAttachToMovement(multiDBTransactionManager, setupGest, movimento, + requestDTO.getDataTrasf() != null ? requestDTO.getDataTrasf().toLocalDate() : null, + requestDTO.getNumTrasf(), requestDTO.getCodVvet(), codMdepArrivo, requestDTO.getAnnotazioni(), + requestDataDTO.getUsername(), requestDTO.isGroupDailyTransfers(), requestDTO.getGroupingPolicy()); entityProcessor.processEntity(transferDocument, true, multiDBTransactionManager);