订单管理-问题件 搜索条件增加(原始订单号,运单号,退回单号,二次订单号,收货人名称,收货人电话,条码) 批量与单条模糊

app/Services/OrderIssueService.php

@@ -71,10 +71,10 @@ class OrderIssueService
                 return $this->searchWay($query,$arr['client_code'],'client_code');
             }
             if ($arr['consignee_name'] ?? false) {
-                $query->where('consignee_name', 'like', $arr['consignee_name']);
+                return $this->searchWay($query,$arr['consignee_name'],'consignee_name');
             }
             if ($arr['consignee_phone'] ?? false) {
-                $query->where('consignee_phone', 'like', $arr['consignee_phone']);
+                return $this->searchWay($query,$arr['consignee_phone'],'consignee_phone');
             }
             if ($arr['logistic_number'] ?? false) {
                 $logistic_number = $arr['logistic_number'];
@@ -87,7 +87,7 @@ class OrderIssueService
                     $query->whereHas('commodities', function ($query) use ($arr) {
                         $query->whereHas('commodity', function ($query) use ($arr) {
                             if ($arr['good_barcode'] ?? false) {
-                                $query->where('sku', $arr['good_barcode']);
+                                return $this->searchWay($query,$arr['good_barcode'],'sku');
                             }
                             if ($arr['good_name'] ?? false) {
                                 $query->where('name', $arr['good_name']);
@@ -99,7 +99,7 @@ class OrderIssueService
         });
         if ($arr['send_client_code'] ?? false) {
             $query->whereHas('secondOrder', function ($query) use ($arr) {
-                $query->where('client_code', $arr['send_client_code']);
+                return $this->searchWay($query,$arr['send_client_code'], 'client_code');
             });
         }
 
@@ -111,7 +111,7 @@ class OrderIssueService
         if(  ($arr['logistic_number_return'] ?? false) || ($arr['id_quality_label'] ?? false)){
             $query->whereHas('rejectedBill', function ($query) use (&$arr) {
                 if ($arr['logistic_number_return'] ?? false) {
-                    $query->where('logistic_number_return', 'like', $arr['logistic_number_return']);
+                    return $this->searchWay($query,$arr['logistic_number_return'], 'logistic_number_return');
                 }
                 if ($arr['id_quality_label'] ?? false) {
                     $query->whereHas('items', function ($query) use ($arr) {