diff --git a/wms/account-receivable-check.php b/wms/account-receivable-check.php
index 6ddf7a79..4ed786aa 100644
--- a/wms/account-receivable-check.php
+++ b/wms/account-receivable-check.php
@@ -1,18 +1,20 @@
 <?php
 include "./header.php";
+$BillNo = $_GET['BillNo'];
+echo $BillNo;
 //企業名稱 統一編號  聯絡地址
-$Bill = $_POST['Bill'];
-$Bill = json_decode($Bill, true);
-$sql_received = "SELECT * from account_received where BillNo = '$Bill[0]' ORDER BY `pay_id` ASC";
-$pay_received = mysqli_query($link, $sql_received);
-$had_received = 0;
-if (mysqli_num_rows($pay_received) == 0) {
-    foreach ($pay_received as $received) {
-        $had_received += $received['received_amount'];
-    }
-}
-$unreceived = $Bill[12] - $had_received;
-$data = json_encode($Bill);
+// $Bill = $_POST['Bill'];
+// $Bill = json_decode($Bill, true);
+// $sql_received = "SELECT * from account_received where BillNo = '$Bill[0]' ORDER BY `pay_id` ASC";
+// $pay_received = mysqli_query($link, $sql_received);
+// $had_received = 0;
+// if (mysqli_num_rows($pay_received) == 0) {
+//     foreach ($pay_received as $received) {
+//         $had_received += $received['received_amount'];
+//     }
+// }
+// $unreceived = $Bill[12] - $had_received;
+// $data = json_encode($Bill);
 ?>
 <style>
     th {
diff --git a/wms/account-receivable-contract.php b/wms/account-receivable-contract.php
index f37920fb..dc849699 100644
--- a/wms/account-receivable-contract.php
+++ b/wms/account-receivable-contract.php
@@ -1,39 +1,245 @@
 <?php
 include "header.php";
+$BillNo = $_GET['BillNo'];
+if ($cont['BillNo'] == 'M231067') {
+    $BillNo = 'SO20230801002';
+}
+
 // 合約收款款別名稱
 $arrayData = [];
-echo "合約號;客戶名稱;1款;金額;2款;金額;3款;金額;4款;金額;5款;金額;6款;金額;7款;金額;8款;金額;9款;金額;10款;金額;11款;金額;12款</br>";
+// echo "合約號;客戶名稱;1款;金額;2款;金額;3款;金額;4款;金額;5款;金額;6款;金額;7款;金額;8款;金額;9款;金額;10款;金額;11款;金額;12款</br>";
 $sql_contract = "SELECT a.BillNo, a.PayStage, a.PlanPayAmt,s.BizPartnerId,c.BizPartnerName 
 FROM salOrderStagePay AS a 
 LEFT JOIN salSalesOrder AS s on a.BillNo = s.BillNo 
 LEFT JOIN comBusinessPartner as c ON s.BizPartnerId=c.BizPartnerId 
-WHERE s.ModeId = 'M' AND (s.CurrentState=2 OR s.CurrentState=4)";
+WHERE s.BillNo = '$BillNo'";
+
+// T8發票
+//M220478
+$sql_invoice = "SELECT DISTINCT
+a.InvoiceNo, a.InvoiceTime,a.OAmountWithTax,a.InvoiceState, 
+b.ProjectId 
+FROM  arSellInvoice as a 
+LEFT JOIN arSellInvoiceMaterial as b 
+ON a.BillNo=b.BillNo 
+WHERE b.ProjectId='$BillNo'";
 
 $contract = $conn->query($sql_contract);
-foreach ($contract as $cont) {
-    if ($cont['BillNo'] == 'SO20230801002') {
-        $BillNo = 'M231067';
-    }else{
-        $BillNo = $cont['BillNo'];
-    };
-    $PayStage = $cont['PayStage'];
-    $PayAmount = $cont['PlanPayAmt'];
-    $partnerName = $cont['BizPartnerName'];
-    if(isset($arrayData[$BillNo])){
-        array_push($arrayData[$BillNo], $PayStage);
-        array_push($arrayData[$BillNo], $PayAmount);
-        
-    }else{
-        $arrayData[$BillNo][0] = $BillNo;
-        $arrayData[$BillNo][1] = $partnerName;
-        array_push($arrayData[$BillNo], $PayStage);
-        array_push($arrayData[$BillNo], $PayAmount);
+$invoices = $conn->query($sql_invoice);
+
+// foreach($contract as $con){
+//     print_r($con);
+//     echo "<br>";
+// }
+
+
+
+
+
+// foreach ($contract as $cont) {
+//     if ($cont['BillNo'] == 'SO20230801002') {
+//         $BillNo = 'M231067';
+//     }else{
+//         $BillNo = $cont['BillNo'];
+//     };
+//     $PayStage = $cont['PayStage'];
+//     $PayAmount = $cont['PlanPayAmt'];
+//     $partnerName = $cont['BizPartnerName'];
+//     if(isset($arrayData[$BillNo])){
+//         array_push($arrayData[$BillNo], $PayStage);
+//         array_push($arrayData[$BillNo], $PayAmount);
+
+//     }else{
+//         $arrayData[$BillNo][0] = $BillNo;
+//         $arrayData[$BillNo][1] = $partnerName;
+//         array_push($arrayData[$BillNo], $PayStage);
+//         array_push($arrayData[$BillNo], $PayAmount);
+
+//     }
+// };
+// foreach($arrayData as $data){
+//     foreach($data as $value){
+//         echo $value.";";
+//     }
+//     echo "</br>";
+// }
+
+
+
+?>
+<style>
+    th {
+        text-align: center;
+    }
 
+    td {
+        text-align: right;
     }
-};
-foreach($arrayData as $data){
-    foreach($data as $value){
-        echo $value.";";
+</style>
+<div class="container">
+    <div class="text-center" style="margin-bottom: 20px;">
+        <h3><strong><?= $Bill[4] ?></strong></h3>
+    </div>
+    <form class="form-horizontal">
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="BillNo">合約號</label>
+                <input type="text" class="form-control" id="BillNo" name="BillNo" value="<?= $Bill[0] ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="DeptId">部門</label>
+                <input type="text" class="form-control" id="DeptId" name="DeptId" value="<?= $Bill[1] ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="Manager">經理</label>
+                <input type="text" class="form-control" id="Manager" name="Manager" value="<?= $Bill[2] ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="PersonName">營業員</label>
+                <input type="text" class="form-control" id="PersonName" name="PersonName" value="<?= $Bill[3] ?>" disabled>
+            </div>
+
+        </div>
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="EnterpriseName">抬頭</label>
+                <input type="text" class="form-control" id="EnterpriseName" name="EnterpriseName" value="<?= $Bill[14] ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="TaxNo">統一編號</label>
+                <input type="text" class="form-control" id="TaxNo" name="TaxNo" value="<?= $Bill[15] ?>" disabled>
+            </div>
+            <div class="col-md-6">
+                <label for="ContactAddress">聯絡地址</label>
+                <input type="text" class="form-control" id="ContactAddress" name="ContactAddress" value="<?= $Bill[16] ?>" disabled>
+            </div>
+        </div>
+        <div>
+            <label for="detail">狀態</label>
+            <textarea class="form-control" style="height: 150px; width: 50%;" name="detail" id="detail" disabled><?= str_replace("<br>", "\n", $Bill[13]) ?></textarea>
+        </div>
+    </form>
+    <div style="width: auto; margin-top: 30px;">
+        <table class="table table-striped table-bordered" style="width:100%;">
+            <thead>
+                <tr>
+                    <th>目前應收</th>
+                    <th>已開發票金額</th>
+                    <th>未開發票金額</th>
+                    <th>已收金額</th>
+                    <th>未收金額</th>
+
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td><?= number_format(round($Bill[12])) ?></td>
+                    <td><?= number_format(round($Bill[19])) ?></td>
+                    <td><?= number_format(round($Bill[21])) ?></td>
+                    <td><?= number_format(round($Bill[20])) ?></td>
+                    <td><?= number_format(round($Bill[22])) ?></td>
+
+                </tr>
+            </tbody>
+        </table>
+    </div>
+
+
+    <div style="width: auto; margin-top: 30px;">
+        <table 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>
+
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td><?= number_format(round($Bill[5])) ?></td>
+                    <td><?= number_format(round($Bill[6])) ?></td>
+                    <td><?= number_format(round($Bill[7])) ?></td>
+                    <td><?= number_format(round($Bill[8])) ?></td>
+                    <td><?= number_format(round($Bill[9])) ?></td>
+                    <td><?= number_format(round($Bill[10])) ?></td>
+                    <td><?= number_format(round($Bill[11])) ?></td>
+
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
+<?php
+include "./footer.php";
+
+?>
+<?php
+if ($user_id == "M0122") {
+?>
+    <button type="button" onclick="create('create',0)" class="btn btn-primary btn-sm pull-right" style="margin-right: 10%;margin-bottom: 10px;">
+        新增收款紀錄<span class=" glyphicon glyphicon-plus"></span></button>
+<?php
+}
+?>
+<div style="margin-right: 10%;margin-left: 10%; justify-content: center;">
+    <table class="table table-striped table-bordered" style="width:100%;">
+        <thead>
+            <tr>
+                <th>發票號碼</th>
+                <th>發票日期</th>
+                <th>發票金額</th>
+                <th>收款日期</th>
+                <th>收款金額</th>
+                <th>說明</th>
+                <th style="width: 10%;">功能</th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php if (!empty($invoices)) {
+                foreach ($invoices as $invoice) { ?>
+                    <tr>
+                        <td><?= $invoice['InvoiceNo'] ?></td>
+                        <td><?= date('Y-m-d', strtotime(strval($invoice['InvoiceTime']))) ?></td>
+                        <td><?= number_format($invoice['OAmountWithTax']) ?></td>
+
+                        <td><?= number_format($received['received_amount']) ?></td>
+                        <td><?= $received['remark'] ?></td>
+                        <td><?php if (in_array(accountidToDepartId($user_id), array('220', '210'))) { ?>
+                                <button type="button" onclick="create('edit',<?= $received['pay_id'] ?>)" class="btn btn-warning btn-sm pull-right" style="margin-right: 10%;margin-bottom: 10px;">
+                                    <span class="glyphicon glyphicon-pencil"></span></button>
+                                <a href="account-receivable-received-delete.php?id=<?php echo $received['pay_id'] ?>&<?= $token_link ?>" class="btn btn-danger btn-sm">
+                                    <span class=" glyphicon glyphicon-trash"></span>
+                                </a>
+                            <?php } ?>
+                        </td>
+                    </tr>
+            <?php }
+            } ?>
+        </tbody>
+    </table>
+</div>
+<script>
+    function create(type, pay_id) {
+        var BillData = <?= $data ?>;
+        var form = document.createElement("form");
+        form.method = 'POST';
+        if (type === 'create') {
+            form.action = "account-receivable-received-create.php?<?= $token_link ?>";
+        } else {
+            form.action = "account-receivable-received-edit.php?pay_id=" + pay_id + "&<?= $token_link ?>";
+        }
+
+        var input = document.createElement("input");
+        input.type = "hidden";
+        input.name = "Bill";
+        input.value = JSON.stringify(BillData);
+        form.appendChild(input);
+        document.body.appendChild(form);
+        form.submit();
     }
-    echo "</br>";
-}
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/wms/account-receivable-excel.php b/wms/account-receivable-excel.php
index 31d7ee95..5fe16fc4 100644
--- a/wms/account-receivable-excel.php
+++ b/wms/account-receivable-excel.php
@@ -65,14 +65,14 @@ $spreadsheet = new Spreadsheet();
 $sheet = $spreadsheet->getActiveSheet();
 $colomnHeader = [
     '合約號', '部門', '經理', '營業員', '客戶名稱', '統一編號', '聯絡地址', '抬頭',
-    '簽約款', '簽約款目前應收', '簽約最小催收次數', '簽約最大應收次數',
-    '二次款', '二次款目前應收', '二次最小催收次數', '二次最大應收次數',
-    '貨抵工地款', '貨抵工地款目前應收', '貨抵工地最小催收次數', '貨抵工地最大應收次數',
-    '安裝款', '安裝款目前應收', '安裝最小催收次數', '安裝最大應收次數',
-    '試車款', '試車款目前應收', '試車最小催收次數', '試車最大應收次數',
-    '官檢款', '官檢款目前應收', '官檢最小催收次數', '官檢最大應收次數',
-    '交車款', '交車款目前應收', '交車最小催收次數', '交車最大應收次數',
-    '尾款', '尾款目前應收', '尾款最小催收次數', '尾款最大應收次數',
+    '簽約款', '簽約款目前應收', '簽約最大催收次數', '簽約最小應收次數',
+    '二次款', '二次款目前應收', '二次最大催收次數', '二次最小應收次數',
+    '貨抵工地款', '貨抵工地款目前應收', '貨抵工地最小催收次數', '貨抵工地最小應收次數',
+    '安裝款', '安裝款目前應收', '安裝最大催收次數', '安裝最小應收次數',
+    '試車款', '試車款目前應收', '試車最大催收次數', '試車最小應收次數',
+    '官檢款', '官檢款目前應收', '官檢最大催收次數', '官檢最小應收次數',
+    '交車款', '交車款目前應收', '交車最大催收次數', '交車最小應收次數',
+    '尾款', '尾款目前應收', '尾款最大催收次數', '尾款最小應收次數',
     '合約總金額', '目前應收', '已開發票金額', '已收金額', '作番狀態'
 ];
 // $colomnHeader = [
diff --git a/wms/account-receivable-index-ing.php b/wms/account-receivable-index-ing.php
index 5b73317a..4e6ef821 100644
--- a/wms/account-receivable-index-ing.php
+++ b/wms/account-receivable-index-ing.php
@@ -108,7 +108,7 @@ foreach ($contract as $cont) {
         $arrayData[$BillNo]['facilities'] = "";
         $arrayData[$BillNo]['total_facility_num'] = $arrayData[$BillNo]['delivery_num'] = $arrayData[$BillNo]['check_num'] = $arrayData[$BillNo]['tryrun_num'] = $arrayData[$BillNo]['install_num'] = $arrayData[$BillNo]['arrive_num'] = $arrayData[$BillNo]['second_num'] = $arrayData[$BillNo]['receivable_budget'] = 0;
     }
-    if (stristr($PayStage, '二次款') || stristr($PayStage, '出貨前') || stristr($PayStage, '簽約後') || stristr($PayStage, '簽訂後') || stristr($PayStage, '建照核發時') || stristr($PayStage, '簽約60')) {
+    if (stristr($PayStage, '二次款') || stristr($PayStage, '出貨前') || stristr($PayStage, '簽約後') || stristr($PayStage, '簽訂後') || stristr($PayStage, '建照核發時') || stristr($PayStage, '簽約60') || stristr($PayStage, '寶佳出貨後10天')) {
         $arrayData[$BillNo]['second'][0] = $PayStage;
         $arrayData[$BillNo]['second'][1] = $PayAmount;
         $arrayData[$BillNo]['second'][2] = $PlanPayDate;
@@ -133,7 +133,7 @@ foreach ($contract as $cont) {
                 $arrayData[$BillNo]['second'][2] = strval($secondtime);
             }
         }
-    } elseif ($PayStage == '簽約' || stristr($PayStage, '簽定') || stristr($PayStage, '簽訂') || stristr($PayStage, '訂金') || stristr($PayStage, '工地動工')) {
+    } elseif ($PayStage == '簽約' || stristr($PayStage, '簽定') || stristr($PayStage, '簽訂') || stristr($PayStage, '訂金') || stristr($PayStage, '工地動工') || stristr($PayStage, '寶佳出貨前30天')) {
         $arrayData[$BillNo]['sign'][0] = $PayStage;
         $arrayData[$BillNo]['sign'][1] = $PayAmount;
         $arrayData[$BillNo]['sign'][2] = $PlanPayDate;
@@ -179,8 +179,9 @@ foreach ($contract as $cont) {
         $arrayData[$BillNo]['total_budget'] += $PayAmount;
     }
 }
-
 //取作番大日程作番與時程
+// real_contract_arrival_date 預計出貨日
+// real_arrival_date 實際出貨日
 $sql = "SELECT
 tmp2.*,
 d.name AS depart_name
@@ -196,6 +197,7 @@ SELECT
  w.estimated_shipping_date,
  w.real_contract_arrival_date,
 w.actual_tofactory_date,
+w.real_contract_arrival_date,
  w.real_arrival_date,
  w.install_end_date,
  w.tryrun_end_date,
@@ -241,6 +243,26 @@ foreach ($wipwhole_array as $wip) {
             $arrayData[$wip['contractno']][$wip['facilityno']][$i]['con']['date'] = (isset($arrayData[$wip['contractno']][$i][2])) ? $arrayData[$wip['contractno']][$i][2] : "";
             $arrayData[$wip['contractno']][$wip['facilityno']][$i]['con']['budget'] = 0;
         }
+        // 補上寶佳 (出貨前) 收款時間
+
+        if (isset($arrayData[$wip['contractno']]['sign'][0]) && $arrayData[$wip['contractno']]['sign'][0] == '寶佳出貨前30天') {
+            if ($wip['real_arrival_date'] != NULL) {
+                $estimate_delivery_time = strtotime($wip['real_arrival_date']);
+                $signtime = $estimate_delivery_time - (30 * 86400);
+                $signtime = date('Ymd', $signtime);
+                $arrayData[$wip['contractno']]['sign'][2] = strval($signtime);
+                array_push($arrayData[$wip['contractno']]['sign']['max'], strtotime(strval($signtime)));
+                array_push($arrayData[$wip['contractno']]['sign']['min'], strtotime(strval($signtime)));
+            } elseif ($wip['real_contract_arrival_date'] != NULL) {
+                $estimate_delivery_time = strtotime($wip['real_contract_arrival_date']);
+                $signtime = $estimate_delivery_time - (30 * 86400);
+                $signtime = date('Ymd', $signtime);
+                $arrayData[$wip['contractno']]['sign'][2] = strval($signtime);
+                array_push($arrayData[$wip['contractno']]['sign']['max'], strtotime(strval($signtime)));
+                array_push($arrayData[$wip['contractno']]['sign']['min'], strtotime(strval($signtime)));
+            }
+        }
+
         // 補上二次款 (出貨前) 收款時間，條件不是"出貨前"就pass
         if (isset($arrayData[$wip['contractno']]['second'][0]) && stristr($arrayData[$wip['contractno']]['second'][0], '出貨前30天')) {
             if (empty($wip['real_contract_arrival_date'])) {
@@ -249,8 +271,8 @@ foreach ($wipwhole_array as $wip) {
                 $secondtime = $estimate_delivery_time - (30 * 86400);
                 $secondtime = date('Ymd', $secondtime);
                 $arrayData[$wip['contractno']]['second'][2] = strval($secondtime);
-                array_push($arrayData[$wip['contractno']]['second']['max'], strtotime(strval($wip['real_contract_arrival_date'])));
-                array_push($arrayData[$wip['contractno']]['second']['min'], strval($wip['real_contract_arrival_date']));
+                array_push($arrayData[$wip['contractno']]['second']['max'], strtotime(strval($secondtime)));
+                array_push($arrayData[$wip['contractno']]['second']['min'], strtotime(strval($secondtime)));
             }
         } elseif (isset($arrayData[$wip['contractno']]['second'][0]) && stristr($arrayData[$wip['contractno']]['second'][0], '出貨前90天')) {
             if (empty($wip['real_contract_arrival_date'])) {
@@ -259,12 +281,30 @@ foreach ($wipwhole_array as $wip) {
                 $secondtime = $estimate_delivery_time - (90 * 86400);
                 $secondtime = date('Ymd', $secondtime);
                 $arrayData[$wip['contractno']]['second'][2] = strval($secondtime);
-                array_push($arrayData[$wip['contractno']]['second']['max'], strtotime(strval($wip['real_contract_arrival_date'])));
-                array_push($arrayData[$wip['contractno']]['second']['min'], strval($wip['real_contract_arrival_date']));
+                array_push($arrayData[$wip['contractno']]['second']['max'], strtotime(strval($secondtime)));
+                array_push($arrayData[$wip['contractno']]['second']['min'], strtotime(strval($secondtime)));
             }
-        }
+        } elseif (isset($arrayData[$wip['contractno']]['second'][0]) && $arrayData[$wip['contractno']]['second'][0] == '寶佳出貨後10天') {
 
+            if ($wip['real_arrival_date'] != NULL) {
+                $estimate_delivery_time = strtotime($wip['real_arrival_date']);
+                $secondtime = $estimate_delivery_time + (10 * 86400);
+                $secondtime = date('Ymd', $secondtime);
+                $arrayData[$wip['contractno']]['second'][2] = strval($secondtime);
+                array_push($arrayData[$wip['contractno']]['second']['max'], strtotime(strval($secondtime)));
+                array_push($arrayData[$wip['contractno']]['second']['min'], strtotime(strval($secondtime)));
+            } else {
+                $estimate_delivery_time = strtotime($wip['real_contract_arrival_date']);
+                $secondtime = $estimate_delivery_time + (10 * 86400);
+                $secondtime = date('Ymd', $secondtime);
+                $arrayData[$wip['contractno']]['second'][2] = strval($secondtime);
+                array_push($arrayData[$wip['contractno']]['second']['max'], strtotime($secondtime));
+                array_push($arrayData[$wip['contractno']]['second']['min'], strtotime(strval($secondtime)));
+            }
+        }
         //根據作番狀態填入facilities，計算各階段數量、一個合約有幾個作番，增加作番資料
+        // real_contract_arrival_date 預計出貨日=預計到貨日=預計貨抵工地
+        // real_arrival_date 實際出貨日=實際到貨日=實際貨抵工地
         if ($wip['delivery_date'] != NULL) {
             $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['delivery_date'] . "已移交)  <br>";
             $arrayData[$wip['contractno']]['total_facility_num'] += 1;
@@ -274,107 +314,238 @@ foreach ($wipwhole_array as $wip) {
             $arrayData[$wip['contractno']]['install_num'] += 1;
             $arrayData[$wip['contractno']]['arrive_num'] += 1;
             $arrayData[$wip['contractno']]['second_num'] += 1;
-            if (!empty($wip['delivery_date']) && $wip['delivery_date'] != NULL) {
-                array_push($arrayData[$wip['contractno']]['delivery']['min'], strval($wip['delivery_date']));
+
+            if ($arrayData[$wip['contractno']]['delivery'][0] == "交車後270天") {
+                $estimate_delivery_time = strtotime($wip['delivery_date']);
+                $arrivetime = $estimate_delivery_time + (90 * 86400);
+                $arrivetime = date('Ymd', $secondtime);
+                $arrayData[$wip['contractno']]['delivery'][2] = strval($secondtime);
+                array_push($arrayData[$wip['contractno']]['delivery']['min'], strtotime(strval($arrivetime)));
+                array_push($arrayData[$wip['contractno']]['delivery']['max'], strtotime(strval($arrivetime)));
+            } else {
+                $arrayData[$wip['contractno']]['delivery'][2] = strval($wip['delivery_date']);
+                array_push($arrayData[$wip['contractno']]['delivery']['min'], strtotime(strval($wip['delivery_date'])));
                 array_push($arrayData[$wip['contractno']]['delivery']['max'], strtotime(strval($wip['delivery_date'])));
-                if (!empty($wip['official_check_date']) && $wip['official_check_date'] != NULL) {
-                    array_push($arrayData[$wip['contractno']]['check']['min'], strval($wip['official_check_date']));
-                    array_push($arrayData[$wip['contractno']]['check']['max'], strtotime(strval($wip['official_check_date'])));
-                }
-                if (!empty($wip['tryrun_end_date']) && $wip['tryrun_end_date'] != NULL) {
-                    array_push($arrayData[$wip['contractno']]['tryrun']['min'], strval($wip['tryrun_end_date']));
+            }
+            if (!empty($wip['official_check_date']) && $wip['official_check_date'] != NULL) {
+                array_push($arrayData[$wip['contractno']]['check']['min'], strtotime(strval($wip['official_check_date'])));
+                array_push($arrayData[$wip['contractno']]['check']['max'], strtotime(strval($wip['official_check_date'])));
+            }
+            if (!empty($wip['tryrun_end_date']) && $wip['tryrun_end_date'] != NULL) {
+                if ($arrayData[$wip['contractno']]['tryrun'][0] == "安裝試車後90天") {
+                    $estimate_delivery_time = strtotime($wip['tryrun_end_date']);
+                    $arrivetime = $estimate_delivery_time + (90 * 86400);
+                    $arrivetime = date('Ymd', $secondtime);
+                    $arrayData[$wip['contractno']]['tryrun'][2] = strval($secondtime);
+                    array_push($arrayData[$wip['contractno']]['tryrun']['min'], strtotime(strval($arrivetime)));
+                    array_push($arrayData[$wip['contractno']]['tryrun']['max'], strtotime(strval($arrivetime)));
+                } else {
+                    $arrayData[$wip['contractno']]['tryrun'][2] = strval($wip['tryrun_end_date']);
+                    array_push($arrayData[$wip['contractno']]['tryrun']['min'], strtotime(strval($wip['tryrun_end_date'])));
                     array_push($arrayData[$wip['contractno']]['tryrun']['max'], strtotime(strval($wip['tryrun_end_date'])));
                 }
-                if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
-                    array_push($arrayData[$wip['contractno']]['install']['min'], strval($wip['install_end_date']));
-                    array_push($arrayData[$wip['contractno']]['install']['max'], strtotime(strval($wip['install_end_date'])));
-                }
-                if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
-                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strval($wip['real_arrival_date']));
+            }
+            if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
+                array_push($arrayData[$wip['contractno']]['install']['min'], strtotime(strval($wip['install_end_date'])));
+                array_push($arrayData[$wip['contractno']]['install']['max'], strtotime(strval($wip['install_end_date'])));
+            }
+            if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
+                if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                    $estimate_delivery_time = strtotime($wip['real_arrival_date']);
+                    $arrivetime = $estimate_delivery_time + (90 * 86400);
+                    $arrivetime = date('Ymd', $secondtime);
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                    array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                } else {
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_arrival_date']);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_arrival_date'])));
                     array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_arrival_date'])));
                 }
