diff --git a/app/admin/lists/beforehand_order/BeforehandOrderLists.php b/app/admin/lists/beforehand_order/BeforehandOrderLists.php index 561d08e13..08ff88510 100644 --- a/app/admin/lists/beforehand_order/BeforehandOrderLists.php +++ b/app/admin/lists/beforehand_order/BeforehandOrderLists.php @@ -133,6 +133,8 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte } $pay_type_name = ''; $pay_status = ''; + $order_rk = ''; + $order_ck = ''; if($export==2 && $item['order_sn']!=''){ $find=StoreOrder::where('order_id',$item['order_sn'])->field('paid,pay_type')->find(); if($find){ @@ -163,9 +165,17 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte $pay_status = '未付款'; } } + if($item['warehousing_id']>0){ + $order_rk=WarehouseOrder::where('id',$item['warehousing_id'])->value('code'); + } + if($item['outbound_id']>0){ + $order_ck=WarehouseOrder::where('id',$item['outbound_id'])->value('code'); + } } $item['pay_status'] = $pay_status; $item['pay_type_name'] = $pay_type_name; + $item['order_ck'] = $order_ck; + $item['order_rk'] = $order_rk; }) ->toArray(); @@ -207,6 +217,8 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte 'id' => 'ID', 'order_id' => '单号', 'order_sn' => '支付单号', + 'order_rk' => '入库单号', + 'order_ck' => '出库单号', 'order_type_name' => '订单类型', 'system_store' => '门店', 'admin_name' => '门店',