From 66e18971dfaa69b02522fe7cb8db9baeada24fac Mon Sep 17 00:00:00 2001
From: MarcoE <m.elefante@integry.it>
Date: Thu, 27 Feb 2025 17:14:54 +0100
Subject: [PATCH] Fix sposta ul

---
 .../generic/service/WMSGenericService.java    | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
index 67de530f0b..74ab9d2393 100644
--- a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
+++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
@@ -2114,18 +2114,12 @@ public class WMSGenericService {
                                 dtbDoct,
                                 wmsLavorazioneService.insertUDSRow(insertUDSRowRequest).getSavedMtbColr()
                         );
-
-                        uds.setOperation(OperationType.UPDATE);
                     }
                 } else {
                     WMSUtility.createDtbDocrFromMtbColrList(
                             dtbDoct,
                             WMSUtility.spostaArtsTraUL(mtbColtToMove, udc, false, entityProcessor, requestDataDTO).getGeneratedMtbColr()
                     );
-
-                    if (udc.getMtbCols() != null) {
-                        udc.getMtbCols().forEach(x -> x.setOperation(OperationType.NO_OP));
-                    }
                 }
 
                 WMSUtility.trasferisciPedane(mtbColtToMove, listaPedane, dtbDoct);
@@ -2143,20 +2137,36 @@ public class WMSGenericService {
             List<String> listCodMart = UtilityDB.executeSimpleQueryOnlyFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
             boolean sameArts = mtbColtToMove.getMtbColr().stream().map(MtbColr::getCodMart).collect(Collectors.toSet()).equals(new HashSet<>(listCodMart));
 
-            if (!sameArts) {
+            if (sameArts) {
                 if (gestisciColli) {
                     udc.setCodJfas(mtbColtToMove.getCodJfas())
                             .setDataVers(mtbColtToMove.getDataVers())
                             .setBarcodeUl(mtbColtToMove.getBarcodeUl());
 
                     mtbColtToMove.setBarcodeUl(EmsRestConstants.NULL);
+
+                    udc.setOperation(OperationType.UPDATE);
+                    if (udc.getMtbCols() != null)
+                        udc.getMtbCols().forEach(x -> x.setOperation(OperationType.NO_OP));
+                    entitiesToSave.add(udc);
                 } else {
                     uds.setCodJfas(mtbColtToMove.getCodJfas())
                             .setDataVers(mtbColtToMove.getDataVers())
                             .setBarcodeUl(mtbColtToMove.getBarcodeUl());
 
                     mtbColtToMove.setBarcodeUl(EmsRestConstants.NULL);
+
+                    uds.setOperation(OperationType.UPDATE);
+                    if (uds.getMtbCols() != null)
+                        uds.getMtbCols().forEach(x -> x.setOperation(OperationType.NO_OP));
+                    entitiesToSave.add(uds);
                 }
+
+                mtbColtToMove.setOperation(OperationType.UPDATE);
+                if (mtbColtToMove.getMtbCols() != null) {
+                    mtbColtToMove.getMtbCols().forEach(x -> x.setOperation(OperationType.NO_OP));
+                }
+                entitiesToSave.add(mtbColtToMove);
             }
         }