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

app/admin/controller/ExecStat.php

@@ -11,8 +11,8 @@ class ExecStat extends \app\admin\BaseController{
 	public function __construct(App $app) {parent::__construct($app);}
 
 	public function list(){
-		$param=$this->request->param(["name"=>"","type"=>"","status"=>"","companyNo"=>"",'relaComNo'=>'',"page"=>1,"size"=>15],"post","trim");
-		$conditon =[["is_del","=",0],["type","=",3]];
+		$param=$this->request->param(["name"=>"","type"=>3,"status"=>"","companyNo"=>"",'relaComNo'=>'',"page"=>1,"size"=>15],"post","trim");
+		$conditon =[["is_del","=",0],["type","=",$param['type']]];
 		if($param['name']!='')$conditon[]=["name","like","%{$param['name']}%"];
 		if($param['status']!=='')$conditon[]=["status","=",$param['status']];
 		$count=Db::name("exec")->where($conditon)->count();
@@ -23,17 +23,15 @@ class ExecStat extends \app\admin\BaseController{
 	}
 
 	public function query(){
-		$param=$this->request->param(["name"=>"","status"=>"","companyNo"=>"",'relaComNo'=>'',"type"=>""],"post","trim");
-		$conditon =[["is_del","=",0],["type","=",3]];
+		$param=$this->request->param(["name"=>"","status"=>"","companyNo"=>"",'relaComNo'=>'',"type"=>3],"post","trim");
+		$conditon =[["is_del","=",0],["type","=",$param['type']]];
 		if($param['name']!='')$conditon[]=["name","like","%{$param['name']}%"];
 		if($param['status']!=='')$conditon[]=["status","=",$param['status']];
-//		if($param['companyNo']!='')$conditon[]=["companyNo","=",$param['companyNo']];
-//		if($param['relaComNo']!='')$conditon[]=["companyNo","=",$param['relaComNo']];
 		$list=Db::name("exec")->where($conditon)->select()->toArray();
 		return app_show(0,"获取成功",$list);
 	}
 	public function add(){
-		$param=$this->request->param(["name"=>"","companyNo"=>"",'relaComNo'=>'',"action"=>''],"post","trim");
+		$param=$this->request->param(["name"=>"","companyNo"=>"",'relaComNo'=>'',"action"=>'',"type"=>3],"post","trim");
 		$valid=Validate::rule([
 			"name|脚本名称"=>'require|max:255',
 			]);
@@ -47,7 +45,7 @@ class ExecStat extends \app\admin\BaseController{
 			"companyNo"=>'',
 			"companyName"=>'',
 			"action"=>$param["action"]??"",
-			"type"=>3,//行政业绩报表
+			"type"=>$param['type'],//3行政业绩报表 4 仓库每日订单数据
 			"status"=>0,
 			"addtime"=>date("Y-m-d H:i:s"),
 			"updatetime"=>date("Y-m-d H:i:s")
@@ -57,12 +55,12 @@ class ExecStat extends \app\admin\BaseController{
 	}
 //新建脚本数据
 	public function addlog(){
-		$param=$this->request->param(["id"=>"","start"=>"","end"=>"","companyNo"=>"",'relaComNo'=>'',"type"=>""],"post","trim");
+		$param=$this->request->param(["id"=>"","start"=>date("Y-m-d"),"end"=>date("Y-m-d"),"companyNo"=>"",'relaComNo'=>'',"type"=>""],"post","trim");
 		$valid=Validate::rule([
 			"id|脚本ID"=>'require|number|gt:0',
 			"start|起始时间"=>'require|dateFormat:Y-m-d',
-			"end|结束时间"=>'require|dateFormat:Y-m-d|gt:start',
-			"type|执行类型"=>'require|number|in:3,4',
+			"end|结束时间"=>'require|dateFormat:Y-m-d|egt:start',
+			"type|执行类型"=>'require|number|in:3,4,5',
 			]);
 		if($valid->check($param)==false) return error_show(1004,$valid->getError());
 		$exec =Db::name("exec")->where("id",$param['id'])->findOrEmpty();
@@ -81,7 +79,7 @@ class ExecStat extends \app\admin\BaseController{
 			"status"=>1,
 			"remark"=>'',
 			"type"=>$param["type"],
-			"expiretime"=>$param["type"]==3? date("Y-m-d H:i:s"):date("Y-m-d 22:00:00"),
+			"expiretime"=>in_array($param["type"],[3,5])? date("Y-m-d H:i:s"):date("Y-m-d 22:00:00"),
 			"addtime"=> date("Y-m-d H:i:s"),
 			"updatetime"=> date("Y-m-d H:i:s")
 		];
@@ -91,11 +89,13 @@ class ExecStat extends \app\admin\BaseController{
 	}
 
 	public function loglist(){
-		$param=$this->request->param(["name"=>"","apply_name"=>"","status"=>"","action"=>"","type"=>"","companyNo"=>"",'relaComNo'=>'',"page"=>1,"size"=>15],"post","trim");
-		$where=[["is_del","=",0],["type","in",[3,4]],["addtime",">=",date("Y-m-d H:i:s",strtotime("-30 day"))]];
+		$param=$this->request->param(["name"=>"","apply_name"=>"","status"=>"","action"=>"","type"=>[3,4],
+		"companyNo"=>"",'relaComNo'=>'',"page"=>1,"size"=>15],"post","trim");
+		$where=[["is_del","=",0],['type','in',$param['type']],["addtime",">=",date("Y-m-d H:i:s",strtotime("-30 day")
+		)]];
 		if($param['name']!='')$where[]=["name","like","%{$param['name']}%"];
 		if($param['apply_name']!='')$where[]=["apply_name","like","%{$param['apply_name']}%"];
-		if($param['type']!='')$where[]=["type","=",$param['type']];
+//		if($param['type']!='')$where[]=["type","=",$param['type']];
 		if($param['status']!='')$where[]=["status","=",$param['status']];
 		if($param['action']!='')$where[]=["action","=",$param['action']];
 		$count=Db::name("exec_log")->where($where)->count();
@@ -120,4 +120,11 @@ class ExecStat extends \app\admin\BaseController{
 			];
 		return app_show(0,"获取成功",$ation);
 	}
+	
+	public function actioninfo(){
+		$ation=[
+			['action'=>'X','name'=>'仓储物流日报'],
+			];
+		return app_show(0,'获取成功',$ation);
+	}
 }

app/admin/controller/OrderPay.php

@@ -599,7 +599,7 @@ class OrderPay extends BaseController{
          $page = $page>$total ? intval($total):$page;
          $list=Db::name("trade_return")->alias("a")->leftJoin("assoc b","a.logNo=b.viceCode")
          ->leftJoin("qrd_info c","c.sequenceNo=b.orderCode")
-         ->field("a.*,b.orderCode,c.qrdSource,goodNo,goodName,qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.platName,b.cancel_fee,c.customerName")
+         ->field("a.*,b.orderCode,c.qrdSource,goodNo,goodName,qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.platName,b.cancel_fee,c.customerName,c.customerNo")
          ->where($condition)->page($page,$size)->order("a.addtime desc")->select();
          return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }

app/admin/controller/Sale.php

@@ -385,44 +385,60 @@ class Sale extends BaseController{
 	* @return \think\response\Json|void
     */
     public function OrderIsCheck(){
-    	  $post =$this->request->only(["orderCode"=>'',"isCgd"=>0],"post","trim");
+    	  $post =$this->request->only(["orderCode"=>'',"isCgd"=>0,"is_cgd_check"=>0],"post","trim");
     	  $vali=Validate::rule([
     	  	"orderCode|销售单单号"=>"require|max:255",
     	  	"isCgd|是否退采购单"=>"require|in:0,1",
+    	  	"is_cgd_check|只退采购单"=>"in:0,1"
     	  	]);
     	  if($vali->check($post)==false) return error_show(1004,$vali->getError());
-    	  $qrdinf =Db::name("qrd_info")->where(["sequenceNo|cxCode"=>$post['orderCode'],"status"=>1,"is_del"=>0])->column("sequenceNo");
-    	  if(!empty($qrdinf)){
-    	  	$asscoinfo =Db::name("assoc")->where(["orderCode"=>$qrdinf,"status"=>[1,2],"is_del"=>0])->column("viceCode","type");
-    	  	$message="";
-    	  	if(isset($asscoinfo[1]))$message.="开票申请编号：".$asscoinfo[1]."\r\n";
-    	  	if(isset($asscoinfo[2]))$message.="资金认领编号：".$asscoinfo[2]."\r\n";
-    	  	return error_show(1005,$message);
-    	  }
-    	  $cgdinfo =Db::name("cgd_info")->where(["cxCode"=>$post['orderCode'],"status"=>1,"is_del"=>0])->column("sequenceNo");
-    	   if(!empty($cgdinfo)){
-	            $message="";
-	            $payinfo = Db::name("pay_info")->where(["cgdNo"=>$cgdinfo,"status"=>1,"is_del"=>0])->column("payNo");
-	            if(!empty($payinfo))$message.="对账单编号：".implode(",",$payinfo)."\n";
-	            $hp = Db::name("pay_invoice")->where(["payNo"=>$payinfo,"is_del"=>0,"status"=>[1,2,3,4]])->column("hpNo");
-	            if(!empty($hp))$message.="对账单回票编号：".implode(",",$hp)."\n";
-	            $paydz = Db::name("pay_payment")->where(["payNo"=>$payinfo,"is_del"=>0,"status"=>[1,2,3,4]])->column("dzNo");
-	            if(!empty($paydz))$message.="对账单付款编号：".implode(",",$paydz)."\n";
+    	  if($post['is_cgd_check']==0){
+    	  	  $qrdinf =Db::name('qrd_info')->where(['sequenceNo|cxCode'=>$post['orderCode'],'status'=>1,'is_del'=>0])->column('sequenceNo');
+	          if(!empty($qrdinf)){
+	            $asscoinfo =Db::name('assoc')->where(['orderCode'=>$qrdinf,'status'=>[1,2],'is_del'=>0])->column('viceCode','type');
+	            $message='';
+	            if(isset($asscoinfo[1]))$message.='开票申请编号：'.$asscoinfo[1]."\r\n";
+	            if(isset($asscoinfo[2]))$message.='资金认领编号：'.$asscoinfo[2]."\r\n";
 	            return error_show(1005,$message);
-    	   }
-    	   if($post['isCgd']==1){
-	           $cgdinfo =Db::name("cgd_info")->where(["qrdCode"=>$post['orderCode'],"status"=>1,"is_del"=>0])->column("sequenceNo");
+	          }
+	          $cgdinfo =Db::name('cgd_info')->where(['cxCode'=>$post['orderCode'],'status'=>1,'is_del'=>0])->column('sequenceNo');
 	           if(!empty($cgdinfo)){
-	           		$message="";
-		            $payinfo = Db::name("pay_info")->where(["cgdNo"=>$cgdinfo,"status"=>1,"is_del"=>0])->column("payNo");
-		            if(!empty($payinfo))$message.="对账单编号：".implode(",",$payinfo)."\n";
-		            $hp = Db::name("pay_invoice")->where(["payNo"=>$payinfo,"is_del"=>0,"status"=>[1,2,3,4]])->column("hpNo");
-		            if(!empty($hp))$message.="对账单回票编号：".implode(",",$hp)."\n";
-		            $paydz = Db::name("pay_payment")->where(["payNo"=>$payinfo,"is_del"=>0,"status"=>[1,2,3,4]])->column("dzNo");
-		            if(!empty($paydz))$message.="对账单付款编号：".implode(",",$paydz)."\n";
+		            $message='';
+		            $payinfo = Db::name('pay_info')->where(['cgdNo'=>$cgdinfo,'status'=>1,'is_del'=>0])->column('payNo');
+		            if(!empty($payinfo))$message.='对账单编号：'.implode(',',$payinfo)."\n";
+		            $hp = Db::name('pay_invoice')->where(['payNo'=>$payinfo,'is_del'=>0,'status'=>[1,2,3,4]])->column('hpNo');
+		            if(!empty($hp))$message.='对账单回票编号：'.implode(',',$hp)."\n";
+		            $paydz = Db::name('pay_payment')->where(['payNo'=>$payinfo,'is_del'=>0,'status'=>[1,2,3,4]])->column('dzNo');
+		            if(!empty($paydz))$message.='对账单付款编号：'.implode(',',$paydz)."\n";
 		            return error_show(1005,$message);
 	           }
-    	   }
+	           if($post['isCgd']==1){
+		           $cgdinfo =Db::name('cgd_info')->where(['qrdCode'=>$post['orderCode'],'status'=>1,'is_del'=>0])->column('sequenceNo');
+		           if(!empty($cgdinfo)){
+		                $message='';
+			            $payinfo = Db::name('pay_info')->where(['cgdNo'=>$cgdinfo,'status'=>1,'is_del'=>0])->column('payNo');
+			            if(!empty($payinfo))$message.='对账单编号：'.implode(',',$payinfo)."\n";
+			            $hp = Db::name('pay_invoice')->where(['payNo'=>$payinfo,'is_del'=>0,'status'=>[1,2,3,4]])->column('hpNo');
+			            if(!empty($hp))$message.='对账单回票编号：'.implode(',',$hp)."\n";
+			            $paydz = Db::name('pay_payment')->where(['payNo'=>$payinfo,'is_del'=>0,'status'=>[1,2,3,4]])->column('dzNo');
+			            if(!empty($paydz))$message.='对账单付款编号：'.implode(',',$paydz)."\n";
+			            return error_show(1005,$message);
+		           }
+	           }
+    	  }else{
+    	  	        $cgdinfo =Db::name('cgd_info')->where(['sequenceNo'=>$post['orderCode'],'status'=>1,'is_del'=>0])->column('sequenceNo');
+		           if(!empty($cgdinfo)){
+		                $message='';
+			            $payinfo = Db::name('pay_info')->where(['cgdNo'=>$cgdinfo,'status'=>1,'is_del'=>0])->column('payNo');
+			            if(!empty($payinfo))$message.='对账单编号：'.implode(',',$payinfo)."\n";
+			            $hp = Db::name('pay_invoice')->where(['payNo'=>$payinfo,'is_del'=>0,'status'=>[1,2,3,4]])->column('hpNo');
+			            if(!empty($hp))$message.='对账单回票编号：'.implode(',',$hp)."\n";
+			            $paydz = Db::name('pay_payment')->where(['payNo'=>$payinfo,'is_del'=>0,'status'=>[1,2,3,4]])->column('dzNo');
+			            if(!empty($paydz))$message.='对账单付款编号：'.implode(',',$paydz)."\n";
+			            return error_show(1005,$message);
+		           }
+    	  }
+    	
     	   return app_show(0,"不存在对账订单");
     }
 }

app/admin/route/app.php

@@ -240,6 +240,7 @@ Route::rule('execstatall','admin/ExecStat/query');//脚本列表全部
 Route::rule('execstatlogadd','admin/ExecStat/addlog');//添加脚本执行记录
 Route::rule('execstatloglist','admin/ExecStat/loglist');//脚本执行记录列表
 Route::rule('execstataction','admin/ExecStat/actionList');//后端已上线脚本
+Route::rule('execstatactioninfo','admin/ExecStat/actioninfo');//后端已上线脚本
 
 route::rule("interadd","admin/InterOrder/create");//网络部录单
 route::rule("interedit","admin/InterOrder/save");//网络部录单

app/command/Report.php

@@ -135,6 +135,10 @@ class Report extends Command
 		        $method="W";
 		        $file='对账采购关联对照';
 		        break;
+		    case 'X':
+		        $method='X';
+		        $file='仓储物流日报';
+		        break;
 			default:
 				$file='暂无数据';
 				$method="";
@@ -792,7 +796,7 @@ class Report extends Command
         diff_fee '工差金额',
         goodNum '商品数量',
         totalPrice '总价',
-        sendStatus '发货状态',
+        qrdSend '发货状态',
         '' as '对账编号',
         '' as '付款状态',
         '' as '回票状态'
@@ -809,7 +813,7 @@ class Report extends Command
 			$value['付款状态'] = $this->cgd_pay_status[$payinfo['pay_status'] ?? "1"];
 			$value['回票状态'] = $this->cgd_inv_status[$payinfo['inv_status'] ?? "1"];
 			$value['是否库存'] = $value['是否库存']==1?'是':'否';
-			$value['发货状态'] = $this->sendStatus[$value['发货状态']];
+			$value['发货状态'] = $this->sendStatus[$value['发货状态']]??"未发货";
 			yield $value;
 		}
 	}
@@ -1060,7 +1064,7 @@ class Report extends Command
 	b.updatetime 回款日期,
 	b.cancel_fee 回款金额,
 	ceil(DATEDIFF(b.updatetime,a.createdTime)/30) 账期,
-	a.ownerName 实际销售人员,
+	if(a.manager='',a.ownerName,a.manager)  实际销售人员,
 	'' 账期回款系数,
 	'' 一级类型,
 	'' 提成系数,
@@ -1073,7 +1077,7 @@ class Report extends Command
 			$totalPrice=$value['回款金额'];
 			$value['账期回款系数']=getPayRate($value['账期']);
 			$value['一级类型']='常规分类';
-			$value['提成系数']=0.0036;
+			$value['提成系数']=0.005;
 			if(in_array($value['一级分类'],$normal)) {
 				$value['一级类型']='非常规分类';
 				$value['提成系数']=0.0002;
@@ -1082,6 +1086,11 @@ class Report extends Command
 				$value['一级类型']='会议分类';
 				$value['提成系数']=0.0018;
 			}
+			if($value['订单类型']=='库存'){
+				$value['采购单价'] = Db::name('cgd_info')->where(['goodNo'=>$value['goodNo'],'cgdSource'=>0])->order('id desc')->value('goodPrice',0);
+			}else{
+				$value['采购单价'] = Db::name('cgd_info')->where(['sequenceNo'=>$value['采购单编号']])->value('goodPrice',0);
+			}
 			$value['明细总提成'] = bcmul(bcmul($totalPrice ,$value['账期回款系数']),$value['提成系数'],4);
 			yield $value;
 		}
@@ -1125,7 +1134,7 @@ class Report extends Command
 						b.updatetime 回款日期,
 						b.cancel_fee 回款金额,
 						ceil(DATEDIFF(b.updatetime,a.createdTime)/30) 账期,
-						'' 项目经理,
+						a.manager 项目经理,
 						'' 账期回款系数,
 						'' 毛利率,
 						'' 毛利率区间,
@@ -1306,4 +1315,43 @@ class Report extends Command
 			yield $value;
 		}
 	}
