Finish Hotfix-100

ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251211162655.java

@@ -0,0 +1,24 @@
+package it.integry.ems.migration.model;
+
+import it.integry.ems.migration._base.BaseMigration;
+import it.integry.ems.migration._base.MigrationModelInterface;
+
+public class Migration_20251211162655 extends BaseMigration implements MigrationModelInterface {
+
+    @Override
+    public void up() throws Exception {
+        if (isHistoryDB())
+            return;
+
+        createSetupQuery("SI_NO", "SI_NO", "SELECT 'S' UNION ALL SELECT 'N'");
+        createSetup("PVM", "ORDINI_V_SLIM2K", "EXPORT_ORDINI", "N",
+"Esporta gli ordini già esportati", false, "SI_NO", false, false,
+false, false, false, null, false, "SELECT 'S' UNION ALL SELECT 'N'");
+    }
+
+    @Override
+    public void down() throws Exception {
+
+    }
+
+}

ems-engine/src/main/java/it/integry/ems/order/service/OrdiniVSlim2kService.java

@@ -10,11 +10,13 @@ import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
 import it.integry.ems_model.base.EntityBase;
 import it.integry.ems_model.entity.DtbOrdr;
 import it.integry.ems_model.entity.DtbOrdt;
+import it.integry.ems_model.service.SetupGest;
 import it.integry.ems_model.types.OperationType;
 import it.integry.ems_model.utility.Query;
 import it.integry.ems_model.utility.UtilityBigDecimal;
 import it.integry.ems_model.utility.UtilityDB;
 import it.integry.ems_model.utility.UtilityHashMap;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -26,6 +28,9 @@ public class OrdiniVSlim2kService {
     private final EntityProcessor entityProcessor;
     private final EmsServices emsServices;
 
+    @Autowired
+    private SetupGest setupGest;
+
     public OrdiniVSlim2kService(EntityProcessor entityProcessor, EmsServices emsServices) {
         this.entityProcessor = entityProcessor;
         this.emsServices = emsServices;
@@ -43,11 +48,11 @@ public class OrdiniVSlim2kService {
         List<HashMap<String, Object>> articoli = new ArrayList<>();
         List<HashMap<String, Object>> export = new ArrayList<>();
 
-        for(DtbOrdt ord : groupOrdini.keySet()) {
+        for (DtbOrdt ord : groupOrdini.keySet()) {
             for (DtbOrdr dtbOrdr : groupOrdini.get(ord)) {
                 String sql =
                         Query.format("SELECT * FROM dtb_ordt WHERE gestione = %s AND data_ord = %s AND num_ord = %s",
-                        ord.getGestione(), ord.getDataOrd(), ord.getNumOrd());
+                                ord.getGestione(), ord.getDataOrd(), ord.getNumOrd());
 
                 ord = UtilityDB.executeSimpleQueryOnlyFirstRowDTO(multiDBTransactionManager.getPrimaryConnection(), sql, DtbOrdt.class);
                 BigDecimal qtaCnf;
@@ -73,48 +78,51 @@ public class OrdiniVSlim2kService {
             }
 
             entityProcessor.processEntity(ord, multiDBTransactionManager, false);
+            boolean exportOrdini = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PVM", "ORDINI_V_SLIM2K", "EXPORT_ORDINI");
 
-            DtbOrdt finalOrd = ord;
+            if (ord.getDataEsportazione() != null && exportOrdini) {
-            Optional<HashMap<String, Object>> exportOpt = export.stream()
+                DtbOrdt finalOrd = ord;
-                    .filter(x -> ((String) x.get("cod_anag")).equalsIgnoreCase(finalOrd.getCodAnag())).findFirst();
+                Optional<HashMap<String, Object>> exportOpt = export.stream()
-            HashMap<String, Object> datiExport;
+                        .filter(x -> ((String) x.get("cod_anag")).equalsIgnoreCase(finalOrd.getCodAnag())).findFirst();
-            if ( exportOpt.isPresent() ) {
+                HashMap<String, Object> datiExport;
-                datiExport = exportOpt.get();
+                if (exportOpt.isPresent()) {
-            } else {
+                    datiExport = exportOpt.get();
-                String query =
+                } else {
-                        Query.format(
+                    String query =
-                                "SELECT wtb_clie.cod_anag, " +
-                                        "wtb_users.user_name, wtb_users.password, wtb_users_info.format_file, COUNT(wtb_users_info.format_file) over (partition by wtb_users_info.user_name) as count_export" +
-                                        " FROM wtb_users " +
-                                        "INNER JOIN wtb_users_info ON wtb_users.User_name = wtb_users_info.user_name " +
-                                        "INNER JOIN wtb_clie ON wtb_users.User_name = wtb_clie.user_name " +
-                                        " WHERE  wtb_users_info.flag_state = 'S' and " +
-                                        " wtb_clie.cod_anag = %s AND \n" +
-                                        " wtb_users_info.export_type = %s",
-                                ord.getCodAnag(), EntityExportType.ORDINI_VENDITA.getText());
-
-                datiExport = UtilityDB.executeSimpleQueryOnlyFirstRow(multiDBTransactionManager.getPrimaryConnection(), query);
-                export.add(datiExport);
-            }
-
-            if (UtilityHashMap.isPresent(datiExport)) {
-                String userNameExport = UtilityHashMap.getValueIfExists(datiExport, "user_name");
-                String passwordExport = UtilityHashMap.getValueIfExists(datiExport, "password");
-                String formatExport = UtilityHashMap.getValueIfExists(datiExport, "format_file");
-                Integer countExport = UtilityHashMap.getValueIfExists(datiExport, "count_export");
-
-                if (countExport == 1) {
-                    RequestDataDTO requestDataDTO = new RequestDataDTO();
-                    requestDataDTO.setUsername(userNameExport);
-                    requestDataDTO.setPassword(passwordExport);
-                    String whereCond =
                             Query.format(
-                                    "dtb_ordt.gestione = %s AND dtb_ordt.data_ord = %s AND dtb_ordt.num_ord = %s",
+                                    "SELECT wtb_clie.cod_anag, " +
-                                    ord.getGestione(), ord.getDataOrd(), ord.getNumOrd());
+                                            "wtb_users.user_name, wtb_users.password, wtb_users_info.format_file, COUNT(wtb_users_info.format_file) over (partition by wtb_users_info.user_name) as count_export" +
+                                            " FROM wtb_users " +
+                                            "INNER JOIN wtb_users_info ON wtb_users.User_name = wtb_users_info.user_name " +
+                                            "INNER JOIN wtb_clie ON wtb_users.User_name = wtb_clie.user_name " +
+                                            " WHERE  wtb_users_info.flag_state = 'S' and " +
+                                            " wtb_clie.cod_anag = %s AND \n" +
+                                            " wtb_users_info.export_type = %s",
+                                    ord.getCodAnag(), EntityExportType.ORDINI_VENDITA.getText());
 
-                    ObjectNode jsonNode = JsonNodeFactory.instance.objectNode();
+                    datiExport = UtilityDB.executeSimpleQueryOnlyFirstRow(multiDBTransactionManager.getPrimaryConnection(), query);
-                    jsonNode.put("whereCond", whereCond);
+                    export.add(datiExport);
-                    emsServices.export(multiDBTransactionManager, requestDataDTO, EntityExportType.ORDINI_VENDITA.getText(), formatExport, jsonNode, true);
+                }
+
+                if (UtilityHashMap.isPresent(datiExport)) {
+                    String userNameExport = UtilityHashMap.getValueIfExists(datiExport, "user_name");
+                    String passwordExport = UtilityHashMap.getValueIfExists(datiExport, "password");
+                    String formatExport = UtilityHashMap.getValueIfExists(datiExport, "format_file");
+                    Integer countExport = UtilityHashMap.getValueIfExists(datiExport, "count_export");
+
+                    if (countExport == 1) {
+                        RequestDataDTO requestDataDTO = new RequestDataDTO();
+                        requestDataDTO.setUsername(userNameExport);
+                        requestDataDTO.setPassword(passwordExport);
+                        String whereCond =
+                                Query.format(
+                                        "dtb_ordt.gestione = %s AND dtb_ordt.data_ord = %s AND dtb_ordt.num_ord = %s",
+                                        ord.getGestione(), ord.getDataOrd(), ord.getNumOrd());
+
+                        ObjectNode jsonNode = JsonNodeFactory.instance.objectNode();
+                        jsonNode.put("whereCond", whereCond);
+                        emsServices.export(multiDBTransactionManager, requestDataDTO, EntityExportType.ORDINI_VENDITA.getText(), formatExport, jsonNode, true);
+                    }
                 }
             }
         }