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

Finish Hotfix-52

Browse Source
This commit is contained in:
Mina Ruggiero
2024-03-06 12:34:18 +01:00
parent 7eecf7591f 7d7d0b508a
commit 388ff5c36e
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/controller/PvmController.java
View File

@@ -405,6 +405,30 @@ public class PvmController {
} }
@RequestMapping(value = "checkDocReso", method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse checkDocReso(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String configuration,
@RequestBody DocFromPickingDTO docFromPickingDTO) throws Exception {
if (!userSession.isAttivo()) {
throw new UsernameNotFoundException("Utente " + requestDataDTO.getUsername() + " non riconoscuto!");
}
try {
List<AnomalieResiDTO> anomalieResiDTOS = pvmService.checkDocReso(docFromPickingDTO);
if (anomalieResiDTOS == null || anomalieResiDTOS.size() == 0)
return ServiceRestResponse.createPositiveResponse();
else {
ServiceRestResponse serviceRestResponse = ServiceRestResponse.createNegativeResponse();
serviceRestResponse.setJsonObject(anomalieResiDTOS);
return serviceRestResponse;
}
} catch (Exception e) {
return ServiceRestResponse.createNegativeResponse(e);
}
}
@RequestMapping(value = EmsRestConstants.PATH_SAVE_PRESENZE, method = RequestMethod.POST) @RequestMapping(value = EmsRestConstants.PATH_SAVE_PRESENZE, method = RequestMethod.POST)
public @ResponseBody public @ResponseBody

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

@@ -2740,7 +2740,7 @@ public class PvmService {
" LEFT OUTER JOIN movi ON colli.cod_mdep = movi.cod_mdep AND\n" + " LEFT OUTER JOIN movi ON colli.cod_mdep = movi.cod_mdep AND\n" +
" colli.cod_anag = movi.cod_anag AND\n" + " colli.cod_anag = movi.cod_anag AND\n" +
" colli.cod_mart = movi.cod_mart AND\n" + " colli.cod_mart = movi.cod_mart AND\n" +
" colli.data_scad = movi.data_scad\n", " movi.data_scad between DateAdd(day, -3, colli.data_scad) AND DateAdd(day, 3, colli.data_scad) \n",
mtbColt.getGestione(), mtbColt.getDataCollo(), mtbColt.getSerCollo(), mtbColt.getNumCollo(), mtbColt.getCodMdep()); mtbColt.getGestione(), mtbColt.getDataCollo(), mtbColt.getSerCollo(), mtbColt.getNumCollo(), mtbColt.getCodMdep());
List<HashMap<String, Object>> partiteErrate = UtilityDB.executeSimpleQuery(multiDBTransactionManager.getPrimaryConnection(), sql); List<HashMap<String, Object>> partiteErrate = UtilityDB.executeSimpleQuery(multiDBTransactionManager.getPrimaryConnection(), sql);