LD 5 лет назад
Родитель
Сommit
7fa765af72
2 измененных файлов с 4 добавлено и 2 удалено
  1. 1 0
      app/Http/Controllers/LaborReportController.php
  2. 3 2
      app/RejectedBill.php

+ 1 - 0
app/Http/Controllers/LaborReportController.php

@@ -119,6 +119,7 @@ class LaborReportController extends Controller
         $laborReportStatus->save();
         $this->log(__METHOD__,"门卫打卡审核创建当前临时工报表状态".__FUNCTION__,json_encode($laborReportStatus),Auth::user()['id']);
         $userDutyCheck=UserDutyCheck::find($userDutyCheckId);
+        $delme=Auth::user();
         $userDutyCheck->verify_user_id=Auth::user()['id'];
         $userDutyCheck->update();
         event(new GuardAuditEvent($userDutyCheck));

+ 3 - 2
app/RejectedBill.php

@@ -156,8 +156,9 @@ class RejectedBill extends Model
         if($this->order_number ?? false){
             $order = Order::query()->with('issue')->where('client_code',$this->order_number)->first();
         }else if($this->logistic_number_return ?? false){
-            $asn_header = OracleDOCASNHeader::query()->where('soreference3',$this->logistic_number_return)->first();
-            $order_header = OracleDOCOrderHeader::query()->where('soreference1',$asn_header->asnreference1)->first();
+            $asn_header = OracleDOCASNHeader::query()->where('asnreference3',$this->logistic_number_return)->first();
+            if(!$asn_header)return;
+            $order_header = OracleDOCOrderHeader::query()->where('soreference1',$asn_header['asnreference1'])->first();
             $order = Order::query()->with('issue')->where('code',$order_header['orderno'])->first();
         }
         if($order['issue'] ?? false){