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

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

Browse Source
This commit is contained in:
jenkins
2025-07-15 10:16:22 +02:00
parent c890cc7c93 a508a816b1
commit 941a688ad4
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ems-engine/src/main/java/it/integry/ems/production/agribook/AgribookOrderService.java
View File

@@ -673,6 +673,10 @@ public class AgribookOrderService {
} }
} }
Optional<GtbAnag> foundGtbAnag = Stream.of(gtbAnagList)
.filter(x -> x.getCodAnag().equals(agribookOrderDTO.getCodAnag()))
.findFirst();
//VtbDest //VtbDest
if (agribookOrderDTO.getCodVdes() != null) { if (agribookOrderDTO.getCodVdes() != null) {
Optional<VtbDest> foundVtbDest = Stream.of(vtbDestList) Optional<VtbDest> foundVtbDest = Stream.of(vtbDestList)
@@ -694,10 +698,6 @@ public class AgribookOrderService {
} }
} }
} else { } else {
Optional<GtbAnag> foundGtbAnag = Stream.of(gtbAnagList)
.filter(x -> x.getCodAnag().equals(agribookOrderDTO.getCodAnag()))
.findFirst();
if (foundGtbAnag.isPresent()) { if (foundGtbAnag.isPresent()) {
if (agribookOrderDTO.getDestinatario() == null) if (agribookOrderDTO.getDestinatario() == null)
agribookOrderDTO.setDestinatario(AgribookDestinatarioDTO.fromGtbAnag(foundGtbAnag.get())); agribookOrderDTO.setDestinatario(AgribookDestinatarioDTO.fromGtbAnag(foundGtbAnag.get()));
@@ -713,6 +713,8 @@ public class AgribookOrderService {
} }
} }
agribookOrderDTO.setFornitore(AgribookDestinatarioDTO.fromGtbAnag(foundGtbAnag.get()));
final short initialWeekDayShort = Short.parseShort(setupGest.getSetup("PVM", "DELIVERY_PLAN", "GIORNO_INIZIO_SETTIMANA")); final short initialWeekDayShort = Short.parseShort(setupGest.getSetup("PVM", "DELIVERY_PLAN", "GIORNO_INIZIO_SETTIMANA"));
if (allReports != null) { if (allReports != null) {

15
ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookDestinatarioDTO.java
View File

@@ -17,6 +17,7 @@ public class AgribookDestinatarioDTO {
private BigDecimal latitude; private BigDecimal latitude;
private BigDecimal longitude; private BigDecimal longitude;
private String numeroTelefono; private String numeroTelefono;
private String codVzon;
// private List<AgribookFieldDTO> availableFields; // private List<AgribookFieldDTO> availableFields;
public static AgribookDestinatarioDTO fromVtbDest(VtbDest vtbDest) { public static AgribookDestinatarioDTO fromVtbDest(VtbDest vtbDest) {
@@ -29,7 +30,8 @@ public class AgribookDestinatarioDTO {
// .setLatitude(vtbDest.getLat()) // .setLatitude(vtbDest.getLat())
// .setLongitude(vtbDest.getLng()) // .setLongitude(vtbDest.getLng())
.setSocieta(false) .setSocieta(false)
.setNumeroTelefono(vtbDest.getTel()); .setNumeroTelefono(vtbDest.getTel())
.setCodVzon(vtbDest.getCodVzon());
} }
public static AgribookDestinatarioDTO fromGtbAnag(GtbAnag gtbAnag) { public static AgribookDestinatarioDTO fromGtbAnag(GtbAnag gtbAnag) {
@@ -136,7 +138,16 @@ public class AgribookDestinatarioDTO {
return this; return this;
} }
// public List<AgribookFieldDTO> getAvailableFields() { public String getCodVzon() {
return codVzon;
}
public AgribookDestinatarioDTO setCodVzon(String codVzon) {
this.codVzon = codVzon;
return this;
}
// public List<AgribookFieldDTO> getAvailableFields() {
// return availableFields; // return availableFields;
// } // }
// //

11
ems-engine/src/main/java/it/integry/ems/production/agribook/model/AgribookOrderDTO.java
View File

@@ -83,6 +83,8 @@ public class AgribookOrderDTO extends ComposedEntityBase {
private AgribookDestinatarioDTO destinatario; private AgribookDestinatarioDTO destinatario;
private AgribookDestinatarioDTO fornitore;
private MtbDepo mtbDepo; private MtbDepo mtbDepo;
private List<AgribookPrevRaccoltaDTO> previsioniRaccolta; private List<AgribookPrevRaccoltaDTO> previsioniRaccolta;
@@ -369,6 +371,15 @@ public class AgribookOrderDTO extends ComposedEntityBase {
return this; return this;
} }
public AgribookDestinatarioDTO getFornitore() {
return fornitore;
}
public AgribookOrderDTO setFornitore(AgribookDestinatarioDTO fornitore) {
this.fornitore = fornitore;
return this;
}
public MtbDepo getMtbDepo() { public MtbDepo getMtbDepo() {
return mtbDepo; return mtbDepo;
} }