+	
+	private function X(){
+		$where=[["a.is_stock","=",1],["c.wsm_type","in",[2,5]],["a.is_del","=",0],['b.is_del','=',0],['c.is_del','=',0],];
+		$Db= Db::connect('mysql_wsm');
+		$list =$Db->name('good_basic')->alias('a')
+		->leftJoin('good_stock b','a.spuCode = b.spuCode')
+		->leftJoin('warehouse_info c','b.wsm_code = c.wsm_code')
+		->leftJoin('purchease_order d','d.spuCode = a.spuCode AND d.is_del = 0')
+		->leftJoin('purchease e','e.bk_code = d.bkcode AND e.is_del = 0 ')
+		->field("a.spuCode 产品编码,
+	a.good_name 商品名称,
+	0 单日订单发货数量,
+	b.wait_in_stock 待入库存数量,
+	b.usable_stock 可用库存数量,
+	b.wait_out_stock 待出库存数量,
+	b.usable_stock + b.wait_out_stock 当前库存数量,
+	e.bk_code 备库单号,
+	d.cgder 采购员,
+	a.companyName 业务公司名称,
+	b.wsm_code,
+	c.NAME 仓库名称,
+	ifnull(e.apply_id,0) 备库部门,
+	e.apply_name 申请人,
+	a.supplierName 供应商名称 ")
+		->where($where)->order("a.id desc")
+		->cursor();
+		$date=date("Y-m-d 00:00:00");
+		$depart=[];
+		foreach ($list as $item){
+			if($item['备库部门']!=''&& !isset($depart[$item['备库部门']])){
+				$temp = getDepartByUid($item['备库部门']);
+				if(isset($temp['data']) && !empty($temp['data']))$depart[$item['备库部门']]=$temp['data'][$item['备库部门']];
+			}
+			$item['备库部门'] = $depart[$item['备库部门']]??'';
+			$item['当日发货数量'] = $Db->name('order_out_child')->where(["spuCode"=>$item['产品编码'],"wsm_code"=>$item["wsm_code"],"is_del"=>0,"status"=>2])->sum("num");
+			unset($item['wsm_code']);
+			yield $item;
+		}
+	}
 }

