diff --git a/wms/account-receivable-index-ing.php b/wms/account-receivable-index-ing.php
index ced50411..722cc971 100644
--- a/wms/account-receivable-index-ing.php
+++ b/wms/account-receivable-index-ing.php
@@ -2158,9 +2158,14 @@ include "./footer.php";
 //[合約號]['facility'] [作番號][款別]0 款項名稱  1 合約金額  2 應收日期  3 應收金額  4 已收金額  5 催收金額  6 催收次數
 ?>
 
-
+<div>
+    <div style="width: 20%;float: right; margin-right: 5%;">
+        <label>查詢條件</label>
+        <input type="text" id="search" name="search" class="form-control" placeholder="請輸入合約號/作番號/客戶名稱" oninput="searchData()">
+    </div>
+</div>
 <div style="width:98%;margin:1% ;overflow-x: auto;">
-    <table  class="table table-striped table-bordered" style="width:100%;">
+    <table class="table table-striped table-bordered" style="width:100%;">
         <thead>
             <tr>
                 <th style="width: 120px;">合約號</th>
@@ -2180,7 +2185,7 @@ include "./footer.php";
             <?php
             foreach ($arrayData as $key => $value) {
             ?>
-                <tr>
+                <tr class="data-row" style="display: '';">
                     <td onclick="toggleContent(this)"><?= $key ?> </td>
                     <td><?= $value[1] ?></td>
                     <td><?= $value[4] ?></td>
@@ -2246,6 +2251,21 @@ include "./footer.php";
     </table>
 </div>
 <script>
+    function searchData() {
+        var searchTerm = document.getElementById('search').value.toLowerCase();
+        var rows = document.getElementsByClassName('data-row');
+        for (var i = 0; i < rows.length; i++) {
+            var rowText = rows[i].textContent.toLowerCase();
+            // var rowText = rows[i].id.toLowerCase();
+            if (rowText.includes(searchTerm)) {
+                console.log(rowText);
+                rows[i].style.display = '';
+            } else {
+                rows[i].style.display = 'none';
+            }
+        }
+    }
+
     function toggleContent(element) {
         var parentRow = element.parentNode;
         var contentRow = parentRow.nextElementSibling;
@@ -2391,80 +2411,80 @@ $table = "";
 // [合約號]['facility'][作番號]['no']
 //['receivable_budget'] / ['total_facility_num'] / ['total_budget']
 //('sign', 'second', 'arrive', 'install', 'tryrun', 'check', 'delivery', 'final');
-foreach ($arrayData as $key => $value) {
-    if (isset($value['facility']) && !empty($value['facility'])) {
-        foreach ($value['facility'] as $fakey => $facility) {
-            foreach ($contractstage as $stage) {
-                switch ($stage) {
-                    case 'sign':
-                        $stageno = 0;
-                        break;
-                    case 'second':
-                        $stageno = 1;
-                        break;
-                    case 'arrive':
-                        $stageno = 2;
-                        break;
-                    case 'install':
-                        $stageno = 3;
-                        break;
-                    case 'tryrun':
-                        $stageno = 4;
-                        break;
-                    case 'check':
-                        $stageno = 5;
-                        break;
-                    case 'delivery':
-                        $stageno = 6;
-                        break;
-                    case 'final':
-                        $stageno = 7;
-                        break;
-                }
-                if (isset($value[$stage]) && isset($value[$stage][0]) && !empty($value[$stage][0])) {
-                    if ($value[$stage][3] > 0) {
-                        $stage3 = 1;
-                    } else {
-                        $stage3 = 0;
-                    }
-                    if ($value[$stage][7] > 0) {
-                        $stage7 = 1;
-                    } else {
-                        $stage7 = 0;
-                    }
-                    $invoice_budget = $value[$stage][7];
-                    $received_budget = $value[$stage][4];
-                    $budget = $value[$stage][1];
-                    $receivable_date = $value[$stage][2];
-                    $table .= "INSERT INTO account_receivable (
-`contract_no`,
-`facility_no`,
-`stage`,
-`budget`,
-`receivable_date`,
-`receivable`,
-`invoice`,
-`invoice_budget`,
-`received_budget`";
-                    if ($value[$stage][7] > 0) {
-                        $table .= ",`invoice_state`";
-                    }
-                    $table .= ") VALUES ('$key','$fakey',$stageno,$budget,$receivable_date,$stage3,$stage7,$invoice_budget,$received_budget ";
-                    if ($value[$stage][7] > 0) {
-                        $table .= ",0";
-                    }
-                    $table .= "); \n";
-                }
-            }
-        }
-    }
-}
+// foreach ($arrayData as $key => $value) {
+//     if (isset($value['facility']) && !empty($value['facility'])) {
+//         foreach ($value['facility'] as $fakey => $facility) {
+//             foreach ($contractstage as $stage) {
+//                 switch ($stage) {
+//                     case 'sign':
+//                         $stageno = 0;
+//                         break;
+//                     case 'second':
+//                         $stageno = 1;
+//                         break;
+//                     case 'arrive':
+//                         $stageno = 2;
+//                         break;
+//                     case 'install':
+//                         $stageno = 3;
+//                         break;
+//                     case 'tryrun':
+//                         $stageno = 4;
+//                         break;
+//                     case 'check':
+//                         $stageno = 5;
+//                         break;
+//                     case 'delivery':
+//                         $stageno = 6;
+//                         break;
+//                     case 'final':
+//                         $stageno = 7;
+//                         break;
+//                 }
+//                 if (isset($value[$stage]) && isset($value[$stage][0]) && !empty($value[$stage][0])) {
+//                     if ($value[$stage][3] > 0) {
+//                         $stage3 = 1;
+//                     } else {
+//                         $stage3 = 0;
+//                     }
+//                     if ($value[$stage][7] > 0) {
+//                         $stage7 = 1;
+//                     } else {
+//                         $stage7 = 0;
+//                     }
+//                     $invoice_budget = $value[$stage][7];
+//                     $received_budget = $value[$stage][4];
+//                     $budget = $value[$stage][1];
+//                     $receivable_date = $value[$stage][2];
+//                     $table .= "INSERT INTO account_receivable (
+// `contract_no`,
+// `facility_no`,
+// `stage`,
+// `budget`,
+// `receivable_date`,
+// `receivable`,
+// `invoice`,
+// `invoice_budget`,
+// `received_budget`";
+//                     if ($value[$stage][7] > 0) {
+//                         $table .= ",`invoice_state`";
+//                     }
+//                     $table .= ") VALUES ('$key','$fakey',$stageno,$budget,$receivable_date,$stage3,$stage7,$invoice_budget,$received_budget ";
+//                     if ($value[$stage][7] > 0) {
+//                         $table .= ",0";
+//                     }
+//                     $table .= "); \n";
+//                 }
+//             }
+//         }
+//     }
+// }
 
-$file_path = 'account_receivable_sql_file.sql';
+// $file_path = 'account_receivable_sql_file.sql';
 
-if (file_put_contents($file_path, $table) !== false) {
-    echo "SQL文件已成功生成：{$file_path}";
-} else {
-    echo "生成SQL文件时出现错误。";
-}
+// if (file_put_contents($file_path, $table) !== false) {
+//     echo "SQL文件已成功生成：{$file_path}";
+// } else {
+//     echo "生成SQL文件时出现错误。";
+// }
 // echo $table;
\ No newline at end of file
diff --git a/wms/account-receivable-index.php b/wms/account-receivable-index.php
index da6204c7..87f59c7b 100644
--- a/wms/account-receivable-index.php
+++ b/wms/account-receivable-index.php
@@ -2401,6 +2401,12 @@ include "./footer.php";
                 <th style="width: 120px;">營業員</th>
                 <th style="width: 180px;">客戶名稱</th>
 
+                <th style="width: 300px;">作番狀態</th>
+                <th style="width: 150px;">合約-設備金額</th>
+                <th style="width: 150px;">合約-安裝金額</th>
+                <th style="width: 150px;">作番總金額</th>
+                <th style="width: 150px;">作番目前應收</th>
+
                 <th style="width: 120px;">訂金 <br>名稱</th>
                 <th style="width: 120px;">訂金<br>合約金額</th>
                 <th style="width: 120px;">訂金<br>應收日期</th>
@@ -2481,11 +2487,7 @@ include "./footer.php";
                 <th style="width: 120px;">尾款<br>催收金額</th>
                 <th style="width: 120px;">尾款<br>催收次數</th>
 
-                <th style="width: 300px;">作番狀態</th>
-                <th style="width: 150px;">合約-設備金額</th>
-                <th style="width: 150px;">合約-安裝金額</th>
-                <th style="width: 150px;">作番總金額</th>
-                <th style="width: 150px;">作番目前應收</th>
+
 
             </tr>
         </thead>
@@ -2501,6 +2503,12 @@ include "./footer.php";
                     <td style="text-align: center;"><?= $value[5] ?></td>
                     <td style="text-align: center;"><?= $value[6] ?></td>
 
+                    <td style="text-align: end;"><?= $value[82] ?></td>
+                    <td style="text-align: end;"><?= $value[83] ?></td>
+                    <td style="text-align: end;"><?= $value[84] ?></td>
+                    <td style="text-align: end;"><?= $value[85] ?></td>
+                    <td style="text-align: end;"><?= $value[86] ?></td>
+ 
                     <td style="text-align: end;"><?= $value[10] ?></td>
                     <td style="text-align: end;"><?= $value[11] ?></td>
                     <td style="text-align: end;"><?= $value[12] ?></td>
@@ -2585,12 +2593,6 @@ include "./footer.php";
                     <td style="text-align: end;"><?= $value[80] ?></td>
                     <td style="text-align: end;"><?= $value[81] ?></td>
 
-                    <td style="text-align: end;"><?= $value[82] ?></td>
-                    <td style="text-align: end;"><?= $value[83] ?></td>
-                    <td style="text-align: end;"><?= $value[84] ?></td>
-                    <td style="text-align: end;"><?= $value[85] ?></td>
-                    <td style="text-align: end;"><?= $value[86] ?></td>
- 
                 </tr>
             <?php
             }
diff --git a/wms/account-receivable-renovate-index.php b/wms/account-receivable-renovate-index.php
index 63c1f588..5b2929dd 100644
--- a/wms/account-receivable-renovate-index.php
+++ b/wms/account-receivable-renovate-index.php
@@ -387,46 +387,46 @@ foreach ($arrayData as &$value) {
                             switch ($facility['PayStage'][$stage]['name']) {
                                 case (stristr($facility['PayStage'][$stage]['name'], '試車')):
                                     if (isset($wipwhole_status[$fakey]['tryrun_end_date']) && $wipwhole_status[$fakey]['tryrun_end_date'] !== NULL && !empty($wipwhole_status[$fakey]['tryrun_end_date'])) {
-                                        $haveNumber = (int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT);
+                                        $haveNumber = ((int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT)) - 1;
                                         $facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['tryrun_end_date'])));
                                     }
                                     break;
                                 case (stristr($facility['PayStage'][$stage]['name'], '完工')):
                                     if (isset($wipwhole_status[$fakey]['delivery_date']) && $wipwhole_status[$fakey]['delivery_date'] !== NULL && !empty($wipwhole_status[$fakey]['delivery_date'])) {
-                                        $haveNumber = (int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT);
+                                        $haveNumber = ((int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT)) - 1;
                                         $facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['delivery_date'])));
                                     }
                                     break;
                                 case (stristr($facility['PayStage'][$stage]['name'], '尾款')):
                                     if (isset($wipwhole_status[$fakey]['delivery_date']) && $wipwhole_status[$fakey]['delivery_date'] !== NULL && !empty($wipwhole_status[$fakey]['delivery_date'])) {
-                                        $haveNumber = (int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT);
+                                        $haveNumber = ((int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT)) - 1;
                                         $facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['delivery_date'])));
                                     }
                                     break;
                                 case (stristr($facility['PayStage'][$stage]['name'], '交車')):
                                     if (isset($wipwhole_status[$fakey]['delivery_date']) && $wipwhole_status[$fakey]['delivery_date'] !== NULL && !empty($wipwhole_status[$fakey]['delivery_date'])) {
-                                        $haveNumber = (int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT);
+                                        $haveNumber = ((int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT)) - 1;
                                         $facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['delivery_date'])));
                                     }
                                     break;
                                 case (stristr($facility['PayStage'][$stage]['name'], '驗收')):
                                     if (isset($wipwhole_status[$fakey]['delivery_date']) && $wipwhole_status[$fakey]['delivery_date'] !== NULL && !empty($wipwhole_status[$fakey]['delivery_date'])) {
-                                        $haveNumber = (int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT);
+                                        $haveNumber = ((int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT)) - 1;
                                         $facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['delivery_date'])));
                                     }
                                     break;
                                 case (stristr($facility['PayStage'][$stage]['name'], '安裝')):
                                     if (isset($wipwhole_status[$fakey]['install_end_date']) && $wipwhole_status[$fakey]['install_end_date'] !== NULL && !empty($wipwhole_status[$fakey]['install_end_date'])) {
-                                        $haveNumber = (int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT);
+                                        $haveNumber = ((int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT)) - 1;
                                         $facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['install_end_date'])));
                                     }
                                     break;
                                 case (stristr($facility['PayStage'][$stage]['name'], '貨抵工地')):
                                     if (isset($wipwhole_status[$fakey]['real_arrival_date']) && $wipwhole_status[$fakey]['real_arrival_date'] !== NULL && !empty($wipwhole_status[$fakey]['real_arrival_date'])) {
-                                        $haveNumber = (int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT);
+                                        $haveNumber = ((int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT)) - 1;
                                         $facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['real_arrival_date'])));
                                     } elseif (isset($wipwhole_status[$fakey]['real_contract_arrival_date']) && $wipwhole_status[$fakey]['real_contract_arrival_date'] !== NULL && !empty($wipwhole_status[$fakey]['real_contract_arrival_date'])) {
-                                        $haveNumber = (int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT);
+                                        $haveNumber = ((int) filter_var(str_replace('-', '', $facility['PayStage'][$stage]['name']), FILTER_SANITIZE_NUMBER_INT)) - 1;
                                         $facility['PayStage'][$stage]['PlanPayDate'] = date("Ymd", strtotime("+ $haveNumber months", strtotime($wipwhole_status[$fakey]['real_contract_arrival_date'])));
                                     }
                                     break;
