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

application/api/controller/Facility.php

@@ -31,30 +31,6 @@ class Facility extends Api
             $this->error('请求错误');
         }
         $data = [];
-//        $department = \db('设备_基本资料')->distinct(true)->column('使用部门');
-//        $date = date('Y-m-d 00:00:00',time()-3888000);
-//        if (empty($department)){
-//            $this->success('未获取到机台数据');
-//        }
-//        foreach ($department as $value){
-//            if (rtrim($value) !== '研发中心'){
-//                $machine = \db('设备_基本资料')->where('使用部门',$value)->field('rtrim(设备编号) as 设备编号,rtrim(设备名称) as 设备名称')->select();
-//                foreach ($machine as $kk=>$vv){
-//                    if ($vv['设备编号'] !== 'ZH01#'){
-//                        $date = \db('设备_产量计酬')
-//                            ->where('sczl_jtbh',$vv['设备编号'])
-////                            ->where('sczl_rq','> time',$date)
-//                            ->distinct(true)
-//                            ->cache(true)
-//                            ->limit(40)
-//                            ->order('UniqId desc')
-//                            ->column('sczl_rq');
-//                        $data[rtrim($value)][$vv['设备编号'].'【'.$vv['设备名称'].'】'] = $date;
-//                    }
-//                }
-//            }
-//        }
-//        $this->success('成功',$data);
         $date = date('Y-m-d 00:00:00',time()-3888000);
         $department = \db('设备_基本资料')
             ->distinct(true)
@@ -80,12 +56,10 @@ class Facility extends Api
         foreach ($department as $value){
             $machine = \db('设备_基本资料')->where('使用部门',$value)->where('使用部门',$value)->field('rtrim(设备编号) as 设备编号,rtrim(设备名称) as 设备名称')->cache(true)->select();
             foreach ($machine as $k=>$v){
-//                $data[rtrim($value)][$k] = $v['设备编号'].'-->'.$v['设备名称'];
                 $data[rtrim($value)][$v['设备编号'].'-->'.$v['设备名称']] = [];
                 foreach ($list as $kk=>$vv){
                     if ($v['设备编号'] === $vv['机台编号']){
                         array_push($data[rtrim($value)][$v['设备编号'].'-->'.$v['设备名称']],date('Y-m-d',strtotime($vv['时间'])));
-//                        array_push($data[rtrim($value)][$v['设备编号'].'-->'.$v['设备名称']],$vv['时间']);
                     }
                 }
             }
@@ -127,7 +101,7 @@ class Facility extends Api
         //工单编号
         $Gd_gdbh = \db('设备_产量计酬')->where($where)->distinct(true)->column('sczl_gdbh');
         //产品名称
-        $productName = \db('工单_基本资料')->whereIn('Gd_gdbh',$Gd_gdbh)->column('Gd_cpmc','Gd_gdbh');
+        $productName = \db('工单_基本资料')->whereIn('Gd_gdbh',$Gd_gdbh)->field('rtrim(Gd_gdbh) as gdbh')->find();
         //组员信息
         $list = \db('设备_产量计酬')->where($where)->field($field)->cache(true,86400)->select();
         $totalA = \db('设备_产量计酬')->where($where)->where('sczl_bzdh','A班')->field('SUM(sczl_cl) as 产量')->select();
@@ -136,7 +110,7 @@ class Facility extends Api
             $this->success('',[]);
         }
         foreach ($list as $key=>$value){
-            $list[$key]['产品名称'] = $value['工单编号'].'---'.$productName[$value['工单编号']];
+            $list[$key]['产品名称'] = $value['工单编号'].'---'.$productName['gdbh'];
             if ($value['yjno']<10){
                 $list[$key]['yjno'] = '0'.$value['yjno'];
             }
@@ -1197,4 +1171,6 @@ class Facility extends Api
         $data['IPQC'] = array_values(array_unique($data['IPQC']));
         $this->success('成功',$data);
     }
+
+    //换型清场
 }