app/command/handleCxData.php

@@ -87,6 +87,8 @@ class handleCxData extends command
 									          'ownerName'=>$data['apply_name'] ,//销售员,
 									          'ownerid'=>$data['apply_id'] ,//销售员id,
 									          'department'=>$data['depart'] ,//部门,
+									           'manager'=>$data['manager']??"",
+                                               'managerid'=>$data['managerid']??0,
 									          'createdTime'=>$data['addtime'] ,//销售单创建时间,
 									          'qrdType'=>$data['order_type'] ,//销售单类型,
 									          'qrdSource'=>$data['order_source'] ,//销售单来源,
@@ -178,6 +180,12 @@ class handleCxData extends command
 									          'goodDesc'=>$data['cost_desc'] ,//工艺说明,
 									          'goodType'=>$data['good_type'] ,//商品类型,
 									          'goodModel'=>'' ,//商品型号,
+									          'companyNo'=>$data['supplierNo'] ,//业务企业编号,
+									          'companyName'=>$data['supplier_name'] ,//业务企业名称,
+									          'customerNo'=>$data['customer_code'] ,//客户编号,
+									          'customerName'=>$data['customer_name'] ,//客户名称,
+									           'manager'=>$data['manager']??'',
+                                               'managerid'=>$data['managerid']??0,
 									          'metalsType'=>$data['noble_metal'] ,//贵金属种类,
 									          'weight'=>$data['good_weight'] ,//商品重量,
 									          'deliveryDay'=>$data['delivery_day'] ,//物流天数,
