From 3f7479106a9db52405c4495e698bdb64d005285b Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Fri, 26 Jan 2024 16:56:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B5=A6=E5=AD=90=E6=88=90=E5=90=88=E4=BD=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/contract-repair/insertFacility.php        |   2 +-
 wms/contract/contract-download.php            |   8 +-
 .../contract-maintainance-management.php      | 114 ++++++++++++++++++
 wms/contract/contract-new-apply.php           |  18 ++-
 wms/contract/js/alpine.js                     |   1 +
 wms/contract/option/facility.xlsx             | Bin 11704 -> 12281 bytes
 wms/contract/prviewPdf.php                    |   5 +
 wms/contract/restoremi.php                    |   2 +-
 wms/database.php                              |  20 +--
 wms/fun_global.php                            |   8 +-
 wms/mkt/assets/js/alpine.js                   |   1 +
 wms/mkt/pricereview-index.php                 |  29 +++--
 wms/mkt/pricereview_mi-api.php                |  90 ++++++++++++--
 13 files changed, 260 insertions(+), 38 deletions(-)
 create mode 100644 wms/contract/contract-maintainance-management.php

diff --git a/wms/contract-repair/insertFacility.php b/wms/contract-repair/insertFacility.php
index 788976f3..c15206f1 100644
--- a/wms/contract-repair/insertFacility.php
+++ b/wms/contract-repair/insertFacility.php
@@ -5,7 +5,7 @@ ini_set('data.timezone', 'Asia/Taipei');
 
 use PhpOffice\PhpSpreadsheet\IOFactory;
 
