|
@@ -39,7 +39,7 @@
|
|
|
FROM
|
|
|
sy_order_data a
|
|
|
left join (
|
|
|
- select sy_order_data_id,sum(total_price_and_tax) as total_price_and_tax,inventory_code,
|
|
|
+ select sy_order_data_id,sum(total_price_and_tax) as total_price_and_tax,inventory_ccode,
|
|
|
sum(surplus_num) as surplus_num,sum(quantity) as quantity
|
|
|
FROM sy_order_data_item GROUP BY sy_order_data_id
|
|
|
) b on a.id=b.sy_order_data_id
|
|
@@ -63,10 +63,10 @@
|
|
|
AND b.surplus_num <![CDATA[ >= ]]> b.quantity
|
|
|
</if>
|
|
|
<if test="(sy.isProduct != null and sy.isProduct != '') and (sy.isProduct == '0' or sy.isProduct ==0) ">
|
|
|
- AND (b.inventory_code like '19%' or b.inventory_code like 'N19%')
|
|
|
+ AND (b.inventory_ccode like '19%' )
|
|
|
</if>
|
|
|
<if test="(sy.isProduct != null and sy.isProduct != '') and (sy.isProduct == '1' or sy.isProduct == 1) ">
|
|
|
- AND (b.inventory_code not like '19%' and b.inventory_code not like 'N19%')
|
|
|
+ AND (b.inventory_ccode not like '19%')
|
|
|
</if>
|
|
|
GROUP BY a.id
|
|
|
ORDER BY
|