-            } elseif ($wip['official_check_date'] != NULL) {
-                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['official_check_date'] . "官檢完畢)  <br>";
-                $arrayData[$wip['contractno']]['total_facility_num'] += 1;
-                $arrayData[$wip['contractno']]['check_num'] += 1;
-                $arrayData[$wip['contractno']]['tryrun_num'] += 1;
-                $arrayData[$wip['contractno']]['install_num'] += 1;
-                $arrayData[$wip['contractno']]['arrive_num'] += 1;
-                $arrayData[$wip['contractno']]['second_num'] += 1;
-                if (!empty($wip['official_check_date']) && $wip['official_check_date'] != NULL) {
-                    array_push($arrayData[$wip['contractno']]['check']['min'], strval($wip['official_check_date']));
-                    array_push($arrayData[$wip['contractno']]['check']['max'], strtotime(strval($wip['official_check_date'])));
+            } else {
+                if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                    $estimate_delivery_time = strtotime($wip['real_contract_arrival_date']);
+                    $arrivetime = $estimate_delivery_time + (90 * 86400);
+                    $arrivetime = date('Ymd', $secondtime);
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                    array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                } else {
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_contract_arrival_date']);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_contract_arrival_date'])));
+                    array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_contract_arrival_date'])));
                 }
-                if (!empty($wip['tryrun_end_date']) && $wip['tryrun_end_date'] != NULL) {
-                    array_push($arrayData[$wip['contractno']]['tryrun']['min'], strval($wip['tryrun_end_date']));
+            }
+        } elseif ($wip['official_check_date'] != NULL) {
+            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['official_check_date'] . "官檢完畢)  <br>";
+            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+            $arrayData[$wip['contractno']]['check_num'] += 1;
+            $arrayData[$wip['contractno']]['tryrun_num'] += 1;
+            $arrayData[$wip['contractno']]['install_num'] += 1;
+            $arrayData[$wip['contractno']]['arrive_num'] += 1;
+            $arrayData[$wip['contractno']]['second_num'] += 1;
+            if (!empty($wip['official_check_date']) && $wip['official_check_date'] != NULL) {
+                array_push($arrayData[$wip['contractno']]['check']['min'], strval($wip['official_check_date']));
+                array_push($arrayData[$wip['contractno']]['check']['max'], strtotime(strval($wip['official_check_date'])));
+            }
+
+            if (!empty($wip['tryrun_end_date']) && $wip['tryrun_end_date'] != NULL) {
+                if ($arrayData[$wip['contractno']]['tryrun'][0] == "安裝試車後90天") {
+                    $estimate_delivery_time = strtotime($wip['tryrun_end_date']);
+                    $arrivetime = $estimate_delivery_time + (90 * 86400);
+                    $arrivetime = date('Ymd', $secondtime);
+                    $arrayData[$wip['contractno']]['tryrun'][2] = strval($secondtime);
+                    array_push($arrayData[$wip['contractno']]['tryrun']['min'], strtotime(strval($arrivetime)));
+                    array_push($arrayData[$wip['contractno']]['tryrun']['max'], strtotime(strval($arrivetime)));
+                } else {
+                    $arrayData[$wip['contractno']]['tryrun'][2] = strval($wip['tryrun_end_date']);
+                    array_push($arrayData[$wip['contractno']]['tryrun']['min'], strtotime(strval($wip['tryrun_end_date'])));
                     array_push($arrayData[$wip['contractno']]['tryrun']['max'], strtotime(strval($wip['tryrun_end_date'])));
                 }
-                if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
-                    array_push($arrayData[$wip['contractno']]['install']['min'], strval($wip['install_end_date']));
-                    array_push($arrayData[$wip['contractno']]['install']['max'], strtotime(strval($wip['install_end_date'])));
-                }
-                if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
-                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strval($wip['real_arrival_date']));
+            }
+            if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
+                array_push($arrayData[$wip['contractno']]['install']['min'], strval($wip['install_end_date']));
+                array_push($arrayData[$wip['contractno']]['install']['max'], strtotime(strval($wip['install_end_date'])));
+            }
+            if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
+                if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                    $estimate_delivery_time = strtotime($wip['real_arrival_date']);
+                    $arrivetime = $estimate_delivery_time + (90 * 86400);
+                    $arrivetime = date('Ymd', $secondtime);
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                    array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                } else {
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_arrival_date']);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_arrival_date'])));
                     array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_arrival_date'])));
                 }
