From fc2eee29a6ecb6da79db5ba979e062f0af005abe Mon Sep 17 00:00:00 2001 From: LisaS Date: Tue, 21 Oct 2025 17:37:47 +0200 Subject: [PATCH 1/3] Corretto controllo su codice pagamento --- .../java/it/integry/ems/rules/completing/DocumentRules.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ems-core/src/main/java/it/integry/ems/rules/completing/DocumentRules.java b/ems-core/src/main/java/it/integry/ems/rules/completing/DocumentRules.java index e8aa0a0a90..34c97d7122 100644 --- a/ems-core/src/main/java/it/integry/ems/rules/completing/DocumentRules.java +++ b/ems-core/src/main/java/it/integry/ems/rules/completing/DocumentRules.java @@ -43,7 +43,7 @@ public class DocumentRules extends QueryRules { public static String getCodPagaDocV(DtbDoct dtbDoct) { if (!UtilityString.isNullOrEmpty(dtbDoct.getDtbTipi().getCodPaga())) { return dtbDoct.getDtbTipi().getCodPaga(); - } else if (UtilityString.isNullOrEmpty(dtbDoct.getVtbClie().getCodPaga())) { + } else if (!UtilityString.isNullOrEmpty(dtbDoct.getVtbClie().getCodPaga())) { return dtbDoct.getVtbClie().getCodPaga(); } return null; From 7a6ddde702a1e7b1163d6523323e708ada636e0b Mon Sep 17 00:00:00 2001 From: AnthonyS Date: Wed, 22 Oct 2025 11:14:59 +0200 Subject: [PATCH 2/3] Rimosso json property errato su cod divi in VtbListData --- .../src/main/java/it/integry/ems_model/entity/VtbListData.java | 1 - 1 file changed, 1 deletion(-) diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/VtbListData.java b/ems-core/src/main/java/it/integry/ems_model/entity/VtbListData.java index 0fa3953f62..ea88a5ca45 100644 --- a/ems-core/src/main/java/it/integry/ems_model/entity/VtbListData.java +++ b/ems-core/src/main/java/it/integry/ems_model/entity/VtbListData.java @@ -92,7 +92,6 @@ public class VtbListData extends EntityBase { @JsonProperty private String descrizione; - @JsonProperty("cod_divi") private String codDivi; private Boolean datiLogistici; From dabf6a0a54ed76f354c6d6e7453eaa94c4f093fc Mon Sep 17 00:00:00 2001 From: AnthonyS Date: Wed, 22 Oct 2025 17:29:22 +0200 Subject: [PATCH 3/3] Creata setup per disabilitare controllo su tutti i range di un colore in ordikids --- .../model/Migration_20251022124614.java | 24 +++++++++++++++++++ .../integry/ems/ordikids/dto/UtenteDTO.java | 10 ++++++++ .../ems/ordikids/service/OrdikidsService.java | 1 + 3 files changed, 35 insertions(+) create mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251022124614.java diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251022124614.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251022124614.java new file mode 100644 index 0000000000..f51f8738c7 --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251022124614.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_20251022124614 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("ORDIKIDS", "SETUP", "RANGE_TAGLIE_SOLO_CON_QTA", "S", + "Indica se considerare tutti i range taglia in aggiunta di un articolo", false, "SI_NO", false, false, + false, false, false, null, false, "SELECT 'S' UNION ALL SELECT 'N'"); + } + + @Override + public void down() throws Exception { + + } + +} diff --git a/ems-engine/src/main/java/it/integry/ems/ordikids/dto/UtenteDTO.java b/ems-engine/src/main/java/it/integry/ems/ordikids/dto/UtenteDTO.java index acdd02cbdb..f760646e6c 100644 --- a/ems-engine/src/main/java/it/integry/ems/ordikids/dto/UtenteDTO.java +++ b/ems-engine/src/main/java/it/integry/ems/ordikids/dto/UtenteDTO.java @@ -43,6 +43,7 @@ public class UtenteDTO implements Serializable { private String recTelObbligatorio; @SqlField private String nomeNegozioRequired; + private Boolean rangeTaglieSoloConQta; public UtenteDTO(String user_name, String full_name, String user_code, String cod_vlis_newclie, String cod_anag_newclie, BigDecimal sc1, BigDecimal sc2, String cod_paga) { @@ -196,4 +197,13 @@ public class UtenteDTO implements Serializable { public void setNomeNegozioRequired(String nomeNegozioRequired) { this.nomeNegozioRequired = nomeNegozioRequired; } + + public Boolean getRangeTaglieSoloConQta() { + return rangeTaglieSoloConQta; + } + + public UtenteDTO setRangeTaglieSoloConQta(Boolean rangeTaglieSoloConQta) { + this.rangeTaglieSoloConQta = rangeTaglieSoloConQta; + return this; + } } \ No newline at end of file diff --git a/ems-engine/src/main/java/it/integry/ems/ordikids/service/OrdikidsService.java b/ems-engine/src/main/java/it/integry/ems/ordikids/service/OrdikidsService.java index 9d15be91af..522404dd98 100644 --- a/ems-engine/src/main/java/it/integry/ems/ordikids/service/OrdikidsService.java +++ b/ems-engine/src/main/java/it/integry/ems/ordikids/service/OrdikidsService.java @@ -122,6 +122,7 @@ public class OrdikidsService { utente.setMoltipl_barcodemode(UtilityHashMap.getValueIfExists(setupSection, "MOLTIP_BARCODEMODE", "S")); utente.setVend_asso_obbligatorio(UtilityHashMap.getValueIfExists(setupSection, "VEND_ASSO_OBBLIGATORIO")); utente.setRecTelObbligatorio(UtilityHashMap.getValueIfExists(setupSection, "REC_TEL_OBBLIGATORIO")); + utente.setRangeTaglieSoloConQta(((String) UtilityHashMap.getValueIfExists(setupSection, "RANGE_TAGLIE_SOLO_CON_QTA")).equalsIgnoreCase("S")); sql = "SELECT gtb_paga.cod_paga,\n" + " gtb_paga.descrizione,\n" +