机台工单显示优化

application/api/controller/Manufacture.php

@@ -825,7 +825,7 @@ class Manufacture extends Api
                 'RTRIM( b.`销售订单号` )' => '销售订单号',
             ])
             ->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('工单_基本资料 b','b.Gd_gdbh = a.Gy0_gdbh')
             ->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')
             ->where([
                 'b.gd_statu' => '2-生产中',

application/api/controller/ProductionLot.php

@@ -79,12 +79,12 @@ class ProductionLot extends Api
         foreach ($list as $key => $value){
             $list[$key]['流程单'] = '第'.$value['num'].'个流程单';
         }
-        $cpmc = db('工单_基本资料')
-            ->where('Gd_gdbh',$param['gdbh'])
-            ->where('行号',$param['yjno'])
-            ->column('Gd_cpmc')[0];
-        $data[$param['gdbh'].'-'.$cpmc]['印件'.$param['yjno']] = $list;
-        $this->success('成功',$data);
+//        $cpmc = db('工单_基本资料')
+//            ->where('Gd_gdbh',$param['gdbh'])
+//            ->where('行号',$param['yjno'])
+//            ->column('Gd_cpmc')[0];
+//        $data[$param['gdbh'].'-'.$cpmc]['印件'.$param['yjno']] = $list;
+        $this->success('成功',$list);
     }
 
     /**