翌星单独页面优化

application/api/controller/YxManufacture.php

@@ -451,6 +451,7 @@ class YxManufacture extends Api
         $machine = db('设备映射表')
             ->where('YXmachine','like','%'.$param['machine'].'%')
             ->value('MNmachine');
+
         $list = \db('工单_工艺资料')
             ->alias('a')
             ->field([
@@ -477,7 +478,7 @@ class YxManufacture extends Api
                 'RTRIM( b.`交货日期` )' => '交货日期',
                 'RTRIM( b.Gd_cpdh )' => '产品代号',
                 'RTRIM( b.`成品代号` )' => '成品代号',
-                'RTRIM( e.YXmachine )' => '设备编号',
+//                'RTRIM( e.YXmachine )' => '设备编号',
                 'RTRIM( a.Gy0_SITE )' => '车间名称',
                 'RTRIM( a.UniqId )' => 'GYUID',
                 'RTRIM( b.Uniqid )' => 'UNIQID',
@@ -490,7 +491,7 @@ class YxManufacture extends Api
             ->join('工单_印件资料 c','c.Yj_Gdbh = a.Gy0_gdbh AND c.yj_Yjno = a.Gy0_yjno')
             ->join('工单_基本资料 b','b.Gd_gdbh = a.Gy0_gdbh AND b.行号 = a.Gy0_yjno')
             ->join('设备_产量计酬 d','a.Gy0_gdbh = d.sczl_gdbh AND a.Gy0_yjno = d.sczl_yjno AND a.Gy0_gxh = d.sczl_gxh AND a.Gy0_sbbh = d.sczl_jtbh','LEFT')
-            ->join('设备映射表 e','d.sczl_jtbh = e.MNmachine')
+//            ->join('设备映射表 e','d.sczl_jtbh = e.MNmachine','LEFT')
             ->where([
                 'b.gd_statu' => '2-生产中',
                 'a.Gy0_sbbh' => ['LIKE','%'.$machine.'%'],
@@ -499,14 +500,16 @@ class YxManufacture extends Api
             ->where($where)
             ->group('a.Gy0_gdbh,a.Gy0_yjno,a.Gy0_gxh')
             ->order('Gy0_sj1')
+//            ->fetchSql(true)
             ->select();
+//        halt($list);
         if (empty($list)){
             $this->success('',[]);
         }
         $data['制程'] = $data['排程'] = [];
         foreach ($list as $key=>$value){
-            $machine = explode(' ',$list[$key]['设备编号']);
-            if (in_array($param['machine'],$machine)){
+//            $machine = explode(' ',$list[$key]['设备编号']);
+//            if (in_array($param['machine'],$machine)){
                 $list[$key]['设备编号'] = $param['machine'];
                 if ((int)$value['yjno'] <10){
                     $value['yjno'] = '0'.rtrim($value['yjno']);
@@ -535,7 +538,7 @@ class YxManufacture extends Api
                 }else{
                     array_push($data['排程'],$list[$key]);
                 }
-            }
+//            }
 
         }