diff --git a/wms/account-receivable-index.php b/wms/account-receivable-index.php
index f2e91ec6..860a6c70 100644
--- a/wms/account-receivable-index.php
+++ b/wms/account-receivable-index.php
@@ -1,26 +1,47 @@
 <?php
 include "header.php";
-$sql = "SELECT 
-a.manager,
-a2.name,
-w.salesid,
-a.name,
-w.contractno,
-w.facilityno,
-w.real_arrival_date,
-w.tryrun_end_date,
-w.delivery_date
+require_once dirname(__DIR__) . '/common/composer/vendor/autoload.php';
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx as xls;
+//use PhpOffice\PhpSpreadsheet\Reader\Xls;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+$arrayData = [];
+$sql = "SELECT
+tmp2.*,
+d.name AS depart_name
+FROM(
+SELECT 
+ a.manager,
+ a.name,
+ a.department_id,
+ w.salesid,
+ w.contractno,
+ w.facilityno,
+ w.real_arrival_date,
+ w.install_end_date,
+ w.tryrun_end_date,
+ w.delivery_date
 from wipwholestatus AS w
 left join account AS a
 ON w.salesid = a.accountid
 left join account AS a2
 ON a2.accountid = a.manager
-where w.status = '1'  
-ORDER BY `w`.`delivery_date` DESC;";
+where w.status = '1'
+)AS tmp2
+left join (
+SELECT DISTINCT 
+ department_id,
+ name
+FROM department
 
-$wipwhole_array= mysqli_query($link, $sql);
+) AS d
+ON d.department_id = tmp2.department_id";
+
+$wipwhole_array = mysqli_query($link, $sql);
 // $T8_array = mysqli_fetch_all($T8_array, MYSQLI_ASSOC);
-foreach ($wipwhole_array as $wip){
+foreach ($wipwhole_array as $wip) {
     // print_r($wip);
     // echo "<br>";
 }
@@ -28,9 +49,73 @@ echo "<br>";
 // $sql_depid = "SELECT department_id, name from department";
 // $dept_query = mysqli_query($link, $sql_depid);
 // $deptype = mysqli_fetch_all($dept_query, MYSQLI_ASSOC);
-$sql_contract = "SELECT * FROM salOrderStagePay;";
+
+
+$sql_contract = "SELECT a.BillNo, a.PayStage, a.PlanPayAmt FROM salOrderStagePay AS a 
+LEFT JOIN salSalesOrder AS s on a.BillNo = s.BillNo WHERE s.ModeId = 'M'";
 $contract = $conn->query($sql_contract);
-foreach($contract as $cont){
-    print_r($cont);
+foreach ($contract as $cont) {
+    // print_r($cont);
+    // echo "<br>";
+    $BillNo =  $cont['BillNo'];
+    $PayStage = $cont['PayStage'];
+    $PayAmount = $cont['PlanPayAmt'];
+
+    if (isset($arrayData[$BillNo])) {
+        if ($PayStage == '簽約' || stristr($PayStage, '簽定') || stristr($PayStage, '簽訂') || stristr($PayStage, '訂金')) {
+            $arrayData[$BillNo][0] = $PayAmount;
+        } elseif (stristr($PayStage, '二次款') || stristr($PayStage, '出貨前') || stristr($PayStage, '簽約後') || stristr($PayStage, '簽訂後') || stristr($PayStage, '建照核發時')) {
+            $arrayData[$BillNo][1] = $PayAmount;
+        } elseif (stristr($PayStage, '貨抵工地')||stristr($PayStage, '貨底工地')) {
+            $arrayData[$BillNo][2] = $PayAmount;
+        } elseif (stristr($PayStage, '安裝')) {
+            $arrayData[$BillNo][3] = $PayAmount;
+        } elseif (stristr($PayStage, '試車')) {
+            $arrayData[$BillNo][4] = $PayAmount;
+        } elseif (stristr($PayStage, '交車') || stristr($PayStage, '完工') || stristr($PayStage, '驗收')) {
+            $arrayData[$BillNo][5] = $PayAmount;
+        } elseif (stristr($PayStage, '取得合格函') || stristr($PayStage, '取得許可函')) {
+            $arrayData[$BillNo][6] = $PayAmount;
+        } elseif (stristr($PayStage, '得合格函後6個月') || stristr($PayStage, '核可函取得後6個月')) {
+            $arrayData[$BillNo][7] = $PayAmount;
+        }else{
+            $arrayData[$BillNo][8] = $PayAmount;
+        }
+    } else {
+
+        $arrayData[$BillNo] = [0, 0, 0, 0, 0, 0, 0, 0];
+    }
+
+    // echo "<br>"."--------------------------------"."<br>";
+
+    // array_push($arrayData,$payment);
+    // print_r($payment);
+    // echo "<br>---------------------------<br>";
+}
+foreach ($arrayData as $key => $value) {
+    print_r($key);
     echo "<br>";
-}
\ No newline at end of file
+    print_r($value);
+    echo "<br>-----------------------------<br>";
+}
+echo "<br>###########################<br>";
+
+    //產生excel
+    // $spreadsheet = new Spreadsheet();
+    // $sheet = $spreadsheet->getActiveSheet();
+    // $colArr = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+    // 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+    // 'AA', 'AB', 'AC', 'AD', 'AE', 'AF', 'AG', 'AH', 'AI', 'AJ', 'AK',
+    // 'AL', 'AM', 'AN', 'AO', 'AP', 'AQ', 'AR', 'AS', 'AT', 'AU', 'AV',
+    // 'AW', 'AX', 'AY', 'AZ', 'BA', 'BB', 'BC', 'BD', 'BE', 'BF', 'BG',
+    // 'BH', 'BI', 'BJ', 'BK', 'BL', 'BM', 'BN', 'BO'];
+    // $colTitleArr = ['合約號','付款階段','付款金額'];
+    // $sheet->setTitle('預收款清單');
+    // for ($i = 0; $i <count($colArr); $i++){
+    //     $sheet->setCellValue($colArr[$i].'1', $colTitleArr[$i]);
+    // }
+    // $i=2;
+    // for ($j=0; $j <count($payment); $j++){
+    //     $sheet->setCellValue($colArr[$j].$i, $payment[$j][$i]);
+    //     $i++;
+    // }