diff --git a/wms/account-receivable-new-index.php b/wms/account-receivable-new-index.php
index 85b6554b..a18c789b 100644
--- a/wms/account-receivable-new-index.php
+++ b/wms/account-receivable-new-index.php
@@ -305,7 +305,7 @@ foreach ($query_wip as $wip) {
             $arrayData[$wip['contractno']]['facility_status'] .= $wip['facilityno'] . " (" . $wip['real_arrival_date'] . "貨抵工地) ;       ";
         } elseif ($wip['real_contract_arrival_date'] != NULL && $wip['real_contract_arrival_date'] !== '1970-01-01' && $wip['delivery_date'] !== '1970-01-11' && !empty($wip['real_contract_arrival_date'])) {
             $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['real_contract_arrival_date'] . "預計出貨";
-            $arrayData[$wip['contractno']]['facility_status'] .= $wip['facilityno'] . " (" .date('Y-m-d',strtotime($wip['real_contract_arrival_date'])) . "預計出貨) ;       ";
+            $arrayData[$wip['contractno']]['facility_status'] .= $wip['facilityno'] . " (" . date('Y-m-d', strtotime($wip['real_contract_arrival_date'])) . "預計出貨) ;       ";
         } elseif ($wip['estimated_shipping_date'] != NULL && $wip['estimated_shipping_date'] !== '1970-01-01' && $wip['delivery_date'] !== '1970-01-11' && !empty($wip['estimated_shipping_date'])) {
             $arrayData[$wip['contractno']]['facility'][$wip['facilityno']]['status'] = $wip['estimated_shipping_date'] . "預計出港";
             $arrayData[$wip['contractno']]['facility_status'] .= $wip['facilityno'] . " (" . $wip['estimated_shipping_date'] . "預計出港) ;       ";
@@ -788,16 +788,18 @@ foreach ($arrayData as $key => &$value) {
     $excel_contract_array[$key][20] = (isset($value['facility_status']) && !is_null($value['facility_status'])) ? $value['facility_status'] : '--';
     $excel_contract_array[$key][14] = number_format(round($excel_contract_array[$key][14]));
     $excel_contract_array[$key][16] = number_format(round($excel_contract_array[$key][16]));
-    if ($excel_contract_array[$key][17] > 1 && isset($value['PayStage']) && is_iterable($value['PayStage'])) {
-        $excel_contract_all_array[$key] = array_fill(0, 24, 0);
-        $excel_contract_all_array[$key][0] = $excel_contract_array[$key][0];
-        $excel_contract_all_array[$key][1] = $excel_contract_array[$key][3];
-        $excel_contract_all_array[$key][2] = $excel_contract_array[$key][8];
-        $excel_contract_all_array[$key][3] = $excel_contract_array[$key][11];
-        $excel_contract_all_array[$key][4] = $excel_contract_array[$key][19];
-        $excel_contract_all_array[$key][5] = $excel_contract_array[$key][20];
-        $excel_contract_all_array[$key][6] = $excel_contract_array[$key][17];
-        $excel_contract_all_array[$key][7] = $excel_contract_array[$key][18];
+    if (isset($value['PayStage']) && is_iterable($value['PayStage'])) {
+        if ($excel_contract_array[$key][17] > 1) {
+            $excel_contract_all_array[$key] = array_fill(0, 24, 0);
+            $excel_contract_all_array[$key][0] = $excel_contract_array[$key][0];
+            $excel_contract_all_array[$key][1] = $excel_contract_array[$key][3];
+            $excel_contract_all_array[$key][2] = $excel_contract_array[$key][8];
+            $excel_contract_all_array[$key][3] = $excel_contract_array[$key][11];
+            $excel_contract_all_array[$key][4] = $excel_contract_array[$key][19];
+            $excel_contract_all_array[$key][5] = $excel_contract_array[$key][20];
+            $excel_contract_all_array[$key][6] = $excel_contract_array[$key][17];
+            $excel_contract_all_array[$key][7] = $excel_contract_array[$key][18];
+        }
         $isBoga = 0;
         if (stristr($value['PayStage'][1]['PayStage'], '寶佳')) {
             $isBoga = 1;
@@ -1014,7 +1016,8 @@ foreach ($arrayData as $key => &$value) {
         }
     }
 }
-
+// print_r($arrayData['M220003']);
+// exit();
 $total_data = json_encode($excel_contract_all_array);
 $boga_data = json_encode($excel_contract_boga_array);
 $noboga_data = json_encode($excel_contract_noboga_array);
diff --git a/wms/account-receivable-renovate-index.php b/wms/account-receivable-renovate-index.php
index 1b3df449..b3b808d3 100644
--- a/wms/account-receivable-renovate-index.php
+++ b/wms/account-receivable-renovate-index.php
@@ -3,6 +3,10 @@
 include "header.php";
 
 $sum_facility = 0;
+$sum_facility_A40002 = 0;
+$sum_facility_A40009 = 0;
+$sum_facility_A40010 = 0;
+$sum_facility_A40019 = 0;
 // M1
 $sum_A40002 = 0;
 // 設備
@@ -37,6 +41,8 @@ $receivable_array = [];
 // T8所有合約號
 $sql_contractNumber = "SELECT MainAll.* , 
 Person.PersonName, 
+Dept.LeaderId,
+Leader.PersonName AS LeaderName,
 Dept.DeptName FROM
     (SELECT 
 Main.BillNo, 
@@ -55,6 +61,7 @@ Main.CurrentState
     LEFT JOIN comBusinessPartner AS Biz ON Biz.BizPartnerId = Main.BizPartnerId) AS MainAll 
     LEFT JOIN comGroupPerson AS Person ON MainAll.PersonId= Person.PersonId
     LEFT JOIN comDepartment AS Dept ON MainAll.DeptId= Dept.DeptId
+    LEFT JOIN comGroupPerson AS Leader ON Dept.LeaderId = Leader.PersonId
     WHERE MainAll.ModeId = 'T' AND (MainAll.CurrentState=2 OR MainAll.CurrentState=4) ";
 
 if (!is_null($start_date)) {
@@ -67,7 +74,7 @@ if (!is_null($end_date)) {
 }
 if ((in_array($user_id, array('M0060', 'M0175'))) || (in_array(accountidToDepartId($user_id), array('220', '210', '321')))) {
 } else {
-    $sql_contractNumber .= " AND (MainAll.PersonId = '$user_id'";
+    $sql_contractNumber .= " AND (Leader.PersonId = '$user_id' OR MainAll.PersonId = '$user_id'";
     if (count($follower) > 0) {
         $column_str = "('$user_id'" . ",'";
         $column_str .= implode("','", $follower);
@@ -199,10 +206,15 @@ FROM department
 ON d.department_id = tmp2.department_id";
 
 //T8 銷售訂單 階段收款計畫
-$sql_contract = "SELECT a.BillNo,s.BillDate, a.RowNo, a.PayStage, a.PlanPayAmt, a.PlanPayDate,s.BizPartnerId,c.BizPartnerName, s.PersonId, s.DeptId, s.DeptName,
+$sql_contract = "SELECT a.BillNo,s.BillDate, a.RowNo, a.PayStage, a.PlanPayAmt, a.PlanPayDate,s.BizPartnerId,c.BizPartnerName, s.PersonId,
+Person.PersonName,
+ s.DeptId, s.DeptName, Leader.PersonId AS ManagerId,
+Leader.PersonName AS ManagerName,
 c.EnterpriseName, c.TaxNo, c.ContactAddress FROM salOrderStagePay AS a 
-LEFT JOIN (SELECT O.*, DE.DeptName FROM salSalesOrder AS O LEFT JOIN comDepartment AS DE ON O.DeptId=DE.DeptId) AS s on a.BillNo = s.BillNo 
-LEFT JOIN comBusinessPartner AS c ON s.BizPartnerId=c.BizPartnerId ";
+LEFT JOIN (SELECT O.*, DE.DeptName, DE.LeaderId FROM salSalesOrder AS O LEFT JOIN comDepartment AS DE ON O.DeptId=DE.DeptId) AS s on a.BillNo = s.BillNo 
+LEFT JOIN comBusinessPartner AS c ON s.BizPartnerId=c.BizPartnerId
+LEFT JOIN comGroupPerson AS Person ON s.PersonId = Person.PersonId
+LEFT JOIN comGroupPerson AS Leader ON s.LeaderId = Leader.PersonId ";
 // if (isset($str_numbers)) {
 //     $sql_contract .= "WHERE s.BillNo IN $str_numbers ";
 // }
@@ -231,6 +243,8 @@ foreach ($contract as $cont) {
     $ContactAddress = $cont['ContactAddress'];
     $RowNo = $cont['RowNo'];
     $salesId = $cont['PersonId'];
+    $managerId = $cont['ManagerId'];
+    $managerName = $cont['ManagerName'];
     if (!in_array($salesId, $manager_list)) {
         array_push($manager_list, $salesId);
     }
@@ -252,6 +266,9 @@ foreach ($contract as $cont) {
         $arrayData[$BillNo][8] = $ContactAddress;
         $arrayData[$BillNo][9] = $BillDate;
         $arrayData[$BillNo][10] = $BillNo;
+        $arrayData[$BillNo]['salesName'] = $cont['PersonName'];
+        $arrayData[$BillNo]['ManagerId'] = $managerId;
+        $arrayData[$BillNo]['ManagerName'] = $managerName;
         $arrayData[$BillNo]['total_budget'] = 0;
         $arrayData[$BillNo]['invoice'] = array();
         $arrayData[$BillNo]['received_budget'] = 0;
@@ -295,6 +312,26 @@ $contract_budget = array();
 foreach ($contract_budget_data as $cont) {
     $BillNo = $cont['BillNo'];
     if (isset($arrayData[$BillNo])) {
+        $sum_total_budget += $cont['OAmountWithTax'];
+        switch ($cont['MaterialId']) {
+            case 'A40002':
+                $sum_A40002 += $cont['OAmountWithTax'];
+                $sum_facility_A40002 +=1;
+                break;
+            case 'A40009':
+                $sum_A40009 += $cont['OAmountWithTax'];
+                $sum_facility_A40009 +=1;
+                break;
+            case 'A40010':
+                $sum_A40010 += $cont['OAmountWithTax'];
+                $sum_facility_A40010 +=1;
+                break;
+            case 'A40019':
+                $sum_A40019 += $cont['OAmountWithTax'];
+                $sum_facility_A40019 +=1;
+                break;
+        }
+
         $salesid = $arrayData[$BillNo][3];
         if (isset($find_manager[$salesid])) {
             $arrayData[$BillNo][2] = $find_manager[$salesid]['manager_name'];
@@ -307,6 +344,7 @@ foreach ($contract_budget_data as $cont) {
             $arrayData[$BillNo]['facility'][$cont['CU_MaterialId']]['total_budget'] += $cont['OAmountWithTax'];
             $arrayData[$BillNo]['facility'][$cont['CU_MaterialId']][$cont['MaterialId']] += $cont['OAmountWithTax'];
         } else {
+            $sum_facility += 1;
             $arrayData[$BillNo]['total_facility_num'] += 1;
             $arrayData[$BillNo]['facility'][$cont['CU_MaterialId']]['total_budget'] = $cont['OAmountWithTax'];
             $arrayData[$BillNo]['facility'][$cont['CU_MaterialId']]['A40002'] = $arrayData[$BillNo]['facility'][$cont['CU_MaterialId']]['A40009'] = $arrayData[$BillNo]['facility'][$cont['CU_MaterialId']]['A40010'] = $arrayData[$BillNo]['facility'][$cont['CU_MaterialId']]['A40019'] = 0;
@@ -593,6 +631,7 @@ foreach ($received_array as $received) {
         $arrayData[$BillNo]['received_budget'] += $received['CurrStandOffOAmount'];
         //     array_push($arrayData[$BillNo]['invoice'][$received['InvoiceNo']], date($received['ReceivedDate']), $received['PayWriteOffOAmount'], $received['Fee'], $received['BillNo']);
         // }
+
     }
 }
 //未在T8的收款資料
@@ -651,6 +690,16 @@ $today = strtotime(date('Ymt'));
 foreach ($arrayData as $key => $value) {
     if (isset($final_paystage[$key])) {
         for ($sequence = 1; $sequence <= count($final_paystage[$key]); $sequence++) {
+            if(!is_null($value['ManagerId']) && $value['ManagerId'] !==''){
+                $managerId = $value['ManagerId'];
+            }else{
+                $managerId = $value[11];
+            }
+            if(!is_null($value['ManagerName']) && $value['ManagerName'] !==''){
+                $managerName = $value['ManagerName'];
+            }else{
+                $managerName = $value[2];
+            }
             $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] : '--';
@@ -673,7 +722,7 @@ foreach ($arrayData as $key => $value) {
             }
             if ($havetopay == "V" && $unReceivedAmount > 1) {
                 $print_array[$keyname] = [
-                    $value[10], $thisPayStage['facilityno'], $value[0], $value[1], $value[11], $value[2], $value[3], $value[4], $value[5], $value[6], $value[7], $value[8],
+                    $value[10], $thisPayStage['facilityno'], $value[0], $value[1], $value[11], $value['ManagerName'], $value[3], $value[4], $value[5], $value[6], $value[7], $value[8],
                     $thisPayStage['name'], $thisPayStage['PlanPayDate'], $havetopay,
                     number_format(round($final_paystage[$key][$sequence]['PayAmount'])),
                     number_format(round($final_paystage[$key][$sequence]['InvoiceAmount'])), number_format(round($unInvoiceAmount)),
@@ -683,7 +732,7 @@ foreach ($arrayData as $key => $value) {
                 ];
             }
             $excel_aray[$keyname] = [
-                $value[10], $thisPayStage['facilityno'], $value[0], $value[1], $value[11], $value[2], $value[3], $value[4], $value[5], $value[6], $value[7], $value[8],
+                $value[10], $thisPayStage['facilityno'], $value[0], $value[1], $managerId, $managerName, $value[3], $value[4], $value[5], $value[6], $value[7], $value[8],
                 $thisPayStage['name'], $thisPayStage['PlanPayDate'], $havetopay,
                 number_format(round($final_paystage[$key][$sequence]['PayAmount'])),
                 number_format(round($final_paystage[$key][$sequence]['InvoiceAmount'])), number_format(round($unInvoiceAmount)),
@@ -695,6 +744,11 @@ foreach ($arrayData as $key => $value) {
     }
 }
 $total_data = json_encode($print_array);
+$average_budget = $sum_total_budget / $sum_facility;
+$average_A40002 = $sum_A40002 / $sum_facility_A40002;
+$average_A40009 = $sum_A40009 / $sum_facility_A40009;
+$average_A40010 = $sum_A40010 / $sum_facility_A40010;
+$average_A40019 = $sum_A40019 / $sum_facility_A40019;
 
 ?>
 <style>
@@ -752,6 +806,126 @@ $total_data = json_encode($print_array);
     <div class="text-center" style="margin-bottom: 20px;">
         <h3><strong>合約 (汰改)統整資訊</strong></h3>
     </div>
+    <form class="form-horizontal">
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="sum_total_budget">合約總金額</label>
+                <input type="text" class="form-control" id="sum_total_budget" name="sum_total_budget" value="<?= number_format($sum_total_budget) ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="sum_facility">總台數</label>
+                <input type="text" class="form-control" id="sum_facility" name="sum_facility" value="<?= number_format($sum_facility) ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="average_budget">作番平均金額 (元/台)</label>
+                <input type="text" class="form-control" id="average_budget" name="average_budget" value="<?= number_format($average_budget) ?>" disabled>
+            </div>
+        </div>
+        <div class="form-group">
+
+            <div class="col-md-3">
+                <label for="sum_A40002">M1總金額</label>
+                <input type="text" class="form-control" id="sum_A40002" name="sum_A40002" value="<?= number_format($sum_A40002) ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="sum_A40009">設備總金額</label>
+                <input type="text" class="form-control" id="sum_A40009" name="sum_A40009" value="<?= number_format($sum_A40009) ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="sum_A40010">安裝總金額</label>
+                <input type="text" class="form-control" id="sum_A40010" name="sum_A40010" value="<?= number_format($sum_A40010) ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="sum_A40019">M4總金額</label>
+                <input type="text" class="form-control" id="sum_A40019" name="sum_A40019" value="<?= number_format($sum_A40019) ?>" disabled>
+            </div>
+
+        </div>
+        <div class="form-group">
+
+            <div class="col-md-3">
+                <label for="average_A40002">M1平均金額 (元/台)</label>
+                <input type="text" class="form-control" id="average_A40002" name="average_A40002" value="<?= number_format($average_A40002) ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="average_A40009">設備平均金額 (元/台)</label>
+                <input type="text" class="form-control" id="average_A40009" name="average_A40009" value="<?= number_format($average_A40009) ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="average_A40010">安裝平均金額 (元/台)</label>
+                <input type="text" class="form-control" id="average_A40010" name="average_A40010" value="<?= number_format($average_A40010) ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="average_A40019">M4平均金額 (元/台)</label>
+                <input type="text" class="form-control" id="average_A40019" name="average_A40019" value="<?= number_format($average_A40019) ?>" disabled>
+            </div>
+        </div>
+    </form>
+    <hr>
+    <form class="form-horizontal" id='myForm' method='post' action='account-receivable-new-index.php?<?= $token_link ?>'>
+        <table class="table table-striped table-bordered" style='width:98%;text-align:center;margin:0 auto'>
+            <tbody>
+                <tr>
+                    <th class="text-center" style="vertical-align: middle;">合約日期</th>
+                    <td colspan="2">
+                        <input type="date" class='form-control' id='date_start' name='date_start' style='width:40%;display:inline;'>
+                        ～
+                        <input type="date" class='form-control' id='date_end' name='date_end' style='width:40%;display:inline;'>
+                        <button type="submit" class="btn btn-primary btn-sm">搜尋</button>
+                    </td>
+                </tr>
+                <tr>
+                    <th class="text-center" style="vertical-align: middle;">催收次數</th>
+                    <td colspan="2">
+                        <input type="text" class='form-control' id='search_collectstart' name='collect_time_start' style='width:10%;display:inline;' oninput="searchFront('collectstart')">
+                        ≤ 催收次數 ≤
+                        <input type="text" class='form-control' id='search_collectend' name='collect_time_end' style='width:10%;display:inline;' oninput="searchFront('collectend')">
+                        <!-- <button type="submit" class="btn btn-primary btn-sm">搜尋</button> -->
+                    </td>
+                </tr>
+                <tr>
+                    <th class="text-center" style="vertical-align: middle;">催收金額</th>
+                    <td colspan="2">
+                        <input type="text" class='form-control' id='search_CBudgetstart' name='collect_budget_start' style='width:40%;display:inline;' onblur="searchFront('CBudgetstart')">
+                        ≤ 催收金額 ≤
+                        <input type="text" class='form-control' id='search_CBudgetend' name='collect_budget_end' style='width:40%;display:inline;' onblur="searchFront('CBudgetend')">
+                        <!-- <button type="submit" class="btn btn-primary btn-sm">搜尋</button> -->
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </form>
+    <hr>
+    <div class="form-group">
+        <div class="col-md-4">
+            <label for="search_contract">查詢合約號</label>
+            <input type="text" id="search_contract" name="search_contract" class="form-control" placeholder="請輸入合約號" onblur="searchFront('contract')">
+        </div>
+        <div class="col-md-4">
+            <label for="search_dept">查詢部門</label>
+            <input type="text" id="search_dept" name="search_dept" class="form-control" placeholder="請輸入部門" onblur="searchFront('dept')">
+        </div>
+        <div class="col-md-4">
+            <label for="search_manager">查詢主管</label>
+            <input type="text" id="search_manager" name="search_manager" class="form-control" placeholder="請輸入主管工號/姓名" onblur="searchFront('manager')">
+        </div>
+
+    </div>
+    <div class="form-group">
+
+        <div class="col-md-4">
+            <label for="search_personId">查詢契約員</label>
+            <input type="text" id="search_personId" name="search_personId" class="form-control" placeholder="請輸入契約員工號/姓名" onblur="searchFront('personId')">
+        </div>
+        <div class="col-md-4">
+            <label for="search_customerid">查詢客戶名稱</label>
+            <input type="text" id="search_customerid" name="search_customerid" class="form-control" placeholder="請輸入客戶名稱" onblur="searchFront('customerid')">
+        </div>
+        <div class="col-md-4">
+            <label for="search_facility">查詢作番號</label>
+            <input type="text" id="search_facility" name="search_facility" class="form-control" placeholder="請輸入作番號" onblur="searchFront('facility')">
+        </div>
+    </div>
 </div>
 <?php
 include "./footer.php";
@@ -785,12 +959,12 @@ include "./footer.php";
         <tbody>
             <?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>
-                    <td><?= $row[4] . "<br>" . $row[5]; ?></td>
-                    <td><?= $row[6] . "<br>" . $row[7]; ?></td>
-                    <td><?= $row[8]; ?></td>
+                    <td class="contract"><?= $row[0]; ?></td>
+                    <td class="facility"><?= $row[1]; ?></td>
+                    <td class="dept"><?= $row[2] . "<br>" . $row[3]; ?></td>
+                    <td class="manager"><?= $row[4] . "<br>" . $row[5]; ?></td>
+                    <td class="personId"><?= $row[6] . "<br>" . $row[7]; ?></td>
+                    <td class="customerid"><?= $row[8]; ?></td>
                     <td><?= $row[12]; ?></td>
                     <td><?= $row[13]; ?></td>
                     <td><?= $row[14]; ?></td>
@@ -803,8 +977,8 @@ include "./footer.php";
                     <td><?= $row[16]; ?></td>
                     <td><?= $row[17]; ?></td>
                     <td><?= $row[18]; ?></td>
-                    <td><?= $row[19]; ?></td>
-                    <td><?= $row[20]; ?></td>
+                    <td class="CBudget"><?= $row[19]; ?></td>
+                    <td class="collect"><?= $row[20]; ?></td>
                 </tr>
             <?php } ?>
         </tbody>
@@ -850,7 +1024,91 @@ include "./footer.php";
         }));
 
     }
+    function searchFront(area) {
+        var term = 'search_' + area;
 
+        if (area == 'collectstart') {
+            var searchTerm = parseInt(document.getElementById(term).value);
+            var searchArea = document.getElementsByClassName('collect');
+            var rows = document.getElementsByClassName('data-row');
+            var criterion = parseInt(document.getElementById('search_collectend').value);
+            for (var i = 0; i < rows.length; i++) {
+                var rowText = parseInt(searchArea[i].textContent);
+                if (rowText >= searchTerm) {
+                    rows[i].style.display = '';
+                } else {
+                    rows[i].style.display = 'none';
+                }
+                if (criterion !== '' && rowText > criterion) {
+                    rows[i].style.display = 'none';
+                }
+            }
+        } else if (area == 'collectend') {
+            var searchTerm = parseInt(document.getElementById(term).value);
+            var searchArea = document.getElementsByClassName('collect');
+            var rows = document.getElementsByClassName('data-row');
+            var criterion = parseInt(document.getElementById('search_collectstart').value);
+            for (var i = 0; i < rows.length; i++) {
+                var rowText = parseInt(searchArea[i].textContent);
+                if (rowText <= searchTerm) {
+                    rows[i].style.display = '';
+                } else {
+                    rows[i].style.display = 'none';
+                }
+                if (criterion !== '' && rowText < criterion) {
+                    rows[i].style.display = 'none';
+                }
+            }
+        } else if (area == 'CBudgetstart') {
+            var searchTerm = parseInt(document.getElementById(term).value);
+            var searchArea = document.getElementsByClassName('CBudget');
+            var rows = document.getElementsByClassName('data-row');
+            var criterion = parseInt(document.getElementById('search_CBudgetend').value);
+            for (var i = 0; i < rows.length; i++) {
+                var rowText = parseInt(searchArea[i].textContent.replace(/,/g, ''));
+                if (isNaN(searchTerm) || searchTerm == 0) {
+                    rows[i].style.display = '';
+                } else if (rowText >= searchTerm) {
+                    rows[i].style.display = '';
+                } else {
+                    rows[i].style.display = 'none';
+                }
+                if (criterion !== '' && rowText > criterion) {
+                    rows[i].style.display = 'none';
+                }
+            }
+        } else if (area == 'CBudgetend') {
+            var searchTerm = parseInt(document.getElementById(term).value);
+            var searchArea = document.getElementsByClassName('CBudget');
+            var rows = document.getElementsByClassName('data-row');
+            var criterion = parseInt(document.getElementById('search_CBudgetstart').value);
+            for (var i = 0; i < rows.length; i++) {
+                var rowText = parseInt(searchArea[i].textContent.replace(/,/g, ''));
+                if (isNaN(searchTerm) || searchTerm == 0) {
+                    rows[i].style.display = '';
+                } else if (rowText <= searchTerm) {
+                    rows[i].style.display = '';
+                } else {
+                    rows[i].style.display = 'none';
+                }
+                if (!isNaN(criterion) && rowText < criterion) {
+                    rows[i].style.display = 'none';
+                }
+            }
+        } else {
+            var searchTerm = document.getElementById(term).value.toLowerCase();
+            var searchArea = document.getElementsByClassName(area);
+            var rows = document.getElementsByClassName('data-row');
+            for (var i = 0; i < rows.length; i++) {
+                var rowText = searchArea[i].textContent.toLowerCase();
+                if (rowText.includes(searchTerm)) {
+                    rows[i].style.display = '';
+                } else {
+                    rows[i].style.display = 'none';
+                }
+            }
+        }
+    }
     function check(searchname) {
         console.log(searchname);
 
diff --git a/wms/account-receivable-repair-index.php b/wms/account-receivable-repair-index.php
index 379d1593..7d8c52de 100644
--- a/wms/account-receivable-repair-index.php
+++ b/wms/account-receivable-repair-index.php
@@ -94,6 +94,7 @@ if (is_iterable($query_contract_number)) {
         $arrayData[$contract_numbers['BillNo']]['invoice_budget'] = 0;
         $arrayData[$contract_numbers['BillNo']]['received_budget'] = 0;
         $arrayData[$contract_numbers['BillNo']]['receivable_budget'] = 0;
+        $arrayData[$contract_numbers['BillNo']]['detail'] = "";
         $sum_total_budget += $contract_numbers['OAmountWithTax'];
     }
     $str_numbers = "('" . implode("','", $contractNumbers) . "')";
@@ -142,9 +143,48 @@ if (isset($str_numbers)) {
     $sql_invoice .= " AND CheckAll.FromSalSalesOrder IN $str_numbers ";
 }
 
+// T8 銷售訂單 表身
+$sql_detail ="SELECT 
+A.BillNo,
+    A.MaterialId,
+	salSalesOrder.TypeId,
+    CASE 
+        WHEN A.ItemType = 0 THEN B.MaterialName
+        WHEN A.ItemType = 1 THEN C.FeeTypeName
+        ELSE 'Unknown'
+    END AS ItemName,
+    E.ProjectId,
+    E.ProjectName,
+    D.MaterialId AS CU_MaterialId,
+    D.MaterialName AS CU_MaterialName
+FROM 
+    salSalesOrderDetail A
+LEFT JOIN 
+    comMaterialGroup B ON A.MaterialId = B.MaterialId AND A.ItemType = 0
+LEFT JOIN 
+    comFeeType C ON A.MaterialId = C.FeeTypeId AND A.ItemType = 1
+LEFT JOIN 
+    comProject E ON A.ProjectId = E.ProjectId 
+LEFT JOIN 
+    comMaterialGroup D ON A.CU_MaterialId = D.MaterialId
+LEFT JOIN 
+    salSalesOrder ON A.BillNo = salSalesOrder.BillNo 
+	WHERE salSalesOrder.TypeId = 'SP'";
+
+
 $PayStage = $conn->query($sql_paystage);
 $received_array = $conn->query($sql_received);
 $invoice_data = $conn->query($sql_invoice);
+$detail_data = $conn->query($sql_detail);
+
+// 將合約表身明細填入arrayData
+foreach ($detail_data as $detail) {
+    if(isset($arrayData[$detail['BillNo']])) {
+        $memo = $detail['MaterialId'].' '.$detail['ItemName'].' 【'.$detail['ProjectId'].$detail['ProjectName'].'】'.'['.$detail['CU_MaterialId'].' '.$detail['CU_MaterialName'].']  ; <br>';
+        $arrayData[$detail['BillNo']]['detail'] .= $memo;
+    }
+}
+
 
 $allPayStages = array();
 foreach ($PayStage as $stage) {
@@ -267,7 +307,7 @@ foreach ($arrayData as $key => $value) {
         $value['ManagerId'], $value['ManagerName'],
         number_format(round($value['OAmountWithTax'])), number_format(round($value['receivable_budget'])),
         number_format(round($value['invoice_budget'])), number_format(round($uninvoice_budget)),
-        number_format(round($value['received_budget'])), $unreceive_budget, $collect_month
+        number_format(round($value['received_budget'])), $unreceive_budget, $collect_month, $value['detail']
     ];
 
     if ($excel_aray[$key][14] > 1) {
@@ -277,7 +317,7 @@ foreach ($arrayData as $key => $value) {
             $value['ManagerId'], $value['ManagerName'],
             number_format(round($value['OAmountWithTax'])), number_format(round($value['receivable_budget'])),
             number_format(round($value['invoice_budget'])), number_format(round($uninvoice_budget)),
-            number_format(round($value['received_budget'])), $unreceive_budget, $collect_month
+            number_format(round($value['received_budget'])), $unreceive_budget, $collect_month, $value['detail']
         ];
     }
 }
@@ -413,19 +453,20 @@ include "./footer.php";
             <tr>
                 <th style='text-align:center;vertical-align: middle;width:140px'>合約號</th>
                 <th style='text-align:center;vertical-align: middle;width:100px'>合約日期</th>
-                <th style='text-align:center;vertical-align: middle;width:110px'>部門</th>
-                <th style='text-align:center;vertical-align: middle;'>主管</th>
-                <th style='text-align:center;vertical-align: middle;'>保養員</th>
-                <th style='text-align:center;vertical-align: middle;'>客戶編號</th>
-                <th style='text-align:center;vertical-align: middle;width:140px'>客戶名稱</th>
+                <th style='text-align:center;vertical-align: middle;width:100px'>部門</th>
+                <th style='text-align:center;vertical-align: middle;width:100px'>主管</th>
+                <th style='text-align:center;vertical-align: middle;width:100px'>保養員</th>
+                <th style='text-align:center;vertical-align: middle;width:140px'>客戶</th>
+                <!-- <th style='text-align:center;vertical-align: middle;width:140px'>客戶名稱</th> -->
 
-                <th style='text-align:center;vertical-align: middle;'>合約總金額</th>
+                <th style='text-align:center;vertical-align: middle;'>總金額</th>
                 <th style='text-align:center;vertical-align: middle;'>應收金額</th>
-                <th style='text-align:center;vertical-align: middle;'>已開金額</th>
-                <th style='text-align:center;vertical-align: middle;'>未開金額</th>
+                <!-- <th style='text-align:center;vertical-align: middle;'>已開金額</th>
+                <th style='text-align:center;vertical-align: middle;'>未開金額</th> -->
                 <th style='text-align:center;vertical-align: middle;'>已收金額</th>
                 <th style='text-align:center;vertical-align: middle;'>催收金額</th>
                 <th style='text-align:center;vertical-align: middle;'>催收次數</th>
+                <th style='text-align:center;vertical-align: middle;width:350px'>內容 <br> 產品 【專案】[作番號]</th>
             </tr>
         </thead>
         <tbody>
@@ -437,16 +478,17 @@ include "./footer.php";
                     <td style='text-align:center;vertical-align: middle;' class="department"><?= $row[4] ?></td>
                     <td style='text-align:center;vertical-align: middle;' class="manager"><?= $row[7] . "<br>" . $row[8]; ?></td>
                     <td style='text-align:center;vertical-align: middle;' class="personId"><?= $row[5] . "<br>" . $row[6]; ?></td>
-                    <td style='text-align:center;vertical-align: middle;' class="customerid"><?= $row[2] ?></td>
-                    <td style='text-align:center;vertical-align: middle;' class="customername"><?= $row[3] ?></td>
+                    <td style='text-align:center;vertical-align: middle;' class="customerid"><?= $row[2] . "<br>".$row[3] ?></td>
+                    <!-- <td style='text-align:center;vertical-align: middle;' class="customername"><?= $row[3] ?></td> -->
 
                     <td style='text-align:end;vertical-align: middle;' class="total_budget"><?= $row[9]; ?></td>
                     <td style='text-align:end;vertical-align: middle;' class="receivable_budget"><?= $row[10]; ?></td>
-                    <td style='text-align:end;vertical-align: middle;' class="invoice_budget"><?= $row[11]; ?></td>
-                    <td style='text-align:end;vertical-align: middle;' class="un_invoice_budget"><?= $row[12]; ?></td>
+                    <!-- <td style='text-align:end;vertical-align: middle;' class="invoice_budget"><?= $row[11]; ?></td>
+                    <td style='text-align:end;vertical-align: middle;' class="un_invoice_budget"><?= $row[12]; ?></td> -->
                     <td style='text-align:end;vertical-align: middle;' class="received_budget"><?= $row[13]; ?></td>
                     <td style='text-align:end;vertical-align: middle;' class="un_received_budget"><?= $row[14]; ?></td>
                     <td style='text-align:end;vertical-align: middle;' class="collect_month"><?= $row[15]; ?></td>
+                    <td style='text-align:end;vertical-align: middle;' class="collect_content"><?= $row[16]; ?></td>
                 </tr>
             <?php }
             ?>
diff --git a/wms/maintainance_contract_payment_status.php b/wms/maintainance_contract_payment_status.php
index 58fb6f74..9ae8c6ac 100644
--- a/wms/maintainance_contract_payment_status.php
+++ b/wms/maintainance_contract_payment_status.php
@@ -238,6 +238,13 @@ function checkArWriteOffBill($conn, $row)
         return "<span class='text-primary'>已收款</span>";
     }
 }
+$final_data = array();
+// foreach($data as $key=>$value){
+//     $final_data[$key] = $value;
+//     echo $key."<br>";
+//     print_r($value);
+//     echo "<br>------------<br>";
+// }
 
 ?>
 
@@ -320,21 +327,24 @@ if ($data) :
         <table id="table_index" class="table table-striped table-bordered" style="width:100%">
             <thead>
                 <tr>
-                    <th style='text-align:center;vertical-align: middle;'>營業人員/契約人員</th>
-                    <th style='text-align:center;vertical-align: middle;'>部門</th>
                     <th style='text-align:center;vertical-align: middle;'>合約號</th>
-                    <th style='text-align:center;vertical-align: middle;width:50px;'>標示號</th>
                     <th style='text-align:center;vertical-align: middle;'>電梯編號</th>
+                    <th style='text-align:center;vertical-align: middle;'>部門</th>
+                    <th style='text-align:center;vertical-align: middle;'>保養員</th>
+
+
+                    <!-- <th style='text-align:center;vertical-align: middle;width:50px;'>標示號</th> -->
+
                     <th style='text-align:center;vertical-align: middle;'>客戶名稱</th>
                     <th style='text-align:center;vertical-align: middle;'>預計請款日</th>
                     <th style='text-align:center;vertical-align: middle;width:50px;'>催收次數</th>
-                    <th style='text-align:center;vertical-align: middle;'>應收申請單狀態</th>
+                    <!-- <th style='text-align:center;vertical-align: middle;'>應收申請單狀態</th>
                     <th style='text-align:center;vertical-align: middle;'>請款金額(未轉應收)</th>
                     <th style='text-align:center;vertical-align: middle;'>請款金額(已轉應收)</th>
-                    <th style='text-align:center;vertical-align: middle;'>應收申請單號</th>
+                    <th style='text-align:center;vertical-align: middle;'>應收申請單號</th> -->
                     <th style='text-align:center;vertical-align: middle;'>發票狀態</th>
-                    <th style='text-align:center;vertical-align: middle;width:50px;'>發票單標示號</th>
-                    <th style='text-align:center;vertical-align: middle;'>發票單號</th>
+                    <!-- <th style='text-align:center;vertical-align: middle;width:50px;'>發票單標示號</th> -->
+                    <!-- <th style='text-align:center;vertical-align: middle;'>發票單號</th> -->
                     <th style='text-align:center;vertical-align: middle;'>發票明細</th>
                     <th style='text-align:center;vertical-align: middle;width:80px;'>發票金額</th>
                     <th style='text-align:center;vertical-align: middle;width:120px;'>發票號碼</th>
@@ -345,24 +355,27 @@ if ($data) :
                 <?php foreach ($data as $row) { ?>
                     <tr>
                         <td>
-                            <?php
-                            echo $row['PersonId'];
-                            echo "<br/>";
-                            echo accountidToName($row['PersonId']);
-                            ?>
-                        </td>
-                        <td>
-                            <?php echo $row['DeptName']; ?>
+                            <?php echo $row['BillNo']; ?>
                         </td>
                         <td>
-                            <?php echo $row['BillNo']; ?>
+                            <?php echo $row['CU_MaterialId']; ?>
                         </td>
                         <td>
-                            <?php echo $row['RowNo']; ?>
+                            <?php echo $row['DeptName']; ?>
                         </td>
                         <td>
-                            <?php echo $row['CU_MaterialId']; ?>
+                            <?php
+                            echo $row['PersonId'];
+                            echo "<br/>";
+                            echo accountidToName($row['PersonId']);
+                            ?>
                         </td>
+
+
+                        <!-- <td>
+                            <?php echo $row['RowNo']; ?>
+                        </td> -->
+
                         <td>
                             <?php echo $row['BizPartnerName']; ?>
                         </td>
@@ -372,7 +385,7 @@ if ($data) :
                         <td>
                             <?php echo checkCollectMonth($row); ?>
                         </td>
-                        <td>
+                        <!-- <td>
                             <?php echo checkArCheckBillStatus($row); ?>
                         </td>
                         <td>
@@ -383,16 +396,16 @@ if ($data) :
                         </td>
                         <td>
                             <?php echo $row['BillNo2']; ?>
-                        </td>
+                        </td> -->
                         <td>
                             <?php echo arSellInvoiceMaterial($row); ?>
                         </td>
-                        <td>
+                        <!-- <td>
                             <?php echo $row['RowCode2']; ?>
-                        </td>
-                        <td>
+                        </td> -->
+                        <!-- <td>
                             <?php echo $row['BillNo3']; ?>
-                        </td>
+                        </td> -->
                         <td>
                             <?php echo $row['InvoiceName']; ?>
                         </td>
diff --git a/wms/rib01-index.php b/wms/rib01-index.php
index 517ec992..1c49ed6f 100644
--- a/wms/rib01-index.php
+++ b/wms/rib01-index.php
@@ -9,8 +9,8 @@ $sql = "select * from rib ";
 
 // 是否為會計 阿娥 
 if (($user_id == "M0056" || $user_id == "M0209")) {
-    $sql .= "WHERE ((CurrentState =1) or (TransactId= '$user_id') or (WriteOffId='$user_id') or (GatheringPersonId='$user_id'))";
-    $data = mysqli_query($link, $sql);
+    $sql .= "WHERE ((CurrentState =1) or (TransactId= '$user_id') or (WriteOffId='$user_id') or (GatheringPersonId='$user_id')) ORDER BY BillDate DESC ";
+    $query_data = mysqli_query($link, $sql);
 } else {
 
     // 找下屬
@@ -22,17 +22,21 @@ if (($user_id == "M0056" || $user_id == "M0209")) {
         $column_str = "('$user_id'" . ",'";
         $column_str .= implode("','", $follower);
         $column_str .= "')";
-        $sql .= "WHERE ((TransactId in $column_str) or (WriteOffId in $column_str) or (GatheringPersonId in $column_str))";
+        $sql .= "WHERE ((TransactId in $column_str) or (WriteOffId in $column_str) or (GatheringPersonId in $column_str)) ORDER BY BillDate DESC ";
     } else {
 
-        $sql .= "WHERE ((TransactId= '$user_id') or (WriteOffId='$user_id') or (GatheringPersonId='$user_id'))";
+        $sql .= "WHERE ((TransactId= '$user_id') or (WriteOffId='$user_id') or (GatheringPersonId='$user_id')) ORDER BY BillDate DESC ";
     };
-    $data = mysqli_query($link, $sql);
+    $query_data = mysqli_query($link, $sql);
 }
 // 取得部門代碼
 $sql_depid = "SELECT department_id, name from department";
 $dept_query = mysqli_query($link, $sql_depid);
 $deptype = mysqli_fetch_all($dept_query, MYSQLI_ASSOC);
+// $data = mysqli_fetch_all($query_data, MYSQLI_ASSOC);
+for($i = 0; $i < mysqli_num_rows($query_data); $i++) {
+    $data[$i] = mysqli_fetch_assoc($query_data);
+}
 
 ?>
 <!-- 
@@ -107,75 +111,76 @@ if ($data) :
 
                 <?php
                 if (is_iterable($data)) {
-                    foreach ($data as $data) : ?>
+                    for($i = 0; $i < count($data); $i++) {
+                    // foreach ($data as $data) : ?>
                         <tr>
-                            <td><?php echo $data['BillNo']; ?></td>
-                            <td><?php echo substr($data['BillDate'], 0, 10); ?></td>
-                            <td><?php if ($data['pay_type'] == 0) {
+                            <td><?php echo $data[$i]['BillNo']; ?></td>
+                            <td><?php echo substr($data[$i]['BillDate'], 0, 10); ?></td>
+                            <td><?php if ($data[$i]['pay_type'] == 0) {
                                     echo "現金";
-                                } elseif ($data['pay_type'] == 1) {
+                                } elseif ($data[$i]['pay_type'] == 1) {
                                     echo "銀行轉帳";
                                 }; ?></td>
-                            <td><?php echo accountidToName($data['TransactId']); ?></td>
+                            <td><?php echo accountidToName($data[$i]['TransactId']); ?></td>
                             <td><?php
                                 if (is_iterable($deptype)) {
                                     foreach ($deptype as $dept) {
-                                        if ($data["DeptId"] == $dept['department_id']) {
+                                        if ($data[$i]["DeptId"] == $dept['department_id']) {
                                             echo $dept['name'];
                                             break;
                                         }
                                     }
                                 } ?></td>
-                            <td><?php echo accountidToName($data['WriteOffId']); ?></td>
-                            <td><?php if ($data['CurrId'] == "USD") : echo "美金";
-                                elseif ($data['CurrId'] == "TWD") : echo "台幣";
-                                elseif ($data['CurrId'] == "CNY") : echo "人民幣";
-                                elseif ($data['CurrId'] == "HKD") : echo "港幣";
-                                elseif ($data['CurrId'] == "EUR") : echo "歐元";
+                            <td><?php echo accountidToName($data[$i]['WriteOffId']); ?></td>
+                            <td><?php if ($data[$i]['CurrId'] == "USD") : echo "美金";
+                                elseif ($data[$i]['CurrId'] == "TWD") : echo "台幣";
+                                elseif ($data[$i]['CurrId'] == "CNY") : echo "人民幣";
+                                elseif ($data[$i]['CurrId'] == "HKD") : echo "港幣";
+                                elseif ($data[$i]['CurrId'] == "EUR") : echo "歐元";
                                 endif;    ?> </td>
                             <?php
                             if (($user_id == "M0056" || $user_id == "M0209")) { ?>
-                                <td><?php echo $data['OAmountWithTax']; ?> </td>
+                                <td><?php echo $data[$i]['OAmountWithTax']; ?> </td>
                             <?php } ?>
-                            <td><?php if ($data['CurrentState'] == 0) : echo "草稿";
-                                elseif ($data['CurrentState'] == 1) : echo "審核中";
-                                elseif ($data['CurrentState'] == 2) : echo "通過";
-                                elseif ($data['CurrentState'] == 3) : echo "作廢";
-                                elseif ($data['CurrentState'] == 5) : echo "退回";
+                            <td><?php if ($data[$i]['CurrentState'] == 0) : echo "草稿";
+                                elseif ($data[$i]['CurrentState'] == 1) : echo "審核中";
+                                elseif ($data[$i]['CurrentState'] == 2) : echo "通過";
+                                elseif ($data[$i]['CurrentState'] == 3) : echo "作廢";
+                                elseif ($data[$i]['CurrentState'] == 5) : echo "退回";
                                 else : echo "結案";
                                 endif ?>
                             </td>
                             <td>
                                 <p>
-                                    <?php if (($user_id == "M0056" || $user_id == "M0209") && $data['CurrentState'] == 1) {
+                                    <?php if (($user_id == "M0056" || $user_id == "M0209") && $data[$i]['CurrentState'] == 1) {
                                     ?>
-                                        <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=1&<?= $token_link ?>" class="btn btn-success btn-sm">
+                                        <a href="rib01-check.php?id=<?php echo $data[$i]['rib_id'] ?>&state=1&<?= $token_link ?>" class="btn btn-success btn-sm">
                                             <span class="glyphicon glyphicon-pawn"></span>
                                         </a>
                                     <?php
                                     } else { ?>
-                                        <?php if ($data['CurrentState'] == 0) : ?>
-                                            <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=0&<?= $token_link ?>" class="btn btn-warning btn-sm">
+                                        <?php if ($data[$i]['CurrentState'] == 0) : ?>
+                                            <a href="rib01-check.php?id=<?php echo $data[$i]['rib_id'] ?>&state=0&<?= $token_link ?>" class="btn btn-warning btn-sm">
                                                 <span class="glyphicon glyphicon-pencil"></span>
                                             </a>
-                                        <?php elseif ($data['CurrentState'] == 1) : ?>
-                                            <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=1&<?= $token_link ?>" class="btn btn-primary btn-sm">
+                                        <?php elseif ($data[$i]['CurrentState'] == 1) : ?>
+                                            <a href="rib01-check.php?id=<?php echo $data[$i]['rib_id'] ?>&state=1&<?= $token_link ?>" class="btn btn-primary btn-sm">
                                                 <span class=" glyphicon glyphicon-search"></span>
                                             </a>
-                                            <button type="button" onclick="download(<?= $data['rib_id'] ?>)" class="btn btn-info btn-sm"><span class="glyphicon glyphicon-download-alt"></span></button>
-                                            <!-- <a href="rib03-download.php?id=<?php echo $data['rib_id'] ?>&<?= $token_link ?>" class="btn btn-info btn-sm">
+                                            <button type="button" onclick="download(<?= $data[$i]['rib_id'] ?>)" class="btn btn-info btn-sm"><span class="glyphicon glyphicon-download-alt"></span></button>
+                                            <!-- <a href="rib03-download.php?id=<?php echo $data[$i]['rib_id'] ?>&<?= $token_link ?>" class="btn btn-info btn-sm">
                                             <span class="glyphicon glyphicon-download-alt"></span>
                                         </a> -->
-                                        <?php elseif ($data['CurrentState'] == 2) : ?>
-                                            <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=2&<?= $token_link ?>" class="btn btn-info btn-sm">
+                                        <?php elseif ($data[$i]['CurrentState'] == 2) : ?>
+                                            <a href="rib01-check.php?id=<?php echo $data[$i]['rib_id'] ?>&state=2&<?= $token_link ?>" class="btn btn-info btn-sm">
                                                 <span class=" glyphicon glyphicon-ok"></span>
                                             </a>
-                                        <?php elseif ($data['CurrentState'] == 3) : ?>
-                                            <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=2&<?= $token_link ?>" class="btn btn-primary btn-sm">
+                                        <?php elseif ($data[$i]['CurrentState'] == 3) : ?>
+                                            <a href="rib01-check.php?id=<?php echo $data[$i]['rib_id'] ?>&state=2&<?= $token_link ?>" class="btn btn-primary btn-sm">
                                                 <span class="glyphicon glyphicon-search"></span>
                                             </a>
-                                        <?php elseif ($data['CurrentState'] == 5) : ?>
-                                            <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=2&<?= $token_link ?>" class="btn btn-primary btn-sm">
+                                        <?php elseif ($data[$i]['CurrentState'] == 5) : ?>
+                                            <a href="rib01-check.php?id=<?php echo $data[$i]['rib_id'] ?>&state=2&<?= $token_link ?>" class="btn btn-primary btn-sm">
                                                 <span class="glyphicon glyphicon-search"></span>
                                             </a>
                                     <?php endif;
@@ -184,7 +189,7 @@ if ($data) :
                                 </p>
                             </td>
                         </tr>
-                <?php endforeach;
+                <?php };
                 } ?>
             </tbody>
         </table>
diff --git a/wms/rib02-create.php b/wms/rib02-create.php
index 93d74484..06b1d403 100644
--- a/wms/rib02-create.php
+++ b/wms/rib02-create.php
@@ -7,10 +7,10 @@ $CurrId = isset($_GET['CurrId']) ? $_GET['CurrId'] : null;
 $sql_rib = "";
 if (empty($rib_id)) {
     $sql_rib = "SELECT * FROM rib WHERE BillNo = '$BillNo' && CurrentState=0";
-    $sql_invoiceNo = "SELECT DISTINCT InvoiceNo FROM rib_sub WHERE BillNo!=$BillNo";
+    $sql_invoiceNo = "SELECT DISTINCT InvoiceNo FROM rib_sub LEFT JOIN rib ON rib.rib_id=rib_sub.rib_id WHERE (rib.CurrentState=2 || rib.CurrentState=4 ) AND rib.BillNo!='$BillNo'";
 } else {
     $sql_rib = "SELECT * FROM rib WHERE rib_id = $rib_id";
-    $sql_invoiceNo = "SELECT DISTINCT InvoiceNo FROM rib_sub WHERE rib_id!=$rib_id";
+    $sql_invoiceNo = "SELECT DISTINCT InvoiceNo FROM rib_sub LEFT JOIN rib ON rib.rib_id=rib_sub.rib_id WHERE (rib.CurrentState=2 || rib.CurrentState=4 ) AND rib.rib_id!=$rib_id";
 }
 $rib_query = mysqli_query($link, $sql_rib);
 if (mysqli_num_rows($rib_query) > 0) {
diff --git a/wms/rib02-edit.php b/wms/rib02-edit.php
index 43ba5fdd..96d2b449 100644
--- a/wms/rib02-edit.php
+++ b/wms/rib02-edit.php
@@ -60,7 +60,10 @@ foreach ($BizPartner as $biz) {
 
 // 取得所有報銷過的發票號碼
 $rib_id = $ribsub['rib_id'];
-$sql_invoiceNo = "SELECT DISTINCT InvoiceNo FROM rib_sub WHERE rib_id !== $rib_id";
+// $sql_invoiceNo = "SELECT DISTINCT InvoiceNo FROM rib_sub WHERE rib_id !== $rib_id";
+$sql_invoiceNo = "SELECT DISTINCT InvoiceNo FROM rib_sub 
+LEFT JOIN rib ON rib.rib_id=rib_sub.rib_id 
+WHERE (rib.CurrentState=2 || rib.CurrentState=4 ) AND rib.rib_id!=$rib_id";
 $invoiceNo = mysqli_query($link, $sql_invoiceNo);
 $invoiceNo_array = array();
 if (is_iterable($invoiceNo)) {