机台工单清单、引用工艺资料

application/api/controller/Facility.php

@@ -319,15 +319,13 @@ class Facility extends Api
                 rtrim(b.Gy0_最早开工时间) AS 最早开工时间
             FROM
                 `工单_基本资料` AS a
-                JOIN `工单_工艺资料` AS b ON a.Gd_gdbh = b.Gy0_gdbh
-                JOIN `产品_基本资料` AS c ON a.`成品代号` = c.`产品编号` 
+                JOIN `工单_工艺资料` AS b ON a.Gd_gdbh = b.Gy0_gdbh 
                 JOIN `工单_印件资料` AS d ON a.Gd_gdbh = d.Yj_Gdbh
                 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 c.`状态` = '' 
                 AND b.PD_WG = '1900-01-01 00:00:00' 
                 AND b.Gy0_sj1 <> '1900-01-01 00:00:00'
             GROUP BY a.Gd_gdbh

application/api/controller/WorkOrder.php

@@ -527,6 +527,8 @@ class WorkOrder extends Api
         foreach ($oldProcessData as $k=>$v){
             $oldProcessData[$k]['Gy0_gdbh']  = $oldWorkOrder;
             $oldProcessData[$k]['Sys_id'] = '';
+            $oldProcessData[$k]['Gy0_sj1'] = '1900-01-01 00:00:00';
+            $oldProcessData[$k]['Gy0_sj2'] = '1900-01-01 00:00:00';
             $oldProcessData[$k]['UniqId'] = $lastId + $k;
             $oldProcessData[$k]['PD_WG'] = '1900-01-01 00:00:00';
         }