优化

2026-08-27 11:45:52 +08:00
parent 086a0f9c89
commit daf0ee2acd
3 changed files with 33 additions and 1 deletions
@@ -192,7 +192,14 @@ public class ContainerService {
        if (repository.containerNoExists(containerNo, id)) throw conflict("集装箱号已存在");
        try {
            if (repository.updateTransport(id, containerNo, voyageNo, request.version(),
-                operatorId, operatorName) != 1) throw conflict("货柜状态或版本已变化，请刷新后重试");
+                operatorId, operatorName) != 1) {
+                ContainerTransportHistoryEntity concurrent = transportHistories == null ? null
+                    : transportHistories.selectOperation(id, operatorId, operationId);
+                if (concurrent != null && requestHash.equals(concurrent.getRequestHash())) {
+                    return required(id);
+                }
+                throw conflict("货柜状态或版本已变化，请刷新后重试");
+            }
        } catch (DuplicateKeyException ex) { throw conflict("集装箱号已存在"); }
        ContainerTransportHistoryEntity history = new ContainerTransportHistoryEntity();
        history.setContainerBookingId(id); history.setBeforeContainerNo(current.getContainerNo());