|
|
@@ -4508,6 +4508,9 @@ class ApplyOrderService extends Service
|
|
|
$emp_map = Employee::whereIn('id',array_unique(array_column($data['data'],'user_id')))
|
|
|
->pluck("emp_name",'id')
|
|
|
->toArray();
|
|
|
+ $order_map = ReportWorking::whereIn('id',array_filter(array_column($data['data'],'report_working_id')))
|
|
|
+ ->pluck('order_number','id')
|
|
|
+ ->toArray();
|
|
|
foreach ($data['data'] as $key => $value){
|
|
|
$time = $value['crt_time'] ? date('Y-m-d',$value['crt_time']) : '';
|
|
|
$data['data'][$key]['crt_time'] = $time;
|
|
|
@@ -4522,7 +4525,17 @@ class ApplyOrderService extends Service
|
|
|
}else{
|
|
|
$p_t .= ":抽检";
|
|
|
}
|
|
|
- $data['data'][$key]['message'] = "派工单:" . $t['dispatch_no'] . "于" . $time . "由($e)完成工序($p_t)报工,数量{$value['quantity']},请及时处理";
|
|
|
+ if(empty($value['report_working_id'])){
|
|
|
+ $str = "派工单:" . $t['dispatch_no'] . "于" . $time . "由($e)完成工序($p_t)报工,数量{$value['quantity']}吨,请及时处理";
|
|
|
+ }else{
|
|
|
+ $tmp = $order_map[$value['report_working_id']] ?? "";
|
|
|
+ if(empty($tmp)){
|
|
|
+ $str = "派工单:" . $t['dispatch_no'] . "于" . $time . "由($e)完成工序($p_t)报工,数量{$value['quantity']}吨,请及时处理";
|
|
|
+ }else{
|
|
|
+ $str = "派工单:" . $t['dispatch_no'] . "于" . $time . "由($e)完成工序($p_t)报工({$tmp}),数量{$value['quantity']}吨,请及时处理";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $data['data'][$key]['message'] = $str;
|
|
|
}
|
|
|
|
|
|
return $data;
|
cqp