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

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

Browse Source
This commit is contained in:
Mina Ruggiero
2025-11-21 15:03:10 +01:00
parent da61cb5439 84ccdafd90
commit df18330a01
6 changed files with 256 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ems-core/src/main/java/it/integry/ems_model/entity/MtbAartMarchio.java
View File

@@ -8,6 +8,8 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.kie.api.definition.type.PropertyReactive;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@Master
@@ -31,6 +33,19 @@ public class MtbAartMarchio extends EntityBase implements EquatableEntityInterfa
@SqlField(value = "marchio", maxLength = 255, nullable = false)
private String marchio;
@EntityChild
private List<MtbMarchioLinea> mtbMarchioLinea = new ArrayList<>();
@EntityChild
private List<MtbMarchioSlinea> mtbMarchioSlinea = new ArrayList<>();
@EntityChild
private List<MtbMarchioSslinea> mtbMarchioSslinea;
{
mtbMarchioSslinea = new ArrayList<>();
}
public MtbAartMarchio() {
super(logger);
}
@@ -44,6 +59,16 @@ public class MtbAartMarchio extends EntityBase implements EquatableEntityInterfa
return this;
}
@Override
protected void deleteChilds() throws Exception {
MtbMarchioSslinea mtbMarchioSslinea = new MtbMarchioSslinea();
mtbMarchioSslinea.deleteAllEntities(connection, this);
MtbMarchioSlinea mtbMarchioSlinea = new MtbMarchioSlinea();
mtbMarchioSlinea.deleteAllEntities(connection, this);
MtbMarchioLinea mtbMarchioLinea = new MtbMarchioLinea();
mtbMarchioLinea.deleteAllEntities(connection, this);
}
@Override
public boolean equalsKey(MtbAartMarchio other) {
if (this == other)

97
ems-core/src/main/java/it/integry/ems_model/entity/MtbMarchioLinea.java Normal file
View File

@@ -0,0 +1,97 @@
package it.integry.ems_model.entity;
import com.fasterxml.jackson.annotation.JsonTypeName;
import it.integry.ems_model.annotation.*;
import it.integry.ems_model.base.EntityBase;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.kie.api.definition.type.PropertyReactive;
import java.util.ArrayList;
import java.util.List;
@PropertyReactive()
@Table(value = MtbMarchioLinea.ENTITY)
@JsonTypeName(value = MtbMarchioLinea.ENTITY)
public class MtbMarchioLinea extends EntityBase {
public final static String ENTITY = "mtb_marchio_linea";
private final static Long serialVersionUID = 1L;
private final static Logger logger = LogManager.getLogger();
public MtbMarchioLinea() {
super(logger);
}
@SqlField(value = "id_marchio", nullable = false)
@FK(tableName = MtbAartMarchio.ENTITY, columnName = "id")
private Long idMarchio;
@PK()
@SqlField(value = "cod_linea", maxLength = 6, nullable = false)
private String codLinea;
@SqlField(value = "descrizione", maxLength = 255, nullable = false)
private String descrizione;
@EntityChild()
private List<MtbMarchioSlinea> mtbMarchioSlinea = new ArrayList<>();
@EntityChild()
private List<MtbMarchioSslinea> mtbMarchioSslinea = new ArrayList<>();
public Long getIdMarchio() {
return idMarchio;
}
public MtbMarchioLinea setIdMarchio(Long idMarchio) {
this.idMarchio = idMarchio;
return this;
}
public String getCodLinea() {
return codLinea;
}
public MtbMarchioLinea setCodLinea(String codLinea) {
this.codLinea = codLinea;
return this;
}
public String getDescrizione() {
return descrizione;
}
public MtbMarchioLinea setDescrizione(String descrizione) {
this.descrizione = descrizione;
return this;
}
public List<MtbMarchioSlinea> getMtbMarchioSlinea() {
return mtbMarchioSlinea;
}
public MtbMarchioLinea setMtbMarchioSlinea(List<MtbMarchioSlinea> mtbMarchioSlinea) {
this.mtbMarchioSlinea = mtbMarchioSlinea;
return this;
}
public List<MtbMarchioSslinea> getMtbMarchioSslinea() {
return mtbMarchioSslinea;
}
public MtbMarchioLinea setMtbMarchioSslinea(List<MtbMarchioSslinea> mtbMarchioSslinea) {
this.mtbMarchioSslinea = mtbMarchioSslinea;
return this;
}
protected void deleteChilds() throws Exception {
MtbMarchioSlinea mtbMarchioSlinea = new MtbMarchioSlinea();
mtbMarchioSlinea.deleteAllEntities(connection, this);
MtbMarchioSslinea mtbMarchioSslinea = new MtbMarchioSslinea();
mtbMarchioSslinea.deleteAllEntities(connection, this);
}
}

65
ems-core/src/main/java/it/integry/ems_model/entity/MtbMarchioSlinea.java Normal file
View File

@@ -0,0 +1,65 @@
package it.integry.ems_model.entity;
import com.fasterxml.jackson.annotation.JsonTypeName;
import it.integry.ems_model.annotation.FK;
import it.integry.ems_model.annotation.PK;
import it.integry.ems_model.annotation.SqlField;
import it.integry.ems_model.annotation.Table;
import it.integry.ems_model.base.EntityBase;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.kie.api.definition.type.PropertyReactive;
@PropertyReactive()
@Table(value = MtbMarchioSlinea.ENTITY)
@JsonTypeName(value = MtbMarchioSlinea.ENTITY)
public class MtbMarchioSlinea extends EntityBase {
public final static String ENTITY = "mtb_marchio_slinea";
private final static Long serialVersionUID = 1L;
private final static Logger logger = LogManager.getLogger();
public MtbMarchioSlinea() {
super(logger);
}
@SqlField(value = "cod_linea", maxLength = 6, nullable = false)
@FK(tableName = MtbMarchioLinea.ENTITY, columnName = "cod_linea")
private String codLinea;
@PK()
@SqlField(value = "cod_slinea", maxLength = 6, nullable = false)
private String codSlinea;
@SqlField(value = "descrizione", maxLength = 255, nullable = false)
private String descrizione;
public String getCodLinea() {
return codLinea;
}
public MtbMarchioSlinea setCodLinea(String codLinea) {
this.codLinea = codLinea;
return this;
}
public String getCodSlinea() {
return codSlinea;
}
public MtbMarchioSlinea setCodSlinea(String codSlinea) {
this.codSlinea = codSlinea;
return this;
}
public String getDescrizione() {
return descrizione;
}
public MtbMarchioSlinea setDescrizione(String descrizione) {
this.descrizione = descrizione;
return this;
}
}

65
ems-core/src/main/java/it/integry/ems_model/entity/MtbMarchioSslinea.java Normal file
View File

@@ -0,0 +1,65 @@
package it.integry.ems_model.entity;
import com.fasterxml.jackson.annotation.JsonTypeName;
import it.integry.ems_model.annotation.FK;
import it.integry.ems_model.annotation.PK;
import it.integry.ems_model.annotation.SqlField;
import it.integry.ems_model.annotation.Table;
import it.integry.ems_model.base.EntityBase;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.kie.api.definition.type.PropertyReactive;
@PropertyReactive()
@Table(value = MtbMarchioSslinea.ENTITY)
@JsonTypeName(value = MtbMarchioSslinea.ENTITY)
public class MtbMarchioSslinea extends EntityBase {
public final static String ENTITY = "mtb_marchio_sslinea";
private final static Long serialVersionUID = 1L;
private final static Logger logger = LogManager.getLogger();
public MtbMarchioSslinea() {
super(logger);
}
@SqlField(value = "cod_slinea", maxLength = 6, nullable = false)
@FK(tableName = MtbMarchioSlinea.ENTITY, columnName = "cod_slinea")
private String codSlinea;
@PK()
@SqlField(value = "cod_sslinea", maxLength = 6, nullable = false)
private String codSslinea;
@SqlField(value = "descrizione", maxLength = 255, nullable = false)
private String descrizione;
public String getCodSlinea() {
return codSlinea;
}
public MtbMarchioSslinea setCodSlinea(String codSlinea) {
this.codSlinea = codSlinea;
return this;
}
public String getCodSslinea() {
return codSslinea;
}
public MtbMarchioSslinea setCodSslinea(String codSslinea) {
this.codSslinea = codSslinea;
return this;
}
public String getDescrizione() {
return descrizione;
}
public MtbMarchioSslinea setDescrizione(String descrizione) {
this.descrizione = descrizione;
return this;
}
}

2
ems-core/src/main/resources/rules/documenti.drl
View File

@@ -591,7 +591,7 @@ end
rule "completeFlagSetNumProtDtbTipi"
when
eval(completeRulesEnabled)
$dTip : DtbTipi((gestione == "V" || codCcau != null) && flagSetNumProt)
$dTip : DtbTipi((gestione == "V" || codCcau != null) && (flagSetNumProt == null || flagSetNumProt))
then
modify ( $dTip ) { setFlagSetNumProt(false) }
end

4
ems-engine/src/main/java/it/integry/ems/production/service/ProductionOrdersLifecycleService.java
View File

@@ -364,6 +364,8 @@ public class ProductionOrdersLifecycleService {
entityProcessor.processEntity(dtbOrdtP, multiDBTransactionManager);
boolean reimpostaLotto = setupGest.getSetupDepoBoolean("PVM", "MONITORAGGIO_LINEE_V2", "REIMPOSTA_LOTTO_ORDINE_RIPIANIFICATO", dtbOrdtP.getCodMdep());
boolean flagEditedCodJfas = !ripianificaOrdineLavRequestDTO.getCodJfasOld().equalsIgnoreCase(ripianificaOrdineLavRequestDTO.getCodJfasNew());
boolean flagEditedDataOrd = !UtilityLocalDate.isSameDay(ripianificaOrdineLavRequestDTO.getDataOrd(), ripianificaOrdineLavRequestDTO.getDataPianificazione());
if (dtbOrdtP.getNumOrd() == null) {
@@ -422,7 +424,7 @@ public class ProductionOrdersLifecycleService {
dtbOrdl.setOperation(OperationType.UPDATE);
}
if (!reimpostaLotto) {
if (reimpostaLotto && (flagEditedCodJfas || flagEditedDataOrd)) {
dtbOrdl.setPartitaMag(EmsRestConstants.NULL);
}