修复费用记录、装柜完成及海外履约资料
This commit is contained in:
@@ -83,6 +83,7 @@ public class LastlegOrderService {
|
||||
@Resource private InventoryCommandService inventory;
|
||||
@Resource private ReceivingWarehouseOperationMapper receivingWarehouseOperations;
|
||||
@Resource private ContainerArrivalTimeOperationMapper containerArrivalTimeOperations;
|
||||
@Resource private ContainerWarehouseArrivalService warehouseArrival;
|
||||
@Resource private WarehouseResourceGateway warehouseResourceGateway;
|
||||
@Resource private ContainerShippingGateMapper containerShippingGates;
|
||||
@Resource private ReturnOrderReferenceResolver returnOrderReferences;
|
||||
@@ -142,6 +143,7 @@ public class LastlegOrderService {
|
||||
orderMapper.findContainerProgressItems(bookingId));
|
||||
}
|
||||
|
||||
/** 清关列表读取统一解析的柜级日期,默认推算不写入订单。 */
|
||||
@Transactional(readOnly = true)
|
||||
public List<ContainerArrivalTimeView> containerArrivalTimes(
|
||||
LastlegOrderRequests.ContainerArrivalTimeQuery request) {
|
||||
@@ -150,7 +152,7 @@ public class LastlegOrderService {
|
||||
if (bookingIds.size() != request.sourceContainerBookingIds().size()) {
|
||||
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "来源柜预订ID不能重复");
|
||||
}
|
||||
return orderMapper.findContainerArrivalTimes(List.copyOf(bookingIds));
|
||||
return warehouseArrival.resolve(List.copyOf(bookingIds));
|
||||
}
|
||||
|
||||
@Transactional
|
||||
@@ -194,8 +196,9 @@ public class LastlegOrderService {
|
||||
return requireContainerArrivalTime(bookingId);
|
||||
}
|
||||
|
||||
/** 保存后沿同一读取入口返回人工日期、版本和计划冻结事实。 */
|
||||
private ContainerArrivalTimeView requireContainerArrivalTime(String bookingId) {
|
||||
List<ContainerArrivalTimeView> values = orderMapper.findContainerArrivalTimes(List.of(bookingId));
|
||||
List<ContainerArrivalTimeView> values = warehouseArrival.resolve(List.of(bookingId));
|
||||
if (values.size() != 1) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "来源柜不存在");
|
||||
if (values.get(0).version() < 0) {
|
||||
throw new ResponseStatusException(HttpStatus.CONFLICT, "柜内预计到仓时间版本不一致");
|
||||
|
||||
Reference in New Issue
Block a user