|
|
|
@ -625,7 +625,12 @@
|
|
|
|
|
WHERE ldpll.order_package_loading_status != '20' |
|
|
|
|
AND ldpll.order_package_reservation_status !='20' |
|
|
|
|
AND ldpll.order_package_status != '70' |
|
|
|
|
GROUP BY ldsaa.id) |
|
|
|
|
AND ldpll.conditions = 1 |
|
|
|
|
AND ldsaa.warehouse_id = #{par.warehouseId} |
|
|
|
|
AND ldpll.warehouse_id = #{par.warehouseId} |
|
|
|
|
AND ldsa.type_service = #{par.typeService} |
|
|
|
|
GROUP BY ldsaa.id |
|
|
|
|
) |
|
|
|
|
AS t ON t.id = ldsa.id |
|
|
|
|
<where> |
|
|
|
|
ldsa.order_status in ('10','20','30','70') |
|
|
|
|