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

app/command/CopySupplier.php

@@ -31,6 +31,7 @@ class CopySupplier extends Command
     {
 		$supplier= Cache::store("redis")->handler()->rpop("companycopy");
 		if($supplier==false) return;
+		$output->writeln($supplier);
 		$supplier =json_decode($supplier,true);
 		if($supplier['type']==1){
 			$this->checkcompany($supplier);
@@ -95,6 +96,7 @@ class CopySupplier extends Command
 	           "companyNo"=>$supplier['companyNo'],
 	           "companyName"=>$supplier['companyName'],
 	           "creater"=>$supplier['creater'],
+	           "area"=>$supplier['area'],
 	           "status"=>1,
 	           "addtime"=>date("Y-m-d H:i:s"),
 	           "updatetime"=>date("Y-m-d H:i:s")

app/command/Report.php

@@ -931,7 +931,8 @@ class Report extends Command
 
 	//产品部门销售业绩
 	private function Q($param=[]){
-		$where = [["is_del","=",0],["status","in",[0,1,2]]];
+
+		$where = [["is_del","=",0],["status","in",[0,1,2]],["apply_id","in",array_merge(getUidByDepartId(52),getUidByDepartId(53))]];
 		if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['addtime', 'between', [date("Y-m-d 00:00:00",strtotime($param['start'])),date("Y-m-d 23:59:59",
 		strtotime($param['end']))]];
 		$Db= Db::connect("mysql_wsm");
@@ -1231,7 +1232,7 @@ class Report extends Command
 
 	//退货明细
 	private function V($param=[]){
-		$where = [["is_del","=",0]];
+		$where = [["a.is_del","=",0],["a.apply_id","in",array_merge(getUidByDepartId(52),getUidByDepartId(53))]];
 		if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [date("Y-m-d 00:00:00",strtotime($param['start'])),date("Y-m-d 23:59:59",
 		strtotime($param['end']))]];
 		$Db= Db::connect("mysql_wsm");