Merge branch 'master' of https://git.7in6.com/Minong/mes-server-api

application/api/controller/LargeWasteRewardPunish.php

@@ -81,10 +81,10 @@ class LargeWasteRewardPunish extends Api
             ->select();
 
         $total = db()->table('db_大废品')->where($where)->count();
-        $gd = db()->table('工单_基本资料')->column('Gd_gdbh, Gd_cpmc');
+        $gd = db()->table('工单_印件资料')->column('Yj_Gdbh, yj_yjmc');
         $rs = db()->table('人事_基本资料')->column('员工编号, 员工姓名');
         foreach ($rows as $key=>$value) {
-            $rows[$key]['Gd_cpmc'] = array_key_exists($value['sczl_gdbh'],$gd) ? sprintf("%02d", $value['sczl_yjno']).'-'.trim($gd[$value['sczl_gdbh']]) : '';
+            $rows[$key]['yj_yjmc'] = array_key_exists($value['sczl_gdbh'],$gd) ? sprintf("%02d", $value['sczl_yjno']).'-'.trim($gd[$value['sczl_gdbh']]) : '';
             $rows[$key]['JL_bh1'] = array_key_exists($value['JL_bh1'],$rs) ? trim($rs[$value['JL_bh1']]) : '';
             $rows[$key]['sczl_bh1'] = array_key_exists($value['sczl_bh1'],$rs) ? trim($rs[$value['sczl_bh1']]) : '';
             $rows[$key]['sczl_bh2'] = array_key_exists($value['sczl_bh2'],$rs) ? trim($rs[$value['sczl_bh2']]) : '';
@@ -118,11 +118,41 @@ class LargeWasteRewardPunish extends Api
         }
 
         $rows = db()->table('db_大废品')->alias('d')
