From 1182ee62799bf96c16e5f8bee8dbfb5fbabd3c36 Mon Sep 17 00:00:00 2001
From: sjeam <359824901@qq.com>
Date: Wed, 9 Apr 2025 12:21:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InventoryTransferLogic.php                |  1 +
 .../InventoryTransferOrderLogic.php           |  1 +
 .../service/xlsx/InventoryTransferXlsx.php    | 22 +++++++++++--------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/admin/logic/inventory_transfer/InventoryTransferLogic.php b/app/admin/logic/inventory_transfer/InventoryTransferLogic.php
index 917c64401..46ad409ee 100644
--- a/app/admin/logic/inventory_transfer/InventoryTransferLogic.php
+++ b/app/admin/logic/inventory_transfer/InventoryTransferLogic.php
@@ -64,6 +64,7 @@ class InventoryTransferLogic extends BaseLogic
                     'oid' => $find['id'],
                     'product_id' => $v['id'],
                     'nums' => $v['nums'],
+                    'remark' => $v['remark'],
                     'one_before_nums' => $outProduct['stock'],
                     'one_after_nums' => bcsub($outProduct['stock'], $v['nums']),
                     'two_before_nums' => $inProduct['stock'],
diff --git a/app/admin/logic/inventory_transfer_order/InventoryTransferOrderLogic.php b/app/admin/logic/inventory_transfer_order/InventoryTransferOrderLogic.php
index 3a341dc37..ad7e8bdd9 100644
--- a/app/admin/logic/inventory_transfer_order/InventoryTransferOrderLogic.php
+++ b/app/admin/logic/inventory_transfer_order/InventoryTransferOrderLogic.php
@@ -65,6 +65,7 @@ class InventoryTransferOrderLogic extends BaseLogic
                 $insert[] = [
                     'product_id' => $v['product_id'],
                     'nums' => $v['nums'],
+                    'remark' => $v['remark'],
                     'one_before_nums' => $outProduct['stock'],
                     'one_after_nums' => bcsub($outProduct['stock'], $v['nums']),
                     'two_before_nums' => $inProduct['stock'],
diff --git a/app/common/service/xlsx/InventoryTransferXlsx.php b/app/common/service/xlsx/InventoryTransferXlsx.php
index 592e4fb05..a08782d3e 100644
--- a/app/common/service/xlsx/InventoryTransferXlsx.php
+++ b/app/common/service/xlsx/InventoryTransferXlsx.php
@@ -28,11 +28,13 @@ class InventoryTransferXlsx
         $sheet->getPageMargins()->setRight(0.5); // 右边距
         $sheet->getPageMargins()->setHeader(0.5); // 页眉边距
         $sheet->getPageMargins()->setFooter(0.5); // 页脚边距
-        $sheet->getStyle('A1:G1')->getFont()->setBold(true); // 设置标题字体加粗
-        $sheet->getStyle('A1:G1')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER); // 设置标题水平居中
-        $sheet->getStyle('A1:G1')->getAlignment()->setVertical(Alignment::VERTICAL_CENTER); // 设置标题垂直居中
-        $sheet->getStyle('A2:G2')->getFont()->setBold(true); // 设置标题字体加粗
-        $sheet->getStyle('A2:G2')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER); // 设置标题水平居中
+
+        $sheet->getStyle('A1:H1')->getFont()->setBold(true); // 设置标题字体加粗
+        $sheet->getStyle('A1:H1')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER); // 设置标题水平居中
+        $sheet->getStyle('A1:H1')->getAlignment()->setVertical(Alignment::VERTICAL_CENTER); // 设置标题垂直居中
+        $sheet->getStyle('A2:H2')->getFont()->setBold(true); // 设置标题字体加粗
+        $sheet->getStyle('A2:H2')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER); // 设置标题水平居中
+
         // 合并单元格并设置标题
         $sheet->mergeCells('A1:G1')->setCellValue('A1', '调拨订单');
         $sheet->setCellValue('A2', '订单编号');
@@ -41,8 +43,8 @@ class InventoryTransferXlsx
         $sheet->setCellValue('D2', '转入方');
         $sheet->setCellValue('E2',  '商品');
         $sheet->setCellValue('F2', '数量');
-        $sheet->setCellValue('G2', '创建时间');
-
+        $sheet->setCellValue('G2', '备注');
+        $sheet->setCellValue('H2', '创建时间');
         // 设置列宽
         $sheet->getColumnDimension('A')->setAutoSize(true);
         $sheet->getColumnDimension('B')->setAutoSize(true);
@@ -51,6 +53,7 @@ class InventoryTransferXlsx
         $sheet->getColumnDimension('E')->setAutoSize(true);
         $sheet->getColumnDimension('F')->setAutoSize(true);
         $sheet->getColumnDimension('G')->setAutoSize(true);
+        $sheet->getColumnDimension('H')->setAutoSize(true);
         // 设置默认的单元格样式
         $defaultStyle = [
             'alignment' => [
@@ -70,7 +73,8 @@ class InventoryTransferXlsx
                 ->setCellValue('D' . $row, $order['two_name'])
                 ->setCellValue('E' . $row, $item['store_name'])
                 ->setCellValue('F' . $row, $item['nums'])
-                ->setCellValue('G' . $row, $item['create_time']);
+                ->setCellValue('G' . $row, $item['remark'])
+                ->setCellValue('H' . $row, $item['create_time']);
             $row++;
         }
 
@@ -93,7 +97,7 @@ class InventoryTransferXlsx
                 ],
             ],
         ];
-        $sheet->getStyle('A1:G' . ($count + 2))->applyFromArray($styleArray);
+        $sheet->getStyle('A1:H' . ($count + 2))->applyFromArray($styleArray);
         // 保存文件到 public 下
         $writer = new Xlsx($spreadsheet);
         $url = '/export/' . "调拨订单-" . date('YmdHi') . '.xlsx';