|
@@ -8,7 +8,7 @@
|
|
|
distinct
|
|
distinct
|
|
|
a.*
|
|
a.*
|
|
|
from websit_goods_category a
|
|
from websit_goods_category a
|
|
|
- join websit_goods b on a.category_id = b.goods_category_id
|
|
|
|
|
|
|
+ join worker_goods b on a.category_id = b.goods_category_id
|
|
|
join worker_stock c on c.goods_id = b.goods_id
|
|
join worker_stock c on c.goods_id = b.goods_id
|
|
|
<where>
|
|
<where>
|
|
|
<if test="goodsType != null and goodsType !=''">
|
|
<if test="goodsType != null and goodsType !=''">
|
|
@@ -29,10 +29,9 @@
|
|
|
<if test="goodsType != null and goodsType == 'M'.toString()">
|
|
<if test="goodsType != null and goodsType == 'M'.toString()">
|
|
|
c.category_name,
|
|
c.category_name,
|
|
|
</if>
|
|
</if>
|
|
|
- b.goods_specification,
|
|
|
|
|
b.goods_category_id
|
|
b.goods_category_id
|
|
|
from worker_stock a
|
|
from worker_stock a
|
|
|
- join websit_goods b on a.goods_id=b.goods_id
|
|
|
|
|
|
|
+ join worker_goods b on a.goods_id=b.goods_id
|
|
|
<if test="goodsType != null and goodsType == 'M'.toString()">
|
|
<if test="goodsType != null and goodsType == 'M'.toString()">
|
|
|
join websit_goods_category c on c.category_id = b.goods_category_id
|
|
join websit_goods_category c on c.category_id = b.goods_category_id
|
|
|
</if>
|
|
</if>
|
