|
@@ -763,11 +763,11 @@
|
|
|
</foreach>
|
|
|
</if>
|
|
|
) TWBI ON TWBI.f_mblno = TW.f_mblno
|
|
|
- LEFT JOIN t_warehousebills TWB ON TWB.f_mblno = TW.f_mblno
|
|
|
- LEFT JOIN t_warehousebillsitems TWBI ON TWBI.f_pid = TWB.f_id
|
|
|
+
|
|
|
<where>
|
|
|
TW.del_flag = '0'
|
|
|
- AND (TWB.f_ifpledge != 0 or TWB.f_ifpledge IS NULL)
|
|
|
+ and TW.f_netweightblc != 0
|
|
|
+ AND (TWBI.f_ifpledge != 0 or TWBI.f_ifpledge IS NULL)
|
|
|
<if test="ownerName != null and ownerName != ''">
|
|
|
and TC.f_name = #{ownerName}
|
|
|
</if>
|