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

Finish FixCQExplodeDist
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Anthony Santoro
2025-11-06 15:30:51 +01:00
parent 7112cf15da cf261ab427
commit a5f22e68d2
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
ems-core/src/main/java/it/integry/ems_model/business_logic/ProductionBusinessLogic.java
View File

@@ -864,35 +864,37 @@ public class ProductionBusinessLogic {
List<JtbCiclCq> jtbCiclCqList = UtilityDB.executeSimpleQueryDTO(conn, sql, JtbCiclCq.class); List<JtbCiclCq> jtbCiclCqList = UtilityDB.executeSimpleQueryDTO(conn, sql, JtbCiclCq.class);
for (JtbCiclCq cq : jtbCiclCqList) { if (!UtilityList.isNullOrEmpty(jtbCiclCqList)) {
int numFase = cq.getNumFase(); for (JtbCiclCq cq : jtbCiclCqList) {
String controllo = cq.getControllo(); int numFase = cq.getNumFase();
String valoreRif = cq.getValoreRif(); String controllo = cq.getControllo();
int numRip = cq.getNumRip(); String valoreRif = cq.getValoreRif();
String tipologia = cq.getTipologia(); int numRip = cq.getNumRip();
datiDist.setIdRigaContrCQ(datiDist.getIdRigaContrCQ() + 1); String tipologia = cq.getTipologia();
datiDist.setIdRigaContrCQ(datiDist.getIdRigaContrCQ() + 1);
// Inserimento controllo di qualità nell'ordine di lavorazione // Inserimento controllo di qualità nell'ordine di lavorazione
DtbOrdCq ordCQ = new DtbOrdCq(); DtbOrdCq ordCQ = new DtbOrdCq();
ordCQ.setOperation(OperationType.INSERT); ordCQ.setOperation(OperationType.INSERT);
ordCQ.setIdRiga(datiDist.getIdRigaContrCQ()); ordCQ.setIdRiga(datiDist.getIdRigaContrCQ());
ordCQ.setControllo(controllo); ordCQ.setControllo(controllo);
ordCQ.setValoreRif(valoreRif); ordCQ.setValoreRif(valoreRif);
ordCQ.setNumRip(numRip); ordCQ.setNumRip(numRip);
ordCQ.setNumFase(numFase);
ordCQ.setTipologia(tipologia);
ordCQ.setTipoValore(cq.getTipoValore());
ordCQ.setIdValori(cq.getIdValori());
if (isRoot) {
ordCQ.setNumFase(numFase + datiDist.getNumFase());
} else {
ordCQ.setNumFase(numFase); ordCQ.setNumFase(numFase);
ordCQ.setTipologia(tipologia);
ordCQ.setTipoValore(cq.getTipoValore());
ordCQ.setIdValori(cq.getIdValori());
if (isRoot) {
ordCQ.setNumFase(numFase + datiDist.getNumFase());
} else {
ordCQ.setNumFase(numFase);
}
if (numFase == 0) {
ordCQ.setNumFase(numFase);
}
ordT.getDtbOrdCq().add(ordCQ);
//((DtbOrdr) dtbOrdr).getOrdLav().getDtbOrdCq().add(ordCQ);
} }
if (numFase == 0) {
ordCQ.setNumFase(numFase);
}
ordT.getDtbOrdCq().add(ordCQ);
//((DtbOrdr) dtbOrdr).getOrdLav().getDtbOrdCq().add(ordCQ);
} }
// ------------------------------------------------- // -------------------------------------------------
@@ -1846,11 +1848,11 @@ public class ProductionBusinessLogic {
Stream.of(dtbOrdtTrasf.getDtbOrdr()).forEach( Stream.of(dtbOrdtTrasf.getDtbOrdr()).forEach(
x -> { x -> {
DtbOrdr row = null; DtbOrdr row = null;
BigDecimal qtaEvasa= BigDecimal.ZERO; BigDecimal qtaEvasa = BigDecimal.ZERO;
FlagEvaso flagEvaso = FlagEvaso.INEVASO; FlagEvaso flagEvaso = FlagEvaso.INEVASO;
if (!UtilityList.isNullOrEmpty(rowsDataToMantain)) { if (!UtilityList.isNullOrEmpty(rowsDataToMantain)) {
row = rowsDataToMantain.stream().filter(c -> Objects.equals(c.getRigaOrd(), x.getRigaOrd())).findFirst().orElse(null); row = rowsDataToMantain.stream().filter(c -> Objects.equals(c.getRigaOrd(), x.getRigaOrd())).findFirst().orElse(null);
if (row != null){ if (row != null) {
qtaEvasa = row.getQtaEvasa(); qtaEvasa = row.getQtaEvasa();
flagEvaso = row.getFlagEvaso(); flagEvaso = row.getFlagEvaso();
} }