|
|
@@ -1106,16 +1106,17 @@
|
|
|
t_whgenleg leg
|
|
|
LEFT JOIN t_corps corp ON corp.f_id = leg.f_corpid
|
|
|
LEFT JOIN t_goods goods ON goods.f_id = leg.f_goodsid
|
|
|
- LEFT JOIN t_warehouse ware ON ware.f_id = leg.f_warehouseid
|
|
|
+ LEFT JOIN t_warehouse ware ON ware.f_id = leg.f_warehouse_locationid
|
|
|
LEFT JOIN sys_dict_data dict ON dict.dict_value = leg.f_business_type
|
|
|
LEFT JOIN sys_dict_data sdict ON sdict.dict_value = leg.f_trademodeid
|
|
|
LEFT JOIN t_warehouse_area area ON area.f_id = leg.f_warehouse_locationid
|
|
|
+ LEFT JOIN t_warehouse wh ON wh.f_id = leg.f_warehouseid
|
|
|
<where>
|
|
|
dict.status = '0'
|
|
|
AND dict.dict_type = 'storage_type'
|
|
|
AND sdict.`status` = '0'
|
|
|
AND sdict.dict_type = 'data_trademodes'
|
|
|
- AND ware.supervise = 1
|
|
|
+ AND wh.supervise = 1
|
|
|
AND leg.f_qtyblc != 0
|
|
|
AND leg.f_grossweightblc != 0
|
|
|
AND leg.f_netweightblc != 0
|
sunhz