Merge branch 'manager'

# Conflicts:
#	manager/bakery/bakery_stock_excel.php
This commit is contained in:
2025-09-29 09:23:38 +09:00
5 changed files with 156 additions and 41 deletions

View File

@ -7,6 +7,7 @@ if(!$_SESSION['user_id']) exit; // 로그인 되어있지 않으면 확인 불
$searchDate = $_POST['searchDate'];
$ord_by = $_POST['ordBy'];
$result = getBakeryInvenData($searchDate, $ord_by);
$authInfo = getAuthorInfo($searchDate);
// UTF-8 BOM 추가
echo "\xEF\xBB\xBF";
@ -17,26 +18,105 @@ header("Content-Description: PHP Generated Data");
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
.tit { background-color:#C0C0C0; height:30px; }
.no-text { mso-number-format:'\@'; text-align:center; }
table {border-collapse:collapse; border:none;}
.head {background-color:#C0C0C0; border: 1px solid black;}
.foot {background-color:#C0C0C0; border: 1px solid black;}
.no-text {mso-number-format:'\@'; text-align: center; }
.line {border: 1px solid black;}
</style>
<table cellspacing="0" cellpadding="0" border="1">
<table>
<thead>
<tr>
<th class="tit">품목</th>
<th class="tit">바코드</th>
<th class="tit">전일재고</th>
<th class="tit">생산</th>
<th class="tit">업장사용</th>
<th class="tit">재활용</th>
<th class="tit">폐기</th>
<th class="tit">판매수량</th>
<th class="tit">판매단가</th>
<th class="tit">판매금액</th>
<th class="tit">메뉴별할인</th>
<th class="tit">결제금액</th>
<th class="tit">현재고</th>
<th>베이커리일일현황</th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
</tr>
<tr>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
</tr>
<tr>
<th>날짜</th>
<th><?=$searchDate?></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
</tr>
<tr>
<th>근무자</th>
<th><?=$authInfo['worker']?></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
</tr>
<tr>
<th>작성자</th>
<th><?=$authInfo['author']?></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
</tr>
<tr>
<th class="head">품목</th>
<th class="head">바코드</th>
<th class="head">전일재고</th>
<th class="head">생산</th>
<th class="head">업장사용</th>
<th class="head">재활용</th>
<th class="head">폐기</th>
<th class="head">판매수량</th>
<th class="head">판매단가</th>
<th class="head">판매금액</th>
<th class="head">메뉴별할인</th>
<th class="head">결제금액</th>
<th class="head">현재고</th>
</tr>
</thead>
<tbody>
@ -48,6 +128,7 @@ foreach ( $result as $row) {
$previous_stock = getPrevStock($searchDate, $row['barcode']);
?>
<tr>
<<<<<<< HEAD
<td><?=$row['product_name']?></td>
<td><?=$row['barcode']?></td>
<td><?=number_format($previous_stock)?></td>
@ -61,6 +142,21 @@ foreach ( $result as $row) {
<td><?=number_format($row['menu_discount'])?></td>
<td><?=number_format($row['payment_amount'])?></td>
<td><?=number_format($row['current_stock'])?></td>
=======
<td class="line"><?=$row['product_name']?></td>
<td class="line"><?=$row['barcode']?></td>
<td class="line"><?=number_format(getPrevStock($searchDate, $row['barcode']))?></td>
<td class="line"><?=number_format($row['production'])?></td>
<td class="line"><?=number_format($row['inhouse_use'])?></td>
<td class="line"><?=number_format($row['recycling'])?></td>
<td class="line"><?=number_format($row['disposal'])?></td>
<td class="line"><?=number_format($row['sales'])?></td>
<td class="line"><?=($row['sales'] != 0 && $row['sales_amount'] != 0) ? number_format($row['sales_amount']/$row['sales']) : 0 ?></td>
<td class="line"><?=number_format($row['sales_amount'])?></td>
<td class="line"><?=number_format($row['menu_discount'])?></td>
<td class="line"><?=number_format($row['payment_amount'])?></td>
<td class="line"><?=number_format($row['current_stock'])?></td>
>>>>>>> manager
</tr>
<?php
@ -78,21 +174,21 @@ foreach ( $result as $row) {
}
?>
</tbody>
<tfoot class="table-group-divider">
<tr class="bakery_total">
<td>합계</td>
<td></td>
<td><?=number_format($t_prev_stock) ?></td>
<td><?=number_format($t_production) ?></td>
<td><?=number_format($t_inhouse_use) ?></td>
<td><?=number_format($t_recycling) ?></td>
<td><?=number_format($t_disposal) ?></td>
<td><?=number_format($t_sales) ?></td>
<td></td>
<td><?=number_format($t_sales_amount) ?></td>
<td><?=number_format($t_menu_discount) ?></td>
<td><?=number_format($t_payment_amount) ?></td>
<td><?=number_format($t_current_stock) ?></td>
</tr>
</tfoot>
<tfoot class="table-group-divider">
<tr class="bakery_total">
<td class="foot">합계</td>
<td class="foot"></td>
<td class="foot"><?=number_format($t_prev_stock) ?></td>
<td class="foot"><?=number_format($t_production) ?></td>
<td class="foot"><?=number_format($t_inhouse_use) ?></td>
<td class="foot"><?=number_format($t_recycling) ?></td>
<td class="foot"><?=number_format($t_disposal) ?></td>
<td class="foot"><?=number_format($t_sales) ?></td>
<td class="foot"></td>
<td class="foot"><?=number_format($t_sales_amount) ?></td>
<td class="foot"><?=number_format($t_menu_discount) ?></td>
<td class="foot"><?=number_format($t_payment_amount) ?></td>
<td class="foot"><?=number_format($t_current_stock) ?></td>
</tr>
</tfoot>
</table>

View File

@ -2,12 +2,7 @@
if (!isset($_SESSION['user_id'])) exit; //페이지 직접 실행 방지
// 권한부여 및 체크
$pageAuth = array(
'abc',
'firstgarden',
'bakery'
);
if ( !in_array($_SESSION['user_id'], $pageAuth) ) {
alert('권한이 없습니다', false);
if ( !in_array($_SESSION['user_id'], $pageAuth['bakery']) && !in_array($_SESSION['user_id'], $pageAuth['admin']) ) {
alert('권한이 없습니다'.$pageAuth['admin'].','.$pageAuth['bakery'].'만 이용할 수 있습니다.', false);
}
?>