ajun 4 лет назад
Родитель
Сommit
0e74d8bb38
1 измененных файлов с 6 добавлено и 6 удалено
  1. 6 6
      app/RejectedBill.php

+ 6 - 6
app/RejectedBill.php

@@ -181,12 +181,12 @@ class RejectedBill extends Model
             $orderIssue->joinRejectedBill($this->logistic_number_return);
             $orderIssue->joinRejectedBill($this->logistic_number_return);
             return;
             return;
         }
         }
-        // 原单退回
-        if($this->logistic_number === '原单退回'){
-            $orderIssue = OrderIssue::query()->where('order_id',function ($query){
-                $query->from('order_packages')->selectRaw('order_id')->where('logistic_number',$this->logistic_number_return);
-            })->first();
-        }
+
+        // 获取是否有快递单号对应问题件订单存在
+        $orderIssue = OrderIssue::query()->where('order_id',function ($query){
+            $query->from('order_packages')->selectRaw('order_id')->where('logistic_number',$this->logistic_number_return);
+        })->first();
+
         if(!$orderIssue){
         if(!$orderIssue){
             $orderHeader = OracleDOCOrderHeader::query()->selectRaw('OrderNO')->where('SoReference1', function ($query) {
             $orderHeader = OracleDOCOrderHeader::query()->selectRaw('OrderNO')->where('SoReference1', function ($query) {
                 $query->select('AsnReference2')->from('DOC_ASN_HEADER')->where('AsnReference3', $this->logistic_number_return)->first();
                 $query->select('AsnReference2')->from('DOC_ASN_HEADER')->where('AsnReference3', $this->logistic_number_return)->first();