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

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

Browse Source
This commit is contained in:
Mina Ruggiero
2024-11-25 09:56:23 +01:00
parent ff234a5c68 4a063f6bd8
commit 497afaca55
3 changed files with 113 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ems-engine/src/main/java/it/integry/ems/retail/controller/GiacenzaController.java
View File

@@ -53,6 +53,6 @@ public class GiacenzaController {
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestParam String codMdep) throws Exception {
return ServiceRestResponse.createPositiveResponse(giacenzaService.retrieveGiacenza(codMdep));
return ServiceRestResponse.createPositiveResponse(giacenzaService.retrieveGiacenza(codMdep, true));
}
}

2
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmServiceSave.java
View File

@@ -552,7 +552,7 @@ public class PvmServiceSave {
List<GiacenzaDTO> giacenzaPv = new ArrayList<>();
if (saveGiacenza) {
giacenzaPv = giacenzaService.retrieveGiacenza(codMdep);
giacenzaPv = giacenzaService.retrieveGiacenza(codMdep, false);
}
MtbColt collo = new MtbColt();

5
ems-engine/src/main/java/it/integry/ems/retail/service/GiacenzaService.java
View File

@@ -513,7 +513,7 @@ public class GiacenzaService {
}
}
public List<GiacenzaDTO> retrieveGiacenza(String codMdep) throws Exception {
public List<GiacenzaDTO> retrieveGiacenza(String codMdep, boolean readOrdini) throws Exception {
String sql = Query.format(
"SELECT cod_mdep FROM stb_gest_setup_depo WHERE gest_name = %s AND section = %s AND key_section = %S AND value = %S",
@@ -677,6 +677,8 @@ public class GiacenzaService {
String listiniAcquisto = setupGest.getSetup("DATI_AZIENDA", "GIACENZA_DA_INV", "LISTINI_ACQUISTO");
List<String> listini = Arrays.asList(listiniAcquisto.split("\\|"));
if (readOrdini ) {
sql = "WITH incoming_stock_documenti AS (\n" +
"/*\n" +
"Estrazione dei documenti (bolle web) di merce consegnata\n" +
@@ -789,6 +791,7 @@ public class GiacenzaService {
});
});
}
}
return listGiacenza;
}