@@ -519,41 +519,7 @@ foreach ($final_paystage as $key => &$payStage) {
         }
     }
 }
-// foreach($final_paystage as $key => $payStage){
-//     echo $key."<br>";
-//     for($sequence = 1; $sequence <= count($payStage); $sequence++){
-//         print_r($payStage[$sequence]);
-//         echo "<br>";
-//     }
-//     echo "---------------------<br>";
-// }
-
-// foreach ($arrayData as &$value) {
-// if (is_iterable($value['facility'])) {
-//     foreach ($value['facility'] as $fakey => &$facility) {
-//         // foreach ($facility['PayStage'] as $index => &$payStage) {
-//         //     // $payStage['sequenceNumber'] = $allPayStages[$value[10]][$index]['sequenceNumber'];
-//         //     echo $index."  => ";
-//         //     print_r($payStage);
-//         //     echo "<br>";
-//         // }
-//         echo $fakey."  => ";
-//         print_r($facility);
-//         echo "<br>";
-//     }
-// }
-// print_r($value);
-// echo "---------------------<br>";
-// }
-// foreach ($final_paystage as $key => $payStage) {
-//     echo $key . "<br>";
-//     for ($sequence = 1; $sequence <= count($payStage); $sequence++) {
-//         print_r($payStage[$sequence]);
-//         echo "<br>";
-//     }
-//     echo "---------------------<br>";
-// }
-// exit();
+
 // 0 部門id  1 部門名稱   2 經理名稱  3 營業員id  4 營業員名稱 5 客戶名稱 6 抬頭 7 統編 8 通訊地址 9 T8單據日期 10 合約號
 // 0 合約號 1 作番號 2 部門id 3 部門名稱 4 經理名稱 5 營業員id 6 營業員名稱 7 客戶名稱 8 抬頭 9 統編 10 通訊地址 
 // 11 收款階段名稱 12 應收日期 13 收款金額 14 已開金額 15 已收金額 16 催收次數
