diff --git a/app/admin/controller/warehouse_order/WarehouseOrderController.php b/app/admin/controller/warehouse_order/WarehouseOrderController.php
index 5c0a32030..b6b4c6fa1 100644
--- a/app/admin/controller/warehouse_order/WarehouseOrderController.php
+++ b/app/admin/controller/warehouse_order/WarehouseOrderController.php
@@ -17,6 +17,7 @@ use app\common\model\system_store\SystemStore;
 use app\common\model\warehouse_order\WarehouseOrder;
 use app\common\model\warehouse_product\WarehouseProduct;
 use app\common\model\warehouse_product_storege\WarehouseProductStorege;
+use app\common\service\xlsx\Beforehand;
 use app\common\service\xlsx\OrderDetail;
 use app\common\service\xlsx\WarehouseOrdeRentry;
 use support\exception\BusinessException;
@@ -275,4 +276,25 @@ class WarehouseOrderController extends BaseAdminController
 
         return $this->success('导出成功', ['url' => $file_path]);
     }
+
+        /**
+     * 导出标签
+     */
+    public function export_tags()
+    {
+        $id = $this->request->post('id');
+        $warehouseOrder = WarehouseOrder::where('id', $id)->field('store_id,delivery_time')->find();
+        $system_store = SystemStore::where('id', $warehouseOrder['store_id'])->value('name');
+        $data = WarehouseProduct::where('oid', $id)->where('financial_pm',0)->field('product_id,nums')->select()
+            ->each(function ($item) use ($system_store,$warehouseOrder) {
+                $item['system_store'] = $system_store;
+                $find = StoreProduct::where('id', $item['product_id'])->field('store_name,unit')->find();
+                $item['store_name'] = $find['store_name'];
+                $unit_name = StoreProductUnit::where('id', $find['unit'])->value('name');
+                $item['unit_name'] = $item['nums'].'/'.$unit_name.'     '.date('m-d',$warehouseOrder['delivery_time']);
+            })
+            ->toArray();
+        $file_path=(new Beforehand())->export($data, $system_store);
+        return $this->success('导出成功', ['url' => $file_path]);
+    }
 }
diff --git a/app/common/service/xlsx/Beforehand.php b/app/common/service/xlsx/Beforehand.php
index 9d816e6f8..b9770cb95 100644
--- a/app/common/service/xlsx/Beforehand.php
+++ b/app/common/service/xlsx/Beforehand.php
@@ -13,19 +13,21 @@ class Beforehand
         $sheet = $spreadsheet->getActiveSheet();
 
         // 合并单元格A1到K1
-        $sheet->mergeCells('A1:B1');
         $kk1=1;
         $kk2=2;
         $kk3=3;
         $styleArray = [
             'font' => [
                 'bold' => true,
-                'size' => 16,
+                'size' => 14,
             ],
         ];
         foreach ($data as $k => $v) {
+            $sheet->mergeCells('A'. ($k + $kk1).':B'.($k + $kk1));
             $sheet->setCellValue('A' . ($k + $kk1), $v['system_store'])->getStyle('A'. ($k + $kk1))->applyFromArray($styleArray);
+            $sheet->mergeCells('A'. ($k + $kk2).':B'.($k + $kk2));
             $sheet->setCellValue('A' . ($k + $kk2), $v['store_name'])->getStyle('A'. ($k + $kk2))->applyFromArray($styleArray);
+            $sheet->mergeCells('A'. ($k + $kk3).':B'.($k + $kk3));
             $sheet->setCellValue('A' . ($k + $kk3), $v['unit_name'])->getStyle('A'. ($k + $kk3))->applyFromArray($styleArray);
             $kk1=$kk1+2;
             $kk2=$kk2+2;