|
|
@ -2103,6 +2103,7 @@ |
|
|
|
SELECT |
|
|
|
SELECT |
|
|
|
lddl.id AS id, |
|
|
|
lddl.id AS id, |
|
|
|
lddl.kind AS kind, |
|
|
|
lddl.kind AS kind, |
|
|
|
|
|
|
|
if(lww.old_id is null,lww.id,lww.old_id) AS warehouseId, |
|
|
|
lddl.warehouse_id AS warehouseId, |
|
|
|
lddl.warehouse_id AS warehouseId, |
|
|
|
lddl.warehouse_name AS warehouseName, |
|
|
|
lddl.warehouse_name AS warehouseName, |
|
|
|
lds.signing_time AS reviewTime, |
|
|
|
lds.signing_time AS reviewTime, |
|
|
@ -2124,6 +2125,7 @@ |
|
|
|
logpm_distribution_signfor AS lds |
|
|
|
logpm_distribution_signfor AS lds |
|
|
|
LEFT JOIN logpm_distribution_delivery_list AS lddl ON lds.delivery_id = lddl.id |
|
|
|
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_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 |
|
|
|
where lddl.id=#{deliveryId} and ldr.id=#{reservationId} and ldr.reservation_status !=40 |
|
|
|
</select> |
|
|
|
</select> |
|
|
|
<select id="selectDeliveryById" resultType="com.logpm.distribution.vo.DistributionDeliveryListVO"> |
|
|
|
<select id="selectDeliveryById" resultType="com.logpm.distribution.vo.DistributionDeliveryListVO"> |
|
|
|