60584764 improve warehouse triggers