diff --git a/ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookFieldService.java b/ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookFieldService.java
index 1f7b2ec4a1..a387215b1e 100644
--- a/ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookFieldService.java
+++ b/ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookFieldService.java
@@ -39,7 +39,7 @@ public class AgribookFieldService {
     public List<EntityBase> createField(MultiDBTransactionManager connection, AgribookNewFieldRequestDTO dto, String username, RequestDataDTO requestDataDTO) throws Exception {
 
         List<EntityBase> entityList = new ArrayList<>();
-        String codVdes = UtilityString.isNull(dto.getCodVdes(), this.suggestCodVdes(connection, dto.getCodAnag()));
+        String codVdes = UtilityString.isNull(dto.getCodVdes(), dto.isNewDes()?this.suggestCodVdes(connection, dto.getCodAnag()):null);
         if (dto.isNewDes()) {
             if (UtilityString.isNullOrEmpty(codVdes)) {
                 throw new Exception("Impossibile calcolare il codice destinatario!");
@@ -166,7 +166,7 @@ public class AgribookFieldService {
         return UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(),
                 "SELECT cod_mdep from mtb_depo where " +
                         " cod_anag = " + UtilityDB.valueToString(codAnag) + " " +
-                        " and cod_vdes = " + UtilityDB.valueToString(codVdes));
+                        " and ISNULL(cod_vdes,'') = ISNULL(" + UtilityDB.valueToString(codVdes)+",'')");
     }
 
     private String suggestCodVdes(MultiDBTransactionManager multiDBTransactionManager, String codAnag) throws Exception {
diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/MagazzinoBufferVersamentoMaterialeRequestDTO.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/MagazzinoBufferVersamentoMaterialeRequestDTO.java
index 79b4dae244..5a017849f8 100644
--- a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/MagazzinoBufferVersamentoMaterialeRequestDTO.java
+++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/MagazzinoBufferVersamentoMaterialeRequestDTO.java
@@ -11,6 +11,7 @@ public class MagazzinoBufferVersamentoMaterialeRequestDTO {
     private String serCollo;
     private Integer numCollo;
     private LocalDate dataCollo;
+    private String codJfas;
 
 
     public MtbColt getInputMtbColt() {
@@ -49,4 +50,13 @@ public class MagazzinoBufferVersamentoMaterialeRequestDTO {
         this.dataCollo = dataCollo;
         return this;
     }
+
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public MagazzinoBufferVersamentoMaterialeRequestDTO setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+        return this;
+    }
 }
diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSMagazzinoBufferService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSMagazzinoBufferService.java
index f16c7b80b1..79e18b2420 100644
--- a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSMagazzinoBufferService.java
+++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSMagazzinoBufferService.java
@@ -99,6 +99,7 @@ public class WMSMagazzinoBufferService {
                 .setNumCollo(magazzinoBufferVersamentoMaterialeRequestDTO.getNumCollo())
                 .setCodMdep(mtbColtRef.getCodMdep())
                 .setPosizione(posizione)
+                .setCodJfas(magazzinoBufferVersamentoMaterialeRequestDTO.getCodJfas())
                 .setCausaleCollo(CreateUDSRequestDTO.Causale.SCARICO));
 
         wmsLavorazioneService.insertUDSRow(new InsertUDSRowRequestDTO()