包裹字段添加 波次

app/Filters/OrderPackageFilters.php

@@ -146,7 +146,7 @@ class OrderPackageFilters
         $this->queryBuilder->whereIn('order_id', function ($query) {
             $query->from('orders')
                 ->select('id')
-                ->whereNotIn('logistic_id', [13, 24, 25, 26, 27, 30, 31, 32, 33, 34, 60, 63, 65, 66, 68, 70, 102, 105, 107, 116, 10, 87]);
+                ->whereNotIn('logistic_id', [13, 24, 25, 26, 27, 30, 31, 32, 33, 34, 60, 63, 65, 66, 68, 70, 102, 105, 107, 116, 10]);
         });
     }
 

app/Http/Controllers/PackageLogisticController.php

@@ -33,7 +33,8 @@ class PackageLogisticController extends Controller
             ->filter($filters)
             ->with([
                 'order.logistic',
-                'order.OracleDOCOrderHeader:orderno,notes',
+                'order.batch:id,wms_type',
+                'order.OracleDOCOrderHeader:orderno,notes,WaveNo',
                 'rejectedBill' => function ($query) {
                     $query->select('id', 'logistic_number', 'logistic_number_return')->where('logistic_number', '原单退回');
                 },
@@ -119,9 +120,12 @@ class PackageLogisticController extends Controller
             '称重日期',
             '快递路由',
             '退件状态',
+            '订单备注',
             '客服备注',
             '情况说明',
             '问题类别',
+            '波次规则',
+            '波次号',
             '说明',
             '操作者',
             '时间',
@@ -163,9 +167,12 @@ class PackageLogisticController extends Controller
                 $orderPackage->weighed_at ?? '',//称重日期
                 $transfer_status ?? '',//快递路由
                 empty($orderPackage->rejectedBill) ? '无' : '有',//退件状态
+                $orderPackage->order->OracleDOCOrderHeader->notes ?? '',//订单备注
                 $remark ?? '',//客服备注
                 $orderPackage->order->issue->result_explain ?? '',//情况说明
                 $orderPackage->order->issue->issueType->name ?? '',//问题类别
+                $orderPackage->order->batch->wms_type ?? '',//波次规则
+                $orderPackage->order->OracleDOCOrderHeader->waveno ?? '',//波次号
                 $logsContent ?? '',//说明
                 $users ?? '',//操作者
                 $logCreatedAt ?? '',//时间

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

@@ -194,6 +194,8 @@
                     <td class="text-overflow-warp-200"><span
                             v-if="package.order && package.order.issue && package.order.issue.issue_type">@{{ package.order.issue.issue_type.name }}</span>
                     </td>
+                    <td class="text-overflow-warp-200">@{{ package.order && package.order.batch && package.order.batch.wms_type }}</td>
+                    <td class="text-overflow-warp-200">@{{ package.order.oracle_d_o_c_order_header.waveno??'' }}</td>
                     <td class="text-overflow-warp-200"><span
                             v-if="package.order && package.order.issue && package.order.issue.logs.length >0"><span
                                 v-for="log in package.order.issue.logs">@{{ log.content }}<br></span></span></td>
@@ -444,6 +446,8 @@
                     {name: 'remark', value: '客服备注'},
                     {name: 'result_explain', value: '情况说明'},
                     {name: 'issue_type', value: '问题类别'},
+                    {name: 'wms_type', value: '波次规则'},
+                    {name: 'wave_no', value: '波次号'},
                     {name: 'content', value: '说明'},
                     {name: 'operation_name', value: '操作者'},
                     {name: 'operation_date', value: '时间'},