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

Merge branch 'master' into feature/RefactoringGestioneColli
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source 
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
This commit is contained in:
Valerio Castellana
2025-10-09 10:54:14 +02:00
parent 03e6db20b5 65009a6693
commit 884c051b18
4 changed files with 97 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,26 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20251006125427 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
createSetup("w_mriassegna_costo_dlg", "SETUP", "CALCOLO_COSTO_DA_DISTINTA", "A+B+C+D",
"Formula calcolo costo da distinta base: A = Costo Materiali B = Costo manodopera C = Costo manodopera magazzino D = Costo servizi", false, null, false, false,
false, false, false, null, false, null);
executeStatement("delete from stb_gest_setup where gest_name = 'w_mriassegna_costo_dlg' and key_section = 'FLAG_COSTO_DISTINTA_NO_MDO'");
executeStatement("delete from stb_gest_setup where gest_name = 'w_mriassegna_costo_dlg' and key_section = 'FLAG_COSTO_DISTINTA_NO_SERVIZI'");
}
@Override
public void down() throws Exception {
}
}

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

@@ -0,0 +1,41 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.IntegryCustomerDB;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20251006151622 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
if (!isCustomerDb(IntegryCustomerDB.Maggio_MaggioSrl))
return;
updateSetupValue("w_mriassegna_costo_dlg", "SETUP", "CALCOLO_COSTO_DA_DISTINTA", "A",
"Formula calcolo costo da distinta base: A = Costo Materiali B = Costo manodopera C = Costo manodopera magazzino D = Costo servizi", false, null, false, false, false,
false, false, null, false, null);
executeStatement("DELETE\n" +
"FROM stb_gest_setup_depo\n" +
"WHERE gest_name = 'w_mriassegna_costo_dlg'\n" +
" AND section = 'SETUP'\n" +
" AND key_section = 'CALCOLO_COSTO_DA_DISTINTA'"
);
executeStatement("DELETE\n" +
"FROM wtb_gest_setup_user\n" +
"WHERE gest_name = 'w_mriassegna_costo_dlg'\n" +
" AND section = 'SETUP'\n" +
" AND key_section = 'CALCOLO_COSTO_DA_DISTINTA'"
);
}
@Override
public void down() throws Exception {
}
}

44
ems-core/src/main/java/it/integry/ems_model/entity/TtbLine.java
View File

@@ -117,10 +117,10 @@ public class TtbLine extends EntityBase {
private String flagAttivaCambioMerce;
@SqlField(value = "num_max_art_reso", defaultObjectValue = "0")
private int numMaxArtReso;
private Integer numMaxArtReso;
@SqlField(value = "num_max_art_reso_buco", defaultObjectValue = "0")
private int numMaxArtResoBuco;
private Integer numMaxArtResoBuco;
@SqlField(value = "linee_cambio_merce")
private String lineeCambioMerce;
@@ -135,7 +135,7 @@ public class TtbLine extends EntityBase {
private BigDecimal moltiplicatorePrezzoBase;
@SqlField(value = "num_min_art_col", defaultObjectValue = "0", nullable = false)
private short numMinArtCol;
private Short numMinArtCol;
@EntityChild
private List<TtbLinePeriod> ttbLinePeriod = new ArrayList<>();
@@ -398,22 +398,6 @@ public class TtbLine extends EntityBase {
this.flagAttivaCambioMerce = flagAttivaCambioMerce;
}
public int getNumMaxArtReso() {
return numMaxArtReso;
}
public void setNumMaxArtReso(int numMaxArtReso) {
this.numMaxArtReso = numMaxArtReso;
}
public int getNumMaxArtResoBuco() {
return numMaxArtResoBuco;
}
public void setNumMaxArtResoBuco(int numMaxArtResoBuco) {
this.numMaxArtResoBuco = numMaxArtResoBuco;
}
public String getLineeCambioMerce() {
return lineeCambioMerce;
}
@@ -455,11 +439,29 @@ public class TtbLine extends EntityBase {
this.moltiplicatorePrezzoBase = moltiplicatorePrezzoBase;
}
public short getNumMinArtCol() {
public Integer getNumMaxArtReso() {
return numMaxArtReso;
}
public TtbLine setNumMaxArtReso(Integer numMaxArtReso) {
this.numMaxArtReso = numMaxArtReso;
return this;
}
public Integer getNumMaxArtResoBuco() {
return numMaxArtResoBuco;
}
public TtbLine setNumMaxArtResoBuco(Integer numMaxArtResoBuco) {
this.numMaxArtResoBuco = numMaxArtResoBuco;
return this;
}
public Short getNumMinArtCol() {
return numMinArtCol;
}
public TtbLine setNumMinArtCol(short numMinArtCol) {
public TtbLine setNumMinArtCol(Short numMinArtCol) {
this.numMinArtCol = numMinArtCol;
return this;
}

10
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmAccettazioneService.java
View File

@@ -232,10 +232,14 @@ public class PvmAccettazioneService {
"WHERE dtb_ordt.cod_mdep = %S\n" +
" AND dtb_ordt.cod_anag = %s\n" +
" AND dtb_ordt.flag_evaso_forzato = 'N'\n" +
" AND dtb_ordr.data_cons BETWEEN DATEADD(WEEK, -1, %s) AND %s",
" AND EXISTS (select * \n" +
" FROM wdtb_docr \n" +
" WHERE wdtb_docr.data_ord = dtb_ordr.data_ord AND \n" +
" wdtb_docr.num_ord = dtb_ordr.num_ord AND \n" +
" wdtb_docr.data_doc = %s AND \n" +
" wdtb_docr.cod_anag = %s) ",
codMdep, accettazioneDTO.getDocumento().getCodAnag(),
accettazioneDTO.getDocumento().getDataDoc(),
accettazioneDTO.getDocumento().getDataDoc());
accettazioneDTO.getDocumento().getDataDoc(), accettazioneDTO.getDocumento().getCodAnag());
List<DtbOrdt> ordini = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, DtbOrdt.class);