|
@@ -143,6 +143,7 @@
|
|
|
wio.delete_flag = '0'
|
|
|
and wio.status ='已提交'
|
|
|
and wio.in_out_type ='采购入库'
|
|
|
+ and wbi.warehouse_type='1'
|
|
|
and wio.update_date> #{beforeDay}
|
|
|
group BY wio.warehouse_name,wio.contract_no,DATE_FORMAT(wio.update_date,"%Y%m%d")
|
|
|
</select>
|
|
@@ -234,7 +235,6 @@
|
|
|
WHERE
|
|
|
(wioi.in_out_type = '收购入库' OR wioi.in_out_type = '采购入库')
|
|
|
AND wioi.status_flag = '3'
|
|
|
- AND wbi.comp_id = #{compId}
|
|
|
and wioi.update_date> #{beforeDay}
|
|
|
GROUP BY
|
|
|
case when (wioi.goods_name not like '%潮粮%' and wioi.goods_name like '%玉米%') then '玉米' else wioi.goods_name end;
|