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

valorizzato tipo valore nei controlli di qualità
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Mina Ruggiero
2024-11-11 11:33:21 +01:00
parent 3b9170d091
commit f6be56c7ec
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20241111104643.java Normal file
View File

@@ -0,0 +1,17 @@
package it.integry.ems.migration.model;import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20241111104643 extends BaseMigration implements MigrationModelInterface{
@Override
public void up()throws Exception {
if(isHistoryDB())
return;
}
@Override
public void down()throws Exception{
}
}

7
ems-core/src/main/java/it/integry/ems_model/business_logic/GeneraOrdLav.java
View File

@@ -16,6 +16,7 @@ import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.db.ResultSetMapper;
import it.integry.ems_model.entity.*;
import it.integry.ems_model.entity._enum.FlagEvaso;
import it.integry.ems_model.entity._enum.TipoValore;
import it.integry.ems_model.exception.DataConverterNotFoundException;
import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.OperationType;
@@ -322,7 +323,7 @@ public class GeneraOrdLav {
.setColliPedana(row.getColliPedana())
.setCodTcolUl(row.getCodTcolUl())
.setCodTcolUi(row.getCodTcolUi())
.setFlagEvasoProd(flagEvasoProd.getValue().toString())
.setFlagEvasoProd(flagEvasoProd!=null?flagEvasoProd.getValue().toString():null)
.setGeneraOrdLavDaProd(dtbOrdt.isGeneraOrdLavDaProd());
String flagAnnulla = "N";
@@ -1305,7 +1306,8 @@ public class GeneraOrdLav {
+ " jtb_cicl_cq.controllo, "
+ " jtb_cicl_cq.valore_rif, "
+ " jtb_cicl_cq.num_rip, "
+ " jtb_cicl_cq.tipologia "
+ " jtb_cicl_cq.tipologia, "
+ " jtb_cicl_cq.tipo_valore "
+ "FROM jtb_cicl_cq "
+ "WHERE jtb_cicl_cq.cod_prod = %s "
+ "ORDER BY jtb_cicl_cq.id_riga ",
@@ -1320,6 +1322,7 @@ public class GeneraOrdLav {
.setValoreRif(UtilityHashMap.getValueIfExists(cq, "valore_rif"))
.setNumRip(UtilityHashMap.getValueIfExists(cq, "num_rip"))
.setTipologia(UtilityHashMap.getValueIfExists(cq, "tipologia"))
.setTipoValore(TipoValore.from(UtilityHashMap.getValueIfExists(cq, "tipo_valore")))
.setNumFase(numFase);
ordCQ.setOperation(OperationType.INSERT);
listOrdCQ.add(ordCQ);

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

@@ -15,6 +15,7 @@ import it.integry.ems_model.business_logic.dto.ExplodeDistDTO;
import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.db.ResultSetMapper;
import it.integry.ems_model.entity.*;
import it.integry.ems_model.entity._enum.TipoValore;
import it.integry.ems_model.rules.util.DroolsUtil;
import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.OperationType;
@@ -865,7 +866,8 @@ public class ProductionBusinessLogic {
+ " jtb_cicl_cq.controllo, "
+ " jtb_cicl_cq.valore_rif, "
+ " jtb_cicl_cq.num_rip, "
+ " jtb_cicl_cq.tipologia "
+ " jtb_cicl_cq.tipologia, "
+ " jtb_cicl_cq.tipo_valore "
+ "FROM jtb_cicl_cq "
+ "WHERE jtb_cicl_cq.cod_prod = " + UtilityDB.valueToString(codProd) + " "
+ "ORDER BY jtb_cicl_cq.id_riga ";
@@ -888,6 +890,7 @@ public class ProductionBusinessLogic {
ordCQ.setNumRip(numRip);
ordCQ.setNumFase(numFase);
ordCQ.setTipologia(tipologia);
ordCQ.setTipoValore(TipoValore.from(rs.getShort("tipo_valore")));
if (isRoot) {
ordCQ.setNumFase(numFase + datiDist.getNumFase());
} else {