diff --git a/.idea/inspectionProfiles/LocalDate_passato_a_SimpleDate.xml b/.idea/inspectionProfiles/LocalDate_Checks.xml similarity index 93% rename from .idea/inspectionProfiles/LocalDate_passato_a_SimpleDate.xml rename to .idea/inspectionProfiles/LocalDate_Checks.xml index ec7d4220f3..6c8b280d78 100644 --- a/.idea/inspectionProfiles/LocalDate_passato_a_SimpleDate.xml +++ b/.idea/inspectionProfiles/LocalDate_Checks.xml @@ -1,9 +1,14 @@ - + + + @@ -902,6 +946,7 @@ + \ No newline at end of file diff --git a/ems-core/src/main/java/it/integry/common/var/CommonConstants.java b/ems-core/src/main/java/it/integry/common/var/CommonConstants.java index e87044af48..e6a0e7d2d4 100644 --- a/ems-core/src/main/java/it/integry/common/var/CommonConstants.java +++ b/ems-core/src/main/java/it/integry/common/var/CommonConstants.java @@ -21,6 +21,7 @@ public class CommonConstants { public static final String TIMESTAMP = "timestamp"; + public static final String DATE_FORMAT_YMD_SLASHED = "yyyy/MM/dd"; public static final String DATE_FORMAT_YMD = "yyyy-MM-dd"; public static final String DATE_FORMAT_DMY = "dd/MM/yyyy"; public static final String DATE_FORMAT_DMY_DASHED = "dd-MM-yyyy"; @@ -28,7 +29,7 @@ public class CommonConstants { public static final String TIME_FORMAT = "HH:mm:ss"; - public static final String DATETIME_FORMAT_YMD = String.format("%s %s", DATE_FORMAT_YMD, TIME_FORMAT); + public static final String DATETIME_FORMAT_YMD = String.format("%s %s", DATE_FORMAT_YMD_SLASHED, TIME_FORMAT); public static final String DATETIME_FORMAT_DMY = String.format("%s %s", DATE_FORMAT_DMY_DASHED, TIME_FORMAT); public static final String DATETIME_FORMAT_DMY_SLASHED = String.format("%s %s", DATE_FORMAT_DMY, TIME_FORMAT); public static final String DATETIME_FORMAT_DMY_DASHED = String.format("%s %s", DATE_FORMAT_DMY_DASHED, TIME_FORMAT); @@ -47,6 +48,10 @@ public class CommonConstants { .withZone(ZoneId.systemDefault()); + public static final DateTimeFormatter DATE_YMD_SLASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATE_FORMAT_YMD_SLASHED) + .withZone(ZoneId.systemDefault()); + public static final DateTimeFormatter DATETIME_YMD_SLASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATETIME_FORMAT_YMD) + .withZone(ZoneId.systemDefault()); public static final DateTimeFormatter DATE_YMD_DASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATE_FORMAT_YMD) .withZone(ZoneId.systemDefault()); public static final DateTimeFormatter DATETIME_YMD_DASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATETIME_FORMAT_YMD) @@ -54,6 +59,8 @@ public class CommonConstants { public static final DateTimeFormatter DATE_DMY_SLASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATE_FORMAT_DMY) .withZone(ZoneId.systemDefault()); + public static final DateTimeFormatter DATE_DMY_DASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATE_FORMAT_DMY_DASHED) + .withZone(ZoneId.systemDefault()); public static final DateTimeFormatter DATETIME_DMY_SLASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATETIME_FORMAT_DMY_SLASHED) .withZone(ZoneId.systemDefault()); public static final DateTimeFormatter DATETIME_DMY_DASHED_FORMATTER = DateTimeFormatter.ofPattern(CommonConstants.DATETIME_FORMAT_DMY_DASHED) diff --git a/ems-core/src/main/java/it/integry/ems/rules/businessLogic/LoadColliService.java b/ems-core/src/main/java/it/integry/ems/rules/businessLogic/LoadColliService.java index 028292e382..965f3db069 100644 --- a/ems-core/src/main/java/it/integry/ems/rules/businessLogic/LoadColliService.java +++ b/ems-core/src/main/java/it/integry/ems/rules/businessLogic/LoadColliService.java @@ -364,7 +364,7 @@ public class LoadColliService { if (mtbColtWithDocAlready != null && !mtbColtWithDocAlready.isEmpty()) { throw new Exception("Il collo n° " + mtbColtWithDocAlready.get(0).getNumCollo() + - " del " + new SimpleDateFormat(CommonConstants.DATE_FORMAT_DMY).format(mtbColtWithDocAlready.get(0).getDataCollo()) + + " del " + CommonConstants.DATE_DMY_SLASHED_FORMATTER.format(mtbColtWithDocAlready.get(0).getDataCollo()) + " già agganciato al documento " + mtbColtWithDocAlready.get(0).getCodDtip() + " del " + new SimpleDateFormat(CommonConstants.DATE_FORMAT_DMY).format(mtbColtWithDocAlready.get(0).getDataDoc()) + " n. " + mtbColtWithDocAlready.get(0).getNumDoc()); diff --git a/ems-engine/src/main/java/it/integry/ems/customizations/production/service/ToscaProductionService.java b/ems-engine/src/main/java/it/integry/ems/customizations/production/service/ToscaProductionService.java index 2163a53551..a7974b2021 100644 --- a/ems-engine/src/main/java/it/integry/ems/customizations/production/service/ToscaProductionService.java +++ b/ems-engine/src/main/java/it/integry/ems/customizations/production/service/ToscaProductionService.java @@ -13,8 +13,6 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.text.SimpleDateFormat; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Date; @@ -157,8 +155,7 @@ public class ToscaProductionService { String serColloPrev = ul.getSerCollo(); Integer numColloPrev = ul.getNumCollo(); - SimpleDateFormat sdf = new SimpleDateFormat("yy"); - String barcodeUl = "U" + sdf.format(ul.getDataCollo()) + String.format("%07d", numColloPrev) + serColloPrev; + String barcodeUl = "U" + String.valueOf(ul.getDataCollo().getYear()).substring(2) + String.format("%07d", numColloPrev) + serColloPrev; ul.setOperation(OperationType.SUBSTITUTE); ul.setOldPk(new HashMap<>()); diff --git a/ems-engine/src/main/java/it/integry/ems/document/fatture/services/DigitalInvoiceBackupService.java b/ems-engine/src/main/java/it/integry/ems/document/fatture/services/DigitalInvoiceBackupService.java index b1153d39b3..185b0b776a 100644 --- a/ems-engine/src/main/java/it/integry/ems/document/fatture/services/DigitalInvoiceBackupService.java +++ b/ems-engine/src/main/java/it/integry/ems/document/fatture/services/DigitalInvoiceBackupService.java @@ -276,7 +276,7 @@ public class DigitalInvoiceBackupService { if (fatturaPassiva != null) { String codAnag = fatturaPassiva.getCodAnag(); String codDtip = fatturaPassiva.getCodDtip(); - String dataDoc = new SimpleDateFormat(CommonConstants.DATE_FORMAT_DMY).format(fatturaPassiva.getDataDoc()); + String dataDoc = CommonConstants.DATE_DMY_SLASHED_FORMATTER.format(fatturaPassiva.getDataDoc()); String numDoc = fatturaPassiva.getNumDoc(); String invoiceDesc = String.format("%s_%s_%s_%s_%s_P", stbFilesAttached.getIdAttach(), codAnag, codDtip, dataDoc, numDoc); FileItem f = new FileItem(fileName, new byte[]{}, invoiceDesc); diff --git a/ems-engine/src/main/java/it/integry/ems/logistic/Import/service/EuritmoImportService.java b/ems-engine/src/main/java/it/integry/ems/logistic/Import/service/EuritmoImportService.java index 7660c8f8fd..4343041186 100644 --- a/ems-engine/src/main/java/it/integry/ems/logistic/Import/service/EuritmoImportService.java +++ b/ems-engine/src/main/java/it/integry/ems/logistic/Import/service/EuritmoImportService.java @@ -532,7 +532,8 @@ public class EuritmoImportService { if (checkForDuplicates) { if (checkColloDuplicato(mDBTransactionManager, colT.getRifOrd())) { - throw new Exception(String.format("Collo L - Data %s - Num. %d già importato. Rif. %s", new SimpleDateFormat(CommonConstants.DATE_FORMAT_DMY).format(colT.getDataCollo()), + throw new Exception(String.format("Collo L - Data %s - Num. %d già importato. Rif. %s", + CommonConstants.DATE_DMY_SLASHED_FORMATTER.format(colT.getDataCollo()), colT.getNumCollo(), colT.getRifOrd())); } } @@ -581,7 +582,7 @@ public class EuritmoImportService { if (checkForDuplicates) { if (checkColloDuplicato(mDBTransactionManager, result.getRifOrd())) { - throw new Exception(String.format("Collo L - Data %s - Num. %d già importato. Rif. %s", new SimpleDateFormat(CommonConstants.DATE_FORMAT_DMY).format(result.getDataCollo()), + throw new Exception(String.format("Collo L - Data %s - Num. %d già importato. Rif. %s", CommonConstants.DATE_DMY_SLASHED_FORMATTER.format(result.getDataCollo()), result.getNumCollo(), result.getRifOrd())); } } diff --git a/ems-engine/src/main/java/it/integry/ems/logistic/controller/LogisticController.java b/ems-engine/src/main/java/it/integry/ems/logistic/controller/LogisticController.java index b7556abb24..28cd377bd9 100644 --- a/ems-engine/src/main/java/it/integry/ems/logistic/controller/LogisticController.java +++ b/ems-engine/src/main/java/it/integry/ems/logistic/controller/LogisticController.java @@ -172,7 +172,7 @@ public class LogisticController { List pairList = new ArrayList(); pairList.add(new PairsDTO("gestione", pack.getGestione())); - pairList.add(new PairsDTO("data_collo", new SimpleDateFormat(CommonConstants.DATETIME_FORMAT_YMD). + pairList.add(new PairsDTO("data_collo", CommonConstants.DATETIME_YMD_SLASHED_FORMATTER. format(pack.getDataCollo()))); pairList.add(new PairsDTO("ser_collo", pack.getSerCollo())); pairList.add(new PairsDTO("num_collo", pack.getNumCollo().toString())); diff --git a/ems-engine/src/main/java/it/integry/ems/logistic/service/LogisticService.java b/ems-engine/src/main/java/it/integry/ems/logistic/service/LogisticService.java index 1f9313ccb6..c920ad35df 100644 --- a/ems-engine/src/main/java/it/integry/ems/logistic/service/LogisticService.java +++ b/ems-engine/src/main/java/it/integry/ems/logistic/service/LogisticService.java @@ -1086,7 +1086,7 @@ public class LogisticService { zplSource = zplSource.replace("%%ORDER_INFO%%", "Ordine # " + ordine); zplSource = zplSource.replace("%%QTA_UNT_MIS%%", rs.getString("qta_cnf") + " " + rs.getString("unt_mis")); - zplSource = zplSource.replace("%%BARCODE%%", "000" + "01" + sdf2.format(dataCollo) + serie + UtilityString.leftPad(numCollo.toString(), 5, '0')); + zplSource = zplSource.replace("%%BARCODE%%", "000" + "01" + UtilityLocalDate.formatDate(dataCollo, "ddMMyy") + serie + UtilityString.leftPad(numCollo.toString(), 5, '0')); printerService.print(printerName, new ByteArrayInputStream(zplSource.getBytes()), "text/plain", 1); } @@ -1301,13 +1301,11 @@ public class LogisticService { } else { List pairList = new ArrayList(); - SimpleDateFormat sdf2 = new SimpleDateFormat("ddMMyy"); pairList.add(new PairsDTO("gestione", mtbColt.getGestione())); - pairList.add(new PairsDTO("dataCollo", - new SimpleDateFormat(CommonConstants.DATE_FORMAT_YMD).format(mtbColt.getDataCollo()))); + pairList.add(new PairsDTO("dataCollo", CommonConstants.DATE_YMD_DASHED_FORMATTER.format(mtbColt.getDataCollo()))); pairList.add(new PairsDTO("serCollo", mtbColt.getSerCollo())); pairList.add(new PairsDTO("numCollo", mtbColt.getNumCollo())); - pairList.add(new PairsDTO("barcode", "000" + "01" + sdf2.format(mtbColt.getDataCollo()) + mtbColt.getSerCollo() + pairList.add(new PairsDTO("barcode", "000" + "01" + UtilityLocalDate.formatDate(mtbColt.getDataCollo(), "ddMMyy") + mtbColt.getSerCollo() + UtilityString.leftPad(mtbColt.getNumCollo().toString(), 5, '0'))); //JasperDTO jasperDTO = reportProcessor.getReportByName("ColliDiMagazzino"); JasperDTO jasperDTO = new JasperDTO() diff --git a/ems-engine/src/main/java/it/integry/ems/logistic/service/SmartLogisticService.java b/ems-engine/src/main/java/it/integry/ems/logistic/service/SmartLogisticService.java index e6fb0a7c00..36292d543a 100644 --- a/ems-engine/src/main/java/it/integry/ems/logistic/service/SmartLogisticService.java +++ b/ems-engine/src/main/java/it/integry/ems/logistic/service/SmartLogisticService.java @@ -35,7 +35,6 @@ import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.text.DecimalFormat; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -485,7 +484,7 @@ public class SmartLogisticService { codVdes = mtbColt.getCodVdes(); ColloDTO colloClie = new ColloDTO(); colloClie.setGestione(mtbColt.getGestione()); - colloClie.setData_collo(new SimpleDateFormat(CommonConstants.DATETIME_FORMAT_YMD).format(mtbColt.getDataCollo())); + colloClie.setData_collo(CommonConstants.DATETIME_YMD_SLASHED_FORMATTER.format(mtbColt.getDataCollo())); colloClie.setSer_collo(mtbColt.getSerCollo()); colloClie.setNum_collo(mtbColt.getNumCollo()); colloClie.setCod_anag(codClie); diff --git a/ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportListiniAcquistoService.java b/ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportListiniAcquistoService.java index c94ada1755..455e72e3c3 100644 --- a/ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportListiniAcquistoService.java +++ b/ems-engine/src/main/java/it/integry/ems/product/importaz/service/ImportListiniAcquistoService.java @@ -21,10 +21,8 @@ import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.List; @@ -126,7 +124,8 @@ public class ImportListiniAcquistoService { return atbListData; } else - anomalie.add(AnomalieDTO.info(String.format("Nessuna variazione sui prezzi del listino %s a data %s", codAlis, new SimpleDateFormat(CommonConstants.DATE_FORMAT_DMY).format(dataVariazione)))); + anomalie.add(AnomalieDTO.info(String.format("Nessuna variazione sui prezzi del listino %s a data %s", codAlis, + CommonConstants.DATE_DMY_SLASHED_FORMATTER.format(dataVariazione)))); return null;