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

Merge branch 'develop' into feature/Feature-ORDL

Browse Source
This commit is contained in:
Mina Ruggiero
2024-08-12 13:13:12 +02:00
parent a698651c24 54033ca781
commit d80f1d1fb8
10 changed files with 167 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.idea/runConfigurations/Tomcat__1__GestSRV_.xml generated Normal file
View File

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat #1 (GestSRV)" type="Remote" folderName="Carelli">
<module name="ems-engine" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="172.16.30.238" />
<option name="PORT" value="8001" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="8001" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>

16
.idea/runConfigurations/Tomcat__2__GestSRV_.xml generated Normal file
View File

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat #2 (GestSRV)" type="Remote" folderName="Carelli">
<module name="ems-engine" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="172.16.30.238" />
<option name="PORT" value="8002" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="8002" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>

16
.idea/runConfigurations/Tomcat__AnydeskTunnel_.xml generated Normal file
View File

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tomcat (AnydeskTunnel)" type="Remote">
<module name="ems-engine" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="servertomcat" />
<option name="PORT" value="8000" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="8000" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>

16
.idea/runConfigurations/Tosca_Cloud.xml generated Normal file
View File

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tosca Cloud" type="Remote" folderName="Tosca">
<module name="ems-engine" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="4.232.161.31" />
<option name="PORT" value="8001" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="8001" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>

16
.idea/runConfigurations/Tosca_Verona.xml generated Normal file
View File

@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Tosca Verona" type="Remote" folderName="Tosca">
<module name="ems-engine" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="10.19.178.6" />
<option name="PORT" value="8001" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="8001" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>

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

@@ -0,0 +1,25 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.IntegryCustomer;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20240801182906 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
String value = "N";
if (isCustomer(IntegryCustomer.Materica)){
value = "S";
}
createSetup("PVM","CATALOGO","REVIEW_CLIENTE",value,"Se impostato nella modifica di un preventivo mostra il form di compilazione cliente anche se già impostato","SI_NO");
}
@Override
public void down() throws Exception {
}
}

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

@@ -0,0 +1,23 @@
package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20240809155154 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
deleteSetup("w_tmprodfin_rc", "SETUP", "FLAG_CHK_ORD_PROD");
createSetup("w_tmprodfin_rc", "SETUP", "FLAG_CHK_ORD_PROD", "N", "Se impostato a S quando viene disattivato un prodotto finito controlla se ci sono ordini di lavorazione associato all'ordine di acquisto (Ordine produzione) ed in tal caso imposta flaG_annulla = 'S' e flag_evaso_prod = 'E'", false, null, false, false, false, false, false, null, false, null);
}
@Override
public void down() throws Exception {
}
}

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

@@ -0,0 +1,23 @@
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_20240812105709 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {
if (isHistoryDB())
return;
if (isCustomerDb(IntegryCustomerDB.Carelli_Format))
updateSetupValue("PVM","DOC_INTERNI", "FILTRO_ARTICOLI", "[{\"codDtip\":\"DDTTR\",\"codMdep\":\"07\", \"whereCond\":\"mtb_aart.cod_mart in (select cod_mart from jtb_dist_mate where cod_mart is not null)\"}]");
}
@Override
public void down() throws Exception {
}
}

11
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/dto/FiltroArtDTO.java
View File

@@ -1,7 +1,7 @@
package it.integry.ems.retail.pvmRetail.dto;
public class FiltroArtDTO {
String codDtip, whereCond;
private String codDtip, whereCond, codMdep;
public String getCodDtip() {
return codDtip;
@@ -20,4 +20,13 @@ public class FiltroArtDTO {
this.whereCond = whereCond;
return this;
}
public String getCodMdep() {
return codMdep;
}
public FiltroArtDTO setCodMdep(String codMdep) {
this.codMdep = codMdep;
return this;
}
}

12
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java
View File

@@ -677,7 +677,7 @@ public class PvmService {
} else if (gestione == GestioneEnum.LAVORAZIONE) {
chkTipoDocUser(requestDataDTO.getUsername(), codDtip);
whereCondArticoli = getFiltroArticoli(multiDBTransactionManager.getPrimaryConnection(), codDtip, valoreFiltroArt);
whereCondArticoli = getFiltroArticoli(multiDBTransactionManager.getPrimaryConnection(), codDtip, codMdep, valoreFiltroArt);
}
}
@@ -761,11 +761,10 @@ public class PvmService {
return grigliaAcquistiDTO;
}
private String getFiltroArticoli(Connection conn, final String codDtip, String valoreFiltro) throws Exception {
private String getFiltroArticoli(Connection conn, final String codDtip, String codMdep, String valoreFiltro) throws Exception {
String whereCondArticoli = null;
String filtroArticoli = null;
List<FiltroArtDTO> filtroDTO = new ArrayList<FiltroArtDTO>();
filtroArticoli = setupGest.getSetup(conn, "PVM", "DOC_INTERNI", "FILTRO_ARTICOLI");
List<FiltroArtDTO> filtroDTO;
String filtroArticoli = setupGest.getSetup(conn, "PVM", "DOC_INTERNI", "FILTRO_ARTICOLI");
String campoFiltro = setupGest.getSetup(conn, "PVM", "DOC_INTERNI", "CAMPO_FILTRO_ARTICOLI");
if (!UtilityString.isNullOrEmpty(filtroArticoli)) {
ObjectMapper objectMapper = new ObjectMapper();
@@ -773,7 +772,8 @@ public class PvmService {
};
filtroDTO = objectMapper.readValue(filtroArticoli, mapType);
final Optional<FiltroArtDTO> filtro = Stream.of(filtroDTO)
.filter(filtroArtDTO -> filtroArtDTO.getCodDtip().equalsIgnoreCase(codDtip))
.filter(filtroArtDTO -> filtroArtDTO.getCodDtip().equalsIgnoreCase(codDtip) &&
filtroArtDTO.getCodMdep() == null || filtroArtDTO.getCodMdep().equalsIgnoreCase(codMdep))
.findFirst();
if (filtro.isPresent()) {
whereCondArticoli = filtro.get().getWhereCond();