-            ->field('d.*, ')
-            ->join('工单_基本资料 g', 'd.')
-            ->where('d.UniqId',$UniqId)
-            ->select();
-
+            ->field('sczl_gdbh,rtrim(g.Gd_cpmc) as Gd_cpmc,sczl_yjno,rtrim(yj.yj_yjmc) as yj_yjmc,
+            rtrim(sczl_gxmc) as sczl_gxmc,sczl_gxh,rtrim(sczl_numDesc) as sczl_numDesc,LEFT(sczl_rq, 10)
+            as sczl_rq,sczl_cl,sczl_ls,rtrim(sczl_fplxA) as sczl_fplxA,sczl_fplxB,rtrim(责任部门) as 责任部门,
+            rtrim(Jl_bzdh) as Jl_bzdh,jl_jtbh,JL_bh1,JL_bh2,JL_bh3,JL_bh4,JL_bh5,JL_bh6,JL_bh7,JL_bh8,JL_bh9,
+            rtrim(jl1.员工姓名) as jlname1,rtrim(jl2.员工姓名) as jlname2,rtrim(jl3.员工姓名) as jlname3
+            ,rtrim(jl4.员工姓名) as jlname4,rtrim(jl5.员工姓名) as jlname5,rtrim(jl6.员工姓名) as jlname6
+            ,rtrim(jl7.员工姓名) as jlname7,rtrim(jl8.员工姓名) as jlname8,rtrim(jl9.员工姓名) as jlname9
+            ,JL_Je1,JL_Je2,JL_Je3,JL_Je4,JL_Je5,JL_Je6,JL_Je7,JL_Je8,JL_Je9,rtrim(sczl_bzdh) as sczl_bzdh,
+            sczl_jtbh,sczl_bh1,sczl_bh2,sczl_bh3,sczl_bh4,sczl_bh5,sczl_bh6,sczl_bh7,sczl_bh8,sczl_bh9,
+            rtrim(Jl_bzdh) as Jl_bzdh,jl_jtbh,JL_bh1,JL_bh2,JL_bh3,JL_bh4,JL_bh5,JL_bh6,JL_bh7,JL_bh8,JL_bh9,
+            rtrim(zr1.员工姓名) as zrname1,rtrim(zr2.员工姓名) as zrname2,rtrim(zr3.员工姓名) as zrname3
+            ,rtrim(zr4.员工姓名) as zrname4,rtrim(zr5.员工姓名) as zrname5,rtrim(zr6.员工姓名) as zrname6
+            ,rtrim(zr7.员工姓名) as zrname7,rtrim(zr8.员工姓名) as zrname8,rtrim(zr9.员工姓名) as zrname9
+            ,sczl_je1,sczl_je2,sczl_je3,sczl_je4,sczl_je5,sczl_je6,sczl_je7,sczl_je8,sczl_je9')
+           ->join('工单_基本资料 g','g.Gd_gdbh=db_大废品.sczl_gdbh')
+           ->join('工单_印件资料 yj','yj.Yj_Gdbh=db_大废品.sczl_gdbh','LEFT')
+           ->join('人事_基本资料 jl1','jl1.员工编号=db_大废品.JL_bh1','LEFT')
+           ->join('人事_基本资料 jl2','jl2.员工编号=db_大废品.JL_bh2','LEFT')
+           ->join('人事_基本资料 jl3','jl3.员工编号=db_大废品.JL_bh3','LEFT')
+           ->join('人事_基本资料 jl4','jl4.员工编号=db_大废品.JL_bh4','LEFT')
+           ->join('人事_基本资料 jl5','jl5.员工编号=db_大废品.JL_bh5','LEFT')
+           ->join('人事_基本资料 jl6','jl6.员工编号=db_大废品.JL_bh6','LEFT')
+           ->join('人事_基本资料 jl7','jl7.员工编号=db_大废品.JL_bh7','LEFT')
+           ->join('人事_基本资料 jl8','jl8.员工编号=db_大废品.JL_bh8','LEFT')
+           ->join('人事_基本资料 jl9','jl9.员工编号=db_大废品.JL_bh9','LEFT')
+           ->join('人事_基本资料 zr1','zr1.员工编号=db_大废品.sczl_bh1','LEFT')
+           ->join('人事_基本资料 zr2','zr2.员工编号=db_大废品.sczl_bh2','LEFT')
+           ->join('人事_基本资料 zr3','zr3.员工编号=db_大废品.sczl_bh3','LEFT')
+           ->join('人事_基本资料 zr4','zr4.员工编号=db_大废品.sczl_bh4','LEFT')
+           ->join('人事_基本资料 zr5','zr5.员工编号=db_大废品.sczl_bh5','LEFT')
+           ->join('人事_基本资料 zr6','zr6.员工编号=db_大废品.sczl_bh6','LEFT')
+           ->join('人事_基本资料 zr7','zr7.员工编号=db_大废品.sczl_bh7','LEFT')
+           ->join('人事_基本资料 zr8','zr8.员工编号=db_大废品.sczl_bh8','LEFT')
+           ->join('人事_基本资料 zr9','zr9.员工编号=db_大废品.sczl_bh9','LEFT')
+            ->where('d.UniqId',$UniqId)->limit(1)->select();
 
         $this->success('成功',$rows);
     }

application/api/controller/PieceWorkSchedule.php

@@ -151,18 +151,59 @@ class PieceWorkSchedule extends Api
     /**
      * 定位
      * @ApiMethod GET
-     * @params date $data
-     * @params string code
     */
