diff --git a/wms/account-receivable-renovate-index.php b/wms/account-receivable-renovate-index.php
index 04425bda..51d819eb 100644
--- a/wms/account-receivable-renovate-index.php
+++ b/wms/account-receivable-renovate-index.php
@@ -152,13 +152,13 @@ foreach ($contract as $cont) {
     $EnterpriseName = $cont['EnterpriseName'];
     $TaxNo = $cont['TaxNo'];
     $ContactAddress = $cont['ContactAddress'];
-    // A：比照新梯、B：純分期、C：A+B都有、D：屬於B但是依合約判斷、E:其他
+    //['type'] A：比照新梯、B：純分期、C:其他
     //['sign'] 0 款項名稱   1 簽約金額   2 簽約日期 3 應收金額  min 最早應收月份   max 最晚應收月份   ['second'] 0 二次款名  1 二次款金額  2 收款日期   ['arrive'] 0 貨抵工地款名稱   1 貨抵工地款金額   2 貨抵工地收款日期   ['install'] 0 安裝款名   1 安裝金額   2 安裝收款日期     
     //['tryrun'] 0 試車款名   1試車金額   2 試車收款日期   ['check'] 0 官檢款名   1 官檢金額   2 官檢收款日期   ['delivery'] 0 交車款名  1 交車金額  2 交車收款日期  ['final'] 0 尾款名  1 尾款金額  2 尾款收款日期 
     //['facility'] [作番號][款別]0 款項名稱  1 合約金額  2 應收日期  3 應收金額  4 已收金額  5 催收金額  6 催收次數
     if (!(isset($arrayData[$BillNo]))) {
         // 0 部門id  1 部門名稱   2 經理名稱  3 營業員id  4 營業員名稱 5 客戶名稱 6 抬頭 7 統編 8 通訊地址 9 T8單據日期 10 合約號
-        $arrayData[$BillNo] = [0, 0, 0, 0, 0, 0, 0, 0, 0];
+        $arrayData[$BillNo] = [0, 0, 0, 0, 0, 0, 0, 0, 0,0,0];
         $arrayData[$BillNo][5] = $partnerName;
         $arrayData[$BillNo][6] = $EnterpriseName;
         $arrayData[$BillNo][7] = $TaxNo;
@@ -169,34 +169,52 @@ foreach ($contract as $cont) {
         $arrayData[$BillNo]['invoice'] = array();
         $arrayData[$BillNo]['received_budget'] = 0;
         $arrayData[$BillNo]['invoice_budget'] = 0;
-        $arrayData[$BillNo]['type'] = 0;
+        $arrayData[$BillNo]['PayStage'][$PayStage]['type'] = 0;
         $arrayData[$BillNo]['A40002'] = $arrayData[$BillNo]['A40009'] = $arrayData[$BillNo]['A40010'] = 0;
         $arrayData[$BillNo]['total_facility_num'] = 0;
     }
-    // 判斷是否全分期/全階段
-    if ($arrayData[$BillNo]['type'] == 0) {
-        if (mb_substr($cont['PayStage'], -1) == '期' && mb_substr($cont['PayStage'], 0, 1) == '第') {
-            $arrayData[$BillNo]['type'] = "B";
-        } elseif (strpos($cont['PayStage'], '1') == false) {
-            $arrayData[$BillNo]['type'] = "A";
-        } else {
-            $arrayData[$BillNo]['type'] = "E";
-        }
-    } elseif ($arrayData[$BillNo]['type'] == "B") {
-        if (mb_substr($cont['PayStage'], -1) == '期' && mb_substr($cont['PayStage'], 0, 1) == '第') {
-            $arrayData[$BillNo]['type'] = "B";
-        } else {
-            $arrayData[$BillNo]['type'] = "E";
-        }
-    } elseif ($arrayData[$BillNo]['type'] == "A") {
-        if (strpos($cont['PayStage'], '1') == false) {
-            $arrayData[$BillNo]['type'] = "A";
-        } else {
-            $arrayData[$BillNo]['type'] = "E";
+    // 判斷type
+    $wipStage = ['簽約', '訂金','貨抵工地','完工','試車','安裝','驗收','完工','交車'.'尾款','設備'];
+    foreach($wipStage as $wipstage){
+        if(strpos($PayStage,$wipstage)!==false){
+            $arrayData[$BillNo]['PayStage'][$PayStage]['type'] = "A";
+            echo "---------'";
+            break;
         }
     }
+    echo $arrayData[$BillNo]['PayStage'][$PayStage]['type'];
+    $haveNumber = (int) filter_var(str_replace('-','',$PayStage), FILTER_SANITIZE_NUMBER_INT);  
+    echo $haveNumber."___________________";
+    if($haveNumber >0 && $arrayData[$BillNo]['PayStage'][$PayStage]['type'] === 0){
+        $arrayData[$BillNo]['PayStage'][$PayStage]['type'] = "B";
+    }elseif($haveNumber > 0 && $arrayData[$BillNo]['PayStage'][$PayStage]['type'] == 'A'){
+        $arrayData[$BillNo]['PayStage'][$PayStage]['type'] = "C";
+    }
+    echo $PayStage."   /   ".$arrayData[$BillNo]['PayStage'][$PayStage]['type'];
+    echo "<br>";
+    // if ($arrayData[$BillNo]['type'] == 0) {
+    //     if (mb_substr($cont['PayStage'], -1) == '期' && mb_substr($cont['PayStage'], 0, 1) == '第') {
+    //         $arrayData[$BillNo]['type'] = "B";
+    //     } elseif (strpos($cont['PayStage'], '1') == false) {
+    //         $arrayData[$BillNo]['type'] = "A";
+    //     } else {
+    //         $arrayData[$BillNo]['type'] = "E";
+    //     }
+    // } elseif ($arrayData[$BillNo]['type'] == "B") {
+    //     if (mb_substr($cont['PayStage'], -1) == '期' && mb_substr($cont['PayStage'], 0, 1) == '第') {
+    //         $arrayData[$BillNo]['type'] = "B";
+    //     } else {
+    //         $arrayData[$BillNo]['type'] = "E";
+    //     }
+    // } elseif ($arrayData[$BillNo]['type'] == "A") {
+    //     if (strpos($cont['PayStage'], '1') == false) {
+    //         $arrayData[$BillNo]['type'] = "A";
+    //     } else {
+    //         $arrayData[$BillNo]['type'] = "E";
+    //     }
+    // }
 }
-
+exit();
 $received_array = $conn->query($sql_received);
 $opening_data = mysqli_query($link, $sql_opening);
 $invoice_data = $conn->query($sql_invoice);