cqp 1 mese fa
parent
commit
2b5a5d1aec
2 ha cambiato i file con 6 aggiunte e 3 eliminazioni
  1. 4 2
      app/Service/ApplyOrderService.php
  2. 2 1
      app/Service/Box/BoxService.php

+ 4 - 2
app/Service/ApplyOrderService.php

@@ -829,6 +829,7 @@ class ApplyOrderService extends Service
                     'opt_case' => ReportMessage::type_one,
                     'crt_time' => $time,
                     'user_id' => $user['id'],
+                    'report_working_id' => $id,
                 ]);
 
                 $t = $team_man[$v['team_id']] ?? [];
@@ -988,6 +989,7 @@ class ApplyOrderService extends Service
                         'opt_case' => ReportMessage::type_one,
                         'crt_time' => $time,
                         'user_id' => $user['id'],
+                        'report_working_id' => $id,
                     ]);
                 }
 
@@ -4475,7 +4477,7 @@ class ApplyOrderService extends Service
 
     public function reportList($data){
         $model = ReportMessage::where('del_time',0)
-            ->select('id','order_id','opt_case','quantity','crt_time','user_id','is_use')
+            ->select('id','order_id','opt_case','quantity','crt_time','user_id','is_use','report_working_id')
             ->orderBy('id','desc');
 
         $list = $this->limit($model,'',$data);
@@ -4520,7 +4522,7 @@ class ApplyOrderService extends Service
             }else{
                 $p_t .= ":抽检";
             }
-            $data['data'][$key]['message'] = "派工单:" . $t['dispatch_no'] . "于" . $time . "由($e)完成工序($p_t)报工,请及时处理";
+            $data['data'][$key]['message'] = "派工单:" . $t['dispatch_no'] . "于" . $time . "由($e)完成工序($p_t)报工,数量{$value['quantity']},请及时处理";
         }
 
         return $data;

+ 2 - 1
app/Service/Box/BoxService.php

@@ -766,7 +766,8 @@ class BoxService extends Service
                         'opt_case' => ReportMessage::type_one,
                         'crt_time' => $time,
                         'user_id' => $user['id'],
-                        'is_use' => 1
+                        'is_use' => 1,
+                        'report_working_id' => $id,
                     ]);
                 }
             }