-$filePath = './facility/facility.xlsx';
+// $filePath = './facility/facility.xlsx';
 
 try {
     $spreadsheet = IOFactory::load($filePath);
diff --git a/wms/contract/contract-download.php b/wms/contract/contract-download.php
index 3693ab7d..3ae40fa2 100644
--- a/wms/contract/contract-download.php
+++ b/wms/contract/contract-download.php
@@ -24,6 +24,7 @@ if (isset($_GET['id']) && $_GET['id'] != "") {
         $stmt->bindParam(':id', $id);
         $stmt->execute();
         $contracts = $stmt->fetchAll(PDO::FETCH_ASSOC);
+      
         $contract = $contracts[0];
         $contract_apply_id = $contract['id'];
         if (($contract['status'] !== "YY" && $user_id != 'M0107' && $user_id != "TEST02" && $user_id == "TEST01") && $user_id != 'M0174' && $user_id != 'M0225') {
@@ -52,7 +53,8 @@ if (isset($_GET['id']) && $_GET['id'] != "") {
         $install_total_price = 0;
         // $noteArr = explode(",", $contracts[0]['note']);
         $noteArr = array(1, 1, 1, 1, 1);
-        $qty = $contracts[0]['total_items'];
+        // $qty = $contracts[0]['total_items'];
+        $qty = 1;
         foreach ($contracts as $idx => $amount) {
             $isset = false;
             if ($amount['pay_kind'] == 5 || $amount['pay_kind'] == 6) {
@@ -413,8 +415,8 @@ if (isset($_GET['id']) && $_GET['id'] != "") {
             <input type="hidden" name="buystandard" x-model="toggleBuyStandard" />
             <input type="hidden" name="installstandard" x-model="toggleInstallStandard" />
             <input type="hidden" name="total_price" x-model="total_price" id="total_price" />
-            <input type="hidden" name="person" id="person" value="<?php echo $contract['accountname']; ?>" />
-            <input type="hidden" name="personid" id="personid" value="<?php echo $contract['accountid']; ?>" />
+            <input type="hidden" name="person" id="person" value="<?php echo $contract['personname']; ?>" />
+            <input type="hidden" name="personid" id="personid" value="<?php echo $contract['person']; ?>" />
             <input type="hidden" name="delivery_term" id="delivery_term" x-model="buyfill1" />
             <input type="hidden" name="install_period" id="install_period" x-model="installfill1" />
             <input type="hidden" name="free_maintainance" id="free_maintainance" x-model="installfill2" />
diff --git a/wms/contract/contract-maintainance-management.php b/wms/contract/contract-maintainance-management.php
new file mode 100644
index 00000000..c0f94479
--- /dev/null
+++ b/wms/contract/contract-maintainance-management.php
@@ -0,0 +1,114 @@
+<?php 
+include("../header.php");
+require_once("./conn.php");
+$sql_str = "SELECT * FROM contract_b_signed_back ";
+$stmt = $conn->prepare($sql_str);
+$stmt->execute();
+$contracts= $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+?>
+
+<link rel="stylesheet" href="./styles/style.css">
+<link rel="stylesheet" href="semantic/dist/semantic.min.css">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<script defer src="./js/alpinejs/cdn.min.js"></script>
+<script src="./js/axios/axios.min.js"></script>
+
+
+<div style="overflow-x:auto;margin-top:12px">
+<a href="contract-newelevator-input.php?function_name=repair&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+            <tr>
+                <th>項次</th>
+                <th>合約號</th>
+                <th>客戶名稱</th>
+                <th>統編</th>
+                <th>營業員</th>
+                <th>合約開始時間</th>
+                <th>合約終止時間</th>
+                <th>狀態</th>
+                <th>建檔者</th>
+                <th>建立時間</th>
+                <th>操作</th>			
+            </tr>
+		</thead>
+		<tbody>			
+            <?php foreach($contracts as $contract): ?>
+            <tr>
+                <td><?php echo $contract['id']; ?></td>
+                <td><?php echo $contract['contract_no'] ?></td>
+                <td><?php echo $contract['company'] ?></td>
+                <td><?php echo $contract['customer_no'] ?></td>
+                <td><?php echo $contract['salesperson'] ?></td>
+                <td><?php echo $contract['contract_start_date'] ?></td>
+                <td><?php echo $contract['contract_end_date'] ?></td>
+                <td>
+                    <?php 
+                        $endDate = new DateTime($contract['contract_end_date']);
+                        $now = new DateTime();
+                        $interval = $now->diff($endDate);
+                        if ($interval->days <= 60) {
+                            echo "60天以內。";
+                        } else {
+                            echo "指定日期與當前日期相差超過60天。";
+                        }
+                        
+                        ?>
+                </td>
+                <td><?php echo $contract['created_by'] ?></td>
+                <td><?php echo $contract['created_at'] ?></td>
+                <td style="width:30px">
+                    <p>
+                        <a href="contract-newelevator-edit.php?contractid=<?php echo $contract['id']; ?>&function_name=repair&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+                            <span class="glyphicon glyphicon-pencil"></span>
+                        </a>
+                        <a href="javascript:;" class="btn btn-info btn-sm" style="margin-left:10px;" @click="deleteFn(<?php  echo $contract['id']; ?>)">
+                            <span class="glyphicon glyphicon-remove"></span>
+                        </a>
+                    </p> 
+                </td>
+            </tr>
+            <?php endforeach ?>
+        </tbody>			
+        </table>
+    </div>
+</div>
+
+<style>
+table {
+    table-layout:fixed;
+    width: 100%;
+}
+
+td {
+    word-wrap:break-word;
+}
+
+img {
+    width:125px;
+}
+
+.width_style_1 {
+	width:125px;
+}
+
+table{
+    width:100%;
+}
+#table_index_filter{
+    float:right;
+}
+#table_index_paginate{
+    float:right;
+}
+label {
+    display: inline-flex;
+    margin-bottom: .5rem;
+    margin-top: .5rem;
+   
+}
+
+</style>
\ No newline at end of file
diff --git a/wms/contract/contract-new-apply.php b/wms/contract/contract-new-apply.php
index 8c8d4628..c6e8ee2c 100644
--- a/wms/contract/contract-new-apply.php
+++ b/wms/contract/contract-new-apply.php
@@ -97,13 +97,14 @@ if (empty($contract_new_apply)) {
     $stmt->bindParam(':contract_id', $id);
     $stmt->execute();
     $files = $stmt->fetchAll(PDO::FETCH_ASSOC);
-    print_r($files);
+    // print_r($files);
 }
 $secondPayDeadline = $contract['secondPayDeadline'] ?? 0;
 $status = isset($contract['status']) ? $contract['status'] : -1;
 $progress = isset($contract['progress']) ? $contract['progress'] : 0;
 $person = $contract['person'];
 
+$para = "function_name=pricereview&" . $token_link;
 ?>
 <link rel="stylesheet" href="./styles/style.css">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
@@ -129,7 +130,8 @@ $person = $contract['person'];
                         </td>
                         <td class="text-right" style='border-left:0px;'>
                             <button type="button" id="btn_close" class="btn btn-default" onclick="window.history.back();">返回</button>
-                            <button type="button" id="btn_close" class="btn btn-default" onclick="window.close();">關閉分頁</button>
+                            <button type="button" id="btn_close" class="btn btn-success" onclick="donwloadDraft()">下載草搞</button>
+                            <!-- <a class="applybtn" href="./contract-download.php?id=<?php echo $id . '&' . $para ?>">下載草稿</a> -->
                         </td>
                     </tr>
                     <tr>
@@ -702,4 +704,14 @@ $person = $contract['person'];
         }
     </script>
 
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
+
+<script>
+    const donwloadDraft = () => {
+        if('<?php echo $status ?>' >=0 ){
+            window.location.href='./contract-download.php?id=<?php echo $id . '&' . $para ?>'
+        }else{
+            alert("請先暫存或送審文件!")
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js
index c93e56a0..d13d8389 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -1381,6 +1381,7 @@ const contractNewApply = () => {
             form.append('status', 1);
             form.append('review_comment', this.data.review_comment);
             form.append('description', this.data.description);
+            form.append('progress', 0);
             for (var i = 0; i < this.data.files.length; i++) {
                 form.append('files[]', this.data.files[i]);
             }
diff --git a/wms/contract/option/facility.xlsx b/wms/contract/option/facility.xlsx
index 929a328d97e38352029426fd941b891003ce2636..f51a39441a3f490f6de5bb93603dcccf68a56b70 100644
GIT binary patch
delta 6409
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

delta 5789
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
JGjRUh{2w8@<j?>B

diff --git a/wms/contract/prviewPdf.php b/wms/contract/prviewPdf.php
index 6c57d5e9..1d311b0a 100644
--- a/wms/contract/prviewPdf.php
+++ b/wms/contract/prviewPdf.php
@@ -19,6 +19,7 @@ if($_POST['list']){
     $total_price = $_POST['total_price'];
     $person = $_POST['person'];
     $personid = $_POST['personid'];
+    echo "----->" . $personid;
     $delivery_term = $_POST['delivery_term'];
     $install_period = $_POST['install_period'];
     $free_maintainance = $_POST['free_maintainance'];
@@ -45,6 +46,10 @@ if($_POST['list']){
     $stmt->bindParam(':vol_no', $partyAcontractno);
     $stmt->execute();
     $customer = $stmt->fetch(PDO::FETCH_ASSOC);
+    if(empty($customer)){
+        echo "有望客戶資料有誤！";
+        exit;
+    }
     if(count($customer) <= 0 ){
         echo "<script>
             alert('資料不齊或合約書已生成過。');
diff --git a/wms/contract/restoremi.php b/wms/contract/restoremi.php
index 1ff9154c..dbf2ee92 100644
--- a/wms/contract/restoremi.php
+++ b/wms/contract/restoremi.php
@@ -9,7 +9,7 @@ $id = $_GET['id'];
 use PhpOffice\PhpSpreadsheet\IOFactory;
 
 if($id == 999){
-    $filePath = './option/f1.xlsx';
+    $filePath = './option/facility.xlsx';
     try {
         $spreadsheet = IOFactory::load($filePath);
     } catch (\PhpOffice\PhpSpreadsheet\Reader\Exception $e) {
diff --git a/wms/database.php b/wms/database.php
index 88d5ebe9..bc99328c 100644
--- a/wms/database.php
+++ b/wms/database.php
@@ -19,21 +19,21 @@ $host = getenv('DB_HOST');
 $dbuser = getenv('DB_USERNAME');
 $dbpassword = getenv('DB_PASSWORD');
 $dbname = getenv('DB_DATABASE');
-$link = mysqli_connect($host, $dbuser, $dbpassword, $dbname);
+// $link = mysqli_connect($host, $dbuser, $dbpassword, $dbname);
 
 $sqlsrv = getenv('sqlsrv');
 $Database = getenv('Database');
 $Account = getenv('Account');
 $Password = getenv('Password');
-try {
-    $conn = new PDO("sqlsrv:Server=$sqlsrv;Database=$Database", "$Account", "$Password");
-    if ($conn) {
-        $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-    }
-} catch (PDOException $e) {
-    echo "fail";
-    echo $e->getMessage();
-}
+// try {
+//     $conn = new PDO("sqlsrv:Server=$sqlsrv;Database=$Database", "$Account", "$Password");
+//     if ($conn) {
+//         $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+//     }
+// } catch (PDOException $e) {
+//     echo "fail";
+//     echo $e->getMessage();
+// }
 if ($link) {
     mysqli_query($link, 'SET NAMES utf8');
     // echo "正確連接資料庫";
diff --git a/wms/fun_global.php b/wms/fun_global.php
index 436a91e8..cd4271b2 100644
--- a/wms/fun_global.php
+++ b/wms/fun_global.php
@@ -102,7 +102,7 @@ function pricereview_class($rate, $user_id, &$ret = [], $special_fee, $i = 0)
             // 若為第一層且使用者ID為區經理，直接訂好接下來的簽核人員並跳出。
             if ($i == 0 && ($user_id == 'M0033' || $user_id == "M0137" || $user_id == 'M0029' || $user_id == 'M0054' || $user_id == "M0086")) {
                 $ret[1] = $user_id . ",,";
-                $ret[2] = "M0175,,<##>M0107,,";         // 業務部專員：M0175陳君敏、M0107許紓晴(第2關有多位審核人)
+                $ret[2] = "M0107,,<##>M0175,,";         // 業務部專員：M0175陳君敏、M0107許紓晴(第2關有多位審核人)
                 $ret[3] = "M0060,,";                    // 業務協理
                 if ($rate < 80 || $special_fee > 0) {
                     $ret[4] = "M0006,,";    // 總經理
@@ -123,7 +123,7 @@ function pricereview_class($rate, $user_id, &$ret = [], $special_fee, $i = 0)
                 }
             } else {
                 
-                $ret[2] = "M0175,,<##>M0107,,";         // 業務部專員：M0175陳君敏、M0107許紓晴(第2關有多位審核人)
+                $ret[2] = "M0107,,<##>M0175,,";         // 業務部專員：M0175陳君敏、M0107許紓晴(第2關有多位審核人)
                 $ret[3] = "M0060,,";                    // 業務協理
                 if ($rate < 80 || $special_fee > 0) {
                     $ret[4] = "M0006,,";    // 總經理
@@ -158,7 +158,7 @@ function pricereview_renovate_class($rate, $user_id, $renovate_flag)
         }
     }
     // $ret[1] = "M0029";
-
+    mysqli_free_result($res);
     $ret[2] = 'M0012';
     if ($renovate_flag == "REN") {
         // $ret[2] = 'M0012';
@@ -169,7 +169,7 @@ function pricereview_renovate_class($rate, $user_id, $renovate_flag)
         if ($rate <= 100) $ret[3] = "M0008";  // 詹總
         if ($rate < 80) $ret[4] = "M0006";  // 總經理
     }
-    mysqli_free_result($res);
+
     return $ret;
 }
 
diff --git a/wms/mkt/assets/js/alpine.js b/wms/mkt/assets/js/alpine.js
index d28a3f3f..85f3c5a4 100644
--- a/wms/mkt/assets/js/alpine.js
+++ b/wms/mkt/assets/js/alpine.js
@@ -297,6 +297,7 @@ const pricereviewOptionSelect = () => {
             this.options = this.orioptions
             this.reloadOptions();
             let val = (e== null) ? this.searchtext.toLowerCase() : e.target.value.toLowerCase()
+            console.log(val);
             this.options.forEach(option=>{
                 if(option.group_name == null) option.group_name = ''
                 if(option.spec == null) option.spec = ''
diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php
index ec517324..8ee8b81d 100644
--- a/wms/mkt/pricereview-index.php
+++ b/wms/mkt/pricereview-index.php
@@ -125,6 +125,14 @@ if (!empty($res_get) || (!empty($_GET['check']) && $_GET['check'] == 1)) {
     // echo $sql;
 }
 
+if($user_id === "M0137"){
+    $sql = "SELECT pricereview_main.*,contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress
+    FROM pricereview_main 
+    left join contract_new_apply on  contract_new_apply.mid = pricereview_main.id 
+    JOIN account ON account.accountid = pricereview_main.creater 
+    WHERE (account.manager = 'M0029' OR account.manager='M0137') AND pricereview_main.status <> 'D' AND pricereview_main.ekind = '新梯' order by pricereview_main.id";
+}
+
 $data = mysqli_query($link, $sql);
 
 // 若結案不同意
@@ -323,9 +331,11 @@ function get_pending($token)
 }
 
 $result = get_pending($token);
-print_r($result);
-$result[1]['sid'] = !empty($result) ? $result[1]['sid'] : 'prm';
-$result[1]['fid'] = !empty($result) ? $result[1]['fid'] : 'prm01';
+// print_r($result);
+if(count($result) > 0){
+    $result[1]['sid'] = !empty($result) ? $result[1]['sid'] : 'prm';
+    $result[1]['fid'] = !empty($result) ? $result[1]['fid'] : 'prm01';
+}
 
 if ($data) :
     /*
@@ -348,9 +358,13 @@ if ($data) :
 </style>
     <link rel="stylesheet" href="common.css">
     <div style="overflow-x:auto; white-space:nowrap;">
-        <?php if($user_id=== "M0060" || $user_id==="M0107" || $user_id==="M0175" || $user_id==="M0174" || $user_id==="M0225"){ ?>
+        <?php if(($user_id=== "M0060" || $user_id==="M0107" || $user_id==="M0175" || $user_id==="M0174" || $user_id==="M0225")){ ?>
         <a href="/wms/mkt/pricereview-index.php?&function_name=pricereview&token=<?php echo $token; ?>" class=" btn <?php echo (!isset($_GET['system_id']) && !isset($_GET['check'])) ? "btn btn-primary" : "btn-secondary"; ?>   btn-sm categoryBtn"> 所有價審</a>
+        <?php if(count($result) > 0): ?>
         <a href="/wms/mkt/pricereview-index.php?system_id=<?= $result[1]['sid'] ?>&flow_id=<?= $result[1]['fid'] ?>&function_name=pricereview&token=<?php echo $token; ?>" class=" btn <?php echo (isset($_GET['system_id'])) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 待我簽核</a>
+        <?php else: ?>
+        <a href="javascript:;" onclick="alert('無待簽資料')" class=" btn <?php echo (isset($_GET['system_id'])) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 待我簽核</a>
+        <?php endif ;?>
         <a href="/wms/mkt/pricereview-index.php?check=1&function_name=pricereview&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 1) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 簽核完畢</a>
         <a href="/wms/mkt/pricereview-index.php?check=2&function_name=pricereview&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 2) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 結案同意</a>
         <a href="/wms/mkt/pricereview-index.php?check=3&function_name=pricereview&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 3) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 結案不同意</a>
@@ -698,13 +712,15 @@ if ($data) :
                                 <?php if (($user_id === "M0107" || $user_id === "M0060") && $data['applystatus'] < 3) : ?>
                                     <span style="font-size:13px;font-weight:600">待申請</span>
                                 <?php elseif ($data['applystatus'] < 3) : ?>
-                                    <a class="applybtn" target="_blank" href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">
+                                    <a class="applybtn"  href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">
                                         <?php if ($data['applystatus'] < 1) {
                                             echo "申請";
                                         } else {
                                             echo "檢視";
                                         } ?>
                                     </a><br>
+                                <?php else : ?>
+                                    <a class="applybtn"  href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">審請已通過</a><br>
                                 <?php endif; ?>
                             <?php else : ?>
 
@@ -720,9 +736,6 @@ if ($data) :
                             <?php if (false && ($data['status'] === 'YY' && $data['applystatus'] == 3 && ($user_id == "M0107" || $user_id == "M0060" || $user_id == "M0175" || $user_id === "TEST02")) || $user_id == "M0174" || $user_id == 'M0225') : ?>
                                 <a class="applybtn" href="../contract/contract-download.php?id=<?php echo $data['id'] . '&' . $para ?>">下載</a>
                             <?php endif; ?>
-                            <?php if ($data['status'] === 'YY') : ?>
-                                <a class="applybtn" href="../contract/contract-download.php?id=<?php echo $data['id'] . '&' . $para ?>">下載草稿</a>
-                            <?php endif; ?>
                         </td>
                     </tr>
                 <?php endforeach; ?>
diff --git a/wms/mkt/pricereview_mi-api.php b/wms/mkt/pricereview_mi-api.php
index 0d8438c4..3784957b 100644
--- a/wms/mkt/pricereview_mi-api.php
+++ b/wms/mkt/pricereview_mi-api.php
@@ -167,6 +167,7 @@ try {
         $ex_fee += $exarr[$j][1];
         $j++;
     }
+    // print_r($exarr);
     mysqli_free_result($res);
 
     // 拆梯&美容平均分到每台電梯
@@ -326,14 +327,14 @@ try {
                             LEFT JOIN option_mi ON option_price.id = option_mi.option_price_id
                             LEFT JOIN elevator_quotation_rule ON option_mi.quotation_no = elevator_quotation_rule.quotation_no
                             WHERE option_price.status = 'Y' ";
-$sql4 = "SELECT option_price.id, elevator_quotation_rule.equipment, option_mi.base_floor, option_mi.quotation_no, option_mi.base_floor_plus, option_mi.price, option_price.price as OP 
-FROM option_price
-LEFT JOIN option_mi ON option_price.id = option_mi.option_price_id
-LEFT JOIN elevator_quotation_rule ON option_mi.quotation_no = elevator_quotation_rule.quotation_no
-WHERE option_mi.option_price_id = " . $opt_elev_arr[$val]["price_id"] . " 
-AND (" . $v["item_weight"] . " BETWEEN option_mi.min_weight AND option_mi.max_weight) 
-AND option_mi.open_kind = '" . $v["item_op"] . "'";
-
+                    //新的SQL
+                    $sql4 = "SELECT option_price.id, elevator_quotation_rule.equipment, option_mi.base_floor, option_mi.quotation_no, option_mi.base_floor_plus, option_mi.price, option_price.price as OP 
+                    FROM option_price
+                    LEFT JOIN option_mi ON option_price.id = option_mi.option_price_id
+                    LEFT JOIN elevator_quotation_rule ON option_mi.quotation_no = elevator_quotation_rule.quotation_no
+                    WHERE option_mi.option_price_id = " . $opt_elev_arr[$val]["price_id"] . " 
+                    AND (" . $v["item_weight"] . " BETWEEN option_mi.min_weight AND option_mi.max_weight) 
+                    AND option_mi.open_kind = '" . $v["item_op"] . "'";
 
                     $res_om = mysqli_query($link, $sql4);
                     if ($row_om = mysqli_fetch_assoc($res_om)) {
@@ -449,6 +450,79 @@ AND option_mi.open_kind = '" . $v["item_op"] . "'";
     }
 
     $rarr["content"] = $mi_arr;
+    $sql_str = "SELECT * FROM pricereview_item WHERE mid = :mid AND item_group = 'E'";
+    $stmt = $conn->prepare($sql_str);
+    $stmt->bindParam(':mid', $id);
+    $stmt->execute();
+    $items = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+    $sql_str = "SELECT pricereview_item.*,option_mi.price as option_mi FROM pricereview_item LEFT JOIN option_mi ON pricereview_item.price_id = option_mi.option_price_id WHERE pricereview_item.mid = :mid AND pricereview_item.item_group = 'B'";
+    $sql_str = "SELECT 
+    pricereview_item.*,
+    (SELECT option_mi.price 
+     FROM option_mi 
+     WHERE pricereview_item.price_id = option_mi.option_price_id 
+     ORDER BY option_mi.id ASC LIMIT 1) AS option_mi
+    FROM 
+        pricereview_item 
+    WHERE 
+        pricereview_item.mid = :mid 
+    AND pricereview_item.item_group = 'B'";
+    $stmt = $conn->prepare($sql_str);
+    $stmt->bindParam(':mid', $id);
+    $stmt->execute();
+    $itemoptions = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+
+
+    $exceptArr = [];
+    foreach($items as $item){
+        if($item['option_relate_spec'] != NULL){
+            $exceptArr[] = [
+                'option_relate_spec'=> $item['option_relate_spec'],
+                'item_spec'=>$item['item_spec'],
+                'item_unit_price'=>$item['item_unit_price'],
+                'item_qty'=>$item['item_qty'],
+                'item_price_bp'=> $item['item_price_bp'],
+            ];
+        }
+    }
+    // $rarr["content"][] = $exceptArr;
+    foreach($rarr["content"] as $idx=>&$item){
+        $newTotal = 0;
+        $item[16] = [];
+        $item[14] = [];
+        foreach($exceptArr as $except){
+            if($idx+1 == $except['option_relate_spec']){
+                $item[16][] = [
+                    $except['item_spec'],
+                    $except['item_unit_price']* $except['item_qty']
+                ];
+            }
+        }
+        foreach($itemoptions as $itemoption){
+
+            if($idx+1 == $itemoption['option_relate_spec']){
+                $item[14][] = [
+                    $itemoption['item_spec'],
+                    round($itemoption['option_mi'] * $itemoption['item_qty'], 0),
+                ];
+            }
+            
+        }   
+
+        foreach($item[14] as $option){
+            $newTotal += $option[1];
+        }
+        foreach($item[16] as $ex){
+            $newTotal += $ex[1];
+        }
+        $newTotal += $item[17];
+        $newTotal += $item[19][1];
+
+        $item[13] = $newTotal;
+    }
+
 } catch (\Exception $e) {
     $rarr['st'] = 'err';
     $rarr['err'] = $e->getMessage();