|
@@ -171,7 +171,7 @@
|
|
|
and i.customer_phone = m.seller_phone and i.delete_flag = 0
|
|
and i.customer_phone = m.seller_phone and i.delete_flag = 0
|
|
|
WHERE s.delete_flag = '0'
|
|
WHERE s.delete_flag = '0'
|
|
|
AND s.comp_id = #{compId}
|
|
AND s.comp_id = #{compId}
|
|
|
- and (w.in_out_type='采购入库' or w.in_out_type='货权转入')
|
|
|
|
|
|
|
+ and (w.in_out_type='采购入库' or w.in_out_type='货权转入' or w.in_out_type='销售出库')
|
|
|
<if test="warehouseName != null and warehouseName != ''">
|
|
<if test="warehouseName != null and warehouseName != ''">
|
|
|
AND s.warehouse_name= #{warehouseName}
|
|
AND s.warehouse_name= #{warehouseName}
|
|
|
</if>
|
|
</if>
|
