|
@@ -59,7 +59,7 @@ class DeleteOrderService extends Service
|
|
|
->select('order_no')
|
|
|
->whereIn('id',$id);
|
|
|
$order_no = DB::table('sale_orders_product')
|
|
|
- ->select('order_no','del_time')
|
|
|
+ ->select('sale_orders_product.order_no','sale_orders_product.del_time')
|
|
|
->joinSub($subquery, 'sub', function ($join) {
|
|
|
$join->on('sale_orders_product.order_no', '=', 'sub.order_no');
|
|
|
})->get()->toArray();
|
|
@@ -67,6 +67,7 @@ class DeleteOrderService extends Service
|
|
|
if(! empty($order_no)){
|
|
|
$tmp = [];
|
|
|
foreach ($order_no as $value){
|
|
|
+ $value = (array)$value;
|
|
|
if($value['del_time'] == 0){
|
|
|
$tmp[] = $value['order_no'];
|
|
|
}else{
|
|
@@ -116,6 +117,7 @@ class DeleteOrderService extends Service
|
|
|
if(! empty($order_no)){
|
|
|
$tmp = [];
|
|
|
foreach ($order_no as $value){
|
|
|
+ $value = (array)$value;
|
|
|
if($value['del_time'] == 0){
|
|
|
$tmp[] = $value['production_no'];
|
|
|
}else{
|
|
@@ -182,7 +184,7 @@ class DeleteOrderService extends Service
|
|
|
->select('dispatch_no')
|
|
|
->whereIn('id',$id);
|
|
|
$order_no = DB::table('dispatch_sub')
|
|
|
- ->select('dispatch_no','del_time')
|
|
|
+ ->select('dispatch_sub.dispatch_no','dispatch_sub.del_time')
|
|
|
->joinSub($subquery, 'sub', function ($join) {
|
|
|
$join->on('dispatch_sub.dispatch_no', '=', 'sub.dispatch_no');
|
|
|
})->get()->toArray();
|
|
@@ -190,6 +192,7 @@ class DeleteOrderService extends Service
|
|
|
if(! empty($order_no)){
|
|
|
$tmp = [];
|
|
|
foreach ($order_no as $value){
|
|
|
+ $value = (array)$value;
|
|
|
if($value['del_time'] == 0){
|
|
|
$tmp[] = $value['dispatch_no'];
|
|
|
}else{
|