From 05f150ace602d0581a6e727b97315f5cf9641edc Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Tue, 19 Dec 2023 09:39:31 +0800
Subject: [PATCH] =?UTF-8?q?option=20=E5=8A=A0=E4=B8=8A=E7=9C=8Bmi=E7=9A=84?=
 =?UTF-8?q?=E6=AC=8A=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/excel-upload.php            | 2 +-
 wms/mkt/price_option-select.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wms/excel-upload.php b/wms/excel-upload.php
index 1a9d842d..222c585b 100644
--- a/wms/excel-upload.php
+++ b/wms/excel-upload.php
@@ -224,7 +224,7 @@ if (move_uploaded_file($temp_file_name, $target_file)) {
 
 ?>
 
-
+<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>
 <div class="container">
     <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>"
           enctype="multipart/form-data">
diff --git a/wms/mkt/price_option-select.php b/wms/mkt/price_option-select.php
index 555ad2f8..c371960e 100644
--- a/wms/mkt/price_option-select.php
+++ b/wms/mkt/price_option-select.php
@@ -1,8 +1,8 @@
 <?php 
 include "../header.php";
 require_once('./conn.php');
-$sql_str = "SELECT * FROM option_price   WHERE status ='Y'";
-
+$sql_str = "SELECT *, option_mi.price as cost FROM option_price LEFT JOIN (SELECT option_mi.option_price_id, option_mi.price  FROM option_mi GROUP BY option_mi.option_price_id) option_mi ON option_price.id = option_mi.option_price_id WHERE status ='Y'";
+$sql_str = "SELECT * FROM option_price   WHERE  status ='Y'";
 $stmt = $conn->prepare($sql_str);
 $stmt->execute();
 $options = $stmt->fetchAll(PDO::FETCH_ASSOC);