|
@@ -377,9 +377,9 @@ class DispatchService extends Service
|
|
|
$data['data'][$key]['is_create'] = 0;
|
|
|
}
|
|
|
}
|
|
|
- $data['production_quantity'] = array_sum(array_column($data['data'], 'production_quantity'));
|
|
|
- $data['dispatch_quantity'] = array_sum(array_column($data['data'], 'dispatch_quantity'));
|
|
|
- $data['not_dispatch_quantity'] = array_sum(array_column($data['data'], 'not_dispatch_quantity'));
|
|
|
+ $data['production_quantity'] = $this->getTotal($data['data'], 'production_quantity');
|
|
|
+ $data['dispatch_quantity'] = $this->getTotal($data['data'], 'dispatch_quantity');
|
|
|
+ $data['not_dispatch_quantity'] = $this->getTotal($data['data'], 'not_dispatch_quantity');
|
|
|
|
|
|
return $data;
|
|
|
}
|
|
@@ -504,7 +504,9 @@ class DispatchService extends Service
|
|
|
$data['data'][$key]['equipment_id'] = $value['device_id'];
|
|
|
$data['data'][$key]['un_finished_quantity'] = bcsub($value['dispatch_quantity'] , $value['finished_num'],3);
|
|
|
}
|
|
|
- $data['dispatch_quantity'] = array_sum(array_column($data['data'], 'dispatch_quantity'));
|
|
|
+
|
|
|
+ $total = $this->getTotal($data['data'], 'dispatch_quantity');
|
|
|
+ $data['dispatch_quantity'] = $total;
|
|
|
|
|
|
return $data;
|
|
|
}
|