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

Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Fabio Narracci
2024-11-29 18:41:08 +01:00
parent d4c3a96a5c 457e0c3d8b
commit 5d4963594a
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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