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

Finish Hotfix-56

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-04-04 10:58:55 +02:00
parent 57bcedf022 f81cf7e3e1
commit eee2e9f893
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ems-engine/src/main/java/it/integry/ems/activity/service/SteUPService.java
View File

@@ -479,8 +479,7 @@ public class SteUPService {
StbActivity activityIsp = new StbActivity();
if (parentActivityId == null) { // ISPEZIONE NON CREATA
SimpleDateFormat sdfDmy = new SimpleDateFormat(CommonConstants.DATE_FORMAT_DMY);
String activityDescription = "ISPEZIONE PV " + codMdep + " DEL " + sdfDmy.format(now);
String activityDescription = "ISPEZIONE PV " + codMdep + " DEL " + CommonConstants.DATE_DMY_SLASHED_FORMATTER.format(now);
String activityTypeIdIspezione = this.getActivityTypeIdIspezione();
if (activityTypeIdIspezione == null) {

4
ems-engine/src/main/java/it/integry/ems/retail/wms/generic/controller/WMSGenericController.java
View File

@@ -306,10 +306,10 @@ public class WMSGenericController {
@RequestParam String serCollo,
@RequestParam String gestioneOrdine) throws Exception {
Date dateCollo = null;
LocalDate dateCollo = null;
if (!UtilityString.isNullOrEmpty(dataCollo)) {
dateCollo = UtilityDate.RecognizeDate(dataCollo);
dateCollo = UtilityString.parseLocalDate(dataCollo);
} else {
throw new Exception("Il campo dataCollo non è corretto");
}

8
ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
View File

@@ -458,7 +458,7 @@ public class WMSGenericService {
}
public List<DtbOrdt> getOrdiniInCommCollo(Date dataCollo, String gestioneCollo, String serCollo, int numCollo, String gestioneOrdine) throws Exception {
public List<DtbOrdt> getOrdiniInCommCollo(LocalDate dataCollo, String gestioneCollo, String serCollo, int numCollo, String gestioneOrdine) throws Exception {
List<DtbOrdt> listOrdini;
String sql = "SELECT * " +
@@ -467,7 +467,7 @@ public class WMSGenericService {
" FROM mtb_colr " +
" WHERE " +
" num_collo = " + UtilityDB.valueToString(numCollo) + " AND " +
" data_collo = " + UtilityDB.valueDateToString(dataCollo, CommonConstants.DATE_FORMAT_YMD) + " AND " +
" data_collo = " + UtilityDB.valueToString(dataCollo) + " AND " +
" gestione = " + UtilityDB.valueToString(gestioneCollo) + " AND " +
" ser_collo = " + UtilityDB.valueToString(serCollo) + ") com_colli " +
"WHERE " +
@@ -2229,11 +2229,11 @@ public class WMSGenericService {
default:
throw new Exception("Impossibile riconoscere il tipo di report da utilizzare");
}
SimpleDateFormat dateFormatFile = new SimpleDateFormat(CommonConstants.DATE_FORMAT_YMD);
List<PairsDTO> pairList = new ArrayList<>();
pairList.add(new PairsDTO("gestione", mtbColtToPrint.getGestione()));
pairList.add(new PairsDTO("data_collo", dateFormatFile.format(mtbColtToPrint.getDataCollo())));
pairList.add(new PairsDTO("data_collo", CommonConstants.DATE_YMD_DASHED_FORMATTER.format(mtbColtToPrint.getDataCollo())));
pairList.add(new PairsDTO("ser_collo", mtbColtToPrint.getSerCollo()));
pairList.add(new PairsDTO("num_collo", mtbColtToPrint.getNumCollo()));