diff --git a/wms/contract/contract-download.php b/wms/contract/contract-download.php
index 2bab2ce4..24fa89c0 100644
--- a/wms/contract/contract-download.php
+++ b/wms/contract/contract-download.php
@@ -11,8 +11,17 @@ if(isset($_GET['id']) && $_GET['id']!=""){
         JOIN pricereview_item ON pricereview_main.id = pricereview_item.mid 
         JOIN account ON pricereview_main.person = account.accountid
         WHERE pricereview_main.id = :id AND pricereview_item.item_group = 'A' ORDER BY pay_kind ASC";
+        // $stmt = $conn->prepare($sql_str);
+        // $stmt->bindParam(':id',$id);
+        // $stmt->execute();
+        // $contracts = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        $sql_str = "SELECT contract_new_apply.*, 
+         contract_new_apply_pays.pay_kind, contract_new_apply_pays.pay_scale, contract_new_apply_pays.pay_amount, contract_new_apply_pays.pay_period, contract_new_apply_pays.condition_date 
+         FROM contract_new_apply 
+         JOIN contract_new_apply_pays ON contract_new_apply.id = contract_new_apply_pays.contract_apply_id 
+         WHERE contract_new_apply.mid = :id";
         $stmt = $conn->prepare($sql_str);
-        $stmt->bindParam(':id',$id);
+        $stmt->bindParam(':id', $id);
         $stmt->execute();
         $contracts = $stmt->fetchAll(PDO::FETCH_ASSOC);
         $contract = $contracts[0];
@@ -37,13 +46,16 @@ if(isset($_GET['id']) && $_GET['id']!=""){
         }
 
 
-        $buyArr = [];
+  
         $buyNo2Pay = false;
         $buy_total_price = 0;
         $installArr = [];
         $install_total_price = 0;
-        $noteArr = explode(",", $contracts[0]['note']);
+        // $noteArr = explode(",", $contracts[0]['note']);
+        $noteArr = array(1,1,1,1,1);
         $qty = $contracts[0]['item_qty'];
+        // print_r($contracts);
+        print_r($contracts);exit;
         foreach($contracts as $idx=>$amount){
             $isset = false;
             if($amount['pay_kind']==1 || $amount['pay_kind']==2 || $amount['pay_kind']==3){
@@ -63,16 +75,21 @@ if(isset($_GET['id']) && $_GET['id']!=""){
                 }
             }
             if($amount['pay_kind']==5 || $amount['pay_kind']==6){
+                echo "111111";
                 if($amount['pay_scale'] > 0){
                     $install_total_price = $install_total_price + $amount['pay_amount'];
                     $installArr[] = ['installment'=> $amount['pay_kind'], 'scale'=> $amount['pay_scale'], 'amount'=> $amount['pay_amount'], 'note'=>$amount['note']];
                 }
             }
         }
+        
+        // print_r($buyArr);
+       
     }
     }catch (PDOException $e ){
         die("ERROR!!!: ". $e->getMessage());
     }
+    echo $buy_total_price;
 }
 ?>
 <link rel="stylesheet" href="./styles/style.css">
