提交

lastleg-service/src/main/java/com/baiyue/lastleg/transfer/service/WarehouseTransferService.java

@@ -92,6 +92,7 @@ import java.util.stream.Collectors;
 
 @Service
 public class WarehouseTransferService {
+    @Resource private com.baiyue.lastleg.fleet.pickup.FleetPickupService pickupService;
     /** 退货单在转运来源中的展示编码，避免把退货单号误当成普通入仓码查询。 */
     public static final String RETURN_ORDER_PREFIX = "RETURN_ORDER:";
     @Resource private com.baiyue.lastleg.service.CompactBusinessNumberService compactNumbers;
@@ -909,6 +910,7 @@ public class WarehouseTransferService {
                                                            WarehouseTransferRequests.CountCartons request) {
         WarehouseTransferOrder transfer = transfers.lockForPda(transferNo, String.valueOf(warehouseId));
         if (transfer == null) throw notFound("当前仓没有该转运单");
+        if ("WAREHOUSE_PICKUP".equals(transfer.getDeliveryMethod())) pickupService.requireArrived(transfer);
         String customerId = transfer.getCustomerId();
         List<WarehouseTransferCarton> cartons = transferCartons.listOrder(customerId, transfer.getId());
         // 客户补箱后旧设备快照不可确认短收，必须刷新取得新增的预报箱唛。
@@ -1034,11 +1036,9 @@ public class WarehouseTransferService {
         return cartons.stream().filter(box -> "COUNTED".equals(box.getStatus())).toList();
     }
 
+    /** 上门取货必须先送仓；按 PDA 绑定仓锁定后继续使用原测量流程。 */
     private WarehouseTransferOrder requirePdaMeasuringTransfer(long warehouseId, String transferNo) {
-        WarehouseTransferOrder transfer = transfers.lockForPda(transferNo, String.valueOf(warehouseId));
-        if (transfer == null) throw notFound("Warehouse transfer order not found");
-        if (!WAIT_PDA_RECEIVING.equals(transfer.getStatus())) throw conflict("Warehouse transfer is not awaiting PDA receiving");
-        return transfer;
+        return pickupService.requireMeasuringSource(String.valueOf(warehouseId), transferNo);
     }
 
     private void validatePalletMeasurement(BigDecimal length, BigDecimal width, BigDecimal height, BigDecimal volume) {
@@ -1056,6 +1056,7 @@ public class WarehouseTransferService {
                                                         WarehouseTransferRequests.Palletize request) {
         WarehouseTransferOrder transfer = transfers.lockForPda(transferNo, String.valueOf(overseasWarehouseId));
         if (transfer == null) throw notFound("Warehouse transfer order not found");
+        if ("WAREHOUSE_PICKUP".equals(transfer.getDeliveryMethod())) pickupService.requireArrived(transfer);
         if (!String.valueOf(overseasWarehouseId).equals(transfer.getOperatingWarehouseId())) {
             throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Warehouse transfer belongs to another warehouse");
         }
@@ -1622,6 +1623,7 @@ public class WarehouseTransferService {
                                                                                String transferNo, MultipartFile file) {
         WarehouseTransferOrder transfer = transfers.lockForPda(transferNo, String.valueOf(overseasWarehouseId));
         if (transfer == null) throw notFound("Warehouse transfer order not found");
+        if ("WAREHOUSE_PICKUP".equals(transfer.getDeliveryMethod())) pickupService.requireArrived(transfer);
         if (!WAIT_PDA_RECEIVING.equals(transfer.getStatus())) {
             throw conflict("Measurement photos can only be uploaded before palletization completes");
         }