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

Fix check localDate

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-12-02 18:52:17 +01:00
parent e5d4e47c67
commit df9096f3fa
5 changed files with 2502 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2485
.idea/inspectionProfiles/Project_Default.xml generated
View File

File diff suppressed because it is too large Load Diff

10
.idea/structuralSearch.xml generated
View File

@@ -6,5 +6,15 @@
<constraint name="formatter" nameOfExprType="java\.text\.SimpleDateFormat" within="" contains="" />
<constraint name="date" nameOfExprType="java\.time\.LocalDate" within="" contains="" />
</searchConfiguration>
<searchConfiguration name="LocalDate equals java.util.Date inspection" text="$d1$.equals($d2$)" recursive="true" caseInsensitive="false" type="JAVA" pattern_context="default">
<constraint name="__context__" within="" contains="" />
<constraint name="d1" nameOfExprType="java\.time\.LocalDate" within="" contains="" />
<constraint name="d2" nameOfExprType="java\.util\.Date" within="" contains="" />
</searchConfiguration>
<searchConfiguration name="java.util.Date equals LocalDate inspection" text="$d1$.equals($d2$)" recursive="true" caseInsensitive="false" type="JAVA" pattern_context="default">
<constraint name="__context__" within="" contains="" />
<constraint name="d1" nameOfExprType="java\.util\.Date" within="" contains="" />
<constraint name="d2" nameOfExprType="java\.time\.LocalDate" within="" contains="" />
</searchConfiguration>
</component>
</project>

2
ems-core/src/main/java/it/integry/ems/service/production/ProductionOrderDataHandlerService.java
View File

@@ -358,7 +358,7 @@ public class ProductionOrderDataHandlerService {
.forEach(order -> {
final Map<String, List<OrdineInevasoGroupMercDTO>> groups = grpMerc.stream()
.filter(x -> Objects.equals(x.getNumOrd(), order.getNumOrd()) &&
x.getDataOrd().equals(order.getDataOrd()) &&
UtilityLocalDate.localDateFromDate(x.getDataOrd()).isEqual(order.getDataOrd()) &&
x.getGestione().equalsIgnoreCase(order.getGestione()))
.collect(Collectors.groupingBy(OrdineInevasoGroupMercDTO::getCodMgrp));

7
ems-engine/src/main/java/it/integry/ems/retail/ReportVariazioni/service/VariazioniPvService.java
View File

@@ -219,7 +219,8 @@ public class VariazioniPvService {
getVariazioneGriglia = true;
grigliaAcquisto = grigliaAcquistoHandlerService.getGrigliaAcquisto();
grigliaAcquisto = Stream.of(grigliaAcquisto)
.filter(x -> x.getDataValidita().equals(variazioniPvInputDTO.getDataValidita()) &&
.filter(x ->
UtilityLocalDate.localDateFromDate(x.getDataValidita()).isEqual(variazioniPvInputDTO.getDataValidita()) &&
x.getCodMdep().equalsIgnoreCase(codMdep))
.toList();
}
@@ -1173,7 +1174,7 @@ public class VariazioniPvService {
List<GrigliaAcquistoDTO> grigliaArticolo = Stream.of(grigliaAcquisto)
.filter(x -> x.getCodMart().equalsIgnoreCase(codMart) &&
x.getCodMdep().equalsIgnoreCase(codMdep) &&
x.getDataValidita().equals(dataValidita))
UtilityLocalDate.localDateFromDate(x.getDataValidita()).isEqual(dataValidita))
.toList();
if (grigliaArticolo.isEmpty()) {
@@ -1189,7 +1190,7 @@ public class VariazioniPvService {
grigliaArticolo = Stream.of(grigliaAcquisto)
.filter(x -> x.getCodMart().equalsIgnoreCase(kit) &&
x.getCodMdep().equalsIgnoreCase(codMdep) &&
x.getDataValidita().equals(dataValidita))
UtilityLocalDate.localDateFromDate(x.getDataValidita()).isEqual(dataValidita))
.toList();
if (!grigliaArticolo.isEmpty()) {

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

@@ -2065,7 +2065,9 @@ public class PvmService {
}
private AnomalieResiDTO setAnomalia(List<AnomalieResiDTO> anomalieResiDTO, String codMart, LocalDate dataScad, String errorMessage) {
Optional<AnomalieResiDTO> first = Stream.of(anomalieResiDTO).filter(x -> x.getCodMart().equalsIgnoreCase(codMart) && x.getDataScad().equals(dataScad)).findFirst();
Optional<AnomalieResiDTO> first = Stream.of(anomalieResiDTO).filter(x ->
x.getCodMart().equalsIgnoreCase(codMart) &&
UtilityLocalDate.localDateFromDate(x.getDataScad()).isEqual(dataScad)).findFirst();
AnomalieResiDTO resiDTO = new AnomalieResiDTO();
if (first.isEmpty()) {