-            } elseif ($wip['tryrun_end_date'] != NULL) {
-                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['tryrun_end_date'] . "試車完畢)  <br>";
-                $arrayData[$wip['contractno']]['total_facility_num'] += 1;
-                $arrayData[$wip['contractno']]['tryrun_num'] += 1;
-                $arrayData[$wip['contractno']]['install_num'] += 1;
-                $arrayData[$wip['contractno']]['arrive_num'] += 1;
-                $arrayData[$wip['contractno']]['second_num'] += 1;
-                if (!empty($wip['tryrun_end_date']) && $wip['tryrun_end_date'] != NULL) {
-                    array_push($arrayData[$wip['contractno']]['tryrun']['min'], strval($wip['tryrun_end_date']));
-                    array_push($arrayData[$wip['contractno']]['tryrun']['max'], strtotime(strval($wip['tryrun_end_date'])));
-                }
-                if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
-                    array_push($arrayData[$wip['contractno']]['install']['min'], strval($wip['install_end_date']));
-                    array_push($arrayData[$wip['contractno']]['install']['max'], strtotime(strval($wip['install_end_date'])));
+            } else {
+                if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                    $estimate_delivery_time = strtotime($wip['real_contract_arrival_date']);
+                    $arrivetime = $estimate_delivery_time + (90 * 86400);
+                    $arrivetime = date('Ymd', $secondtime);
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                    array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                } else {
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_contract_arrival_date']);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_contract_arrival_date'])));
+                    array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_contract_arrival_date'])));
                 }
-                if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
-                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strval($wip['real_arrival_date']));
+            }
+        } elseif ($wip['tryrun_end_date'] != NULL) {
+            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['tryrun_end_date'] . "試車完畢)  <br>";
+            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+            $arrayData[$wip['contractno']]['tryrun_num'] += 1;
+            $arrayData[$wip['contractno']]['install_num'] += 1;
+            $arrayData[$wip['contractno']]['arrive_num'] += 1;
+            $arrayData[$wip['contractno']]['second_num'] += 1;
+            if (!empty($wip['tryrun_end_date']) && $wip['tryrun_end_date'] != NULL) {
+                array_push($arrayData[$wip['contractno']]['tryrun']['min'], strval($wip['tryrun_end_date']));
+                array_push($arrayData[$wip['contractno']]['tryrun']['max'], strtotime(strval($wip['tryrun_end_date'])));
+            }
+            if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
+                array_push($arrayData[$wip['contractno']]['install']['min'], strval($wip['install_end_date']));
+                array_push($arrayData[$wip['contractno']]['install']['max'], strtotime(strval($wip['install_end_date'])));
+            }
+            if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
+                if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                    $estimate_delivery_time = strtotime($wip['real_arrival_date']);
+                    $arrivetime = $estimate_delivery_time + (90 * 86400);
+                    $arrivetime = date('Ymd', $secondtime);
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                    array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                } else {
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_arrival_date']);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_arrival_date'])));
                     array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_arrival_date'])));
                 }
-            } elseif ($wip['install_end_date'] != NULL) {
-                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['install_end_date'] . "安裝完畢)  <br>";
-                $arrayData[$wip['contractno']]['total_facility_num'] += 1;
-                $arrayData[$wip['contractno']]['install_num'] += 1;
-                $arrayData[$wip['contractno']]['arrive_num'] += 1;
-                $arrayData[$wip['contractno']]['second_num'] += 1;
-                if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
-                    array_push($arrayData[$wip['contractno']]['install']['min'], strval($wip['install_end_date']));
-                    array_push($arrayData[$wip['contractno']]['install']['max'], strtotime(strtotime(strval($wip['install_end_date']))));
+            } else {
+                if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                    $estimate_delivery_time = strtotime($wip['real_contract_arrival_date']);
+                    $arrivetime = $estimate_delivery_time + (90 * 86400);
+                    $arrivetime = date('Ymd', $secondtime);
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                    array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                } else {
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_contract_arrival_date']);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_contract_arrival_date'])));
+                    array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_contract_arrival_date'])));
                 }
-                if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
-                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strval($wip['real_arrival_date']));
+            }
+        } elseif ($wip['install_end_date'] != NULL) {
+            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['install_end_date'] . "安裝完畢)  <br>";
+            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+            $arrayData[$wip['contractno']]['install_num'] += 1;
+            $arrayData[$wip['contractno']]['arrive_num'] += 1;
+            $arrayData[$wip['contractno']]['second_num'] += 1;
+            if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
+                array_push($arrayData[$wip['contractno']]['install']['min'], strval($wip['install_end_date']));
+                array_push($arrayData[$wip['contractno']]['install']['max'], strtotime(strtotime(strval($wip['install_end_date']))));
+            }
+            if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
+                if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                    $estimate_delivery_time = strtotime($wip['real_arrival_date']);
+                    $arrivetime = $estimate_delivery_time + (90 * 86400);
+                    $arrivetime = date('Ymd', $secondtime);
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                    array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                } else {
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_arrival_date']);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_arrival_date'])));
                     array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_arrival_date'])));
                 }
-            } elseif ($wip['real_arrival_date'] != NULL) {
-                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['real_arrival_date'] . "貨抵工地)  <br>";
-                $arrayData[$wip['contractno']]['total_facility_num'] += 1;
-                $arrayData[$wip['contractno']]['arrive_num'] += 1;
-                $arrayData[$wip['contractno']]['second_num'] += 1;
-                if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
-                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strval($wip['real_arrival_date']));
-                    array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_arrival_date'])));
+            } else {
+                if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                    $estimate_delivery_time = strtotime($wip['real_contract_arrival_date']);
+                    $arrivetime = $estimate_delivery_time + (90 * 86400);
+                    $arrivetime = date('Ymd', $secondtime);
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                    array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                } else {
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_contract_arrival_date']);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_contract_arrival_date'])));
+                    array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_contract_arrival_date'])));
                 }
