提交

2026-10-14 18:01:25 +08:00
parent 8bc8518496
commit 471e50ffe1
34 changed files with 1088 additions and 71 deletions
@@ -1158,6 +1158,7 @@ public class DeliveryTransferService {
        required(request == null ? null : request.reason(), "取消原因不能为空");
        OutboundOrder observed = outboundOrders.findGlobalByNo(trim(outboundNo));
        if (observed == null) throw notFound("Outbound order not found");
+        if ("DISCARD_OUTBOUND".equals(observed.getOutboundType())) throw conflict("请通过废弃单取消，废弃出库单随申请同步取消");
        // Match dispatch picking and relabel confirmation lock order before locking outbound.
        DispatchOrder dispatch = observed.getDispatchOrderId() == null ? null
            : dispatchOrders.lockById(observed.getCustomerId(), observed.getDispatchOrderId());