From a93af7a5669036ee1ad20ffca1beb1f6c3ec97e2 Mon Sep 17 00:00:00 2001
From: KWON <thexero@gmail.com>
Date: Tue, 25 Nov 2025 16:07:39 +0900
Subject: [PATCH] =?UTF-8?q?[manager]=20=EB=B2=A0=EC=9D=B4=EC=BB=A4?=
 =?UTF-8?q?=EB=A6=AC=20=EB=88=84=EA=B3=84=EA=B8=B0=EB=8A=A5=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/bakery/bakery_stock.php       |  2 +-
 manager/bakery/bakery_stock_excel.php | 22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/manager/bakery/bakery_stock.php b/manager/bakery/bakery_stock.php
index 1f1ca367b..4241ac1de 100644
--- a/manager/bakery/bakery_stock.php
+++ b/manager/bakery/bakery_stock.php
@@ -276,7 +276,7 @@ if (!$authInfo) {
 						<!-- 누계 데이터 출력 -->
 					<tr>
 						<td colspan="3" class="text-center">누계</th>
-						<td class="text-end" id="summary_prev_stock"><?=number_format($sumData['total_previous_stock'])?></th>
+						<td class="text-end" id="summary_prev_stock"></th>
 						<td class="text-end" id="summary_production"><?=number_format($sumData['total_production'])?></th>
 						<td class="text-end" id="summary_inhouse_use"><?=number_format($sumData['total_inhouse_use'])?></th>
 						<td class="text-end" id="summary_recycling"><?=number_format($sumData['total_recycling'])?></th>
diff --git a/manager/bakery/bakery_stock_excel.php b/manager/bakery/bakery_stock_excel.php
index 9e6326fde..12052c76c 100644
--- a/manager/bakery/bakery_stock_excel.php
+++ b/manager/bakery/bakery_stock_excel.php
@@ -9,6 +9,9 @@ $ord_by = $_POST['ordBy'];
 $result = getBakeryInvenData($searchDate, $ord_by);
 $authInfo = getAuthorInfo($searchDate);
 
+// 누계 데이터 가져오기
+$sumData = getBakeryInvenSummaryData($searchDate);
+
 // UTF-8 BOM 추가 
 echo "\xEF\xBB\xBF"; 
 // 헤더 설정 
@@ -142,8 +145,8 @@ foreach ( $result as $row) {
         <td><?=number_format($row['payment_amount'])?></td>
         <td><?=number_format($row['current_stock'])?></td>
     </tr>
-    <?php
 
+<?php
 			// 합계 함수 처리
 			$t_prev_stock 		+= $previous_stock;
 			$t_production 		+= $row['production'];
@@ -156,7 +159,9 @@ foreach ( $result as $row) {
 			$t_payment_amount 	+= $row['payment_amount'];
 			$t_current_stock 	+= $row['current_stock'];
 }
+
 ?>
+
 </tbody>
     <tfoot class="table-group-divider">
         <tr class="bakery_total">
@@ -174,5 +179,20 @@ foreach ( $result as $row) {
             <td class="foot"><?=number_format($t_payment_amount) ?></td>
             <td class="foot"><?=number_format($t_current_stock) ?></td>
         </tr>
+        <tr>
+            <td class="foot">누계</th>
+            <td class="foot"></th>
+            <td class="foot"></th>
+            <td class="foot"><?=number_format($sumData['total_production'])?></th>
+            <td class="foot"><?=number_format($sumData['total_inhouse_use'])?></th>
+            <td class="foot"><?=number_format($sumData['total_recycling'])?></th>
+            <td class="foot"><?=number_format($sumData['total_disposal'])?></th>
+            <td class="foot"><?=number_format($sumData['total_sales'])?></th>
+            <td class="foot"></th>
+            <td class="foot"><?=number_format($sumData['total_sales_amount'])?></th>
+            <td class="foot"><?=number_format($sumData['total_menu_discount'])?></th>
+            <td class="foot"><?=number_format($sumData['total_payment_amount'])?></th>
+            <td class="foot"></th>
+        </tr>
     </tfoot>
 </table>