设备工作清单

application/api/controller/Facility.php

@@ -341,7 +341,7 @@ class Facility extends Api
             FROM
                 `工单_工艺资料` AS a
                 JOIN `工单_印件资料` AS d ON a.Gy0_gdbh = d.Yj_Gdbh AND d.yj_Yjno = a.Gy0_yjno
-                JOIN `工单_基本资料` AS b ON b.Gd_gdbh = a.Gy0_gdbh AND b.Gd_cpdh = d.yj_Yjdh
+                JOIN `工单_基本资料` AS b ON b.Gd_gdbh = a.Gy0_gdbh
                 LEFT JOIN `设备_产量计酬` AS e ON e.sczl_gdbh = a.Gy0_gdbh AND e.sczl_yjno = a.Gy0_yjno AND e.sczl_gxh = a.Gy0_gxh
             WHERE
                 b.gd_statu = '2-生产中' 
@@ -2185,7 +2185,7 @@ class Facility extends Api
             }else{
                 $list[$key]['name'] = $value['gxh'].'-'.$value['gxmc'].'【'.$value['add_gxmc'].'】';
             }
-            unset($list[$key]['add_gxmc']);
+            unset( $list[$key]['add_gxmc']);
 //            $list[$key]['time'] = $time;
         }
 //        $list['sys_bh'] = $sys_bh;