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

Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Anthony Santoro
2024-12-10 17:33:20 +01:00
parent afce979ca6 0ed531b965
commit 925ee134cb
3 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ems-engine/src/main/java/it/integry/ems/production/dto/MRP/MrpDailyMaterialInputDTO.java
View File

@@ -19,6 +19,7 @@ public class MrpDailyMaterialInputDTO {
private String orderBy;
private String whereCond;
private boolean soloArtDis = false;
private boolean soloConDati = false;
public Date getDataCons() {
return dataCons;
@@ -145,4 +146,13 @@ public class MrpDailyMaterialInputDTO {
this.soloArtDis = soloArtDis;
return this;
}
public boolean isSoloConDati() {
return soloConDati;
}
public MrpDailyMaterialInputDTO setSoloConDati(boolean soloConDati) {
this.soloConDati = soloConDati;
return this;
}
}

12
ems-engine/src/main/java/it/integry/ems/production/dto/MRP/MrpDailyMaterialReqDTO.java
View File

@@ -103,6 +103,18 @@ public class MrpDailyMaterialReqDTO {
private List<HashMap<String, Object>> depositi;
private List<MRPDailyPromoAcqDTO> promozioni;
public boolean isEmpty() {
return UtilityBigDecimal.isNullOrZero(this.getGiacenza())
&& UtilityBigDecimal.isNullOrZero(this.getQtaArrivi())
&& UtilityBigDecimal.isNullOrZero(this.getQtaArriviProx())
&& UtilityBigDecimal.isNullOrZero(this.getQtaImpegni())
&& UtilityBigDecimal.isNullOrZero(this.getQtaImpProxOrd())
&& UtilityBigDecimal.isNullOrZero(this.getQtaImpProxContr())
&& UtilityBigDecimal.isNullOrZero(this.getScortaMin())
&& UtilityBigDecimal.isNullOrZero(this.getConsumiMedi())
&& UtilityBigDecimal.isNullOrZero(this.getDisponibilita());
}
public String getCodMgrp() {
return codMgrp;
}

8
ems-engine/src/main/java/it/integry/ems/production/service/MrpDailyMaterialReqService.java
View File

@@ -189,7 +189,7 @@ public class MrpDailyMaterialReqService {
for (Map.Entry<HashMap<String, Object>, List<MrpDailyMaterialReqDetDTO>> gg : listGG) {
MrpDailyMaterialReqDTO.DatiGg mrpGiorno;
java.util.Optional<MrpDailyMaterialReqDTO.DatiGg> data = datiGg.stream().filter(x ->x. getDataMrp().compareTo(UtilityHashMap.getValueIfExists(gg.getKey(), "data"))==0).findFirst();
java.util.Optional<MrpDailyMaterialReqDTO.DatiGg> data = datiGg.stream().filter(x -> x.getDataMrp().compareTo(UtilityHashMap.getValueIfExists(gg.getKey(), "data")) == 0).findFirst();
if (data.isPresent()) {
mrpGiorno = data.get();
datiGg.remove(mrpGiorno);
@@ -255,7 +255,13 @@ public class MrpDailyMaterialReqService {
.setCriticita()
.setSottoScorta(isSottoScorta(depoArt));
}
if (mrpDailyMaterialInputDTO.isSoloConDati()) {
datiArt = datiArt.stream().filter(x -> !x.isEmpty()).collect(java.util.stream.Collectors.toList());
}
logger.debug(MrpDailyMaterialReqService.class.getSimpleName() + " - fine: Timing " + ((new Date().getTime() - startDate.getTime()) / 1000) + " secs");
return datiArt;
}