Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Mina Ruggiero
2025-10-23 11:34:17 +02:00
parent 6b80520d8d dabf6a0a54
commit 87cb0f8302
5 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251022124614.java Normal file
View File

@@ -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 {
}
}

2
ems-core/src/main/java/it/integry/ems/rules/completing/DocumentRules.java
View File

@@ -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;

1
ems-core/src/main/java/it/integry/ems_model/entity/VtbListData.java
View File

@@ -92,7 +92,6 @@ public class VtbListData extends EntityBase {
@JsonProperty
private String descrizione;
@JsonProperty("cod_divi")
private String codDivi;
private Boolean datiLogistici;

10
ems-engine/src/main/java/it/integry/ems/ordikids/dto/UtenteDTO.java
View File

@@ -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;
}
}

1
ems-engine/src/main/java/it/integry/ems/ordikids/service/OrdikidsService.java
View File

@@ -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" +