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

This commit is contained in:
2025-06-23 13:00:31 +02:00
2 changed files with 12 additions and 0 deletions

View File

@@ -460,6 +460,7 @@ public class AgribookOrderService {
" opened_orders.cod_mart,\n" + " opened_orders.cod_mart,\n" +
" varieta,\n" + " varieta,\n" +
" opened_orders.partita_mag,\n" + " opened_orders.partita_mag,\n" +
" CONCAT(mtb_partita_mag.partita_mag, ' ', mtb_partita_mag.descrizione, ' ', mtb_partita_mag.note) AS lotto,\n" +
" unt_ord,\n" + " unt_ord,\n" +
" data_cons_min,\n" + " data_cons_min,\n" +
" data_cons_max,\n" + " data_cons_max,\n" +

View File

@@ -46,6 +46,8 @@ public class AgribookOrderDTO extends ComposedEntityBase {
private String varieta; private String varieta;
@SqlField("partita_mag") @SqlField("partita_mag")
private String partitaMag; private String partitaMag;
@SqlField("lotto")
private String lotto;
@SqlField("unt_ord") @SqlField("unt_ord")
private String untOrd; private String untOrd;
@SqlField("data_cons_min") @SqlField("data_cons_min")
@@ -212,6 +214,15 @@ public class AgribookOrderDTO extends ComposedEntityBase {
return this; return this;
} }
public String getLotto() {
return lotto;
}
public AgribookOrderDTO setLotto(String lotto) {
this.lotto = lotto;
return this;
}
public String getUntOrd() { public String getUntOrd() {
return untOrd; return untOrd;
} }