diff --git a/IntegryManagementSystem.ipr b/IntegryManagementSystem.ipr
index 08d2d2b32d..5651d07c5b 100644
--- a/IntegryManagementSystem.ipr
+++ b/IntegryManagementSystem.ipr
@@ -477,61 +477,61 @@
Spring @Cacheable and @CacheEvict
-
-
-
-
-
-
-
-
+ psiMethod().withName("condition").withParameters().definedInClass("org.springframework.cache.annotation.CacheEvict")
+ psiMethod().withName("condition").withParameters().definedInClass("org.springframework.cache.annotation.CachePut")
+ psiMethod().withName("condition").withParameters().definedInClass("org.springframework.cache.annotation.Cacheable")
+ psiMethod().withName("key").withParameters().definedInClass("org.springframework.cache.annotation.CacheEvict")
+ psiMethod().withName("key").withParameters().definedInClass("org.springframework.cache.annotation.CachePut")
+ psiMethod().withName("key").withParameters().definedInClass("org.springframework.cache.annotation.Cacheable")
+ psiMethod().withName("unless").withParameters().definedInClass("org.springframework.cache.annotation.CachePut")
+ psiMethod().withName("unless").withParameters().definedInClass("org.springframework.cache.annotation.Cacheable")
Spring HttpHeaders (org.springframework.http)
-
-
-
+ psiParameter().ofMethod(0, psiMethod().withName("header").definedInClass("org.springframework.http.ResponseEntity.HeadersBuilder"))
+ psiParameter().ofMethod(0, psiMethod().withName("header").definedInClass("org.springframework.web.servlet.function.ServerResponse.HeadersBuilder"))
+ psiParameter().ofMethod(0, psiMethod().withName("set", "add", "addAll", "getFirst", "containsKey", "get", "put", "getFirstDate", "setDate", "setInstant", "setZonedDateTime").definedInClass("org.springframework.http.HttpHeaders"))
Spring Integration/Messaging
-
-
-
+ psiMethod().withName("expression").withParameters().definedInClass("org.springframework.messaging.handler.annotation.Payload")
+ psiMethod().withName("value").withParameters().definedInClass("org.springframework.integration.annotation.Payload")
+ psiMethod().withName("value").withParameters().definedInClass("org.springframework.messaging.handler.annotation.Payload")
Spring JDBC (org.springframework.jdbc.core.PreparedStatementCreatorFactory)
-
-
-
+ psiParameter().ofMethod(0, psiMethod().withName("PreparedStatementCreatorFactory").withParameters("java.lang.String").definedInClass("org.springframework.jdbc.core.PreparedStatementCreatorFactory"))
+ psiParameter().ofMethod(0, psiMethod().withName("PreparedStatementCreatorFactory").withParameters("java.lang.String", "int[]").definedInClass("org.springframework.jdbc.core.PreparedStatementCreatorFactory"))
+ psiParameter().ofMethod(0, psiMethod().withName("PreparedStatementCreatorFactory").withParameters("java.lang.String", "java.util.List").definedInClass("org.springframework.jdbc.core.PreparedStatementCreatorFactory"))
Spring JDBC (org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator)
-
-
-
-
+ psiParameter().ofMethod(0, psiMethod().withName("createCustomException").withParameters("java.lang.String", "java.lang.String", "java.sql.SQLException", "java.lang.Class").definedInClass("org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator"))
+ psiParameter().ofMethod(0, psiMethod().withName("customTranslate").withParameters("java.lang.String", "java.lang.String", "java.sql.SQLException").definedInClass("org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator"))
+ psiParameter().ofMethod(0, psiMethod().withName("doTranslate").withParameters("java.lang.String", "java.lang.String", "java.sql.SQLException").definedInClass("org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator"))
+ psiParameter().ofMethod(0, psiMethod().withName("logTranslation").withParameters("java.lang.String", "java.lang.String", "java.sql.SQLException", "boolean").definedInClass("org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator"))
Spring Security @PostAuthorize/@PostFilter/@PreAuthorize/@PreFilter/@AuthenticationPrincipal
-
-
-
-
-
-
+ psiMethod().withName("expression").withParameters().definedInClass("org.springframework.security.core.annotation.AuthenticationPrincipal")
+ psiMethod().withName("expression").withParameters().definedInClass("org.springframework.security.core.annotation.CurrentSecurityContext")
+ psiMethod().withName("value").withParameters().definedInClass("org.springframework.security.access.prepost.PostAuthorize")
+ psiMethod().withName("value").withParameters().definedInClass("org.springframework.security.access.prepost.PostFilter")
+ psiMethod().withName("value").withParameters().definedInClass("org.springframework.security.access.prepost.PreAuthorize")
+ psiMethod().withName("value").withParameters().definedInClass("org.springframework.security.access.prepost.PreFilter")
Spring State Machine
-
-
-
-
+ psiParameter().ofMethod(0, psiMethod().withName("event").withParameters("java.lang.String").definedInClass("org.springframework.statemachine.config.configurers.SecurityConfigurer"))
+ psiParameter().ofMethod(0, psiMethod().withName("guardExpression").withParameters("java.lang.String").definedInClass("org.springframework.statemachine.config.configurers.TransitionConfigurer"))
+ psiParameter().ofMethod(0, psiMethod().withName("secured").withParameters("java.lang.String").definedInClass("org.springframework.statemachine.config.configurers.TransitionConfigurer"))
+ psiParameter().ofMethod(0, psiMethod().withName("transition").withParameters("java.lang.String").definedInClass("org.springframework.statemachine.config.configurers.SecurityConfigurer"))
@@ -1070,7 +1070,6 @@
-
diff --git a/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/dto/RowInventarioDTO.java b/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/dto/RowInventarioDTO.java
index eb30f5dfc7..b0c3d2be44 100644
--- a/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/dto/RowInventarioDTO.java
+++ b/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/dto/RowInventarioDTO.java
@@ -23,6 +23,9 @@ public class RowInventarioDTO {
@SqlField("rows_count")
private int rowsCount;
+ @SqlField("data_ora_inv")
+ private Date dataOraInv;
+
private String profileDb;
public Integer getIdInventario() {
@@ -78,6 +81,14 @@ public class RowInventarioDTO {
this.rowsCount = rowsCount;
}
+ public Date getDataOraInv() {
+ return dataOraInv;
+ }
+
+ public void setDataOraInv(Date dataOraInv) {
+ this.dataOraInv = dataOraInv;
+ }
+
public String getProfileDb() {
return profileDb;
}
diff --git a/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java b/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java
index cedb60c909..68db938e3b 100644
--- a/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java
+++ b/ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java
@@ -2250,7 +2250,7 @@ public class PvmService {
MtbColt mtbColt = getColloByExternalBarcode(codBarreCollo);
- if(mtbColt == null) {
+ if (mtbColt == null) {
HashMap datiCollo = new HashMap<>();
if (codBarreCollo.startsWith("U")) {
@@ -3559,25 +3559,27 @@ public class PvmService {
}
String sql = "WITH TempResult AS (SELECT *, ROW_NUMBER() OVER (ORDER BY data_inventario DESC, id_inventario DESC) AS num_row\n" +
- " FROM (SELECT id_inventario,\n" +
- " data_inventario,\n" +
- " filtro,\n" +
- " cod_mdep,\n" +
- " (SELECT COUNT(*)\n" +
- " FROM mtb_invenr\n" +
- " WHERE mtb_invent.id_inventario = mtb_invenr.id_inventario\n" +
- " AND mtb_invent.cod_mdep = mtb_invenr.cod_mdep) AS num_righe\n" +
- " FROM mtb_invent\n" +
- " WHERE " + whereCond + "\n" +
- " AND data_inventario >= DATEADD(MONTH, -2, GETDATE())) t),\n" +
- " TempCount AS (SELECT COUNT(*) AS rows_count\n" +
- " FROM TempResult)\n" +
- "SELECT TempResult.*,\n" +
- " TempCount.*\n" +
- "FROM TempResult,\n" +
- " TempCount\n" +
- "ORDER BY 2 DESC, 1 DESC\n" +
- "OFFSET (" + UtilityDB.valueToString(pageNum) + " - 1) * " + UtilityDB.valueToString(pageSize) + " ROWS FETCH NEXT " + UtilityDB.valueToString(pageSize) + " ROWS ONLY";
+ " FROM (SELECT id_inventario,\n" +
+ " data_inventario,\n" +
+ " filtro,\n" +
+ " cod_mdep,\n" +
+ " righe.num_righe,\n" +
+ " righe.data_ora_inv" +
+ " FROM mtb_invent\n" +
+ " OUTER APPLY (SELECT COUNT(*) AS num_righe, MIN(CAST(mtb_invenr.data_ora_inv AS DATE)) AS data_ora_inv\n" +
+ " FROM mtb_invenr\n" +
+ " WHERE mtb_invent.id_inventario = mtb_invenr.id_inventario\n" +
+ " AND mtb_invent.cod_mdep = mtb_invenr.cod_mdep) AS righe" +
+ " WHERE " + whereCond + "\n" +
+ " AND data_inventario >= DATEADD(MONTH, -2, GETDATE())) t),\n" +
+ " TempCount AS (SELECT COUNT(*) AS rows_count\n" +
+ " FROM TempResult)\n" +
+ "SELECT TempResult.*,\n" +
+ " TempCount.*\n" +
+ "FROM TempResult,\n" +
+ " TempCount\n" +
+ "ORDER BY 2 DESC, 1 DESC\n" +
+ "OFFSET (" + UtilityDB.valueToString(pageNum) + " - 1) * " + UtilityDB.valueToString(pageSize) + " ROWS FETCH NEXT " + UtilityDB.valueToString(pageSize) + " ROWS ONLY";
List inventari = new ArrayList<>();