From 1d3989ba9c9f6f1576d2c07c196127944df768c9 Mon Sep 17 00:00:00 2001
From: Cheng <lkmd555@masada.com.tw>
Date: Mon, 26 Feb 2024 18:02:29 +0800
Subject: [PATCH 01/16] =?UTF-8?q?=E6=96=B0=E6=A2=AF=E5=A5=91=E7=B4=84?=
 =?UTF-8?q?=E7=8D=8E=E9=87=91=E5=92=8C=E7=B0=BD=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/bonus/bonus.php                           |  18 ++-
 .../other/maintenance_contract_bonus_v2_1.php |  52 ++++---
 ...erm_contract_m1_free_charge_bonus_v2_1.php | 127 +++++++++---------
 wms/contract/api/getContractData.php          |  59 ++++++--
 wms/contract/api/postContractData.php         |  25 ++--
 wms/contract/api/postNewContractData.php      |  63 ++++++---
 wms/contract/contract-input.php               |  20 +--
 wms/contract/js/alpine.js                     |   3 +-
 8 files changed, 222 insertions(+), 145 deletions(-)

diff --git a/wms/bonus/bonus.php b/wms/bonus/bonus.php
index 4e0b84fd..63bec621 100644
--- a/wms/bonus/bonus.php
+++ b/wms/bonus/bonus.php
@@ -32,15 +32,17 @@ if (!empty($_GET['check'])) {
     if ($_GET['check'] == 4) {
         $oneMonthAgo = date("Y-m-d", strtotime("$now +1 months"));
         // $clause .= "AND pay_day_due >= '$now' AND pay_day_due <= '$oneMonthAgo' AND status IN (1,2,5)";
-        $clause .= "AND status IN (1,2,5)";
+        $clause .= "AND a.status IN (1,2,5)";
     } else if ($_GET['check'] == 2) {
-        $clause .= "AND status = 1";
+        $clause .= "AND a.status = 1";
     } else if ($_GET['check'] == 3) {
-        $clause .= "AND status IN (2,5)";
+        $clause .= "AND a.status IN (2,5)";
     }
 }
 
-$sql = "SELECT * FROM bonus WHERE 1=1 $clause";
+$sql = "SELECT a.*,b.customer FROM bonus AS a 
+LEFT JOIN con_maintance_examine_apply AS b ON a.contract_no = b.vol_no
+WHERE 1=1 $clause";
 $stmt = $conn->prepare($sql);
 $stmt->execute();
 $datas = $stmt->fetchAll(PDO::FETCH_ASSOC);
@@ -130,17 +132,21 @@ function isPay($contract_no, $connT8)
             <a href="/wms/bonus/bonus.php?check=2&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 2) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 未發獎金</a>
             <a href="/wms/bonus/bonus.php?check=3&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 3) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 已發獎金</a>
             <a href="/wms/bonus/bonus.php?check=4&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 4) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 人事發放作業</a>
+            <a href="/wms/bonus/bonus.php?check=5&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 5) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 獎金總計(人)</a>
 
 
             <table id="table_index" class="table table-striped table-bordered" style="width:100%">
                 <?php if (!empty($_GET['check']) && $_GET['check'] == '4') { ?>
                     <button class="btn btn-primary float-end" style="float: right;" onclick="All('<?= $id_str ?>')">鎖定並發放</button>
+                <?php } else { ?>
+                    <input type="text" name="account_name">
+                    <button class="btn btn-primary float-end" style="float: right;">總計搜尋</button>
                 <?php } ?>
                 <thead>
                     <tr>
                         <th>項次</th>
-                        <th>合約類別</th>
                         <th>合約號</th>
+                        <th>合約名稱</th>
                         <th>作番號</th>
                         <th>獎金類別</th>
                         <th>獎金版本</th>
@@ -178,8 +184,8 @@ function isPay($contract_no, $connT8)
                     ?>
                             <tr>
                                 <td><?= $data['id'] ?></td>
-                                <td><?= $contract_type[$data['contract_type']] ?></td>
                                 <td><?= $data['contract_no'] ?></td>
+                                <td><?= $data['customer'] ?></td>
                                 <td><?= $data['facility_no'] ?></td>
                                 <td><?= $bonus_type[$data['bonus_type']] ?></td>
                                 <td><?= $data['bonus_verson'] ?></td>
diff --git a/wms/bonus/other/maintenance_contract_bonus_v2_1.php b/wms/bonus/other/maintenance_contract_bonus_v2_1.php
index 610da6d7..598202d4 100644
--- a/wms/bonus/other/maintenance_contract_bonus_v2_1.php
+++ b/wms/bonus/other/maintenance_contract_bonus_v2_1.php
@@ -55,48 +55,48 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 					case ($discount >= 0.8):
 						switch ($fee_per_st) {
 							case ($fee_per_st <= 3000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.6;
+								$sales_bonus = ($fee_per_st) * 0.6;
 								break;
 							case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.7;
+								$sales_bonus = ($fee_per_st) * 0.7;
 								break;
 							case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.8;
+								$sales_bonus = ($fee_per_st) * 0.8;
 								break;
 							case ($fee_per_st >= 4000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.9;
+								$sales_bonus = ($fee_per_st) * 0.9;
 								break;
 						};
 						break;
 					case ($discount >= 0.6 and $discount < 0.8):
 						switch ($fee_per_st) {
 							case ($fee_per_st <= 3000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.48;
+								$sales_bonus = ($fee_per_st) * 0.48;
 								break;
 							case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.56;
+								$sales_bonus = ($fee_per_st) * 0.56;
 								break;
 							case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.64;
+								$sales_bonus = ($fee_per_st) * 0.64;
 								break;
 							case ($fee_per_st >= 4000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.72;
+								$sales_bonus = ($fee_per_st) * 0.72;
 								break;
 						};
 						break;
 					case ($discount < 0.6):
 						switch ($fee_per_st) {
 							case ($fee_per_st <= 3000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.42;
+								$sales_bonus = ($fee_per_st) * 0.42;
 								break;
 							case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.49;
+								$sales_bonus = ($fee_per_st) * 0.49;
 								break;
 							case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.56;
+								$sales_bonus = ($fee_per_st) * 0.56;
 								break;
 							case ($fee_per_st >= 4000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.63;
+								$sales_bonus = ($fee_per_st) * 0.63;
 								break;
 						};
 						break;
@@ -111,16 +111,16 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 			case "free_to_charge":
 				switch ($fee_per_st) {
 					case ($fee_per_st <= 3000):
-						$sales_bonus = ($fee_per_st - $commission_fee) * 0.3;
+						$sales_bonus = ($fee_per_st) * 0.3;
 						break;
 					case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
-						$sales_bonus = ($fee_per_st - $commission_fee) * 0.35;
+						$sales_bonus = ($fee_per_st) * 0.35;
 						break;
 					case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
-						$sales_bonus = ($fee_per_st - $commission_fee) * 0.4;
+						$sales_bonus = ($fee_per_st) * 0.4;
 						break;
 					case ($fee_per_st >= 4000):
-						$sales_bonus = ($fee_per_st - $commission_fee) * 0.45;
+						$sales_bonus = ($fee_per_st) * 0.45;
 						break;
 				};
 				#地區處長獎金($region_director_bonus)
@@ -132,16 +132,16 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 			case "renew_priceissue":
 				switch ($fee_per_st) {
 					case ($fee_per_st <= 3000):
-						$sales_bonus = ($fee_per_st - $commission_fee) * 0.25;
+						$sales_bonus = ($fee_per_st) * 0.25;
 						break;
 					case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
-						$sales_bonus = ($fee_per_st - $commission_fee) * 0.3;
+						$sales_bonus = ($fee_per_st) * 0.3;
 						break;
 					case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
-						$sales_bonus = ($fee_per_st - $commission_fee) * 0.35;
+						$sales_bonus = ($fee_per_st) * 0.35;
 						break;
 					case ($fee_per_st >= 4000):
-						$sales_bonus = ($fee_per_st - $commission_fee) * 0.4;
+						$sales_bonus = ($fee_per_st) * 0.4;
 						break;
 				};
 				#地區處長獎金($region_director_bonus)
@@ -226,7 +226,10 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 
 				#2月1次
 			case "bimonthly":
-				$payment_ratio_due_array = array(0.166, 0.166, 0.166, 0.166, 0.166, 0.166);
+				$payment_ratio_due_array = array();
+				for ($i = 0; $i < 6; $i++) {
+					array_push($payment_ratio_due_array, 1 / 6);
+				}
 				$payday_due_array = array(1, 3, 5, 7, 9, 11);
 				for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
 					if ($i < count($payment_ratio_due_array) - 1) {
@@ -246,7 +249,12 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 
 				#月付	
 			case "monthly":
-				$payment_ratio_due_array = array(0.083, 0.083, 0.083, 0.083, 0.083, 0.083, 0.083, 0.083, 0.083, 0.083, 0.083, 0.083);
+				$payment_ratio_due_array = array();
+				// $payment_ratio_due_array = array();
+				for ($i = 0; $i < 12; $i++) {
+					array_push($payment_ratio_due_array, 1 / 12);
+				}
+
 				$payday_due_array = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
 				for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
 					if ($i < count($payment_ratio_due_array) - 1) {
diff --git a/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1.php b/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1.php
index 7122fbd3..d29650b2 100644
--- a/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1.php
+++ b/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1.php
@@ -41,12 +41,13 @@ result_array[
 
 
 
-function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract_type, $payment_period_amount, $elevator_list_price, $fee_per_st, $commission_fee, $receivable_date_due, $sales_id, $region_director_id, $regular_contract_manger_id){
+function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract_type, $payment_period_amount, $elevator_list_price, $fee_per_st, $commission_fee, $receivable_date_due, $sales_id, $region_director_id, $regular_contract_manger_id)
+{
 	$bonus_array = [];
-	if ($ver == "2.1"){
+	if ($ver == "2.1") {
 		$discount = round(($fee_per_st - $commission_fee) / $elevator_list_price, 2);
 		#契約總類($contract_type)：簽長約並免費送M1 (longcontract_m1_free_charge)
-		switch ($contract_type){	
+		switch ($contract_type) {
 			case "longcontract_m1_free_charge":
 				#契約員獎金($sales_bonus)
 				#合約折扣率($discount)：大於80%以上(含)(above_80)、60-79%(含)以上(60_to_79)、折扣率59% (含)以下(below_59)
@@ -54,57 +55,57 @@ function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract
 					case ($discount >= 0.8):
 						switch ($fee_per_st) {
 							case ($fee_per_st <= 3000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.6;
+								$sales_bonus = ($fee_per_st) * 0.6;
 								break;
 							case ($fee_per_st > 300 and $fee_per_st <= 4000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.7;		
-								break;						
+								$sales_bonus = ($fee_per_st) * 0.7;
+								break;
 							case ($fee_per_st > 4000 and $fee_per_st <= 5000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.8;
+								$sales_bonus = ($fee_per_st) * 0.8;
 								break;
 							case ($fee_per_st > 5000 and $fee_per_st <= 6000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.9;
-								break;								
+								$sales_bonus = ($fee_per_st) * 0.9;
+								break;
 							case ($fee_per_st > 6000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 1.0;
+								$sales_bonus = ($fee_per_st) * 1.0;
 								break;
 						};
 						break;
 					case ($discount >= 0.6 and $discount < 0.8):
 						switch ($fee_per_st) {
 							case ($fee_per_st <= 3000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.42;
+								$sales_bonus = ($fee_per_st) * 0.42;
 								break;
 							case ($fee_per_st > 300 and $fee_per_st <= 4000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.49;		
-								break;						
+								$sales_bonus = ($fee_per_st) * 0.49;
+								break;
 							case ($fee_per_st > 4000 and $fee_per_st <= 5000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.56;
+								$sales_bonus = ($fee_per_st) * 0.56;
 								break;
 							case ($fee_per_st > 5000 and $fee_per_st <= 6000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.63;
-								break;								
+								$sales_bonus = ($fee_per_st) * 0.63;
+								break;
 							case ($fee_per_st > 6000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.7;
+								$sales_bonus = ($fee_per_st) * 0.7;
 								break;
 						};
 						break;
 					case ($discount < 0.6):
 						switch ($fee_per_st) {
 							case ($fee_per_st <= 3000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.3;
+								$sales_bonus = ($fee_per_st) * 0.3;
 								break;
 							case ($fee_per_st > 300 and $fee_per_st <= 4000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.35;		
-								break;						
+								$sales_bonus = ($fee_per_st) * 0.35;
+								break;
 							case ($fee_per_st > 4000 and $fee_per_st <= 5000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.4;
+								$sales_bonus = ($fee_per_st) * 0.4;
 								break;
 							case ($fee_per_st > 5000 and $fee_per_st <= 6000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.45;
-								break;								
+								$sales_bonus = ($fee_per_st) * 0.45;
+								break;
 							case ($fee_per_st > 6000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.5;
+								$sales_bonus = ($fee_per_st) * 0.5;
 								break;
 						};
 						break;
@@ -116,81 +117,77 @@ function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract
 				$regular_contract_manger_bonus = 300;
 				break;
 		};
-		
+
 		#地區處長獎金、專任契約經理、契約員獎金
-		switch ($payment_period_amount){			
-			#簽長約免費贈送控制系統,因屬於公司特殊政策,所以無汰改獎金,合約期內每月領取契約獎金	
-			#總支付期數$payment_period_amount： 總支付期數，依規定5年約至少60期，
+		switch ($payment_period_amount) {
+				#簽長約免費贈送控制系統,因屬於公司特殊政策,所以無汰改獎金,合約期內每月領取契約獎金	
+				#總支付期數$payment_period_amount： 總支付期數，依規定5年約至少60期，
 			case $payment_period_amount >= 60:
 				#地區處長獎金
-				array_push($bonus_array,[
+				array_push($bonus_array, [
 					"bonus_type" => "地區處長獎金", #獎金名稱
 					"bonus_receiver" => $region_director_id, #發放人員
 					"bonus_amount" => round($region_director_bonus), #金額
-					"pay_day_due" => date("Y-m-d",strtotime("$receivable_date_due +1 months")), #預計發放時間
+					"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +1 months")), #預計發放時間
 					"bonus_regulation" => "訂金收回後次月發放" #發放規定				
-				]);				
+				]);
 
 				#專任契約經理獎金
-				array_push($bonus_array,[
+				array_push($bonus_array, [
 					"bonus_type" => "專任契約經理獎金", #獎金名稱
 					"bonus_receiver" => $regular_contract_manger_id, #發放人員
 					"bonus_amount" => round($regular_contract_manger_bonus), #金額
-					"pay_day_due" => date("Y-m-d",strtotime("$receivable_date_due +1 months")), #預計發放時間
+					"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +1 months")), #預計發放時間
 					"bonus_regulation" => "訂金收回後次月發放" #發放規定				
-				]);	
-			
+				]);
+
 				#產生契約員每個月的獎金應發比例
 				$payment_ratio_due_array = array();
 				for ($i = 0; $i < $payment_period_amount; $i++) {
-					array_push($payment_ratio_due_array, 1/$payment_period_amount);
-				}				
-				
+					array_push($payment_ratio_due_array, 1 / $payment_period_amount);
+				}
+
 				$payday_due_array = array();
 				for ($i = 0; $i < $payment_period_amount; $i++) {
-					array_push($payday_due_array, $i+1 );
-				}					
-				
-				for($i = 0; $i < count($payment_ratio_due_array); $i++) {
-					if($i < count($payment_ratio_due_array) - 1){
+					array_push($payday_due_array, $i + 1);
+				}
+
+				for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
+					if ($i < count($payment_ratio_due_array) - 1) {
 						$current_bonus = round($sales_bonus * $payment_ratio_due_array[$i]); #金額
-					}else{
+					} else {
 						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
-					};				
-					array_push($bonus_array,[
+					};
+					array_push($bonus_array, [
 						"bonus_type" => "契約員獎金", #獎金名稱
 						"bonus_receiver" => $sales_id, #發放人員
 						"bonus_amount" => round($current_bonus), #金額
-						"pay_day_due" => date("Y-m-d",strtotime("$receivable_date_due +$payday_due_array[$i] months")), #預計發放時間
+						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] months")), #預計發放時間
 						"bonus_regulation" => "每月收款後,按收款比率次月發放" #發放規定				
-					]);	
-				}					
+					]);
+				}
 				break;
 		}
-		
+
 		$result_array = [
-			"ver"=>$ver, #獎金版本
-			"result_status"=>"success", #計算結果	
-			"bonus_array"=>$bonus_array #獎金水庫
+			"ver" => $ver, #獎金版本
+			"result_status" => "success", #計算結果	
+			"bonus_array" => $bonus_array #獎金水庫
 		];
-
-	}else{
-		array_push($bonus_array,[
+	} else {
+		array_push($bonus_array, [
 			"bonus_type" => "error", #獎金名稱
 			"bonus_receiver" => "error", #發放人員
 			"bonus_amount" => 0, #金額
 			"pay_day_due" => "9999-1-1", #預計發放時間
 			"bonus_regulation" => "error" #發放規定				
-		]);	
+		]);
 		$result_array = [
-			"ver"=>$ver, #獎金版本
-			"result_status"=>"error", #計算結果	
-			"bonus_array"=>$bonus_array #獎金水庫
-		];	
+			"ver" => $ver, #獎金版本
+			"result_status" => "error", #計算結果	
+			"bonus_array" => $bonus_array #獎金水庫
+		];
 	}
-	
+
 	return $result_array;
 };
-
-
-?>
diff --git a/wms/contract/api/getContractData.php b/wms/contract/api/getContractData.php
index 253e8d54..5534b8eb 100644
--- a/wms/contract/api/getContractData.php
+++ b/wms/contract/api/getContractData.php
@@ -1,5 +1,6 @@
 <?php
 require_once('../conn.php');
+// 保養
 if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['contracttype']) && $_GET['contracttype'] == 'b') {
     try {
         $contractno = $_GET['contractno'];
@@ -43,6 +44,7 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
     }
 }
 
+// 新梯
 if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['contracttype']) && $_GET['contracttype'] == 'm') {
     try {
         $contractno = $_GET['contractno'];
@@ -69,11 +71,51 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
         $stmt = $conn->prepare($sql);
         $stmt->bindParam(':mid', $mid);
         $stmt->execute();
-        $results = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        $elevators_results = $stmt->fetchAll(PDO::FETCH_ASSOC);
         $elevators_detail_arr = [];
-        foreach ($results as $keys => $result) {
+
+        $sql = "SELECT * FROM pricereview_item WHERE mid =:mid AND item_group ='B' ";
+        $stmt = $conn->prepare($sql);
+        $stmt->bindParam(':mid', $mid);
+        $stmt->execute();
+        $option_results = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        $option_arr = [];
+
+        foreach ($elevators_results as $keys => $result) {
+            $item_no = $result['item_no']; //電梯項次
+            // 電梯 OPTION 
+            $sql = "SELECT * FROM pricereview_item WHERE mid =:mid AND item_group ='B' AND option_relate_spec = :item_no";
+            $stmt = $conn->prepare($sql);
+            $stmt->bindParam(':mid', $mid);
+            $stmt->bindParam(':item_no', $item_no);
+            $stmt->execute();
+            $option_results = $stmt->fetchAll(PDO::FETCH_ASSOC);
+            $option_arr[] = $option_results;
+            if (!empty($option_results)) {
+                $result['option_price'] = 0;
+                // 電梯 OPTION 價格分別加到各台電梯
+                foreach ($option_arr[$keys] as $key => $option) {
+                    if ($option['item_qty'] == $result['item_qty']) {
+                        $result['option_price'] += intval($option['item_unit_price']);
+                        echo '1..';
+                    } else if ($option['item_qty'] > $result['item_qty'] != 1) {
+                        $item_qty = intval($option['item_qty']) / intval($result['item_qty']); // 總option數量 / 總電梯台數
+                        $result['option_price'] += intval($option['item_unit_price']) * $item_qty;
+                        echo '2..';
+                    } else {
+                        $result['option_price'] += $option['item_unit_price'] * intval($option['item_qty']);
+                        echo '3..';
+                    }
+                    echo '<pre>';
+                    print_r($option['item_no'] . '--->' . $option['item_unit_price']);
+                    echo '</pre>';
+                }
+
+                print_r($result['option_price']);
+                exit();
+            }
             $note = explode(',', $result['note']);
-            $result['spec'] = $note[0]; //型號
+            $result['spec'] = $note[0];   //型號
             $result['person'] = $note[1]; // 人承
             $result['floor'] = $note[2]; // 樓層
             $result['speed'] = $note[3]; // 速度
@@ -82,21 +124,20 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
                 array_push($elevators_detail_arr, $result);
             }
         }
+        // print_r(COUNT($option_results));
+
         $count = COUNT($elevators_detail_arr);
 
-        $contract['elevators'] = $results;
+        $contract['elevators'] = $elevators_results;
         $contract['elevators_detail_arr'] = $elevators_detail_arr;
         $contract['nums'] = $count;
-        // echo '<pre>';
-        // print_r($contract);
-        // echo '</pre>';
-        // exit;
+
         $contractResponse = json_encode($contract);
         // 設定回應標頭為 JSON
         header('Content-Type: application/json');
 
         // 將 JSON 回應返回給客戶端
-        echo $contractResponse;
+        // echo $contractResponse;
     } catch (PDOException $e) {
         die("ERROR!!!: " . $e->getMessage());
     }
diff --git a/wms/contract/api/postContractData.php b/wms/contract/api/postContractData.php
index 29038b9f..d3ecf356 100644
--- a/wms/contract/api/postContractData.php
+++ b/wms/contract/api/postContractData.php
@@ -88,10 +88,10 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         if ($address == '')  $fail_arr[] = '地址為必填';
         if ($area == '')  $fail_arr[] = '區域為必填';
         if ($customer == '')  $fail_arr[] = '客戶為必填';
-        if ($partyA == '')  $fail_arr[] = '業務聯繫人為必填';
-        if ($partyAaddress == '')  $fail_arr[] = '業務聯繫人地址為必填';
-        if ($partyAphone == '')  $fail_arr[] = '業務聯繫人電話為必填';
-        if ($partyAemail == '')  $fail_arr[] = '業務聯繫人Email為必填';
+        // if ($partyA == '')  $fail_arr[] = '業務聯繫人為必填';
+        // if ($partyAaddress == '')  $fail_arr[] = '業務聯繫人地址為必填';
+        // if ($partyAphone == '')  $fail_arr[] = '業務聯繫人電話為必填';
+        // if ($partyAemail == '')  $fail_arr[] = '業務聯繫人Email為必填';
         if ($num == '')  $fail_arr[] = '電梯數量為必填';
         if ($payType == '') $fail_arr[] = '付款方式為必填';
         if (count($fail_arr) > 0) {
@@ -99,7 +99,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
             echo json_encode($fail_arr);
             exit();
         }
-        T8insert($_POST, $facilityno, $depId);
+        // T8insert($_POST, $facilityno, $depId);
         bonusCreate($_POST, $facilityno, $conn);
         //create account table
         $accounttype = "A";
@@ -127,7 +127,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         $stmt->bindParam(':repairerid', $repairerid);
         $stmt->bindParam(':creater', $creater);
         $stmt->bindParam(':create_at', $create_at);
-        $stmt->execute();
+        // $stmt->execute();
 
         //create contract table
 
@@ -163,7 +163,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         $stmt->bindParam(':end_date', $end_date);
         $stmt->bindParam(':creater', $creater);
         $stmt->bindParam(':create_at', $create_at);
-        $stmt->execute();
+        // $stmt->execute();
 
         //create facility table
         // $createFacilityNo = new CreateFacilityNo();
@@ -238,7 +238,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
             $stmt->bindParam(':area', $area);
             $stmt->bindParam(':takecertificatedate', $elevator['takecertificatedate']);
             $stmt->bindParam(':licensedate', $ADuseful_date);
-            $result = $stmt->execute();
+            // $result = $stmt->execute();
         }
 
         //create schedule table
@@ -259,7 +259,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
                 $stmt->bindParam(':duedate', $combo[1]);
                 $stmt->bindParam(':creater', $creater);
                 $stmt->bindParam(':create_at', $create_at);
-                $result = $stmt->execute();
+                // $result = $stmt->execute();
             }
         }
         // create contract_b_signed_back table
@@ -366,7 +366,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         $stmt->bindParam(":created_by", $user_id);
         $stmt->bindParam(':payType', $payType);
 
-        $stmt->execute();
+        // $stmt->execute();
 
         // T8insert($_POST, $facilityno);
 
@@ -665,7 +665,7 @@ function bonusCreate($data, $facilityno, $conn)
         $status = 1;
         $bonus_json = [];
         $create_id = $data['user_id'];
-        $create_at = date('Y-m-d');
+        $create_at = date('Y-m-d H:i:s');
         $contract_no = !empty($data['contractno']) ? $data['contractno'] : '';
         $contract_kind = 3;
 
@@ -689,7 +689,7 @@ function bonusCreate($data, $facilityno, $conn)
             $contract_type = $elevator['contract_type']; //合約類別
             $payment_period = $payment[$payType]; //付款方式
             $elevator_list_price = intval($elevator['stand_price']); //牌價
-            $fee_per_st = $elevator['contract_price']; //作翻契約金額
+            $fee_per_st = $elevator['sold_price']; //作翻契約金額
             $commission_fee = $elevator['service_expense']; //服務費(月)
             $receivable_date_due = $payDay; //第一筆保養款項收回日
             $sales_id = $salesman; //營業人員
@@ -722,6 +722,7 @@ function bonusCreate($data, $facilityno, $conn)
                     $stmt->execute();
                 }
             }
+            // exit();
         }
         // exit();
     } catch (PDOException $e) {
diff --git a/wms/contract/api/postNewContractData.php b/wms/contract/api/postNewContractData.php
index d94dac12..6180e4d4 100644
--- a/wms/contract/api/postNewContractData.php
+++ b/wms/contract/api/postNewContractData.php
@@ -27,7 +27,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
     $elevators_nums = $_POST['nums'];
     $elevators = json_decode($_POST['elevators'], true);
     $elevators_detail_arr = json_decode($_POST['elevators_detail_arr'], true);
-    BounsCount($_POST, $conn);
+
     // echo '<pre>';
     // print_r($elevators);
     // echo '</pre>';
@@ -54,12 +54,12 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
     //create facility table
     $createFacilityNo = new CreateFacilityNo();
     $dailyNecessities = [
-      'MAE100' => 'X',
-      'MAM200' => 'W',
-      'MAH100' => 'H',
-      'MAQ100' => 'Z',
-      'MAF100' => 'F',
-      'MAZ100' => 'B',
+      'MAE100' => 'X', //小機房客梯
+      'MAM200' => 'W', //無機房客梯
+      'MAH100' => 'H', //小電梯
+      'MAQ100' => 'Z', //強趨梯
+      'MAF100' => 'F', //貨梯
+      'MAP100' => 'B', //平台梯
     ];
     $arr = [];
     // 建立作番號
@@ -68,9 +68,8 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
       $arr[] = $dailyNecessities[$elevator['spec']];
     }
     $facilityno = $createFacilityNo->makeMFacilityNo('M', $arr, intval($elevators_nums));
-    echo '<pre>';
-    print_r($facilityno);
-    echo '</pre>';
+
+    BounsCount($_POST, $conn, $facilityno);
     exit();
     $conn->beginTransaction();
 
@@ -282,39 +281,63 @@ function T8Insert($data)
 }
 
 
-function BounsCount($data, $conn)
+function BounsCount($data, $conn, $facilityno)
 {
   // echo '<pre>';
-  // print_r($data);
+  // print_r($facilityno);
   // echo '</pre>';
   // exit;
   require_once("../../bonus/elevator_new/elevator_new_deal_bonus.php");
-  $signing_date = $data['signing_date'];
-  $bonus_v1_0_date = '2024-01-02';
-  $bonus_v2_0_date = '2024-01-03';
+  $dailyNecessities = [
+    'MAE100' => 'passenger', //小機房
+    'MAM200' => 'passenger', //無機房
+    'MAH100' => 'dumbwaiter', //小電梯
+    'MAQ100' => 'positive_drive', //強趨梯
+    'MAF100' => 'cargo', //貨梯
+    'MAP100' => 'flatbase', // 平台踢
+  ];
   $contractType = [
     '1' => 'strategy_customer',
     '2' => 'general_customer'
   ];
+  $signing_date = $data['signing_date'];
+  $bonus_v1_0_date = '2024-01-02';
+  $bonus_v2_0_date = '2024-01-03';
   $contract_type = $data['contract_type'];
 
   $type = $contractType[$contract_type]; //戰略客戶 or 一般客戶
-  $elevator_knockdown_price = $data['price_total']; //受價總額
+  // $elevator_knockdown_price = $data['price_total']; //受價總額
+  $elevators = json_decode($data['elevators_detail_arr'], true);
 
   $salesman = $data['salesman'];
   $manager = $data['manager'];
 
+
+
   $result_bonus = [];
+  $result_bonus_arr = [];
   if ($signing_date <= $bonus_v1_0_date) {
     $ver = '1.0';
-    $result_bonus = elevator_new_deal_bonus_v1_0($ver, $type, $elevator_knockdown_price, $salesman, $manager);
+    foreach ($elevators as $i => $elevator) {
+
+      $elevator_knockdown_price = $elevator['item_price_ct'];
+      $result_bonus = elevator_new_deal_bonus_v1_0($ver, $type, $elevator_knockdown_price, $salesman, $manager);
+      $result_bonus['facility'] = $facilityno[$i];
+      $result_bonus_arr[] = $result_bonus;
+    }
   } else if ($signing_date >= $bonus_v2_0_date) {
     $ver = '2.0';
-    // $result_bonus = elevator_new_deal_bonus_v2_0($ver,$contract_type,);
+    foreach ($elevators as $i => $elevator) {
+      $elevator_type = $dailyNecessities[$elevator['spec']];
+      $elevator_list_price = $elevator[''];
+      $result_bonus = elevator_new_deal_bonus_v2_0($ver, $contract_type, $elevator_type, $elevator_list_price, $elevator_knockdown_price, $sales_id, $region_manger_id);
+    }
   }
-
+  // foreach ($elevators as $elevator) {
+  //   $elevator_knockdown_price = $elevator['item_price_ct'];
+  // }
   echo '<pre>';
-  print_r($result_bonus);
+  print_r($result_bonus_arr);
   echo '</pre>';
   exit();
   try {
diff --git a/wms/contract/contract-input.php b/wms/contract/contract-input.php
index 114cea2f..58acb4a8 100644
--- a/wms/contract/contract-input.php
+++ b/wms/contract/contract-input.php
@@ -111,7 +111,7 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                             </td>
                             <td style="vertical-align: middle">契約成交價</td>
                             <td>
-                                <input class="form-control disabled_select" type="text" name="tel" x-model="data.total_price" :disabled="data.disabled">
+                                <input class="form-control disabled_select" type="number" name="tel" x-model="data.total_price" :disabled="data.disabled">
                                 <p class="alerttext" x-show="data.total_price==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                             </td>
                         </tr>
@@ -158,7 +158,7 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 <p class="alerttext" x-show="data.payType==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                             </td>
                         </tr>
-                        <tr>
+                        <!-- <tr>
                             <td style="vertical-align: middle">業務聯繫人</td>
                             <td>
                                 <input type="text" x-model="data.partyA" name="partyA" />
@@ -179,7 +179,7 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 <input class="form-control disabled_select" type="email" name="contracttel" x-model="data.partyAemail">
                                 <p class="alerttext" x-show="data.partyAemail==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                             </td>
-                        </tr>
+                        </tr> -->
                         <tr>
                             <td style="vertical-align: middle">區域</td>
                             <td>
@@ -374,28 +374,28 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 </td>
                                 <td style="vertical-align:middle">獎金適用版本</td>
                                 <td>
-                                    <input type="text" x-model="elevator.bonus_verson" disabled="disabled">
+                                    <input type="text" x-model="elevator.bonus_verson">
                                 </td>
                             </tr>
                             <tr>
                                 <td style="vertical-align:middle">作番契約金額(月)</td>
-                                <td><input type="text" x-model="elevator.sold_price" disabled></td>
+                                <td><input type="text" x-model="elevator.sold_price"></td>
 
                                 <td style="vertical-align:middle">牌價(標準價)</td>
                                 <td>
-                                    <input type="text" x-model="elevator.stand_price" disabled>
+                                    <input type="text" x-model="elevator.stand_price">
                                     <p>標準價+Option價格+與其他電梯共同分擔的費用貨價格</p>
                                 </td>
                                 <td style="vertical-align:middle">服務費</td>
                                 <td>
-                                    <input type="text" x-model="elevator.service_expense" disabled>
+                                    <input type="text" x-model="elevator.service_expense">
                                 </td>
-                                <td style="vertical-align:middle">折扣率(%)</td>
-                                <td><input type="text" x-model='elevator.discount' disabled></td>
+                                <td style="vertical-align:middle">折扣率(%) <br />(作番契約金額+服務費/台數) / 牌價 * 100</td>
+                                <td><input type="text" x-model='elevator.discount'></td>
                             </tr>
                             <tr>
                                 <td style="vertical-align:middle">地區處長員工號</td>
-                                <td><input type="text" x-model="elevator.manager" disabled></td>
+                                <td><input type="text" x-model="elevator.manager"></td>
                                 <td style="vertical-align:middle">專任契約經理員工號</td>
                                 <td><input type="text" x-model="elevator.regular_contract_manger_id"></td>
                             </tr>
diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js
index b2ad1eb9..db386702 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -1090,7 +1090,8 @@ const contractInput = () => {
                     contract_type: '',
                     manager: '',
                     regular_contract_manger_id: '',
-                    bonus_verson: ''
+                    bonus_verson: '',
+                    sold_price: ''
                 })
             }
         },

From 8408a410e63329e3e46c5b0cdc004b7a05849729 Mon Sep 17 00:00:00 2001
From: Cheng <lkmd555@masada.com.tw>
Date: Tue, 27 Feb 2024 17:37:18 +0800
Subject: [PATCH 02/16] =?UTF-8?q?=E4=BF=9D=E9=A4=8A=E7=8D=8E=E9=87=91?=
 =?UTF-8?q?=E8=A8=88=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../other/maintenance_contract_bonus_v2_1.php |  24 +-
 ...enance_contract_bonus_v2_1_examination.php |   8 +-
 ...m_contract_m1_free_charge_bonus_v2_1_1.php | 312 ++++++++++++++++++
 ..._m1_free_charge_bonus_v2_1_examination.php | 174 +++++++---
 wms/contract/api/postContractData.php         | 140 +++++++-
 wms/contract/contract-input.php               |  54 +--
 wms/contract/js/alpine.js                     |  55 +--
 7 files changed, 649 insertions(+), 118 deletions(-)
 create mode 100644 wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_1.php

diff --git a/wms/bonus/other/maintenance_contract_bonus_v2_1.php b/wms/bonus/other/maintenance_contract_bonus_v2_1.php
index 598202d4..27959883 100644
--- a/wms/bonus/other/maintenance_contract_bonus_v2_1.php
+++ b/wms/bonus/other/maintenance_contract_bonus_v2_1.php
@@ -45,7 +45,9 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 {
 	$bonus_array = [];
 	if ($ver == "2.1") {
-		$discount = round(($fee_per_st - $commission_fee) / $elevator_list_price, 2);
+		// $discount = round(($fee_per_st - $commission_fee) / $elevator_list_price, 2);
+		$discount = ($fee_per_st - $commission_fee) / $elevator_list_price;
+
 		#契約總類($contract_type)：新簽約(new)、免保轉有費(free_to_charge)、續簽約(原價或僅契約金額異動)(renew_priceissue)
 		switch ($contract_type) {
 			case "new":
@@ -54,10 +56,10 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 				switch ($discount) {
 					case ($discount >= 0.8):
 						switch ($fee_per_st) {
-							case ($fee_per_st <= 3000):
+							case ($fee_per_st < 3000):
 								$sales_bonus = ($fee_per_st) * 0.6;
 								break;
-							case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
+							case ($fee_per_st >= 3000 and $fee_per_st <= 3499):
 								$sales_bonus = ($fee_per_st) * 0.7;
 								break;
 							case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
@@ -70,10 +72,10 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 						break;
 					case ($discount >= 0.6 and $discount < 0.8):
 						switch ($fee_per_st) {
-							case ($fee_per_st <= 3000):
+							case ($fee_per_st < 3000):
 								$sales_bonus = ($fee_per_st) * 0.48;
 								break;
-							case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
+							case ($fee_per_st >= 3000 and $fee_per_st <= 3499):
 								$sales_bonus = ($fee_per_st) * 0.56;
 								break;
 							case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
@@ -86,10 +88,10 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 						break;
 					case ($discount < 0.6):
 						switch ($fee_per_st) {
-							case ($fee_per_st <= 3000):
+							case ($fee_per_st < 3000):
 								$sales_bonus = ($fee_per_st) * 0.42;
 								break;
-							case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
+							case ($fee_per_st >= 3000 and $fee_per_st <= 3499):
 								$sales_bonus = ($fee_per_st) * 0.49;
 								break;
 							case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
@@ -110,10 +112,10 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 
 			case "free_to_charge":
 				switch ($fee_per_st) {
-					case ($fee_per_st <= 3000):
+					case ($fee_per_st < 3000):
 						$sales_bonus = ($fee_per_st) * 0.3;
 						break;
-					case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
+					case ($fee_per_st >= 3000 and $fee_per_st <= 3499):
 						$sales_bonus = ($fee_per_st) * 0.35;
 						break;
 					case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
@@ -131,10 +133,10 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 
 			case "renew_priceissue":
 				switch ($fee_per_st) {
-					case ($fee_per_st <= 3000):
+					case ($fee_per_st < 3000):
 						$sales_bonus = ($fee_per_st) * 0.25;
 						break;
-					case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
+					case ($fee_per_st >= 3000 and $fee_per_st <= 3499):
 						$sales_bonus = ($fee_per_st) * 0.3;
 						break;
 					case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
diff --git a/wms/bonus/other/maintenance_contract_bonus_v2_1_examination.php b/wms/bonus/other/maintenance_contract_bonus_v2_1_examination.php
index d68bdb7d..5b26e9c8 100644
--- a/wms/bonus/other/maintenance_contract_bonus_v2_1_examination.php
+++ b/wms/bonus/other/maintenance_contract_bonus_v2_1_examination.php
@@ -270,9 +270,9 @@ $examination_array = [
 // echo '10、專任契約經理員工號($regular_contract_manger_id)</br>';
 
 for ($i = 0; $i < count($examination_array); $i++) {
-	$fee_per_st = $examination_array[$i][3];
-	$commission_fee = $examination_array[$i][5];
-	$elevator_list_price = $examination_array[$i][4];
+	$fee_per_st = $examination_array[$i][4];  //作番金額
+	$commission_fee = $examination_array[$i][5];  // 服務費
+	$elevator_list_price = $examination_array[$i][3]; // 牌價
 	$discount = round(($fee_per_st - $commission_fee) / $elevator_list_price, 2);
 
 	// echo "$fee_per_st - $commission_fee / $elevator_list_price ";
@@ -314,7 +314,7 @@ for ($i = 0; $i < count($examination_array); $i++) {
 	];
 	echo "獎金版本:" . $result["ver"] . "<br>";
 	echo "計算結果:" . $result["result_status"] . "<br>";
-	echo "傳入參數說明：" . $contract_type[$examination_array[$i][1]] . "、" . $pay_kind[$examination_array[$i][2]] . "、牌價" . $examination_array[$i][3] . "元、簽約價" . $examination_array[$i][4] . "元、服務費600元(折扣率" . $discount . ")、契約人員 : " . $examination_array[$i][7] . "、區經理 : " . $examination_array[$i][8] . " 、契約經理 : " . $examination_array[$i][9] . "<br>";
+	echo "傳入參數說明：" . $contract_type[$examination_array[$i][1]] . "、" . $pay_kind[$examination_array[$i][2]] . "、牌價" . $examination_array[$i][3] . "元、簽約價" . $examination_array[$i][4] . "元、服務費" . $commission_fee . "元(折扣率" . $discount . ")、契約人員 : " . $examination_array[$i][7] . "、區經理 : " . $examination_array[$i][8] . " 、契約經理 : " . $examination_array[$i][9] . "<br>";
 	echo "輸入參數：" . $examination_array[$i][1] . "  " . $examination_array[$i][2] . "  " . $examination_array[$i][3] . "  " . $examination_array[$i][4] . "  "
 		. $examination_array[$i][5] . "  " . $examination_array[$i][6] . "  " . $examination_array[$i][7] . "  " . $examination_array[$i][8] . "  "
 		. $examination_array[$i][9] . "<br>";
diff --git a/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_1.php b/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_1.php
new file mode 100644
index 00000000..70a19f40
--- /dev/null
+++ b/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_1.php
@@ -0,0 +1,312 @@
+<?php
+/* 函數用法與參數
+【1.輸入參數：】
+獎金版本($ver)：2.1
+契約總類($contract_type)：簽長約並免費送M1 (longcontract_m1_free_charge)
+作番契約金額($fee_per_st)：3000元/月以下、3001-3499元/月、3500-3999元/月、4000元/月以上
+牌價($elevator_list_price)：該電梯的合約發佈(標準)價+Option價格+與其他電梯共同分擔的費用貨價格
+該作番所佔的服務費金額($commission_fee)
+合約折扣率($discount)：大於80%以上(含)(above_80)、60-79%(含)以上(60_to_79)、折扣率59% (含)以下(below_59) ； 契約折扣率=(簽約價格-服務費)/牌價
+總支付期數$payment_period_amount： 總支付期數，依規定5年約至少60期，
+付款方式$payment_period： 每月支付(monthly), 2月1次(bimonthly), 季付(quarterly), 半年付(semiannually), 年付(annually)
+第一筆保養款項應收回日($receivable_date_due, array)
+契約員員工號($sales_id)
+地區處長員工號($region_director_id)
+專任契約經理員工號($regular_contract_manger_id)
+
+【2.函數中的變數說明】
+契約員獎金($sales_bonus)
+地區處長獎金($region_director_bonus)
+專任契約經理獎金($regular_contract_manger_bonus)
+獎金預計發放比例($payment_ratio_due_array)
+當次應發獎金($current_bonus)
+獎金預計發放日($payday_due_array)
+獎金預計發放規定($payday_due_regulation)：合約簽回及保養款項收回的次月一次性發
+計算結果($result_status)：success, error
+獎金水庫(bonus_array)[
+  bonus_type:獎金名稱,
+  bonus_receiver:發放人員,
+  bonus_amount:金額,
+  pay_day_due:預計發放時間
+  bonus_regulation, 發放規定
+  ]
+
+【3.輸出數據】
+result_array[
+	"ver"=>$ver, #獎金版本
+	"result_status"=>"success", #計算結果	
+	"$bonus_array"=>$bonus_array #所有獎金水庫
+	];
+
+*/
+
+
+
+function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract_type, $payment_period, $payment_period_amount, $elevator_list_price, $fee_per_st, $commission_fee, $receivable_date_due, $sales_id, $region_director_id, $regular_contract_manger_id = '')
+{
+	$bonus_array = [];
+	if ($ver == "2.1") {
+		$discount = ($fee_per_st - $commission_fee) / $elevator_list_price;
+		#契約總類($contract_type)：簽長約並免費送M1 (longcontract_m1_free_charge)
+		switch ($contract_type) {
+			case "longcontract_m1_free_charge":
+				#契約員獎金($sales_bonus)
+				#合約折扣率($discount)：大於80%以上(含)(above_80)、60-79%(含)以上(60_to_79)、折扣率59% (含)以下(below_59)
+				switch ($discount) {
+					case ($discount >= 0.8):
+						switch ($fee_per_st) {
+							case ($fee_per_st < 3000):
+								$sales_bonus = ($fee_per_st) * 0.6;
+								break;
+							case ($fee_per_st >= 3000 and $fee_per_st < 4000):
+								$sales_bonus = ($fee_per_st) * 0.7;
+								break;
+							case ($fee_per_st >= 4000 and $fee_per_st < 5000):
+								$sales_bonus = ($fee_per_st) * 0.8;
+								break;
+							case ($fee_per_st >= 5000 and $fee_per_st < 6000):
+								$sales_bonus = ($fee_per_st) * 0.9;
+								break;
+							case ($fee_per_st >= 6000):
+								$sales_bonus = ($fee_per_st) * 1.0;
+								break;
+						};
+						break;
+					case ($discount >= 0.6 and $discount < 0.8):
+						switch ($fee_per_st) {
+							case ($fee_per_st < 3000):
+								$sales_bonus = ($fee_per_st) * 0.42;
+								break;
+							case ($fee_per_st >= 3000 and $fee_per_st <= 4000):
+								$sales_bonus = ($fee_per_st) * 0.49;
+								break;
+							case ($fee_per_st >= 4000 and $fee_per_st < 5000):
+								$sales_bonus = ($fee_per_st) * 0.56;
+								break;
+							case ($fee_per_st >= 5000 and $fee_per_st < 6000):
+								$sales_bonus = ($fee_per_st) * 0.63;
+								break;
+							case ($fee_per_st >= 6000):
+								$sales_bonus = ($fee_per_st) * 0.7;
+								break;
+						};
+						break;
+					case ($discount < 0.6):
+						switch ($fee_per_st) {
+							case ($fee_per_st < 3000):
+								$sales_bonus = ($fee_per_st) * 0.3;
+								break;
+							case ($fee_per_st >= 3000 and $fee_per_st < 4000):
+								$sales_bonus = ($fee_per_st) * 0.35;
+								break;
+							case ($fee_per_st >= 4000 and $fee_per_st < 5000):
+								$sales_bonus = ($fee_per_st) * 0.4;
+								break;
+							case ($fee_per_st >= 5000 and $fee_per_st < 6000):
+								$sales_bonus = ($fee_per_st) * 0.45;
+								break;
+							case ($fee_per_st >= 6000):
+								$sales_bonus = ($fee_per_st) * 0.5;
+								break;
+						};
+						break;
+				};
+
+				#地區處長獎金($region_director_bonus)
+				$region_director_bonus = 170;
+				#專任契約經理獎金($regular_contract_manger_bonus)
+				$regular_contract_manger_bonus = 300;
+				break;
+		};
+		#付款方式$payment_period： 每月支付(monthly), 2月1次(bimonthly), 季付(quarterly), 半年付(semiannually), 年付(annually)
+		array_push($bonus_array, [
+			"bonus_type" => "地區處長獎金", #獎金名稱
+			"bonus_receiver" => $region_director_id, #發放人員
+			"bonus_amount" => round($region_director_bonus), #金額
+			"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +12 months")), #預計發放時間
+			"bonus_regulation" => "訂金收回後次月發放" #發放規定				
+		]);
+
+		#專任契約經理獎金
+		if ($regular_contract_manger_id != '') {
+			array_push($bonus_array, [
+				"bonus_type" => "專任契約經理獎金", #獎金名稱
+				"bonus_receiver" => $regular_contract_manger_id, #發放人員
+				"bonus_amount" => round($regular_contract_manger_bonus), #金額
+				"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +12 months")), #預計發放時間
+				"bonus_regulation" => "訂金收回後次月發放" #發放規定				
+			]);
+		}
+
+		#地區處長獎金、專任契約經理、契約員獎金
+		switch ($payment_period) {
+				#簽長約免費贈送控制系統,因屬於公司特殊政策,所以無汰改獎金,合約期內每月領取契約獎金	
+				#總支付期數$payment_period_amount： 總支付期數，依規定5年約至少60期，
+				#年繳
+			case 'annually':
+				$payment_ratio_due_array = array();
+				$a = $payment_period_amount / 12;
+				for ($i = 0; $i < $a; $i++) {
+					array_push($payment_ratio_due_array, 1 / $a);
+				}
+
+				$payday_due_array = array();
+				for ($i = 0; $i < $a; $i++) {
+					array_push($payday_due_array, $i + 1);
+				}
+
+				for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
+					if ($i < count($payment_ratio_due_array) - 1) {
+						$current_bonus = round($sales_bonus * $payment_ratio_due_array[$i]); #金額
+					} else {
+						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
+					};
+					array_push($bonus_array, [
+						"bonus_type" => "契約員獎金", #獎金名稱
+						"bonus_receiver" => $sales_id, #發放人員
+						"bonus_amount" => round($current_bonus), #金額
+						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] year")), #預計發放時間
+						"bonus_regulation" => "每月收款後,按收款比率次月發放" #發放規定				
+					]);
+				}
+
+				break;
+				#半年繳
+			case 'semiannually':
+				$payment_ratio_due_array = array();
+				$a = $payment_period_amount / 6;
+				for ($i = 0; $i < $a; $i++) {
+					array_push($payment_ratio_due_array, 1 / $a);
+				}
+
+				$payday_due_array = array();
+				for ($i = 0; $i < $a; $i++) {
+					array_push($payday_due_array, ($i + 1) * 6);
+				}
+
+				for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
+					if ($i < count($payment_ratio_due_array) - 1) {
+						$current_bonus = round($sales_bonus * $payment_ratio_due_array[$i]); #金額
+					} else {
+						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
+					};
+					array_push($bonus_array, [
+						"bonus_type" => "契約員獎金", #獎金名稱
+						"bonus_receiver" => $sales_id, #發放人員
+						"bonus_amount" => round($current_bonus), #金額
+						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] months")), #預計發放時間
+						"bonus_regulation" => "每月收款後,按收款比率次月發放" #發放規定				
+					]);
+				}
+				break;
+				#季繳
+			case 'quarterly':
+				$a = $payment_period_amount / 3;
+				$payment_ratio_due_array = array();
+				for ($i = 0; $i < $a; $i++) {
+					array_push($payment_ratio_due_array, 1 / $a);
+				}
+
+				$payday_due_array = array();
+				for ($i = 0; $i < $a; $i++) {
+					array_push($payday_due_array, ($i + 1) * 4);
+				}
+
+				for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
+					if ($i < count($payment_ratio_due_array) - 1) {
+						$current_bonus = round($sales_bonus * $payment_ratio_due_array[$i]); #金額
+					} else {
+						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
+					};
+					array_push($bonus_array, [
+						"bonus_type" => "契約員獎金", #獎金名稱
+						"bonus_receiver" => $sales_id, #發放人員
+						"bonus_amount" => round($current_bonus), #金額
+						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] months")), #預計發放時間
+						"bonus_regulation" => "每月收款後,按收款比率次月發放" #發放規定				
+					]);
+				}
+				break;
+				break;
+				#雙月繳
+			case 'bimonthly':
+				$a = $payment_period_amount / 2;
+				$payment_ratio_due_array = array();
+				for ($i = 0; $i < $a; $i++) {
+					array_push($payment_ratio_due_array, 1 / $a);
+				}
+
+				$payday_due_array = array();
+				for ($i = 0; $i < $a; $i++) {
+					array_push($payday_due_array, ($i + 1) * 2);
+				}
+
+				for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
+					if ($i < count($payment_ratio_due_array) - 1) {
+						$current_bonus = round($sales_bonus * $payment_ratio_due_array[$i]); #金額
+					} else {
+						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
+					};
+					array_push($bonus_array, [
+						"bonus_type" => "契約員獎金", #獎金名稱
+						"bonus_receiver" => $sales_id, #發放人員
+						"bonus_amount" => round($current_bonus), #金額
+						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] months")), #預計發放時間
+						"bonus_regulation" => "每月收款後,按收款比率次月發放" #發放規定				
+					]);
+				}
+				break;
+				break;
+				#月繳
+			case 'monthly':
+
+				#產生契約員每個月的獎金應發比例
+				$payment_ratio_due_array = array();
+				for ($i = 0; $i < $payment_period_amount; $i++) {
+					array_push($payment_ratio_due_array, 1 / $payment_period_amount);
+				}
+
+				$payday_due_array = array();
+				for ($i = 0; $i < $payment_period_amount; $i++) {
+					array_push($payday_due_array, $i + 1);
+				}
+
+				for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
+					if ($i < count($payment_ratio_due_array) - 1) {
+						$current_bonus = round($sales_bonus * $payment_ratio_due_array[$i]); #金額
+					} else {
+						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
+					};
+					array_push($bonus_array, [
+						"bonus_type" => "契約員獎金", #獎金名稱
+						"bonus_receiver" => $sales_id, #發放人員
+						"bonus_amount" => round($current_bonus), #金額
+						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] months")), #預計發放時間
+						"bonus_regulation" => "每月收款後,按收款比率次月發放" #發放規定				
+					]);
+				}
+				break;
+		}
+
+		$result_array = [
+			"ver" => $ver, #獎金版本
+			"result_status" => "success", #計算結果	
+			"bonus_array" => $bonus_array #獎金水庫
+		];
+	} else {
+		array_push($bonus_array, [
+			"bonus_type" => "error", #獎金名稱
+			"bonus_receiver" => "error", #發放人員
+			"bonus_amount" => 0, #金額
+			"pay_day_due" => "9999-1-1", #預計發放時間
+			"bonus_regulation" => "error" #發放規定				
+		]);
+		$result_array = [
+			"ver" => $ver, #獎金版本
+			"result_status" => "error", #計算結果	
+			"bonus_array" => $bonus_array #獎金水庫
+		];
+	}
+
+	return $result_array;
+};
diff --git a/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_examination.php b/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_examination.php
index 0c42a890..3e0c3af0 100644
--- a/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_examination.php
+++ b/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_examination.php
@@ -40,62 +40,150 @@ result_array[
 */
 
 
-require_once("maintenance_longterm_contract_m1_free_charge_bonus_v2_1.php");
-
-#$ver, $contract_type, $payment_period_amount, $elevator_list_price, $fee_per_st, $commission_fee, $receivable_date_due, $sales_id, $region_director_id, $regular_contract_manger_id
-
-
+require_once("maintenance_longterm_contract_m1_free_charge_bonus_v2_1_1.php");
 #獎金測試
 $examination_array = [
 	#錯誤版本
-	["1.0","longcontract_m1_free_charge",60,0.8,4000,333, "2014-07-01", "M0001", "M0002", "M0003"],
+	// ["1.0", 'annually', "longcontract_m1_free_charge", 60, 0.8, 4000, 333, "2014-07-01", "M0001", "M0002", "M0003"],
 	#60期
-	["2.1","longcontract_m1_free_charge",60,3000,3000,600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費600元(折扣率0.8)
-	["2.1","longcontract_m1_free_charge",60,3000,4000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費1600元(折扣率0.8)
-	["2.1","longcontract_m1_free_charge",60,3000,5000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費2600元(折扣率0.8)	
-	["2.1","longcontract_m1_free_charge",60,3000,6000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費3600元(折扣率0.8)	
-	["2.1","longcontract_m1_free_charge",60,3000,7000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價7000元、服務費4600元(折扣率0.8)	
-	["2.1","longcontract_m1_free_charge",60,3000,3000,600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費1200元(折扣率0.6)
-	["2.1","longcontract_m1_free_charge",60,3000,4000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費2200元(折扣率0.6)
-	["2.1","longcontract_m1_free_charge",60,3000,5000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費3200元(折扣率0.6)	
-	["2.1","longcontract_m1_free_charge",60,3000,6000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費4200元(折扣率0.6)	
-	["2.1","longcontract_m1_free_charge",60,3000,7000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價7000元、服務費5200元(折扣率0.6)	
-	["2.1","longcontract_m1_free_charge",60,3000,3000,600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費1230元(折扣率0.59)
-	["2.1","longcontract_m1_free_charge",60,3000,4000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費2230元(折扣率0.59)
-	["2.1","longcontract_m1_free_charge",60,3000,5000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費3230元(折扣率0.59)	
-	["2.1","longcontract_m1_free_charge",60,3000,6000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費4230元(折扣率0.59)	
-	["2.1","longcontract_m1_free_charge",60,3000,7000,1600,"2014-07-01", "M0001", "M0002", "M0003"] #牌價3000、簽約價7000元、服務費5230元(折扣率0.59)	
-	
+	//付款方式$payment_period： 每月支付(monthly), 2月1次(bimonthly), 季付(quarterly), 半年付(semiannually), 年付(annually)
+	["2.1", "longcontract_m1_free_charge", 'annually', 60, 3000, 2999, 600, "2014-07-01", "M0001", "M0002"], #牌價3000、簽約價3000元、服務費600元(折扣率0.8)
+	["2.1", "longcontract_m1_free_charge", 'annually', 60, 3000, 3000, 600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費600元(折扣率0.8)
+	["2.1", "longcontract_m1_free_charge", 'semiannually', 60, 3000, 4000, 1600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費1600元(折扣率0.8)
+	["2.1", "longcontract_m1_free_charge", 'quarterly', 60, 3000, 5000, 2600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費2600元(折扣率0.8)	
+	["2.1", "longcontract_m1_free_charge", 'bimonthly', 60, 3000, 6000, 3600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費3600元(折扣率0.8)	
+	["2.1", "longcontract_m1_free_charge", 'monthly', 60, 3000, 7000, 4600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價7000元、服務費4600元(折扣率0.8)	
+	["2.1", "longcontract_m1_free_charge", 'annually', 60, 3000, 2999, 1200, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費1200元(折扣率0.6)
+	["2.1", "longcontract_m1_free_charge", 'semiannually', 60, 3000, 4000, 2200, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費2200元(折扣率0.6)
+	["2.1", "longcontract_m1_free_charge", 'quarterly', 60, 3000, 5000, 3200, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費3200元(折扣率0.6)	
+	["2.1", "longcontract_m1_free_charge", 'bimonthly', 60, 3000, 6000, 4200, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費4200元(折扣率0.6)	
+	["2.1", "longcontract_m1_free_charge", 'monthly', 60, 3000, 7000, 5200, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價7000元、服務費5200元(折扣率0.6)	
+	["2.1", "longcontract_m1_free_charge", 'annually', 60, 3000, 2999, 1230, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費1230元(折扣率0.59)
+	["2.1", "longcontract_m1_free_charge", 'annually', 60, 3000, 3000, 1230, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費1230元(折扣率0.59)
+	["2.1", "longcontract_m1_free_charge", 'semiannually', 60, 3000, 4000, 2230, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費2230元(折扣率0.59)
+	["2.1", "longcontract_m1_free_charge", 'quarterly', 60, 3000, 5000, 3230, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費3230元(折扣率0.59)	
+	["2.1", "longcontract_m1_free_charge", 'bimonthly', 60, 3000, 6000, 4230, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費4230元(折扣率0.59)	
+	["2.1", "longcontract_m1_free_charge", 'monthly', 60, 3000, 7000, 5230, "2014-07-01", "M0001", "M0002", "M0003"] #牌價3000、簽約價7000元、服務費5230元(折扣率0.59)	
+
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 3000, 600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費600元(折扣率0.8)
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 4000, 1600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費1600元(折扣率0.8)
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 5000, 2600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費2600元(折扣率0.8)	
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 6000, 3600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費3600元(折扣率0.8)	
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 7000, 4600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價7000元、服務費4600元(折扣率0.8)	
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 3000, 600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費1200元(折扣率0.6)
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 4000, 1600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費2200元(折扣率0.6)
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 5000, 2600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費3200元(折扣率0.6)	
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 6000, 3600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費4200元(折扣率0.6)	
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 7000, 4600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價7000元、服務費5200元(折扣率0.6)	
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 3000, 600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費1230元(折扣率0.59)
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 4000, 1600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費2230元(折扣率0.59)
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 5000, 2600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費3230元(折扣率0.59)	
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 6000, 3600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費4230元(折扣率0.59)	
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 7000, 4600, "2014-07-01", "M0001", "M0002", "M0003"] #牌價3000、簽約價7000元、服務費5230元(折扣率0.59)
 ];
 
 
 
-for($i = 0; $i<count($examination_array); $i++){
+for ($i = 0; $i < count($examination_array); $i++) {
+	$ver = $examination_array[$i][0];
+	$contract_type = $examination_array[$i][1];
+	$payment_period = $examination_array[$i][2];
+	$payment_period_amount = $examination_array[$i][3];
+	$elevator_list_price = $examination_array[$i][4];
+	$fee_per_st = $examination_array[$i][5];
+	$commission_fee = $examination_array[$i][6];
+	$receivable_date_due = $examination_array[$i][7];
+	$sales_id = $examination_array[$i][8];
+	$region_director_id =  $examination_array[$i][9];
+	$regular_contract_manger_id = empty($examination_array[$i][10]) ? '' : $examination_array[$i][10];
+	$a = $payment_period_amount / 12;
+	$sales_bonus = ($fee_per_st) * 0.6;
+	$bonus_array = [];
+
+	// $payment_ratio_due_array = array();
+	// for ($i = 0; $i < $a; $i++) {
+	// 	array_push($payment_ratio_due_array, 1 / $a);
+	// }
+
+	// $payday_due_array = array();
+	// for ($i = 0; $i < $a; $i++) {
+	// 	array_push($payday_due_array, $i + 1);
+	// }
+
+	// for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
+	// 	if ($i < count($payment_ratio_due_array) - 1) {
+	// 		$current_bonus = round($sales_bonus * $payment_ratio_due_array[$i]); #金額
+	// 	} else {
+	// 		$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
+	// 	};
+	// 	array_push($bonus_array, [
+	// 		"bonus_type" => "契約員獎金", #獎金名稱
+	// 		"bonus_receiver" => $sales_id, #發放人員
+	// 		"bonus_amount" => round($current_bonus), #金額
+	// 		"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] year")), #預計發放時間
+	// 		"bonus_regulation" => "每月收款後,按收款比率次月發放" #發放規定				
+	// 	]);
+	// }
+	// echo '<pre>';
+	// print_r($bonus_array);
+	// echo '</pre>';
+	// exit();
 	$result = maintenance_longterm_contract_m1_free_charge_bonus_v2_1(
-		$examination_array[$i][0],
-		$examination_array[$i][1],	
-		$examination_array[$i][2],	
-		$examination_array[$i][3],	
-		$examination_array[$i][4],	
-		$examination_array[$i][5],	
-		$examination_array[$i][6],	
-		$examination_array[$i][7],	
-		$examination_array[$i][8],			
-		$examination_array[$i][9]		
+		$ver,
+		$contract_type,
+		$payment_period,
+		$payment_period_amount,
+		$elevator_list_price,
+		$fee_per_st,
+		$commission_fee,
+		$receivable_date_due,
+		$sales_id,
+		$region_director_id,
+		$regular_contract_manger_id
 	);
+
+	$discount = (($fee_per_st - $commission_fee) / $elevator_list_price);
+	#新簽約、月繳、牌價3000、簽約價3000元、服務費600元(折扣率0.8)
+	$contract_type = [
+		'new' => '新簽約',
+		'free_to_charge' => '免保轉有費',
+		'renew_priceissue' => '續簽約(原價或僅契約金額異動)',
+		'longcontract_m1_free_charge' => '五年長約'
+
+	];
+	// 付款方式$payment_period： 每月支付(monthly), 2月1次(bimonthly), 季付(quarterly), 半年付(semiannually), 年付(annually)
+	$pay_kind = [
+		'monthly' => '月繳',
+		'bimonthly' => '雙月繳',
+		'quarterly' => '季繳',
+		'semiannually' => '半年繳',
+		'annually' => '年繳'
+	];
+
+	//
+	$bonus_type = [
+		'1' => '契約員獎金',
+		'2' => '區經理獎金',
+		'3' => '契約經理獎金'
+	];
 	echo "獎金版本:" . $result["ver"] . "<br>";
 	echo "計算結果:" . $result["result_status"] . "<br>";
-	echo "輸入參數：" . $examination_array[$i][1] . "  " . $examination_array[$i][2] . "  " . $examination_array[$i][3] . "  " . $examination_array[$i][4] . "  "
-					 . $examination_array[$i][5] . "  " . $examination_array[$i][6] . "  " . $examination_array[$i][7]. "  " . $examination_array[$i][8] . "  "
-					 . $examination_array[$i][9] . "<br>";
-	for($j = 0; $j<count($result["bonus_array"]); $j++){
+
+	echo "傳入參數說明：" . $contract_type[$examination_array[$i][1]] . "、" . $pay_kind[$payment_period] . "、牌價" . $elevator_list_price . "元、簽約價" . $fee_per_st . "元、服務費" . $commission_fee . "元(折扣率" . $discount . ")、契約人員 : " . 	$sales_id .
+		"、區經理 : " . $region_director_id . " 、契約經理 : " . $regular_contract_manger_id . "<br>";
+	echo "輸入參數：" . $examination_array[$i][1] . "  " . $examination_array[$i][2] . "  " . $examination_array[$i][4] . "  "
+		. $examination_array[$i][5] . "  " . $examination_array[$i][6] . "  " . $examination_array[$i][7] . "  " . $examination_array[$i][8] . "  "
+		. $examination_array[$i][9] . "<br>";
+	$n = 0;
+	for ($j = 0; $j < count($result["bonus_array"]); $j++) {
+		if ($result["bonus_array"][$j]["bonus_receiver"] == "M0001") {
+
+			$n++;
+			echo '[' . $n . ']';
+		}
 		echo "輸出結果：" . $result["bonus_array"][$j]["bonus_type"] . "   " . $result["bonus_array"][$j]["bonus_receiver"] . "   "
-						 . $result["bonus_array"][$j]["bonus_amount"] . "   " . $result["bonus_array"][$j]["pay_day_due"] . "   "
-						  . $result["bonus_array"][$j]["bonus_regulation"] . "<br>";
+			. $result["bonus_array"][$j]["bonus_amount"] . "   " . $result["bonus_array"][$j]["pay_day_due"] . "   "
+			. $result["bonus_array"][$j]["bonus_regulation"] . "<br>";
 	};
 	echo "-------------------------" . "<br>";
-
 };
-
-
-?>
diff --git a/wms/contract/api/postContractData.php b/wms/contract/api/postContractData.php
index d3ecf356..e8dca10f 100644
--- a/wms/contract/api/postContractData.php
+++ b/wms/contract/api/postContractData.php
@@ -88,10 +88,10 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         if ($address == '')  $fail_arr[] = '地址為必填';
         if ($area == '')  $fail_arr[] = '區域為必填';
         if ($customer == '')  $fail_arr[] = '客戶為必填';
-        // if ($partyA == '')  $fail_arr[] = '業務聯繫人為必填';
-        // if ($partyAaddress == '')  $fail_arr[] = '業務聯繫人地址為必填';
-        // if ($partyAphone == '')  $fail_arr[] = '業務聯繫人電話為必填';
-        // if ($partyAemail == '')  $fail_arr[] = '業務聯繫人Email為必填';
+        if ($partyA == '')  $fail_arr[] = '業務聯繫人為必填';
+        if ($partyAaddress == '')  $fail_arr[] = '業務聯繫人地址為必填';
+        if ($partyAphone == '')  $fail_arr[] = '業務聯繫人電話為必填';
+        if ($partyAemail == '')  $fail_arr[] = '業務聯繫人Email為必填';
         if ($num == '')  $fail_arr[] = '電梯數量為必填';
         if ($payType == '') $fail_arr[] = '付款方式為必填';
         if (count($fail_arr) > 0) {
@@ -100,7 +100,11 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
             exit();
         }
         // T8insert($_POST, $facilityno, $depId);
-        bonusCreate($_POST, $facilityno, $conn);
+        $aaa = bonusCreate($_POST, $facilityno, $conn);
+        echo '<pre>';
+        print_r($aaa);
+        echo '</pre>';
+        exit;
         //create account table
         $accounttype = "A";
         $accountid = $vat;
@@ -658,10 +662,13 @@ function bonusCreate($data, $facilityno, $conn)
 {
     try {
         require_once("../../bonus/other/maintenance_contract_bonus_v2_1.php");
+        require_once("../../bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_1.php");
+
         $elevators = !empty($_POST['elevators']) ? json_decode($_POST['elevators'], true) : [];
         $contract_begin_date = !empty($data['contract_begin_date']) ? $data['contract_begin_date'] : '';
         $salesman = !empty($data['salesman']) ? $data['salesman'] : '';
         $payType = !empty($data['payType']) ? $data['payType'] : '';
+        $contract_type = $data['contract_type']; //合約類別
         $status = 1;
         $bonus_json = [];
         $create_id = $data['user_id'];
@@ -676,28 +683,114 @@ function bonusCreate($data, $facilityno, $conn)
             'A40005' => 'semiannually', // 半年繳
             'A40003' => 'monthly' //月繳
         ];
-
+        $fail_arr = [];
         $payDay = getNext25thDate($contract_begin_date);
         foreach ($elevators as $key => $elevator) {
-            // print_r($payDay);
-            // echo '<pre>';
-            // print_r($elevator);
-            // echo '</pre>';
-            // exit;
             $facility_no = $facilityno[$key];
             $ver = $elevator['bonus_verson']; //獎金版本
-            $contract_type = $elevator['contract_type']; //合約類別
             $payment_period = $payment[$payType]; //付款方式
-            $elevator_list_price = intval($elevator['stand_price']); //牌價
-            $fee_per_st = $elevator['sold_price']; //作翻契約金額
-            $commission_fee = $elevator['service_expense']; //服務費(月)
+            $elevator_list_price = !empty(intval($elevator['stand_price'])) ? intval($elevator['stand_price']) : ''; //牌價
+            $fee_per_st = !empty(round($elevator['sold_price'] / 1.05, 2)) ? round($elevator['sold_price'] / 1.05, 2) : ''; //作翻契約金額 (不含稅)
+            $commission_fee = !empty($elevator['service_expense']) ? $elevator['service_expense'] : ''; //服務費(月/台)
             $receivable_date_due = $payDay; //第一筆保養款項收回日
             $sales_id = $salesman; //營業人員
             $discount = $elevator['discount'];
             $region_director_id = $elevator['manager'];
             $regular_contract_manger_id = !empty($elevator['regular_contract_manger_id']) ? $elevator['regular_contract_manger_id'] : '';
-            $results = maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period, $elevator_list_price, $fee_per_st, $commission_fee, $receivable_date_due, $sales_id, $region_director_id, $regular_contract_manger_id);
+            $maintain_months = intval($elevator['maintain_months']);
+            $years = $maintain_months / 12;
+
+            if ($maintain_months == '') $fail_arr[] = "保養月費為必填";
+            if ($fee_per_st == '') $fail_arr[] = "契約金額為必填";
+            if ($elevator_list_price == '') $fail_arr[] = "牌價為必填";
+            if ($region_director_id == '') $fail_arr[] = '區處長為必填';
+            if ($sales_id == '') $fail_arr[] = "契約人為必填";
+
+            if (COUNT($fail_arr) > 0) {
+                return $fail_arr;
+                break;
+            }
 
+            // $years = ($maintain_months % 12) == 0 ? $maintain_months / 12 : '';
+            // 如果保養合約 大於一年
+            if (!empty($maintain_months)) {
+                if ($maintain_months > 12 && $contract_type == 'new') {
+                    // 第一年為新簽約
+                    $results = maintenance_contract_bonus_v2_1(
+                        $ver,
+                        $contract_type,
+                        $payment_period,
+                        $elevator_list_price,
+                        $fee_per_st,
+                        $commission_fee,
+                        $receivable_date_due,
+                        $sales_id,
+                        $region_director_id,
+                        $regular_contract_manger_id
+                    );
+                    for ($i = 0; $i < $maintain_months - 1; $i++) {
+                        $contract_type = 'renew_priceissue';
+                        // 第二年以上改續約
+                        $result2 = maintenance_contract_bonus_v2_1(
+                            $ver,
+                            $contract_type,
+                            $payment_period,
+                            $elevator_list_price,
+                            $fee_per_st,
+                            $commission_fee,
+                            $receivable_date_due,
+                            $sales_id,
+                            $region_director_id,
+                            $regular_contract_manger_id
+                        );
+                    }
+                } else if ($maintain_months > 12 && $contract_type == 'renew_priceissue') {
+                    // 超過一年的續約
+                    for ($i = 0; $i < $years; $i++) {
+                        $contract_type = 'renew_priceissue';
+                        $result2 = maintenance_contract_bonus_v2_1(
+                            $ver,
+                            $contract_type,
+                            $payment_period,
+                            $elevator_list_price,
+                            $fee_per_st,
+                            $commission_fee,
+                            $receivable_date_due,
+                            $sales_id,
+                            $region_director_id,
+                            $regular_contract_manger_id
+                        );
+                    }
+                } else if ($maintain_months >= 60) {
+                    $contract_type = 'longcontract_m1_free_charge';
+                    $result = maintenance_longterm_contract_m1_free_charge_bonus_v2_1(
+                        $ver,
+                        $contract_type,
+                        $payment_period,
+                        $maintain_months,
+                        $elevator_list_price,
+                        $fee_per_st,
+                        $commission_fee,
+                        $receivable_date_due,
+                        $sales_id,
+                        $region_director_id,
+                        $regular_contract_manger_id
+                    );
+                } else {
+                    $results = maintenance_contract_bonus_v2_1(
+                        $ver,
+                        $contract_type,
+                        $payment_period,
+                        $elevator_list_price,
+                        $fee_per_st,
+                        $commission_fee,
+                        $receivable_date_due,
+                        $sales_id,
+                        $region_director_id,
+                        $regular_contract_manger_id
+                    );
+                }
+            }
             $bonus_json = [
                 'contract_type' => $contract_type,
                 'total' => $elevator_list_price,
@@ -721,6 +814,21 @@ function bonusCreate($data, $facilityno, $conn)
                     $stmt = $conn->prepare($sql);
                     $stmt->execute();
                 }
+                if (!empty($result2)) {
+                    foreach ($results2['bonus_array'] as $i => $result) {
+
+                        $bonus_type = $result['bonus_type'];
+                        $pay_day = $result['pay_day_due'];
+                        $amount = $result['bonus_amount'];
+                        $receiver = $result['bonus_receiver'];
+                        $a = json_encode($bonus_json);
+                        $sql = "INSERT INTO bonus 
+                    (bonus_type,bonus_verson,contract_no,contract_type,facility_no,amount,receiver,pay_day_due,status,bonus_json,create_id,create_at) VALUES
+                    ($bonus_type,'$ver','$contract_no',$contract_kind,'$facility_no',$amount,'$receiver','$pay_day',$status,'$a','$create_id','$create_at')";
+                        $stmt = $conn->prepare($sql);
+                        // $stmt->execute();
+                    }
+                }
             }
             // exit();
         }
diff --git a/wms/contract/contract-input.php b/wms/contract/contract-input.php
index 58acb4a8..cbec41c1 100644
--- a/wms/contract/contract-input.php
+++ b/wms/contract/contract-input.php
@@ -57,8 +57,8 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 <h4>業務確認項</h4>
                             </td>
                             <td class="text-right" style='border-left:0px;'>
-                                <button type="button" id="btn_close" class="btn btn-default" onclick="window.history.back();">返回</button>
-                                <button type="button" id="btn_close" class="btn btn-default" onclick="window.close();">關閉分頁</button>
+                                <!-- <button type="button" id="btn_close" class="btn btn-default" onclick="window.history.back();">返回</button>
+                                <button type="button" id="btn_close" class="btn btn-default" onclick="window.close();">關閉分頁</button> -->
                             </td>
                         </tr>
                         <tr>
@@ -158,7 +158,7 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 <p class="alerttext" x-show="data.payType==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                             </td>
                         </tr>
-                        <!-- <tr>
+                        <tr>
                             <td style="vertical-align: middle">業務聯繫人</td>
                             <td>
                                 <input type="text" x-model="data.partyA" name="partyA" />
@@ -179,7 +179,7 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 <input class="form-control disabled_select" type="email" name="contracttel" x-model="data.partyAemail">
                                 <p class="alerttext" x-show="data.partyAemail==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                             </td>
-                        </tr> -->
+                        </tr>
                         <tr>
                             <td style="vertical-align: middle">區域</td>
                             <td>
@@ -201,7 +201,17 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 <input type="file" name="file[]" multiple draggable="true" @change="uploadFiles($event)" />
                             </td>
                         </tr>
-
+                        <tr>
+                            <td style="vertical-align:middle">合約類別</td>
+                            <td>
+                                <select name="" id="" x-model="data.contract_type">
+                                    <option value="">請選擇</option>
+                                    <option value="new">新簽約</option>
+                                    <option value="free_to_charge">免保轉有費</option>
+                                    <option value="renew_priceissue">續簽約</option>
+                                </select>
+                            </td>
+                        </tr>
                         <!-- <tr>
                             <td></td>
                             <td></td>
@@ -363,42 +373,48 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 <td>
                                     <input type="text" x-model="elevator.maintain_months">
                                 </td>
-                                <td style="vertical-align:middle">合約類別</td>
-                                <td>
+                                <!-- <td style="vertical-align:middle">合約類別</td> -->
+                                <!-- <td>
                                     <select name="" id="" x-model="elevator.contract_type">
                                         <option value="">請選擇</option>
                                         <option value="new">新簽約</option>
                                         <option value="free_to_charge">免保轉有費</option>
                                         <option value="renew_priceissue">續簽約</option>
                                     </select>
-                                </td>
+                                </td> -->
                                 <td style="vertical-align:middle">獎金適用版本</td>
                                 <td>
                                     <input type="text" x-model="elevator.bonus_verson">
                                 </td>
-                            </tr>
-                            <tr>
                                 <td style="vertical-align:middle">作番契約金額(月)</td>
                                 <td><input type="text" x-model="elevator.sold_price"></td>
-
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:middle">服務費</td>
+                                <td>
+                                    <input type="text" x-model="elevator.service_expense">
+                                </td>
                                 <td style="vertical-align:middle">牌價(標準價)</td>
                                 <td>
                                     <input type="text" x-model="elevator.stand_price">
                                     <p>標準價+Option價格+與其他電梯共同分擔的費用貨價格</p>
                                 </td>
-                                <td style="vertical-align:middle">服務費</td>
-                                <td>
-                                    <input type="text" x-model="elevator.service_expense">
-                                </td>
-                                <td style="vertical-align:middle">折扣率(%) <br />(作番契約金額+服務費/台數) / 牌價 * 100</td>
-                                <td><input type="text" x-model='elevator.discount'></td>
-                            </tr>
-                            <tr>
                                 <td style="vertical-align:middle">地區處長員工號</td>
                                 <td><input type="text" x-model="elevator.manager"></td>
                                 <td style="vertical-align:middle">專任契約經理員工號</td>
                                 <td><input type="text" x-model="elevator.regular_contract_manger_id"></td>
+                                <!-- <td style="vertical-align:middle">折扣率(%)</td>
+                                <td colspan="2">
+                                    <input type="text" x-model='elevator.discount'>
+                                    <p>(作番契約金額+服務費/台數) / 牌價 * 100</p>
+                                </td> -->
                             </tr>
+                            <!-- <tr>
+                                <td style="vertical-align:middle">地區處長員工號</td>
+                                <td><input type="text" x-model="elevator.manager"></td>
+                                <td style="vertical-align:middle">專任契約經理員工號</td>
+                                <td><input type="text" x-model="elevator.regular_contract_manger_id"></td>
+                            </tr> -->
                         </tbody>
                     </template>
                 </template>
diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js
index db386702..ad56eb3b 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -1016,6 +1016,7 @@ const contractInput = () => {
             disabled: false, //資料庫是否有電梯數量資料
             elevators: [], //機種、載重、人乘、樓停、樓層、速度、緯度、經度、開門方式、保養別、廠牌、竣檢日、許可證日期
             payType: '', //付款方式
+            contract_type: ''
             // bonus_verson: 2.1,
             // manager: '',
             // regular_contract_manger_id: '',
@@ -1048,6 +1049,7 @@ const contractInput = () => {
             data.bonus_verson = 2.1;
         },
         getManager() {
+
             for (let i = 0; i < this.data.elevators.length; i++) {
                 this.getBonusVerson(this.data.elevators[i]);
                 axios.get('./api/getContractData.php?contracttype=accountManger&salesman=' + this.data.salesman).then(res => {
@@ -1070,29 +1072,31 @@ const contractInput = () => {
             }
         },
         createElevator() {
-            for (let i = 0; i < this.data.num; i++) {
-                this.data.elevators.push({
-                    spec: '', //規格
-                    weight: '', //載重
-                    speed: '', //速度
-                    persons: '', //人乘
-                    stop: '', //樓停
-                    floors: '', //樓層
-                    latitude: '',  //緯度
-                    longitude: '', //經度
-                    elevator_brand: '', //廠牌
-                    opendoor: '', //開門方式
-                    maintainance: '', //保養別
-                    takecertificatedate: '', //竣檢日
-                    useful_date: '', //許可證有效日期
-                    maintain_times: '', //保養頻率
-                    discount: '', //折價率
-                    contract_type: '',
-                    manager: '',
-                    regular_contract_manger_id: '',
-                    bonus_verson: '',
-                    sold_price: ''
-                })
+            if (this.data.num != this.data.elevators.length) {
+                for (let i = 0; i < this.data.num; i++) {
+                    this.data.elevators.push({
+                        spec: '', //規格
+                        weight: '', //載重
+                        speed: '', //速度
+                        persons: '', //人乘
+                        stop: '', //樓停
+                        floors: '', //樓層
+                        latitude: '',  //緯度
+                        longitude: '', //經度
+                        elevator_brand: '', //廠牌
+                        opendoor: '', //開門方式
+                        maintainance: '', //保養別
+                        takecertificatedate: '', //竣檢日
+                        useful_date: '', //許可證有效日期
+                        maintain_times: '', //保養頻率
+                        discount: '', //折價率
+                        // contract_type: '',
+                        manager: '',
+                        regular_contract_manger_id: '',
+                        bonus_verson: '',
+                        sold_price: ''
+                    })
+                }
             }
         },
         getContractDate() {
@@ -1109,7 +1113,7 @@ const contractInput = () => {
                         this.data.total_price = Number(res.data.elevators[i].sold_price) + Number(this.data.total_price);
 
                         // 服務費 (以單筆合約記，但計算獎金須傳入單月服務費)
-                        this.data.elevators[i].service_expense = Math.round(this.data.elevators[i].service_expense / 12);
+                        this.data.elevators[i].service_expense = Math.round(this.data.elevators[i].service_expense / res.data.elevators[i]);
                         // 折扣率
                         this.data.elevators[i].discount = Math.round(((res.data.elevators[i].sold_price / res.data.elevators[i].stand_price) + this.data.elevators[i].service_expense) * 100);
                     }
@@ -1206,7 +1210,8 @@ const contractInput = () => {
             form.append('num', this.data.num);
             form.append('elevators', JSON.stringify(this.data.elevators));
             form.append('contracttype', 'b');
-            form.append('payType', this.data.payType)
+            form.append('payType', this.data.payType);
+            form.append('contract_type', this.data.contract_type);
 
             // 如果有附件檔案，可以逐一加入
             for (var i = 0; i < this.data.files.length; i++) {

From 2978a669f28606d6fdfaabb28b291e46bec6cee4 Mon Sep 17 00:00:00 2001
From: Cheng <lkmd555@masada.com.tw>
Date: Mon, 26 Feb 2024 18:02:29 +0800
Subject: [PATCH 03/16] =?UTF-8?q?=E6=96=B0=E6=A2=AF=E5=A5=91=E7=B4=84?=
 =?UTF-8?q?=E7=8D=8E=E9=87=91=E5=92=8C=E7=B0=BD=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/bonus/bonus.php                           |  18 ++-
 .../other/maintenance_contract_bonus_v2_1.php |  52 ++++---
 ...erm_contract_m1_free_charge_bonus_v2_1.php | 127 +++++++++---------
 wms/contract/api/getContractData.php          |  59 ++++++--
 wms/contract/api/postContractData.php         |  25 ++--
 wms/contract/api/postNewContractData.php      |  63 ++++++---
 wms/contract/contract-input.php               |  20 +--
 wms/contract/js/alpine.js                     |   3 +-
 8 files changed, 222 insertions(+), 145 deletions(-)

diff --git a/wms/bonus/bonus.php b/wms/bonus/bonus.php
index 4e0b84fd..63bec621 100644
--- a/wms/bonus/bonus.php
+++ b/wms/bonus/bonus.php
@@ -32,15 +32,17 @@ if (!empty($_GET['check'])) {
     if ($_GET['check'] == 4) {
         $oneMonthAgo = date("Y-m-d", strtotime("$now +1 months"));
         // $clause .= "AND pay_day_due >= '$now' AND pay_day_due <= '$oneMonthAgo' AND status IN (1,2,5)";
-        $clause .= "AND status IN (1,2,5)";
+        $clause .= "AND a.status IN (1,2,5)";
     } else if ($_GET['check'] == 2) {
-        $clause .= "AND status = 1";
+        $clause .= "AND a.status = 1";
     } else if ($_GET['check'] == 3) {
-        $clause .= "AND status IN (2,5)";
+        $clause .= "AND a.status IN (2,5)";
     }
 }
 
-$sql = "SELECT * FROM bonus WHERE 1=1 $clause";
+$sql = "SELECT a.*,b.customer FROM bonus AS a 
+LEFT JOIN con_maintance_examine_apply AS b ON a.contract_no = b.vol_no
+WHERE 1=1 $clause";
 $stmt = $conn->prepare($sql);
 $stmt->execute();
 $datas = $stmt->fetchAll(PDO::FETCH_ASSOC);
@@ -130,17 +132,21 @@ function isPay($contract_no, $connT8)
             <a href="/wms/bonus/bonus.php?check=2&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 2) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 未發獎金</a>
             <a href="/wms/bonus/bonus.php?check=3&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 3) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 已發獎金</a>
             <a href="/wms/bonus/bonus.php?check=4&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 4) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 人事發放作業</a>
+            <a href="/wms/bonus/bonus.php?check=5&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 5) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 獎金總計(人)</a>
 
 
             <table id="table_index" class="table table-striped table-bordered" style="width:100%">
                 <?php if (!empty($_GET['check']) && $_GET['check'] == '4') { ?>
                     <button class="btn btn-primary float-end" style="float: right;" onclick="All('<?= $id_str ?>')">鎖定並發放</button>
+                <?php } else { ?>
+                    <input type="text" name="account_name">
+                    <button class="btn btn-primary float-end" style="float: right;">總計搜尋</button>
                 <?php } ?>
                 <thead>
                     <tr>
                         <th>項次</th>
-                        <th>合約類別</th>
                         <th>合約號</th>
+                        <th>合約名稱</th>
                         <th>作番號</th>
                         <th>獎金類別</th>
                         <th>獎金版本</th>
@@ -178,8 +184,8 @@ function isPay($contract_no, $connT8)
                     ?>
                             <tr>
                                 <td><?= $data['id'] ?></td>
-                                <td><?= $contract_type[$data['contract_type']] ?></td>
                                 <td><?= $data['contract_no'] ?></td>
+                                <td><?= $data['customer'] ?></td>
                                 <td><?= $data['facility_no'] ?></td>
                                 <td><?= $bonus_type[$data['bonus_type']] ?></td>
                                 <td><?= $data['bonus_verson'] ?></td>
diff --git a/wms/bonus/other/maintenance_contract_bonus_v2_1.php b/wms/bonus/other/maintenance_contract_bonus_v2_1.php
index 610da6d7..598202d4 100644
--- a/wms/bonus/other/maintenance_contract_bonus_v2_1.php
+++ b/wms/bonus/other/maintenance_contract_bonus_v2_1.php
@@ -55,48 +55,48 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 					case ($discount >= 0.8):
 						switch ($fee_per_st) {
 							case ($fee_per_st <= 3000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.6;
+								$sales_bonus = ($fee_per_st) * 0.6;
 								break;
 							case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.7;
+								$sales_bonus = ($fee_per_st) * 0.7;
 								break;
 							case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.8;
+								$sales_bonus = ($fee_per_st) * 0.8;
 								break;
 							case ($fee_per_st >= 4000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.9;
+								$sales_bonus = ($fee_per_st) * 0.9;
 								break;
 						};
 						break;
 					case ($discount >= 0.6 and $discount < 0.8):
 						switch ($fee_per_st) {
 							case ($fee_per_st <= 3000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.48;
+								$sales_bonus = ($fee_per_st) * 0.48;
 								break;
 							case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.56;
+								$sales_bonus = ($fee_per_st) * 0.56;
 								break;
 							case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.64;
+								$sales_bonus = ($fee_per_st) * 0.64;
 								break;
 							case ($fee_per_st >= 4000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.72;
+								$sales_bonus = ($fee_per_st) * 0.72;
 								break;
 						};
 						break;
 					case ($discount < 0.6):
 						switch ($fee_per_st) {
 							case ($fee_per_st <= 3000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.42;
+								$sales_bonus = ($fee_per_st) * 0.42;
 								break;
 							case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.49;
+								$sales_bonus = ($fee_per_st) * 0.49;
 								break;
 							case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.56;
+								$sales_bonus = ($fee_per_st) * 0.56;
 								break;
 							case ($fee_per_st >= 4000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.63;
+								$sales_bonus = ($fee_per_st) * 0.63;
 								break;
 						};
 						break;
@@ -111,16 +111,16 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 			case "free_to_charge":
 				switch ($fee_per_st) {
 					case ($fee_per_st <= 3000):
-						$sales_bonus = ($fee_per_st - $commission_fee) * 0.3;
+						$sales_bonus = ($fee_per_st) * 0.3;
 						break;
 					case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
-						$sales_bonus = ($fee_per_st - $commission_fee) * 0.35;
+						$sales_bonus = ($fee_per_st) * 0.35;
 						break;
 					case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
-						$sales_bonus = ($fee_per_st - $commission_fee) * 0.4;
+						$sales_bonus = ($fee_per_st) * 0.4;
 						break;
 					case ($fee_per_st >= 4000):
-						$sales_bonus = ($fee_per_st - $commission_fee) * 0.45;
+						$sales_bonus = ($fee_per_st) * 0.45;
 						break;
 				};
 				#地區處長獎金($region_director_bonus)
@@ -132,16 +132,16 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 			case "renew_priceissue":
 				switch ($fee_per_st) {
 					case ($fee_per_st <= 3000):
-						$sales_bonus = ($fee_per_st - $commission_fee) * 0.25;
+						$sales_bonus = ($fee_per_st) * 0.25;
 						break;
 					case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
-						$sales_bonus = ($fee_per_st - $commission_fee) * 0.3;
+						$sales_bonus = ($fee_per_st) * 0.3;
 						break;
 					case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
-						$sales_bonus = ($fee_per_st - $commission_fee) * 0.35;
+						$sales_bonus = ($fee_per_st) * 0.35;
 						break;
 					case ($fee_per_st >= 4000):
-						$sales_bonus = ($fee_per_st - $commission_fee) * 0.4;
+						$sales_bonus = ($fee_per_st) * 0.4;
 						break;
 				};
 				#地區處長獎金($region_director_bonus)
@@ -226,7 +226,10 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 
 				#2月1次
 			case "bimonthly":
-				$payment_ratio_due_array = array(0.166, 0.166, 0.166, 0.166, 0.166, 0.166);
+				$payment_ratio_due_array = array();
+				for ($i = 0; $i < 6; $i++) {
+					array_push($payment_ratio_due_array, 1 / 6);
+				}
 				$payday_due_array = array(1, 3, 5, 7, 9, 11);
 				for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
 					if ($i < count($payment_ratio_due_array) - 1) {
@@ -246,7 +249,12 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 
 				#月付	
 			case "monthly":
-				$payment_ratio_due_array = array(0.083, 0.083, 0.083, 0.083, 0.083, 0.083, 0.083, 0.083, 0.083, 0.083, 0.083, 0.083);
+				$payment_ratio_due_array = array();
+				// $payment_ratio_due_array = array();
+				for ($i = 0; $i < 12; $i++) {
+					array_push($payment_ratio_due_array, 1 / 12);
+				}
+
 				$payday_due_array = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
 				for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
 					if ($i < count($payment_ratio_due_array) - 1) {
diff --git a/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1.php b/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1.php
index 7122fbd3..d29650b2 100644
--- a/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1.php
+++ b/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1.php
@@ -41,12 +41,13 @@ result_array[
 
 
 
-function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract_type, $payment_period_amount, $elevator_list_price, $fee_per_st, $commission_fee, $receivable_date_due, $sales_id, $region_director_id, $regular_contract_manger_id){
+function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract_type, $payment_period_amount, $elevator_list_price, $fee_per_st, $commission_fee, $receivable_date_due, $sales_id, $region_director_id, $regular_contract_manger_id)
+{
 	$bonus_array = [];
-	if ($ver == "2.1"){
+	if ($ver == "2.1") {
 		$discount = round(($fee_per_st - $commission_fee) / $elevator_list_price, 2);
 		#契約總類($contract_type)：簽長約並免費送M1 (longcontract_m1_free_charge)
-		switch ($contract_type){	
+		switch ($contract_type) {
 			case "longcontract_m1_free_charge":
 				#契約員獎金($sales_bonus)
 				#合約折扣率($discount)：大於80%以上(含)(above_80)、60-79%(含)以上(60_to_79)、折扣率59% (含)以下(below_59)
@@ -54,57 +55,57 @@ function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract
 					case ($discount >= 0.8):
 						switch ($fee_per_st) {
 							case ($fee_per_st <= 3000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.6;
+								$sales_bonus = ($fee_per_st) * 0.6;
 								break;
 							case ($fee_per_st > 300 and $fee_per_st <= 4000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.7;		
-								break;						
+								$sales_bonus = ($fee_per_st) * 0.7;
+								break;
 							case ($fee_per_st > 4000 and $fee_per_st <= 5000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.8;
+								$sales_bonus = ($fee_per_st) * 0.8;
 								break;
 							case ($fee_per_st > 5000 and $fee_per_st <= 6000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.9;
-								break;								
+								$sales_bonus = ($fee_per_st) * 0.9;
+								break;
 							case ($fee_per_st > 6000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 1.0;
+								$sales_bonus = ($fee_per_st) * 1.0;
 								break;
 						};
 						break;
 					case ($discount >= 0.6 and $discount < 0.8):
 						switch ($fee_per_st) {
 							case ($fee_per_st <= 3000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.42;
+								$sales_bonus = ($fee_per_st) * 0.42;
 								break;
 							case ($fee_per_st > 300 and $fee_per_st <= 4000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.49;		
-								break;						
+								$sales_bonus = ($fee_per_st) * 0.49;
+								break;
 							case ($fee_per_st > 4000 and $fee_per_st <= 5000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.56;
+								$sales_bonus = ($fee_per_st) * 0.56;
 								break;
 							case ($fee_per_st > 5000 and $fee_per_st <= 6000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.63;
-								break;								
+								$sales_bonus = ($fee_per_st) * 0.63;
+								break;
 							case ($fee_per_st > 6000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.7;
+								$sales_bonus = ($fee_per_st) * 0.7;
 								break;
 						};
 						break;
 					case ($discount < 0.6):
 						switch ($fee_per_st) {
 							case ($fee_per_st <= 3000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.3;
+								$sales_bonus = ($fee_per_st) * 0.3;
 								break;
 							case ($fee_per_st > 300 and $fee_per_st <= 4000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.35;		
-								break;						
+								$sales_bonus = ($fee_per_st) * 0.35;
+								break;
 							case ($fee_per_st > 4000 and $fee_per_st <= 5000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.4;
+								$sales_bonus = ($fee_per_st) * 0.4;
 								break;
 							case ($fee_per_st > 5000 and $fee_per_st <= 6000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.45;
-								break;								
+								$sales_bonus = ($fee_per_st) * 0.45;
+								break;
 							case ($fee_per_st > 6000):
-								$sales_bonus = ($fee_per_st - $commission_fee) * 0.5;
+								$sales_bonus = ($fee_per_st) * 0.5;
 								break;
 						};
 						break;
@@ -116,81 +117,77 @@ function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract
 				$regular_contract_manger_bonus = 300;
 				break;
 		};
-		
+
 		#地區處長獎金、專任契約經理、契約員獎金
-		switch ($payment_period_amount){			
-			#簽長約免費贈送控制系統,因屬於公司特殊政策,所以無汰改獎金,合約期內每月領取契約獎金	
-			#總支付期數$payment_period_amount： 總支付期數，依規定5年約至少60期，
+		switch ($payment_period_amount) {
+				#簽長約免費贈送控制系統,因屬於公司特殊政策,所以無汰改獎金,合約期內每月領取契約獎金	
+				#總支付期數$payment_period_amount： 總支付期數，依規定5年約至少60期，
 			case $payment_period_amount >= 60:
 				#地區處長獎金
-				array_push($bonus_array,[
+				array_push($bonus_array, [
 					"bonus_type" => "地區處長獎金", #獎金名稱
 					"bonus_receiver" => $region_director_id, #發放人員
 					"bonus_amount" => round($region_director_bonus), #金額
-					"pay_day_due" => date("Y-m-d",strtotime("$receivable_date_due +1 months")), #預計發放時間
+					"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +1 months")), #預計發放時間
 					"bonus_regulation" => "訂金收回後次月發放" #發放規定				
-				]);				
+				]);
 
 				#專任契約經理獎金
-				array_push($bonus_array,[
+				array_push($bonus_array, [
 					"bonus_type" => "專任契約經理獎金", #獎金名稱
 					"bonus_receiver" => $regular_contract_manger_id, #發放人員
 					"bonus_amount" => round($regular_contract_manger_bonus), #金額
-					"pay_day_due" => date("Y-m-d",strtotime("$receivable_date_due +1 months")), #預計發放時間
+					"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +1 months")), #預計發放時間
 					"bonus_regulation" => "訂金收回後次月發放" #發放規定				
-				]);	
-			
+				]);
+
 				#產生契約員每個月的獎金應發比例
 				$payment_ratio_due_array = array();
 				for ($i = 0; $i < $payment_period_amount; $i++) {
-					array_push($payment_ratio_due_array, 1/$payment_period_amount);
-				}				
-				
+					array_push($payment_ratio_due_array, 1 / $payment_period_amount);
+				}
+
 				$payday_due_array = array();
 				for ($i = 0; $i < $payment_period_amount; $i++) {
-					array_push($payday_due_array, $i+1 );
-				}					
-				
-				for($i = 0; $i < count($payment_ratio_due_array); $i++) {
-					if($i < count($payment_ratio_due_array) - 1){
+					array_push($payday_due_array, $i + 1);
+				}
+
+				for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
+					if ($i < count($payment_ratio_due_array) - 1) {
 						$current_bonus = round($sales_bonus * $payment_ratio_due_array[$i]); #金額
-					}else{
+					} else {
 						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
-					};				
-					array_push($bonus_array,[
+					};
+					array_push($bonus_array, [
 						"bonus_type" => "契約員獎金", #獎金名稱
 						"bonus_receiver" => $sales_id, #發放人員
 						"bonus_amount" => round($current_bonus), #金額
-						"pay_day_due" => date("Y-m-d",strtotime("$receivable_date_due +$payday_due_array[$i] months")), #預計發放時間
+						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] months")), #預計發放時間
 						"bonus_regulation" => "每月收款後,按收款比率次月發放" #發放規定				
-					]);	
-				}					
+					]);
+				}
 				break;
 		}
-		
+
 		$result_array = [
-			"ver"=>$ver, #獎金版本
-			"result_status"=>"success", #計算結果	
-			"bonus_array"=>$bonus_array #獎金水庫
+			"ver" => $ver, #獎金版本
+			"result_status" => "success", #計算結果	
+			"bonus_array" => $bonus_array #獎金水庫
 		];
-
-	}else{
-		array_push($bonus_array,[
+	} else {
+		array_push($bonus_array, [
 			"bonus_type" => "error", #獎金名稱
 			"bonus_receiver" => "error", #發放人員
 			"bonus_amount" => 0, #金額
 			"pay_day_due" => "9999-1-1", #預計發放時間
 			"bonus_regulation" => "error" #發放規定				
-		]);	
+		]);
 		$result_array = [
-			"ver"=>$ver, #獎金版本
-			"result_status"=>"error", #計算結果	
-			"bonus_array"=>$bonus_array #獎金水庫
-		];	
+			"ver" => $ver, #獎金版本
+			"result_status" => "error", #計算結果	
+			"bonus_array" => $bonus_array #獎金水庫
+		];
 	}
-	
+
 	return $result_array;
 };
-
-
-?>
diff --git a/wms/contract/api/getContractData.php b/wms/contract/api/getContractData.php
index 253e8d54..5534b8eb 100644
--- a/wms/contract/api/getContractData.php
+++ b/wms/contract/api/getContractData.php
@@ -1,5 +1,6 @@
 <?php
 require_once('../conn.php');
+// 保養
 if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['contracttype']) && $_GET['contracttype'] == 'b') {
     try {
         $contractno = $_GET['contractno'];
@@ -43,6 +44,7 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
     }
 }
 
+// 新梯
 if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['contracttype']) && $_GET['contracttype'] == 'm') {
     try {
         $contractno = $_GET['contractno'];
@@ -69,11 +71,51 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
         $stmt = $conn->prepare($sql);
         $stmt->bindParam(':mid', $mid);
         $stmt->execute();
-        $results = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        $elevators_results = $stmt->fetchAll(PDO::FETCH_ASSOC);
         $elevators_detail_arr = [];
-        foreach ($results as $keys => $result) {
+
+        $sql = "SELECT * FROM pricereview_item WHERE mid =:mid AND item_group ='B' ";
+        $stmt = $conn->prepare($sql);
+        $stmt->bindParam(':mid', $mid);
+        $stmt->execute();
+        $option_results = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        $option_arr = [];
+
+        foreach ($elevators_results as $keys => $result) {
+            $item_no = $result['item_no']; //電梯項次
+            // 電梯 OPTION 
+            $sql = "SELECT * FROM pricereview_item WHERE mid =:mid AND item_group ='B' AND option_relate_spec = :item_no";
+            $stmt = $conn->prepare($sql);
+            $stmt->bindParam(':mid', $mid);
+            $stmt->bindParam(':item_no', $item_no);
+            $stmt->execute();
+            $option_results = $stmt->fetchAll(PDO::FETCH_ASSOC);
+            $option_arr[] = $option_results;
+            if (!empty($option_results)) {
+                $result['option_price'] = 0;
+                // 電梯 OPTION 價格分別加到各台電梯
+                foreach ($option_arr[$keys] as $key => $option) {
+                    if ($option['item_qty'] == $result['item_qty']) {
+                        $result['option_price'] += intval($option['item_unit_price']);
+                        echo '1..';
+                    } else if ($option['item_qty'] > $result['item_qty'] != 1) {
+                        $item_qty = intval($option['item_qty']) / intval($result['item_qty']); // 總option數量 / 總電梯台數
+                        $result['option_price'] += intval($option['item_unit_price']) * $item_qty;
+                        echo '2..';
+                    } else {
+                        $result['option_price'] += $option['item_unit_price'] * intval($option['item_qty']);
+                        echo '3..';
+                    }
+                    echo '<pre>';
+                    print_r($option['item_no'] . '--->' . $option['item_unit_price']);
+                    echo '</pre>';
+                }
+
+                print_r($result['option_price']);
+                exit();
+            }
             $note = explode(',', $result['note']);
-            $result['spec'] = $note[0]; //型號
+            $result['spec'] = $note[0];   //型號
             $result['person'] = $note[1]; // 人承
             $result['floor'] = $note[2]; // 樓層
             $result['speed'] = $note[3]; // 速度
@@ -82,21 +124,20 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
                 array_push($elevators_detail_arr, $result);
             }
         }
+        // print_r(COUNT($option_results));
+
         $count = COUNT($elevators_detail_arr);
 
-        $contract['elevators'] = $results;
+        $contract['elevators'] = $elevators_results;
         $contract['elevators_detail_arr'] = $elevators_detail_arr;
         $contract['nums'] = $count;
-        // echo '<pre>';
-        // print_r($contract);
-        // echo '</pre>';
-        // exit;
+
         $contractResponse = json_encode($contract);
         // 設定回應標頭為 JSON
         header('Content-Type: application/json');
 
         // 將 JSON 回應返回給客戶端
-        echo $contractResponse;
+        // echo $contractResponse;
     } catch (PDOException $e) {
         die("ERROR!!!: " . $e->getMessage());
     }
diff --git a/wms/contract/api/postContractData.php b/wms/contract/api/postContractData.php
index 29038b9f..d3ecf356 100644
--- a/wms/contract/api/postContractData.php
+++ b/wms/contract/api/postContractData.php
@@ -88,10 +88,10 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         if ($address == '')  $fail_arr[] = '地址為必填';
         if ($area == '')  $fail_arr[] = '區域為必填';
         if ($customer == '')  $fail_arr[] = '客戶為必填';
-        if ($partyA == '')  $fail_arr[] = '業務聯繫人為必填';
-        if ($partyAaddress == '')  $fail_arr[] = '業務聯繫人地址為必填';
-        if ($partyAphone == '')  $fail_arr[] = '業務聯繫人電話為必填';
-        if ($partyAemail == '')  $fail_arr[] = '業務聯繫人Email為必填';
+        // if ($partyA == '')  $fail_arr[] = '業務聯繫人為必填';
+        // if ($partyAaddress == '')  $fail_arr[] = '業務聯繫人地址為必填';
+        // if ($partyAphone == '')  $fail_arr[] = '業務聯繫人電話為必填';
+        // if ($partyAemail == '')  $fail_arr[] = '業務聯繫人Email為必填';
         if ($num == '')  $fail_arr[] = '電梯數量為必填';
         if ($payType == '') $fail_arr[] = '付款方式為必填';
         if (count($fail_arr) > 0) {
@@ -99,7 +99,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
             echo json_encode($fail_arr);
             exit();
         }
-        T8insert($_POST, $facilityno, $depId);
+        // T8insert($_POST, $facilityno, $depId);
         bonusCreate($_POST, $facilityno, $conn);
         //create account table
         $accounttype = "A";
@@ -127,7 +127,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         $stmt->bindParam(':repairerid', $repairerid);
         $stmt->bindParam(':creater', $creater);
         $stmt->bindParam(':create_at', $create_at);
-        $stmt->execute();
+        // $stmt->execute();
 
         //create contract table
 
@@ -163,7 +163,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         $stmt->bindParam(':end_date', $end_date);
         $stmt->bindParam(':creater', $creater);
         $stmt->bindParam(':create_at', $create_at);
-        $stmt->execute();
+        // $stmt->execute();
 
         //create facility table
         // $createFacilityNo = new CreateFacilityNo();
@@ -238,7 +238,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
             $stmt->bindParam(':area', $area);
             $stmt->bindParam(':takecertificatedate', $elevator['takecertificatedate']);
             $stmt->bindParam(':licensedate', $ADuseful_date);
-            $result = $stmt->execute();
+            // $result = $stmt->execute();
         }
 
         //create schedule table
@@ -259,7 +259,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
                 $stmt->bindParam(':duedate', $combo[1]);
                 $stmt->bindParam(':creater', $creater);
                 $stmt->bindParam(':create_at', $create_at);
-                $result = $stmt->execute();
+                // $result = $stmt->execute();
             }
         }
         // create contract_b_signed_back table
@@ -366,7 +366,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         $stmt->bindParam(":created_by", $user_id);
         $stmt->bindParam(':payType', $payType);
 
-        $stmt->execute();
+        // $stmt->execute();
 
         // T8insert($_POST, $facilityno);
 
@@ -665,7 +665,7 @@ function bonusCreate($data, $facilityno, $conn)
         $status = 1;
         $bonus_json = [];
         $create_id = $data['user_id'];
-        $create_at = date('Y-m-d');
+        $create_at = date('Y-m-d H:i:s');
         $contract_no = !empty($data['contractno']) ? $data['contractno'] : '';
         $contract_kind = 3;
 
@@ -689,7 +689,7 @@ function bonusCreate($data, $facilityno, $conn)
             $contract_type = $elevator['contract_type']; //合約類別
             $payment_period = $payment[$payType]; //付款方式
             $elevator_list_price = intval($elevator['stand_price']); //牌價
-            $fee_per_st = $elevator['contract_price']; //作翻契約金額
+            $fee_per_st = $elevator['sold_price']; //作翻契約金額
             $commission_fee = $elevator['service_expense']; //服務費(月)
             $receivable_date_due = $payDay; //第一筆保養款項收回日
             $sales_id = $salesman; //營業人員
@@ -722,6 +722,7 @@ function bonusCreate($data, $facilityno, $conn)
                     $stmt->execute();
                 }
             }
+            // exit();
         }
         // exit();
     } catch (PDOException $e) {
diff --git a/wms/contract/api/postNewContractData.php b/wms/contract/api/postNewContractData.php
index d94dac12..6180e4d4 100644
--- a/wms/contract/api/postNewContractData.php
+++ b/wms/contract/api/postNewContractData.php
@@ -27,7 +27,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
     $elevators_nums = $_POST['nums'];
     $elevators = json_decode($_POST['elevators'], true);
     $elevators_detail_arr = json_decode($_POST['elevators_detail_arr'], true);
-    BounsCount($_POST, $conn);
+
     // echo '<pre>';
     // print_r($elevators);
     // echo '</pre>';
@@ -54,12 +54,12 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
     //create facility table
     $createFacilityNo = new CreateFacilityNo();
     $dailyNecessities = [
-      'MAE100' => 'X',
-      'MAM200' => 'W',
-      'MAH100' => 'H',
-      'MAQ100' => 'Z',
-      'MAF100' => 'F',
-      'MAZ100' => 'B',
+      'MAE100' => 'X', //小機房客梯
+      'MAM200' => 'W', //無機房客梯
+      'MAH100' => 'H', //小電梯
+      'MAQ100' => 'Z', //強趨梯
+      'MAF100' => 'F', //貨梯
+      'MAP100' => 'B', //平台梯
     ];
     $arr = [];
     // 建立作番號
@@ -68,9 +68,8 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
       $arr[] = $dailyNecessities[$elevator['spec']];
     }
     $facilityno = $createFacilityNo->makeMFacilityNo('M', $arr, intval($elevators_nums));
-    echo '<pre>';
-    print_r($facilityno);
-    echo '</pre>';
+
+    BounsCount($_POST, $conn, $facilityno);
     exit();
     $conn->beginTransaction();
 
@@ -282,39 +281,63 @@ function T8Insert($data)
 }
 
 
-function BounsCount($data, $conn)
+function BounsCount($data, $conn, $facilityno)
 {
   // echo '<pre>';
-  // print_r($data);
+  // print_r($facilityno);
   // echo '</pre>';
   // exit;
   require_once("../../bonus/elevator_new/elevator_new_deal_bonus.php");
-  $signing_date = $data['signing_date'];
-  $bonus_v1_0_date = '2024-01-02';
-  $bonus_v2_0_date = '2024-01-03';
+  $dailyNecessities = [
+    'MAE100' => 'passenger', //小機房
+    'MAM200' => 'passenger', //無機房
+    'MAH100' => 'dumbwaiter', //小電梯
+    'MAQ100' => 'positive_drive', //強趨梯
+    'MAF100' => 'cargo', //貨梯
+    'MAP100' => 'flatbase', // 平台踢
+  ];
   $contractType = [
     '1' => 'strategy_customer',
     '2' => 'general_customer'
   ];
+  $signing_date = $data['signing_date'];
+  $bonus_v1_0_date = '2024-01-02';
+  $bonus_v2_0_date = '2024-01-03';
   $contract_type = $data['contract_type'];
 
   $type = $contractType[$contract_type]; //戰略客戶 or 一般客戶
-  $elevator_knockdown_price = $data['price_total']; //受價總額
+  // $elevator_knockdown_price = $data['price_total']; //受價總額
+  $elevators = json_decode($data['elevators_detail_arr'], true);
 
   $salesman = $data['salesman'];
   $manager = $data['manager'];
 
+
+
   $result_bonus = [];
+  $result_bonus_arr = [];
   if ($signing_date <= $bonus_v1_0_date) {
     $ver = '1.0';
-    $result_bonus = elevator_new_deal_bonus_v1_0($ver, $type, $elevator_knockdown_price, $salesman, $manager);
+    foreach ($elevators as $i => $elevator) {
+
+      $elevator_knockdown_price = $elevator['item_price_ct'];
+      $result_bonus = elevator_new_deal_bonus_v1_0($ver, $type, $elevator_knockdown_price, $salesman, $manager);
+      $result_bonus['facility'] = $facilityno[$i];
+      $result_bonus_arr[] = $result_bonus;
+    }
   } else if ($signing_date >= $bonus_v2_0_date) {
     $ver = '2.0';
-    // $result_bonus = elevator_new_deal_bonus_v2_0($ver,$contract_type,);
+    foreach ($elevators as $i => $elevator) {
+      $elevator_type = $dailyNecessities[$elevator['spec']];
+      $elevator_list_price = $elevator[''];
+      $result_bonus = elevator_new_deal_bonus_v2_0($ver, $contract_type, $elevator_type, $elevator_list_price, $elevator_knockdown_price, $sales_id, $region_manger_id);
+    }
   }
-
+  // foreach ($elevators as $elevator) {
+  //   $elevator_knockdown_price = $elevator['item_price_ct'];
+  // }
   echo '<pre>';
-  print_r($result_bonus);
+  print_r($result_bonus_arr);
   echo '</pre>';
   exit();
   try {
diff --git a/wms/contract/contract-input.php b/wms/contract/contract-input.php
index 114cea2f..58acb4a8 100644
--- a/wms/contract/contract-input.php
+++ b/wms/contract/contract-input.php
@@ -111,7 +111,7 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                             </td>
                             <td style="vertical-align: middle">契約成交價</td>
                             <td>
-                                <input class="form-control disabled_select" type="text" name="tel" x-model="data.total_price" :disabled="data.disabled">
+                                <input class="form-control disabled_select" type="number" name="tel" x-model="data.total_price" :disabled="data.disabled">
                                 <p class="alerttext" x-show="data.total_price==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                             </td>
                         </tr>
@@ -158,7 +158,7 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 <p class="alerttext" x-show="data.payType==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                             </td>
                         </tr>
-                        <tr>
+                        <!-- <tr>
                             <td style="vertical-align: middle">業務聯繫人</td>
                             <td>
                                 <input type="text" x-model="data.partyA" name="partyA" />
@@ -179,7 +179,7 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 <input class="form-control disabled_select" type="email" name="contracttel" x-model="data.partyAemail">
                                 <p class="alerttext" x-show="data.partyAemail==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                             </td>
-                        </tr>
+                        </tr> -->
                         <tr>
                             <td style="vertical-align: middle">區域</td>
                             <td>
@@ -374,28 +374,28 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 </td>
                                 <td style="vertical-align:middle">獎金適用版本</td>
                                 <td>
-                                    <input type="text" x-model="elevator.bonus_verson" disabled="disabled">
+                                    <input type="text" x-model="elevator.bonus_verson">
                                 </td>
                             </tr>
                             <tr>
                                 <td style="vertical-align:middle">作番契約金額(月)</td>
-                                <td><input type="text" x-model="elevator.sold_price" disabled></td>
+                                <td><input type="text" x-model="elevator.sold_price"></td>
 
                                 <td style="vertical-align:middle">牌價(標準價)</td>
                                 <td>
-                                    <input type="text" x-model="elevator.stand_price" disabled>
+                                    <input type="text" x-model="elevator.stand_price">
                                     <p>標準價+Option價格+與其他電梯共同分擔的費用貨價格</p>
                                 </td>
                                 <td style="vertical-align:middle">服務費</td>
                                 <td>
-                                    <input type="text" x-model="elevator.service_expense" disabled>
+                                    <input type="text" x-model="elevator.service_expense">
                                 </td>
-                                <td style="vertical-align:middle">折扣率(%)</td>
-                                <td><input type="text" x-model='elevator.discount' disabled></td>
+                                <td style="vertical-align:middle">折扣率(%) <br />(作番契約金額+服務費/台數) / 牌價 * 100</td>
+                                <td><input type="text" x-model='elevator.discount'></td>
                             </tr>
                             <tr>
                                 <td style="vertical-align:middle">地區處長員工號</td>
-                                <td><input type="text" x-model="elevator.manager" disabled></td>
+                                <td><input type="text" x-model="elevator.manager"></td>
                                 <td style="vertical-align:middle">專任契約經理員工號</td>
                                 <td><input type="text" x-model="elevator.regular_contract_manger_id"></td>
                             </tr>
diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js
index b2ad1eb9..db386702 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -1090,7 +1090,8 @@ const contractInput = () => {
                     contract_type: '',
                     manager: '',
                     regular_contract_manger_id: '',
-                    bonus_verson: ''
+                    bonus_verson: '',
+                    sold_price: ''
                 })
             }
         },

From f1aca066250b6c8ca403801102a6fe36307d19d5 Mon Sep 17 00:00:00 2001
From: Cheng <lkmd555@masada.com.tw>
Date: Tue, 27 Feb 2024 17:37:18 +0800
Subject: [PATCH 04/16] =?UTF-8?q?=E4=BF=9D=E9=A4=8A=E7=8D=8E=E9=87=91?=
 =?UTF-8?q?=E8=A8=88=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../other/maintenance_contract_bonus_v2_1.php |  24 +-
 ...enance_contract_bonus_v2_1_examination.php |   8 +-
 ...m_contract_m1_free_charge_bonus_v2_1_1.php | 312 ++++++++++++++++++
 ..._m1_free_charge_bonus_v2_1_examination.php | 174 +++++++---
 wms/contract/api/postContractData.php         | 140 +++++++-
 wms/contract/contract-input.php               |  54 +--
 wms/contract/js/alpine.js                     |  55 +--
 7 files changed, 649 insertions(+), 118 deletions(-)
 create mode 100644 wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_1.php

diff --git a/wms/bonus/other/maintenance_contract_bonus_v2_1.php b/wms/bonus/other/maintenance_contract_bonus_v2_1.php
index 598202d4..27959883 100644
--- a/wms/bonus/other/maintenance_contract_bonus_v2_1.php
+++ b/wms/bonus/other/maintenance_contract_bonus_v2_1.php
@@ -45,7 +45,9 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 {
 	$bonus_array = [];
 	if ($ver == "2.1") {
-		$discount = round(($fee_per_st - $commission_fee) / $elevator_list_price, 2);
+		// $discount = round(($fee_per_st - $commission_fee) / $elevator_list_price, 2);
+		$discount = ($fee_per_st - $commission_fee) / $elevator_list_price;
+
 		#契約總類($contract_type)：新簽約(new)、免保轉有費(free_to_charge)、續簽約(原價或僅契約金額異動)(renew_priceissue)
 		switch ($contract_type) {
 			case "new":
@@ -54,10 +56,10 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 				switch ($discount) {
 					case ($discount >= 0.8):
 						switch ($fee_per_st) {
-							case ($fee_per_st <= 3000):
+							case ($fee_per_st < 3000):
 								$sales_bonus = ($fee_per_st) * 0.6;
 								break;
-							case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
+							case ($fee_per_st >= 3000 and $fee_per_st <= 3499):
 								$sales_bonus = ($fee_per_st) * 0.7;
 								break;
 							case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
@@ -70,10 +72,10 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 						break;
 					case ($discount >= 0.6 and $discount < 0.8):
 						switch ($fee_per_st) {
-							case ($fee_per_st <= 3000):
+							case ($fee_per_st < 3000):
 								$sales_bonus = ($fee_per_st) * 0.48;
 								break;
-							case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
+							case ($fee_per_st >= 3000 and $fee_per_st <= 3499):
 								$sales_bonus = ($fee_per_st) * 0.56;
 								break;
 							case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
@@ -86,10 +88,10 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 						break;
 					case ($discount < 0.6):
 						switch ($fee_per_st) {
-							case ($fee_per_st <= 3000):
+							case ($fee_per_st < 3000):
 								$sales_bonus = ($fee_per_st) * 0.42;
 								break;
-							case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
+							case ($fee_per_st >= 3000 and $fee_per_st <= 3499):
 								$sales_bonus = ($fee_per_st) * 0.49;
 								break;
 							case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
@@ -110,10 +112,10 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 
 			case "free_to_charge":
 				switch ($fee_per_st) {
-					case ($fee_per_st <= 3000):
+					case ($fee_per_st < 3000):
 						$sales_bonus = ($fee_per_st) * 0.3;
 						break;
-					case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
+					case ($fee_per_st >= 3000 and $fee_per_st <= 3499):
 						$sales_bonus = ($fee_per_st) * 0.35;
 						break;
 					case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
@@ -131,10 +133,10 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 
 			case "renew_priceissue":
 				switch ($fee_per_st) {
-					case ($fee_per_st <= 3000):
+					case ($fee_per_st < 3000):
 						$sales_bonus = ($fee_per_st) * 0.25;
 						break;
-					case ($fee_per_st >= 3001 and $fee_per_st <= 3499):
+					case ($fee_per_st >= 3000 and $fee_per_st <= 3499):
 						$sales_bonus = ($fee_per_st) * 0.3;
 						break;
 					case ($fee_per_st >= 3500 and $fee_per_st <= 3999):
diff --git a/wms/bonus/other/maintenance_contract_bonus_v2_1_examination.php b/wms/bonus/other/maintenance_contract_bonus_v2_1_examination.php
index d68bdb7d..5b26e9c8 100644
--- a/wms/bonus/other/maintenance_contract_bonus_v2_1_examination.php
+++ b/wms/bonus/other/maintenance_contract_bonus_v2_1_examination.php
@@ -270,9 +270,9 @@ $examination_array = [
 // echo '10、專任契約經理員工號($regular_contract_manger_id)</br>';
 
 for ($i = 0; $i < count($examination_array); $i++) {
-	$fee_per_st = $examination_array[$i][3];
-	$commission_fee = $examination_array[$i][5];
-	$elevator_list_price = $examination_array[$i][4];
+	$fee_per_st = $examination_array[$i][4];  //作番金額
+	$commission_fee = $examination_array[$i][5];  // 服務費
+	$elevator_list_price = $examination_array[$i][3]; // 牌價
 	$discount = round(($fee_per_st - $commission_fee) / $elevator_list_price, 2);
 
 	// echo "$fee_per_st - $commission_fee / $elevator_list_price ";
@@ -314,7 +314,7 @@ for ($i = 0; $i < count($examination_array); $i++) {
 	];
 	echo "獎金版本:" . $result["ver"] . "<br>";
 	echo "計算結果:" . $result["result_status"] . "<br>";
-	echo "傳入參數說明：" . $contract_type[$examination_array[$i][1]] . "、" . $pay_kind[$examination_array[$i][2]] . "、牌價" . $examination_array[$i][3] . "元、簽約價" . $examination_array[$i][4] . "元、服務費600元(折扣率" . $discount . ")、契約人員 : " . $examination_array[$i][7] . "、區經理 : " . $examination_array[$i][8] . " 、契約經理 : " . $examination_array[$i][9] . "<br>";
+	echo "傳入參數說明：" . $contract_type[$examination_array[$i][1]] . "、" . $pay_kind[$examination_array[$i][2]] . "、牌價" . $examination_array[$i][3] . "元、簽約價" . $examination_array[$i][4] . "元、服務費" . $commission_fee . "元(折扣率" . $discount . ")、契約人員 : " . $examination_array[$i][7] . "、區經理 : " . $examination_array[$i][8] . " 、契約經理 : " . $examination_array[$i][9] . "<br>";
 	echo "輸入參數：" . $examination_array[$i][1] . "  " . $examination_array[$i][2] . "  " . $examination_array[$i][3] . "  " . $examination_array[$i][4] . "  "
 		. $examination_array[$i][5] . "  " . $examination_array[$i][6] . "  " . $examination_array[$i][7] . "  " . $examination_array[$i][8] . "  "
 		. $examination_array[$i][9] . "<br>";
diff --git a/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_1.php b/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_1.php
new file mode 100644
index 00000000..70a19f40
--- /dev/null
+++ b/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_1.php
@@ -0,0 +1,312 @@
+<?php
+/* 函數用法與參數
+【1.輸入參數：】
+獎金版本($ver)：2.1
+契約總類($contract_type)：簽長約並免費送M1 (longcontract_m1_free_charge)
+作番契約金額($fee_per_st)：3000元/月以下、3001-3499元/月、3500-3999元/月、4000元/月以上
+牌價($elevator_list_price)：該電梯的合約發佈(標準)價+Option價格+與其他電梯共同分擔的費用貨價格
+該作番所佔的服務費金額($commission_fee)
+合約折扣率($discount)：大於80%以上(含)(above_80)、60-79%(含)以上(60_to_79)、折扣率59% (含)以下(below_59) ； 契約折扣率=(簽約價格-服務費)/牌價
+總支付期數$payment_period_amount： 總支付期數，依規定5年約至少60期，
+付款方式$payment_period： 每月支付(monthly), 2月1次(bimonthly), 季付(quarterly), 半年付(semiannually), 年付(annually)
+第一筆保養款項應收回日($receivable_date_due, array)
+契約員員工號($sales_id)
+地區處長員工號($region_director_id)
+專任契約經理員工號($regular_contract_manger_id)
+
+【2.函數中的變數說明】
+契約員獎金($sales_bonus)
+地區處長獎金($region_director_bonus)
+專任契約經理獎金($regular_contract_manger_bonus)
+獎金預計發放比例($payment_ratio_due_array)
+當次應發獎金($current_bonus)
+獎金預計發放日($payday_due_array)
+獎金預計發放規定($payday_due_regulation)：合約簽回及保養款項收回的次月一次性發
+計算結果($result_status)：success, error
+獎金水庫(bonus_array)[
+  bonus_type:獎金名稱,
+  bonus_receiver:發放人員,
+  bonus_amount:金額,
+  pay_day_due:預計發放時間
+  bonus_regulation, 發放規定
+  ]
+
+【3.輸出數據】
+result_array[
+	"ver"=>$ver, #獎金版本
+	"result_status"=>"success", #計算結果	
+	"$bonus_array"=>$bonus_array #所有獎金水庫
+	];
+
+*/
+
+
+
+function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract_type, $payment_period, $payment_period_amount, $elevator_list_price, $fee_per_st, $commission_fee, $receivable_date_due, $sales_id, $region_director_id, $regular_contract_manger_id = '')
+{
+	$bonus_array = [];
+	if ($ver == "2.1") {
+		$discount = ($fee_per_st - $commission_fee) / $elevator_list_price;
+		#契約總類($contract_type)：簽長約並免費送M1 (longcontract_m1_free_charge)
+		switch ($contract_type) {
+			case "longcontract_m1_free_charge":
+				#契約員獎金($sales_bonus)
+				#合約折扣率($discount)：大於80%以上(含)(above_80)、60-79%(含)以上(60_to_79)、折扣率59% (含)以下(below_59)
+				switch ($discount) {
+					case ($discount >= 0.8):
+						switch ($fee_per_st) {
+							case ($fee_per_st < 3000):
+								$sales_bonus = ($fee_per_st) * 0.6;
+								break;
+							case ($fee_per_st >= 3000 and $fee_per_st < 4000):
+								$sales_bonus = ($fee_per_st) * 0.7;
+								break;
+							case ($fee_per_st >= 4000 and $fee_per_st < 5000):
+								$sales_bonus = ($fee_per_st) * 0.8;
+								break;
+							case ($fee_per_st >= 5000 and $fee_per_st < 6000):
+								$sales_bonus = ($fee_per_st) * 0.9;
+								break;
+							case ($fee_per_st >= 6000):
+								$sales_bonus = ($fee_per_st) * 1.0;
+								break;
+						};
+						break;
+					case ($discount >= 0.6 and $discount < 0.8):
+						switch ($fee_per_st) {
+							case ($fee_per_st < 3000):
+								$sales_bonus = ($fee_per_st) * 0.42;
+								break;
+							case ($fee_per_st >= 3000 and $fee_per_st <= 4000):
+								$sales_bonus = ($fee_per_st) * 0.49;
+								break;
+							case ($fee_per_st >= 4000 and $fee_per_st < 5000):
+								$sales_bonus = ($fee_per_st) * 0.56;
+								break;
+							case ($fee_per_st >= 5000 and $fee_per_st < 6000):
+								$sales_bonus = ($fee_per_st) * 0.63;
+								break;
+							case ($fee_per_st >= 6000):
+								$sales_bonus = ($fee_per_st) * 0.7;
+								break;
+						};
+						break;
+					case ($discount < 0.6):
+						switch ($fee_per_st) {
+							case ($fee_per_st < 3000):
+								$sales_bonus = ($fee_per_st) * 0.3;
+								break;
+							case ($fee_per_st >= 3000 and $fee_per_st < 4000):
+								$sales_bonus = ($fee_per_st) * 0.35;
+								break;
+							case ($fee_per_st >= 4000 and $fee_per_st < 5000):
+								$sales_bonus = ($fee_per_st) * 0.4;
+								break;
+							case ($fee_per_st >= 5000 and $fee_per_st < 6000):
+								$sales_bonus = ($fee_per_st) * 0.45;
+								break;
+							case ($fee_per_st >= 6000):
+								$sales_bonus = ($fee_per_st) * 0.5;
+								break;
+						};
+						break;
+				};
+
+				#地區處長獎金($region_director_bonus)
+				$region_director_bonus = 170;
+				#專任契約經理獎金($regular_contract_manger_bonus)
+				$regular_contract_manger_bonus = 300;
+				break;
+		};
+		#付款方式$payment_period： 每月支付(monthly), 2月1次(bimonthly), 季付(quarterly), 半年付(semiannually), 年付(annually)
+		array_push($bonus_array, [
+			"bonus_type" => "地區處長獎金", #獎金名稱
+			"bonus_receiver" => $region_director_id, #發放人員
+			"bonus_amount" => round($region_director_bonus), #金額
+			"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +12 months")), #預計發放時間
+			"bonus_regulation" => "訂金收回後次月發放" #發放規定				
+		]);
+
+		#專任契約經理獎金
+		if ($regular_contract_manger_id != '') {
+			array_push($bonus_array, [
+				"bonus_type" => "專任契約經理獎金", #獎金名稱
+				"bonus_receiver" => $regular_contract_manger_id, #發放人員
+				"bonus_amount" => round($regular_contract_manger_bonus), #金額
+				"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +12 months")), #預計發放時間
+				"bonus_regulation" => "訂金收回後次月發放" #發放規定				
+			]);
+		}
+
+		#地區處長獎金、專任契約經理、契約員獎金
+		switch ($payment_period) {
+				#簽長約免費贈送控制系統,因屬於公司特殊政策,所以無汰改獎金,合約期內每月領取契約獎金	
+				#總支付期數$payment_period_amount： 總支付期數，依規定5年約至少60期，
+				#年繳
+			case 'annually':
+				$payment_ratio_due_array = array();
+				$a = $payment_period_amount / 12;
+				for ($i = 0; $i < $a; $i++) {
+					array_push($payment_ratio_due_array, 1 / $a);
+				}
+
+				$payday_due_array = array();
+				for ($i = 0; $i < $a; $i++) {
+					array_push($payday_due_array, $i + 1);
+				}
+
+				for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
+					if ($i < count($payment_ratio_due_array) - 1) {
+						$current_bonus = round($sales_bonus * $payment_ratio_due_array[$i]); #金額
+					} else {
+						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
+					};
+					array_push($bonus_array, [
+						"bonus_type" => "契約員獎金", #獎金名稱
+						"bonus_receiver" => $sales_id, #發放人員
+						"bonus_amount" => round($current_bonus), #金額
+						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] year")), #預計發放時間
+						"bonus_regulation" => "每月收款後,按收款比率次月發放" #發放規定				
+					]);
+				}
+
+				break;
+				#半年繳
+			case 'semiannually':
+				$payment_ratio_due_array = array();
+				$a = $payment_period_amount / 6;
+				for ($i = 0; $i < $a; $i++) {
+					array_push($payment_ratio_due_array, 1 / $a);
+				}
+
+				$payday_due_array = array();
+				for ($i = 0; $i < $a; $i++) {
+					array_push($payday_due_array, ($i + 1) * 6);
+				}
+
+				for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
+					if ($i < count($payment_ratio_due_array) - 1) {
+						$current_bonus = round($sales_bonus * $payment_ratio_due_array[$i]); #金額
+					} else {
+						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
+					};
+					array_push($bonus_array, [
+						"bonus_type" => "契約員獎金", #獎金名稱
+						"bonus_receiver" => $sales_id, #發放人員
+						"bonus_amount" => round($current_bonus), #金額
+						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] months")), #預計發放時間
+						"bonus_regulation" => "每月收款後,按收款比率次月發放" #發放規定				
+					]);
+				}
+				break;
+				#季繳
+			case 'quarterly':
+				$a = $payment_period_amount / 3;
+				$payment_ratio_due_array = array();
+				for ($i = 0; $i < $a; $i++) {
+					array_push($payment_ratio_due_array, 1 / $a);
+				}
+
+				$payday_due_array = array();
+				for ($i = 0; $i < $a; $i++) {
+					array_push($payday_due_array, ($i + 1) * 4);
+				}
+
+				for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
+					if ($i < count($payment_ratio_due_array) - 1) {
+						$current_bonus = round($sales_bonus * $payment_ratio_due_array[$i]); #金額
+					} else {
+						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
+					};
+					array_push($bonus_array, [
+						"bonus_type" => "契約員獎金", #獎金名稱
+						"bonus_receiver" => $sales_id, #發放人員
+						"bonus_amount" => round($current_bonus), #金額
+						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] months")), #預計發放時間
+						"bonus_regulation" => "每月收款後,按收款比率次月發放" #發放規定				
+					]);
+				}
+				break;
+				break;
+				#雙月繳
+			case 'bimonthly':
+				$a = $payment_period_amount / 2;
+				$payment_ratio_due_array = array();
+				for ($i = 0; $i < $a; $i++) {
+					array_push($payment_ratio_due_array, 1 / $a);
+				}
+
+				$payday_due_array = array();
+				for ($i = 0; $i < $a; $i++) {
+					array_push($payday_due_array, ($i + 1) * 2);
+				}
+
+				for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
+					if ($i < count($payment_ratio_due_array) - 1) {
+						$current_bonus = round($sales_bonus * $payment_ratio_due_array[$i]); #金額
+					} else {
+						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
+					};
+					array_push($bonus_array, [
+						"bonus_type" => "契約員獎金", #獎金名稱
+						"bonus_receiver" => $sales_id, #發放人員
+						"bonus_amount" => round($current_bonus), #金額
+						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] months")), #預計發放時間
+						"bonus_regulation" => "每月收款後,按收款比率次月發放" #發放規定				
+					]);
+				}
+				break;
+				break;
+				#月繳
+			case 'monthly':
+
+				#產生契約員每個月的獎金應發比例
+				$payment_ratio_due_array = array();
+				for ($i = 0; $i < $payment_period_amount; $i++) {
+					array_push($payment_ratio_due_array, 1 / $payment_period_amount);
+				}
+
+				$payday_due_array = array();
+				for ($i = 0; $i < $payment_period_amount; $i++) {
+					array_push($payday_due_array, $i + 1);
+				}
+
+				for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
+					if ($i < count($payment_ratio_due_array) - 1) {
+						$current_bonus = round($sales_bonus * $payment_ratio_due_array[$i]); #金額
+					} else {
+						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
+					};
+					array_push($bonus_array, [
+						"bonus_type" => "契約員獎金", #獎金名稱
+						"bonus_receiver" => $sales_id, #發放人員
+						"bonus_amount" => round($current_bonus), #金額
+						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] months")), #預計發放時間
+						"bonus_regulation" => "每月收款後,按收款比率次月發放" #發放規定				
+					]);
+				}
+				break;
+		}
+
+		$result_array = [
+			"ver" => $ver, #獎金版本
+			"result_status" => "success", #計算結果	
+			"bonus_array" => $bonus_array #獎金水庫
+		];
+	} else {
+		array_push($bonus_array, [
+			"bonus_type" => "error", #獎金名稱
+			"bonus_receiver" => "error", #發放人員
+			"bonus_amount" => 0, #金額
+			"pay_day_due" => "9999-1-1", #預計發放時間
+			"bonus_regulation" => "error" #發放規定				
+		]);
+		$result_array = [
+			"ver" => $ver, #獎金版本
+			"result_status" => "error", #計算結果	
+			"bonus_array" => $bonus_array #獎金水庫
+		];
+	}
+
+	return $result_array;
+};
diff --git a/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_examination.php b/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_examination.php
index 0c42a890..3e0c3af0 100644
--- a/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_examination.php
+++ b/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_examination.php
@@ -40,62 +40,150 @@ result_array[
 */
 
 
-require_once("maintenance_longterm_contract_m1_free_charge_bonus_v2_1.php");
-
-#$ver, $contract_type, $payment_period_amount, $elevator_list_price, $fee_per_st, $commission_fee, $receivable_date_due, $sales_id, $region_director_id, $regular_contract_manger_id
-
-
+require_once("maintenance_longterm_contract_m1_free_charge_bonus_v2_1_1.php");
 #獎金測試
 $examination_array = [
 	#錯誤版本
-	["1.0","longcontract_m1_free_charge",60,0.8,4000,333, "2014-07-01", "M0001", "M0002", "M0003"],
+	// ["1.0", 'annually', "longcontract_m1_free_charge", 60, 0.8, 4000, 333, "2014-07-01", "M0001", "M0002", "M0003"],
 	#60期
-	["2.1","longcontract_m1_free_charge",60,3000,3000,600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費600元(折扣率0.8)
-	["2.1","longcontract_m1_free_charge",60,3000,4000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費1600元(折扣率0.8)
-	["2.1","longcontract_m1_free_charge",60,3000,5000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費2600元(折扣率0.8)	
-	["2.1","longcontract_m1_free_charge",60,3000,6000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費3600元(折扣率0.8)	
-	["2.1","longcontract_m1_free_charge",60,3000,7000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價7000元、服務費4600元(折扣率0.8)	
-	["2.1","longcontract_m1_free_charge",60,3000,3000,600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費1200元(折扣率0.6)
-	["2.1","longcontract_m1_free_charge",60,3000,4000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費2200元(折扣率0.6)
-	["2.1","longcontract_m1_free_charge",60,3000,5000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費3200元(折扣率0.6)	
-	["2.1","longcontract_m1_free_charge",60,3000,6000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費4200元(折扣率0.6)	
-	["2.1","longcontract_m1_free_charge",60,3000,7000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價7000元、服務費5200元(折扣率0.6)	
-	["2.1","longcontract_m1_free_charge",60,3000,3000,600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費1230元(折扣率0.59)
-	["2.1","longcontract_m1_free_charge",60,3000,4000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費2230元(折扣率0.59)
-	["2.1","longcontract_m1_free_charge",60,3000,5000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費3230元(折扣率0.59)	
-	["2.1","longcontract_m1_free_charge",60,3000,6000,1600,"2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費4230元(折扣率0.59)	
-	["2.1","longcontract_m1_free_charge",60,3000,7000,1600,"2014-07-01", "M0001", "M0002", "M0003"] #牌價3000、簽約價7000元、服務費5230元(折扣率0.59)	
-	
+	//付款方式$payment_period： 每月支付(monthly), 2月1次(bimonthly), 季付(quarterly), 半年付(semiannually), 年付(annually)
+	["2.1", "longcontract_m1_free_charge", 'annually', 60, 3000, 2999, 600, "2014-07-01", "M0001", "M0002"], #牌價3000、簽約價3000元、服務費600元(折扣率0.8)
+	["2.1", "longcontract_m1_free_charge", 'annually', 60, 3000, 3000, 600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費600元(折扣率0.8)
+	["2.1", "longcontract_m1_free_charge", 'semiannually', 60, 3000, 4000, 1600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費1600元(折扣率0.8)
+	["2.1", "longcontract_m1_free_charge", 'quarterly', 60, 3000, 5000, 2600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費2600元(折扣率0.8)	
+	["2.1", "longcontract_m1_free_charge", 'bimonthly', 60, 3000, 6000, 3600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費3600元(折扣率0.8)	
+	["2.1", "longcontract_m1_free_charge", 'monthly', 60, 3000, 7000, 4600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價7000元、服務費4600元(折扣率0.8)	
+	["2.1", "longcontract_m1_free_charge", 'annually', 60, 3000, 2999, 1200, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費1200元(折扣率0.6)
+	["2.1", "longcontract_m1_free_charge", 'semiannually', 60, 3000, 4000, 2200, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費2200元(折扣率0.6)
+	["2.1", "longcontract_m1_free_charge", 'quarterly', 60, 3000, 5000, 3200, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費3200元(折扣率0.6)	
+	["2.1", "longcontract_m1_free_charge", 'bimonthly', 60, 3000, 6000, 4200, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費4200元(折扣率0.6)	
+	["2.1", "longcontract_m1_free_charge", 'monthly', 60, 3000, 7000, 5200, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價7000元、服務費5200元(折扣率0.6)	
+	["2.1", "longcontract_m1_free_charge", 'annually', 60, 3000, 2999, 1230, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費1230元(折扣率0.59)
+	["2.1", "longcontract_m1_free_charge", 'annually', 60, 3000, 3000, 1230, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費1230元(折扣率0.59)
+	["2.1", "longcontract_m1_free_charge", 'semiannually', 60, 3000, 4000, 2230, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費2230元(折扣率0.59)
+	["2.1", "longcontract_m1_free_charge", 'quarterly', 60, 3000, 5000, 3230, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費3230元(折扣率0.59)	
+	["2.1", "longcontract_m1_free_charge", 'bimonthly', 60, 3000, 6000, 4230, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費4230元(折扣率0.59)	
+	["2.1", "longcontract_m1_free_charge", 'monthly', 60, 3000, 7000, 5230, "2014-07-01", "M0001", "M0002", "M0003"] #牌價3000、簽約價7000元、服務費5230元(折扣率0.59)	
+
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 3000, 600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費600元(折扣率0.8)
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 4000, 1600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費1600元(折扣率0.8)
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 5000, 2600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費2600元(折扣率0.8)	
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 6000, 3600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費3600元(折扣率0.8)	
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 7000, 4600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價7000元、服務費4600元(折扣率0.8)	
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 3000, 600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費1200元(折扣率0.6)
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 4000, 1600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費2200元(折扣率0.6)
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 5000, 2600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費3200元(折扣率0.6)	
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 6000, 3600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費4200元(折扣率0.6)	
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 7000, 4600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價7000元、服務費5200元(折扣率0.6)	
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 3000, 600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價3000元、服務費1230元(折扣率0.59)
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 4000, 1600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價4000元、服務費2230元(折扣率0.59)
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 5000, 2600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價5000元、服務費3230元(折扣率0.59)	
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 6000, 3600, "2014-07-01", "M0001", "M0002", "M0003"], #牌價3000、簽約價6000元、服務費4230元(折扣率0.59)	
+	// 	["2.1", "longcontract_m1_free_charge", '', 60, 3000, 7000, 4600, "2014-07-01", "M0001", "M0002", "M0003"] #牌價3000、簽約價7000元、服務費5230元(折扣率0.59)
 ];
 
 
 
-for($i = 0; $i<count($examination_array); $i++){
+for ($i = 0; $i < count($examination_array); $i++) {
+	$ver = $examination_array[$i][0];
+	$contract_type = $examination_array[$i][1];
+	$payment_period = $examination_array[$i][2];
+	$payment_period_amount = $examination_array[$i][3];
+	$elevator_list_price = $examination_array[$i][4];
+	$fee_per_st = $examination_array[$i][5];
+	$commission_fee = $examination_array[$i][6];
+	$receivable_date_due = $examination_array[$i][7];
+	$sales_id = $examination_array[$i][8];
+	$region_director_id =  $examination_array[$i][9];
+	$regular_contract_manger_id = empty($examination_array[$i][10]) ? '' : $examination_array[$i][10];
+	$a = $payment_period_amount / 12;
+	$sales_bonus = ($fee_per_st) * 0.6;
+	$bonus_array = [];
+
+	// $payment_ratio_due_array = array();
+	// for ($i = 0; $i < $a; $i++) {
+	// 	array_push($payment_ratio_due_array, 1 / $a);
+	// }
+
+	// $payday_due_array = array();
+	// for ($i = 0; $i < $a; $i++) {
+	// 	array_push($payday_due_array, $i + 1);
+	// }
+
+	// for ($i = 0; $i < count($payment_ratio_due_array); $i++) {
+	// 	if ($i < count($payment_ratio_due_array) - 1) {
+	// 		$current_bonus = round($sales_bonus * $payment_ratio_due_array[$i]); #金額
+	// 	} else {
+	// 		$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
+	// 	};
+	// 	array_push($bonus_array, [
+	// 		"bonus_type" => "契約員獎金", #獎金名稱
+	// 		"bonus_receiver" => $sales_id, #發放人員
+	// 		"bonus_amount" => round($current_bonus), #金額
+	// 		"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] year")), #預計發放時間
+	// 		"bonus_regulation" => "每月收款後,按收款比率次月發放" #發放規定				
+	// 	]);
+	// }
+	// echo '<pre>';
+	// print_r($bonus_array);
+	// echo '</pre>';
+	// exit();
 	$result = maintenance_longterm_contract_m1_free_charge_bonus_v2_1(
-		$examination_array[$i][0],
-		$examination_array[$i][1],	
-		$examination_array[$i][2],	
-		$examination_array[$i][3],	
-		$examination_array[$i][4],	
-		$examination_array[$i][5],	
-		$examination_array[$i][6],	
-		$examination_array[$i][7],	
-		$examination_array[$i][8],			
-		$examination_array[$i][9]		
+		$ver,
+		$contract_type,
+		$payment_period,
+		$payment_period_amount,
+		$elevator_list_price,
+		$fee_per_st,
+		$commission_fee,
+		$receivable_date_due,
+		$sales_id,
+		$region_director_id,
+		$regular_contract_manger_id
 	);
+
+	$discount = (($fee_per_st - $commission_fee) / $elevator_list_price);
+	#新簽約、月繳、牌價3000、簽約價3000元、服務費600元(折扣率0.8)
+	$contract_type = [
+		'new' => '新簽約',
+		'free_to_charge' => '免保轉有費',
+		'renew_priceissue' => '續簽約(原價或僅契約金額異動)',
+		'longcontract_m1_free_charge' => '五年長約'
+
+	];
+	// 付款方式$payment_period： 每月支付(monthly), 2月1次(bimonthly), 季付(quarterly), 半年付(semiannually), 年付(annually)
+	$pay_kind = [
+		'monthly' => '月繳',
+		'bimonthly' => '雙月繳',
+		'quarterly' => '季繳',
+		'semiannually' => '半年繳',
+		'annually' => '年繳'
+	];
+
+	//
+	$bonus_type = [
+		'1' => '契約員獎金',
+		'2' => '區經理獎金',
+		'3' => '契約經理獎金'
+	];
 	echo "獎金版本:" . $result["ver"] . "<br>";
 	echo "計算結果:" . $result["result_status"] . "<br>";
-	echo "輸入參數：" . $examination_array[$i][1] . "  " . $examination_array[$i][2] . "  " . $examination_array[$i][3] . "  " . $examination_array[$i][4] . "  "
-					 . $examination_array[$i][5] . "  " . $examination_array[$i][6] . "  " . $examination_array[$i][7]. "  " . $examination_array[$i][8] . "  "
-					 . $examination_array[$i][9] . "<br>";
-	for($j = 0; $j<count($result["bonus_array"]); $j++){
+
+	echo "傳入參數說明：" . $contract_type[$examination_array[$i][1]] . "、" . $pay_kind[$payment_period] . "、牌價" . $elevator_list_price . "元、簽約價" . $fee_per_st . "元、服務費" . $commission_fee . "元(折扣率" . $discount . ")、契約人員 : " . 	$sales_id .
+		"、區經理 : " . $region_director_id . " 、契約經理 : " . $regular_contract_manger_id . "<br>";
+	echo "輸入參數：" . $examination_array[$i][1] . "  " . $examination_array[$i][2] . "  " . $examination_array[$i][4] . "  "
+		. $examination_array[$i][5] . "  " . $examination_array[$i][6] . "  " . $examination_array[$i][7] . "  " . $examination_array[$i][8] . "  "
+		. $examination_array[$i][9] . "<br>";
+	$n = 0;
+	for ($j = 0; $j < count($result["bonus_array"]); $j++) {
+		if ($result["bonus_array"][$j]["bonus_receiver"] == "M0001") {
+
+			$n++;
+			echo '[' . $n . ']';
+		}
 		echo "輸出結果：" . $result["bonus_array"][$j]["bonus_type"] . "   " . $result["bonus_array"][$j]["bonus_receiver"] . "   "
-						 . $result["bonus_array"][$j]["bonus_amount"] . "   " . $result["bonus_array"][$j]["pay_day_due"] . "   "
-						  . $result["bonus_array"][$j]["bonus_regulation"] . "<br>";
+			. $result["bonus_array"][$j]["bonus_amount"] . "   " . $result["bonus_array"][$j]["pay_day_due"] . "   "
+			. $result["bonus_array"][$j]["bonus_regulation"] . "<br>";
 	};
 	echo "-------------------------" . "<br>";
-
 };
-
-
-?>
diff --git a/wms/contract/api/postContractData.php b/wms/contract/api/postContractData.php
index d3ecf356..e8dca10f 100644
--- a/wms/contract/api/postContractData.php
+++ b/wms/contract/api/postContractData.php
@@ -88,10 +88,10 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         if ($address == '')  $fail_arr[] = '地址為必填';
         if ($area == '')  $fail_arr[] = '區域為必填';
         if ($customer == '')  $fail_arr[] = '客戶為必填';
-        // if ($partyA == '')  $fail_arr[] = '業務聯繫人為必填';
-        // if ($partyAaddress == '')  $fail_arr[] = '業務聯繫人地址為必填';
-        // if ($partyAphone == '')  $fail_arr[] = '業務聯繫人電話為必填';
-        // if ($partyAemail == '')  $fail_arr[] = '業務聯繫人Email為必填';
+        if ($partyA == '')  $fail_arr[] = '業務聯繫人為必填';
+        if ($partyAaddress == '')  $fail_arr[] = '業務聯繫人地址為必填';
+        if ($partyAphone == '')  $fail_arr[] = '業務聯繫人電話為必填';
+        if ($partyAemail == '')  $fail_arr[] = '業務聯繫人Email為必填';
         if ($num == '')  $fail_arr[] = '電梯數量為必填';
         if ($payType == '') $fail_arr[] = '付款方式為必填';
         if (count($fail_arr) > 0) {
@@ -100,7 +100,11 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
             exit();
         }
         // T8insert($_POST, $facilityno, $depId);
-        bonusCreate($_POST, $facilityno, $conn);
+        $aaa = bonusCreate($_POST, $facilityno, $conn);
+        echo '<pre>';
+        print_r($aaa);
+        echo '</pre>';
+        exit;
         //create account table
         $accounttype = "A";
         $accountid = $vat;
@@ -658,10 +662,13 @@ function bonusCreate($data, $facilityno, $conn)
 {
     try {
         require_once("../../bonus/other/maintenance_contract_bonus_v2_1.php");
+        require_once("../../bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_1.php");
+
         $elevators = !empty($_POST['elevators']) ? json_decode($_POST['elevators'], true) : [];
         $contract_begin_date = !empty($data['contract_begin_date']) ? $data['contract_begin_date'] : '';
         $salesman = !empty($data['salesman']) ? $data['salesman'] : '';
         $payType = !empty($data['payType']) ? $data['payType'] : '';
+        $contract_type = $data['contract_type']; //合約類別
         $status = 1;
         $bonus_json = [];
         $create_id = $data['user_id'];
@@ -676,28 +683,114 @@ function bonusCreate($data, $facilityno, $conn)
             'A40005' => 'semiannually', // 半年繳
             'A40003' => 'monthly' //月繳
         ];
-
+        $fail_arr = [];
         $payDay = getNext25thDate($contract_begin_date);
         foreach ($elevators as $key => $elevator) {
-            // print_r($payDay);
-            // echo '<pre>';
-            // print_r($elevator);
-            // echo '</pre>';
-            // exit;
             $facility_no = $facilityno[$key];
             $ver = $elevator['bonus_verson']; //獎金版本
-            $contract_type = $elevator['contract_type']; //合約類別
             $payment_period = $payment[$payType]; //付款方式
-            $elevator_list_price = intval($elevator['stand_price']); //牌價
-            $fee_per_st = $elevator['sold_price']; //作翻契約金額
-            $commission_fee = $elevator['service_expense']; //服務費(月)
+            $elevator_list_price = !empty(intval($elevator['stand_price'])) ? intval($elevator['stand_price']) : ''; //牌價
+            $fee_per_st = !empty(round($elevator['sold_price'] / 1.05, 2)) ? round($elevator['sold_price'] / 1.05, 2) : ''; //作翻契約金額 (不含稅)
+            $commission_fee = !empty($elevator['service_expense']) ? $elevator['service_expense'] : ''; //服務費(月/台)
             $receivable_date_due = $payDay; //第一筆保養款項收回日
             $sales_id = $salesman; //營業人員
             $discount = $elevator['discount'];
             $region_director_id = $elevator['manager'];
             $regular_contract_manger_id = !empty($elevator['regular_contract_manger_id']) ? $elevator['regular_contract_manger_id'] : '';
-            $results = maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period, $elevator_list_price, $fee_per_st, $commission_fee, $receivable_date_due, $sales_id, $region_director_id, $regular_contract_manger_id);
+            $maintain_months = intval($elevator['maintain_months']);
+            $years = $maintain_months / 12;
+
+            if ($maintain_months == '') $fail_arr[] = "保養月費為必填";
+            if ($fee_per_st == '') $fail_arr[] = "契約金額為必填";
+            if ($elevator_list_price == '') $fail_arr[] = "牌價為必填";
+            if ($region_director_id == '') $fail_arr[] = '區處長為必填';
+            if ($sales_id == '') $fail_arr[] = "契約人為必填";
+
+            if (COUNT($fail_arr) > 0) {
+                return $fail_arr;
+                break;
+            }
 
+            // $years = ($maintain_months % 12) == 0 ? $maintain_months / 12 : '';
+            // 如果保養合約 大於一年
+            if (!empty($maintain_months)) {
+                if ($maintain_months > 12 && $contract_type == 'new') {
+                    // 第一年為新簽約
+                    $results = maintenance_contract_bonus_v2_1(
+                        $ver,
+                        $contract_type,
+                        $payment_period,
+                        $elevator_list_price,
+                        $fee_per_st,
+                        $commission_fee,
+                        $receivable_date_due,
+                        $sales_id,
+                        $region_director_id,
+                        $regular_contract_manger_id
+                    );
+                    for ($i = 0; $i < $maintain_months - 1; $i++) {
+                        $contract_type = 'renew_priceissue';
+                        // 第二年以上改續約
+                        $result2 = maintenance_contract_bonus_v2_1(
+                            $ver,
+                            $contract_type,
+                            $payment_period,
+                            $elevator_list_price,
+                            $fee_per_st,
+                            $commission_fee,
+                            $receivable_date_due,
+                            $sales_id,
+                            $region_director_id,
+                            $regular_contract_manger_id
+                        );
+                    }
+                } else if ($maintain_months > 12 && $contract_type == 'renew_priceissue') {
+                    // 超過一年的續約
+                    for ($i = 0; $i < $years; $i++) {
+                        $contract_type = 'renew_priceissue';
+                        $result2 = maintenance_contract_bonus_v2_1(
+                            $ver,
+                            $contract_type,
+                            $payment_period,
+                            $elevator_list_price,
+                            $fee_per_st,
+                            $commission_fee,
+                            $receivable_date_due,
+                            $sales_id,
+                            $region_director_id,
+                            $regular_contract_manger_id
+                        );
+                    }
+                } else if ($maintain_months >= 60) {
+                    $contract_type = 'longcontract_m1_free_charge';
+                    $result = maintenance_longterm_contract_m1_free_charge_bonus_v2_1(
+                        $ver,
+                        $contract_type,
+                        $payment_period,
+                        $maintain_months,
+                        $elevator_list_price,
+                        $fee_per_st,
+                        $commission_fee,
+                        $receivable_date_due,
+                        $sales_id,
+                        $region_director_id,
+                        $regular_contract_manger_id
+                    );
+                } else {
+                    $results = maintenance_contract_bonus_v2_1(
+                        $ver,
+                        $contract_type,
+                        $payment_period,
+                        $elevator_list_price,
+                        $fee_per_st,
+                        $commission_fee,
+                        $receivable_date_due,
+                        $sales_id,
+                        $region_director_id,
+                        $regular_contract_manger_id
+                    );
+                }
+            }
             $bonus_json = [
                 'contract_type' => $contract_type,
                 'total' => $elevator_list_price,
@@ -721,6 +814,21 @@ function bonusCreate($data, $facilityno, $conn)
                     $stmt = $conn->prepare($sql);
                     $stmt->execute();
                 }
+                if (!empty($result2)) {
+                    foreach ($results2['bonus_array'] as $i => $result) {
+
+                        $bonus_type = $result['bonus_type'];
+                        $pay_day = $result['pay_day_due'];
+                        $amount = $result['bonus_amount'];
+                        $receiver = $result['bonus_receiver'];
+                        $a = json_encode($bonus_json);
+                        $sql = "INSERT INTO bonus 
+                    (bonus_type,bonus_verson,contract_no,contract_type,facility_no,amount,receiver,pay_day_due,status,bonus_json,create_id,create_at) VALUES
+                    ($bonus_type,'$ver','$contract_no',$contract_kind,'$facility_no',$amount,'$receiver','$pay_day',$status,'$a','$create_id','$create_at')";
+                        $stmt = $conn->prepare($sql);
+                        // $stmt->execute();
+                    }
+                }
             }
             // exit();
         }
diff --git a/wms/contract/contract-input.php b/wms/contract/contract-input.php
index 58acb4a8..cbec41c1 100644
--- a/wms/contract/contract-input.php
+++ b/wms/contract/contract-input.php
@@ -57,8 +57,8 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 <h4>業務確認項</h4>
                             </td>
                             <td class="text-right" style='border-left:0px;'>
-                                <button type="button" id="btn_close" class="btn btn-default" onclick="window.history.back();">返回</button>
-                                <button type="button" id="btn_close" class="btn btn-default" onclick="window.close();">關閉分頁</button>
+                                <!-- <button type="button" id="btn_close" class="btn btn-default" onclick="window.history.back();">返回</button>
+                                <button type="button" id="btn_close" class="btn btn-default" onclick="window.close();">關閉分頁</button> -->
                             </td>
                         </tr>
                         <tr>
@@ -158,7 +158,7 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 <p class="alerttext" x-show="data.payType==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                             </td>
                         </tr>
-                        <!-- <tr>
+                        <tr>
                             <td style="vertical-align: middle">業務聯繫人</td>
                             <td>
                                 <input type="text" x-model="data.partyA" name="partyA" />
@@ -179,7 +179,7 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 <input class="form-control disabled_select" type="email" name="contracttel" x-model="data.partyAemail">
                                 <p class="alerttext" x-show="data.partyAemail==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                             </td>
-                        </tr> -->
+                        </tr>
                         <tr>
                             <td style="vertical-align: middle">區域</td>
                             <td>
@@ -201,7 +201,17 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 <input type="file" name="file[]" multiple draggable="true" @change="uploadFiles($event)" />
                             </td>
                         </tr>
-
+                        <tr>
+                            <td style="vertical-align:middle">合約類別</td>
+                            <td>
+                                <select name="" id="" x-model="data.contract_type">
+                                    <option value="">請選擇</option>
+                                    <option value="new">新簽約</option>
+                                    <option value="free_to_charge">免保轉有費</option>
+                                    <option value="renew_priceissue">續簽約</option>
+                                </select>
+                            </td>
+                        </tr>
                         <!-- <tr>
                             <td></td>
                             <td></td>
@@ -363,42 +373,48 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                 <td>
                                     <input type="text" x-model="elevator.maintain_months">
                                 </td>
-                                <td style="vertical-align:middle">合約類別</td>
-                                <td>
+                                <!-- <td style="vertical-align:middle">合約類別</td> -->
+                                <!-- <td>
                                     <select name="" id="" x-model="elevator.contract_type">
                                         <option value="">請選擇</option>
                                         <option value="new">新簽約</option>
                                         <option value="free_to_charge">免保轉有費</option>
                                         <option value="renew_priceissue">續簽約</option>
                                     </select>
-                                </td>
+                                </td> -->
                                 <td style="vertical-align:middle">獎金適用版本</td>
                                 <td>
                                     <input type="text" x-model="elevator.bonus_verson">
                                 </td>
-                            </tr>
-                            <tr>
                                 <td style="vertical-align:middle">作番契約金額(月)</td>
                                 <td><input type="text" x-model="elevator.sold_price"></td>
-
+                            </tr>
+                            <tr>
+                                <td style="vertical-align:middle">服務費</td>
+                                <td>
+                                    <input type="text" x-model="elevator.service_expense">
+                                </td>
                                 <td style="vertical-align:middle">牌價(標準價)</td>
                                 <td>
                                     <input type="text" x-model="elevator.stand_price">
                                     <p>標準價+Option價格+與其他電梯共同分擔的費用貨價格</p>
                                 </td>
-                                <td style="vertical-align:middle">服務費</td>
-                                <td>
-                                    <input type="text" x-model="elevator.service_expense">
-                                </td>
-                                <td style="vertical-align:middle">折扣率(%) <br />(作番契約金額+服務費/台數) / 牌價 * 100</td>
-                                <td><input type="text" x-model='elevator.discount'></td>
-                            </tr>
-                            <tr>
                                 <td style="vertical-align:middle">地區處長員工號</td>
                                 <td><input type="text" x-model="elevator.manager"></td>
                                 <td style="vertical-align:middle">專任契約經理員工號</td>
                                 <td><input type="text" x-model="elevator.regular_contract_manger_id"></td>
+                                <!-- <td style="vertical-align:middle">折扣率(%)</td>
+                                <td colspan="2">
+                                    <input type="text" x-model='elevator.discount'>
+                                    <p>(作番契約金額+服務費/台數) / 牌價 * 100</p>
+                                </td> -->
                             </tr>
+                            <!-- <tr>
+                                <td style="vertical-align:middle">地區處長員工號</td>
+                                <td><input type="text" x-model="elevator.manager"></td>
+                                <td style="vertical-align:middle">專任契約經理員工號</td>
+                                <td><input type="text" x-model="elevator.regular_contract_manger_id"></td>
+                            </tr> -->
                         </tbody>
                     </template>
                 </template>
diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js
index db386702..ad56eb3b 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -1016,6 +1016,7 @@ const contractInput = () => {
             disabled: false, //資料庫是否有電梯數量資料
             elevators: [], //機種、載重、人乘、樓停、樓層、速度、緯度、經度、開門方式、保養別、廠牌、竣檢日、許可證日期
             payType: '', //付款方式
+            contract_type: ''
             // bonus_verson: 2.1,
             // manager: '',
             // regular_contract_manger_id: '',
@@ -1048,6 +1049,7 @@ const contractInput = () => {
             data.bonus_verson = 2.1;
         },
         getManager() {
+
             for (let i = 0; i < this.data.elevators.length; i++) {
                 this.getBonusVerson(this.data.elevators[i]);
                 axios.get('./api/getContractData.php?contracttype=accountManger&salesman=' + this.data.salesman).then(res => {
@@ -1070,29 +1072,31 @@ const contractInput = () => {
             }
         },
         createElevator() {
-            for (let i = 0; i < this.data.num; i++) {
-                this.data.elevators.push({
-                    spec: '', //規格
-                    weight: '', //載重
-                    speed: '', //速度
-                    persons: '', //人乘
-                    stop: '', //樓停
-                    floors: '', //樓層
-                    latitude: '',  //緯度
-                    longitude: '', //經度
-                    elevator_brand: '', //廠牌
-                    opendoor: '', //開門方式
-                    maintainance: '', //保養別
-                    takecertificatedate: '', //竣檢日
-                    useful_date: '', //許可證有效日期
-                    maintain_times: '', //保養頻率
-                    discount: '', //折價率
-                    contract_type: '',
-                    manager: '',
-                    regular_contract_manger_id: '',
-                    bonus_verson: '',
-                    sold_price: ''
-                })
+            if (this.data.num != this.data.elevators.length) {
+                for (let i = 0; i < this.data.num; i++) {
+                    this.data.elevators.push({
+                        spec: '', //規格
+                        weight: '', //載重
+                        speed: '', //速度
+                        persons: '', //人乘
+                        stop: '', //樓停
+                        floors: '', //樓層
+                        latitude: '',  //緯度
+                        longitude: '', //經度
+                        elevator_brand: '', //廠牌
+                        opendoor: '', //開門方式
+                        maintainance: '', //保養別
+                        takecertificatedate: '', //竣檢日
+                        useful_date: '', //許可證有效日期
+                        maintain_times: '', //保養頻率
+                        discount: '', //折價率
+                        // contract_type: '',
+                        manager: '',
+                        regular_contract_manger_id: '',
+                        bonus_verson: '',
+                        sold_price: ''
+                    })
+                }
             }
         },
         getContractDate() {
@@ -1109,7 +1113,7 @@ const contractInput = () => {
                         this.data.total_price = Number(res.data.elevators[i].sold_price) + Number(this.data.total_price);
 
                         // 服務費 (以單筆合約記，但計算獎金須傳入單月服務費)
-                        this.data.elevators[i].service_expense = Math.round(this.data.elevators[i].service_expense / 12);
+                        this.data.elevators[i].service_expense = Math.round(this.data.elevators[i].service_expense / res.data.elevators[i]);
                         // 折扣率
                         this.data.elevators[i].discount = Math.round(((res.data.elevators[i].sold_price / res.data.elevators[i].stand_price) + this.data.elevators[i].service_expense) * 100);
                     }
@@ -1206,7 +1210,8 @@ const contractInput = () => {
             form.append('num', this.data.num);
             form.append('elevators', JSON.stringify(this.data.elevators));
             form.append('contracttype', 'b');
-            form.append('payType', this.data.payType)
+            form.append('payType', this.data.payType);
+            form.append('contract_type', this.data.contract_type);
 
             // 如果有附件檔案，可以逐一加入
             for (var i = 0; i < this.data.files.length; i++) {

From 2f1afae09efd6727eb526049573a39fb72ae6b8c Mon Sep 17 00:00:00 2001
From: Cheng <lkmd555@masada.com.tw>
Date: Thu, 29 Feb 2024 20:14:00 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E6=96=B0=E6=A2=AF=E3=80=81=E4=BF=9D?=
 =?UTF-8?q?=E9=A4=8A=E7=8D=8E=E9=87=91=E8=A8=88=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/bonus/api/postStatus.php                  | 125 +++++-
 wms/bonus/bonus_person.php                    | 146 +++++++
 .../elevator_new/elevator_new_deal_bonus.php  |  20 +-
 wms/bonus/maintainance_bonus.php              | 366 ++++++++++++++++++
 ...tail.php => maintainance_bonus_detail.php} |   0
 wms/bonus/{bonus.php => new_bonus.php}        |  37 +-
 .../other/maintenance_contract_bonus_v2_1.php |   3 +-
 ...m_contract_m1_free_charge_bonus_v2_1_1.php |  19 +-
 wms/contract/api/getContractData.php          |  94 ++++-
 wms/contract/api/postContractData.php         |  95 +++--
 wms/contract/api/postNewContractData.php      | 133 ++++++-
 wms/contract/contract-input.php               |   5 +-
 wms/contract/js/alpine.js                     |  16 +-
 13 files changed, 922 insertions(+), 137 deletions(-)
 create mode 100644 wms/bonus/bonus_person.php
 create mode 100644 wms/bonus/maintainance_bonus.php
 rename wms/bonus/{bonus_detail.php => maintainance_bonus_detail.php} (100%)
 rename wms/bonus/{bonus.php => new_bonus.php} (83%)

diff --git a/wms/bonus/api/postStatus.php b/wms/bonus/api/postStatus.php
index 86f9f88d..0ebcd723 100644
--- a/wms/bonus/api/postStatus.php
+++ b/wms/bonus/api/postStatus.php
@@ -2,22 +2,36 @@
 require_once("../../contract/conn.php");
 
 if (!empty($_POST['id']) && !empty($_POST['postType']) && $_POST['postType'] == 'a') {
-    try {
-        $id = empty($_POST['id']) ? '' : $_POST['id'];
-        $user_id = empty($_POST['user_id']) ? '' : $_POST['user_id'];
-        $amount = empty($_POST['amount']) ? '' : $_POST['amount'];
-        $pay_day = empty($_POST['pay_day']) ? '' : $_POST['pay_day'];
-        $review_at = date("Y-m-d H:i:s");
-        $sql = "UPDATE bonus SET status = 2 ,bonus_actual='$amount',review_hr = '$user_id' ,review_at = '$review_at',pay_day ='$pay_day',update_id='$user_id',update_at='$review_at' WHERE id = $id";
-        $stmt = $conn->prepare($sql);
-        $stmt->execute();
+    if ($_POST['contract_type'] == 'maintainance') {
+        try {
+            $id = empty($_POST['id']) ? '' : $_POST['id'];
+            $user_id = empty($_POST['user_id']) ? '' : $_POST['user_id'];
+            $amount = empty($_POST['amount']) ? '' : $_POST['amount'];
+            $pay_day = empty($_POST['pay_day']) ? '' : $_POST['pay_day'];
+            $review_at = date("Y-m-d H:i:s");
+            $sql = "UPDATE bonus SET status = 2 ,bonus_actual='$amount',review_hr = '$user_id' ,review_at = '$review_at',pay_day ='$pay_day',update_id='$user_id',update_at='$review_at' WHERE id = $id";
+            $stmt = $conn->prepare($sql);
+            $stmt->execute();
 
-        header("HTTP/1.1 200 success!");
-        echo 'Success';
-    } catch (PDOException $e) {
-        header("HTTP/1.1 404 failed!");
-        echo $e->getMessage();
-        die('Error!:' . $e->getMessage());
+            header("HTTP/1.1 200 success!");
+            echo 'Success';
+        } catch (PDOException $e) {
+            header("HTTP/1.1 404 failed!");
+            echo $e->getMessage();
+            die('Error!:' . $e->getMessage());
+        }
+    } else if ($_POST['contract_type'] == 'new') {
+        try {
+            $id = empty($_POST['id']) ? '' : $_POST['id'];
+            $user_id = empty($_POST['user_id']) ? '' : $_POST['user_id'];
+            $amount = empty($_POST['amount']) ? '' : $_POST['amount'];
+
+            header("HTTP/1.1 200 success!");
+            echo 'Success';
+        } catch (PDOException $e) {
+            echo $e->getMessage();
+            die('Error!:' . $e->getMessage());
+        }
     }
 }
 // 獎金確認發放，並更新獎金 OR 實際發放時間
@@ -109,3 +123,84 @@ if (!empty($_POST['postType']) && $_POST['postType'] == 'd') {
     }
     // echo 'ddddd';
 }
+// 查看T8 是否收款
+if (!empty($_POST['postType']) && $_POST['postType'] == 'e') {
+    $sql = "SELECT contract_no FROM bonus WHERE contract_type = 3 AND T8api_status = 1 ";
+    $stmt = $conn->prepare($sql);
+    $stmt->execute();
+    $results = $stmt->fetchAll(PDO::FETCH_ASSOC);
+    // echo "<pre>";
+    // print_r($results);
+    // echo "</pre>";
+    foreach ($results as $result) {
+        $contract_no = $result['contract_no'];
+        $a = isPay($contract_no, $connT8);
+
+        if ($a == '1') {
+            try {
+                $sql = "UPDATE bonus SET T8api_status = 2 WHERE contract_no = :contract_no";
+                $stmt = $conn->prepare($sql);
+                $stmt->bindParam(":contract_no", $contract_no);
+                $stmt->execute();
+                header("HTTP/1.1 200 success!");
+                echo 'Success';
+            } catch (PDOException $e) {
+                echo $e->getMessage();
+                die('Error!:' . $e->getMessage());
+            }
+        }
+    }
+}
+
+function isPay($contract_no, $connT8)
+{
+    // echo $contract_no;
+    $sql = "SELECT 
+    a.BillNo,
+    b.OTaxAmt as amount,
+    a.CU_EstPayDate as createDate,
+    b.PersonId as personId,
+    c.BillNo as CBno,
+    c.CU_MaterialId as facility 
+FROM salIncomeApplyDetail as a
+LEFT JOIN salIncomeApplyMaster as b ON a.BillNo = b.BillNo
+LEFT JOIN (
+    SELECT aMaster.BillNo,aMaster.BizPartnerId,aDetail.CU_MaterialId FROM arCheckBill as aMaster
+    LEFT JOIN arCheckBillDetail as aDetail ON aMaster.BizPartnerId = aDetail.FromBillNo
+    WHERE aMaster.BizPartnerId = '$contract_no' AND aMaster.TypeId = 'RVS'
+    ) AS c ON a.BillNo = c.BizPartnerId
+WHERE a.BillNo = '$contract_no'
+AND a.RowNo = '1'
+";
+    $stmt = $connT8->prepare($sql);
+    $stmt->execute();
+    $data = $stmt->fetch(PDO::FETCH_ASSOC);
+    // $data['amount'] = intval($data['amount']);
+    if (!empty($data['CBno']) && $data['CBno'] != '') {
+        $checkBillNo = $data['CBno'];
+
+        $sql = "SELECT 
+c.BillDate AS CheckBillDate
+FROM arWriteOffBill AS a 
+LEFT JOIN arWriteOffBillRec AS b ON a.BillNo=b.BillNo 
+LEFT JOIN 
+(SELECT temp1.*,arWriteOffBillDetail.*  FROM arWriteOffBillDetail 
+LEFT JOIN 
+    (SELECT 
+    arCheckBill.BillNo AS checkBillNo, arCheckBill.BillDate,arCheckBillInvInfo.InvoiceNo 
+    FROM arCheckBill 
+    LEFT JOIN arCheckBillInvInfo 
+    ON arCheckBill.InvoiceBillNo=arCheckBillInvInfo.InvoiceBillNo) AS temp1 
+ON temp1.checkBillNo = arWriteOffBillDetail.FromBillNo) AS c 
+ON a.BillNo=c.BillNo
+WHERE c.checkBillNo = '$checkBillNo'
+";
+
+        $stmt = $connT8->prepare($sql);
+        $stmt->execute();
+
+        return '1';
+    } else {
+        return '2';
+    }
+}
diff --git a/wms/bonus/bonus_person.php b/wms/bonus/bonus_person.php
new file mode 100644
index 00000000..1b01b289
--- /dev/null
+++ b/wms/bonus/bonus_person.php
@@ -0,0 +1,146 @@
+<?php
+include_once("../header.php");
+// require_once('./connT8.php');
+require("../contract/conn.php");
+$now = date("Y-m-d");
+$oneMonthAgo = date("Y-m-d", strtotime("$now +1 months"));
+$oneMonthAgo1 = date("m",  strtotime($oneMonthAgo));
+$clause = "";
+if ($_GET['check'] == 'maintainance') {
+    if (!empty($_GET)) {
+        $month = $_GET['months_select'];
+        $years = $_GET['years']; // 當前年份
+        $days_in_month = cal_days_in_month(CAL_GREGORIAN, $month, $years);
+        $select_date = date("$years-$month-01");
+        $select_date1 = date("$years-$month-$days_in_month");
+        echo $select_date1;
+        $clause .= "AND pay_day_due >='$select_date'  AND pay_day_due <= '$select_date1' ";
+    } else {
+        $clause .= "AND pay_day_due >= '$now' AND pay_day_due <= '$oneMonthAgo' ";
+    }
+
+    // $clause .= "AND pay_day_due >= '$now' AND pay_day_due <= '$oneMonthAgo' ";
+    $sql = "SELECT a.receiver,a.amount,b.name FROM bonus AS a 
+LEFT JOIN account AS b ON a.receiver = b.accountid 
+WHERE 1=1 AND contract_type = 3 $clause ORDER BY a.receiver ASC";
+    $stmt = $conn->prepare($sql);
+    $stmt->execute();
+    $results = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+    $person_arr = [];
+    $bonus_arr = [];
+    $count = 0;
+
+    $a = 0;
+    $j = 0;
+}
+
+for ($i = 0; $i < COUNT($results); $i++) {
+    $a++;
+    if ($i + 1 < COUNT($results)) {
+        if ($results[$i]['receiver'] != $results[$i + 1]['receiver']) {
+            $amount = 0;
+            if ($i != $j) {
+                for ($j; $j <= $i; $j++) {
+                    $amount += $results[$j]['amount'];
+                }
+                $person_arr['person_id'] = $results[$i]['receiver'];
+                $person_arr['person'] = $results[$i]['name'];
+                $person_arr['bonus'] = $amount;
+                array_push($bonus_arr, $person_arr);
+            } else {
+                $amount += $results[$j]['amount'];
+                $person_arr['person_id'] = $results[$i]['receiver'];
+                $person_arr['person'] = $results[$i]['name'];
+                $person_arr['bonus'] = $amount;
+                array_push($bonus_arr, $person_arr);
+            }
+
+            $j = $i + 1;
+        }
+    } else {
+        $amount = 0;
+        for ($j; $j <= $i; $j++) {
+            $amount += $results[$j]['amount'];
+        }
+        $amount += $results[$i]['amount'];
+        $person_arr['person_id'] = $results[$i]['receiver'];
+        $person_arr['bonus'] = $amount;
+        $person_arr['person'] = $results[$i]['name'];
+        array_push($bonus_arr, $person_arr);
+    }
+}
+
+?>
+<div style="overflow-x:auto;margin-top:12px">
+    <!-- <a href="contract-newelevator-input.php?function_name=repair&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+        <span class="glyphicon glyphicon-plus"></span>
+    </a> -->
+    <table class='table query-table table-striped table-bordered display  compact' style='width:98%;text-align:center;margin:0 auto'>
+        <thead>
+            <tr>
+                <td colspan="8">
+                    <h3 style='text-align:center'><?= !empty($years) ? $years : date('Y') ?>年<?= !empty($month) ? $month : $oneMonthAgo1 ?>月份、個人獎金計算</h3>
+                </td>
+            </tr>
+
+        </thead>
+    </table>
+    <form method='get' action=''>
+        <table class='table table-striped table-bordered' style='width:70%;text-align:center;margin:0 auto'>
+            <tbody>
+                <tr>
+                    <th style="text-align:center;vertical-align:middle;">年份</th>
+                    <td>
+                        <select name="years" id="">
+                            <?php for ($i = 2020; $i <= 2030; $i++) { ?>
+                                <option value="<?= $i ?>" <?php echo isset($_GET["years"]) && $_GET["years"] == $i ? 'selected' : ''; ?>>
+                                    <?= $i ?>
+                                </option> <?php } ?>
+                        </select>
+                    </td>
+                    <th style="text-align:center;vertical-align:middle;">月份</th>
+                    <td>
+                        <select name="months_select" id="">
+                            <?php for ($i = 1; $i <= 12; $i++) { ?>
+                                <option value="<?= $i ?>" <?php echo isset($_GET["months_select"]) && $_GET["months_select"] == $i ? 'selected' : ''; ?>>
+                                    <?= $i ?>
+                                </option> <?php } ?>
+                        </select>
+                    </td>
+                    <!-- <td><input type="text" class="form-control" name="months_select" value="<?php if (isset($_GET["facilityno"])) echo $_GET["facilityno"]; ?>"></td> -->
+                    <!--<th>保養員姓名</th>                        -->
+                    <td style="text-align:center;vertical-align:middle;width:80px"><button type="submit" style='text-align:center; margin:0 auto' class="btn  btn-info btn-sm">查詢</button></td>
+                </tr>
+            </tbody>
+        </table>
+        <input type="hidden" name="function_name" value="schedule_index">
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+
+    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+        <thead>
+            <tr>
+                <!-- <th>項次</th> -->
+                <th>工號</th>
+                <th>姓名</th>
+                <th>總獎金水庫(實發總價)</th>
+            </tr>
+        </thead>
+        <tbody>
+
+            <?php
+            if (!empty($bonus_arr)) {
+                foreach ($bonus_arr as $key => $bonus) {
+            ?>
+                    <tr>
+                        <!-- <td><?php echo $key ?></td> -->
+                        <td><?php echo $bonus['person_id'] ?></td>
+                        <td><?php echo $bonus['person'] ?></td>
+                        <td><?php echo $bonus['bonus'] ?></td>
+                    </tr>
+            <?php }
+            } ?>
+        </tbody>
+    </table>
+</div>
\ No newline at end of file
diff --git a/wms/bonus/elevator_new/elevator_new_deal_bonus.php b/wms/bonus/elevator_new/elevator_new_deal_bonus.php
index c26e747d..7138e787 100644
--- a/wms/bonus/elevator_new/elevator_new_deal_bonus.php
+++ b/wms/bonus/elevator_new/elevator_new_deal_bonus.php
@@ -59,7 +59,7 @@ function elevator_new_deal_bonus_v2_0($ver, $contract_type, $elevator_type, $ele
 
         #營銷人員銷售獎金水庫-----訂金已收款20%，發放總獎金20%
         array_push($bonus_array, [
-            "bonus_type" => "營銷人員銷售獎金-訂金段", #獎金名稱
+            "bonus_type" => "1-訂金段", #獎金名稱
             "bonus_receiver" => $sales_id, #發放人員
             "bonus_amount" => round($sales_bonus * 0.2), #金額
             "payment_schedul_due" => "deposit", #訂金已收款20%
@@ -68,7 +68,7 @@ function elevator_new_deal_bonus_v2_0($ver, $contract_type, $elevator_type, $ele
 
         #營銷人員銷售獎金水庫-----出貨前期所有款項已收齊，且出貨款已收款50%，發放總獎金50%
         array_push($bonus_array, [
-            "bonus_type" => "營銷人員銷售獎金-出貨款段", #獎金名稱
+            "bonus_type" => "1-出貨款段", #獎金名稱
             "bonus_receiver" => $sales_id, #發放人員
             "bonus_amount" => round($sales_bonus * 0.5), #金額
             "payment_schedul_due" => "shipping", #訂金已收款20%
@@ -77,7 +77,7 @@ function elevator_new_deal_bonus_v2_0($ver, $contract_type, $elevator_type, $ele
 
         #營銷人員銷售獎金水庫-----驗收前期所有款項已收齊，且驗收款已收款30%，發放總獎金30%
         array_push($bonus_array, [
-            "bonus_type" => "營銷人員銷售獎金-驗收款段", #獎金名稱
+            "bonus_type" => "1-驗收款段", #獎金名稱
             "bonus_receiver" => $sales_id, #發放人員
             "bonus_amount" => round($sales_bonus * 0.3), #金額
             "payment_schedul_due" => "acceptance", #訂金已收款20%
@@ -86,7 +86,7 @@ function elevator_new_deal_bonus_v2_0($ver, $contract_type, $elevator_type, $ele
 
         #區域經理提成獎金水庫-----訂金已收款100%，發放總獎金50%
         array_push($bonus_array, [
-            "bonus_type" => "區域經理提成獎金-訂金段", #獎金名稱
+            "bonus_type" => "2-訂金段", #獎金名稱
             "bonus_receiver" => $region_manger_id, #發放人員
             "bonus_amount" => round($region_manager_bonus * 0.5), #金額
             "payment_schedul_due" => "deposit", #訂金已收款100%
@@ -95,7 +95,7 @@ function elevator_new_deal_bonus_v2_0($ver, $contract_type, $elevator_type, $ele
 
         #區域經理獎金水庫-----貨到工地款(含)之前所有款項已收款100%，發放總獎金50%
         array_push($bonus_array, [
-            "bonus_type" => "區域經理提成獎金-貨到工地款段", #獎金名稱
+            "bonus_type" => "2-貨到工地款段", #獎金名稱
             "bonus_receiver" => $region_manger_id, #發放人員
             "bonus_amount" => round($region_manager_bonus * 0.5), #金額
             "payment_schedul_due" => "deliveried", #貨到工地款(含)之前所有款項已收款100%
@@ -150,7 +150,7 @@ function elevator_new_deal_bonus_v1_0($ver, $contract_type, $elevator_knockdown_
 
         #營銷人員銷售獎金水庫-----訂金已收款20%，發放總獎金20%
         array_push($bonus_array, [
-            "bonus_type" => "營銷人員銷售獎金-訂金段", #獎金名稱
+            "bonus_type" => "1-訂金段", #獎金名稱
             "bonus_receiver" => $sales_id, #發放人員
             "bonus_amount" => round($sales_bonus * 0.2), #金額
             "payment_schedul_due" => "deposit", #訂金已收款20%
@@ -159,7 +159,7 @@ function elevator_new_deal_bonus_v1_0($ver, $contract_type, $elevator_knockdown_
 
         #營銷人員銷售獎金水庫-----出貨前期所有款項已收齊，且出貨款已收款50%，發放總獎金50%
         array_push($bonus_array, [
-            "bonus_type" => "營銷人員銷售獎金-出貨款段", #獎金名稱
+            "bonus_type" => "1-出貨款段", #獎金名稱
             "bonus_receiver" => $sales_id, #發放人員
             "bonus_amount" => round($sales_bonus * 0.5), #金額
             "payment_schedul_due" => "shipping", #訂金已收款20%
@@ -168,7 +168,7 @@ function elevator_new_deal_bonus_v1_0($ver, $contract_type, $elevator_knockdown_
 
         #營銷人員銷售獎金水庫-----驗收前期所有款項已收齊，且驗收款已收款30%，發放總獎金30%
         array_push($bonus_array, [
-            "bonus_type" => "營銷人員銷售獎金-驗收款段", #獎金名稱
+            "bonus_type" => "1-驗收款段", #獎金名稱
             "bonus_receiver" => $sales_id, #發放人員
             "bonus_amount" => round($sales_bonus * 0.3), #金額
             "payment_schedul_due" => "acceptance", #訂金已收款20%
@@ -177,7 +177,7 @@ function elevator_new_deal_bonus_v1_0($ver, $contract_type, $elevator_knockdown_
 
         #區域經理獎金水庫-----訂金已收款100%，發放總獎金50%
         array_push($bonus_array, [
-            "bonus_type" => "區域經理提成獎金-訂金段", #獎金名稱
+            "bonus_type" => "2-訂金段", #獎金名稱
             "bonus_receiver" => $region_manger_id, #發放人員
             "bonus_amount" => round($region_manager_bonus * 0.5), #金額
             "payment_schedul_due" => "deposit", #訂金已收款100%
@@ -186,7 +186,7 @@ function elevator_new_deal_bonus_v1_0($ver, $contract_type, $elevator_knockdown_
 
         #區域經理獎金水庫-----貨到工地款(含)之前所有款項已收款100%，發放總獎金50%
         array_push($bonus_array, [
-            "bonus_type" => "區域經理提成獎金-貨到工地款段", #獎金名稱
+            "bonus_type" => "2-貨到工地款段", #獎金名稱
             "bonus_receiver" => $region_manger_id, #發放人員
             "bonus_amount" => round($region_manager_bonus * 0.5), #金額
             "payment_schedul_due" => "deliveried", #貨到工地款(含)之前所有款項已收款100%
diff --git a/wms/bonus/maintainance_bonus.php b/wms/bonus/maintainance_bonus.php
new file mode 100644
index 00000000..ee2ab36b
--- /dev/null
+++ b/wms/bonus/maintainance_bonus.php
@@ -0,0 +1,366 @@
+<?php
+include_once("../header.php");
+// require_once('./connT8.php');
+require("../contract/conn.php");
+$now = date("Y-m-d");
+
+$contract_type = [
+    '1' => '新梯',
+    '2' => '汰改',
+    '3' => '保養'
+];
+
+$bonus_type = [
+    '1' => '契約人獎金',
+    '2' => '區經理獎金',
+    '3' => '專任契約經理獎金'
+];
+
+$bonus_status = [
+    '1' => '未確認',
+    '2' => '應發已確認',
+    '3' => '應發未確認',
+    '4' => '暫不發放',
+    '5' => '人事審核確認'
+];
+$clause = '';
+if ($user_id != 'M0225') {
+    $clause .= "AND receiver == '$user_id'";
+}
+if (!empty($_GET['check'])) {
+    // 人事發放作業，應為一個月內
+    if ($_GET['check'] == 4) {
+        $oneMonthAgo = date("Y-m-d", strtotime("$now +1 months"));
+        // $clause .= "AND pay_day_due >= '$now' AND pay_day_due <= '$oneMonthAgo' AND status IN (1,2,5)";
+        $clause .= "AND a.status IN (1,2,5)";
+    } else if ($_GET['check'] == 2) {
+        $clause .= "AND a.status = 1";
+    } else if ($_GET['check'] == 3) {
+        $clause .= "AND a.status IN (2,5)";
+    }
+}
+
+$sql = "SELECT a.*,b.customer FROM bonus AS a 
+LEFT JOIN con_maintance_examine_apply AS b ON a.contract_no = b.vol_no
+WHERE 1=1 $clause AND a.contract_type = 3";
+
+$stmt = $conn->prepare($sql);
+$stmt->execute();
+$datas = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+
+$now = new DateTime();
+$oneMonthAgo = $now->modify('+1 month');
+
+$id = [];
+foreach ($datas as $data) {
+    $id[] = $data['id'];
+}
+$id_str = implode(',', $id);
+
+// 查看 T8 是否有收款明細
+// require("./api/get.php");
+?>
+<link rel="stylesheet" href="../contract-repair/styles/style.css">
+<link rel="stylesheet" href="../contract-repair/semantic/dist/semantic.min.css">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<script defer src="../contract-repair/js/alpinejs/cdn.min.js"></script>
+<script src="../contract-repair/js/alpine.js"></script>
+<script src="../contract-repair/js/axios/axios.min.js"></script>
+<!-- <script src="../contract-repair/js/jquery/jquery-3.1.1.min.js"></script> -->
+<script src="../contract-repair/semantic/dist/semantic.min.js"></script>
+<div class="bonus_index" x-data="bonusIndexTest">
+    <div class="form" method="post" id="form" enctype="multipart/form-data">
+        <div style="overflow-x:auto;margin-top:12px">
+            <table class='table query-table table-striped table-bordered display  compact' style='width:98%;text-align:center;margin:0 auto'>
+                <thead>
+                    <tr>
+                        <td colspan="8">
+                            <h3 style='text-align:center'>(契約)獎金計算</h3>
+                        </td>
+                    </tr>
+
+                </thead>
+            </table>
+            <!-- <a href="bonus_index1.php?function_name=bonus&token=<?php echo $token; ?>" class="btn btn-info btn-sm">
+                <span class="glyphicon glyphicon-plus"></span>
+            </a> -->
+            <a href="/wms/bonus/bonus.php?function_name=bonus&token=<?php echo $token; ?>" class=" btn <?php echo (!isset($_GET['check'])) ? "btn btn-primary" : "btn-secondary"; ?>   btn-sm categoryBtn"> 所有獎金</a>
+            <!-- <a href="/wms/bonus/bonus.php?check=1&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 1) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 應發獎金</a> -->
+            <a href="/wms/bonus/bonus.php?check=2&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 2) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 未發獎金</a>
+            <a href="/wms/bonus/bonus.php?check=3&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 3) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 已發獎金</a>
+            <a href="/wms/bonus/bonus.php?check=4&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 4) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 人事發放作業</a>
+            <a href="/wms/bonus/bonus_person.php?check=maintainance&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 5) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 獎金總計(人)</a>
+
+
+            <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+                <button class="btn btn-primary float-end" style="float: right;" onclick="isPay()">查看是否收款</button>
+                <?php if (!empty($_GET['check']) && $_GET['check'] == '4') { ?>
+                    <button class="btn btn-primary float-end" style="float: right;" onclick="All('<?= $id_str ?>')">鎖定並發放</button>
+                <?php } ?>
+                <thead>
+                    <tr>
+                        <th>項次</th>
+                        <th>合約號</th>
+                        <th>合約名稱</th>
+                        <th>作番號</th>
+                        <th>獎金類別</th>
+                        <th>獎金版本</th>
+                        <th>作番金額(月)</th>
+                        <th>牌價</th>
+                        <th>服務費</th>
+                        <th>應發人員</th>
+                        <th>預計發放時間</th>
+                        <th>應發獎金水庫</th>
+                        <th>實發金額</th>
+                        <th>狀態</th>
+                        <?php
+                        if (!empty($_GET['check']) && $_GET['check'] == '4') {
+                        ?>
+                            <th>實際發放時間</th>
+                            <th>發放 / 詳情</th>
+
+                        <?php } else { ?>
+                            <th>詳情</th>
+                        <?php
+                        } ?>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php if (!empty($datas)) {
+                        foreach ($datas as $key => $data) :
+
+                            $contract_no = $data['contract_no'];
+                            $json = json_decode($data['bonus_json']);
+                            $total = empty($json->total) ? 0 : $json->total;
+                            $fee_per_st = empty($json->fee_per_st) ? 0 : $json->fee_per_st;
+                            $commission_fee = empty($json->commission_fee) ? 0 : $json->commission_fee;
+                            // $isPay = isPay($data['contract_no'], $connT8);
+
+                    ?>
+                            <tr>
+                                <td><?= $data['id'] ?></td>
+                                <td><?= $data['contract_no'] ?></td>
+                                <td><?= $data['customer'] ?></td>
+                                <td><?= $data['facility_no'] ?></td>
+                                <td><?= $bonus_type[$data['bonus_type']] ?></td>
+                                <td><?= $data['bonus_verson'] ?></td>
+                                <td><?= $fee_per_st ?></td>
+                                <td><?= $total ?></td>
+                                <td><?= $commission_fee ?></td>
+                                <td><?= $data['receiver'] ?></td>
+                                <td><?= $data['pay_day_due'] ?></td>
+                                <td><?= $data['amount'] ?></td>
+                                <td><?= $data['bonus_actual'] ?></td>
+                                <td>
+                                    <?= $bonus_status[$data['status']] ?>
+                                    <!-- <span><?= ($isPay == 1) ? '已收款' : '未收款' ?></span> -->
+                                </td>
+                                <?php if (!empty($_GET['check']) && $_GET['check'] == '4') {
+                                    if ($data['status'] == '3' || $data['status'] == '1') { ?>
+                                        <td> -- </td>
+                                        <td>
+                                            <?php
+                                            // if ($isPay == 1) {
+                                            ?>
+                                            <button onclick="issue(<?= $data['id'] ?>,'<?= $user_id ?>','<?= $data['pay_day_due'] ?>','<?= $data['amount'] ?>')" type="button" class="btn applybtn" name='issuePay'>發放獎金</button>
+                                            <?php
+
+                                            // } else if ($payday < $oneMonthAgo) {
+                                            ?>
+                                            <a href="bonus_detail.php?id=<?= $data['id'] ?>&token=<?php echo $token; ?>" class="applybtncheck">查看詳情</a>
+                                            <?php
+                                            // }
+                                            ?>
+                                        </td>
+                                        <!-- <td><input type="date" value="<?= $data['pay_day'] ?>"></td> -->
+
+                                    <?php } else { ?>
+                                        <td><?= $data['pay_day'] ?></td>
+                                        <td><a href="bonus_check.php?id=<?= $data['id'] ?>&token=<?php echo $token; ?>" class="applybtncheck">查看詳情</a></td>
+
+                                    <?php }
+                                } else { ?>
+                                    <td><a href="bonus_check.php?id=<?= $data['id'] ?>&token=<?php echo $token; ?>" class="applybtncheck">查看詳情</a></td>
+
+                                <?php } ?>
+                            </tr>
+                    <?php
+                        endforeach;
+                    } ?>
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <!-- </div> -->
+
+    <style>
+        table {
+            table-layout: fixed;
+            width: 100%;
+        }
+
+        td {
+            word-wrap: break-word;
+        }
+
+        .width_st yle_1 {
+            width: 125px;
+        }
+
+        table {
+            width: 100%;
+        }
+
+        #table_index_filter {
+            float: right;
+        }
+
+        #table_index_paginate {
+            table-layout: fixed;
+            width: 100%;
+        }
+
+        label {
+            display: inline-flex;
+            margin-bottom: .5rem;
+            margin-top: .5rem;
+
+        }
+
+        .btn-secondary {
+            color: #fff;
+            background-color: #6c757d;
+            border-color: #6c757d;
+        }
+
+        .btn-secondary:hover {
+            color: #fff;
+            background-color: #5a6268;
+            border-color: #545b62;
+        }
+
+        .applybtn {
+            color: #fff;
+            background-color: #1484c4;
+            /* display: block; */
+            border-radius: 5px;
+            /* padding: 5px 2px; */
+            font-size: 13px;
+            line-height: 1;
+            display: grid;
+            place-items: center;
+            /* 水平和垂直居中 */
+            /* height: 2%vh; */
+            /* 100%视窗高度，可根据需要调整 */
+        }
+
+        .applybtncheck {
+            color: #fff;
+            background-color: #eea236;
+            /* display: block; */
+            border-radius: 4px;
+            padding: 4px 2px;
+            font-size: 13px;
+            line-height: 1;
+            display: grid;
+            place-items: center;
+            /* 水平和垂直居中 */
+            height: 2%vh;
+            /* 100%视窗高度，可根据需要调整 */
+        }
+
+        .applybtncheck:hover {
+            background-color: #f0ad4e;
+            color: #fff;
+        }
+
+        .applybtn:hover {
+            background-color: #1494f9;
+            color: #fff;
+        }
+    </style>
+
+    <script>
+        const datas = <?php echo json_encode($datas); ?>;
+
+        function issue(id, user_id, pay_day, amount) {
+            // consolelog(id);
+            const form = new FormData();
+            form.append('id', id)
+            form.append('user_id', user_id);
+            form.append('pay_day', pay_day)
+            form.append('amount', amount);
+            form.append('postType', 'a');
+            form.append('contract_type', 'maintainance');
+            axios.post('./api/postStatus.php', form).then((res) => {
+                if (res.data == 'Success') {
+                    alert('更新成功');
+                    location.reload();
+                }
+            }).catch((err) => {
+
+            })
+        }
+
+        function All(data) {
+            let arr = data.split(",");
+            const form = new FormData();
+            form.append('id', arr);
+            form.append('user_id', '<?= $user_id ?>')
+            form.append('postType', 'd');
+            if (confirm('是否發放全部獎金')) {
+                axios.post('./api/postStatus.php', form).then((res) => {
+                    if (res.status == 200) {
+                        alert('更新成功');
+                        location.reload();
+                    }
+                }).catch((err) => {
+
+                });
+            }
+        }
+
+        function isPay() {
+            const form = new FormData();
+            form.append('user_id', '<?= $user_id ?>');
+            form.append('postType', 'e');
+            // if (confirm('是否發放全部獎金')) {
+            axios.post('./api/postStatus.php', form).then((res) => {
+                if (res.status == 200) {
+                    alert('更新成功');
+                    // location.reload();
+                }
+            }).catch((err) => {
+
+            });
+            // }
+        }
+        // $(function() {
+        //     $("button[name=issuePay]").click(function() {
+        //         console.log(123);
+        //     })
+        // })
+        // function init() {
+        //     this.isPay();
+
+        // }
+        // const bonusIndex = () => {
+        //     return {
+        //         async isPay() {
+        //             // console.log(123)
+        //             for (let i = 0; i < datas.length; i++) {
+        //                 await axios.get('./api/get.php?contract_no=' + datas[i].contract_no).then(res => {
+        //                     let isPay = res.data;
+        //                     // this.data.isPay.push(isPay); // 更新 x-data 中的数据
+        //                     this.isPays.push(isPay);
+        //                 }).catch(err => {
+
+        //                 })
+        //             }
+
+        //             console.log(this.isPays);
+        //         }
+        //     }
+        // }
+    </script>
\ No newline at end of file
diff --git a/wms/bonus/bonus_detail.php b/wms/bonus/maintainance_bonus_detail.php
similarity index 100%
rename from wms/bonus/bonus_detail.php
rename to wms/bonus/maintainance_bonus_detail.php
diff --git a/wms/bonus/bonus.php b/wms/bonus/new_bonus.php
similarity index 83%
rename from wms/bonus/bonus.php
rename to wms/bonus/new_bonus.php
index 63bec621..c595e442 100644
--- a/wms/bonus/bonus.php
+++ b/wms/bonus/new_bonus.php
@@ -42,7 +42,7 @@ if (!empty($_GET['check'])) {
 
 $sql = "SELECT a.*,b.customer FROM bonus AS a 
 LEFT JOIN con_maintance_examine_apply AS b ON a.contract_no = b.vol_no
-WHERE 1=1 $clause";
+WHERE 1=1 $clause AND a.contract_type = 1 ORDER BY a.id DESC";
 $stmt = $conn->prepare($sql);
 $stmt->execute();
 $datas = $stmt->fetchAll(PDO::FETCH_ASSOC);
@@ -124,23 +124,30 @@ function isPay($contract_no, $connT8)
 <div class="bonus_index" x-data="bonusIndexTest">
     <div class="form" method="post" id="form" enctype="multipart/form-data">
         <div style="overflow-x:auto;margin-top:12px">
+            <table class='table query-table table-striped table-bordered display  compact' style='width:98%;text-align:center;margin:0 auto'>
+                <thead>
+                    <tr>
+                        <td colspan="8">
+                            <h3 style='text-align:center'>(契約)獎金計算</h3>
+                        </td>
+                    </tr>
+
+                </thead>
+            </table>
             <!-- <a href="bonus_index1.php?function_name=bonus&token=<?php echo $token; ?>" class="btn btn-info btn-sm">
                 <span class="glyphicon glyphicon-plus"></span>
             </a> -->
-            <a href="/wms/bonus/bonus.php?function_name=bonus&token=<?php echo $token; ?>" class=" btn <?php echo (!isset($_GET['check'])) ? "btn btn-primary" : "btn-secondary"; ?>   btn-sm categoryBtn"> 所有獎金</a>
+            <a href="/wms/bonus/new_bonus.php?function_name=bonus&token=<?php echo $token; ?>" class=" btn <?php echo (!isset($_GET['check'])) ? "btn btn-primary" : "btn-secondary"; ?>   btn-sm categoryBtn"> 所有獎金</a>
             <!-- <a href="/wms/bonus/bonus.php?check=1&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 1) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 應發獎金</a> -->
-            <a href="/wms/bonus/bonus.php?check=2&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 2) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 未發獎金</a>
-            <a href="/wms/bonus/bonus.php?check=3&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 3) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 已發獎金</a>
-            <a href="/wms/bonus/bonus.php?check=4&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 4) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 人事發放作業</a>
-            <a href="/wms/bonus/bonus.php?check=5&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 5) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 獎金總計(人)</a>
+            <a href="/wms/bonus/new_bonus.php?check=2&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 2) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 未發獎金</a>
+            <a href="/wms/bonus/new_bonus.php?check=3&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 3) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 已發獎金</a>
+            <a href="/wms/bonus/new_bonus.php?check=4&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 4) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 人事發放作業</a>
+            <a href="/wms/bonus/bonus_person.php?check=new&function_name=bonus&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 5) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 獎金總計(人)</a>
 
 
             <table id="table_index" class="table table-striped table-bordered" style="width:100%">
                 <?php if (!empty($_GET['check']) && $_GET['check'] == '4') { ?>
                     <button class="btn btn-primary float-end" style="float: right;" onclick="All('<?= $id_str ?>')">鎖定並發放</button>
-                <?php } else { ?>
-                    <input type="text" name="account_name">
-                    <button class="btn btn-primary float-end" style="float: right;">總計搜尋</button>
                 <?php } ?>
                 <thead>
                     <tr>
@@ -154,7 +161,6 @@ function isPay($contract_no, $connT8)
                         <th>牌價</th>
                         <th>服務費</th>
                         <th>應發人員</th>
-                        <th>預計發放時間</th>
                         <th>應發獎金水庫</th>
                         <th>實發金額</th>
                         <th>狀態</th>
@@ -165,7 +171,7 @@ function isPay($contract_no, $connT8)
                             <th>發放 / 詳情</th>
 
                         <?php } else { ?>
-                            <th>詳情</th>
+                            <!-- <th>詳情</th> -->
                         <?php
                         } ?>
                     </tr>
@@ -173,7 +179,8 @@ function isPay($contract_no, $connT8)
                 <tbody>
                     <?php if (!empty($datas)) {
                         foreach ($datas as $key => $data) :
-
+                            $bonus_json = json_decode($data['bonus_json']);
+                            $bonus_kind = !empty($bonus_json->bonus_kind) ? $bonus_json->bonus_kind : '';
                             $contract_no = $data['contract_no'];
                             $json = json_decode($data['bonus_json']);
                             $total = empty($json->total) ? 0 : $json->total;
@@ -187,13 +194,12 @@ function isPay($contract_no, $connT8)
                                 <td><?= $data['contract_no'] ?></td>
                                 <td><?= $data['customer'] ?></td>
                                 <td><?= $data['facility_no'] ?></td>
-                                <td><?= $bonus_type[$data['bonus_type']] ?></td>
+                                <td><?php echo $bonus_type[$data['bonus_type']] . '-' . $bonus_kind ?></td>
                                 <td><?= $data['bonus_verson'] ?></td>
                                 <td><?= $fee_per_st ?></td>
                                 <td><?= $total ?></td>
                                 <td><?= $commission_fee ?></td>
                                 <td><?= $data['receiver'] ?></td>
-                                <td><?= $data['pay_day_due'] ?></td>
                                 <td><?= $data['amount'] ?></td>
                                 <td><?= $data['bonus_actual'] ?></td>
                                 <td>
@@ -225,7 +231,7 @@ function isPay($contract_no, $connT8)
 
                                     <?php }
                                 } else { ?>
-                                    <td><a href="bonus_check.php?id=<?= $data['id'] ?>&token=<?php echo $token; ?>" class="applybtncheck">查看詳情</a></td>
+                                    <!-- <td><a href="bonus_check.php?id=<?= $data['id'] ?>&token=<?php echo $token; ?>" class="applybtncheck">查看詳情</a></td> -->
 
                                 <?php } ?>
                             </tr>
@@ -336,6 +342,7 @@ function isPay($contract_no, $connT8)
             form.append('pay_day', pay_day)
             form.append('amount', amount);
             form.append('postType', 'a');
+            form.append('contract_type', 'new');
             axios.post('./api/postStatus.php', form).then((res) => {
                 if (res.data == 'Success') {
                     alert('更新成功');
diff --git a/wms/bonus/other/maintenance_contract_bonus_v2_1.php b/wms/bonus/other/maintenance_contract_bonus_v2_1.php
index 27959883..086dbbf1 100644
--- a/wms/bonus/other/maintenance_contract_bonus_v2_1.php
+++ b/wms/bonus/other/maintenance_contract_bonus_v2_1.php
@@ -43,10 +43,11 @@ result_array[
 
 function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period, $elevator_list_price, $fee_per_st, $commission_fee, $receivable_date_due, $sales_id, $region_director_id, $regular_contract_manger_id = '')
 {
+	// $fee_per_st = round($fee_per_st);
 	$bonus_array = [];
 	if ($ver == "2.1") {
 		// $discount = round(($fee_per_st - $commission_fee) / $elevator_list_price, 2);
-		$discount = ($fee_per_st - $commission_fee) / $elevator_list_price;
+		$discount = round(($fee_per_st - $commission_fee) / $elevator_list_price, 10);
 
 		#契約總類($contract_type)：新簽約(new)、免保轉有費(free_to_charge)、續簽約(原價或僅契約金額異動)(renew_priceissue)
 		switch ($contract_type) {
diff --git a/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_1.php b/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_1.php
index 70a19f40..db37fd30 100644
--- a/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_1.php
+++ b/wms/bonus/other/maintenance_longterm_contract_m1_free_charge_bonus_v2_1_1.php
@@ -120,7 +120,7 @@ function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract
 		};
 		#付款方式$payment_period： 每月支付(monthly), 2月1次(bimonthly), 季付(quarterly), 半年付(semiannually), 年付(annually)
 		array_push($bonus_array, [
-			"bonus_type" => "地區處長獎金", #獎金名稱
+			"bonus_type" => "2", #獎金名稱
 			"bonus_receiver" => $region_director_id, #發放人員
 			"bonus_amount" => round($region_director_bonus), #金額
 			"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +12 months")), #預計發放時間
@@ -130,7 +130,7 @@ function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract
 		#專任契約經理獎金
 		if ($regular_contract_manger_id != '') {
 			array_push($bonus_array, [
-				"bonus_type" => "專任契約經理獎金", #獎金名稱
+				"bonus_type" => "3", #獎金名稱
 				"bonus_receiver" => $regular_contract_manger_id, #發放人員
 				"bonus_amount" => round($regular_contract_manger_bonus), #金額
 				"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +12 months")), #預計發放時間
@@ -162,11 +162,11 @@ function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract
 						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
 					};
 					array_push($bonus_array, [
-						"bonus_type" => "契約員獎金", #獎金名稱
+						"bonus_type" => "1", #獎金名稱
 						"bonus_receiver" => $sales_id, #發放人員
 						"bonus_amount" => round($current_bonus), #金額
 						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] year")), #預計發放時間
-						"bonus_regulation" => "每月收款後,按收款比率次月發放" #發放規定				
+						"bonus_regulation" => "每次收款後,按收款比率次月發放" #發放規定				
 					]);
 				}
 
@@ -191,11 +191,11 @@ function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract
 						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
 					};
 					array_push($bonus_array, [
-						"bonus_type" => "契約員獎金", #獎金名稱
+						"bonus_type" => "1", #獎金名稱
 						"bonus_receiver" => $sales_id, #發放人員
 						"bonus_amount" => round($current_bonus), #金額
 						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] months")), #預計發放時間
-						"bonus_regulation" => "每月收款後,按收款比率次月發放" #發放規定				
+						"bonus_regulation" => "每次收款後,按收款比率次月發放" #發放規定				
 					]);
 				}
 				break;
@@ -219,7 +219,7 @@ function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract
 						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
 					};
 					array_push($bonus_array, [
-						"bonus_type" => "契約員獎金", #獎金名稱
+						"bonus_type" => "1", #獎金名稱
 						"bonus_receiver" => $sales_id, #發放人員
 						"bonus_amount" => round($current_bonus), #金額
 						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] months")), #預計發放時間
@@ -227,7 +227,6 @@ function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract
 					]);
 				}
 				break;
-				break;
 				#雙月繳
 			case 'bimonthly':
 				$a = $payment_period_amount / 2;
@@ -248,7 +247,7 @@ function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract
 						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
 					};
 					array_push($bonus_array, [
-						"bonus_type" => "契約員獎金", #獎金名稱
+						"bonus_type" => "1", #獎金名稱
 						"bonus_receiver" => $sales_id, #發放人員
 						"bonus_amount" => round($current_bonus), #金額
 						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] months")), #預計發放時間
@@ -278,7 +277,7 @@ function maintenance_longterm_contract_m1_free_charge_bonus_v2_1($ver, $contract
 						$current_bonus = round($sales_bonus - $i * round($sales_bonus * $payment_ratio_due_array[$i])); #最後一次金額
 					};
 					array_push($bonus_array, [
-						"bonus_type" => "契約員獎金", #獎金名稱
+						"bonus_type" => "1", #獎金名稱
 						"bonus_receiver" => $sales_id, #發放人員
 						"bonus_amount" => round($current_bonus), #金額
 						"pay_day_due" => date("Y-m-d", strtotime("$receivable_date_due +$payday_due_array[$i] months")), #預計發放時間
diff --git a/wms/contract/api/getContractData.php b/wms/contract/api/getContractData.php
index 5534b8eb..7d31dcbb 100644
--- a/wms/contract/api/getContractData.php
+++ b/wms/contract/api/getContractData.php
@@ -73,14 +73,17 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
         $stmt->execute();
         $elevators_results = $stmt->fetchAll(PDO::FETCH_ASSOC);
         $elevators_detail_arr = [];
-
-        $sql = "SELECT * FROM pricereview_item WHERE mid =:mid AND item_group ='B' ";
-        $stmt = $conn->prepare($sql);
-        $stmt->bindParam(':mid', $mid);
-        $stmt->execute();
-        $option_results = $stmt->fetchAll(PDO::FETCH_ASSOC);
-        $option_arr = [];
-
+        $contract_elevator_qty = 0;
+        // $sql = "SELECT * FROM pricereview_item WHERE mid =:mid AND item_group ='B' ";
+        // $stmt = $conn->prepare($sql);
+        // $stmt->bindParam(':mid', $mid);
+        // $stmt->execute();
+        // $option_results = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        // $option_arr = [];
+
+        foreach ($elevators_results as $keys) {
+            $contract_elevator_qty += $keys['item_qty'];
+        }
         foreach ($elevators_results as $keys => $result) {
             $item_no = $result['item_no']; //電梯項次
             // 電梯 OPTION 
@@ -91,36 +94,87 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
             $stmt->execute();
             $option_results = $stmt->fetchAll(PDO::FETCH_ASSOC);
             $option_arr[] = $option_results;
+            // echo "<pre>";
+            // print_r($option_arr);
+            // echo "</pre>";
             if (!empty($option_results)) {
                 $result['option_price'] = 0;
                 // 電梯 OPTION 價格分別加到各台電梯
-                foreach ($option_arr[$keys] as $key => $option) {
+                foreach ($option_results as $key => $option) {
                     if ($option['item_qty'] == $result['item_qty']) {
                         $result['option_price'] += intval($option['item_unit_price']);
-                        echo '1..';
-                    } else if ($option['item_qty'] > $result['item_qty'] != 1) {
+                        // echo '1..';
+                        // echo "<pre>";
+                        // print_r($option['item_unit_price']);
+                        // echo "</pre>";
+                    } else if ($option['item_qty'] / $result['item_qty'] != 1) {
                         $item_qty = intval($option['item_qty']) / intval($result['item_qty']); // 總option數量 / 總電梯台數
                         $result['option_price'] += intval($option['item_unit_price']) * $item_qty;
-                        echo '2..';
+                        // echo '2..';
+                        // echo "<pre>";
+                        // print_r(intval($option['item_unit_price']) . ' *' . $item_qty . '=' . intval($option['item_unit_price']) * $item_qty);
+                        // echo "</pre>";
                     } else {
                         $result['option_price'] += $option['item_unit_price'] * intval($option['item_qty']);
-                        echo '3..';
+                        // echo '3..';
                     }
-                    echo '<pre>';
-                    print_r($option['item_no'] . '--->' . $option['item_unit_price']);
-                    echo '</pre>';
+                    // echo '<pre>';
+                    // print_r($option['item_no'] . '--->' . $option['item_unit_price'] . '--->' . $option['item_qty']);
+                    // echo '</pre>';
                 }
 
-                print_r($result['option_price']);
-                exit();
+                // print_r($result['option_price']);
+                // exit();
             }
+            // 查詢保固延長
+            $sql = "SELECT * FROM pricereview_item WHERE mid =:mid AND item_group ='E' AND option_relate_spec = :item_no";
+            $stmt = $conn->prepare($sql);
+            $stmt->bindParam(':mid', $mid);
+            $stmt->bindParam(':item_no', $item_no);
+            $stmt->execute();
+            $other_option_arr = $stmt->fetchAll(PDO::FETCH_ASSOC);
+            if (!empty($other_option_arr)) {
+                $result['option_other_price'] = 0;
+                // 電梯 OPTION 價格分別加到各台電梯
+                foreach ($other_option_arr as $key => $option) {
+                    if ($option['item_qty'] == $result['item_qty']) {
+                        $result['option_other_price'] += intval($option['item_unit_price']);
+                        // echo '1..';
+                        // echo "<pre>";
+                        // print_r($option['item_unit_price']);
+                        // echo "</pre>";
+                    } else if ($option['item_qty'] / $result['item_qty'] != 1) {
+                        $item_qty = intval($option['item_qty']) / intval($result['item_qty']); // 總option數量 / 總電梯台數
+                        $result['option_other_price'] += intval($option['item_unit_price']) * $item_qty;
+                        // echo '2..';
+                        // echo "<pre>";
+                        // print_r(intval($option['item_unit_price']) . ' *' . $item_qty . '=' . intval($option['item_unit_price']) * $item_qty);
+                        // echo "</pre>";
+                    } else {
+                        $result['option_other_price'] += $option['item_unit_price'] * intval($option['item_qty']);
+                        // echo '3..';
+                    }
+                    // echo '<pre>';
+                    // print_r($option['item_no'] . '--->' . $option['item_unit_price'] . '--->' . $option['item_qty']);
+                    // echo '</pre>';
+                }
+
+                // print_r($result['option_other_price']);
+                // exit();
+            }
+
+
             $note = explode(',', $result['note']);
             $result['spec'] = $note[0];   //型號
             $result['person'] = $note[1]; // 人承
             $result['floor'] = $note[2]; // 樓層
             $result['speed'] = $note[3]; // 速度
-            for ($i = 0; $i < $result['item_qty']; $i++) {
+            $count_qty = $result['item_qty'];
+            for ($i = 0; $i < $count_qty; $i++) {
+                $result['elevator_price'] = round($result['item_price_ct'] / $result['item_qty']); //合約單台電提價格
+                $result['commission_fee'] = round($contract['special_fee']) / $contract_elevator_qty;
                 $result['item_no'] = $i + 1;
+                $result['item_qty'] = 1;
                 array_push($elevators_detail_arr, $result);
             }
         }
@@ -137,7 +191,7 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
         header('Content-Type: application/json');
 
         // 將 JSON 回應返回給客戶端
-        // echo $contractResponse;
+        echo $contractResponse;
     } catch (PDOException $e) {
         die("ERROR!!!: " . $e->getMessage());
     }
diff --git a/wms/contract/api/postContractData.php b/wms/contract/api/postContractData.php
index e8dca10f..445d0b5b 100644
--- a/wms/contract/api/postContractData.php
+++ b/wms/contract/api/postContractData.php
@@ -35,6 +35,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         $files = !empty($_FILES['files']) ? $_FILES['files'] : null;
         $elevators = !empty($_POST['elevators']) ? json_decode($_POST['elevators'], true) : [];
         $payType = !empty($_POST['payType']) ? $_POST['payType'] : null;
+        $contract_type = !empty($_POST['contract_type']) ? $_POST['contract_type'] : null;
 
         $sql = "SELECT * FROM account WHERE accountid = '$salesman'";
         $stmt = $conn->prepare($sql);
@@ -72,7 +73,6 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         //     exit();
         // }
         echo json_encode($facilityno);
-        /// 獎金計算
         $fail_arr = [];
         if ($contractno === '') return $fail_arr[] = '合約號為必填';
         if ($total_price == '')  $fail_arr[] = '合約總價為必填';
@@ -93,17 +93,21 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         if ($partyAphone == '')  $fail_arr[] = '業務聯繫人電話為必填';
         if ($partyAemail == '')  $fail_arr[] = '業務聯繫人Email為必填';
         if ($num == '')  $fail_arr[] = '電梯數量為必填';
-        if ($payType == '') $fail_arr[] = '付款方式為必填';
+        if ($payType == '') $fail_arr[] = '分期方式為必填';
+        if ($contract_type == '') $fail_arr[] = '合約類別為必填';
         if (count($fail_arr) > 0) {
             header("HTTP/1.1 422 Unprocessable Entity");
             echo json_encode($fail_arr);
             exit();
         }
         // T8insert($_POST, $facilityno, $depId);
+        /// 獎金計算
         $aaa = bonusCreate($_POST, $facilityno, $conn);
-        echo '<pre>';
-        print_r($aaa);
-        echo '</pre>';
+        if ($aaa['status'] == 2) {
+            header("HTTP/1.1 422 Unprocessable Entity");
+            echo $aaa['data'];
+            exit();
+        }
         exit;
         //create account table
         $accounttype = "A";
@@ -683,6 +687,7 @@ function bonusCreate($data, $facilityno, $conn)
             'A40005' => 'semiannually', // 半年繳
             'A40003' => 'monthly' //月繳
         ];
+
         $fail_arr = [];
         $payDay = getNext25thDate($contract_begin_date);
         foreach ($elevators as $key => $elevator) {
@@ -690,7 +695,7 @@ function bonusCreate($data, $facilityno, $conn)
             $ver = $elevator['bonus_verson']; //獎金版本
             $payment_period = $payment[$payType]; //付款方式
             $elevator_list_price = !empty(intval($elevator['stand_price'])) ? intval($elevator['stand_price']) : ''; //牌價
-            $fee_per_st = !empty(round($elevator['sold_price'] / 1.05, 2)) ? round($elevator['sold_price'] / 1.05, 2) : ''; //作翻契約金額 (不含稅)
+            $fee_per_st = !empty($elevator['sold_price']) ? intval(round($elevator['sold_price'] / 1.05, 2)) : ''; //作翻契約金額 (不含稅)
             $commission_fee = !empty($elevator['service_expense']) ? $elevator['service_expense'] : ''; //服務費(月/台)
             $receivable_date_due = $payDay; //第一筆保養款項收回日
             $sales_id = $salesman; //營業人員
@@ -699,7 +704,7 @@ function bonusCreate($data, $facilityno, $conn)
             $regular_contract_manger_id = !empty($elevator['regular_contract_manger_id']) ? $elevator['regular_contract_manger_id'] : '';
             $maintain_months = intval($elevator['maintain_months']);
             $years = $maintain_months / 12;
-
+            echo $years;
             if ($maintain_months == '') $fail_arr[] = "保養月費為必填";
             if ($fee_per_st == '') $fail_arr[] = "契約金額為必填";
             if ($elevator_list_price == '') $fail_arr[] = "牌價為必填";
@@ -710,12 +715,12 @@ function bonusCreate($data, $facilityno, $conn)
                 return $fail_arr;
                 break;
             }
-
+            $renew_priceissue_bonus = [];
             // $years = ($maintain_months % 12) == 0 ? $maintain_months / 12 : '';
             // 如果保養合約 大於一年
             if (!empty($maintain_months)) {
                 if ($maintain_months > 12 && $contract_type == 'new') {
-                    // 第一年為新簽約
+                    // 第一年為 "新簽約"
                     $results = maintenance_contract_bonus_v2_1(
                         $ver,
                         $contract_type,
@@ -728,27 +733,28 @@ function bonusCreate($data, $facilityno, $conn)
                         $region_director_id,
                         $regular_contract_manger_id
                     );
-                    for ($i = 0; $i < $maintain_months - 1; $i++) {
+                    for ($i = 1; $i <= $years - 1; $i++) {
                         $contract_type = 'renew_priceissue';
-                        // 第二年以上改續約
-                        $result2 = maintenance_contract_bonus_v2_1(
+                        $receivable_date_due_renew = date("Y-m-d", strtotime("$receivable_date_due + $i year"));
+                        // 第二年以上改 "續約"
+                        $renew_priceissue_bonus[] = maintenance_contract_bonus_v2_1(
                             $ver,
                             $contract_type,
                             $payment_period,
                             $elevator_list_price,
                             $fee_per_st,
                             $commission_fee,
-                            $receivable_date_due,
+                            $receivable_date_due_renew,
                             $sales_id,
                             $region_director_id,
                             $regular_contract_manger_id
                         );
                     }
                 } else if ($maintain_months > 12 && $contract_type == 'renew_priceissue') {
-                    // 超過一年的續約
+                    // 超過一年的 "續約"
                     for ($i = 0; $i < $years; $i++) {
                         $contract_type = 'renew_priceissue';
-                        $result2 = maintenance_contract_bonus_v2_1(
+                        $renew_priceissue_bonus[] = maintenance_contract_bonus_v2_1(
                             $ver,
                             $contract_type,
                             $payment_period,
@@ -761,9 +767,9 @@ function bonusCreate($data, $facilityno, $conn)
                             $regular_contract_manger_id
                         );
                     }
-                } else if ($maintain_months >= 60) {
-                    $contract_type = 'longcontract_m1_free_charge';
-                    $result = maintenance_longterm_contract_m1_free_charge_bonus_v2_1(
+                } else if ($maintain_months >= 60 && $contract_type = 'longcontract_m1_free_charge') {
+                    // 五年以上長約
+                    $results = maintenance_longterm_contract_m1_free_charge_bonus_v2_1(
                         $ver,
                         $contract_type,
                         $payment_period,
@@ -791,6 +797,7 @@ function bonusCreate($data, $facilityno, $conn)
                     );
                 }
             }
+
             $bonus_json = [
                 'contract_type' => $contract_type,
                 'total' => $elevator_list_price,
@@ -800,22 +807,10 @@ function bonusCreate($data, $facilityno, $conn)
                 'receivable_date_due' => $receivable_date_due,
                 'discount' => $discount
             ];
-            if ($results['result_status'] != 'error') {
-                foreach ($results['bonus_array'] as $i => $result) {
-
-                    $bonus_type = $result['bonus_type'];
-                    $pay_day = $result['pay_day_due'];
-                    $amount = $result['bonus_amount'];
-                    $receiver = $result['bonus_receiver'];
-                    $a = json_encode($bonus_json);
-                    $sql = "INSERT INTO bonus 
-                (bonus_type,bonus_verson,contract_no,contract_type,facility_no,amount,receiver,pay_day_due,status,bonus_json,create_id,create_at) VALUES
-                ($bonus_type,'$ver','$contract_no',$contract_kind,'$facility_no',$amount,'$receiver','$pay_day',$status,'$a','$create_id','$create_at')";
-                    $stmt = $conn->prepare($sql);
-                    $stmt->execute();
-                }
-                if (!empty($result2)) {
-                    foreach ($results2['bonus_array'] as $i => $result) {
+            if (!empty($results)) {
+
+                if ($results['result_status'] != 'error') {
+                    foreach ($results['bonus_array'] as $i => $result) {
 
                         $bonus_type = $result['bonus_type'];
                         $pay_day = $result['pay_day_due'];
@@ -823,15 +818,43 @@ function bonusCreate($data, $facilityno, $conn)
                         $receiver = $result['bonus_receiver'];
                         $a = json_encode($bonus_json);
                         $sql = "INSERT INTO bonus 
+                (bonus_type,bonus_verson,contract_no,contract_type,facility_no,amount,receiver,pay_day_due,status,bonus_json,create_id,create_at) VALUES
+                ($bonus_type,'$ver','$contract_no',$contract_kind,'$facility_no',$amount,'$receiver','$pay_day',$status,'$a','$create_id','$create_at')";
+                        $stmt = $conn->prepare($sql);
+                        $stmt->execute();
+                    }
+                }
+                if (!empty($renew_priceissue_bonus)) {
+                    // echo '1';
+                    foreach ($renew_priceissue_bonus as $renew_priceissue_bonus) {
+                        foreach ($renew_priceissue_bonus['bonus_array'] as $i => $result) {
+
+                            $bonus_type = $result['bonus_type'];
+                            $pay_day = $result['pay_day_due'];
+                            $amount = $result['bonus_amount'];
+                            $receiver = $result['bonus_receiver'];
+                            $a = json_encode($bonus_json);
+                            $sql = "INSERT INTO bonus 
                     (bonus_type,bonus_verson,contract_no,contract_type,facility_no,amount,receiver,pay_day_due,status,bonus_json,create_id,create_at) VALUES
                     ($bonus_type,'$ver','$contract_no',$contract_kind,'$facility_no',$amount,'$receiver','$pay_day',$status,'$a','$create_id','$create_at')";
-                        $stmt = $conn->prepare($sql);
-                        // $stmt->execute();
+                            $stmt = $conn->prepare($sql);
+                            $stmt->execute();
+                        }
                     }
                 }
+                $request = [
+                    "status" => "1",
+                    "data" => "Success"
+                ];
+            } else {
+                $request = [
+                    "status" => "2",
+                    "data" => "create_bonus_error"
+                ];
             }
             // exit();
         }
+        return $request;
         // exit();
     } catch (PDOException $e) {
         http_response_code(404);
diff --git a/wms/contract/api/postNewContractData.php b/wms/contract/api/postNewContractData.php
index 6180e4d4..a62d6e95 100644
--- a/wms/contract/api/postNewContractData.php
+++ b/wms/contract/api/postNewContractData.php
@@ -48,7 +48,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
     if (empty($qc)) $fail_arr[] = '請選擇QC或官檢';
     if (count($fail_arr) > 0) {
       header("HTTP/1.1 422 Unprocessable Entity");
-      echo json_encode($fail_arr);
+      echo json_encode($fail_arr, JSON_UNESCAPED_UNICODE);
       exit();
     }
     //create facility table
@@ -69,8 +69,14 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
     }
     $facilityno = $createFacilityNo->makeMFacilityNo('M', $arr, intval($elevators_nums));
 
-    BounsCount($_POST, $conn, $facilityno);
-    exit();
+    $bonus_result = BounsCount($_POST, $conn, $facilityno);
+    if (!empty($bonus_result) && $bonus_result['status'] == "2") {
+      $fail_arr[] = '獎金計算錯誤，請再檢查或連繫資訊人員';
+      // header("HTTP/1.1 422 Unprocessable Entity");
+      echo json_encode($fail_arr, JSON_UNESCAPED_UNICODE);
+      exit();
+    }
+    // exit();
     $conn->beginTransaction();
 
     $sql_str = "SELECT accountid, name FROM account WHERE accountid = :accountid ORDER BY create_at DESC";
@@ -118,7 +124,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
           $stmt->bindParam(':file_size', $file['size']);
           $stmt->bindParam(':created_at', $created_at);
           $stmt->bindParam(':created_by', $created_by);
-          $stmt->execute();
+          // $stmt->execute();
         } else {
           throw new PDOException('檔案上傳失敗:' . $msg);
         }
@@ -151,7 +157,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
     $stmt->bindParam(":created_at", $created_at);
     $stmt->bindParam(":created_by", $created_by);
     $stmt->bindParam(":qc", $qc);
-    $stmt->execute();
+    // $stmt->execute();
 
 
     $result = $conn->commit();
@@ -304,13 +310,17 @@ function BounsCount($data, $conn, $facilityno)
   $bonus_v1_0_date = '2024-01-02';
   $bonus_v2_0_date = '2024-01-03';
   $contract_type = $data['contract_type'];
-
+  $total = $data['price_total'];
   $type = $contractType[$contract_type]; //戰略客戶 or 一般客戶
   // $elevator_knockdown_price = $data['price_total']; //受價總額
   $elevators = json_decode($data['elevators_detail_arr'], true);
-
+  $contract_no = $data['contractno'];
   $salesman = $data['salesman'];
   $manager = $data['manager'];
+  $contract_kind = 1;
+  $create_id = $data['user_id'];
+  $create_at = date("Y-m-d H:i:s");
+  $status = 1;
 
 
 
@@ -318,28 +328,109 @@ function BounsCount($data, $conn, $facilityno)
   $result_bonus_arr = [];
   if ($signing_date <= $bonus_v1_0_date) {
     $ver = '1.0';
-    foreach ($elevators as $i => $elevator) {
+    foreach ($elevators as $key => $elevator) {
 
-      $elevator_knockdown_price = $elevator['item_price_ct'];
+      $elevator_knockdown_price = $elevator['elevator_price']; // 單台電梯售價
+      $elevator_list_price = $elevator['option_other_price'] + $elevator['option_price'] + $elevator['elevator_price']; //牌價
       $result_bonus = elevator_new_deal_bonus_v1_0($ver, $type, $elevator_knockdown_price, $salesman, $manager);
-      $result_bonus['facility'] = $facilityno[$i];
-      $result_bonus_arr[] = $result_bonus;
+      $facility_no = $facilityno[$key];
+      $bonus_json = [
+        'contract_type' => $type,
+        'total' => $elevator_list_price,
+        'fee_per_st' => $elevator_knockdown_price
+      ];
+
+      if (!empty($result_bonus)) {
+        if ($result_bonus['result_status'] != "error") {
+          foreach ($result_bonus['bonus_array'] as $i => $result) {
+            $bonus_type = explode('-', $result['bonus_type']);
+            $pay_man_type = $bonus_type[0]; //發放類別
+            $bonus_kind = $bonus_type[1];
+            $amount = $result['bonus_amount']; //獎金水庫
+            $bonus_receiver = $result['bonus_receiver']; //發放人員
+            $bonus_json['payment_schedul_due'] = $result['payment_schedul_due'];
+            $bonus_json['payment_schedul_regulation'] = $result['payment_schedul_regulation'];
+            $bonus_json['bonus_kind'] = $bonus_kind;
+            $a = json_encode($bonus_json, JSON_UNESCAPED_UNICODE);
+            $sql = "INSERT INTO bonus 
+                (bonus_type,bonus_verson,contract_no,contract_type,facility_no,amount,receiver,status,bonus_json,create_id,create_at) VALUES
+                ($pay_man_type,'$ver','$contract_no',$contract_kind,'$facility_no',$amount,'$bonus_receiver',$status,'$a','$create_id','$create_at')
+                ";
+            $stmt = $conn->prepare($sql);
+            $stmt->execute();
+          }
+          $request = [
+            "status" => "1",
+            "data" => "Success"
+          ];
+          return $request;
+        }
+        $request = [
+          "status" => "2",
+          "data" => "create_bonus_error"
+        ];
+        return $request;
+      }
     }
   } else if ($signing_date >= $bonus_v2_0_date) {
     $ver = '2.0';
-    foreach ($elevators as $i => $elevator) {
+    foreach ($elevators as $key => $elevator) {
       $elevator_type = $dailyNecessities[$elevator['spec']];
-      $elevator_list_price = $elevator[''];
-      $result_bonus = elevator_new_deal_bonus_v2_0($ver, $contract_type, $elevator_type, $elevator_list_price, $elevator_knockdown_price, $sales_id, $region_manger_id);
+      $elevator_list_price = $elevator['option_other_price'] + $elevator['option_price'] + $elevator['elevator_price'];
+      $elevator_knockdown_price = $elevator['elevator_price'];
+      $commission_fee = $elevator['commission_fee'];
+      $result_bonus = elevator_new_deal_bonus_v2_0(
+        $ver,
+        $type,
+        $elevator_type,
+        $elevator_list_price,
+        $elevator_knockdown_price,
+        $salesman,
+        $manager
+      );
+      // echo '<pre>';
+      // print_r($result_bonus);
+      // echo '</pre>';
+      $facility_no = $facilityno[$key];
+      $bonus_json = [
+        'contract_type' => $type,
+        'total' => $elevator_list_price,
+        'fee_per_st' => $elevator_knockdown_price
+      ];
+      if (!empty($result_bonus)) {
+        if ($result_bonus['result_status'] != "error") {
+          foreach ($result_bonus['bonus_array'] as $i => $result) {
+            $bonus_type = explode('-', $result['bonus_type']);
+            $pay_man_type = $bonus_type[0]; //發放類別
+            $bonus_kind = $bonus_type[1];
+            $amount = $result['bonus_amount']; //獎金水庫
+            $bonus_receiver = $result['bonus_receiver']; //發放人員
+            $bonus_json['payment_schedul_due'] = $result['payment_schedul_due'];
+            $bonus_json['payment_schedul_regulation'] = $result['payment_schedul_regulation'];
+            $bonus_json['bonus_kind'] = $bonus_kind;
+            $a = json_encode($bonus_json, JSON_UNESCAPED_UNICODE);
+            $sql = "INSERT INTO bonus 
+                (bonus_type,bonus_verson,contract_no,contract_type,facility_no,amount,receiver,status,bonus_json,create_id,create_at) VALUES
+                ($pay_man_type,'$ver','$contract_no',$contract_kind,'$facility_no',$amount,'$bonus_receiver',$status,'$a','$create_id','$create_at')
+                ";
+            $stmt = $conn->prepare($sql);
+            $stmt->execute();
+          }
+        }
+        $request = [
+          "status" => "1",
+          "data" => "Success"
+        ];
+      } else {
+        $request = [
+          "status" => "2",
+          "data" => "create_bonus_error"
+        ];
+      }
     }
   }
-  // foreach ($elevators as $elevator) {
-  //   $elevator_knockdown_price = $elevator['item_price_ct'];
-  // }
-  echo '<pre>';
-  print_r($result_bonus_arr);
-  echo '</pre>';
-  exit();
+  return $request;
+
   try {
   } catch (PDOException $e) {
     header("HTTP/1.1 500 Internal Server Error");
diff --git a/wms/contract/contract-input.php b/wms/contract/contract-input.php
index cbec41c1..56af787c 100644
--- a/wms/contract/contract-input.php
+++ b/wms/contract/contract-input.php
@@ -209,6 +209,7 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                                     <option value="new">新簽約</option>
                                     <option value="free_to_charge">免保轉有費</option>
                                     <option value="renew_priceissue">續簽約</option>
+                                    <option value="longcontract_m1_free_charge">長約</option>
                                 </select>
                             </td>
                         </tr>
@@ -449,9 +450,7 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
     </div>
 
 </div>
-<script src="./js/jquery/jquery-3.1.1.min.js"></script>
-<script src="semantic/dist/semantic.min.js"></script>
-<script src="./js/alpine.js"></script>
+
 <script>
     const user_id = '<?php echo $user_id; ?>'
     const user_name = '<?php echo $user_name; ?>'
diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js
index ad56eb3b..4c4d6d36 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -810,7 +810,7 @@ const contractNewInput = () => {
     return {
         init() { },
         data: {
-            contractno: 'M23110004',
+            contractno: 'M24020029',
             customer: '',
             manager: '',
             vat: '',
@@ -827,7 +827,7 @@ const contractNewInput = () => {
             signing_date: '', //合約簽訂日期
             elevators: [], // 電梯種類 Array
             elevators_detail_arr: [], // 電梯台數 Array
-            nums: '', //電梯數量
+            nums: 0, //電梯數量
         },
         step: 1,
         isLoading: false,
@@ -838,6 +838,7 @@ const contractNewInput = () => {
             if (this.step == 1) {
                 this.getContractDate();
             } else if (this.step == 2) {
+                if (this.data.nums <= 0) return alert('請填寫電梯數量！')
                 this.getElevatorsData();
             } else if (this.step == 3) {
                 this.getElevatorsData();
@@ -1106,16 +1107,18 @@ const contractInput = () => {
                     this.isLoading = false
                     return
                 }
+                console.log(res.data.service_expense);
                 if (!this.customize) {
                     this.data.elevators = res.data.elevators;
                     for (let i = 0; i < res.data.elevators.length; i++) {
                         // 合約總價格。
-                        this.data.total_price = Number(res.data.elevators[i].sold_price) + Number(this.data.total_price);
+                        this.data.total_price = Math.round(Number(res.data.elevators[i].sold_price) + Number(this.data.total_price));
 
                         // 服務費 (以單筆合約記，但計算獎金須傳入單月服務費)
-                        this.data.elevators[i].service_expense = Math.round(this.data.elevators[i].service_expense / res.data.elevators[i]);
+                        this.data.elevators[i].service_expense = Math.round(this.data.elevators[i].service_expense / res.data.elevators[i].maintain_months);
                         // 折扣率
-                        this.data.elevators[i].discount = Math.round(((res.data.elevators[i].sold_price / res.data.elevators[i].stand_price) + this.data.elevators[i].service_expense) * 100);
+                        this.data.elevators[i].discount = ((res.data.elevators[i].sold_price - this.data.elevators[i].service_expense) / res.data.elevators[i].stand_price);
+                        this.data.elevators[i].sold_price = Math.round(res.data.elevators[i].sold_price);
                     }
                     this.data.total_price = Number(res.data.elevators[0].maintain_months) * this.data.total_price;
                     this.data.salesman = res.data.salesman
@@ -1245,7 +1248,8 @@ const contractInput = () => {
                     this.data.zip = ''
                     this.data.partyAphone = ''
                     this.data.partyAemail = ''
-                    this.data.payType = ''
+                    this.data.payType = '';
+                    this.data.contract_type = ''
                 }
                 this.isLoading = false
             }).catch(error => {

From a2a4da208ad09185af16753e8d4bb2b40636f062 Mon Sep 17 00:00:00 2001
From: Cheng <lkmd555@masada.com.tw>
Date: Fri, 1 Mar 2024 20:43:05 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E6=96=B0=E6=A2=AF=E9=80=B2t8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/{T8salIncomeApply.php => T8api.php}   |  12 +-
 wms/contract/api/getContractData.php          |  66 ++-
 wms/contract/api/postContractData.php         |  67 +--
 wms/contract/api/postNewContractData.php      | 418 +++++++++++++-----
 wms/contract/api/test copy.json               | 113 +++++
 wms/contract/api/test.json                    | 211 ++-------
 wms/contract/api/testT8API.php                | 320 ++++++++++++--
 wms/contract/contract-input.php               |   5 +-
 wms/contract/js/alpine.js                     |   5 +-
 9 files changed, 864 insertions(+), 353 deletions(-)
 rename wms/contract/api/{T8salIncomeApply.php => T8api.php} (84%)
 create mode 100644 wms/contract/api/test copy.json

diff --git a/wms/contract/api/T8salIncomeApply.php b/wms/contract/api/T8api.php
similarity index 84%
rename from wms/contract/api/T8salIncomeApply.php
rename to wms/contract/api/T8api.php
index f419d4d8..7bf12c6f 100644
--- a/wms/contract/api/T8salIncomeApply.php
+++ b/wms/contract/api/T8api.php
@@ -1,14 +1,14 @@
 <?php
 require_once("../../T8_Authorization_from_bpm.php");
 
-function T8API($data)
+function T8salIncomeApply($data, $api_url)
 {
 
-    $api_url = 'https://erp.masada.com.tw:780/twWebAPI/V1/SALINCOMEAPPLY/PostERPData';
+    // $api_url = 'https://erp.masada.com.tw:780/twWebAPI/V1/SALINCOMEAPPLY/PostERPData';
     $validation = get_Auth();
-    echo '<pre>';
-    print_r(json_encode($data));
-    echo '</pre>';
+    // echo '<pre>';
+    // print_r(json_encode($data));
+    // echo '</pre>';
     $header = [
         "CHI_Authorization :" . $validation,
         "GroupId:TEST"
@@ -19,7 +19,7 @@ function T8API($data)
     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
     curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
     curl_setopt($ch, CURLOPT_POST, 1); // 使用 POST
-    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data));
+    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data, JSON_UNESCAPED_UNICODE));
     $response = curl_exec($ch);
 
     if ($response === false) {
diff --git a/wms/contract/api/getContractData.php b/wms/contract/api/getContractData.php
index 7ff973d6..667c33b7 100644
--- a/wms/contract/api/getContractData.php
+++ b/wms/contract/api/getContractData.php
@@ -74,12 +74,59 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
         $elevators_results = $stmt->fetchAll(PDO::FETCH_ASSOC);
         $elevators_detail_arr = [];
         $contract_elevator_qty = 0;
-        // $sql = "SELECT * FROM pricereview_item WHERE mid =:mid AND item_group ='B' ";
-        // $stmt = $conn->prepare($sql);
-        // $stmt->bindParam(':mid', $mid);
-        // $stmt->execute();
-        // $option_results = $stmt->fetchAll(PDO::FETCH_ASSOC);
-        // $option_arr = [];
+        $sql = "SELECT * FROM pricereview_pay WHERE mid = :mid";
+        $stmt = $conn->prepare($sql);
+        $stmt->bindParam(':mid', $mid);
+        $stmt->execute();
+
+        $pay_amount = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        $pay_arr = [
+            'equipment_total' => 0, //設備款
+            'install_total' => 0, //安裝款
+            'elevotor_pay_detail' => []
+        ];
+        $elevotor_pay_detail = [];
+        foreach ($pay_amount as $i => $pay) {
+            if ($pay['pay_kind'] <= 4) {
+                // 設備款總價
+                $pay_arr['equipment_total'] += $pay['pay_amount'];
+                if ($pay['pay_scale'] > 0) {
+                    $elevotor_pay_detail = [
+                        'kind' => $pay['pay_kind'],
+                        'pay_scale' => $pay['pay_scale'],
+                        'pay_period' => $pay['pay_period'],
+                        'amount' => $pay['pay_amount']
+                    ];
+                    // $elevotor_pay_detail['pay_scale'] = $pay['pay_scale'];
+                    // $pay_arr['elevotor_pay_detail']['kind'] = $pay['pay_kind'];
+                    // $pay_arr['elevotor_pay_detail']['pay_scale'] = $pay['pay_scale'];
+                    // $pay_arr['elevotor_pay_detail']['pay_period'] = $pay['pay_period'];
+                    // $pay_arr['elevotor_pay_detail']['amount'] = $pay['pay_amount'];
+                    array_push($pay_arr['elevotor_pay_detail'], $elevotor_pay_detail);
+                }
+            } else {
+                $pay_arr['install_total'] += $pay['pay_amount'];
+                if ($pay['pay_scale'] > 0) {
+                    $a = $pay['pay_kind'];
+                    $elevotor_pay_detail = [
+                        'kind' => "$a",
+                        'pay_scale' => $pay['pay_scale'],
+                        'pay_period' => $pay['pay_period'],
+                        'amount' => $pay['pay_amount']
+                    ];
+                    array_push($pay_arr['elevotor_pay_detail'], $elevotor_pay_detail);
+
+                    // $elevotor_pay_detail[] = $pay['pay_kind'];
+                    // $pay_arr['elevotor_pay_detail']['kind'] = $pay['pay_kind'];
+                    // $pay_arr['elevotor_pay_detail']['pay_scale'] = $pay['pay_scale'];
+                    // $pay_arr['elevotor_pay_detail']['pay_period'] = $pay['pay_period'];
+                    // $pay_arr['elevotor_pay_detail']['amount'] = $pay['pay_amount'];
+                }
+            }
+        }
+        // echo "<pre>";
+        // print_r($pay_arr);
+        // echo "</pre>";
 
         foreach ($elevators_results as $keys) {
             $contract_elevator_qty += $keys['item_qty'];
@@ -152,7 +199,7 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
                         // echo "</pre>";
                     } else {
                         $result['option_other_price'] += $option['item_unit_price'] * intval($option['item_qty']);
-                        // echo '3..';
+                        // echo '
                     }
                     // echo '<pre>';
                     // print_r($option['item_no'] . '--->' . $option['item_unit_price'] . '--->' . $option['item_qty']);
@@ -178,12 +225,11 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
                 array_push($elevators_detail_arr, $result);
             }
         }
-        // print_r(COUNT($option_results));
 
         $count = COUNT($elevators_detail_arr);
-
         $contract['elevators'] = $elevators_results;
         $contract['elevators_detail_arr'] = $elevators_detail_arr;
+        $contract['pay_arr'] = $pay_arr;
         $contract['nums'] = $count;
 
         $contractResponse = json_encode($contract);
@@ -191,7 +237,7 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
         header('Content-Type: application/json');
 
         // 將 JSON 回應返回給客戶端
-        // echo $contractResponse;
+        echo $contractResponse;
     } catch (PDOException $e) {
         die("ERROR!!!: " . $e->getMessage());
     }
diff --git a/wms/contract/api/postContractData.php b/wms/contract/api/postContractData.php
index 445d0b5b..6b9b210b 100644
--- a/wms/contract/api/postContractData.php
+++ b/wms/contract/api/postContractData.php
@@ -100,7 +100,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
             echo json_encode($fail_arr);
             exit();
         }
-        // T8insert($_POST, $facilityno, $depId);
+        T8insert($_POST, $facilityno, $depId);
         /// 獎金計算
         $aaa = bonusCreate($_POST, $facilityno, $conn);
         if ($aaa['status'] == 2) {
@@ -108,7 +108,6 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
             echo $aaa['data'];
             exit();
         }
-        exit;
         //create account table
         $accounttype = "A";
         $accountid = $vat;
@@ -120,8 +119,6 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         $create_at = date('Y-m-d H:i:s');
 
         $conn->beginTransaction();
-        // bonusCreate($_POST, $facilityno, $conn);
-        // exit();
 
         $sql_str = "INSERT INTO account (accounttype, accountid, pwd, name, tel, address, email, repairerid, creater, create_at) VALUES (:accounttype, :accountid, :pwd, :name, :tel, :address, :email, :repairerid, :creater, :create_at)";
         $stmt = $conn->prepare($sql_str);
@@ -135,7 +132,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         $stmt->bindParam(':repairerid', $repairerid);
         $stmt->bindParam(':creater', $creater);
         $stmt->bindParam(':create_at', $create_at);
-        // $stmt->execute();
+        $stmt->execute();
 
         //create contract table
 
@@ -171,7 +168,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         $stmt->bindParam(':end_date', $end_date);
         $stmt->bindParam(':creater', $creater);
         $stmt->bindParam(':create_at', $create_at);
-        // $stmt->execute();
+        $stmt->execute();
 
         //create facility table
         // $createFacilityNo = new CreateFacilityNo();
@@ -246,7 +243,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
             $stmt->bindParam(':area', $area);
             $stmt->bindParam(':takecertificatedate', $elevator['takecertificatedate']);
             $stmt->bindParam(':licensedate', $ADuseful_date);
-            // $result = $stmt->execute();
+            $result = $stmt->execute();
         }
 
         //create schedule table
@@ -267,7 +264,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
                 $stmt->bindParam(':duedate', $combo[1]);
                 $stmt->bindParam(':creater', $creater);
                 $stmt->bindParam(':create_at', $create_at);
-                // $result = $stmt->execute();
+                $result = $stmt->execute();
             }
         }
         // create contract_b_signed_back table
@@ -374,11 +371,11 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         $stmt->bindParam(":created_by", $user_id);
         $stmt->bindParam(':payType', $payType);
 
-        // $stmt->execute();
+        $stmt->execute();
 
         // T8insert($_POST, $facilityno);
 
-        // header('Content-Type: application/json');
+        header('Content-Type: application/json');
         $jsonData = json_encode($files);
 
         $conn->commit();
@@ -394,7 +391,7 @@ function T8insert($data, $facilityno, $depId)
 {
     require_once("../connt8.php");
     // 引入 T8 API 連線
-    require_once("./T8salIncomeApply.php");
+    require_once("./T8api.php");
 
     $contractno = !empty($data['contractno']) ? $data['contractno'] : null; // 合約號
     $address = !empty($data['address']) ? $data['address'] : null; // 客戶地址
@@ -572,23 +569,45 @@ function T8insert($data, $facilityno, $depId)
 
         // 分期代碼計算
         $IncomeId = [
-            'A40006' => 1, //年繳
-            'A40007' => 4, //季繳
-            'A40003' => 12, //月繳
-            'A40004' => 6, //雙月繳
-            'A40005' => 2  //半年繳
+            'A40006' => 12, //年繳
+            'A40007' => 3, //季繳
+            'A40003' => 1, //月繳
+            'A40004' => 2, //雙月繳
+            'A40005' => 6  //半年繳
         ];
-        //分幾期 => 總共保養月 / 分期月
-        $SQuantity = $elevator['maintain_months'] / $IncomeId[$payType];
+        // 幾年
+        // $SQuantityYear = $elevator['maintain_months'] / 12;
+        //分幾期 () => 總共保養月 / 分期月
+        $SQuantitya = $elevator['maintain_months'] / $IncomeId[$payType];
+        $SQuantity = $IncomeId[$payType];
+        // $paymonth = $IncomeId[$payType] * $SQuantity;
 
         $date_1 = getNext25thDate($contract_begin_date);
 
-
         // 依每台電梯去加入各個的付款項
-        for ($i = 0; $i < $IncomeId[$payType]; $i++) {
+        for ($i = 1; $i <= $SQuantitya; $i++) {
             $row++;
             // 計算分期款的收款月份
-            $paymonth = $i * $SQuantity;
+            $paymonth = $i * $IncomeId[$payType];
+            // switch($IncomeId[$payType]):
+            //     case (1):
+            //         $paymonth = $i * $IncomeId[$payType];
+            //         $countDay = date('Y-m-d', strtotime("$date_1 + $paymonth years"));
+            //         break;
+            //     case (2):
+            //         $paymonth = $i * $IncomeId[$payType];
+            //         $countDay = date('Y-m-d', strtotime("$date_1 + $paymonth months"));
+            //         break;
+            //     case (12):
+            //         $countDay = date('Y-m-d', strtotime("$date_1 + $paymonth months"));
+            //         break;
+            //     case (6):
+            //         $countDay = date('Y-m-d', strtotime("$date_1 + $paymonth months"));
+            //         break;
+            //     case (2):
+            //         $countDay = date('Y-m-d', strtotime("$date_1 + $paymonth months"));
+            //         break;
+
             $countDay = date('Y-m-d', strtotime("$date_1 + $paymonth months"));
             $payDay = str_replace('-', '', $countDay);
             $rows_data = [
@@ -605,9 +624,6 @@ function T8insert($data, $facilityno, $depId)
                 "CU_EstPayDate" => intval($payDay)
             ];
             $salIncomeApplyDetail_rows[] = $rows_data;
-            // echo '<pre>';
-            // print_r($salIncomeApplyDetail_rows);
-            // echo '</pre>';
         }
     }
 
@@ -652,7 +668,8 @@ function T8insert($data, $facilityno, $depId)
     // echo '<pre>';
     // print_r($API_body);
     // echo '</pre>';
-    $result = T8API($API_body);
+    $api_url = 'https://erp.masada.com.tw:780/twWebAPI/V1/SALINCOMEAPPLY/PostERPData';
+    $result = T8salIncomeApply($API_body, $api_url);
 
     if ($result['Status'] == 'Error' || $result['Status'] == 'Fails') {
 
diff --git a/wms/contract/api/postNewContractData.php b/wms/contract/api/postNewContractData.php
index c5027877..2a1ebca5 100644
--- a/wms/contract/api/postNewContractData.php
+++ b/wms/contract/api/postNewContractData.php
@@ -28,29 +28,26 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
     $elevators = json_decode($_POST['elevators'], true);
     $elevators_detail_arr = json_decode($_POST['elevators_detail_arr'], true);
 
-    // echo '<pre>';
-    // print_r($elevators);
-    // echo '</pre>';
-    // exit;
+
     $files = !empty($_FILES['files']) ? $_FILES['files'] : null;
     $files_id = null;
 
     $fail_arr = [];
-    if (empty($contractno)) $fail_arr[] = '合約號為必填';
-    if (empty($customer)) $fail_arr[] = '客戶名稱為必填';
-    if (empty($manager)) $fail_arr[] = '負責人為必填';
-    if (empty($vat)) $fail_arr[] = '統編/身分證為必填';
-    if (empty($case_name)) $fail_arr[] = '案名為必填';
-    if (empty($linkman)) $fail_arr[] = '聯絡人為必填';
-    if (empty($lm_tel)) $fail_arr[] = '聯絡人電話為必填';
-    if (empty($address)) $fail_arr[] = '地址為必填';
-    if (empty($salesman)) $fail_arr[] = '營業員為必填';
-    if (empty($qc)) $fail_arr[] = '請選擇QC或官檢';
-    if (count($fail_arr) > 0) {
-      header("HTTP/1.1 422 Unprocessable Entity");
-      echo json_encode($fail_arr, JSON_UNESCAPED_UNICODE);
-      exit();
-    }
+    // if (empty($contractno)) $fail_arr[] = '合約號為必填';
+    // if (empty($customer)) $fail_arr[] = '客戶名稱為必填';
+    // if (empty($manager)) $fail_arr[] = '負責人為必填';
+    // if (empty($vat)) $fail_arr[] = '統編/身分證為必填';
+    // if (empty($case_name)) $fail_arr[] = '案名為必填';
+    // if (empty($linkman)) $fail_arr[] = '聯絡人為必填';
+    // if (empty($lm_tel)) $fail_arr[] = '聯絡人電話為必填';
+    // if (empty($address)) $fail_arr[] = '地址為必填';
+    // if (empty($salesman)) $fail_arr[] = '營業員為必填';
+    // if (empty($qc)) $fail_arr[] = '請選擇QC或官檢';
+    // if (count($fail_arr) > 0) {
+    //   header("HTTP/1.1 422 Unprocessable Entity");
+    //   echo json_encode($fail_arr, JSON_UNESCAPED_UNICODE);
+    //   exit();
+    // }
     //create facility table
     $createFacilityNo = new CreateFacilityNo();
     $dailyNecessities = [
@@ -68,15 +65,19 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
       $arr[] = $dailyNecessities[$elevator['spec']];
     }
     $facilityno = $createFacilityNo->makeMFacilityNo('M', $arr, intval($elevators_nums));
+    echo json_encode($facilityno);
 
-    $bonus_result = BounsCount($_POST, $conn, $facilityno);
-    if (!empty($bonus_result) && $bonus_result['status'] == "2") {
-      $fail_arr[] = '獎金計算錯誤，請再檢查或連繫資訊人員';
-      // header("HTTP/1.1 422 Unprocessable Entity");
-      echo json_encode($fail_arr, JSON_UNESCAPED_UNICODE);
-      exit();
-    }
-    // exit();
+    // $bonus_result = BounsCount($_POST, $conn, $facilityno);
+    // if (!empty($bonus_result) && $bonus_result['status'] == "2") {
+    //   $fail_arr[] = '獎金計算錯誤，請再檢查或連繫資訊人員';
+    //   // header("HTTP/1.1 422 Unprocessable Entity");
+    //   echo json_encode($fail_arr, JSON_UNESCAPED_UNICODE);
+    //   exit();
+    // }
+
+    T8Insert($_POST, $facilityno, $connT8);
+
+    exit();
     $conn->beginTransaction();
 
     $sql_str = "SELECT accountid, name FROM account WHERE accountid = :accountid ORDER BY create_at DESC";
@@ -171,118 +172,315 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
   }
 }
 
-function T8Insert($data)
+function T8Insert($data, $facilityno, $connT8)
 {
-  require_once("../connt8.php");
-
-  $contractno = $data['contractno'];
-  $partyA = $data['customer'];
-  $phone = $data['lm_tel'];
-  $vat = $data['vat'];
-  $partyAaddress = $data['address'];
-  $user_id = $data['user_id'];
-  $salesman = $data['salesman'];
-  $createAt = date("Y-m-dH-i-s");
-  $elevators[] = $data['elevators'];
-  $createTime = str_replace('-', '', $createAt);
-
-
-  $connT8->beginTransaction();
-
-  $sql = "SELECT * FROM comCustomer WHERE BizPartnerId = :BizPartnerId";
-  $stmt = $conn->prepare($sql);
-  $stmt->bindParam(':BizPartnerId', $contractno);
-  $stmt->execute();
-  $result = $stmt->fetch(PDO::FETCH_ASSOC);
-  // 新增客戶 table
-  if (empty($result)) {
-    // 若 客戶資料為空，新增一筆到 comCustomer
-    // 新增客戶資料
-    $sql = "INSERT INTO comBusinessPartner
-      (BizPartnerId,BizPartnerName,BusinessAttr,CountryId,WorkTelNo,BizToDate,TaxNo,EnterpriseName,ContactAddress,EMail,CreatorId,CreateTime,BizPartnerTypeId)
-      VALUES(:BizPartnerId,:BizPartnerName,1,'TW',:WorkTelNo,99999999,:TaxNo,:EnterpriseName,:ContactAddress,:EMail,:CreatorId,:CreateTime,'10')";
+  try {
+    // 引入銷售訂單 API
+    require_once("./T8API.php");
+
+    $contractno = $data['contractno'];
+    $partyA = $data['customer'];
+    $phone = $data['lm_tel'];
+    $vat = $data['vat'];
+    $partyAaddress = $data['address'];
+    $user_id = $data['user_id'];
+    $salesman = $data['salesman'];
+    $createAt = date("Y-m-dH-i-s");
+
+
+    $elevators = !empty($data['elevators_detail_arr']) ? json_decode($data['elevators_detail_arr'], true) : []; //電梯
+    $pay_arr = !empty($data['pay_arr']) ? json_decode($data['pay_arr'], true) : []; //電梯
+
+    $createTime = str_replace('-', '', $createAt);
+    $signing_date = intval(str_replace("-", '', $data['signing_date'])); //簽訂日期
+    // echo
+    $pay_kind = [
+      '1' => '簽約',
+      '2' => '二次款',
+      '3' => '貨抵工地',
+      '4' => '材料其他',
+      '5' => '試車完工', //安裝完畢
+      '6' => '交車' //交車
+    ];
+
+    $sql = "SELECT * FROM comCustomer 
+    WHERE BizPartnerId = :BizPartnerId
+    ";
     $stmt = $connT8->prepare($sql);
     $stmt->bindParam(':BizPartnerId', $contractno);
-    $stmt->bindParam(':BizPartnerName', $partyA); //客戶名稱
-    $stmt->bindParam(':WorkTelNo', $phone);
-    $stmt->bindParam(':TaxNo', $vat);
-    // $stmt->bindParam(':EnterpriseName', $customer);  //企業名稱
-    $stmt->bindParam(':ContactAddress', $partyAaddress);
-    $stmt->bindParam(':EMail', $email);
-    $stmt->bindParam(':CreatorId', $user_id);
-    $stmt->bindParam(':CreateTime', $createTime);
-
     $stmt->execute();
+    $result = $stmt->fetch(PDO::FETCH_ASSOC);
 
-    $sql = "INSERT INTO comCustomer
+    // 新增客戶 table
+    if (empty($result)) {
+      // 若 客戶資料為空，新增一筆到 comCustomer
+      // 新增客戶資料
+      $sql = "INSERT INTO comBusinessPartner
+      (BizPartnerId,BizPartnerName,BusinessAttr,CountryId,WorkTelNo,BizToDate,TaxNo,EnterpriseName,ContactAddress,CreatorId,CreateTime,BizPartnerTypeId)
+      VALUES(:BizPartnerId,:BizPartnerName,1,'TW',:WorkTelNo,99999999,:TaxNo,:EnterpriseName,:ContactAddress,:CreatorId,:CreateTime,'10')";
+      // $sql = "INSERT INTO comBusinessPartner
+      // (BizPartnerId,BizPartnerName,BusinessAttr,CountryId,WorkTelNo,BizToDate,TaxNo,EnterpriseName,ContactAddress,CreatorId,CreateTime,BizPartnerTypeId)
+      // VALUES('$contractno','$partyA',1,'TW','$phone',99999999,'$vat', '$partyA','$partyAaddress','$user_id',$createTime,'10')";
+      $stmt = $connT8->prepare($sql);
+      $stmt->bindParam(':BizPartnerId', $contractno);
+      $stmt->bindParam(':BizPartnerName', $partyA); //客戶名稱
+      $stmt->bindParam(':WorkTelNo', $phone);
+      $stmt->bindParam(':TaxNo', $vat);
+      $stmt->bindParam(':EnterpriseName', $partyA);  //企業名稱
+      $stmt->bindParam(':ContactAddress', $partyAaddress);
+      // $stmt->bindParam(':EMail', $email);
+      $stmt->bindParam(':CreatorId', $user_id);
+      $stmt->bindParam(':CreateTime', $createTime);
+      $stmt->execute();
+
+
+
+      $sql = "INSERT INTO comCustomer
       (OrgId,BizPartnerTypeId,CurrId,BizPartnerId,PersonId,CreatorId,IsInUsed,InvoiceAddress,CreateTime,InvoiceId)
       VALUES('1000','10','TWD',:BizPartnerId,:PersonId,:CreatorId,1,:InvoiceAddress,:CreateTime,'35')";
-    $stmt = $connT8->prepare($sql);
+      // $sql = "INSERT INTO comCustomer
+      //  (OrgId,BizPartnerTypeId,CurrId,BizPartnerId,PersonId,CreatorId,IsInUsed,InvoiceAddress,CreateTime,InvoiceId)
+      //  VALUES('1000','10','TWD','$contractno','$salesman','$user_id',1,'$partyAaddress','$createTime','35')";
+      $stmt = $connT8->prepare($sql);
 
-    $stmt->bindParam(':BizPartnerId', $contractno);
-    $stmt->bindParam(':PersonId', $salesman);
-    $stmt->bindParam(':CreatorId', $user_id);
-    $stmt->bindParam(':InvoiceAddress', $address);
-    $stmt->bindParam(':CreateTime', $createTime);
-
-    $stmt->execute();
-  } else {
-    //     // 若客戶資料不為空，更新該客戶資訊。
-    $sql = "UPDATE comCustomer SET 
+      $stmt->bindParam(':BizPartnerId', $contractno);
+      $stmt->bindParam(':PersonId', $salesman);
+      $stmt->bindParam(':CreatorId', $user_id);
+      $stmt->bindParam(':InvoiceAddress', $partyAaddress);
+      $stmt->bindParam(':CreateTime', $createTime);
+      $stmt->execute();
+    } else {
+      //     // 若客戶資料不為空，更新該客戶資訊。
+      $sql = "UPDATE comCustomer SET 
           PersonId=:PersonId,
           InvoiceAddress=:InvoiceAddress,
           LastOperatorId=:LastOperatorId,
           LastOperateTime=:LastOperateTime
           WHERE BizPartnerId=:BizPartnerId
           ";
-    $stmt = $connT8->prepare($sql);
-    $stmt->bindParam(':PersonId', $salesman);
-    $stmt->bindParam(':InvoiceAddress', $address);
-    $stmt->bindParam(':LastOperatorId', $user_id);
-    $stmt->bindParam(':LastOperateTime', $createTime);
-    $stmt->bindParam(':BizPartnerId', $contractno);
-    $stmt->execute();
+      $stmt = $connT8->prepare($sql);
+      $stmt->bindParam(':PersonId', $salesman);
+      $stmt->bindParam(':InvoiceAddress', $partyAaddress);
+      $stmt->bindParam(':LastOperatorId', $user_id);
+      $stmt->bindParam(':LastOperateTime', $createTime);
+      $stmt->bindParam(':BizPartnerId', $contractno);
+      $stmt->execute();
 
 
-    $sql = "UPDATE comBusinessPartner SET
+      $sql = "UPDATE comBusinessPartner SET
           BizPartnerName=:BizPartnerName,
           WorkTelNo=:WorkTelNo,
           TaxNo=:TaxNo,
           EnterpriseName=:EnterpriseName,
           ContactAddress=:ContactAddress,
-          EMail=:EMail,
           LastOperatorId=:LastOperatorId,
           LastOperateTime=:LastOperateTime
           WHERE BizPartnerId = :BizPartnerId
           ";
-    $stmt = $connT8->prepare($sql);
-    $stmt->bindParam(':BizPartnerName', $partyA);
-    $stmt->bindParam(':WorkTelNo', $phone);
-    $stmt->bindParam(':TaxNo', $vat);
-    $stmt->bindParam(':EnterpriseName', $customer);
-    $stmt->bindParam(':ContactAddress', $partyAaddress);
-    $stmt->bindParam(':EMail', $email);
-    $stmt->bindParam(':LastOperatorId', $user_id);
-    $stmt->bindParam(':LastOperateTime', $createTime);
-    $stmt->bindParam(':BizPartnerId', $contractno);
-    $stmt->execute();
-  }
+      $stmt = $connT8->prepare($sql);
+      $stmt->bindParam(':BizPartnerName', $partyA);
+      $stmt->bindParam(':WorkTelNo', $phone);
+      $stmt->bindParam(':TaxNo', $vat);
+      $stmt->bindParam(':EnterpriseName', $partyA);
+      $stmt->bindParam(':ContactAddress', $partyAaddress);
+      // $stmt->bindParam(':EMail', $email);
+      $stmt->bindParam(':LastOperatorId', $user_id);
+      $stmt->bindParam(':LastOperateTime', $createTime);
+      $stmt->bindParam(':BizPartnerId', $contractno);
+      $stmt->execute();
+    }
 
-  $sql = "SELECT * FROM comProject WHERE ProjectId = :ProjectId";
-  $stmt = $connT8->prepare($sql);
-  $stmt->bindParam(':ProjectId', $contractno);
-  $stmt->execute();
-  $resultProject = $stmt->fetchAll(PDO::FETCH_ASSOC);
-  if (empty($resultProject)) {
-    //新增於 comProject。合約 table
-    $sql = "INSERT INTO comProject(ProjectId,ProjectName,TypeId,CreateTime,CreatorId,IsInUsed) 
-        VALUES(:ProjectId,:ProjectName,'C0',:CreateTime,:CreatorId,1)";
+    $sql = "SELECT * FROM comProject WHERE ProjectId = :ProjectId";
     $stmt = $connT8->prepare($sql);
     $stmt->bindParam(':ProjectId', $contractno);
-    $stmt->bindParam(':ProjectName', $customer);
-    $stmt->bindParam(':CreateTime', $createTime);
-    $stmt->bindParam(':CreatorId', $user_id);
     $stmt->execute();
+    $resultProject = $stmt->fetchAll(PDO::FETCH_ASSOC);
+    if (empty($resultProject)) {
+      //新增於 comProject。合約 table
+      $sql = "INSERT INTO comProject(ProjectId,ProjectName,TypeId,CreateTime,CreatorId,IsInUsed) 
+        VALUES(:ProjectId,:ProjectName,'C0',:CreateTime,:CreatorId,1)";
+      $stmt = $connT8->prepare($sql);
+      $stmt->bindParam(':ProjectId', $contractno);
+      $stmt->bindParam(':ProjectName', $partyA);
+      $stmt->bindParam(':CreateTime', $createTime);
+      $stmt->bindParam(':CreatorId', $user_id);
+      $stmt->execute();
+    }
+
+    foreach ($elevators as $index => $elevator) {
+      $count = 1;
+      // 產品集成維護
+      $facility_no = $facilityno[$index];
+      $MaterialName = "$partyA($facility_no)";
+      $sql = "INSERT INTO comMaterial
+        (FOrgid,MaterialId,MaterialTypeId,MaterialCategoryId,CreatorId,CreateTime,IsInUsed) 
+        VALUES ('1000',:MaterialId,'10','A',:CreatorId,:CreateTime,1)";
+      $stmt = $connT8->prepare($sql);
+      $stmt->bindParam(':MaterialId', $facility_no);
+      $stmt->bindParam(':CreatorId', $user_id);
+      $stmt->bindParam(':CreateTime', $createTime);
+      $stmt->execute();
+
+      $sql = "INSERT INTO comMaterialGroup
+        (MaterialTypeId,MaterialId,MaterialName,MaterialCategoryId,IsInUsed,UnitId,CreatorId,CreateTime) 
+        VALUES ('10',:MaterialId,:MaterialName,'A',1,'SET',:CreatorId,:CreateTime)";
+      $stmt = $connT8->prepare($sql);
+      $stmt->bindParam(':MaterialId', $facility_no);
+      $stmt->bindParam(':MaterialName', $MaterialName);
+      $stmt->bindParam(':CreatorId', $user_id);
+      $stmt->bindParam(':CreateTime', $createTime);
+      $stmt->execute();
+
+      $sql = "INSERT INTO comMaterialPurchases
+        (Orgid,MaterialTypeId,MaterialId,CurrId,SUnitId,TaxId,CreatorId,CreateTime) 
+        VALUES ('1000','10',:MaterialId,'TWD','SET','ST005',:CreatorId,:CreateTime)";
+      $stmt = $connT8->prepare($sql);
+      $stmt->bindParam(':MaterialId', $facility_no);
+      $stmt->bindParam(':CreatorId', $user_id);
+      $stmt->bindParam(':CreateTime', $createTime);
+      $stmt->execute();
+
+      $sql = "INSERT INTO plsMaterialPlanData
+      (PlanRangeId,MaterialId,FOrgId,MaterialTypeId,CreatorId,CreateTime,DefaultDemandOrg) VALUES
+      (1000,:MaterialId,1000,10,:CreatorId,:CreateTime,1000)
+      ";
+      $stmt = $connT8->prepare($sql);
+      $stmt->bindParam(':MaterialId', $facility_no);
+      $stmt->bindParam(':CreatorId', $user_id);
+      $stmt->bindParam(':CreateTime', $createTime);
+      $stmt->execute();
+
+      $sql = "INSERT INTO comMaterialSales
+      (OrgId,MAterialTypeId,MaterialId,CurrId,SUnitId,SupplyOrgId,CreatorId,CreateTime,IsInUsed) VALUES
+      (1000,10,:MaterialId,'TWD','SET',1000,:CreatorId,:CreateTime,1)
+      ";
+      $stmt = $connT8->prepare($sql);
+      $stmt->bindParam(':MaterialId', $facility_no);
+      $stmt->bindParam(':CreatorId', $user_id);
+      $stmt->bindParam(':CreateTime', $createTime);
+      $stmt->execute();
+
+      // 階段收款資訊
+      $salOrderStagePay_row = [];
+      $equipment_total = 0;
+      $install_total = 0;
+      $equipment_total = $pay_arr['equipment_total'];
+      $install_total = $pay_arr['install_total'];
+      foreach ($pay_arr['elevotor_pay_detail'] as $key => $detail) {
+        $PayStage = $pay_kind[$detail['kind']];
+        $PlanPercentage = intval($detail['pay_scale']) / 100;
+        $rows = [
+          "PayStage" => "$PayStage", //收款階段
+          "PlanPercentage" => $PlanPercentage, //計劃收款比例(%)
+          "PlanPayAmt" => $detail['amount'], //計劃收款金額
+          "PlanPayDate" => 20240101, //計劃收款日期 1.第一筆都是簽約日
+          "BillNo" => "$contractno",
+          "RowCode" => $key + 1,
+          "RowNo" => $key + 1,
+          "UnWriteOffOAmount" => $detail['amount'] //未核銷金額
+        ];
+        $salOrderStagePay_row[] = $rows;
+      }
+
+      // 設備
+      $row1 = [
+        "TaxId" => "ST005",
+        "RequirementDate" => $signing_date, //出貨日期
+        "ConsignmentDate" => $signing_date, //發貨日期
+        "BillNo" => "$contractno", //合約號
+        "RowCode" => $count, //全部筆數排列
+        "ItemType" => 1,
+        "MaterialId" => "A40001", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
+        "SUnitId" => "SET",
+        "SQuantity" => 1, //交易數量
+        "SPrice" => $equipment_total //交易價格
+      ];
+      $count++;
+      // 安裝
+      $row2 = [
+        "TaxId" => "ST005",
+        "RequirementDate" => $signing_date, //出貨日期
+        "ConsignmentDate" => $signing_date, //發貨日期
+        "BillNo" => "$contractno", //合約號
+        "RowCode" => $count, //全部筆數排列
+        "ItemType" => 1,
+        "MaterialId" => "A40008", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
+        "SUnitId" => "SET",
+        "SQuantity" => 1, //交易數量
+        "SPrice" => $install_total //交易價格
+      ];
+      $count++;
+      // 產品(作番)
+      $row3 = [
+        "TaxId" => "ST005",
+        "RequirementDate" => $signing_date, //出貨日期
+        "ConsignmentDate" => $signing_date, //發貨日期
+        "BillNo" => "$contractno", //合約號
+        "RowCode" => $count, //全部筆數排列
+        "ItemType" => 0,
+        "MaterialId" => "$facility_no", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
+        "SUnitId" => "SET",
+        "SQuantity" => 1, //交易數量
+        "SPrice" => 0 //交易價格
+      ];
+      $count++;
+      $SubOrder_row[] = $row1;
+      $SubOrder_row[] = $row2;
+      $SubOrder_row[] = $row3;
+      $count++;
+    }
+    $MainSalesOrder_row = [
+      "BillNo" => "$contractno", //合約單號
+      "BillDate" => $signing_date, //簽約日期 
+      "TypeId" => "SO", //
+      "FOrgId" => "1000",
+      "OrgId" => "1000",
+      "ModeId" => "M", // T汰改 M新梯
+      "BizPartnerId" => "$contractno", //客戶代碼
+      "CurrId" => "TWD",
+      "CurrOAmount" => 1,
+      "CurrLAmount" => 1,
+      "PersonId" => "$user_id", //業務人員
+      "DueToId" => "$contractno", //債務方
+      "TradeConditionId" => "",
+      "TaxId" => "ST005",
+      "CreditorCompId" => "1001",
+      "CreditorOrgId" => "1000",
+      // "CompId" => "1001",
+      // "CreditorCurrOAmount" => 1,
+      // "CreditorCurrLAmount" => 1
+    ];
+    $MainSalesOrder = [
+      "name" => "MainSalesOrder",
+      'rows' => [$MainSalesOrder_row]
+    ];
+    $SubOrder = [
+      "name" => "SubOrder",
+      "rows" => $SubOrder_row
+    ];
+    $salOrderStagePay = [
+      "name" => "salOrderStagePay",
+      "rows" => [$salOrderStagePay_row]
+    ];
+
+    $API_body = [];
+    $API_body[] = $MainSalesOrder;
+    $API_body[] = $SubOrder;
+    $API_body[] = $salOrderStagePay;
+    echo "<pre>";
+    print_r(json_encode($API_body, JSON_UNESCAPED_UNICODE));
+    echo "</pre>";
+    $api_url = "https://erp.masada.com.tw:780/twWebAPI/V1/SALSALESORDER/PostERPData";
+
+    $result = T8salIncomeApply($API_body, $api_url);
+    echo "<pre>";
+    print_r($result);
+    echo "</pre>";
+    $connT8->commit();
+  } catch (PDOException $e) {
+    $connT8->rollback();
+    header("HTTP/1.1 500 Internal Server Error");
+    die('Error!:' . $e->getMessage());
   }
 }
 
diff --git a/wms/contract/api/test copy.json b/wms/contract/api/test copy.json
new file mode 100644
index 00000000..5df03461
--- /dev/null
+++ b/wms/contract/api/test copy.json	
@@ -0,0 +1,113 @@
+[
+    {
+        "name": "MainSalesOrder",
+        "rows": [
+            {
+                "BillNo": "M24020076",
+                "BillDate": 20240305,
+                "TypeId": "SO",
+                "FOrgId": "1000",
+                "OrgId": "1000",
+                "ModeId": "M",
+                "BizPartnerId": "M24020076",
+                "CurrId": "TWD",
+                "CurrOAmount": 1,
+                "CurrLAmount": 1,
+                "PersonId": "M0225",
+                "DueToId": "M24020076",
+                "TradeConditionId": "",
+                "TaxId": "ST005",
+                "CreditorCompId": "1001",
+                "CreditorOrgId": "1000"
+            }
+        ]
+    },
+    {
+        "name": "SubOrder",
+        "rows": [
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240305,
+                "ConsignmentDate": 20240305,
+                "BillNo": "M24020076",
+                "RowCode": 1,
+                "ItemType": 1,
+                "MaterialId": "A40001",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 910000
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240305,
+                "ConsignmentDate": 20240305,
+                "BillNo": "M24020076",
+                "RowCode": 2,
+                "ItemType": 1,
+                "MaterialId": "A40008",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 390000
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240305,
+                "ConsignmentDate": 20240305,
+                "BillNo": "M24020076",
+                "RowCode": 3,
+                "ItemType": 0,
+                "MaterialId": "4MW00705",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 0
+            }
+        ]
+    },
+    {
+        "name": "salOrderStagePay",
+        "rows": [
+            [
+                {
+                    "PayStage": "簽約",
+                    "PlanPercentage": 0.2,
+                    "PlanPayAmt": 260000,
+                    "PlanPayDate": 20240101,
+                    "BillNo": "M24020076",
+                    "RowCode": 0,
+                    "RowNo": 0,
+                    "UnWriteOffOAmount": 260000
+                },
+                {
+                    "PayStage": "貨抵工地",
+                    "PlanPercentage": 0.5,
+                    "PlanPayAmt": 650000,
+                    "PlanPayDate": 20240101,
+                    "BillNo": "M24020076",
+                    "RowCode": 1,
+                    "RowNo": 1,
+                    "UnWriteOffOAmount": 650000
+                },
+                {
+                    "PayStage": "試車完工",
+                    "PlanPercentage": 0.2,
+                    "PlanPayAmt": 260000,
+                    "PlanPayDate": 20240101,
+                    "BillNo": "M24020076",
+                    "RowCode": 2,
+                    "RowNo": 2,
+                    "UnWriteOffOAmount": 260000
+                },
+                {
+                    "PayStage": "交車",
+                    "PlanPercentage": 0.1,
+                    "PlanPayAmt": 130000,
+                    "PlanPayDate": 20240101,
+                    "BillNo": "M24020076",
+                    "RowCode": 3,
+                    "RowNo": 3,
+                    "UnWriteOffOAmount": 130000
+                }
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/wms/contract/api/test.json b/wms/contract/api/test.json
index 04729705..c0585164 100644
--- a/wms/contract/api/test.json
+++ b/wms/contract/api/test.json
@@ -1,185 +1,66 @@
 [
     {
-        "name": "salIncomeApplyMaster",
+        //salSalesOrder
+        "name": "MainSalesOrder",
         "rows": [
             {
-                "BillNo": "B23100060",
-                "BillDate": "20240122",
-                "OrgId": "1000",
+                "BillNo": "Z001", //合約單號
+                "BillDate": 20210420, //簽約日期 
+                "TypeId": "SO", //
                 "FOrgId": "1000",
-                "TypeId": "RAS",
-                "BpOrgId": "1000",
-                "BizPartnerId": "B23100060",
+                "OrgId": "1000",
+                "ModeId": "T", // T汰改 M新梯
+                "BizPartnerId": "M0225", //創建人ID
                 "CurrId": "TWD",
                 "CurrOAmount": 1,
                 "CurrLAmount": 1,
-                "PersonId": "M0065",
-                "DtOrgId": "1000",
-                "DueToId": "B23100060",
+                "PersonId": "M0225", //業務人員
+                "DueToId": "512", //業務部門
+                "TradeConditionId": "",
                 "TaxId": "ST005",
-                "CompId": "1001",
-                "CreatorId": "M0225"
+                "CreditorCompId": "1000",
+                "CreditorOrgId": "1000",
+                "CreditorCurrOAmount": 1,
+                "CreditorCurrLAmount": 1,
+                "CompId": "1000"
             }
         ]
     },
     {
-        "name": "salIncomeApplyDetail",
+        //salSalesOrderDetail
+        "name": "SubOrder",
         "rows": [
             {
-                "BillNo": "B23100060",
-                "IncomeId": "A40003",
-                "TaxId": "ST005",
-                "RowCode": 1,
-                "RowNo": 1,
-                "ItemType": 1,
-                "SPrice": 1250,
-                "SQuantity": 1,
-                "ProjectId": "B23100060",
-                "FromSourceTag": 0,
-                "CU_MaterialId": "4TH53801"
-            },
-            {
-                "BillNo": "B23100060",
-                "IncomeId": "A40003",
-                "TaxId": "ST005",
-                "RowCode": 2,
-                "RowNo": 2,
-                "ItemType": 1,
-                "SPrice": 1250,
-                "SQuantity": 1,
-                "ProjectId": "B23100060",
-                "FromSourceTag": 0,
-                "CU_MaterialId": "4TH53801"
-            },
-            {
-                "BillNo": "B23100060",
-                "IncomeId": "A40003",
-                "TaxId": "ST005",
-                "RowCode": 3,
-                "RowNo": 3,
-                "ItemType": 1,
-                "SPrice": 1250,
-                "SQuantity": 1,
-                "ProjectId": "B23100060",
-                "FromSourceTag": 0,
-                "CU_MaterialId": "4TH53801"
-            },
-            {
-                "BillNo": "B23100060",
-                "IncomeId": "A40003",
-                "TaxId": "ST005",
-                "RowCode": 4,
-                "RowNo": 4,
-                "ItemType": 1,
-                "SPrice": 1250,
-                "SQuantity": 1,
-                "ProjectId": "B23100060",
-                "FromSourceTag": 0,
-                "CU_MaterialId": "4TH53801"
-            },
-            {
-                "BillNo": "B23100060",
-                "IncomeId": "A40003",
-                "TaxId": "ST005",
-                "RowCode": 5,
-                "RowNo": 5,
-                "ItemType": 1,
-                "SPrice": 1250,
-                "SQuantity": 1,
-                "ProjectId": "B23100060",
-                "FromSourceTag": 0,
-                "CU_MaterialId": "4TH53801"
-            },
-            {
-                "BillNo": "B23100060",
-                "IncomeId": "A40003",
-                "TaxId": "ST005",
-                "RowCode": 6,
-                "RowNo": 6,
-                "ItemType": 1,
-                "SPrice": 1250,
-                "SQuantity": 1,
-                "ProjectId": "B23100060",
-                "FromSourceTag": 0,
-                "CU_MaterialId": "4TH53801"
-            },
-            {
-                "BillNo": "B23100060",
-                "IncomeId": "A40003",
+                "SupplyCompId": "1001",
+                "SupplyOrgId": "1000",
                 "TaxId": "ST005",
-                "RowCode": 7,
-                "RowNo": 7,
-                "ItemType": 1,
-                "SPrice": 1250,
-                "SQuantity": 1,
-                "ProjectId": "B23100060",
-                "FromSourceTag": 0,
-                "CU_MaterialId": "4TH53801"
-            },
-            {
-                "BillNo": "B23100060",
-                "IncomeId": "A40003",
-                "TaxId": "ST005",
-                "RowCode": 8,
-                "RowNo": 8,
-                "ItemType": 1,
-                "SPrice": 1250,
-                "SQuantity": 1,
-                "ProjectId": "B23100060",
-                "FromSourceTag": 0,
-                "CU_MaterialId": "4TH53801"
-            },
-            {
-                "BillNo": "B23100060",
-                "IncomeId": "A40003",
-                "TaxId": "ST005",
-                "RowCode": 9,
-                "RowNo": 9,
-                "ItemType": 1,
-                "SPrice": 1250,
-                "SQuantity": 1,
-                "ProjectId": "B23100060",
-                "FromSourceTag": 0,
-                "CU_MaterialId": "4TH53801"
-            },
-            {
-                "BillNo": "B23100060",
-                "IncomeId": "A40003",
-                "TaxId": "ST005",
-                "RowCode": 10,
-                "RowNo": 10,
-                "ItemType": 1,
-                "SPrice": 1250,
-                "SQuantity": 1,
-                "ProjectId": "B23100060",
-                "FromSourceTag": 0,
-                "CU_MaterialId": "4TH53801"
-            },
-            {
-                "BillNo": "B23100060",
-                "IncomeId": "A40003",
-                "TaxId": "ST005",
-                "RowCode": 11,
-                "RowNo": 11,
-                "ItemType": 1,
-                "SPrice": 1250,
-                "SQuantity": 1,
-                "ProjectId": "B23100060",
-                "FromSourceTag": 0,
-                "CU_MaterialId": "4TH53801"
-            },
+                "RequirementDate": 20210420, //出貨日期
+                "ConsignmentDate": 20210420, //發貨日期
+                "DispatchCompId": "1001",
+                "DispatchOrgId": "1000",
+                "BillNo": "Z001", //合約號
+                "RowCode": 1, //全部筆數排列
+                "ItemType": 0,
+                "MaterialId": "Z001", //作番號
+                "SUnitId": "SET",
+                "SQuantity": 1, //交易數量
+                "SPrice": 1 //交易價格
+            }
+        ]
+    },
+    {
+        //salOrderStagePay
+        "name": "salOrderStagePay",
+        "rows": [
             {
-                "BillNo": "B23100060",
-                "IncomeId": "A40003",
-                "TaxId": "ST005",
-                "RowCode": 12,
-                "RowNo": 12,
-                "ItemType": 1,
-                "SPrice": 1250,
-                "SQuantity": 1,
-                "ProjectId": "B23100060",
-                "FromSourceTag": 0,
-                "CU_MaterialId": "4TH53801"
+                "BillNo": "",
+                "RowCode": "",
+                "RowNo": "",
+                "PayStage": "ST003", //收款階段
+                "PlanPercentage": "Z001", //計劃收款比例(%)
+                "PlanPayAmt": 1, //計劃收款金額
+                "PlanPayDate": 1, //計劃收款日期 1.第一筆都是簽約日
+                "UnWriteOffOAmount": 1 //未核銷金額
             }
         ]
     }
diff --git a/wms/contract/api/testT8API.php b/wms/contract/api/testT8API.php
index 9512cbc8..89077ffc 100644
--- a/wms/contract/api/testT8API.php
+++ b/wms/contract/api/testT8API.php
@@ -1,36 +1,286 @@
 <?php
-?>
-
-<head>
-    <title>地址轉經緯度</title>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
-</head>
-
-<body>
-    <h1>輸入地址以獲取經緯度</h1>
-    <form id="addressForm" method="post">
-        <input type="text" id="addressInput" name="address" placeholder="輸入地址">
-        <button type="submit">查詢</button>
-    </form>
-    <div id="map"></div>
-
-    <script>
-        // 使用AJAX提交表單
-        $(document).ready(function() {
-            $("#addressForm").submit(function(event) {
-                event.preventDefault();
-                var address = $("#addressInput").val();
-                $.ajax({
-                    url: "get_lat_lng.php",
-                    type: "POST",
-                    data: {
-                        address: address
-                    },
-                    success: function(data) {
-                        $("#map").html(data);
-                    }
-                });
-            });
-        });
-    </script>
-</body>
\ No newline at end of file
+// [
+//     {
+//         //salSalesOrder
+//         "name": "MainSalesOrder",
+//         "rows": [
+//             {
+//                 "BillNo": "Z001", //合約單號
+//                 "BillDate": 20210420, //簽約日期 
+//                 "TypeId": "SO", //
+//                 "FOrgId": "1000",
+//                 "OrgId": "1000",
+//                 "ModeId": "T", // T汰改 M新梯
+//                 "BizPartnerId": "M0225", //創建人ID
+//                 "CurrId": "TWD",
+//                 "CurrOAmount": 1,
+//                 "CurrLAmount": 1,
+//                 "PersonId": "M0225", //業務人員
+//                 "DueToId": "512", //業務部門
+//                 "TradeConditionId": "",
+//                 "TaxId": "ST005",
+//                 "CreditorCompId": "1000",
+//                 "CreditorOrgId": "1000",
+//                 "CreditorCurrOAmount": 1,
+//                 "CreditorCurrLAmount": 1,
+//                 "CompId": "1000"
+//             }
+//         ]
+//     },
+//     {
+//         //salSalesOrderDetail
+//         "name": "SubOrder",
+//         "rows": [
+//             {
+//                 "SupplyCompId": "1001",
+//                 "SupplyOrgId": "1000",
+//                 "TaxId": "ST005",
+//                 "RequirementDate": 20210420, //出貨日期
+//                 "ConsignmentDate": 20210420, //發貨日期
+//                 "DispatchCompId": "1001",
+//                 "DispatchOrgId": "1000",
+//                 "BillNo": "Z001", //合約號
+//                 "RowCode": 1, //全部筆數排列
+//                 "ItemType": 0,
+//                 "MaterialId": "Z001", //作番號
+//                 "SUnitId": "SET",
+//                 "SQuantity": 1, //交易數量
+//                 "SPrice": 1 //交易價格
+//             }
+//         ]
+//     },
+//     {
+//         "name": "salOrderStagePay",
+//         "rows": [
+//             {
+//                 "BillNo": "",
+//                 "RowCode": "",
+//                 "RowNo": "",
+//                 "PayStage": "ST003", //收款階段
+//                 "PlanPercentage": "Z001", //計劃收款比例(%)
+//                 "PlanPayAmt": 1, //計劃收款金額
+//                 "PlanPayDate": 1, //計劃收款日期 1.第一筆都是簽約日
+//                 "UnWriteOffOAmount": 1 //未核銷金額
+//             }
+//         ]
+//     }
+// ]
+require_once("../../T8_Authorization_from_bpm.php");
+
+$api_url = "https://erp.masada.com.tw:780/twWebAPI/V1/SALSALESORDER/PostERPData";
+
+$validation = get_Auth();
+
+$MainSalesOrder_row = [
+    "BillNo" => "M24020076", //合約單號
+    "BillDate" => 20210420, //簽約日期 
+    "TypeId" => "SO", //
+    "FOrgId" => "1000",
+    "OrgId" => "1000",
+    "ModeId" => "M", // T汰改 M新梯
+    "BizPartnerId" => "M24020076", //客戶代碼
+    "CurrId" => "TWD",
+    "CurrOAmount" => 1,
+    "CurrLAmount" => 1,
+    "PersonId" => "M0225", //業務人員
+    "DueToId" => "M24020076", //債務方
+    "TradeConditionId" => "",
+    "TaxId" => "ST005",
+    "CreditorCompId" => "1001",
+    "CreditorOrgId" => "1000",
+    // "CompId" => "1001",
+    // "CreditorCurrOAmount" => 1,
+    // "CreditorCurrLAmount" => 1
+];
+// //salSalesOrderDetail
+// $SubOrder_row = [];
+for ($i = 0; $i < 3; $i++) {
+    if ($i == 0) {
+        $row = [
+            // "SupplyCompId" => "1001",
+            // "SupplyOrgId" => "1000",
+            "TaxId" => "ST005",
+            "RequirementDate" => 20210420, //出貨日期
+            "ConsignmentDate" => 20210420, //發貨日期
+            // "DispatchCompId" => "1001",
+            // "DispatchOrgId" => "1000",
+            "BillNo" => "M24020076", //合約號
+            "RowCode" => $i, //全部筆數排列
+            "ItemType" => 1,
+            "MaterialId" => "A40001", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
+            "SUnitId" => "SET",
+            "SQuantity" => 1, //交易數量
+            "SPrice" => 50000 //交易價格
+        ];
+    }
+    if ($i == 1) {
+        $row = [
+            // "SupplyCompId" => "1001",
+            // "SupplyOrgId" => "1000",
+            "TaxId" => "ST005",
+            "RequirementDate" => 20210420, //出貨日期
+            "ConsignmentDate" => 20210420, //發貨日期
+            // "DispatchCompId" => "1001",
+            // "DispatchOrgId" => "1000",
+            "BillNo" => "M24020076", //合約號
+            "RowCode" => $i, //全部筆數排列
+            "ItemType" => 1,
+            "MaterialId" => "A40008", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
+            "SUnitId" => "SET",
+            "SQuantity" => 1, //交易數量
+            "SPrice" => 700000 //交易價格
+        ];
+    }
+    if ($i == 2) {
+        $row = [
+            // "SupplyCompId" => "1001",
+            // "SupplyOrgId" => "1000",
+            "TaxId" => "ST005",
+            "RequirementDate" => 20210420, //出貨日期
+            "ConsignmentDate" => 20210420, //發貨日期
+            // "DispatchCompId" => "1001",
+            // "DispatchOrgId" => "1000",
+            "BillNo" => "M24020076", //合約號
+            "RowCode" => $i, //全部筆數排列
+            "ItemType" => 0,
+            "MaterialId" => "4MH00669", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
+            "SUnitId" => "SET",
+            "SQuantity" => 1, //交易數量
+            "SPrice" => 0 //交易價格
+        ];
+    }
+    $SubOrder_row[] = $row;
+}
+
+// // $salOrderStagePay_row = [];
+// // // for ($i = 0; $i < 2; $i) {
+// // //     if ($i == 0) {
+// // //         $row = [
+// // //             "BillNo" => "M24010201",
+// // //             "RowCode" => 1,
+// // //             "RowNo" => 1,
+// // //             "PayStage" => "簽約", //收款階段
+// // //             "PlanPercentage" => 0.10, //計劃收款比例(%)
+// // //             "PlanPayAmt" => 100000, //計劃收款金額
+// // //             "PlanPayDate" => 20240101, //計劃收款日期 1.第一筆都是簽約日
+// // //             "UnWriteOffOAmount" => 100000 //未核銷金額
+// // //         ];
+// // //     }
+// // //     if ($i == 1) {
+// // //         $row = [
+// // //             "BillNo" => "M24010201",
+// // //             "RowCode" => 1,
+// // //             "RowNo" => 1,
+// // //             "PayStage" => "貨抵工地", //收款階段
+// // //             "PlanPercentage" => 0.40, //計劃收款比例(%)
+// // //             "PlanPayAmt" => 100000, //計劃收款金額
+// // //             "PlanPayDate" => 20240101, //計劃收款日期 1.第一筆都是簽約日
+// // //             "UnWriteOffOAmount" => 100000 //未核銷金額
+// // //         ];
+// // //     }
+// // //     if ($i == 2) {
+// // //         $row = [
+// // //             "BillNo" => "M24010201",
+// // //             "RowCode" => 1,
+// // //             "RowNo" => 1,
+// // //             "PayStage" => "試車完工", //收款階段
+// // //             "PlanPercentage" => 0.30, //計劃收款比例(%)
+// // //             "PlanPayAmt" => 100000, //計劃收款金額
+// // //             "PlanPayDate" => 20240101, //計劃收款日期 1.第一筆都是簽約日
+// // //             "UnWriteOffOAmount" => 100000 //未核銷金額
+// // //         ];
+// // //     }
+// // //     if ($i == 3) {
+// // //         $row = [
+// // //             "BillNo" => "M24010201",
+// // //             "RowCode" => 1,
+// // //             "RowNo" => 1,
+// // //             "PayStage" => "交車", //收款階段
+// // //             "PlanPercentage" => 0.20, //計劃收款比例(%)
+// // //             "PlanPayAmt" => 100000, //計劃收款金額
+// // //             "PlanPayDate" => 20240101, //計劃收款日期 1.第一筆都是簽約日
+// // //             "UnWriteOffOAmount" => 100000 //未核銷金額
+// // //         ];
+// // //     }
+// // //     $salOrderStagePay_row[] = $row;
+// // // }
+$salOrderStagePay_row = [];
+$roww = [
+    "PayStage" => "簽約", //收款階段
+    "PlanPercentage" => 0.5, //計劃收款比例(%)
+    "PlanPayAmt" => 375000, //計劃收款金額
+    "PlanPayDate" => 20240101, //計劃收款日期 1.第一筆都是簽約日
+    "BillNo" => "M24020076",
+    "RowCode" => 1,
+    "RowNo" => 1,
+    "UnWriteOffOAmount" => 375000 //未核銷金額
+];
+$roww2 = [
+    "PayStage" => "貨抵工地",
+    "PlanPercentage" => 0.5,
+    "PlanPayAmt" => 375000,
+    "PlanPayDate" => 20240101,
+    "BillNo" => "M24020076",
+    "RowCode" => 2,
+    "RowNo" => 2,
+    "UnWriteOffOAmount" => 375000
+];
+$salOrderStagePay_row[] = $roww;
+
+$MainSalesOrder = [
+    "name" => "MainSalesOrder",
+    'rows' => [$MainSalesOrder_row]
+];
+$SubOrder = [
+    "name" => "SubOrder",
+    "rows" => $SubOrder_row
+];
+$salOrderStagePay = [
+    "name" => "salOrderStagePay",
+    "rows" => $salOrderStagePay_row
+];
+
+$APIbody = [];
+$APIbody[] = $MainSalesOrder;
+$APIbody[] = $SubOrder;
+$APIbody[] = $salOrderStagePay;
+// $data = file_get_contents('test copy.json');
+// $arr = json_decode($data, true);
+// echo "<pre>";
+// print_r($data);
+// echo "</pre>";
+
+// echo "<pre>";
+// print_r(json_encode($APIbody, JSON_UNESCAPED_UNICODE));
+// echo "</pre>";
+// exit();
+
+$header = [
+    "CHI_Authorization :" . $validation,
+    "GroupId:TEST"
+];
+$ch = curl_init();
+curl_setopt($ch, CURLOPT_URL, $api_url); // 设置请求的URL
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+curl_setopt($ch, CURLOPT_POST, 1); // 使用 POST
+curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($APIbody, JSON_UNESCAPED_UNICODE));
+$response = curl_exec($ch);
+
+if ($response === false) {
+    echo 'Curl error: ' . curl_error($ch);
+} else {
+    $result = json_decode($response, true);
+    // 若 API 傳入失敗。
+    if ($result['Status'] == 'Erroe') {
+        echo 'API傳入失敗，' . $result['ErrorMsg'];
+        print_r($result);
+    } else {
+        // print_r($result);
+        print_r($result);
+    }
+    print_r($result);
+}
+
+curl_close($ch);
diff --git a/wms/contract/contract-input.php b/wms/contract/contract-input.php
index 10ef98d8..92aaf7d0 100644
--- a/wms/contract/contract-input.php
+++ b/wms/contract/contract-input.php
@@ -452,8 +452,11 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
     </div>
 
 </div>
-
+<script src="./js/jquery/jquery-3.1.1.min.js"></script>
+<script src="semantic/dist/semantic.min.js"></script>
+<script src="./js/alpine.js"></script>
 <script>
     const user_id = '<?php echo $user_id; ?>'
     const user_name = '<?php echo $user_name; ?>'
+    // console.log(123);
 </script>
\ No newline at end of file
diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js
index 4c4d6d36..104ab4f7 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -810,7 +810,7 @@ const contractNewInput = () => {
     return {
         init() { },
         data: {
-            contractno: 'M24020029',
+            contractno: 'M24020076',
             customer: '',
             manager: '',
             vat: '',
@@ -827,6 +827,7 @@ const contractNewInput = () => {
             signing_date: '', //合約簽訂日期
             elevators: [], // 電梯種類 Array
             elevators_detail_arr: [], // 電梯台數 Array
+            pay_arr: [], //電梯付款種類
             nums: 0, //電梯數量
         },
         step: 1,
@@ -902,6 +903,7 @@ const contractNewInput = () => {
                     this.data.elevators = res.data.elevators;
                     this.data.elevators_detail_arr = res.data.elevators_detail_arr;
                     this.data.nums = res.data.nums;
+                    this.data.pay_arr = res.data.pay_arr;
                 }
                 this.step = 2
                 this.isLoading = false
@@ -929,6 +931,7 @@ const contractNewInput = () => {
             form.append('contract_type', this.data.contract_type);
             form.append('elevators_detail_arr', JSON.stringify(this.data.elevators_detail_arr));
             form.append('elevators', JSON.stringify(this.data.elevators));
+            form.append('pay_arr', JSON.stringify(this.data.pay_arr));
             form.append('contracttype', 'm');
             form.append('user_id', user_id);
             for (var i = 0; i < this.data.files.length; i++) {

From 79d4fecce6acc8d90dec812cf475969e2ab64faa Mon Sep 17 00:00:00 2001
From: Cheng <lkmd555@masada.com.tw>
Date: Mon, 4 Mar 2024 20:25:19 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E6=96=B0=E6=A2=AF=E3=80=81=E4=BF=9D?=
 =?UTF-8?q?=E9=A4=8A=E7=B0=BD=E5=9B=9E&=E7=8D=8E=E9=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elevator_new_deal_bonus_v2_0.php          |  73 +-
 ...evator_new_deal_bonus_v2_0_examination.php | 121 +--
 wms/contract/api/T8api.php                    |   2 +-
 wms/contract/api/getContractData.php          |  15 -
 wms/contract/api/postContractData.php         |   1 +
 wms/contract/api/postNewContractData.php      | 761 +++++++++++-------
 wms/contract/api/test copy.json               | 407 ++++++++--
 wms/contract/api/test.json                    |   2 +-
 wms/contract/api/testT8API.php                | 127 ++-
 wms/contract/contract-newelevator-input.php   |  14 +-
 wms/contract/js/alpine.js                     |  13 +-
 11 files changed, 989 insertions(+), 547 deletions(-)

diff --git a/wms/bonus/elevator_new/elevator_new_deal_bonus_v2_0.php b/wms/bonus/elevator_new/elevator_new_deal_bonus_v2_0.php
index 84dde3cd..15f87514 100644
--- a/wms/bonus/elevator_new/elevator_new_deal_bonus_v2_0.php
+++ b/wms/bonus/elevator_new/elevator_new_deal_bonus_v2_0.php
@@ -35,13 +35,14 @@ result_array[
 
 
 
-function elevator_new_deal_bonus_v2_0($ver, $contract_type, $elevator_type, $elevator_list_price, $elevator_knockdown_price, $sales_id, $region_manger_id){
+function elevator_new_deal_bonus_v2_0($ver, $contract_type, $elevator_type, $elevator_list_price, $elevator_knockdown_price, $sales_id, $region_manger_id)
+{
 	$bonus_array = [];
-	if ($ver == "2.0"){
+	if ($ver == "2.0") {
 		$discount = round($elevator_knockdown_price / $elevator_list_price, 3); #銷售點數，取到小數點第三位。
-		
+
 		#合約總類($contract_type)：戰略客戶(strategy_customer)、一般客戶(general_customer)
-		switch ($contract_type){	
+		switch ($contract_type) {
 			case "strategy_customer":
 				#契約員獎金($sales_bonus)
 				$sales_bonus = $elevator_knockdown_price * 0.007;
@@ -51,7 +52,7 @@ function elevator_new_deal_bonus_v2_0($ver, $contract_type, $elevator_type, $ele
 
 			case "general_customer":
 				switch ($elevator_type) {
-					#客梯(passenger)、貨梯(cargo)
+						#客梯(passenger)、貨梯(cargo)
 					case ($elevator_type == "passenger" or $elevator_type == "cargo"):
 						switch ($discount) {
 							case ($discount >= 1.0):
@@ -62,14 +63,14 @@ function elevator_new_deal_bonus_v2_0($ver, $contract_type, $elevator_type, $ele
 								break;
 							case ($discount >= 0.75 and $discount < 0.9):
 								$sales_bonus = $elevator_knockdown_price * 0.015;
-								break;	
+								break;
 							case ($discount < 0.75):
 								$sales_bonus = $elevator_knockdown_price * 0.008;
-								break;	
+								break;
 						};
-						break;	
-					
-					#小電梯(dumbwaiter)、平台梯(flatbase)、強驅(positive_drive)			
+						break;
+
+						#小電梯(dumbwaiter)、平台梯(flatbase)、強驅(positive_drive)			
 					case ($elevator_type == "dumbwaiter" or $elevator_type == "flatbase" or $elevator_type == "positive_drive"):
 						switch ($discount) {
 							case ($discount >= 1.0):
@@ -80,7 +81,7 @@ function elevator_new_deal_bonus_v2_0($ver, $contract_type, $elevator_type, $ele
 								break;
 							case ($discount >= 0.72 and $discount < 0.9):
 								$sales_bonus = $elevator_knockdown_price * 0.015;
-								break;	
+								break;
 							case ($discount < 0.72):
 								$sales_bonus = $elevator_knockdown_price * 0.008;
 								break;
@@ -91,74 +92,72 @@ function elevator_new_deal_bonus_v2_0($ver, $contract_type, $elevator_type, $ele
 				$region_manager_bonus = 600;
 				break;
 		};
-		
+
 		#營銷人員銷售獎金水庫-----訂金已收款20%，發放總獎金20%
-		array_push($bonus_array,[
+		array_push($bonus_array, [
 			"bonus_type" => "營銷人員銷售獎金-訂金段", #獎金名稱
 			"bonus_receiver" => $sales_id, #發放人員
 			"bonus_amount" => round($sales_bonus * 0.2), #金額
 			"payment_schedul_due" => "deposit", #訂金已收款20%
 			"payment_schedul_regulation" => "訂金已收款20%，發放總獎金20%" #發放規定				
 		]);
-		
+
 		#營銷人員銷售獎金水庫-----出貨前期所有款項已收齊，且出貨款已收款50%，發放總獎金50%
-		array_push($bonus_array,[
+		array_push($bonus_array, [
 			"bonus_type" => "營銷人員銷售獎金-出貨款段", #獎金名稱
 			"bonus_receiver" => $sales_id, #發放人員
 			"bonus_amount" => round($sales_bonus * 0.5), #金額
 			"payment_schedul_due" => "shipping", #訂金已收款20%
 			"payment_schedul_regulation" => "出貨前期所有款項已收齊，且出貨款已收款50%，發放總獎金50%" #發放規定				
-		]);		
-		
+		]);
+
 		#營銷人員銷售獎金水庫-----驗收前期所有款項已收齊，且驗收款已收款30%，發放總獎金30%
-		array_push($bonus_array,[
+		array_push($bonus_array, [
 			"bonus_type" => "營銷人員銷售獎金-驗收款段", #獎金名稱
 			"bonus_receiver" => $sales_id, #發放人員
 			"bonus_amount" => round($sales_bonus * 0.3), #金額
 			"payment_schedul_due" => "acceptance", #訂金已收款20%
 			"payment_schedul_regulation" => "驗收前期所有款項已收齊，且驗收款已收款30%，發放總獎金30%" #發放規定				
-		]);	
+		]);
 
 		#區域經理提成獎金水庫-----訂金已收款100%，發放總獎金50%
-		array_push($bonus_array,[
+		array_push($bonus_array, [
 			"bonus_type" => "區域經理提成獎金-訂金段", #獎金名稱
 			"bonus_receiver" => $region_manger_id, #發放人員
 			"bonus_amount" => round($region_manager_bonus * 0.5), #金額
 			"payment_schedul_due" => "deposit", #訂金已收款100%
 			"payment_schedul_regulation" => "訂金已收款100%，發放總獎金50%" #發放規定				
-		]);		
-		
+		]);
+
 		#區域經理獎金水庫-----貨到工地款(含)之前所有款項已收款100%，發放總獎金50%
-		array_push($bonus_array,[
+		array_push($bonus_array, [
 			"bonus_type" => "區域經理提成獎金-貨到工地款段", #獎金名稱
 			"bonus_receiver" => $region_manger_id, #發放人員
 			"bonus_amount" => round($region_manager_bonus * 0.5), #金額
 			"payment_schedul_due" => "deliveried", #貨到工地款(含)之前所有款項已收款100%
 			"payment_schedul_regulation" => "貨到工地款(含)之前所有款項已收款100%，發放總獎金50%" #發放規定				
-		]);			
+		]);
 
 		$result_array = [
-			"ver"=>$ver, #獎金版本
-			"result_status"=>"success", #計算結果	
-			"bonus_array"=>$bonus_array #獎金水庫
-		];			
-	}else{
-		array_push($bonus_array,[
+			"ver" => $ver, #獎金版本
+			"result_status" => "success", #計算結果	
+			"bonus_array" => $bonus_array #獎金水庫
+		];
+	} else {
+		array_push($bonus_array, [
 			"bonus_type" => "error", #獎金名稱
 			"bonus_receiver" => "error", #發放人員
 			"bonus_amount" => 0, #金額
 			"payment_schedul_due" => "9999-1-1", #預計發放時間
 			"payment_schedul_regulation" => "error" #發放規定				
 		]);
-		
+
 		$result_array = [
-			"ver"=>$ver, #獎金版本
-			"result_status"=>"error", #計算結果	
-			"bonus_array"=>$bonus_array #獎金水庫
+			"ver" => $ver, #獎金版本
+			"result_status" => "error", #計算結果	
+			"bonus_array" => $bonus_array #獎金水庫
 		];
 	};
-	
+
 	return $result_array;
 };
-
-?>
\ No newline at end of file
diff --git a/wms/bonus/elevator_new/elevator_new_deal_bonus_v2_0_examination.php b/wms/bonus/elevator_new/elevator_new_deal_bonus_v2_0_examination.php
index 771b791b..600d4071 100644
--- a/wms/bonus/elevator_new/elevator_new_deal_bonus_v2_0_examination.php
+++ b/wms/bonus/elevator_new/elevator_new_deal_bonus_v2_0_examination.php
@@ -41,76 +41,85 @@ require_once("elevator_new_deal_bonus_v2_0.php");
 #獎金測試
 $examination_array = [
 	#錯誤版本
-	["1.0","strategy_customer","passenger",1000000,1000000,"M0001", "M0003"],
+	["1.0", "strategy_customer", "passenger", 1000000, 1000000, "M0001", "M0003"],
 	#戰略客戶(strategy_customer)
-	["2.0","strategy_customer","passenger",1000000,1000000,"M0001", "M0003"], #戰略客戶、客梯、銷售點數100%
-	["2.0","strategy_customer","passenger",1000000,900000,"M0001", "M0003"], #戰略客戶、客梯、銷售點數90%	
-	["2.0","strategy_customer","passenger",1000000,750000,"M0001", "M0003"], #戰略客戶、客梯、銷售點數75%		
-	["2.0","strategy_customer","passenger",1000000,600000,"M0001", "M0003"], #戰略客戶、客梯、銷售點數60%		
-	["2.0","strategy_customer","cargo",1000000,1000000,"M0001", "M0003"], #戰略客戶、貨梯、銷售點數100%
-	["2.0","strategy_customer","cargo",1000000,900000,"M0001", "M0003"], #戰略客戶、貨梯、銷售點數90%	
-	["2.0","strategy_customer","cargo",1000000,750000,"M0001", "M0003"], #戰略客戶、貨梯、銷售點數75%		
-	["2.0","strategy_customer","cargo",1000000,600000,"M0001", "M0003"], #戰略客戶、貨梯、銷售點數60%	
-	["2.0","strategy_customer","dumbwaiter",1000000,1000000,"M0001", "M0003"], #戰略客戶、小電梯、銷售點數100%
-	["2.0","strategy_customer","dumbwaiter",1000000,900000,"M0001", "M0003"], #戰略客戶、小電梯、銷售點數90%	
-	["2.0","strategy_customer","dumbwaiter",1000000,720000,"M0001", "M0003"], #戰略客戶、小電梯、銷售點數75%		
-	["2.0","strategy_customer","dumbwaiter",1000000,600000,"M0001", "M0003"], #戰略客戶、小電梯、銷售點數60%
-	["2.0","strategy_customer","flatbase",1000000,1000000,"M0001", "M0003"], #戰略客戶、平台梯、銷售點數100%
-	["2.0","strategy_customer","flatbase",1000000,900000,"M0001", "M0003"], #戰略客戶、平台梯、銷售點數90%	
-	["2.0","strategy_customer","flatbase",1000000,720000,"M0001", "M0003"], #戰略客戶、平台梯、銷售點數75%		
-	["2.0","strategy_customer","flatbase",1000000,600000,"M0001", "M0003"], #戰略客戶、平台梯、銷售點數60%	
-	["2.0","strategy_customer","positive_drive",1000000,1000000,"M0001", "M0003"], #戰略客戶、強驅、銷售點數100%
-	["2.0","strategy_customer","positive_drive",1000000,900000,"M0001", "M0003"], #戰略客戶、強驅、銷售點數90%	
-	["2.0","strategy_customer","positive_drive",1000000,720000,"M0001", "M0003"], #戰略客戶、強驅、銷售點數75%		
-	["2.0","strategy_customer","positive_drive",1000000,600000,"M0001", "M0003"], #戰略客戶、強驅、銷售點數60%	
+	["2.0", "strategy_customer", "passenger", 1000000, 1000000, "M0001", "M0003"], #戰略客戶、客梯、銷售點數100%
+	["2.0", "strategy_customer", "passenger", 1000000, 900000, "M0001", "M0003"], #戰略客戶、客梯、銷售點數90%	
+	["2.0", "strategy_customer", "passenger", 1000000, 750000, "M0001", "M0003"], #戰略客戶、客梯、銷售點數75%		
+	["2.0", "strategy_customer", "passenger", 1000000, 600000, "M0001", "M0003"], #戰略客戶、客梯、銷售點數60%		
+	["2.0", "strategy_customer", "cargo", 1000000, 1000000, "M0001", "M0003"], #戰略客戶、貨梯、銷售點數100%
+	["2.0", "strategy_customer", "cargo", 1000000, 900000, "M0001", "M0003"], #戰略客戶、貨梯、銷售點數90%	
+	["2.0", "strategy_customer", "cargo", 1000000, 750000, "M0001", "M0003"], #戰略客戶、貨梯、銷售點數75%		
+	["2.0", "strategy_customer", "cargo", 1000000, 600000, "M0001", "M0003"], #戰略客戶、貨梯、銷售點數60%	
+	["2.0", "strategy_customer", "dumbwaiter", 1000000, 1000000, "M0001", "M0003"], #戰略客戶、小電梯、銷售點數100%
+	["2.0", "strategy_customer", "dumbwaiter", 1000000, 900000, "M0001", "M0003"], #戰略客戶、小電梯、銷售點數90%	
+	["2.0", "strategy_customer", "dumbwaiter", 1000000, 720000, "M0001", "M0003"], #戰略客戶、小電梯、銷售點數75%		
+	["2.0", "strategy_customer", "dumbwaiter", 1000000, 600000, "M0001", "M0003"], #戰略客戶、小電梯、銷售點數60%
+	["2.0", "strategy_customer", "flatbase", 1000000, 1000000, "M0001", "M0003"], #戰略客戶、平台梯、銷售點數100%
+	["2.0", "strategy_customer", "flatbase", 1000000, 900000, "M0001", "M0003"], #戰略客戶、平台梯、銷售點數90%	
+	["2.0", "strategy_customer", "flatbase", 1000000, 720000, "M0001", "M0003"], #戰略客戶、平台梯、銷售點數75%		
+	["2.0", "strategy_customer", "flatbase", 1000000, 600000, "M0001", "M0003"], #戰略客戶、平台梯、銷售點數60%	
+	["2.0", "strategy_customer", "positive_drive", 1000000, 1000000, "M0001", "M0003"], #戰略客戶、強驅、銷售點數100%
+	["2.0", "strategy_customer", "positive_drive", 1000000, 900000, "M0001", "M0003"], #戰略客戶、強驅、銷售點數90%	
+	["2.0", "strategy_customer", "positive_drive", 1000000, 720000, "M0001", "M0003"], #戰略客戶、強驅、銷售點數75%		
+	["2.0", "strategy_customer", "positive_drive", 1000000, 600000, "M0001", "M0003"], #戰略客戶、強驅、銷售點數60%	
 
 	#一般客戶(general_customer)
-	["2.0","general_customer","passenger",1000000,1000000,"M0001", "M0003"], #一般客戶、客梯、銷售點數100%
-	["2.0","general_customer","passenger",1000000,900000,"M0001", "M0003"], #一般客戶、客梯、銷售點數90%	
-	["2.0","general_customer","passenger",1000000,750000,"M0001", "M0003"], #一般客戶、客梯、銷售點數75%		
-	["2.0","general_customer","passenger",1000000,600000,"M0001", "M0003"], #一般客戶、客梯、銷售點數60%		
-	["2.0","general_customer","cargo",1000000,1000000,"M0001", "M0003"], #一般客戶、貨梯、銷售點數100%
-	["2.0","general_customer","cargo",1000000,900000,"M0001", "M0003"], #一般客戶、貨梯、銷售點數90%	
-	["2.0","general_customer","cargo",1000000,750000,"M0001", "M0003"], #一般客戶、貨梯、銷售點數75%		
-	["2.0","general_customer","cargo",1000000,600000,"M0001", "M0003"], #一般客戶、貨梯、銷售點數60%	
-	["2.0","general_customer","dumbwaiter",1000000,1000000,"M0001", "M0003"], #一般客戶、小電梯、銷售點數100%
-	["2.0","general_customer","dumbwaiter",1000000,900000,"M0001", "M0003"], #一般客戶、小電梯、銷售點數90%	
-	["2.0","general_customer","dumbwaiter",1000000,720000,"M0001", "M0003"], #一般客戶、小電梯、銷售點數75%		
-	["2.0","general_customer","dumbwaiter",1000000,600000,"M0001", "M0003"], #一般客戶、小電梯、銷售點數60%
-	["2.0","general_customer","flatbase",1000000,1000000,"M0001", "M0003"], #一般客戶、平台梯、銷售點數100%
-	["2.0","general_customer","flatbase",1000000,900000,"M0001", "M0003"], #一般客戶、平台梯、銷售點數90%	
-	["2.0","general_customer","flatbase",1000000,720000,"M0001", "M0003"], #一般客戶、平台梯、銷售點數75%		
-	["2.0","general_customer","flatbase",1000000,600000,"M0001", "M0003"], #一般客戶、平台梯、銷售點數60%	
-	["2.0","general_customer","positive_drive",1000000,1000000,"M0001", "M0003"], #一般客戶、強驅、銷售點數100%
-	["2.0","general_customer","positive_drive",1000000,900000,"M0001", "M0003"], #一般客戶、強驅、銷售點數90%	
-	["2.0","general_customer","positive_drive",1000000,720000,"M0001", "M0003"], #一般客戶、強驅、銷售點數75%		
-	["2.0","general_customer","positive_drive",1000000,600000,"M0001", "M0003"] #一般客戶、強驅、銷售點數60%		
+	["2.0", "general_customer", "passenger", 1000000, 1000000, "M0001", "M0003"], #一般客戶、客梯、銷售點數100%
+	["2.0", "general_customer", "passenger", 1000000, 900000, "M0001", "M0003"], #一般客戶、客梯、銷售點數90%	
+	["2.0", "general_customer", "passenger", 1000000, 750000, "M0001", "M0003"], #一般客戶、客梯、銷售點數75%		
+	["2.0", "general_customer", "passenger", 1000000, 600000, "M0001", "M0003"], #一般客戶、客梯、銷售點數60%		
+	["2.0", "general_customer", "cargo", 1000000, 1000000, "M0001", "M0003"], #一般客戶、貨梯、銷售點數100%
+	["2.0", "general_customer", "cargo", 1000000, 900000, "M0001", "M0003"], #一般客戶、貨梯、銷售點數90%	
+	["2.0", "general_customer", "cargo", 1000000, 750000, "M0001", "M0003"], #一般客戶、貨梯、銷售點數75%		
+	["2.0", "general_customer", "cargo", 1000000, 600000, "M0001", "M0003"], #一般客戶、貨梯、銷售點數60%	
+	["2.0", "general_customer", "dumbwaiter", 1000000, 1000000, "M0001", "M0003"], #一般客戶、小電梯、銷售點數100%
+	["2.0", "general_customer", "dumbwaiter", 1000000, 900000, "M0001", "M0003"], #一般客戶、小電梯、銷售點數90%	
+	["2.0", "general_customer", "dumbwaiter", 1000000, 720000, "M0001", "M0003"], #一般客戶、小電梯、銷售點數75%		
+	["2.0", "general_customer", "dumbwaiter", 1000000, 600000, "M0001", "M0003"], #一般客戶、小電梯、銷售點數60%
+	["2.0", "general_customer", "flatbase", 1000000, 1000000, "M0001", "M0003"], #一般客戶、平台梯、銷售點數100%
+	["2.0", "general_customer", "flatbase", 1000000, 900000, "M0001", "M0003"], #一般客戶、平台梯、銷售點數90%	
+	["2.0", "general_customer", "flatbase", 1000000, 720000, "M0001", "M0003"], #一般客戶、平台梯、銷售點數75%		
+	["2.0", "general_customer", "flatbase", 1000000, 600000, "M0001", "M0003"], #一般客戶、平台梯、銷售點數60%	
+	["2.0", "general_customer", "positive_drive", 1000000, 1000000, "M0001", "M0003"], #一般客戶、強驅、銷售點數100%
+	["2.0", "general_customer", "positive_drive", 1000000, 900000, "M0001", "M0003"], #一般客戶、強驅、銷售點數90%	
+	["2.0", "general_customer", "positive_drive", 1000000, 720000, "M0001", "M0003"], #一般客戶、強驅、銷售點數75%		
+	["2.0", "general_customer", "positive_drive", 1000000, 600000, "M0001", "M0003"] #一般客戶、強驅、銷售點數60%		
 ];
 
 
 
-for($i = 0; $i<count($examination_array); $i++){
+for ($i = 0; $i < count($examination_array); $i++) {
 	$result = elevator_new_deal_bonus_v2_0(
 		$examination_array[$i][0],
-		$examination_array[$i][1],	
-		$examination_array[$i][2],	
-		$examination_array[$i][3],	
-		$examination_array[$i][4],	
-		$examination_array[$i][5],	
-		$examination_array[$i][6]		
+		$examination_array[$i][1],
+		$examination_array[$i][2],
+		$examination_array[$i][3],
+		$examination_array[$i][4],
+		$examination_array[$i][5],
+		$examination_array[$i][6]
 	);
+	$customer = [
+		'strategy_customer' => '戰略客戶',
+		'general_customer' => '一般客戶'
+	];
+	//作番機種($elevator_type)：客梯(passenger)、貨梯(cargo)、小電梯(dumbwaiter)、平台梯(flatbase)、強驅(positive_drive)
+	$elevator = [
+		"passenger" => "客梯",
+		"cargo" => "貨梯",
+		"dumbwaiter" => "小電梯",
+		"flatbase" => "平台踢",
+		"positive_drive" => "強驅"
+	];
 	echo "獎金版本:" . $result["ver"] . "<br>";
 	echo "計算結果:" . $result["result_status"] . "<br>";
+	echo "參數說明: " . $customer[$examination_array[$i][1]] . " 、 " . $elevator[$examination_array[$i][2]] . "、  作番表價:" . $examination_array[$i][3] . "  、  作番賣價: " . $examination_array[$i][4] . "、  營業員員工號:" . $examination_array[$i][5] . "   、   區域經理員工號:" . $examination_array[$i][6] . "<br>";
 	echo "輸入參數：" . $examination_array[$i][1] . "  " . $examination_array[$i][2] . "  " . $examination_array[$i][3] . "  " . $examination_array[$i][4] . "  "
-					 . $examination_array[$i][5] . "  " . $examination_array[$i][6] . "<br>";
-	for($j = 0; $j<count($result["bonus_array"]); $j++){
+		. $examination_array[$i][5] . "  " . $examination_array[$i][6] . "<br>";
+	for ($j = 0; $j < count($result["bonus_array"]); $j++) {
 		echo "輸出結果：" . $result["bonus_array"][$j]["bonus_type"] . "   " . $result["bonus_array"][$j]["bonus_receiver"] . "   "
-						 . $result["bonus_array"][$j]["bonus_amount"] . "   " . $result["bonus_array"][$j]["payment_schedul_due"] . "   "
-						  . $result["bonus_array"][$j]["payment_schedul_regulation"] . "<br>";
+			. $result["bonus_array"][$j]["bonus_amount"] . "   " . $result["bonus_array"][$j]["payment_schedul_due"] . "   "
+			. $result["bonus_array"][$j]["payment_schedul_regulation"] . "<br>";
 	};
 	echo "-------------------------" . "<br>";
-
 };
-
-
-?>
diff --git a/wms/contract/api/T8api.php b/wms/contract/api/T8api.php
index 7bf12c6f..245a318d 100644
--- a/wms/contract/api/T8api.php
+++ b/wms/contract/api/T8api.php
@@ -7,7 +7,7 @@ function T8salIncomeApply($data, $api_url)
     // $api_url = 'https://erp.masada.com.tw:780/twWebAPI/V1/SALINCOMEAPPLY/PostERPData';
     $validation = get_Auth();
     // echo '<pre>';
-    // print_r(json_encode($data));
+    // print_r(json_encode($data, JSON_UNESCAPED_UNICODE));
     // echo '</pre>';
     $header = [
         "CHI_Authorization :" . $validation,
diff --git a/wms/contract/api/getContractData.php b/wms/contract/api/getContractData.php
index 667c33b7..e2aedd43 100644
--- a/wms/contract/api/getContractData.php
+++ b/wms/contract/api/getContractData.php
@@ -186,28 +186,13 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
                 foreach ($other_option_arr as $key => $option) {
                     if ($option['item_qty'] == $result['item_qty']) {
                         $result['option_other_price'] += intval($option['item_unit_price']);
-                        // echo '1..';
-                        // echo "<pre>";
-                        // print_r($option['item_unit_price']);
-                        // echo "</pre>";
                     } else if ($option['item_qty'] / $result['item_qty'] != 1) {
                         $item_qty = intval($option['item_qty']) / intval($result['item_qty']); // 總option數量 / 總電梯台數
                         $result['option_other_price'] += intval($option['item_unit_price']) * $item_qty;
-                        // echo '2..';
-                        // echo "<pre>";
-                        // print_r(intval($option['item_unit_price']) . ' *' . $item_qty . '=' . intval($option['item_unit_price']) * $item_qty);
-                        // echo "</pre>";
                     } else {
                         $result['option_other_price'] += $option['item_unit_price'] * intval($option['item_qty']);
-                        // echo '
                     }
-                    // echo '<pre>';
-                    // print_r($option['item_no'] . '--->' . $option['item_unit_price'] . '--->' . $option['item_qty']);
-                    // echo '</pre>';
                 }
-
-                // print_r($result['option_other_price']);
-                // exit();
             }
 
 
diff --git a/wms/contract/api/postContractData.php b/wms/contract/api/postContractData.php
index 6b9b210b..243b9ad3 100644
--- a/wms/contract/api/postContractData.php
+++ b/wms/contract/api/postContractData.php
@@ -620,6 +620,7 @@ function T8insert($data, $facilityno, $depId)
                 "SPrice" =>  intval($elevator['sold_price']),
                 "SQuantity" => $SQuantity,
                 "ProjectId" => "$contractno",
+                "FromBillNo" => "$contractno",
                 "CU_MaterialId" => "$facility_no",
                 "CU_EstPayDate" => intval($payDay)
             ];
diff --git a/wms/contract/api/postNewContractData.php b/wms/contract/api/postNewContractData.php
index 2a1ebca5..6fd5756c 100644
--- a/wms/contract/api/postNewContractData.php
+++ b/wms/contract/api/postNewContractData.php
@@ -1,10 +1,16 @@
+<meta charset="UTF-8">
 <?php
+// header("Content-Type: text/html; charset=utf-8");
+// echo '你好';
+// exit;
 require_once("../conn.php");
+// include_once("../../fun_global.php");
 include_once("./getFacilityNo.php");
 include_once("./getComboNo.php");
 include_once("./upload_chk.php");
 ini_set('date.timezone', 'Asia/Taipei');
 
+
 if ($_SERVER['REQUEST_METHOD'] != 'POST') {
   exit();
 }
@@ -25,10 +31,13 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
     $qc = $_POST["qc"];
     $contracttype = $_POST["contracttype"];
     $elevators_nums = $_POST['nums'];
-    $elevators = json_decode($_POST['elevators'], true);
-    $elevators_detail_arr = json_decode($_POST['elevators_detail_arr'], true);
-
-
+    $area_no = $_POST['area_no'];
+    $elevators = json_decode($_POST['elevators'], JSON_UNESCAPED_UNICODE);
+    $elevators_detail_arr = json_decode($_POST['elevators_detail_arr'], JSON_UNESCAPED_UNICODE);
+    // echo "<pre>";
+    // print_r($elevators_detail_arr);
+    // echo "</pre>";
+    // exit();
     $files = !empty($_FILES['files']) ? $_FILES['files'] : null;
     $files_id = null;
 
@@ -67,19 +76,131 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
     $facilityno = $createFacilityNo->makeMFacilityNo('M', $arr, intval($elevators_nums));
     echo json_encode($facilityno);
 
-    // $bonus_result = BounsCount($_POST, $conn, $facilityno);
-    // if (!empty($bonus_result) && $bonus_result['status'] == "2") {
-    //   $fail_arr[] = '獎金計算錯誤，請再檢查或連繫資訊人員';
-    //   // header("HTTP/1.1 422 Unprocessable Entity");
-    //   echo json_encode($fail_arr, JSON_UNESCAPED_UNICODE);
-    //   exit();
-    // }
+    $bonus_result = BounsCount($_POST, $conn, $facilityno);
+    if (!empty($bonus_result) && $bonus_result['status'] == "2") {
+      $fail_arr[] = '獎金計算錯誤，請再檢查或連繫資訊人員';
+      // header("HTTP/1.1 422 Unprocessable Entity");
+      echo json_encode($fail_arr, JSON_UNESCAPED_UNICODE);
+      exit();
+    }
 
     T8Insert($_POST, $facilityno, $connT8);
-
     exit();
     $conn->beginTransaction();
 
+    //create account table
+    $accounttype = "A";
+    $accountid = $vat;
+    $pwd = "123";
+    $name = $customer;
+    $tel = $lm_tel ?? '';
+    $sql = "INSERT INTO account (accounttype, accountid, pwd, name, tel, address, creater, create_at) 
+    VALUES (:accounttype, :accountid, :pwd, :name, :tel, :address , :creater, :created_at)";
+    $stmt = $conn->prepare($sql);
+    $stmt->bindParam(':accounttype', $accounttype);
+    $stmt->bindParam(':accountid', $contractno);
+    $stmt->bindParam(':pwd', $pwd);
+    $stmt->bindParam(':name', $customer);
+    $stmt->bindParam(':tel', $tel);
+    $stmt->bindParam(':address', $address);
+    $stmt->bindParam(':creater', $created_by);
+    $stmt->bindParam(':created_at', $created_at);
+    $stmt->execute();
+    // exit();
+
+    //create table Wipwholestatus (作番大日程)
+    foreach ($elevators_detail_arr as $key => $value) {
+      $facilityno = $facilityno[$key]; // 作番
+      $weight = $value['item_weight']; // 載重
+      $person = $value['person'];  // 人乘
+      $floor = $value['floor'];  // 樓層
+      $open = $value['item_op']; // 開門方式
+      $speed = $value['speed']; //速度
+      $qc = $value['qc'];
+      $facility_kind = $value['spec']; //型號
+      $contract_arrival_date = $value['contract_arrival_date']; //到工地日期
+      $site_manager = $value['manage'];
+      $warehouseid = $value['warehouseid'];
+      $sql = "INSERT INTO Wipwholestatus 
+      (contract_type,contractno,salesid,custom,accountid,site_manager,warehouseid,facilityno,weight,numberofpassenger,numberoffloor,opentype,speed,facility_kind,area_no,address,contract_arrival_date,real_contract_arrival_date,qc_official_type,creater,create_at) VALUES
+      ('A',:contractno,:salesid,:custom,:accountid,:site_manager,:warehouseid,:facilityno,:weight,:numberofpassenger,:numberoffloor,:opentype,:speed,:facility_kind,:area_no,:address,:contract_arrival_date,:real_contract_arrival_date,:qc_official_type,:creater,:create_at)";
+      // $sql = "INSERT INTO Wipwholestatus
+      // (contract_type,contractno,salesid,custom,accountid,facilityno,weight,numberofpassenger,numberoffloor,opentype,speed,facility_kind,address,contract_arrival_date,qc_official_type,creater,create_at) VALUES
+      // ('A','$contractno','$salesman','$customer','$customer','$facilityno','$weight','$person','$floor','$open','$speed','$facility_kind','$address','$contract_arrival_date','$qc','$created_by','$created_at')";
+      $stmt = $conn->prepare($sql);
+      $stmt->bindParam(':contractno', $contractno);
+      $stmt->bindParam(':salesid', $salesman);
+      $stmt->bindParam(':custom', $customer);
+      $stmt->bindParam(':accountid', $customer);
+      $stmt->bindParam(':site_manager', $site_manager);
+      $stmt->bindParam(':warehouseid', $warehouseid);
+      $stmt->bindParam(':facilityno', $facilityno);
+      $stmt->bindParam(':weight', $weight);
+      $stmt->bindParam(':numberofpassenger', $person);
+      $stmt->bindParam(':numberoffloor', $floor);
+      $stmt->bindParam(':opentype', $open);
+      $stmt->bindParam(':speed', $speed);
+      $stmt->bindParam(':facility_kind', $facility_kind);
+      $stmt->bindParam(':area_no', $area_no);
+      $stmt->bindParam(':address', $address);
+      $stmt->bindParam(':contract_arrival_date', $contract_arrival_date);
+      $stmt->bindParam(':real_contract_arrival_date', $contract_arrival_date);
+      $stmt->bindParam(':qc_official_type', $qc);
+      $stmt->bindParam(':creater', $created_by);
+      $stmt->bindParam(':create_at', $created_at);
+      $stmt->execute();
+      $lastId = $conn->lastInsertId();
+      // echo "<pre>";
+      // print_r($lastId);
+      // echo "</pre>";
+      if (!empty($lastId)) {
+        echo '123';
+        // 寫入待簽程狀態 A (營業)
+        do_wws_assign1($salesman, $lastId, 'A', $conn);
+        // // 寫入待簽程狀態 G (工務)
+        do_wws_assign1($warehouseid, $lastId, 'G', $conn);
+      }
+
+
+      // create table worksite (戰情室)
+      $latitude = $value['latitude'];
+      $longitude = $value['longitude'];
+      $sql = "INSERT INTO worksite 
+      (latitude,longitude,facilitynum,facilityno,address,buildcompany,process,status,marchintotime,creater,create_at)VALUES
+      (:latitude,:longitude,'1',:facilityno,:address,:bulidcompany,'進行中','未工勘',:marchintotime,:creater,:create_at)";
+      $stmt = $conn->prepare($sql);
+      $stmt->bindParam(':latitude', $latitude);
+      $stmt->bindParam(':longitude', $longitude);
+      $stmt->bindParam(':facilityno', $facilityno);
+      $stmt->bindParam(':address', $address);
+      $stmt->bindParam(':bulidcompany', $customer);
+      $stmt->bindParam(':marchintotime', $contract_arrival_date);
+      $stmt->bindParam(':creater', $created_by);
+      $stmt->bindParam(':create_at', $created_at);
+      $stmt->execute();
+
+      // create table schedule
+      $contract_begin_date = '';
+      $contract_end_date = ''; // 一年
+      $comboNo = new CreateComboNo('em', $contract_begin_date, $contract_end_date);
+      $comboArr =  json_decode($comboNo->getComboNo(), true);
+      foreach ($comboArr as $combo) {
+        $sql_str = 'INSERT INTO schedule (contractno, facilityno, combono, repairerid, repairername, duedate, creater, create_at) VALUES (:contractno, :facilityno, :combono, :repairerid, :repairername, :duedate, :creater, :create_at)';
+        $stmt = $conn->prepare($sql_str);
+        $stmt->bindParam(':contractno', $contractno);
+        $stmt->bindParam(':facilityno', $facility_no);
+        $stmt->bindParam(':combono', $combo[0]);
+        $stmt->bindParam(':repairerid', $repairerid);
+        $stmt->bindParam(':repairername', $repairername);
+        $stmt->bindParam(':duedate', $combo[1]);
+        $stmt->bindParam(':creater', $creater);
+        $stmt->bindParam(':create_at', $create_at);
+        $result = $stmt->execute();
+      }
+    }
+
+
+
     $sql_str = "SELECT accountid, name FROM account WHERE accountid = :accountid ORDER BY create_at DESC";
     $stmt = $conn->prepare($sql_str);
     $stmt->bindParam(":accountid", $salesman);
@@ -125,7 +246,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
           $stmt->bindParam(':file_size', $file['size']);
           $stmt->bindParam(':created_at', $created_at);
           $stmt->bindParam(':created_by', $created_by);
-          // $stmt->execute();
+          $stmt->execute();
         } else {
           throw new PDOException('檔案上傳失敗:' . $msg);
         }
@@ -158,7 +279,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
     $stmt->bindParam(":created_at", $created_at);
     $stmt->bindParam(":created_by", $created_by);
     $stmt->bindParam(":qc", $qc);
-    // $stmt->execute();
+    $stmt->execute();
 
 
     $result = $conn->commit();
@@ -194,6 +315,15 @@ function T8Insert($data, $facilityno, $connT8)
     $createTime = str_replace('-', '', $createAt);
     $signing_date = intval(str_replace("-", '', $data['signing_date'])); //簽訂日期
     // echo
+    // $pay_kind = [
+    //   '1' => '簽約',
+    //   '2' => '二次款',
+    //   '3' => '貨抵工地',
+    //   '4' => '材料其他',
+    //   '5' => '試車完工', //安裝完畢
+    //   '6' => '交車' //交車
+    // ];
+
     $pay_kind = [
       '1' => '簽約',
       '2' => '二次款',
@@ -228,7 +358,6 @@ function T8Insert($data, $facilityno, $connT8)
       $stmt->bindParam(':TaxNo', $vat);
       $stmt->bindParam(':EnterpriseName', $partyA);  //企業名稱
       $stmt->bindParam(':ContactAddress', $partyAaddress);
-      // $stmt->bindParam(':EMail', $email);
       $stmt->bindParam(':CreatorId', $user_id);
       $stmt->bindParam(':CreateTime', $createTime);
       $stmt->execute();
@@ -236,8 +365,8 @@ function T8Insert($data, $facilityno, $connT8)
 
 
       $sql = "INSERT INTO comCustomer
-      (OrgId,BizPartnerTypeId,CurrId,BizPartnerId,PersonId,CreatorId,IsInUsed,InvoiceAddress,CreateTime,InvoiceId)
-      VALUES('1000','10','TWD',:BizPartnerId,:PersonId,:CreatorId,1,:InvoiceAddress,:CreateTime,'35')";
+      (OrgId,BizPartnerTypeId,ConditionId,CurrId,BizPartnerId,PersonId,CreatorId,IsInUsed,InvoiceAddress,CreateTime,InvoiceId)
+      VALUES('1000','10','TWD','0008',:BizPartnerId,:PersonId,:CreatorId,1,:InvoiceAddress,:CreateTime,'35')";
       // $sql = "INSERT INTO comCustomer
       //  (OrgId,BizPartnerTypeId,CurrId,BizPartnerId,PersonId,CreatorId,IsInUsed,InvoiceAddress,CreateTime,InvoiceId)
       //  VALUES('1000','10','TWD','$contractno','$salesman','$user_id',1,'$partyAaddress','$createTime','35')";
@@ -253,6 +382,7 @@ function T8Insert($data, $facilityno, $connT8)
       //     // 若客戶資料不為空，更新該客戶資訊。
       $sql = "UPDATE comCustomer SET 
           PersonId=:PersonId,
+          ConditionId='0008',
           InvoiceAddress=:InvoiceAddress,
           LastOperatorId=:LastOperatorId,
           LastOperateTime=:LastOperateTime
@@ -306,176 +436,208 @@ function T8Insert($data, $facilityno, $connT8)
       $stmt->bindParam(':CreatorId', $user_id);
       $stmt->execute();
     }
-
-    foreach ($elevators as $index => $elevator) {
-      $count = 1;
-      // 產品集成維護
-      $facility_no = $facilityno[$index];
-      $MaterialName = "$partyA($facility_no)";
-      $sql = "INSERT INTO comMaterial
+    $sql = "SELECT * FROM salSalesOrder WHERE BillNo = :BillNo";
+    $stmt = $connT8->prepare($sql);
+    $stmt->bindParam(':BillNo', $contractno);
+    $contractT8 = $stmt->fetch(PDO::FETCH_ASSOC);
+    if (empty($contractT8)) {
+      foreach ($elevators as $index => $elevator) {
+        $count = 1;
+        // 產品集成維護
+        $facility_no = $facilityno[$index];
+        $MaterialName = "$partyA($facility_no)";
+        $contract_arrival_a = $elevator['contract_arrival_date'];
+
+        $sql = "INSERT INTO comMaterial
         (FOrgid,MaterialId,MaterialTypeId,MaterialCategoryId,CreatorId,CreateTime,IsInUsed) 
         VALUES ('1000',:MaterialId,'10','A',:CreatorId,:CreateTime,1)";
-      $stmt = $connT8->prepare($sql);
-      $stmt->bindParam(':MaterialId', $facility_no);
-      $stmt->bindParam(':CreatorId', $user_id);
-      $stmt->bindParam(':CreateTime', $createTime);
-      $stmt->execute();
+        $stmt = $connT8->prepare($sql);
+        $stmt->bindParam(':MaterialId', $facility_no);
+        $stmt->bindParam(':CreatorId', $user_id);
+        $stmt->bindParam(':CreateTime', $createTime);
+        $stmt->execute();
 
-      $sql = "INSERT INTO comMaterialGroup
+        $sql = "INSERT INTO comMaterialGroup
         (MaterialTypeId,MaterialId,MaterialName,MaterialCategoryId,IsInUsed,UnitId,CreatorId,CreateTime) 
         VALUES ('10',:MaterialId,:MaterialName,'A',1,'SET',:CreatorId,:CreateTime)";
-      $stmt = $connT8->prepare($sql);
-      $stmt->bindParam(':MaterialId', $facility_no);
-      $stmt->bindParam(':MaterialName', $MaterialName);
-      $stmt->bindParam(':CreatorId', $user_id);
-      $stmt->bindParam(':CreateTime', $createTime);
-      $stmt->execute();
-
-      $sql = "INSERT INTO comMaterialPurchases
+        $stmt = $connT8->prepare($sql);
+        $stmt->bindParam(':MaterialId', $facility_no);
+        $stmt->bindParam(':MaterialName', $MaterialName);
+        $stmt->bindParam(':CreatorId', $user_id);
+        $stmt->bindParam(':CreateTime', $createTime);
+        $stmt->execute();
+
+        $sql = "INSERT INTO comMaterialPurchases
         (Orgid,MaterialTypeId,MaterialId,CurrId,SUnitId,TaxId,CreatorId,CreateTime) 
         VALUES ('1000','10',:MaterialId,'TWD','SET','ST005',:CreatorId,:CreateTime)";
-      $stmt = $connT8->prepare($sql);
-      $stmt->bindParam(':MaterialId', $facility_no);
-      $stmt->bindParam(':CreatorId', $user_id);
-      $stmt->bindParam(':CreateTime', $createTime);
-      $stmt->execute();
+        $stmt = $connT8->prepare($sql);
+        $stmt->bindParam(':MaterialId', $facility_no);
+        $stmt->bindParam(':CreatorId', $user_id);
+        $stmt->bindParam(':CreateTime', $createTime);
+        $stmt->execute();
 
-      $sql = "INSERT INTO plsMaterialPlanData
+        $sql = "INSERT INTO plsMaterialPlanData
       (PlanRangeId,MaterialId,FOrgId,MaterialTypeId,CreatorId,CreateTime,DefaultDemandOrg) VALUES
       (1000,:MaterialId,1000,10,:CreatorId,:CreateTime,1000)
       ";
-      $stmt = $connT8->prepare($sql);
-      $stmt->bindParam(':MaterialId', $facility_no);
-      $stmt->bindParam(':CreatorId', $user_id);
-      $stmt->bindParam(':CreateTime', $createTime);
-      $stmt->execute();
+        $stmt = $connT8->prepare($sql);
+        $stmt->bindParam(':MaterialId', $facility_no);
+        $stmt->bindParam(':CreatorId', $user_id);
+        $stmt->bindParam(':CreateTime', $createTime);
+        $stmt->execute();
 
-      $sql = "INSERT INTO comMaterialSales
+        $sql = "INSERT INTO comMaterialSales
       (OrgId,MAterialTypeId,MaterialId,CurrId,SUnitId,SupplyOrgId,CreatorId,CreateTime,IsInUsed) VALUES
       (1000,10,:MaterialId,'TWD','SET',1000,:CreatorId,:CreateTime,1)
       ";
-      $stmt = $connT8->prepare($sql);
-      $stmt->bindParam(':MaterialId', $facility_no);
-      $stmt->bindParam(':CreatorId', $user_id);
-      $stmt->bindParam(':CreateTime', $createTime);
-      $stmt->execute();
+        $stmt = $connT8->prepare($sql);
+        $stmt->bindParam(':MaterialId', $facility_no);
+        $stmt->bindParam(':CreatorId', $user_id);
+        $stmt->bindParam(':CreateTime', $createTime);
+        $stmt->execute();
+        // 階段收款資訊
+        $salOrderStagePay_row = [];
+        $equipment_total = 0;
+        $install_total = 0;
+        $equipment_total = $pay_arr['equipment_total'];
+        $install_total = $pay_arr['install_total'];
+        $count_a = 0;
+        $count_month = 1;
+        foreach ($pay_arr['elevotor_pay_detail'] as $key => $detail) {
+          if ($detail['kind'] == 3) {
+            $PlanPayDate = $contract_arrival_a;
+          } else if ($detail['kind'] > 3) {
+            $PlanPayDate = date("Y-m-d", strtotime($contract_arrival_a . '+' . $count_month . ' month'));
+            $count_month++;
+          } else {
+            $PlanPayDate = $signing_date;
+            $count_a++;
+            if ($count_a == 1) {
+              $PlanPayDate = date("Y-m-d", strtotime($signing_date . '+' . $count_a . ' month'));
+            }
+          }
+
+          $contract_arrival_date = intval(str_replace("-", '', $PlanPayDate)); //貨到工地日
+
+          $PayStage = $pay_kind[$detail['kind']];
+          $PlanPercentage = intval($detail['pay_scale']) / 100;
+          $rows = [
+            "PayStage" => "$PayStage", //收款階段
+            "PlanPercentage" => $PlanPercentage, //計劃收款比例(%)
+            "PlanPayAmt" => $detail['amount'], //計劃收款金額
+            "PlanPayDate" => $contract_arrival_date, //計劃收款日期 1.第一筆都是簽約日
+            "BillNo" => "$contractno",
+            "RowCode" => $key + 1,
+            "RowNo" => $key + 1,
+            "UnWriteOffOAmount" => $detail['amount'] //未核銷金額
+          ];
+          $salOrderStagePay_row[] = $rows;
+        }
 
-      // 階段收款資訊
-      $salOrderStagePay_row = [];
-      $equipment_total = 0;
-      $install_total = 0;
-      $equipment_total = $pay_arr['equipment_total'];
-      $install_total = $pay_arr['install_total'];
-      foreach ($pay_arr['elevotor_pay_detail'] as $key => $detail) {
-        $PayStage = $pay_kind[$detail['kind']];
-        $PlanPercentage = intval($detail['pay_scale']) / 100;
-        $rows = [
-          "PayStage" => "$PayStage", //收款階段
-          "PlanPercentage" => $PlanPercentage, //計劃收款比例(%)
-          "PlanPayAmt" => $detail['amount'], //計劃收款金額
-          "PlanPayDate" => 20240101, //計劃收款日期 1.第一筆都是簽約日
-          "BillNo" => "$contractno",
-          "RowCode" => $key + 1,
-          "RowNo" => $key + 1,
-          "UnWriteOffOAmount" => $detail['amount'] //未核銷金額
+        // 設備
+        $row1 = [
+          "TaxId" => "ST005",
+          "RequirementDate" => $signing_date, //出貨日期
+          "ConsignmentDate" => $signing_date, //發貨日期
+          "BillNo" => "$contractno", //合約號
+          "RowCode" => $count, //全部筆數排列
+          "ItemType" => 1,
+          "MaterialId" => "A40001", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
+          "SUnitId" => "SET",
+          "SQuantity" => 1, //交易數量
+          "SPrice" => $equipment_total, //交易價格
+          "CU_MaterialId" => $facility_no
+        ];
+        $count++;
+        // 安裝
+        $row2 = [
+          "TaxId" => "ST005",
+          "RequirementDate" => $signing_date, //出貨日期
+          "ConsignmentDate" => $signing_date, //發貨日期
+          "BillNo" => "$contractno", //合約號
+          "RowCode" => $count, //全部筆數排列
+          "ItemType" => 1,
+          "MaterialId" => "A40008", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
+          "SUnitId" => "SET",
+          "SQuantity" => 1, //交易數量
+          "SPrice" => $install_total, //交易價格
+          "CU_MaterialId" => $facility_no
         ];
-        $salOrderStagePay_row[] = $rows;
+        $count++;
+        // 產品(作番)
+        $row3 = [
+          "TaxId" => "ST005",
+          "RequirementDate" => $signing_date, //出貨日期
+          "ConsignmentDate" => $signing_date, //發貨日期
+          "BillNo" => "$contractno", //合約號
+          "RowCode" => $count, //全部筆數排列
+          "ItemType" => 0,
+          "MaterialId" => "$facility_no", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
+          "SUnitId" => "SET",
+          "SQuantity" => 1, //交易數量
+          "SPrice" => 0, //交易價格
+          "CU_MaterialId" => $facility_no // 歸屬作番號
+        ];
+        $count++;
+        $SubOrder_row[] = $row1;
+        $SubOrder_row[] = $row2;
+        $SubOrder_row[] = $row3;
+        $count++;
       }
-
-      // 設備
-      $row1 = [
+      $MainSalesOrder_row = [
+        "BillNo" => "$contractno", //合約單號
+        "BillDate" => $signing_date, //簽約日期 
+        "TypeId" => "SO", //
+        "FOrgId" => "1000",
+        "OrgId" => "1000",
+        "ModeId" => "M", // T汰改 M新梯
+        "BizPartnerId" => "$contractno", //客戶代碼
+        "CurrId" => "TWD",
+        "CurrOAmount" => 1,
+        "CurrLAmount" => 1,
+        "PersonId" => "$salesman", //業務人員
+        "DueToId" => "$contractno", //債務方
+        "TradeConditionId" => "",
         "TaxId" => "ST005",
-        "RequirementDate" => $signing_date, //出貨日期
-        "ConsignmentDate" => $signing_date, //發貨日期
-        "BillNo" => "$contractno", //合約號
-        "RowCode" => $count, //全部筆數排列
-        "ItemType" => 1,
-        "MaterialId" => "A40001", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
-        "SUnitId" => "SET",
-        "SQuantity" => 1, //交易數量
-        "SPrice" => $equipment_total //交易價格
+        "CreditorCompId" => "1001",
+        "CreditorOrgId" => "1000",
+        "CreatorId" => "$user_id"
+        // "CompId" => "1001",
+        // "CreditorCurrOAmount" => 1,
+        // "CreditorCurrLAmount" => 1
       ];
-      $count++;
-      // 安裝
-      $row2 = [
-        "TaxId" => "ST005",
-        "RequirementDate" => $signing_date, //出貨日期
-        "ConsignmentDate" => $signing_date, //發貨日期
-        "BillNo" => "$contractno", //合約號
-        "RowCode" => $count, //全部筆數排列
-        "ItemType" => 1,
-        "MaterialId" => "A40008", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
-        "SUnitId" => "SET",
-        "SQuantity" => 1, //交易數量
-        "SPrice" => $install_total //交易價格
+      $MainSalesOrder = [
+        "name" => "MainSalesOrder",
+        'rows' => [$MainSalesOrder_row]
       ];
-      $count++;
-      // 產品(作番)
-      $row3 = [
-        "TaxId" => "ST005",
-        "RequirementDate" => $signing_date, //出貨日期
-        "ConsignmentDate" => $signing_date, //發貨日期
-        "BillNo" => "$contractno", //合約號
-        "RowCode" => $count, //全部筆數排列
-        "ItemType" => 0,
-        "MaterialId" => "$facility_no", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
-        "SUnitId" => "SET",
-        "SQuantity" => 1, //交易數量
-        "SPrice" => 0 //交易價格
+      $SubOrder = [
+        "name" => "SubOrder",
+        "rows" => $SubOrder_row
+      ];
+      $salOrderStagePay = [
+        "name" => "salOrderStagePay",
+        "rows" => $salOrderStagePay_row
       ];
-      $count++;
-      $SubOrder_row[] = $row1;
-      $SubOrder_row[] = $row2;
-      $SubOrder_row[] = $row3;
-      $count++;
-    }
-    $MainSalesOrder_row = [
-      "BillNo" => "$contractno", //合約單號
-      "BillDate" => $signing_date, //簽約日期 
-      "TypeId" => "SO", //
-      "FOrgId" => "1000",
-      "OrgId" => "1000",
-      "ModeId" => "M", // T汰改 M新梯
-      "BizPartnerId" => "$contractno", //客戶代碼
-      "CurrId" => "TWD",
-      "CurrOAmount" => 1,
-      "CurrLAmount" => 1,
-      "PersonId" => "$user_id", //業務人員
-      "DueToId" => "$contractno", //債務方
-      "TradeConditionId" => "",
-      "TaxId" => "ST005",
-      "CreditorCompId" => "1001",
-      "CreditorOrgId" => "1000",
-      // "CompId" => "1001",
-      // "CreditorCurrOAmount" => 1,
-      // "CreditorCurrLAmount" => 1
-    ];
-    $MainSalesOrder = [
-      "name" => "MainSalesOrder",
-      'rows' => [$MainSalesOrder_row]
-    ];
-    $SubOrder = [
-      "name" => "SubOrder",
-      "rows" => $SubOrder_row
-    ];
-    $salOrderStagePay = [
-      "name" => "salOrderStagePay",
-      "rows" => [$salOrderStagePay_row]
-    ];
 
-    $API_body = [];
-    $API_body[] = $MainSalesOrder;
-    $API_body[] = $SubOrder;
-    $API_body[] = $salOrderStagePay;
-    echo "<pre>";
-    print_r(json_encode($API_body, JSON_UNESCAPED_UNICODE));
-    echo "</pre>";
-    $api_url = "https://erp.masada.com.tw:780/twWebAPI/V1/SALSALESORDER/PostERPData";
-
-    $result = T8salIncomeApply($API_body, $api_url);
-    echo "<pre>";
-    print_r($result);
-    echo "</pre>";
+      $API_body = [];
+      $API_body[] = $MainSalesOrder;
+      $API_body[] = $SubOrder;
+      $API_body[] = $salOrderStagePay;
+      echo "<pre>";
+      print_r(json_encode($API_body, JSON_UNESCAPED_UNICODE));
+      echo "</pre>";
+      $api_url = "https://erp.masada.com.tw:780/twWebAPI/V1/SALSALESORDER/PostERPData";
+
+      $result = T8salIncomeApply($API_body, $api_url);
+      // echo "<pre>";
+      // print_r($result);
+      // echo "</pre>";
+      if ($result['Status'] == 'Fails' || $result['Status'] == 'Error') {
+        echo $result['ErrorMsg'];
+      }
+    } else {
+      echo '資料已新增過，請洽資訊人員';
+    }
     $connT8->commit();
   } catch (PDOException $e) {
     $connT8->rollback();
@@ -487,153 +649,168 @@ function T8Insert($data, $facilityno, $connT8)
 
 function BounsCount($data, $conn, $facilityno)
 {
-  // echo '<pre>';
-  // print_r($facilityno);
-  // echo '</pre>';
-  // exit;
-  require_once("../../bonus/elevator_new/elevator_new_deal_bonus.php");
-  $dailyNecessities = [
-    'MAE100' => 'passenger', //小機房
-    'MAM200' => 'passenger', //無機房
-    'MAH100' => 'dumbwaiter', //小電梯
-    'MAQ100' => 'positive_drive', //強趨梯
-    'MAF100' => 'cargo', //貨梯
-    'MAP100' => 'flatbase', // 平台踢
-  ];
-  $contractType = [
-    '1' => 'strategy_customer',
-    '2' => 'general_customer'
-  ];
-  $signing_date = $data['signing_date'];
-  $bonus_v1_0_date = '2024-01-02';
-  $bonus_v2_0_date = '2024-01-03';
-  $contract_type = $data['contract_type'];
-  $total = $data['price_total'];
-  $type = $contractType[$contract_type]; //戰略客戶 or 一般客戶
-  // $elevator_knockdown_price = $data['price_total']; //受價總額
-  $elevators = json_decode($data['elevators_detail_arr'], true);
-  $contract_no = $data['contractno'];
-  $salesman = $data['salesman'];
-  $manager = $data['manager'];
-  $contract_kind = 1;
-  $create_id = $data['user_id'];
-  $create_at = date("Y-m-d H:i:s");
-  $status = 1;
-
-
-
-
-
-  $result_bonus = [];
-  $result_bonus_arr = [];
-  if ($signing_date <= $bonus_v1_0_date) {
-    $ver = '1.0';
-    foreach ($elevators as $key => $elevator) {
-
-      $elevator_knockdown_price = $elevator['elevator_price']; // 單台電梯售價
-      $elevator_list_price = $elevator['option_other_price'] + $elevator['option_price'] + $elevator['elevator_price']; //牌價
-      $result_bonus = elevator_new_deal_bonus_v1_0($ver, $type, $elevator_knockdown_price, $salesman, $manager);
-      $facility_no = $facilityno[$key];
-      $bonus_json = [
-        'contract_type' => $type,
-        'total' => $elevator_list_price,
-        'fee_per_st' => $elevator_knockdown_price
-      ];
+  try {
+    require_once("../../bonus/elevator_new/elevator_new_deal_bonus.php");
+    $dailyNecessities = [
+      'MAE100' => 'passenger', //小機房
+      'MAM200' => 'passenger', //無機房
+      'MAH100' => 'dumbwaiter', //小電梯
+      'MAQ100' => 'positive_drive', //強趨梯
+      'MAF100' => 'cargo', //貨梯
+      'MAP100' => 'flatbase', // 平台踢
+    ];
+    $contractType = [
+      '1' => 'strategy_customer',
+      '2' => 'general_customer'
+    ];
+    $signing_date = $data['signing_date'];
+    $bonus_v1_0_date = '2024-01-02';
+    $bonus_v2_0_date = '2024-01-03';
+    $contract_type = $data['contract_type'];
+    $total = $data['price_total'];
+    $type = $contractType[$contract_type]; //戰略客戶 or 一般客戶
+    // $elevator_knockdown_price = $data['price_total']; //受價總額
+    $elevators = json_decode($data['elevators_detail_arr'], true);
+    $contract_no = $data['contractno'];
+    $salesman = $data['salesman'];
+    $manager = $data['manager'];
+    $contract_kind = 1;
+    $create_id = $data['user_id'];
+    $create_at = date("Y-m-d H:i:s");
+    $status = 1;
+
+
+
+
+
+    $result_bonus = [];
+    $result_bonus_arr = [];
+    if ($signing_date <= $bonus_v1_0_date) {
+      $ver = '1.0';
+      foreach ($elevators as $key => $elevator) {
+
+        $elevator_knockdown_price = $elevator['elevator_price']; // 單台電梯售價
+        $elevator_list_price = $elevator['option_other_price'] + $elevator['option_price'] + $elevator['elevator_price']; //牌價
+        $result_bonus = elevator_new_deal_bonus_v1_0($ver, $type, $elevator_knockdown_price, $salesman, $manager);
+        $facility_no = $facilityno[$key];
+        $bonus_json = [
+          'contract_type' => $type,
+          'total' => $elevator_list_price,
+          'fee_per_st' => $elevator_knockdown_price
+        ];
 
-      if (!empty($result_bonus)) {
-        if ($result_bonus['result_status'] != "error") {
-          foreach ($result_bonus['bonus_array'] as $i => $result) {
-            $bonus_type = explode('-', $result['bonus_type']);
-            $pay_man_type = $bonus_type[0]; //發放類別
-            $bonus_kind = $bonus_type[1];
-            $amount = $result['bonus_amount']; //獎金水庫
-            $bonus_receiver = $result['bonus_receiver']; //發放人員
-            $bonus_json['payment_schedul_due'] = $result['payment_schedul_due'];
-            $bonus_json['payment_schedul_regulation'] = $result['payment_schedul_regulation'];
-            $bonus_json['bonus_kind'] = $bonus_kind;
-            $a = json_encode($bonus_json, JSON_UNESCAPED_UNICODE);
-            $sql = "INSERT INTO bonus 
+        if (!empty($result_bonus)) {
+          if ($result_bonus['result_status'] != "error") {
+            foreach ($result_bonus['bonus_array'] as $i => $result) {
+              $bonus_type = explode('-', $result['bonus_type']);
+              $pay_man_type = $bonus_type[0]; //發放類別
+              $bonus_kind = $bonus_type[1];
+              $amount = $result['bonus_amount']; //獎金水庫
+              $bonus_receiver = $result['bonus_receiver']; //發放人員
+              $bonus_json['payment_schedul_due'] = $result['payment_schedul_due'];
+              $bonus_json['payment_schedul_regulation'] = $result['payment_schedul_regulation'];
+              $bonus_json['bonus_kind'] = $bonus_kind;
+              $a = json_encode($bonus_json, JSON_UNESCAPED_UNICODE);
+              $sql = "INSERT INTO bonus 
                 (bonus_type,bonus_verson,contract_no,contract_type,facility_no,amount,receiver,status,bonus_json,create_id,create_at) VALUES
                 ($pay_man_type,'$ver','$contract_no',$contract_kind,'$facility_no',$amount,'$bonus_receiver',$status,'$a','$create_id','$create_at')
                 ";
-            $stmt = $conn->prepare($sql);
-            $stmt->execute();
+              $stmt = $conn->prepare($sql);
+              $stmt->execute();
+            }
+            $request = [
+              "status" => "1",
+              "data" => "Success"
+            ];
+            return $request;
           }
           $request = [
-            "status" => "1",
-            "data" => "Success"
+            "status" => "2",
+            "data" => "create_bonus_error"
           ];
           return $request;
         }
-        $request = [
-          "status" => "2",
-          "data" => "create_bonus_error"
-        ];
-        return $request;
       }
-    }
-  } else if ($signing_date >= $bonus_v2_0_date) {
-    $ver = '2.0';
-    foreach ($elevators as $key => $elevator) {
-      $elevator_type = $dailyNecessities[$elevator['spec']];
-      $elevator_list_price = $elevator['option_other_price'] + $elevator['option_price'] + $elevator['elevator_price'];
-      $elevator_knockdown_price = $elevator['elevator_price'];
-      $commission_fee = $elevator['commission_fee'];
-      $result_bonus = elevator_new_deal_bonus_v2_0(
-        $ver,
-        $type,
-        $elevator_type,
-        $elevator_list_price,
-        $elevator_knockdown_price,
-        $salesman,
-        $manager
-      );
-      // echo '<pre>';
-      // print_r($result_bonus);
-      // echo '</pre>';
-      $facility_no = $facilityno[$key];
-      $bonus_json = [
-        'contract_type' => $type,
-        'total' => $elevator_list_price,
-        'fee_per_st' => $elevator_knockdown_price
-      ];
-      if (!empty($result_bonus)) {
-        if ($result_bonus['result_status'] != "error") {
-          foreach ($result_bonus['bonus_array'] as $i => $result) {
-            $bonus_type = explode('-', $result['bonus_type']);
-            $pay_man_type = $bonus_type[0]; //發放類別
-            $bonus_kind = $bonus_type[1];
-            $amount = $result['bonus_amount']; //獎金水庫
-            $bonus_receiver = $result['bonus_receiver']; //發放人員
-            $bonus_json['payment_schedul_due'] = $result['payment_schedul_due'];
-            $bonus_json['payment_schedul_regulation'] = $result['payment_schedul_regulation'];
-            $bonus_json['bonus_kind'] = $bonus_kind;
-            $a = json_encode($bonus_json, JSON_UNESCAPED_UNICODE);
-            $sql = "INSERT INTO bonus 
+    } else if ($signing_date >= $bonus_v2_0_date) {
+      $ver = '2.0';
+      foreach ($elevators as $key => $elevator) {
+        $option_other_price = !empty($elevator['option_other_price']) ? intval($elevator['option_other_price']) : 0;
+        $elevator_type = $dailyNecessities[$elevator['spec']];
+        $elevator_list_price = $option_other_price + $elevator['option_price'] + $elevator['elevator_price'];
+        $elevator_knockdown_price = $elevator['elevator_price'];
+        $commission_fee = $elevator['commission_fee'];
+        $result_bonus = elevator_new_deal_bonus_v2_0(
+          $ver,
+          $type,
+          $elevator_type,
+          $elevator_list_price,
+          $elevator_knockdown_price,
+          $salesman,
+          $manager
+        );
+        // echo '<pre>';
+        // print_r($result_bonus);
+        // echo '</pre>';
+        $facility_no = $facilityno[$key];
+        $bonus_json = [
+          'contract_type' => $type,
+          'total' => $elevator_list_price,
+          'fee_per_st' => $elevator_knockdown_price
+        ];
+        if (!empty($result_bonus)) {
+          if ($result_bonus['result_status'] != "error") {
+            foreach ($result_bonus['bonus_array'] as $i => $result) {
+              $bonus_type = explode('-', $result['bonus_type']);
+              $pay_man_type = $bonus_type[0]; //發放類別
+              $bonus_kind = $bonus_type[1];
+              $amount = $result['bonus_amount']; //獎金水庫
+              $bonus_receiver = $result['bonus_receiver']; //發放人員
+              $bonus_json['payment_schedul_due'] = $result['payment_schedul_due'];
+              $bonus_json['payment_schedul_regulation'] = $result['payment_schedul_regulation'];
+              $bonus_json['bonus_kind'] = $bonus_kind;
+              $a = json_encode($bonus_json, JSON_UNESCAPED_UNICODE);
+              $sql = "INSERT INTO bonus 
                 (bonus_type,bonus_verson,contract_no,contract_type,facility_no,amount,receiver,status,bonus_json,create_id,create_at) VALUES
                 ($pay_man_type,'$ver','$contract_no',$contract_kind,'$facility_no',$amount,'$bonus_receiver',$status,'$a','$create_id','$create_at')
                 ";
-            $stmt = $conn->prepare($sql);
-            $stmt->execute();
+              $stmt = $conn->prepare($sql);
+              $stmt->execute();
+            }
           }
+          $request = [
+            "status" => "1",
+            "data" => "Success"
+          ];
+        } else {
+          $request = [
+            "status" => "2",
+            "data" => "create_bonus_error"
+          ];
         }
-        $request = [
-          "status" => "1",
-          "data" => "Success"
-        ];
-      } else {
-        $request = [
-          "status" => "2",
-          "data" => "create_bonus_error"
-        ];
       }
     }
-  }
-  return $request;
-
-  try {
+    return $request;
   } catch (PDOException $e) {
     header("HTTP/1.1 500 Internal Server Error");
     die('Error!:' . $e->getMessage());
   }
 }
+
+function do_wws_assign1($user_id, $form_id, $flow_code, $conn)
+{
+  $tds = date("Y-m-d H:i:s");
+
+  $sql = "select appwms.nextval('form_key') form_key";
+  $stmt = $conn->prepare($sql);
+  $stmt->execute();
+  $result = $stmt->fetch(PDO::FETCH_ASSOC);
+  $form_key = $result['form_key'];
+
+  $sql = "INSERT INTO flow (system_id, flow_id, form_key, form_id,flow_code) VALUES ('wws', 'wws01', '$form_key', '$form_id','$flow_code');";
+  $stmt = $conn->prepare($sql);
+  $stmt->execute();
+
+  $sql = "INSERT INTO subflow (form_key, seq, current_assigner, create_date) VALUES ('$form_key', '1', '$user_id', '$tds');";
+  $stmt = $conn->prepare($sql);
+  $stmt->execute();
+}
diff --git a/wms/contract/api/test copy.json b/wms/contract/api/test copy.json
index 5df03461..b9dd2f3f 100644
--- a/wms/contract/api/test copy.json	
+++ b/wms/contract/api/test copy.json	
@@ -3,22 +3,23 @@
         "name": "MainSalesOrder",
         "rows": [
             {
-                "BillNo": "M24020076",
-                "BillDate": 20240305,
+                "BillNo": "M23110121",
+                "BillDate": 20240313,
                 "TypeId": "SO",
                 "FOrgId": "1000",
                 "OrgId": "1000",
                 "ModeId": "M",
-                "BizPartnerId": "M24020076",
+                "BizPartnerId": "M23110121",
                 "CurrId": "TWD",
                 "CurrOAmount": 1,
                 "CurrLAmount": 1,
-                "PersonId": "M0225",
-                "DueToId": "M24020076",
+                "PersonId": "M0042",
+                "DueToId": "M23110121",
                 "TradeConditionId": "",
                 "TaxId": "ST005",
                 "CreditorCompId": "1001",
-                "CreditorOrgId": "1000"
+                "CreditorOrgId": "1000",
+                "CreatorId": "M0225"
             }
         ]
     },
@@ -27,87 +28,371 @@
         "rows": [
             {
                 "TaxId": "ST005",
-                "RequirementDate": 20240305,
-                "ConsignmentDate": 20240305,
-                "BillNo": "M24020076",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
                 "RowCode": 1,
                 "ItemType": 1,
                 "MaterialId": "A40001",
                 "SUnitId": "SET",
                 "SQuantity": 1,
-                "SPrice": 910000
+                "SPrice": 3904000,
+                "CU_MaterialId": "4MH00836"
             },
             {
                 "TaxId": "ST005",
-                "RequirementDate": 20240305,
-                "ConsignmentDate": 20240305,
-                "BillNo": "M24020076",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
                 "RowCode": 2,
                 "ItemType": 1,
                 "MaterialId": "A40008",
                 "SUnitId": "SET",
                 "SQuantity": 1,
-                "SPrice": 390000
+                "SPrice": 976000,
+                "CU_MaterialId": "4MH00836"
             },
             {
                 "TaxId": "ST005",
-                "RequirementDate": 20240305,
-                "ConsignmentDate": 20240305,
-                "BillNo": "M24020076",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
                 "RowCode": 3,
                 "ItemType": 0,
-                "MaterialId": "4MW00705",
+                "MaterialId": "4MH00836",
                 "SUnitId": "SET",
                 "SQuantity": 1,
-                "SPrice": 0
+                "SPrice": 0,
+                "CU_MaterialId": "4MH00836"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 1,
+                "ItemType": 1,
+                "MaterialId": "A40001",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 3904000,
+                "CU_MaterialId": "4MH00837"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 2,
+                "ItemType": 1,
+                "MaterialId": "A40008",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 976000,
+                "CU_MaterialId": "4MH00837"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 3,
+                "ItemType": 0,
+                "MaterialId": "4MH00837",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 0,
+                "CU_MaterialId": "4MH00837"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 1,
+                "ItemType": 1,
+                "MaterialId": "A40001",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 3904000,
+                "CU_MaterialId": "4MH00838"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 2,
+                "ItemType": 1,
+                "MaterialId": "A40008",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 976000,
+                "CU_MaterialId": "4MH00838"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 3,
+                "ItemType": 0,
+                "MaterialId": "4MH00838",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 0,
+                "CU_MaterialId": "4MH00838"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 1,
+                "ItemType": 1,
+                "MaterialId": "A40001",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 3904000,
+                "CU_MaterialId": "4MH00839"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 2,
+                "ItemType": 1,
+                "MaterialId": "A40008",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 976000,
+                "CU_MaterialId": "4MH00839"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 3,
+                "ItemType": 0,
+                "MaterialId": "4MH00839",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 0,
+                "CU_MaterialId": "4MH00839"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 1,
+                "ItemType": 1,
+                "MaterialId": "A40001",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 3904000,
+                "CU_MaterialId": "4MH00840"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 2,
+                "ItemType": 1,
+                "MaterialId": "A40008",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 976000,
+                "CU_MaterialId": "4MH00840"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 3,
+                "ItemType": 0,
+                "MaterialId": "4MH00840",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 0,
+                "CU_MaterialId": "4MH00840"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 1,
+                "ItemType": 1,
+                "MaterialId": "A40001",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 3904000,
+                "CU_MaterialId": "4MH00841"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 2,
+                "ItemType": 1,
+                "MaterialId": "A40008",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 976000,
+                "CU_MaterialId": "4MH00841"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 3,
+                "ItemType": 0,
+                "MaterialId": "4MH00841",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 0,
+                "CU_MaterialId": "4MH00841"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 1,
+                "ItemType": 1,
+                "MaterialId": "A40001",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 3904000,
+                "CU_MaterialId": "4MH00842"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 2,
+                "ItemType": 1,
+                "MaterialId": "A40008",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 976000,
+                "CU_MaterialId": "4MH00842"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 3,
+                "ItemType": 0,
+                "MaterialId": "4MH00842",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 0,
+                "CU_MaterialId": "4MH00842"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 1,
+                "ItemType": 1,
+                "MaterialId": "A40001",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 3904000,
+                "CU_MaterialId": "4MH00843"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 2,
+                "ItemType": 1,
+                "MaterialId": "A40008",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 976000,
+                "CU_MaterialId": "4MH00843"
+            },
+            {
+                "TaxId": "ST005",
+                "RequirementDate": 20240313,
+                "ConsignmentDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 3,
+                "ItemType": 0,
+                "MaterialId": "4MH00843",
+                "SUnitId": "SET",
+                "SQuantity": 1,
+                "SPrice": 0,
+                "CU_MaterialId": "4MH00843"
             }
         ]
     },
     {
         "name": "salOrderStagePay",
         "rows": [
-            [
-                {
-                    "PayStage": "簽約",
-                    "PlanPercentage": 0.2,
-                    "PlanPayAmt": 260000,
-                    "PlanPayDate": 20240101,
-                    "BillNo": "M24020076",
-                    "RowCode": 0,
-                    "RowNo": 0,
-                    "UnWriteOffOAmount": 260000
-                },
-                {
-                    "PayStage": "貨抵工地",
-                    "PlanPercentage": 0.5,
-                    "PlanPayAmt": 650000,
-                    "PlanPayDate": 20240101,
-                    "BillNo": "M24020076",
-                    "RowCode": 1,
-                    "RowNo": 1,
-                    "UnWriteOffOAmount": 650000
-                },
-                {
-                    "PayStage": "試車完工",
-                    "PlanPercentage": 0.2,
-                    "PlanPayAmt": 260000,
-                    "PlanPayDate": 20240101,
-                    "BillNo": "M24020076",
-                    "RowCode": 2,
-                    "RowNo": 2,
-                    "UnWriteOffOAmount": 260000
-                },
-                {
-                    "PayStage": "交車",
-                    "PlanPercentage": 0.1,
-                    "PlanPayAmt": 130000,
-                    "PlanPayDate": 20240101,
-                    "BillNo": "M24020076",
-                    "RowCode": 3,
-                    "RowNo": 3,
-                    "UnWriteOffOAmount": 130000
-                }
-            ]
+            {
+                "PayStage": "簽約",
+                "PlanPercentage": 0.2,
+                "PlanPayAmt": 976000,
+                "PlanPayDate": 20240413,
+                "BillNo": "M23110121",
+                "RowCode": 1,
+                "RowNo": 1,
+                "UnWriteOffOAmount": 976000
+            },
+            {
+                "PayStage": "二次款",
+                "PlanPercentage": 0.4,
+                "PlanPayAmt": 1952000,
+                "PlanPayDate": 20240313,
+                "BillNo": "M23110121",
+                "RowCode": 2,
+                "RowNo": 2,
+                "UnWriteOffOAmount": 1952000
+            },
+            {
+                "PayStage": "貨抵工地",
+                "PlanPercentage": 0.2,
+                "PlanPayAmt": 976000,
+                "PlanPayDate": 20241104,
+                "BillNo": "M23110121",
+                "RowCode": 3,
+                "RowNo": 3,
+                "UnWriteOffOAmount": 976000
+            },
+            {
+                "PayStage": "試車完工",
+                "PlanPercentage": 0.1,
+                "PlanPayAmt": 488000,
+                "PlanPayDate": 20241204,
+                "BillNo": "M23110121",
+                "RowCode": 4,
+                "RowNo": 4,
+                "UnWriteOffOAmount": 488000
+            },
+            {
+                "PayStage": "交車",
+                "PlanPercentage": 0.1,
+                "PlanPayAmt": 488000,
+                "PlanPayDate": 20250104,
+                "BillNo": "M23110121",
+                "RowCode": 5,
+                "RowNo": 5,
+                "UnWriteOffOAmount": 488000
+            }
         ]
     }
 ]
\ No newline at end of file
diff --git a/wms/contract/api/test.json b/wms/contract/api/test.json
index c0585164..da130a89 100644
--- a/wms/contract/api/test.json
+++ b/wms/contract/api/test.json
@@ -27,7 +27,7 @@
         ]
     },
     {
-        //salSalesOrderDetail
+        // salSalesOrderDetail
         "name": "SubOrder",
         "rows": [
             {
diff --git a/wms/contract/api/testT8API.php b/wms/contract/api/testT8API.php
index 89077ffc..e9d2f04f 100644
--- a/wms/contract/api/testT8API.php
+++ b/wms/contract/api/testT8API.php
@@ -1,9 +1,5 @@
 <?php
-// [
-//     {
-//         //salSalesOrder
-//         "name": "MainSalesOrder",
-//         "rows": [
+
 //             {
 //                 "BillNo": "Z001", //合約單號
 //                 "BillDate": 20210420, //簽約日期 
@@ -70,27 +66,55 @@ require_once("../../T8_Authorization_from_bpm.php");
 $api_url = "https://erp.masada.com.tw:780/twWebAPI/V1/SALSALESORDER/PostERPData";
 
 $validation = get_Auth();
+// $header = [
+//     "CHI_Authorization :" . $validation,
+//     "GroupId:TEST"
+// ];
+// $url = "https://erp.masada.com.tw:780/twWebAPI/V1/GLFEEWRITEOFF/DeleteERPData?pkValue=M24020032";
+
+// $ch = curl_init();
+// curl_setopt($ch, CURLOPT_URL, $url);
+// curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+// curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+// $response = curl_exec($ch);
+// if ($response === false) {
+//     echo 'Curl error: ' . curl_error($ch);
+// } else {
+//     $result = json_decode($response, true);
+//     // 若 API 傳入失敗。
+//     if ($result['Status'] == 'Erroe') {
+//         echo 'API傳入失敗，' . $result['ErrorMsg'];
+//         print_r($result);
+//     } else {
+//         // print_r($result);
+//         print_r($result);
+//     }
+//     print_r($result);
+// }
 
+// curl_close($ch);
+// exit();
+$contract_no = "M24020003";
+// $contract_no = "M24010109";
 $MainSalesOrder_row = [
-    "BillNo" => "M24020076", //合約單號
+    "BillNo" => "$contract_no", //合約單號
     "BillDate" => 20210420, //簽約日期 
     "TypeId" => "SO", //
     "FOrgId" => "1000",
     "OrgId" => "1000",
     "ModeId" => "M", // T汰改 M新梯
-    "BizPartnerId" => "M24020076", //客戶代碼
+    "BizPartnerId" => "$contract_no", //客戶代碼
     "CurrId" => "TWD",
     "CurrOAmount" => 1,
     "CurrLAmount" => 1,
-    "PersonId" => "M0225", //業務人員
-    "DueToId" => "M24020076", //債務方
+    "PersonId" => "M0177", //業務人員
+    "DueToId" => "$contract_no", //債務方
     "TradeConditionId" => "",
     "TaxId" => "ST005",
     "CreditorCompId" => "1001",
     "CreditorOrgId" => "1000",
-    // "CompId" => "1001",
-    // "CreditorCurrOAmount" => 1,
-    // "CreditorCurrLAmount" => 1
+    "CreatorId" => "M0225"
+
 ];
 // //salSalesOrderDetail
 // $SubOrder_row = [];
@@ -104,13 +128,13 @@ for ($i = 0; $i < 3; $i++) {
             "ConsignmentDate" => 20210420, //發貨日期
             // "DispatchCompId" => "1001",
             // "DispatchOrgId" => "1000",
-            "BillNo" => "M24020076", //合約號
+            "BillNo" => "$contract_no", //合約號
             "RowCode" => $i, //全部筆數排列
             "ItemType" => 1,
             "MaterialId" => "A40001", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
             "SUnitId" => "SET",
             "SQuantity" => 1, //交易數量
-            "SPrice" => 50000 //交易價格
+            "SPrice" => 100000 //交易價格
         ];
     }
     if ($i == 1) {
@@ -122,25 +146,21 @@ for ($i = 0; $i < 3; $i++) {
             "ConsignmentDate" => 20210420, //發貨日期
             // "DispatchCompId" => "1001",
             // "DispatchOrgId" => "1000",
-            "BillNo" => "M24020076", //合約號
+            "BillNo" => "$contract_no", //合約號
             "RowCode" => $i, //全部筆數排列
             "ItemType" => 1,
             "MaterialId" => "A40008", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
             "SUnitId" => "SET",
             "SQuantity" => 1, //交易數量
-            "SPrice" => 700000 //交易價格
+            "SPrice" => 650000 //交易價格
         ];
     }
     if ($i == 2) {
         $row = [
-            // "SupplyCompId" => "1001",
-            // "SupplyOrgId" => "1000",
             "TaxId" => "ST005",
             "RequirementDate" => 20210420, //出貨日期
             "ConsignmentDate" => 20210420, //發貨日期
-            // "DispatchCompId" => "1001",
-            // "DispatchOrgId" => "1000",
-            "BillNo" => "M24020076", //合約號
+            "BillNo" => "$contract_no", //合約號
             "RowCode" => $i, //全部筆數排列
             "ItemType" => 0,
             "MaterialId" => "4MH00669", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
@@ -152,65 +172,14 @@ for ($i = 0; $i < 3; $i++) {
     $SubOrder_row[] = $row;
 }
 
-// // $salOrderStagePay_row = [];
-// // // for ($i = 0; $i < 2; $i) {
-// // //     if ($i == 0) {
-// // //         $row = [
-// // //             "BillNo" => "M24010201",
-// // //             "RowCode" => 1,
-// // //             "RowNo" => 1,
-// // //             "PayStage" => "簽約", //收款階段
-// // //             "PlanPercentage" => 0.10, //計劃收款比例(%)
-// // //             "PlanPayAmt" => 100000, //計劃收款金額
-// // //             "PlanPayDate" => 20240101, //計劃收款日期 1.第一筆都是簽約日
-// // //             "UnWriteOffOAmount" => 100000 //未核銷金額
-// // //         ];
-// // //     }
-// // //     if ($i == 1) {
-// // //         $row = [
-// // //             "BillNo" => "M24010201",
-// // //             "RowCode" => 1,
-// // //             "RowNo" => 1,
-// // //             "PayStage" => "貨抵工地", //收款階段
-// // //             "PlanPercentage" => 0.40, //計劃收款比例(%)
-// // //             "PlanPayAmt" => 100000, //計劃收款金額
-// // //             "PlanPayDate" => 20240101, //計劃收款日期 1.第一筆都是簽約日
-// // //             "UnWriteOffOAmount" => 100000 //未核銷金額
-// // //         ];
-// // //     }
-// // //     if ($i == 2) {
-// // //         $row = [
-// // //             "BillNo" => "M24010201",
-// // //             "RowCode" => 1,
-// // //             "RowNo" => 1,
-// // //             "PayStage" => "試車完工", //收款階段
-// // //             "PlanPercentage" => 0.30, //計劃收款比例(%)
-// // //             "PlanPayAmt" => 100000, //計劃收款金額
-// // //             "PlanPayDate" => 20240101, //計劃收款日期 1.第一筆都是簽約日
-// // //             "UnWriteOffOAmount" => 100000 //未核銷金額
-// // //         ];
-// // //     }
-// // //     if ($i == 3) {
-// // //         $row = [
-// // //             "BillNo" => "M24010201",
-// // //             "RowCode" => 1,
-// // //             "RowNo" => 1,
-// // //             "PayStage" => "交車", //收款階段
-// // //             "PlanPercentage" => 0.20, //計劃收款比例(%)
-// // //             "PlanPayAmt" => 100000, //計劃收款金額
-// // //             "PlanPayDate" => 20240101, //計劃收款日期 1.第一筆都是簽約日
-// // //             "UnWriteOffOAmount" => 100000 //未核銷金額
-// // //         ];
-// // //     }
-// // //     $salOrderStagePay_row[] = $row;
-// // // }
+
 $salOrderStagePay_row = [];
 $roww = [
     "PayStage" => "簽約", //收款階段
     "PlanPercentage" => 0.5, //計劃收款比例(%)
     "PlanPayAmt" => 375000, //計劃收款金額
     "PlanPayDate" => 20240101, //計劃收款日期 1.第一筆都是簽約日
-    "BillNo" => "M24020076",
+    "BillNo" => "$contract_no",
     "RowCode" => 1,
     "RowNo" => 1,
     "UnWriteOffOAmount" => 375000 //未核銷金額
@@ -220,12 +189,14 @@ $roww2 = [
     "PlanPercentage" => 0.5,
     "PlanPayAmt" => 375000,
     "PlanPayDate" => 20240101,
-    "BillNo" => "M24020076",
+    "BillNo" => "$contract_no",
     "RowCode" => 2,
     "RowNo" => 2,
     "UnWriteOffOAmount" => 375000
 ];
 $salOrderStagePay_row[] = $roww;
+$salOrderStagePay_row[] = $roww2;
+
 
 $MainSalesOrder = [
     "name" => "MainSalesOrder",
@@ -250,9 +221,9 @@ $APIbody[] = $salOrderStagePay;
 // print_r($data);
 // echo "</pre>";
 
-// echo "<pre>";
-// print_r(json_encode($APIbody, JSON_UNESCAPED_UNICODE));
-// echo "</pre>";
+echo "<pre>";
+print_r(json_encode($APIbody, JSON_UNESCAPED_UNICODE));
+echo "</pre>";
 // exit();
 
 $header = [
diff --git a/wms/contract/contract-newelevator-input.php b/wms/contract/contract-newelevator-input.php
index 75992ffc..70d83b32 100644
--- a/wms/contract/contract-newelevator-input.php
+++ b/wms/contract/contract-newelevator-input.php
@@ -134,7 +134,17 @@ $persons = array_map(function ($person) {
                             </td>
                         </tr>
                         <tr>
-
+                            <td style="vertical-align: middle">區域</td>
+                            <td>
+                                <select id="area_no" name="area_no" x-model="data.area_no">
+                                    <option value="">請選擇</option>
+                                    <option value="N">北區</option>
+                                    <option value="Y">宜蘭</option>
+                                    <option value="T">桃園</option>
+                                    <option value="C">中區</option>
+                                    <option value="K">南區</option>
+                                </select>
+                            </td>
                         </tr>
                     </tbody>
                 </template>
@@ -187,7 +197,7 @@ $persons = array_map(function ($person) {
                             <tr>
                                 <td style="vertical-align: middle">QC和官檢</td>
                                 <td>
-                                    <select class="" id="qc" x-model="data.qc">
+                                    <select class="" id="qc" x-model="elevator.qc">
                                         <option value="">請選擇QC或官檢</option>
                                         <option value="Q">只需QC</option>
                                         <option value="O">只需官檢</option>
diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js
index 104ab4f7..59d63b01 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -829,6 +829,8 @@ const contractNewInput = () => {
             elevators_detail_arr: [], // 電梯台數 Array
             pay_arr: [], //電梯付款種類
             nums: 0, //電梯數量
+            area_no: 'T',
+            contract_arrival_date: ''
         },
         step: 1,
         isLoading: false,
@@ -868,14 +870,15 @@ const contractNewInput = () => {
                     this.data.elevators_detail_arr[i].longitude = '';   // 緯度
                     this.data.elevators_detail_arr[i].manage = '';      // 工地負責人
                     this.data.elevators_detail_arr[i].qc = '';          // QC和官檢
-                    this.data.elevators_detail_arr[i].contract_arrival_date = ''; //合約交期(到工地)
+                    this.data.elevators_detail_arr[i].contract_arrival_date = this.data.contract_arrival_date; //合約交期(到工地)
+                    // this.data.elevators_detail_arr[i].area_no = ''; //區域
                 }
                 this.step = 3;
                 this.isLoading = false;
             } else if (this.step == 3) {
                 console.log(this.data.elevators_detail_arr);
-                this.step = 4;
-                this.isLoading = false;
+                // this.step = 4;
+                // this.isLoading = false;
             }
         },
         getContractDate() {
@@ -889,7 +892,7 @@ const contractNewInput = () => {
                     return
                 }
                 if (!this.customize) {
-                    console.log(res.data);
+                    console.log(res.data.customer);
                     this.data.customer = res.data.company
                     this.data.manager = res.data.manager
                     this.data.vat = res.data.uscc
@@ -904,6 +907,7 @@ const contractNewInput = () => {
                     this.data.elevators_detail_arr = res.data.elevators_detail_arr;
                     this.data.nums = res.data.nums;
                     this.data.pay_arr = res.data.pay_arr;
+                    this.data.contract_arrival_date = res.data.facilitok_date;
                 }
                 this.step = 2
                 this.isLoading = false
@@ -919,6 +923,7 @@ const contractNewInput = () => {
             form.append('customer', this.data.customer);
             form.append('manager', this.data.manager);
             form.append('vat', this.data.vat);
+            form.append('area_no', this.data.area_no);
             form.append('case_name', this.data.case_name);
             form.append('linkman', this.data.linkman);
             form.append('lm_tel', this.data.lm_tel);

From af80c76a1cd0300f3c4fd4be3f8f656866168e0b Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Tue, 5 Mar 2024 11:23:38 +0800
Subject: [PATCH 08/16] =?UTF-8?q?=E6=96=B0=E6=A2=AF=E5=90=88=E7=B4=84?=
 =?UTF-8?q?=E6=9B=B8=E7=94=B3=E8=AB=8B:=E6=96=B0=E5=A2=9E=E5=BE=85?=
 =?UTF-8?q?=E7=B0=BD=E9=80=9A=E7=9F=A5=E3=80=81=E5=AF=A9=E6=A0=B8=E4=BA=BA?=
 =?UTF-8?q?=E6=94=B9=E7=82=BA=E6=A5=AD=E5=8B=99=E9=83=A8(M0175)=E4=B8=80?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/cont/css/pricereview.css                  | 325 +++++++++++++++++
 wms/cont/css/pricereview.css.map              |   1 +
 wms/cont/css/pricereview.scss                 | 343 ++++++++++++++++++
 wms/cont/js/alpinejs/cdn.min.js               |   5 +
 wms/cont/js/pricereviewAlpine.js              |   7 +
 wms/cont/pricereviewCheck.php                 |   4 +
 wms/cont/pricereviewCreate.php                | 143 ++++++++
 wms/contract/api/postContractData.php         |   2 +-
 wms/contract/api/postContractNewApplyData.php |  39 +-
 wms/contract/api/postFlow.php                 |  58 +++
 wms/contract/contract-new-apply.php           |  67 +++-
 wms/contract/js/alpine.js                     |  13 +-
 wms/crm/crmm02-index.php                      |   2 +-
 wms/crm/crmm06_submit.php                     |   2 +-
 wms/fun_global.php                            |   7 +-
 wms/login.php                                 |   3 +-
 16 files changed, 995 insertions(+), 26 deletions(-)
 create mode 100644 wms/cont/css/pricereview.css
 create mode 100644 wms/cont/css/pricereview.css.map
 create mode 100644 wms/cont/css/pricereview.scss
 create mode 100644 wms/cont/js/alpinejs/cdn.min.js
 create mode 100644 wms/cont/js/pricereviewAlpine.js
 create mode 100644 wms/cont/pricereviewCheck.php
 create mode 100644 wms/cont/pricereviewCreate.php
 create mode 100644 wms/contract/api/postFlow.php

diff --git a/wms/cont/css/pricereview.css b/wms/cont/css/pricereview.css
new file mode 100644
index 00000000..afeeb875
--- /dev/null
+++ b/wms/cont/css/pricereview.css
@@ -0,0 +1,325 @@
+@charset "UTF-8";
+#pricereviewCreate input[type=text], #pricereviewCreate input[type=number], #pricereviewCreate select {
+  margin: 1px;
+}
+#pricereviewCreate textarea {
+  resize: vertical;
+}
+#pricereviewCreate select {
+  -webkit-appearance: none; /* 針對 Chrome, Safari, Opera */
+  -moz-appearance: none; /* 針對 Firefox */
+  appearance: none; /* 標準語法 */
+}
+#pricereviewCreate > .modal {
+  padding: 20px;
+}
+#pricereviewCreate > .modal table, #pricereviewCreate > .modal th, #pricereviewCreate > .modal td {
+  border: 1px #ccc solid;
+}
+#pricereviewCreate > .modal table > thead tr th {
+  color: #A52A2A;
+}
+#pricereviewCreate > .modal table > tbody .selected {
+  background-color: #E7FEFB;
+}
+#pricereviewCreate .container table, #pricereviewCreate .container th, #pricereviewCreate .container td {
+  border: 1px #ccc solid;
+  padding: 9px;
+}
+#pricereviewCreate .container table.noborder, #pricereviewCreate .container table .noborder th, #pricereviewCreate .container table .noborder td, #pricereviewCreate .container th.noborder, #pricereviewCreate .container th .noborder th, #pricereviewCreate .container th .noborder td, #pricereviewCreate .container td.noborder, #pricereviewCreate .container td .noborder th, #pricereviewCreate .container td .noborder td {
+  border: none;
+}
+#pricereviewCreate .container table thead th {
+  background-color: #6D9EEB;
+}
+#pricereviewCreate .container table tbody td input {
+  font-size: 14px;
+}
+#pricereviewCreate .container table tbody th {
+  background-color: #CCE4F8;
+  font-size: 14px;
+  padding: 15px 2px;
+  min-width: 100px;
+  text-align: center;
+}
+#pricereviewCreate .container table input {
+  font-size: 13px;
+}
+#pricereviewCreate .container .pricreviewmain {
+  background-color: #F2F2F2;
+  padding: 20px;
+  border-radius: 6px;
+  margin: 30px 0;
+}
+#pricereviewCreate .container .pricreviewmain button {
+  color: #fff;
+  width: 55px;
+  height: 30px;
+  padding: 0;
+  margin-left: 6px;
+  margin-bottom: 2px;
+  font-size: 13px;
+}
+#pricereviewCreate .container .pricreviewmain button.addbtn {
+  background-color: #337AB7;
+  width: 30px;
+}
+#pricereviewCreate .container .pricreviewmain button.deleteBtn {
+  background-color: #D9534F;
+  color: #fff;
+  font-size: 12px;
+  width: 30px;
+}
+#pricereviewCreate .container .pricreviewmain button.selectElevator {
+  background-color: #D9534F;
+  color: #fff;
+}
+#pricereviewCreate .container .pricreviewmain > .divitem {
+  border: 1px #ccc solid;
+  padding: 10px;
+  border-radius: 4px;
+}
+#pricereviewCreate .container .pricreviewmain > .divitem .title {
+  display: flex;
+  align-items: center;
+  border-bottom: 1px #ccc solid;
+  padding: 10px 0;
+  margin-bottom: 10px;
+}
+#pricereviewCreate .container .pricreviewmain > .divitem .title h6 {
+  font-weight: 600;
+}
+#pricereviewCreate .container .pricreviewmain > .divitem table, #pricereviewCreate .container .pricreviewmain > .divitem th, #pricereviewCreate .container .pricreviewmain > .divitem td {
+  font-size: 14px;
+  background-color: transparent;
+}
+#pricereviewCreate .container .pricreviewmain > .divitem table input, #pricereviewCreate .container .pricreviewmain > .divitem table select, #pricereviewCreate .container .pricreviewmain > .divitem th input, #pricereviewCreate .container .pricreviewmain > .divitem th select, #pricereviewCreate .container .pricreviewmain > .divitem td input, #pricereviewCreate .container .pricreviewmain > .divitem td select {
+  font-size: 13px;
+  padding: 0 13px;
+}
+#pricereviewCreate .container .pricreviewmain > .divitem table textarea, #pricereviewCreate .container .pricreviewmain > .divitem th textarea, #pricereviewCreate .container .pricreviewmain > .divitem td textarea {
+  font-size: 13px;
+}
+#pricereviewCreate .container .pricreviewmain > .divitem table input[type=number]::-webkit-outer-spin-button,
+#pricereviewCreate .container .pricreviewmain > .divitem table input[type=number]::-webkit-inner-spin-button, #pricereviewCreate .container .pricreviewmain > .divitem th input[type=number]::-webkit-outer-spin-button,
+#pricereviewCreate .container .pricreviewmain > .divitem th input[type=number]::-webkit-inner-spin-button, #pricereviewCreate .container .pricreviewmain > .divitem td input[type=number]::-webkit-outer-spin-button,
+#pricereviewCreate .container .pricreviewmain > .divitem td input[type=number]::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+#pricereviewCreate .container .pricreviewmain > .divitem table tr:hover .deleteBtn, #pricereviewCreate .container .pricreviewmain > .divitem table tr:hover .copyBtn {
+  opacity: 1;
+}
+#pricereviewCreate .container .pricreviewmain > .divitem table .copyBtn {
+  width: 30px;
+  height: 30px;
+}
+#pricereviewCreate .container .pricreviewmain > .divitem table .saletd {
+  position: relative;
+}
+#pricereviewCreate .container .pricreviewmain > .divitem table .saletd > .deleteBtn {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  right: 2px;
+  opacity: 0;
+  transition: 0.3s;
+}
+#pricereviewCreate .container .pricreviewmain > .divitem table .saletd > .copyBtn {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  right: 38px;
+  opacity: 0;
+  transition: 0.3s;
+  width: 30px;
+  height: 30px;
+}
+#pricereviewCreate .container .pricreviewmain > .divitem table textarea {
+  height: auto;
+  min-height: 50px;
+}
+#pricereviewCreate .container .pricreviewmain > .filediv {
+  display: flex;
+  flex-direction: column;
+  margin-top: 20px;
+}
+#pricereviewCreate .container .pricreviewmain > .filediv label {
+  display: flex;
+  align-items: center;
+  margin: 10px 0;
+}
+#pricereviewCreate .container .pricreviewmain > .filediv label p {
+  width: 100px;
+  font-size: 15px;
+  font-weight: 600;
+}
+#pricereviewCreate .container .pricreviewmain > .filediv label input[type=file] {
+  width: 400px;
+}
+#pricereviewCreate .container .pricreviewmain > .filediv label a, #pricereviewCreate .container .pricreviewmain > .filediv label button {
+  width: 100px;
+  height: 35px;
+  margin: 0;
+  margin-right: 15px;
+  margin-top: 20px;
+}
+
+.container-fluid, .container {
+  max-width: 1400px !important;
+  width: 100%;
+}
+.container-fluid h4, .container h4 {
+  font-weight: 600;
+}
+.container-fluid .btn-secondary, .container .btn-secondary {
+  background-color: #6C757D;
+}
+
+[x-cloak][data-type=window-modal],
+[x-cloak][data-type=errortext] {
+  display: none !important;
+}
+
+.errortext {
+  font-size: 12px !important;
+  color: red !important;
+  font-weight: 600 !important;
+}
+
+.window-modal {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100vh;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 9;
+  padding: 20px;
+}
+@keyframes fade-in {
+  0% {
+    transform: translate(-50%, -60%);
+    opacity: 0;
+  }
+  100% {
+    transform: translate(-50%, -55%);
+    opacity: 1;
+  }
+}
+.window-modal table, .window-modal th, .window-modal td {
+  border: 1px #ccc solid;
+}
+.window-modal table > thead tr th {
+  color: #A52A2A;
+}
+.window-modal table > tbody .selected {
+  background-color: #E7FEFB;
+}
+.window-modal#optionModal .window-modal-content {
+  max-height: 80vh;
+}
+.window-modal#optionModal .window-modal-content .window-modal-body {
+  height: 400px;
+  overflow-y: scroll;
+}
+.window-modal#toElevatorModal .window-modal-content {
+  min-height: 270px;
+  height: auto;
+}
+.window-modal#toElevatorModal .window-modal-content .window-modal-body {
+  height: auto;
+}
+.window-modal .window-modal-content {
+  z-index: 9;
+  background-color: #fff;
+  border-radius: 10px;
+  position: absolute;
+  width: 90%;
+  padding: 30px;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -55%);
+  box-shadow: 0 5px 5px #222;
+  animation: fade-in 0.2s linear;
+}
+.window-modal .window-modal-content.modal-xl {
+  max-width: 1200px;
+}
+.window-modal .window-modal-content.modal-lg {
+  max-width: 800px;
+}
+.window-modal .window-modal-content.modal-m {
+  max-width: 450px;
+}
+.window-modal .window-modal-content .window-modal-header {
+  display: flex;
+  flex-direction: column;
+}
+.window-modal .window-modal-content .window-modal-header button.btn-close {
+  position: absolute;
+  top: 10px;
+  right: 10px;
+  background-color: transparent;
+  border: none;
+  outline: none;
+  border-radius: 50%;
+}
+.window-modal .window-modal-content .window-modal-header > div > input {
+  width: 250px;
+}
+.window-modal .window-back {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: transparent;
+}
+
+#pricereviewCheck > .container {
+  background-color: #F2F2F2;
+  border-radius: 15px;
+  padding: 20px;
+}
+#pricereviewCheck > .container .historytable {
+  max-height: 0;
+  overflow: hidden;
+}
+#pricereviewCheck > .container textarea {
+  resize: vertical;
+}
+#pricereviewCheck > .container table, #pricereviewCheck > .container th, #pricereviewCheck > .container td {
+  border: 1px #ccc solid;
+}
+#pricereviewCheck > .container table.noborder {
+  border: none !important;
+}
+#pricereviewCheck > .container table.noborder th, #pricereviewCheck > .container table.noborder td {
+  border: none !important;
+}
+#pricereviewCheck > .container .customerinfo-table input {
+  background-color: #EEE5E5;
+}
+#pricereviewCheck > .container .mi-table th {
+  font-weight: 600;
+}
+#pricereviewCheck > .container .mi-table input[type=text] {
+  background-color: #EEEEEE;
+  cursor: not-allowed;
+  padding: 6px 12px;
+  font-size: 14px;
+}
+#pricereviewCheck > .container .mi-table .mi-info {
+  font-size: 14px;
+}
+#pricereviewCheck > .container .mi-table .mi-info span {
+  font-size: 15px;
+  font-weight: 600;
+}
+#pricereviewCheck > .container .mi-table .mi-info .line {
+  width: 100%;
+  height: 0.5px;
+  margin: 30px 0;
+  background-color: #ccc;
+}/*# sourceMappingURL=pricereview.css.map */
\ No newline at end of file
diff --git a/wms/cont/css/pricereview.css.map b/wms/cont/css/pricereview.css.map
new file mode 100644
index 00000000..4acaa24e
--- /dev/null
+++ b/wms/cont/css/pricereview.css.map
@@ -0,0 +1 @@
+{"version":3,"sources":["pricereview.css","pricereview.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACCZ;EACI,WAAA;ADCR;ACCI;EACI,gBAAA;ADCR;ACCI;EACI,wBAAA,EAAA,6BAAA;EACA,qBAAA,EAAA,eAAA;EACA,gBAAA,EAAA,SAAA;ADCR;ACCI;EACI,aAAA;ADCR;ACAQ;EACI,sBAAA;ADEZ;ACAQ;EACI,cAAA;ADEZ;ACAQ;EACI,yBAAA;ADEZ;ACIQ;EACI,sBAAA;EACA,YAAA;ADFZ;ACGY;EACI,YAAA;ADDhB;ACMY;EACI,yBAAA;ADJhB;ACOgB;EACI,eAAA;ADLpB;ACOgB;EACI,yBAAA;EACA,eAAA;EACA,iBAAA;EACA,gBAAA;EACA,kBAAA;ADLpB;ACQY;EACI,eAAA;ADNhB;ACSQ;EACI,yBAAA;EACA,aAAA;EACA,kBAAA;EACA,cAAA;ADPZ;ACQY;EACI,WAAA;EACA,WAAA;EACA,YAAA;EACA,UAAA;EACA,gBAAA;EACA,kBAAA;EACA,eAAA;ADNhB;ACOgB;EACI,yBAAA;EACA,WAAA;ADLpB;ACOgB;EACI,yBAAA;EACA,WAAA;EACA,eAAA;EACA,WAAA;ADLpB;ACOgB;EACI,yBAAA;EACA,WAAA;ADLpB;ACSY;EACI,sBAAA;EACA,aAAA;EACA,kBAAA;ADPhB;ACQgB;EACI,aAAA;EACA,mBAAA;EACA,6BAAA;EACA,eAAA;EACA,mBAAA;ADNpB;ACOoB;EACI,gBAAA;ADLxB;ACSgB;EACI,eAAA;EACA,6BAAA;ADPpB;ACQoB;EACI,eAAA;EACA,eAAA;ADNxB;ACQoB;EACI,eAAA;ADNxB;ACQoB;;;;EAEA,wBAAA;EACA,SAAA;ADJpB;ACQoB;EACI,UAAA;ADNxB;ACQoB;EACI,WAAA;EACA,YAAA;ADNxB;ACQoB;EACI,kBAAA;ADNxB;ACOwB;EACI,kBAAA;EACA,QAAA;EACA,2BAAA;EACA,UAAA;EACA,UAAA;EACA,gBAAA;ADL5B;ACOwB;EACI,kBAAA;EACA,QAAA;EACA,2BAAA;EACA,WAAA;EACA,UAAA;EACA,gBAAA;EACA,WAAA;EACA,YAAA;ADL5B;ACQoB;EACI,YAAA;EACA,gBAAA;ADNxB;ACUY;EACI,aAAA;EACA,sBAAA;EACA,gBAAA;ADRhB;ACSgB;EACI,aAAA;EACA,mBAAA;EACA,cAAA;ADPpB;ACQoB;EACI,YAAA;EACA,eAAA;EACA,gBAAA;ADNxB;ACQoB;EACI,YAAA;ADNxB;ACQoB;EACI,YAAA;EACA,YAAA;EACA,SAAA;EACA,kBAAA;EACA,gBAAA;ADNxB;;ACcA;EACI,4BAAA;EACA,WAAA;ADXJ;ACYI;EACI,gBAAA;ADVR;ACYI;EACI,yBAAA;ADVR;;ACaA;;EAGI,wBAAA;ADXJ;;ACaA;EACI,0BAAA;EACA,qBAAA;EACA,2BAAA;ADVJ;;ACYA;EACI,eAAA;EACA,MAAA;EACA,OAAA;EACA,WAAA;EACA,aAAA;EACA,oCAAA;EACA,UAAA;EACA,aAAA;ADTJ;ACWI;EACI;IACI,gCAAA;IACA,UAAA;EDTV;ECWM;IACI,gCAAA;IACA,UAAA;EDTV;AACF;ACWI;EACI,sBAAA;ADTR;ACWI;EACI,cAAA;ADTR;ACWI;EACI,yBAAA;ADTR;ACWI;EACI,gBAAA;ADTR;ACUQ;EACI,aAAA;EACA,kBAAA;ADRZ;ACWI;EACI,iBAAA;EACA,YAAA;ADTR;ACUQ;EACI,YAAA;ADRZ;ACWI;EACI,UAAA;EACA,sBAAA;EACA,mBAAA;EACA,kBAAA;EACA,UAAA;EACA,aAAA;EACA,QAAA;EACA,SAAA;EACA,gCAAA;EACA,0BAAA;EACA,8BAAA;ADTR;ACUQ;EACI,iBAAA;ADRZ;ACUQ;EACI,gBAAA;ADRZ;ACUQ;EACI,gBAAA;ADRZ;ACUQ;EACI,aAAA;EACA,sBAAA;ADRZ;ACSY;EACI,kBAAA;EACA,SAAA;EACA,WAAA;EACA,6BAAA;EACA,YAAA;EACA,aAAA;EACA,kBAAA;ADPhB;ACSY;EACI,YAAA;ADPhB;ACWI;EACI,kBAAA;EACA,MAAA;EACA,OAAA;EACA,WAAA;EACA,YAAA;EACA,6BAAA;ADTR;;ACcI;EACI,yBAAA;EACA,mBAAA;EACA,aAAA;ADXR;ACYQ;EACI,aAAA;EACA,gBAAA;ADVZ;ACYQ;EACI,gBAAA;ADVZ;ACYQ;EACI,sBAAA;ADVZ;ACYQ;EACI,uBAAA;ADVZ;ACWY;EACI,uBAAA;ADThB;ACaY;EACI,yBAAA;ADXhB;ACeY;EACI,gBAAA;ADbhB;ACeY;EACI,yBAAA;EACA,mBAAA;EACA,iBAAA;EACA,eAAA;ADbhB;ACeY;EACI,eAAA;ADbhB;ACcgB;EACI,eAAA;EACA,gBAAA;ADZpB;ACcgB;EACI,WAAA;EACA,aAAA;EACA,cAAA;EACA,sBAAA;ADZpB","file":"pricereview.css"}
\ No newline at end of file
diff --git a/wms/cont/css/pricereview.scss b/wms/cont/css/pricereview.scss
new file mode 100644
index 00000000..07a63973
--- /dev/null
+++ b/wms/cont/css/pricereview.scss
@@ -0,0 +1,343 @@
+#pricereviewCreate{
+    input[type='text'], input[type='number'], select{
+        margin: 1px;
+    }
+    textarea{
+        resize: vertical;
+    }
+    select{
+        -webkit-appearance: none; /* 針對 Chrome, Safari, Opera */
+        -moz-appearance: none;    /* 針對 Firefox */
+        appearance: none;         /* 標準語法 */
+    }
+    >.modal{
+        padding: 20px;
+        table,  th, td{
+            border:1px #ccc solid;
+        }
+        table > thead tr th{
+            color:#A52A2A;
+        }
+        table > tbody .selected{
+            background-color: #E7FEFB;
+        }
+        table > tbody .selected td{
+        }
+    }
+    .container{
+        table, th, td{
+            border:1px #ccc solid;
+            padding: 9px;
+            &.noborder, .noborder th, .noborder td{
+                border:none;
+            }
+        }
+        table{
+            
+            thead th{
+                background-color: #6D9EEB;
+            }
+            tbody {
+                td input{
+                    font-size: 14px;
+                }
+                th{
+                    background-color: #CCE4F8;
+                    font-size: 14px;
+                    padding: 15px 2px;
+                    min-width: 100px;
+                    text-align: center;
+                }
+            }
+            input{
+                font-size: 13px;
+            }
+        }
+        .pricreviewmain{
+            background-color: #F2F2F2;
+            padding: 20px;
+            border-radius: 6px ;
+            margin:30px 0;
+            button{
+                color:#fff;
+                width: 55px;
+                height: 30px;
+                padding: 0;
+                margin-left: 6px;
+                margin-bottom: 2px;
+                font-size: 13px;
+                &.addbtn{
+                    background-color: #337AB7;
+                    width: 30px;
+                }
+                &.deleteBtn{
+                    background-color: #D9534F;
+                    color:#fff;
+                    font-size: 12px;
+                    width: 30px;
+                }
+                &.selectElevator{
+                    background-color: #D9534F;
+                    color:#fff;
+                }
+            }
+            
+            >.divitem{
+                border:1px #ccc solid;
+                padding: 10px;
+                border-radius: 4px ;
+                .title{
+                    display: flex;
+                    align-items: center;
+                    border-bottom: 1px #ccc solid;
+                    padding: 10px 0;
+                    margin-bottom: 10px;
+                    h6{
+                        font-weight: 600;
+                    }
+                    
+                }
+                table, th, td{
+                    font-size: 14px;
+                    background-color: transparent;
+                    input, select{
+                        font-size: 13px;
+                        padding: 0 13px;
+                    }
+                    textarea{
+                        font-size: 13px;
+                    }
+                    input[type=number]::-webkit-outer-spin-button,
+                    input[type=number]::-webkit-inner-spin-button {
+                    -webkit-appearance: none;
+                    margin: 0;
+                    }
+                }
+                table {
+                    tr:hover .deleteBtn ,tr:hover .copyBtn{
+                        opacity: 1;
+                    }
+                    .copyBtn{
+                        width: 30px;
+                        height: 30px;
+                    }
+                    .saletd{
+                        position: relative;
+                        >.deleteBtn{
+                            position: absolute;
+                            top: 50%;
+                            transform: translateY(-50%);
+                            right:2px;
+                            opacity: 0;
+                            transition: .3s;
+                        }
+                        >.copyBtn{
+                            position: absolute;
+                            top: 50%;
+                            transform: translateY(-50%);
+                            right:38px;
+                            opacity: 0;
+                            transition: .3s;
+                            width: 30px;
+                            height: 30px;
+                        }
+                    }
+                    textarea{
+                        height: auto;
+                        min-height: 50px;
+                    }
+                }
+            }
+            >.filediv{
+                display: flex;
+                flex-direction: column;
+                margin-top: 20px;
+                label{
+                    display: flex;
+                    align-items: center;
+                    margin:10px 0;
+                    p{
+                        width:100px;
+                        font-size: 15px;
+                        font-weight: 600;
+                    }
+                    input[type="file"]{
+                        width:400px
+                    }
+                    a, button{
+                        width:100px;
+                        height: 35px;
+                        margin:0;
+                        margin-right: 15px;
+                        margin-top: 20px;
+                    }
+                }
+            }
+        }
+    }
+}
+
+.container-fluid, .container{
+    max-width:1400px !important;
+    width: 100%;
+    h4{
+        font-weight: 600;
+    }
+    .btn-secondary{
+        background-color: #6C757D;
+    }
+}
+[x-cloak][data-type="window-modal"],
+[x-cloak][data-type="errortext"]
+{
+    display: none !important;
+}
+.errortext{
+    font-size:12px !important;
+    color:red !important;
+    font-weight:600 !important;
+}
+.window-modal{
+    position: fixed;
+    top: 0;
+    left:0;
+    width: 100%;
+    height: 100vh;
+    background-color: rgba(0, 0, 0, 0.5);
+    z-index: 9;
+    padding: 20px;
+    // display: none;
+    @keyframes fade-in {
+        0%{
+            transform: translate(-50%, -60%);
+            opacity: 0;
+        }
+        100%{
+            transform: translate(-50%, -55%);
+            opacity: 1;
+        }
+    }
+    table,  th, td{
+        border:1px #ccc solid;
+    }
+    table > thead tr th{
+        color:#A52A2A;
+    }
+    table > tbody .selected{
+        background-color: #E7FEFB;
+    }
+    &#optionModal .window-modal-content{
+        max-height: 80vh;
+        .window-modal-body{
+            height: 400px;
+            overflow-y: scroll;
+        }
+    }
+    &#toElevatorModal .window-modal-content{
+        min-height: 270px;
+        height: auto;
+        .window-modal-body{
+            height: auto;
+        }
+    }
+    .window-modal-content{
+        z-index: 9;
+        background-color: #fff;
+        border-radius: 10px;
+        position: absolute;
+        width:90%;
+        padding: 30px;
+        top: 50%;
+        left:50%;
+        transform: translate(-50%, -55%);
+        box-shadow: 0 5px 5px #222;
+        animation: fade-in .2s linear;
+        &.modal-xl{
+            max-width:1200px;
+        }
+        &.modal-lg{
+            max-width:800px;
+        }
+        &.modal-m{
+            max-width:450px;
+        }
+        .window-modal-header{
+            display: flex;
+            flex-direction: column;
+            button.btn-close{
+                position: absolute;
+                top: 10px;
+                right:10px;
+                background-color: transparent;
+                border:none;
+                outline: none;
+                border-radius: 50%;
+            }
+            >div > input{
+                width: 250px;
+            }
+        }
+    }
+    .window-back{
+        position: absolute;
+        top: 0;
+        left:0;
+        width: 100%;
+        height: 100%;
+        background-color: transparent;
+    }
+}
+
+#pricereviewCheck{
+    >.container{
+        background-color: #F2F2F2;
+        border-radius: 15px;
+        padding: 20px;
+        .historytable{
+            max-height: 0;
+            overflow: hidden;
+        }
+        textarea{
+            resize: vertical;
+        }
+        table,  th, td{
+            border:1px #ccc solid;
+        }
+        table.noborder{
+            border:none !important;
+            th ,td{
+                border:none !important;
+            }
+        }
+        .customerinfo-table{
+            input{
+                background-color: #EEE5E5;
+            }
+        }
+        .mi-table{
+            th{
+                font-weight: 600;
+            }
+            input[type=text]{
+                background-color: #EEEEEE;
+                cursor: not-allowed;
+                padding: 6px 12px;
+                font-size: 14px;
+            }
+            .mi-info{
+                font-size: 14px;
+                span{
+                    font-size: 15px;
+                    font-weight: 600;
+                }
+                .line{
+                    width: 100%;
+                    height: .5px;
+                    margin:30px 0;
+                    background-color: #ccc;
+                }
+            }
+        }
+    }
+    
+}
\ No newline at end of file
diff --git a/wms/cont/js/alpinejs/cdn.min.js b/wms/cont/js/alpinejs/cdn.min.js
new file mode 100644
index 00000000..922cc02e
--- /dev/null
+++ b/wms/cont/js/alpinejs/cdn.min.js
@@ -0,0 +1,5 @@
+(()=>{var Ze=!1,Qe=!1,H=[],et=-1;function zt(e){En(e)}function En(e){H.includes(e)||H.push(e),vn()}function we(e){let t=H.indexOf(e);t!==-1&&t>et&&H.splice(t,1)}function vn(){!Qe&&!Ze&&(Ze=!0,queueMicrotask(Sn))}function Sn(){Ze=!1,Qe=!0;for(let e=0;e<H.length;e++)H[e](),et=e;H.length=0,et=-1,Qe=!1}var T,I,L,rt,tt=!0;function Vt(e){tt=!1,e(),tt=!0}function Ht(e){T=e.reactive,L=e.release,I=t=>e.effect(t,{scheduler:r=>{tt?zt(r):r()}}),rt=e.raw}function nt(e){I=e}function qt(e){let t=()=>{};return[n=>{let i=I(n);return e._x_effects||(e._x_effects=new Set,e._x_runEffects=()=>{e._x_effects.forEach(o=>o())}),e._x_effects.add(i),t=()=>{i!==void 0&&(e._x_effects.delete(i),L(i))},i},()=>{t()}]}function q(e,t,r={}){e.dispatchEvent(new CustomEvent(t,{detail:r,bubbles:!0,composed:!0,cancelable:!0}))}function O(e,t){if(typeof ShadowRoot=="function"&&e instanceof ShadowRoot){Array.from(e.children).forEach(i=>O(i,t));return}let r=!1;if(t(e,()=>r=!0),r)return;let n=e.firstElementChild;for(;n;)O(n,t,!1),n=n.nextElementSibling}function v(e,...t){console.warn(`Alpine Warning: ${e}`,...t)}var Ut=!1;function Wt(){Ut&&v("Alpine has already been initialized on this page. Calling Alpine.start() more than once can cause problems."),Ut=!0,document.body||v("Unable to initialize. Trying to load Alpine before `<body>` is available. Did you forget to add `defer` in Alpine's `<script>` tag?"),q(document,"alpine:init"),q(document,"alpine:initializing"),ce(),er(t=>S(t,O)),Q(t=>ae(t)),Se((t,r)=>{le(t,r).forEach(n=>n())});let e=t=>!U(t.parentElement,!0);Array.from(document.querySelectorAll(Yt())).filter(e).forEach(t=>{S(t)}),q(document,"alpine:initialized")}var it=[],Gt=[];function Jt(){return it.map(e=>e())}function Yt(){return it.concat(Gt).map(e=>e())}function Ee(e){it.push(e)}function ve(e){Gt.push(e)}function U(e,t=!1){return Z(e,r=>{if((t?Yt():Jt()).some(i=>r.matches(i)))return!0})}function Z(e,t){if(e){if(t(e))return e;if(e._x_teleportBack&&(e=e._x_teleportBack),!!e.parentElement)return Z(e.parentElement,t)}}function Xt(e){return Jt().some(t=>e.matches(t))}var Zt=[];function Qt(e){Zt.push(e)}function S(e,t=O,r=()=>{}){rr(()=>{t(e,(n,i)=>{r(n,i),Zt.forEach(o=>o(n,i)),le(n,n.attributes).forEach(o=>o()),n._x_ignore&&i()})})}function ae(e){O(e,t=>{ot(t),tr(t)})}var nr=[],ir=[],or=[];function er(e){or.push(e)}function Q(e,t){typeof t=="function"?(e._x_cleanups||(e._x_cleanups=[]),e._x_cleanups.push(t)):(t=e,ir.push(t))}function Se(e){nr.push(e)}function Oe(e,t,r){e._x_attributeCleanups||(e._x_attributeCleanups={}),e._x_attributeCleanups[t]||(e._x_attributeCleanups[t]=[]),e._x_attributeCleanups[t].push(r)}function ot(e,t){e._x_attributeCleanups&&Object.entries(e._x_attributeCleanups).forEach(([r,n])=>{(t===void 0||t.includes(r))&&(n.forEach(i=>i()),delete e._x_attributeCleanups[r])})}function tr(e){if(e._x_cleanups)for(;e._x_cleanups.length;)e._x_cleanups.pop()()}var at=new MutationObserver(ft),ct=!1;function ce(){at.observe(document,{subtree:!0,childList:!0,attributes:!0,attributeOldValue:!0}),ct=!0}function lt(){An(),at.disconnect(),ct=!1}var ue=[],st=!1;function An(){ue=ue.concat(at.takeRecords()),ue.length&&!st&&(st=!0,queueMicrotask(()=>{On(),st=!1}))}function On(){ft(ue),ue.length=0}function h(e){if(!ct)return e();lt();let t=e();return ce(),t}var ut=!1,Ae=[];function sr(){ut=!0}function ar(){ut=!1,ft(Ae),Ae=[]}function ft(e){if(ut){Ae=Ae.concat(e);return}let t=[],r=[],n=new Map,i=new Map;for(let o=0;o<e.length;o++)if(!e[o].target._x_ignoreMutationObserver&&(e[o].type==="childList"&&(e[o].addedNodes.forEach(s=>s.nodeType===1&&t.push(s)),e[o].removedNodes.forEach(s=>s.nodeType===1&&r.push(s))),e[o].type==="attributes")){let s=e[o].target,a=e[o].attributeName,c=e[o].oldValue,l=()=>{n.has(s)||n.set(s,[]),n.get(s).push({name:a,value:s.getAttribute(a)})},u=()=>{i.has(s)||i.set(s,[]),i.get(s).push(a)};s.hasAttribute(a)&&c===null?l():s.hasAttribute(a)?(u(),l()):u()}i.forEach((o,s)=>{ot(s,o)}),n.forEach((o,s)=>{nr.forEach(a=>a(s,o))});for(let o of r)t.includes(o)||(ir.forEach(s=>s(o)),ae(o));t.forEach(o=>{o._x_ignoreSelf=!0,o._x_ignore=!0});for(let o of t)r.includes(o)||o.isConnected&&(delete o._x_ignoreSelf,delete o._x_ignore,or.forEach(s=>s(o)),o._x_ignore=!0,o._x_ignoreSelf=!0);t.forEach(o=>{delete o._x_ignoreSelf,delete o._x_ignore}),t=null,r=null,n=null,i=null}function Ce(e){return j($(e))}function N(e,t,r){return e._x_dataStack=[t,...$(r||e)],()=>{e._x_dataStack=e._x_dataStack.filter(n=>n!==t)}}function $(e){return e._x_dataStack?e._x_dataStack:typeof ShadowRoot=="function"&&e instanceof ShadowRoot?$(e.host):e.parentNode?$(e.parentNode):[]}function j(e){return new Proxy({objects:e},Cn)}var Cn={ownKeys({objects:e}){return Array.from(new Set(e.flatMap(t=>Object.keys(t))))},has({objects:e},t){return t==Symbol.unscopables?!1:e.some(r=>Object.prototype.hasOwnProperty.call(r,t))},get({objects:e},t,r){return t=="toJSON"?Tn:Reflect.get(e.find(n=>Object.prototype.hasOwnProperty.call(n,t))||{},t,r)},set({objects:e},t,r,n){let i=e.find(s=>Object.prototype.hasOwnProperty.call(s,t))||e[e.length-1],o=Object.getOwnPropertyDescriptor(i,t);return o?.set&&o?.get?Reflect.set(i,t,r,n):Reflect.set(i,t,r)}};function Tn(){return Reflect.ownKeys(this).reduce((t,r)=>(t[r]=Reflect.get(this,r),t),{})}function Te(e){let t=n=>typeof n=="object"&&!Array.isArray(n)&&n!==null,r=(n,i="")=>{Object.entries(Object.getOwnPropertyDescriptors(n)).forEach(([o,{value:s,enumerable:a}])=>{if(a===!1||s===void 0)return;let c=i===""?o:`${i}.${o}`;typeof s=="object"&&s!==null&&s._x_interceptor?n[o]=s.initialize(e,c,o):t(s)&&s!==n&&!(s instanceof Element)&&r(s,c)})};return r(e)}function Re(e,t=()=>{}){let r={initialValue:void 0,_x_interceptor:!0,initialize(n,i,o){return e(this.initialValue,()=>Rn(n,i),s=>dt(n,i,s),i,o)}};return t(r),n=>{if(typeof n=="object"&&n!==null&&n._x_interceptor){let i=r.initialize.bind(r);r.initialize=(o,s,a)=>{let c=n.initialize(o,s,a);return r.initialValue=c,i(o,s,a)}}else r.initialValue=n;return r}}function Rn(e,t){return t.split(".").reduce((r,n)=>r[n],e)}function dt(e,t,r){if(typeof t=="string"&&(t=t.split(".")),t.length===1)e[t[0]]=r;else{if(t.length===0)throw error;return e[t[0]]||(e[t[0]]={}),dt(e[t[0]],t.slice(1),r)}}var cr={};function y(e,t){cr[e]=t}function fe(e,t){return Object.entries(cr).forEach(([r,n])=>{let i=null;function o(){if(i)return i;{let[s,a]=pt(t);return i={interceptor:Re,...s},Q(t,a),i}}Object.defineProperty(e,`$${r}`,{get(){return n(t,o())},enumerable:!1})}),e}function lr(e,t,r,...n){try{return r(...n)}catch(i){ee(i,e,t)}}function ee(e,t,r=void 0){Object.assign(e,{el:t,expression:r}),console.warn(`Alpine Expression Error: ${e.message}
+
+${r?'Expression: "'+r+`"
+
+`:""}`,t),setTimeout(()=>{throw e},0)}var Me=!0;function Pe(e){let t=Me;Me=!1;let r=e();return Me=t,r}function R(e,t,r={}){let n;return x(e,t)(i=>n=i,r),n}function x(...e){return ur(...e)}var ur=ht;function fr(e){ur=e}function ht(e,t){let r={};fe(r,e);let n=[r,...$(e)],i=typeof t=="function"?Mn(n,t):Pn(n,t,e);return lr.bind(null,e,t,i)}function Mn(e,t){return(r=()=>{},{scope:n={},params:i=[]}={})=>{let o=t.apply(j([n,...e]),i);Ne(r,o)}}var mt={};function Nn(e,t){if(mt[e])return mt[e];let r=Object.getPrototypeOf(async function(){}).constructor,n=/^[\n\s]*if.*\(.*\)/.test(e.trim())||/^(let|const)\s/.test(e.trim())?`(async()=>{ ${e} })()`:e,o=(()=>{try{let s=new r(["__self","scope"],`with (scope) { __self.result = ${n} }; __self.finished = true; return __self.result;`);return Object.defineProperty(s,"name",{value:`[Alpine] ${e}`}),s}catch(s){return ee(s,t,e),Promise.resolve()}})();return mt[e]=o,o}function Pn(e,t,r){let n=Nn(t,r);return(i=()=>{},{scope:o={},params:s=[]}={})=>{n.result=void 0,n.finished=!1;let a=j([o,...e]);if(typeof n=="function"){let c=n(n,a).catch(l=>ee(l,r,t));n.finished?(Ne(i,n.result,a,s,r),n.result=void 0):c.then(l=>{Ne(i,l,a,s,r)}).catch(l=>ee(l,r,t)).finally(()=>n.result=void 0)}}}function Ne(e,t,r,n,i){if(Me&&typeof t=="function"){let o=t.apply(r,n);o instanceof Promise?o.then(s=>Ne(e,s,r,n)).catch(s=>ee(s,i,t)):e(o)}else typeof t=="object"&&t instanceof Promise?t.then(o=>e(o)):e(t)}var yt="x-";function C(e=""){return yt+e}function dr(e){yt=e}var _t={};function d(e,t){return _t[e]=t,{before(r){if(!_t[r]){console.warn("Cannot find directive `${directive}`. `${name}` will use the default order of execution");return}let n=W.indexOf(r);W.splice(n>=0?n:W.indexOf("DEFAULT"),0,e)}}}function le(e,t,r){if(t=Array.from(t),e._x_virtualDirectives){let o=Object.entries(e._x_virtualDirectives).map(([a,c])=>({name:a,value:c})),s=bt(o);o=o.map(a=>s.find(c=>c.name===a.name)?{name:`x-bind:${a.name}`,value:`"${a.value}"`}:a),t=t.concat(o)}let n={};return t.map(mr((o,s)=>n[o]=s)).filter(_r).map(Dn(n,r)).sort(kn).map(o=>In(e,o))}function bt(e){return Array.from(e).map(mr()).filter(t=>!_r(t))}var gt=!1,de=new Map,pr=Symbol();function rr(e){gt=!0;let t=Symbol();pr=t,de.set(t,[]);let r=()=>{for(;de.get(t).length;)de.get(t).shift()();de.delete(t)},n=()=>{gt=!1,r()};e(r),n()}function pt(e){let t=[],r=a=>t.push(a),[n,i]=qt(e);return t.push(i),[{Alpine:F,effect:n,cleanup:r,evaluateLater:x.bind(x,e),evaluate:R.bind(R,e)},()=>t.forEach(a=>a())]}function In(e,t){let r=()=>{},n=_t[t.type]||r,[i,o]=pt(e);Oe(e,t.original,o);let s=()=>{e._x_ignore||e._x_ignoreSelf||(n.inline&&n.inline(e,t,i),n=n.bind(n,e,t,i),gt?de.get(pr).push(n):n())};return s.runCleanups=o,s}var Ie=(e,t)=>({name:r,value:n})=>(r.startsWith(e)&&(r=r.replace(e,t)),{name:r,value:n}),De=e=>e;function mr(e=()=>{}){return({name:t,value:r})=>{let{name:n,value:i}=hr.reduce((o,s)=>s(o),{name:t,value:r});return n!==t&&e(n,t),{name:n,value:i}}}var hr=[];function te(e){hr.push(e)}function _r({name:e}){return gr().test(e)}var gr=()=>new RegExp(`^${yt}([^:^.]+)\\b`);function Dn(e,t){return({name:r,value:n})=>{let i=r.match(gr()),o=r.match(/:([a-zA-Z0-9\-_:]+)/),s=r.match(/\.[^.\]]+(?=[^\]]*$)/g)||[],a=t||e[r]||r;return{type:i?i[1]:null,value:o?o[1]:null,modifiers:s.map(c=>c.replace(".","")),expression:n,original:a}}}var xt="DEFAULT",W=["ignore","ref","data","id","bind","init","for","model","modelable","transition","show","if",xt,"teleport"];function kn(e,t){let r=W.indexOf(e.type)===-1?xt:e.type,n=W.indexOf(t.type)===-1?xt:t.type;return W.indexOf(r)-W.indexOf(n)}var wt=[],Et=!1;function re(e=()=>{}){return queueMicrotask(()=>{Et||setTimeout(()=>{ke()})}),new Promise(t=>{wt.push(()=>{e(),t()})})}function ke(){for(Et=!1;wt.length;)wt.shift()()}function xr(){Et=!0}function pe(e,t){return Array.isArray(t)?yr(e,t.join(" ")):typeof t=="object"&&t!==null?Ln(e,t):typeof t=="function"?pe(e,t()):yr(e,t)}function yr(e,t){let r=o=>o.split(" ").filter(Boolean),n=o=>o.split(" ").filter(s=>!e.classList.contains(s)).filter(Boolean),i=o=>(e.classList.add(...o),()=>{e.classList.remove(...o)});return t=t===!0?t="":t||"",i(n(t))}function Ln(e,t){let r=a=>a.split(" ").filter(Boolean),n=Object.entries(t).flatMap(([a,c])=>c?r(a):!1).filter(Boolean),i=Object.entries(t).flatMap(([a,c])=>c?!1:r(a)).filter(Boolean),o=[],s=[];return i.forEach(a=>{e.classList.contains(a)&&(e.classList.remove(a),s.push(a))}),n.forEach(a=>{e.classList.contains(a)||(e.classList.add(a),o.push(a))}),()=>{s.forEach(a=>e.classList.add(a)),o.forEach(a=>e.classList.remove(a))}}function G(e,t){return typeof t=="object"&&t!==null?$n(e,t):jn(e,t)}function $n(e,t){let r={};return Object.entries(t).forEach(([n,i])=>{r[n]=e.style[n],n.startsWith("--")||(n=Fn(n)),e.style.setProperty(n,i)}),setTimeout(()=>{e.style.length===0&&e.removeAttribute("style")}),()=>{G(e,r)}}function jn(e,t){let r=e.getAttribute("style",t);return e.setAttribute("style",t),()=>{e.setAttribute("style",r||"")}}function Fn(e){return e.replace(/([a-z])([A-Z])/g,"$1-$2").toLowerCase()}function me(e,t=()=>{}){let r=!1;return function(){r?t.apply(this,arguments):(r=!0,e.apply(this,arguments))}}d("transition",(e,{value:t,modifiers:r,expression:n},{evaluate:i})=>{typeof n=="function"&&(n=i(n)),n!==!1&&(!n||typeof n=="boolean"?Kn(e,r,t):Bn(e,n,t))});function Bn(e,t,r){br(e,pe,""),{enter:i=>{e._x_transition.enter.during=i},"enter-start":i=>{e._x_transition.enter.start=i},"enter-end":i=>{e._x_transition.enter.end=i},leave:i=>{e._x_transition.leave.during=i},"leave-start":i=>{e._x_transition.leave.start=i},"leave-end":i=>{e._x_transition.leave.end=i}}[r](t)}function Kn(e,t,r){br(e,G);let n=!t.includes("in")&&!t.includes("out")&&!r,i=n||t.includes("in")||["enter"].includes(r),o=n||t.includes("out")||["leave"].includes(r);t.includes("in")&&!n&&(t=t.filter((g,b)=>b<t.indexOf("out"))),t.includes("out")&&!n&&(t=t.filter((g,b)=>b>t.indexOf("out")));let s=!t.includes("opacity")&&!t.includes("scale"),a=s||t.includes("opacity"),c=s||t.includes("scale"),l=a?0:1,u=c?he(t,"scale",95)/100:1,p=he(t,"delay",0)/1e3,m=he(t,"origin","center"),w="opacity, transform",k=he(t,"duration",150)/1e3,be=he(t,"duration",75)/1e3,f="cubic-bezier(0.4, 0.0, 0.2, 1)";i&&(e._x_transition.enter.during={transformOrigin:m,transitionDelay:`${p}s`,transitionProperty:w,transitionDuration:`${k}s`,transitionTimingFunction:f},e._x_transition.enter.start={opacity:l,transform:`scale(${u})`},e._x_transition.enter.end={opacity:1,transform:"scale(1)"}),o&&(e._x_transition.leave.during={transformOrigin:m,transitionDelay:`${p}s`,transitionProperty:w,transitionDuration:`${be}s`,transitionTimingFunction:f},e._x_transition.leave.start={opacity:1,transform:"scale(1)"},e._x_transition.leave.end={opacity:l,transform:`scale(${u})`})}function br(e,t,r={}){e._x_transition||(e._x_transition={enter:{during:r,start:r,end:r},leave:{during:r,start:r,end:r},in(n=()=>{},i=()=>{}){Le(e,t,{during:this.enter.during,start:this.enter.start,end:this.enter.end},n,i)},out(n=()=>{},i=()=>{}){Le(e,t,{during:this.leave.during,start:this.leave.start,end:this.leave.end},n,i)}})}window.Element.prototype._x_toggleAndCascadeWithTransitions=function(e,t,r,n){let i=document.visibilityState==="visible"?requestAnimationFrame:setTimeout,o=()=>i(r);if(t){e._x_transition&&(e._x_transition.enter||e._x_transition.leave)?e._x_transition.enter&&(Object.entries(e._x_transition.enter.during).length||Object.entries(e._x_transition.enter.start).length||Object.entries(e._x_transition.enter.end).length)?e._x_transition.in(r):o():e._x_transition?e._x_transition.in(r):o();return}e._x_hidePromise=e._x_transition?new Promise((s,a)=>{e._x_transition.out(()=>{},()=>s(n)),e._x_transitioning.beforeCancel(()=>a({isFromCancelledTransition:!0}))}):Promise.resolve(n),queueMicrotask(()=>{let s=wr(e);s?(s._x_hideChildren||(s._x_hideChildren=[]),s._x_hideChildren.push(e)):i(()=>{let a=c=>{let l=Promise.all([c._x_hidePromise,...(c._x_hideChildren||[]).map(a)]).then(([u])=>u());return delete c._x_hidePromise,delete c._x_hideChildren,l};a(e).catch(c=>{if(!c.isFromCancelledTransition)throw c})})})};function wr(e){let t=e.parentNode;if(t)return t._x_hidePromise?t:wr(t)}function Le(e,t,{during:r,start:n,end:i}={},o=()=>{},s=()=>{}){if(e._x_transitioning&&e._x_transitioning.cancel(),Object.keys(r).length===0&&Object.keys(n).length===0&&Object.keys(i).length===0){o(),s();return}let a,c,l;zn(e,{start(){a=t(e,n)},during(){c=t(e,r)},before:o,end(){a(),l=t(e,i)},after:s,cleanup(){c(),l()}})}function zn(e,t){let r,n,i,o=me(()=>{h(()=>{r=!0,n||t.before(),i||(t.end(),ke()),t.after(),e.isConnected&&t.cleanup(),delete e._x_transitioning})});e._x_transitioning={beforeCancels:[],beforeCancel(s){this.beforeCancels.push(s)},cancel:me(function(){for(;this.beforeCancels.length;)this.beforeCancels.shift()();o()}),finish:o},h(()=>{t.start(),t.during()}),xr(),requestAnimationFrame(()=>{if(r)return;let s=Number(getComputedStyle(e).transitionDuration.replace(/,.*/,"").replace("s",""))*1e3,a=Number(getComputedStyle(e).transitionDelay.replace(/,.*/,"").replace("s",""))*1e3;s===0&&(s=Number(getComputedStyle(e).animationDuration.replace("s",""))*1e3),h(()=>{t.before()}),n=!0,requestAnimationFrame(()=>{r||(h(()=>{t.end()}),ke(),setTimeout(e._x_transitioning.finish,s+a),i=!0)})})}function he(e,t,r){if(e.indexOf(t)===-1)return r;let n=e[e.indexOf(t)+1];if(!n||t==="scale"&&isNaN(n))return r;if(t==="duration"||t==="delay"){let i=n.match(/([0-9]+)ms/);if(i)return i[1]}return t==="origin"&&["top","right","left","center","bottom"].includes(e[e.indexOf(t)+2])?[n,e[e.indexOf(t)+2]].join(" "):n}var D=!1;function B(e,t=()=>{}){return(...r)=>D?t(...r):e(...r)}function Er(e){return(...t)=>D&&e(...t)}function vr(e,t){e._x_dataStack&&(t._x_dataStack=e._x_dataStack,t.setAttribute("data-has-alpine-state",!0)),D=!0,Ar(()=>{S(t,(r,n)=>{n(r,()=>{})})}),D=!1}var vt=!1;function Sr(e,t){t._x_dataStack||(t._x_dataStack=e._x_dataStack),D=!0,vt=!0,Ar(()=>{Vn(t)}),D=!1,vt=!1}function Vn(e){let t=!1;S(e,(n,i)=>{O(n,(o,s)=>{if(t&&Xt(o))return s();t=!0,i(o,s)})})}function Ar(e){let t=I;nt((r,n)=>{let i=t(r);return L(i),()=>{}}),e(),nt(t)}function Or(e){return D?vt?!0:e.hasAttribute("data-has-alpine-state"):!1}function _e(e,t,r,n=[]){switch(e._x_bindings||(e._x_bindings=T({})),e._x_bindings[t]=r,t=n.includes("camel")?Xn(t):t,t){case"value":Hn(e,r);break;case"style":Un(e,r);break;case"class":qn(e,r);break;case"selected":case"checked":Wn(e,t,r);break;default:Tr(e,t,r);break}}function Hn(e,t){if(e.type==="radio")e.attributes.value===void 0&&(e.value=t),window.fromModel&&(e.checked=Cr(e.value,t));else if(e.type==="checkbox")Number.isInteger(t)?e.value=t:!Array.isArray(t)&&typeof t!="boolean"&&![null,void 0].includes(t)?e.value=String(t):Array.isArray(t)?e.checked=t.some(r=>Cr(r,e.value)):e.checked=!!t;else if(e.tagName==="SELECT")Yn(e,t);else{if(e.value===t)return;e.value=t===void 0?"":t}}function qn(e,t){e._x_undoAddedClasses&&e._x_undoAddedClasses(),e._x_undoAddedClasses=pe(e,t)}function Un(e,t){e._x_undoAddedStyles&&e._x_undoAddedStyles(),e._x_undoAddedStyles=G(e,t)}function Wn(e,t,r){Tr(e,t,r),Jn(e,t,r)}function Tr(e,t,r){[null,void 0,!1].includes(r)&&Zn(t)?e.removeAttribute(t):(Rr(t)&&(r=t),Gn(e,t,r))}function Gn(e,t,r){e.getAttribute(t)!=r&&e.setAttribute(t,r)}function Jn(e,t,r){e[t]!==r&&(e[t]=r)}function Yn(e,t){let r=[].concat(t).map(n=>n+"");Array.from(e.options).forEach(n=>{n.selected=r.includes(n.value)})}function Xn(e){return e.toLowerCase().replace(/-(\w)/g,(t,r)=>r.toUpperCase())}function Cr(e,t){return e==t}function Rr(e){return["disabled","checked","required","readonly","hidden","open","selected","autofocus","itemscope","multiple","novalidate","allowfullscreen","allowpaymentrequest","formnovalidate","autoplay","controls","loop","muted","playsinline","default","ismap","reversed","async","defer","nomodule"].includes(e)}function Zn(e){return!["aria-pressed","aria-checked","aria-expanded","aria-selected"].includes(e)}function Mr(e,t,r){return e._x_bindings&&e._x_bindings[t]!==void 0?e._x_bindings[t]:Pr(e,t,r)}function Nr(e,t,r,n=!0){if(e._x_bindings&&e._x_bindings[t]!==void 0)return e._x_bindings[t];if(e._x_inlineBindings&&e._x_inlineBindings[t]!==void 0){let i=e._x_inlineBindings[t];return i.extract=n,Pe(()=>R(e,i.expression))}return Pr(e,t,r)}function Pr(e,t,r){let n=e.getAttribute(t);return n===null?typeof r=="function"?r():r:n===""?!0:Rr(t)?!![t,"true"].includes(n):n}function $e(e,t){var r;return function(){var n=this,i=arguments,o=function(){r=null,e.apply(n,i)};clearTimeout(r),r=setTimeout(o,t)}}function je(e,t){let r;return function(){let n=this,i=arguments;r||(e.apply(n,i),r=!0,setTimeout(()=>r=!1,t))}}function Fe({get:e,set:t},{get:r,set:n}){let i=!0,o,s=I(()=>{let a=e(),c=r();if(i)n(St(a)),i=!1,o=JSON.stringify(a);else{let l=JSON.stringify(a);l!==o?(n(St(a)),o=l):(t(St(c)),o=JSON.stringify(c))}JSON.stringify(r()),JSON.stringify(e())});return()=>{L(s)}}function St(e){return typeof e=="object"?JSON.parse(JSON.stringify(e)):e}function Ir(e){(Array.isArray(e)?e:[e]).forEach(r=>r(F))}var J={},Dr=!1;function kr(e,t){if(Dr||(J=T(J),Dr=!0),t===void 0)return J[e];J[e]=t,typeof t=="object"&&t!==null&&t.hasOwnProperty("init")&&typeof t.init=="function"&&J[e].init(),Te(J[e])}function Lr(){return J}var $r={};function jr(e,t){let r=typeof t!="function"?()=>t:t;return e instanceof Element?At(e,r()):($r[e]=r,()=>{})}function Fr(e){return Object.entries($r).forEach(([t,r])=>{Object.defineProperty(e,t,{get(){return(...n)=>r(...n)}})}),e}function At(e,t,r){let n=[];for(;n.length;)n.pop()();let i=Object.entries(t).map(([s,a])=>({name:s,value:a})),o=bt(i);return i=i.map(s=>o.find(a=>a.name===s.name)?{name:`x-bind:${s.name}`,value:`"${s.value}"`}:s),le(e,i,r).map(s=>{n.push(s.runCleanups),s()}),()=>{for(;n.length;)n.pop()()}}var Br={};function Kr(e,t){Br[e]=t}function zr(e,t){return Object.entries(Br).forEach(([r,n])=>{Object.defineProperty(e,r,{get(){return(...i)=>n.bind(t)(...i)},enumerable:!1})}),e}var Qn={get reactive(){return T},get release(){return L},get effect(){return I},get raw(){return rt},version:"3.13.2",flushAndStopDeferringMutations:ar,dontAutoEvaluateFunctions:Pe,disableEffectScheduling:Vt,startObservingMutations:ce,stopObservingMutations:lt,setReactivityEngine:Ht,onAttributeRemoved:Oe,onAttributesAdded:Se,closestDataStack:$,skipDuringClone:B,onlyDuringClone:Er,addRootSelector:Ee,addInitSelector:ve,addScopeToNode:N,deferMutations:sr,mapAttributes:te,evaluateLater:x,interceptInit:Qt,setEvaluator:fr,mergeProxies:j,extractProp:Nr,findClosest:Z,onElRemoved:Q,closestRoot:U,destroyTree:ae,interceptor:Re,transition:Le,setStyles:G,mutateDom:h,directive:d,entangle:Fe,throttle:je,debounce:$e,evaluate:R,initTree:S,nextTick:re,prefixed:C,prefix:dr,plugin:Ir,magic:y,store:kr,start:Wt,clone:Sr,cloneNode:vr,bound:Mr,$data:Ce,walk:O,data:Kr,bind:jr},F=Qn;function Ot(e,t){let r=Object.create(null),n=e.split(",");for(let i=0;i<n.length;i++)r[n[i]]=!0;return t?i=>!!r[i.toLowerCase()]:i=>!!r[i]}var ei="itemscope,allowfullscreen,formnovalidate,ismap,nomodule,novalidate,readonly";var Rs=Ot(ei+",async,autofocus,autoplay,controls,default,defer,disabled,hidden,loop,open,required,reversed,scoped,seamless,checked,muted,multiple,selected");var Vr=Object.freeze({}),Ms=Object.freeze([]);var ti=Object.prototype.hasOwnProperty,ge=(e,t)=>ti.call(e,t),K=Array.isArray,ne=e=>Hr(e)==="[object Map]";var ri=e=>typeof e=="string",Be=e=>typeof e=="symbol",xe=e=>e!==null&&typeof e=="object";var ni=Object.prototype.toString,Hr=e=>ni.call(e),Ct=e=>Hr(e).slice(8,-1);var Ke=e=>ri(e)&&e!=="NaN"&&e[0]!=="-"&&""+parseInt(e,10)===e;var ze=e=>{let t=Object.create(null);return r=>t[r]||(t[r]=e(r))},ii=/-(\w)/g,Ns=ze(e=>e.replace(ii,(t,r)=>r?r.toUpperCase():"")),oi=/\B([A-Z])/g,Ps=ze(e=>e.replace(oi,"-$1").toLowerCase()),Tt=ze(e=>e.charAt(0).toUpperCase()+e.slice(1)),Is=ze(e=>e?`on${Tt(e)}`:""),Rt=(e,t)=>e!==t&&(e===e||t===t);var Mt=new WeakMap,ye=[],P,Y=Symbol("iterate"),Nt=Symbol("Map key iterate");function si(e){return e&&e._isEffect===!0}function Yr(e,t=Vr){si(e)&&(e=e.raw);let r=ci(e,t);return t.lazy||r(),r}function Xr(e){e.active&&(Zr(e),e.options.onStop&&e.options.onStop(),e.active=!1)}var ai=0;function ci(e,t){let r=function(){if(!r.active)return e();if(!ye.includes(r)){Zr(r);try{return ui(),ye.push(r),P=r,e()}finally{ye.pop(),Qr(),P=ye[ye.length-1]}}};return r.id=ai++,r.allowRecurse=!!t.allowRecurse,r._isEffect=!0,r.active=!0,r.raw=e,r.deps=[],r.options=t,r}function Zr(e){let{deps:t}=e;if(t.length){for(let r=0;r<t.length;r++)t[r].delete(e);t.length=0}}var ie=!0,It=[];function li(){It.push(ie),ie=!1}function ui(){It.push(ie),ie=!0}function Qr(){let e=It.pop();ie=e===void 0?!0:e}function M(e,t,r){if(!ie||P===void 0)return;let n=Mt.get(e);n||Mt.set(e,n=new Map);let i=n.get(r);i||n.set(r,i=new Set),i.has(P)||(i.add(P),P.deps.push(i),P.options.onTrack&&P.options.onTrack({effect:P,target:e,type:t,key:r}))}function V(e,t,r,n,i,o){let s=Mt.get(e);if(!s)return;let a=new Set,c=u=>{u&&u.forEach(p=>{(p!==P||p.allowRecurse)&&a.add(p)})};if(t==="clear")s.forEach(c);else if(r==="length"&&K(e))s.forEach((u,p)=>{(p==="length"||p>=n)&&c(u)});else switch(r!==void 0&&c(s.get(r)),t){case"add":K(e)?Ke(r)&&c(s.get("length")):(c(s.get(Y)),ne(e)&&c(s.get(Nt)));break;case"delete":K(e)||(c(s.get(Y)),ne(e)&&c(s.get(Nt)));break;case"set":ne(e)&&c(s.get(Y));break}let l=u=>{u.options.onTrigger&&u.options.onTrigger({effect:u,target:e,key:r,type:t,newValue:n,oldValue:i,oldTarget:o}),u.options.scheduler?u.options.scheduler(u):u()};a.forEach(l)}var fi=Ot("__proto__,__v_isRef,__isVue"),en=new Set(Object.getOwnPropertyNames(Symbol).map(e=>Symbol[e]).filter(Be)),di=tn();var pi=tn(!0);var qr=mi();function mi(){let e={};return["includes","indexOf","lastIndexOf"].forEach(t=>{e[t]=function(...r){let n=_(this);for(let o=0,s=this.length;o<s;o++)M(n,"get",o+"");let i=n[t](...r);return i===-1||i===!1?n[t](...r.map(_)):i}}),["push","pop","shift","unshift","splice"].forEach(t=>{e[t]=function(...r){li();let n=_(this)[t].apply(this,r);return Qr(),n}}),e}function tn(e=!1,t=!1){return function(n,i,o){if(i==="__v_isReactive")return!e;if(i==="__v_isReadonly")return e;if(i==="__v_raw"&&o===(e?t?Mi:sn:t?Ri:on).get(n))return n;let s=K(n);if(!e&&s&&ge(qr,i))return Reflect.get(qr,i,o);let a=Reflect.get(n,i,o);return(Be(i)?en.has(i):fi(i))||(e||M(n,"get",i),t)?a:Pt(a)?!s||!Ke(i)?a.value:a:xe(a)?e?an(a):Je(a):a}}var hi=_i();function _i(e=!1){return function(r,n,i,o){let s=r[n];if(!e&&(i=_(i),s=_(s),!K(r)&&Pt(s)&&!Pt(i)))return s.value=i,!0;let a=K(r)&&Ke(n)?Number(n)<r.length:ge(r,n),c=Reflect.set(r,n,i,o);return r===_(o)&&(a?Rt(i,s)&&V(r,"set",n,i,s):V(r,"add",n,i)),c}}function gi(e,t){let r=ge(e,t),n=e[t],i=Reflect.deleteProperty(e,t);return i&&r&&V(e,"delete",t,void 0,n),i}function xi(e,t){let r=Reflect.has(e,t);return(!Be(t)||!en.has(t))&&M(e,"has",t),r}function yi(e){return M(e,"iterate",K(e)?"length":Y),Reflect.ownKeys(e)}var bi={get:di,set:hi,deleteProperty:gi,has:xi,ownKeys:yi},wi={get:pi,set(e,t){return console.warn(`Set operation on key "${String(t)}" failed: target is readonly.`,e),!0},deleteProperty(e,t){return console.warn(`Delete operation on key "${String(t)}" failed: target is readonly.`,e),!0}};var Dt=e=>xe(e)?Je(e):e,kt=e=>xe(e)?an(e):e,Lt=e=>e,Ge=e=>Reflect.getPrototypeOf(e);function Ve(e,t,r=!1,n=!1){e=e.__v_raw;let i=_(e),o=_(t);t!==o&&!r&&M(i,"get",t),!r&&M(i,"get",o);let{has:s}=Ge(i),a=n?Lt:r?kt:Dt;if(s.call(i,t))return a(e.get(t));if(s.call(i,o))return a(e.get(o));e!==i&&e.get(t)}function He(e,t=!1){let r=this.__v_raw,n=_(r),i=_(e);return e!==i&&!t&&M(n,"has",e),!t&&M(n,"has",i),e===i?r.has(e):r.has(e)||r.has(i)}function qe(e,t=!1){return e=e.__v_raw,!t&&M(_(e),"iterate",Y),Reflect.get(e,"size",e)}function Ur(e){e=_(e);let t=_(this);return Ge(t).has.call(t,e)||(t.add(e),V(t,"add",e,e)),this}function Wr(e,t){t=_(t);let r=_(this),{has:n,get:i}=Ge(r),o=n.call(r,e);o?nn(r,n,e):(e=_(e),o=n.call(r,e));let s=i.call(r,e);return r.set(e,t),o?Rt(t,s)&&V(r,"set",e,t,s):V(r,"add",e,t),this}function Gr(e){let t=_(this),{has:r,get:n}=Ge(t),i=r.call(t,e);i?nn(t,r,e):(e=_(e),i=r.call(t,e));let o=n?n.call(t,e):void 0,s=t.delete(e);return i&&V(t,"delete",e,void 0,o),s}function Jr(){let e=_(this),t=e.size!==0,r=ne(e)?new Map(e):new Set(e),n=e.clear();return t&&V(e,"clear",void 0,void 0,r),n}function Ue(e,t){return function(n,i){let o=this,s=o.__v_raw,a=_(s),c=t?Lt:e?kt:Dt;return!e&&M(a,"iterate",Y),s.forEach((l,u)=>n.call(i,c(l),c(u),o))}}function We(e,t,r){return function(...n){let i=this.__v_raw,o=_(i),s=ne(o),a=e==="entries"||e===Symbol.iterator&&s,c=e==="keys"&&s,l=i[e](...n),u=r?Lt:t?kt:Dt;return!t&&M(o,"iterate",c?Nt:Y),{next(){let{value:p,done:m}=l.next();return m?{value:p,done:m}:{value:a?[u(p[0]),u(p[1])]:u(p),done:m}},[Symbol.iterator](){return this}}}}function z(e){return function(...t){{let r=t[0]?`on key "${t[0]}" `:"";console.warn(`${Tt(e)} operation ${r}failed: target is readonly.`,_(this))}return e==="delete"?!1:this}}function Ei(){let e={get(o){return Ve(this,o)},get size(){return qe(this)},has:He,add:Ur,set:Wr,delete:Gr,clear:Jr,forEach:Ue(!1,!1)},t={get(o){return Ve(this,o,!1,!0)},get size(){return qe(this)},has:He,add:Ur,set:Wr,delete:Gr,clear:Jr,forEach:Ue(!1,!0)},r={get(o){return Ve(this,o,!0)},get size(){return qe(this,!0)},has(o){return He.call(this,o,!0)},add:z("add"),set:z("set"),delete:z("delete"),clear:z("clear"),forEach:Ue(!0,!1)},n={get(o){return Ve(this,o,!0,!0)},get size(){return qe(this,!0)},has(o){return He.call(this,o,!0)},add:z("add"),set:z("set"),delete:z("delete"),clear:z("clear"),forEach:Ue(!0,!0)};return["keys","values","entries",Symbol.iterator].forEach(o=>{e[o]=We(o,!1,!1),r[o]=We(o,!0,!1),t[o]=We(o,!1,!0),n[o]=We(o,!0,!0)}),[e,r,t,n]}var[vi,Si,Ai,Oi]=Ei();function rn(e,t){let r=t?e?Oi:Ai:e?Si:vi;return(n,i,o)=>i==="__v_isReactive"?!e:i==="__v_isReadonly"?e:i==="__v_raw"?n:Reflect.get(ge(r,i)&&i in n?r:n,i,o)}var Ci={get:rn(!1,!1)};var Ti={get:rn(!0,!1)};function nn(e,t,r){let n=_(r);if(n!==r&&t.call(e,n)){let i=Ct(e);console.warn(`Reactive ${i} contains both the raw and reactive versions of the same object${i==="Map"?" as keys":""}, which can lead to inconsistencies. Avoid differentiating between the raw and reactive versions of an object and only use the reactive version if possible.`)}}var on=new WeakMap,Ri=new WeakMap,sn=new WeakMap,Mi=new WeakMap;function Ni(e){switch(e){case"Object":case"Array":return 1;case"Map":case"Set":case"WeakMap":case"WeakSet":return 2;default:return 0}}function Pi(e){return e.__v_skip||!Object.isExtensible(e)?0:Ni(Ct(e))}function Je(e){return e&&e.__v_isReadonly?e:cn(e,!1,bi,Ci,on)}function an(e){return cn(e,!0,wi,Ti,sn)}function cn(e,t,r,n,i){if(!xe(e))return console.warn(`value cannot be made reactive: ${String(e)}`),e;if(e.__v_raw&&!(t&&e.__v_isReactive))return e;let o=i.get(e);if(o)return o;let s=Pi(e);if(s===0)return e;let a=new Proxy(e,s===2?n:r);return i.set(e,a),a}function _(e){return e&&_(e.__v_raw)||e}function Pt(e){return Boolean(e&&e.__v_isRef===!0)}y("nextTick",()=>re);y("dispatch",e=>q.bind(q,e));y("watch",(e,{evaluateLater:t,effect:r})=>(n,i)=>{let o=t(n),s=!0,a,c=r(()=>o(l=>{JSON.stringify(l),s?a=l:queueMicrotask(()=>{i(l,a),a=l}),s=!1}));e._x_effects.delete(c)});y("store",Lr);y("data",e=>Ce(e));y("root",e=>U(e));y("refs",e=>(e._x_refs_proxy||(e._x_refs_proxy=j(Ii(e))),e._x_refs_proxy));function Ii(e){let t=[],r=e;for(;r;)r._x_refs&&t.push(r._x_refs),r=r.parentNode;return t}var $t={};function jt(e){return $t[e]||($t[e]=0),++$t[e]}function ln(e,t){return Z(e,r=>{if(r._x_ids&&r._x_ids[t])return!0})}function un(e,t){e._x_ids||(e._x_ids={}),e._x_ids[t]||(e._x_ids[t]=jt(t))}y("id",e=>(t,r=null)=>{let n=ln(e,t),i=n?n._x_ids[t]:jt(t);return r?`${t}-${i}-${r}`:`${t}-${i}`});y("el",e=>e);fn("Focus","focus","focus");fn("Persist","persist","persist");function fn(e,t,r){y(t,n=>v(`You can't use [$${t}] without first installing the "${e}" plugin here: https://alpinejs.dev/plugins/${r}`,n))}d("modelable",(e,{expression:t},{effect:r,evaluateLater:n,cleanup:i})=>{let o=n(t),s=()=>{let u;return o(p=>u=p),u},a=n(`${t} = __placeholder`),c=u=>a(()=>{},{scope:{__placeholder:u}}),l=s();c(l),queueMicrotask(()=>{if(!e._x_model)return;e._x_removeModelListeners.default();let u=e._x_model.get,p=e._x_model.set,m=Fe({get(){return u()},set(w){p(w)}},{get(){return s()},set(w){c(w)}});i(m)})});d("teleport",(e,{modifiers:t,expression:r},{cleanup:n})=>{e.tagName.toLowerCase()!=="template"&&v("x-teleport can only be used on a <template> tag",e);let i=dn(r),o=e.content.cloneNode(!0).firstElementChild;e._x_teleport=o,o._x_teleportBack=e,e.setAttribute("data-teleport-template",!0),o.setAttribute("data-teleport-target",!0),e._x_forwardEvents&&e._x_forwardEvents.forEach(a=>{o.addEventListener(a,c=>{c.stopPropagation(),e.dispatchEvent(new c.constructor(c.type,c))})}),N(o,{},e);let s=(a,c,l)=>{l.includes("prepend")?c.parentNode.insertBefore(a,c):l.includes("append")?c.parentNode.insertBefore(a,c.nextSibling):c.appendChild(a)};h(()=>{s(o,i,t),S(o),o._x_ignore=!0}),e._x_teleportPutBack=()=>{let a=dn(r);h(()=>{s(e._x_teleport,a,t)})},n(()=>o.remove())});var Di=document.createElement("div");function dn(e){let t=B(()=>document.querySelector(e),()=>Di)();return t||v(`Cannot find x-teleport element for selector: "${e}"`),t}var pn=()=>{};pn.inline=(e,{modifiers:t},{cleanup:r})=>{t.includes("self")?e._x_ignoreSelf=!0:e._x_ignore=!0,r(()=>{t.includes("self")?delete e._x_ignoreSelf:delete e._x_ignore})};d("ignore",pn);d("effect",(e,{expression:t},{effect:r})=>r(x(e,t)));function oe(e,t,r,n){let i=e,o=c=>n(c),s={},a=(c,l)=>u=>l(c,u);if(r.includes("dot")&&(t=ki(t)),r.includes("camel")&&(t=Li(t)),r.includes("passive")&&(s.passive=!0),r.includes("capture")&&(s.capture=!0),r.includes("window")&&(i=window),r.includes("document")&&(i=document),r.includes("debounce")){let c=r[r.indexOf("debounce")+1]||"invalid-wait",l=Ye(c.split("ms")[0])?Number(c.split("ms")[0]):250;o=$e(o,l)}if(r.includes("throttle")){let c=r[r.indexOf("throttle")+1]||"invalid-wait",l=Ye(c.split("ms")[0])?Number(c.split("ms")[0]):250;o=je(o,l)}return r.includes("prevent")&&(o=a(o,(c,l)=>{l.preventDefault(),c(l)})),r.includes("stop")&&(o=a(o,(c,l)=>{l.stopPropagation(),c(l)})),r.includes("self")&&(o=a(o,(c,l)=>{l.target===e&&c(l)})),(r.includes("away")||r.includes("outside"))&&(i=document,o=a(o,(c,l)=>{e.contains(l.target)||l.target.isConnected!==!1&&(e.offsetWidth<1&&e.offsetHeight<1||e._x_isShown!==!1&&c(l))})),r.includes("once")&&(o=a(o,(c,l)=>{c(l),i.removeEventListener(t,o,s)})),o=a(o,(c,l)=>{ji(t)&&Fi(l,r)||c(l)}),i.addEventListener(t,o,s),()=>{i.removeEventListener(t,o,s)}}function ki(e){return e.replace(/-/g,".")}function Li(e){return e.toLowerCase().replace(/-(\w)/g,(t,r)=>r.toUpperCase())}function Ye(e){return!Array.isArray(e)&&!isNaN(e)}function $i(e){return[" ","_"].includes(e)?e:e.replace(/([a-z])([A-Z])/g,"$1-$2").replace(/[_\s]/,"-").toLowerCase()}function ji(e){return["keydown","keyup"].includes(e)}function Fi(e,t){let r=t.filter(o=>!["window","document","prevent","stop","once","capture"].includes(o));if(r.includes("debounce")){let o=r.indexOf("debounce");r.splice(o,Ye((r[o+1]||"invalid-wait").split("ms")[0])?2:1)}if(r.includes("throttle")){let o=r.indexOf("throttle");r.splice(o,Ye((r[o+1]||"invalid-wait").split("ms")[0])?2:1)}if(r.length===0||r.length===1&&mn(e.key).includes(r[0]))return!1;let i=["ctrl","shift","alt","meta","cmd","super"].filter(o=>r.includes(o));return r=r.filter(o=>!i.includes(o)),!(i.length>0&&i.filter(s=>((s==="cmd"||s==="super")&&(s="meta"),e[`${s}Key`])).length===i.length&&mn(e.key).includes(r[0]))}function mn(e){if(!e)return[];e=$i(e);let t={ctrl:"control",slash:"/",space:" ",spacebar:" ",cmd:"meta",esc:"escape",up:"arrow-up",down:"arrow-down",left:"arrow-left",right:"arrow-right",period:".",equal:"=",minus:"-",underscore:"_"};return t[e]=e,Object.keys(t).map(r=>{if(t[r]===e)return r}).filter(r=>r)}d("model",(e,{modifiers:t,expression:r},{effect:n,cleanup:i})=>{let o=e;t.includes("parent")&&(o=e.parentNode);let s=x(o,r),a;typeof r=="string"?a=x(o,`${r} = __placeholder`):typeof r=="function"&&typeof r()=="string"?a=x(o,`${r()} = __placeholder`):a=()=>{};let c=()=>{let m;return s(w=>m=w),hn(m)?m.get():m},l=m=>{let w;s(k=>w=k),hn(w)?w.set(m):a(()=>{},{scope:{__placeholder:m}})};typeof r=="string"&&e.type==="radio"&&h(()=>{e.hasAttribute("name")||e.setAttribute("name",r)});var u=e.tagName.toLowerCase()==="select"||["checkbox","radio"].includes(e.type)||t.includes("lazy")?"change":"input";let p=D?()=>{}:oe(e,u,t,m=>{l(Bi(e,t,m,c()))});if(t.includes("fill")&&([null,""].includes(c())||e.type==="checkbox"&&Array.isArray(c()))&&e.dispatchEvent(new Event(u,{})),e._x_removeModelListeners||(e._x_removeModelListeners={}),e._x_removeModelListeners.default=p,i(()=>e._x_removeModelListeners.default()),e.form){let m=oe(e.form,"reset",[],w=>{re(()=>e._x_model&&e._x_model.set(e.value))});i(()=>m())}e._x_model={get(){return c()},set(m){l(m)}},e._x_forceModelUpdate=m=>{m===void 0&&typeof r=="string"&&r.match(/\./)&&(m=""),window.fromModel=!0,h(()=>_e(e,"value",m)),delete window.fromModel},n(()=>{let m=c();t.includes("unintrusive")&&document.activeElement.isSameNode(e)||e._x_forceModelUpdate(m)})});function Bi(e,t,r,n){return h(()=>{if(r instanceof CustomEvent&&r.detail!==void 0)return r.detail!==null&&r.detail!==void 0?r.detail:r.target.value;if(e.type==="checkbox")if(Array.isArray(n)){let i=t.includes("number")?Ft(r.target.value):r.target.value;return r.target.checked?n.concat([i]):n.filter(o=>!Ki(o,i))}else return r.target.checked;else{if(e.tagName.toLowerCase()==="select"&&e.multiple)return t.includes("number")?Array.from(r.target.selectedOptions).map(i=>{let o=i.value||i.text;return Ft(o)}):Array.from(r.target.selectedOptions).map(i=>i.value||i.text);{let i=r.target.value;return t.includes("number")?Ft(i):t.includes("trim")?i.trim():i}}})}function Ft(e){let t=e?parseFloat(e):null;return zi(t)?t:e}function Ki(e,t){return e==t}function zi(e){return!Array.isArray(e)&&!isNaN(e)}function hn(e){return e!==null&&typeof e=="object"&&typeof e.get=="function"&&typeof e.set=="function"}d("cloak",e=>queueMicrotask(()=>h(()=>e.removeAttribute(C("cloak")))));ve(()=>`[${C("init")}]`);d("init",B((e,{expression:t},{evaluate:r})=>typeof t=="string"?!!t.trim()&&r(t,{},!1):r(t,{},!1)));d("text",(e,{expression:t},{effect:r,evaluateLater:n})=>{let i=n(t);r(()=>{i(o=>{h(()=>{e.textContent=o})})})});d("html",(e,{expression:t},{effect:r,evaluateLater:n})=>{let i=n(t);r(()=>{i(o=>{h(()=>{e.innerHTML=o,e._x_ignoreSelf=!0,S(e),delete e._x_ignoreSelf})})})});te(Ie(":",De(C("bind:"))));var _n=(e,{value:t,modifiers:r,expression:n,original:i},{effect:o})=>{if(!t){let a={};Fr(a),x(e,n)(l=>{At(e,l,i)},{scope:a});return}if(t==="key")return Vi(e,n);if(e._x_inlineBindings&&e._x_inlineBindings[t]&&e._x_inlineBindings[t].extract)return;let s=x(e,n);o(()=>s(a=>{a===void 0&&typeof n=="string"&&n.match(/\./)&&(a=""),h(()=>_e(e,t,a,r))}))};_n.inline=(e,{value:t,modifiers:r,expression:n})=>{t&&(e._x_inlineBindings||(e._x_inlineBindings={}),e._x_inlineBindings[t]={expression:n,extract:!1})};d("bind",_n);function Vi(e,t){e._x_keyExpression=t}Ee(()=>`[${C("data")}]`);d("data",(e,{expression:t},{cleanup:r})=>{if(Or(e))return;t=t===""?"{}":t;let n={};fe(n,e);let i={};zr(i,n);let o=R(e,t,{scope:i});(o===void 0||o===!0)&&(o={}),fe(o,e);let s=T(o);Te(s);let a=N(e,s);s.init&&R(e,s.init),r(()=>{s.destroy&&R(e,s.destroy),a()})});d("show",(e,{modifiers:t,expression:r},{effect:n})=>{let i=x(e,r);e._x_doHide||(e._x_doHide=()=>{h(()=>{e.style.setProperty("display","none",t.includes("important")?"important":void 0)})}),e._x_doShow||(e._x_doShow=()=>{h(()=>{e.style.length===1&&e.style.display==="none"?e.removeAttribute("style"):e.style.removeProperty("display")})});let o=()=>{e._x_doHide(),e._x_isShown=!1},s=()=>{e._x_doShow(),e._x_isShown=!0},a=()=>setTimeout(s),c=me(p=>p?s():o(),p=>{typeof e._x_toggleAndCascadeWithTransitions=="function"?e._x_toggleAndCascadeWithTransitions(e,p,s,o):p?a():o()}),l,u=!0;n(()=>i(p=>{!u&&p===l||(t.includes("immediate")&&(p?a():o()),c(p),l=p,u=!1)}))});d("for",(e,{expression:t},{effect:r,cleanup:n})=>{let i=qi(t),o=x(e,i.items),s=x(e,e._x_keyExpression||"index");e._x_prevKeys=[],e._x_lookup={},r(()=>Hi(e,i,o,s)),n(()=>{Object.values(e._x_lookup).forEach(a=>a.remove()),delete e._x_prevKeys,delete e._x_lookup})});function Hi(e,t,r,n){let i=s=>typeof s=="object"&&!Array.isArray(s),o=e;r(s=>{Ui(s)&&s>=0&&(s=Array.from(Array(s).keys(),f=>f+1)),s===void 0&&(s=[]);let a=e._x_lookup,c=e._x_prevKeys,l=[],u=[];if(i(s))s=Object.entries(s).map(([f,g])=>{let b=gn(t,g,f,s);n(E=>u.push(E),{scope:{index:f,...b}}),l.push(b)});else for(let f=0;f<s.length;f++){let g=gn(t,s[f],f,s);n(b=>u.push(b),{scope:{index:f,...g}}),l.push(g)}let p=[],m=[],w=[],k=[];for(let f=0;f<c.length;f++){let g=c[f];u.indexOf(g)===-1&&w.push(g)}c=c.filter(f=>!w.includes(f));let be="template";for(let f=0;f<u.length;f++){let g=u[f],b=c.indexOf(g);if(b===-1)c.splice(f,0,g),p.push([be,f]);else if(b!==f){let E=c.splice(f,1)[0],A=c.splice(b-1,1)[0];c.splice(f,0,A),c.splice(b,0,E),m.push([E,A])}else k.push(g);be=g}for(let f=0;f<w.length;f++){let g=w[f];a[g]._x_effects&&a[g]._x_effects.forEach(we),a[g].remove(),a[g]=null,delete a[g]}for(let f=0;f<m.length;f++){let[g,b]=m[f],E=a[g],A=a[b],X=document.createElement("div");h(()=>{A||v('x-for ":key" is undefined or invalid',o),A.after(X),E.after(A),A._x_currentIfEl&&A.after(A._x_currentIfEl),X.before(E),E._x_currentIfEl&&E.after(E._x_currentIfEl),X.remove()}),A._x_refreshXForScope(l[u.indexOf(b)])}for(let f=0;f<p.length;f++){let[g,b]=p[f],E=g==="template"?o:a[g];E._x_currentIfEl&&(E=E._x_currentIfEl);let A=l[b],X=u[b],se=document.importNode(o.content,!0).firstElementChild,Kt=T(A);N(se,Kt,o),se._x_refreshXForScope=yn=>{Object.entries(yn).forEach(([bn,wn])=>{Kt[bn]=wn})},h(()=>{E.after(se),S(se)}),typeof X=="object"&&v("x-for key cannot be an object, it must be a string or an integer",o),a[X]=se}for(let f=0;f<k.length;f++)a[k[f]]._x_refreshXForScope(l[u.indexOf(k[f])]);o._x_prevKeys=u})}function qi(e){let t=/,([^,\}\]]*)(?:,([^,\}\]]*))?$/,r=/^\s*\(|\)\s*$/g,n=/([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/,i=e.match(n);if(!i)return;let o={};o.items=i[2].trim();let s=i[1].replace(r,"").trim(),a=s.match(t);return a?(o.item=s.replace(t,"").trim(),o.index=a[1].trim(),a[2]&&(o.collection=a[2].trim())):o.item=s,o}function gn(e,t,r,n){let i={};return/^\[.*\]$/.test(e.item)&&Array.isArray(t)?e.item.replace("[","").replace("]","").split(",").map(s=>s.trim()).forEach((s,a)=>{i[s]=t[a]}):/^\{.*\}$/.test(e.item)&&!Array.isArray(t)&&typeof t=="object"?e.item.replace("{","").replace("}","").split(",").map(s=>s.trim()).forEach(s=>{i[s]=t[s]}):i[e.item]=t,e.index&&(i[e.index]=r),e.collection&&(i[e.collection]=n),i}function Ui(e){return!Array.isArray(e)&&!isNaN(e)}function xn(){}xn.inline=(e,{expression:t},{cleanup:r})=>{let n=U(e);n._x_refs||(n._x_refs={}),n._x_refs[t]=e,r(()=>delete n._x_refs[t])};d("ref",xn);d("if",(e,{expression:t},{effect:r,cleanup:n})=>{e.tagName.toLowerCase()!=="template"&&v("x-if can only be used on a <template> tag",e);let i=x(e,t),o=()=>{if(e._x_currentIfEl)return e._x_currentIfEl;let a=e.content.cloneNode(!0).firstElementChild;return N(a,{},e),h(()=>{e.after(a),S(a)}),e._x_currentIfEl=a,e._x_undoIf=()=>{O(a,c=>{c._x_effects&&c._x_effects.forEach(we)}),a.remove(),delete e._x_currentIfEl},a},s=()=>{e._x_undoIf&&(e._x_undoIf(),delete e._x_undoIf)};r(()=>i(a=>{a?o():s()})),n(()=>e._x_undoIf&&e._x_undoIf())});d("id",(e,{expression:t},{evaluate:r})=>{r(t).forEach(i=>un(e,i))});te(Ie("@",De(C("on:"))));d("on",B((e,{value:t,modifiers:r,expression:n},{cleanup:i})=>{let o=n?x(e,n):()=>{};e.tagName.toLowerCase()==="template"&&(e._x_forwardEvents||(e._x_forwardEvents=[]),e._x_forwardEvents.includes(t)||e._x_forwardEvents.push(t));let s=oe(e,t,r,a=>{o(()=>{},{scope:{$event:a},params:[a]})});i(()=>s())}));Xe("Collapse","collapse","collapse");Xe("Intersect","intersect","intersect");Xe("Focus","trap","focus");Xe("Mask","mask","mask");function Xe(e,t,r){d(t,n=>v(`You can't use [x-${t}] without first installing the "${e}" plugin here: https://alpinejs.dev/plugins/${r}`,n))}F.setEvaluator(ht);F.setReactivityEngine({reactive:Je,effect:Yr,release:Xr,raw:_});var Bt=F;window.Alpine=Bt;queueMicrotask(()=>{Bt.start()});})();
diff --git a/wms/cont/js/pricereviewAlpine.js b/wms/cont/js/pricereviewAlpine.js
new file mode 100644
index 00000000..6c21d29d
--- /dev/null
+++ b/wms/cont/js/pricereviewAlpine.js
@@ -0,0 +1,7 @@
+const pricereviewCreate = ()=>{
+    return {
+        init(){
+            console.log(123);
+        },
+    }
+}
\ No newline at end of file
diff --git a/wms/cont/pricereviewCheck.php b/wms/cont/pricereviewCheck.php
new file mode 100644
index 00000000..2225044c
--- /dev/null
+++ b/wms/cont/pricereviewCheck.php
@@ -0,0 +1,4 @@
+<?php 
+
+include_once "../header.php";
+require_once('../mkt/conn.php');
diff --git a/wms/cont/pricereviewCreate.php b/wms/cont/pricereviewCreate.php
new file mode 100644
index 00000000..1ac0efbe
--- /dev/null
+++ b/wms/cont/pricereviewCreate.php
@@ -0,0 +1,143 @@
+<?php 
+
+include_once "../header.php";
+require_once "../mkt/conn.php";
+
+?>
+<link rel="stylesheet" href="./css/pricereview.css">
+<script src="https://cdnjs.cloudflare.com/ajax/libs/axios/1.5.0/axios.min.js" integrity="sha512-aoTNnqZcT8B4AmeCFmiSnDlc4Nj/KPaZyB5G7JnOnUEkdNpCZs1LCankiYi01sLTyWy+m2P+W4XM+BuQ3Q4/Dg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script defer src="./js/alpinejs/cdn.min.js"></script>
+<script src="./js/pricereviewAlpine.js"></script>
+<div id="pricereviewCreate" x-data=pricereviewCreate()>
+    <div class="container">
+        <table class="table" border="1">
+                <thead >
+                    <tr class="" >
+                    <th scope="col" class="text-center " colspan="8">有望客戶(契約)基本資料</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <th>評審單號</th>
+                        <td><input class="form-control" type="text" disabled value="" /></td>
+                        <th>卷號</th>
+                        <td><input class="form-control" type="text" disabled value="" /></td>
+                        <th>現場地址</th>
+                        <td><input class="form-control" type="text" disabled value="" /></td>
+                        <th>現場名稱</th>
+                        <td><input class="form-control" type="text" disabled value="" /></td>
+                    </tr>
+                    <tr>
+                        <th>電梯品牌</th>
+                        <td><input class="form-control" type="text" disabled value="" /></td>
+                        <th>數量</th>
+                        <td><input class="form-control" type="number" disabled value="" /></td>
+                        <th>營業員</th>
+                        <td><input class="form-control" type="text" disabled value="" /></td>
+                        <th>保養方式</th>
+                        <td>
+                            <select class="form-control" disabled>
+                                <option value=""></option>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>契約期限開始</th>
+                        <td><input class="form-control" type="date" disabled value="" /></td>
+                        <th>契約期限結束</th>
+                        <td><input class="form-control" type="date" disabled value="" /></td>
+                        <th>契約性質</th>
+                        <td>
+                            <select class="form-control" disabled>
+                                <option value=""></option>
+                                <option value="">新簽約</option>
+                                <option value="">免保轉有費</option>
+                                <option value="">續約</option>
+                            </select>
+                        </td>
+                        <th>介紹人</th>
+                        <td><input class="form-control" type="text" disabled value="" /></td>
+                    </tr>
+                    <tr>
+                        <th>付款方式</th>
+                        <td>
+                            <select class="form-control" disabled>
+                                <option value=""></option>
+                                <option value="">月付</option>
+                                <option value="">季付</option>
+                                <option value="">半年付</option>
+                                <option value="">年付</option>
+                            </select>
+                        </td>
+                        <th></th>
+                        <td></td>
+                        <th></th>
+                        <td></td>
+                        <th></th>
+                        <td></td>
+                    </tr>
+                </tbody>
+        </table>
+        <table class="table" border="1">
+            <thead >
+                <tr class="" >
+                <th scope="col" class="text-center " colspan="8">洽商進度</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td colspan=8>
+                        <textarea class="form-control" name="progress" id="progress" cols="20" rows="5" disabled ></textarea>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        <table class="table" border="1">
+            <thead >
+                <tr class="" >
+                <th scope="col" class="text-center " colspan="8">電梯詳細資料</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td colspan=8>
+                        <textarea class="form-control" name="progress" id="progress" cols="20" rows="6" disabled>註意事項:
+1.速度單位是 米/分.
+2.選擇贈送M1,保養月數需填寫60.
+3.標準價格未帶出,請聯係業務部建立該規格報價.
+4.無機房速度20~60米 以60米為標準.
+                        </textarea>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        <div class="pricreviewmain container">
+            <div class="divitem">
+                <div class="title">
+                    <h4>整機單價</h4>
+                    <button class="addbtn btn" x-ref="addElevatorBtn" @click="openCreateElevatorModal()" >+</button>
+                </div>
+                <table class="table" border=1>
+                    <thead>
+                        <tr>
+                            <th>項次</th>
+                            <th>電梯</th>
+                            <th>人乘</th>
+                            <th>載重(KG)</th>
+                            <th>停數</th>
+                            <th>速度(m/min)</th>
+                            <th>開門方式</th>
+                            <th>規格</th>
+                            <th>公司發布價(台)</th>
+                            <th>數量</th>
+                            <th>公司發布價(總價)</th>
+                            <th>售價(台)</th>
+                            <th>售價(總價) </th>
+                        </tr>
+                    </thead>
+                    
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/wms/contract/api/postContractData.php b/wms/contract/api/postContractData.php
index 29038b9f..6eb6dcaa 100644
--- a/wms/contract/api/postContractData.php
+++ b/wms/contract/api/postContractData.php
@@ -213,7 +213,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
             $ADuseful_date = implode("-", $click);
 
             $sql_str = "INSERT INTO facility (contractno, define, facilityno, latitude, longitude, customerid, weight, numberofpassenger, numberofstop, numberoffloor, opentype, speed, repairtype, maintainance, facility_kind, address, repairerid, repairername, creater, create_at, area, takecertificatedate, licensedate)
-          VALUES (:contractno, :define, :facilityno, :latitude, :longitude, :customerid, :weight, :numberofpassenger, :numberofstop, :numberoffloor, :opentype, :speed, :repairtype, :maintainance, :facility_kind, :address, :repairerid, :repairername, :creater, :create_at, :area, :takecertificatedate, :licensedate)";
+            VALUES (:contractno, :define, :facilityno, :latitude, :longitude, :customerid, :weight, :numberofpassenger, :numberofstop, :numberoffloor, :opentype, :speed, :repairtype, :maintainance, :facility_kind, :address, :repairerid, :repairername, :creater, :create_at, :area, :takecertificatedate, :licensedate)";
             $stmt = $conn->prepare($sql_str);
             $stmt->bindParam(':contractno', $contractno);
             $stmt->bindParam(':define', $define);
diff --git a/wms/contract/api/postContractNewApplyData.php b/wms/contract/api/postContractNewApplyData.php
index e3ec18e5..7f2e2525 100644
--- a/wms/contract/api/postContractNewApplyData.php
+++ b/wms/contract/api/postContractNewApplyData.php
@@ -4,6 +4,7 @@ use function Symfony\Component\String\s;
 
 require_once("../conn.php");
 include_once("./upload_chk.php");
+include_once "./postFlow.php";
 ini_set('date.timezone', 'Asia/Taipei');
 if ($_SERVER['REQUEST_METHOD'] != 'POST') {
     exit();
@@ -42,6 +43,8 @@ if (isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] ==
     $status = $_POST['status']; // 0:暫存 1:送審 2:退回 3:完成
     $pays = json_decode($pays, true);
 
+    $form_key = $_POST['form_key'];
+
     $files = !empty($_FILES['files']) ? $_FILES['files'] : null;
 
 
@@ -160,6 +163,14 @@ if (isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] ==
                 }
             }
             // -----處理檔案上傳 END-----
+
+            if($status == 1){
+                $current_assigner = "M0175";
+                $flow_code = "A";
+                $ekind = "新梯";
+                createFlow($mid, $current_assigner, $flow_code, $ekind, $form_key);
+            }
+            
             header("HTTP/1.1 201 success!");
             $conn->commit();
         } else {
@@ -211,7 +222,6 @@ if (isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] ==
             }
             $deleted_at = date("Y-m-d H:i:s");
             $removefiles = isset($_POST['removefiles']) ? json_decode($_POST['removefiles'], true) : [];
-            print_r($removefiles);
             if(count($removefiles) > 0){
                 foreach($removefiles as $file){
                     $sql_str = "UPDATE contract_apply_files SET deleted_at = :deleted_at WHERE id = :fileid";
@@ -221,9 +231,18 @@ if (isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] ==
                     $stmt ->execute();
                 }
             }
+
+            if($status == 1){
+                $current_assigner = "M0175";
+                $flow_code = "A";
+                $ekind = "新梯";
+                createFlow($mid, $current_assigner, $flow_code, $ekind, $form_key);
+            }
+
             header("HTTP/1.1 201 success!");
             $conn->commit();
         }
+        
     } catch (PDOException $e) {
         $conn->rollback();
         header("HTTP/1.1 500 failed!");
@@ -268,6 +287,8 @@ if (isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] ==
     $progress = $_POST['progress'];
     $review_comment = $_POST['review_comment'];
     $user_id = $_POST['review_person_id'];
+    $form_key = $_POST['form_key'];
+    $mid = $contract_new_apply_id;
     $review_date = date('Y-m-d H:i:s');
     $conn->beginTransaction();
     try {
@@ -280,6 +301,13 @@ if (isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] ==
         $stmt->bindParam(':review_person_id', $user_id);
         $stmt->bindParam(':review_date', $review_date);
         $stmt->execute();
+       
+
+        //發送待簽通知
+        $current_assigner = "00000";
+        $flow_code = "Z";
+        $ekind = "新梯";
+        createFlow($mid, $current_assigner, $flow_code, $ekind, $form_key);
         header("HTTP/1.1 200 success!");
         $conn->commit();
     } catch (PDOException $e) {
@@ -297,6 +325,8 @@ if (isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] ==
     $progress = $_POST['progress'];
     $review_comment = $_POST['review_comment'];
     $user_id = $_POST['review_person_id'];
+    $form_key = $_POST['form_key'];
+    $mid = $contract_new_apply_id;
     echo $user_id;
     $review_date = date('Y-m-d H:i:s');
     $conn->beginTransaction();
@@ -310,6 +340,13 @@ if (isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] ==
         $stmt->bindParam(':review_person_id', $user_id);
         $stmt->bindParam(':review_date', $review_date);
         $stmt->execute();
+    
+
+        //發送待簽通知
+        $current_assigner = "00000";
+        $flow_code = "A";
+        $ekind = "新梯";
+        createFlow($mid, $current_assigner, $flow_code, $ekind, $form_key);
         header("HTTP/1.1 200 success!");
         $conn->commit();
     } catch (PDOException $e) {
diff --git a/wms/contract/api/postFlow.php b/wms/contract/api/postFlow.php
new file mode 100644
index 00000000..90368b1c
--- /dev/null
+++ b/wms/contract/api/postFlow.php
@@ -0,0 +1,58 @@
+<?php
+require_once("../conn.php");
+function createFlow($mid, $current_assigner, $flow_code, $ekind, $form_key=null){
+    global $conn;
+    $form_id = $mid;
+    $seq = 0;
+    $system_id = "cta";
+    if($ekind == "新梯") $flow_id = "cta01";
+    if($ekind == "汰改") $flow_id = "cta02";
+    if($ekind == "保養") $flow_id = "cta03";
+
+    if($form_key == null){
+        $sql_str = "SELECT appwms.nextval('form_key') form_key";
+        $stmt = $conn->prepare($sql_str);
+        $stmt->execute();
+        $result = $stmt->fetch(PDO::FETCH_ASSOC);
+        $form_key =  $result['form_key'];
+        $seq = 0;
+
+        $sql_str = "INSERT INTO flow (system_id, flow_id, form_id, form_key, flow_code)
+        VALUES (:system_id, :flow_id, :form_id, :form_key, :flow_code)";
+        $stmt = $conn->prepare($sql_str);
+        $stmt->bindParam(':system_id', $system_id);
+        $stmt->bindParam(':flow_id', $flow_id);
+        $stmt->bindParam(':form_id', $form_id);
+        $stmt->bindParam(':form_key', $form_key);
+        $stmt->bindParam(':flow_code', $flow_code);
+        $stmt->execute();
+    }else{
+        $sql_str = "UPDATE flow SET flow_code = :flow_code WHERE form_key = :form_key";
+        $stmt = $conn->prepare($sql_str);
+        $stmt->bindParam(':form_key', $form_key);
+        $stmt->bindParam(':flow_code', $flow_code);
+        $stmt->execute();
+
+        $sql_str = "SELECT MAX(seq) AS max_seq FROM subflow WHERE form_key = :form_key";
+        $stmt = $conn->prepare($sql_str);
+        $stmt->bindParam(':form_key', $form_key);
+        $stmt->execute();
+        $result = $stmt->fetch(PDO::FETCH_ASSOC);
+        $seq = $result['max_seq'];
+        $seq ++;
+    }
+    
+    $created_at = date("Y-m-d H:i:s");
+    $sql_str = "INSERT INTO subflow (form_key, seq, current_assigner, update_date,create_date)
+    VALUES (:form_key, :seq, :current_assigner, :update_date,:create_date)";
+    $stmt = $conn->prepare($sql_str);
+    $stmt->bindParam(':form_key', $form_key);
+    $stmt->bindParam(':seq', $seq);
+    $stmt->bindParam(':current_assigner', $current_assigner);
+    $stmt->bindParam(':update_date', $created_at);
+    $stmt->bindParam(':create_date', $created_at);
+    $stmt->execute();
+    
+
+    return $form_key;
+}
\ No newline at end of file
diff --git a/wms/contract/contract-new-apply.php b/wms/contract/contract-new-apply.php
index 74153c28..e315c28c 100644
--- a/wms/contract/contract-new-apply.php
+++ b/wms/contract/contract-new-apply.php
@@ -1,13 +1,45 @@
 <?php
 include_once("../header.php");
 require_once("./conn.php");
-if (!(isset($_GET['id']) && !empty($_GET['id']))) {
+if (!(isset($_GET['id']) && !empty($_GET['id'])) && !(isset($_GET['form_key']) && !empty($_GET['form_key']))) {
     $para = "function_name=pricereview&" . $token_link;
     echo "<script>alert('非法訪問!!!');</script>";
     echo "<script>window.history.go(-1);</script>";
     exit;
 }
-$id = $_GET["id"];
+$id = null;
+if(isset($_GET['id'])){
+    $id = $_GET["id"];
+}
+$form_key = null;
+if(isset($_GET['form_key'])){
+    $form_key = $_GET['form_key'];
+}
+
+if($form_key != null){
+    $sql_str = "SELECT form_id FROM flow WHERE system_id = 'cta' AND flow_id = 'cta01' AND form_key = :form_key";
+    $stmt = $conn->prepare($sql_str);
+    $stmt->bindParam(':form_key', $form_key);
+    $stmt->execute();
+    $result = $stmt->fetch(PDO::FETCH_ASSOC);
+    $id = $result['form_id'];
+}
+
+if(!$id){
+    $para = "function_name=pricereview&" . $token_link;
+    echo "<script>alert('非法訪問!!!');</script>";
+    echo "<script>window.history.go(-1);</script>";
+    exit;
+}
+
+$sql_str = "SELECT form_key FROM flow WHERE system_id = 'cta' AND flow_id = 'cta01' AND form_id = :id";
+$stmt = $conn->prepare($sql_str);
+$stmt->bindParam(':id', $id);
+$stmt->execute();
+$result = $stmt->fetch(PDO::FETCH_ASSOC);
+if($result){
+    $form_key = $result['form_key'];
+}
 
 $sql_str = "SELECT contract_new_apply.*, person_account.name AS review_person_name, person_final_account.name AS review_final_person_name
 FROM contract_new_apply 
@@ -439,7 +471,13 @@ $para = "function_name=pricereview&" . $token_link;
                         <tr>
                             <td>第二期款交貨期限(日)</td>
                             <td>
-                                <input type="number" class="form-control" x-model="data.secondPayDeadline" />
+                                <select class="form-control" x-model="data.secondPayDeadline">
+                                    <option value="">請選擇</option>    
+                                    <option value="30">30天</option>    
+                                    <option value="60">60天</option>    
+                                    <option value="90">90天</option>    
+                                    <option value="120">120天</option>    
+                                </select>
                                 <p class="alerttext" x-show="data.secondPayDeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                             </td>
                         </tr>
@@ -513,8 +551,8 @@ $para = "function_name=pricereview&" . $token_link;
                             <?php endif; ?>
                         </td>
                     </tr>
-                    <tr>
-                        <td>業務承辦人</td>
+                    <tr x-show="false">
+                        <td>業務部審核</td>
                         <td><span><?php echo (!isset($contract['review_person_name']) || empty($contract['review_person_name'])) ? "---" : $contract['review_person_name'] . "(" . $contract['review_person_id'] . ")";  ?></span></td>
                         <td>
                             <?php if (($status == 1 || $status == 3) && $progress >= 2) : ?><span class="successtext">已同意</span><?php endif; ?>
@@ -525,15 +563,15 @@ $para = "function_name=pricereview&" . $token_link;
                         <td><?php echo $contract['review_date'] ?? "---"; ?></td>
                     </tr>
                     <tr>
-                        <td>業務部協理</td>
+                        <td>業務部審核</td>
                         <td><span><?php echo (!isset($contract['review_final_person_name']) || empty($contract['review_final_person_name'])) ? "---" : $contract['review_final_person_name'] . "(" . $contract['review_final_person_id'] . ")";  ?></span></td>
                         <td>
                             <?php if ($status == 3) : ?><span class="successtext">結案同意</span><?php endif; ?>
                             <?php if ($status == 2) : ?><span class="failtext">結案不同意</span><?php endif; ?>
                             <?php if ($status < 2) : ?><span>---</span><?php endif; ?>
                         </td>
-                        <td colspan=2><?php echo $contract['review_final_comment'] ?? "---"; ?></td>
-                        <td><?php echo $contract['review_final_date'] ?? "---"; ?></td>
+                        <td colspan=2><?php echo $contract['review_comment'] ?? "---"; ?></td>
+                        <td><?php echo $contract['review_date'] ?? "---"; ?></td>
                     </tr>
                     <!-- <tr>
                         <td colspan="2" style="font-weight:bold">業務部承辦人</td>
@@ -554,10 +592,10 @@ $para = "function_name=pricereview&" . $token_link;
                 </tbody>
             </table>
             <button @click="window.history.go(-1)" type="button" class="btn btn-primary btn-lg pull-right savebtn">回前頁</button>
-            <?php if (($isFirst == 1 && ($person == $user_id || $user_id == "M0174")) || ($isFirst == 0 && $status == 0 && ($person == $user_id || $user_id == "M0174"))) : ?>
+            <?php if (($isFirst == 1 && ($person == $user_id || $user_id == "M0174")) || ($isFirst == 0 && ($status == 0 || $status == 2) && ($person == $user_id || $user_id == "M0174"))) : ?>
                 <button x-show="true" x-on:click="submit()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
                     <template x-if="!isLoading">
-                        <span>送審</span>
+                        <span><?php if($status==2) echo "重新"; ?>送審</span>
                     </template>
                     <template x-if="isLoading">
                         <div class="loader"></div>
@@ -578,7 +616,7 @@ $para = "function_name=pricereview&" . $token_link;
                         <span>
                             <?php
                             if (($user_id === "M0175" || $user_id == "TEST02") && $contract['progress'] <= 1) {
-                                echo "同意(上呈)";
+                                echo "同意(結案)";
                             } elseif (($user_id === "M0060" || $user_id == "TEST03") && $contract['progress'] == 2) {
                                 echo "同意(結案)";
                             }
@@ -629,7 +667,7 @@ $para = "function_name=pricereview&" . $token_link;
         const price_b = <?php echo $price_b ?? ''; ?>;
         const items = [...<?php echo json_encode($items) ?? []; ?>];
         const user_id = '<?php echo $user_id ?>';
-        const mid = '<?php echo $_GET['id']; ?>';
+        const mid = '<?php echo $id; ?>';
         const pays = [...<?php echo json_encode($pays) ?? []; ?>];
         const secondPayDeadline = '';
         const tradeaddress = '<?php echo $contract['address'] ?? ''; ?>';
@@ -662,7 +700,7 @@ $para = "function_name=pricereview&" . $token_link;
         const price_b = <?php echo $contract['install_fee'] ?? ''; ?>;
         const items = [...<?php echo json_encode($items) ?? []; ?>];
         const user_id = '<?php echo $user_id ?? ''; ?>';
-        const mid = '<?php echo $_GET['id']; ?>';
+        const mid = '<?php echo $id; ?>';
         const pays = [...<?php echo json_encode($pays) ?? []; ?>];
         const isFirst = <?php echo $isFirst; ?>;
         const tradeaddress = '<?php echo $contract['trade_address'] ?? ''; ?>';
@@ -682,7 +720,7 @@ $para = "function_name=pricereview&" . $token_link;
     </script>
 
 <?php endif; ?>
-<?php if ($status > 0 || ($person != $user_id && $user_id != "M0174")) : ?>
+<?php if ($status ==1 || $status == 3 || ($person != $user_id && $user_id != "M0174")) : ?>
     <script>
         window.onload = () => {
             const input = document.querySelectorAll('input');
@@ -714,4 +752,5 @@ $para = "function_name=pricereview&" . $token_link;
             alert("請先暫存或送審文件!")
         }
     }
+    const form_key = '<?php echo $form_key; ?>';
 </script>
\ No newline at end of file
diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js
index b2ad1eb9..fd1471ad 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -1465,6 +1465,7 @@ const contractNewApply = () => {
             form.append('review_comment', this.data.review_comment);
             form.append('description', this.data.description);
             form.append('progress', 0);
+            form.append('form_key', form_key);
             for (var i = 0; i < this.data.files.length; i++) {
                 form.append('files[]', this.data.files[i]);
             }
@@ -1490,7 +1491,7 @@ const contractNewApply = () => {
             let newstatus = 0;
 
             if (this.progress <= 1) {
-                newprogress = 2;
+                newprogress = 3;
             } else if (this.progress == 2) {
                 newprogress = 3;
             }
@@ -1498,7 +1499,7 @@ const contractNewApply = () => {
             if (this.status == 1 && this.progress == 2) {
                 newstatus = 3
             } else {
-                newstatus = 1
+                newstatus = 3
             }
             console.log(newstatus);
             console.log(newprogress)
@@ -1511,6 +1512,7 @@ const contractNewApply = () => {
             form.append('review_comment', this.data.review_comment);
             form.append('review_person_id', user_id);
             form.append('progress', newprogress);
+            form.append('form_key', form_key);
             axios.post('./api/postContractNewApplyData.php', form).then(res => {
                 if (res.status === 200) {
                     alert('審核成功');
@@ -1518,11 +1520,13 @@ const contractNewApply = () => {
                 }
                 this.isLoading = false
             }).catch(error => {
-                alert('審核失敗！可能為以下錯誤:\n' + error.response.data)
+                console.log('審核失敗！可能為以下錯誤:\n' + error.response.data)
+                alert('審核失敗！')
                 this.isLoading = false
             })
         },
         disagree() {
+            console.log(user_id);
             if (!confirm('確定退回嗎?')) return;
             this.isLoading = true
             const form = new FormData();
@@ -1532,11 +1536,12 @@ const contractNewApply = () => {
             form.append('review_comment', this.data.review_comment);
             form.append('review_person_id', user_id);
             form.append('progress', 0);
+            form.append('form_key', form_key);
             axios.post('./api/postContractNewApplyData.php', form).then(res => {
                 if (res.status === 200) {
                     alert('退回成功');
                     console.log(res.data);
-                    // window.location.reload();
+                    window.location.reload();
                 }
                 this.isLoading = false
             }).catch(error => {
diff --git a/wms/crm/crmm02-index.php b/wms/crm/crmm02-index.php
index fc7646f6..33e48991 100644
--- a/wms/crm/crmm02-index.php
+++ b/wms/crm/crmm02-index.php
@@ -170,7 +170,7 @@ if ($data) :
                                         <span class="glyphicon glyphicon-pencil"></span>
                                     </a>
                                     <?php if ($user_name === $row['salesman'] || $user_id = 'M0225') : ?>
-                                        <a href="../mkt/pricereviewMaintainCreate.php?function_name=customer&token=<?= $token_link ?>&vol_no=<?= $row['vol_no'] ?>" class="btn btn-info btn-sm">
+                                        <a href="../cont/pricereviewCheck.php?function_name=sign_list&<?= $token_link ?>&vol_no=<?= $row['vol_no'] ?>" class="btn btn-info btn-sm">
                                             轉價審
                                         </a>
                                     <?php endif ?>
diff --git a/wms/crm/crmm06_submit.php b/wms/crm/crmm06_submit.php
index 01ab28ef..73e5df38 100644
--- a/wms/crm/crmm06_submit.php
+++ b/wms/crm/crmm06_submit.php
@@ -17,4 +17,4 @@ foreach ($cols as $col) {
 $hecm->create($data);
 
 echo "<script>alert('已保存');</script>";
-header("Location:" . "localhost/wms/crm/crmm02-index.php?token=" . $request['token']);
+header("Location:" . "crmm02-index.php?token=" . $request['token']);
diff --git a/wms/fun_global.php b/wms/fun_global.php
index 44c197dd..e42fa0e0 100644
--- a/wms/fun_global.php
+++ b/wms/fun_global.php
@@ -201,12 +201,13 @@ function check_user_permission($user_id, $token)
         '/wms/test.php',
         '/wms/delivery_kpi.php',
         '/wms/contract_m-index.php',
-        '/wms/contract_b-index.php'
+        '/wms/contract_b-index.php',
     ];
     if (in_array($_SERVER["SCRIPT_NAME"], $ignore_url_arr)) return;
 
     $do = "";
     $sql = "select accounttype from account where accountid = '$user_id'";
+   
     $res = mysqli_query($link, $sql);
     if ($row = mysqli_fetch_assoc($res)) {
         if ($row["accounttype"] == "E") $do = 3;    // 管理員
@@ -215,8 +216,8 @@ function check_user_permission($user_id, $token)
             $res2 = mysqli_query($link, $sql2);
             if ($row2 = mysqli_fetch_assoc($res2)) {
                 $arr = json_decode(urldecode($row2["permission"]), true);
-                //print_r($arr);
-                //echo "#".str_replace("/wms/", "",  $_SERVER["SCRIPT_NAME"]);exit;
+
+            
                 $do = $arr[str_replace("/wms/", "",  $_SERVER["SCRIPT_NAME"])];
             }
             mysqli_free_result($res2);
diff --git a/wms/login.php b/wms/login.php
index 245fd0ac..139688af 100644
--- a/wms/login.php
+++ b/wms/login.php
@@ -89,6 +89,7 @@
                     </div>
 
                 </div>
+                <span style="color:red">
                 <?php
                 if (!empty($_GET['errno'])) {
                     if ($_GET['errno'] == 1) {
@@ -102,7 +103,7 @@
                     }
                 }
                 ?>
-
+                </span>
             </div>
 
 

From 35c6da8e710c0ce0de6c95f67e04ba3006e05d25 Mon Sep 17 00:00:00 2001
From: Ellin <b0206040@masada.com.tw>
Date: Tue, 5 Mar 2024 18:05:58 +0800
Subject: [PATCH 09/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=87=89=E6=94=B6?=
 =?UTF-8?q?=E5=B8=B3=E6=AC=BE(=E4=BF=9D=E9=A4=8A)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   1 +
 wms/T8_Authorization_from_bpm.php             |  15 +-
 wms/account-receivable-maintainance-index.php | 523 ++++++++++++++++++
 3 files changed, 531 insertions(+), 8 deletions(-)
 create mode 100644 wms/account-receivable-maintainance-index.php

diff --git a/.gitignore b/.gitignore
index a344fd2a..44e45c2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ wms/gary2.php
 wms/chinese.php
 phpinfo.php
 wms/account_receivable_sql_file.sql
+wms/account_receivable_maintainance_sql.sql
diff --git a/wms/T8_Authorization_from_bpm.php b/wms/T8_Authorization_from_bpm.php
index 7d2ca5a8..0c81c268 100644
--- a/wms/T8_Authorization_from_bpm.php
+++ b/wms/T8_Authorization_from_bpm.php
@@ -4,9 +4,8 @@
 // $user_password = "M012290493119";
 
 // echo $validation = get_Auth($user_id, $user_password);
-
-// function get_Auth($user_id = "M0000", $user_password = "M012290493119")
-function get_Auth($user_id = "ADMIN", $user_password = "chi")
+// function get_Auth($user_id = "ADMIN", $user_password = "chi")
+function get_Auth($user_id = "M0000", $user_password = "M012290493119")
 {
     $currentTime = time();
     $twoMinutesLater = $currentTime - (2 * 60);
@@ -14,14 +13,14 @@ function get_Auth($user_id = "ADMIN", $user_password = "chi")
     // $now = gmdate("YmdHis");
     $now = gmdate("YmdHis", strtotime("-2 minutes"));
     $data = "$user_id." . $now;
-    // $sign = hash_hmac('SHA256', $data, 'A21181F1EE4966D3', false);
-    $sign = hash_hmac('SHA256', $data, 'A733DAD19527399E', false);
+    $sign = hash_hmac('SHA256', $data, '91EB2CB12C3F8211', false);
+    // $sign = hash_hmac('SHA256', $data, 'A733DAD19527399E', false); 普來特富
 
     // echo $sign;
 
     // $apiurl = 'https://erp.masada.com.tw:780/twWebAPI/GetAuth';
-    // $apiurl = 'http://60.244.87.101:880//twWebAPI/GetAuth'; -----
-       $apiurl = 'http://101.132.66.206:880/twWebAPI/GetAuth';
+    $apiurl = 'http://60.244.87.101:880//twWebAPI/GetAuth';
+    //    $apiurl = 'http://101.132.66.206:880/twWebAPI/GetAuth';   普來特富
     // $apiurl = 'http://10.10.145.2:880//twWebAPI/GetAuth';
     // $apiurl = 'https://erp.masada.com.tw:780/twWebAPI/GetAuth';
 
@@ -31,7 +30,7 @@ function get_Auth($user_id = "ADMIN", $user_password = "chi")
         "Pwd: $user_password",
         "TimestampUTC: $now",
         "Sign: $sign",
-        "GroupId:ceshi"
+        "GroupId:MASADA"
     ];
 
     $ch = curl_init();
diff --git a/wms/account-receivable-maintainance-index.php b/wms/account-receivable-maintainance-index.php
new file mode 100644
index 00000000..5295d065
--- /dev/null
+++ b/wms/account-receivable-maintainance-index.php
@@ -0,0 +1,523 @@
+<?php
+include "header.php";
+include "css/view/wipwhole-index.php";
+// 設置一個空陣列來放資料
+$data = array();
+$start_date = empty($_POST['date_start']) ? null : $_POST['date_start'];
+$end_date = empty($_POST['date_end']) ? null : $_POST['date_end'];
+$start_SignDate = empty($_POST['date_Signstart']) ? null : $_POST['date_Signstart'];
+$end_SignDate = empty($_POST['date_Signend']) ? null : $_POST['date_Signend'];
+
+$sql = "
+SELECT 
+        siam.PersonId,
+		cp.PersonName,
+		cd.DeptId,
+        cd.DeptName,
+		cd.LeaderId,
+		lcp.PersonName AS LeaderName,
+		siam.BizPartnerId,
+        cbp.BizPartnerName,
+        siamd.RowCode,
+        siam.BillNo,
+        siamd.ProjectId,
+        siamd.CU_EstPayDate,
+        siamd.UnTransCheckBLAmtWTax ,
+        siamd.HadTransCheckBLAmtWTax,
+		siamd.OAmountWithTax,
+        siamd.CU_MaterialId,
+        acb_tmp.BillNo2,
+        acb_tmp.RowCode2,
+		acb_tmp.checkOAmount,
+        asim.BillNo AS BillNo3,
+        asim.InvoiceName,
+        asim.OAmountWithTax AS InvoiceOAmount,
+        asi.InvoiceNo,
+        asi.InvoiceTime,
+        writeoff.BillDate AS WriteOffDate,
+        SUM(arwobd.CurrStandOffOAmount) AS TotalCurrStandOffOAmount
+    FROM salIncomeApplyMaster AS siam -- 收入申請單
+    LEFT JOIN salIncomeApplyDetail AS siamd -- 收入申請單明細
+    ON siam.BillNo = siamd.BillNo
+    LEFT JOIN comGroupPerson AS cp   -- 員工主檔
+    ON siam.PersonId = cp.PersonId
+    LEFT JOIN  comDepartment AS cd -- 部門主檔
+    ON siam.DeptId = cd.DeptId
+	LEFT JOIN comGroupPerson AS lcp
+	ON lcp.PersonId= cd.LeaderId
+    LEFT JOIN (
+        SELECT
+            acbd.FromRowCode,
+            acb.FromBillNo,
+            acbd.BillNo AS BillNo2,
+            acbd.RowCode AS RowCode2,
+			acbd.LAmountWithTax AS checkOAmount
+        FROM arCheckBill AS acb -- 應收確認單
+        LEFT JOIN arCheckBillDetail AS acbd -- 應收確認單明細
+        ON acb.BillNo = acbd.BillNo
+        WHERE 1 = 1
+        AND acb.TypeId = 'RVS') AS acb_tmp 
+    ON siamd.RowCode = acb_tmp.FromRowCode
+    AND siamd.BillNo = acb_tmp.FromBillNo
+	LEFT JOIN arSellInvoiceMaterial AS asim -- 買賣發票明細
+    ON asim.FromBillNo = acb_tmp.BillNo2
+    AND asim.RowCode = acb_tmp.RowCode2
+    LEFT JOIN arSellInvoice AS asi
+    ON asim.BillNo = asi.BillNo
+    LEFT JOIN comBusinessPartner AS cbp
+    ON siam.BizPartnerId = cbp.BizPartnerId
+    LEFT JOIN 
+    arWriteOffBillDetail AS arwobd 
+    ON acb_tmp.BillNo2 = arwobd.FromBillNo
+    LEFT JOIN 
+	arWriteOffBill AS writeoff ON arwobd.BillNo = writeoff.BillNo
+WHERE 1 = 1 
+";
+$follower = find_follow($user_id);
+if ((in_array($user_id, array('M0008', 'M0012'))) || (in_array(accountidToDepartId($user_id), array('220', '210', '501')))) {
+} else {
+    $sql .= " AND (siam.PersonId = '$user_id'";
+    if (count($follower) > 0) {
+        $column_str = "('$user_id'" . ",'";
+        $column_str .= implode("','", $follower);
+        $column_str .= "')";
+        $sql .= " OR siam.PersonId IN $column_str OR cd.LeaderId = '$user_id')";
+    } else {
+        $sql .= " OR cd.LeaderId = '$user_id')";
+    };
+}
+if (!is_null($start_date)) {
+    $start_date = (int)date('Ymd', strtotime($start_date));
+    $sql .= " AND siam.CU_ContractStart >= $start_date ";
+}
+if (!is_null($end_date)) {
+    $end_date = (int)date('Ymd', strtotime($end_date));
+    $sql .= " AND siam.CU_ContractStart <= $end_date ";
+}
+if (!is_null($start_SignDate)) {
+    $start_SignDate = (int)date('Ymd', strtotime($start_SignDate));
+    $sql .= " AND siam.BillDate >= $start_SignDate ";
+}
+if (!is_null($end_SignDate)) {
+    $end_SignDate = (int)date('Ymd', strtotime($end_SignDate));
+    $sql .= " AND siam.BillDate <= $end_SignDate ";
+}
+$sql .= " GROUP BY 
+siam.PersonId, 
+cp.PersonName, 
+cd.DeptId, 
+cd.DeptName, 
+cd.LeaderId, 
+lcp.PersonName, 
+siam.BizPartnerId, 
+cbp.BizPartnerName, 
+siamd.RowCode, 
+siam.BillNo, 
+siamd.ProjectId,
+siamd.CU_EstPayDate, 
+siamd.UnTransCheckBLAmtWTax, 
+siamd.HadTransCheckBLAmtWTax, 
+siamd.OAmountWithTax, 
+siamd.CU_MaterialId, 
+acb_tmp.BillNo2, 
+acb_tmp.RowCode2, 
+acb_tmp.checkOAmount, 
+asim.BillNo, 
+asim.InvoiceName, 
+asim.OAmountWithTax,
+asi.InvoiceNo,
+asi.InvoiceTime, 
+writeoff.BillDate 
+ORDER BY 
+siam.PersonId ASC, 
+siam.BillNo ASC, 
+siamd.RowCode ASC";
+
+$query_T8 = $conn->query($sql);
+$rows = $query_T8->fetchAll(PDO::FETCH_ASSOC);
+$today = strtotime(date('Ymt'));
+$table = "";
+for ($i = 0; $i < count($rows); $i++) {
+    $row = $rows[$i];
+    $tmpname = $row['ProjectId'] . $row['RowCode'];
+    $data[$tmpname] = $row;
+    $data[$tmpname]['CU_EstPayDate'] = date('Y-m-d', strtotime($row['CU_EstPayDate']));
+    $data[$tmpname]['havetopay'] = strtotime($row['CU_EstPayDate']) > $today ? '--' : 'V';
+    $datahavetopay = $row['CU_EstPayDate'] > $today ? 0 : 1;
+    $data[$tmpname]['collecttime'] = collect_month(strtotime($row['CU_EstPayDate']));
+    $invoicedate = is_null($row['InvoiceTime']) ? null : date('Y-m-d', strtotime($row['InvoiceTime']));
+    $tableinvoice_state = is_null($invoicedate) ? 0 : 1;
+    $contract_no = $row['ProjectId'];
+    $facility_no = $row['CU_MaterialId'];
+    $RowCode = $row['RowCode'];
+    $BillNo = $row['BillNo'];
+    $receivable_date = date('Y-m-d', strtotime($row['CU_EstPayDate']));
+    $budget = $row['OAmountWithTax'];
+    $invoiceNo = $row['InvoiceNo'];
+    $invoice_budget = is_null($row['InvoiceOAmount']) ? 0 : $row['InvoiceOAmount'];
+    $table_writeoff_date = is_null($row['WriteOffDate']) ? null : date('Y-m-d', strtotime($row['WriteOffDate']));
+    $table_writeoff_amount = is_null($row['TotalCurrStandOffOAmount']) ? 0 : $row['TotalCurrStandOffOAmount'];
+    $table1 = "INSERT INTO account_receivable_maintainance(
+    `contract_no`,
+    `facility_no`,
+    `RowCode`,
+    `BillNo`,
+    `receivable_date`,
+    `budget`,
+    `receivable`,
+    `invoice_state`,
+    `invoice_budget`,
+    `received_budget`
+    ";
+    $table2 = ") VALUES(
+        '$contract_no',
+        '$facility_no',
+        '$RowCode',
+        '$BillNo',
+        '$receivable_date',
+        $budget,
+        $datahavetopay,
+        $tableinvoice_state,
+        $invoice_budget,
+        $table_writeoff_amount
+    ";
+    $table1 .= is_null($invoicedate) ? "" : ",`invoice_date`";
+    $table2 .= is_null($invoicedate) ? "" : ",'$invoicedate'";
+    $table1 .= is_null($table_writeoff_date) ? "" : ",`received_date`";
+    $table2 .= is_null($table_writeoff_date) ? "" : ",'$table_writeoff_date'";
+    $table1 .= is_null($invoiceNo) ? "" : ",`invoice_no`";
+    $table2 .= is_null($invoiceNo) ? "" : ",'$invoiceNo'";
+    $table .= $table1 . $table2 . "); \n";
+}
+// $file_path = 'account_receivable_maintainance_sql.sql';
+// if (file_put_contents($file_path, $table) !== false) {
+//     echo "SQL文件已成功生成：{$file_path}";
+// } else {
+//     echo "生成SQL文件时出现错误。";
+// }
+
+// foreach ($data as $key => $row) {
+//     echo $key . "<br>";
+//     print_r($row);
+//     echo "<br>------------<br>";
+// }
+// exit();
+?>
+<style>
+    table {
+        table-layout: fixed;
+        width: 100%;
+    }
+
+    td {
+        word-wrap: break-word;
+    }
+
+    img {
+        width: 125px;
+    }
+
+    .width_style_1 {
+        width: 125px;
+    }
+
+    table {
+        width: 100%;
+    }
+
+    #table_index_filter {
+        float: right;
+    }
+
+    #table_index_paginate {
+        float: right;
+    }
+
+    label {
+        display: inline-flex;
+        margin-bottom: .5rem;
+        margin-top: .5rem;
+
+    }
+
+    .hiddenTable {
+        display: none;
+    }
+
+    .hidden {
+        display: none;
+    }
+</style>
+
+<div style="width: 98%;margin: 1%;">
+    <div class="btn-group btn-group-md " style="padding:10 px; width: 100%;">
+        <button type="button" style="width: 12%;" onclick="downloadData()" class="btn btn-success">下載 <span class="glyphicon glyphicon-download-alt"></span></button>
+    </div>
+</div>
+<div class="container">
+    <div class="text-center" style="margin-bottom: 20px;">
+        <h3><strong>應收帳款(保養)</strong></h3>
+    </div>
+    <hr>
+    <form class="form-horizontal" id='myForm' method='post' action='account-receivable-new-index.php?<?= $token_link ?>'>
+        <table class="table table-striped table-bordered" style='width:98%;text-align:center;margin:0 auto'>
+            <tbody>
+                <tr>
+                    <th class="text-center" style="vertical-align: middle;">簽約日期</th>
+                    <td colspan="2">
+                        <input type="date" class='form-control' id='date_Signstart' name='date_Signstart' style='width:40%;display:inline;'>
+                        ～
+                        <input type="date" class='form-control' id='date_Signend' name='date_Signend' style='width:40%;display:inline;'>
+
+                    </td>
+                    <td rowspan="2">
+                        <button type="submit" class="btn btn-primary btn-sm">搜尋</button>
+                    </td>
+                </tr>
+                <tr>
+                    <th class="text-center" style="vertical-align: middle;">合約日期</th>
+                    <td colspan="2">
+                        <input type="date" class='form-control' id='date_start' name='date_start' style='width:40%;display:inline;'>
+                        ～
+                        <input type="date" class='form-control' id='date_end' name='date_end' style='width:40%;display:inline;'>
+                        <!-- <button type="submit" class="btn btn-primary btn-sm">搜尋</button> -->
+                    </td>
+                </tr>
+                <tr>
+                    <th class="text-center" style="vertical-align: middle;">催收次數</th>
+                    <td colspan="3">
+                        <input type="text" class='form-control' id='search_collectstart' name='collect_time_start' style='width:30%;display:inline;' oninput="searchFront('collectstart')">
+                        ≤ 催收次數 ≤
+                        <input type="text" class='form-control' id='search_collectend' name='collect_time_end' style='width:30%;display:inline;' oninput="searchFront('collectend')">
+                        <!-- <button type="submit" class="btn btn-primary btn-sm">搜尋</button> -->
+                    </td>
+                </tr>
+                <tr>
+                    <th class="text-center" style="vertical-align: middle;">催收金額</th>
+                    <td colspan="3">
+                        <input type="text" class='form-control' id='search_CBudgetstart' name='collect_budget_start' style='width:30%;display:inline;' onblur="searchFront('CBudgetstart')">
+                        ≤ 催收金額 ≤
+                        <input type="text" class='form-control' id='search_CBudgetend' name='collect_budget_end' style='width:30%;display:inline;' onblur="searchFront('CBudgetend')">
+                        <!-- <button type="submit" class="btn btn-primary btn-sm">搜尋</button> -->
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </form>
+    <hr>
+    <div class="form-group">
+        <div class="col-md-4">
+            <label for="search_contract">查詢合約號</label>
+            <input type="text" id="search_contract" name="search_contract" class="form-control" placeholder="請輸入合約號" onblur="searchFront('contract')">
+        </div>
+        <div class="col-md-4">
+            <label for="search_dept">查詢部門</label>
+            <input type="text" id="search_dept" name="search_dept" class="form-control" placeholder="請輸入部門" onblur="searchFront('dept')">
+        </div>
+        <div class="col-md-4">
+            <label for="search_manager">查詢主管</label>
+            <input type="text" id="search_manager" name="search_manager" class="form-control" placeholder="請輸入主管工號/姓名" onblur="searchFront('manager')">
+        </div>
+
+    </div>
+    <div class="form-group">
+
+        <div class="col-md-4">
+            <label for="search_personId">查詢契約員</label>
+            <input type="text" id="search_personId" name="search_personId" class="form-control" placeholder="請輸入契約員工號/姓名" onblur="searchFront('personId')">
+        </div>
+        <div class="col-md-4">
+            <label for="search_customerid">查詢客戶名稱</label>
+            <input type="text" id="search_customerid" name="search_customerid" class="form-control" placeholder="請輸入客戶名稱" onblur="searchFront('customerid')">
+        </div>
+        <div class="col-md-4">
+            <label for="search_facility">查詢作番號</label>
+            <input type="text" id="search_facility" name="search_facility" class="form-control" placeholder="請輸入作番號" onblur="searchFront('facility')">
+        </div>
+    </div>
+</div>
+<?php
+include "./footer.php";
+?>
+<div style="width: 20%;float:right;margin-right:5%; ">
+    <label>查詢條件</label>
+    <input type="text" id="search" name="search" class="form-control" placeholder="請輸入合約號/作番號/客戶名稱" oninput="searchData()">
+</div>
+<div style="width: 98%; margin:1%;" style="overflow-x:auto;">
+    <table class="table table-striped table-bordered" style="width:100%">
+        <thead>
+            <tr>
+                <th style='text-align:center;vertical-align: middle;width:100px'>合約號</th>
+                <th style='text-align:center;vertical-align: middle;'>序號</th>
+                <th style='text-align:center;vertical-align: middle;width:100px'>作番號</th>
+                <th style='text-align:center;vertical-align: middle;width:110px'>部門</th>
+                <th style='text-align:center;vertical-align: middle;'>主管</th>
+                <th style='text-align:center;vertical-align: middle;'>契約員</th>
+                <th style='text-align:center;vertical-align: middle;width:120px'>客戶名稱</th>
+
+                <th style='text-align:center;vertical-align: middle;'>應收日期</th>
+                <th style='text-align:center;vertical-align: middle;'>是否應收</th>
+                <th style='text-align:center;vertical-align: middle;'>應收金額</th>
+<!-- 
+                <th style='text-align:end;vertical-align: middle;'>已開金額</th>
+                <th style='text-align:end;vertical-align: middle;'>未開金額</th> -->
+                <th style='text-align:center;vertical-align: middle;'>已收金額</th>
+                <th style='text-align:center;vertical-align: middle;'>催收金額</th>
+                <th style='text-align:center;vertical-align: middle;'>催收次數</th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php foreach ($data as $key => $row) { ?>
+                <tr class="data-row" style="display: '';" id="<?= $key; ?>">
+                    <td class="contract"><?= $row['ProjectId']; ?></td>
+                    <td><?= $row['RowCode']; ?></td>
+                    <td class="facility"><?= $row['CU_MaterialId']; ?></td>
+                    <td class="dept"><?= $row['DeptId'] . "<br>" . $row['DeptName']; ?></td>
+                    <td class="manager"><?= $row['LeaderId'] . "<br>" . $row['LeaderName']; ?></td>
+                    <td class="personId"><?= $row['PersonId'] . "<br>" . $row['PersonName']; ?></td>
+                    <td class="customerid"><?= $row['BizPartnerId'] . "<br>" . $row['BizPartnerName']; ?></td>
+                  
+                    <td><?= $row['CU_EstPayDate']; ?></td>
+                    <td><?= $row['havetopay']; ?></td>
+                    <td><?= number_format(round($row['OAmountWithTax'])); ?></td>
+
+                    <td><?= is_null($row['TotalCurrStandOffOAmount']) ? 0 : number_format(round($row['TotalCurrStandOffOAmount']));  ?></td>
+                    <td class="CBudget"><?= ($row['havetopay'] == "V")? (number_format(round($row['OAmountWithTax'] - $row['TotalCurrStandOffOAmount']))) :0; ?></td>
+                    <td class="collect"><?= (($row['havetopay'] == "V") && ($row['OAmountWithTax'] - $row['TotalCurrStandOffOAmount'] >1))? $row['collecttime']:0; ?></td>
+                </tr>
+            <?php } ?>
+        </tbody>
+    </table>
+</div>
+
+<script>
+    function searchData() {
+        var searchTerm = document.getElementById('search').value.toLowerCase();
+        var rows = document.getElementsByClassName('data-row');
+        for (var i = 0; i < rows.length; i++) {
+            var rowText = rows[i].textContent.toLowerCase();
+            // var rowText = rows[i].id.toLowerCase();
+            if (rowText.includes(searchTerm)) {
+                console.log(rowText);
+                rows[i].style.display = '';
+            } else {
+                rows[i].style.display = 'none';
+            }
+        }
+    }
+
+    function downloadData() {
+        var xhr = new XMLHttpRequest();
+        var url = window.location.origin + "/wms/account-receivable-renovate-excel.php?type=all&<?= $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-renovate.xlsx");
+                link.setAttribute('download', name);
+                link.style.display = 'none';
+                document.body.appendChild(link);
+                link.click();
+                document.body.removeChild(link);
+            }
+        }
+        xhr.send(JSON.stringify({
+            Bill: <?= $total_data ?>
+        }));
+
+    }
+
+    function searchFront(area) {
+        var term = 'search_' + area;
+
+        if (area == 'collectstart') {
+            var searchTerm = parseInt(document.getElementById(term).value);
+            var searchArea = document.getElementsByClassName('collect');
+            var rows = document.getElementsByClassName('data-row');
+            var criterion = parseInt(document.getElementById('search_collectend').value);
+            for (var i = 0; i < rows.length; i++) {
+                var rowText = parseInt(searchArea[i].textContent);
+                if (rowText >= searchTerm) {
+                    rows[i].style.display = '';
+                } else {
+                    rows[i].style.display = 'none';
+                }
+                if (criterion !== '' && rowText > criterion) {
+                    rows[i].style.display = 'none';
+                }
+            }
+        } else if (area == 'collectend') {
+            var searchTerm = parseInt(document.getElementById(term).value);
+            var searchArea = document.getElementsByClassName('collect');
+            var rows = document.getElementsByClassName('data-row');
+            var criterion = parseInt(document.getElementById('search_collectstart').value);
+            for (var i = 0; i < rows.length; i++) {
+                var rowText = parseInt(searchArea[i].textContent);
+                if (rowText <= searchTerm) {
+                    rows[i].style.display = '';
+                } else {
+                    rows[i].style.display = 'none';
+                }
+                if (criterion !== '' && rowText < criterion) {
+                    rows[i].style.display = 'none';
+                }
+            }
+        } else if (area == 'CBudgetstart') {
+            var searchTerm = parseInt(document.getElementById(term).value);
+            var searchArea = document.getElementsByClassName('CBudget');
+            var rows = document.getElementsByClassName('data-row');
+            var criterion = parseInt(document.getElementById('search_CBudgetend').value);
+            for (var i = 0; i < rows.length; i++) {
+                var rowText = parseInt(searchArea[i].textContent.replace(/,/g, ''));
+                if (isNaN(searchTerm) || searchTerm == 0) {
+                    rows[i].style.display = '';
+                } else if (rowText >= searchTerm) {
+                    rows[i].style.display = '';
+                } else {
+                    rows[i].style.display = 'none';
+                }
+                if (criterion !== '' && rowText > criterion) {
+                    rows[i].style.display = 'none';
+                }
+            }
+        } else if (area == 'CBudgetend') {
+            var searchTerm = parseInt(document.getElementById(term).value);
+            var searchArea = document.getElementsByClassName('CBudget');
+            var rows = document.getElementsByClassName('data-row');
+            var criterion = parseInt(document.getElementById('search_CBudgetstart').value);
+            for (var i = 0; i < rows.length; i++) {
+                var rowText = parseInt(searchArea[i].textContent.replace(/,/g, ''));
+                if (isNaN(searchTerm) || searchTerm == 0) {
+                    rows[i].style.display = '';
+                } else if (rowText <= searchTerm) {
+                    rows[i].style.display = '';
+                } else {
+                    rows[i].style.display = 'none';
+                }
+                if (!isNaN(criterion) && rowText < criterion) {
+                    rows[i].style.display = 'none';
+                }
+            }
+        } else {
+            var searchTerm = document.getElementById(term).value.toLowerCase();
+            var searchArea = document.getElementsByClassName(area);
+            var rows = document.getElementsByClassName('data-row');
+            for (var i = 0; i < rows.length; i++) {
+                var rowText = searchArea[i].textContent.toLowerCase();
+                if (rowText.includes(searchTerm)) {
+                    rows[i].style.display = '';
+                } else {
+                    rows[i].style.display = 'none';
+                }
+            }
+        }
+    }
+
+    function check(searchname) {
+        console.log(searchname);
+
+    }
+</script>
\ No newline at end of file

From 2ac5424596ae8d667c6b52ffbb384c9ca31a87b1 Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Tue, 5 Mar 2024 18:08:50 +0800
Subject: [PATCH 10/16] =?UTF-8?q?=E4=BF=9D=E9=A4=8A=E5=83=B9=E5=AF=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/cont/css/pricereview.css               |   4 +
 wms/cont/css/pricereview.css.map           |   2 +-
 wms/cont/css/pricereview.scss              |   5 +
 wms/cont/js/pricereviewAlpine.js           | 111 ++++++
 wms/cont/pricereviewCreate.php             | 412 ++++++++++++++++++++-
 wms/mkt/api/postNewElevatorPricereview.php |   5 +-
 wms/mkt/api/postPricereviewSign.php        |  20 +-
 wms/mkt/pricereview-index.php              |   9 +-
 wms/mkt/pricereviewCreate.php              |   3 +-
 9 files changed, 541 insertions(+), 30 deletions(-)

diff --git a/wms/cont/css/pricereview.css b/wms/cont/css/pricereview.css
index afeeb875..3cd7f902 100644
--- a/wms/cont/css/pricereview.css
+++ b/wms/cont/css/pricereview.css
@@ -164,6 +164,10 @@
   margin-right: 15px;
   margin-top: 20px;
 }
+#pricereviewCreate .dark {
+  background-color: rgb(225, 225, 225) !important;
+  font-weight: 600;
+}
 
 .container-fluid, .container {
   max-width: 1400px !important;
diff --git a/wms/cont/css/pricereview.css.map b/wms/cont/css/pricereview.css.map
index 4acaa24e..a5d7bedf 100644
--- a/wms/cont/css/pricereview.css.map
+++ b/wms/cont/css/pricereview.css.map
@@ -1 +1 @@
-{"version":3,"sources":["pricereview.css","pricereview.scss"],"names":[],"mappings":"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","file":"pricereview.css"}
\ No newline at end of file
+{"version":3,"sources":["pricereview.css","pricereview.scss"],"names":[],"mappings":"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","file":"pricereview.css"}
\ No newline at end of file
diff --git a/wms/cont/css/pricereview.scss b/wms/cont/css/pricereview.scss
index 07a63973..7812e8e5 100644
--- a/wms/cont/css/pricereview.scss
+++ b/wms/cont/css/pricereview.scss
@@ -1,4 +1,5 @@
 #pricereviewCreate{
+    
     input[type='text'], input[type='number'], select{
         margin: 1px;
     }
@@ -175,6 +176,10 @@
             }
         }
     }
+    .dark{
+        background-color: rgba(225,225,225,1) !important;
+        font-weight: 600;
+    }
 }
 
 .container-fluid, .container{
diff --git a/wms/cont/js/pricereviewAlpine.js b/wms/cont/js/pricereviewAlpine.js
index 6c21d29d..fe3df137 100644
--- a/wms/cont/js/pricereviewAlpine.js
+++ b/wms/cont/js/pricereviewAlpine.js
@@ -3,5 +3,116 @@ const pricereviewCreate = ()=>{
         init(){
             console.log(123);
         },
+        modalShow:{
+            elevator: false,
+        },
+        total_spec:0,
+        elevators:[],
+        modalElevatorInfo:{
+            spec:'',
+            person:'',
+            weight:'',
+            stop:'',
+            speed:'',
+            permitNumber:'', //許可證號碼
+            brand:'', //品牌
+            m1:0, //贈送M1
+            months:12, //保養月數(月)
+            cycle:'EM', // 保養週期
+            checkYear:'', //竣工檢查年度
+            lastDate:'', // 上次年檢日期
+            yearCheckFee:'', //年檢費用
+            price:'', //公司發布價(月)
+            qty:'', //電梯數量
+            sale_price:'', //契約報價
+        },
+        openCreateElevatorModal(){
+            this.modalShow.elevator = true;
+            body.style.overflow = 'hidden';
+        },
+        hideCreateElevatorModal(){
+            this.modalShow.elevator = false;
+            body.style.overflow = 'auto';
+            this.modalElevatorInfo = {
+                spec:'',
+                person:'',
+                weight:'',
+                stop:'',
+                speed:'',
+                permitNumber:'', 
+                brand:'', 
+                m1:0,
+                months:'', 
+                cycle:'', 
+                checkYear:'', 
+                lastDate:'',
+                yearCheckFee:'',
+                price:'',
+                qty:'', 
+                sale_price:'', 
+            };
+        },
+        createElevatorFn(){
+            this.total_spec ++;
+            this.elevators.push({
+                id: this.total_spec,
+                spec: this.modalElevatorInfo.spec,
+                person: this.modalElevatorInfo.person,
+                weight: this.modalElevatorInfo.weight,
+                stop: this.modalElevatorInfo.stop,
+                speed: this.modalElevatorInfo.speed,
+                permitNumber: this.modalElevatorInfo.permitNumber,
+                brand: this.modalElevatorInfo.brand,
+                m1: this.modalElevatorInfo.m1,
+                months: this.modalElevatorInfo.months,
+                cycle: this.modalElevatorInfo.cycle,
+                checkYear: this.modalElevatorInfo.checkYear,
+                lastDate: this.modalElevatorInfo.lastDate,
+                yearCheckFee: this.modalElevatorInfo.yearCheckFee,
+                price: this.modalElevatorInfo.price,
+                qty: this.modalElevatorInfo.qty,
+                sale_price: this.modalElevatorInfo.sale_price
+            })
+            this.hideCreateElevatorModal();
+        },
+        copyElevator(idx){
+            const spec = this.elevators[idx].spec;
+            const person = this.elevators[idx].person;
+            const stop = this.elevators[idx].stop;
+            const weight = this.elevators[idx].weight
+            const speed = this.elevators[idx].speed;
+            const permitNumber = this.elevators[idx].permitNumber;
+            const brand = this.elevators[idx].brand;
+            const m1 = this.elevators[idx].m1;
+            const months = this.elevators[idx].months;
+            const cycle = this.elevators[idx].cycle;
+            const checkYear = this.elevators[idx].checkYear;
+            const lastDate = this.elevators[idx].lastDate;
+            const yearCheckFee = this.elevators[idx].yearCheckFee;
+            const price = this.elevators[idx].price;
+            const qty = this.elevators[idx].qty;
+            const sale_price = this.elevators[idx].sale_price;
+
+            this.total_spec ++;
+            this.elevators.push({
+                id: this.total_spec,
+                spec: spec,
+                person: person,
+                stop: stop,
+                weight:weight,
+                speed: speed,
+                permitNumber: permitNumber,
+                brand: brand,
+                m1: m1,
+                months: months,
+                cycle: cycle,
+                checkYear: checkYear,
+                lastDate: lastDate,
+                yearCheckFee: yearCheckFee,
+                price: price,
+                qty: qty,
+                sale_price: sale_price
+            })
+        },
     }
 }
\ No newline at end of file
diff --git a/wms/cont/pricereviewCreate.php b/wms/cont/pricereviewCreate.php
index 1ac0efbe..cd65c763 100644
--- a/wms/cont/pricereviewCreate.php
+++ b/wms/cont/pricereviewCreate.php
@@ -9,6 +9,172 @@ require_once "../mkt/conn.php";
 <script defer src="./js/alpinejs/cdn.min.js"></script>
 <script src="./js/pricereviewAlpine.js"></script>
 <div id="pricereviewCreate" x-data=pricereviewCreate()>
+    <div class="window-modal" x-cloak data-type="window-modal" x-show="modalShow.elevator" x-ref="createElevatorModal" id="createElevatorModal">
+        <div class="window-modal-content modal-xl">
+            <div class="window-modal-header">
+                <h4>新增電梯規格</h4>
+                <button class="btn btn-close" @click="hideCreateElevatorModal()">X</button>
+            </div>
+            <div class="window-modal-body">
+                <div>
+                    <table class="table">
+                        <tr class="table-active">
+                            <th>電梯</th>
+                            <th>人乘</th>
+                            <th>載重(KG)</th>
+                            <th>停數</th>
+                        </tr>
+                        <tr>
+                            <td>
+                                <select class="form-control" x-model="modalElevatorInfo.spec">
+                                    <option value="">請選擇</option>
+                                    <option value="MAE100">MAE100有機房</option>
+                                    <option value="MAM200">MAM200無機房</option>
+                                    <option value="MAH100">MAH100小電梯</option>
+                                    <option value="MAF100">MAF100貨梯(有機房)</option>
+                                    <option value="MAQ100">MAQ100強趨梯</option>
+                                    <option value="MAP100">MAP100平台梯</option>
+                                    <option value="M1">M1(系統更新)</option>
+                                    <option value="M1+M4(1:1)">M1+M4(1:1)系統+主機</option>
+                                    <option value="M1+M4(2:1)">M1+M4(2:1)系統+主機</option>
+                                </select>
+                            </td>
+                            <td>
+                                <select name="" id="" class="form-control"  x-model="modalElevatorInfo.person">
+                                    <option value="">請選擇</option>
+                                    <option value="6">6</option>
+                                    <option value="8">8</option>
+                                    <option value="9">9</option>
+                                    <option value="10">10</option>
+                                    <option value="11">11</option>
+                                    <option value="12">12</option>
+                                    <option value="13">13</option>
+                                    <option value="15">15</option>
+                                    <option value="17">17</option>
+                                    <option value="20">20</option>
+                                    <option value="24">24</option>
+                                </select>
+                            </td>
+                            <td>
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.weight" />
+                            </td>
+                            <td>
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.stop" />
+                            </td>
+                        </tr>
+                        <tr class="table-active">
+                            <th>速度</th>
+                            <th>電梯許可證號</th>
+                            <th>品牌</th>
+                            <th>贈送M1</th>
+                        </tr>
+                        <tr>
+                            <td>
+                                <select name="" id="" class="form-control" style="width:93px" x-model="modalElevatorInfo.speed" @change="getModalElevatorPrice()" >
+                                    <option value="">請選擇</option>
+                                    <option value="9">9</option>
+                                    <option value="24">24</option>
+                                    <option value="30">30</option>
+                                    <option value="45">45</option>
+                                    <option value="60">60</option>
+                                    <option value="90">90</option>
+                                    <option value="105">105</option>
+                                    <option value="120">120</option>
+                                    <option value="150">150</option>
+                                </select>
+                            </td>
+                            <td>
+                                <input type="text" class="form-control" x-model="modalElevatorInfo.permitNumber" />
+                            </td>
+                            <td>
+                                <select class="form-control" x-model="modalElevatorInfo.brand">
+                                    <option value="請選擇">請選擇</option>
+                                    <option value='永大'>永大</option>
+                                    <option value='三菱'>三菱</option>
+                                    <option value='崇友'>崇友</option>
+                                    <option value='Otis'>Otis</option>
+                                    <option value='櫻花'>櫻花</option>
+                                    <option value='立路'>立路</option>
+                                    <option value='富士達'>富士達</option>
+                                    <option value='富士'>富士</option>
+                                    <option value='測試品牌'>測試品牌</option>
+                                    <option value='sanyo'>sanyo</option>
+                                    <option value='測試品牌2'>測試品牌2</option>
+                                    <option value='測試品牌4'>測試品牌4</option>
+                                    <option value='中升'>中升</option>
+                                    <option value='長合'>長合</option>
+                                    <option value='宏偉電機工業股份有限公司'>宏偉電機工業股份有限公司</option>
+                                    <option value='保速達'>保速達</option>
+                                    <option value='東棋'>東棋</option>
+                                    <option value='安達'>安達</option>
+                                    <option value='百朝'>百朝</option>
+                                    <option value='太友'>太友</option>
+                                    <option value='永佳捷'>永佳捷</option>
+                                    <option value='永勝'>永勝</option>
+                                    <option value='其他'>其他</option>
+                                </select>
+                            </td>
+                            <td>
+                                <select class="form-control" x-model="modalElevatorInfo.m1">
+                                    <option value="0">否</option>
+                                    <option value="1">是</option>
+                                </select>
+                            </td>
+                        </tr>
+                        <tr class="table-active">
+                            <th>保養月數</th>
+                            <th>保養週期</th>
+                            <th>竣工檢查年度</th>
+                            <th>上次年檢日期</th>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="number" class="form-control" value="12" x-model="modalElevatorInfo.months" />
+                            </td>
+                            <td>
+                                <select name="" id="" class="form-control" x-model="modalElevatorInfo.cycle">
+                                    <option value="">請選擇</option>
+                                    <option value="">月保</option>
+                                    <option value="">雙週保</option>
+                                </select>
+                            </td>
+                            <td>
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.checkYear" />
+                            </td>
+                            <td>
+                                <input type="date" class="form-control" x-model="modalElevatorInfo.lastDate" />
+                            </td>
+                        </tr>
+                        <tr class="table-active">
+                            <th>年檢費用(元)</th>
+                            <th>公司發布價(月)</th>
+                            <th>電梯數量</th>
+                            <th>契約報價(月)</th>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.yearCheckFee" />
+                            </td>
+                            <td>
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.price" />
+                            </td>
+                            <td>
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.qty" />
+                            </td>
+                            <td>
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.sale_price" />
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <div class="modal-footer">
+            <button type="button" class="btn btn-secondary" @click="hideCreateElevatorModal()">關閉</button>
+                <button type="button" class="btn btn-primary"  @click="createElevatorFn()">新增</button>
+            </div>
+        </div>
+        <div class="window-back" @click="hideCreateElevatorModal()"></div>
+    </div>
     <div class="container">
         <table class="table" border="1">
                 <thead >
@@ -101,7 +267,7 @@ require_once "../mkt/conn.php";
             <tbody>
                 <tr>
                     <td colspan=8>
-                        <textarea class="form-control" name="progress" id="progress" cols="20" rows="6" disabled>註意事項:
+                        <textarea class="form-control" name="progress" id="progress" cols="20" rows="6" disabled>注意事項:
 1.速度單位是 米/分.
 2.選擇贈送M1,保養月數需填寫60.
 3.標準價格未帶出,請聯係業務部建立該規格報價.
@@ -118,26 +284,236 @@ require_once "../mkt/conn.php";
                     <button class="addbtn btn" x-ref="addElevatorBtn" @click="openCreateElevatorModal()" >+</button>
                 </div>
                 <table class="table" border=1>
-                    <thead>
+                    <template x-for="(elevator, idx) in elevators" :key="elevator.id">
+                        <tbody>
+                            <tr class="dark" >
+                                <th colspan=1>項次</th>
+                                <th colspan=9 style="text-align: left; padding-left: 15px;" x-text="elevator.id"></th>
+                                <th colspan="2" >
+                                <button class="copyBtn btn btn-secondary" @click="copyElevator(idx)">+</button>
+                                    <button class="btn btn-danger"  @click="deleteElevator(elevator.id)">刪除</button>
+                                </th>
+                            </tr>
+                            <tr>
+                                <th >電梯</th>
+                                <td>
+                                    <select class="form-control" x-model="elevator.spec">
+                                        <option value="">請選擇</option>
+                                        <option value="MAE100">MAE100有機房</option>
+                                        <option value="MAM200">MAM200無機房</option>
+                                        <option value="MAH100">MAH100小電梯</option>
+                                        <option value="MAF100">MAF100貨梯(有機房)</option>
+                                        <option value="MAQ100">MAQ100強趨梯</option>
+                                        <option value="MAP100">MAP100平台梯</option>
+                                        <option value="M1">M1(系統更新)</option>
+                                        <option value="M1+M4(1:1)">M1+M4(1:1)系統+主機</option>
+                                        <option value="M1+M4(2:1)">M1+M4(2:1)系統+主機</option>
+                                    </select>
+                                </td>
+                                <th>人乘</th>
+                                <td>
+                                    <select class="form-control"  x-model="elevator.person">
+                                        <option value="">請選擇</option>
+                                        <option value="6">6</option>
+                                        <option value="8">8</option>
+                                        <option value="9">9</option>
+                                        <option value="10">10</option>
+                                        <option value="11">11</option>
+                                        <option value="12">12</option>
+                                        <option value="13">13</option>
+                                        <option value="15">15</option>
+                                        <option value="17">17</option>
+                                        <option value="20">20</option>
+                                        <option value="24">24</option>
+                                    </select>
+                                </td>
+                                <th>載重(KG)</th>
+                                <td>
+                                    <input type="number" class="form-control" x-model="elevator.weight" />
+                                </td>
+                                <th>停數</th>
+                                <td>
+                                    <input type="number" class="form-control" x-model="elevator.stop" />
+                                </td>
+                                <th>速度(m/min)</th>
+                                <td>
+                                    <select name="" id="" class="form-control" style="width:93px" x-model="elevator.speed" @change="getElevatorPrice()" >
+                                        <option value="">請選擇</option>
+                                        <option value="9">9</option>
+                                        <option value="24">24</option>
+                                        <option value="30">30</option>
+                                        <option value="45">45</option>
+                                        <option value="60">60</option>
+                                        <option value="90">90</option>
+                                        <option value="105">105</option>
+                                        <option value="120">120</option>
+                                        <option value="150">150</option>
+                                    </select>
+                                </td>
+                                <th>規格</th>
+                                <td colspan=1>
+                                    <input type="text" class="form-control" disabled />
+                                </td>
+                            </tr>
+                            <tr>
+                                <th>電梯許可證號碼</th>
+                                <td colspan=3>
+                                    <input type="text" class="form-control" x-model="elevator.permitNumber" />
+                                </td>
+                                <th>品牌</th>
+                                <td colspan="1">
+                                    <select class="form-control" x-model="modalElevatorInfo.brand">
+                                        <option value="請選擇">請選擇</option>
+                                        <option value='永大'>永大</option>
+                                        <option value='三菱'>三菱</option>
+                                        <option value='崇友'>崇友</option>
+                                        <option value='Otis'>Otis</option>
+                                        <option value='櫻花'>櫻花</option>
+                                        <option value='立路'>立路</option>
+                                        <option value='富士達'>富士達</option>
+                                        <option value='富士'>富士</option>
+                                        <option value='測試品牌'>測試品牌</option>
+                                        <option value='sanyo'>sanyo</option>
+                                        <option value='測試品牌2'>測試品牌2</option>
+                                        <option value='測試品牌4'>測試品牌4</option>
+                                        <option value='中升'>中升</option>
+                                        <option value='長合'>長合</option>
+                                        <option value='宏偉電機工業股份有限公司'>宏偉電機工業股份有限公司</option>
+                                        <option value='保速達'>保速達</option>
+                                        <option value='東棋'>東棋</option>
+                                        <option value='安達'>安達</option>
+                                        <option value='百朝'>百朝</option>
+                                        <option value='太友'>太友</option>
+                                        <option value='永佳捷'>永佳捷</option>
+                                        <option value='永勝'>永勝</option>
+                                        <option value='其他'>其他</option>
+                                    </select>
+                                </td>
+                                <th>保養月數</th>
+                                <td>
+                                    <input type="number" class="form-control" x-model="elevator.months" />
+                                </td>
+                                <th>保養週期</th>
+                                <td>
+                                    <select name="" id="" class="form-control" x-model="elevator.cycle">
+                                        <option value="">請選擇</option>
+                                        <option value="EM">月保</option>
+                                        <option value="BW">雙週保</option>
+                                    </select>
+                                </td>
+                                <th>送M1</th>
+                                <td>
+                                    <select class="form-control" x-model="elevator.m1">
+                                        <option value="0">否</option>
+                                        <option value="1">是</option>
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <th>竣工檢查年度</th>
+                                <td>
+                                    <input type="number" class="form-control" x-model="elevator.checkYear" />
+                                </td>
+                                <th>上次年檢日期</th>
+                                <td>
+                                    <input type="date" class="form-control" x-model="elevator.lastDate" />
+                                </td>
+                                <th>年檢費用(元)</th>
+                                <td>
+                                    <input type="number" class="form-control" x-model="elevator.yearCheckFee" />
+                                </td>
+                                <th>公司發布價(月)</th>
+                                <td>
+                                    <input type="number" class="form-control" x-model="elevator.price" />
+                                </td>
+                                <th>電梯數量</th>
+                                <td>
+                                    <input type="number" class="form-control" x-model="elevator.qty" />
+                                </td>
+                                <th>契約報價(月)</th>
+                                <td>
+                                    <input type="number" class="form-control" x-model="elevator.sale_price" />
+                                </td>
+                            </tr>
+                        </tbody>
+                    </template>
+                </table>
+            </div>
+            <div class="divitem" style="margin-top:20px">
+                <table style="width:800px" class="table noborder" >
+                    <tbody>
                         <tr>
-                            <th>項次</th>
-                            <th>電梯</th>
-                            <th>人乘</th>
-                            <th>載重(KG)</th>
-                            <th>停數</th>
-                            <th>速度(m/min)</th>
-                            <th>開門方式</th>
-                            <th>規格</th>
-                            <th>公司發布價(台)</th>
-                            <th>數量</th>
-                            <th>公司發布價(總價)</th>
-                            <th>售價(台)</th>
-                            <th>售價(總價) </th>
+                            <th>標準價總額(A)</th>
+                            <th>報價總額(B)</th>
+                            <th>破價總額(B-A)</th>
+                            <th>價率%(B/A)</th>
+                            <th>總台數</th>
+                            <th>服務費(介紹費)</th>
+                        </tr>
+                        <tr>
+                            <td><input type="text" class="form-control" x-model="totalPrice().toLocaleString()" disabled style="width:180px" /></td>
+                            <td><input type="text" class="form-control" x-model="totalSalePrice().toLocaleString()" disabled style="width:180px" /></td>
+                            <td><input type="text" class="form-control" x-model="(totalSalePrice() - totalPrice()).toLocaleString()" disabled style="width:180px" /></td>
+                            <td>
+                                <input type="text" class="form-control" x-show="totalPrice()!=0" x-model="Math.round(totalSalePrice() / totalPrice() * 100 * 10) /10" disabled  />
+                                <input type="text" class="form-control" x-show="totalPrice()==0" value="0" disabled  />
+                            </td>
+                            <td><input type="text" class="form-control" x-model="totalElevatorsNum()" disabled /></td>
+                            <td><input type="text" class="form-control" x-model="serviceFee" style="width:150px" /></td>
                         </tr>
-                    </thead>
-                    
+                        <tr>
+                            <th>罰則</th>
+                            <th>訂金保證金(函)%</th>
+                            <th>履約保證金(函)%</th>
+                            <th>保固保證金(函)%</th>
+                            <th></th>
+                            <th></th>
+                        </tr>
+                        <tr>
+                            <td><input type="text" class="form-control" x-model="penalty" /></td>
+                            <td><input type="text" class="form-control" x-model="deposit_rate" /></td>
+                            <td><input type="text" class="form-control" x-model="keep_rate" /></td>
+                            <td><input type="text" class="form-control" x-model="warranty_rate" /></td>
+                            <td></td>
+                            <td></td>
+                        </tr>
+                        <tr>
+                            <th colspan="6">特記事項</th>
+                        </tr>
+                        <tr>
+                            <td colspan="6">
+                                <textarea class="form-control" id="" cols="30" rows="5" x-model="remark"></textarea>
+                            </td>
+                        </tr>
+                    </tbody>            
                 </table>
+                
             </div>
+            <div class="filediv">
+                    <label style="font-size:13px">▪️ 營業權限85%以上；85-80%呈至區處長審核；80%以下呈至總經理審核。</label>
+                    <label for="">
+                        <p>報價單</p>
+                        <input type="file" class="form-control" multiple draggable="true" @change="uploadFiles($event, 1)" />
+                    </label>
+                    <label for="">
+                        <p>附表</p>
+                        <input type="file" class="form-control" multiple draggable="true" @change="uploadFiles($event, 2)" />
+                    </label>
+                    <label for="">
+                        <?php if(!empty($main) && $main['attatch1'] != null): ?>
+                        <a class="btn btn-primary" href="<?php echo $main['attatch1']; ?>" download="<?php echo $main['contractno']; ?>報價單">下載報價單</a>
+                        <?php endif; ?>
+                        <?php if(!empty($main) && $main['attatch2'] != null): ?>
+                        <a class="btn btn-primary" href="<?php echo $main['attatch2']; ?>" download="<?php echo $main['contractno']; ?>附表一">下載附表一</a>
+                        <?php endif; ?>
+                        <button class="btn btn-primary" @click="save()">保存</button>
+                        <button class="btn btn-primary" @click="submit()">送審</button>
+                    </label>
+                </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+
+<script>
+    const body = document.querySelector('body');
+</script>
\ No newline at end of file
diff --git a/wms/mkt/api/postNewElevatorPricereview.php b/wms/mkt/api/postNewElevatorPricereview.php
index 841f53d6..911647f8 100644
--- a/wms/mkt/api/postNewElevatorPricereview.php
+++ b/wms/mkt/api/postNewElevatorPricereview.php
@@ -30,6 +30,8 @@ $attatch2_src = null;
 $token = $_POST['token'];
 $form_key = $_POST['form_key'];
 
+$updated_at = date("Y-m-d H:i:s");
+$updated_by = $_POST['user_id'];
 $elevators = json_decode($_POST['elevators'], true);
 $options = json_decode($_POST['options'], true);
 $otherOptions = json_decode($_POST['otherOptions'], true);
@@ -63,8 +65,6 @@ if(!empty($attatch1)){
     $path = './pricereview-uploads/';
     $attatch1_src = $path.$imgsrc;
     if (!file_exists($path)) { mkdir($path); }
-   
-
     if ($error == 0) {
         $ext = pathinfo($file_name, PATHINFO_EXTENSION);
         if (!in_array($ext, $allow_ext)) {
@@ -155,7 +155,6 @@ try{
         $stmt->bindParam(':status', $status);
         $stmt->bindParam(':attatch1', $attatch1_src);
         $stmt->bindParam(':attatch2', $attatch2_src);
-    
         $stmt->execute();
     
         //整機單價
diff --git a/wms/mkt/api/postPricereviewSign.php b/wms/mkt/api/postPricereviewSign.php
index dfe15b01..a6981dcf 100644
--- a/wms/mkt/api/postPricereviewSign.php
+++ b/wms/mkt/api/postPricereviewSign.php
@@ -31,11 +31,21 @@ try{
     $stmt->bindParam(':sign_id', $sign_id);
     $stmt->execute();
 
-    $sql_str = "UPDATE pricereview_main SET status=:status WHERE id = :id ";
-    $stmt = $conn->prepare($sql_str);
-    $stmt->bindParam(':status', $result);
-    $stmt->bindParam(':id', $mid);
-    $stmt->execute();
+    if($sign == 3){
+        $sql_str = "UPDATE pricereview_main SET status=:status, updated_at=:updated_at WHERE id = :id ";
+        $stmt = $conn->prepare($sql_str);
+        $stmt->bindParam(':status', $result);
+        $stmt->bindParam(':id', $mid);
+        $stmt->bindParam(':updated_at', $updated_at);
+        $stmt->execute();
+    }else{
+        $sql_str = "UPDATE pricereview_main SET status=:status WHERE id = :id ";
+        $stmt = $conn->prepare($sql_str);
+        $stmt->bindParam(':status', $result);
+        $stmt->bindParam(':id', $mid);
+        $stmt->execute();
+    }
+   
 
     include_once "./postSystemNotice.php";
     $sql_str = "SELECT * FROM pricereview_main WHERE id = :id ORDER BY id DESC LIMIT 1";
diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php
index 2e046d1e..1026efe8 100644
--- a/wms/mkt/pricereview-index.php
+++ b/wms/mkt/pricereview-index.php
@@ -392,13 +392,15 @@ if ($data) :
                     <th>總經理</th>
                     <th>狀態</th>
                     <th>合約書申請</th>
+                    <?php if($user_id == "M0060"): ?>
+                    <th>送審時間</th>
+                    <?php endif ; ?>
                     <!--<th>修改</th>-->
                 </tr>
             </thead>
             <tbody>
                 <?php
                 foreach ($data as $data) :
-
                     $sign1 = $sign2 = $sign3 = $sign4 = "";
                     $oneself = ($data["creater"] == $user_id) ? 1 : 0;    // 是否為營業員本人
                     // 簽核狀況
@@ -741,6 +743,11 @@ if ($data) :
                                 <a class="applybtn" href="../contract/contract-download.php?id=<?php echo $data['id'] . '&' . $para ?>">下載</a>
                             <?php endif; ?>
                         </td>
+                        <?php if($user_id == "M0060"): ?>
+                        <td>
+                            <?php echo $data['updated_at']; ?>
+                        </td>
+                        <?php endif; ?>
                     </tr>
                 <?php endforeach; ?>
             </tbody>
diff --git a/wms/mkt/pricereviewCreate.php b/wms/mkt/pricereviewCreate.php
index 921de714..f9c6ba6f 100644
--- a/wms/mkt/pricereviewCreate.php
+++ b/wms/mkt/pricereviewCreate.php
@@ -49,12 +49,11 @@ $hope_status = [
 $sql_str = "SELECT hope_elevator_customer.*, code.content AS source_content, account.name AS salesman_name FROM hope_elevator_customer
             LEFT JOIN code ON code.code_name = hope_elevator_customer.source
             LEFT JOIN account ON account.accountid = hope_elevator_customer.salesman
-            WHERE hope_elevator_customer.vol_no = :vol_no AND code.field_name = 'customer_source'";
+            WHERE hope_elevator_customer.vol_no = :vol_no ";
 $stmt = $conn->prepare($sql_str);
 $stmt->bindParam(':vol_no', $vol_no);
 $stmt->execute();
 $hope_customer = $stmt->fetch(PDO::FETCH_ASSOC);
-
 if($user_id !== $hope_customer['salesman'] && $user_id !== "M0174"){
     echo "<script>alert('無權限編輯此紀錄！您不是該單營業員。');window.history.go(-1);</script>";
     exit;

From c9db9f89f12ab4766cfa40bacad553a97b7be2f2 Mon Sep 17 00:00:00 2001
From: Cheng <lkmd555@masada.com.tw>
Date: Tue, 5 Mar 2024 19:28:00 +0800
Subject: [PATCH 11/16] =?UTF-8?q?=E6=96=B0=E6=A2=AF=E3=80=81=E4=BF=9D?=
 =?UTF-8?q?=E9=A4=8A=E5=90=88=E7=B4=84=E7=B0=BD=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/T8_Authorization_from_bpm.php             |  20 +-
 .../elevator_new_deal_bonus_v1_0.php          |  59 +-
 .../elevator_new_deal_bonus_v2_0.php          |   3 +-
 wms/contract/api/T8api.php                    |   9 +-
 wms/contract/api/getFacilityNo.php            |  31 +-
 wms/contract/api/getT8NewContractData.php     |  62 ++
 wms/contract/api/postContractData.php         |  43 +-
 wms/contract/api/postNewContractData.php      | 874 +++++++++---------
 wms/contract/api/test copy.json               | 363 +-------
 wms/contract/api/testT8API.php                |  53 +-
 wms/contract/conn.php                         |   6 +-
 wms/contract/contract-newelevator-input.php   |   2 +-
 wms/contract/js/alpine.js                     |  11 +-
 13 files changed, 667 insertions(+), 869 deletions(-)
 create mode 100644 wms/contract/api/getT8NewContractData.php

diff --git a/wms/T8_Authorization_from_bpm.php b/wms/T8_Authorization_from_bpm.php
index 7d2ca5a8..42c4f3bd 100644
--- a/wms/T8_Authorization_from_bpm.php
+++ b/wms/T8_Authorization_from_bpm.php
@@ -1,12 +1,7 @@
 <?php
 
-// $user_id = "M0000";
-// $user_password = "M012290493119";
 
-// echo $validation = get_Auth($user_id, $user_password);
-
-// function get_Auth($user_id = "M0000", $user_password = "M012290493119")
-function get_Auth($user_id = "ADMIN", $user_password = "chi")
+function get_Auth($user_id = "M0000", $user_password = "M012290493119")
 {
     $currentTime = time();
     $twoMinutesLater = $currentTime - (2 * 60);
@@ -15,13 +10,13 @@ function get_Auth($user_id = "ADMIN", $user_password = "chi")
     $now = gmdate("YmdHis", strtotime("-2 minutes"));
     $data = "$user_id." . $now;
     // $sign = hash_hmac('SHA256', $data, 'A21181F1EE4966D3', false);
-    $sign = hash_hmac('SHA256', $data, 'A733DAD19527399E', false);
+    $sign = hash_hmac('SHA256', $data, '91EB2CB12C3F8211', false);
 
     // echo $sign;
 
-    // $apiurl = 'https://erp.masada.com.tw:780/twWebAPI/GetAuth';
-    // $apiurl = 'http://60.244.87.101:880//twWebAPI/GetAuth'; -----
-       $apiurl = 'http://101.132.66.206:880/twWebAPI/GetAuth';
+    $apiurl = 'https://erp.masada.com.tw:780/twWebAPI/GetAuth';
+    // $apiurl = 'http://60.244.87.101:880//twWebAPI/GetAuth';
+    // $apiurl = 'http://101.132.66.206:880/twWebAPI/GetAuth';
     // $apiurl = 'http://10.10.145.2:880//twWebAPI/GetAuth';
     // $apiurl = 'https://erp.masada.com.tw:780/twWebAPI/GetAuth';
 
@@ -31,7 +26,7 @@ function get_Auth($user_id = "ADMIN", $user_password = "chi")
         "Pwd: $user_password",
         "TimestampUTC: $now",
         "Sign: $sign",
-        "GroupId:ceshi"
+        "GroupId:MASADA"
     ];
 
     $ch = curl_init();
@@ -54,4 +49,5 @@ function get_Auth($user_id = "ADMIN", $user_password = "chi")
     curl_close($ch);
 }
 // $data = [];
-get_Auth();
+// get_Auth();
+// exit();
diff --git a/wms/bonus/elevator_new/elevator_new_deal_bonus_v1_0.php b/wms/bonus/elevator_new/elevator_new_deal_bonus_v1_0.php
index 7d45b3a1..7564e746 100644
--- a/wms/bonus/elevator_new/elevator_new_deal_bonus_v1_0.php
+++ b/wms/bonus/elevator_new/elevator_new_deal_bonus_v1_0.php
@@ -32,12 +32,13 @@ result_array[
 
 
 
-function elevator_new_deal_bonus_v1_0($ver, $contract_type, $elevator_knockdown_price, $sales_id, $region_manger_id){
+function elevator_new_deal_bonus_v1_0($ver, $contract_type, $elevator_knockdown_price, $elevator_pay_kind, $sales_id, $region_manger_id)
+{
 	$bonus_array = [];
-	if ($ver == "1.0"){
-		
+	if ($ver == "1.0") {
+
 		#合約總類($contract_type)：戰略客戶(strategy_customer)、一般客戶(general_customer)
-		switch ($contract_type){	
+		switch ($contract_type) {
 			case "strategy_customer":
 				#契約員獎金($sales_bonus)
 				$sales_bonus = $elevator_knockdown_price * 0.007;
@@ -52,74 +53,72 @@ function elevator_new_deal_bonus_v1_0($ver, $contract_type, $elevator_knockdown_
 				$region_manager_bonus = 600;
 				break;
 		};
-		
+
 		#營銷人員銷售獎金水庫-----訂金已收款20%，發放總獎金20%
-		array_push($bonus_array,[
+		array_push($bonus_array, [
 			"bonus_type" => "營銷人員銷售獎金-訂金段", #獎金名稱
 			"bonus_receiver" => $sales_id, #發放人員
 			"bonus_amount" => round($sales_bonus * 0.2), #金額
 			"payment_schedul_due" => "deposit", #訂金已收款20%
 			"payment_schedul_regulation" => "訂金已收款20%，發放總獎金20%" #發放規定				
 		]);
-		
+
 		#營銷人員銷售獎金水庫-----出貨前期所有款項已收齊，且出貨款已收款50%，發放總獎金50%
-		array_push($bonus_array,[
+		array_push($bonus_array, [
 			"bonus_type" => "營銷人員銷售獎金-出貨款段", #獎金名稱
 			"bonus_receiver" => $sales_id, #發放人員
 			"bonus_amount" => round($sales_bonus * 0.5), #金額
 			"payment_schedul_due" => "shipping", #訂金已收款20%
 			"payment_schedul_regulation" => "出貨前期所有款項已收齊，且出貨款已收款50%，發放總獎金50%" #發放規定				
-		]);		
-		
+		]);
+
 		#營銷人員銷售獎金水庫-----驗收前期所有款項已收齊，且驗收款已收款30%，發放總獎金30%
-		array_push($bonus_array,[
+		array_push($bonus_array, [
 			"bonus_type" => "營銷人員銷售獎金-驗收款段", #獎金名稱
 			"bonus_receiver" => $sales_id, #發放人員
 			"bonus_amount" => round($sales_bonus * 0.3), #金額
 			"payment_schedul_due" => "acceptance", #訂金已收款20%
 			"payment_schedul_regulation" => "驗收前期所有款項已收齊，且驗收款已收款30%，發放總獎金30%" #發放規定				
-		]);	
+		]);
 
 		#區域經理獎金水庫-----訂金已收款100%，發放總獎金50%
-		array_push($bonus_array,[
+		array_push($bonus_array, [
 			"bonus_type" => "區域經理提成獎金-訂金段", #獎金名稱
 			"bonus_receiver" => $region_manger_id, #發放人員
 			"bonus_amount" => round($region_manager_bonus * 0.5), #金額
 			"payment_schedul_due" => "deposit", #訂金已收款100%
 			"payment_schedul_regulation" => "訂金已收款100%，發放總獎金50%" #發放規定				
-		]);		
-		
+		]);
+
 		#區域經理獎金水庫-----貨到工地款(含)之前所有款項已收款100%，發放總獎金50%
-		array_push($bonus_array,[
+		array_push($bonus_array, [
 			"bonus_type" => "區域經理提成獎金-貨到工地款段", #獎金名稱
 			"bonus_receiver" => $region_manger_id, #發放人員
 			"bonus_amount" => round($region_manager_bonus * 0.5), #金額
 			"payment_schedul_due" => "deliveried", #貨到工地款(含)之前所有款項已收款100%
 			"payment_schedul_regulation" => "貨到工地款(含)之前所有款項已收款100%，發放總獎金50%" #發放規定				
-		]);			
+		]);
 
 		$result_array = [
-			"ver"=>$ver, #獎金版本
-			"result_status"=>"success", #計算結果	
-			"bonus_array"=>$bonus_array #獎金水庫
-		];			
-	}else{
-		array_push($bonus_array,[
+			"ver" => $ver, #獎金版本
+			"result_status" => "success", #計算結果	
+			"bonus_array" => $bonus_array #獎金水庫
+		];
+	} else {
+		array_push($bonus_array, [
 			"bonus_type" => "error", #獎金名稱
 			"bonus_receiver" => "error", #發放人員
 			"bonus_amount" => 0, #金額
 			"payment_schedul_due" => "9999-1-1", #預計發放時間
 			"payment_schedul_regulation" => "error" #發放規定				
 		]);
-		
+
 		$result_array = [
-			"ver"=>$ver, #獎金版本
-			"result_status"=>"error", #計算結果	
-			"bonus_array"=>$bonus_array #獎金水庫
+			"ver" => $ver, #獎金版本
+			"result_status" => "error", #計算結果	
+			"bonus_array" => $bonus_array #獎金水庫
 		];
 	};
-	
+
 	return $result_array;
 };
-
-?>
\ No newline at end of file
diff --git a/wms/bonus/elevator_new/elevator_new_deal_bonus_v2_0.php b/wms/bonus/elevator_new/elevator_new_deal_bonus_v2_0.php
index 15f87514..82ea4798 100644
--- a/wms/bonus/elevator_new/elevator_new_deal_bonus_v2_0.php
+++ b/wms/bonus/elevator_new/elevator_new_deal_bonus_v2_0.php
@@ -10,7 +10,7 @@
 區域經理員工號($region_manger_id)
 
 【2.函數中的變數說明】
-銷售點數($discount)：作番賣價($elevator_knockdown_price) 除以 作番表價($elevator_list_price)
+// 銷售點數($discount)：作番賣價($elevator_knockdown_price) 除以 作番表價($elevator_list_price)
 營業員獎金($sales_bonus)
 區域經理提成獎金($region_manager_bonus)
 獎金預計發放階段($payment_schedule_due)：deposit(訂金)、shipping(出貨款)、deliveried(貨到工地款)、acceptance(驗收款)
@@ -39,6 +39,7 @@ function elevator_new_deal_bonus_v2_0($ver, $contract_type, $elevator_type, $ele
 {
 	$bonus_array = [];
 	if ($ver == "2.0") {
+		$elevator_knockdown_price = round($elevator_knockdown_price / 1.05); //不含稅
 		$discount = round($elevator_knockdown_price / $elevator_list_price, 3); #銷售點數，取到小數點第三位。
 
 		#合約總類($contract_type)：戰略客戶(strategy_customer)、一般客戶(general_customer)
diff --git a/wms/contract/api/T8api.php b/wms/contract/api/T8api.php
index 245a318d..88d8dffa 100644
--- a/wms/contract/api/T8api.php
+++ b/wms/contract/api/T8api.php
@@ -6,12 +6,13 @@ function T8salIncomeApply($data, $api_url)
 
     // $api_url = 'https://erp.masada.com.tw:780/twWebAPI/V1/SALINCOMEAPPLY/PostERPData';
     $validation = get_Auth();
-    // echo '<pre>';
-    // print_r(json_encode($data, JSON_UNESCAPED_UNICODE));
-    // echo '</pre>';
+    echo '<pre>';
+    print_r($validation);
+    echo '</pre>';
+    // exit;
     $header = [
         "CHI_Authorization :" . $validation,
-        "GroupId:TEST"
+        "GroupId:MASADA"
     ];
     $ch = curl_init();
     curl_setopt($ch, CURLOPT_URL, $api_url); // 设置请求的URL
diff --git a/wms/contract/api/getFacilityNo.php b/wms/contract/api/getFacilityNo.php
index 55df3c57..b4d0928f 100644
--- a/wms/contract/api/getFacilityNo.php
+++ b/wms/contract/api/getFacilityNo.php
@@ -378,16 +378,31 @@ class CreateFacilityNo
      * @param string|array $facility_no
      * @return boolean $status : true:沒重複 false:重複
      */
+
     function checkFacilityRepeatStatus($facility_no)
     {
+        // worksite wipwholestatus
+        // 檢查 substring 後五碼
         if (gettype($facility_no) == "string") {
             $pdo = $this->connectionDB();
             $pdo->exec('SET CHARACTER SET utf8mb4');
-            $sth = $pdo->prepare('SELECT * FROM `facility` WHERE `facilityno` = ?');
+            $sth = $pdo->prepare('SELECT * FROM `worksite` WHERE `facilityno` = ?');
             $sth->bindValue(1, $facility_no);
             $sth->execute();
-            if ($sth->rowCount() == 0)
+            if ($sth->rowCount() == 0) {
+                return true;
+            }
+            $facility_no = substr($facility_no, -5);
+            echo $facility_no;
+            $pdo = $this->connectionDB();
+            $pdo->exec('SET CHARACTER SET utf8mb4');
+            $sth = $pdo->prepare("SELECT * FROM `wipwholestatus` WHERE `facilityno` LIKE '%?'");
+            $sth->bindValue(1, '%' . $facility_no . '%');
+            $sth->execute();
+            if ($sth->rowCount() == 0) {
                 return true;
+            }
+
             return false;
         }
         if (gettype($facility_no) == "array") {
@@ -395,11 +410,21 @@ class CreateFacilityNo
             $pdo->exec('SET CHARACTER SET utf8mb4');
             $status = true;
             foreach ($facility_no as $row) {
-                $sth = $pdo->prepare('SELECT * FROM `facility` WHERE `facilityno` = ?');
+                $sth = $pdo->prepare('SELECT * FROM `worksite` WHERE `facilityno` = ?');
                 $sth->bindValue(1, $row);
                 $sth->execute();
                 if ($sth->rowCount() !== 0)
                     $status = false;
+
+                $row = substr($row, -5);
+                $pdo = $this->connectionDB();
+                $pdo->exec('SET CHARACTER SET utf8mb4');
+                $sth = $pdo->prepare("SELECT * FROM `wipwholestatus` WHERE `facilityno` LIKE ?");
+                $sth->bindValue(1, '%' . $row . '%');
+                $sth->execute();
+                if ($sth->rowCount() != 0) {
+                    $status = false;
+                }
             }
             return $status;
         }
diff --git a/wms/contract/api/getT8NewContractData.php b/wms/contract/api/getT8NewContractData.php
new file mode 100644
index 00000000..2d348558
--- /dev/null
+++ b/wms/contract/api/getT8NewContractData.php
@@ -0,0 +1,62 @@
+<?php
+require_once('../conn.php');
+
+$sql = "SELECT 
+    BillNo, -- 合約號
+    OAmount -- 合約未稅金額
+FROM salSalesOrder WHERE 1=1";
+$stmt = $connT8->prepare($sql);
+$stmt->execute();
+$result = $stmt->fetchAll(PDO::FETCH_ASSOC);
+// echo "<pre>";
+// print_r($result);
+// echo "</pre>";
+// exit();
+$result_detail = [];
+$result_master = [];
+$result_arr = [];
+foreach ($result as $key => $result) {
+    $no = $result['BillNo'];
+    $result_master['BillNo'] = $no;
+    $firstChar = substr($no, 0, 1);
+    if ($firstChar == 'M' && $key <= 100) {
+        $sql = "SELECT BizPartnerName FROM comBusinessPartner WHERE BizPartnerId = '$no' ";
+        $stmt = $connT8->prepare($sql);
+        $stmt->execute();
+        $customer_name = $stmt->fetch(PDO::FETCH_ASSOC);
+        // $result_master[] = $result;
+        $sql = "SELECT 
+            BillNo, -- 合約號
+            PayStage, -- 收款階段
+            PlanPercentage, -- 收款比例
+            PlanPayAmt -- 收款金額
+            FROM salOrderStagePay WHERE BillNo = '$no'";
+        $stmt = $connT8->prepare($sql);
+        $stmt->execute();
+        $Detail = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        if (!empty($Detail)) {
+            foreach ($Detail as $key => $detail) {
+                $detail['PlanPercentage'] = (float)$detail['PlanPercentage'];
+                $Detail[$key]['PlanPercentage'] = $detail['PlanPercentage']; // 比例轉小數第二位
+                $Detail[$key]['PlanPayAmt'] = intval($detail['PlanPayAmt']); // 比例金額轉整數
+
+            }
+
+            if (mb_substr($Detail[0]['PayStage'], 0, 2) == '寶佳') {
+                $result_master['customer_status'] = 'strategy_customer';
+            } else if (!empty($customer_name) && mb_substr($customer_name['BizPartnerName'], 0, 1) == '【') {
+                $result_master['customer_status'] = 'strategy_customer';
+            } else {
+                $result_master['customer_status'] = 'general_customer';
+            }
+
+            $result_master['total_price'] = intval($result['OAmount']);
+            $result_master['detail'] = $Detail;
+            $result_arr[] = $result_master;
+        }
+    }
+}
+
+echo "<pre>";
+print_r($result_arr);
+echo "</pre>";
diff --git a/wms/contract/api/postContractData.php b/wms/contract/api/postContractData.php
index 243b9ad3..26b97cb7 100644
--- a/wms/contract/api/postContractData.php
+++ b/wms/contract/api/postContractData.php
@@ -1,3 +1,5 @@
+<meta charset="UTF-8">
+
 <?php
 require_once("../conn.php");
 // require_once("../connt8.php");
@@ -66,13 +68,14 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
         echo json_encode($facility_arr);
         // 電梯做番號
         $facilityno = $createFacilityNo->makeBFacilityNo("T", $facility_arr, (int)$num);
+        echo json_encode($facilityno);
+        T8insert($_POST, $facilityno, $depId, $connT8);
         // if ($user_id == 'M0225') {
         //     echo '<pre>';
         //     print_r($facilityno);
         //     echo '</pre>';
         //     exit();
         // }
-        echo json_encode($facilityno);
         $fail_arr = [];
         if ($contractno === '') return $fail_arr[] = '合約號為必填';
         if ($total_price == '')  $fail_arr[] = '合約總價為必填';
@@ -100,10 +103,9 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
             echo json_encode($fail_arr);
             exit();
         }
-        T8insert($_POST, $facilityno, $depId);
         /// 獎金計算
         $aaa = bonusCreate($_POST, $facilityno, $conn);
-        if ($aaa['status'] == 2) {
+        if (!empty($aaa) && $aaa['status'] == 2) {
             header("HTTP/1.1 422 Unprocessable Entity");
             echo $aaa['data'];
             exit();
@@ -387,12 +389,13 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
     }
 };
 
-function T8insert($data, $facilityno, $depId)
+function T8insert($data, $facilityno, $depId, $connT8)
 {
-    require_once("../connt8.php");
+    // require_once("../conn.php");
     // 引入 T8 API 連線
     require_once("./T8api.php");
 
+
     $contractno = !empty($data['contractno']) ? $data['contractno'] : null; // 合約號
     $address = !empty($data['address']) ? $data['address'] : null; // 客戶地址
     $customer = !empty($data['customer']) ? $data['customer'] : null; //企業名稱
@@ -414,7 +417,7 @@ function T8insert($data, $facilityno, $depId)
     $connT8->beginTransaction();
 
     $sql = "SELECT * FROM comCustomer WHERE BizPartnerId = :BizPartnerId";
-    $stmt = $conn->prepare($sql);
+    $stmt = $connT8->prepare($sql);
     $stmt->bindParam(':BizPartnerId', $contractno);
     $stmt->execute();
     $result = $stmt->fetch(PDO::FETCH_ASSOC);
@@ -428,6 +431,7 @@ function T8insert($data, $facilityno, $depId)
         echo 'Error';
         exit;
     }
+
     if (empty($result)) {
         // 若 客戶資料為空，新增一筆到 comCustomer
         // 新增客戶資料
@@ -589,25 +593,6 @@ function T8insert($data, $facilityno, $depId)
             $row++;
             // 計算分期款的收款月份
             $paymonth = $i * $IncomeId[$payType];
-            // switch($IncomeId[$payType]):
-            //     case (1):
-            //         $paymonth = $i * $IncomeId[$payType];
-            //         $countDay = date('Y-m-d', strtotime("$date_1 + $paymonth years"));
-            //         break;
-            //     case (2):
-            //         $paymonth = $i * $IncomeId[$payType];
-            //         $countDay = date('Y-m-d', strtotime("$date_1 + $paymonth months"));
-            //         break;
-            //     case (12):
-            //         $countDay = date('Y-m-d', strtotime("$date_1 + $paymonth months"));
-            //         break;
-            //     case (6):
-            //         $countDay = date('Y-m-d', strtotime("$date_1 + $paymonth months"));
-            //         break;
-            //     case (2):
-            //         $countDay = date('Y-m-d', strtotime("$date_1 + $paymonth months"));
-            //         break;
-
             $countDay = date('Y-m-d', strtotime("$date_1 + $paymonth months"));
             $payDay = str_replace('-', '', $countDay);
             $rows_data = [
@@ -666,10 +651,10 @@ function T8insert($data, $facilityno, $depId)
     $API_body[] = $salIncomeApplyMaster;
     $API_body[] = $salIncomeApplyDetail;
     // 呼叫 API
-    // echo '<pre>';
-    // print_r($API_body);
-    // echo '</pre>';
-    $api_url = 'https://erp.masada.com.tw:780/twWebAPI/V1/SALINCOMEAPPLY/PostERPData';
+    echo '<pre>';
+    print_r($API_body);
+    echo '</pre>';
+    $api_url = 'http://10.10.145.2:880/twWebAPI/V1/SALINCOMEAPPLY/PostERPData';
     $result = T8salIncomeApply($API_body, $api_url);
 
     if ($result['Status'] == 'Error' || $result['Status'] == 'Fails') {
diff --git a/wms/contract/api/postNewContractData.php b/wms/contract/api/postNewContractData.php
index 6fd5756c..359cbbb0 100644
--- a/wms/contract/api/postNewContractData.php
+++ b/wms/contract/api/postNewContractData.php
@@ -16,76 +16,77 @@ if ($_SERVER['REQUEST_METHOD'] != 'POST') {
 }
 //新梯簽回
 if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['contracttype']) && $_POST['contracttype'] == 'm') {
-  try {
-    $created_at = date('Y-m-d H:i:s');
-    $created_by = $_POST["user_id"];
-    $contractno = $_POST["contractno"];
-    $customer = $_POST["customer"];
-    $manager = $_POST["manager"];
-    $vat = $_POST["vat"];
-    $case_name = $_POST["case_name"];
-    $linkman = $_POST["linkman"];
-    $lm_tel = $_POST["lm_tel"];
-    $address = $_POST["address"];
-    $salesman = $_POST["salesman"];
-    $qc = $_POST["qc"];
-    $contracttype = $_POST["contracttype"];
-    $elevators_nums = $_POST['nums'];
-    $area_no = $_POST['area_no'];
-    $elevators = json_decode($_POST['elevators'], JSON_UNESCAPED_UNICODE);
-    $elevators_detail_arr = json_decode($_POST['elevators_detail_arr'], JSON_UNESCAPED_UNICODE);
-    // echo "<pre>";
-    // print_r($elevators_detail_arr);
-    // echo "</pre>";
-    // exit();
-    $files = !empty($_FILES['files']) ? $_FILES['files'] : null;
-    $files_id = null;
-
-    $fail_arr = [];
-    // if (empty($contractno)) $fail_arr[] = '合約號為必填';
-    // if (empty($customer)) $fail_arr[] = '客戶名稱為必填';
-    // if (empty($manager)) $fail_arr[] = '負責人為必填';
-    // if (empty($vat)) $fail_arr[] = '統編/身分證為必填';
-    // if (empty($case_name)) $fail_arr[] = '案名為必填';
-    // if (empty($linkman)) $fail_arr[] = '聯絡人為必填';
-    // if (empty($lm_tel)) $fail_arr[] = '聯絡人電話為必填';
-    // if (empty($address)) $fail_arr[] = '地址為必填';
-    // if (empty($salesman)) $fail_arr[] = '營業員為必填';
-    // if (empty($qc)) $fail_arr[] = '請選擇QC或官檢';
-    // if (count($fail_arr) > 0) {
-    //   header("HTTP/1.1 422 Unprocessable Entity");
-    //   echo json_encode($fail_arr, JSON_UNESCAPED_UNICODE);
-    //   exit();
-    // }
-    //create facility table
-    $createFacilityNo = new CreateFacilityNo();
-    $dailyNecessities = [
-      'MAE100' => 'X', //小機房客梯
-      'MAM200' => 'W', //無機房客梯
-      'MAH100' => 'H', //小電梯
-      'MAQ100' => 'Z', //強趨梯
-      'MAF100' => 'F', //貨梯
-      'MAP100' => 'B', //平台梯
-    ];
-    $arr = [];
-    // 建立作番號
-    foreach ($elevators_detail_arr as $elevator) {
-      // $spec = explode('-', $elevator['item_spec']);
-      $arr[] = $dailyNecessities[$elevator['spec']];
-    }
-    $facilityno = $createFacilityNo->makeMFacilityNo('M', $arr, intval($elevators_nums));
-    echo json_encode($facilityno);
-
-    $bonus_result = BounsCount($_POST, $conn, $facilityno);
-    if (!empty($bonus_result) && $bonus_result['status'] == "2") {
-      $fail_arr[] = '獎金計算錯誤，請再檢查或連繫資訊人員';
-      // header("HTTP/1.1 422 Unprocessable Entity");
-      echo json_encode($fail_arr, JSON_UNESCAPED_UNICODE);
-      exit();
-    }
 
-    T8Insert($_POST, $facilityno, $connT8);
+  $created_at = date('Y-m-d H:i:s');
+  $created_by = $_POST["user_id"];
+  $contractno = $_POST["contractno"];
+  $customer = $_POST["customer"];
+  $manager = $_POST["manager"];
+  $vat = $_POST["vat"];
+  $case_name = $_POST["case_name"];
+  $linkman = $_POST["linkman"];
+  $lm_tel = $_POST["lm_tel"];
+  $address = $_POST["address"];
+  $salesman = $_POST["salesman"];
+  $contracttype = $_POST["contracttype"];
+  $elevators_nums = $_POST['nums'];
+  $area_no = $_POST['area_no'];
+  $elevators = json_decode($_POST['elevators'], JSON_UNESCAPED_UNICODE);
+  $elevators_detail_arr = json_decode($_POST['elevators_detail_arr'], JSON_UNESCAPED_UNICODE);
+  // echo "<pre>";
+  // print_r($elevators_detail_arr);
+  // echo "</pre>";
+  // exit();
+  $files = !empty($_FILES['files']) ? $_FILES['files'] : null;
+  $files_id = null;
+
+  $fail_arr = [];
+  if (empty($contractno)) $fail_arr[] = '合約號為必填';
+  if (empty($customer)) $fail_arr[] = '客戶名稱為必填';
+  if (empty($manager)) $fail_arr[] = '負責人為必填';
+  // if (empty($vat)) $fail_arr[] = '統編/身分證為必填';
+  if (empty($case_name)) $fail_arr[] = '案名為必填';
+  if (empty($linkman)) $fail_arr[] = '聯絡人為必填';
+  if (empty($lm_tel)) $fail_arr[] = '聯絡人電話為必填';
+  if (empty($address)) $fail_arr[] = '地址為必填';
+  if (empty($salesman)) $fail_arr[] = '營業員為必填';
+  // if (empty($elevators_detail_arr['qc'])) $fail_arr[] = '請選擇QC或官檢';
+  if (count($fail_arr) > 0) {
+    header("HTTP/1.1 422 Unprocessable Entity");
+    echo json_encode($fail_arr, JSON_UNESCAPED_UNICODE);
     exit();
+  }
+  //create facility table
+  $createFacilityNo = new CreateFacilityNo();
+  $dailyNecessities = [
+    'MAE100' => 'X', //小機房客梯
+    'MAM200' => 'W', //無機房客梯
+    'MAH100' => 'H', //小電梯
+    'MAQ100' => 'Z', //強趨梯
+    'MAF100' => 'F', //貨梯
+    'MAP100' => 'B', //平台梯
+  ];
+  $arr = [];
+  // 建立作番號
+  foreach ($elevators_detail_arr as $elevator) {
+    // $spec = explode('-', $elevator['item_spec']);
+    $arr[] = $dailyNecessities[$elevator['spec']];
+  }
+  $facilityno = $createFacilityNo->makeMFacilityNo('M', $arr, intval($elevators_nums));
+  echo json_encode($facilityno);
+
+  // $bonus_result = BounsCount($_POST, $conn, $facilityno);
+
+  // if (!empty($bonus_result) && $bonus_result['status'] == "2") {
+  //   $fail_arr[] = '獎金計算錯誤，請再檢查或連繫資訊人員';
+  //   // header("HTTP/1.1 422 Unprocessable Entity");
+  //   echo json_encode($fail_arr, JSON_UNESCAPED_UNICODE);
+  //   exit();
+  // }
+
+  T8Insert($_POST, $facilityno, $connT8);
+  // exit();
+  try {
     $conn->beginTransaction();
 
     //create account table
@@ -122,8 +123,8 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
       $site_manager = $value['manage'];
       $warehouseid = $value['warehouseid'];
       $sql = "INSERT INTO Wipwholestatus 
-      (contract_type,contractno,salesid,custom,accountid,site_manager,warehouseid,facilityno,weight,numberofpassenger,numberoffloor,opentype,speed,facility_kind,area_no,address,contract_arrival_date,real_contract_arrival_date,qc_official_type,creater,create_at) VALUES
-      ('A',:contractno,:salesid,:custom,:accountid,:site_manager,:warehouseid,:facilityno,:weight,:numberofpassenger,:numberoffloor,:opentype,:speed,:facility_kind,:area_no,:address,:contract_arrival_date,:real_contract_arrival_date,:qc_official_type,:creater,:create_at)";
+      (contract_type,contractno,salesid,custom,accountid,site_manager,warehouseid,facilityno,weight,numberofpassenger,numberoffloor,opentype,speed,facility_kind,area_no,address,contract_arrival_date,real_contract_arrival_date,qc_official_type,creater,create_at,desin_spec_verify) VALUES
+      ('A',:contractno,:salesid,:custom,:accountid,:site_manager,:warehouseid,:facilityno,:weight,:numberofpassenger,:numberoffloor,:opentype,:speed,:facility_kind,:area_no,:address,:contract_arrival_date,:real_contract_arrival_date,:qc_official_type,:creater,:create_at,1)";
       // $sql = "INSERT INTO Wipwholestatus
       // (contract_type,contractno,salesid,custom,accountid,facilityno,weight,numberofpassenger,numberoffloor,opentype,speed,facility_kind,address,contract_arrival_date,qc_official_type,creater,create_at) VALUES
       // ('A','$contractno','$salesman','$customer','$customer','$facilityno','$weight','$person','$floor','$open','$speed','$facility_kind','$address','$contract_arrival_date','$qc','$created_by','$created_at')";
@@ -153,6 +154,7 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
       // echo "<pre>";
       // print_r($lastId);
       // echo "</pre>";
+      // exit;
       if (!empty($lastId)) {
         echo '123';
         // 寫入待簽程狀態 A (營業)
@@ -180,111 +182,112 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
       $stmt->execute();
 
       // create table schedule
-      $contract_begin_date = '';
-      $contract_end_date = ''; // 一年
-      $comboNo = new CreateComboNo('em', $contract_begin_date, $contract_end_date);
-      $comboArr =  json_decode($comboNo->getComboNo(), true);
-      foreach ($comboArr as $combo) {
-        $sql_str = 'INSERT INTO schedule (contractno, facilityno, combono, repairerid, repairername, duedate, creater, create_at) VALUES (:contractno, :facilityno, :combono, :repairerid, :repairername, :duedate, :creater, :create_at)';
-        $stmt = $conn->prepare($sql_str);
-        $stmt->bindParam(':contractno', $contractno);
-        $stmt->bindParam(':facilityno', $facility_no);
-        $stmt->bindParam(':combono', $combo[0]);
-        $stmt->bindParam(':repairerid', $repairerid);
-        $stmt->bindParam(':repairername', $repairername);
-        $stmt->bindParam(':duedate', $combo[1]);
-        $stmt->bindParam(':creater', $creater);
-        $stmt->bindParam(':create_at', $create_at);
-        $result = $stmt->execute();
-      }
-    }
-
-
-
-    $sql_str = "SELECT accountid, name FROM account WHERE accountid = :accountid ORDER BY create_at DESC";
-    $stmt = $conn->prepare($sql_str);
-    $stmt->bindParam(":accountid", $salesman);
-    $stmt->execute();
-    $saleman = $stmt->fetch(PDO::FETCH_ASSOC);
-    $salesman_name = $saleman['name'];
-    if (!empty($files)) {
-      $englisharr = range('a', 'z');
-      $files = $_FILES['files'];
-      $newfiles = [];
-      foreach ($files as $file) {
-        $i = 0;  //新陣列的索引編號
-        foreach ($file as $key => $val) {
-          $newfiles[$i]['name']     = $files['name'][$key];
-          $newfiles[$i]['type']     = $files['type'][$key];
-          $newfiles[$i]['tmp_name'] = $files['tmp_name'][$key];
-          $newfiles[$i]['error']    = $files['error'][$key];
-          $newfiles[$i]['size']     = $files['size'][$key];
-          $i++;
-        } //foreach 第2層 end
-      }
-      $max_size  = 4096 * 4096;                     //設定允許上傳檔案容量的最大值(1M)
-      $allow_ext = array('jpeg', 'jpg', 'png', 'JPG', 'JPEG', 'PNG', 'GIF');   //設定允許上傳檔案的類型
-      $path      = '../images/contracts/';
-      if (!file_exists($path)) {
-        mkdir($path);
-      }
-      $msg_result = '';  //負責接收所有檔案檢測後的回傳訊息
-      $datetime = (string)date('YmdHis');
-      $files_id = 'm' . $datetime; // 保養=>b + 日期時間
-      foreach ($newfiles as $key => $file) {
-        $randNum = rand(1000, 9999);
-        $randEnglish = $englisharr[rand(0, 25)];
-        $file_name = 'm' . (string)date('YmdHis') . $randNum . $randEnglish . $randNum . $file['name'];
-        $msg = upload_chk($file, $path, $max_size, $allow_ext,  $file_name);
-        if ($msg == 1) {
-          $msg = '檔案傳送成功！';
-          $sql_str = "INSERT INTO contract_back_files (files_id, file_name, file_mime, file_size, created_at, created_by) VALUES (:files_id, :file_name, :file_mime, :file_size, :created_at, :created_by)";
-          $stmt = $conn->prepare($sql_str);
-          $stmt->bindParam(':files_id', $files_id);
-          $stmt->bindParam(':file_name', $file_name);
-          $stmt->bindParam(':file_mime', $file['type']);
-          $stmt->bindParam(':file_size', $file['size']);
-          $stmt->bindParam(':created_at', $created_at);
-          $stmt->bindParam(':created_by', $created_by);
-          $stmt->execute();
-        } else {
-          throw new PDOException('檔案上傳失敗:' . $msg);
+      //   $contract_begin_date = '';
+      //   $contract_end_date = ''; // 一年
+      //   $comboNo = new CreateComboNo('em', $contract_begin_date, $contract_end_date);
+      //   $comboArr =  json_decode($comboNo->getComboNo(), true);
+      //   foreach ($comboArr as $combo) {
+      //     $sql_str = 'INSERT INTO schedule (contractno, facilityno, combono, repairerid, repairername, duedate, creater, create_at) VALUES (:contractno, :facilityno, :combono, :repairerid, :repairername, :duedate, :creater, :create_at)';
+      //     $stmt = $conn->prepare($sql_str);
+      //     $stmt->bindParam(':contractno', $contractno);
+      //     $stmt->bindParam(':facilityno', $facility_no);
+      //     $stmt->bindParam(':combono', $combo[0]);
+      //     $stmt->bindParam(':repairerid', $repairerid);
+      //     $stmt->bindParam(':repairername', $repairername);
+      //     $stmt->bindParam(':duedate', $combo[1]);
+      //     $stmt->bindParam(':creater', $creater);
+      //     $stmt->bindParam(':create_at', $create_at);
+      //     $result = $stmt->execute();
+      //   }
+      // }
+
+
+
+      $sql_str = "SELECT accountid, name FROM account WHERE accountid = :accountid ORDER BY create_at DESC";
+      $stmt = $conn->prepare($sql_str);
+      $stmt->bindParam(":accountid", $salesman);
+      $stmt->execute();
+      $saleman = $stmt->fetch(PDO::FETCH_ASSOC);
+      $salesman_name = $saleman['name'];
+      if (!empty($files)) {
+        $englisharr = range('a', 'z');
+        $files = $_FILES['files'];
+        $newfiles = [];
+        foreach ($files as $file) {
+          $i = 0;  //新陣列的索引編號
+          foreach ($file as $key => $val) {
+            $newfiles[$i]['name']     = $files['name'][$key];
+            $newfiles[$i]['type']     = $files['type'][$key];
+            $newfiles[$i]['tmp_name'] = $files['tmp_name'][$key];
+            $newfiles[$i]['error']    = $files['error'][$key];
+            $newfiles[$i]['size']     = $files['size'][$key];
+            $i++;
+          } //foreach 第2層 end
         }
-        $msg_result .= '第' . ($key + 1) . '個上傳檔案的結果：' . $msg . '<br/>';
-        $src_name = $path . $file['name'];
-        if (file_exists($src_name)) {
-          //副檔名
-          $extname  = pathinfo($src_name, PATHINFO_EXTENSION);
-          //主檔名
-          $basename = basename($src_name, '.' . $extname);
+        $max_size  = 4096 * 4096;                     //設定允許上傳檔案容量的最大值(1M)
+        $allow_ext = array('jpeg', 'jpg', 'png', 'JPG', 'JPEG', 'PNG', 'GIF');   //設定允許上傳檔案的類型
+        $path      = '../images/contracts/';
+        if (!file_exists($path)) {
+          mkdir($path);
+        }
+        $msg_result = '';  //負責接收所有檔案檢測後的回傳訊息
+        $datetime = (string)date('YmdHis');
+        $files_id = 'm' . $datetime; // 保養=>b + 日期時間
+        foreach ($newfiles as $key => $file) {
+          $randNum = rand(1000, 9999);
+          $randEnglish = $englisharr[rand(0, 25)];
+          $file_name = 'm' . (string)date('YmdHis') . $randNum . $randEnglish . $randNum . $file['name'];
+          $msg = upload_chk($file, $path, $max_size, $allow_ext,  $file_name);
+          if ($msg == 1) {
+            $msg = '檔案傳送成功！';
+            $sql_str = "INSERT INTO contract_back_files (files_id, file_name, file_mime, file_size, created_at, created_by) VALUES (:files_id, :file_name, :file_mime, :file_size, :created_at, :created_by)";
+            $stmt = $conn->prepare($sql_str);
+            $stmt->bindParam(':files_id', $files_id);
+            $stmt->bindParam(':file_name', $file_name);
+            $stmt->bindParam(':file_mime', $file['type']);
+            $stmt->bindParam(':file_size', $file['size']);
+            $stmt->bindParam(':created_at', $created_at);
+            $stmt->bindParam(':created_by', $created_by);
+            $stmt->execute();
+          } else {
+            throw new PDOException('檔案上傳失敗:' . $msg);
+          }
+          $msg_result .= '第' . ($key + 1) . '個上傳檔案的結果：' . $msg . '<br/>';
+          $src_name = $path . $file['name'];
+          if (file_exists($src_name)) {
+            //副檔名
+            $extname  = pathinfo($src_name, PATHINFO_EXTENSION);
+            //主檔名
+            $basename = basename($src_name, '.' . $extname);
+          }
         }
+      } else {
+        $files = null;
       }
-    } else {
-      $files = null;
-    }
 
-    $sql_str = "INSERT INTO contract_m_signed_back (contract_no, customer, manager, vat, case_name, linkman, lm_tel, address, salesman, salesman_name, files_id, created_at, created_by, qc_official_type) VALUES (:contract_no, :customer, :manager, :vat, :case_name, :linkman, :lm_tel, :address, :salesman, :salesman_name, :files_id, :created_at, :created_by, :qc)";
-    $stmt = $conn->prepare($sql_str);
-    $stmt->bindParam(":contract_no", $contractno);
-    $stmt->bindParam(":customer", $customer);
-    $stmt->bindParam(":manager", $manager);
-    $stmt->bindParam(":vat", $vat);
-    $stmt->bindParam(":case_name", $case_name);
-    $stmt->bindParam(":linkman", $linkman);
-    $stmt->bindParam(":lm_tel", $lm_tel);
-    $stmt->bindParam(":address", $address);
-    $stmt->bindParam(":salesman", $salesman);
-    $stmt->bindParam(":salesman_name", $salesman_name);
-    $stmt->bindParam(":files_id", $files_id);
-    $stmt->bindParam(":created_at", $created_at);
-    $stmt->bindParam(":created_by", $created_by);
-    $stmt->bindParam(":qc", $qc);
-    $stmt->execute();
+      $sql_str = "INSERT INTO contract_m_signed_back (contract_no, customer, manager, vat, case_name, linkman, lm_tel, address, salesman, salesman_name, files_id, created_at, created_by) VALUES (:contract_no, :customer, :manager, :vat, :case_name, :linkman, :lm_tel, :address, :salesman, :salesman_name, :files_id, :created_at, :created_by)";
+      $stmt = $conn->prepare($sql_str);
+      $stmt->bindParam(":contract_no", $contractno);
+      $stmt->bindParam(":customer", $customer);
+      $stmt->bindParam(":manager", $manager);
+      $stmt->bindParam(":vat", $vat);
+      $stmt->bindParam(":case_name", $case_name);
+      $stmt->bindParam(":linkman", $linkman);
+      $stmt->bindParam(":lm_tel", $lm_tel);
+      $stmt->bindParam(":address", $address);
+      $stmt->bindParam(":salesman", $salesman);
+      $stmt->bindParam(":salesman_name", $salesman_name);
+      $stmt->bindParam(":files_id", $files_id);
+      $stmt->bindParam(":created_at", $created_at);
+      $stmt->bindParam(":created_by", $created_by);
+      // $stmt->bindParam(":qc", $qc);
+      $stmt->execute();
 
 
-    $result = $conn->commit();
-    if ($result) {
-      header("HTTP/1.1 201 Created");
+      $result = $conn->commit();
+      if ($result) {
+        header("HTTP/1.1 201 Created");
+      }
     }
   } catch (PDOException $e) {
     $conn->rollback();
@@ -295,109 +298,110 @@ if (isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['c
 
 function T8Insert($data, $facilityno, $connT8)
 {
-  try {
-    // 引入銷售訂單 API
-    require_once("./T8API.php");
-
-    $contractno = $data['contractno'];
-    $partyA = $data['customer'];
-    $phone = $data['lm_tel'];
-    $vat = $data['vat'];
-    $partyAaddress = $data['address'];
-    $user_id = $data['user_id'];
-    $salesman = $data['salesman'];
-    $createAt = date("Y-m-dH-i-s");
-
-
-    $elevators = !empty($data['elevators_detail_arr']) ? json_decode($data['elevators_detail_arr'], true) : []; //電梯
-    $pay_arr = !empty($data['pay_arr']) ? json_decode($data['pay_arr'], true) : []; //電梯
-
-    $createTime = str_replace('-', '', $createAt);
-    $signing_date = intval(str_replace("-", '', $data['signing_date'])); //簽訂日期
-    // echo
-    // $pay_kind = [
-    //   '1' => '簽約',
-    //   '2' => '二次款',
-    //   '3' => '貨抵工地',
-    //   '4' => '材料其他',
-    //   '5' => '試車完工', //安裝完畢
-    //   '6' => '交車' //交車
-    // ];
-
-    $pay_kind = [
-      '1' => '簽約',
-      '2' => '二次款',
-      '3' => '貨抵工地',
-      '4' => '材料其他',
-      '5' => '試車完工', //安裝完畢
-      '6' => '交車' //交車
-    ];
-
-    $sql = "SELECT * FROM comCustomer 
+  // try {
+  // 引入銷售訂單 API
+  require_once("./T8API.php");
+
+  $contractno = $data['contractno'];
+  $partyA = $data['customer'];
+  $phone = $data['lm_tel'];
+  $vat = $data['vat'];
+  $partyAaddress = $data['address'];
+  $user_id = $data['user_id'];
+  $salesman = $data['salesman'];
+  $createAt = date("Y-m-dH-i-s");
+
+
+  $elevators = !empty($data['elevators_detail_arr']) ? json_decode($data['elevators_detail_arr'], true) : []; //電梯
+  $pay_arr = !empty($data['pay_arr']) ? json_decode($data['pay_arr'], true) : []; //電梯
+
+  $createTime = str_replace('-', '', $createAt);
+  $signing_date = intval(str_replace("-", '', $data['signing_date'])); //簽訂日期
+  // echo
+  // $pay_kind = [
+  //   '1' => '簽約',
+  //   '2' => '二次款',
+  //   '3' => '貨抵工地',
+  //   '4' => '材料其他',
+  //   '5' => '試車完工', //安裝完畢
+  //   '6' => '交車' //交車
+  // ];
+
+  $pay_kind = [
+    '1' => '簽約',
+    '2' => '二次款',
+    '3' => '貨抵工地',
+    '4' => '材料其他',
+    '5' => '試車完工', //安裝完畢
+    '6' => '交車' //交車
+  ];
+
+  $sql = "SELECT * FROM comCustomer 
     WHERE BizPartnerId = :BizPartnerId
     ";
-    $stmt = $connT8->prepare($sql);
-    $stmt->bindParam(':BizPartnerId', $contractno);
-    $stmt->execute();
-    $result = $stmt->fetch(PDO::FETCH_ASSOC);
+  $stmt = $connT8->prepare($sql);
+  $stmt->bindParam(':BizPartnerId', $contractno);
+  $stmt->execute();
+  $result = $stmt->fetch(PDO::FETCH_ASSOC);
+
+  // 新增客戶 table
+  if (empty($result)) {
+    // 若 客戶資料為空，新增一筆到 comCustomer
+    // 新增客戶資料
 
-    // 新增客戶 table
-    if (empty($result)) {
-      // 若 客戶資料為空，新增一筆到 comCustomer
-      // 新增客戶資料
-      $sql = "INSERT INTO comBusinessPartner
+    $sql = "INSERT INTO comBusinessPartner
       (BizPartnerId,BizPartnerName,BusinessAttr,CountryId,WorkTelNo,BizToDate,TaxNo,EnterpriseName,ContactAddress,CreatorId,CreateTime,BizPartnerTypeId)
       VALUES(:BizPartnerId,:BizPartnerName,1,'TW',:WorkTelNo,99999999,:TaxNo,:EnterpriseName,:ContactAddress,:CreatorId,:CreateTime,'10')";
-      // $sql = "INSERT INTO comBusinessPartner
-      // (BizPartnerId,BizPartnerName,BusinessAttr,CountryId,WorkTelNo,BizToDate,TaxNo,EnterpriseName,ContactAddress,CreatorId,CreateTime,BizPartnerTypeId)
-      // VALUES('$contractno','$partyA',1,'TW','$phone',99999999,'$vat', '$partyA','$partyAaddress','$user_id',$createTime,'10')";
-      $stmt = $connT8->prepare($sql);
-      $stmt->bindParam(':BizPartnerId', $contractno);
-      $stmt->bindParam(':BizPartnerName', $partyA); //客戶名稱
-      $stmt->bindParam(':WorkTelNo', $phone);
-      $stmt->bindParam(':TaxNo', $vat);
-      $stmt->bindParam(':EnterpriseName', $partyA);  //企業名稱
-      $stmt->bindParam(':ContactAddress', $partyAaddress);
-      $stmt->bindParam(':CreatorId', $user_id);
-      $stmt->bindParam(':CreateTime', $createTime);
-      $stmt->execute();
-
+    // $sql = "INSERT INTO comBusinessPartner
+    // (BizPartnerId,BizPartnerName,BusinessAttr,CountryId,WorkTelNo,BizToDate,TaxNo,EnterpriseName,ContactAddress,CreatorId,CreateTime,BizPartnerTypeId)
+    // VALUES('$contractno','$partyA',1,'TW','$phone',99999999,'$vat', '$partyA','$partyAaddress','$user_id',$createTime,'10')";
+    $stmt = $connT8->prepare($sql);
+    $stmt->bindParam(':BizPartnerId', $contractno);
+    $stmt->bindParam(':BizPartnerName', $partyA); //客戶名稱
+    $stmt->bindParam(':WorkTelNo', $phone);
+    $stmt->bindParam(':TaxNo', $vat);
+    $stmt->bindParam(':EnterpriseName', $partyA);  //企業名稱
+    $stmt->bindParam(':ContactAddress', $partyAaddress);
+    $stmt->bindParam(':CreatorId', $user_id);
+    $stmt->bindParam(':CreateTime', $createTime);
+    $stmt->execute();
 
 
-      $sql = "INSERT INTO comCustomer
-      (OrgId,BizPartnerTypeId,ConditionId,CurrId,BizPartnerId,PersonId,CreatorId,IsInUsed,InvoiceAddress,CreateTime,InvoiceId)
-      VALUES('1000','10','TWD','0008',:BizPartnerId,:PersonId,:CreatorId,1,:InvoiceAddress,:CreateTime,'35')";
-      // $sql = "INSERT INTO comCustomer
-      //  (OrgId,BizPartnerTypeId,CurrId,BizPartnerId,PersonId,CreatorId,IsInUsed,InvoiceAddress,CreateTime,InvoiceId)
-      //  VALUES('1000','10','TWD','$contractno','$salesman','$user_id',1,'$partyAaddress','$createTime','35')";
-      $stmt = $connT8->prepare($sql);
+    $sql = "INSERT INTO comCustomer
+      (OrgId,BizPartnerTypeId,ConditionId,CurrId,BizPartnerId,PersonId,CreatorId,IsInUsed,InvoiceAddress,CreateTime,InvoiceId)VALUES
+      ('1000','10','0008','TWD',:BizPartnerId,:PersonId,:CreatorId,1,:InvoiceAddress,:CreateTime,'35')";
+    // $sql = "INSERT INTO comCustomer
+    //  (OrgId,BizPartnerTypeId,CurrId,BizPartnerId,PersonId,CreatorId,IsInUsed,InvoiceAddress,CreateTime,InvoiceId)
+    //  VALUES('1000','10','TWD','$contractno','$salesman','$user_id',1,'$partyAaddress','$createTime','35')";
+    $stmt = $connT8->prepare($sql);
 
-      $stmt->bindParam(':BizPartnerId', $contractno);
-      $stmt->bindParam(':PersonId', $salesman);
-      $stmt->bindParam(':CreatorId', $user_id);
-      $stmt->bindParam(':InvoiceAddress', $partyAaddress);
-      $stmt->bindParam(':CreateTime', $createTime);
-      $stmt->execute();
-    } else {
-      //     // 若客戶資料不為空，更新該客戶資訊。
-      $sql = "UPDATE comCustomer SET 
+    $stmt->bindParam(':BizPartnerId', $contractno);
+    $stmt->bindParam(':PersonId', $salesman);
+    $stmt->bindParam(':CreatorId', $user_id);
+    $stmt->bindParam(':InvoiceAddress', $partyAaddress);
+    $stmt->bindParam(':CreateTime', $createTime);
+    $stmt->execute();
+  } else {
+    // 若客戶資料不為空，更新該客戶資訊。
+    $sql = "UPDATE comCustomer SET 
           PersonId=:PersonId,
           ConditionId='0008',
+          CurrId='TWD',
           InvoiceAddress=:InvoiceAddress,
           LastOperatorId=:LastOperatorId,
           LastOperateTime=:LastOperateTime
           WHERE BizPartnerId=:BizPartnerId
           ";
-      $stmt = $connT8->prepare($sql);
-      $stmt->bindParam(':PersonId', $salesman);
-      $stmt->bindParam(':InvoiceAddress', $partyAaddress);
-      $stmt->bindParam(':LastOperatorId', $user_id);
-      $stmt->bindParam(':LastOperateTime', $createTime);
-      $stmt->bindParam(':BizPartnerId', $contractno);
-      $stmt->execute();
+    $stmt = $connT8->prepare($sql);
+    $stmt->bindParam(':PersonId', $salesman);
+    $stmt->bindParam(':InvoiceAddress', $partyAaddress);
+    $stmt->bindParam(':LastOperatorId', $user_id);
+    $stmt->bindParam(':LastOperateTime', $createTime);
+    $stmt->bindParam(':BizPartnerId', $contractno);
+    $stmt->execute();
 
 
-      $sql = "UPDATE comBusinessPartner SET
+    $sql = "UPDATE comBusinessPartner SET
           BizPartnerName=:BizPartnerName,
           WorkTelNo=:WorkTelNo,
           TaxNo=:TaxNo,
@@ -407,47 +411,54 @@ function T8Insert($data, $facilityno, $connT8)
           LastOperateTime=:LastOperateTime
           WHERE BizPartnerId = :BizPartnerId
           ";
-      $stmt = $connT8->prepare($sql);
-      $stmt->bindParam(':BizPartnerName', $partyA);
-      $stmt->bindParam(':WorkTelNo', $phone);
-      $stmt->bindParam(':TaxNo', $vat);
-      $stmt->bindParam(':EnterpriseName', $partyA);
-      $stmt->bindParam(':ContactAddress', $partyAaddress);
-      // $stmt->bindParam(':EMail', $email);
-      $stmt->bindParam(':LastOperatorId', $user_id);
-      $stmt->bindParam(':LastOperateTime', $createTime);
-      $stmt->bindParam(':BizPartnerId', $contractno);
-      $stmt->execute();
-    }
+    $stmt = $connT8->prepare($sql);
+    $stmt->bindParam(':BizPartnerName', $partyA);
+    $stmt->bindParam(':WorkTelNo', $phone);
+    $stmt->bindParam(':TaxNo', $vat);
+    $stmt->bindParam(':EnterpriseName', $partyA);
+    $stmt->bindParam(':ContactAddress', $partyAaddress);
+    // $stmt->bindParam(':EMail', $email);
+    $stmt->bindParam(':LastOperatorId', $user_id);
+    $stmt->bindParam(':LastOperateTime', $createTime);
+    $stmt->bindParam(':BizPartnerId', $contractno);
+    $stmt->execute();
+  }
 
-    $sql = "SELECT * FROM comProject WHERE ProjectId = :ProjectId";
+  $sql = "SELECT * FROM comProject WHERE ProjectId = :ProjectId";
+  $stmt = $connT8->prepare($sql);
+  $stmt->bindParam(':ProjectId', $contractno);
+  $stmt->execute();
+  $resultProject = $stmt->fetchAll(PDO::FETCH_ASSOC);
+  if (empty($resultProject)) {
+    //新增於 comProject。合約 table
+    $sql = "INSERT INTO comProject(ProjectId,ProjectName,TypeId,CreateTime,CreatorId,IsInUsed) 
+        VALUES(:ProjectId,:ProjectName,'C0',:CreateTime,:CreatorId,1)";
     $stmt = $connT8->prepare($sql);
     $stmt->bindParam(':ProjectId', $contractno);
+    $stmt->bindParam(':ProjectName', $partyA);
+    $stmt->bindParam(':CreateTime', $createTime);
+    $stmt->bindParam(':CreatorId', $user_id);
     $stmt->execute();
-    $resultProject = $stmt->fetchAll(PDO::FETCH_ASSOC);
-    if (empty($resultProject)) {
-      //新增於 comProject。合約 table
-      $sql = "INSERT INTO comProject(ProjectId,ProjectName,TypeId,CreateTime,CreatorId,IsInUsed) 
-        VALUES(:ProjectId,:ProjectName,'C0',:CreateTime,:CreatorId,1)";
+  }
+  $sql = "SELECT * FROM salSalesOrder WHERE BillNo = :BillNo";
+  $stmt = $connT8->prepare($sql);
+  $stmt->bindParam(':BillNo', $contractno);
+  $contractT8 = $stmt->fetch(PDO::FETCH_ASSOC);
+  if (empty($contractT8)) {
+
+    foreach ($elevators as $index => $elevator) {
+
+      $count = 1;
+      // 產品集成維護
+      $facility_no = $facilityno[$index];
+      $MaterialName = "$partyA($facility_no)";
+      $contract_arrival_a = $elevator['contract_arrival_date'];
+
+      $sql = "SELECT * FROM comMaterial WHERE MaterialId = '$facility_no'";
       $stmt = $connT8->prepare($sql);
-      $stmt->bindParam(':ProjectId', $contractno);
-      $stmt->bindParam(':ProjectName', $partyA);
-      $stmt->bindParam(':CreateTime', $createTime);
-      $stmt->bindParam(':CreatorId', $user_id);
       $stmt->execute();
-    }
-    $sql = "SELECT * FROM salSalesOrder WHERE BillNo = :BillNo";
-    $stmt = $connT8->prepare($sql);
-    $stmt->bindParam(':BillNo', $contractno);
-    $contractT8 = $stmt->fetch(PDO::FETCH_ASSOC);
-    if (empty($contractT8)) {
-      foreach ($elevators as $index => $elevator) {
-        $count = 1;
-        // 產品集成維護
-        $facility_no = $facilityno[$index];
-        $MaterialName = "$partyA($facility_no)";
-        $contract_arrival_a = $elevator['contract_arrival_date'];
-
+      $MaterialisIt = $stmt->fetch(PDO::FETCH_ASSOC);
+      if (empty($MaterialisIt)) {
         $sql = "INSERT INTO comMaterial
         (FOrgid,MaterialId,MaterialTypeId,MaterialCategoryId,CreatorId,CreateTime,IsInUsed) 
         VALUES ('1000',:MaterialId,'10','A',:CreatorId,:CreateTime,1)";
@@ -456,7 +467,6 @@ function T8Insert($data, $facilityno, $connT8)
         $stmt->bindParam(':CreatorId', $user_id);
         $stmt->bindParam(':CreateTime', $createTime);
         $stmt->execute();
-
         $sql = "INSERT INTO comMaterialGroup
         (MaterialTypeId,MaterialId,MaterialName,MaterialCategoryId,IsInUsed,UnitId,CreatorId,CreateTime) 
         VALUES ('10',:MaterialId,:MaterialName,'A',1,'SET',:CreatorId,:CreateTime)";
@@ -495,155 +505,159 @@ function T8Insert($data, $facilityno, $connT8)
         $stmt->bindParam(':CreatorId', $user_id);
         $stmt->bindParam(':CreateTime', $createTime);
         $stmt->execute();
-        // 階段收款資訊
-        $salOrderStagePay_row = [];
-        $equipment_total = 0;
-        $install_total = 0;
-        $equipment_total = $pay_arr['equipment_total'];
-        $install_total = $pay_arr['install_total'];
-        $count_a = 0;
-        $count_month = 1;
-        foreach ($pay_arr['elevotor_pay_detail'] as $key => $detail) {
-          if ($detail['kind'] == 3) {
-            $PlanPayDate = $contract_arrival_a;
-          } else if ($detail['kind'] > 3) {
-            $PlanPayDate = date("Y-m-d", strtotime($contract_arrival_a . '+' . $count_month . ' month'));
-            $count_month++;
-          } else {
-            $PlanPayDate = $signing_date;
-            $count_a++;
-            if ($count_a == 1) {
-              $PlanPayDate = date("Y-m-d", strtotime($signing_date . '+' . $count_a . ' month'));
-            }
+      }
+      // 階段收款資訊
+      $salOrderStagePay_row = [];
+      $equipment_total = 0;
+      $install_total = 0;
+      $equipment_total = $pay_arr['equipment_total'];
+      $install_total = $pay_arr['install_total'];
+      $count_a = 0;
+      $count_month = 1;
+      foreach ($pay_arr['elevotor_pay_detail'] as $key => $detail) {
+        if ($detail['kind'] == 3) {
+          $PlanPayDate = $contract_arrival_a;
+        } else if ($detail['kind'] > 3) {
+          $PlanPayDate = date("Y-m-d", strtotime($contract_arrival_a . '+' . $count_month . ' month'));
+          $count_month++;
+        } else {
+          $PlanPayDate = $signing_date;
+          $count_a++;
+          if ($count_a == 1) {
+            $PlanPayDate = date("Y-m-d", strtotime($signing_date . '+' . $count_a . ' month'));
           }
-
-          $contract_arrival_date = intval(str_replace("-", '', $PlanPayDate)); //貨到工地日
-
-          $PayStage = $pay_kind[$detail['kind']];
-          $PlanPercentage = intval($detail['pay_scale']) / 100;
-          $rows = [
-            "PayStage" => "$PayStage", //收款階段
-            "PlanPercentage" => $PlanPercentage, //計劃收款比例(%)
-            "PlanPayAmt" => $detail['amount'], //計劃收款金額
-            "PlanPayDate" => $contract_arrival_date, //計劃收款日期 1.第一筆都是簽約日
-            "BillNo" => "$contractno",
-            "RowCode" => $key + 1,
-            "RowNo" => $key + 1,
-            "UnWriteOffOAmount" => $detail['amount'] //未核銷金額
-          ];
-          $salOrderStagePay_row[] = $rows;
         }
 
-        // 設備
-        $row1 = [
-          "TaxId" => "ST005",
-          "RequirementDate" => $signing_date, //出貨日期
-          "ConsignmentDate" => $signing_date, //發貨日期
-          "BillNo" => "$contractno", //合約號
-          "RowCode" => $count, //全部筆數排列
-          "ItemType" => 1,
-          "MaterialId" => "A40001", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
-          "SUnitId" => "SET",
-          "SQuantity" => 1, //交易數量
-          "SPrice" => $equipment_total, //交易價格
-          "CU_MaterialId" => $facility_no
-        ];
-        $count++;
-        // 安裝
-        $row2 = [
-          "TaxId" => "ST005",
-          "RequirementDate" => $signing_date, //出貨日期
-          "ConsignmentDate" => $signing_date, //發貨日期
-          "BillNo" => "$contractno", //合約號
-          "RowCode" => $count, //全部筆數排列
-          "ItemType" => 1,
-          "MaterialId" => "A40008", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
-          "SUnitId" => "SET",
-          "SQuantity" => 1, //交易數量
-          "SPrice" => $install_total, //交易價格
-          "CU_MaterialId" => $facility_no
-        ];
-        $count++;
-        // 產品(作番)
-        $row3 = [
-          "TaxId" => "ST005",
-          "RequirementDate" => $signing_date, //出貨日期
-          "ConsignmentDate" => $signing_date, //發貨日期
-          "BillNo" => "$contractno", //合約號
-          "RowCode" => $count, //全部筆數排列
-          "ItemType" => 0,
-          "MaterialId" => "$facility_no", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
-          "SUnitId" => "SET",
-          "SQuantity" => 1, //交易數量
-          "SPrice" => 0, //交易價格
-          "CU_MaterialId" => $facility_no // 歸屬作番號
+        $contract_arrival_date = intval(str_replace("-", '', $PlanPayDate)); //貨到工地日
+
+        $PayStage = $pay_kind[$detail['kind']];
+        $PlanPercentage = intval($detail['pay_scale']) / 100;
+        $rows = [
+          "PayStage" => "$PayStage", //收款階段
+          "PlanPercentage" => $PlanPercentage, //計劃收款比例(%)
+          "PlanPayAmt" => $detail['amount'], //計劃收款金額
+          "PlanPayDate" => $contract_arrival_date, //計劃收款日期 1.第一筆都是簽約日
+          "BillNo" => "$contractno",
+          "RowCode" => $key + 1,
+          "RowNo" => $key + 1,
+          "UnWriteOffOAmount" => $detail['amount'] //未核銷金額
         ];
-        $count++;
-        $SubOrder_row[] = $row1;
-        $SubOrder_row[] = $row2;
-        $SubOrder_row[] = $row3;
-        $count++;
+        $salOrderStagePay_row[] = $rows;
       }
-      $MainSalesOrder_row = [
-        "BillNo" => "$contractno", //合約單號
-        "BillDate" => $signing_date, //簽約日期 
-        "TypeId" => "SO", //
-        "FOrgId" => "1000",
-        "OrgId" => "1000",
-        "ModeId" => "M", // T汰改 M新梯
-        "BizPartnerId" => "$contractno", //客戶代碼
-        "CurrId" => "TWD",
-        "CurrOAmount" => 1,
-        "CurrLAmount" => 1,
-        "PersonId" => "$salesman", //業務人員
-        "DueToId" => "$contractno", //債務方
-        "TradeConditionId" => "",
+
+      // 設備
+      $row1 = [
         "TaxId" => "ST005",
-        "CreditorCompId" => "1001",
-        "CreditorOrgId" => "1000",
-        "CreatorId" => "$user_id"
-        // "CompId" => "1001",
-        // "CreditorCurrOAmount" => 1,
-        // "CreditorCurrLAmount" => 1
-      ];
-      $MainSalesOrder = [
-        "name" => "MainSalesOrder",
-        'rows' => [$MainSalesOrder_row]
+        "RequirementDate" => $signing_date, //出貨日期
+        "ConsignmentDate" => $signing_date, //發貨日期
+        "BillNo" => "$contractno", //合約號
+        "RowCode" => $count, //全部筆數排列
+        "ItemType" => 1,
+        "MaterialId" => "A40001", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
+        "SUnitId" => "SET",
+        "SQuantity" => 1, //交易數量
+        "SPrice" => $equipment_total, //交易價格
+        "CU_MaterialId" => $facility_no
       ];
-      $SubOrder = [
-        "name" => "SubOrder",
-        "rows" => $SubOrder_row
+      $count++;
+      // 安裝
+      $row2 = [
+        "TaxId" => "ST005",
+        "RequirementDate" => $signing_date, //出貨日期
+        "ConsignmentDate" => $signing_date, //發貨日期
+        "BillNo" => "$contractno", //合約號
+        "RowCode" => $count, //全部筆數排列
+        "ItemType" => 1,
+        "MaterialId" => "A40008", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
+        "SUnitId" => "SET",
+        "SQuantity" => 1, //交易數量
+        "SPrice" => $install_total, //交易價格
+        "CU_MaterialId" => $facility_no
       ];
-      $salOrderStagePay = [
-        "name" => "salOrderStagePay",
-        "rows" => $salOrderStagePay_row
+      $count++;
+      // 產品(作番)
+      $row3 = [
+        "TaxId" => "ST005",
+        "RequirementDate" => $signing_date, //出貨日期
+        "ConsignmentDate" => $signing_date, //發貨日期
+        "BillNo" => "$contractno", //合約號
+        "RowCode" => $count, //全部筆數排列
+        "ItemType" => 0,
+        "MaterialId" => "$facility_no", //1.設備(A40001)、2.安裝(A4008)、3.作番號(作番)
+        "SUnitId" => "SET",
+        "SQuantity" => 1, //交易數量
+        "SPrice" => 0, //交易價格
+        "CU_MaterialId" => $facility_no // 歸屬作番號
       ];
+      $count++;
+      $SubOrder_row[] = $row1;
+      $SubOrder_row[] = $row2;
+      $SubOrder_row[] = $row3;
+      $count++;
+    }
+    $MainSalesOrder_row = [
+      "BillNo" => "$contractno", //合約單號
+      "BillDate" => $signing_date, //簽約日期 
+      "TypeId" => "SO", //
+      "FOrgId" => "1000",
+      "OrgId" => "1000",
+      "ModeId" => "M", // T汰改 M新梯
+      "BizPartnerId" => "$contractno", //客戶代碼
+      "CurrId" => "TWD",
+      "CurrOAmount" => 1,
+      "CurrLAmount" => 1,
+      "PersonId" => "$salesman", //業務人員
+      "DueToId" => "$contractno", //債務方
+      "TradeConditionId" => "",
+      "TaxId" => "ST005",
+      "CreditorCompId" => "1001",
+      "CreditorOrgId" => "1000",
+      "CreatorId" => "$user_id"
+      // "CompId" => "1001",
+      // "CreditorCurrOAmount" => 1,
+      // "CreditorCurrLAmount" => 1
+    ];
+    $MainSalesOrder = [
+      "name" => "MainSalesOrder",
+      'rows' => [$MainSalesOrder_row]
+    ];
+    $SubOrder = [
+      "name" => "SubOrder",
+      "rows" => $SubOrder_row
+    ];
+    $salOrderStagePay = [
+      "name" => "salOrderStagePay",
+      "rows" => $salOrderStagePay_row
+    ];
 
-      $API_body = [];
-      $API_body[] = $MainSalesOrder;
-      $API_body[] = $SubOrder;
-      $API_body[] = $salOrderStagePay;
-      echo "<pre>";
-      print_r(json_encode($API_body, JSON_UNESCAPED_UNICODE));
-      echo "</pre>";
-      $api_url = "https://erp.masada.com.tw:780/twWebAPI/V1/SALSALESORDER/PostERPData";
-
-      $result = T8salIncomeApply($API_body, $api_url);
-      // echo "<pre>";
-      // print_r($result);
-      // echo "</pre>";
-      if ($result['Status'] == 'Fails' || $result['Status'] == 'Error') {
-        echo $result['ErrorMsg'];
-      }
-    } else {
-      echo '資料已新增過，請洽資訊人員';
+    $API_body = [];
+    $API_body[] = $MainSalesOrder;
+    $API_body[] = $SubOrder;
+    $API_body[] = $salOrderStagePay;
+    echo "<pre>";
+    print_r(json_encode($API_body, JSON_UNESCAPED_UNICODE));
+    echo "</pre>";
+    // $api_url = "https://erp.masada.com.tw:780/twWebAPI/V1/SALSALESORDER/PostERPData";
+    // $api_url = "http://127.0.0.1:880/twWebAPI/V1/SALSALESORDER/PostERPData";
+    $api_url = 'http://10.10.145.2:880/twWebAPI/V1/SALSALESORDER/PostERPData';
+
+    $result = T8salIncomeApply($API_body, $api_url);
+    echo "<pre>";
+    print_r($result);
+    echo "</pre>";
+    if (!empty($result) && ($result['Status'] == 'Fails' || $result['Status'] == 'Error')) {
+      echo $result['ErrorMsg'];
     }
-    $connT8->commit();
-  } catch (PDOException $e) {
-    $connT8->rollback();
-    header("HTTP/1.1 500 Internal Server Error");
-    die('Error!:' . $e->getMessage());
+  } else {
+    echo '資料已新增過，請洽資訊人員';
+    // exit();
   }
+  $connT8->commit();
+  // } catch (PDOException $e) {
+  //   $connT8->rollback();
+  //   header("HTTP/1.1 500 Internal Server Error");
+  //   die('Error!:' . $e->getMessage());
+  // }
 }
 
 
@@ -698,7 +712,6 @@ function BounsCount($data, $conn, $facilityno)
           'total' => $elevator_list_price,
           'fee_per_st' => $elevator_knockdown_price
         ];
-
         if (!empty($result_bonus)) {
           if ($result_bonus['result_status'] != "error") {
             foreach ($result_bonus['bonus_array'] as $i => $result) {
@@ -748,9 +761,6 @@ function BounsCount($data, $conn, $facilityno)
           $salesman,
           $manager
         );
-        // echo '<pre>';
-        // print_r($result_bonus);
-        // echo '</pre>';
         $facility_no = $facilityno[$key];
         $bonus_json = [
           'contract_type' => $type,
diff --git a/wms/contract/api/test copy.json b/wms/contract/api/test copy.json
index b9dd2f3f..cb1ba7c7 100644
--- a/wms/contract/api/test copy.json	
+++ b/wms/contract/api/test copy.json	
@@ -3,18 +3,18 @@
         "name": "MainSalesOrder",
         "rows": [
             {
-                "BillNo": "M23110121",
-                "BillDate": 20240313,
+                "BillNo": "M24020076",
+                "BillDate": 20240320,
                 "TypeId": "SO",
                 "FOrgId": "1000",
                 "OrgId": "1000",
                 "ModeId": "M",
-                "BizPartnerId": "M23110121",
+                "BizPartnerId": "M24020076",
                 "CurrId": "TWD",
                 "CurrOAmount": 1,
                 "CurrLAmount": 1,
-                "PersonId": "M0042",
-                "DueToId": "M23110121",
+                "PersonId": "M0073",
+                "DueToId": "M24020076",
                 "TradeConditionId": "",
                 "TaxId": "ST005",
                 "CreditorCompId": "1001",
@@ -28,315 +28,42 @@
         "rows": [
             {
                 "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
+                "RequirementDate": 20240320,
+                "ConsignmentDate": 20240320,
+                "BillNo": "M24020076",
                 "RowCode": 1,
                 "ItemType": 1,
                 "MaterialId": "A40001",
                 "SUnitId": "SET",
                 "SQuantity": 1,
-                "SPrice": 3904000,
-                "CU_MaterialId": "4MH00836"
+                "SPrice": 910000,
+                "CU_MaterialId": "4MW00001"
             },
             {
                 "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
+                "RequirementDate": 20240320,
+                "ConsignmentDate": 20240320,
+                "BillNo": "M24020076",
                 "RowCode": 2,
                 "ItemType": 1,
                 "MaterialId": "A40008",
                 "SUnitId": "SET",
                 "SQuantity": 1,
-                "SPrice": 976000,
-                "CU_MaterialId": "4MH00836"
+                "SPrice": 390000,
+                "CU_MaterialId": "4MW00001"
             },
             {
                 "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
+                "RequirementDate": 20240320,
+                "ConsignmentDate": 20240320,
+                "BillNo": "M24020076",
                 "RowCode": 3,
                 "ItemType": 0,
-                "MaterialId": "4MH00836",
+                "MaterialId": "4MW00001",
                 "SUnitId": "SET",
                 "SQuantity": 1,
                 "SPrice": 0,
-                "CU_MaterialId": "4MH00836"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 1,
-                "ItemType": 1,
-                "MaterialId": "A40001",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 3904000,
-                "CU_MaterialId": "4MH00837"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 2,
-                "ItemType": 1,
-                "MaterialId": "A40008",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 976000,
-                "CU_MaterialId": "4MH00837"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 3,
-                "ItemType": 0,
-                "MaterialId": "4MH00837",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 0,
-                "CU_MaterialId": "4MH00837"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 1,
-                "ItemType": 1,
-                "MaterialId": "A40001",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 3904000,
-                "CU_MaterialId": "4MH00838"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 2,
-                "ItemType": 1,
-                "MaterialId": "A40008",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 976000,
-                "CU_MaterialId": "4MH00838"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 3,
-                "ItemType": 0,
-                "MaterialId": "4MH00838",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 0,
-                "CU_MaterialId": "4MH00838"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 1,
-                "ItemType": 1,
-                "MaterialId": "A40001",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 3904000,
-                "CU_MaterialId": "4MH00839"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 2,
-                "ItemType": 1,
-                "MaterialId": "A40008",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 976000,
-                "CU_MaterialId": "4MH00839"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 3,
-                "ItemType": 0,
-                "MaterialId": "4MH00839",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 0,
-                "CU_MaterialId": "4MH00839"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 1,
-                "ItemType": 1,
-                "MaterialId": "A40001",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 3904000,
-                "CU_MaterialId": "4MH00840"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 2,
-                "ItemType": 1,
-                "MaterialId": "A40008",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 976000,
-                "CU_MaterialId": "4MH00840"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 3,
-                "ItemType": 0,
-                "MaterialId": "4MH00840",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 0,
-                "CU_MaterialId": "4MH00840"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 1,
-                "ItemType": 1,
-                "MaterialId": "A40001",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 3904000,
-                "CU_MaterialId": "4MH00841"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 2,
-                "ItemType": 1,
-                "MaterialId": "A40008",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 976000,
-                "CU_MaterialId": "4MH00841"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 3,
-                "ItemType": 0,
-                "MaterialId": "4MH00841",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 0,
-                "CU_MaterialId": "4MH00841"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 1,
-                "ItemType": 1,
-                "MaterialId": "A40001",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 3904000,
-                "CU_MaterialId": "4MH00842"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 2,
-                "ItemType": 1,
-                "MaterialId": "A40008",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 976000,
-                "CU_MaterialId": "4MH00842"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 3,
-                "ItemType": 0,
-                "MaterialId": "4MH00842",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 0,
-                "CU_MaterialId": "4MH00842"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 1,
-                "ItemType": 1,
-                "MaterialId": "A40001",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 3904000,
-                "CU_MaterialId": "4MH00843"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 2,
-                "ItemType": 1,
-                "MaterialId": "A40008",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 976000,
-                "CU_MaterialId": "4MH00843"
-            },
-            {
-                "TaxId": "ST005",
-                "RequirementDate": 20240313,
-                "ConsignmentDate": 20240313,
-                "BillNo": "M23110121",
-                "RowCode": 3,
-                "ItemType": 0,
-                "MaterialId": "4MH00843",
-                "SUnitId": "SET",
-                "SQuantity": 1,
-                "SPrice": 0,
-                "CU_MaterialId": "4MH00843"
+                "CU_MaterialId": "4MW00001"
             }
         ]
     },
@@ -346,52 +73,42 @@
             {
                 "PayStage": "簽約",
                 "PlanPercentage": 0.2,
-                "PlanPayAmt": 976000,
-                "PlanPayDate": 20240413,
-                "BillNo": "M23110121",
+                "PlanPayAmt": 260000,
+                "PlanPayDate": 20240420,
+                "BillNo": "M24020076",
                 "RowCode": 1,
                 "RowNo": 1,
-                "UnWriteOffOAmount": 976000
+                "UnWriteOffOAmount": 260000
             },
             {
-                "PayStage": "二次款",
-                "PlanPercentage": 0.4,
-                "PlanPayAmt": 1952000,
-                "PlanPayDate": 20240313,
-                "BillNo": "M23110121",
+                "PayStage": "貨抵工地",
+                "PlanPercentage": 0.5,
+                "PlanPayAmt": 650000,
+                "PlanPayDate": 20241220,
+                "BillNo": "M24020076",
                 "RowCode": 2,
                 "RowNo": 2,
-                "UnWriteOffOAmount": 1952000
+                "UnWriteOffOAmount": 650000
             },
             {
-                "PayStage": "貨抵工地",
+                "PayStage": "試車完工",
                 "PlanPercentage": 0.2,
-                "PlanPayAmt": 976000,
-                "PlanPayDate": 20241104,
-                "BillNo": "M23110121",
+                "PlanPayAmt": 260000,
+                "PlanPayDate": 20250120,
+                "BillNo": "M24020076",
                 "RowCode": 3,
                 "RowNo": 3,
-                "UnWriteOffOAmount": 976000
+                "UnWriteOffOAmount": 260000
             },
             {
-                "PayStage": "試車完工",
+                "PayStage": "交車",
                 "PlanPercentage": 0.1,
-                "PlanPayAmt": 488000,
-                "PlanPayDate": 20241204,
-                "BillNo": "M23110121",
+                "PlanPayAmt": 130000,
+                "PlanPayDate": 20250220,
+                "BillNo": "M24020076",
                 "RowCode": 4,
                 "RowNo": 4,
-                "UnWriteOffOAmount": 488000
-            },
-            {
-                "PayStage": "交車",
-                "PlanPercentage": 0.1,
-                "PlanPayAmt": 488000,
-                "PlanPayDate": 20250104,
-                "BillNo": "M23110121",
-                "RowCode": 5,
-                "RowNo": 5,
-                "UnWriteOffOAmount": 488000
+                "UnWriteOffOAmount": 130000
             }
         ]
     }
diff --git a/wms/contract/api/testT8API.php b/wms/contract/api/testT8API.php
index e9d2f04f..a77acf8b 100644
--- a/wms/contract/api/testT8API.php
+++ b/wms/contract/api/testT8API.php
@@ -66,34 +66,35 @@ require_once("../../T8_Authorization_from_bpm.php");
 $api_url = "https://erp.masada.com.tw:780/twWebAPI/V1/SALSALESORDER/PostERPData";
 
 $validation = get_Auth();
-// $header = [
-//     "CHI_Authorization :" . $validation,
-//     "GroupId:TEST"
-// ];
-// $url = "https://erp.masada.com.tw:780/twWebAPI/V1/GLFEEWRITEOFF/DeleteERPData?pkValue=M24020032";
+$header = [
+    "CHI_Authorization :" . $validation,
+    "GroupId:MASADA"
+];
+$url = "https://erp.masada.com.tw:780/twWebAPI/V1/GLFEEWRITEOFF/DeleteERPData?pkValue=1000,M24020076";
 
-// $ch = curl_init();
-// curl_setopt($ch, CURLOPT_URL, $url);
-// curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-// curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
-// $response = curl_exec($ch);
-// if ($response === false) {
-//     echo 'Curl error: ' . curl_error($ch);
-// } else {
-//     $result = json_decode($response, true);
-//     // 若 API 傳入失敗。
-//     if ($result['Status'] == 'Erroe') {
-//         echo 'API傳入失敗，' . $result['ErrorMsg'];
-//         print_r($result);
-//     } else {
-//         // print_r($result);
-//         print_r($result);
-//     }
-//     print_r($result);
-// }
+$ch = curl_init();
+curl_setopt($ch, CURLOPT_URL, $url);
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
 
-// curl_close($ch);
-// exit();
+$response = curl_exec($ch);
+if ($response === false) {
+    echo 'Curl error: ' . curl_error($ch);
+} else {
+    $result = json_decode($response, true);
+    // 若 API 傳入失敗。
+    if ($result['Status'] == 'Erroe') {
+        echo 'API傳入失敗，' . $result['ErrorMsg'];
+        print_r($result);
+    } else {
+        // print_r($result);
+        print_r($result);
+    }
+    print_r($result);
+}
+
+curl_close($ch);
+exit();
 $contract_no = "M24020003";
 // $contract_no = "M24010109";
 $MainSalesOrder_row = [
diff --git a/wms/contract/conn.php b/wms/contract/conn.php
index ed80762b..bbfd1c50 100644
--- a/wms/contract/conn.php
+++ b/wms/contract/conn.php
@@ -34,7 +34,11 @@ try {
     //設定主動以警告的形式報錯
     $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
-    $connT8 = new PDO("sqlsrv:Server=220.130.203.251;Database=T8TEST", "M0225", "IFFBU1E=");
+    // $connT8 = new PDO("sqlsrv:Server=220.130.203.251;Database=T8TEST", "M0225", "IFFBU1E=");
+    // $connT8 = new PDO("sqlsrv:Server=10.10.145.2;Database=T8MASADA", "masada", "@m222222");
+    $connT8 = new PDO("sqlsrv:Server=220.130.203.251;Database=T8MASADA", "masada", "@m222222");
+
+
     if ($connT8) {
         $connT8->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
     }
diff --git a/wms/contract/contract-newelevator-input.php b/wms/contract/contract-newelevator-input.php
index 70d83b32..634dfd3b 100644
--- a/wms/contract/contract-newelevator-input.php
+++ b/wms/contract/contract-newelevator-input.php
@@ -179,7 +179,7 @@ $persons = array_map(function ($person) {
                             <tr>
                                 <td style="vertical-align: middle">電梯速度</td>
                                 <td>
-                                    <input class="form-control disabled_select" type="text" x-model="elevator.person" disabled>
+                                    <input class="form-control disabled_select" type="text" x-model="elevator.speed" disabled>
                                 </td>
                                 <td style="vertical-align: middle">電梯樓停</td>
                                 <td>
diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js
index 59d63b01..3ebfa73d 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -819,8 +819,6 @@ const contractNewInput = () => {
             lm_tel: '',
             address: '',
             salesman: '',
-            qc: '',
-            qc: '',
             price_total: '', //合約總價
             files: [],
             contract_type: '1',
@@ -869,7 +867,7 @@ const contractNewInput = () => {
                     this.data.elevators_detail_arr[i].latitude = '';    // 經度
                     this.data.elevators_detail_arr[i].longitude = '';   // 緯度
                     this.data.elevators_detail_arr[i].manage = '';      // 工地負責人
-                    this.data.elevators_detail_arr[i].qc = '';          // QC和官檢
+                    this.data.elevators_detail_arr[i].qc = 'QO';          // QC和官檢
                     this.data.elevators_detail_arr[i].contract_arrival_date = this.data.contract_arrival_date; //合約交期(到工地)
                     // this.data.elevators_detail_arr[i].area_no = ''; //區域
                 }
@@ -901,7 +899,7 @@ const contractNewInput = () => {
                     this.data.lm_tel = res.data.lm_tel
                     this.data.address = res.data.address
                     this.data.salesman = res.data.person
-                    this.data.qc = res.data.qc;
+                    // this.data.qc = res.data.qc;
                     this.data.price_total = res.data.price_total;
                     this.data.elevators = res.data.elevators;
                     this.data.elevators_detail_arr = res.data.elevators_detail_arr;
@@ -929,7 +927,6 @@ const contractNewInput = () => {
             form.append('lm_tel', this.data.lm_tel);
             form.append('address', this.data.address);
             form.append('salesman', this.data.salesman);
-            form.append('qc', this.data.qc);
             form.append('signing_date', this.data.signing_date);
             form.append('nums', this.data.nums);
             form.append('price_total', this.data.price_total);
@@ -961,7 +958,7 @@ const contractNewInput = () => {
                     this.customize = false
 
                 } else {
-                    alert('儲存失敗！可能為以下錯誤:\n' + res.data)
+                    alert('儲存失敗!')
                 }
                 this.isLoading = false
             }).catch(error => {
@@ -1025,7 +1022,7 @@ const contractInput = () => {
             disabled: false, //資料庫是否有電梯數量資料
             elevators: [], //機種、載重、人乘、樓停、樓層、速度、緯度、經度、開門方式、保養別、廠牌、竣檢日、許可證日期
             payType: '', //付款方式
-            contract_type: ''
+            contract_type: 'new'
             // bonus_verson: 2.1,
             // manager: '',
             // regular_contract_manger_id: '',

From 00fa59b33b508194ca8ab0774555892257e51615 Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Wed, 6 Mar 2024 18:02:32 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E4=BF=9D=E9=A4=8A=E5=83=B9=E5=AF=A90306?=
 =?UTF-8?q?=20=E6=96=B0=E6=A2=AF=E5=83=B9=E5=AF=A9for=20=E5=8A=A0key=20?=
 =?UTF-8?q?=E7=B6=81=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/cont/css/pricereview.css                  |   1 -
 wms/cont/css/pricereview.css.map              |   2 +-
 wms/cont/css/pricereview.scss                 |   1 -
 wms/cont/js/pricereviewAlpine.js              | 113 ++++-
 wms/cont/pricereviewCreate.php                | 414 ++++++++----------
 wms/cont/window-modal/modalElevaotr.php       | 179 ++++++++
 wms/cont/window-modal/otherOptionModal.php    |  33 ++
 .../window-modal/otherToElevatorModal.php     |  36 ++
 wms/crm/crmm02-index.php                      |   2 +-
 wms/mkt/assets/js/pricereviewAlpine.js        |  25 +-
 wms/mkt/pricereviewCreate.php                 |   5 -
 .../window-modal/demolishToElevatorModal.php  |   4 +-
 wms/mkt/window-modal/elevatorModal.php        |   5 -
 .../window-modal/maintainToElevatorModal.php  |   4 +-
 .../window-modal/optionToElevatorModal.php    |   6 +-
 wms/mkt/window-modal/otherToElevatorModal.php |   4 +-
 16 files changed, 571 insertions(+), 263 deletions(-)
 create mode 100644 wms/cont/window-modal/modalElevaotr.php
 create mode 100644 wms/cont/window-modal/otherOptionModal.php
 create mode 100644 wms/cont/window-modal/otherToElevatorModal.php

diff --git a/wms/cont/css/pricereview.css b/wms/cont/css/pricereview.css
index 3cd7f902..0169e645 100644
--- a/wms/cont/css/pricereview.css
+++ b/wms/cont/css/pricereview.css
@@ -111,7 +111,6 @@
   opacity: 1;
 }
 #pricereviewCreate .container .pricreviewmain > .divitem table .copyBtn {
-  width: 30px;
   height: 30px;
 }
 #pricereviewCreate .container .pricreviewmain > .divitem table .saletd {
diff --git a/wms/cont/css/pricereview.css.map b/wms/cont/css/pricereview.css.map
index a5d7bedf..dd3f0e70 100644
--- a/wms/cont/css/pricereview.css.map
+++ b/wms/cont/css/pricereview.css.map
@@ -1 +1 @@
-{"version":3,"sources":["pricereview.css","pricereview.scss"],"names":[],"mappings":"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","file":"pricereview.css"}
\ No newline at end of file
+{"version":3,"sources":["pricereview.css","pricereview.scss"],"names":[],"mappings":"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","file":"pricereview.css"}
\ No newline at end of file
diff --git a/wms/cont/css/pricereview.scss b/wms/cont/css/pricereview.scss
index 7812e8e5..ecc890a6 100644
--- a/wms/cont/css/pricereview.scss
+++ b/wms/cont/css/pricereview.scss
@@ -119,7 +119,6 @@
                         opacity: 1;
                     }
                     .copyBtn{
-                        width: 30px;
                         height: 30px;
                     }
                     .saletd{
diff --git a/wms/cont/js/pricereviewAlpine.js b/wms/cont/js/pricereviewAlpine.js
index fe3df137..9536b056 100644
--- a/wms/cont/js/pricereviewAlpine.js
+++ b/wms/cont/js/pricereviewAlpine.js
@@ -5,6 +5,8 @@ const pricereviewCreate = ()=>{
         },
         modalShow:{
             elevator: false,
+            other:false,
+            otherToElevator:false,
         },
         total_spec:0,
         elevators:[],
@@ -23,9 +25,20 @@ const pricereviewCreate = ()=>{
             lastDate:'', // 上次年檢日期
             yearCheckFee:'', //年檢費用
             price:'', //公司發布價(月)
-            qty:'', //電梯數量
+            qty:1, //電梯數量
             sale_price:'', //契約報價
         },
+        otherOptions: [],
+        modalOtherOptionInfo:{
+            pr_no:"",
+            name:"",
+            price: 0,
+            num:"",
+        },
+        otherOptionKey:0,
+        currentOtherOptionKey:'',
+        toElevators:[],
+        toElevatorNo:'',
         openCreateElevatorModal(){
             this.modalShow.elevator = true;
             body.style.overflow = 'hidden';
@@ -42,13 +55,14 @@ const pricereviewCreate = ()=>{
                 permitNumber:'', 
                 brand:'', 
                 m1:0,
-                months:'', 
+                startDate:'',
+                endDate:'',
                 cycle:'', 
                 checkYear:'', 
                 lastDate:'',
                 yearCheckFee:'',
                 price:'',
-                qty:'', 
+                qty:1, 
                 sale_price:'', 
             };
         },
@@ -114,5 +128,98 @@ const pricereviewCreate = ()=>{
                 sale_price: sale_price
             })
         },
+        removeElevator(id){
+            this.elevators = this.elevators.filter(elevator=> elevator.id != id)
+        },
+        openCreateOtherOptionFn(){
+            this.modalShow.other = true
+            body.style.overflow = 'hidden'
+        },
+        createOtherOptionFn(){
+            this.otherOptionKey ++;
+            this.otherOptions.push({
+                id: this.otherOptionKey,
+                pr_no: this.modalOtherOptionInfo.pr_no,
+                name: this.modalOtherOptionInfo.name,
+                price: this.modalOtherOptionInfo.price,
+                num: this.modalOtherOptionInfo.num,
+                toElevator:[],
+            })
+            this.modalOtherOptionInfo = {
+                pr_no: '',
+                name: '',
+                price: 0,
+                num: '',
+            }
+            this.hideCreateOtherOptionModal();
+        },
+        hideCreateOtherOptionModal(){
+            this.modalShow.other = false
+            // this.$refs.createOtherOptionModal.style.display = 'none';
+            body.style.overflow = 'auto'
+        },
+        addOtherOptionToElevator(id){
+            this.currentOtherOptionKey = id;
+            this.toElevators = [];
+            this.toElevatorNo = "";
+            const matchElevators = this.otherOptions.filter(option=> option.id == id)[0].toElevator.map(elevator=> elevator.id)
+            this.toElevatorNo = matchElevators[0]
+            console.log(this.elevators);
+            this.elevators.forEach(elevator=>{
+                if(elevator.price > 0){
+                    let model = ''
+                    model = elevator.spec
+                    this.toElevators.push({
+                        id: elevator.id,
+                        model: model,
+                        checked: matchElevators.includes(elevator.id) ? 1: 0,
+                    })
+                }
+            })
+            
+            this.modalShow.otherToElevator = true
+            body.style.overflow = 'hidden'
+        },
+        hideToOtherOptionElevatorModal(){
+            this.modalShow.otherToElevator = false
+            body.style.overflow = 'auto'
+        },
+        copyOtherOption(id){
+            this.otherOptionKey++;
+            const copyOption = this.otherOptions.filter(option=> option.id === id)[0]
+            console.log(copyOption);
+            this.otherOptions.push({
+                id: this.otherOptionKey,
+                name: copyOption.name,
+                price: copyOption.price,
+                num: copyOption.num,
+                toElevator: [],
+                pr_no: copyOption.pr_no
+            })
+            console.log(this.otherOptions);
+        },
+        chkOtherOptionToElevators(){
+            const checkedOptions = [];
+           
+            const matchElevators = this.elevators.filter(elevator=> elevator.id == this.toElevatorNo)[0]
+            console.log(matchElevators);
+            checkedOptions.push({
+                id: this.toElevatorNo,
+                model: matchElevators['spec'],
+            })
+            this.otherOptions.forEach(option=>{
+                if(option.id == this.currentOtherOptionKey){
+                    option.toElevator = [];
+                    option.toElevator.push(...checkedOptions)
+                }
+            })
+            console.log(this.otherOptions);
+            this.currentOtherOptionKey = ''
+
+            this.hideToOtherOptionElevatorModal();
+        },
+        removeOtherOption(id){
+            this.otherOptions = this.otherOptions.filter(option=> option.id != id)
+        },
     }
 }
\ No newline at end of file
diff --git a/wms/cont/pricereviewCreate.php b/wms/cont/pricereviewCreate.php
index cd65c763..e2b87b9f 100644
--- a/wms/cont/pricereviewCreate.php
+++ b/wms/cont/pricereviewCreate.php
@@ -3,178 +3,61 @@
 include_once "../header.php";
 require_once "../mkt/conn.php";
 
+if(!(isset($_GET['vol_no']) && $_GET['vol_no'] != "")){
+    echo "<script>alert('非法訪問!');window.history.go(-1);</script>";
+}
+$vol_no = $_GET['vol_no'];
+$sql_str = "SELECT * FROM hope_contract_customer WHERE vol_no = :vol_no";
+$stmt = $conn->prepare($sql_str);
+$stmt->bindParam(':vol_no', $vol_no);
+$stmt->execute();
+$hope_customer = $stmt->fetch(PDO::FETCH_ASSOC);
+
+$apply_key = getApplyKey(date('ym'), 'cmea_apply_key');
+echo $apply_key;
+function getApplyKey($p_yyyymm, $seq_name){
+    if (empty($p_yyyymm) || empty($seq_name)) return null;
+    global $conn;
+    $sql_str = "SELECT yyyymm, prefix FROM sequence WHERE seq_name = :seq_name";
+    $stmt = $conn->prepare($sql_str);
+    $stmt->bindParam(':seq_name', $seq_name);
+    $stmt->execute();
+    $result = $stmt->fetch(PDO::FETCH_ASSOC);
+
+    $yyyymm = $result['yyyymm'];
+    $prefix = $result['prefix'];
+
+    if ($p_yyyymm != $yyyymm) {
+        $sql_str = "UPDATE sequence SET yyyymm = :p_yyyymm, current_val = '10000' WHERE seq_name = :seq_name";
+        $stmt = $conn->prepare($sql_str);
+        $stmt->bindParam(':p_yyyymm', $p_yyyymm);
+        $stmt->bindParam(':seq_name', $seq_name);
+        $stmt->execute();
+    }
+
+    $sql_str = "SELECT CONCAT(:prefix, :p_yyyymm, SUBSTRING(appwms.nextval(:seq_name), 2)) AS seq_no";
+    $stmt = $conn->prepare($sql_str);
+    $stmt->bindParam(':prefix', $prefix);
+    $stmt->bindParam(':p_yyyymm', $p_yyyymm);
+    $stmt->bindParam(':seq_name', $seq_name);
+    $stmt->execute();
+    $result = $stmt->fetch(PDO::FETCH_ASSOC);
+
+    $seq_no = $result['seq_no'];
+
+    return $seq_no;
+}
 ?>
 <link rel="stylesheet" href="./css/pricereview.css">
 <script src="https://cdnjs.cloudflare.com/ajax/libs/axios/1.5.0/axios.min.js" integrity="sha512-aoTNnqZcT8B4AmeCFmiSnDlc4Nj/KPaZyB5G7JnOnUEkdNpCZs1LCankiYi01sLTyWy+m2P+W4XM+BuQ3Q4/Dg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script defer src="./js/alpinejs/cdn.min.js"></script>
 <script src="./js/pricereviewAlpine.js"></script>
 <div id="pricereviewCreate" x-data=pricereviewCreate()>
-    <div class="window-modal" x-cloak data-type="window-modal" x-show="modalShow.elevator" x-ref="createElevatorModal" id="createElevatorModal">
-        <div class="window-modal-content modal-xl">
-            <div class="window-modal-header">
-                <h4>新增電梯規格</h4>
-                <button class="btn btn-close" @click="hideCreateElevatorModal()">X</button>
-            </div>
-            <div class="window-modal-body">
-                <div>
-                    <table class="table">
-                        <tr class="table-active">
-                            <th>電梯</th>
-                            <th>人乘</th>
-                            <th>載重(KG)</th>
-                            <th>停數</th>
-                        </tr>
-                        <tr>
-                            <td>
-                                <select class="form-control" x-model="modalElevatorInfo.spec">
-                                    <option value="">請選擇</option>
-                                    <option value="MAE100">MAE100有機房</option>
-                                    <option value="MAM200">MAM200無機房</option>
-                                    <option value="MAH100">MAH100小電梯</option>
-                                    <option value="MAF100">MAF100貨梯(有機房)</option>
-                                    <option value="MAQ100">MAQ100強趨梯</option>
-                                    <option value="MAP100">MAP100平台梯</option>
-                                    <option value="M1">M1(系統更新)</option>
-                                    <option value="M1+M4(1:1)">M1+M4(1:1)系統+主機</option>
-                                    <option value="M1+M4(2:1)">M1+M4(2:1)系統+主機</option>
-                                </select>
-                            </td>
-                            <td>
-                                <select name="" id="" class="form-control"  x-model="modalElevatorInfo.person">
-                                    <option value="">請選擇</option>
-                                    <option value="6">6</option>
-                                    <option value="8">8</option>
-                                    <option value="9">9</option>
-                                    <option value="10">10</option>
-                                    <option value="11">11</option>
-                                    <option value="12">12</option>
-                                    <option value="13">13</option>
-                                    <option value="15">15</option>
-                                    <option value="17">17</option>
-                                    <option value="20">20</option>
-                                    <option value="24">24</option>
-                                </select>
-                            </td>
-                            <td>
-                                <input type="number" class="form-control" x-model="modalElevatorInfo.weight" />
-                            </td>
-                            <td>
-                                <input type="number" class="form-control" x-model="modalElevatorInfo.stop" />
-                            </td>
-                        </tr>
-                        <tr class="table-active">
-                            <th>速度</th>
-                            <th>電梯許可證號</th>
-                            <th>品牌</th>
-                            <th>贈送M1</th>
-                        </tr>
-                        <tr>
-                            <td>
-                                <select name="" id="" class="form-control" style="width:93px" x-model="modalElevatorInfo.speed" @change="getModalElevatorPrice()" >
-                                    <option value="">請選擇</option>
-                                    <option value="9">9</option>
-                                    <option value="24">24</option>
-                                    <option value="30">30</option>
-                                    <option value="45">45</option>
-                                    <option value="60">60</option>
-                                    <option value="90">90</option>
-                                    <option value="105">105</option>
-                                    <option value="120">120</option>
-                                    <option value="150">150</option>
-                                </select>
-                            </td>
-                            <td>
-                                <input type="text" class="form-control" x-model="modalElevatorInfo.permitNumber" />
-                            </td>
-                            <td>
-                                <select class="form-control" x-model="modalElevatorInfo.brand">
-                                    <option value="請選擇">請選擇</option>
-                                    <option value='永大'>永大</option>
-                                    <option value='三菱'>三菱</option>
-                                    <option value='崇友'>崇友</option>
-                                    <option value='Otis'>Otis</option>
-                                    <option value='櫻花'>櫻花</option>
-                                    <option value='立路'>立路</option>
-                                    <option value='富士達'>富士達</option>
-                                    <option value='富士'>富士</option>
-                                    <option value='測試品牌'>測試品牌</option>
-                                    <option value='sanyo'>sanyo</option>
-                                    <option value='測試品牌2'>測試品牌2</option>
-                                    <option value='測試品牌4'>測試品牌4</option>
-                                    <option value='中升'>中升</option>
-                                    <option value='長合'>長合</option>
-                                    <option value='宏偉電機工業股份有限公司'>宏偉電機工業股份有限公司</option>
-                                    <option value='保速達'>保速達</option>
-                                    <option value='東棋'>東棋</option>
-                                    <option value='安達'>安達</option>
-                                    <option value='百朝'>百朝</option>
-                                    <option value='太友'>太友</option>
-                                    <option value='永佳捷'>永佳捷</option>
-                                    <option value='永勝'>永勝</option>
-                                    <option value='其他'>其他</option>
-                                </select>
-                            </td>
-                            <td>
-                                <select class="form-control" x-model="modalElevatorInfo.m1">
-                                    <option value="0">否</option>
-                                    <option value="1">是</option>
-                                </select>
-                            </td>
-                        </tr>
-                        <tr class="table-active">
-                            <th>保養月數</th>
-                            <th>保養週期</th>
-                            <th>竣工檢查年度</th>
-                            <th>上次年檢日期</th>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="number" class="form-control" value="12" x-model="modalElevatorInfo.months" />
-                            </td>
-                            <td>
-                                <select name="" id="" class="form-control" x-model="modalElevatorInfo.cycle">
-                                    <option value="">請選擇</option>
-                                    <option value="">月保</option>
-                                    <option value="">雙週保</option>
-                                </select>
-                            </td>
-                            <td>
-                                <input type="number" class="form-control" x-model="modalElevatorInfo.checkYear" />
-                            </td>
-                            <td>
-                                <input type="date" class="form-control" x-model="modalElevatorInfo.lastDate" />
-                            </td>
-                        </tr>
-                        <tr class="table-active">
-                            <th>年檢費用(元)</th>
-                            <th>公司發布價(月)</th>
-                            <th>電梯數量</th>
-                            <th>契約報價(月)</th>
-                        </tr>
-                        <tr>
-                            <td>
-                                <input type="number" class="form-control" x-model="modalElevatorInfo.yearCheckFee" />
-                            </td>
-                            <td>
-                                <input type="number" class="form-control" x-model="modalElevatorInfo.price" />
-                            </td>
-                            <td>
-                                <input type="number" class="form-control" x-model="modalElevatorInfo.qty" />
-                            </td>
-                            <td>
-                                <input type="number" class="form-control" x-model="modalElevatorInfo.sale_price" />
-                            </td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-            <div class="modal-footer">
-            <button type="button" class="btn btn-secondary" @click="hideCreateElevatorModal()">關閉</button>
-                <button type="button" class="btn btn-primary"  @click="createElevatorFn()">新增</button>
-            </div>
-        </div>
-        <div class="window-back" @click="hideCreateElevatorModal()"></div>
-    </div>
+    <?php 
+        include_once "./window-modal/modalElevaotr.php";
+        include_once "./window-modal/otherOptionModal.php";
+        include_once "./window-modal/otherToElevatorModal.php";
+     ?>
     <div class="container">
         <table class="table" border="1">
                 <thead >
@@ -184,63 +67,58 @@ require_once "../mkt/conn.php";
                 </thead>
                 <tbody>
                     <tr>
-                        <th>評審單號</th>
-                        <td><input class="form-control" type="text" disabled value="" /></td>
+                        <th>價審單號</th>
+                        <td><input class="form-control" type="text" disabled value="<?php echo $apply_key; ?>" /></td>
                         <th>卷號</th>
-                        <td><input class="form-control" type="text" disabled value="" /></td>
-                        <th>現場地址</th>
-                        <td><input class="form-control" type="text" disabled value="" /></td>
+                        <td><input class="form-control" type="text" disabled value="<?php echo $hope_customer['vol_no']; ?>" /></td>
                         <th>現場名稱</th>
-                        <td><input class="form-control" type="text" disabled value="" /></td>
+                        <td><input class="form-control" type="text" disabled value="<?php echo $hope_customer['customer']; ?>" /></td>
+                        <th>現場地址</th>
+                        <td><input class="form-control" type="text" disabled value="<?php echo $hope_customer['address']; ?>" /></td>
                     </tr>
                     <tr>
                         <th>電梯品牌</th>
-                        <td><input class="form-control" type="text" disabled value="" /></td>
-                        <th>數量</th>
-                        <td><input class="form-control" type="number" disabled value="" /></td>
+                        <td><input class="form-control" type="text" disabled value="<?php echo $hope_customer['brand']; ?>" /></td>
+                        <th>電梯數量</th>
+                        <td><input class="form-control" type="number" disabled value="<?php echo $hope_customer['num']; ?>" /></td>
                         <th>營業員</th>
-                        <td><input class="form-control" type="text" disabled value="" /></td>
-                        <th>保養方式</th>
-                        <td>
-                            <select class="form-control" disabled>
-                                <option value=""></option>
-                            </select>
-                        </td>
+                        <td><input class="form-control" type="text" disabled value="<?php echo $hope_customer['salesman_name']; ?>" /></td>
+                        <th>當前契約期限結束</th>
+                        <td><input class="form-control" type="date" disabled value="" /></td>
+                        
                     </tr>
+                </tbody>
+        </table>
+        <table class="table" border="1">
+                <thead >
+                    <tr class="" >
+                    <th scope="col" class="text-center " colspan="8">價格審查(契約)基本資料</th>
+                    </tr>
+                </thead>
+                <tbody>
                     <tr>
-                        <th>契約期限開始</th>
-                        <td><input class="form-control" type="date" disabled value="" /></td>
-                        <th>契約期限結束</th>
-                        <td><input class="form-control" type="date" disabled value="" /></td>
+                        
                         <th>契約性質</th>
                         <td>
-                            <select class="form-control" disabled>
-                                <option value=""></option>
+                            <select class="form-control">
+                                <option value="">請選擇</option>
                                 <option value="">新簽約</option>
                                 <option value="">免保轉有費</option>
                                 <option value="">續約</option>
                             </select>
                         </td>
-                        <th>介紹人</th>
-                        <td><input class="form-control" type="text" disabled value="" /></td>
-                    </tr>
-                    <tr>
                         <th>付款方式</th>
                         <td>
-                            <select class="form-control" disabled>
-                                <option value=""></option>
+                            <select class="form-control" >
+                                <option value="">請選擇</option>
                                 <option value="">月付</option>
                                 <option value="">季付</option>
                                 <option value="">半年付</option>
                                 <option value="">年付</option>
                             </select>
                         </td>
-                        <th></th>
-                        <td></td>
-                        <th></th>
-                        <td></td>
-                        <th></th>
-                        <td></td>
+                        <th>案件名稱</th>
+                        <td><input class="form-control" type="text" value="" /></td>
                     </tr>
                 </tbody>
         </table>
@@ -253,7 +131,7 @@ require_once "../mkt/conn.php";
             <tbody>
                 <tr>
                     <td colspan=8>
-                        <textarea class="form-control" name="progress" id="progress" cols="20" rows="5" disabled ></textarea>
+                        <textarea class="form-control" name="progress" id="progress" cols="20" rows="5" disabled ><?php echo nl2br($hope_customer['progress_status']); ?></textarea>
                     </td>
                 </tr>
             </tbody>
@@ -288,10 +166,10 @@ require_once "../mkt/conn.php";
                         <tbody>
                             <tr class="dark" >
                                 <th colspan=1>項次</th>
-                                <th colspan=9 style="text-align: left; padding-left: 15px;" x-text="elevator.id"></th>
+                                <th colspan=7 style="text-align: left; padding-left: 15px;" x-text="elevator.id"></th>
                                 <th colspan="2" >
-                                <button class="copyBtn btn btn-secondary" @click="copyElevator(idx)">+</button>
-                                    <button class="btn btn-danger"  @click="deleteElevator(elevator.id)">刪除</button>
+                                <button class="copyBtn btn btn-secondary" @click="copyElevator(idx)">複製</button>
+                                    <button class="btn btn-danger"  @click="removeElevator(elevator.id)">刪除</button>
                                 </th>
                             </tr>
                             <tr>
@@ -305,28 +183,9 @@ require_once "../mkt/conn.php";
                                         <option value="MAF100">MAF100貨梯(有機房)</option>
                                         <option value="MAQ100">MAQ100強趨梯</option>
                                         <option value="MAP100">MAP100平台梯</option>
-                                        <option value="M1">M1(系統更新)</option>
-                                        <option value="M1+M4(1:1)">M1+M4(1:1)系統+主機</option>
-                                        <option value="M1+M4(2:1)">M1+M4(2:1)系統+主機</option>
-                                    </select>
-                                </td>
-                                <th>人乘</th>
-                                <td>
-                                    <select class="form-control"  x-model="elevator.person">
-                                        <option value="">請選擇</option>
-                                        <option value="6">6</option>
-                                        <option value="8">8</option>
-                                        <option value="9">9</option>
-                                        <option value="10">10</option>
-                                        <option value="11">11</option>
-                                        <option value="12">12</option>
-                                        <option value="13">13</option>
-                                        <option value="15">15</option>
-                                        <option value="17">17</option>
-                                        <option value="20">20</option>
-                                        <option value="24">24</option>
                                     </select>
                                 </td>
+                               
                                 <th>載重(KG)</th>
                                 <td>
                                     <input type="number" class="form-control" x-model="elevator.weight" />
@@ -350,9 +209,22 @@ require_once "../mkt/conn.php";
                                         <option value="150">150</option>
                                     </select>
                                 </td>
-                                <th>規格</th>
-                                <td colspan=1>
-                                    <input type="text" class="form-control" disabled />
+                                <th>人乘</th>
+                                <td>
+                                    <select class="form-control"  x-model="elevator.person">
+                                        <option value="">請選擇</option>
+                                        <option value="6">6</option>
+                                        <option value="8">8</option>
+                                        <option value="9">9</option>
+                                        <option value="10">10</option>
+                                        <option value="11">11</option>
+                                        <option value="12">12</option>
+                                        <option value="13">13</option>
+                                        <option value="15">15</option>
+                                        <option value="17">17</option>
+                                        <option value="20">20</option>
+                                        <option value="24">24</option>
+                                    </select>
                                 </td>
                             </tr>
                             <tr>
@@ -361,7 +233,7 @@ require_once "../mkt/conn.php";
                                     <input type="text" class="form-control" x-model="elevator.permitNumber" />
                                 </td>
                                 <th>品牌</th>
-                                <td colspan="1">
+                                <td colspan="3">
                                     <select class="form-control" x-model="modalElevatorInfo.brand">
                                         <option value="請選擇">請選擇</option>
                                         <option value='永大'>永大</option>
@@ -389,9 +261,20 @@ require_once "../mkt/conn.php";
                                         <option value='其他'>其他</option>
                                     </select>
                                 </td>
-                                <th>保養月數</th>
+                                <th>竣工檢查年度(民國)</th>
                                 <td>
-                                    <input type="number" class="form-control" x-model="elevator.months" />
+                                    <input type="number" class="form-control" x-model="elevator.checkYear" />
+                                </td>
+                            </tr>
+                            <tr>
+                               
+                                <th>保養開始日期</th>
+                                <td>
+                                    <input type="date" class="form-control" x-model="elevator.months" />
+                                </td>
+                                <th>保養結束日期</th>
+                                <td>
+                                    <input type="date" class="form-control" x-model="elevator.months" />
                                 </td>
                                 <th>保養週期</th>
                                 <td>
@@ -401,6 +284,15 @@ require_once "../mkt/conn.php";
                                         <option value="BW">雙週保</option>
                                     </select>
                                 </td>
+                                <th>保養方式</th>
+                                <td>
+                                    <select class="form-control">
+                                        <option value="">請選擇</option>
+                                        <option value="3">全包</option>
+                                        <option value="2">半包</option>
+                                        <option value="4">清包</option>
+                                    </select>
+                                </td>
                                 <th>送M1</th>
                                 <td>
                                     <select class="form-control" x-model="elevator.m1">
@@ -410,10 +302,7 @@ require_once "../mkt/conn.php";
                                 </td>
                             </tr>
                             <tr>
-                                <th>竣工檢查年度</th>
-                                <td>
-                                    <input type="number" class="form-control" x-model="elevator.checkYear" />
-                                </td>
+                                
                                 <th>上次年檢日期</th>
                                 <td>
                                     <input type="date" class="form-control" x-model="elevator.lastDate" />
@@ -428,7 +317,7 @@ require_once "../mkt/conn.php";
                                 </td>
                                 <th>電梯數量</th>
                                 <td>
-                                    <input type="number" class="form-control" x-model="elevator.qty" />
+                                    <input type="number" class="form-control" x-model="elevator.qty" disabled />
                                 </td>
                                 <th>契約報價(月)</th>
                                 <td>
@@ -439,6 +328,61 @@ require_once "../mkt/conn.php";
                     </template>
                 </table>
             </div>
+            <div class="divitem">
+                <div class="title">
+                    <h4>除外項目</h4>
+                    <button class="addbtn btn" @click="openCreateOtherOptionFn()" >+</button>
+                </div>
+                <table class="table" border=1>
+                    <thead x-show="otherOptions.length > 0">
+                        <tr>
+                            <td>詢價單號</td>
+                            <td>名稱</td>
+                            <td>單價</td>
+                            <td>數量</td>
+                            <td>複價</td>
+                            <td style="width:160px">所屬電梯</td>
+                            <td style="width:220px">功能</td>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <template x-for="option in otherOptions">
+                            <tr>
+                                <td><input type="text" class="form-control" x-model="option.pr_no"></td>
+                                <td>
+                                    <input type="text" class="form-control" x-model="option.name">
+                                    <span x-show="option.name==''" class="errortext" x-cloak data-type="errortext">請輸入除外項目名稱</span>
+                                </td>
+                                <td><input type="text" class="form-control" x-model="option.price"></td>
+                                <td>
+                                    <input type="number" class="form-control"  x-model="option.num">
+                                    <span x-show="!option.num || option.num <= 0 || !Number.isInteger(Number(option.num))" class="errortext" x-cloak data-type="errortext">請輸入正整數</span>
+                                </td>
+                                <td><input type="text" class="form-control" x-model="(option.price * option.num).toLocaleString()" disabled></td>
+                                <td>
+                                    <template x-for="el in option.toElevator">
+                                        <p x-html="'<b>' + el.id + '</b>、' + el.model"></p>
+                                    </template>
+                                    <span x-show="option.toElevator.length <=0" class="errortext" x-cloak data-type="errortext">尚未選擇電梯</span>
+                                </td>
+                                <td>
+                                    <div class="d-flex">
+                                        <button class="copyBtn btn btn-secondary" @click="copyOtherOption(option.id)">複製</button>
+                                        <button class="selectElevator btn btn-danger"  @click="addOtherOptionToElevator(option.id)">電梯</button>
+                                        <button class="deleteBtn btn btn-danger" @click="removeOtherOption(option.id)">X</button>
+                                    </div>
+                                </td>
+                            </tr>
+                        </template>
+                        <tr x-show="otherOptions.length > 0">
+                            <td colspan=3>小計</td>
+                            <td colspan=1 ><input type="number" class="form-control" disabled :value="totalOtherOptionsNum().toLocaleString()" ></td>
+                            <td colspan=1 ><input type="text" class="form-control" disabled :value="totalOtherOptionsPrice().toLocaleString()" ></td>
+                            <td colspan=3 ></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
             <div class="divitem" style="margin-top:20px">
                 <table style="width:800px" class="table noborder" >
                     <tbody>
diff --git a/wms/cont/window-modal/modalElevaotr.php b/wms/cont/window-modal/modalElevaotr.php
new file mode 100644
index 00000000..896ea9de
--- /dev/null
+++ b/wms/cont/window-modal/modalElevaotr.php
@@ -0,0 +1,179 @@
+<div class="window-modal" x-cloak data-type="window-modal" x-show="modalShow.elevator" x-ref="createElevatorModal" id="createElevatorModal">
+        <div class="window-modal-content modal-xl">
+            <div class="window-modal-header">
+                <h4>新增電梯規格</h4>
+                <button class="btn btn-close" @click="hideCreateElevatorModal()">X</button>
+            </div>
+            <div class="window-modal-body">
+                <div>
+                    <table class="table">
+                        <tr class="table-active">
+                            <th>電梯</th>
+                            <th>人乘</th>
+                            <th>載重(KG)</th>
+                            <th>停數</th>
+                        </tr>
+                        <tr>
+                            <td>
+                                <select class="form-control" x-model="modalElevatorInfo.spec">
+                                    <option value="">請選擇</option>
+                                    <option value="MAE100">MAE100有機房</option>
+                                    <option value="MAM200">MAM200無機房</option>
+                                    <option value="MAH100">MAH100小電梯</option>
+                                    <option value="MAF100">MAF100貨梯(有機房)</option>
+                                    <option value="MAQ100">MAQ100強趨梯</option>
+                                    <option value="MAP100">MAP100平台梯</option>
+                                    <option value="M1">M1(系統更新)</option>
+                                    <option value="M1+M4(1:1)">M1+M4(1:1)系統+主機</option>
+                                    <option value="M1+M4(2:1)">M1+M4(2:1)系統+主機</option>
+                                </select>
+                            </td>
+                            <td>
+                                <select name="" id="" class="form-control"  x-model="modalElevatorInfo.person">
+                                    <option value="">請選擇</option>
+                                    <option value="6">6</option>
+                                    <option value="8">8</option>
+                                    <option value="9">9</option>
+                                    <option value="10">10</option>
+                                    <option value="11">11</option>
+                                    <option value="12">12</option>
+                                    <option value="13">13</option>
+                                    <option value="15">15</option>
+                                    <option value="17">17</option>
+                                    <option value="20">20</option>
+                                    <option value="24">24</option>
+                                </select>
+                            </td>
+                            <td>
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.weight" />
+                            </td>
+                            <td>
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.stop" />
+                            </td>
+                        </tr>
+                        <tr class="table-active">
+                            <th>速度</th>
+                            <th>電梯許可證號</th>
+                            <th>品牌</th>
+                            <th>贈送M1</th>
+                        </tr>
+                        <tr>
+                            <td>
+                                <select name="" id="" class="form-control" style="width:93px" x-model="modalElevatorInfo.speed" @change="getModalElevatorPrice()" >
+                                    <option value="">請選擇</option>
+                                    <option value="9">9</option>
+                                    <option value="24">24</option>
+                                    <option value="30">30</option>
+                                    <option value="45">45</option>
+                                    <option value="60">60</option>
+                                    <option value="90">90</option>
+                                    <option value="105">105</option>
+                                    <option value="120">120</option>
+                                    <option value="150">150</option>
+                                </select>
+                            </td>
+                            <td>
+                                <input type="text" class="form-control" x-model="modalElevatorInfo.permitNumber" />
+                            </td>
+                            <td>
+                                <select class="form-control" x-model="modalElevatorInfo.brand">
+                                    <option value="請選擇">請選擇</option>
+                                    <option value='永大'>永大</option>
+                                    <option value='三菱'>三菱</option>
+                                    <option value='崇友'>崇友</option>
+                                    <option value='Otis'>Otis</option>
+                                    <option value='櫻花'>櫻花</option>
+                                    <option value='立路'>立路</option>
+                                    <option value='富士達'>富士達</option>
+                                    <option value='富士'>富士</option>
+                                    <option value='測試品牌'>測試品牌</option>
+                                    <option value='sanyo'>sanyo</option>
+                                    <option value='測試品牌2'>測試品牌2</option>
+                                    <option value='測試品牌4'>測試品牌4</option>
+                                    <option value='中升'>中升</option>
+                                    <option value='長合'>長合</option>
+                                    <option value='宏偉電機工業股份有限公司'>宏偉電機工業股份有限公司</option>
+                                    <option value='保速達'>保速達</option>
+                                    <option value='東棋'>東棋</option>
+                                    <option value='安達'>安達</option>
+                                    <option value='百朝'>百朝</option>
+                                    <option value='太友'>太友</option>
+                                    <option value='永佳捷'>永佳捷</option>
+                                    <option value='永勝'>永勝</option>
+                                    <option value='其他'>其他</option>
+                                </select>
+                            </td>
+                            <td>
+                                <select class="form-control" x-model="modalElevatorInfo.m1">
+                                    <option value="0">否</option>
+                                    <option value="1">是</option>
+                                </select>
+                            </td>
+                        </tr>
+                        <tr class="table-active">
+                            <th colspan=2>保養開始日期</th>
+                            <th colspan=2>保養結束日期</th>
+                        </tr>
+                        <tr class="table-active">
+                            <td colspan=2><input type="date" class="form-control" x-model="modalElevatorInfo.startDate" /></td>
+                            <td colspan=2><input type="date" class="form-control" x-model="modalElevatorInfo.endDate" /></td>
+                        </tr>
+                        <tr class="table-active">
+                            <th>保養方式</th>
+                            <th>保養週期</th>
+                            <th>竣工檢查年度</th>
+                            <th>上次年檢日期</th>
+                        </tr>
+                        <tr>
+                            <td>
+                                <select class="form-control">
+                                    <option value="">請選擇</option>
+                                    <option value="3">全包</option>
+                                    <option value="2">半包</option>
+                                    <option value="4">清包</option>
+                                </select>
+                            </td>
+                            <td>
+                                <select name="" id="" class="form-control" x-model="modalElevatorInfo.cycle">
+                                    <option value="">請選擇</option>
+                                    <option value="">月保</option>
+                                    <option value="">雙週保</option>
+                                </select>
+                            </td>
+                            <td>
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.checkYear" />
+                            </td>
+                            <td>
+                                <input type="date" class="form-control" x-model="modalElevatorInfo.lastDate" />
+                            </td>
+                        </tr>
+                        <tr class="table-active">
+                            <th>年檢費用(元)</th>
+                            <th>公司發布價(月)</th>
+                            <th>電梯數量</th>
+                            <th>契約報價(月)</th>
+                        </tr>
+                        <tr>
+                            <td>
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.yearCheckFee" />
+                            </td>
+                            <td>
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.price" />
+                            </td>
+                            <td>
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.qty"  disabled />
+                            </td>
+                            <td>
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.sale_price" />
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <div class="modal-footer">
+            <button type="button" class="btn btn-secondary" @click="hideCreateElevatorModal()">關閉</button>
+                <button type="button" class="btn btn-primary"  @click="createElevatorFn()">新增</button>
+            </div>
+        </div>
+        <div class="window-back" @click="hideCreateElevatorModal()"></div>
+    </div>
\ No newline at end of file
diff --git a/wms/cont/window-modal/otherOptionModal.php b/wms/cont/window-modal/otherOptionModal.php
new file mode 100644
index 00000000..565ccbf5
--- /dev/null
+++ b/wms/cont/window-modal/otherOptionModal.php
@@ -0,0 +1,33 @@
+<div class="window-modal" x-cloak data-type="window-modal" x-show="modalShow.other" x-ref="createOtherOptionModal" id="createOtherOptionModal">
+    <div class="window-modal-content modal-xl">
+        <div class="window-modal-header">
+            <h4>新增除外項目</h4>
+            <button class="btn btn-close" @click="hideCreateOtherOptionModal()">X</button>
+        </div>
+        <div class="window-modal-body">
+            <div>
+                <table class="table">
+                    <tr class="table-active">
+                        <th>詢價單號</th>
+                        <th>項目名稱</th>
+                        <th>單價</th>
+                        <th>數量</th>
+                        <th>複價</th>
+                    </tr>
+                    <tr>
+                        <td><input type="text" class="form-control" x-model="modalOtherOptionInfo.pr_no"></td>
+                        <td><input type="text" class="form-control" x-model="modalOtherOptionInfo.name"></td>
+                        <td><input type="number" class="form-control" x-model="modalOtherOptionInfo.price"></td>
+                        <td><input type="number" class="form-control" x-model="modalOtherOptionInfo.num"></td>
+                        <td><input type="text" disabled class="form-control" x-model="(modalOtherOptionInfo.price * modalOtherOptionInfo.num).toLocaleString()"></td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+        <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" @click="hideCreateOtherOptionModal()">關閉</button>
+            <button type="button" class="btn btn-primary"  @click="createOtherOptionFn()">新增</button>
+        </div>
+    </div>
+    <div class="window-back" @click="hideCreateOtherOptionModal()"></div>
+</div>
\ No newline at end of file
diff --git a/wms/cont/window-modal/otherToElevatorModal.php b/wms/cont/window-modal/otherToElevatorModal.php
new file mode 100644
index 00000000..3b073176
--- /dev/null
+++ b/wms/cont/window-modal/otherToElevatorModal.php
@@ -0,0 +1,36 @@
+<div class="window-modal" x-cloak data-type="window-modal" x-show="modalShow.otherToElevator" x-ref="toOtherOptionElevatorModal" id="toOtherOptionElevatorModal">
+    <div class="window-modal-content modal-m">
+        <div class="window-modal-header">
+            <h4>配對電梯</h4>
+            <button class="btn btn-close" @click="hideToOtherOptionElevatorModal()">X</button>
+        </div>
+        <div class="window-modal-body">
+            <div>
+                <table class="table">
+                    <tr>
+                        <th>項次</th>
+                        <th>規格</th>
+                        <th>選擇</th>
+                    </tr>
+                    <template x-for="elevator in toElevators" :key="elevator.id">
+                        <tr>
+                            <td x-text="elevator.id"></td>
+                            <td x-text="elevator.model"></td>
+                            <td><input type="radio" name="otherOptionToElevator" :value="elevator.id" class="form-check-input" x-model="toElevatorNo" /></td>
+                        </tr>
+                    </template>
+                    <tr x-show="toElevators.length == 0">
+                        <td colspan="3">
+                            <small class="text-danger" style="font-size:13px;font-weight:600">暫無可選電梯，請先新增電梯規格！</small>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-secondary"  @click="hideToOtherOptionElevatorModal()">關閉</button>
+            <button type="button" x-show="toElevators.length > 0" class="btn btn-primary"  @click="chkOtherOptionToElevators()">確認</button>
+        </div>
+    </div>
+    <div class="window-back" @click="hideToOtherOptionElevatorModal()"></div>
+</div>
\ No newline at end of file
diff --git a/wms/crm/crmm02-index.php b/wms/crm/crmm02-index.php
index 33e48991..a4fcc9bd 100644
--- a/wms/crm/crmm02-index.php
+++ b/wms/crm/crmm02-index.php
@@ -170,7 +170,7 @@ if ($data) :
                                         <span class="glyphicon glyphicon-pencil"></span>
                                     </a>
                                     <?php if ($user_name === $row['salesman'] || $user_id = 'M0225') : ?>
-                                        <a href="../cont/pricereviewCheck.php?function_name=sign_list&<?= $token_link ?>&vol_no=<?= $row['vol_no'] ?>" class="btn btn-info btn-sm">
+                                        <a href="../cont/pricereviewCreate.php?function_name=sign_list&<?= $token_link ?>&vol_no=<?= $row['vol_no'] ?>" class="btn btn-info btn-sm">
                                             轉價審
                                         </a>
                                     <?php endif ?>
diff --git a/wms/mkt/assets/js/pricereviewAlpine.js b/wms/mkt/assets/js/pricereviewAlpine.js
index 227b2f4c..255c8251 100644
--- a/wms/mkt/assets/js/pricereviewAlpine.js
+++ b/wms/mkt/assets/js/pricereviewAlpine.js
@@ -490,10 +490,14 @@ const pricereviewCreate = ()=>{
             this.otherOptionKey++;
         },
         addOptionToElevator(key){
+            console.log(key);
+            console.log(this.selectedOptions);
             this.currentOptionKey = key;
             this.toElevators = [];
             this.toElevatorNo = "";
             const matchElevators = this.selectedOptions.filter(option=> option.key == key)[0].toElevator.map(elevator=> elevator.id)
+            console.log(matchElevators);
+            // this.toElevatorNo = matchElevators.length > 0 ? matchElevators[0] : '';
             this.toElevatorNo = matchElevators[0]
             this.elevators.forEach(elevator=>{
                 if(elevator.price > 0){
@@ -544,7 +548,9 @@ const pricereviewCreate = ()=>{
         chkOptionToElevators(){
             const checkedOptions = [];
             const matchElevators = this.elevators.filter(elevator=> elevator.id == this.toElevatorNo)[0]
-            
+            console.log(this.elevators);
+            console.log(this.toElevatorNo);
+            console.log(this.elevators.filter(elevator=> elevator.id == this.toElevatorNo));
             checkedOptions.push({
                 id: this.toElevatorNo,
                 model: matchElevators['model'] ,
@@ -590,7 +596,22 @@ const pricereviewCreate = ()=>{
                     return issetElevators.includes(el.id)
                 })
             })
-            console.log(this.selectedOptions);
+
+            this.otherOptions.forEach(option=>{
+                option.toElevator = option.toElevator.filter(el=>{
+                    return issetElevators.includes(el.id)
+                })
+            })
+            this.maintainOptions.forEach(option=>{
+                option.toElevator = option.toElevator.filter(el=>{
+                    return issetElevators.includes(el.id)
+                })
+            })
+            this.demolishOptions.forEach(option=>{
+                option.toElevator = option.toElevator.filter(el=>{
+                    return issetElevators.includes(el.id)
+                })
+            })
         },
         removeOption(key){
             console.log(this.selectedOptions);
diff --git a/wms/mkt/pricereviewCreate.php b/wms/mkt/pricereviewCreate.php
index f9c6ba6f..72d58e0e 100644
--- a/wms/mkt/pricereviewCreate.php
+++ b/wms/mkt/pricereviewCreate.php
@@ -490,11 +490,6 @@ function convertDateTimeFormat($dateTimeStr) {
                                         <option value="MAF100">MAE100貨梯(有機房)</option>
                                         <option value="MAQ100">MAQ100強趨梯</option>
                                         <option value="MAP100">MAP100平台梯</option>
-                                        <?php if($hope_customer['is_renovation']): ?>
-                                        <option value="M1">M1(系統更新)</option>
-                                        <option value="M1+M4(1:1)">M1+M4(1:1)系統+主機</option>
-                                        <option value="M1+M4(2:1)">M1+M4(2:1)系統+主機</option>
-                                        <?php endif; ?>
                                     </select>
                                     <span x-show="!elevator.specifications" class="errortext" x-cloak data-type="errortext">請選擇規格</span>
                                 </td>
diff --git a/wms/mkt/window-modal/demolishToElevatorModal.php b/wms/mkt/window-modal/demolishToElevatorModal.php
index da7e3974..3970c026 100644
--- a/wms/mkt/window-modal/demolishToElevatorModal.php
+++ b/wms/mkt/window-modal/demolishToElevatorModal.php
@@ -12,7 +12,7 @@
                         <th>規格</th>
                         <th>選擇</th>
                     </tr>
-                    <template x-for="elevator in toElevators">
+                    <template x-for="elevator in toElevators" :key="elevator.id">
                         <tr>
                             <td x-text="elevator.id"></td>
                             <td x-text="elevator.model"></td>
@@ -29,7 +29,7 @@
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-secondary"  @click="hideToDemolishOptionElevatorModal()">關閉</button>
-            <button type="button" class="btn btn-primary"  @click="chkDemolishOptionToElevators()">確認</button>
+            <button type="button"  x-show="toElevators.length > 0" class="btn btn-primary"  @click="chkDemolishOptionToElevators()">確認</button>
         </div>
     </div>
     <div class="window-back" @click="hideToDemolishOptionElevatorModal()"></div>
diff --git a/wms/mkt/window-modal/elevatorModal.php b/wms/mkt/window-modal/elevatorModal.php
index 4bd18d0c..73b0fde4 100644
--- a/wms/mkt/window-modal/elevatorModal.php
+++ b/wms/mkt/window-modal/elevatorModal.php
@@ -23,11 +23,6 @@
                                 <option value="MAF100">MAF100貨梯(有機房)</option>
                                 <option value="MAQ100">MAQ100強趨梯</option>
                                 <option value="MAP100">MAP100平台梯</option>
-                                <?php if($hope_customer['is_renovation'] == 'Y'): ?>
-                                <option value="M1">M1(系統更新)</option>
-                                <option value="M1+M4(1:1)">M1+M4(1:1)系統+主機</option>
-                                <option value="M1+M4(2:1)">M1+M4(2:1)系統+主機</option>
-                                <?php endif; ?>
                             </select>
                         </td>
                         <td>
diff --git a/wms/mkt/window-modal/maintainToElevatorModal.php b/wms/mkt/window-modal/maintainToElevatorModal.php
index 524574f2..0658cf50 100644
--- a/wms/mkt/window-modal/maintainToElevatorModal.php
+++ b/wms/mkt/window-modal/maintainToElevatorModal.php
@@ -12,7 +12,7 @@
                             <th>規格</th>
                             <th>選擇</th>
                         </tr>
-                        <template x-for="elevator in toElevators">
+                        <template x-for="elevator in toElevators" :key="elevator.id">
                             <tr>
                                 <td x-text="elevator.id"></td>
                                 <td x-text="elevator.model"></td>
@@ -29,7 +29,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary"  @click="hideToMaintainOptionElevatorModal()">關閉</button>
-                <button type="button" class="btn btn-primary"  @click="chkMaintainOptionToElevators()">確認</button>
+                <button type="button"  x-show="toElevators.length > 0" class="btn btn-primary"  @click="chkMaintainOptionToElevators()">確認</button>
             </div>
         </div>
         <div class="window-back" @click="hideToMaintainOptionElevatorModal()"></div>
diff --git a/wms/mkt/window-modal/optionToElevatorModal.php b/wms/mkt/window-modal/optionToElevatorModal.php
index 1a4dfc51..94b2c862 100644
--- a/wms/mkt/window-modal/optionToElevatorModal.php
+++ b/wms/mkt/window-modal/optionToElevatorModal.php
@@ -12,11 +12,11 @@
                         <th>規格</th>
                         <th>選擇</th>
                     </tr>
-                    <template x-for="elevator in toElevators">
+                    <template x-for="elevator in toElevators" :key="elevator.id">
                         <tr>
                             <td x-text="elevator.id"></td>
                             <td x-text="elevator.model"></td>
-                            <td><input type="radio" name="optionToElevator" :value="elevator.id" class="form-check-input" x-model="toElevatorNo" /></td>
+                            <td><input type="radio" name="optionToElevator" :value="elevator.id" class="form-check-input" x-model="toElevatorNo" @change="console.log(elevator.id, toElevatorNo)" /></td>
                         </tr>
                     </template>
                     <tr x-show="toElevators.length == 0">
@@ -29,7 +29,7 @@
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-secondary"  @click="hideToElevatorModal()">關閉</button>
-            <button type="button" class="btn btn-primary"  @click="chkOptionToElevators()">確認</button>
+            <button type="button" x-show="toElevators.length > 0" class="btn btn-primary"  @click="chkOptionToElevators()">確認</button>
         </div>
     </div>
     <div class="window-back" @click="hideToElevatorModal()"></div>
diff --git a/wms/mkt/window-modal/otherToElevatorModal.php b/wms/mkt/window-modal/otherToElevatorModal.php
index 8816205b..5798868c 100644
--- a/wms/mkt/window-modal/otherToElevatorModal.php
+++ b/wms/mkt/window-modal/otherToElevatorModal.php
@@ -12,7 +12,7 @@
                         <th>規格</th>
                         <th>選擇</th>
                     </tr>
-                    <template x-for="elevator in toElevators">
+                    <template x-for="elevator in toElevators" :key="elevator.id">
                         <tr>
                             <td x-text="elevator.id"></td>
                             <td x-text="elevator.model"></td>
@@ -29,7 +29,7 @@
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-secondary"  @click="hideToOtherOptionElevatorModal()">關閉</button>
-            <button type="button" class="btn btn-primary"  @click="chkOtherOptionToElevators()">確認</button>
+            <button type="button"  x-show="toElevators.length > 0" class="btn btn-primary"  @click="chkOtherOptionToElevators()">確認</button>
         </div>
     </div>
     <div class="window-back" @click="hideToOtherOptionElevatorModal()"></div>

From b36d4244698d3b09b24664361d898f3e771351ac Mon Sep 17 00:00:00 2001
From: Ellin <b0206040@masada.com.tw>
Date: Wed, 6 Mar 2024 18:26:57 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E6=87=89=E6=94=B6=E5=B8=B3=E6=AC=BE(?=
 =?UTF-8?q?=E4=BF=9D=E9=A4=8A)=20=E4=BF=AE=E6=94=B9=E5=AE=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/account-receivable-maintainance-index.php | 181 +++++++++---------
 1 file changed, 87 insertions(+), 94 deletions(-)

diff --git a/wms/account-receivable-maintainance-index.php b/wms/account-receivable-maintainance-index.php
index 5295d065..aad21f66 100644
--- a/wms/account-receivable-maintainance-index.php
+++ b/wms/account-receivable-maintainance-index.php
@@ -26,16 +26,14 @@ SELECT
         siamd.HadTransCheckBLAmtWTax,
 		siamd.OAmountWithTax,
         siamd.CU_MaterialId,
-        acb_tmp.BillNo2,
+        acb_tmp.BillNo2 AS checkBillNo,
         acb_tmp.RowCode2,
 		acb_tmp.checkOAmount,
         asim.BillNo AS BillNo3,
         asim.InvoiceName,
         asim.OAmountWithTax AS InvoiceOAmount,
         asi.InvoiceNo,
-        asi.InvoiceTime,
-        writeoff.BillDate AS WriteOffDate,
-        SUM(arwobd.CurrStandOffOAmount) AS TotalCurrStandOffOAmount
+        asi.InvoiceTime
     FROM salIncomeApplyMaster AS siam -- 收入申請單
     LEFT JOIN salIncomeApplyDetail AS siamd -- 收入申請單明細
     ON siam.BillNo = siamd.BillNo
@@ -66,26 +64,38 @@ SELECT
     ON asim.BillNo = asi.BillNo
     LEFT JOIN comBusinessPartner AS cbp
     ON siam.BizPartnerId = cbp.BizPartnerId
-    LEFT JOIN 
-    arWriteOffBillDetail AS arwobd 
-    ON acb_tmp.BillNo2 = arwobd.FromBillNo
-    LEFT JOIN 
-	arWriteOffBill AS writeoff ON arwobd.BillNo = writeoff.BillNo
 WHERE 1 = 1 
 ";
+
+//核銷單 SQL
+$sql_writeOff = "SELECT 
+wod.FromBillNo AS checkBillNo,
+arCheckBill.LAmountWithTax,
+SUM(wod.CurrWriteOffLAmount) AS TotalWriteOffAmount
+FROM arWriteOffBillDetail AS wod
+LEFT JOIN arCheckBill 
+ON arCheckBill.BillNo = wod.FromBillNo
+LEFT JOIN comDepartment AS cd
+ON cd.DeptId = arCheckBill.DeptId
+WHERE arCheckBill.TypeId = 'RVS'";
+
 $follower = find_follow($user_id);
 if ((in_array($user_id, array('M0008', 'M0012'))) || (in_array(accountidToDepartId($user_id), array('220', '210', '501')))) {
 } else {
     $sql .= " AND (siam.PersonId = '$user_id'";
+    $sql_writeOff .= " AND (arCheckBill.PersonId = '$user_id'";
     if (count($follower) > 0) {
         $column_str = "('$user_id'" . ",'";
         $column_str .= implode("','", $follower);
         $column_str .= "')";
         $sql .= " OR siam.PersonId IN $column_str OR cd.LeaderId = '$user_id')";
+        $sql_writeOff .= " OR arCheckBill.PersonId IN $column_str OR cd.LeaderId = '$user_id')";
     } else {
         $sql .= " OR cd.LeaderId = '$user_id')";
+        $sql_writeOff .= " OR cd.LeaderId = '$user_id')";
     };
 }
+
 if (!is_null($start_date)) {
     $start_date = (int)date('Ymd', strtotime($start_date));
     $sql .= " AND siam.CU_ContractStart >= $start_date ";
@@ -102,39 +112,23 @@ if (!is_null($end_SignDate)) {
     $end_SignDate = (int)date('Ymd', strtotime($end_SignDate));
     $sql .= " AND siam.BillDate <= $end_SignDate ";
 }
-$sql .= " GROUP BY 
-siam.PersonId, 
-cp.PersonName, 
-cd.DeptId, 
-cd.DeptName, 
-cd.LeaderId, 
-lcp.PersonName, 
-siam.BizPartnerId, 
-cbp.BizPartnerName, 
-siamd.RowCode, 
-siam.BillNo, 
-siamd.ProjectId,
-siamd.CU_EstPayDate, 
-siamd.UnTransCheckBLAmtWTax, 
-siamd.HadTransCheckBLAmtWTax, 
-siamd.OAmountWithTax, 
-siamd.CU_MaterialId, 
-acb_tmp.BillNo2, 
-acb_tmp.RowCode2, 
-acb_tmp.checkOAmount, 
-asim.BillNo, 
-asim.InvoiceName, 
-asim.OAmountWithTax,
-asi.InvoiceNo,
-asi.InvoiceTime, 
-writeoff.BillDate 
+$sql .= "
 ORDER BY 
 siam.PersonId ASC, 
 siam.BillNo ASC, 
 siamd.RowCode ASC";
+$sql_writeOff.=" GROUP BY 
+wod.FromBillNo
+,arCheckBill.LAmountWithTax";
 
+$writeoff = array();
 $query_T8 = $conn->query($sql);
 $rows = $query_T8->fetchAll(PDO::FETCH_ASSOC);
+$query_writeoff = $conn->query($sql_writeOff);
+foreach($query_writeoff->fetchAll(PDO::FETCH_ASSOC) as $row){
+    $writeoff[$row['checkBillNo']]= ($row['TotalWriteOffAmount']==$row['LAmountWithTax'])?'V':'X';
+}
+
 $today = strtotime(date('Ymt'));
 $table = "";
 for ($i = 0; $i < count($rows); $i++) {
@@ -142,21 +136,29 @@ for ($i = 0; $i < count($rows); $i++) {
     $tmpname = $row['ProjectId'] . $row['RowCode'];
     $data[$tmpname] = $row;
     $data[$tmpname]['CU_EstPayDate'] = date('Y-m-d', strtotime($row['CU_EstPayDate']));
+    $receivable_date = $data[$tmpname]['CU_EstPayDate'];
     $data[$tmpname]['havetopay'] = strtotime($row['CU_EstPayDate']) > $today ? '--' : 'V';
-    $datahavetopay = $row['CU_EstPayDate'] > $today ? 0 : 1;
+    $datahavetopay = strtotime($row['CU_EstPayDate']) > $today ? 0 : 1;
     $data[$tmpname]['collecttime'] = collect_month(strtotime($row['CU_EstPayDate']));
-    $invoicedate = is_null($row['InvoiceTime']) ? null : date('Y-m-d', strtotime($row['InvoiceTime']));
-    $tableinvoice_state = is_null($invoicedate) ? 0 : 1;
+    $data[$tmpname]['invoicedate'] = is_null($row['InvoiceTime']) ? null : date('Y-m-d', strtotime($row['InvoiceTime']));
+    $invoicedate = $data[$tmpname]['invoicedate'];
+    $data[$tmpname]['invoice'] =  is_null($data[$tmpname]['invoicedate']) ? 0 : 1;
+    if(!is_null($data[$tmpname]['checkBillNo']) && isset($writeoff[$data[$tmpname]['checkBillNo']])){
+        $data[$tmpname]['WriteOff'] = $writeoff[$data[$tmpname]['checkBillNo']];
+    }else{
+        $data[$tmpname]['WriteOff'] = '--';
+    }
     $contract_no = $row['ProjectId'];
     $facility_no = $row['CU_MaterialId'];
     $RowCode = $row['RowCode'];
     $BillNo = $row['BillNo'];
-    $receivable_date = date('Y-m-d', strtotime($row['CU_EstPayDate']));
+    $data[$tmpname]['receivable_date'] = date('Y-m-d', strtotime($row['CU_EstPayDate']));
     $budget = $row['OAmountWithTax'];
     $invoiceNo = $row['InvoiceNo'];
-    $invoice_budget = is_null($row['InvoiceOAmount']) ? 0 : $row['InvoiceOAmount'];
-    $table_writeoff_date = is_null($row['WriteOffDate']) ? null : date('Y-m-d', strtotime($row['WriteOffDate']));
-    $table_writeoff_amount = is_null($row['TotalCurrStandOffOAmount']) ? 0 : $row['TotalCurrStandOffOAmount'];
+    $tableinvoice_state = is_null($invoiceNo) ? 0 : 1;
+    $data[$tmpname]['invoice_budget'] = is_null($row['InvoiceOAmount']) ? 0 : $row['InvoiceOAmount'];
+   $invoice_budget = $data[$tmpname]['invoice_budget'];
+    $table_writeoff =  ($data[$tmpname]['WriteOff'] =='V') ? 1 : 0;
     $table1 = "INSERT INTO account_receivable_maintainance(
     `contract_no`,
     `facility_no`,
@@ -167,7 +169,7 @@ for ($i = 0; $i < count($rows); $i++) {
     `receivable`,
     `invoice_state`,
     `invoice_budget`,
-    `received_budget`
+    `received`
     ";
     $table2 = ") VALUES(
         '$contract_no',
@@ -179,12 +181,10 @@ for ($i = 0; $i < count($rows); $i++) {
         $datahavetopay,
         $tableinvoice_state,
         $invoice_budget,
-        $table_writeoff_amount
+        $table_writeoff
     ";
     $table1 .= is_null($invoicedate) ? "" : ",`invoice_date`";
     $table2 .= is_null($invoicedate) ? "" : ",'$invoicedate'";
-    $table1 .= is_null($table_writeoff_date) ? "" : ",`received_date`";
-    $table2 .= is_null($table_writeoff_date) ? "" : ",'$table_writeoff_date'";
     $table1 .= is_null($invoiceNo) ? "" : ",`invoice_no`";
     $table2 .= is_null($invoiceNo) ? "" : ",'$invoiceNo'";
     $table .= $table1 . $table2 . "); \n";
@@ -249,17 +249,17 @@ for ($i = 0; $i < count($rows); $i++) {
     }
 </style>
 
-<div style="width: 98%;margin: 1%;">
+<!-- <div style="width: 98%;margin: 1%;">
     <div class="btn-group btn-group-md " style="padding:10 px; width: 100%;">
         <button type="button" style="width: 12%;" onclick="downloadData()" class="btn btn-success">下載 <span class="glyphicon glyphicon-download-alt"></span></button>
     </div>
-</div>
+</div> -->
 <div class="container">
     <div class="text-center" style="margin-bottom: 20px;">
         <h3><strong>應收帳款(保養)</strong></h3>
     </div>
     <hr>
-    <form class="form-horizontal" id='myForm' method='post' action='account-receivable-new-index.php?<?= $token_link ?>'>
+    <form class="form-horizontal" id='myForm' method='post' action='account-receivable-maintainance-index.php?<?= $token_link ?>'>
         <table class="table table-striped table-bordered" style='width:98%;text-align:center;margin:0 auto'>
             <tbody>
                 <tr>
@@ -271,7 +271,7 @@ for ($i = 0; $i < count($rows); $i++) {
 
                     </td>
                     <td rowspan="2">
-                        <button type="submit" class="btn btn-primary btn-sm">搜尋</button>
+                        <button type="submit" class="btn btn-primary btn-md">搜尋</button>
                     </td>
                 </tr>
                 <tr>
@@ -286,19 +286,17 @@ for ($i = 0; $i < count($rows); $i++) {
                 <tr>
                     <th class="text-center" style="vertical-align: middle;">催收次數</th>
                     <td colspan="3">
-                        <input type="text" class='form-control' id='search_collectstart' name='collect_time_start' style='width:30%;display:inline;' oninput="searchFront('collectstart')">
+                        <input type="number" class='form-control' id='search_collectstart' name='search_collectstart' style='width:30%;display:inline;' onblur="searchFront('collectstart')">
                         ≤ 催收次數 ≤
-                        <input type="text" class='form-control' id='search_collectend' name='collect_time_end' style='width:30%;display:inline;' oninput="searchFront('collectend')">
-                        <!-- <button type="submit" class="btn btn-primary btn-sm">搜尋</button> -->
+                        <input type="number" class='form-control' id='search_collectend' name='search_collectend' style='width:30%;display:inline;' onblur="searchFront('collectend')">
                     </td>
                 </tr>
                 <tr>
-                    <th class="text-center" style="vertical-align: middle;">催收金額</th>
+                    <th class="text-center" style="vertical-align: middle;">款別金額</th>
                     <td colspan="3">
                         <input type="text" class='form-control' id='search_CBudgetstart' name='collect_budget_start' style='width:30%;display:inline;' onblur="searchFront('CBudgetstart')">
-                        ≤ 催收金額 ≤
+                        ≤ 款別金額 ≤
                         <input type="text" class='form-control' id='search_CBudgetend' name='collect_budget_end' style='width:30%;display:inline;' onblur="searchFront('CBudgetend')">
-                        <!-- <button type="submit" class="btn btn-primary btn-sm">搜尋</button> -->
                     </td>
                 </tr>
             </tbody>
@@ -314,10 +312,10 @@ for ($i = 0; $i < count($rows); $i++) {
             <label for="search_dept">查詢部門</label>
             <input type="text" id="search_dept" name="search_dept" class="form-control" placeholder="請輸入部門" onblur="searchFront('dept')">
         </div>
-        <div class="col-md-4">
+        <!-- <div class="col-md-4">
             <label for="search_manager">查詢主管</label>
             <input type="text" id="search_manager" name="search_manager" class="form-control" placeholder="請輸入主管工號/姓名" onblur="searchFront('manager')">
-        </div>
+        </div> -->
 
     </div>
     <div class="form-group">
@@ -351,18 +349,15 @@ include "./footer.php";
                 <th style='text-align:center;vertical-align: middle;'>序號</th>
                 <th style='text-align:center;vertical-align: middle;width:100px'>作番號</th>
                 <th style='text-align:center;vertical-align: middle;width:110px'>部門</th>
-                <th style='text-align:center;vertical-align: middle;'>主管</th>
+                <!-- <th style='text-align:center;vertical-align: middle;'>主管</th> -->
                 <th style='text-align:center;vertical-align: middle;'>契約員</th>
                 <th style='text-align:center;vertical-align: middle;width:120px'>客戶名稱</th>
 
                 <th style='text-align:center;vertical-align: middle;'>應收日期</th>
                 <th style='text-align:center;vertical-align: middle;'>是否應收</th>
-                <th style='text-align:center;vertical-align: middle;'>應收金額</th>
-<!-- 
-                <th style='text-align:end;vertical-align: middle;'>已開金額</th>
-                <th style='text-align:end;vertical-align: middle;'>未開金額</th> -->
-                <th style='text-align:center;vertical-align: middle;'>已收金額</th>
-                <th style='text-align:center;vertical-align: middle;'>催收金額</th>
+                <th style='text-align:center;vertical-align: middle;'>款別金額</th>
+                <th style='text-align:center;vertical-align: middle;'>是否收齊</th>
+
                 <th style='text-align:center;vertical-align: middle;'>催收次數</th>
             </tr>
         </thead>
@@ -373,17 +368,16 @@ include "./footer.php";
                     <td><?= $row['RowCode']; ?></td>
                     <td class="facility"><?= $row['CU_MaterialId']; ?></td>
                     <td class="dept"><?= $row['DeptId'] . "<br>" . $row['DeptName']; ?></td>
-                    <td class="manager"><?= $row['LeaderId'] . "<br>" . $row['LeaderName']; ?></td>
+                    <!-- <td class="manager"><?= $row['LeaderId'] . "<br>" . $row['LeaderName']; ?></td> -->
                     <td class="personId"><?= $row['PersonId'] . "<br>" . $row['PersonName']; ?></td>
                     <td class="customerid"><?= $row['BizPartnerId'] . "<br>" . $row['BizPartnerName']; ?></td>
                   
                     <td><?= $row['CU_EstPayDate']; ?></td>
                     <td><?= $row['havetopay']; ?></td>
-                    <td><?= number_format(round($row['OAmountWithTax'])); ?></td>
-
-                    <td><?= is_null($row['TotalCurrStandOffOAmount']) ? 0 : number_format(round($row['TotalCurrStandOffOAmount']));  ?></td>
-                    <td class="CBudget"><?= ($row['havetopay'] == "V")? (number_format(round($row['OAmountWithTax'] - $row['TotalCurrStandOffOAmount']))) :0; ?></td>
-                    <td class="collect"><?= (($row['havetopay'] == "V") && ($row['OAmountWithTax'] - $row['TotalCurrStandOffOAmount'] >1))? $row['collecttime']:0; ?></td>
+                    <td class="CBudget"><?= number_format(round($row['OAmountWithTax'])); ?></td>
+                    <td><?= $row['WriteOff'];  ?></td>
+                
+                    <td class="collect"><?= (($row['havetopay'] == "V") && ($row['WriteOff'] !== 'V'))? $row['collecttime']:0; ?></td>
                 </tr>
             <?php } ?>
         </tbody>
@@ -405,30 +399,29 @@ include "./footer.php";
             }
         }
     }
+    // function downloadData() {
+    //     var xhr = new XMLHttpRequest();
+    //     var url = window.location.origin + "/wms/account-receivable-renovate-excel.php?type=all&<?= $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-renovate.xlsx");
+    //             link.setAttribute('download', name);
+    //             link.style.display = 'none';
+    //             document.body.appendChild(link);
+    //             link.click();
+    //             document.body.removeChild(link);
+    //         }
+    //     }
+    //     xhr.send(JSON.stringify({
+    //         Bill: 
+    //     }));
 
-    function downloadData() {
-        var xhr = new XMLHttpRequest();
-        var url = window.location.origin + "/wms/account-receivable-renovate-excel.php?type=all&<?= $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-renovate.xlsx");
-                link.setAttribute('download', name);
-                link.style.display = 'none';
-                document.body.appendChild(link);
-                link.click();
-                document.body.removeChild(link);
-            }
-        }
-        xhr.send(JSON.stringify({
-            Bill: <?= $total_data ?>
-        }));
-
-    }
+    // }
 
     function searchFront(area) {
         var term = 'search_' + area;

From e8b91c06216ca0aeb99cfa7516434264dfcf929d Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Thu, 7 Mar 2024 09:28:24 +0800
Subject: [PATCH 14/16] =?UTF-8?q?=E6=96=B0=E6=A2=AF/=E6=B1=B0=E6=94=B9=20?=
 =?UTF-8?q?=E6=9C=89=E6=9C=9B=E5=AE=A2=E6=88=B6=E5=8A=A0=E4=B8=8A=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B6=E9=A1=9E=E5=9E=8B(=E4=B8=80=E8=88=AC=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B6/=E6=88=B0=E7=95=A5=E5=AE=A2=E6=88=B6)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/crm/crmm03-edit.php                     | 8 ++++++--
 wms/crm/model/HopeElevatorCustomerModel.php | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/wms/crm/crmm03-edit.php b/wms/crm/crmm03-edit.php
index 3f64a37e..a0f89e56 100644
--- a/wms/crm/crmm03-edit.php
+++ b/wms/crm/crmm03-edit.php
@@ -23,7 +23,7 @@ $salesman_opt = DB::result($sql);
 #5.有望客戶狀態
 $sql = "select code_name value ,content label from code where field_name='hope_customer_status'";
 $hope_customer_status_opt = DB::result($sql);
-
+print_r($hope_customer_status_opt);
 #6.是否汰改
 $is_renovation_opt = ["N" => "新梯(M)", "Y" => "汰改(T)"];
 /*
@@ -46,7 +46,10 @@ $speed_opt = DB::result($sql);
 #卷號
 $vol_no = "";
 #抓取有望客戶資料
-
+$customer_type = [
+    ['value'=>'0', 0=>'0', 'label'=>'一般客戶', 1=>'一般客戶'],
+    ['value'=>'1', 0=>'1', 'label'=>'戰略客戶', 1=>'戰略客戶'],
+];
 $hope_elevator_customer_column = [
     'is_renovation' => ['label' => "產品屬性", "tag" => 'radio', 'attr' => ['required', 'class' => ' form-control form-control-sm'], 'options' => $is_renovation_opt],
     'vol_no' => ['label' => "卷號",  "tag" => 'text', 'attr' => ['required', 'readonly=true ', "value" => "$vol_no", 'class' => 'form-control form-control-sm']],
@@ -67,6 +70,7 @@ $hope_elevator_customer_column = [
     'num' => ['label' => "台數", "tag" => 'digits', 'attr' => ['min=1', 'digits', 'class' => 'form-control form-control-sm']],
     'pre_order_date' => ['label' => "預定成交日", "tag" => 'date', 'attr' => ['class' => 'date form-control form-control-sm']],
     'status' => ['label' => "有望客戶狀態", "tag" => 'select', 'attr' => ['class' => 'form-control form-control-sm'], 'options' => $hope_customer_status_opt],
+    'customer_type' => ['label' => "客戶類型", "tag" => 'select', 'attr' => ['class' => 'form-control form-control-sm'], 'options' => $customer_type],
     //'next_visit_date' => ['label' => "下次拜訪時間", "tag" => 'date', 'attr' => ['class' => 'date form-control form-control-sm']],
     // 'brand' => ['label' => "廠牌", "tag" => 'select', 'attr' => ['required', 'class' => ' form-control form-control-sm '], 'options' => $elevator_brand_opt],
     //'quote_date' => ['label' => "報價日期", "tag" => 'date', 'attr' => ['class' => 'date form-control form-control-sm']],
diff --git a/wms/crm/model/HopeElevatorCustomerModel.php b/wms/crm/model/HopeElevatorCustomerModel.php
index 1b705d8b..40740bb3 100644
--- a/wms/crm/model/HopeElevatorCustomerModel.php
+++ b/wms/crm/model/HopeElevatorCustomerModel.php
@@ -29,6 +29,7 @@ class HopeElevatorCustomerModel extends Model
         'introducer',
         'company',
         'case_name',
+        'customer_type',
         'creater_name',
         'creater'];
 }

From 859d55c04721bf1ad14793f03fd2f6b3f7539c26 Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Thu, 7 Mar 2024 18:55:54 +0800
Subject: [PATCH 15/16] =?UTF-8?q?=E4=BF=9D=E9=A4=8A=E5=83=B9=E5=AF=A9=20?=
 =?UTF-8?q?=E7=8D=B2=E5=8F=96=E6=A8=99=E6=BA=96=E5=83=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/cont/api/getElevatorPrice.php        |  44 +++++++
 wms/cont/api/postElevatorPricereview.php |   0
 wms/cont/css/pricereview.css             |   5 +
 wms/cont/css/pricereview.css.map         |   2 +-
 wms/cont/css/pricereview.scss            |   5 +
 wms/cont/js/pricereviewAlpine.js         | 149 ++++++++++++++++++++---
 wms/cont/pricereviewCreate.php           | 128 +++++++++++--------
 wms/cont/window-modal/modalElevaotr.php  |  78 ++++++------
 wms/contract/contract-new-apply.php      |   2 +-
 wms/contract/js/alpine.js                |   2 +-
 10 files changed, 302 insertions(+), 113 deletions(-)
 create mode 100644 wms/cont/api/getElevatorPrice.php
 create mode 100644 wms/cont/api/postElevatorPricereview.php

diff --git a/wms/cont/api/getElevatorPrice.php b/wms/cont/api/getElevatorPrice.php
new file mode 100644
index 00000000..92f9d4c1
--- /dev/null
+++ b/wms/cont/api/getElevatorPrice.php
@@ -0,0 +1,44 @@
+<?php
+
+require_once "../../mkt/conn.php";
+
+$spec = $_GET['spec'];
+$person = $_GET['person'];
+$stop = $_GET['stop'];
+$weight = $_GET['weight'];
+$speed = $_GET['speed'];
+$m1 = $_GET['m1'];
+$method = $_GET['method'];
+$cycle = $_GET['cycle'];
+if($spec == "MAE100"){
+    $elevator_type = "A";
+}elseif($spec == "MAF100"){
+    $elevator_type = "B";
+}elseif($spec == "MAM200"){
+    $elevator_type = "D";
+}elseif($spec == "MAH100"){
+    $elevator_type = "E";
+}
+
+$sql_str = "SELECT * FROM maintain_standard_option WHERE elevator_type=:elevator_type AND min_speed = :min_speed AND min_persons <= :person AND max_persons >= :person AND is_m1_bundle=:m1 ORDER bY id DESC";
+$stmt  = $conn->prepare($sql_str);
+$stmt->bindParam(':elevator_type', $elevator_type);
+$stmt->bindParam(':min_speed', $speed);
+$stmt->bindParam(':person', $person);
+$stmt->bindParam(':m1', $m1);
+$stmt->execute();
+$result = $stmt->fetch(PDO::FETCH_ASSOC);
+if(!$result){
+    echo 0;
+    exit;
+}
+$differ = $stop > $result['max_floors'] ? $result['max_floors'] - $result['min_floors'] : ($stop - $result['min_floors']);
+$price = $result['base_price']  + $differ * $result['floors_price'] +$result['m1_bundle_fee'];
+if($cycle == 2){
+    $price += $price * $result['maintenance_fee_coefficient'];
+}
+if($method == "A"){
+    $price += $result['all_inclusive_fee'];
+}
+
+echo $price;
\ No newline at end of file
diff --git a/wms/cont/api/postElevatorPricereview.php b/wms/cont/api/postElevatorPricereview.php
new file mode 100644
index 00000000..e69de29b
diff --git a/wms/cont/css/pricereview.css b/wms/cont/css/pricereview.css
index 0169e645..0c527544 100644
--- a/wms/cont/css/pricereview.css
+++ b/wms/cont/css/pricereview.css
@@ -271,6 +271,11 @@
 .window-modal .window-modal-content .window-modal-header > div > input {
   width: 250px;
 }
+.window-modal .window-modal-content input[type=number]::-webkit-outer-spin-button,
+.window-modal .window-modal-content input[type=number]::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
 .window-modal .window-back {
   position: absolute;
   top: 0;
diff --git a/wms/cont/css/pricereview.css.map b/wms/cont/css/pricereview.css.map
index dd3f0e70..668d8c66 100644
--- a/wms/cont/css/pricereview.css.map
+++ b/wms/cont/css/pricereview.css.map
@@ -1 +1 @@
-{"version":3,"sources":["pricereview.css","pricereview.scss"],"names":[],"mappings":"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","file":"pricereview.css"}
\ No newline at end of file
+{"version":3,"sources":["pricereview.css","pricereview.scss"],"names":[],"mappings":"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","file":"pricereview.css"}
\ No newline at end of file
diff --git a/wms/cont/css/pricereview.scss b/wms/cont/css/pricereview.scss
index ecc890a6..f78743a2 100644
--- a/wms/cont/css/pricereview.scss
+++ b/wms/cont/css/pricereview.scss
@@ -281,6 +281,11 @@
                 width: 250px;
             }
         }
+        input[type=number]::-webkit-outer-spin-button,
+        input[type=number]::-webkit-inner-spin-button {
+            -webkit-appearance: none;
+            margin: 0;
+        }
     }
     .window-back{
         position: absolute;
diff --git a/wms/cont/js/pricereviewAlpine.js b/wms/cont/js/pricereviewAlpine.js
index 9536b056..1fabad15 100644
--- a/wms/cont/js/pricereviewAlpine.js
+++ b/wms/cont/js/pricereviewAlpine.js
@@ -8,8 +8,22 @@ const pricereviewCreate = ()=>{
             other:false,
             otherToElevator:false,
         },
+        vol_no: vol_no,
+        apply_key: apply_key,
+        customer:customer,
+        manager:manager,
+        salesman:salesman,
+        salesman_name:salesman_name,
+        pre_order_date:pre_order_date,
+        address:address,
+        progress_status:progress_status,
         total_spec:0,
         elevators:[],
+        case_name:'', //案件名稱
+        contract_status:'', // 契約性質
+        pay_method:'', // 付款方式
+        startDate:'', //合約開始日期
+        endDate:'', // 合約結束日期
         modalElevatorInfo:{
             spec:'',
             person:'',
@@ -18,9 +32,10 @@ const pricereviewCreate = ()=>{
             speed:'',
             permitNumber:'', //許可證號碼
             brand:'', //品牌
-            m1:0, //贈送M1
-            months:12, //保養月數(月)
-            cycle:'EM', // 保養週期
+            m1:'N', //贈送M1
+            months:'', // 保養月數
+            cycle:'', // 保養週期
+            method:'', //保養方式
             checkYear:'', //竣工檢查年度
             lastDate:'', // 上次年檢日期
             yearCheckFee:'', //年檢費用
@@ -39,6 +54,12 @@ const pricereviewCreate = ()=>{
         currentOtherOptionKey:'',
         toElevators:[],
         toElevatorNo:'',
+        serviceFee:0,
+        remark:'',
+        penalty:'',
+        deposit_rate:'',
+        keep_rate:'',
+        warranty_rate:'',
         openCreateElevatorModal(){
             this.modalShow.elevator = true;
             body.style.overflow = 'hidden';
@@ -52,21 +73,33 @@ const pricereviewCreate = ()=>{
                 weight:'',
                 stop:'',
                 speed:'',
-                permitNumber:'', 
-                brand:'', 
-                m1:0,
-                startDate:'',
-                endDate:'',
-                cycle:'', 
-                checkYear:'', 
-                lastDate:'',
-                yearCheckFee:'',
-                price:'',
-                qty:1, 
-                sale_price:'', 
+                permitNumber:'', //許可證號碼
+                brand:'', //品牌
+                m1:'N', //贈送M1
+                months:'', // 保養月數
+                cycle:'', // 保養週期
+                method:'', //保養方式
+                checkYear:'', //竣工檢查年度
+                lastDate:'', // 上次年檢日期
+                yearCheckFee:'', //年檢費用
+                price:'', //公司發布價(月)
+                qty:1, //電梯數量
+                sale_price:'', //契約報價
             };
         },
         createElevatorFn(){
+            // if(this.modalElevatorInfo.spec == '') return alert("請選擇電梯規格");
+            // if(this.modalElevatorInfo.person == '') return alert("請選擇人乘");
+            // if(this.modalElevatorInfo.weight == '') return alert("請輸入載重");
+            // if(this.modalElevatorInfo.stop == '') return alert("請輸入停數");
+            // if(this.modalElevatorInfo.speed == '') return alert("請選擇速度");
+            // if(this.modalElevatorInfo.brand == '') return alert("請選擇品牌");
+            // if(this.modalElevatorInfo.months == '') return alert("請輸入保養月數");
+            // if(this.modalElevatorInfo.method == '') return alert("請選擇保養方式");
+            // if(this.modalElevatorInfo.cycle == '') return alert("請選擇保養週期");
+            // if(this.modalElevatorInfo.checkYear == '') return alert("請輸入竣工檢查年度");
+            // if(this.modalElevatorInfo.price == '') return alert("請選擇正確規格");
+            // if(this.modalElevatorInfo.sale_price == '') return alert("請輸入契約報價");
             this.total_spec ++;
             this.elevators.push({
                 id: this.total_spec,
@@ -78,8 +111,9 @@ const pricereviewCreate = ()=>{
                 permitNumber: this.modalElevatorInfo.permitNumber,
                 brand: this.modalElevatorInfo.brand,
                 m1: this.modalElevatorInfo.m1,
-                months: this.modalElevatorInfo.months,
+                months:this.modalElevatorInfo.months, // 保養月數
                 cycle: this.modalElevatorInfo.cycle,
+                method:this.modalElevatorInfo.method, // 保養方法
                 checkYear: this.modalElevatorInfo.checkYear,
                 lastDate: this.modalElevatorInfo.lastDate,
                 yearCheckFee: this.modalElevatorInfo.yearCheckFee,
@@ -95,10 +129,10 @@ const pricereviewCreate = ()=>{
             const stop = this.elevators[idx].stop;
             const weight = this.elevators[idx].weight
             const speed = this.elevators[idx].speed;
-            const permitNumber = this.elevators[idx].permitNumber;
             const brand = this.elevators[idx].brand;
             const m1 = this.elevators[idx].m1;
             const months = this.elevators[idx].months;
+            const method = this.elevators[idx].method;
             const cycle = this.elevators[idx].cycle;
             const checkYear = this.elevators[idx].checkYear;
             const lastDate = this.elevators[idx].lastDate;
@@ -115,10 +149,11 @@ const pricereviewCreate = ()=>{
                 stop: stop,
                 weight:weight,
                 speed: speed,
-                permitNumber: permitNumber,
+                permitNumber: '',
                 brand: brand,
                 m1: m1,
                 months: months,
+                method: method,
                 cycle: cycle,
                 checkYear: checkYear,
                 lastDate: lastDate,
@@ -129,6 +164,7 @@ const pricereviewCreate = ()=>{
             })
         },
         removeElevator(id){
+            if(!confirm('確定刪除該電梯?')) return;
             this.elevators = this.elevators.filter(elevator=> elevator.id != id)
         },
         openCreateOtherOptionFn(){
@@ -221,5 +257,82 @@ const pricereviewCreate = ()=>{
         removeOtherOption(id){
             this.otherOptions = this.otherOptions.filter(option=> option.id != id)
         },
+        get totalPrice(){
+            let total_price = this.elevators.reduce((accumulator, el) => accumulator + Number(el.price*el.months), 0);
+            let total_other_price = this.otherOptions.reduce((accumulator, option) => accumulator + Number(option.price*option.num), 0);
+            return total_price + total_other_price;
+        },
+        get totalSalePrice(){
+            let total_sale_price = this.elevators.reduce((accumulator, el) => accumulator + Number(el.sale_price*el.months), 0);
+            return total_sale_price + Number(this.serviceFee);
+        },
+        get totalElevatorsNum(){
+            let total_num = this.elevators.reduce((accumulator, el) => accumulator + Number(el.qty), 0);
+            return total_num;
+        },
+        get totalOtherOptionsNum(){
+            let total_other_num = this.otherOptions.reduce((accumulator, option) => accumulator + Number(option.num), 0);
+            return total_other_num;
+        },
+        get totalOtherOptionsPrice(){
+            let total_other_price = this.otherOptions.reduce((accumulator, option) => accumulator + Number(option.price*option.num), 0);
+            return total_other_price;
+        },
+        async getModalElevatorPrice(){
+            const spec = this.modalElevatorInfo.spec
+            const person = this.modalElevatorInfo.person
+            const stop = this.modalElevatorInfo.stop
+            const weight = this.modalElevatorInfo.weight
+            const speed = this.modalElevatorInfo.speed
+            const m1 = this.modalElevatorInfo.m1
+            const method = this.modalElevatorInfo.method 
+            const cycle = this.modalElevatorInfo.cycle
+            try{
+                const res = await axios.get('./api/getElevatorPrice.php', {params: {spec: spec, person:person, weight: weight, stop: stop, speed: speed, m1: m1, method: method, cycle:cycle}})
+                this.modalElevatorInfo.price = res.data;
+                console.log(res.data);
+            }catch (error) {
+                console.error("Error message:", error);
+            }
+        },
+        save(){
+            const form = new FormData();
+            form.append('vol_no', this.vol_no);
+            form.append('apply_key', this.apply_key);
+            form.append('customer', this.customer);
+            form.append('address', this.address);
+            form.append('case_name', this.case_name);
+            form.append('brand', this.brand);
+            form.append('num', this.totalElevatorsNum);
+            form.append('salesman', this.salesman);
+            form.append('contract_begin_date', this.startDate);
+            form.append('contract_end_date', this.endDate);
+            form.append('contract_kind', this.contract_status);
+            form.append('progress_status', this.progress_status);
+            form.append('serviceFee', this.serviceFee);
+            form.append('penalty', this.penalty);
+            form.append('deposit_rate', this.deposit_rate);
+            form.append('keep_rate', this.keep_rate);
+            form.append('warranty_rate', this.warranty_rate);
+            form.append('remark', this.remark);
+            form.append('creater', this.user_id);
+
+            form.append('pay_method', this.pay_method);
+            form.append('status', 'Y1');
+
+            form.append('elevators', JSON.stringify(this.elevators));
+            form.append('otherOptions', JSON.stringify(this.otherOptions));
+
+            axios.post('./api/postElevatorPricereview.php', form).then(res=>{
+                console.log(res.data);
+                if(res.data == 'success'){
+                    alert("保存成功！");
+                    window.location.reload();
+                }
+            })
+        },
+        submit(){
+
+        },
     }
 }
\ No newline at end of file
diff --git a/wms/cont/pricereviewCreate.php b/wms/cont/pricereviewCreate.php
index e2b87b9f..27174458 100644
--- a/wms/cont/pricereviewCreate.php
+++ b/wms/cont/pricereviewCreate.php
@@ -68,7 +68,7 @@ function getApplyKey($p_yyyymm, $seq_name){
                 <tbody>
                     <tr>
                         <th>價審單號</th>
-                        <td><input class="form-control" type="text" disabled value="<?php echo $apply_key; ?>" /></td>
+                        <td><input class="form-control" type="text" disabled x-model="apply_key" /></td>
                         <th>卷號</th>
                         <td><input class="form-control" type="text" disabled value="<?php echo $hope_customer['vol_no']; ?>" /></td>
                         <th>現場名稱</th>
@@ -92,7 +92,7 @@ function getApplyKey($p_yyyymm, $seq_name){
         <table class="table" border="1">
                 <thead >
                     <tr class="" >
-                    <th scope="col" class="text-center " colspan="8">價格審查(契約)基本資料</th>
+                    <th scope="col" class="text-center " colspan="10">價格審查(契約)基本資料</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -100,25 +100,30 @@ function getApplyKey($p_yyyymm, $seq_name){
                         
                         <th>契約性質</th>
                         <td>
-                            <select class="form-control">
+                            <select class="form-control" x-model="contract_status">
                                 <option value="">請選擇</option>
-                                <option value="">新簽約</option>
-                                <option value="">免保轉有費</option>
-                                <option value="">續約</option>
+                                <option value="1">新簽約</option>
+                                <option value="2">免保轉有費</option>
+                                <option value="3">續約</option>
                             </select>
                         </td>
                         <th>付款方式</th>
                         <td>
-                            <select class="form-control" >
+                            <select class="form-control" x-model="pay_method" >
                                 <option value="">請選擇</option>
-                                <option value="">月付</option>
-                                <option value="">季付</option>
-                                <option value="">半年付</option>
-                                <option value="">年付</option>
+                                <option value="A40003">月繳</option>
+                                <option value="A40004">雙月繳</option>
+                                <option value="A40007">季繳</option>
+                                <option value="A40005">半年繳</option>
+                                <option value="A40006">年繳</option>
                             </select>
                         </td>
                         <th>案件名稱</th>
-                        <td><input class="form-control" type="text" value="" /></td>
+                        <td><input class="form-control" type="text" x-model="case_name" /></td>
+                        <th>合約開始日期</th>
+                        <td><input type="date" class="form-control" x-model="startDate" /></td>
+                        <th>合約結束日期</th>
+                        <td><input type="date" class="form-control" x-model="endDate" /></td>
                     </tr>
                 </tbody>
         </table>
@@ -147,9 +152,8 @@ function getApplyKey($p_yyyymm, $seq_name){
                     <td colspan=8>
                         <textarea class="form-control" name="progress" id="progress" cols="20" rows="6" disabled>注意事項:
 1.速度單位是 米/分.
-2.選擇贈送M1,保養月數需填寫60.
-3.標準價格未帶出,請聯係業務部建立該規格報價.
-4.無機房速度20~60米 以60米為標準.
+2.標準價格未帶出,請聯係業務部建立該規格報價.
+3.無機房速度20~60米 以60米為標準.
                         </textarea>
                     </td>
                 </tr>
@@ -233,9 +237,9 @@ function getApplyKey($p_yyyymm, $seq_name){
                                     <input type="text" class="form-control" x-model="elevator.permitNumber" />
                                 </td>
                                 <th>品牌</th>
-                                <td colspan="3">
-                                    <select class="form-control" x-model="modalElevatorInfo.brand">
-                                        <option value="請選擇">請選擇</option>
+                                <td>
+                                    <select class="form-control" x-model="elevator.brand">
+                                        <option value="">請選擇</option>
                                         <option value='永大'>永大</option>
                                         <option value='三菱'>三菱</option>
                                         <option value='崇友'>崇友</option>
@@ -265,64 +269,69 @@ function getApplyKey($p_yyyymm, $seq_name){
                                 <td>
                                     <input type="number" class="form-control" x-model="elevator.checkYear" />
                                 </td>
+                                <th>上次年檢日期</th>
+                                <td>
+                                    <input type="date" class="form-control" x-model="elevator.lastDate" />
+                                </td>
                             </tr>
                             <tr>
-                               
-                                <th>保養開始日期</th>
+                                <th>年檢費用(元)</th>
                                 <td>
-                                    <input type="date" class="form-control" x-model="elevator.months" />
+                                    <input type="number" class="form-control" x-model="elevator.yearCheckFee" />
                                 </td>
-                                <th>保養結束日期</th>
+                                <th>電梯數量</th>
                                 <td>
-                                    <input type="date" class="form-control" x-model="elevator.months" />
+                                    <input type="number" class="form-control" x-model="elevator.qty" disabled />
                                 </td>
+                                
                                 <th>保養週期</th>
                                 <td>
                                     <select name="" id="" class="form-control" x-model="elevator.cycle">
                                         <option value="">請選擇</option>
-                                        <option value="EM">月保</option>
-                                        <option value="BW">雙週保</option>
+                                        <option value="1">月保</option>
+                                        <option value="2">月保兩次</option>
+                                        <option value="3">雙月保</option>
+                                        <option value="4">季保</option>
                                     </select>
                                 </td>
                                 <th>保養方式</th>
                                 <td>
-                                    <select class="form-control">
+                                    <select class="form-control" x-model="elevator.method">
                                         <option value="">請選擇</option>
-                                        <option value="3">全包</option>
-                                        <option value="2">半包</option>
-                                        <option value="4">清包</option>
+                                        <option value="A">全包</option>
+                                        <option value="B">半包</option>
+                                        <option value="C">清包</option>
                                     </select>
                                 </td>
-                                <th>送M1</th>
+                                <th>贈送M1</th>
                                 <td>
                                     <select class="form-control" x-model="elevator.m1">
-                                        <option value="0">否</option>
-                                        <option value="1">是</option>
+                                        <option value="N">否</option>
+                                        <option value="Y">是</option>
                                     </select>
                                 </td>
                             </tr>
                             <tr>
-                                
-                                <th>上次年檢日期</th>
+                                <th>公司發布價(月)</th>
                                 <td>
-                                    <input type="date" class="form-control" x-model="elevator.lastDate" />
+                                    <input type="text" class="form-control" disabled x-model="elevator.price.toLocaleString()" />
                                 </td>
-                                <th>年檢費用(元)</th>
+                                <th>保養月數</th>
                                 <td>
-                                    <input type="number" class="form-control" x-model="elevator.yearCheckFee" />
+                                    <input type="number" class="form-control" x-model="elevator.months" />
                                 </td>
-                                <th>公司發布價(月)</th>
+                                <th>公司發布價(總價)</th>
                                 <td>
-                                    <input type="number" class="form-control" x-model="elevator.price" />
-                                </td>
-                                <th>電梯數量</th>
-                                <td>
-                                    <input type="number" class="form-control" x-model="elevator.qty" disabled />
+                                    <input type="text" class="form-control" disabled x-model="(elevator.price * elevator.months).toLocaleString()" />
                                 </td>
                                 <th>契約報價(月)</th>
                                 <td>
                                     <input type="number" class="form-control" x-model="elevator.sale_price" />
                                 </td>
+                                <th>契約報價(總價)</th>
+                                <td>
+                                    <input type="text" class="form-control" disabled x-model="(elevator.sale_price * elevator.months).toLocaleString()"  />
+                                </td>
                             </tr>
                         </tbody>
                     </template>
@@ -376,8 +385,8 @@ function getApplyKey($p_yyyymm, $seq_name){
                         </template>
                         <tr x-show="otherOptions.length > 0">
                             <td colspan=3>小計</td>
-                            <td colspan=1 ><input type="number" class="form-control" disabled :value="totalOtherOptionsNum().toLocaleString()" ></td>
-                            <td colspan=1 ><input type="text" class="form-control" disabled :value="totalOtherOptionsPrice().toLocaleString()" ></td>
+                            <td colspan=1 ><input type="number" class="form-control" disabled :value="totalOtherOptionsNum.toLocaleString()" ></td>
+                            <td colspan=1 ><input type="text" class="form-control" disabled :value="totalOtherOptionsPrice.toLocaleString()" ></td>
                             <td colspan=3 ></td>
                         </tr>
                     </tbody>
@@ -395,14 +404,14 @@ function getApplyKey($p_yyyymm, $seq_name){
                             <th>服務費(介紹費)</th>
                         </tr>
                         <tr>
-                            <td><input type="text" class="form-control" x-model="totalPrice().toLocaleString()" disabled style="width:180px" /></td>
-                            <td><input type="text" class="form-control" x-model="totalSalePrice().toLocaleString()" disabled style="width:180px" /></td>
-                            <td><input type="text" class="form-control" x-model="(totalSalePrice() - totalPrice()).toLocaleString()" disabled style="width:180px" /></td>
+                            <td><input type="text" class="form-control" x-model="totalPrice.toLocaleString()" disabled style="width:180px" /></td>
+                            <td><input type="text" class="form-control" x-model="totalSalePrice.toLocaleString()" disabled style="width:180px" /></td>
+                            <td><input type="text" class="form-control" x-model="(totalSalePrice - totalPrice).toLocaleString()" disabled style="width:180px" /></td>
                             <td>
-                                <input type="text" class="form-control" x-show="totalPrice()!=0" x-model="Math.round(totalSalePrice() / totalPrice() * 100 * 10) /10" disabled  />
-                                <input type="text" class="form-control" x-show="totalPrice()==0" value="0" disabled  />
+                                <input type="text" class="form-control" x-show="totalPrice!=0" x-model="Math.round(totalSalePrice / totalPrice * 100* 10) /10 + '%'" disabled  />
+                                <input type="text" class="form-control" x-show="totalPrice==0" value="0" disabled  />
                             </td>
-                            <td><input type="text" class="form-control" x-model="totalElevatorsNum()" disabled /></td>
+                            <td><input type="text" class="form-control" x-model="totalElevatorsNum" disabled /></td>
                             <td><input type="text" class="form-control" x-model="serviceFee" style="width:150px" /></td>
                         </tr>
                         <tr>
@@ -436,11 +445,11 @@ function getApplyKey($p_yyyymm, $seq_name){
             <div class="filediv">
                     <label style="font-size:13px">▪️ 營業權限85%以上；85-80%呈至區處長審核；80%以下呈至總經理審核。</label>
                     <label for="">
-                        <p>報價單</p>
+                        <p style="width:120px">報價單</p>
                         <input type="file" class="form-control" multiple draggable="true" @change="uploadFiles($event, 1)" />
                     </label>
                     <label for="">
-                        <p>附表</p>
+                        <p style="width:120px">合約用印申請表</p>
                         <input type="file" class="form-control" multiple draggable="true" @change="uploadFiles($event, 2)" />
                     </label>
                     <label for="">
@@ -460,4 +469,17 @@ function getApplyKey($p_yyyymm, $seq_name){
 
 <script>
     const body = document.querySelector('body');
+    const vol_no = '<?php echo $hope_customer['vol_no']; ?>';
+    const apply_key = '<?php echo $apply_key; ?>';
+    const customer = '<?php echo $hope_customer['customer']; ?>';
+    const manager = '<?php echo $hope_customer['manager']; ?>';
+    const salesman = '<?php echo $hope_customer['salesman'] ?>';
+    const salesman_name = '<?php echo $hope_customer['salesman_name'] ?>';
+    const pre_order_date = '<?php echo $hope_customer['pre_order_date']; ?>';
+    const address = '<?php echo $hope_customer['address']; ?>';
+    const brand = '<?php echo $hope_customer['brand']; ?>';
+    const progress_status = '<?php echo $hope_customer['progress_status']; ?>';
+    const user_id = '<?php echo $user_id ?>';
+    const user_name = '<?php echo $user_name ?>';
+
 </script>
\ No newline at end of file
diff --git a/wms/cont/window-modal/modalElevaotr.php b/wms/cont/window-modal/modalElevaotr.php
index 896ea9de..045362b7 100644
--- a/wms/cont/window-modal/modalElevaotr.php
+++ b/wms/cont/window-modal/modalElevaotr.php
@@ -15,21 +15,16 @@
                         </tr>
                         <tr>
                             <td>
-                                <select class="form-control" x-model="modalElevatorInfo.spec">
+                                <select class="form-control" x-model="modalElevatorInfo.spec" @change="getModalElevatorPrice()">
                                     <option value="">請選擇</option>
                                     <option value="MAE100">MAE100有機房</option>
                                     <option value="MAM200">MAM200無機房</option>
                                     <option value="MAH100">MAH100小電梯</option>
                                     <option value="MAF100">MAF100貨梯(有機房)</option>
-                                    <option value="MAQ100">MAQ100強趨梯</option>
-                                    <option value="MAP100">MAP100平台梯</option>
-                                    <option value="M1">M1(系統更新)</option>
-                                    <option value="M1+M4(1:1)">M1+M4(1:1)系統+主機</option>
-                                    <option value="M1+M4(2:1)">M1+M4(2:1)系統+主機</option>
                                 </select>
                             </td>
                             <td>
-                                <select name="" id="" class="form-control"  x-model="modalElevatorInfo.person">
+                                <select name="" id="" class="form-control"  x-model="modalElevatorInfo.person" @change="getModalElevatorPrice()">
                                     <option value="">請選擇</option>
                                     <option value="6">6</option>
                                     <option value="8">8</option>
@@ -45,21 +40,21 @@
                                 </select>
                             </td>
                             <td>
-                                <input type="number" class="form-control" x-model="modalElevatorInfo.weight" />
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.weight" @change="getModalElevatorPrice()" />
                             </td>
                             <td>
-                                <input type="number" class="form-control" x-model="modalElevatorInfo.stop" />
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.stop" @change="getModalElevatorPrice()" />
                             </td>
                         </tr>
                         <tr class="table-active">
                             <th>速度</th>
-                            <th>電梯許可證號</th>
+                            <th>電梯數量</th>
                             <th>品牌</th>
                             <th>贈送M1</th>
                         </tr>
                         <tr>
                             <td>
-                                <select name="" id="" class="form-control" style="width:93px" x-model="modalElevatorInfo.speed" @change="getModalElevatorPrice()" >
+                                <select name="" id="" class="form-control" x-model="modalElevatorInfo.speed" @change="getModalElevatorPrice()" @change="getModalElevatorPrice()" >
                                     <option value="">請選擇</option>
                                     <option value="9">9</option>
                                     <option value="24">24</option>
@@ -73,11 +68,11 @@
                                 </select>
                             </td>
                             <td>
-                                <input type="text" class="form-control" x-model="modalElevatorInfo.permitNumber" />
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.qty" disabled />
                             </td>
                             <td>
                                 <select class="form-control" x-model="modalElevatorInfo.brand">
-                                    <option value="請選擇">請選擇</option>
+                                    <option value="">請選擇</option>
                                     <option value='永大'>永大</option>
                                     <option value='三菱'>三菱</option>
                                     <option value='崇友'>崇友</option>
@@ -104,40 +99,41 @@
                                 </select>
                             </td>
                             <td>
-                                <select class="form-control" x-model="modalElevatorInfo.m1">
-                                    <option value="0">否</option>
-                                    <option value="1">是</option>
+                                <select class="form-control" x-model="modalElevatorInfo.m1" @change="getModalElevatorPrice()">
+                                    <option value="N">否</option>
+                                    <option value="Y">是</option>
                                 </select>
                             </td>
                         </tr>
                         <tr class="table-active">
-                            <th colspan=2>保養開始日期</th>
-                            <th colspan=2>保養結束日期</th>
+                            <th colspan=2>電梯許可證號</th>
+                            <th colspan=2>保養方式</th>
                         </tr>
                         <tr class="table-active">
-                            <td colspan=2><input type="date" class="form-control" x-model="modalElevatorInfo.startDate" /></td>
-                            <td colspan=2><input type="date" class="form-control" x-model="modalElevatorInfo.endDate" /></td>
+                            <td colspan=2><input type="number" class="form-control" x-model="modalElevatorInfo.permitNumber" /></td>
+                            <td colspan=2>
+                                <select class="form-control" x-model="modalElevatorInfo.method" @change="getModalElevatorPrice()">
+                                    <option value="">請選擇</option>
+                                    <option value="A">全包</option>
+                                    <option value="B">半包</option>
+                                    <option value="C">清包</option>
+                                </select>
+                            </td>   
                         </tr>
                         <tr class="table-active">
-                            <th>保養方式</th>
                             <th>保養週期</th>
                             <th>竣工檢查年度</th>
                             <th>上次年檢日期</th>
+                            <th>年檢費用(元)</th>
                         </tr>
                         <tr>
                             <td>
-                                <select class="form-control">
-                                    <option value="">請選擇</option>
-                                    <option value="3">全包</option>
-                                    <option value="2">半包</option>
-                                    <option value="4">清包</option>
-                                </select>
-                            </td>
-                            <td>
-                                <select name="" id="" class="form-control" x-model="modalElevatorInfo.cycle">
+                                <select name="" id="" class="form-control" x-model="modalElevatorInfo.cycle" @change="getModalElevatorPrice()">
                                     <option value="">請選擇</option>
-                                    <option value="">月保</option>
-                                    <option value="">雙週保</option>
+                                    <option value="1">月保</option>
+                                    <option value="2">月保兩次</option>
+                                    <option value="3">雙月保</option>
+                                    <option value="4">季保</option>
                                 </select>
                             </td>
                             <td>
@@ -146,32 +142,36 @@
                             <td>
                                 <input type="date" class="form-control" x-model="modalElevatorInfo.lastDate" />
                             </td>
+                            <td>
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.yearCheckFee" />
+                            </td>
                         </tr>
                         <tr class="table-active">
-                            <th>年檢費用(元)</th>
+                            
                             <th>公司發布價(月)</th>
-                            <th>電梯數量</th>
+                            <th>保養月數</th>
                             <th>契約報價(月)</th>
+                            <th>契約報價總額</th>
                         </tr>
                         <tr>
                             <td>
-                                <input type="number" class="form-control" x-model="modalElevatorInfo.yearCheckFee" />
+                                <input type="text" class="form-control" disabled x-model="modalElevatorInfo.price.toLocaleString()" />
                             </td>
                             <td>
-                                <input type="number" class="form-control" x-model="modalElevatorInfo.price" />
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.months"   />
                             </td>
                             <td>
-                                <input type="number" class="form-control" x-model="modalElevatorInfo.qty"  disabled />
+                                <input type="number" class="form-control" x-model="modalElevatorInfo.sale_price" />
                             </td>
                             <td>
-                                <input type="number" class="form-control" x-model="modalElevatorInfo.sale_price" />
+                                <input type="text" class="form-control" disabled x-model="(modalElevatorInfo.sale_price * modalElevatorInfo.months).toLocaleString()" />
                             </td>
                         </tr>
                     </table>
                 </div>
             </div>
             <div class="modal-footer">
-            <button type="button" class="btn btn-secondary" @click="hideCreateElevatorModal()">關閉</button>
+                <button type="button" class="btn btn-secondary" @click="hideCreateElevatorModal()">關閉</button>
                 <button type="button" class="btn btn-primary"  @click="createElevatorFn()">新增</button>
             </div>
         </div>
diff --git a/wms/contract/contract-new-apply.php b/wms/contract/contract-new-apply.php
index e315c28c..ae5ba7f2 100644
--- a/wms/contract/contract-new-apply.php
+++ b/wms/contract/contract-new-apply.php
@@ -714,7 +714,7 @@ $para = "function_name=pricereview&" . $token_link;
         const total_items = <?php echo $contract['total_items'] ?? ''; ?>;
         const contract_new_apply_id = <?php echo $contract_new_apply_id; ?>;
         const originfiles = [...<?php echo json_encode($files) ?? []; ?>];
-        const description = '<?php echo $contract['description']; ?>';
+        const description = `<?php echo $contract['description']; ?>`;
         const contractstatus = <?php echo $contract['status']; ?>;
         const progress = <?php echo $contract['progress']; ?>;
     </script>
diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js
index c3cb39c8..e250451c 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -23,7 +23,7 @@ const contractDownload = () => {
         data: {
             illustrate: {
                 editshow: false,
-                plaintext: '茲因甲方向乙方訂購電梯，並委由乙方安裝系爭電梯，經雙方同意共同訂立本合約書，其條款如下：'
+                plaintext: '茲因甲方向乙方訂購電梯，並委由乙方安裝新增電梯，經雙方同意共同訂立本合約書，其條款如下：'
             },
             partyA: {
                 editshow: false,

From 9e5f5eb23da94e83caf3603fb56d3b49af80f0aa Mon Sep 17 00:00:00 2001
From: Ellin <b0206040@masada.com.tw>
Date: Thu, 7 Mar 2024 19:41:14 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E6=87=89=E6=94=B6=E5=B8=B3=E6=AC=BE(?=
 =?UTF-8?q?=E6=96=B0=E6=A2=AF)=E4=BF=AE=E6=94=B9=E5=AE=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/account-receivable-contract.xlsx | Bin 45089 -> 18571 bytes
 wms/account-receivable-new-index.php | 267 ++++++++++++++++++---------
 wms/account-receivable.txt           |   2 +-
 3 files changed, 176 insertions(+), 93 deletions(-)

diff --git a/wms/account-receivable-contract.xlsx b/wms/account-receivable-contract.xlsx
index cb3cc542f3afc8cd1f4806ce9044e0f6ff17d0b3..89245253fa09c806225a2c8d39cbc0739244b102 100644
GIT binary patch
delta 14163
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
M91AH&;@6x1ANh@z1^@s6

delta 40868
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
SX26ZSxYMV!MULhR{`+58!|h)H

diff --git a/wms/account-receivable-new-index.php b/wms/account-receivable-new-index.php
index 6515aa98..e2ac10a8 100644
--- a/wms/account-receivable-new-index.php
+++ b/wms/account-receivable-new-index.php
@@ -519,7 +519,7 @@ foreach ($PayStage_array as $key => &$value) {
                     $estimate_time = strtotime($arrayData[$key]['PayStage'][1]['PlanPayDate']);
                     $payvalue['PlanPayDate'] = date('Y-m-d', $estimate_time);
                     break;
-                case (stristr($payvalue['PayStage'], '試車')):
+                case (stristr($payvalue['PayStage'], '試車') || $payvalue['PayStage'] == '安裝試車'):
                     $payvalue['stage'] = '試車款';
                     if ($wip_array[$payvalue['facilityno']]['tryrun_end_date'] !== null && strtotime($wip_array[$payvalue['facilityno']]['tryrun_end_date']) > 975686400 && !empty($wip_array[$payvalue['facilityno']]['tryrun_end_date'])) {
                         $estimate_time = strtotime($wip_array[$payvalue['facilityno']]['tryrun_end_date']);
@@ -528,6 +528,15 @@ foreach ($PayStage_array as $key => &$value) {
                         $payvalue['PlanPayDate'] = NULL;
                     }
                     break;
+                case (stristr($payvalue['PayStage'], '合格') || stristr($payvalue['PayStage'], '驗收')  || stristr($payvalue['PayStage'], '驗收')):
+                    $payvalue['stage'] = '官檢驗收款';
+                    if ($wip_array[$payvalue['facilityno']]['official_check_date'] !== null && strtotime($wip_array[$payvalue['facilityno']]['official_check_date']) > 975686400 && !empty($wip_array[$payvalue['facilityno']]['official_check_date'])) {
+                        $estimate_time = strtotime($wip_array[$payvalue['facilityno']]['official_check_date']);
+                        $payvalue['PlanPayDate'] = date('Y-m-d', $estimate_time);
+                    } else {
+                        $payvalue['PlanPayDate'] = NULL;
+                    }
+                    break;
                 case (stristr($payvalue['PayStage'], '安裝') || stristr($payvalue['PayStage'], '貨抵工地且完工')):
                     $payvalue['stage'] = '安裝款';
                     if ($wip_array[$payvalue['facilityno']]['install_end_date'] !== null && strtotime($wip_array[$payvalue['facilityno']]['install_end_date']) > 975686400 && !empty($wip_array[$payvalue['facilityno']]['install_end_date'])) {
@@ -547,15 +556,7 @@ foreach ($PayStage_array as $key => &$value) {
                         $payvalue['PlanPayDate'] = NULL;
                     }
                     break;
-                case (stristr($payvalue['PayStage'], '合格') || stristr($payvalue['PayStage'], '驗收')  || stristr($payvalue['PayStage'], '驗收')):
-                    $payvalue['stage'] = '官檢驗收款';
-                    if ($wip_array[$payvalue['facilityno']]['official_check_date'] !== null && strtotime($wip_array[$payvalue['facilityno']]['official_check_date']) > 975686400 && !empty($wip_array[$payvalue['facilityno']]['official_check_date'])) {
-                        $estimate_time = strtotime($wip_array[$payvalue['facilityno']]['official_check_date']);
-                        $payvalue['PlanPayDate'] = date('Y-m-d', $estimate_time);
-                    } else {
-                        $payvalue['PlanPayDate'] = NULL;
-                    }
-                    break;
+
                 case (stristr($payvalue['PayStage'], '交車') || stristr($payvalue['PayStage'], '移交') || stristr($payvalue['PayStage'], '完工') || stristr($payvalue['PayStage'], '許可') || stristr($payvalue['PayStage'], '核可')):
                     $payvalue['stage'] = '交車款';
                     if ($wip_array[$payvalue['facilityno']]['delivery_date'] !== null && strtotime($wip_array[$payvalue['facilityno']]['delivery_date']) > 975686400 && !empty($wip_array[$payvalue['facilityno']]['delivery_date'])) {
@@ -618,7 +619,7 @@ CheckAll.FromSalSalesOrder AS BillNo
                 SELECT CheckDetail.BillNo, CheckDetail.FromSalSalesOrder, CheckDetail.RowNo
                 FROM arCheckBillDetail AS CheckDetail ) 
         AS CheckAll ON CheckAll.BillNo= Detail.FromBillNo AND Detail.FromRowCode = CheckAll.RowNo
-	WHERE Main.InvoiceState!=2 AND LEN(CheckAll.FromSalSalesOrder)>0";
+	WHERE Main.InvoiceState!=2 AND LEN(CheckAll.FromSalSalesOrder)>0 AND Main.InvoiceDate > 20240229";
 $query_invoice = $conn->query($sql_invoice);
 
 //發票資訊回填到arrayData
@@ -629,53 +630,145 @@ foreach ($query_invoice as $invoice) {
 }
 
 //未在T8的收款資料
-$sql_wms = "SELECT * FROM account_received WHERE type='M' AND BillNo IN $str_numbers";
-$query_wms = mysqli_query($link, $sql_wms);
-foreach ($query_wms as $wms) {
-    if (isset($arrayData[$wms['BillNo']]) && isset($arrayData[$wms['BillNo']]['invoice_budget'])) {
-        $arrayData[$wms['BillNo']]['invoice_budget'] += $wms['invoice_budget'];
-    }
-    if (isset($arrayData[$wms['BillNo']]) && isset($arrayData[$wms['BillNo']]['received_budget'])) {
-        $arrayData[$wms['BillNo']]['received_budget'] += $wms['received_budget'];
-    }
-}
+// $sql_wms = "SELECT * FROM account_received WHERE type='M' AND BillNo IN $str_numbers";
+// $query_wms = mysqli_query($link, $sql_wms);
+// foreach ($query_wms as $wms) {
+//     if (isset($arrayData[$wms['BillNo']]) && isset($arrayData[$wms['BillNo']]['invoice_budget'])) {
+//         $arrayData[$wms['BillNo']]['invoice_budget'] += $wms['invoice_budget'];
+//     }
+//     if (isset($arrayData[$wms['BillNo']]) && isset($arrayData[$wms['BillNo']]['received_budget'])) {
+//         $arrayData[$wms['BillNo']]['received_budget'] += $wms['received_budget'];
+//     }
+// }
 
 // 核銷資訊
-$sql_received = "SELECT 
-CheckDetail.OrderBillNo,
-arWriteOffBillDetail.FromBillNo AS CheckBillNo, 
-arWriteOffBillDetail.FromRowCode AS CheckRowCode,
-arWriteOffBillDetail.CurrStandOffOAmount,
-CheckDetail.TypeId
-FROM arWriteOffBillDetail
-	LEFT JOIN 
-		(SELECT 
-			arCheckBillDetail.BillNo,
-			arCheckBillDetail.RowCode,
-			arCheckBillDetail.FromSalSalesOrder AS OrderBillNo,
-			salSalesOrder.TypeId,
-			salSalesOrder.ModeId
-		FROM arCheckBillDetail 
-			LEFT JOIN salSalesOrder 
-			ON salSalesOrder.BillNo =arCheckBillDetail.FromSalSalesOrder  )
-		AS CheckDetail
-	ON CheckDetail.BillNo=arWriteOffBillDetail.FromBillNo AND arWriteOffBillDetail.FromRowCode = CheckDetail.RowCode
-WHERE CheckDetail.ModeId = 'M'";
+// $sql_received = "SELECT 
+// CheckDetail.OrderBillNo,
+// arWriteOffBillDetail.FromBillNo AS CheckBillNo, 
+// arWriteOffBillDetail.FromRowCode AS CheckRowCode,
+// arWriteOffBillDetail.CurrStandOffOAmount,
+// CheckDetail.TypeId
+// FROM arWriteOffBillDetail
+// 	LEFT JOIN 
+// 		(SELECT 
+// 			arCheckBillDetail.BillNo,
+// 			arCheckBillDetail.RowCode,
+// 			arCheckBillDetail.FromSalSalesOrder AS OrderBillNo,
+// 			salSalesOrder.TypeId,
+// 			salSalesOrder.ModeId
+// 		FROM arCheckBillDetail 
+// 			LEFT JOIN salSalesOrder 
+// 			ON salSalesOrder.BillNo =arCheckBillDetail.FromSalSalesOrder  )
+// 		AS CheckDetail
+// 	ON CheckDetail.BillNo=arWriteOffBillDetail.FromBillNo AND arWriteOffBillDetail.FromRowCode = CheckDetail.RowCode
+// WHERE CheckDetail.ModeId = 'M'";
+$sql_received = "
+SELECT Detail.OrderBillNo,
+Detail.CurrWriteOffLAmount,
+Main.BillDate
+FROM arWriteOffBillDetail AS Detail
+LEFT JOIN arWriteOffBill AS Main 
+ON Detail.BillNo=Main.BillNo
+WHERE Main.BillDate >20240229 AND LEN(Detail.OrderBillNo)>0";
 $query_received = $conn->query($sql_received);
 
 // 核銷資訊回填到arrayData
-foreach ($query_received as $received) {
-    if (isset($arrayData[$received['OrderBillNo']])) {
-        $arrayData[$received['OrderBillNo']]['received_budget'] += $received['CurrStandOffOAmount'];
+if(is_iterable($query_received)){
+    foreach ($query_received as $received) {
+        if (isset($arrayData[$received['OrderBillNo']])) {
+            $arrayData[$received['OrderBillNo']]['received_budget'] += $received['CurrWriteOffLAmount'];
+        }
     }
 }
 
+
+// 取WMS期初資料並依作番款別填入 $wms_initial
+$wms_initial = array();
+$sql_initial = "SELECT * FROM account_receivable";
+$initail_data = mysqli_query($link, $sql_initial);
+foreach ($initail_data as $initial) {
+    if ($initial['invoice_budget'] > 0) {
+        if (isset($wms_initial[$initial['facility_no']][$initial['stage']]['invoice_budget'])) {
+            $wms_initial[$initial['facility_no']][$initial['stage']]['invoice_budget'] += $initial['invoice_budget'];
+        } else {
+            $wms_initial[$initial['facility_no']][$initial['stage']]['invoice_budget'] = $initial['invoice_budget'];
+        }
+    }
+    if ($initial['received_budget'] > 0) {
+        if (isset($wms_initial[$initial['facility_no']][$initial['stage']]['received_budget'])) {
+            $wms_initial[$initial['facility_no']][$initial['stage']]['received_budget'] += $initial['received_budget'];
+        } else {
+            $wms_initial[$initial['facility_no']][$initial['stage']]['received_budget'] = $initial['received_budget'];
+        }
+    }
+}
+
+
 // 將發票與核銷資訊 分別計算作番收款階段金額 與 催收次數
 $today = strtotime(date('Y-m-t'));
 foreach ($final_paystage as $key => &$value) {
     $tmpinvoice = $arrayData[$key]['invoice_budget'];
     $tmpreceived = $arrayData[$key]['received_budget'];
     for ($sequenceNumber = 1; $sequenceNumber <= count($value); $sequenceNumber++) {
+        if (isset($value[$sequenceNumber]['stage'])) {
+            switch ($value[$sequenceNumber]['stage']) {
+                case '訂金':
+                    $istage = 100;
+                    break;
+                case '二次款':
+                    $istage = 200;
+                    break;
+                case '貨抵工地款':
+                    $istage = 300;
+                    break;
+                case '安裝款':
+                    $istage = 400;
+                    break;
+                case '試車款':
+                    $istage = 500;
+                    break;
+                case '官檢驗收款':
+                    $istage = 600;
+                    break;
+                case '交車款':
+                    $istage = 700;
+                    break;
+                case '尾款':
+                    $istage = 800;
+                    break;
+            }
+        } else {
+            $istage = 0;
+        }
+        if (isset($wms_initial[$value[$sequenceNumber]['facilityno']][$istage]['invoice_budget'])) {
+            $value[$sequenceNumber]['invoice_budget'] = $wms_initial[$value[$sequenceNumber]['facilityno']][$istage]['invoice_budget'];
+        } else {
+            if ($tmpinvoice > $value[$sequenceNumber]['PlanPayAmt']) {
+                $value[$sequenceNumber]['invoice_budget'] = $value[$sequenceNumber]['PlanPayAmt'];
+                $tmpinvoice = $tmpinvoice - $value[$sequenceNumber]['invoice_budget'];
+            } elseif ($tmpinvoice > 0) {
+                $value[$sequenceNumber]['invoice_budget'] = $tmpinvoice;
+                $tmpinvoice = 0;
+            } else {
+                $value[$sequenceNumber]['invoice_budget'] = 0;
+            }
+        }
+
+        if (isset($wms_initial[$value[$sequenceNumber]['facilityno']][$istage]['received_budget'])) {
+            $value[$sequenceNumber]['received_budget'] = $wms_initial[$value[$sequenceNumber]['facilityno']][$istage]['received_budget'];
+        } else {
+            if ($tmpreceived > $value[$sequenceNumber]['PlanPayAmt']) {
+                $value[$sequenceNumber]['received_budget'] = $value[$sequenceNumber]['PlanPayAmt'];
+                $tmpreceived -= $value[$sequenceNumber]['received_budget'];
+            } elseif ($tmpreceived > 0) {
+                $value[$sequenceNumber]['received_budget'] = $tmpreceived;
+                $tmpreceived = 0;
+            } else {
+                $value[$sequenceNumber]['received_budget'] = 0;
+            }
+        }
+
+
         if (isset($value[$sequenceNumber]['PlanPayDate'])) {
             $collect_month = collect_month(strtotime($value[$sequenceNumber]['PlanPayDate']));
             if ($today > strtotime($value[$sequenceNumber]['PlanPayDate'])) {
@@ -687,24 +780,8 @@ foreach ($final_paystage as $key => &$value) {
             $collect_month = 0;
             $value[$sequenceNumber]['hadtopay'] = '--';
         }
-        if ($tmpinvoice > $value[$sequenceNumber]['PlanPayAmt']) {
-            $value[$sequenceNumber]['invoice_budget'] = $value[$sequenceNumber]['PlanPayAmt'];
-            $tmpinvoice = $tmpinvoice - $value[$sequenceNumber]['invoice_budget'];
-        } elseif ($tmpinvoice > 0) {
-            $value[$sequenceNumber]['invoice_budget'] = $tmpinvoice;
-            $tmpinvoice = 0;
-        } else {
-            $value[$sequenceNumber]['invoice_budget'] = 0;
-        }
-        if ($tmpreceived > $value[$sequenceNumber]['PlanPayAmt']) {
-            $value[$sequenceNumber]['received_budget'] = $value[$sequenceNumber]['PlanPayAmt'];
-            $tmpreceived -= $value[$sequenceNumber]['received_budget'];
-        } elseif ($tmpreceived > 0) {
-            $value[$sequenceNumber]['received_budget'] = $tmpreceived;
-            $tmpreceived = 0;
-        } else {
-            $value[$sequenceNumber]['received_budget'] = 0;
-        }
+
+
         if ($collect_month > 0 && $value[$sequenceNumber]['PlanPayAmt'] > $value[$sequenceNumber]['received_budget']) {
             $value[$sequenceNumber]['collect_month'] = $collect_month;
         } else {
@@ -714,7 +791,6 @@ foreach ($final_paystage as $key => &$value) {
 }
 
 
-
 //合約資料填回arrayData
 foreach ($final_paystage as $key => $value) {
     for ($sequence = 1; $sequence <= count($value); $sequence++) {
@@ -724,13 +800,16 @@ foreach ($final_paystage as $key => $value) {
                 if ($arvalue['PayStage'] == $value[$sequence]['PayStage']) {
                     if (isset($arvalue['receivable_budget']) && isset($arvalue['received_budget']) && isset($arvalue['invoice_budget'])) {
                         $arvalue['received_budget'] += $value[$sequence]['received_budget'];
+                        $arrayData[$key]['received_budget'] += $value[$sequence]['received_budget'];
                         $arvalue['invoice_budget'] += $value[$sequence]['invoice_budget'];
+                        $arrayData[$key]['invoice_budget'] += $value[$sequence]['invoice_budget'];
                         if ($value[$sequence]['hadtopay'] == 'V') {
                             $arvalue['receivable_budget'] += $value[$sequence]['PlanPayAmt'];
                             $arrayData[$key]['receivable_budget'] += $value[$sequence]['PlanPayAmt'];
-                        } else {
-                            $arvalue['receivable_budget'] = 0;
-                        }
+                        } 
+                        // else {
+                        //     $arvalue['receivable_budget'] = 0;
+                        // }
                         if ($arvalue['collect_month'] < $value[$sequence]['collect_month']) {
                             $arvalue['collect_month'] = $value[$sequence]['collect_month'];
                         }
@@ -746,7 +825,9 @@ foreach ($final_paystage as $key => $value) {
                             $arvalue['receivable_budget'] = 0;
                         }
                         $arvalue['received_budget'] = $value[$sequence]['received_budget'];
+                        $arrayData[$key]['received_budget'] += $value[$sequence]['received_budget'];
                         $arvalue['invoice_budget'] = $value[$sequence]['invoice_budget'];
+                        $arrayData[$key]['invoice_budget'] += $value[$sequence]['invoice_budget'];
                         $arvalue['collect_month'] = $value[$sequence]['collect_month'];
                         $sum_receivable_budget += $value[$sequence]['PlanPayAmt'];
                         $sum_received_budget += $value[$sequence]['received_budget'];
@@ -779,6 +860,7 @@ $excel_contract_boga_array = array();
 $excel_contract_noboga_array = array();
 
 $excel_facility_array = array();
+
 foreach ($arrayData as $key => &$value) {
 
     $excel_contract_array[$key] = array_fill(0, 76, '');
@@ -799,7 +881,7 @@ foreach ($arrayData as $key => &$value) {
     $excel_contract_array[$key][14] = (isset($value['receivable_budget']) && !is_null($value['receivable_budget'])) ? $value['receivable_budget'] : 0;
     $excel_contract_array[$key][15] = (isset($value['invoice_budget']) && !is_null($value['invoice_budget'])) ? number_format(round($value['invoice_budget'])) : '0';
     $excel_contract_array[$key][16] = (isset($value['received_budget']) && !is_null($value['received_budget'])) ? $value['received_budget'] : 0;
-    $value['collect_budget'] = ($excel_contract_array[$key][14] - $excel_contract_array[$key][16]) > 0 ? $excel_contract_array[$key][14] - $excel_contract_array[$key][16] : 0;
+    $value['collect_budget'] = (($excel_contract_array[$key][14] - $excel_contract_array[$key][16]) > 0) ? $excel_contract_array[$key][14] - $excel_contract_array[$key][16] : 0;
     $excel_contract_array[$key][17] = number_format(round($excel_contract_array[$key][14] - $excel_contract_array[$key][16]));
     $excel_contract_array[$key][18] = (isset($value['collect_month']) && !is_null($value['collect_month'])) ? number_format(round($value['collect_month'])) : '0';
     $excel_contract_array[$key][19] = (isset($value['facility_num']) && !is_null($value['facility_num'])) ? number_format(round($value['facility_num'])) : '0';
@@ -807,7 +889,7 @@ foreach ($arrayData as $key => &$value) {
     $excel_contract_array[$key][14] = number_format(round($excel_contract_array[$key][14]));
     $excel_contract_array[$key][16] = number_format(round($excel_contract_array[$key][16]));
     if (isset($value['PayStage']) && is_iterable($value['PayStage'])) {
-        if ($excel_contract_array[$key][17] > 1) {
+        if ($excel_contract_array[$key][18] !== '0') {
             $excel_contract_all_array[$key] = array_fill(0, 24, 0);
             $excel_contract_all_array[$key][0] = $excel_contract_array[$key][0];
             $excel_contract_all_array[$key][1] = $excel_contract_array[$key][3];
@@ -817,30 +899,31 @@ foreach ($arrayData as $key => &$value) {
             $excel_contract_all_array[$key][5] = $excel_contract_array[$key][20];
             $excel_contract_all_array[$key][6] = $excel_contract_array[$key][17];
             $excel_contract_all_array[$key][7] = $excel_contract_array[$key][18];
+            $isBoga = 0;
+            if (stristr($value['PayStage'][1]['PayStage'], '寶佳')) {
+                $isBoga = 1;
+                $excel_contract_boga_array[$key] = array_fill(0, 24, '');
+                $excel_contract_boga_array[$key][0] = $excel_contract_array[$key][0];
+                $excel_contract_boga_array[$key][1] = $excel_contract_array[$key][3];
+                $excel_contract_boga_array[$key][2] = $excel_contract_array[$key][8];
+                $excel_contract_boga_array[$key][3] = $excel_contract_array[$key][11];
+                $excel_contract_boga_array[$key][4] = $excel_contract_array[$key][19];
+                $excel_contract_boga_array[$key][5] = $excel_contract_array[$key][20];
+                $excel_contract_boga_array[$key][6] = $excel_contract_array[$key][17];
+                $excel_contract_boga_array[$key][7] = $excel_contract_array[$key][18];
+            } else {
+                $excel_contract_noboga_array[$key] = array_fill(0, 24, '');
+                $excel_contract_noboga_array[$key][0] = $excel_contract_array[$key][0];
+                $excel_contract_noboga_array[$key][1] = $excel_contract_array[$key][3];
+                $excel_contract_noboga_array[$key][2] = $excel_contract_array[$key][8];
+                $excel_contract_noboga_array[$key][3] = $excel_contract_array[$key][11];
+                $excel_contract_noboga_array[$key][4] = $excel_contract_array[$key][19];
+                $excel_contract_noboga_array[$key][5] = $excel_contract_array[$key][20];
+                $excel_contract_noboga_array[$key][6] = $excel_contract_array[$key][17];
+                $excel_contract_noboga_array[$key][7] = $excel_contract_array[$key][18];
+            }
         }
-        $isBoga = 0;
-        if (stristr($value['PayStage'][1]['PayStage'], '寶佳')) {
-            $isBoga = 1;
-            $excel_contract_boga_array[$key] = array_fill(0, 24, '');
-            $excel_contract_boga_array[$key][0] = $excel_contract_array[$key][0];
-            $excel_contract_boga_array[$key][1] = $excel_contract_array[$key][3];
-            $excel_contract_boga_array[$key][2] = $excel_contract_array[$key][8];
-            $excel_contract_boga_array[$key][3] = $excel_contract_array[$key][11];
-            $excel_contract_boga_array[$key][4] = $excel_contract_array[$key][19];
-            $excel_contract_boga_array[$key][5] = $excel_contract_array[$key][20];
-            $excel_contract_boga_array[$key][6] = $excel_contract_array[$key][17];
-            $excel_contract_boga_array[$key][7] = $excel_contract_array[$key][18];
-        } else {
-            $excel_contract_noboga_array[$key] = array_fill(0, 24, '');
-            $excel_contract_noboga_array[$key][0] = $excel_contract_array[$key][0];
-            $excel_contract_noboga_array[$key][1] = $excel_contract_array[$key][3];
-            $excel_contract_noboga_array[$key][2] = $excel_contract_array[$key][8];
-            $excel_contract_noboga_array[$key][3] = $excel_contract_array[$key][11];
-            $excel_contract_noboga_array[$key][4] = $excel_contract_array[$key][19];
-            $excel_contract_noboga_array[$key][5] = $excel_contract_array[$key][20];
-            $excel_contract_noboga_array[$key][6] = $excel_contract_array[$key][17];
-            $excel_contract_noboga_array[$key][7] = $excel_contract_array[$key][18];
-        }
+
         foreach ($value['PayStage'] as $paykey => $payvalue) {
             switch ($payvalue['stage']) {
                 case "訂金":
@@ -1040,7 +1123,7 @@ $total_data = json_encode($excel_contract_all_array);
 $boga_data = json_encode($excel_contract_boga_array);
 $noboga_data = json_encode($excel_contract_noboga_array);
 $table = "";
-$testtotal =0;
+$testtotal = 0;
 // foreach ($arrayData as $key => $value) {
 //     if (isset($value['facility']) && is_iterable($value['facility'])) {
 //         foreach ($value['facility'] as $fkey => $fvalue) {
diff --git a/wms/account-receivable.txt b/wms/account-receivable.txt
index 5602b2b4..8e19026c 100644
--- a/wms/account-receivable.txt
+++ b/wms/account-receivable.txt
@@ -1 +1 @@
-{"Bill":{"M220005":["M220005","【和峻】新長壽段C區","何政揚","3,603,162","4","3MX00011 (2023-11-29貨抵工地) ;       3MX00012 (2024-01-29安裝完畢) ;       3MX00013 (2023-11-29貨抵工地) ;       3MX00014 (2024-01-29安裝完畢) ;       ","2,522,213","2","378,332","2","756,664","1","1,387,217","0",0,0,"0","0",0,0,0,0,"0","0"],"M220011":["M220011","【和境】善捷段","何政揚","5,964,849","6","2MX00016 (2023-12-07貨抵工地) ;       2MX00017 (2024-01-05貨抵工地) ;       2MX00018 (2023-12-07貨抵工地) ;       2MX00019 (2024-01-05貨抵工地) ;       2MX00020 (2024-01-05貨抵工地) ;       2MX00021 (2023-12-07貨抵工地) ;       ","626,309","0","0","0","626,309","0","0","0",0,0,"0","0",0,0,0,0,"0","0"],"M220012":["M220012","【鴻廣】樂捷段","何政揚","7,807,005","7","2MX00006 (2024-02-05已移交) ;      2MX00007 (2023-10-27貨抵工地) ;       2MX00008 (2023-12-12已移交) ;      2MX00009 (2024-01-19已移交) ;      2MX00010 (2023-10-27貨抵工地) ;       2MX00011 (2023-10-27貨抵工地) ;       2MX00012 (2023-12-19已移交) ;      ","5,464,904","5","819,736","5","1,639,471","4","3,005,697","1",0,0,"0","0",0,0,0,0,"0","0"],"M220013":["M220013","【鴻承 】豐田段一期","何政揚","6,786,188","4","3MX00015 (2024-03-20預計出貨) ;       3MX00016 (2024-02-29預計出貨) ;       3MX00017 (2024-03-20預計出貨) ;       3MX00018 (2024-02-29預計出貨) ;       ","712,550","0","712,550","0","0","0","0","0",0,0,"0","0",0,0,0,0,"0","0"],"M220014":["M220014","【大華】新站段","何政揚","5,216,816","4","3MX00218 (2023-10-04貨抵工地) ;       3MX00219 (2024-02-15試車完畢) ;       3MX00220 (2023-10-04貨抵工地) ;       3MX00221 (2024-01-12安裝完畢) ;       ","2,086,725","0","0","0","0","0","2,086,725","0",0,0,"0","0",0,0,0,0,"0","0"],"M220114":["M220114","【鴻豐】大金山下段","何政揚","4,136,280","4","3MX00019 (2023-09-28貨抵工地) ;       3MX00020 (2023-12-25已移交) ;      3MX00021 (2023-12-25已移交) ;      3MX00022 (2023-09-28貨抵工地) ;       ","3,112,551","6","434,309","6","868,619","5","1,592,468","2",0,0,"0","0",0,0,0,0,"0","0"],"M220115":["M220115","【鴻築】青山段","何政揚","4,073,580","4","2MX00022 (2023-12-29貨抵工地) ;       2MX00023 (2023-11-30貨抵工地) ;       2MX00024 (2024-02-06安裝完畢) ;       2MX00025 (2023-12-29貨抵工地) ;       ","2,050,190","2","427,726","2","855,452","1","0","0",0,0,"0","0",0,0,0,0,"0","0"],"M220179":["M220179","【鴻築】大湖段A區","何政揚","3,056,365","3","2MX00013 (2023-12-25已移交) ;      2MX00014 (2023-12-25已移交) ;      2MX00015 (2023-12-25已移交) ;      ","2,353,401","5","320,918","5","641,837","4","1,176,700","1",0,0,"0","0",0,0,0,0,"0","0"],"D23090047":["D23090047","【秉和】榮華段","何政揚","10,821,075","10","3MX00740 (2024-01-31安裝完畢) ;       3MX00741 (2024-01-15貨抵工地) ;       3MX00742 (2024-02-01已移交) ;      3MX00743 (2024-01-15貨抵工地) ;       3MX00744 (2023-12-15貨抵工地) ;       3MX00745 (2024-01-15貨抵工地) ;       3MX00746 (2023-12-15貨抵工地) ;       3MX00747 (2024-01-15貨抵工地) ;       3MX00748 (2024-01-15貨抵工地) ;       3MX00749 (2023-12-15貨抵工地) ;       ","1","0","0","0","1","0","0","0",0,0,"0","0",0,0,0,0,"0","0"],"M220245":["M220245","【勝麗】興隆B3-2區(協侑)","何政揚","463,200","1","3MH00482 (2024-01-18貨抵工地) ;       ","145,908","1","48,636","1","97,272","0","0","0",0,0,"0","0",0,0,0,0,"0","0"],"M220377":["M220377","紹華營造股份有限公司","何政揚","3,578,000","2","3MX00037 (2024-02-01安裝完畢) ;       3MF00038 (2023-12-21貨抵工地) ;       ","2,862,400","11","715,600","11",0,0,"2,146,800","1",0,0,"0","0",0,0,0,0,0,0],"M230051":["M230051","宏富建設\/成州段","何政揚","3,402,000","2","3MX00446 (2024-07-31預計出貨) ;       3MX00447 (2024-07-31預計出貨) ;       ","680,400","5","680,400","5","0","0","0","0","0","0",0,0,0,0,"0","0",0,0],"M230219":["M230219","【寶佳】坪頂段","何政揚","1,867,100","2","3MX00597 (2024-03-22預計出貨) ;       3MX00598 (2024-03-22預計出貨) ;       ","196,046","0","196,046","0","0","0","0","0",0,0,"0","0",0,0,0,0,"0","0"],"M230373":["M230373","展隆建設\/日新段","何政揚","1,081,500","1","3MX00314 (2024-02-27預計出貨) ;       ","648,900","8","216,300","8","432,600","0","0","0",0,0,"0","0",0,0,"0","0",0,0],"M230728":["M230728","金有康建設\/盧松根等3人集合住宅","何政揚","880,000","1","3MX00537 (2024-02-21預計出貨) ;       ","264,000","0","0","0","264,000","0","0","0","0","0",0,0,0,0,0,0,"0","0"],"M230780":["M230780","【勝麗】興隆B3-4區","何政揚","2,609,862","3","3MX00628 (2023-12-01貨抵工地) ;       3MX00629 (2024-02-02試車完畢) ;       3MX00630 (2023-12-01貨抵工地) ;       ","548,072","2","1","2","548,071","1","0","0",0,0,"0","0",0,0,0,0,"0","0"],"M230878":["M230878","【協和】市鎮北段二期","何政揚","9,205,241","8","3MX00631 (2023-12-08貨抵工地) ;       3MX00632 (2023-12-12貨抵工地) ;       3MX00633 (2023-12-08貨抵工地) ;       3MX00634 (2023-12-12貨抵工地) ;       3MX00635 (2023-12-12貨抵工地) ;       3MX00636 (2023-12-08貨抵工地) ;       3MX00637 (2023-12-08貨抵工地) ;       3MX00638 (2023-12-12貨抵工地) ;       ","1","1","0","0","1","1","0","0",0,0,"0","0",0,0,0,0,"0","0"],"M23090105":["M23090105","【益翔】市鎮南段二期","何政揚","4,214,001","4","3MX00809 (2024-01-09貨抵工地) ;       3MX00810 (2024-01-09貨抵工地) ;       3MX00811 (2024-01-09貨抵工地) ;       3MX00812 (2024-01-09貨抵工地) ;       ","884,940","1","0","1","884,940","0","0","0",0,0,"0","0",0,0,0,0,"0","0"],"M231009":["M231009","【泓瑞】育賢段","何政揚","9,997,399","8","3MX00672 (2023-12-07貨抵工地) ;       3MX00673 (2023-12-07貨抵工地) ;       3MX00674 (2023-12-07貨抵工地) ;       3MX00675 (2023-12-26貨抵工地) ;       3MX00676 (2023-12-26貨抵工地) ;       3MX00677 (2023-12-07貨抵工地) ;       3MX00678 (2023-12-26貨抵工地) ;       3MX00679 (2023-12-07貨抵工地) ;       ","2,099,454","1","0","0","2,099,454","1","0","0",0,0,"0","0",0,0,0,0,"0","0"],"M231011":["M231011","【佳友】北城段","何政揚","1,975,764","2","3MX00614 (2024-01-24貨抵工地) ;       3MX00615 (2024-01-24貨抵工地) ;       ","622,365","1","207,455","1","414,910","0","0","0",0,0,"0","0",0,0,0,0,"0","0"],"M230023":["M230023","正洲包裝機材股份有限公司","張莉凱","1,060,500","1","3MW00024 (2023-09-26官檢完畢) ;       ","848,200","9","0","0","424,000","9","212,100","6","106,050","4","106,050","4",0,0,0,0,0,0],"M220311":["M220311","永安北路增設案","張莉凱","707,200","1","2MH00026 (2023-07-12官檢完畢) ;       ","633,651","14","140,026","14","280,050","12","140,026","8",0,0,0,0,"73,549","6","0","0",0,0],"M220200":["M220200","聯雄建設股份有限公司","張莉凱","850,000","1","3MX00026 (2024-05-02預計出貨) ;       ","425,000","11","170,000","11","255,000","8","0","0",0,0,"0","0",0,0,"0","0",0,0],"M220001":["M220001","【恆鵬】善新段","謝文憲","2,911,500","3","3MX00191 (2024-02-20預計出貨) ;       3MX00192 (2024-02-20預計出貨) ;       3MX00193 (2024-02-20預計出貨) ;       ","305,708","0","305,708","0","0","0","0","0",0,0,"0","0",0,0,0,0,"0","0"],"M230106":["M230106","星達工程行-董清文住宅案","謝文憲","535,000","1","3MH00120 (2024-02-03安裝完畢) ;       ","374,500","8","107,000","8",0,0,"267,500","0",0,0,"0","0",0,0,"0","0",0,0],"M230414":["M230414","秉俊建設-大社區中里段","謝文憲","1,192,000","2","3MH00205 (2024-02-01已移交) ;      3MH00206 (2024-02-01已移交) ;      ","1,192,000","9","238,400","9",0,0,"596,000","5",0,0,"238,400","3",0,0,"119,200","0",0,0],"M231085":["M231085","吳政弘","謝文憲","530,000","1","3MH00513 (2024-01-15試車完畢) ;       ","477,000","8","106,000","8",0,0,"265,000","2",0,0,"106,000","0",0,0,"0","0",0,0],"M230563":["M230563","葉建中-大里新建住宅","陳敦德","820,000","1","3MX00295 (2024-05-15預計出貨) ;       ","492,000","7","164,000","7","328,000","4","0","0",0,0,"0","0",0,0,"0","0",0,0],"M230166":["M230166","富德開發有限公司-東海段98-54地號","陳敦德","650,000","1","3MH00294 (2024-01-04安裝完畢) ;       ","520,000","7","130,000","7","260,000","5","130,000","1",0,0,"0","0",0,0,"0","0",0,0],"M230022":["M230022","旺旺工程行-鄭秋月","陳敦德","600,000","1","3MH00076 (2024-06-01預計出貨) ;       ","360,000","10","120,000","10","240,000","7","0","0",0,0,"0","0",0,0,"0","0",0,0],"M220473":["M220473","國合營造-新北市雙溪案","陳敦德","3,822,000","3","3MW00050 (2024-02-23預計出貨) ;       3MW00051 (2024-02-23預計出貨) ;       3MW00052 (2024-02-16預計出貨) ;       ","1,974,000","9","658,000","9","1,316,000","7","0","0","0","0",0,0,0,0,"0","0",0,0],"M220366":["M220366","欣佳德營造工程有限公司","陳敦德","750,000","1","2MW00038 (2024-07-01預計出貨) ;       ","450,000","13","150,000","13","300,000","10","0","0",0,0,"0","0",0,0,"0","0",0,0],"M220369":["M220369","震營建設開發股份有限公司","吳育宗","1,360,000","2","2MH00047 (2024-02-01已移交) ;      2MH00048 (2024-02-01已移交) ;      ","1,360,000","12","272,000","12",0,0,"680,000","6","136,000","4",0,0,0,0,"136,000","0",0,0],"M220304":["M220304","全台晶像","吳育宗","2,793,000","1","2MW00027 (2024-02-01已移交) ;      ","2,793,000","14","558,600","14",0,0,"1,396,500","9","558,600","7",0,0,"279,300","6",0,0,0,0],"M220267":["M220267","昇暘營造(興達路林宅)","林易增","600,000","1","2MH00028 (2023-07-26官檢完畢) ;       ","540,000","13","120,000","13",0,0,"300,000","9","60,000","8","60,000","8",0,0,"0","0",0,0],"M220276":["M220276","大田土木包工業(陳正得)","林易增","600,000","1","3MH00172 (2024-03-19預計出貨) ;       ","120,000","9","120,000","9",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M220307":["M220307","曜麗營造(歸仁派出所案)","林易增","700,000","1","3MH00795 (2024-01-23官檢完畢) ;       ","490,000","1","0","0",0,0,"350,000","1","140,000","1",0,0,0,0,"0","0",0,0],"M230089":["M230089","采築營造","林易增","920,000","1","3MW00110 (2024-03-20預計出貨) ;       ","184,000","10","184,000","10",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230113":["M230113","黃曉芳","林易增","720,000","1","3MH00049 (2024-04-25預計出貨) ;       ","144,000","11","144,000","11",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230327":["M230327","玖太建設六期","林易增","570,000","1","3MH00282 (2023-11-22試車完畢) ;       ","228,000","4","0","0",0,0,"114,000","4",0,0,"114,000","2",0,0,"0","0",0,0],"M230206":["M230206","森居室內裝修(六興段)","林易增","600,000","1","3MH00131 (2024-01-22已移交) ;      ","300,000","2","0","0",0,0,"120,000","2",0,0,"120,000","1",0,0,"60,000","0",0,0],"M230573":["M230573","梁宗興","林易增","660,000","1","3MH00416 (2023-12-26貨抵工地) ;       ","462,000","7","132,000","7",0,0,"330,000","1",0,0,"0","0",0,0,"0","0",0,0],"M230595":["M230595","王雨晴","林易增","660,000","1","3MH00299 (2024-04-05預計出貨) ;       ","132,000","8","132,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230609":["M230609","祥發開發(青砂街)","林易增","3,180,000","6","3MH00719 (2024-05-08預計出貨) ;       3MH00720 (2024-05-08預計出貨) ;       3MH00721 (2024-05-08預計出貨) ;       3MH00722 (2024-05-08預計出貨) ;       3MH00723 (2024-05-10預計出貨) ;       3MH00724 (2024-05-10預計出貨) ;       ","636,000","4","636,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230610":["M230610","祥發開發(忠孝路)","林易增","3,710,000","7","3MH00712 (2024-04-15預計出貨) ;       3MH00713 (2024-04-15預計出貨) ;       3MH00714 (2024-04-15預計出貨) ;       3MH00715 (2024-04-15預計出貨) ;       3MH00716 (2024-04-15預計出貨) ;       3MH00717 (2024-04-15預計出貨) ;       3MH00718 (2024-04-15預計出貨) ;       ","742,000","4","742,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23080128":["M23080128","唐開元農舍","林易增","720,000","1","4MH00223 (2024-12-30預計出貨) ;       ","144,000","0","144,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23080129":["M23080129","鍾佳霖(川勝開發營造有限公司)","林易增","730,000","1","3MH00970 (2024-04-22預計出貨) ;       ","146,000","2","146,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23080175":["M23080175","北港鎮府番第三納骨塔","林易增","970,000","1","3MW01028 (2024-05-30預計出貨) ;       ","194,000","1","194,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230721":["M230721","陸福營造(復興路)","林易增","570,000","1","3MH00417 (2023-11-24安裝完畢) ;       ","399,000","7","114,000","7",0,0,"285,000","2",0,0,"0","0",0,0,"0","0",0,0],"M23080078":["M23080078","隆聚-將軍農會","林易增","720,000","1","4MH00001 (2024-04-01預計出貨) ;       ","144,000","1","144,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230628":["M230628","李惠庭","林易增","540,000","1","3MH00283 (2023-12-11已移交) ;      ","270,000","3","0","0",0,0,"108,000","3",0,0,"108,000","1",0,0,"54,000","1",0,0],"M230630":["M230630","郭建志","林易增","660,000","1","3MH00368 (2024-01-19貨抵工地) ;       ","462,000","7","132,000","7",0,0,"330,000","0",0,0,"0","0",0,0,"0","0",0,0],"M23110045":["M23110045","黃詔輝","林易增","1,013,000","1","4MW00121 (2024-06-11預計出貨) ;       ","196,600","0","196,600","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231049":["M231049","高昇德","林易增","1,160,000","2","3MH00511 (2024-01-05官檢完畢) ;       3MH00512 (2024-01-05官檢完畢) ;       ","364,000","3","0","0",0,0,"132,000","3",0,0,"232,000","1",0,0,"0","0",0,0],"M231076":["M231076","萬昌建設(柳南段)","林易增","1,140,000","2","3MH00793 (2024-06-14T16:15預計出貨) ;       3MH00794 (2024-06-14T16:15預計出貨) ;       ","228,000","3","228,000","3",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M231006":["M231006","紘歆營造工程(玉南段)(榮鑫土木包工業)","林易增","1,590,000","3","3MH00874 (2024-05-20預計出貨) ;       3MH00875 (2024-05-20預計出貨) ;       3MH00876 (2024-05-20預計出貨) ;       ","318,000","3","318,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23120009":["M23120009","築域建築(新興街)","林易增","580,000","1","4MH00222 (2024-08-01預計出貨) ;       ","116,000","0","116,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M24010005":["M24010005","世紀莊園接待中心","林易增","980,000","1","4MW00156 (2024-05-18預計出貨) ;       ","196,000","0","196,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100121":["M23100121","尊丞開發-湖美三路","林易增","720,000","1","4MW00068 (2024-11-25預計出貨) ;       ","144,000","0","144,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100124":["M23100124","尊丞開發-健康七街公寓","林易增","900,000","1","4MW00067 (2024-05-06預計出貨) ;       ","180,000","0","180,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100125":["M23100125","冠虹建設(湖美小段399)","林易增","1,160,000","2","4MH00220 (2025-03-25預計出貨) ;       4MH00221 (2025-03-25預計出貨) ;       ","232,000","0","232,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100126":["M23100126","冠虹建設(湖美小段401)","林易增","590,000","1","3MH01029 (2024-04-01預計出貨) ;       ","118,000","1","118,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230954":["M230954","蒼達藥品廠房","林易增","1,460,000","1","3MX00536 (2024-03-20預計出貨) ;       ","7,300","6","7,300","6",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M230942":["M230942","王榮松","林易增","560,000","1","3MH00499 (2024-05-14預計出貨) ;       ","112,000","6","112,000","6",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M23090136":["M23090136","捷築建設-新案段","林易增","990,000","1","4MW00002 (2024-07-30預計出貨) ;       ","198,000","0","198,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230927":["M230927","蘆葦啟智中心","林易增","960,000","1","3MW00419 (2023-12-15貨抵工地) ;       ","480,000","1","0","0",0,0,"480,000","1",0,0,"0","0",0,0,"0","0",0,0],"M23090031":["M23090031","捷築建設-二行段","林易增","990,000","1","4MW00003 (2024-05-30預計出貨) ;       ","198,000","0","198,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090038":["M23090038","祥綸建設(澄合段)","杜孟釗","1,700,000","3","3MH00735 (2024-01-04貨抵工地) ;       3MH00736 (2024-03-15預計出貨) ;       3MH00737 (2024-01-19貨抵工地) ;       ","562,500","0","0","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090002":["M23090002","賽斯新能源(新吉段)","杜孟釗","1,100,000","1","3MX00815 (2024-03-05預計出貨) ;       ","220,000","3","220,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230810":["M230810","左東段透天新建工程(鑲揚國際開發有限公司)","杜孟釗","14,840,000","28","3MH00454 (2024-05-16預計出貨) ;       3MH00455 (2024-05-16預計出貨) ;       3MH00456 (2024-05-16預計出貨) ;       3MH00457 (2024-05-16預計出貨) ;       3MH00458 (2024-05-16預計出貨) ;       3MH00459 (2024-05-28預計出貨) ;       3MH00460 (2024-05-28預計出貨) ;       3MH00461 (2024-05-28預計出貨) ;       3MH00462 (2024-05-28預計出貨) ;       3MH00463 (2024-05-28預計出貨) ;       3MH00464 (2024-06-06預計出貨) ;       3MH00465 (2024-06-06預計出貨) ;       3MH00466 (2024-06-06預計出貨) ;       3MH00467 (2024-06-06預計出貨) ;       3MH00468 (2024-06-06預計出貨) ;       3MH00469 (2024-06-18預計出貨) ;       3MH00470 (2024-06-18預計出貨) ;       3MH00471 (2024-06-18預計出貨) ;       3MH00472 (2024-06-18預計出貨) ;       3MH00473 (2024-06-18預計出貨) ;       3MH00474 (2024-07-02預計出貨) ;       3MH00475 (2024-07-02預計出貨) ;       3MH00476 (2024-07-02預計出貨) ;       3MH00477 (2024-07-02預計出貨) ;       3MH00478 (2024-07-12預計出貨) ;       3MH00479 (2024-07-12預計出貨) ;       3MH00480 (2024-07-12預計出貨) ;       3MH00481 (2024-07-12預計出貨) ;       ","2,968,000","7","2,968,000","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090128":["M23090128","林妏珊","杜孟釗","600,000","1","4MH00186 (2024-07-15預計出貨) ;       ","120,000","0","120,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090142":["M23090142","天鴻營造(東門段96)","杜孟釗","1,240,000","2","3MH00850 (2024-01-25貨抵工地) ;       3MH00851 (2024-01-25貨抵工地) ;       ","620,000","0",0,0,0,0,"620,000","0","0","0",0,0,0,0,"0","0",0,0],"M23090066":["M23090066","力洋營造有限公司","杜孟釗","1,000,000","1","3MW00739 (2024-03-08預計出貨) ;       ","200,000","2","200,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230876":["M230876","何乃玲","杜孟釗","660,000","1","4MH00009 (2024-04-30預計出貨) ;       ","132,000","0","132,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090074":["M23090074","權鵬營造股份有限公司","杜孟釗","680,000","1","3MH00787 (2024-07-03預計出貨) ;       ","102,000","4","102,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100120":["M23100120","和昌建設 (新和段)","杜孟釗","1,800,000","2","3MX00934 (2024-03-05預計出貨) ;       3MX00935 (2024-03-05預計出貨) ;       ","360,000","2","360,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M24010248":["M24010248","比意設計-榮成一街","杜孟釗","570,000","1","4MH00226 (2024-05-15預計出貨) ;       ","114,000","0","114,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110059":["M23110059","陳樹蘭","杜孟釗","620,000","1","4MH00075 (2024-05-06預計出貨) ;       ","124,000","0","124,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110068":["M23110068","和豊營造-藍田西段","杜孟釗","670,000","1","4MH00004 (2024-05-03預計出貨) ;       ","134,000","0","134,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110041":["M23110041","達豐開發-埤頂段","杜孟釗","1,900,000","2","4MX00007 (2024-05-15預計出貨) ;       4MX00008 (2024-05-15預計出貨) ;       ","380,000","0","380,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110004":["M23110004","勤富建設(玉田段)","杜孟釗","820,000","1","4MX00155 (2024-05-02預計出貨) ;       ","164,000","0","164,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110097":["M23110097","居岩建設股(新社皮段)","杜孟釗","1,100,000","1","4MW00187 (2024-05-14預計出貨) ;       ","220,000","0","220,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231124":["M231124","崧本房地開發(苓雅寮段)","杜孟釗","620,000","1","3MH00540 (2023-12-25官檢完畢) ;       ","248,000","3","0","0",0,0,"124,000","3","124,000","2",0,0,0,0,"0","0",0,0],"M230562":["M230562","昱陞建設(覆鼎金段)","杜孟釗","3,780,000","6","3MH00928 (2024-05-07預計出貨) ;       3MH00929 (2024-05-07預計出貨) ;       3MH00930 (2024-05-17預計出貨) ;       3MH00931 (2024-05-17預計出貨) ;       3MH00932 (2024-06-04預計出貨) ;       3MH00933 (2024-06-04預計出貨) ;       ","756,000","2","756,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230750":["M230750","蔡結勝(A1)","杜孟釗","660,000","1","4MH00005 (2024-07-18預計出貨) ;       ","132,000","0","132,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230751":["M230751","蔡結晟(A2)","杜孟釗","680,000","1","4MH00006 (2024-07-18預計出貨) ;       ","136,000","0","136,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23080088":["M23080088","乙男營造廠房","杜孟釗","740,000","1","3MW00960 (2024-03-07預計出貨) ;       ","148,000","2","148,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23080166":["M23080166","利品建設-蚵寮段","杜孟釗","2,044,980","2","4MX00010 (2024-08-06預計出貨) ;       4MX00011 (2024-08-06預計出貨) ;       ","408,996","0","408,996","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230599":["M230599","陳鼎文","杜孟釗","630,000","1","3MH00286 (2023-12-08試車完畢) ;       ","315,000","4","0","0",0,0,"189,000","4",0,0,"126,000","1",0,0,"0","0",0,0],"M230522":["M230522","寶盟建設(宏明段)","杜孟釗","1,080,000","2","3MH00427 (2024-04-09預計出貨) ;       3MH00428 (2024-04-09預計出貨) ;       ","216,000","7","216,000","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230428":["M230428","龍耀木業","杜孟釗","680,000","1","3MH00371 (2024-02-07官檢完畢) ;       ","612,000","7","136,000","7",0,0,"340,000","2",0,0,"136,000","0",0,0,"0","0",0,0],"M230420":["M230420","寶龍生命紀念館","杜孟釗","1,900,000","2","3MW00199 (2024-04-17預計出貨) ;       3MW00200 (2024-04-17預計出貨) ;       ","390,000","9","390,000","9",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230371":["M230371","湖內全聯廠房","杜孟釗","850,000","1","3MW00190 (2023-09-28官檢完畢) ;       ","595,000","6","0","0",0,0,"425,000","6",0,0,"170,000","5",0,0,"0","0",0,0],"M230270":["M230270","岳銘建築(牛潮埔段)","杜孟釗","3,300,000","6","3MH00304 (2024-06-12預計出貨) ;       3MH00305 (2024-06-12預計出貨) ;       3MH00306 (2024-06-12預計出貨) ;       3MH00307 (2024-06-12預計出貨) ;       3MH00308 (2024-06-12預計出貨) ;       3MH00309 (2024-06-12預計出貨) ;       ","660,000","8","660,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230165":["M230165","鴻居營造(利百特儲運中心)","杜孟釗","980,000","1","3MX00133 (2024-03-06預計出貨) ;       ","196,000","8","196,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230157":["M230157","同城土木(林孜亭)","杜孟釗","530,000","1","3MH00303 (2024-01-30試車完畢) ;       ","477,000","8","106,000","8",0,0,"265,000","0",0,0,"106,000","0",0,0,"0","0",0,0],"M230121":["M230121","豐鉅開發(仁愛段)","杜孟釗","1,200,000","2","3MH00284 (2024-06-18預計出貨) ;       3MH00285 (2024-06-18預計出貨) ;       ","240,000","8","240,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230112":["M230112","常勝鑫建設（山明段）","杜孟釗","800,000","1","3MX00109 (2024-04-10預計出貨) ;       ","160,000","10","160,000","10",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230078":["M230078","王彤熒","杜孟釗","900,000","1","3MW00376 (2024-07-03預計出貨) ;       ","180,000","7","180,000","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M220476":["M220476","信泓營造工程有限公司(榮安街)","杜孟釗","550,000","1","3MH00023 (2024-02-27預計出貨) ;       ","110,000","12","110,000","12",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M220495":["M220495","大方無隅(育仁段)","杜孟釗","1,900,000","2","3MX00501 (2024-10-08預計出貨) ;       3MX00502 (2024-10-08預計出貨) ;       ","380,000","6","380,000","6",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"D23070118":["D23070118","兆淞營造(蘇惠珍)","杜孟釗","630,000","1","3MH00554 (2024-01-05試車完畢) ;       ","252,000","2","0","0",0,0,"126,000","2","126,000","1",0,0,0,0,"0","0",0,0],"M220389":["M220389","欣宏達建設(林子邊段)","杜孟釗","5,000,000","4","3MX00372 (2024-09-10預計出貨) ;       3MX00373 (2024-09-10預計出貨) ;       3MX00374 (2024-09-10預計出貨) ;       3MX00375 (2024-09-10預計出貨) ;       ","1,000,000","7","1,000,000","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M220379":["M220379","同城土木(陳偉庭)","杜孟釗","560,000","1","3MH00025 (2024-03-21預計出貨) ;       ","112,000","12","112,000","12",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M220355":["M220355","國合營造-廣興段","楊勝安","1,100,000","1","2MX00044 (2024-04-15預計出貨) ;       ","660,000","13","220,000","13","440,000","12","0","0",0,0,"0","0",0,0,"0","0",0,0],"D23080170":["D23080170","峰宥土木包工業","楊勝安","590,000","1","3MH00733 (2024-01-13試車完畢) ;       ","354,000","1","0","0",0,0,"177,000","1",0,0,"177,000","0",0,0,"0","0",0,0],"M230064":["M230064","秉藙營造-戴欣哲住宅新建工程","楊勝安","580,000","1","3MH00093 (2023-09-13已移交) ;      ","580,000","9","116,000","9","232,000","7","116,000","7",0,0,"58,000","4",0,0,"58,000","4",0,0],"M230071":["M230071","愛山林建設-土城金城帝寶","楊勝安","800,000","1","3MW00067 (2023-07-19已移交) ;      ","720,000","9","160,000","9",0,0,"240,000","8",0,0,"240,000","6",0,0,"80,000","6",0,0],"M230156":["M230156","胡一帆-民權路室外增建案","楊勝安","600,000","1","3MH00504 (2023-12-28已移交) ;      ","600,000","6","120,000","6","240,000","4","120,000","3","60,000","1",0,0,0,0,"60,000","1",0,0],"M230408":["M230408","穆刻室內-新竹案","楊勝安","750,000","1","3MP00254 (2024-04-02預計出貨) ;       ","150,000","6","0","0","150,000","6","0","0",0,0,"0","0",0,0,"0","0",0,0],"M230410":["M230410","築康建設-新店安城段","楊勝安","2,150,000","2","3MX00290 (2024-06-01預計出貨) ;       3MX00291 (2024-06-01預計出貨) ;       ","1,290,000","7","430,000","7","860,000","5","0","0",0,0,"0","0",0,0,"0","0",0,0],"M23080136":["M23080136","成盟-茵夢湖何宅","楊勝安","670,000","1","4MH00225 (2024-08-01預計出貨) ;       ","134,000","0","134,000","0","0","0","0","0",0,0,"0","0",0,0,"0","0",0,0],"M23080146":["M23080146","黃卓原","楊勝安","720,000","1","3MH00854 (2024-06-04預計出貨) ;       ","288,000","1","0","0","288,000","1","0","0",0,0,"0","0",0,0,"0","0",0,0],"M230765":["M230765","宏晟營造-樹林樹德段","楊勝安","820,000","1","3MH00403 (2024-05-02預計出貨) ;       ","492,000","6","164,000","6","328,000","5","0","0","0","0",0,0,0,0,"0","0",0,0],"M230767":["M230767","蕭又齊-基隆復興路","楊勝安","590,000","1","4MH00224 (2024-10-01預計出貨) ;       ","118,000","0","118,000","0","0","0","0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110090":["M23110090","川鉅建設有限公司(桃園)","楊勝安","650,000","1","3MH01020 (2024-05-01預計出貨) ;       ","130,000","1","130,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110104":["M23110104","澤里設計工程有限公司","楊勝安","600,000","1","3MH01021 (2024-04-03預計出貨) ;       ","240,000","0","0","0","240,000","0","0","0",0,0,"0","0",0,0,"0","0",0,0],"M231046":["M231046","十方建築-峨嵋十方禪林","楊勝安","720,000","1","3MH00852 (2024-06-14預計出貨) ;       ","336,000","2","0","0","336,000","2","0","0",0,0,"0","0",0,0,"0","0",0,0],"M23120159":["M23120159","螺絲瑪莉義式央廚","楊勝安","1,600,000","1","4MX00219 (2024-09-22預計出貨) ;       ","320,000","0","320,000","0","0","0","0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100104":["M23100104","愛山林建設開發股份有限公司","楊勝安","850,000","1","3MW00927 (2024-01-25試車完畢) ;       ","510,000","0","0","0",0,0,"255,000","0",0,0,"255,000","0",0,0,"0","0",0,0],"M230970":["M230970","歌爾開發-湖口新盛段621","楊勝安","700,000","1","4MH00108 (2024-09-11預計出貨) ;       ","210,000","0","210,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100024":["M23100024","太平洋電梯工業股份有限公司","楊勝安","787,500","1","3MH00797 (2024-01-11試車完畢) ;       ","472,500","1","0","0",0,0,"315,000","1",0,0,"157,500","0",0,0,"0","0",0,0],"M23100026":["M23100026","何胤辰","楊勝安","600,000","1","4MH00162 (2024-06-26預計出貨) ;       ","180,000","0","180,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090150":["M23090150","瀚黌樘控股-新埔七街","楊勝安","680,000","1","3MP00865 (2024-02-20預計出貨) ;       ","204,000","2","204,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090003":["M23090003","築園工程顧問有限公司","蔡杰錡","680,000","1","3MP00966 (2024-02-22預計出貨) ;       ","136,000","2","136,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230953":["M230953","鉅榮建設-麻豆案","蔡杰錡","1,608,000","3","4MH00096 (2024-05-15預計出貨) ;       4MH00097 (2024-05-15預計出貨) ;       4MH00098 (2024-05-15預計出貨) ;       ","321,600","0","321,600","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100091":["M23100091","金豐泰","蔡杰錡","700,000","1","3MH01031 (2024-05-15預計出貨) ;       ","140,000","1","140,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100089":["M23100089","龍華街六角空間","蔡杰錡","700,000","1","3MP00937 (2024-06-18預計出貨) ;       ","140,000","2","140,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231002":["M231002","磬揚建設有限公司","蔡杰錡","1,008,000","1","3MW00965 (2024-04-25預計出貨) ;       ","201,600","2","201,600","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231003":["M231003","震營建設-恆春案","蔡杰錡","5,320,000","8","3MH00704 (2024-05-02預計出貨) ;       3MH00705 (2024-05-02預計出貨) ;       3MH00706 (2024-05-02預計出貨) ;       3MH00707 (2024-05-14預計出貨) ;       3MH00708 (2024-05-14預計出貨) ;       3MH00709 (2024-05-14預計出貨) ;       3MH00710 (2024-05-28預計出貨) ;       3MH00711 (2024-05-28預計出貨) ;       ","1,064,000","5","1,064,000","5",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23120145":["M23120145","利坤營造-崗山東街","蔡杰錡","590,000","1","4MH00179 (2024-05-15預計出貨) ;       ","118,000","0","118,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23120156":["M23120156","一甲國小","蔡杰錡","885,000","1","4MW00137 (2024-05-15預計出貨) ;       ","177,000","0","177,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23120117":["M23120117","年洲商標工業廠房-富傑營造","蔡杰錡","1,300,000","1","4MW00120 (2024-05-15預計出貨) ;       ","260,000","0","260,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23120020":["M23120020","松暉營造-前瞻","蔡杰錡","5,180,000","2","4MW00094 (2024-05-15預計出貨) ;       4MX00095 (2024-05-15預計出貨) ;       ","1,036,000","0","1,036,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23120039":["M23120039","萬鼎工程-TSA路科廠房","蔡杰錡","1,659,000","1","4MX00161 (2024-06-15預計出貨) ;       ","165,900","1","165,900","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23120053":["M23120053","吉利建設神農段","蔡杰錡","1,530,000","2","4MX00138 (2024-06-11預計出貨) ;       4MX00139 (2024-06-11預計出貨) ;       ","306,000","0","306,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23120054":["M23120054","坤圓科技營造有限公司","蔡杰錡","682,500","1","3MP01049 (2024-05-15預計出貨) ;       ","136,500","1","136,500","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231097":["M231097","王鋕清住宅案","蔡杰錡","670,000","1","3MH00539 (2024-01-05試車完畢) ;       ","469,000","1","0","0",0,0,"335,000","1","134,000","1",0,0,0,0,"0","0",0,0],"M231098":["M231098","泰洲營造股份有限公司","蔡杰錡","1,050,000","1","3MW00662 (2024-01-09試車完畢) ;       ","945,000","4","210,000","4",0,0,"525,000","1",0,0,"210,000","0",0,0,"0","0",0,0],"M231100":["M231100","正興路122號電梯改修工程","蔡杰錡","610,000","1","3MH00538 (2023-11-23貨抵工地) ;       ","427,000","6","122,000","6",0,0,"305,000","2",0,0,"0","0",0,0,"0","0",0,0],"M231069":["M231069","美林達建設恆春10戶","蔡杰錡","5,100,000","10","3MH00681 (2024-05-08預計出貨) ;       3MH00682 (2024-05-08預計出貨) ;       3MH00683 (2024-05-08預計出貨) ;       3MH00684 (2024-05-21預計出貨) ;       3MH00685 (2024-05-21預計出貨) ;       3MH00686 (2024-05-21預計出貨) ;       3MH00687 (2024-06-05預計出貨) ;       3MH00688 (2024-06-05預計出貨) ;       3MH00689 (2024-06-18預計出貨) ;       3MH00690 (2024-06-18預計出貨) ;       ","1,020,000","4","1,020,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110052":["M23110052","光明路二段(勇信工程有限公司)","蔡杰錡","520,000","1","3MH01030 (2024-03-19預計出貨) ;       ","104,000","1","104,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110053":["M23110053","富昇肉品","蔡杰錡","780,000","1","3MP01036 (2024-04-03預計出貨) ;       ","156,000","1","156,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110107":["M23110107","成太機械","蔡杰錡","950,000","1","3MW01035 (2024-08-07預計出貨) ;       ","190,000","1","190,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110075":["M23110075","郭藝均(九如二路)","蔡杰錡","680,000","1","3MP01022 (2024-03-07預計出貨) ;       ","136,000","1","136,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230770":["M230770","新中大實業股份有限公司","蔡杰錡","700,000","1","3MP00370 (2024-01-05安裝完畢) ;       ","350,000","1","0","0",0,0,"350,000","1",0,0,"0","0",0,0,"0","0",0,0],"M230771":["M230771","佳皇建設-麻豆5戶住宅","蔡杰錡","2,690,000","5","3MH00420 (2024-05-20預計出貨) ;       3MH00421 (2024-05-20預計出貨) ;       3MH00422 (2024-05-20預計出貨) ;       3MH00423 (2024-05-20預計出貨) ;       3MH00424 (2024-05-20預計出貨) ;       ","538,000","7","538,000","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23080109":["M23080109","富諭建設","蔡杰錡","3,180,000","6","4MH00069 (2024-11-05預計出貨) ;       4MH00070 (2024-11-05預計出貨) ;       4MH00071 (2024-11-05預計出貨) ;       4MH00072 (2024-11-05預計出貨) ;       4MH00073 (2024-11-05預計出貨) ;       4MH00074 (2024-11-05預計出貨) ;       ","636,000","12","636,000","12",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230509":["M230509","仙盈建設","蔡杰錡","6,760,000","13","3MH00177 (2023-12-17試車完畢) ;       3MH00178 (2023-11-12試車完畢) ;       3MH00179 (2023-11-01試車完畢) ;       3MH00180 (2023-11-01試車完畢) ;       3MH00181 (2023-11-02試車完畢) ;       3MH00182 (2023-12-04試車完畢) ;       3MH00183 (2023-12-04試車完畢) ;       3MH00184 (2023-12-03試車完畢) ;       3MH00185 (2023-12-03試車完畢) ;       3MH00186 (2023-12-19試車完畢) ;       3MH00187 (2023-12-19試車完畢) ;       3MH00188 (2023-12-18試車完畢) ;       3MH00189 (2023-12-04試車完畢) ;       ","6,084,000","8","1,352,000","8",0,0,"3,380,000","6",0,0,"1,352,000","2",0,0,"0","0",0,0],"M230564":["M230564","佑陞建設-豐年段集合住宅","蔡杰錡","740,000","1","3MX00204 (2024-01-10試車完畢) ;       ","666,000","7","148,000","7",0,0,"370,000","2",0,0,"148,000","0",0,0,"0","0",0,0],"M230566":["M230566","寶鼎開發營造-班尼菲廠房","蔡杰錡","5,355,000","3","3MW00451 (2024-05-15預計出貨) ;       3MX00452 (2024-05-15預計出貨) ;       3MW00453 (2024-05-15預計出貨) ;       ","1,071,000","6","1,071,000","6",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230467":["M230467","豐富地產-大寮集合住宅","蔡杰錡","1,932,000","2","3MH00425 (2024-05-21預計出貨) ;       3MH00426 (2024-05-21預計出貨) ;       ","193,200","7","193,200","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230400":["M230400","霈晟股份有限公司-八里中山段集合住宅","蔡杰錡","750,000","1","3MX00201 (2024-02-20預計出貨) ;       ","150,000","8","150,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230375":["M230375","東龍地產-新和段集合住宅案","蔡杰錡","800,000","1","3MX00203 (2024-04-16預計出貨) ;       ","160,000","8","160,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230379":["M230379","興毅工程行熱河一街案","蔡杰錡","570,000","1","3MH00302 (2024-02-02貨抵工地) ;       ","399,000","7","114,000","7",0,0,"285,000","0",0,0,"0","0",0,0,"0","0",0,0],"M230339":["M230339","正和工程有限公司","蔡杰錡","700,000","1","3MX00176 (2024-03-06預計出貨) ;       ","140,000","9","140,000","9",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230341":["M230341","康庭國際股份有限公司","蔡杰錡","1,020,000","1","3MW00369 (2024-07-03預計出貨) ;       ","204,000","7","204,000","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230169":["M230169","鑫海建設-後港東段","蔡杰錡","1,695,000","3","3MH00150 (2024-01-16試車完畢) ;       3MH00151 (2024-01-16試車完畢) ;       3MH00152 (2024-01-16試車完畢) ;       ","1,531,500","9","327,000","9",0,0,"877,500","2",0,0,"327,000","0",0,0,"0","0",0,0],"M230176":["M230176","華明鋼鐵股份有限公司","蔡杰錡","550,000","1","3MH00202 (2024-02-01貨抵工地) ;       ","385,000","8","110,000","8",0,0,"275,000","0",0,0,"0","0",0,0,"0","0",0,0],"M230134":["M230134","寬室空間設計有限公司","蔡杰錡","580,000","1","3MH00301 (2023-12-19試車完畢) ;       ","522,000","8","116,000","8",0,0,"290,000","4",0,0,"116,000","1",0,0,"0","0",0,0],"M230137":["M230137","百春陽建設股份有限公司","蔡杰錡","5,200,000","8","3MH00620 (2024-09-04預計出貨) ;       3MH00621 (2024-05-02預計出貨) ;       3MH00622 (2024-05-03預計出貨) ;       3MH00623 (2024-05-14預計出貨) ;       3MH00624 (2024-09-04預計出貨) ;       3MH00625 (2024-05-14預計出貨) ;       3MH00626 (2024-05-21預計出貨) ;       3MH00627 (2024-09-04預計出貨) ;       ","1,040,000","5","1,040,000","5",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M230139":["M230139","帝勳實業-大寮集合住宅","蔡杰錡","1,400,000","2","3MH00570 (2024-07-05預計出貨) ;       3MH00571 (2024-07-05預計出貨) ;       ","280,000","5","280,000","5",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M230275":["M230275","李東遠","蔡杰錡","525,000","1","3MH00153 (2024-01-12安裝完畢) ;       ","349,500","9","117,000","9",0,0,"232,500","2",0,0,"0","0",0,0,"0","0",0,0],"M230214":["M230214","談達投資股份有限公司","蔡杰錡","520,000","1","3MH00111 (2024-02-01已移交) ;      ","104,000","6","0","0",0,0,"0","0",0,0,"52,000","6",0,0,"52,000","0",0,0],"M230072":["M230072","仙盈建設鹽水案","蔡杰錡","1,120,000","2","3MH00053 (2023-11-12試車完畢) ;       3MH00054 (2023-11-12試車完畢) ;       ","1,008,000","9","224,000","9",0,0,"560,000","8",0,0,"224,000","2",0,0,"0","0",0,0],"M230073":["M230073","旭發開發建設(旭墅7)","蔡杰錡","1,120,000","2","3MH00063 (2024-05-28預計出貨) ;       3MH00064 (2024-05-28預計出貨) ;       ","224,000","10","224,000","10",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230074":["M230074","健暉建設-仁勇路","蔡杰錡","720,000","1","3MH00105 (2024-03-19預計出貨) ;       ","144,000","11","144,000","11",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230075":["M230075","健暉建設-澄新五街","蔡杰錡","5,550,000","10","3MH00095 (2024-06-05預計出貨) ;       3MH00096 (2024-06-05預計出貨) ;       3MH00097 (2024-06-05預計出貨) ;       3MH00098 (2024-06-18預計出貨) ;       3MH00099 (2024-06-18預計出貨) ;       3MH00100 (2024-06-18預計出貨) ;       3MH00101 (2024-07-02預計出貨) ;       3MH00102 (2024-07-02預計出貨) ;       3MH00103 (2024-07-11預計出貨) ;       3MH00104 (2024-07-11預計出貨) ;       ","1,110,000","9",0,0,"1,110,000","9","0","0",0,0,"0","0",0,0,"0","0",0,0],"M220504":["M220504","鈦宇建設","蔡杰錡","4,600,000","8","3MH00055 (2024-01-12安裝完畢) ;       3MH00056 (2024-01-12安裝完畢) ;       3MH00057 (2024-01-12安裝完畢) ;       3MH00058 (2024-01-12安裝完畢) ;       3MH00059 (2024-01-12安裝完畢) ;       3MH00060 (2024-01-12安裝完畢) ;       3MH00061 (2023-12-22安裝完畢) ;       3MH00062 (2023-12-22安裝完畢) ;       ","3,680,000","11","920,000","11",0,0,"2,300,000","2","460,000","1","0","0",0,0,"0","0",0,0],"M230015":["M230015","陳麗珍","蔡杰錡","580,000","1","3MH00094 (2024-03-19預計出貨) ;       ","116,000","10","116,000","10",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M220478":["M220478","林汶亭","蔡杰錡","560,000","1","3MH00036 (2024-02-01已移交) ;      ","560,000","11","112,000","11",0,0,"280,000","5",0,0,"56,000","2",0,0,"112,000","0",0,0],"M230032":["M230032","昂陞營造-昇陽長照","蔡杰錡","1,250,000","1","3MX00048 (2023-12-26安裝完畢) ;       ","875,000","9","250,000","9",0,0,"625,000","2",0,0,"0","0",0,0,"0","0",0,0],"M230047":["M230047","春木建設-麟愛案","蔡杰錡","920,000","1","3MW00198 (2024-01-17貨抵工地) ;       ","644,000","9","184,000","9",0,0,"460,000","0",0,0,"0","0",0,0,"0","0",0,0],"M230109":["M230109","豐富地產(二苓案)","蔡杰錡","690,000","1","3MH00149 (2024-08-06預計出貨) ;       ","69,000","9","69,000","9",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230105":["M230105","金莎工程有限公司","蔡杰錡","900,000","1","3MW00117 (2024-04-03預計出貨) ;       ","180,000","10","180,000","10",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M220209":["M220209","詠大營造-高雄案","蔡杰錡","1,000,000","1","2MW00001 (2023-08-25官檢完畢) ;       ","900,000","15","200,000","15",0,0,"500,000","8","200,000","8",0,0,0,0,"0","0",0,0],"M220224":["M220224","詠大營造-東昀投資-屏東案","蔡杰錡","2,000,000","2","2MW00002 (2024-04-19預計出貨) ;       2MW00003 (2024-04-19預計出貨) ;       ","400,000","15","400,000","15",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M220243":["M220243","有田建設有限公司","蔡杰錡","4,320,000","8","2MH00045 (2024-04-05預計出貨) ;       2MH00049 (2024-04-05預計出貨) ;       2MH00050 (2024-04-05預計出貨) ;       2MH00051 (2024-04-05預計出貨) ;       2MH00052 (2024-05-05預計出貨) ;       2MH00053 (2024-05-05預計出貨) ;       2MH00054 (2024-05-05預計出貨) ;       2MH00055 (2024-05-05預計出貨) ;       ","864,000","12","864,000","12",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M220244":["M220244","達豐昇建設","蔡杰錡","2,284,000","2","2MW00004 (2024-04-10預計出貨) ;       2MW00005 (2024-04-10預計出貨) ;       ","380,000","15","380,000","15",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M220305":["M220305","詠大營造-新屋頭洲段住宅","蔡杰錡","700,000","1","3MH00112 (2024-05-02預計出貨) ;       ","140,000","10","140,000","10",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M220356":["M220356","寶潤營造-高都獅甲","蔡杰錡","950,000","1","3MW00114 (2024-01-04官檢完畢) ;       ","760,000","10","190,000","10",0,0,"380,000","4",0,0,"190,000","2",0,0,"0","0",0,0],"M220332":["M220332","圻豐建設","蔡杰錡","660,000","1","2MH00046 (2023-12-20試車完畢) ;       ","594,000","13","132,000","13",0,0,"330,000","3","66,000","2","66,000","1",0,0,"0","0",0,0],"M220393":["M220393","川庭開發有限公司","蔡杰錡","550,000","1","3MH00002 (2024-02-01已移交) ;      ","550,000","11","110,000","11",0,0,"275,000","7","55,000","6","55,000","4",0,0,"55,000","0",0,0],"D23080110":["D23080110","竟能有限公司","蔡杰錡","580,000","1","3MH00772 (2024-01-31安裝完畢) ;       ","290,000","1","0","0",0,0,"290,000","1",0,0,"0","0",0,0,"0","0",0,0],"D23080132":["D23080132","偉唐營造(宜縉建設冬山集合住宅)","陳志文","2,590,000","2","3MX00775 (2024-07-01預計出貨) ;       3MX00776 (2024-07-01預計出貨) ;       ","518,000","4","518,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"D23080168":["D23080168","陳世明農舍(葉彥廷)","陳志文","546,000","1","3MH00817 (2024-02-01貨抵工地) ;       ","286,000","0","0","0",0,0,"286,000","0",0,0,"0","0",0,0,"0","0",0,0],"M230103":["M230103","敦柏建設股份有限公司","陳志文","950,000","1","3MX00132 (2024-11-05預計出貨) ;       ","190,000","9","190,000","9",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230077":["M230077","傳承建設-五結協和一段集合住宅","陳志文","890,000","1","3MW00515 (2024-03-29預計出貨) ;       ","178,000","6","178,000","6",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M230058":["M230058","葉彥廷(何朝宗農舍)","陳志文","556,000","1","3MH00039 (2024-01-14安裝完畢) ;       ","397,000","11","106,000","11",0,0,"291,000","1",0,0,"0","0",0,0,"0","0",0,0],"M230059":["M230059","葉彥廷(何朝順農舍)","陳志文","556,000","1","3MH00040 (2024-02-01試車完畢) ;       ","503,000","11","106,000","11",0,0,"291,000","1",0,0,"106,000","0",0,0,"0","0",0,0],"M230060":["M230060","林國川-游長喜玉田農舍","陳志文","530,000","1","3MH00377 (2024-02-27預計出貨) ;       ","106,000","7","106,000","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230061":["M230061","李志宏-三星農舍新建工程","陳志文","530,000","1","3MH00041 (2024-04-01預計出貨) ;       ","106,000","11","106,000","11",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230062":["M230062","璟福建設-五結鄉案集合住宅","陳志文","3,385,000","6","3MH00042 (2024-03-05預計出貨) ;       3MH00043 (2024-03-05預計出貨) ;       3MH00044 (2024-03-15預計出貨) ;       3MH00045 (2024-03-15預計出貨) ;       3MH00046 (2024-03-15預計出貨) ;       3MH00047 (2024-05-01預計出貨) ;       ","677,000","11","677,000","11",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230217":["M230217","許進東(沈秀娥農舍)","陳志文","520,000","1","3MH00113 (2023-11-03試車完畢) ;       ","468,000","10","104,000","10",0,0,"260,000","3",0,0,"104,000","2",0,0,"0","0",0,0],"M230218":["M230218","勝築建設有限公司","陳志文","870,000","1","3MW00108 (2024-06-30預計出貨) ;       ","174,000","10","174,000","10",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230332":["M230332","張建明游錦煌農舍","陳志文","550,000","1","3MH00126 (2024-03-21預計出貨) ;       ","109,000","10","109,000","10",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230333":["M230333","張建明游錦禎農舍","陳志文","550,000","1","3MH00125 (2024-03-12預計出貨) ;       ","109,000","10","109,000","10",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230212":["M230212","誠峰建設(安安兒股份有限公司)","陳志文","1,100,000","1","3MH00115 (2024-02-22預計出貨) ;       ","214,000","10","214,000","10",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230158":["M230158","羅崇勳(勳風烘培坊)","陳志文","1,270,000","1","3MW00292 (2024-03-06預計出貨) ;       ","254,000","8","254,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230148":["M230148","九畝田有限公司","陳志文","690,000","1","3MH00106 (2024-06-01預計出貨) ;       ","138,000","10","138,000","10",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230171":["M230171","游本南","陳志文","600,000","1","3MH00107 (2023-11-30試車完畢) ;       ","208,000","2","0","0",0,0,"104,000","2",0,0,"104,000","1",0,0,"0","0",0,0],"M230288":["M230288","喜耀建設","陳志文","860,000","1","3MW00253 (2024-01-17貨抵工地) ;       ","602,000","9","172,000","9",0,0,"430,000","0",0,0,"0","0",0,0,"0","0",0,0],"M230301":["M230301","李燦忠農舍","陳志文","530,000","1","3MH00127 (2024-05-01預計出貨) ;       ","106,000","10","106,000","10",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230303":["M230303","林文捷農舍","陳志文","530,000","1","3MH00194 (2024-01-24貨抵工地) ;       ","371,000","9","106,000","9",0,0,"265,000","0",0,0,"0","0",0,0,"0","0",0,0],"M230266":["M230266","美而快國際股份有限公司","陳志文","970,000","1","3MW00139 (2024-01-02官檢完畢) ;       ","364,000","2","0","0",0,0,"182,000","2",0,0,"182,000","1",0,0,"0","0",0,0],"M230346":["M230346","李志宏(林素月農舍)","陳志文","625,000","1","3MH00148 (2023-11-27試車完畢) ;       ","212,000","3","0","0",0,0,"106,000","3","106,000","2",0,0,0,0,"0","0",0,0],"M230403":["M230403","宜恩建設","陳志文","860,000","1","3MW00212 (2024-05-15預計出貨) ;       ","172,000","3","172,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230394":["M230394","宜縉建設(冬山透天住宅)","陳志文","1,599,000","3","3MH00544 (2024-03-08預計出貨) ;       3MH00545 (2024-03-08預計出貨) ;       3MH00546 (2024-03-08預計出貨) ;       ","319,800","5","319,800","5",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M230430":["M230430","大暐建設有限公司","陳志文","1,650,000","2","3MW00154 (2024-06-28預計出貨) ;       3MW00155 (2024-06-28預計出貨) ;       ","330,000","2","330,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230544":["M230544","游哲豪(林柏槐農舍)","陳志文","530,000","1","3MH00242 (2024-03-06預計出貨) ;       ","106,000","5","106,000","5",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230497":["M230497","家福春天建設有限公司","陳志文","2,400,000","3","3MW00213 (2024-05-30預計出貨) ;       3MW00214 (2024-05-30預計出貨) ;       3MW00215 (2024-05-30預計出貨) ;       ","480,000","4","480,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230526":["M230526","豫呈建設(桐沁乾們二段集合住宅)","陳志文","720,000","1","3MH00216 (2024-06-03預計出貨) ;       ","144,000","9","144,000","9",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230619":["M230619","大興發建設","陳志文","1,545,000","3","3MH00250 (2024-03-05預計出貨) ;       3MH00251 (2024-03-20預計出貨) ;       3MH00252 (2024-03-29預計出貨) ;       ","309,000","8","309,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230576":["M230576","高灃土木包工業(張鈿土農舍)","陳志文","520,000","1","3MH00557 (2023-12-27試車完畢) ;       ","364,000","1","0","0",0,0,"260,000","1","104,000","1",0,0,0,0,"0","0",0,0],"M230725":["M230725","寬闊建設股份有限公司","陳志文","700,000","1","3MX00533 (2024-09-17預計出貨) ;       ","140,000","1","140,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23080106":["M23080106","頭城武營段集合住宅(京翔建設)","陳志文","975,000","1","4MW00153 (2024-08-28預計出貨) ;       ","195,000","3","195,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230713":["M230713","泰勛建設(羅東鎮羅莊段80地號)","陳志文","740,000","1","3MH00445 (2024-06-01預計出貨) ;       ","148,000","7","148,000","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230774":["M230774","趙志星礁溪整建住宅","陳志文","540,000","1","3MH00378 (2024-02-20預計出貨) ;       ","108,000","7","108,000","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110118":["M23110118","凱達營造-唐承開發","陳志文","710,000","1","4MH00077 (2024-07-31預計出貨) ;       ","142,000","0","142,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231148":["M231148","賴協隆(邱山田農舍)","陳志文","520,000","1","3MH00808 (2024-06-30預計出貨) ;       ","104,000","3","104,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231150":["M231150","力大開發股份有限公司","陳志文","520,000","1","3MH00738 (2024-02-06安裝完畢) ;       ","260,000","0","0","0",0,0,"260,000","0",0,0,"0","0",0,0,"0","0",0,0],"M231167":["M231167","王閩霆","陳志文","530,000","1","3MH00656 (2024-02-16預計出貨) ;       ","106,000","5","106,000","5",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M231061":["M231061","杜代書林褲煌農舍","陳志文","560,000","1","3MH00532 (2024-04-19預計出貨) ;       ","112,000","6","112,000","6",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23120058":["M23120058","新豪營造","陳志文","1,200,000","1","4MW00063 (2024-03-15預計出貨) ;       ","240,000","0","240,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231161":["M231161","劉俊宏","陳志文","520,000","1","3MH00657 (2024-05-30預計出貨) ;       ","104,000","5","104,000","5",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M231179":["M231179","復宇企業有限公司(盧建隆)","陳志文","600,000","1","3MH00555 (2023-12-12試車完畢) ;       ","120,000","1","0","0",0,0,"0","0","120,000","1",0,0,0,0,"0","0",0,0],"M231202":["M231202","千風建設股份有限公司","陳志文","695,000","1","3MH00774 (2024-04-16預計出貨) ;       ","139,000","4","139,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231204":["M231204","環球建設(大福段)","陳志文","720,000","1","3MH00609 (2023-11-26試車完畢) ;       ","144,000","2","0","0",0,0,"0","0","144,000","2",0,0,0,0,"0","0",0,0],"M231205":["M231205","環球建設(壯圍中興段)","陳志文","1,420,000","2","3MH00610 (2024-06-10預計出貨) ;       3MH00611 (2024-06-10預計出貨) ;       ","284,000","5","284,000","5",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M231019":["M231019","陳武祥建築師頭城烏石港段24地號","陳志文","730,000","1","3MH00531 (2024-03-13預計出貨) ;       ","146,000","1","146,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231024":["M231024","白水芳華酒業股份有限公司","陳志文","910,000","1","3MW00939 (2024-04-10預計出貨) ;       ","182,000","2","182,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100085":["M23100085","鼎弘健康生技","陳志文","3,850,000","7","4MH00101 (2024-08-29預計出貨) ;       4MH00102 (2024-08-29預計出貨) ;       4MH00103 (2024-08-29預計出貨) ;       4MH00104 (2024-08-29預計出貨) ;       4MH00105 (2024-08-29預計出貨) ;       4MH00106 (2024-08-29預計出貨) ;       4MH00107 (2024-08-29預計出貨) ;       ","770,000","0","770,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100099":["M23100099","品揚建設-冬山香和段","陳志文","760,000","1","4MH00061 (2024-09-12預計出貨) ;       ","152,000","1","152,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230967":["M230967","築林興業(北成段住宅)","陳志文","535,000","1","3MH00853 (2024-03-19預計出貨) ;       ","107,000","3","107,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230968":["M230968","七賢土木包工業(李長發農會)","陳志文","520,000","1","3MH00485 (2024-04-01預計出貨) ;       ","104,000","6","104,000","6",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090010":["M23090010","亞比建設","陳志文","1,040,000","2","4MH00099 (2024-06-28預計出貨) ;       4MH00100 (2024-06-28預計出貨) ;       ","208,000","0","208,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090040":["M23090040","賴文專-張國文農舍","陳志文","518,000","1","4MH00060 (2024-06-26預計出貨) ;       ","103,600","2","103,600","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090041":["M23090041","賴文專-高阿昭農舍","陳志文","518,000","1","4MH00059 (2024-06-26預計出貨) ;       ","103,600","2","103,600","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230861":["M230861","林名宏頭城拔雅段透天住宅","陳志文","620,000","1","3MH00429 (2024-01-23試車完畢) ;       ","558,000","4","124,000","4",0,0,"310,000","1",0,0,"124,000","0",0,0,"0","0",0,0],"M23090118":["M23090118","日昌營造-陳正農","陳志文","520,000","1","4MH00078 (2024-06-01預計出貨) ;       ","104,000","0","104,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090137":["M23090137","群盛食品-羅東羅莊街","陳志文","1,680,000","1","4MX00076 (2024-06-01預計出貨) ;       ","336,000","3","336,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090063":["M23090063","連冠建設-國民一段","陳志文","1,820,000","2","3MW00958 (2024-04-20預計出貨) ;       3MW00959 (2024-04-20預計出貨) ;       ","364,000","2","364,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090022":["M23090022","文學苑2期(京禾建設)","陳志文","1,050,000","1","4MX00154 (2024-10-30預計出貨) ;       ","210,000","0","210,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090068":["M23090068","眾信營造(中壢埔頂段)","趙漢霖","980,000","1","3MW00940 (2025-02-10預計出貨) ;       ","294,000","2","294,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230847":["M230847","張正忠(大園區橫山段)","趙漢霖","570,000","1","3MH00547 (2024-12-24預計出貨) ;       ","171,000","5","171,000","5",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230982":["M230982","亞灣開發有限公司","趙漢霖","2,100,000","2","3MW00489 (2024-10-15預計出貨) ;       3MW00490 (2024-10-15預計出貨) ;       ","630,000","6","630,000","6",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100076":["M23100076","雲磊建設","趙漢霖","2,800,000","4","3MH01043 (2024-05-15預計出貨) ;       3MH01044 (2024-05-15預計出貨) ;       3MH01045 (2024-05-15預計出貨) ;       3MH01046 (2024-05-15預計出貨) ;       ","840,000","1","840,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100078":["M23100078","新竹市武陵段(姜佳妡)","趙漢霖","665,000","1","3MH00977 (2024-07-10預計出貨) ;       ","199,500","2","199,500","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100135":["M23100135","鉅立營造","趙漢霖","750,000","1","3MH01047 (2024-05-15預計出貨) ;       ","225,000","1","225,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23120002":["M23120002","人合營造","趙漢霖","880,000","1","4MW00064 (2024-04-01預計出貨) ;       ","176,000","1","176,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23120067":["M23120067","玖群-八德興豐段","趙漢霖","1,120,000","2","4MH00118 (2024-06-15預計出貨) ;       4MH00119 (2024-06-15預計出貨) ;       ","336,000","0","336,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110100":["M23110100","堡居建設","趙漢霖","1,840,000","2","4MW00057 (2025-02-10預計出貨) ;       4MW00058 (2025-02-10預計出貨) ;       ","552,000","0","552,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110073":["M23110073","郭為宸-桃園中埔段","趙漢霖","750,000","1","4MH00157 (2024-11-15預計出貨) ;       ","225,000","0","225,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23070155":["M23070155","眾信營造股份有限公司","趙漢霖","600,000","1","3MH00864 (2024-04-22預計出貨) ;       ","180,000","3","180,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230703":["M230703","寶台建設有限公司","趙漢霖","2,516,000","2","3MX00487 (2024-05-17預計出貨) ;       3MX00488 (2024-05-17預計出貨) ;       ","754,800","6","754,800","6",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230656":["M230656","元展開發-觀音草福段395地號","趙漢霖","1,852,000","2","3MX00404 (2024-04-10預計出貨) ;       3MX00405 (2024-04-10預計出貨) ;       ","384,000","7","384,000","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23080173":["M23080173","富昌發建設有限公司","趙漢霖","1,480,000","2","3MX00861 (2024-06-03預計出貨) ;       3MX00862 (2024-06-03預計出貨) ;       ","444,000","3","444,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230802":["M230802","元展開發-觀音草福段395-1地號","趙漢霖","860,000","1","3MX00406 (2024-04-10預計出貨) ;       ","172,000","6","172,000","6",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230534":["M230534","元臺建設有限公司","趙漢霖","5,040,000","9","3MH00941 (2024-05-10預計出貨) ;       3MH00942 (2024-05-10預計出貨) ;       3MH00943 (2024-05-10預計出貨) ;       3MH00944 (2024-05-10預計出貨) ;       3MH00945 (2024-05-10預計出貨) ;       3MH00946 (2024-05-10預計出貨) ;       3MH00947 (2024-05-10預計出貨) ;       3MH00948 (2024-05-10預計出貨) ;       3MH00949 (2024-05-10預計出貨) ;       ","1,512,000","2","1,512,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230479":["M230479","全新建設有限公司","趙漢霖","1,500,000","2","3MX00257 (2024-05-15預計出貨) ;       3MX00310 (2024-05-15預計出貨) ;       ","450,000","5","0","0","450,000","5","0","0",0,0,"0","0",0,0,"0","0",0,0],"M230018":["M230018","樂橋建設有限公司","趙漢霖","560,000","1","3MH00066 (2024-04-01預計出貨) ;       ","336,000","9","112,000","9","224,000","6","0","0",0,0,"0","0",0,0,"0","0",0,0],"M220195":["M220195","鑫建豪營造有限公司","趙漢霖","990,000","1","3MW00256 (2024-08-15預計出貨) ;       ","594,000","9","198,000","9","396,000","7","0","0",0,0,"0","0",0,0,"0","0",0,0],"D23070156":["D23070156","鄭鈞鴻(竹北幸福街)","趙漢霖","2,172,000","1","3MX00680 (2024-04-01預計出貨) ;       ","651,600","4","651,600","4",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M220289":["M220289","鑫建豪營造有限公司","趙漢霖","570,000","1","3MH00255 (2024-05-20預計出貨) ;       ","285,000","9","114,000","9","171,000","7","0","0",0,0,"0","0",0,0,"0","0",0,0],"D23070085":["D23070085","永融營造(大圓環區南路)","章又仁","1,020,002","2","3MH00658 (2024-03-05預計出貨) ;       3MH00659 (2024-03-05預計出貨) ;       ","204,000","5","204,000","5",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"D23070086":["D23070086","永融營造(大園學八街)","章又仁","1,050,000","2","3MH00660 (2024-04-05預計出貨) ;       3MH00661 (2024-04-05預計出貨) ;       ","210,000","5","210,000","5",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M23080187":["M23080187","鴻耀國際開發有限公司","章又仁","1,010,000","1","3MW00805 (2024-01-12貨抵工地) ;       ","407,000","3","3,000","3",0,0,"404,000","0",0,0,"0","0",0,0,"0","0",0,0],"M23080188":["M23080188","新城營造","章又仁","2,150,000","2","4MX00079 (2024-12-31預計出貨) ;       4MX00080 (2024-12-31預計出貨) ;       ","430,000","0","430,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230714":["M230714","許美菊","章又仁","560,000","1","3MH00293 (2024-05-24預計出貨) ;       ","168,000","3","168,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230781":["M230781","青埔吳公館","章又仁","820,000","1","3MH00507 (2024-03-11預計出貨) ;       ","246,000","6","246,000","6",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230786":["M230786","青埔陳威宇住宅案","章又仁","615,000","1","3MH00407 (2024-09-10預計出貨) ;       ","184,500","7","184,500","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23120064":["M23120064","張興鈺","章又仁","554,650","1","4MH00180 (2024-07-31預計出貨) ;       ","166,395","0","166,395","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23120065":["M23120065","陳連政住宅案","章又仁","550,000","1","4MH00082 (2024-05-24預計出貨) ;       ","165,000","0","165,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230851":["M230851","澄鳴建設-高明段集合式住宅案","章又仁","1,200,000","1","3MW00558 (2024-03-19預計出貨) ;       ","36,000","5","36,000","5",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M230943":["M230943","岩美開發建設-中壢案","章又仁","1,160,000","2","3MH00408 (2024-01-25已移交) ;      3MH00409 (2024-01-25已移交) ;      ","1,160,000","7","348,000","7",0,0,"464,000","3",0,0,"232,000","0",0,0,"116,000","0",0,0],"M230936":["M230936","啟森營造股份有限公司","章又仁","8,405,875","5","3MW00695 (2024-06-03預計出貨) ;       3MW00697 (2024-06-03預計出貨) ;       3MW00698 (2024-06-03預計出貨) ;       3MW00699 (2024-06-03預計出貨) ;       3MW00696 (2024-06-03預計出貨) ;       ","1,681,175","4","1,681,175","4",0,0,"0","0",0,0,"0","0",0,0,"0","0","0","0"],"M23090140":["M23090140","廣瓏建設有限公司","李烘銘","4,000,000","4","3MW00855 (2024-06-14T10:10預計出貨) ;       3MW00856 (2024-06-14T10:10預計出貨) ;       3MW00857 (2024-06-14T10:10預計出貨) ;       3MW00858 (2024-06-14T10:10預計出貨) ;       ","400,000","3","400,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090132":["M23090132","上群地產開發股份有限公司","李烘銘","2,300,000","2","3MX00859 (2024-06-14T10:10預計出貨) ;       3MX00860 (2024-06-14T10:10預計出貨) ;       ","230,000","3","230,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090095":["M23090095","格誠建設有限公司","李烘銘","1,100,000","1","3MW00845 (2024-05-15預計出貨) ;       ","220,000","3","220,000","3",0,0,"0","0","0","0",0,0,"0","0","0","0",0,0],"M23090096":["M23090096","格睿建設有限公司","李烘銘","2,430,000","2","3MW00846 (2024-05-15T10:00預計出貨) ;       3MW00847 (2024-05-15T10:00預計出貨) ;       ","486,000","3","486,000","3",0,0,"0","0","0","0",0,0,"0","0","0","0",0,0],"M23090097":["M23090097","格睿建設有限公司","李烘銘","830,000","1","3MH00848 (2024-05-15T10:00預計出貨) ;       ","166,000","3","166,000","3",0,0,"0","0","0","0",0,0,"0","0","0","0",0,0],"M230881":["M230881","胡方翔(溫玉嬌)","李烘銘","910,000","1","3MW00415 (2024-03-19預計出貨) ;       ","258,000","7","258,000","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230838":["M230838","福興建設有限公司","李烘銘","5,615,000","10","3MH00582 (2024-02-16預計出貨) ;       3MH00583 (2024-02-16預計出貨) ;       3MH00584 (2024-03-06預計出貨) ;       3MH00585 (2024-03-06預計出貨) ;       3MH00586 (2024-03-06預計出貨) ;       3MH00587 (2024-03-06預計出貨) ;       3MH00588 (2024-03-18預計出貨) ;       3MH00589 (2024-03-18預計出貨) ;       3MH00590 (2024-03-18預計出貨) ;       3MH00591 (2024-01-08貨抵工地) ;       ","212,000","0","0","0",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M230839":["M230839","全鴻建設開發有限公司(觀音安和街)","李烘銘","530,000","1","3MH00592 (2024-02-03已移交) ;      ","424,000","0","0","0",0,0,"212,000","0",0,0,"159,000","0",0,0,"53,000","0",0,0],"M23100133":["M23100133","總富建設-彰化溪州鄉","李烘銘","610,000","1","3MH00962 (2024-02-27預計出貨) ;       ","183,000","2","183,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100138":["M23100138","王凱莉","李烘銘","670,000","1","3MH01034 (2024-05-21預計出貨) ;       ","201,000","1","201,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100140":["M23100140","薆綉室內裝修工程有限公司","李烘銘","520,000","1","3MH01048 (2024-03-11預計出貨) ;       ","159,000","1","159,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230994":["M230994","村玉建設-長春路案(B棟)","李烘銘","3,300,000","6","3MH00273 (2024-05-10預計出貨) ;       3MH00272 (2024-05-10預計出貨) ;       3MH00271 (2024-05-10預計出貨) ;       3MH00270 (2024-05-10預計出貨) ;       3MH00268 (2024-05-10預計出貨) ;       3MH00269 (2024-05-10預計出貨) ;       ","990,000","4","990,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231169":["M231169","鄭茂昌","李烘銘","2,080,000","2","3MH00596 (2024-03-15預計出貨) ;       ","210,000","5","0","5",0,0,0,0,0,0,0,0,0,0,0,0,0,0],"M231172":["M231172","乾唐建設有限公司","李烘銘","820,000","1","3MX00619 (2024-01-08安裝完畢) ;       ","492,000","1","0","0",0,0,"246,000","1","246,000","0",0,0,0,0,"0","0",0,0],"M231045":["M231045","寶祥營造廠有限公司(林梅清)","李烘銘","560,000","1","3MH00503 (2023-12-22安裝完畢) ;       ","168,000","2","0","0",0,0,"168,000","2",0,0,"0","0",0,0,"0","0",0,0],"M23110069":["M23110069","弘泰-彰化和美鎮","李烘銘","2,120,000","4","3MH01071 (2024-05-15預計出貨) ;       3MH01072 (2024-05-15預計出貨) ;       3MH01073 (2024-05-15預計出貨) ;       3MH01074 (2024-05-15預計出貨) ;       ","636,000","1","636,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110060":["M23110060","張弘起","李烘銘","535,000","1","3MH01054 (2024-04-10預計出貨) ;       ","160,500","1","160,500","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231126":["M231126","薆綉室內裝修工程有限公司-南投草屯鎮","李烘銘","540,000","1","3MH00535 (2024-01-12貨抵工地) ;       ","324,000","6","162,000","6",0,0,"162,000","0","0","0",0,0,0,0,"0","0",0,0],"M231133":["M231133","弘宬營造股份有限公司(西屯區)","李烘銘","700,000","1","3MH00646 (2024-11-29預計出貨) ;       ","210,000","5","210,000","5",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231134":["M231134","弘宬營造股份有限公司(北區)","李烘銘","1,170,000","2","3MH00644 (2024-06-05預計出貨) ;       3MH00645 (2024-06-05預計出貨) ;       ","3,000","5","3,000","5",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M231153":["M231153","馨盛-明德北路","李烘銘","510,000","1","3MH00779 (2024-05-14預計出貨) ;       ","153,000","4","153,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231154":["M231154","上互營造股份有限公司","李烘銘","1,020,000","2","3MH00777 (2024-08-10T12:00預計出貨) ;       3MH00778 (2024-08-10T12:00預計出貨) ;       ","255,000","4","255,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110123":["M23110123","瑋瓏營造有限公司","李烘銘","1,080,000","2","3MH01051 (2024-05-10預計出貨) ;       3MH01052 (2024-04-23預計出貨) ;       ","324,000","1","324,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110129":["M23110129","蕭崇家-彰化縣員林市","李烘銘","1,300,000","2","4MH00159 (2024-12-26預計出貨) ;       4MH00160 (2024-12-16預計出貨) ;       ","390,000","0","390,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230759":["M230759","通權建設-王江海","李烘銘","520,000","1","3MH00496 (2024-10-15預計出貨) ;       ","156,000","6","156,000","6",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230760":["M230760","通權建設-南投市","李烘銘","680,000","1","3MH00497 (2024-10-15預計出貨) ;       ","204,000","6","204,000","6",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230734":["M230734","盛立交通-貨運集貨站新建工程","李烘銘","750,000","1","3MW00509 (2024-02-21預計出貨) ;       ","225,000","5","225,000","5",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M230737":["M230737","萬大建設有限公司-台中沙鹿區","李烘銘","540,000","1","3MH00297 (2023-09-08試車完畢) ;       ","162,000","4","0","0",0,0,"0","0",0,0,"162,000","4",0,0,"0","0",0,0],"M230738":["M230738","江春池","李烘銘","560,000","1","3MH00298 (2023-11-02試車完畢) ;       ","168,000","2","0","0",0,0,"0","0",0,0,"168,000","2",0,0,"0","0",0,0],"M230631":["M230631","劉建利","李烘銘","740,000","1","3MW00248 (2023-10-05試車完畢) ;       ","385,560","4","0","0",0,0,"163,560","4",0,0,"222,000","3",0,0,"0","0",0,0],"M230662":["M230662","劉建忠","李烘銘","740,000","1","3MW00249 (2023-10-02試車完畢) ;       ","388,320","4","0","0",0,0,"166,320","4",0,0,"222,000","3",0,0,"0","0",0,0],"M230679":["M230679","劉繕綸","李烘銘","810,000","1","3MW00311 (2024-02-22預計出貨) ;       ","225,000","8","225,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230687":["M230687","永豪營造有限公司","李烘銘","525,000","1","3MH00355 (2023-12-08試車完畢) ;       ","472,500","7","157,500","7",0,0,"157,500","3",0,0,"157,500","1",0,0,"0","0",0,0],"M230635":["M230635","村玉建設-長春路案(A棟)","李烘銘","850,000","1","3MW00267 (2024-04-16預計出貨) ;       ","255,000","4","255,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230636":["M230636","村玉建設-科邨一路案","李烘銘","5,940,000","6","3MW00279 (2024-06-25預計出貨) ;       3MW00278 (2024-06-25預計出貨) ;       3MW00277 (2024-06-25預計出貨) ;       3MW00276 (2024-06-25預計出貨) ;       3MW00275 (2024-06-25預計出貨) ;       3MW00274 (2024-06-25預計出貨) ;       ","1,782,000","8","1,782,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230637":["M230637","村玉建設-高南","李烘銘","1,320,000","2","3MH00281 (2024-05-10預計出貨) ;       3MH00280 (2024-05-10預計出貨) ;       ","396,000","8","396,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230512":["M230512","陳宜羣","李烘銘","550,000","1","3MH00197 (2024-07-10預計出貨) ;       ","165,000","9","165,000","9",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230545":["M230545","耀鼎建設-北屯","李烘銘","1,100,000","2","3MH00207 (2024-08-01預計出貨) ;       3MH00208 (2024-08-01預計出貨) ;       ","330,000","6","330,000","6",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230548":["M230548","益豪建築-竹山大同街","李烘銘","1,500,000","2","3MW00260 (2024-01-16貨抵工地) ;       3MW00261 (2024-01-31安裝完畢) ;       ","900,000","8","450,000","8",0,0,"450,000","0",0,0,"0","0",0,0,"0","0",0,0],"M230549":["M230549","益豪建造-竹山大明路","李烘銘","2,400,000","4","3MH00262 (2024-04-19預計出貨) ;       3MH00263 (2024-04-19預計出貨) ;       3MH00264 (2024-04-19預計出貨) ;       3MH00265 (2024-04-19預計出貨) ;       ","720,000","8","720,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230620":["M230620","洪輝龍-A1","李烘銘","520,000","1","3MH00247 (2024-06-28預計出貨) ;       ","156,000","8","156,000","8",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M230621":["M230621","金寶城糖業-虎尾科虎路","李烘銘","550,000","1","3MH00266 (2023-12-21貨抵工地) ;       ","330,000","8","165,000","8",0,0,"165,000","1",0,0,"0","0",0,0,"0","0",0,0],"M230579":["M230579","洪輝龍-A2","李烘銘","520,000","1","3MH00245 (2024-06-28預計出貨) ;       ","156,000","8","156,000","8",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M230580":["M230580","翔富裕股份有限公司(林紡鍥-A8)","李烘銘","520,000","1","3MH00246 (2024-06-28預計出貨) ;       ","156,000","8","156,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230391":["M230391","台翰營造","李烘銘","740,000","1","3MW00209 (2024-01-31官檢完畢) ;       ","666,000","8","222,000","8",0,0,"222,000","4",0,0,"222,000","1",0,0,"0","0",0,0],"M230412":["M230412","勝德營造(順宇)","李烘銘","1,050,000","2","3MH00312 (2024-01-03貨抵工地) ;       3MH00313 (2024-01-03貨抵工地) ;       ","630,000","7","315,000","7",0,0,"315,000","0",0,0,"0","0",0,0,"0","0",0,0],"M230438":["M230438","佳意工程有限公司","李烘銘","600,000","1","3MH00196 (2023-09-28試車完畢) ;       ","420,000","9","180,000","9",0,0,"180,000","5",0,0,"60,000","4",0,0,"0","0",0,0],"M230483":["M230483","蔡育薰-博思特幼兒學校","李烘銘","550,000","1","3MH00450 (2024-01-02官檢完畢) ;       ","495,000","6","165,000","6",0,0,"165,000","2",0,0,"165,000","1",0,0,"0","0",0,0],"M230484":["M230484","協順營造有限公司","李烘銘","630,000","1","3MH00360 (2024-01-16官檢完畢) ;       ","567,000","7","189,000","7",0,0,"189,000","2",0,0,"189,000","1",0,0,"0","0",0,0],"M230485":["M230485","順宇土地建築(大雅秀山段)","李烘銘","2,100,000","4","3MH00356 (2023-12-22貨抵工地) ;       3MH00357 (2023-12-22貨抵工地) ;       3MH00358 (2023-12-29貨抵工地) ;       3MH00359 (2023-12-29貨抵工地) ;       ","1,260,000","7","630,000","7",0,0,"630,000","1",0,0,"0","0",0,0,"0","0",0,0],"M220471":["M220471","東禹營造-台中果菜市場","李烘銘","3,280,000","2","3MW00118 (2023-09-12官檢完畢) ;       3MW00119 (2023-09-12官檢完畢) ;       ","2,987,280","11","538,912","11",0,0,0,0,"1,886,192","4","292,720","4","269,456","4","0","0",0,0],"M230238":["M230238","王色鳳","李烘銘","630,000","1","3MH00130 (2023-11-08已移交) ;      ","189,000","4","0","0",0,0,"0","0",0,0,"126,000","4",0,0,"63,000","2",0,0],"M230239":["M230239","弘宬營造股份有限公司","李烘銘","600,000","1","3MH00173 (2024-05-15預計出貨) ;       ","180,000","8","180,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230240":["M230240","弘宬營造股份有限公司","李烘銘","1,260,000","2","3MH00174 (2024-03-12預計出貨) ;       3MH00175 (2024-03-12預計出貨) ;       ","378,000","8","378,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230284":["M230284","劉玉閔-施洽成撚線厰","李烘銘","600,000","1","3MH00195 (2024-04-03預計出貨) ;       ","180,000","9","180,000","9",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230205":["M230205","金順億建設有限公司","葉博澄","2,520,000","4","3MH00121 (2023-08-18官檢完畢) ;       3MH00122 (2023-08-18官檢完畢) ;       3MH00123 (2023-08-18官檢完畢) ;       3MH00124 (2023-08-18官檢完畢) ;       ","2,268,000","8","756,000","8",0,0,"756,000","8",0,0,"756,000","6",0,0,"0","0",0,0],"M230432":["M230432","彰員營造股份有限公司","葉博澄","11,860,000","13","3MW00171 (2023-10-20試車完畢) ;       3MW00160 (2024-06-01預計出貨) ;       3MW00161 (2024-06-01預計出貨) ;       3MW00162 (2024-06-01預計出貨) ;       3MW00163 (2024-06-01預計出貨) ;       3MW00164 (2024-06-01預計出貨) ;       3MW00165 (2024-06-01預計出貨) ;       3MW00166 (2024-06-01預計出貨) ;       3MW00167 (2024-06-01預計出貨) ;       3MW00168 (2024-06-01預計出貨) ;       3MW00169 (2024-06-01預計出貨) ;       3MW00170 (2024-06-01預計出貨) ;       3MW00159 (2024-06-01預計出貨) ;       ","3,978,000","9","3,558,000","9",0,0,"0","5",0,0,"0","3",0,0,"0","0",0,0],"M230415":["M230415","岩城營造(名富建設)","葉博澄","1,800,000","3","3MH00156 (2024-01-08試車完畢) ;       3MH00157 (2024-03-22預計出貨) ;       3MH00158 (2024-01-08試車完畢) ;       ","1,260,000","9","540,000","9",0,0,"0","3",0,0,"0","0",0,0,"0","0",0,0],"M230416":["M230416","雲啟建設(周素鳳)","葉博澄","2,550,000","5","3MH00491 (2024-03-15預計出貨) ;       3MH00492 (2024-03-15預計出貨) ;       3MH00493 (2024-03-15預計出貨) ;       3MH00494 (2024-03-15預計出貨) ;       3MH00495 (2024-03-15預計出貨) ;       ","765,000","6","765,000","6",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230593":["M230593","耐福營造股份有限公司","葉博澄","5,160,000","8","3MH00573 (2023-11-17貨抵工地) ;       3MH00574 (2023-11-17貨抵工地) ;       3MH00575 (2024-03-06預計出貨) ;       3MH00576 (2024-01-03貨抵工地) ;       3MH00577 (2024-03-06預計出貨) ;       3MH00578 (2024-01-03貨抵工地) ;       3MW00579 (2024-03-06預計出貨) ;       3MW00580 (2024-03-06預計出貨) ;       ","666,000","2","0","0",0,0,"0","2","0","0",0,0,0,0,"0","0",0,0],"M230600":["M230600","玄盟營造","葉博澄","3,600,000","6","3MH00835 (2024-03-19預計出貨) ;       3MH00836 (2024-03-19預計出貨) ;       3MH00837 (2024-03-19預計出貨) ;       3MH00838 (2024-03-20預計出貨) ;       3MH00839 (2024-03-20預計出貨) ;       3MH00840 (2024-03-20預計出貨) ;       ","1,080,000","4","1,080,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230607":["M230607","豐田流通供應鏈物流有限公司","葉博澄","580,000","1","3MH00259 (2023-10-18試車完畢) ;       ","522,000","8","174,000","8",0,0,"174,000","4",0,0,"174,000","3",0,0,"0","0",0,0],"M230530":["M230530","保成營造","葉博澄","700,000","1","3MW00210 (2023-11-30官檢完畢) ;       ","630,000","8","210,000","8",0,0,"210,000","5",0,0,"210,000","1",0,0,"0","0",0,0],"M230531":["M230531","保成營造","葉博澄","680,000","1","3MW00211 (2024-02-05官檢完畢) ;       ","612,000","8","204,000","8",0,0,"204,000","4",0,0,"204,000","1",0,0,"0","0",0,0],"M230639":["M230639","洪婉楹(林俊輝)","葉博澄","620,000","1","3MH00411 (2024-04-01預計出貨) ;       ","186,000","7","186,000","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230641":["M230641","秉禾營造(詹朝揚)","葉博澄","640,000","1","3MH00244 (2024-01-16官檢完畢) ;       ","576,000","8","256,000","8",0,0,"128,000","3",0,0,"192,000","1",0,0,"0","0",0,0],"M230646":["M230646","立傑營造","葉博澄","1,140,000","1","3MW00243 (2023-10-25試車完畢) ;       ","1,026,000","8","342,000","8",0,0,"342,000","5",0,0,"342,000","3",0,0,"0","0",0,0],"M230743":["M230743","拾益營造-清水幼兒園","葉博澄","790,000","1","3MH00296 (2024-01-31官檢完畢) ;       ","711,000","8","316,000","8",0,0,"158,000","4",0,0,"237,000","2",0,0,"0","0",0,0],"M230745":["M230745","陳加樺","葉博澄","550,000","1","3MH00508 (2023-12-19貨抵工地) ;       ","330,000","6","165,000","6",0,0,"165,000","1",0,0,"0","0",0,0,"0","0",0,0],"M230790":["M230790","班米羅幼兒園","葉博澄","750,000","1","3MW00410 (2024-03-05預計出貨) ;       ","225,000","7","225,000","7",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M230791":["M230791","吳明鴻","葉博澄","960,000","1","3MW00350 (2023-11-10試車完畢) ;       ","864,000","7","288,000","7",0,0,"288,000","4",0,0,"288,000","2",0,0,"0","0",0,0],"M23080163":["M23080163","吉旺營造股份有限公司","葉博澄","653,000","1","3MH00879 (2024-03-20預計出貨) ;       ","192,000","3","192,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231151":["M231151","太裕營造股份有限公司","葉博澄","1,300,000","1","3MW00788 (2024-03-01預計出貨) ;       ","390,000","4","390,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231118":["M231118","立傑營造-台中太平","葉博澄","2,000,000","2","3MW00613 (2024-03-07預計出貨) ;       3MW00612 (2023-12-08貨抵工地) ;       ","285,000","1","0","0",0,0,"0","1","0","0",0,0,0,0,"0","0",0,0],"M231168":["M231168","山本耀(鄭榆錚)","葉博澄","800,000","1","3MH00950 (2024-03-11預計出貨) ;       ","240,000","2","240,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110080":["M23110080","金進億","葉博澄","650,000","1","3MH01050 (2024-03-04預計出貨) ;       ","195,000","1","195,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110103":["M23110103","亘玉露生技","葉博澄","930,000","1","4MW00066 (2024-04-01預計出貨) ;       ","279,000","0","279,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110005":["M23110005","興安-南投司馬按段","葉博澄","3,300,000","6","4MH00126 (2024-04-08預計出貨) ;       4MH00127 (2024-04-08預計出貨) ;       4MH00128 (2024-04-08預計出貨) ;       4MH00129 (2024-04-08預計出貨) ;       4MH00130 (2024-04-08預計出貨) ;       4MH00131 (2024-04-08預計出貨) ;       ","990,000","0","990,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110007":["M23110007","經緯營造","葉博澄","820,000","1","4MW00065 (2024-04-15預計出貨) ;       ","246,000","0","246,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110011":["M23110011","孫室空間","葉博澄","700,000","1","3MP01032 (2024-02-29預計出貨) ;       ","210,000","1","210,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231039":["M231039","玉明玻璃股份有限公司(劉澄藝)","葉博澄","530,000","1","3MH00534 (2023-12-16安裝完畢) ;       ","318,000","6","159,000","6",0,0,"159,000","2",0,0,"0","0",0,0,"0","0",0,0],"M231043":["M231043","磐檍建設(邑鼎)-北屯段","葉博澄","570,000","1","4MH00158 (2024-05-30預計出貨) ;       ","171,000","0","171,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231173":["M231173","厚德建設有限公司","葉博澄","1,670,000","3","3MH00641 (2024-01-19安裝完畢) ;       3MH00642 (2024-01-20安裝完畢) ;       3MH00643 (2023-12-27貨抵工地) ;       ","501,000","1","0","0",0,0,"501,000","1",0,0,"0","0",0,0,"0","0",0,0],"M231184":["M231184","裕民工務企業有限公司","葉博澄","530,000","1","3MH00640 (2024-01-24已移交) ;      ","371,000","2","0","0",0,0,"159,000","2","159,000","1",0,0,0,0,"53,000","0",0,0],"M23120001":["M23120001","東松建設-台中西屯區廣昌段","葉博澄","15,080,000","29","4MH00188 (2024-05-06預計出貨) ;       4MH00189 (2024-05-06預計出貨) ;       4MH00190 (2024-05-06預計出貨) ;       4MH00191 (2024-05-06預計出貨) ;       4MH00192 (2024-05-06預計出貨) ;       4MH00193 (2024-05-06預計出貨) ;       4MH00194 (2024-05-06預計出貨) ;       4MH00195 (2024-05-06預計出貨) ;       4MH00196 (2024-05-06預計出貨) ;       4MH00197 (2024-05-06預計出貨) ;       4MH00198 (2024-05-06預計出貨) ;       4MH00199 (2024-05-06預計出貨) ;       4MH00200 (2024-05-06預計出貨) ;       4MH00201 (2024-05-06預計出貨) ;       4MH00202 (2024-05-06預計出貨) ;       4MH00203 (2024-05-06預計出貨) ;       4MH00204 (2024-05-06預計出貨) ;       4MH00205 (2024-05-06預計出貨) ;       4MH00206 (2024-05-06預計出貨) ;       4MH00207 (2024-05-06預計出貨) ;       4MH00208 (2024-05-06預計出貨) ;       4MH00209 (2024-05-06預計出貨) ;       4MH00210 (2024-05-06預計出貨) ;       4MH00211 (2024-05-06預計出貨) ;       4MH00212 (2024-05-06預計出貨) ;       4MH00213 (2024-05-06預計出貨) ;       4MH00214 (2024-05-06預計出貨) ;       4MH00215 (2024-05-06預計出貨) ;       4MH00216 (2024-05-06預計出貨) ;       ","4,524,000","0","4,524,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231207":["M231207","三冠企業社","葉博澄","840,000","1","3MW01082 (2024-09-02預計出貨) ;       ","252,000","1","252,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23120100":["M23120100","林佳民-台中豐原區","葉博澄","650,000","1","4MH00089 (2024-04-22預計出貨) ;       ","195,000","0","195,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100002":["M23100002","悅綠樹-彰化田中","葉博澄","1,740,000","2","4MW00090 (2024-05-15預計出貨) ;       4MW00091 (2024-05-15預計出貨) ;       ","522,000","0","522,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100003":["M23100003","悅綠樹-彰化員林","葉博澄","1,330,000","2","4MW00092 (2024-05-15預計出貨) ;       4MH00093 (2024-05-15預計出貨) ;       ","399,000","0","399,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100074":["M23100074","政馭實業","葉博澄","620,000","1","4MH00062 (2024-04-15預計出貨) ;       ","186,000","1","186,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100045":["M23100045","深坑區土庫段廠房-永陞建設","葉博澄","10,300,000","4","4MW00181 (2024-11-01預計出貨) ;       4MW00182 (2024-11-01預計出貨) ;       4MX00183 (2024-11-01預計出貨) ;       4MX00184 (2024-11-01預計出貨) ;       ","1,854,000","1","1,854,000","1",0,0,"0","0",0,0,"0","0",0,0,0,0,"0","0"],"M23100051":["M23100051","山王營造有限公司","葉博澄","530,000","1","3MH00926 (2024-02-19預計出貨) ;       ","159,000","3","159,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100057":["M23100057","吉成食品","葉博澄","910,000","1","3MW01083 (2024-05-02預計出貨) ;       ","273,000","1","273,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100058":["M23100058","岩城營造(億豪建設)-新營區周武段","葉博澄","990,000","1","4MW00217 (2024-04-15預計出貨) ;       ","297,000","0","297,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100134":["M23100134","興安-北屯區陳平段","葉博澄","5,120,000","5","4MW00132 (2024-05-20預計出貨) ;       4MW00133 (2024-05-20預計出貨) ;       4MW00134 (2024-05-20預計出貨) ;       4MW00135 (2024-05-20預計出貨) ;       4MW00136 (2024-05-20預計出貨) ;       ","1,536,000","0","1,536,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100136":["M23100136","興安-美和綠洲","葉博澄","3,780,000","4","4MW00122 (2024-04-08預計出貨) ;       4MW00123 (2024-04-08預計出貨) ;       4MW00124 (2024-04-08預計出貨) ;       4MW00125 (2024-04-08預計出貨) ;       ","1,134,000","0","1,134,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231026":["M231026","伍灃營造開發有限公司","葉博澄","520,000","1","3MH00881 (2024-05-03預計出貨) ;       ","156,000","4","156,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231030":["M231030","陳慶宏","葉博澄","530,000","1","3MH00796 (2023-12-29安裝完畢) ;       ","318,000","1","0","0",0,0,"159,000","1","159,000","1",0,0,0,0,"0","0",0,0],"M23100129":["M23100129","金順億大坑巷二期","葉博澄","650,000","1","3MH00957 (2024-02-22預計出貨) ;       ","195,000","2","195,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100082":["M23100082","靖捷企業社","葉博澄","580,000","1","3MH00978 (2024-03-25預計出貨) ;       ","174,000","2","174,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230848":["M230848","山王營造","葉博澄","530,000","1","3MH00351 (2023-10-27試車完畢) ;       ","477,000","7","212,000","7",0,0,"106,000","5",0,0,"159,000","3",0,0,"0","0",0,0],"M230896":["M230896","勝邦開發建設股份有限公司","葉博澄","1,620,000","3","3MH00352 (2023-10-27試車完畢) ;       3MH00353 (2023-11-01試車完畢) ;       3MH00354 (2023-11-29試車完畢) ;       ","1,458,000","7","486,000","7",0,0,"486,000","5",0,0,"486,000","3",0,0,"0","0",0,0],"M23090101":["M23090101","佑翔營造工程有限公司","葉博澄","1,160,000","2","3MH00883 (2024-02-27預計出貨) ;       3MH00884 (2024-02-27預計出貨) ;       ","348,000","3","348,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100027":["M23100027","總財建設實業股份有限公司","黃孟澤","1,456,000","2","3MX00968 (2024-08-15預計出貨) ;       3MX00969 (2024-08-15預計出貨) ;       ","436,800","2","436,800","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100029":["M23100029","高臺營造","黃孟澤","10,080,000","16","3MH01055 (2024-10-15預計出貨) ;       3MH01056 (2024-10-15預計出貨) ;       3MH01057 (2024-10-15預計出貨) ;       3MH01058 (2024-10-15預計出貨) ;       3MH01059 (2024-10-15預計出貨) ;       3MH01060 (2024-10-15預計出貨) ;       3MH01061 (2024-10-15預計出貨) ;       3MH01062 (2024-10-15預計出貨) ;       3MH01063 (2024-10-15預計出貨) ;       3MH01064 (2024-10-15預計出貨) ;       3MH01065 (2024-10-15預計出貨) ;       3MH01066 (2024-10-15預計出貨) ;       3MH01067 (2024-10-15預計出貨) ;       3MH01068 (2024-10-15預計出貨) ;       3MH01069 (2024-10-15預計出貨) ;       3MH01070 (2024-10-15預計出貨) ;       ","3,024,000","1","3,024,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M220381":["M220381","睿邑生物科技廠房","黃孟澤","2,200,000","2","3MW00128 (2023-12-22試車完畢) ;       3MW00129 (2024-01-11安裝完畢) ;       ","1,973,200","9","336,800","9",0,0,"673,600","4","110,000","2",0,0,0,0,"0","0",0,0],"M220316":["M220316","白鴿建設-自由路都更案","黃孟澤","700,000","1","3MH00814 (2024-02-20預計出貨) ;       ","280,000","0","0","0","280,000","0","0","0",0,0,"0","0",0,0,"0","0",0,0],"M24010158":["M24010158","庶古文創(七福營造)","徐福廷","960,000","1","4MW00218 (2024-09-30預計出貨) ;       ","192,000","0","192,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M24010214":["M24010214","莊信緯(莊俊銘新建農舍)","徐福廷","540,000","1","4MH00185 (2024-05-02預計出貨) ;       ","108,000","0","108,000","0",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0]}}
\ No newline at end of file
+{"Bill":{"M220366":["M220366","欣佳德營造工程有限公司","陳敦德","750,000","1","2MW00038 (2024-07-01預計出貨) ;       ","450,000","14","150,000","14","300,000","11","0","0",0,0,"0","0",0,0,"0","0",0,0],"M220473":["M220473","國合營造-新北市雙溪案","陳敦德","3,822,000","3","3MW00050 (2024-02-23預計出貨) ;       3MW00051 (2024-02-23預計出貨) ;       3MW00052 (2024-02-16預計出貨) ;       ","1,974,000","10","658,000","10","1,316,000","8","0","0",0,0,"0","0",0,0,"0","0",0,0],"M230022":["M230022","旺旺工程行-鄭秋月","陳敦德","600,000","1","3MH00076 (2024-06-01預計出貨) ;       ","360,000","11","120,000","11","240,000","8","0","0",0,0,"0","0",0,0,"0","0",0,0],"M230166":["M230166","富德開發有限公司-東海段98-54地號","陳敦德","650,000","1","3MH00294 (2024-01-04安裝完畢) ;       ","520,000","8","130,000","8","260,000","6","130,000","2",0,0,"0","0",0,0,"0","0",0,0],"M230563":["M230563","葉建中-大里新建住宅","陳敦德","820,000","1","3MX00295 (2024-05-15預計出貨) ;       ","492,000","8","164,000","8","328,000","5","0","0",0,0,"0","0",0,0,"0","0",0,0],"M230579":["M230579","洪輝龍-A2","李烘銘","520,000","1","3MH00245 (2024-06-28預計出貨) ;       ","156,000","9","156,000","9",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230580":["M230580","翔富裕股份有限公司(林紡鍥-A8)","李烘銘","520,000","1","3MH00246 (2024-06-28預計出貨) ;       ","156,000","9","156,000","9",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230438":["M230438","佳意工程有限公司","李烘銘","600,000","1","3MH00196 (2023-09-28試車完畢) ;       ","420,000","10","180,000","10",0,0,"180,000","6",0,0,"60,000","5",0,0,"0","0",0,0],"M230483":["M230483","蔡育薰-博思特幼兒學校","李烘銘","550,000","1","3MH00450 (2024-01-02官檢完畢) ;       ","495,000","7","165,000","7",0,0,"165,000","3",0,0,"165,000","2",0,0,"0","0",0,0],"M230484":["M230484","協順營造有限公司","李烘銘","630,000","1","3MH00360 (2024-01-16官檢完畢) ;       ","567,000","8","189,000","8",0,0,"189,000","3",0,0,"189,000","2",0,0,"0","0",0,0],"M230485":["M230485","順宇土地建築(大雅秀山段)","李烘銘","2,100,000","4","3MH00356 (2023-12-22貨抵工地) ;       3MH00357 (2023-12-22貨抵工地) ;       3MH00358 (2023-12-29貨抵工地) ;       3MH00359 (2023-12-29貨抵工地) ;       ","1,260,000","9","630,000","9",0,0,"630,000","2",0,0,"0","0",0,0,"0","0",0,0],"M230512":["M230512","陳宜羣","李烘銘","550,000","1","3MH00197 (2024-07-10預計出貨) ;       ","165,000","10","165,000","10",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230620":["M230620","洪輝龍-A1","李烘銘","520,000","1","3MH00247 (2024-06-28預計出貨) ;       ","156,000","9","156,000","9",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M230621":["M230621","金寶城糖業-虎尾科虎路","李烘銘","550,000","1","3MH00266 (2023-12-21貨抵工地) ;       ","330,000","9","165,000","9",0,0,"165,000","2",0,0,"0","0",0,0,"0","0",0,0],"M230631":["M230631","劉建利","李烘銘","740,000","1","3MW00248 (2023-10-05試車完畢) ;       ","385,560","6","0","0",0,0,"163,560","6",0,0,"222,000","4",0,0,"0","0",0,0],"M230635":["M230635","村玉建設-長春路案(A棟)","李烘銘","850,000","1","3MW00267 (2024-04-16預計出貨) ;       ","255,000","5","255,000","5",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230636":["M230636","村玉建設-科邨一路案","李烘銘","5,940,000","6","3MW00279 (2024-06-25預計出貨) ;       3MW00278 (2024-06-25預計出貨) ;       3MW00277 (2024-06-25預計出貨) ;       3MW00276 (2024-06-25預計出貨) ;       3MW00275 (2024-06-25預計出貨) ;       3MW00274 (2024-06-25預計出貨) ;       ","1,782,000","9","1,782,000","9",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230637":["M230637","村玉建設-高南","李烘銘","1,320,000","2","3MH00281 (2024-05-10預計出貨) ;       3MH00280 (2024-05-10預計出貨) ;       ","396,000","9","396,000","9",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M220471":["M220471","東禹營造-台中果菜市場","李烘銘","3,280,000","2","3MW00118 (2023-09-12官檢完畢) ;       3MW00119 (2023-09-12官檢完畢) ;       ","2,987,280","12","538,912","12",0,0,0,0,"1,886,192","6","292,720","5","269,456","5","0","0",0,0],"M230238":["M230238","王色鳳","李烘銘","630,000","1","3MH00130 (2023-11-08已移交) ;      ","189,000","5","0","0",0,0,"0","0",0,0,"126,000","5",0,0,"63,000","3",0,0],"M230239":["M230239","弘宬營造股份有限公司","李烘銘","600,000","1","3MH00173 (2024-05-15預計出貨) ;       ","180,000","10","180,000","10",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230240":["M230240","弘宬營造股份有限公司","李烘銘","1,260,000","2","3MH00174 (2024-03-12預計出貨) ;       3MH00175 (2024-03-12預計出貨) ;       ","378,000","10","378,000","10",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230284":["M230284","劉玉閔-施洽成撚線厰","李烘銘","600,000","1","3MH00195 (2024-04-03預計出貨) ;       ","180,000","10","180,000","10",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230391":["M230391","台翰營造","李烘銘","740,000","1","3MW00209 (2024-01-31官檢完畢) ;       ","666,000","9","222,000","9",0,0,"222,000","5",0,0,"222,000","2",0,0,"0","0",0,0],"M230412":["M230412","勝德營造(順宇)","李烘銘","1,050,000","2","3MH00312 (2024-01-03貨抵工地) ;       3MH00313 (2024-01-03貨抵工地) ;       ","630,000","9","315,000","9",0,0,"315,000","1",0,0,"0","0",0,0,"0","0",0,0],"M230662":["M230662","劉建忠","李烘銘","740,000","1","3MW00249 (2023-10-02試車完畢) ;       ","388,320","6","0","0",0,0,"166,320","6",0,0,"222,000","5",0,0,"0","0",0,0],"M230679":["M230679","劉繕綸","李烘銘","810,000","1","3MW00311 (2024-02-22預計出貨) ;       ","225,000","9","225,000","9",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230687":["M230687","永豪營造有限公司","李烘銘","525,000","1","3MH00355 (2023-12-08試車完畢) ;       ","472,500","8","157,500","8",0,0,"157,500","4",0,0,"157,500","2",0,0,"0","0",0,0],"M230734":["M230734","盛立交通-貨運集貨站新建工程","李烘銘","750,000","1","3MW00509 (2024-02-21預計出貨) ;       ","225,000","6","225,000","6",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230737":["M230737","萬大建設有限公司-台中沙鹿區","李烘銘","540,000","1","3MH00297 (2023-09-08試車完畢) ;       ","162,000","5","0","0",0,0,"0","0",0,0,"162,000","5",0,0,"0","0",0,0],"M230738":["M230738","江春池","李烘銘","560,000","1","3MH00298 (2023-11-02試車完畢) ;       ","168,000","4","0","0",0,0,"0","0",0,0,"168,000","4",0,0,"0","0",0,0],"M230759":["M230759","通權建設-王江海","李烘銘","520,000","1","3MH00496 (2024-10-15預計出貨) ;       ","156,000","7","156,000","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230760":["M230760","通權建設-南投市","李烘銘","680,000","1","3MH00497 (2024-10-15預計出貨) ;       ","204,000","7","204,000","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230545":["M230545","耀鼎建設-北屯","李烘銘","1,100,000","2","3MH00207 (2024-08-01預計出貨) ;       3MH00208 (2024-08-01預計出貨) ;       ","330,000","7","330,000","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230548":["M230548","益豪建築-竹山大同街","李烘銘","1,500,000","2","3MW00260 (2024-01-16貨抵工地) ;       3MW00261 (2024-01-31安裝完畢) ;       ","900,000","9","450,000","9",0,0,"450,000","1",0,0,"0","0",0,0,"0","0",0,0],"M230549":["M230549","益豪建造-竹山大明路","李烘銘","2,400,000","4","3MH00262 (2024-04-19預計出貨) ;       3MH00263 (2024-04-19預計出貨) ;       3MH00264 (2024-04-19預計出貨) ;       3MH00265 (2024-04-19預計出貨) ;       ","720,000","9","720,000","9",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230838":["M230838","福興建設有限公司","李烘銘","5,615,000","10","3MH00582 (2024-02-16預計出貨) ;       3MH00583 (2024-02-16預計出貨) ;       3MH00584 (2024-03-06預計出貨) ;       3MH00585 (2024-03-06預計出貨) ;       3MH00586 (2024-03-06預計出貨) ;       3MH00587 (2024-03-06預計出貨) ;       3MH00588 (2024-03-18預計出貨) ;       3MH00589 (2024-03-18預計出貨) ;       3MH00590 (2024-03-18預計出貨) ;       3MH00591 (2024-01-08貨抵工地) ;       ","212,000","1","0","0",0,0,"212,000","1",0,0,"0","0",0,0,"0","0",0,0],"M230839":["M230839","全鴻建設開發有限公司(觀音安和街)","李烘銘","530,000","1","3MH00592 (2024-02-03已移交) ;      ","424,000","1","0","0",0,0,"212,000","1",0,0,"159,000","0",0,0,"53,000","0",0,0],"M23090095":["M23090095","格誠建設有限公司","李烘銘","1,100,000","1","3MW00845 (2024-05-15預計出貨) ;       ","220,000","4","220,000","4",0,0,"0","0",0,0,"0","0","0","0","0","0",0,0],"M23090096":["M23090096","格睿建設有限公司","李烘銘","2,430,000","2","3MW00846 (2024-05-15預計出貨) ;       3MW00847 (2024-05-15預計出貨) ;       ","486,000","4","486,000","4",0,0,"0","0",0,0,"0","0","0","0","0","0",0,0],"M23090097":["M23090097","格睿建設有限公司","李烘銘","830,000","1","3MH00848 (2024-05-15預計出貨) ;       ","166,000","4","166,000","4",0,0,"0","0",0,0,"0","0","0","0","0","0",0,0],"M23090132":["M23090132","上群地產開發股份有限公司","李烘銘","2,300,000","2","3MX00859 (2024-06-14預計出貨) ;       3MX00860 (2024-06-14預計出貨) ;       ","230,000","4","230,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090140":["M23090140","廣瓏建設有限公司","李烘銘","4,000,000","4","3MW00855 (2024-06-14預計出貨) ;       3MW00856 (2024-06-14預計出貨) ;       3MW00857 (2024-06-14預計出貨) ;       3MW00858 (2024-06-14預計出貨) ;       ","400,000","4","400,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230994":["M230994","村玉建設-長春路案(B棟)","李烘銘","3,300,000","6","3MH00273 (2024-05-10預計出貨) ;       3MH00272 (2024-05-10預計出貨) ;       3MH00271 (2024-05-10預計出貨) ;       3MH00270 (2024-05-10預計出貨) ;       3MH00268 (2024-05-10預計出貨) ;       3MH00269 (2024-05-10預計出貨) ;       ","990,000","5","990,000","5",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230881":["M230881","胡方翔(溫玉嬌)","李烘銘","910,000","1","3MW00415 (2024-03-19預計出貨) ;       ","258,000","8","258,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100138":["M23100138","王凱莉","李烘銘","670,000","1","3MH01034 (2024-05-21預計出貨) ;       ","201,000","2","201,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100140":["M23100140","薆綉室內裝修工程有限公司","李烘銘","520,000","1","3MH01048 (2024-03-11預計出貨) ;       ","159,000","2","159,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231045":["M231045","寶祥營造廠有限公司(林梅清)","李烘銘","560,000","1","3MH00503 (2023-12-22安裝完畢) ;       ","168,000","3","0","0",0,0,"168,000","3",0,0,"0","0",0,0,"0","0",0,0],"M23110060":["M23110060","張弘起","李烘銘","535,000","1","3MH01054 (2024-04-10預計出貨) ;       ","160,500","2","160,500","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110069":["M23110069","弘泰-彰化和美鎮","李烘銘","2,120,000","4","3MH01071 (2024-05-15預計出貨) ;       3MH01072 (2024-05-15預計出貨) ;       3MH01073 (2024-05-15預計出貨) ;       3MH01074 (2024-05-15預計出貨) ;       ","636,000","2","636,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231126":["M231126","薆綉室內裝修工程有限公司-南投草屯鎮","李烘銘","540,000","1","3MH00535 (2024-01-12貨抵工地) ;       ","324,000","7","162,000","7",0,0,"162,000","1",0,0,"0","0",0,0,"0","0",0,0],"M231133":["M231133","弘宬營造股份有限公司(西屯區)","李烘銘","700,000","1","3MH00646 (2024-11-29預計出貨) ;       ","210,000","6","210,000","6",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231134":["M231134","弘宬營造股份有限公司(北區)","李烘銘","1,170,000","2","3MH00644 (2024-06-05預計出貨) ;       3MH00645 (2024-06-05預計出貨) ;       ","3,000","6","3,000","6",0,0,"0","0","0","0",0,0,0,0,"0","0",0,0],"M23100133":["M23100133","總富建設-彰化溪州鄉","李烘銘","610,000","1","3MH00962 (2024-02-27預計出貨) ;       ","183,000","3","183,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110123":["M23110123","瑋瓏營造有限公司","李烘銘","1,080,000","2","3MH01051 (2024-05-10預計出貨) ;       3MH01052 (2024-04-23預計出貨) ;       ","324,000","2","324,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110129":["M23110129","蕭崇家-彰化縣員林市","李烘銘","1,300,000","2","4MH00159 (2024-12-26預計出貨) ;       4MH00160 (2024-12-16預計出貨) ;       ","390,000","1","390,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231153":["M231153","馨盛-明德北路","李烘銘","510,000","1","3MH00779 (2024-05-14預計出貨) ;       ","153,000","5","153,000","5",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231154":["M231154","上互營造股份有限公司","李烘銘","1,020,000","2","3MH00777 (2024-08-10預計出貨) ;       3MH00778 (2024-08-10預計出貨) ;       ","255,000","5","255,000","5",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231169":["M231169","鄭茂昌","李烘銘","2,080,000","2","3MH00596 (2024-03-15預計出貨) ;       ","210,000","6","210,000","6",0,0,0,0,0,0,0,0,0,0,0,0,0,0],"M231172":["M231172","乾唐建設有限公司","李烘銘","820,000","1","3MX00619 (2024-01-08安裝完畢) ;       ","246,000","2","0","0",0,0,"246,000","2",0,0,"0","0",0,0,"0","0",0,0],"M231173":["M231173","厚德建設有限公司","葉博澄","1,670,000","3","3MH00641 (2024-01-19安裝完畢) ;       3MH00642 (2024-01-20安裝完畢) ;       3MH00643 (2023-12-27貨抵工地) ;       ","501,000","2","0","0",0,0,"501,000","2",0,0,"0","0",0,0,"0","0",0,0],"M231207":["M231207","三冠企業社","葉博澄","840,000","1","3MW01082 (2024-09-02預計出貨) ;       ","252,000","2","252,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231184":["M231184","裕民工務企業有限公司","葉博澄","530,000","1","3MH00640 (2024-01-24已移交) ;      ","371,000","3","0","0",0,0,"159,000","3",0,0,"159,000","2",0,0,"53,000","1",0,0],"M23120001":["M23120001","東松建設-台中西屯區廣昌段","葉博澄","15,080,000","29","4MH00188 (2024-05-06預計出貨) ;       4MH00189 (2024-05-06預計出貨) ;       4MH00190 (2024-05-06預計出貨) ;       4MH00191 (2024-05-06預計出貨) ;       4MH00192 (2024-05-06預計出貨) ;       4MH00193 (2024-05-06預計出貨) ;       4MH00194 (2024-05-06預計出貨) ;       4MH00195 (2024-05-06預計出貨) ;       4MH00196 (2024-05-06預計出貨) ;       4MH00197 (2024-05-06預計出貨) ;       4MH00198 (2024-05-06預計出貨) ;       4MH00199 (2024-05-06預計出貨) ;       4MH00200 (2024-05-06預計出貨) ;       4MH00201 (2024-05-06預計出貨) ;       4MH00202 (2024-05-06預計出貨) ;       4MH00203 (2024-05-06預計出貨) ;       4MH00204 (2024-05-06預計出貨) ;       4MH00205 (2024-05-06預計出貨) ;       4MH00206 (2024-05-06預計出貨) ;       4MH00207 (2024-05-06預計出貨) ;       4MH00208 (2024-05-06預計出貨) ;       4MH00209 (2024-05-06預計出貨) ;       4MH00210 (2024-05-06預計出貨) ;       4MH00211 (2024-05-06預計出貨) ;       4MH00212 (2024-05-06預計出貨) ;       4MH00213 (2024-05-06預計出貨) ;       4MH00214 (2024-05-06預計出貨) ;       4MH00215 (2024-05-06預計出貨) ;       4MH00216 (2024-05-06預計出貨) ;       ","4,524,000","1","4,524,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23120100":["M23120100","林佳民-台中豐原區","葉博澄","650,000","1","4MH00089 (2024-04-22預計出貨) ;       ","195,000","1","195,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231168":["M231168","山本耀(鄭榆錚)","葉博澄","800,000","1","3MH00950 (2024-03-11預計出貨) ;       ","240,000","3","240,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231118":["M231118","立傑營造-台中太平","葉博澄","2,000,000","2","3MW00613 (2024-03-07預計出貨) ;       3MW00612 (2023-12-08貨抵工地) ;       ","285,000","2","0","0",0,0,"285,000","2",0,0,"0","0",0,0,"0","0",0,0],"M23100134":["M23100134","興安-北屯區陳平段","葉博澄","5,120,000","5","4MW00132 (2024-05-20預計出貨) ;       4MW00133 (2024-05-20預計出貨) ;       4MW00134 (2024-05-20預計出貨) ;       4MW00135 (2024-05-20預計出貨) ;       4MW00136 (2024-05-20預計出貨) ;       ","1,536,000","1","1,536,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100136":["M23100136","興安-美和綠洲","葉博澄","3,780,000","4","4MW00122 (2024-04-08預計出貨) ;       4MW00123 (2024-04-08預計出貨) ;       4MW00124 (2024-04-08預計出貨) ;       4MW00125 (2024-04-08預計出貨) ;       ","1,134,000","1","1,134,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231141":["M231141","太禾發建設開發企業有限公司","葉博澄","565,000","1","3MH00885 (2024-03-01預計出貨) ;       ","169,500","4","169,500","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231151":["M231151","太裕營造股份有限公司","葉博澄","1,300,000","1","3MW00788 (2024-03-01預計出貨) ;       ","390,000","5","390,000","5",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110080":["M23110080","金進億","葉博澄","650,000","1","3MH01050 (2024-03-04預計出貨) ;       ","195,000","2","195,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110103":["M23110103","亘玉露生技","葉博澄","930,000","1","4MW00066 (2024-04-01預計出貨) ;       ","279,000","1","279,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110005":["M23110005","興安-南投司馬按段","葉博澄","3,300,000","6","4MH00126 (2024-04-08預計出貨) ;       4MH00127 (2024-04-08預計出貨) ;       4MH00128 (2024-04-08預計出貨) ;       4MH00129 (2024-04-08預計出貨) ;       4MH00130 (2024-04-08預計出貨) ;       4MH00131 (2024-04-08預計出貨) ;       ","990,000","1","990,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110007":["M23110007","經緯營造","葉博澄","820,000","1","4MW00065 (2024-04-15預計出貨) ;       ","246,000","1","246,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23110011":["M23110011","孫室空間","葉博澄","700,000","1","3MP01032 (2024-02-29預計出貨) ;       ","210,000","2","210,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231026":["M231026","伍灃營造開發有限公司","葉博澄","520,000","1","3MH00881 (2024-05-03預計出貨) ;       ","156,000","5","156,000","5",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M231030":["M231030","陳慶宏","葉博澄","530,000","1","3MH00796 (2023-12-29安裝完畢) ;       ","159,000","2","0","0",0,0,"159,000","2",0,0,"0","0",0,0,"0","0",0,0],"M231039":["M231039","玉明玻璃股份有限公司(劉澄藝)","葉博澄","530,000","1","3MH00534 (2023-12-16安裝完畢) ;       ","318,000","7","159,000","7",0,0,"159,000","3",0,0,"0","0",0,0,"0","0",0,0],"M231043":["M231043","磐檍建設(邑鼎)-北屯段","葉博澄","570,000","1","4MH00158 (2024-05-30預計出貨) ;       ","171,000","1","171,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100074":["M23100074","政馭實業","葉博澄","620,000","1","4MH00062 (2024-04-15預計出貨) ;       ","186,000","2","186,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100082":["M23100082","靖捷企業社","葉博澄","580,000","1","3MH00978 (2024-03-25預計出貨) ;       ","174,000","3","174,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100129":["M23100129","金順億大坑巷二期","葉博澄","650,000","1","3MH00957 (2024-02-22預計出貨) ;       ","195,000","3","195,000","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100045":["M23100045","深坑區土庫段廠房-永陞建設","葉博澄","10,300,000","4","4MW00181 (2024-11-01預計出貨) ;       4MW00182 (2024-11-01預計出貨) ;       4MX00183 (2024-11-01預計出貨) ;       4MX00184 (2024-11-01預計出貨) ;       ","1,854,000","2","1,854,000","2",0,0,"0","0",0,0,"0","0","0","0",0,0,0,0],"M23100051":["M23100051","山王營造有限公司","葉博澄","530,000","1","3MH00926 (2024-02-19預計出貨) ;       ","159,000","4","159,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100057":["M23100057","吉成食品","葉博澄","910,000","1","3MW01083 (2024-05-02預計出貨) ;       ","273,000","2","273,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100058":["M23100058","岩城營造(億豪建設)-新營區周武段","葉博澄","990,000","1","4MW00217 (2024-04-15預計出貨) ;       ","297,000","1","297,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230896":["M230896","勝邦開發建設股份有限公司","葉博澄","1,620,000","3","3MH00352 (2023-10-27試車完畢) ;       3MH00353 (2023-11-01試車完畢) ;       3MH00354 (2023-11-29試車完畢) ;       ","1,458,000","8","486,000","8",0,0,"486,000","6",0,0,"486,000","4",0,0,"0","0",0,0],"M23100002":["M23100002","悅綠樹-彰化田中","葉博澄","1,740,000","2","4MW00090 (2024-05-15預計出貨) ;       4MW00091 (2024-05-15預計出貨) ;       ","522,000","1","522,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100003":["M23100003","悅綠樹-彰化員林","葉博澄","1,330,000","2","4MW00092 (2024-05-15預計出貨) ;       4MH00093 (2024-05-15預計出貨) ;       ","399,000","1","399,000","1",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23090101":["M23090101","佑翔營造工程有限公司","葉博澄","1,160,000","2","3MH00883 (2024-02-27預計出貨) ;       3MH00884 (2024-02-27預計出貨) ;       ","348,000","4","348,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230848":["M230848","山王營造","葉博澄","530,000","1","3MH00351 (2023-10-27試車完畢) ;       ","477,000","8","212,000","8",0,0,"106,000","6",0,0,"159,000","4",0,0,"0","0",0,0],"M230790":["M230790","班米羅幼兒園","葉博澄","750,000","1","3MW00410 (2024-03-05預計出貨) ;       ","225,000","8","225,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230791":["M230791","吳明鴻","葉博澄","960,000","1","3MW00350 (2023-11-10試車完畢) ;       ","864,000","8","288,000","8",0,0,"288,000","5",0,0,"288,000","3",0,0,"0","0",0,0],"M23080163":["M23080163","吉旺營造股份有限公司","葉博澄","653,000","1","3MH00879 (2024-03-20預計出貨) ;       ","192,000","4","192,000","4",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230743":["M230743","拾益營造-清水幼兒園","葉博澄","790,000","1","3MH00296 (2024-01-31官檢完畢) ;       ","711,000","9","316,000","9",0,0,"158,000","5",0,0,"237,000","3",0,0,"0","0",0,0],"M230745":["M230745","陳加樺","葉博澄","550,000","1","3MH00508 (2023-12-19貨抵工地) ;       ","330,000","7","165,000","7",0,0,"165,000","2",0,0,"0","0",0,0,"0","0",0,0],"M230415":["M230415","岩城營造(名富建設)","葉博澄","1,800,000","3","3MH00156 (2024-01-08試車完畢) ;       3MH00157 (2024-03-22預計出貨) ;       3MH00158 (2024-01-08試車完畢) ;       ","1,260,000","10","540,000","10",0,0,"360,000","4",0,0,"360,000","1",0,0,"0","0",0,0],"M230416":["M230416","雲啟建設(周素鳳)","葉博澄","2,550,000","5","3MH00491 (2024-03-15預計出貨) ;       3MH00492 (2024-03-15預計出貨) ;       3MH00493 (2024-03-15預計出貨) ;       3MH00494 (2024-03-15預計出貨) ;       3MH00495 (2024-03-15預計出貨) ;       ","765,000","7","765,000","7",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230432":["M230432","彰員營造股份有限公司","葉博澄","11,860,000","13","3MW00171 (2023-10-20試車完畢) ;       3MW00160 (2024-06-01預計出貨) ;       3MW00161 (2024-06-01預計出貨) ;       3MW00162 (2024-06-01預計出貨) ;       3MW00163 (2024-06-01預計出貨) ;       3MW00164 (2024-06-01預計出貨) ;       3MW00165 (2024-06-01預計出貨) ;       3MW00166 (2024-06-01預計出貨) ;       3MW00167 (2024-06-01預計出貨) ;       3MW00168 (2024-06-01預計出貨) ;       3MW00169 (2024-06-01預計出貨) ;       3MW00170 (2024-06-01預計出貨) ;       3MW00159 (2024-06-01預計出貨) ;       ","3,978,000","10","3,558,000","10",0,0,"210,000","6",0,0,"210,000","4",0,0,"0","0",0,0],"M230205":["M230205","金順億建設有限公司","葉博澄","2,520,000","4","3MH00121 (2023-08-18官檢完畢) ;       3MH00122 (2023-08-18官檢完畢) ;       3MH00123 (2023-08-18官檢完畢) ;       3MH00124 (2023-08-18官檢完畢) ;       ","2,268,000","10","756,000","10",0,0,"756,000","9",0,0,"756,000","7",0,0,"0","0",0,0],"M230639":["M230639","洪婉楹(林俊輝)","葉博澄","620,000","1","3MH00411 (2024-04-01預計出貨) ;       ","186,000","8","186,000","8",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230641":["M230641","秉禾營造(詹朝揚)","葉博澄","640,000","1","3MH00244 (2024-01-16官檢完畢) ;       ","576,000","9","256,000","9",0,0,"128,000","4",0,0,"192,000","2",0,0,"0","0",0,0],"M230646":["M230646","立傑營造","葉博澄","1,140,000","1","3MW00243 (2023-10-25試車完畢) ;       ","1,026,000","9","342,000","9",0,0,"342,000","6",0,0,"342,000","4",0,0,"0","0",0,0],"M230530":["M230530","保成營造","葉博澄","700,000","1","3MW00210 (2023-11-30官檢完畢) ;       ","630,000","10","210,000","10",0,0,"210,000","6",0,0,"210,000","3",0,0,"0","0",0,0],"M230531":["M230531","保成營造","葉博澄","680,000","1","3MW00211 (2024-02-05官檢完畢) ;       ","612,000","10","204,000","10",0,0,"204,000","5",0,0,"204,000","2",0,0,"0","0",0,0],"M230593":["M230593","耐福營造股份有限公司","葉博澄","5,160,000","8","3MH00573 (2023-11-17貨抵工地) ;       3MH00574 (2023-11-17貨抵工地) ;       3MH00575 (2024-03-06預計出貨) ;       3MH00576 (2024-01-03貨抵工地) ;       3MH00577 (2024-03-06預計出貨) ;       3MH00578 (2024-01-03貨抵工地) ;       3MW00579 (2024-03-06預計出貨) ;       3MW00580 (2024-03-06預計出貨) ;       ","666,000","3","0","0",0,0,"666,000","3",0,0,"0","0",0,0,"0","0",0,0],"M230600":["M230600","玄盟營造","葉博澄","3,600,000","6","3MH00835 (2024-03-19預計出貨) ;       3MH00836 (2024-03-19預計出貨) ;       3MH00837 (2024-03-19預計出貨) ;       3MH00838 (2024-03-20預計出貨) ;       3MH00839 (2024-03-20預計出貨) ;       3MH00840 (2024-03-20預計出貨) ;       ","1,080,000","5","1,080,000","5",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M230607":["M230607","豐田流通供應鏈物流有限公司","葉博澄","580,000","1","3MH00259 (2023-10-18試車完畢) ;       ","522,000","9","174,000","9",0,0,"174,000","6",0,0,"174,000","4",0,0,"0","0",0,0],"M220316":["M220316","白鴿建設-自由路都更案","黃孟澤","700,000","1","3MH00814 (2024-02-20預計出貨) ;       ","280,000","1","0","0","280,000","1","0","0",0,0,"0","0",0,0,"0","0",0,0],"M220381":["M220381","睿邑生物科技廠房","黃孟澤","2,200,000","2","3MW00128 (2023-12-22試車完畢) ;       3MW00129 (2024-01-11安裝完畢) ;       ","1,061,650","10","336,800","10",0,0,"673,600","5",0,0,"51,250","2","0","0","0","0",0,0],"M23100027":["M23100027","總財建設實業股份有限公司","黃孟澤","1,456,000","2","3MX00968 (2024-08-15預計出貨) ;       3MX00969 (2024-08-15預計出貨) ;       ","436,800","3","436,800","3",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0],"M23100029":["M23100029","高臺營造","黃孟澤","10,080,000","16","3MH01055 (2024-10-15預計出貨) ;       3MH01056 (2024-10-15預計出貨) ;       3MH01057 (2024-10-15預計出貨) ;       3MH01058 (2024-10-15預計出貨) ;       3MH01059 (2024-10-15預計出貨) ;       3MH01060 (2024-10-15預計出貨) ;       3MH01061 (2024-10-15預計出貨) ;       3MH01062 (2024-10-15預計出貨) ;       3MH01063 (2024-10-15預計出貨) ;       3MH01064 (2024-10-15預計出貨) ;       3MH01065 (2024-10-15預計出貨) ;       3MH01066 (2024-10-15預計出貨) ;       3MH01067 (2024-10-15預計出貨) ;       3MH01068 (2024-10-15預計出貨) ;       3MH01069 (2024-10-15預計出貨) ;       3MH01070 (2024-10-15預計出貨) ;       ","3,024,000","2","3,024,000","2",0,0,"0","0",0,0,"0","0",0,0,"0","0",0,0]}}
\ No newline at end of file