设备制程清单列表，计划开工时间

application/api/controller/Facility.php

@@ -335,10 +335,10 @@ class Facility extends Api
                 LEFT JOIN `设备_产量计酬` AS e ON e.sczl_gdbh = a.Gd_gdbh AND e.sczl_jtbh = b.Gy0_sbbh
             WHERE
                 a.gd_statu = '2-生产中' 
-                AND a.`行号` = '1' 
                 AND b.Gy0_sbbh = '{$machine}' 
                 AND b.PD_WG = '1900-01-01 00:00:00' 
                 AND b.Gy0_sj1 <> '1900-01-01 00:00:00'
+                AND b.Gy0_sj1 < '2099-01-01 00:00:00'
             GROUP BY a.Gd_gdbh
             ORDER BY b.Gy0_sj1";
         $orderList = Db::query($sql);

application/api/controller/Manufacture.php

@@ -656,34 +656,36 @@ class Manufacture extends Api
             $this->error('参数错误');
         }
         $machine = $param['machine'];
-        $list = \db('工单_工艺资料')
+        $list = \db('工单_基本资料')
             ->alias('a')
             ->field([
-                'rtrim(a.Gy0_gdbh)' => '工单编号',
-                'rtrim(a.Gy0_计划接货数)' => '计划接货数',
-                'rtrim(a.Gy0_小时产能)' => '小时产能',
-                'rtrim(a.Gy0_生产工时)' => '生产工时',
-                'rtrim(a.Gy0_辅助工时)' => '辅助工时',
-                'rtrim(a.Gy0_班次安排)' => '班次安排',
-                'rtrim(a.工序备注)' => '排单备注',
-                'rtrim(a.Gy0_最早开工时间)' => '最早开工时间',
-                'rtrim(a.Gy0_sj1)' => '计划开工时间',
-                'rtrim(a.Gy0_sj2)' => '计划完工时间',
-                'rtrim(a.Gy0_yjno)' => 'yjno',
-                'rtrim(a.Gy0_gxh)' => 'gxh',
-                'rtrim(a.Gy0_gxmc)' => 'gxmc',
-                'rtrim(a.Gy0_ls)' => 'ls',
-                'rtrim(a.UniqId)' => 'UniqId',
-                'SUM(b.sczl_cl)' => '已完成'
+                'rtrim(b.Gy0_gdbh)' => '工单编号',
+                'rtrim(b.Gy0_计划接货数)' => '计划接货数',
+                'rtrim(b.Gy0_小时产能)' => '小时产能',
+                'rtrim(b.Gy0_生产工时)' => '生产工时',
+                'rtrim(b.Gy0_辅助工时)' => '辅助工时',
+                'rtrim(b.Gy0_班次安排)' => '班次安排',
+                'rtrim(b.工序备注)' => '排单备注',
+                'rtrim(b.Gy0_最早开工时间)' => '最早开工时间',
+                'rtrim(b.Gy0_sj1)' => '计划开工时间',
+                'rtrim(b.Gy0_sj2)' => '计划完工时间',
+                'rtrim(b.Gy0_yjno)' => 'yjno',
+                'rtrim(b.Gy0_gxh)' => 'gxh',
+                'rtrim(b.Gy0_gxmc)' => 'gxmc',
+                'rtrim(b.Gy0_ls)' => 'ls',
+                'rtrim(b.UniqId)' => 'UniqId',
+                'SUM(c.sczl_cl)' => '已完成'
             ])
-            ->join('设备_产量计酬 b','a.Gy0_gdbh = b.sczl_gdbh AND a.Gy0_gxh = b.sczl_gxh','LEFT')
+            ->join('工单_工艺资料 b','a.Gd_gdbh = b.Gy0_gdbh')
+            ->join('设备_产量计酬 c','a.Gd_gdbh = c.sczl_gdbh AND b.Gy0_gxh = c.sczl_gxh','LEFT')
             ->where([
-                'a.Gy0_sbbh' => $machine,
-                'a.Gy0_sj1' => ['>','1900-01-01 00:00:00'],
-                'a.PD_WG' => '1900-01-01 00:00:00'
+                'b.Gy0_sbbh' => $machine,
+                'b.Gy0_sj1' => ['>','1900-01-01 00:00:00'],
+                'b.PD_WG' => '1900-01-01 00:00:00',
+                'a.gd_statu' => '2-生产中'
             ])
-            ->where('a.Gy0_sj1','<','2099-01-01 00:00:00')
-            ->group('a.Gy0_gdbh')
+            ->where('b.Gy0_sj1','<','2099-01-01 00:00:00')
+            ->group('a.Gd_gdbh')
             ->select();
         foreach ($list as $key=>$value){
             $list[$key]['计划接货数'] = (int)round($value['计划接货数']/$value['ls']);
@@ -726,7 +728,7 @@ class Manufacture extends Api
                 '工序备注' => $value['remark'],
                 'Gy0_最早开工时间' => $value['start'] === ''?'1900-01-01 00:00:00':date('Y-m-d H:i:s',strtotime($value['start'])),
                 'Gy0_sj1' => date('Y-m-d H:i:s',strtotime($value['projectTime'])),
-                'Gy0_sj2' => date('Y-m-d H:i:s',strtotime($param[0]['projectTime'])+(ceil($param[0]['ProductionHours'])+ceil($param[0]['AuxiliaryHours']))*3600),
+                'Gy0_sj2' => date('Y-m-d H:i:s',strtotime($value['endTime'])),
             ];
             $sql = \db('工单_工艺资料')
                 ->where('UniqId',$value['UniqId'])