diff --git a/ems-engine/src/main/java/it/integry/ems/document/Import/dto/DocumentiProdDaFabbDTO.java b/ems-engine/src/main/java/it/integry/ems/document/Import/dto/DocumentiProdDaFabbDTO.java
index 21a47c8c49..1633bf46c1 100644
--- a/ems-engine/src/main/java/it/integry/ems/document/Import/dto/DocumentiProdDaFabbDTO.java
+++ b/ems-engine/src/main/java/it/integry/ems/document/Import/dto/DocumentiProdDaFabbDTO.java
@@ -22,6 +22,8 @@ public class DocumentiProdDaFabbDTO {
 
     private String matricola;
 
+    private String generaScarico;
+
     public String getGestione() {
         return gestione;
     }
@@ -84,4 +86,12 @@ public class DocumentiProdDaFabbDTO {
         this.matricola = matricola;
         return this;
     }
+
+    public String getGeneraScarico() {
+        return generaScarico;
+    }
+
+    public void setGeneraScarico(String generaScarico) {
+        this.generaScarico = generaScarico;
+    }
 }
diff --git a/ems-engine/src/main/java/it/integry/ems/document/Import/service/DocumentiProdDaFabb.java b/ems-engine/src/main/java/it/integry/ems/document/Import/service/DocumentiProdDaFabb.java
index cc6a4b695c..6b1f545128 100644
--- a/ems-engine/src/main/java/it/integry/ems/document/Import/service/DocumentiProdDaFabb.java
+++ b/ems-engine/src/main/java/it/integry/ems/document/Import/service/DocumentiProdDaFabb.java
@@ -40,7 +40,7 @@ public class DocumentiProdDaFabb {
     private String query;
 
     public List<EntityBase> generateCaricoScaricoDaFabb(String type, String format, List<DocumentiProdDaFabbDTO> ordini, List<AnomalieDTO> anomalie) throws Exception {
-        String chiudiCommessa = "N", codJcom = null;
+        String chiudiCommessa = "N", codJcom = null, generaScarico = null;
         List<EntityBase> entityList = new ArrayList<EntityBase>();
         Connection connect = multiDBTransactionManager.getPrimaryConnection();
 
@@ -54,6 +54,7 @@ public class DocumentiProdDaFabb {
         String codDtipScarGiroc = setupGest.getImportSetup(connect, type, format, "COD_DTIP_SCAR_GIROC");
 
         if (ordini.size() != 0) {
+            generaScarico = ordini.get(0).getGeneraScarico();
             chiudiCommessa = ordini.get(0).getChiudiCommessa();
             codJcom = ordini.get(0).getCodJcom();
         }
@@ -149,21 +150,23 @@ public class DocumentiProdDaFabb {
                     entityList.add(docCar);
 
                     // Creazione testata documento di scarico
-                    docScar = new DtbDoct();
-                    docScar.setOperation(OperationType.INSERT);
-                    docScar.setCodDtip(codDtipScar);
-                    docScar.setCodAnag(codAnag);
-                    docScar.setDataDoc(dataDoc);
-                    docScar.setCodMdep(codMdep);
-                    docScar.setCodProd(codProd);
-                    docScar.setPartitaMag(partitaMagProd);
-                    docScar.setQtaProd(qtaProd);
-                    docScar.setUntMisProd(untMisProd);
-                    docScar.setRapConvProd(rapConvProd);
-                    docScar.setCodJcom(codJcom);
-                    docScar.setDataOrd(riga.getDataOrd());
-                    docScar.setNumOrd(riga.getNumOrd());
-                    entityList.add(docScar);
+                    if (generaScarico.compareTo("S") == 0){
+                        docScar = new DtbDoct();
+                        docScar.setOperation(OperationType.INSERT);
+                        docScar.setCodDtip(codDtipScar);
+                        docScar.setCodAnag(codAnag);
+                        docScar.setDataDoc(dataDoc);
+                        docScar.setCodMdep(codMdep);
+                        docScar.setCodProd(codProd);
+                        docScar.setPartitaMag(partitaMagProd);
+                        docScar.setQtaProd(qtaProd);
+                        docScar.setUntMisProd(untMisProd);
+                        docScar.setRapConvProd(rapConvProd);
+                        docScar.setCodJcom(codJcom);
+                        docScar.setDataOrd(riga.getDataOrd());
+                        docScar.setNumOrd(riga.getNumOrd());
+                        entityList.add(docScar);
+                    }
 
                     // Creazione riga documento carico
                     DtbDocr docRCar = new DtbDocr();
@@ -237,17 +240,19 @@ public class DocumentiProdDaFabb {
                 }
 
                 // Creazione riga documento di scarico
-                DtbDocr docRScar = new DtbDocr();
-                docRScar.setCodMart(codMart);
-                docRScar.setPartitaMag(partitaMag);
-                docRScar.setUntDoc(untDoc);
-                docRScar.setQtaDoc(qtaDoc);
-                docRScar.setRapConv(rapConv);
-                docRScar.setCodJcom(codJcom);
-                docRScar.setDataOrd(dataOrd);
-                docRScar.setNumOrd(numOrd);
-                docRScar.setRigaOrd(rigaOrd);
-                docScar.getDtbDocr().add(docRScar);
+                if (generaScarico.compareTo("S") == 0){
+                    DtbDocr docRScar = new DtbDocr();
+                    docRScar.setCodMart(codMart);
+                    docRScar.setPartitaMag(partitaMag);
+                    docRScar.setUntDoc(untDoc);
+                    docRScar.setQtaDoc(qtaDoc);
+                    docRScar.setRapConv(rapConv);
+                    docRScar.setCodJcom(codJcom);
+                    docRScar.setDataOrd(dataOrd);
+                    docRScar.setNumOrd(numOrd);
+                    docRScar.setRigaOrd(rigaOrd);
+                    docScar.getDtbDocr().add(docRScar);
+                }
             }
             res.close();
             info.close();