|
@@ -244,8 +244,12 @@
|
|
|
LEFT JOIN
|
|
|
sys_supplier ss ON sd.supplier_id = ss.id
|
|
|
LEFT JOIN
|
|
|
- t_b_device_delivery tbdd ON tbdd.effect AND tbdd.serial_no = sd.serial_no
|
|
|
+ t_b_device_delivery tbdd ON tbdd.serial_no = sd.serial_no
|
|
|
<where>
|
|
|
+ IF(tbdd.id IS NULL,
|
|
|
+ TRUE,
|
|
|
+ tbdd.effect
|
|
|
+ AND tbdd.status = 'RECEIVE')
|
|
|
AND sd.enable
|
|
|
<if test="supplierId != null">
|
|
|
AND ss.id = #{supplierId}
|