-            } elseif (($arrayData[$wip['contractno']]['second'] != NULL) && (isset($arrayData[$wip['contractno']]['second'][2])) && ($arrayData[$wip['contractno']]['second'][2] <= date('Ymd'))) {
+            }
+        } elseif ($wip['real_arrival_date'] != NULL) {
+            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['real_arrival_date'] . "貨抵工地)  <br>";
+            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+            $arrayData[$wip['contractno']]['arrive_num'] += 1;
+            $arrayData[$wip['contractno']]['second_num'] += 1;
 
-                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (已達二次款收款條件)  <br>";
+            if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                $estimate_delivery_time = strtotime($wip['real_arrival_date']);
+                $arrivetime = $estimate_delivery_time + (90 * 86400);
+                $arrivetime = date('Ymd', $secondtime);
+                $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+            } else {
+                $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_arrival_date']);
+                array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_arrival_date'])));
+                array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_arrival_date'])));
+            }
+        } elseif (($arrayData[$wip['contractno']]['second'] != NULL) && (isset($arrayData[$wip['contractno']]['second'][2])) && ($arrayData[$wip['contractno']]['second'][2] <= date('Ymd'))) {
+
+            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (已達二次款收款條件)  <br>";
+            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+            $arrayData[$wip['contractno']]['second_num'] += 1;
+        } else {
+            if ($wip['real_contract_arrival_date'] != NULL) {
+                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['real_contract_arrival_date'] . "預計出貨日)  <br>";
+                $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+            } elseif ($wip['estimated_shipping_date'] != NULL) {
+                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['estimated_shipping_date'] . "預計出港日)  <br>";
                 $arrayData[$wip['contractno']]['total_facility_num'] += 1;
-                $arrayData[$wip['contractno']]['second_num'] += 1;
             } else {
-                if ($wip['real_contract_arrival_date'] != NULL) {
-                    $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['real_contract_arrival_date'] . "預計出貨日)  <br>";
-                    $arrayData[$wip['contractno']]['total_facility_num'] += 1;
-                } elseif ($wip['estimated_shipping_date'] != NULL) {
-                    $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['estimated_shipping_date'] . "預計出港日)  <br>";
-                    $arrayData[$wip['contractno']]['total_facility_num'] += 1;
-                } else {
-                    $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (預計出港日待確認)  <br>";
-                    $arrayData[$wip['contractno']]['total_facility_num'] += 1;
-                }
+                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (預計出港日待確認)  <br>";
+                $arrayData[$wip['contractno']]['total_facility_num'] += 1;
             }
         }
     }
@@ -398,7 +569,7 @@ foreach ($arrayData as &$value) {
     }
     $stagearray = array('sign', 'second', 'arrive', 'install', 'tryrun', 'check', 'delivery', 'final');
 
-    $today = date('Ym01', strtotime('-1 month',strtotime(date('Ym01'))));
+    $today = date('Ym01', strtotime('-1 month', strtotime(date('Ym01'))));
     // $today = strtotime($today,);
     // echo "today: " . $today . "<br>";
     // exit();
@@ -476,7 +647,7 @@ foreach ($received_array as $received) {
         }
     }
 }
-foreach($arrayData as $key => $value){
+foreach ($arrayData as $key => $value) {
     print_r($value);
     echo "<br>";
 }
diff --git a/wms/account-receivable-index.php b/wms/account-receivable-index.php
index 9feac530..190783da 100644
--- a/wms/account-receivable-index.php
+++ b/wms/account-receivable-index.php
@@ -32,6 +32,7 @@ LEFT JOIN
 ON a.BillNo=c.BillNo
 WHERE DATALENGTH(c.OrderBillNo) >0";
 
+//T8 銷售訂單 階段收款計畫
 $sql_contract = "SELECT a.BillNo, a.PayStage, a.PlanPayAmt, a.PlanPayDate,s.BizPartnerId,c.BizPartnerName, s.PersonId,
 c.EnterpriseName, c.TaxNo, c.ContactAddress FROM salOrderStagePay AS a 
 LEFT JOIN salSalesOrder AS s on a.BillNo = s.BillNo 
@@ -66,6 +67,7 @@ $received_array = $conn->query($sql_received);
 $opening_data = mysqli_query($link, $sql_opening);
 $invoice_data = $conn->query($sql_invoice);
 
+
 // 合約收款階段內容分類
 $sign60 = array('簽訂後60天', '簽約60日', '簽約後60天', '簽訂後60日內', '訂金支付後60天');
 $sign90 = array('簽約後90天', '簽約後90日', '簽訂後90天');
@@ -104,9 +106,9 @@ foreach ($contract as $cont) {
         $arrayData[$BillNo]['sign']['min'] = $arrayData[$BillNo]['second']['min'] = $arrayData[$BillNo]['arrive']['min'] = $arrayData[$BillNo]['install']['min'] = $arrayData[$BillNo]['tryrun']['min'] = $arrayData[$BillNo]['check']['min'] = $arrayData[$BillNo]['delivery']['min'] = $arrayData[$BillNo]['final']['min'] = array();
         $arrayData[$BillNo]['sign']['max'] = $arrayData[$BillNo]['second']['max'] = $arrayData[$BillNo]['arrive']['max'] = $arrayData[$BillNo]['install']['max'] = $arrayData[$BillNo]['tryrun']['max'] = $arrayData[$BillNo]['check']['max'] = $arrayData[$BillNo]['delivery']['max'] = $arrayData[$BillNo]['final']['max'] = array();
         $arrayData[$BillNo]['facilities'] = "";
-        $arrayData[$BillNo]['total_facility_num'] = $arrayData[$BillNo]['delivery_num'] = $arrayData[$BillNo]['check_num'] = $arrayData[$BillNo]['tryrun_num'] = $arrayData[$BillNo]['install_num'] = $arrayData[$BillNo]['arrive_num'] = $arrayData[$BillNo]['second_num'] = $arrayData[$BillNo]['receivable_budget'] = 0;
+        $arrayData[$BillNo]['total_facility_num'] = $arrayData[$BillNo]['delivery_num'] = $arrayData[$BillNo]['check_num'] = $arrayData[$BillNo]['tryrun_num'] = $arrayData[$BillNo]['install_num'] = $arrayData[$BillNo]['arrive_num'] = $arrayData[$BillNo]['second_num'] = $arrayData[$BillNo]['sign_num'] = $arrayData[$BillNo]['receivable_budget'] = 0;
     }
-    if (stristr($PayStage, '二次款') || stristr($PayStage, '出貨前') || stristr($PayStage, '簽約後') || stristr($PayStage, '簽訂後') || stristr($PayStage, '建照核發時') || stristr($PayStage, '簽約60') || stristr($PayStage, '寶佳出貨後')) {
+    if (stristr($PayStage, '二次款') || (stristr($PayStage, '出貨前') && $PayStage != "寶佳出貨前30天") || stristr($PayStage, '簽約後') || stristr($PayStage, '簽訂後') || stristr($PayStage, '建照核發時') || stristr($PayStage, '簽約60') || stristr($PayStage, '寶佳出貨後10天')) {
         $arrayData[$BillNo]['second'][0] = $PayStage;
         $arrayData[$BillNo]['second'][1] = $PayAmount;
         $arrayData[$BillNo]['second'][2] = $PlanPayDate;
@@ -116,28 +118,31 @@ foreach ($contract as $cont) {
             if (in_array($PayStage, $sign60)) {
                 $secondtime = $signtime + (60 * 86400);
                 $secondtime = date('Ymd', $secondtime);
-                $arrayData[$BillNo]['second'][2] = intval($secondtime);
+                $arrayData[$BillNo]['second'][2] = strval($secondtime);
             } elseif (in_array($PayStage, $sign90)) {
                 $secondtime = $signtime + (90 * 86400);
                 $secondtime = date('Ymd', $secondtime);
-                $arrayData[$BillNo]['second'][2] = intval($secondtime);
+                $arrayData[$BillNo]['second'][2] = strval($secondtime);
             } elseif (in_array($PayStage, $sign120)) {
                 $secondtime = $signtime + (120 * 86400);
                 $secondtime = date('Ymd', $secondtime);
-                $arrayData[$BillNo]['second'][2] = intval($secondtime);
+                $arrayData[$BillNo]['second'][2] = strval($secondtime);
             } elseif (stristr($PayStage, '簽訂後30天')) {
                 $secondtime = $signtime + (30 * 86400);
                 $secondtime = date('Ymd', $secondtime);
-                $arrayData[$BillNo]['second'][2] = intval($secondtime);
+                $arrayData[$BillNo]['second'][2] = strval($secondtime);
             }
         }
-    } elseif ($PayStage == '簽約' || stristr($PayStage, '簽定') || stristr($PayStage, '簽訂') || stristr($PayStage, '訂金') || stristr($PayStage, '工地動工') || stristr($PayStage, '寶佳出貨前')) {
+    } elseif ($PayStage == '簽約' || stristr($PayStage, '簽定') || stristr($PayStage, '簽訂') || stristr($PayStage, '訂金') || stristr($PayStage, '工地動工') || $PayStage == '寶佳出貨前30天') {
         $arrayData[$BillNo]['sign'][0] = $PayStage;
         $arrayData[$BillNo]['sign'][1] = $PayAmount;
         $arrayData[$BillNo]['sign'][2] = $PlanPayDate;
         $arrayData[$BillNo]['total_budget'] += $PayAmount;
-        array_push($arrayData[$BillNo]['sign']['min'], intval(substr($PlanPayDate, 4, 2)));
-        array_push($arrayData[$BillNo]['sign']['max'], intval(substr($PlanPayDate, 4, 2)));
+        $arrayData[$BillNo]['receivable_budget'] += $PayAmount;
+        if (isset($PlanPayDate) && !empty($PlanPayDate) && $PayStage != "寶佳出貨前30天") {
+            array_push($arrayData[$BillNo]['sign']['min'], strtotime(strval($PlanPayDate)));
+            array_push($arrayData[$BillNo]['sign']['max'], strtotime(strval($PlanPayDate)));
+        }
     } elseif (stristr($PayStage, '試車')) {
         $arrayData[$BillNo]['tryrun'][0] = $PayStage;
         $arrayData[$BillNo]['tryrun'][1] = $PayAmount;
@@ -174,6 +179,9 @@ foreach ($contract as $cont) {
         $arrayData[$BillNo]['total_budget'] += $PayAmount;
     }
 }
+//取作番大日程作番與時程
+// real_contract_arrival_date 預計出貨日
+// real_arrival_date 實際出貨日
 $sql = "SELECT
 tmp2.*,
 d.name AS depart_name
@@ -187,6 +195,7 @@ SELECT
  w.contractno,
  w.facilityno,
  w.estimated_shipping_date,
+ w.real_contract_arrival_date,
 w.actual_tofactory_date,
  w.real_arrival_date,
  w.install_end_date,
@@ -207,155 +216,395 @@ SELECT DISTINCT
 FROM department
 
 ) AS d
-ON d.department_id = tmp2.department_id";
+ON d.department_id = tmp2.department_id ORDER BY contractno";
 $wipwhole_array = mysqli_query($link, $sql);
 foreach ($wipwhole_array as $wip) {
     if (isset($arrayData[$wip['contractno']])) {
+        // 整理合約資料
         $arrayData[$wip['contractno']][0] = $wip['department_id'];;
         $arrayData[$wip['contractno']][1] = $wip['depart_name'];
         $arrayData[$wip['contractno']][2] = $wip['manager_name'];
         $arrayData[$wip['contractno']][3] = $wip['salesid'];
         $arrayData[$wip['contractno']][4] = $wip['name'];
         $arrayData[$wip['contractno']][10] = $wip['contractno'];
+        $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+        // [合約號][作番號]['no']
+        $arrayData[$wip['contractno']][$wip['facilityno']]['no'] = $wip['facilityno'];
+
+        // [合約號][作番號][款別]    ['con']  [金額]/[合約預計收款日期]
+        // [合約號][作番號][款別]    ['inv']  [金額]/[發票開立日期]
+        // [合約號][作番號][款別]    ['rec']  [金額]/[實際收款日期]
+        $contractstage = array('sign', 'second', 'arrive', 'install', 'tryrun', 'check', 'delivery', 'final');
+        foreach ($contractstage as $i) {
+            $arrayData[$wip['contractno']][$wip['facilityno']][$i]['inv']['date'] = "";
+            $arrayData[$wip['contractno']][$wip['facilityno']][$i]['inv']['budget'] = 0;
+            $arrayData[$wip['contractno']][$wip['facilityno']][$i]['rec']['date'] = "";
+            $arrayData[$wip['contractno']][$wip['facilityno']][$i]['rec']['budget'] = 0;
+            $arrayData[$wip['contractno']][$wip['facilityno']][$i]['con']['date'] = (isset($arrayData[$wip['contractno']][$i][2])) ? $arrayData[$wip['contractno']][$i][2] : "";
+            $arrayData[$wip['contractno']][$wip['facilityno']][$i]['con']['budget'] = 0;
+        }
+        // 補上寶佳 (出貨前) 收款時間
+
+        if (isset($arrayData[$wip['contractno']]['sign'][0]) && $arrayData[$wip['contractno']]['sign'][0] == '寶佳出貨前30天') {
+            if ($wip['real_arrival_date'] != NULL) {
+                $estimate_delivery_time = strtotime($wip['real_arrival_date']);
+                $signtime = $estimate_delivery_time - (30 * 86400);
+                $signtime = date('Ymd', $signtime);
+                $arrayData[$wip['contractno']]['sign'][2] = strval($signtime);
+                array_push($arrayData[$wip['contractno']]['sign']['max'], strtotime(strval($signtime)));
+                array_push($arrayData[$wip['contractno']]['sign']['min'], strtotime(strval($signtime)));
+            } elseif ($wip['real_contract_arrival_date'] != NULL) {
+                $estimate_delivery_time = strtotime($wip['real_contract_arrival_date']);
+                $signtime = $estimate_delivery_time - (30 * 86400);
+                $signtime = date('Ymd', $signtime);
+                $arrayData[$wip['contractno']]['sign'][2] = strval($signtime);
+                array_push($arrayData[$wip['contractno']]['sign']['max'], strtotime(strval($signtime)));
+                array_push($arrayData[$wip['contractno']]['sign']['min'], strtotime(strval($signtime)));
+            }
+        }
+
+        // 補上二次款 (出貨前) 收款時間，條件不是"出貨前"就pass
         if (isset($arrayData[$wip['contractno']]['second'][0]) && stristr($arrayData[$wip['contractno']]['second'][0], '出貨前30天')) {
-            $estimate_delivery_time = strtotime($wip['estimated_shipping_date']);
-            $secondtime = $estimate_delivery_time - (30 * 86400);
-            $secondtime = date('Ymd', $secondtime);
-            if (empty($wip['estimated_shipping_date'])) {
-                $arrayData[$wip['contractno']]['second']['min'] = 0;
+            if (empty($wip['real_contract_arrival_date'])) {
             } else {
-                array_push($arrayData[$wip['contractno']]['second']['max'], intval(substr($wip['estimated_shipping_date'], 5, 2)));
-                array_push($arrayData[$wip['contractno']]['second']['min'], intval(substr($wip['estimated_shipping_date'], 5, 2)));
+                $estimate_delivery_time = strtotime($wip['real_contract_arrival_date']);
+                $secondtime = $estimate_delivery_time - (30 * 86400);
+                $secondtime = date('Ymd', $secondtime);
+                $arrayData[$wip['contractno']]['second'][2] = strval($secondtime);
+                array_push($arrayData[$wip['contractno']]['second']['max'], strtotime(strval($secondtime)));
+                array_push($arrayData[$wip['contractno']]['second']['min'], strtotime(strval($secondtime)));
             }
-            $arrayData[$wip['contractno']]['second'][2] = intval($secondtime);
         } elseif (isset($arrayData[$wip['contractno']]['second'][0]) && stristr($arrayData[$wip['contractno']]['second'][0], '出貨前90天')) {
-            $estimate_delivery_time = strtotime($wip['estimated_shipping_date']);
-            $secondtime = $estimate_delivery_time - (90 * 86400);
-            $secondtime = date('Ymd', $secondtime);
-            $arrayData[$wip['contractno']]['second'][2] = intval($secondtime);
-            if (empty($wip['estimated_shipping_date'])) {
-                $arrayData[$wip['contractno']]['second']['min'] = 0;
+            if (empty($wip['real_contract_arrival_date'])) {
             } else {
-                array_push($arrayData[$wip['contractno']]['second']['max'], intval(substr($wip['estimated_shipping_date'], 5, 2)));
-                array_push($arrayData[$wip['contractno']]['second']['min'], intval(substr($wip['estimated_shipping_date'], 5, 2)));
-            }
-        }
-        if ($wip['delivery_date'] != NULL) {
-            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['delivery_date'] . "已移交)  <br>";
-            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
-            $arrayData[$wip['contractno']]['delivery_num'] += 1;
-            $arrayData[$wip['contractno']]['check_num'] += 1;
-            $arrayData[$wip['contractno']]['tryrun_num'] += 1;
-            $arrayData[$wip['contractno']]['install_num'] += 1;
-            $arrayData[$wip['contractno']]['arrive_num'] += 1;
-            $arrayData[$wip['contractno']]['second_num'] += 1;
-            array_push($arrayData[$wip['contractno']]['delivery']['min'], intval(substr($wip['delivery_date'], 5, 2)));
-            array_push($arrayData[$wip['contractno']]['delivery']['max'], intval(substr($wip['delivery_date'], 5, 2)));
-            if (!empty($wip['official_check_date']) && $wip['official_check_date'] != NULL) {
-                array_push($arrayData[$wip['contractno']]['check']['min'], intval(substr($wip['official_check_date'], 5, 2)));
-                array_push($arrayData[$wip['contractno']]['check']['max'], intval(substr($wip['official_check_date'], 5, 2)));
-            }
-            if (!empty($wip['tryrun_end_date']) && $wip['tryrun_end_date'] != NULL) {
-                array_push($arrayData[$wip['contractno']]['tryrun']['min'], intval(substr($wip['tryrun_end_date'], 5, 2)));
-                array_push($arrayData[$wip['contractno']]['tryrun']['max'], intval(substr($wip['tryrun_end_date'], 5, 2)));
-            }
-            if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
-                array_push($arrayData[$wip['contractno']]['install']['min'], intval(substr($wip['install_end_date'], 5, 2)));
-                array_push($arrayData[$wip['contractno']]['install']['max'], intval(substr($wip['install_end_date'], 5, 2)));
-            }
-            if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
-                array_push($arrayData[$wip['contractno']]['arrive']['min'], intval(substr($wip['real_arrival_date'], 5, 2)));
-                array_push($arrayData[$wip['contractno']]['arrive']['max'], intval(substr($wip['real_arrival_date'], 5, 2)));
-            }
-        } elseif ($wip['official_check_date'] != NULL) {
-            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['official_check_date'] . "官檢完畢)  <br>";
-            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
-            $arrayData[$wip['contractno']]['check_num'] += 1;
-            $arrayData[$wip['contractno']]['tryrun_num'] += 1;
-            $arrayData[$wip['contractno']]['install_num'] += 1;
-            $arrayData[$wip['contractno']]['arrive_num'] += 1;
-            $arrayData[$wip['contractno']]['second_num'] += 1;
-            array_push($arrayData[$wip['contractno']]['check']['min'], intval(substr($wip['official_check_date'], 5, 2)));
-            array_push($arrayData[$wip['contractno']]['check']['max'], intval(substr($wip['official_check_date'], 5, 2)));
-            if (!empty($wip['tryrun_end_date']) && $wip['tryrun_end_date'] != NULL) {
-                array_push($arrayData[$wip['contractno']]['tryrun']['min'], intval(substr($wip['tryrun_end_date'], 5, 2)));
-                array_push($arrayData[$wip['contractno']]['tryrun']['max'], intval(substr($wip['tryrun_end_date'], 5, 2)));
-            }
-            if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
-                array_push($arrayData[$wip['contractno']]['install']['min'], intval(substr($wip['install_end_date'], 5, 2)));
-                array_push($arrayData[$wip['contractno']]['install']['max'], intval(substr($wip['install_end_date'], 5, 2)));
-            }
-            if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
-                array_push($arrayData[$wip['contractno']]['arrive']['min'], intval(substr($wip['real_arrival_date'], 5, 2)));
-                array_push($arrayData[$wip['contractno']]['arrive']['max'], intval(substr($wip['real_arrival_date'], 5, 2)));
-            }
-        } elseif ($wip['tryrun_end_date'] != NULL) {
-            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['tryrun_end_date'] . "試車完畢)  <br>";
-            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
-            $arrayData[$wip['contractno']]['tryrun_num'] += 1;
-            $arrayData[$wip['contractno']]['install_num'] += 1;
-            $arrayData[$wip['contractno']]['arrive_num'] += 1;
-            $arrayData[$wip['contractno']]['second_num'] += 1;
-            if (!empty($wip['tryrun_end_date']) && $wip['tryrun_end_date'] != NULL) {
-                array_push($arrayData[$wip['contractno']]['tryrun']['min'], intval(substr($wip['tryrun_end_date'], 5, 2)));
-                array_push($arrayData[$wip['contractno']]['tryrun']['max'], intval(substr($wip['tryrun_end_date'], 5, 2)));
-            }
-            if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
-                array_push($arrayData[$wip['contractno']]['install']['min'], intval(substr($wip['install_end_date'], 5, 2)));
-                array_push($arrayData[$wip['contractno']]['install']['max'], intval(substr($wip['install_end_date'], 5, 2)));
-            }
-            if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
-                array_push($arrayData[$wip['contractno']]['arrive']['min'], intval(substr($wip['real_arrival_date'], 5, 2)));
-                array_push($arrayData[$wip['contractno']]['arrive']['max'], intval(substr($wip['real_arrival_date'], 5, 2)));
-            }
-        } elseif ($wip['install_end_date'] != NULL) {
-            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['install_end_date'] . "安裝完畢)  <br>";
-            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
-            $arrayData[$wip['contractno']]['install_num'] += 1;
-            $arrayData[$wip['contractno']]['arrive_num'] += 1;
-            $arrayData[$wip['contractno']]['second_num'] += 1;
-            if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
-                array_push($arrayData[$wip['contractno']]['install']['min'], intval(substr($wip['install_end_date'], 5, 2)));
-                array_push($arrayData[$wip['contractno']]['install']['max'], intval(substr($wip['install_end_date'], 5, 2)));
+                $estimate_delivery_time = strtotime($wip['real_contract_arrival_date']);
+                $secondtime = $estimate_delivery_time - (90 * 86400);
+                $secondtime = date('Ymd', $secondtime);
+                $arrayData[$wip['contractno']]['second'][2] = strval($secondtime);
+                array_push($arrayData[$wip['contractno']]['second']['max'], strtotime(strval($secondtime)));
+                array_push($arrayData[$wip['contractno']]['second']['min'], strtotime(strval($secondtime)));
             }
