Aggiunto flag per disattivare controllo deposito dei colli

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

@@ -381,6 +381,7 @@ public class LoadColliService {
 
 
         // CONTROLLO DEPOSITO DEI COLLI
+        if (loadColliDTO.isControllaDepoDeiColli()) {
             if (loadDatiFromDB) {
                 query =
                         "SELECT DISTINCT " +
@@ -391,7 +392,7 @@ public class LoadColliService {
                 query = UtilityDB.addwhereCond(query, whereCond, false);
                 List<HashMap<String, Object>> results = UtilityDB.executeSimpleQuery(multiDBTransactionManager.getPrimaryConnection(), query);
 
-            if (results.size() > 0) {
+                if (!results.isEmpty()) {
                     throw new Exception("Ci sono colli con Deposito diverso da quello del Documento");
                 }
             } else {
@@ -402,6 +403,7 @@ public class LoadColliService {
                     throw new Exception("Ci sono colli con Deposito diverso da quello del Documento");
                 }
             }
+        }
 
         if (loadDatiFromDB) {
             query = "SELECT Count( distinct dtb_ordt.cod_forn_td) as count_cod_forn_td" +

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

@@ -32,9 +32,10 @@ public class LoadColliDTO {
     /**
      * Se settato a false vengono serializzati anche i dettagli della entity dtb_docr
      */
-
     private boolean saveDoc = true;
 
+    private boolean controllaDepoDeiColli = true;
+
     private List<MtbColt> colli = new ArrayList<>();
 
     public String getGestione() {
@@ -199,16 +200,14 @@ public class LoadColliDTO {
         return this;
     }
 
-//    public LoadColliDTO setColliMtbColt(List<MtbColt> colli) {
-//        List<DatiCollo> datiColloList = new ArrayList<>();
-//
-//        for(MtbColt mtbColt : colli) {
-//            datiColloList.add(new DatiCollo(mtbColt));
-//        }
-//
-//        this.colli = datiColloList;
-//        return this;
-//    }
+    public boolean isControllaDepoDeiColli() {
+        return controllaDepoDeiColli;
+    }
+
+    public LoadColliDTO setControllaDepoDeiColli(boolean controllaDepoDeiColli) {
+        this.controllaDepoDeiColli = controllaDepoDeiColli;
+        return this;
+    }
 
     public boolean isSaveDoc() {
         return saveDoc;

ems-engine/src/main/java/it/integry/ems/document/service/DocumentProdService.java

@@ -1071,7 +1071,8 @@ public class DocumentProdService {
                         .setDataDoc(results.get(j).getDataDocFromCollo())
                         .setCodMdep(carico.getCodMdep())
                         .setDataOrd(dataOrd)
-                        .setNumOrd(numOrd);
+                        .setNumOrd(numOrd)
+                        .setControllaDepoDeiColli(false);
 
                 String condDataCollo = "";
                 if (carico.getDataDoc() == null) {