|
|
|
@ -625,10 +625,13 @@
|
|
|
|
|
WHERE ldpll.order_package_loading_status != '20' |
|
|
|
|
AND ldpll.order_package_reservation_status !='20' |
|
|
|
|
AND ldpll.order_package_status != '70' |
|
|
|
|
AND ldpll.conditions = 1 |
|
|
|
|
AND ldpll.conditions != 2 |
|
|
|
|
AND ldsaa.warehouse_id = #{par.warehouseId} |
|
|
|
|
AND ldpll.warehouse_id = #{par.warehouseId} |
|
|
|
|
AND ldsaa.type_service = #{par.typeService} |
|
|
|
|
<if test="par.orderCode != null and par.orderCode != '' "> |
|
|
|
|
and ldsaa.order_code like concat(#{par.orderCode},'%') |
|
|
|
|
</if> |
|
|
|
|
GROUP BY ldsaa.id |
|
|
|
|
) |
|
|
|
|
AS t ON t.id = ldsa.id |
|
|
|
|