@@ -562,7 +528,6 @@ $today = strtotime(date('Ymt'));
 foreach ($arrayData as $key => $value) {
     if (isset($final_paystage[$key])) {
         for ($sequence = 1; $sequence <= count($final_paystage[$key]); $sequence++) {
-            $keyname = $key . $final_paystage[$key][$sequence]['sequenceNumber'];
             $value[4] = (isset($value[4]) && !empty($value[4])) ? $value[4] : '--';
             $value[5] = (isset($value[5]) && !empty($value[5])) ? $value[5] : '--';
             $value[6] = (isset($value[6]) && !empty($value[6])) ? $value[6] : '--';
@@ -571,13 +536,16 @@ foreach ($arrayData as $key => $value) {
             $value[11] = (isset($value[11]) && !empty($value[11])) ? $value[11] : '--';
             $value[12] = (isset($value[12]) && !empty($value[12])) ? date('Y/m/d', strtotime($value[12])) : '--';
             $thisPayStage = $final_paystage[$key][$sequence];
-            $havetopay = ($today >= $thisPayStage['PlanPayDate']) ? "V" : "--";
+            $keyname = $key . "/" . $final_paystage[$key][$sequence]['facilityno'] . "/" . $value[5];
+            $havetopay = ($today >= strtotime($thisPayStage['PlanPayDate'])) ? "V" : "--";
             switch ($havetopay) {
                 case "V":
                     $unInvoiceAmount = $thisPayStage['PayAmount'] - $thisPayStage['InvoiceAmount'];
                     $unReceivedAmount = $thisPayStage['PayAmount'] - $thisPayStage['receivedAmount'];
                     break;
                 default:
+                    $unInvoiceAmount = 0;
+                    $unReceivedAmount = 0;
                     break;
             }
             $excel_aray[$keyname] = [
@@ -635,6 +603,10 @@ $total_data = json_encode($excel_aray);
     .hiddenTable {
         display: none;
     }
+
+    .hidden {
+        display: none;
+    }
 </style>
 
 <div style="width: 98%;margin: 1%;">
@@ -647,9 +619,15 @@ $total_data = json_encode($excel_aray);
         <h3><strong>合約 (汰改)統整資訊</strong></h3>
     </div>
 </div>
-
-<div style="overflow-x:auto;">
-    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+<?php
+include "./footer.php";
+?>
+<div style="width: 20%;float:right;margin-right:5%; ">
+    <label>查詢條件</label>
+    <input type="text" id="search" name="search" class="form-control" placeholder="請輸入合約號/作番號/客戶名稱" oninput="searchData()">
+</div>
+<div style="width: 98%; margin:1%;" <div style="overflow-x:auto;">
+    <table class="table table-striped table-bordered" style="width:100%">
         <thead>
             <tr>
                 <th style='text-align:center;vertical-align: middle;width:120px'>合約號</th>
@@ -670,8 +648,8 @@ $total_data = json_encode($excel_aray);
             </tr>
         </thead>
         <tbody>
-            <?php foreach ($excel_aray as $row) { ?>
-                <tr>
+            <?php foreach ($excel_aray as $key => $row) { ?>
+                <tr class="data-row" style="display: '';" id="<?= $key; ?>">
                     <td><?= $row[0]; ?></td>
                     <td><?= $row[1]; ?></td>
                     <td><?= $row[2] . "<br>" . $row[3]; ?></td>
@@ -694,6 +672,21 @@ $total_data = json_encode($excel_aray);
 </div>
 
 <script>
+    function searchData() {
+        var searchTerm = document.getElementById('search').value.toLowerCase();
+        var rows = document.getElementsByClassName('data-row');
+        for (var i = 0; i < rows.length; i++) {
+            var rowText = rows[i].textContent.toLowerCase();
+            // var rowText = rows[i].id.toLowerCase();
+            if (rowText.includes(searchTerm)) {
+                console.log(rowText);
+                rows[i].style.display = '';
+            } else {
+                rows[i].style.display = 'none';
+            }
+        }
+    }
+
     function downloadData() {
         var xhr = new XMLHttpRequest();
         var url = window.location.origin + "/wms/account-receivable-renovate-excel.php?type=all&<?= $token_link ?>";
@@ -717,4 +710,9 @@ $total_data = json_encode($excel_aray);
         }));
 
     }
+
+    function check(searchname) {
+        console.log(searchname);
+
+    }
 </script>
\ No newline at end of file
diff --git a/wms/rib02-create.php b/wms/rib02-create.php
index 5b06c718..93d74484 100644
--- a/wms/rib02-create.php
+++ b/wms/rib02-create.php
@@ -157,7 +157,7 @@ $materials = $conn->query($sql_Material);
 
             </div>
             <div class="col-md-3">
-                <label for="FeeDate" style="color: red;">發票日期</label>
+                <label for="FeeDate" style="color: red;">費用日期</label>
                 <input class="form-control" type="int" name="FeeDate" id="FeeDate" placeholder="西元年(4碼)+月(2碼)+日(2碼)" required>
 
             </div>
diff --git a/wms/rib02-edit.php b/wms/rib02-edit.php
index 7892870a..8b490e75 100644
--- a/wms/rib02-edit.php
+++ b/wms/rib02-edit.php
@@ -96,7 +96,7 @@ $materials = $conn->query($sql_Material);
 
             </div>
             <div class="col-md-3">
-                <label for="FeeDate" style="color: red;">發票日期</label>
+                <label for="FeeDate" style="color: red;">費用日期</label>
                 <input class="form-control" type="int" name="FeeDate" id="FeeDate" placeholder="西元年(4碼)+月(2碼)+日(2碼)" value="<?= $ribsub['FeeDate'] ?>" required>
 
             </div>