@@ -357,10 +374,10 @@ if(isset($_GET['id']) && $_GET['id']!=""){
 </main>
 <script src="../ckeditor4/ckeditor.js"></script>
 <script>
-    const partyAcompany = <?php echo json_encode($contract['company']); ?>;
+    const partyAcompany = <?php echo json_encode($contract['customer']); ?>;
     const partyAcontractno = <?php echo json_encode($contract['contractno']); ?>;
-    const partyAaddress = <?php echo json_encode($contract['address']); ?>;
-    const totalPrice = <?php echo $contract['price_total']; ?>;
+    const partyAaddress = <?php echo json_encode($contract['contact_address']); ?>;
+    const totalPrice = <?php echo $contract['total_price']; ?>;
     const totalInstallPrice = <?php echo $install_total_price; ?>;
     const totalBuyPrice = <?php echo $buy_total_price; ?>;
     let buyInputArr = ["<input id='buyfill1' />"];
@@ -370,11 +387,13 @@ if(isset($_GET['id']) && $_GET['id']!=""){
     let buy_pay_text =  ''
     const chineseArr = ['零','一','二','三','四','五','六','七']
     const bigChineseArr = ['零','壹','貳','參','肆','伍','陸','柒','捌','玖','拾'];
-    const num = <?php echo $qty; ?>;
+    // const num = <?php echo $qty; ?>;
+    const num = 7;
     const people = <?php echo $noteArr[1]; ?>;
     const floor = <?php echo $noteArr[2]; ?>;
     const speed = <?php echo $noteArr[3]; ?>;
     console.log(buyArr);
+    console.log(installArr);
     buyArr.forEach((item, idx) => {
         if(item.scale > 0){
             if(item.installment == 1){
diff --git a/wms/contract/insertData.php b/wms/contract/insertData.php
index 5f1ffc00..62eea961 100644
--- a/wms/contract/insertData.php
+++ b/wms/contract/insertData.php
@@ -47,8 +47,12 @@ foreach ($sheet->getRowIterator() as $key=>$row) {
         }elseif($idx == 'E'){
             if($cell->getValue() == "標配"){
                 $optional = 1;
-            }else{
+            }elseif($cell->getValue() == "選配"){
                 $optional = 2;
+            }elseif($cell->getValue() == "加價"){
+                $optional = 3;
+            }else{
+                $optional = 0;
             }
             echo $optional;
         }elseif($idx == 'F'){
@@ -114,6 +118,9 @@ foreach ($sheet->getRowIterator() as $key=>$row) {
     }elseif($id == 16){
         $kind ='F';
         $subkind = 'F1';
+    }elseif($id == 20){
+        $kind = 'F';
+        $subkind = 'F1';
     }
 
     if(isset($_GET['id'])){
@@ -137,7 +144,7 @@ foreach ($sheet->getRowIterator() as $key=>$row) {
 
             $option_price_id = $last_id;
             $option_price = $cost;
-            $quotation_no = 'Q2311001';
+            $quotation_no = 'Q2312001';
             foreach($open_kind_arr as $kind){
                 $min_weight = 1;
                 $max_weight = 1600;
diff --git a/wms/contract/option/2024_公告用分類option231207.xlsx b/wms/contract/option/2024_公告用分類option231207.xlsx
new file mode 100644
index 00000000..398145b2
Binary files /dev/null and b/wms/contract/option/2024_公告用分類option231207.xlsx differ
diff --git a/wms/contract/option/option1.xlsx b/wms/contract/option/option1.xlsx
new file mode 100644
index 00000000..f8dd2f16
Binary files /dev/null and b/wms/contract/option/option1.xlsx differ
diff --git a/wms/contract/option/option10.xlsx b/wms/contract/option/option10.xlsx
new file mode 100644
index 00000000..ddb87e4b
Binary files /dev/null and b/wms/contract/option/option10.xlsx differ
diff --git a/wms/contract/option/option11.xlsx b/wms/contract/option/option11.xlsx
new file mode 100644
index 00000000..4dfc1ad8
Binary files /dev/null and b/wms/contract/option/option11.xlsx differ
diff --git a/wms/contract/option/option12.xlsx b/wms/contract/option/option12.xlsx
new file mode 100644
index 00000000..46af294e
Binary files /dev/null and b/wms/contract/option/option12.xlsx differ
diff --git a/wms/contract/option/option13.xlsx b/wms/contract/option/option13.xlsx
new file mode 100644
index 00000000..9e22b263
Binary files /dev/null and b/wms/contract/option/option13.xlsx differ
diff --git a/wms/contract/option/option14.xlsx b/wms/contract/option/option14.xlsx
new file mode 100644
index 00000000..ab2cd1c7
Binary files /dev/null and b/wms/contract/option/option14.xlsx differ
diff --git a/wms/contract/option/option2.xlsx b/wms/contract/option/option2.xlsx
new file mode 100644
index 00000000..2b577118
Binary files /dev/null and b/wms/contract/option/option2.xlsx differ
diff --git a/wms/contract/option/option20.xlsx b/wms/contract/option/option20.xlsx
new file mode 100644
index 00000000..e2422b5d
Binary files /dev/null and b/wms/contract/option/option20.xlsx differ
diff --git a/wms/contract/option/option3.xlsx b/wms/contract/option/option3.xlsx
new file mode 100644
index 00000000..f14a0668
Binary files /dev/null and b/wms/contract/option/option3.xlsx differ
diff --git a/wms/contract/option/option4.xlsx b/wms/contract/option/option4.xlsx
new file mode 100644
index 00000000..0184777f
Binary files /dev/null and b/wms/contract/option/option4.xlsx differ
diff --git a/wms/contract/option/option5.xlsx b/wms/contract/option/option5.xlsx
new file mode 100644
index 00000000..8cfd587a
Binary files /dev/null and b/wms/contract/option/option5.xlsx differ
diff --git a/wms/contract/option/option6.xlsx b/wms/contract/option/option6.xlsx
new file mode 100644
index 00000000..cfba9a45
Binary files /dev/null and b/wms/contract/option/option6.xlsx differ
diff --git a/wms/contract/option/option7.xlsx b/wms/contract/option/option7.xlsx
new file mode 100644
index 00000000..721036f1
Binary files /dev/null and b/wms/contract/option/option7.xlsx differ
diff --git a/wms/contract/option/option8.xlsx b/wms/contract/option/option8.xlsx
new file mode 100644
index 00000000..6253f447
Binary files /dev/null and b/wms/contract/option/option8.xlsx differ
diff --git a/wms/contract/option/option9.xlsx b/wms/contract/option/option9.xlsx
new file mode 100644
index 00000000..1dd520cf
Binary files /dev/null and b/wms/contract/option/option9.xlsx differ