java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

贴标申请，仓储转运

Browse Source
This commit is contained in:
liuyihe
2026-09-24 11:39:15 +08:00
parent b991eac3c3
commit d03862d47e
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lastleg-service/src/main/java/com/baiyue/lastleg/transfer/service/WarehouseTransferService.java
+11 -6
View File
@@ -1224,19 +1224,24 @@ public class WarehouseTransferService {
public List<WarehouseTransferResponses.Summary> pdaCandidates(long overseasWarehouseId) { public List<WarehouseTransferResponses.Summary> pdaCandidates(long overseasWarehouseId) {
List<WarehouseTransferOrder> candidates = transfers.selectList(new LambdaQueryWrapper<WarehouseTransferOrder>() List<WarehouseTransferOrder> candidates = transfers.selectList(new LambdaQueryWrapper<WarehouseTransferOrder>()
.eq(WarehouseTransferOrder::getOperatingWarehouseId, String.valueOf(overseasWarehouseId)) .eq(WarehouseTransferOrder::getOperatingWarehouseId, String.valueOf(overseasWarehouseId))
.in(WarehouseTransferOrder::getStatus, List.of(WAIT_PDA_RECEIVING, APPROVED, ALLOCATED, WAIT_RELABEL, READY_FOR_DISPATCH)) // 只有尚未完成 PDA 收货/测量的状态才进入测量列表。换标、待排车及已出库
// 都是后续履约阶段，不能继续占用 PDA 的“当前测量单”锁。
.in(WarehouseTransferOrder::getStatus, List.of(WAIT_PDA_RECEIVING, APPROVED, ALLOCATED))
.orderByDesc(WarehouseTransferOrder::getUpdatedAt)); .orderByDesc(WarehouseTransferOrder::getUpdatedAt));
Map<String, RelabelApplication> relabelApplicationsByNo = relabelApplications(candidates); Map<String, RelabelApplication> relabelApplicationsByNo = relabelApplications(candidates);
return candidates.stream().map(value -> return candidates.stream().map(value -> {
new WarehouseTransferResponses.Summary(value.getId(), value.getTransferNo(), value.getInboundCode(), RelabelApplication relabel = StringUtils.hasText(value.getRelabelNo())
? relabelApplicationsByNo.get(value.getRelabelNo()) : null;
return new WarehouseTransferResponses.Summary(value.getId(), value.getTransferNo(), value.getInboundCode(),
value.getLastlegOrderId(), value.getLastlegOrderNo(), value.getOperatingWarehouseId(), value.getLastlegOrderId(), value.getLastlegOrderNo(), value.getOperatingWarehouseId(),
value.getFbaWarehouseCode(), value.getDestinationType(), value.getDestinationWarehouseCode(), value.getFbaWarehouseCode(), value.getDestinationType(), value.getDestinationWarehouseCode(),
value.getDestinationWarehouseName(), value.getPackageCount(), value.getDeliveryMethod(), value.getDestinationWarehouseName(), value.getPackageCount(), value.getDeliveryMethod(),
Boolean.TRUE.equals(value.getNeedRelabel()), value.getRelabelNo(), Boolean.TRUE.equals(value.getNeedRelabel()), value.getRelabelNo(),
relabelApplicationsByNo.get(value.getRelabelNo()) == null ? null : relabelApplicationsByNo.get(value.getRelabelNo()).getStatus(), relabel == null ? null : relabel.getStatus(),
relabelApplicationsByNo.get(value.getRelabelNo()) == null ? null : relabelApplicationsByNo.get(value.getRelabelNo()).getFulfillmentStatus(), relabel == null ? null : relabel.getFulfillmentStatus(),
value.getStatus(), value.getStatus(),
value.getEstimatedArrivalAt(), value.getCreatedAt())).toList(); value.getEstimatedArrivalAt(), value.getCreatedAt());
}).toList();
} }
private Map<String, RelabelApplication> relabelApplications(List<WarehouseTransferOrder> transferOrders) { private Map<String, RelabelApplication> relabelApplications(List<WarehouseTransferOrder> transferOrders) {