-            if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
-                array_push($arrayData[$wip['contractno']]['arrive']['min'], intval(substr($wip['real_arrival_date'], 5, 2)));
-                array_push($arrayData[$wip['contractno']]['arrive']['max'], intval(substr($wip['real_arrival_date'], 5, 2)));
+        } elseif (isset($arrayData[$wip['contractno']]['second'][0]) && $arrayData[$wip['contractno']]['second'][0] == '寶佳出貨後10天') {
+
+            if ($wip['real_arrival_date'] != NULL) {
+                $estimate_delivery_time = strtotime($wip['real_arrival_date']);
+                $secondtime = $estimate_delivery_time + (10 * 86400);
+                $secondtime = date('Ymd', $secondtime);
+                $arrayData[$wip['contractno']]['second'][2] = strval($secondtime);
+                array_push($arrayData[$wip['contractno']]['second']['max'], strtotime(strval($secondtime)));
+                array_push($arrayData[$wip['contractno']]['second']['min'], strtotime(strval($secondtime)));
+            } else {
+                $estimate_delivery_time = strtotime($wip['real_contract_arrival_date']);
+                $secondtime = $estimate_delivery_time + (10 * 86400);
+                $secondtime = date('Ymd', $secondtime);
+                $arrayData[$wip['contractno']]['second'][2] = strval($secondtime);
+                array_push($arrayData[$wip['contractno']]['second']['max'], strtotime($secondtime));
+                array_push($arrayData[$wip['contractno']]['second']['min'], strtotime(strval($secondtime)));
             }
-        } elseif ($wip['real_arrival_date'] != NULL) {
-            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['real_arrival_date'] . "貨抵工地)  <br>";
-            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
-            $arrayData[$wip['contractno']]['arrive_num'] += 1;
-            $arrayData[$wip['contractno']]['second_num'] += 1;
-            if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
-                array_push($arrayData[$wip['contractno']]['arrive']['min'], intval(substr($wip['real_arrival_date'], 5, 2)));
-                array_push($arrayData[$wip['contractno']]['arrive']['max'], intval(substr($wip['real_arrival_date'], 5, 2)));
+        }
+        //根據作番狀態填入facilities，計算各階段數量、一個合約有幾個作番，增加作番資料
+        // real_contract_arrival_date 預計出貨日=預計到貨日=預計貨抵工地
+        // real_arrival_date 實際出貨日=實際到貨日=實際貨抵工地
+        //----------------------------------------寶佳的另外處理---------------------------------------------------
+        if ($arrayData[$wip['contractno']]['sign'][0] == "寶佳出貨前30天") {
+            $facility_status = "";
+            // if ($arrayData[$wip['contractno']]['sign'][2])
+            $today = strtotime(date('Ymd'));
+            $contractday = strtotime($arrayData[$wip['contractno']]['sign'][2]);
+            if ($today > $contractday) {
+                $arrayData[$wip['contractno']]['sign_num'] += 1;
+                $facility_status = $wip['facilityno'] . " (出貨前30天" . $arrayData[$wip['contractno']]['sign'][2] . "已過)  <br>";
+                $contractday = strtotime($arrayData[$wip['contractno']]['second'][2]);
+                if ($today > $contractday) {
+                    $arrayData[$wip['contractno']]['second_num'] += 1;
+                    $facility_status = $wip['facilityno'] . " (出貨後10天" . $arrayData[$wip['contractno']]['second'][2] . "已過)  <br>";
+                    if ($wip['real_arrival_date'] != NULL) {
+                        $estimate_time = strtotime($wip['real_arrival_date']);
+                        $contractday = $estimate_time + (90 * 86400);
+                        if ($today > $contractday) {
+                            $arrayData[$wip['contractno']]['arrive_num'] += 1;
+                            $arrayData[$wip['contractno']]['arrive'][2] = strval(date('Y-m-d', $contractday));
+                            $facility_status = $wip['facilityno'] . " (貨抵工地後90天" . $arrayData[$wip['contractno']]['arrive'][2] . "已過)  <br>";
+                            if ($wip['tryrun_end_date'] != NULL) {
+                                $estimate_time = strtotime($wip['tryrun_end_date']);
+                                $contractday = $estimate_time + (90 * 86400);
+                                if ($today > $contractday) {
+                                    $arrayData[$wip['contractno']]['tryrun_num'] += 1;
+                                    $arrayData[$wip['contractno']]['tryrun'][2] = strval(date('Y-m-d', $contractday));
+                                    $facility_status = $wip['facilityno'] . " (試車後90天" . $arrayData[$wip['contractno']]['tryrun'][2] . "已過)  <br>";
+                                    if ($wip['delivery_date'] != NULL) {
+                                        $estimate_time = strtotime($wip['delivery_date']);
+                                        $contractday = $estimate_time + (270 * 86400);
+                                        if ($today > $contractday) {
+                                            $arrayData[$wip['contractno']]['delivery_num'] += 1;
+                                            $arrayData[$wip['contractno']]['delivery'][2] = strval(date('Y-m-d', $contractday));
+                                            $facility_status = $wip['facilityno'] . " (交車後270天" . $arrayData[$wip['contractno']]['delivery'][2] . "已過)  <br>";
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            } else {
+                $facility_status = $wip['facilityno'] . " (出貨前30天" . $arrayData[$wip['contractno']]['sign'][2] . "未到)  <br>";
             }
-        } elseif (($arrayData[$wip['contractno']]['second'] != NULL) && (isset($arrayData[$wip['contractno']]['second'][2])) && ($arrayData[$wip['contractno']]['second'][2] <= date('Ymd'))) {
-            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (已達二次款收款條件)  <br>";
-            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
-            $arrayData[$wip['contractno']]['second_num'] += 1;
+            $arrayData[$wip['contractno']]['facilities'] .= $facility_status;
         } else {
-            if ($wip['estimated_shipping_date'] != NULL) {
-                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['estimated_shipping_date'] . "預計到港)  <br>";
-                $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+            if ($wip['delivery_date'] != NULL) {
+                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['delivery_date'] . "已移交)  <br>";
+                $arrayData[$wip['contractno']]['tryrun_num'] += 1;
+                $arrayData[$wip['contractno']]['install_num'] += 1;
+                $arrayData[$wip['contractno']]['arrive_num'] += 1;
+                $arrayData[$wip['contractno']]['second_num'] += 1;
+                $arrayData[$wip['contractno']]['sign_num'] += 1;
+
+                if ($arrayData[$wip['contractno']]['delivery'][0] == "交車後270天") {
+                    $estimate_delivery_time = strtotime($wip['delivery_date']);
+                    $arrivetime = $estimate_delivery_time + (90 * 86400);
+                    $arrivetime = date('Ymd', $secondtime);
+                    $arrayData[$wip['contractno']]['delivery'][2] = strval($secondtime);
+                    array_push($arrayData[$wip['contractno']]['delivery']['min'], strtotime(strval($arrivetime)));
+                    array_push($arrayData[$wip['contractno']]['delivery']['max'], strtotime(strval($arrivetime)));
+                } else {
+                    $arrayData[$wip['contractno']]['delivery_num'] += 1;
+                    $arrayData[$wip['contractno']]['check_num'] += 1;
+                    $arrayData[$wip['contractno']]['delivery'][2] = strval($wip['delivery_date']);
+                    array_push($arrayData[$wip['contractno']]['delivery']['min'], strtotime(strval($wip['delivery_date'])));
+                    array_push($arrayData[$wip['contractno']]['delivery']['max'], strtotime(strval($wip['delivery_date'])));
+                }
+                if (!empty($wip['official_check_date']) && $wip['official_check_date'] != NULL) {
+                    array_push($arrayData[$wip['contractno']]['check']['min'], strtotime(strval($wip['official_check_date'])));
+                    array_push($arrayData[$wip['contractno']]['check']['max'], strtotime(strval($wip['official_check_date'])));
+                }
+                if (!empty($wip['tryrun_end_date']) && $wip['tryrun_end_date'] != NULL) {
+                    if ($arrayData[$wip['contractno']]['tryrun'][0] == "安裝試車後90天") {
+                        $estimate_delivery_time = strtotime($wip['tryrun_end_date']);
+                        $arrivetime = $estimate_delivery_time + (90 * 86400);
+                        $arrivetime = date('Ymd', $secondtime);
+                        $arrayData[$wip['contractno']]['tryrun'][2] = strval($secondtime);
+                        array_push($arrayData[$wip['contractno']]['tryrun']['min'], strtotime(strval($arrivetime)));
+                        array_push($arrayData[$wip['contractno']]['tryrun']['max'], strtotime(strval($arrivetime)));
+                    } else {
+                        $arrayData[$wip['contractno']]['tryrun'][2] = strval($wip['tryrun_end_date']);
+                        array_push($arrayData[$wip['contractno']]['tryrun']['min'], strtotime(strval($wip['tryrun_end_date'])));
+                        array_push($arrayData[$wip['contractno']]['tryrun']['max'], strtotime(strval($wip['tryrun_end_date'])));
+                    }
+                }
+                if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
+                    array_push($arrayData[$wip['contractno']]['install']['min'], strtotime(strval($wip['install_end_date'])));
+                    array_push($arrayData[$wip['contractno']]['install']['max'], strtotime(strval($wip['install_end_date'])));
+                }
+                if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
+                    if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                        $estimate_delivery_time = strtotime($wip['real_arrival_date']);
+                        $arrivetime = $estimate_delivery_time + (90 * 86400);
+                        $arrivetime = date('Ymd', $secondtime);
+                        $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                        array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                        array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                    } else {
+                        $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_arrival_date']);
+                        array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_arrival_date'])));
+                        array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_arrival_date'])));
+                    }
+                } else {
+                    if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                        $estimate_delivery_time = strtotime($wip['real_contract_arrival_date']);
+                        $arrivetime = $estimate_delivery_time + (90 * 86400);
+                        $arrivetime = date('Ymd', $secondtime);
+                        $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                        array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                        array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                    } else {
+                        $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_contract_arrival_date']);
+                        array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_contract_arrival_date'])));
+                        array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_contract_arrival_date'])));
+                    }
+                }
+            } elseif ($wip['official_check_date'] != NULL) {
+                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['official_check_date'] . "官檢完畢)  <br>";
+                $arrayData[$wip['contractno']]['check_num'] += 1;
+                $arrayData[$wip['contractno']]['tryrun_num'] += 1;
+                $arrayData[$wip['contractno']]['install_num'] += 1;
+                $arrayData[$wip['contractno']]['arrive_num'] += 1;
+                $arrayData[$wip['contractno']]['second_num'] += 1;
+                $arrayData[$wip['contractno']]['sign_num'] += 1;
+                if (!empty($wip['official_check_date']) && $wip['official_check_date'] != NULL) {
+                    array_push($arrayData[$wip['contractno']]['check']['min'], strtotime(strval($wip['official_check_date'])));
+                    array_push($arrayData[$wip['contractno']]['check']['max'], strtotime(strval($wip['official_check_date'])));
+                }
+
+                if (!empty($wip['tryrun_end_date']) && $wip['tryrun_end_date'] != NULL) {
+                    if ($arrayData[$wip['contractno']]['tryrun'][0] == "安裝試車後90天") {
+                        $estimate_delivery_time = strtotime($wip['tryrun_end_date']);
+                        $arrivetime = $estimate_delivery_time + (90 * 86400);
+                        $arrivetime = date('Ymd', $secondtime);
+                        $arrayData[$wip['contractno']]['tryrun'][2] = strval($secondtime);
+                        array_push($arrayData[$wip['contractno']]['tryrun']['min'], strtotime(strval($arrivetime)));
+                        array_push($arrayData[$wip['contractno']]['tryrun']['max'], strtotime(strval($arrivetime)));
+                    } else {
+                        $arrayData[$wip['contractno']]['tryrun'][2] = strval($wip['tryrun_end_date']);
+                        array_push($arrayData[$wip['contractno']]['tryrun']['min'], strtotime(strval($wip['tryrun_end_date'])));
+                        array_push($arrayData[$wip['contractno']]['tryrun']['max'], strtotime(strval($wip['tryrun_end_date'])));
+                    }
+                }
+                if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
+                    array_push($arrayData[$wip['contractno']]['install']['min'], strtotime(strval($wip['install_end_date'])));
+                    array_push($arrayData[$wip['contractno']]['install']['max'], strtotime(strval($wip['install_end_date'])));
+                }
+                if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
+                    if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                        $estimate_delivery_time = strtotime($wip['real_arrival_date']);
+                        $arrivetime = $estimate_delivery_time + (90 * 86400);
+                        $arrivetime = date('Ymd', $secondtime);
+                        $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                        array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                        array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                    } else {
+                        $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_arrival_date']);
+                        array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_arrival_date'])));
+                        array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_arrival_date'])));
+                    }
+                } else {
+                    if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                        $estimate_delivery_time = strtotime($wip['real_contract_arrival_date']);
+                        $arrivetime = $estimate_delivery_time + (90 * 86400);
+                        $arrivetime = date('Ymd', $secondtime);
+                        $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                        array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                        array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                    } else {
+                        $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_contract_arrival_date']);
+                        array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_contract_arrival_date'])));
+                        array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_contract_arrival_date'])));
+                    }
+                }
+            } elseif ($wip['tryrun_end_date'] != NULL) {
+                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['tryrun_end_date'] . "試車完畢)  <br>";
+                $arrayData[$wip['contractno']]['tryrun_num'] += 1;
+                $arrayData[$wip['contractno']]['install_num'] += 1;
+                $arrayData[$wip['contractno']]['arrive_num'] += 1;
+                $arrayData[$wip['contractno']]['second_num'] += 1;
+                $arrayData[$wip['contractno']]['sign_num'] += 1;
+                if (!empty($wip['tryrun_end_date']) && $wip['tryrun_end_date'] != NULL) {
+                    array_push($arrayData[$wip['contractno']]['tryrun']['min'], strtotime(strval($wip['tryrun_end_date'])));
+                    array_push($arrayData[$wip['contractno']]['tryrun']['max'], strtotime(strval($wip['tryrun_end_date'])));
+                }
+                if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
+                    array_push($arrayData[$wip['contractno']]['install']['min'], strtotime(strval($wip['install_end_date'])));
+                    array_push($arrayData[$wip['contractno']]['install']['max'], strtotime(strval($wip['install_end_date'])));
+                }
+                if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
+                    if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                        $estimate_delivery_time = strtotime($wip['real_arrival_date']);
+                        $arrivetime = $estimate_delivery_time + (90 * 86400);
+                        $arrivetime = date('Ymd', $secondtime);
+                        $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                        array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                        array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                    } else {
+                        $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_arrival_date']);
+                        array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_arrival_date'])));
+                        array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_arrival_date'])));
+                    }
+                } else {
+                    if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                        $estimate_delivery_time = strtotime($wip['real_contract_arrival_date']);
+                        $arrivetime = $estimate_delivery_time + (90 * 86400);
+                        $arrivetime = date('Ymd', $secondtime);
+                        $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                        array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                        array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                    } else {
+                        $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_contract_arrival_date']);
+                        array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_contract_arrival_date'])));
+                        array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_contract_arrival_date'])));
+                    }
+                }
+            } elseif ($wip['install_end_date'] != NULL) {
+                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['install_end_date'] . "安裝完畢)  <br>";
+                $arrayData[$wip['contractno']]['install_num'] += 1;
+                $arrayData[$wip['contractno']]['arrive_num'] += 1;
+                $arrayData[$wip['contractno']]['second_num'] += 1;
+                $arrayData[$wip['contractno']]['sign_num'] += 1;
+                if (!empty($wip['install_end_date']) && $wip['install_end_date'] != NULL) {
+                    array_push($arrayData[$wip['contractno']]['install']['min'], strtotime(strval($wip['install_end_date'])));
+                    array_push($arrayData[$wip['contractno']]['install']['max'], strtotime(strtotime(strval($wip['install_end_date']))));
+                }
+                if (!empty($wip['real_arrival_date']) && $wip['real_arrival_date'] != NULL) {
+                    if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                        $estimate_delivery_time = strtotime($wip['real_arrival_date']);
+                        $arrivetime = $estimate_delivery_time + (90 * 86400);
+                        $arrivetime = date('Ymd', $secondtime);
+                        $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                        array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                        array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                    } else {
+                        $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_arrival_date']);
+                        array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_arrival_date'])));
+                        array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_arrival_date'])));
+                    }
+                } else {
+                    if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                        $estimate_delivery_time = strtotime($wip['real_contract_arrival_date']);
+                        $arrivetime = $estimate_delivery_time + (90 * 86400);
+                        $arrivetime = date('Ymd', $secondtime);
+                        $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                        array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                        array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                    } else {
+                        $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_contract_arrival_date']);
+                        array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_contract_arrival_date'])));
+                        array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_contract_arrival_date'])));
+                    }
+                }
+            } elseif ($wip['real_arrival_date'] != NULL) {
+                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['real_arrival_date'] . "貨抵工地)  <br>";
+                $arrayData[$wip['contractno']]['arrive_num'] += 1;
+                $arrayData[$wip['contractno']]['second_num'] += 1;
+                $arrayData[$wip['contractno']]['sign_num'] += 1;
+
+                if ($arrayData[$wip['contractno']]['arrive'][0] == "貨抵工地後90天") {
+                    $estimate_delivery_time = strtotime($wip['real_arrival_date']);
+                    $arrivetime = $estimate_delivery_time + (90 * 86400);
+                    $arrivetime = date('Ymd', $secondtime);
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($secondtime);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($arrivetime)));
+                    array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($arrivetime)));
+                } else {
+                    $arrayData[$wip['contractno']]['arrive'][2] = strval($wip['real_arrival_date']);
+                    array_push($arrayData[$wip['contractno']]['arrive']['min'], strtotime(strval($wip['real_arrival_date'])));
+                    array_push($arrayData[$wip['contractno']]['arrive']['max'], strtotime(strval($wip['real_arrival_date'])));
+                }
+            } elseif (($arrayData[$wip['contractno']]['second'] != NULL) && (isset($arrayData[$wip['contractno']]['second'][2])) && ($arrayData[$wip['contractno']]['second'][2] <= date('Ymd'))) {
+
+                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (已達二次款收款條件)  <br>";
+                $arrayData[$wip['contractno']]['second_num'] += 1;
+                $arrayData[$wip['contractno']]['sign_num'] += 1;
             } else {
-                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (預計到港日待確認)  <br>";
-                $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+                $arrayData[$wip['contractno']]['sign_num'] += 1;
+                if ($wip['real_contract_arrival_date'] != NULL) {
+                    $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['real_contract_arrival_date'] . "預計出貨日)  <br>";
+                } elseif ($wip['estimated_shipping_date'] != NULL) {
+                    $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['estimated_shipping_date'] . "預計出港日)  <br>";
+                } else {
+                    $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (預計出港日待確認)  <br>";
+                }
             }
         }
     }
 }
 