@@ -208,6 +216,8 @@ class handleCxData extends command
 							    'ownerid'=>$data['apply_id'] ,//销售员id,
 							    'department'=>$data['depart'] ,//部门,
 							    'createdTime'=>$data['addtime'] ,//销售单创建时间,
+							    'manager'=>$data['manager']??'',
+                                'managerid'=>$data['managerid']??0,
 							    'qrdType'=>$data['order_type'] ,//销售单类型,
 							    'qrdSource'=>$data['order_source'] ,//销售单来源,
 							    'companyNo'=>$data['supplierNo'] ,//业务企业编号,
@@ -279,7 +289,8 @@ class handleCxData extends command
 						    ];
 					    }
 						if($data['cgdNo']!=''){
-								Db::name('cgd_info')->where(['sequenceNo'=>$data['cgdNo']])->update(['qrdSend',$data['send_status']]);
+								Db::name('cgd_info')->where(['sequenceNo'=>$data['cgdNo']])->update
+								(['qrdSend'=>$data['send_status']]);
 							}
 					
 				    } else {
@@ -302,7 +313,7 @@ class handleCxData extends command
 					                  ->whereIn('sequenceNo' , $data['cgdNo'])
 					                  ->field('id,status')->findOrEmpty();
 					    $data['qrdSend'] = Db::name("qrd_info")->where(["cgdNo"=>$data['cgdNo']])->value
-					    ("sendStatus",0);
+					    ("sendStatus",1);
 					    if (!empty($exists_cgd)) {
 
 						    //未对账，更新
@@ -398,6 +409,10 @@ class handleCxData extends command
 									      'qrdCode'=>$data['qrdNo'] ,//确认单编号',
 									      'goodType'=>$data['good_type'] ,//商品类型',
 									      'goodBrand'=>$data['brand'] ,//商品品牌',
+									       'companyNo'=>$data['companyNo'] ,//业务公司编号',
+									      'companyName'=>$data['companyName'] ,//业务公司',
+									       'supplierNo'=>$data['supplierNo'] ,//供应商编号',
+									      'supplierName'=>$data['supplier_name'] ,//供应商名称',
 									      'goodModel'=>'' ,//商品型号',
 									      'goodMaterial'=>'' ,//商品材质',
 									      'goodUnit'=>$data['unit'] ,//商品单位',

app/common.php

@@ -712,7 +712,7 @@ if(!function_exists("getUidByDepartId")){
 		$uidArr=Cache::get("Depart_Uid_Arr_$depart_id");
 		if($uidArr==false){
 			$uidArr = Db::connect("mysql_sys")->name("account_item")->where(["itemid"=>$depart_id])->column("account_id");
-			Cache::set("Depart_Uid_Arr_$depart_id",$uidArr);
+			Cache::set("Depart_Uid_Arr_$depart_id",$uidArr, new \DateTime(date("Y-m-d 23:59:59")));
 		}
 		return $uidArr;
 	}