From 4a9145cc7c2da978d7c6b7dfa5da029c645ba38c Mon Sep 17 00:00:00 2001 From: zengchaoxin Date: Sat, 23 Nov 2019 14:04:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=88=B0=E6=97=A0=E6=95=88=EF=BC=8C=E4=B8=8D=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E8=AE=B0=E5=BD=95BUG=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/controllers/DatabaseController.php | 112 +++++++++++++------- 1 file changed, 73 insertions(+), 39 deletions(-) diff --git a/frontend/controllers/DatabaseController.php b/frontend/controllers/DatabaseController.php index c413d1e..66aa6ef 100644 --- a/frontend/controllers/DatabaseController.php +++ b/frontend/controllers/DatabaseController.php @@ -298,6 +298,11 @@ class DatabaseController extends BaseController if(!$b_info->save(false)) { throw new Exception(print_r($b_info->getFirstErrors(),true)); } + } else { + $b_info->user_id = 0; + if(!$b_info->save(false)) { + throw new Exception(print_r($b_info->getFirstErrors(),true)); + } } $this->addLog($car_info->id,'从A库分配到B库',1); } @@ -346,6 +351,11 @@ class DatabaseController extends BaseController if(!$b_info->save(false)) { throw new Exception(print_r($b_info->getFirstErrors(),true)); } + } else { + $b_info->user_id = 0; + if(!$b_info->save(false)) { + throw new Exception(print_r($b_info->getFirstErrors(),true)); + } } $this->addLog($car_info->id,'从A库分配到B库',1); } @@ -396,6 +406,11 @@ class DatabaseController extends BaseController if(!$c_info->save(false)) { throw new Exception(print_r($c_info->getFirstErrors(),true)); } + } else { + $c_info->user_id = 0; + if(!$c_info->save(false)) { + throw new Exception(print_r($c_info->getFirstErrors(),true)); + } } $this->addLog($car_info->id,'从A库分配到C库',1); } @@ -988,20 +1003,23 @@ class DatabaseController extends BaseController } $b_info = CarBT::findOne(['id'=>$id]); - if($b_info->user_id > 0) { - //删除预约 - AppointmentT::deleteAll('car_id='.$b_info->id); - - //删除保单 还没有正本生成的保单可以直接删除,正本生成后,需要退单操作 - //删除操作人员 - $orders = OrderT::find() - ->where('car_id='.$b_info->id.' and status_id<5') - ->all(); - foreach($orders as $order_info) { - OrderUserT::deleteAll('order_id='.$order_info->id); - //删除保单 - $order_info->delete(); + if($b_info) { + if($b_info->user_id > 0) { + //删除预约 + AppointmentT::deleteAll('car_id='.$b_info->id); + + //删除保单 还没有正本生成的保单可以直接删除,正本生成后,需要退单操作 + //删除操作人员 + $orders = OrderT::find() + ->where('car_id='.$b_info->id.' and status_id<5') + ->all(); + foreach($orders as $order_info) { + OrderUserT::deleteAll('order_id='.$order_info->id); + //删除保单 + $order_info->delete(); + } } + $b_info->delete(); } $this->addLog($car_info->id,'从B库移动到无效库',1); } @@ -1555,6 +1573,11 @@ class DatabaseController extends BaseController if(!$d_info->save(false)) { throw new Exception(print_r($d_info->getFirstErrors(),true)); } + } else { + $d_info->user_id = 0; + if(!$d_info->save(false)) { + throw new Exception(print_r($d_info->getFirstErrors(),true)); + } } $this->addLog($car_info->id,'从C库分配到D库',1); } @@ -1601,6 +1624,11 @@ class DatabaseController extends BaseController if(!$d_info->save(false)) { throw new Exception(print_r($d_info->getFirstErrors(),true)); } + } else { + $d_info->user_id = 0; + if(!$d_info->save(false)) { + throw new Exception(print_r($d_info->getFirstErrors(),true)); + } } $this->addLog($car_info->id,'从C库分配到D库',1); } @@ -1659,20 +1687,23 @@ class DatabaseController extends BaseController } $c_info = CarCT::findOne(['id'=>$id]); - if($c_info->user_id > 0) { - //删除预约 - AppointmentT::deleteAll('car_id='.$c_info->id); - - //删除保单 还没有正本生成的保单可以直接删除,正本生成后,需要退单操作 - //删除操作人员 - $orders = OrderT::find() - ->where('car_id='.$c_info->id.' and status_id<5') - ->all(); - foreach($orders as $order_info) { - OrderUserT::deleteAll('order_id='.$order_info->id); - //删除保单 - $order_info->delete(); + if($c_info) { + if($c_info->user_id > 0) { + //删除预约 + AppointmentT::deleteAll('car_id='.$c_info->id); + + //删除保单 还没有正本生成的保单可以直接删除,正本生成后,需要退单操作 + //删除操作人员 + $orders = OrderT::find() + ->where('car_id='.$c_info->id.' and status_id<5') + ->all(); + foreach($orders as $order_info) { + OrderUserT::deleteAll('order_id='.$order_info->id); + //删除保单 + $order_info->delete(); + } } + $c_info->delete(); } $this->addLog($car_info->id,'从C库移动到无效库',1); } @@ -2236,20 +2267,23 @@ class DatabaseController extends BaseController } $d_info = CarDT::findOne(['id'=>$id]); - if($d_info->user_id > 0) { - //删除预约 - AppointmentT::deleteAll('car_id='.$d_info->id); - - //删除保单 还没有正本生成的保单可以直接删除,正本生成后,需要退单操作 - //删除操作人员 - $orders = OrderT::find() - ->where('car_id='.$d_info->id.' and status_id<5') - ->all(); - foreach($orders as $order_info) { - OrderUserT::deleteAll('order_id='.$order_info->id); - //删除保单 - $order_info->delete(); + if($d_info) { + if($d_info->user_id > 0) { + //删除预约 + AppointmentT::deleteAll('car_id='.$d_info->id); + + //删除保单 还没有正本生成的保单可以直接删除,正本生成后,需要退单操作 + //删除操作人员 + $orders = OrderT::find() + ->where('car_id='.$d_info->id.' and status_id<5') + ->all(); + foreach($orders as $order_info) { + OrderUserT::deleteAll('order_id='.$order_info->id); + //删除保单 + $order_info->delete(); + } } + $d_info->deletel(); } $this->addLog($car_info->id,'从C库移动到无效库',1); }