diff --git a/ems-core/src/main/java/it/integry/ems_model/business_logic/GeneraOrdLav.java b/ems-core/src/main/java/it/integry/ems_model/business_logic/GeneraOrdLav.java index b068897465..d77463d576 100644 --- a/ems-core/src/main/java/it/integry/ems_model/business_logic/GeneraOrdLav.java +++ b/ems-core/src/main/java/it/integry/ems_model/business_logic/GeneraOrdLav.java @@ -943,7 +943,9 @@ public class GeneraOrdLav { .setUntMis(untMisProd) .setCodJfasRow(codJfasDist) .setRapConv(rapConvDist) - .setDataCons(ordR.getDataCons()) + .setDataCons(dataConsDist) + /*.setDataCons(ordR.getDataCons())*/ + ); } } @@ -1204,7 +1206,7 @@ public class GeneraOrdLav { //qtaLav = qtaProd.divide(rapConv, EmsRestConstants.cifreDecMax, RoundingMode.HALF_UP); } - // Inserimento riga step nell'ordine di lavorazione + // Inserimento riga getdat nell'ordine di lavorazione DtbOrdSteps ordStep = new DtbOrdSteps() .setCodProdPri(explodeDistDTO.getCodProd()) diff --git a/ems-core/src/main/java/it/integry/ems_model/business_logic/ProductionBusinessLogic.java b/ems-core/src/main/java/it/integry/ems_model/business_logic/ProductionBusinessLogic.java index 2096dbded3..088610cf81 100644 --- a/ems-core/src/main/java/it/integry/ems_model/business_logic/ProductionBusinessLogic.java +++ b/ems-core/src/main/java/it/integry/ems_model/business_logic/ProductionBusinessLogic.java @@ -1,7 +1,9 @@ package it.integry.ems_model.business_logic; import com.annimon.stream.Stream; +import com.fasterxml.jackson.databind.ObjectMapper; import it.integry.common.var.CommonConstants; +import it.integry.ems.json.ResponseJSONObjectMapper; import it.integry.ems.rules.completing.ConfigActivityRules; import it.integry.ems.rules.completing.DocOrdRules; import it.integry.ems.rules.completing.OrderRules; @@ -25,6 +27,8 @@ import it.integry.ems_model.utility.UtilityHashMap; import it.integry.ems_model.utility.UtilityString; import org.json.JSONArray; +import java.io.File; +import java.io.StringWriter; import java.math.BigDecimal; import java.math.RoundingMode; import java.sql.*; @@ -1068,8 +1072,13 @@ public class ProductionBusinessLogic { } boolean newProcedure = setup.getSetupBoolean(conn, "DTB_ORDT", "SETUP", "NUOVA_PROCEDURA"); + if (newProcedure) { GeneraOrdLav.generateOrdLav(conn, dtbOrdt); + + StringWriter writer = new StringWriter(); + ResponseJSONObjectMapper jsonObjectMapper = new ResponseJSONObjectMapper(); + jsonObjectMapper.writeValue(writer, dtbOrdt); return; } diff --git a/ems-engine/src/main/java/it/integry/ems/document/farm_mes/service/FarmMesImportService.java b/ems-engine/src/main/java/it/integry/ems/document/farm_mes/service/FarmMesImportService.java index faed207b85..beb41e8205 100644 --- a/ems-engine/src/main/java/it/integry/ems/document/farm_mes/service/FarmMesImportService.java +++ b/ems-engine/src/main/java/it/integry/ems/document/farm_mes/service/FarmMesImportService.java @@ -2771,14 +2771,6 @@ public class FarmMesImportService { // ----------------------------------- // EVASIONE FORZATA DELL'ORDINE // ----------------------------------- - sql = - " UPDATE dtb_ordt " + - " SET flag_evaso_prod = 'E', " + - " flag_evaso_forzato = 'S' " + - " WHERE dtb_ordt.data_ord = " + UtilityDB.valueDateToString(dataOrd, CommonConstants.DATE_FORMAT_YMD) + " AND " + - " dtb_ordt.num_ord = " + UtilityDB.valueToString(numOrd) + " AND " + - " dtb_ordt.gestione = " + UtilityDB.valueToString(gestione); - ordT = new DtbOrdt(); ordT.setOperation(OperationType.INSERT_OR_UPDATE); ordT.setGestione(gestione); @@ -3840,7 +3832,6 @@ public class FarmMesImportService { // Assegnazione codice fase lavorazione sugli step if (transaction.getApriProduzione() != null && arrayEntity.get(a) instanceof DtbOrdt) { - String gestoneRif = ((DtbOrdt) arrayEntity.get(a)).getGestione(); Date dataOrdRif = ((DtbOrdt) arrayEntity.get(a)).getDataOrd(); Integer numOrdRif = ((DtbOrdt) arrayEntity.get(a)).getNumOrd();