-
+// 計算每個合約的應收款、作番總數
+$today_date = new DateTime(date('Y-m-d', strtotime('-1 month', strtotime(date('Y-m-d')))));
 foreach ($arrayData as &$value) {
     if ($value['total_facility_num'] > 0) {
-        $month = 11;
-        $value['receivable_budget'] = $value['sign'][1] + ($value['second'][1] * ($value['second_num'] / $value['total_facility_num'])) +
+        $value['receivable_budget'] = $value['sign'][1] * ($value['sign_num'] / $value['total_facility_num']) + ($value['second'][1] * ($value['second_num'] / $value['total_facility_num'])) +
             ($value['arrive'][1] * ($value['arrive_num'] / $value['total_facility_num'])) + ($value['install'][1] * ($value['install_num'] / $value['total_facility_num'])) +
             ($value['tryrun'][1] * ($value['tryrun_num'] / $value['total_facility_num'])) + ($value['check'][1] * ($value['check_num'] / $value['total_facility_num'])) +
             (($value['delivery'][1] + $value['final'][1]) * ($value['delivery_num'] / $value['total_facility_num']));
-        $value['sign'][3] = $value['sign'][1];
+        $value['sign'][3] = $value['sign'][1] * ($value['sign_num'] / $value['total_facility_num']);
         $value['second'][3] = $value['second'][1] * ($value['second_num'] / $value['total_facility_num']);
         $value['arrive'][3] = $value['arrive'][1] * ($value['arrive_num'] / $value['total_facility_num']);
         $value['install'][3] = $value['install'][1] * ($value['install_num'] / $value['total_facility_num']);
@@ -364,22 +613,51 @@ foreach ($arrayData as &$value) {
         $value['delivery'][3] = $value['delivery'][1] * ($value['delivery_num'] / $value['total_facility_num']);
         $value['final'][3] = $value['final'][1] * ($value['delivery_num'] / $value['total_facility_num']);
     }
-    $value['sign']['max'] = empty($value['sign']['max']) ? 0 : (($month - max($value['sign']['max'])) < 0 ? 0 : ($month - max($value['sign']['max'])));
-    $value['sign']['min'] = empty($value['sign']['min']) ? 0 : (($month - min($value['sign']['min'])) < 0 ? 0 : ($month - min($value['sign']['min'])));
-    $value['second']['max'] = empty($value['second']['max']) ? 0 : (($month - max($value['second']['max'])) < 0 ? 0 : ($month - max($value['second']['max'])));
-    $value['second']['min'] = empty($value['second']['min']) ? 0 : (($month - min($value['second']['min'])) < 0 ? 0 : ($month - min($value['second']['min'])));
-    $value['arrive']['max'] = empty($value['arrive']['max']) ? 0 : (($month - max($value['arrive']['max'])) < 0 ? 0 : ($month - max($value['arrive']['max'])));
-    $value['arrive']['min'] = empty($value['arrive']['min']) ? 0 : (($month - min($value['arrive']['min'])) < 0 ? 0 : ($month - min($value['arrive']['min'])));
-    $value['install']['max'] = empty($value['install']['max']) ? 0 : (($month - max($value['install']['max'])) < 0 ? 0 : ($month - max($value['install']['max'])));
-    $value['install']['min'] = empty($value['install']['min']) ? 0 : (($month - min($value['install']['min'])) < 0 ? 0 : ($month - min($value['install']['min'])));
-    $value['tryrun']['max'] = empty($value['tryrun']['max']) ? 0 : (($month - max($value['tryrun']['max'])) < 0 ? 0 : ($month - max($value['tryrun']['max'])));
-    $value['tryrun']['min'] = empty($value['tryrun']['min']) ? 0 : (($month - min($value['tryrun']['min'])) < 0 ? 0 : ($month - min($value['tryrun']['min'])));
-    $value['check']['max'] = empty($value['check']['max']) ? 0 : (($month - max($value['check']['max'])) < 0 ? 0 : ($month - max($value['check']['max'])));
-    $value['check']['min'] = empty($value['check']['min']) ? 0 : (($month - min($value['check']['min'])) < 0 ? 0 : ($month - min($value['check']['min'])));
-    $value['delivery']['max'] = empty($value['delivery']['max']) ? 0 : (($month - max($value['delivery']['max'])) < 0 ? 0 : ($month - max($value['delivery']['max'])));
-    $value['delivery']['min'] = empty($value['delivery']['min']) ? 0 : (($month - min($value['delivery']['min'])) < 0 ? 0 : ($month - min($value['delivery']['min'])));
-    $value['final']['max'] = empty($value['final']['max']) ? 0 : (($month - max($value['final']['max'])) < 0 ? 0 : ($month - max($value['final']['max'])));
-    $value['final']['min'] = empty($value['final']['min']) ? 0 : (($month - min($value['final']['min'])) < 0 ? 0 : ($month - min($value['final']['min'])));
+    // 計算最大催收次數與最小催收次數
+    $contractstage = array('sign', 'second', 'arrive', 'install', 'tryrun', 'check', 'delivery', 'final');
+
+    foreach ($contractstage as $i) {
+        if (!empty($value[$i]['min']) && count($value[$i]['min']) > 0) {
+            $latest_timestamp = max($value[$i]['min']);
+            $latest_date = new DateTime();
+            $latest_date->setTimestamp($latest_timestamp);
+            if ($latest_date < $today_date) {
+                $interval = $latest_date->diff($today_date);
+                $month = $interval->format('%m');
+                $value[$i]['min'] = $month;
+            } else {
+                $value[$i]['min'] = 0;
+            }
+        } else {
+            $value[$i]['min'] = 0;
+        };
+        if (!empty($value[$i]['max']) && count($value[$i]['max']) > 0) {
+            $latest_timestamp = min($value[$i]['max']);
+            $latest_date = new DateTime();
+            $latest_date->setTimestamp($latest_timestamp);
+            if ($latest_date < $today_date) {
+                $interval = $latest_date->diff($today_date);
+                $month = $interval->format('%m');
+                $value[$i]['max'] = $month;
+            } else {
+                $value[$i]['max'] = 0;
+            }
+        } else {
+            $value[$i]['max'] = 0;
+        };
+    }
+}
+
+// [合約號][作番號][款別]    ['con']  [金額]/[合約預計收款日期]
+// [合約號][作番號][款別]    ['inv']  [金額]/[發票開立日期]
+// [合約號][作番號][款別]    ['rec']  [金額]/[實際收款日期]
+foreach ($wipwhole_array as $wip) {
+    if (isset($arrayData[$wip['contractno']]) && isset($arrayData[$wip['contractno']][$wip['facilityno']]) && !empty($arrayData[$wip['contractno']]['total_facility_num'])) {
+        $stagearray = array('sign', 'second', 'arrive', 'install', 'tryrun', 'check', 'delivery', 'final');
+        foreach ($stagearray as $stage) {
+            $arrayData[$wip['contractno']][$wip['facilityno']][$stage]['con'] = $arrayData[$wip['contractno']][$stage][1] / $arrayData[$wip['contractno']]['total_facility_num'];
+        }
+    }
 }
 // [invoice][發票號碼][0 發票日期, 1 發票金額, 2 發票狀態, 3 收款日期, 4 收款金額, 5 手續費, 6 核銷單號] 
 foreach ($invoice_data as $invoice) {
@@ -409,6 +687,8 @@ foreach ($received_array as $received) {
 
 //產生excel的array
 $excel_aray = array();
+$boga_array = array();
+$exclude_boga_array = array();
 foreach ($arrayData as $key => $value) {
     $value['sign'][3] = (isset($value['sign'][3])) ? $value['sign'][3] : 0;
     $value['second'][3] = (isset($value['second'][3])) ? $value['second'][3] : 0;
@@ -418,6 +698,43 @@ foreach ($arrayData as $key => $value) {
     $value['check'][3] = (isset($value['check'][3])) ? $value['check'][3] : 0;
     $value['delivery'][3] = (isset($value['delivery'][3])) ? $value['delivery'][3] : 0;
     $value['final'][3] = (isset($value['final'][3])) ? $value['final'][3] : 0;
+    $contractstage = array('sign', 'second', 'arrive', 'install', 'tryrun', 'check', 'delivery', 'final');
+    foreach ($contractstage as $i) {
+        $value[$i]['max'] = (empty($value[$i]['max']) || !isset($value[$i]['max'])) ? 0 : $value[$i]['max'];
+        $value[$i]['min'] = (empty($value[$i]['min']) || !isset($value[$i]['min'])) ? 0 : $value[$i]['min'];
+    };
+
+
+    if ($value['sign'][0] == "寶佳出貨前30天") {
+        $boga_array[$key] = [
+            $key, $value[1], $value[2], $value[4], $value[5], $value[7], $value[8], $value[6],
+            $value['sign'][1], $value['sign'][3], $value['sign']['max'], $value['sign']['min'],
+            $value['second'][1], $value['second'][3], $value['second']['max'], $value['second']['min'],
+            $value['arrive'][1], $value['arrive'][3], $value['arrive']['max'], $value['arrive']['min'],
+            $value['install'][1], $value['install'][3], $value['install']['max'], $value['install']['min'],
+            $value['tryrun'][1], $value['tryrun'][3], $value['tryrun']['max'], $value['tryrun']['min'],
+            $value['check'][1], $value['check'][3], $value['check']['max'], $value['check']['min'],
+            $value['delivery'][1], $value['delivery'][3], $value['delivery']['max'], $value['delivery']['min'],
+            $value['final'][1], $value['final'][3], $value['final']['max'], $value['final']['min'],
+            $value['total_budget'], $value['receivable_budget'], $value['invoice_budget'], $value['received_budget'], str_replace('<br>', ';     ', $value['facilities'])
+        ];
+    }else{
+        $exclude_boga_array[$key] = [
+            $key, $value[1], $value[2], $value[4], $value[5], $value[7], $value[8], $value[6],
+            $value['sign'][1], $value['sign'][3], $value['sign']['max'], $value['sign']['min'],
+            $value['second'][1], $value['second'][3], $value['second']['max'], $value['second']['min'],
+            $value['arrive'][1], $value['arrive'][3], $value['arrive']['max'], $value['arrive']['min'],
+            $value['install'][1], $value['install'][3], $value['install']['max'], $value['install']['min'],
+            $value['tryrun'][1], $value['tryrun'][3], $value['tryrun']['max'], $value['tryrun']['min'],
+            $value['check'][1], $value['check'][3], $value['check']['max'], $value['check']['min'],
+            $value['delivery'][1], $value['delivery'][3], $value['delivery']['max'], $value['delivery']['min'],
+            $value['final'][1], $value['final'][3], $value['final']['max'], $value['final']['min'],
+            $value['total_budget'], $value['receivable_budget'], $value['invoice_budget'], $value['received_budget'], str_replace('<br>', ';     ', $value['facilities'])
+        ];
+    }
+
+
+
     $excel_aray[$key] = [
         $key, $value[1], $value[2], $value[4], $value[5], $value[7], $value[8], $value[6],
         $value['sign'][1], $value['sign'][3], $value['sign']['max'], $value['sign']['min'],
@@ -433,6 +750,8 @@ foreach ($arrayData as $key => $value) {
 }
 
 $data = json_encode($excel_aray);
+$boga_data = json_encode($boga_array);
+$exclude_boga_data = json_encode($exclude_boga_array);
 
 ?>
 <style>
@@ -472,7 +791,9 @@ $data = json_encode($excel_aray);
 
     }
 </style>
-<button type="button" onclick="downloadData()" class="btn btn-warning btn-lg pull-right"><span class="glyphicon glyphicon-download-alt"></span></button>
+<button type="button" onclick="downloadData()" class="btn btn-success btn-lg pull-right">全部<span class="glyphicon glyphicon-download-alt"></span></button>
+<button type="button" onclick="exclude_bogaData()" class="btn btn-info btn-lg pull-right">不含寶佳<span class="glyphicon glyphicon-download-alt"></span></button>
+<button type="button" onclick="bogaData()" class="btn btn-warning btn-lg pull-right">寶佳<span class="glyphicon glyphicon-download-alt"></span></button>
 <?php
 if (in_array(accountidToDepartId($user_id), array('220', '210')) || $user_id == 'M0060') {
 ?>
@@ -491,42 +812,42 @@ if (in_array(accountidToDepartId($user_id), array('220', '210')) || $user_id ==
                 <th style="width: 120px;">客戶名稱</th>
                 <th style="width: 120px;">簽約款</th>
                 <th style="width: 120px;">應收簽約金額</th>
-                <th style="width: 120px;">簽約最大催收次數</th>
                 <th style="width: 120px;">簽約最小催收次數</th>
+                <th style="width: 120px;">簽約最大催收次數</th>
                 <th style="width: 120px;">二次款</th>
                 <th style="width: 120px;">應收二次金額</th>
-                <th style="width: 120px;">二次最大催收次數</th>
                 <th style="width: 120px;">二次最小催收次數</th>
+                <th style="width: 120px;">二次最大催收次數</th>
                 <th style="width: 120px;">貨抵工地款</th>
                 <th style="width: 120px;">應收貨抵工地金額</th>
-                <th style="width: 120px;">貨抵工地最大催收次數</th>
                 <th style="width: 120px;">貨抵工地最小催收次數</th>
+                <th style="width: 120px;">貨抵工地最大催收次數</th>
                 <th style="width: 120px;">安裝款</th>
                 <th style="width: 120px;">應收安裝金額</th>
-                <th style="width: 120px;">安裝最大催收次數</th>
                 <th style="width: 120px;">安裝最小催收次數</th>
+                <th style="width: 120px;">安裝最大催收次數</th>
                 <th style="width: 120px;">試車款</th>
                 <th style="width: 120px;">應收試車金額</th>
-                <th style="width: 120px;">試車最大催收次數</th>
                 <th style="width: 120px;">試車最小催收次數</th>
+                <th style="width: 120px;">試車最大催收次數</th>
                 <th style="width: 120px;">官檢款</th>
                 <th style="width: 120px;">應收官檢金額</th>
-                <th style="width: 120px;">官檢最大催收次數</th>
                 <th style="width: 120px;">官檢最小催收次數</th>
+                <th style="width: 120px;">官檢最大催收次數</th>
                 <th style="width: 120px;">移交款</th>
                 <th style="width: 120px;">應收移交金額</th>
-                <th style="width: 120px;">移交最大催收次數</th>
                 <th style="width: 120px;">移交最小催收次數</th>
+                <th style="width: 120px;">移交最大催收次數</th>
                 <th style="width: 120px;">尾款</th>
                 <th style="width: 120px;">應收尾款金額</th>
-                <th style="width: 120px;">尾款最大催收次數</th>
                 <th style="width: 120px;">尾款最小催收次數</th>
+                <th style="width: 120px;">尾款最大催收次數</th>
                 <th style="width: 120px;">合約總金額</th>
                 <th style="width: 120px;" style="width: 120px;">目前應收</th>
                 <th style="width: 120px;" style="width: 120px;">已開發票金額</th>
                 <th style="width: 120px;">已收金額</th>
                 <!-- <th>作番狀態</th> -->
-                <!-- <th style="width: 100px;">收款狀態</th> -->
+                <th style="width: 350px;">收款狀態</th>
 
             </tr>
         </thead>
@@ -535,7 +856,7 @@ if (in_array(accountidToDepartId($user_id), array('220', '210')) || $user_id ==
             foreach ($arrayData as $key => $value) {
             ?>
                 <tr>
-                    <th><?= $key ?></th>
+                    <th><a onclick="showContract('<?= $key ?>')"><?= $key ?> </a></th>
                     <td><?= $value[1] ?></td>
                     <td><?= $value[2] ?></td>
                     <td><?= $value[4] ?></td>
@@ -576,8 +897,8 @@ if (in_array(accountidToDepartId($user_id), array('220', '210')) || $user_id ==
                     <td style="text-align: end;"><?= isset($value['receivable_budget']) ? number_format(round($value['receivable_budget'])) : '--' ?></td>
                     <td style="text-align: end;"><?= isset($value['invoice_budget']) ? number_format(round($value['invoice_budget'])) : '--' ?></td>
                     <td style="text-align: end;"><?= isset($value['received_budget']) ? number_format(round($value['received_budget'])) : '--' ?></td>
-                    <!-- <td style="text-align: start;"><?= $value['facilities'] ?></td>
-                    <td><button type="button" onclick="sendData('<?= $key ?>')" class="btn btn-primary btn-sm"><span class=" glyphicon glyphicon-search"></span></button>
+                    <td style="text-align: start;"><?= $value['facilities'] ?></td>
+                    <!-- <td><button type="button" onclick="sendData('<?= $key ?>')" class="btn btn-primary btn-sm"><span class=" glyphicon glyphicon-search"></span></button>
                     </td> -->
                 </tr>
             <?php
@@ -587,6 +908,11 @@ if (in_array(accountidToDepartId($user_id), array('220', '210')) || $user_id ==
     </table>
 </div>
 <script>
+    function showContract(BillNo) {
+        window.open('account-receivable-contract.php?BillNo=' + BillNo+'&<?= $token_link ?>', '發票範例', config = 'height=600, width=1200');
+        console.log(BillNo);
+    }
+
     function test() {
         var BillData = <?= $data ?>;
         var form = document.createElement("form");
@@ -631,6 +957,57 @@ if (in_array(accountidToDepartId($user_id), array('220', '210')) || $user_id ==
 
     }
 
+    function bogaData() {
+        var xhr = new XMLHttpRequest();
+        var url = window.location.origin + "/wms/account-receivable-excel.php?<?= $token_link ?>";
+        xhr.open('POST', url, true);
+        xhr.setRequestHeader('Content-Type', 'application/json');
+        xhr.onreadystatechange = function() {
+            if (xhr.readyState === 4 && xhr.status === 200) {
+                var file_path = xhr.responseText;
+                var link = document.createElement('a');
+                var name = "應收帳款" + "<?= date('Y-m-d-Hm') ?>" + ".xlsx";
+                link.setAttribute('href', window.location.origin + "/wms/account-receivable-test.xlsx");
+                link.setAttribute('download', name);
+                link.style.display = 'none';
+                document.body.appendChild(link);
+                link.click();
+                document.body.removeChild(link);
+            }
+        }
+        xhr.send(JSON.stringify({
+            Bill: <?= $boga_data ?>
+        }));
+
+    }
+
+    
+    function exclude_bogaData() {
+        var xhr = new XMLHttpRequest();
+        var url = window.location.origin + "/wms/account-receivable-excel.php?<?= $token_link ?>";
+        xhr.open('POST', url, true);
+        xhr.setRequestHeader('Content-Type', 'application/json');
+        xhr.onreadystatechange = function() {
+            if (xhr.readyState === 4 && xhr.status === 200) {
+                var file_path = xhr.responseText;
+                var link = document.createElement('a');
+                var name = "應收帳款" + "<?= date('Y-m-d-Hm') ?>" + ".xlsx";
+                link.setAttribute('href', window.location.origin + "/wms/account-receivable-test.xlsx");
+                link.setAttribute('download', name);
+                link.style.display = 'none';
+                document.body.appendChild(link);
+                link.click();
+                document.body.removeChild(link);
+            }
+        }
+        xhr.send(JSON.stringify({
+            Bill: <?= $exclude_boga_data ?>
+        }));
+
+    }
+
+
+
     function sendData(BillNo) {
         var BillData = <?= $data ?>;
         var Bill = BillData[BillNo];
diff --git a/wms/account-receivable-test.php b/wms/account-receivable-test.php
index 92f38f63..1831bdb6 100644
--- a/wms/account-receivable-test.php
+++ b/wms/account-receivable-test.php
@@ -1,9 +1,32 @@
 <?php
-$today = date('Ym01', strtotime('-1 month',strtotime(date('Ym01'))));
-$yesterday = date("Ym01", strtotime('-1 month',strtotime(date('2023-11-17'))));
-    echo "today: " . $today . "<br>";
-    echo "yesterday: " . $yesterday . "<br>";
-    echo $today-$yesterday;
+// $today = date('Ym01', strtotime('-1 month',strtotime(date('Ym01'))));
+// $yesterday = date("Ym01", strtotime('-1 month',strtotime(date('2023-11-17'))));
+//     echo "today: " . $today . "<br>";
+//     echo "yesterday: " . $yesterday . "<br>";
+//     echo $today-$yesterday;
+//     echo "<br>";
+//     $test = date('Ymd', $today-$yesterday);
+//     echo $test;
+
+include './header.php';
+$sql = "SELECT 
+salOrderStagePay.BillNo, 
+salOrderStagePay.PayStage 
+FROM salOrderStagePay
+LEFT JOIN salSalesOrder 
+ON salSalesOrder.BillNo = salOrderStagePay.BillNo WHERE salSalesOrder.ModeId = 'M' AND (salSalesOrder.CurrentState=2 OR salSalesOrder.CurrentState=4) ";
+$query = $conn->query($sql);
+$contracts = array();
+foreach ($query as $row) {
+    if (!array_key_exists($row['BillNo'], $contracts)) {
+        $contracts[$row['BillNo']] = [$row['BillNo'], $row['PayStage']];
+    }else{
+        array_push($contracts[$row['BillNo']], $row['PayStage']);
+    }
+}
+foreach($contracts as $contract){
+    foreach($contract as $con){
+        echo $con.";";
+    }
     echo "<br>";
-    $test = date('Ymd', $today-$yesterday);
-    echo $test;
+}
diff --git a/wms/account-receivable-test.xlsx b/wms/account-receivable-test.xlsx
index 406eb40b..5424fc0b 100644
Binary files a/wms/account-receivable-test.xlsx and b/wms/account-receivable-test.xlsx differ
diff --git a/wms/facility-price.xlsx b/wms/facility-price.xlsx
index bf2057d9..4a2fb783 100644
Binary files a/wms/facility-price.xlsx and b/wms/facility-price.xlsx differ