Not all picking slots are released (#17819)

refs: #17813
metasfresh · Apr 10, 2024 · 9b3714a · 9b3714a
1 parent fc413c1
commit 9b3714a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/....metas.cucumber/src/test/java/de/metas/cucumber/stepdefs/picking/PickingSlot_StepDef.java b/....metas.cucumber/src/test/java/de/metas/cucumber/stepdefs/picking/PickingSlot_StepDef.java
@@ -70,6 +70,8 @@ public void validatePickingSlot(@NonNull final DataTable dataTable)
 							softAssertions.assertThat(pickingSlot.getC_BPartner_Location_ID()).isEqualTo(0);
 						}
 					});
+
+			softAssertions.assertAll();
 		});
 	}
 

diff --git a/...esources/de/metas/cucumber/features/workflow/picking_abortPickingJobAfterShipment.feature b/...esources/de/metas/cucumber/features/workflow/picking_abortPickingJobAfterShipment.feature
@@ -60,6 +60,9 @@ Feature: Picking workflow - abort not started picking jobs after shipment
     When 'generate shipments' process is invoked
       | M_ShipmentSchedule_ID.Identifier | QuantityType | IsCompleteShipments | IsShipToday |
       | pickingShipmentSchedule          | D            | true                | false       |
+    And after not more than 60s, M_InOut is found:
+      | M_ShipmentSchedule_ID.Identifier | M_InOut_ID.Identifier |
+      | pickingShipmentSchedule          | s_1                   |
     Then validate M_PickingSlot:
       | M_PickingSlot_ID.Identifier | IsAllocated |
       | 170.0                       | N           |

diff --git a/....handlingunits.base/src/main/java/de/metas/handlingunits/picking/interceptor/M_InOut.java b/....handlingunits.base/src/main/java/de/metas/handlingunits/picking/interceptor/M_InOut.java
@@ -29,6 +29,7 @@
 import lombok.RequiredArgsConstructor;
 import org.adempiere.ad.modelvalidator.annotations.DocValidate;
 import org.adempiere.ad.modelvalidator.annotations.Interceptor;
+import org.adempiere.ad.trx.api.ITrxManager;
 import org.compiere.model.I_M_InOut;
 import org.compiere.model.ModelValidator;
 import org.springframework.stereotype.Component;
@@ -39,12 +40,15 @@
 public class M_InOut
 {
 	private final IShipmentScheduleAllocDAO shipmentScheduleAllocDAO = Services.get(IShipmentScheduleAllocDAO.class);
+	private final ITrxManager trxManager = Services.get(ITrxManager.class);
+
 
 	private final PickingJobService pickingJobService;
 
 	@DocValidate(timings = ModelValidator.TIMING_AFTER_COMPLETE)
 	public void afterComplete(@NonNull final I_M_InOut shipment)
 	{
-		shipmentScheduleAllocDAO.retrieveOrderIds(shipment).forEach(pickingJobService::abortNotStartedForSalesOrderId);
+		trxManager.runAfterCommit(() -> shipmentScheduleAllocDAO.retrieveOrderIds(shipment)
+				.forEach(pickingJobService::abortNotStartedForSalesOrderId));
 	}
 }