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

Finish Hotfix-1
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Giuseppe Scorrano
2025-01-09 11:52:46 +01:00
parent a15463cffe 9d4fa00711
commit ff6e9baf82
4 changed files with 15 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ems-core/src/main/java/it/integry/ems_model/utility/UtilityHashMap.java
View File

@@ -3,6 +3,7 @@ package it.integry.ems_model.utility;
import it.integry.ems_model.annotation.SqlField; import it.integry.ems_model.annotation.SqlField;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.validation.constraints.NotNull;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@@ -26,7 +27,7 @@ public class UtilityHashMap {
} }
@Nullable @Nullable
public static <T> T getValueIfExists(@Nullable Map<?, ?> map, String key, T defaultValue) { public static <T> T getValueIfExists(@Nullable Map<?, ?> map, @NotNull String key, @Nullable T defaultValue) {
T value = defaultValue; T value = defaultValue;
if (map != null && map.containsKey(key)) value = (T) map.get(key); if (map != null && map.containsKey(key)) value = (T) map.get(key);
return value; return value;
@@ -50,7 +51,7 @@ public class UtilityHashMap {
SqlField sqlField = field.getAnnotation(SqlField.class); SqlField sqlField = field.getAnnotation(SqlField.class);
// Mappa il valore della HashMap al campo se esiste // Mappa il valore della HashMap al campo se esiste
if((sqlField != null && dataMap.containsKey(sqlField.value())) || dataMap.containsKey(field.getName())) { if ((sqlField != null && dataMap.containsKey(sqlField.value())) || dataMap.containsKey(field.getName())) {
String fieldName = sqlField != null ? sqlField.value() : field.getName(); String fieldName = sqlField != null ? sqlField.value() : field.getName();
Object value = dataMap.get(fieldName); Object value = dataMap.get(fieldName);

4
ems-engine/src/main/java/it/integry/ems/logistic/service/PackagesImportService.java
View File

@@ -454,11 +454,11 @@ public class PackagesImportService {
if (result != null) { if (result != null) {
mtbColtV.setCodAnag(UtilityHashMap.getValueIfExists(result, "cod_anag")) mtbColtV.setCodAnag(UtilityHashMap.getValueIfExists(result, "cod_anag"))
.setDataOrd(UtilityHashMap.getValueIfExists(result, "data_ord")) .setDataOrd(UtilityLocalDate.localDateFromDate(UtilityHashMap.getValueIfExists(result, "data_ord")))
.setNumOrd(UtilityHashMap.getValueIfExists(result, "num_ord")) .setNumOrd(UtilityHashMap.getValueIfExists(result, "num_ord"))
.setCodVdes(UtilityHashMap.getValueIfExists(result, "cod_vdes")) .setCodVdes(UtilityHashMap.getValueIfExists(result, "cod_vdes"))
.setRifOrd(UtilityHashMap.getValueIfExists(result, "rif_ord")); .setRifOrd(UtilityHashMap.getValueIfExists(result, "rif_ord"));
mtbColrV.setDataOrd(UtilityHashMap.getValueIfExists(result, "data_ord")) mtbColrV.setDataOrd(UtilityLocalDate.localDateFromDate(UtilityHashMap.getValueIfExists(result, "data_ord")))
.setNumOrd(UtilityHashMap.getValueIfExists(result, "num_ord")) .setNumOrd(UtilityHashMap.getValueIfExists(result, "num_ord"))
.setRigaOrd(UtilityHashMap.getValueIfExists(result, "riga_ord")); .setRigaOrd(UtilityHashMap.getValueIfExists(result, "riga_ord"));

39
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java
View File

@@ -20,39 +20,30 @@ import it.integry.ems.product.dto.CategorieCostoProdottoDTO;
import it.integry.ems.product.dto.CostoProdottoDTO; import it.integry.ems.product.dto.CostoProdottoDTO;
import it.integry.ems.product.dto.TipoCosto; import it.integry.ems.product.dto.TipoCosto;
import it.integry.ems.production.dto.PvmAuthorizationDTO; import it.integry.ems.production.dto.PvmAuthorizationDTO;
import it.integry.ems.properties.EmsProperties;
import it.integry.ems.report.dto.JasperDTO;
import it.integry.ems.report.dto.PairsDTO;
import it.integry.ems.response.EsitoType; import it.integry.ems.response.EsitoType;
import it.integry.ems.response.FileItem; import it.integry.ems.response.FileItem;
import it.integry.ems.response.ServiceRestResponse; import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems.retail.dto.AnomalieResiDTO; import it.integry.ems.retail.dto.AnomalieResiDTO;
import it.integry.ems.retail.dto.GiacenzaDTO;
import it.integry.ems.retail.dto.OrdChkConsDTO; import it.integry.ems.retail.dto.OrdChkConsDTO;
import it.integry.ems.retail.pvmRetail.dto.*; import it.integry.ems.retail.pvmRetail.dto.*;
import it.integry.ems.retail.pvmRetail.dto.save.*; import it.integry.ems.retail.pvmRetail.dto.save.DocFromPickingDTO;
import it.integry.ems.retail.service.GiacenzaService;
import it.integry.ems.rules.businessLogic.LoadColliService; import it.integry.ems.rules.businessLogic.LoadColliService;
import it.integry.ems.rules.businessLogic.dto.LoadColliDTO;
import it.integry.ems.rules.completing.OrderRules; import it.integry.ems.rules.completing.OrderRules;
import it.integry.ems.service.EmsServices; import it.integry.ems.service.EmsServices;
import it.integry.ems.service.EntityProcessor; import it.integry.ems.service.EntityProcessor;
import it.integry.ems.service.ReportProcessor;
import it.integry.ems.service.exception.EmptyReportException;
import it.integry.ems.settings.Model.AvailableConnectionsModel; import it.integry.ems.settings.Model.AvailableConnectionsModel;
import it.integry.ems.settings.Model.SettingsModel; import it.integry.ems.settings.Model.SettingsModel;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager; import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems.system.service.SystemService; import it.integry.ems.system.service.SystemService;
import it.integry.ems.user.UserSession; import it.integry.ems.user.UserSession;
import it.integry.ems.user.UtilityUser; import it.integry.ems.utility.UtilityDebug;
import it.integry.ems.utility.*; import it.integry.ems.utility.UtilityEntity;
import it.integry.ems_model.base.EntityBase; import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.coollection.Coollection; import it.integry.ems_model.coollection.Coollection;
import it.integry.ems_model.db.ResultSetMapper; import it.integry.ems_model.db.ResultSetMapper;
import it.integry.ems_model.entity.*; import it.integry.ems_model.entity.*;
import it.integry.ems_model.entity._enum.GestioneEnum; import it.integry.ems_model.entity._enum.GestioneEnum;
import it.integry.ems_model.exception.EntityException;
import it.integry.ems_model.resolver.SqlFieldHolder; import it.integry.ems_model.resolver.SqlFieldHolder;
import it.integry.ems_model.service.SetupGest; import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.OperationType; import it.integry.ems_model.types.OperationType;
@@ -63,34 +54,22 @@ import it.integry.firebase.dto.webpush.WebpushConfigDTO;
import it.integry.firebase.dto.webpush.WebpushNotificationDTO; import it.integry.firebase.dto.webpush.WebpushNotificationDTO;
import it.integry.firebase.service.FirebaseService; import it.integry.firebase.service.FirebaseService;
import it.integry.firebase.service.NotificationService; import it.integry.firebase.service.NotificationService;
import it.integry.security.utility.RestUtil;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.w3c.dom.*; import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Response;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.xpath.XPath; import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathFactory;
import java.io.File;
import java.io.FileOutputStream;
import java.io.StringWriter;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.MathContext;
import it.integry.ems.sync.MultiDBTransaction.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.Statement; import java.sql.Statement;
@@ -1678,7 +1657,7 @@ public class PvmService {
row.setNumCnf(UtilityHashMap.getValueIfExists(mapRow, "num_cnf")); row.setNumCnf(UtilityHashMap.getValueIfExists(mapRow, "num_cnf"));
row.setRiga(UtilityHashMap.getValueIfExists(mapRow, "riga")); row.setRiga(UtilityHashMap.getValueIfExists(mapRow, "riga"));
row.setRigaOrd(UtilityHashMap.getValueIfExists(mapRow, "riga_ord")); row.setRigaOrd(UtilityHashMap.getValueIfExists(mapRow, "riga_ord"));
row.setDataOrd(UtilityHashMap.getValueIfExists(mapRow, "data_ord")); row.setDataOrd(UtilityLocalDate.localDateFromDate(UtilityHashMap.getValueIfExists(mapRow, "data_ord")));
row.setNumOrd(UtilityHashMap.getValueIfExists(mapRow, "num_ord")); row.setNumOrd(UtilityHashMap.getValueIfExists(mapRow, "num_ord"));
row.setNumEtich(UtilityHashMap.getValueIfExists(mapRow, "num_etich")); row.setNumEtich(UtilityHashMap.getValueIfExists(mapRow, "num_etich"));
row.setDatetimeRow(UtilityHashMap.getValueIfExists(mapRow, "datetime_row")); row.setDatetimeRow(UtilityHashMap.getValueIfExists(mapRow, "datetime_row"));

2
ems-engine/src/main/java/it/integry/ems/system/controller/SystemController.java
View File

@@ -1779,7 +1779,7 @@ public class SystemController {
final HashMap<String, Object> orderToSet = UtilityDB.executeSimpleQueryOnlyFirstRow(multiDBTransactionManager.getPrimaryConnection(), queryRetrieveOrder); final HashMap<String, Object> orderToSet = UtilityDB.executeSimpleQueryOnlyFirstRow(multiDBTransactionManager.getPrimaryConnection(), queryRetrieveOrder);
mtbColtToFix.setDataOrd(UtilityHashMap.getValueIfExists(orderToSet, "data_ord")); mtbColtToFix.setDataOrd(UtilityLocalDate.localDateFromDate(UtilityHashMap.getValueIfExists(orderToSet, "data_ord")));
mtbColtToFix.setNumOrd(UtilityHashMap.getValueIfExists(orderToSet, "num_ord")); mtbColtToFix.setNumOrd(UtilityHashMap.getValueIfExists(orderToSet, "num_ord"));
} }