su 1 жил өмнө
parent
commit
ddbb384e82

+ 21 - 28
application/api/controller/EmployeeDailySalary.php

@@ -44,31 +44,22 @@ class EmployeeDailySalary extends Api
         ->order('sys_rq desc')
         ->limit(15)
         ->column("DATE_FORMAT(`sys_rq`, '%Y%m')");
-        // $row = db()->table('绩效工资汇总')
-        // ->field('sys_ny,人事_基本资料.所在部门')
-        // ->join('人事_基本资料','人事_基本资料.员工编号=绩效工资汇总.bh','LEFT')
-        // ->group('sys_ny,人事_基本资料.所在部门')
-        // ->where(['sys_ny'=>['between',"$rows[14],$rows[0]"]])
-        // ->order('sys_ny desc')
-        // ->fetchSql(true)
-        // ->select();
-        foreach($rows as $k=>$v){
-            $res[$k]['ny']=$v;
-            $res[$k]['bh']=db()->table('绩效工资汇总')
-            ->group('bh')
-            ->where('sys_ny',$v)
-            ->column('bh');
+        $res=db()->table('绩效工资汇总')
+            ->field('sys_ny,bh')
+            ->group('sys_ny,bh')
+            ->where(['sys_ny'=>['between',"$rows[14],$rows[0]"]])
+            ->order('sys_ny desc')
+            ->select();
+        foreach($res as $v){
+            $arr[$v['sys_ny'].'-'][]=$v['bh'];
         }
         $rs = db()->table('人事_基本资料')->column('员工编号,所在部门');
-        foreach($res as $k=>$v){
-            foreach($v['bh'] as $value){
-                $res[$k]['bm'][]=rtrim($rs[$value]);
+        foreach($arr as $k=>$v){
+            foreach($v as $key=>$value){
+                $data[$k][$key]=rtrim($rs[$value]);
             }
-        }
-        foreach($res as &$v){
-            unset($v['bh']);
-            $v['bm']=array_unique($v['bm']);
-            usort($v['bm'], function($a, $b) {
+            $data[$k]=array_unique($data[$k]);
+            usort($data[$k], function($a, $b) {
                 $order = array(
                     '胶印车间',
                     '凹印车间',
@@ -86,13 +77,15 @@ class EmployeeDailySalary extends Api
                 return $a_index - $b_index;
             });
         }
-        foreach($res as $k=>$v){
-            $data[$k]['lable']=$v['ny'];
-            foreach($v['bm'] as $value){
-                $data[$k]['children'][]['lable']=$value;
+        $i=0;
+        foreach($data as $k=>$v){
+            $datas[$i]['lable']=str_replace('-','',$k);
+            foreach($v as $value){
+                $datas[$i]['children'][]['lable']=$value;
             }
+            $i++;
         }
-        $this->success('成功',$data);
+        $this->success('成功',$datas);
     }
     
 
@@ -111,7 +104,7 @@ class EmployeeDailySalary extends Api
         $req = $this->request->param();
         $res=db()->table('绩效工资汇总')
             ->join('人事_基本资料','人事_基本资料.员工编号=绩效工资汇总.bh','LEFT')
-            ->field('bh,xm as 员工姓名,LEFT(sczl_rq, 10) as sczl_rq,sum(个人计件工资) as 计件工资,
+            ->field('bh,rtrim(xm) as 员工姓名,LEFT(sczl_rq, 10) as sczl_rq,sum(个人计件工资) as 计件工资,
             sum(个人加班工资) as 加班工资,(sum(个人计件工资)+sum(个人加班工资)) as 日工资合计')
             ->group('绩效工资汇总.bh,LEFT(sczl_rq, 10)')
             ->where('sys_ny',$req['date'])

+ 37 - 3
application/api/controller/LargeWasteRewardPunish.php

@@ -45,6 +45,29 @@ class LargeWasteRewardPunish extends Api
         $this->success('成功',$rows);
     }
 
+    /**
+     * 获取工序大废品惩奖侧边栏根据工单
+     * @ApiMethod (GET)
+     */
+    public function getTabByGd()
+    {
+        //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        $rows = db()->table('db_大废品')
+            ->field('sczl_gdbh,rtrim(g.成品名称) as 成品名称')
+            ->join('工单_基本资料 g','g.Gd_gdbh=db_大废品.sczl_gdbh','LEFT')
+            ->group('sczl_gdbh')
+            ->whereTime('db_大废品.sys_rq', '>=', strtotime('-60 days'))
+            ->order('sczl_gdbh desc')
+            ->select();
+        foreach($rows as $key=>$value){
+            $data[$key]['lable']=$value['sczl_gdbh'].' 【'.$value['成品名称'].'】';
+            $data[$key]['sczl_gdbh']=$value['sczl_gdbh'];
+        }
+        $this->success('成功',$data);
+    }
     /**
      * 获取工序大废品惩奖列表
      * @ApiMethod (GET)
@@ -69,8 +92,19 @@ class LargeWasteRewardPunish extends Api
         }else{
             $this->error('参数错误');
         }
-
-        $rows = db()->table('db_大废品')
+        $res = db()->table('db_大废品')
+        ->field('sczl_gdbh, LEFT(sczl_rq, 10) as sczl_rq, rtrim(sczl_numDesc) as sczl_numDesc, sczl_ls, sczl_yjno, 
+        rtrim(责任部门) as 责任部门, CAST(sczl_cl AS SIGNED) as sczl_cl, 
+        rtrim(sczl_fplxA) as sczl_fplxA, sczl_fplxB, Jl_bzdh, JL_bh1, 
+        sczl_bzdh, sczl_bh1, sczl_bh2, rtrim(sys_id) as sys_id, sys_rq, UniqId')
+        ->where('sczl_gdbh',$req['date'])
+        ->order('UniqId desc')
+        ->page($page,$limit)
+        ->select();
+        if($res){
+            $rows=$res;
+        }else{
+            $rows = db()->table('db_大废品')
             ->field('sczl_gdbh, LEFT(sczl_rq, 10) as sczl_rq, rtrim(sczl_numDesc) as sczl_numDesc, sczl_ls, sczl_yjno, 
             rtrim(责任部门) as 责任部门, CAST(sczl_cl AS SIGNED) as sczl_cl, 
             rtrim(sczl_fplxA) as sczl_fplxA, sczl_fplxB, Jl_bzdh, JL_bh1, 
@@ -79,7 +113,7 @@ class LargeWasteRewardPunish extends Api
             ->order('UniqId desc')
             ->page($page,$limit)
             ->select();
-
+        }
         $total = db()->table('db_大废品')->where($where)->count();
         $gd = db()->table('工单_印件资料')->column('Yj_Gdbh, yj_yjmc');
         $rs = db()->table('人事_基本资料')->column('员工编号, 员工姓名');

+ 353 - 0
application/api/controller/OvertimeVerification.php

@@ -0,0 +1,353 @@
+<?php
+
+namespace app\api\controller;
+
+use app\common\controller\Api;
+use \think\Request;
+use \think\Db;
+/**
+ * 计件员工加班费核查接口
+ */
+class OvertimeVerification extends Api
+{
+    protected $noNeedLogin = ['*'];
+    protected $noNeedRight = ['*'];
+
+    /**
+     * 首页
+     *
+     */
+    public function index()
+    {
+        $this->success('请求成功');
+    }
+
+    /**
+     * 计件员工加班费核查侧边栏
+     * @ApiMethod (GET)
+     */
+    public function getTab()
+    {
+        //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        // $rows = db()->table('绩效工资汇总')
+        // ->whereTime('sczl_rq', '>=', strtotime('-15 months'))
+        // ->group('sys_ny')
+        // ->order('sys_ny desc')
+        // ->limit(15)
+        // ->column('sys_ny');
+        $rows = db()->table('db_大废品')
+        ->whereTime('sys_rq', '>=', strtotime('-15 months'))
+        ->group("DATE_FORMAT(`sys_rq`, '%Y%m')")
+        ->order('sys_rq desc')
+        ->limit(15)
+        ->column("DATE_FORMAT(`sys_rq`, '%Y%m')");
+        $res=db()->table('绩效工资汇总')
+            ->field('sys_ny,bh')
+            ->group('sys_ny,bh')
+            ->where(['sys_ny'=>['between',"$rows[14],$rows[0]"]])
+            ->order('sys_ny desc')
+            ->select();
+        foreach($res as $v){
+            $arr[$v['sys_ny'].'('][]=$v['bh'];
+        }
+        $rs = db()->table('人事_基本资料')->column('员工编号,所在部门');
+        foreach($arr as $k=>$v){
+            foreach($v as $value){
+                $data[$k.count($v).'人)'][rtrim($rs[$value])][]=rtrim($rs[$value]);
+            }
+            $j=0;
+            foreach($data[$k.count($v).'人)'] as $keys=>$values){
+                $data[$k.count($v).'人)']['bm'][$j]=$keys;
+                $data[$k.count($v).'人)'][$keys]=count($values);
+                $j++;
+            }
+            usort($data[$k.count($v).'人)']['bm'], function($a, $b) {
+                $order = array(
+                    '胶印车间',
+                    '凹印车间',
+                    '丝印车间',
+                    '模切车间',
+                    '检验车间',
+                    '精品试验车间',
+                    '品保部',
+                    '人力资源部',
+                    '生产部',
+                    '营销部'
+                );
+                $a_index = array_search($a, $order);
+                $b_index = array_search($b, $order);
+                return $a_index - $b_index;
+            });
+            foreach($data[$k.count($v).'人)']['bm'] as &$va){
+                $va=$va.'('.$data[$k.count($v).'人)'][$va].'人)';
+            }
+            $data[$k.count($v).'人)']=$data[$k.count($v).'人)']['bm'];
+        }
+        $i=0;
+        foreach($data as $k=>$v){
+            $datas[$i]['lable']=$k;
+            foreach($v as $value){
+                $datas[$i]['children'][]['lable']=$value;
+            }
+            $i++;
+        }
+        $this->success('成功',$datas);
+    }
+    
+
+    /**
+     * 计件员工加班费核查上侧列表
+     * @ApiMethod (GET)
+     * @param string $date 年月
+     * @param string $department 部门
+     */
+    public function getList()
+    {
+        //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        $req = $this->request->param();
+        $res=db()->table('绩效工资汇总')
+            ->join('人事_基本资料','人事_基本资料.员工编号=绩效工资汇总.bh','LEFT')
+            ->field('bh,rtrim(xm) as 员工姓名,人事_基本资料.工资表类别,LEFT(人事_基本资料.聘用日期, 10) as 聘用日期,法定天数,
+            sum(日定额) as 当月定额,(sum(班组车头产量*工序难度系数)+sum(班组换算产量)) as 月度合计产量,sum(个人计件工资) as 个人计件工资,
+            sum(个人加班工资) as 个人加班工资,sum(计时补差额工资) as 计时补差,LEFT(sczl_rq, 7) as sczl_rq')
+            ->group('绩效工资汇总.bh')
+            ->where('sys_ny',$req['date'])
+            ->where('人事_基本资料.所在部门',$req['department'])
+            ->select();
+        if(!$res){
+            $this->error('失败');
+        }
+        $year=substr($req['date'],0,4);
+        $month=substr($req['date'],-2);
+        if($month==12){
+            $start_time=$year.'-12-01 00:00:00';
+            $end_time=($year+1).'-01-01 00:00:00';
+        }else{
+            $start_time=$year.'-'.$month.'-01 00:00:00';
+            $end_time=$year.'-'.($month+1).'-01 00:00:00';
+        }
+        $res1=db()->table('db_wgjs1')
+        ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh1 as wgjs_bh,wgjs_js1 as wgjs_js')
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh1','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->select();
+        $res2=db()->table('db_wgjs1')
+        ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh2 as wgjs_bh,wgjs_js2 as wgjs_js')
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh2','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->select();
+        $res3=db()->table('db_wgjs1')
+        ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh3 as wgjs_bh,wgjs_js3 as wgjs_js')
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh3','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->select();
+        $res4=db()->table('db_wgjs1')
+        ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh4 as wgjs_bh,wgjs_js4 as wgjs_js')
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh4','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->select();
+        $res5=db()->table('db_wgjs1')
+        ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh5 as wgjs_bh,wgjs_js5  as wgjs_js')
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh5','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->select();
+        $res6=db()->table('db_wgjs1')
+        ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh6 as wgjs_bh,wgjs_js6 as wgjs_js')
+        ->join('人事_基本资料','人事_基本资料.员工编号=db_wgjs1.wgjs_bh6','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'人事_基本资料.所在部门'=>$req['department']])
+        ->select();
+        $arr=array_merge($res1,$res2,$res3,$res4,$res5,$res6);
+        foreach($arr as $v){
+            if(isset($list[$v['wgjs_rq']][$v['wgjs_bh']])){
+                $list[$v['wgjs_rq']][$v['wgjs_bh']]+=$v['wgjs_js'];
+            }else{
+                $list[$v['wgjs_rq']][$v['wgjs_bh']]=$v['wgjs_js'];
+            }
+        }
+        foreach($res as &$v){
+            $v['聘用日期']=str_replace('-','.',$v['聘用日期']);
+            if(isset($list[$v['sczl_rq']][$v['bh']])){
+                $v['月计时时数']=$list[$v['sczl_rq']][$v['bh']];
+            }else{
+                $v['月计时时数']='';
+            }  
+            unset($v['sczl_rq']);
+        }
+        $this->success('成功',$res);
+    }
+    /**
+     * 计件员工加班费核查下侧列表
+     * @ApiMethod (GET)
+     * @param string $date 年月
+     * @param string $code 员工编号
+     */
+    public function getAllList()
+    {
+        //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        $req = $this->request->param();
+        $res=db()->table('绩效工资汇总')
+            ->field('LEFT(sczl_rq, 10) as sczl_rq,sczl_gdbh,rtrim(g.Gd_cpmc) as Gd_cpmc,sczl_yjno,sczl_gxh,sczl_type,
+            sczl_jtbh,sum(班组车头产量) as 班组车头产量,工序难度系数 as 产量系数,(sum(班组车头产量*工序难度系数)) as 计件产量,
+            sum(班组换算产量) as 补产产量,(sum(班组车头产量*工序难度系数)+sum(班组换算产量)) as 核算产量,日定额,sum(达标定额)
+            as 达标定额,千件工价,补产标准,sum(个人计件工资) as 个人计件工资,sum(个人加班工资) as 个人加班工资,Rate as 个人比例,
+            sum(装版工时) as 装版工时,sum(保养工时) as 保养工时,sum(打样工时) as 打样工时,sum(计时补差额工资) as 计时补差')
+            ->join('工单_基本资料 g','g.Gd_gdbh=绩效工资汇总.sczl_gdbh','LEFT')
+            ->group('LEFT(sczl_rq, 10),sczl_gdbh')
+            ->where(['sys_ny'=>$req['date'],'bh'=>$req['code']])
+            ->select();
+        if(!$res){
+            $this->error('失败');
+        }
+        foreach($res as &$v){
+            $v['sczl_rq']=str_replace('-','.',$v['sczl_rq']);
+            if($v['sczl_yjno']>9){
+                $sczl_yjno=$v['sczl_yjno'];
+            }else{
+                $sczl_yjno='0'.$v['sczl_yjno'];
+            }
+            unset($v['sczl_yjno']);
+            if($v['sczl_gxh']>9){
+                $sczl_gxh=$v['sczl_gxh'];
+            }else{
+                $sczl_gxh='0'.$v['sczl_gxh'];
+            }
+            unset($v['sczl_gxh']);
+            $v['sczl_type']=$sczl_yjno.'-'.$sczl_gxh.'-->'.$v['sczl_type'];
+        }
+        $this->success('成功',$res);
+    }
+     /**
+     * 计件员工加班费核查详情
+     * @ApiMethod (GET)
+     * @param string $date 日期
+     * @param string $code 员工编号
+     */
+    public function getDetail()
+    {
+        //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        $req = $this->request->param();
+        $start_time=$req['date'].' 00:00:00';
+        $end_time=$req['date'].' 23:59:59';
+        $res=db()->table('绩效工资汇总')
+           ->field('LEFT(sczl_rq, 10) as sczl_rq,sczl_gdbh,rtrim(g.Gd_cpmc) as Gd_cpmc,sczl_yjno,sczl_gxh,sczl_type,
+            sczl_jtbh,sum(班组车头产量) as 班组车头产量,工序难度系数 as 产量系数,(sum(班组车头产量*工序难度系数)) as 计件产量,
+            sum(班组换算产量) as 补产产量,(sum(班组车头产量*工序难度系数)+sum(班组换算产量)) as 核算产量,日定额,sum(达标定额)
+            as 达标定额,千件工价,补产标准,sum(个人计件工资) as 个人计件工资,sum(个人加班工资) as 个人加班工资,Rate as 个人比例,
+            sum(装版工时) as 装版工时,sum(保养工时) as 保养工时,sum(打样工时) as 打样工时,sum(计时补差额工资) as 计时补差')
+            ->join('工单_基本资料 g','g.Gd_gdbh=绩效工资汇总.sczl_gdbh','LEFT')
+            ->group('LEFT(sczl_rq, 10),sczl_gdbh')
+            ->where(['sczl_rq'=>['between',"$start_time,$end_time"],'bh'=>$req['code']])
+            ->select();
+        if(!$res){
+            $this->error('失败');
+        }
+        foreach($res as &$v){
+            $v['sczl_rq']=str_replace('-','.',$v['sczl_rq']);
+            if($v['sczl_yjno']>9){
+                $sczl_yjno=$v['sczl_yjno'];
+            }else{
+                $sczl_yjno='0'.$v['sczl_yjno'];
+            }
+            unset($v['sczl_yjno']);
+            if($v['sczl_gxh']>9){
+                $sczl_gxh=$v['sczl_gxh'];
+            }else{
+                $sczl_gxh='0'.$v['sczl_gxh'];
+            }
+            unset($v['sczl_gxh']);
+            $v['sczl_type']=$sczl_yjno.'-'.$sczl_gxh.'-->'.$v['sczl_type'];
+        }
+        $this->success('成功',$res);
+    }
+    /**
+     * 定位
+     * @ApiMethod GET
+    */
+    public function search(){
+      
+        //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        $req = $this->request->param();
+        $yg = db()->table('人事_基本资料')->where('员工姓名',$req['search'])->value('员工编号');
+        if($yg){
+            $req['search']=$yg;
+        }
+        $res=db()->table('绩效工资汇总')
+            ->join('人事_基本资料','人事_基本资料.员工编号=绩效工资汇总.bh','LEFT')
+            ->field('bh,rtrim(xm) as 员工姓名,人事_基本资料.工资表类别,LEFT(人事_基本资料.聘用日期, 10) as 聘用日期,法定天数,
+            sum(日定额) as 当月定额,(sum(班组车头产量*工序难度系数)+sum(班组换算产量)) as 月度合计产量,sum(个人计件工资) as 个人计件工资,
+            sum(个人加班工资) as 个人加班工资,sum(计时补差额工资) as 计时补差,LEFT(sczl_rq, 7) as sczl_rq')
+            ->group('绩效工资汇总.bh')
+            ->where('sys_ny',$req['date'])
+            ->where('bh',$req['search'])
+            ->select();
+        if(!$res){
+            $this->error('失败');
+        }
+        $year=substr($req['date'],0,4);
+        $month=substr($req['date'],-2);
+        if($month==12){
+            $start_time=$year.'-12-01 00:00:00';
+            $end_time=($year+1).'-01-01 00:00:00';
+        }else{
+            $start_time=$year.'-'.$month.'-01 00:00:00';
+            $end_time=$year.'-'.($month+1).'-01 00:00:00';
+        }
+        $res1=db()->table('db_wgjs1')
+        ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh1 as wgjs_bh,wgjs_js1 as wgjs_js')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh1'=>$req['search']])
+        ->select();
+        $res2=db()->table('db_wgjs1')
+        ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh2 as wgjs_bh,wgjs_js2 as wgjs_js')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh2'=>$req['search']])
+        ->select();
+        $res3=db()->table('db_wgjs1')
+        ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh3 as wgjs_bh,wgjs_js3 as wgjs_js')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh3'=>$req['search']])
+        ->select();
+        $res4=db()->table('db_wgjs1')
+        ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh4 as wgjs_bh,wgjs_js4 as wgjs_js')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh4'=>$req['search']])
+        ->select();
+        $res5=db()->table('db_wgjs1')
+        ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh5 as wgjs_bh,wgjs_js5  as wgjs_js')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh5'=>$req['search']])
+        ->select();
+        $res6=db()->table('db_wgjs1')
+        ->field('LEFT(wgjs_rq, 7) as wgjs_rq,wgjs_bh6 as wgjs_bh,wgjs_js6 as wgjs_js')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh6'=>$req['search']])
+        ->select();
+        $arr=array_merge($res1,$res2,$res3,$res4,$res5,$res6);
+        foreach($arr as $v){
+            if(isset($list[$v['wgjs_rq']][$v['wgjs_bh']])){
+                $list[$v['wgjs_rq']][$v['wgjs_bh']]+=$v['wgjs_js'];
+            }else{
+                $list[$v['wgjs_rq']][$v['wgjs_bh']]=$v['wgjs_js'];
+            }
+        }
+        foreach($res as &$v){
+            $v['聘用日期']=str_replace('-','.',$v['聘用日期']);
+            if(isset($list[$v['sczl_rq']][$v['bh']])){
+                $v['月计时时数']=$list[$v['sczl_rq']][$v['bh']];
+            }else{
+                $v['月计时时数']='';
+            }  
+            unset($v['sczl_rq']);
+        }
+        $this->success('成功',$res);
+    }
+}