Merge remote-tracking branch 'origin/develop' into develop

ems-core/src/main/java/it/integry/ems_model/entity/ArlFogm.java

@@ -24,13 +24,13 @@ public class ArlFogm extends EntityBase {
         super(logger);
     }
 
-    @SqlField(value = "cod_anag", maxLength = 5, nullable = true)
+    @SqlField(value = "cod_anag", maxLength = 5, nullable = false)
     private String codAnag;
 
-    @SqlField(value = "cod_mgrp", maxLength = 5, nullable = true)
+    @SqlField(value = "cod_mgrp", maxLength = 5, nullable = false)
     private String codMgrp;
 
-    @SqlField(value = "cod_msgr", maxLength = 5, nullable = true)
+    @SqlField(value = "cod_msgr", maxLength = 5, nullable = false)
     private String codMsgr;
 
     public String getCodAnag() {

ems-core/src/main/java/it/integry/ems_model/entity/AtbForn.java

@@ -116,6 +116,7 @@ public class AtbForn extends EntityBase implements EquatableEntityInterface<AtbF
 
     @EntityChild
     private List<VtbDest> vtbDest = new ArrayList<>();
+    @EntityChild
     private List<ArlFogm> arlFogm = new ArrayList<>();
 
     public AtbForn() {

ems-engine/src/main/java/it/integry/ems/production/dto/CreaOrdineProdDTO.java

@@ -21,6 +21,7 @@ public class CreaOrdineProdDTO {
     private String untOrd;
     private List<ModificheDistintaDTO> modificheDistinta = new ArrayList<>();
     private String descrizionePartita;
+    private String codJfas;
 
     public LocalDate getDataOrd() {
         return dataOrd;
@@ -156,4 +157,13 @@ public class CreaOrdineProdDTO {
         this.codVzon = codVzon;
         return this;
     }
+
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public CreaOrdineProdDTO setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+        return this;
+    }
 }

ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java

@@ -1351,6 +1351,7 @@ public class MesProductionServiceV2 {
                     .setCodMdep(ordine.getCodMdep())
                     .setNumCnf(oldRow.getNumCnf())
                     .setQtaOrd(ordine.getQtaProd())
+                    .setCodJfas(ordine.getCodJfas())
                     .setColliPedana(oldRow.getColliPedana());
             ordine = productionService.saveOrdineProd(newOrdDTO);
             ordine.setOperation(OperationType.SELECT_OBJECT);

ems-engine/src/main/java/it/integry/ems/production/service/ProductionService.java

@@ -999,6 +999,7 @@ public class ProductionService {
                 .setQtaOrd(creaOrdineProdDTO.getQtaOrd())
                 .setColliPedana(creaOrdineProdDTO.getColliPedana())
                 .setUntOrd(creaOrdineProdDTO.getUntOrd())
+                .setCodJfas(creaOrdineProdDTO.getCodJfas())
                 .setOperation(creaOrdineProdDTO.getNumOrd() != null ? OperationType.UPDATE : OperationType.INSERT_OR_UPDATE);