|
|
@@ -118,7 +118,7 @@
|
|
|
iowt.in_out_task_no as warehousingTaskNo,
|
|
|
'' as paymentNo,
|
|
|
m.seller as customerName,
|
|
|
- '采购入库' as inOutType,
|
|
|
+ case when w.in_out_type='货权转入' then '采购入库(货转)' else '采购入库' end as inOutType,
|
|
|
'' as deliveryGrossWeight,
|
|
|
'' as deliveryTare,
|
|
|
'' as deliveryVolume,
|
|
|
@@ -171,6 +171,7 @@
|
|
|
and i.customer_phone = m.seller_phone and i.delete_flag = 0
|
|
|
WHERE s.delete_flag = '0'
|
|
|
AND s.comp_id = #{compId}
|
|
|
+ and (w.in_out_type='采购入库' or w.in_out_type='货权转入')
|
|
|
<if test="warehouseName != null and warehouseName != ''">
|
|
|
AND s.warehouse_name= #{warehouseName}
|
|
|
</if>
|
|
|
@@ -426,7 +427,7 @@
|
|
|
case when m.contract_type = '1' then m.contract_no else '' end as contractNo,
|
|
|
m.buyer as customerName,
|
|
|
wm.customer as remark,
|
|
|
- w.in_out_task_no as inOutTaskNo,
|
|
|
+ IFNULL(w.in_out_task_no,'货转') as inOutTaskNo,
|
|
|
g.goods_name as goodsName,
|
|
|
case when g.goods_name like '%潮粮%' then '潮粮' else '干粮' end as type,
|
|
|
g.grade as grade,
|
|
|
@@ -483,7 +484,7 @@
|
|
|
left join source_relation_info sri on iowt.id = sri.task_id and sri.delete_flag = 0
|
|
|
WHERE s.delete_flag = '0'
|
|
|
AND s.comp_id = #{compId}
|
|
|
- and w.in_out_type='销售出库'
|
|
|
+ and (w.in_out_type='销售出库' or w.in_out_type='货权转出')
|
|
|
<if test="warehouseName != null and warehouseName != ''">
|
|
|
AND s.warehouse_name= #{warehouseName}
|
|
|
</if>
|
zhangyuewww