工序状态

application/api/controller/Manufacture.php

@@ -411,8 +411,8 @@ class Manufacture extends Api
             'Gy0_yjno' => $data['printCode'],
             'Gy0_gxh'  => $data['processCode']
         ];
-        $result = \db('工单_工艺资料')->where($where)->field('Gy0_sj1')->find();
-        if ($result['Gy0_sj1']>'1900-01-01 00:00:00'){
+        $result = \db('工单_工艺资料')->where($where)->field('rtrim(Gy0_sj1) as sj1')->find();
+        if ($result['sj1']>'1900-01-01 00:00:00'){
             $this->error('该工单已经是制程中');
         }
         $lastTime = \db('工单_工艺资料')
@@ -420,7 +420,7 @@ class Manufacture extends Api
             ->field('rtrim(Gy0_sj2) as sj2')
             ->order('Gy0_sj2 desc')
             ->find();
-        $date = date('Y-m-d H:i:00',time());
+        $date = date('Y-m-d H:i:s',time());
         if ($lastTime['sj2'] < $date){
             $newTime = $date;
         }else{
@@ -433,7 +433,7 @@ class Manufacture extends Api
         if (empty($row)){
             $this->success('未找到该工单工艺资料');
         }
-        $endTime = date('Y-m-d H:i:s',strtotime($lastTime['sj2']) + ((int)round($row['计划接货数']/$row['小时产能'])+(int)$row['辅助工时'])*3600);
+        $endTime = date('Y-m-d H:i:s',strtotime($newTime) + ((int)round($row['计划接货数']/$row['小时产能'])+(int)$row['辅助工时'])*3600);
         $sql = \db('工单_工艺资料')
             ->where($where)
             ->fetchSql(true)