Merge remote-tracking branch 'origin/feature/RefactoringGestioneColli' into feature/RefactoringGestioneColli

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);
         }

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

@@ -735,7 +735,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 {
 
@@ -750,6 +750,8 @@ public class WMSUtility {
         LoadColliDTO docTrasfRequest = new LoadColliDTO();
         docTrasfRequest
                 .setDataDoc(dataDoc)
+                .setNumDoc(numTrasf)
+                .setCodVvet(codVvet)
                 .setCodDtip(codDtipToUse)
                 .setCodMdep(movementToAttach.getCodMdep())
                 .setCodAnag(movementToAttach.getCodAnag())

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<String> 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;
     }

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

@@ -2193,8 +2193,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,
+                    WMSUtility.createTransferDocumentAndAttachToMovement(multiDBTransactionManager, setupGest, movimento,
-                            codMdepArrivo, requestDTO.getAnnotazioni(), requestDataDTO.getUsername(), requestDTO.isGroupDailyTransfers(), requestDTO.getGroupingPolicy());
+                            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);