|
|
@@ -1045,7 +1045,7 @@
|
|
|
FROM
|
|
|
t_whgenleg wh
|
|
|
RIGHT JOIN t_corps c ON c.f_id = wh.f_corpid
|
|
|
- RIGHT JOIN t_warehousebills w ON w.f_corpid = wh.f_corpid
|
|
|
+ RIGHT JOIN t_warehousebills w ON wh.f_corpid in (w.f_corpid, w.f_tocorpid)
|
|
|
AND IF ( w.f_billtype = 'HWTG', wh.f_trademodeid IN ( w.f_trademodeid, w.f_new_trademodeid ), w.f_trademodeid = wh.f_trademodeid )
|
|
|
RIGHT JOIN t_warehousebillsitems t ON t.f_pid = w.f_id
|
|
|
AND t.f_mblno = wh.f_mblno
|
|
|
@@ -1056,7 +1056,7 @@
|
|
|
AND wh.f_bsdate IN ( t.f_src_bsdate, t.f_bsdate )
|
|
|
WHERE
|
|
|
wh.f_id = #{fId}
|
|
|
- AND w.f_billtype IN ('CKDB','HWTG','HQZY')
|
|
|
+ AND w.f_billtype IN ('CKDB','HWTG','HQZY')
|
|
|
GROUP BY t.f_id
|
|
|
</select>
|
|
|
|
caifc