firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

베이커리 업데이트 오류 수정

Browse Source
This commit is contained in:
KWON
2025-09-29 09:26:07 +09:00
parent 57c265cb01
commit 3f58acf0f7
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manager/bakery/bakery_stock_excel.php
View File

@ -128,7 +128,6 @@ 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>
@ -142,21 +141,6 @@ 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