diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index f0a763a7d..9e7f79f84 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -2103,6 +2103,7 @@ SELECT lddl.id AS id, lddl.kind AS kind, + if(lww.old_id is null,lww.id,lww.old_id) AS warehouseId, lddl.warehouse_id AS warehouseId, lddl.warehouse_name AS warehouseName, lds.signing_time AS reviewTime, @@ -2124,6 +2125,7 @@ logpm_distribution_signfor AS lds LEFT JOIN logpm_distribution_delivery_list AS lddl ON lds.delivery_id = lddl.id LEFT JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id + LEFT JOIN logpm_warehouse_warehouse AS lww ON lddl.warehouse_id = lww.id where lddl.id=#{deliveryId} and ldr.id=#{reservationId} and ldr.reservation_status !=40