Fix sposta ul

This commit is contained in:
2025-02-27 17:14:54 +01:00
parent 3ac1fdeb1b
commit 66e18971df

View File

@@ -2114,18 +2114,12 @@ public class WMSGenericService {
dtbDoct, dtbDoct,
wmsLavorazioneService.insertUDSRow(insertUDSRowRequest).getSavedMtbColr() wmsLavorazioneService.insertUDSRow(insertUDSRowRequest).getSavedMtbColr()
); );
uds.setOperation(OperationType.UPDATE);
} }
} else { } else {
WMSUtility.createDtbDocrFromMtbColrList( WMSUtility.createDtbDocrFromMtbColrList(
dtbDoct, dtbDoct,
WMSUtility.spostaArtsTraUL(mtbColtToMove, udc, false, entityProcessor, requestDataDTO).getGeneratedMtbColr() 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); WMSUtility.trasferisciPedane(mtbColtToMove, listaPedane, dtbDoct);
@@ -2143,20 +2137,36 @@ public class WMSGenericService {
List<String> listCodMart = UtilityDB.executeSimpleQueryOnlyFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql); List<String> listCodMart = UtilityDB.executeSimpleQueryOnlyFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
boolean sameArts = mtbColtToMove.getMtbColr().stream().map(MtbColr::getCodMart).collect(Collectors.toSet()).equals(new HashSet<>(listCodMart)); boolean sameArts = mtbColtToMove.getMtbColr().stream().map(MtbColr::getCodMart).collect(Collectors.toSet()).equals(new HashSet<>(listCodMart));
if (!sameArts) { if (sameArts) {
if (gestisciColli) { if (gestisciColli) {
udc.setCodJfas(mtbColtToMove.getCodJfas()) udc.setCodJfas(mtbColtToMove.getCodJfas())
.setDataVers(mtbColtToMove.getDataVers()) .setDataVers(mtbColtToMove.getDataVers())
.setBarcodeUl(mtbColtToMove.getBarcodeUl()); .setBarcodeUl(mtbColtToMove.getBarcodeUl());
mtbColtToMove.setBarcodeUl(EmsRestConstants.NULL); 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 { } else {
uds.setCodJfas(mtbColtToMove.getCodJfas()) uds.setCodJfas(mtbColtToMove.getCodJfas())
.setDataVers(mtbColtToMove.getDataVers()) .setDataVers(mtbColtToMove.getDataVers())
.setBarcodeUl(mtbColtToMove.getBarcodeUl()); .setBarcodeUl(mtbColtToMove.getBarcodeUl());
mtbColtToMove.setBarcodeUl(EmsRestConstants.NULL); 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);
} }
} }