|
@@ -1796,7 +1796,7 @@
|
|
|
LEFT JOIN t_cntr tr ON th.f_cntrid = tr.f_id
|
|
|
LEFT JOIN t_goods tg ON th.f_goodsid = tg.f_id
|
|
|
) tc ON tc.f_pid = tw.f_id
|
|
|
- LEFT JOIN (SELECT f_pid,f_billstatus FROM t_warehousebillsfees GROUP BY f_pid,f_billstatus)tf ON tf.f_pid = tw.f_id
|
|
|
+ LEFT JOIN (SELECT f_pid,f_billstatus FROM t_warehousebillsfees GROUP BY f_pid)tf ON tf.f_pid = tw.f_id
|
|
|
<where>
|
|
|
tw.f_typeid = '1'
|
|
|
and tw.del_flag = '0'
|
|
@@ -2067,7 +2067,7 @@
|
|
|
LEFT JOIN t_cntr tr ON th.f_cntrid = tr.f_id
|
|
|
LEFT JOIN t_goods tg ON th.f_goodsid = tg.f_id
|
|
|
) tc ON tc.f_pid = tw.f_id
|
|
|
- LEFT JOIN (SELECT f_pid,f_billstatus,IFNULL(SUM(f_amount),0) fAmount FROM t_warehousebillsfees GROUP BY f_pid,f_billstatus)tf ON tf.f_pid = tw.f_id
|
|
|
+ LEFT JOIN (SELECT f_pid,f_billstatus,IFNULL(SUM(f_amount),0) fAmount FROM t_warehousebillsfees GROUP BY f_pid)tf ON tf.f_pid = tw.f_id
|
|
|
<where>
|
|
|
tw.f_typeid = '1'
|
|
|
and tw.del_flag = '0'
|