From b369212a26d2b1e815cca0615dd0a4e340685b0f Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 4 Dec 2024 12:54:18 +0100
Subject: [PATCH] =?UTF-8?q?Rimosso=20auto=20completamento=20del=20codice?=
 =?UTF-8?q?=20commessa=20sui=20colli=20quando=20non=20=C3=A8=20un=20A+=20o?=
 =?UTF-8?q?=20L+?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ems/rules/completing/PackagesRules.java       | 15 ++++++---------
 .../java/it/integry/ems_model/entity/MtbColr.java | 12 ++++++++++++
 ems-core/src/main/resources/rules/logistic.drl    |  2 +-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ems-core/src/main/java/it/integry/ems/rules/completing/PackagesRules.java b/ems-core/src/main/java/it/integry/ems/rules/completing/PackagesRules.java
index b00e63bd46..ce67040607 100644
--- a/ems-core/src/main/java/it/integry/ems/rules/completing/PackagesRules.java
+++ b/ems-core/src/main/java/it/integry/ems/rules/completing/PackagesRules.java
@@ -3,6 +3,7 @@ package it.integry.ems.rules.completing;
 import com.annimon.stream.Stream;
 import it.integry.common.var.CommonConstants;
 import it.integry.ems.rules.completing.dto.DatiPartitaMagDTO;
+import it.integry.ems.sync.MultiDBTransaction.Connection;
 import it.integry.ems_model.config.EmsRestConstants;
 import it.integry.ems_model.entity.MtbColr;
 import it.integry.ems_model.entity.MtbCols;
@@ -14,9 +15,6 @@ import it.integry.ems_model.utility.*;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.CallableStatement;
-
-import it.integry.ems.sync.MultiDBTransaction.Connection;
-
 import java.sql.SQLException;
 import java.sql.Types;
 import java.time.LocalDate;
@@ -236,19 +234,18 @@ public class PackagesRules extends QueryRules {
         return flagInsPartitaMag;
     }
 
-    public static String completeCodJcom(Connection conn, MtbColr entity) throws SQLException {
+    public static String completeCodJcom(Connection conn, MtbColr mtbColr) throws SQLException {
         String sql =
                 "SELECT cod_jcom " +
                         "  FROM dtb_ordr " +
-                        " WHERE gestione = " + UtilityDB.valueToString(entity.getGestione()) + " AND " +
-                        "data_ord = " + UtilityDB.valueDateToString(entity.getDataOrd(), CommonConstants.DATE_FORMAT_YMD) + " AND " +
-                        "num_ord = " + UtilityDB.valueToString(entity.getNumOrd()) + " AND " +
-                        "riga_ord = " + UtilityDB.valueToString(entity.getRigaOrd());
+                        " WHERE gestione = " + UtilityDB.valueToString(mtbColr.getGestione()) + " AND " +
+                        "data_ord = " + UtilityDB.valueDateToString(mtbColr.getDataOrd(), CommonConstants.DATE_FORMAT_YMD) + " AND " +
+                        "num_ord = " + UtilityDB.valueToString(mtbColr.getNumOrd()) + " AND " +
+                        "riga_ord = " + UtilityDB.valueToString(mtbColr.getRigaOrd());
 
         String codJcom = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(conn, sql);
 
         return codJcom;
-
     }
 
     public static BigDecimal completeNumCnf(Connection connection, MtbColr mtbColr) throws Exception {
diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/MtbColr.java b/ems-core/src/main/java/it/integry/ems_model/entity/MtbColr.java
index fbffc5dcd5..c6381178c6 100644
--- a/ems-core/src/main/java/it/integry/ems_model/entity/MtbColr.java
+++ b/ems-core/src/main/java/it/integry/ems_model/entity/MtbColr.java
@@ -157,6 +157,9 @@ public class MtbColr extends EntityBase implements EquatableEntityInterface<MtbC
     @EntityChild
     MtbColrInfoProd mtbColrInfoProd;
 
+    @ImportFromParent
+    private Integer segno;
+
     @ImportFromParent
     private String insPartitaMag;
 
@@ -578,6 +581,15 @@ public class MtbColr extends EntityBase implements EquatableEntityInterface<MtbC
         return this;
     }
 
+    public Integer getSegno() {
+        return segno;
+    }
+
+    public MtbColr setSegno(Integer segno) {
+        this.segno = segno;
+        return this;
+    }
+
     public boolean hasDocument() {
         MtbColt parent = (MtbColt) getParent();
         return !(UtilityString.isNullOrEmpty(parent.getCodDtip()) && UtilityString.isNullOrEmpty(parent.getSerDoc()) && parent.getNumDoc() == null && parent.getDataDoc() == null);
diff --git a/ems-core/src/main/resources/rules/logistic.drl b/ems-core/src/main/resources/rules/logistic.drl
index 2aefd7bc8e..182ce53251 100644
--- a/ems-core/src/main/resources/rules/logistic.drl
+++ b/ems-core/src/main/resources/rules/logistic.drl
@@ -325,7 +325,7 @@ rule "completeCodJcomColli"
 no-loop
 when
 	eval(completeRulesEnabled)
-	$entity: MtbColr(codJcom == null && gestione != null && dataOrd != null && numOrd != null && rigaOrd != null)
+	$entity: MtbColr(codJcom == null && (gestione.equalsIgnoreCase("A") || gestione.equalsIgnoreCase("L")) && segno == 1 && dataOrd != null && numOrd != null && rigaOrd != null)
 then
     String codJcom = PackagesRules.completeCodJcom(conn, $entity);
 	modify ( $entity ) { setCodJcom(codJcom) }