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

Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Marco Elefante
2025-12-10 13:35:53 +01:00
parent 671c2e99d0 6b71d6b784
commit 92cd4b1af5
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -580,16 +580,14 @@ public class GiacenzaService {
}
public List<GiacenzaDTO> retrieveGiacenza(String codMdep, boolean readOrdini, String codMart) 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",
gestName, section, "REPLACE_DEPO", codMdep);
String codMdepNew = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
String whereCond = UtilityDB.valueToString(codMdep);
if (codMdepNew != null) {
if (codMdepNew != null)
whereCond += ", " + UtilityDB.valueToString(codMdepNew);
}
sql = "WITH art AS (SELECT mtb_aart.cod_mart AS cod_mart,\n" +
" IIF(mtb_aart.articolo_composto = 'S'\n" +

5
ems-engine/src/main/java/it/integry/ems/retail/wms/punti_vendita/controller/WMSVerificaGiacenzeController.java
View File

@@ -28,10 +28,11 @@ public class WMSVerificaGiacenzeController {
private SetupGest setupGest;
@GetMapping("retrieve")
public @ResponseBody ServiceRestResponse retrieveGiacenze(@RequestParam String codMdep) throws Exception {
public @ResponseBody ServiceRestResponse retrieveGiacenze(@RequestParam String codMdep,
@RequestParam(required = false) String codMart) throws Exception {
wmsVerificaGiacenzeService.setPrimaryDs(codMdep);
return ServiceRestResponse.createPositiveResponse(giacenzaService.retrieveGiacenza(codMdep, false, null));
return ServiceRestResponse.createPositiveResponse(giacenzaService.retrieveGiacenza(codMdep, false, codMart));
}
@PostMapping(value = "save_new_row")

2
ems-engine/src/main/java/it/integry/ems/retail/wms/punti_vendita/service/WMSVerificaGiacenzeService.java
View File

@@ -45,7 +45,7 @@ public class WMSVerificaGiacenzeService {
String profileDb = UtilityString.isNull(setupGest.getSetupDepo(multiDBTransactionManager.getPrimaryConnection(), "DATI_AZIENDA", "DATI_DEPOSITO", "PROFILE_DB", codMdep),
multiDBTransactionManager.getPrimaryConnection().getProfileName());
if (!multiDBTransactionManager.getPrimaryConnection().getProfileName().equals(profileDb))
if (!multiDBTransactionManager.getPrimaryConnection().getProfileName().equalsIgnoreCase(profileDb))
multiDBTransactionManager.setPrimaryDB(profileDb);
}