包裹问题修改

app/Filters/OrderPackageFilters.php

@@ -3,6 +3,7 @@
 
 namespace App\Filters;
 
+use App\OracleDOCOrderHeader;
 use App\Order;
 use App\OrderIssue;
 use App\Services\UserService;
@@ -35,6 +36,7 @@ class OrderPackageFilters
         'is_new_rejecting',
         'result_explain',
         'issue_type_name',
+        'order_notes',//订单备注
     ];
 
     protected $orderIssueQuery;
@@ -177,12 +179,12 @@ class OrderPackageFilters
     {
         if ($is_new_rejecting === '有') {
             $this->queryBuilder->whereIn('logistic_number', function ($query) {
-                $query->from('rejected_bills')->select('logistic_number_return')->where('logistic_number','原单退回')->whereNotNull('logistic_number_return');
+                $query->from('rejected_bills')->select('logistic_number_return')->where('logistic_number', '原单退回')->whereNotNull('logistic_number_return');
             });
         }
         if ($is_new_rejecting === '无') {
             $this->queryBuilder->whereNotIn('logistic_number', function ($query) {
-                $query->from('rejected_bills')->select('logistic_number_return')->where('logistic_number','原单退回')->whereNotNull('logistic_number_return');
+                $query->from('rejected_bills')->select('logistic_number_return')->where('logistic_number', '原单退回')->whereNotNull('logistic_number_return');
             });
         }
     }
@@ -190,7 +192,7 @@ class OrderPackageFilters
     public function issue_type_name($issue_type_name)
     {
         $this->queryBuilder->whereIn('order_id', function ($query) use ($issue_type_name) {
-            $query->from('order_issues')->select('order_id')->where('order_issue_type_id',function ($query) use ($issue_type_name){
+            $query->from('order_issues')->select('order_id')->where('order_issue_type_id', function ($query) use ($issue_type_name) {
                 $query->from('order_issue_types')->select('id')->where('name', $issue_type_name);
             });
         });
@@ -199,7 +201,15 @@ class OrderPackageFilters
     public function result_explain($result_explain)
     {
         $this->queryBuilder->whereIn('order_id', function ($query) use ($result_explain) {
-            $query->from('order_issues')->select('order_id')->where('result_explain','like',$result_explain);
+            $query->from('order_issues')->select('order_id')->where('result_explain', 'like', $result_explain);
+        });
+    }
+
+    public function order_notes($order_notes)
+    {
+        $ordernos = OracleDOCOrderHeader::query()->select('orderno')->where('notes', 'like', $order_notes)->pluck('orderno');
+        $this->queryBuilder->whereIn('order_id', function ($query) use ($ordernos) {
+            $query->from('orders')->select('order_id')->whereIn('code', $ordernos);
         });
     }
 }

app/Http/Controllers/PackageLogisticController.php

@@ -33,6 +33,7 @@ class PackageLogisticController extends Controller
             ->filter($filters)
             ->with([
                 'order.logistic',
+                'order.OracleDOCOrderHeader:orderno,notes',
                 'rejectedBill' => function ($query) {
                     $query->select('id', 'logistic_number', 'logistic_number_return')->where('logistic_number', '原单退回');
                 },

app/Order.php

@@ -5,6 +5,7 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelLogChanging;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Order extends Model
 {
@@ -178,4 +179,9 @@ class Order extends Model
         ];
         return $arr[$string] ?? '否';
     }
+
+    public function OracleDOCOrderHeader(): BelongsTo
+    {
+        return $this->belongsTo(OracleDOCOrderHeader::class,'code','orderno');
+    }
 }

resources/views/package/logistic/index.blade.php

@@ -157,6 +157,7 @@
                     </td>
                     <!--退件状态-->
                     <td>@{{ package.rejected_bill?'有':'无' }}</td>
+                    <td>@{{ package.order.oracle_d_o_c_order_header.notes??'' }}</td>
                     <td  class="m-0 p-0 order-package-remarks" style="padding-left: 0 !important;padding-right: 0 !important">
                         @can('包裹管理-快递-客服备注')
                         <label :for="'create_remark_'+package.id" class="btn-create-remark" @click="package.input_remark=!package.input_remark">
@@ -417,6 +418,8 @@
                                 {name: '无记录', value: '无记录'},
                             ]
                         },
+                        {name: 'order_notes', type: 'input', tip: '糊模查找需要在右边打上%符号', placeholder: '订单备注'},
+
                     ]
                 ];
                 _this.form = new query({
@@ -437,6 +440,7 @@
                     {name: 'weighed_at', value: '称重日期'},
                     {name: 'transfer_status', value: '快递路由'},
                     {name: 'is_new_rejecting', value: '退件状态'},
+                    {name: 'order_notes', value: '订单备注'},
                     {name: 'remark', value: '客服备注'},
                     {name: 'result_explain', value: '情况说明'},
                     {name: 'issue_type', value: '问题类别'},