|
|
@@ -10,6 +10,7 @@ use App\Model\Dispatch;
|
|
|
use App\Model\DispatchSub;
|
|
|
use App\Model\Employee;
|
|
|
use App\Model\EmployeeTeamPermission;
|
|
|
+use App\Model\Equipment;
|
|
|
use App\Model\InOutRecord;
|
|
|
use App\Model\OrdersProduct;
|
|
|
use App\Model\Process;
|
|
|
@@ -983,7 +984,7 @@ class ApplyOrderService extends Service
|
|
|
//派工单
|
|
|
$d = DispatchSub::where('del_time',0)
|
|
|
->whereIn('id', $apply_id)
|
|
|
- ->select('id', 'dispatch_no as order_no', 'product_title','technology_name','wood_name','product_no','process_id','product_unit','price','product_size')
|
|
|
+ ->select('id', 'dispatch_no as order_no', 'product_title','technology_name','wood_name','product_no','process_id','product_unit','price','product_size','device_id')
|
|
|
->get()->toArray();
|
|
|
$d_tmp = array_column($d,null,'id');
|
|
|
|
|
|
@@ -991,6 +992,9 @@ class ApplyOrderService extends Service
|
|
|
->pluck('title','id')
|
|
|
->toArray();
|
|
|
$team_map = Team::pluck('title','id')->toArray();
|
|
|
+ $device_map = Equipment::whereIn('id',array_unique(array_column($d,'device_id')))
|
|
|
+ ->pluck('title','id')
|
|
|
+ ->toArray();
|
|
|
|
|
|
$return = [];
|
|
|
foreach ($apply_d as $t){
|
|
|
@@ -1012,6 +1016,8 @@ class ApplyOrderService extends Service
|
|
|
'process_name' => $process_map[$tmp['process_id']] ?? "",
|
|
|
'team_id' => $t['team_id'] ?? 0,
|
|
|
'team_title' => $team_map[$t['team_id']] ?? '',
|
|
|
+ 'device_id' => $tmp['device_id'] ?? 0,
|
|
|
+ 'device_title' => $device_map[$tmp['device_id']] ?? '',
|
|
|
];
|
|
|
}
|
|
|
}
|
cqp