From 8998c281ba163c523dfcaf89cfac0325725eb4b9 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 23 Nov 2024 17:46:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(admin):=20=E6=B7=BB=E5=8A=A0=E5=89=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=AE=A2=E5=8D=95=E7=9A=84=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E5=92=8C=E5=87=BA=E5=BA=93=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 BeforehandOrderLists 类中添加 order_rk 和 order_ck 字段
- 通过 WarehouseOrder 模型查询入库单号和出库单号
- 在导出数据时包含这两个新字段
---
 .../lists/beforehand_order/BeforehandOrderLists.php  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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' => '门店',