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

Modifiche varie

Browse Source
This commit is contained in:
Fabio Narracci
2024-09-10 08:59:29 +02:00
parent 2e70316bc6
commit 27e60d558f
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -943,7 +943,9 @@ public class GeneraOrdLav {
.setUntMis(untMisProd) .setUntMis(untMisProd)
.setCodJfasRow(codJfasDist) .setCodJfasRow(codJfasDist)
.setRapConv(rapConvDist) .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); //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 = DtbOrdSteps ordStep =
new DtbOrdSteps() new DtbOrdSteps()
.setCodProdPri(explodeDistDTO.getCodProd()) .setCodProdPri(explodeDistDTO.getCodProd())

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

@@ -1,7 +1,9 @@
package it.integry.ems_model.business_logic; package it.integry.ems_model.business_logic;
import com.annimon.stream.Stream; import com.annimon.stream.Stream;
import com.fasterxml.jackson.databind.ObjectMapper;
import it.integry.common.var.CommonConstants; 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.ConfigActivityRules;
import it.integry.ems.rules.completing.DocOrdRules; import it.integry.ems.rules.completing.DocOrdRules;
import it.integry.ems.rules.completing.OrderRules; 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 it.integry.ems_model.utility.UtilityString;
import org.json.JSONArray; import org.json.JSONArray;
import java.io.File;
import java.io.StringWriter;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.sql.*; import java.sql.*;
@@ -1068,8 +1072,13 @@ public class ProductionBusinessLogic {
} }
boolean newProcedure = setup.getSetupBoolean(conn, "DTB_ORDT", "SETUP", "NUOVA_PROCEDURA"); boolean newProcedure = setup.getSetupBoolean(conn, "DTB_ORDT", "SETUP", "NUOVA_PROCEDURA");
if (newProcedure) { if (newProcedure) {
GeneraOrdLav.generateOrdLav(conn, dtbOrdt); GeneraOrdLav.generateOrdLav(conn, dtbOrdt);
StringWriter writer = new StringWriter();
ResponseJSONObjectMapper jsonObjectMapper = new ResponseJSONObjectMapper();
jsonObjectMapper.writeValue(writer, dtbOrdt);
return; return;
} }

9
ems-engine/src/main/java/it/integry/ems/document/farm_mes/service/FarmMesImportService.java
View File

@@ -2771,14 +2771,6 @@ public class FarmMesImportService {
// ----------------------------------- // -----------------------------------
// EVASIONE FORZATA DELL'ORDINE // 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 = new DtbOrdt();
ordT.setOperation(OperationType.INSERT_OR_UPDATE); ordT.setOperation(OperationType.INSERT_OR_UPDATE);
ordT.setGestione(gestione); ordT.setGestione(gestione);
@@ -3840,7 +3832,6 @@ public class FarmMesImportService {
// Assegnazione codice fase lavorazione sugli step // Assegnazione codice fase lavorazione sugli step
if (transaction.getApriProduzione() != null && arrayEntity.get(a) instanceof DtbOrdt) { if (transaction.getApriProduzione() != null && arrayEntity.get(a) instanceof DtbOrdt) {
String gestoneRif = ((DtbOrdt) arrayEntity.get(a)).getGestione();
Date dataOrdRif = ((DtbOrdt) arrayEntity.get(a)).getDataOrd(); Date dataOrdRif = ((DtbOrdt) arrayEntity.get(a)).getDataOrd();
Integer numOrdRif = ((DtbOrdt) arrayEntity.get(a)).getNumOrd(); Integer numOrdRif = ((DtbOrdt) arrayEntity.get(a)).getNumOrd();