Merge branch 'master-dev' of wugg/cxinv into master

app/command/Report.php

@@ -910,7 +910,7 @@ class Report extends Command
 
 		//采购部门销售业绩
 	private function R($param=[]){
-		$where = [["a.is_del","=",0],["a.status","=",2]];
+		$where = [["a.is_del","=",0],["a.status","=",2],["b.is_stock","=",0]];
 		if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.sendtime', 'between', [date("Y-m-d 00:00:00",
 		strtotime($param['start'])),date("Y-m-d 23:59:59",strtotime($param['end']))]];
 //		if ($param['companyNo'] != '') $where[] = ['supplierNo', '=', $param['companyNo']];