-    public function locate(){
+    public function search(){
         if (Request::instance()->isGet() == false){
             $this->error('非法请求');
         }
-        $params = Request::instance()->param();
-        if (!isset($params['code']) || !isset($params['date'])){
+        $req = Request::instance()->param();
+        if (!isset($req['search']) || !isset($req['date'])){
             $this->error('参数错误');
         }
-        halt($params);
+        $page = 1;
+        $limit = 10;
+        if (isset($req['page']) && !empty($req['page'])) $page = $req['page'];
+        if (isset($req['limit']) && !empty($req['limit'])) $limit = $req['limit'];
+        $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';
+        }
+        $yg = db()->table('人事_基本资料')->where('员工姓名',$req['search'])->value('员工编号');
+        if($yg){
+            $req['search']=$yg;
+        }
+        $rows = db()->table('db_wgjs1')
+        ->field('LEFT(wgjs_rq, 10) as wgjs_rq, 
+        wgjs_bh1,rs1.所在部门, CAST(wgjs_js1 AS SIGNED) as wgjs_js1, rtrim(wgjs_yy1) as wgjs_yy1, 
+        wgjs_bh2, CAST(wgjs_js2 AS SIGNED) as wgjs_js2, rtrim(wgjs_yy2) as wgjs_yy2, 
+        wgjs_bh3, CAST(wgjs_js3 AS SIGNED) as wgjs_js3, rtrim(wgjs_yy3) as wgjs_yy3, 
+        wgjs_bh4, CAST(wgjs_js4 AS SIGNED) as wgjs_js4, rtrim(wgjs_yy4) as wgjs_yy4, 
+        wgjs_bh5, CAST(wgjs_js5 AS SIGNED) as wgjs_js5, rtrim(wgjs_yy5) as wgjs_yy5, 
+        wgjs_bh6, CAST(wgjs_js6 AS SIGNED) as wgjs_js6, rtrim(wgjs_yy6) as wgjs_yy6,
+        rtrim(rs1.员工姓名) as name1,rtrim(rs2.员工姓名) as name2,rtrim(rs3.员工姓名)
+        as name3,rtrim(rs4.员工姓名) as name4,rtrim(rs5.员工姓名) as name5,rtrim(rs6.员工姓名)
+        as name6')
+        ->join('人事_基本资料 rs1','rs1.员工编号=db_wgjs1.wgjs_bh1','LEFT')
+        ->join('人事_基本资料 rs2','rs2.员工编号=db_wgjs1.wgjs_bh2','LEFT')
+        ->join('人事_基本资料 rs3','rs3.员工编号=db_wgjs1.wgjs_bh3','LEFT')
+        ->join('人事_基本资料 rs4','rs4.员工编号=db_wgjs1.wgjs_bh4','LEFT')
+        ->join('人事_基本资料 rs5','rs5.员工编号=db_wgjs1.wgjs_bh5','LEFT')
+        ->join('人事_基本资料 rs6','rs6.员工编号=db_wgjs1.wgjs_bh6','LEFT')
+        ->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh1'=>$req['search']])
+        ->select();
+        $total = db()->table('db_wgjs1')->where(['wgjs_rq'=>['between',"$start_time,$end_time"],'wgjs_bh1'=>$req['search']])->count();
+        $data = ['total'=> $total,'rows'=> $rows];
+        if($rows){
+            $this->success('成功',$data);
+         }else{
+            $this->error('失败');
+         }
     }
     /**
      * 详情
@@ -192,9 +233,9 @@ class PieceWorkSchedule extends Api
         wgjs_bh4, CAST(wgjs_js4 AS SIGNED) as wgjs_js4, rtrim(wgjs_yy4) as wgjs_yy4, 
         wgjs_bh5, CAST(wgjs_js5 AS SIGNED) as wgjs_js5, rtrim(wgjs_yy5) as wgjs_yy5, 
         wgjs_bh6, CAST(wgjs_js6 AS SIGNED) as wgjs_js6, rtrim(wgjs_yy6) as wgjs_yy6,
-        rs1.员工姓名 as name1,rs2.员工姓名 as name2,rs3.员工姓名 as name3,rs4.员工姓名
-        as name4,rs5.员工姓名 as name5,rs6.员工姓名 as name6,wgjs_冲定额1,wgjs_冲定额2
-        ,wgjs_冲定额3,wgjs_冲定额4,wgjs_冲定额5,wgjs_冲定额6')
+        rtrim(rs1.员工姓名) as name1,rtrim(rs2.员工姓名) as name2,rtrim(rs3.员工姓名)
+        as name3,rtrim(rs4.员工姓名) as name4,rtrim(rs5.员工姓名) as name5,rtrim(rs6.员工姓名)
+        as name6,wgjs_冲定额1,wgjs_冲定额2,wgjs_冲定额3,wgjs_冲定额4,wgjs_冲定额5,wgjs_冲定额6')
         ->join('人事_基本资料 rs1','rs1.员工编号=db_wgjs1.wgjs_bh1','LEFT')
         ->join('人事_基本资料 rs2','rs2.员工编号=db_wgjs1.wgjs_bh2','LEFT')
         ->join('人事_基本资料 rs3','rs3.员工编号=db_wgjs1.wgjs_bh3','LEFT')
@@ -273,8 +314,7 @@ class PieceWorkSchedule extends Api
         //开启事务
         db()->startTrans();
         try{
-            $sql = db()->table('db_wgjs1')->where(['wgjs_rq'=>$req['wgjs_rq'],'wgjs_bh1'=>$req['wgjs_bh1']])
-            ->fetchSql(true)->insert($req);
+            $sql = db()->table('db_wgjs1')->fetchSql(true)->insert($req);
             $res= db()->query($sql);
             // 提交事务
             db()->commit();

application/api/controller/WorkOrderSpotCheck.php

@@ -133,14 +133,61 @@ class WorkOrderSpotCheck extends Api
         }
 
         $rows = db()->table('db_抽检记录1')
-        ->field('Sczl_bh,rs.员工姓名 as name,sczl_bzdh,LEFT(Sczl_rq, 10) as Sczl_rq,Sczl_gdbh,g.Gd_cpmc,
-        Sczl_gxmc,sczl_gxh,Sczl_num,Sczl_抽检数,Sczl_A类废,Sczl_B类废,Sczl_C类废,Sczl_desc')
+        ->field('Sczl_bh,rtrim(rs.员工姓名) as name,rtrim(sczl_bzdh) as sczl_bzdh ,LEFT(Sczl_rq, 10) as Sczl_rq,
+        Sczl_gdbh,rtrim(g.Gd_cpmc) as Gd_cpmc, rtrim(Sczl_gxmc) as Sczl_gxmc,sczl_gxh,Sczl_num,Sczl_抽检数,
+        Sczl_A类废,Sczl_B类废,Sczl_C类废,rtrim(Sczl_desc) as Sczl_desc')
         ->join('人事_基本资料 rs','rs.员工编号=db_抽检记录1.Sczl_bh','LEFT')
         ->join('工单_基本资料 g','g.Gd_gdbh=db_抽检记录1.Sczl_gdbh','LEFT')
-        ->where('db_抽检记录1.UniqId',$UniqId)->select();
+        ->where('db_抽检记录1.UniqId',$UniqId)->limit(1)->select();
 
+        if($rows){
+            $this->success('成功',$rows);
+        }else{
+            $this->error('失败');
+        }
+        
+    }
+    /**
+     * 定位
+     * @ApiMethod (GET)
+     */
+    public function search()
+    {
+        //get请求
+        if(!$this->request->isGet()){
+            $this->error('请求方式错误');
+        }
+        $req = $this->request->param();
+        if (isset($req['search']) && !empty($req['search'])){
+            $search = $req['search'];
+        }else{
+            $this->error('参数错误');
+        }
+        $page = 1;
+        $limit = 10;
+        if (isset($req['page']) && !empty($req['page'])) $page = $req['page'];
+        if (isset($req['limit']) && !empty($req['limit'])) $limit = $req['limit'];
 
-        $this->success('成功',$rows);
+        $gd = db()->table('工单_基本资料')->where('Gd_cpmc',$search)->value('Gd_gdbh');
+        if($gd){
+            $search=$gd;
+        }
+        $rows = db()->table('db_抽检记录1')
+        ->field('Sczl_bh,sczl_yjno,rtrim(rs.员工姓名) as name,LEFT(Sczl_rq, 10) as Sczl_rq,
+        Sczl_gdbh,rtrim(g.Gd_cpmc) as Gd_cpmc, rtrim(Sczl_gxmc) as Sczl_gxmc,sczl_gxh,Sczl_num,Sczl_抽检数,
+        Sczl_A类废,Sczl_B类废,Sczl_C类废,rtrim(Sczl_desc) as Sczl_desc,rtrim(db_抽检记录1.Sys_id) as Sys_id,
+        db_抽检记录1.Sys_rq,db_抽检记录1.Mod_rq,db_抽检记录1.UniqId')
+        ->join('人事_基本资料 rs','rs.员工编号=db_抽检记录1.Sczl_bh','LEFT')
+        ->join('工单_基本资料 g','g.Gd_gdbh=db_抽检记录1.Sczl_gdbh','LEFT')
+        ->where('db_抽检记录1.Sczl_gdbh',$search)
+        ->page($page,$limit)->select();
+        $total = db()->table('db_抽检记录1')->where('db_抽检记录1.Sczl_gdbh',$search)->count();
+        $data = ['total'=> $total,'rows'=> $rows];
+         if($rows){
+            $this->success('成功',$data);
+         }else{
+            $this->error('失败');
+         }
     }
     /**
      * 修改
@@ -157,15 +204,18 @@ class WorkOrderSpotCheck extends Api
         }else{
             $this->error('参数错误');
         }
-
-        $req['wgjs_rq'] = $req['wgjs_rq'].' 00:00:00';
-        $req['mod_rq'] = date('Y-m-d H:i:s');
+        if (isset($req['Sczl_gxmc']) && !empty($req['Sczl_gxmc'])){
+            $req['sczl_gxh'] = explode('-',$req['Sczl_gxmc'])[1];
+        }
+        if (isset($req['Sczl_rq']) && !empty($req['Sczl_rq'])){
+            $req['Sczl_rq'] = $req['Sczl_rq'].' 00:00:00';
+        }
+        $req['Mod_rq'] = date('Y-m-d H:i:s');
 
         //开启事务
         db()->startTrans();
         try{
-            $sql = db()->table('db_wgjs1')->where(['wgjs_rq'=>$req['wgjs_rq'],'wgjs_bh1'=>$req['wgjs_bh1']])
-            ->fetchSql(true)->update($req);
+            $sql = db()->table('db_抽检记录1')->where('UniqId',$UniqId)->fetchSql(true)->update($req);
             $res= db()->query($sql);
             // 提交事务
             db()->commit();
@@ -190,20 +240,22 @@ class WorkOrderSpotCheck extends Api
         }
 
         $req = $this->request->param();
-        if (isset($req['UniqId']) && !empty($req['UniqId'])){
-            $UniqId = $req['UniqId'];
+        if (isset($req) && !empty($req)){
         }else{
             $this->error('参数错误');
         }
-
-        $req['wgjs_rq'] = $req['wgjs_rq'].' 00:00:00';
-        $req['sys_rq'] = date('Y-m-d H:i:s');
+        if (isset($req['Sczl_gxmc']) && !empty($req['Sczl_gxmc'])){
+            $req['sczl_gxh'] = explode('-',$req['Sczl_gxmc'])[1];
+        }
+        if (isset($req['Sczl_rq']) && !empty($req['Sczl_rq'])){
+            $req['Sczl_rq'] = $req['Sczl_rq'].' 00:00:00';
+        }
+        $req['Sys_rq'] = date('Y-m-d H:i:s');
 
         //开启事务
         db()->startTrans();
         try{
-            $sql = db()->table('db_wgjs1')->where(['wgjs_rq'=>$req['wgjs_rq'],'wgjs_bh1'=>$req['wgjs_bh1']])
-            ->fetchSql(true)->insert($req);
+            $sql = db()->table('db_抽检记录1')->fetchSql(true)->insert($req);
             $res= db()->query($sql);
             // 提交事务
             db()->commit();