From 75a7bf5a5d279afa0e2404deeef1993cc1c8fff1 Mon Sep 17 00:00:00 2001
From: Cheng <lkmd555@masada.com.tw>
Date: Wed, 13 Dec 2023 11:00:18 +0800
Subject: [PATCH] header

---
 wms/IncludeCommon.php                         |  206 +-
 wms/T8_APItest.php                            |  180 +-
 wms/T8_APItest_from_bpm.php                   |   99 +
 wms/T8_Authorization.php                      |   72 +-
 wms/T8_Authorization_from_bpm.php             |   43 +
 wms/T8_assemble_apply.php                     |  140 +-
 wms/T8_purBillOrder_search.php                |   46 +-
 wms/T8_purRequestOrder_create.php             |   88 +-
 wms/account-create.php                        |  360 +-
 wms/account-delete.php                        |   36 +-
 wms/account-edit.php                          |  346 +-
 wms/account-index-submit.php                  |  170 +-
 wms/account-index.php                         |  371 +-
 wms/account-receivable-check.php              |  452 +-
 wms/account-receivable-contract.php           |   76 +-
 wms/account-receivable-excel.php              |   51 +
 wms/account-receivable-index.php              |  746 +--
 wms/account-receivable-received-create.php    |  243 +-
 wms/account-receivable-received-edit.php      |  261 +-
 wms/account-receivable-received-submit.php    |  180 +-
 wms/account-receivable.xlsx                   |  Bin 0 -> 55801 bytes
 wms/account-record-submit.php                 |  148 +-
 wms/account-record-update.php                 |  130 +-
 wms/account-user-input.php                    |  130 +-
 wms/account_auth-create.php                   |  354 +-
 wms/account_auth-edit.php                     |  364 +-
 wms/account_auth-index.php                    |  209 +-
 wms/account_auth-record-update.php            |  128 +-
 wms/bargain-create.php                        |  624 +--
 wms/bargain-delete.php                        |   56 +-
 wms/bargain-edit.php                          |  748 +--
 wms/bargain-index.php                         |  286 +-
 wms/bargain-record-submit.php                 |  296 +-
 wms/bargain-record-update.php                 |  286 +-
 wms/board-create.php                          |  129 +-
 wms/board-delete.php                          |   44 +-
 wms/board-edit.php                            |  118 +-
 wms/board-file.php                            |   36 +-
 wms/board-index.php                           |  307 +-
 wms/board-record-submit.php                   |  103 +-
 wms/board-record-update.php                   |  102 +-
 wms/change-password-update.php                |   94 +-
 wms/change-password.php                       |  152 +-
 wms/combo-create.php                          |  172 +-
 wms/combo-delete.php                          |   22 +-
 wms/combo-edit.php                            |  186 +-
 wms/combo-index.php                           |  278 +-
 wms/combo-record-submit.php                   |   84 +-
 wms/combo-record-update.php                   |   80 +-
 wms/combo-user-input.php                      |  108 +-
 wms/contract-create.php                       |  252 +-
 wms/contract-delete.php                       |   22 +-
 wms/contract-edit.php                         |  284 +-
 wms/contract-index.php                        |  324 +-
 wms/contract-record-submit.php                |  122 +-
 wms/contract-record-update.php                |   98 +-
 wms/contract-user-input.php                   |  126 +-
 wms/custom-create-contract.php                |  452 +-
 wms/custom-create-facility.php                |  544 +-
 wms/custom-create-schedule.php                |  460 +-
 wms/custom-create.php                         |  766 +--
 wms/data_collection_merge_export_submit.php   |  222 +-
 wms/database.php                              |   84 +-
 wms/delivery_info-create.php                  |  184 +-
 wms/delivery_info-delete.php                  |   22 +-
 wms/delivery_info-edit.php                    |  208 +-
 wms/delivery_info-index.php                   |  292 +-
 wms/delivery_info-record-submit.php           |   98 +-
 wms/delivery_info-record-update.php           |   86 +-
 wms/delivery_info-user-input.php              |  116 +-
 wms/delivery_log-create.php                   |  132 +-
 wms/delivery_log-delete.php                   |   22 +-
 wms/delivery_log-edit.php                     |  150 +-
 wms/delivery_log-index.php                    |  272 +-
 wms/delivery_log-record-submit.php            |   76 +-
 wms/delivery_log-record-update.php            |   74 +-
 wms/delivery_log-user-input.php               |  106 +-
 wms/demo.dart                                 |    8 +-
 wms/ec_purchase_order_submit.php              |  376 +-
 wms/equipment-create.php                      |  200 +-
 wms/equipment-delete.php                      |   22 +-
 wms/equipment-edit.php                        |  226 +-
 wms/equipment-index.php                       |  300 +-
 wms/equipment-record-submit.php               |  244 +-
 wms/equipment-record-update.php               |  158 +-
 wms/equipment-user-input.php                  |  114 +-
 wms/estimated_shipping_date_report.php        | 2676 +++++-----
 wms/excel-upload.php                          |  488 +-
 wms/expert-create.php                         |  262 +-
 wms/expert-delete.php                         |   22 +-
 wms/expert-edit.php                           |  252 +-
 wms/expert-index.php                          |  308 +-
 wms/expert-record-submit.php                  |  272 +-
 wms/expert-record-update.php                  |  168 +-
 wms/expert-user-input.php                     |  118 +-
 wms/facility-create.php                       |  252 +-
 wms/facility-delete.php                       |   22 +-
 wms/facility-edit.php                         |  306 +-
 wms/facility-excel-upload.php                 |  230 +-
 wms/facility-index.php                        |  320 +-
 wms/facility-record-submit.php                |  118 +-
 wms/facility-record-update.php                |   96 +-
 wms/facility-user-input.php                   |  122 +-
 wms/facility_current_status-create.php        |  130 +-
 wms/facility_current_status-delete.php        |   22 +-
 wms/facility_current_status-edit.php          |  146 +-
 wms/facility_current_status-index.php         |  270 +-
 wms/facility_current_status-record-submit.php |   76 +-
 wms/facility_current_status-record-update.php |   74 +-
 wms/facility_current_status-user-input.php    |  104 +-
 wms/facilityapi.php                           |  112 +-
 wms/footer.php                                |   12 +-
 wms/forms-create.php                          |   90 +-
 wms/forms-delete.php                          |   44 +-
 wms/forms-edit.php                            |   88 +-
 wms/forms-file.php                            |   36 +-
 wms/forms-index.php                           |  208 +-
 wms/forms-record-submit.php                   |   94 +-
 wms/forms-record-update.php                   |   92 +-
 wms/fun_global.php                            | 1175 ++---
 wms/gary.php                                  |  184 +-
 wms/gary_info.php                             |    4 +-
 wms/header.php                                |  556 +--
 wms/header_nomenu.php                         |   48 +-
 wms/headerapi.php                             |   48 +-
 wms/index.php                                 |  430 +-
 wms/login.php                                 |  298 +-
 wms/loginapi.php                              |  148 +-
 wms/logout.php                                |   28 +-
 wms/maintenance.php                           |  152 +-
 wms/meeting-create.php                        |  284 +-
 wms/meeting-delete.php                        |  138 +-
 wms/meeting-edit.php                          |  384 +-
 wms/meeting-index.php                         |  252 +-
 wms/meeting-record-submit.php                 |  156 +-
 wms/meeting-record-update.php                 |  206 +-
 wms/menu-create.php                           |  194 +-
 wms/menu-delete.php                           |   22 +-
 wms/menu-edit.php                             |  395 +-
 wms/menu-index.php                            |  252 +-
 wms/menu-record-submit.php                    |   56 +-
 wms/menu-record-update.php                    |  201 +-
 wms/new-elevator-contract-create.php          |  140 +-
 wms/new-order-contract-excel-upload.php       |  356 +-
 wms/ngfeedback-create-submit.php              |  120 +-
 wms/ngfeedback-create.php                     |  390 +-
 wms/ngfeedback-index.php                      |  936 ++--
 wms/ngfeedback-update-reply-submit.php        |   88 +-
 wms/ngfeedback-update-reply.php               |  344 +-
 wms/ngfeedback-update-submit.php              |  182 +-
 wms/ngfeedback-update.php                     |  470 +-
 wms/ngfeedbackapi.php                         |   46 +-
 wms/notice-delete.php                         |   20 +-
 wms/notice-edit.php                           |   92 +-
 wms/notice-index.php                          |  210 +-
 wms/pending_list.php                          |  238 +-
 wms/pre_order-create.php                      |  264 +-
 wms/pre_order-delete.php                      |   22 +-
 wms/pre_order-edit.php                        |  302 +-
 wms/pre_order-index.php                       |  326 +-
 wms/pre_order-record-submit.php               |  130 +-
 wms/pre_order-record-update.php               |  100 +-
 wms/pre_order-user-input.php                  |  126 +-
 wms/purchase-create.php                       |  366 +-
 wms/purchase-record-submit.php                |  124 +-
 wms/ranking-create.php                        |  534 +-
 wms/receivable-create.php                     |  212 +-
 wms/receivable-delete.php                     |   22 +-
 wms/receivable-edit.php                       |  230 +-
 wms/receivable-index.php                      |  282 +-
 wms/receivable-record-submit.php              |   96 +-
 wms/receivable-record-update.php              |   86 +-
 wms/receivable-user-input.php                 |  118 +-
 wms/reimburse-import.php                      |   60 +-
 wms/reimburse-import01.php                    |   60 +-
 wms/repair-create.php                         |  262 +-
 wms/repair-delete.php                         |   22 +-
 wms/repair-edit.php                           |  304 +-
 wms/repair-index.php                          |  334 +-
 wms/repair-record-submit.php                  |  132 +-
 wms/repair-record-update.php                  |   98 +-
 wms/repair-user-input.php                     |  130 +-
 wms/rib-feeapply-test.php                     |   22 +-
 wms/rib-test.php                              |  182 +-
 wms/rib-test02.php                            |   68 +-
 wms/rib01-business-check.php                  |  560 +--
 wms/rib01-business-create.php                 |  438 +-
 wms/rib01-business-edit.php                   |  360 +-
 wms/rib01-business-index.php                  |  482 +-
 wms/rib01-business-submit.php                 |   60 +-
 wms/rib01-check.php                           |  810 +--
 wms/rib01-create.php                          |   20 +-
 wms/rib01-delete.php                          |  140 +-
 wms/rib01-edit.php                            |  662 +--
 wms/rib01-index.php                           |  440 +-
 wms/rib01-submit.php                          |  208 +-
 wms/rib02-business-create.php                 |  890 ++--
 wms/rib02-check.php                           |  588 +--
 wms/rib02-create.php                          | 1408 +++---
 wms/rib02-delete.php                          |   74 +-
 wms/rib02-edit.php                            | 1442 +++---
 wms/rib02-invoice.php                         |   38 +-
 wms/rib02-purReceive-submit.php               |  176 +-
 wms/rib02-purchase-submit.php                 |  176 +-
 wms/rib02-submit.php                          |  466 +-
 wms/rib03-download.php                        |  188 +-
 wms/rib03-submit.php                          |  796 +--
 wms/schedule-create.php                       |  272 +-
 wms/schedule-delete.php                       |   22 +-
 wms/schedule-edit.php                         |  290 +-
 wms/schedule-index.php                        |  564 +--
 wms/schedule-record-submit.php                |  138 +-
 wms/schedule-record-update.php                |  122 +-
 wms/schedule-user-input.php                   |  140 +-
 wms/schedule_check-create.php                 |  376 +-
 wms/schedule_check-delete.php                 |   20 +-
 wms/schedule_check-edit.php                   |  340 +-
 wms/schedule_check-facility.php               |  128 +-
 wms/schedule_check-import.php                 |  264 +-
 wms/schedule_check-index.php                  |  322 +-
 wms/schedule_check-record-submit.php          |   84 +-
 wms/schedule_check-record-update.php          |   76 +-
 wms/schedule_star-index.php                   |  444 +-
 wms/scheduleapi.php                           |  110 +-
 wms/wipinstallation-create.php                |  154 +-
 wms/wipinstallation-delete.php                |   22 +-
 wms/wipinstallation-edit.php                  |  172 +-
 wms/wipinstallation-index.php                 |  280 +-
 wms/wipinstallation-record-submit.php         |   84 +-
 wms/wipinstallation-record-update.php         |   76 +-
 wms/wipinstallation-user-input.php            |  108 +-
 wms/wipproduction-create.php                  |  166 +-
 wms/wipproduction-delete.php                  |   22 +-
 wms/wipproduction-edit.php                    |  186 +-
 wms/wipproduction-index.php                   |  302 +-
 wms/wipproduction-record-submit.php           |   88 +-
 wms/wipproduction-record-update.php           |   78 +-
 wms/wipproduction-user-input.php              |  110 +-
 wms/wipwhole-change-contractdate-function.php | 1350 ++---
 wms/wipwhole-change-contractdate-submit.php   |  606 +--
 wms/wipwhole-change-contractdate.php          | 1043 ++--
 ...change-planning-customer-name-function.php | 1406 +++---
 ...e-change-planning-customer-name-submit.php |  462 +-
 ...wipwhole-change-planning-customer-name.php |  970 ++--
 wms/wipwhole-index-export-excel.php           |  804 +--
 wms/wipwhole-index-first-insert.php           | 1288 ++---
 wms/wipwhole-index-function.php               | 2420 ++++-----
 wms/wipwhole-index-table-html.php             |   15 +-
 wms/wipwhole-index.php                        | 1082 ++--
 wms/wipwhole-rec-invoice-edit-fileupload.php  |  140 +-
 wms/wipwhole-rec-invoice-edit-submit.php      | 2259 +++++----
 wms/wipwhole-rec-invoice-edit.php             | 4444 +++++++++--------
 wms/wipwhole-rec-invoice.php                  | 1753 +++----
 wms/wipwhole-rec-renovate-invoice.php         | 1716 +++----
 wms/wipwhole-renovate-index-export-excel.php  |  828 +--
 wms/wipwhole-renovate-index-function.php      | 2279 ++++-----
 wms/wipwhole-renovate-index-table-html.php    |   15 +-
 wms/wipwhole-renovate-index.php               |  220 +-
 wms/wipwhole-renovate-rec-invoice.php         | 1847 +++----
 wms/wipwholeinstall-index-export-excel.php    |  438 +-
 wms/wipwholeinstall-index-first-insert.php    |  388 +-
 wms/wipwholeinstall-index-function.php        | 2300 ++++-----
 wms/wipwholeinstall-index-table-html.php      |  408 +-
 wms/wipwholeinstall-index.php                 |  768 +--
 ...oleinstall-renovate-index-export-excel.php |  402 +-
 ...ipwholeinstall-renovate-index-function.php | 2344 ++++-----
 ...wholeinstall-renovate-index-table-html.php |  491 +-
 wms/wipwholeinstall-renovate-index.php        |  762 +--
 268 files changed, 45944 insertions(+), 44355 deletions(-)
 create mode 100644 wms/T8_APItest_from_bpm.php
 create mode 100644 wms/T8_Authorization_from_bpm.php
 create mode 100644 wms/account-receivable-excel.php
 create mode 100644 wms/account-receivable.xlsx

diff --git a/wms/IncludeCommon.php b/wms/IncludeCommon.php
index 1092255d..b11be99b 100644
--- a/wms/IncludeCommon.php
+++ b/wms/IncludeCommon.php
@@ -1,67 +1,65 @@
 <?php
 class IncludeCommon
 {
-    function CheckToken($token)
-    {
-        date_default_timezone_set("Asia/Taipei");
-        $encryption_code = "MASADA!^***";
-        $time = date("Y-m-d H:i:s");
-
-        if (!isset($token) || empty($token)) {
-            $data['code'] = '400';
-            $data['message'] = '非法请求';
-            return $data;
-        }
-        //对比token
-        $explode = explode('.', $token); //以.分割token为数组
-        if (!empty($explode[0]) && !empty($explode[1]) && !empty($explode[2]) && !empty($explode[3]) && !empty($explode[4])) {
-            $info = $explode[0] . '.' . $explode[1] . '.' . $explode[2] . '.' . $explode[3]; //信息部分
-            $true_signature = hash_hmac('md5', $info, $encryption_code); //正确的签名
-            if ($time > $explode[3]) {
-                $data['user_id'] = '';
-                $data['code'] = '401';
-                $data['message'] = 'Token已过期,请重新登录';
-                return $data;
-            }
-            if (($true_signature == $explode[4])) {
-                $data['user_id'] = $explode[0];
-                $data['code'] = '200';
-                $data['message'] = 'Token合法';
-                return $data;
-            } else {
-                $data['user_id'] = '';
-                $data['code'] = '400';
-                $data['message'] = 'Token不合法';
-                return $data;
-            }
-        } else {
-            $data['user_id'] = '';
-            $data['code'] = '400';
-            $data['message'] = 'Token不合法';
-            return $data;
-        }
-    }
-    //生成登录记录
-    function save_log_response($account, $response_result, $source_flag = 'web')
-    {
-        # 储存纪录并输出
-        #echo date("Y-m-d");
-        $file_path = "account_log/" . $account . "-" . date("Y-m-d") . ".ini";
-        $data = serialize($response_result) . date("H:i:s") . "\n";
-        $fp = fopen($file_path, "a"); # 如果档案不存在择尝试建立再写入
-        fwrite($fp, $data);
-        fclose($fp);
-        if ($source_flag == "web") {
-            //			header("Location: custom-create.php?function_list=" . serialize($response_result) .
-            //				"&token=" . $response_result["token"]); #请输入使用者名称密码
-            //			exit();
-            return true;
-        } else {
-            //			echo json_encode($response_result, JSON_UNESCAPED_UNICODE);
-            return false;
-        }
+	function CheckToken($token) {
+		date_default_timezone_set("Asia/Taipei");
+		$encryption_code = "MASADA!^***";
+		$time = date("Y-m-d H:i:s");
+
+		if (!isset($token) || empty($token)) {
+			$data['code'] = '400';
+			$data['message'] = '非法请求';
+			return $data;
+		}
+		//对比token
+		$explode = explode('.', $token); //以.分割token为数组
+		if (!empty($explode[0]) && !empty($explode[1]) && !empty($explode[2]) && !empty($explode[3]) && !empty($explode[4])) {
+			$info = $explode[0] . '.' . $explode[1] . '.' . $explode[2] . '.' . $explode[3]; //信息部分
+			$true_signature = hash_hmac('md5', $info, $encryption_code); //正确的签名
+			if ($time > $explode[3]) {
+				$data['user_id'] = '';
+				$data['code'] = '401';
+				$data['message'] = 'Token已过期,请重新登录';
+				return $data;
+			}
+			if (($true_signature == $explode[4])) {
+				$data['user_id'] = $explode[0];
+				$data['code'] = '200';
+				$data['message'] = 'Token合法';
+				return $data;
+			} else {
+				$data['user_id'] = '';
+				$data['code'] = '400';
+				$data['message'] = 'Token不合法';
+				return $data;
+			}
+		} else {
+			$data['user_id'] = '';
+			$data['code'] = '400';
+			$data['message'] = 'Token不合法';
+			return $data;
+		}
+	}
+//生成登录记录
+	function save_log_response($source_flag='web', $account, $response_result){
+		# 储存纪录并输出
+		#echo date("Y-m-d");
+		$file_path = "account_log/" . $account . "-" . date("Y-m-d") . ".ini";
+		$data = serialize($response_result). date("H:i:s") . "\n";
+		$fp = fopen($file_path,"a"); # 如果档案不存在择尝试建立再写入
+		fwrite($fp, $data);
+		fclose($fp);
+		if ($source_flag == "web"){
+//			header("Location: custom-create.php?function_list=" . serialize($response_result) .
+//				"&token=" . $response_result["token"]); #请输入使用者名称密码
+//			exit();
+			return true;
+		}else{
+//			echo json_encode($response_result, JSON_UNESCAPED_UNICODE);
+			return false;
+		}
 
-        /*
+		/*
 		if ($source_flag == "app"){
 			echo json_encode($response_result, JSON_UNESCAPED_UNICODE);
 		}elseif ($source_flag == "web"){
@@ -70,28 +68,26 @@ class IncludeCommon
 			exit();
 		}
 		*/
-    }
-
-    //生成token
-    function CreateToken($user_id, $user_name)
-    {
-        date_default_timezone_set("Asia/Taipei");
-        $start_time = date("Y-m-d H:i:s");
-        $end_time = date('Y-m-d H:i:s', strtotime('+24 hour')); #设定24小时
-        $info = $user_id . '.' . base64_encode(urlencode($user_name)) . '.' . $start_time . '.' . $end_time; //设置token过期时间为一天
-        $encryption_code = "MASADA!^***";
-        //根据以上信息信息生成签名（密钥为 SIGNATURE 自定义全局常量)
-        $signature = hash_hmac('md5', $info, $encryption_code);
-        //最后将这两部分拼接起来，得到最终的Token字符串
-        return $token = $info . '.' . $signature;
-    }
-    //生成菜单
+	}
+
+//生成token
+	function CreateToken($user_id, $user_name) {
+		date_default_timezone_set("Asia/Taipei");
+		$start_time = date("Y-m-d H:i:s");
+		$end_time = date('Y-m-d H:i:s',strtotime('+24 hour')); #设定24小时
+		$info = $user_id . '.' . base64_encode(urlencode($user_name)) . '.' . $start_time . '.' . $end_time; //设置token过期时间为一天
+		$encryption_code = "MASADA!^***";
+		//根据以上信息信息生成签名（密钥为 SIGNATURE 自定义全局常量)
+		$signature = hash_hmac('md5', $info, $encryption_code);
+		//最后将这两部分拼接起来，得到最终的Token字符串
+		return $token = $info . '.' . $signature;
+	}
+//生成菜单
 
     /**
      * 將模擬帳號寫入token
      */
-    function FakeToken($fake_user_id, $token)
-    {
+    function FakeToken($fake_user_id, $token) {
         date_default_timezone_set("Asia/Taipei");
         $encryption_code = "MASADA!^***";
         $time = date("Y-m-d H:i:s");
@@ -101,32 +97,31 @@ class IncludeCommon
         return $token = $info . '.' . $signature;
     }
 
-    function menu($type, $from = 'tw')
-    {
-        $function_type = array(
-            "tw" => array(
-                # F角色菜单
-                "F" => array(
-                    "language" => "tw",
-                    "type" => "manage",
-                    "list" => array(
-                        array("name" => "批量导入", "path" => "http://192.168.0.12/wms/excel-upload"),
-                    ),
-                    "note" => "none",
-                    "token" => ""
-                ),
-            )
-        );
-
-
-        return  $function_type[$from][$type];
-    }
+	function menu ($from='tw',$type){
+		$function_type = array(
+			"tw" => array(
+				# F角色菜单
+				"F" => array(
+					"language" => "tw",
+					"type" => "manage",
+					"list" => array(
+						array("name" => "批量导入", "path" => "http://192.168.0.12/wms/excel-upload"),
+					),
+					"note" => "none",
+					"token" => ""
+				),
+			)
+		);
+        
+
+		 return  $function_type[$from][$type];
+
+	}
 
     /**
      * 依帳號類別檢視功能目錄
      */
-    function menu_v2($atype = "")
-    {
+    function menu_v2($atype="") {
         global $link;
 
         if (!$atype) return;
@@ -145,8 +140,7 @@ class IncludeCommon
      * 管理者可看到全部選單
      * 其餘人員依account_auth決定可檢視的選單
      */
-    function menu_v3($accounttype, $aid = "")
-    {
+    function menu_v3($aid="", $accounttype) {
         global $link;
 
         if (!$aid) return;
@@ -155,7 +149,7 @@ class IncludeCommon
 
         $sql_cmd = ($accounttype == "E") ? "" : "where status = 'Y'";
         $sql = "select main_menu, sub_menu, sub_menu_eng, mlink from menu $sql_cmd order by main_menu_seq, sub_menu_seq";
-
+     
         $res = mysqli_query($link, $sql);
         while ($row = mysqli_fetch_assoc($res)) {
             $menu_arr[$row["mlink"]]["main_menu"] = $row["main_menu"];
@@ -167,8 +161,8 @@ class IncludeCommon
         $sql = "select permission from account_auth where accountid = '$aid'";
         $res = mysqli_query($link, $sql);
         $row = mysqli_fetch_row($res);
-        $permission = empty($row) ? json_encode([]) : $row[0];  // $permission = $row[0]; //P0044 修改于2023/6/13 16:30
-
+        $permission = empty($row)? json_encode([]): $row[0];  // $permission = $row[0]; //P0044 修改于2023/6/13 16:30
+	     
         $permission_arr = json_decode($permission, true);
         foreach ($menu_arr as $key => $val) {
             if (($accounttype == "E") || !empty($permission_arr[$key])) {
@@ -215,4 +209,4 @@ class IncludeCommon
         return $str;
         */
     }
-}
+}
\ No newline at end of file
diff --git a/wms/T8_APItest.php b/wms/T8_APItest.php
index d327c6e5..6f89ee68 100644
--- a/wms/T8_APItest.php
+++ b/wms/T8_APItest.php
@@ -1,91 +1,91 @@
-<?php
-include "T8_Authorization.php";
-echo "ii";
-?>
-<script>
-  get_Auth();
-  window.addEventListener('message', function(event) {
-    if (event.origin === "http://localhost:3000" && (typeof event.data === "string")) {
-      // if (event.origin === "https://masada.com.tw" && (typeof event.data === "string")) {
-      var validation = event.data;
-      console.log("event");
-      console.log(validation);
-
-      // var corsurl = 'http://cors-anywhere.herokuapp.com/';
-      var apiurl = 'https://erp.masada.com.tw:780/twWebAPI/V1/SALDISPATCHLIST/GetERPData?pkValue=SS20230825001';
-      headerParam = {
-        CHI_Authorization: `${validation}`,
-      };
-      var body = [{
-          "name": "MasterTable",
-          "rows": [{
-            "BillNo": "Z001",
-            "BillDate": 20230930,
-            "OrgId": "1000",
-            "TypeId": "OPV",
-            "BizPartnerId": "03051501",
-            "CurrId": "RMB",
-            "CurrLAmount":5,
-            "TaxId": "ST005",
-            "PersonId": "M0012",
-            "DeptId": "220",
-            "CompId": "1001",
-            "CreditAgeDate": 20230930,
-            "RecBizPartnerId": "03051501",
-
-          }]
-        },
-        {
-          "name": "DetailTable",
-          "rows": [{
-              "BillNo": "Z001",
-              "RowCode": 1,
-              "RowNo": 1,
-              "ItemType": 0,
-              "MaterialId": "MX00000001",
-              "UnitId": "PCS",
-              "MaterialSpec": "",
-              "SQuantity": 10,
-              "SPrice": 141.18,
-              "OAmount": 1344.57,
-              "OTax": 67.23,
-              "OAmountWithTax": 1411.8,
-              "TaxId": "ST005"
-            },
-            {
-              "BillNo": "Z001",
-              "RowCode": 2,
-              "RowNo": 2,
-              "ItemType": 0,
-              "MaterialId": "MX00000001",
-              "UnitId": "PCS",
-              "MaterialSpec": "",
-              "SQuantity": 15,
-              "SPrice": 141.18,
-              "OAmount": 2016.86,
-              "OTax": 100.84,
-              "OAmountWithTax": 2117.7,
-              "TaxId": "ST005"
-            }
-          ]
-        }
-      ];
-      var json = JSON.stringify(body);
-      obj = {
-        type: 'GET',
-        // url: `${corsurl}${apiurl}`,
-        url: `${apiurl}`,
-        // dataType: 'json',
-        headers: headerParam,
-        // data: json,
-        // dataType: "json",
-        success: function(res) {
-          console.log(res.Status);
-          console.log(res.ErrorMsg);
-          console.log(res.Data);
-        }
-      };
-      jQuery.ajax(obj);
-    }
-  })
+<?php
+include "T8_Authorization.php";
+echo "ii";
+?>
+<script>
+  get_Auth();
+  window.addEventListener('message', function(event) {
+    if (event.origin === "http://localhost:3000" && (typeof event.data === "string")) {
+      // if (event.origin === "https://masada.com.tw" && (typeof event.data === "string")) {
+      var validation = event.data;
+      console.log("event");
+      console.log(validation);
+
+      // var corsurl = 'http://cors-anywhere.herokuapp.com/';
+      var apiurl = 'https://erp.masada.com.tw:780/twWebAPI/V1/SALDISPATCHLIST/GetERPData?pkValue=SS20230825001';
+      headerParam = {
+        CHI_Authorization: `${validation}`,
+      };
+      var body = [{
+          "name": "MasterTable",
+          "rows": [{
+            "BillNo": "Z001",
+            "BillDate": 20230930,
+            "OrgId": "1000",
+            "TypeId": "OPV",
+            "BizPartnerId": "03051501",
+            "CurrId": "RMB",
+            "CurrLAmount":5,
+            "TaxId": "ST005",
+            "PersonId": "M0012",
+            "DeptId": "220",
+            "CompId": "1001",
+            "CreditAgeDate": 20230930,
+            "RecBizPartnerId": "03051501",
+
+          }]
+        },
+        {
+          "name": "DetailTable",
+          "rows": [{
+              "BillNo": "Z001",
+              "RowCode": 1,
+              "RowNo": 1,
+              "ItemType": 0,
+              "MaterialId": "MX00000001",
+              "UnitId": "PCS",
+              "MaterialSpec": "",
+              "SQuantity": 10,
+              "SPrice": 141.18,
+              "OAmount": 1344.57,
+              "OTax": 67.23,
+              "OAmountWithTax": 1411.8,
+              "TaxId": "ST005"
+            },
+            {
+              "BillNo": "Z001",
+              "RowCode": 2,
+              "RowNo": 2,
+              "ItemType": 0,
+              "MaterialId": "MX00000001",
+              "UnitId": "PCS",
+              "MaterialSpec": "",
+              "SQuantity": 15,
+              "SPrice": 141.18,
+              "OAmount": 2016.86,
+              "OTax": 100.84,
+              "OAmountWithTax": 2117.7,
+              "TaxId": "ST005"
+            }
+          ]
+        }
+      ];
+      var json = JSON.stringify(body);
+      obj = {
+        type: 'GET',
+        // url: `${corsurl}${apiurl}`,
+        url: `${apiurl}`,
+        // dataType: 'json',
+        headers: headerParam,
+        // data: json,
+        // dataType: "json",
+        success: function(res) {
+          console.log(res.Status);
+          console.log(res.ErrorMsg);
+          console.log(res.Data);
+        }
+      };
+      jQuery.ajax(obj);
+    }
+  })
 </script>
\ No newline at end of file
diff --git a/wms/T8_APItest_from_bpm.php b/wms/T8_APItest_from_bpm.php
new file mode 100644
index 00000000..483b0e22
--- /dev/null
+++ b/wms/T8_APItest_from_bpm.php
@@ -0,0 +1,99 @@
+<?php
+ini_set('display_errors', 'on');
+date_default_timezone_set('Asia/Taipei');
+
+$referrer = isset($_REQUEST['referer']) ? $_REQUEST['referer'] : "";
+$hashReferer = "https://bpm.masada.com.twMasada@2023";
+
+if ($hashReferer == $referrer) {
+
+  include "T8_Authorization_from_bpm.php";
+
+  $user_id = "M0000";
+  $user_password = "M012290493119";
+  $validation = get_Auth("M0000", "M012290493119");
+
+  send_data_to_API($validation);
+} else {
+  echo "非法訪問！";
+  exit;
+}
+
+
+function send_data_to_API($validation)
+{
+  // $apiurl = 'http://60.244.87.101:880//twWebAPI/V1/STKASSY/PostERPData';
+  $apiurl = 'http://10.10.145.2:880//twWebAPI/V1/STKASSY/PostERPData';
+  // $apiurl = 'https://erp.masada.com.tw:780/twWebAPI/V1/STKASSY/PostERPData';
+
+  $headerParam = [
+    'CHI_Authorization: ' . $validation,
+    'Content-Type: application/json'
+  ];
+
+  $body = [
+    [
+      "name" => "stkAssyMast",
+      "rows" => [
+        [
+          "BillNo" => "TEST06",
+          "OrgId" => "1000",
+          "TypeId" => "CA",
+          "MaterialId" => "3MH00302",
+          "PersonId" => "M0122",
+          "CompId" => "1001",
+          "DeptId" => "220",
+          "SQuantity" => 1,
+          "SUnitId" => "SET",
+          "CurrentState" => 2,
+          "CreatorId" => "M0122"
+        ]
+      ]
+    ],
+    [
+      "name" => "stkAssySubMatInfo",
+      "rows" => [
+        [
+          "BillNo" => "TEST06",
+          "MaterialId" => "3MH00302P",
+          "ComponentBaseQty" => 1,
+          "UnitQty" => 1,
+          "SUnitId" => "SET",
+          "MarkerNo" => "3MH00302",
+          "CU_MaterialId" => "3MH00302"
+        ],
+        [
+          "BillNo" => "TEST06",
+          "MaterialId" => "MX00000001",
+          "ComponentBaseQty" => 1,
+          "UnitQty" => 3,
+          "SUnitId" => "PCS",
+          "MarkerNo" => "3MH00302",
+          "CU_MaterialId" => "3MH00302"
+        ]
+      ]
+    ]
+  ];
+
+  $json = json_encode($body);
+
+  $ch = curl_init();
+  curl_setopt($ch, CURLOPT_URL, $apiurl);
+  curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+  curl_setopt($ch, CURLOPT_HTTPHEADER, $headerParam);
+  curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
+  curl_setopt($ch, CURLOPT_POSTFIELDS, $json);
+
+  $response = curl_exec($ch);
+
+  if ($response === false) {
+    echo 'Curl error: ' . curl_error($ch);
+  } else {
+    $result = json_decode($response, true);
+    echo $result['Status'] . "\n";
+    echo $result['ErrorMsg'] . "\n";
+    print_r($result['Data']);
+  }
+
+  curl_close($ch);
+}
diff --git a/wms/T8_Authorization.php b/wms/T8_Authorization.php
index 0a18e7ed..f383ee47 100644
--- a/wms/T8_Authorization.php
+++ b/wms/T8_Authorization.php
@@ -1,37 +1,37 @@
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
-<?php
-$now = gmdate("YmdHis");
-$data = 'M0000.' . $now;
-$sign = hash_hmac('SHA256', $data, 'B2D6395D2883E26C', false);
-
-?>
-
-<script>
-    function get_Auth() {
-        var api_key = 'B2D6395D2883E26C';
-        var validation = "";
-        // var corsurl = 'http://cors-anywhere.herokuapp.com/';
-        // var apiurl = 'http://60.244.87.101:880//twWebAPI/GetAuth';
-        var apiurl =  'https://erp.masada.com.tw:780/twWebAPI/GetAuth'
-        headerParam = {
-            UserId: 'M0000',
-            Pwd: 'M012290493119',
-            TimestampUTC: <?= $now ?>,
-            Sign: '<?= $sign ?>'
-        };
-        obj = {
-            type: 'get',
-            // url: `${corsurl}${apiurl}`,
-            url: `${apiurl}`,
-            dataType: 'json',
-            headers: headerParam,
-            success: function(res) {
-                validation = res.Data['CHI_Authorization'];
-                console.log("validation：",validation);
-                window.parent.postMessage(validation,'http://localhost:3000');
-                // window.parent.postMessage(validation,'https://masada.com.tw');
-            }
-        };
-        jQuery.ajax(obj);
-    }
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+<?php
+$now = gmdate("YmdHis");
+$data = 'M0000.' . $now;
+$sign = hash_hmac('SHA256', $data, 'B2D6395D2883E26C', false);
+
+?>
+
+<script>
+    function get_Auth() {
+        var api_key = 'B2D6395D2883E26C';
+        var validation = "";
+        // var corsurl = 'http://cors-anywhere.herokuapp.com/';
+        // var apiurl = 'http://60.244.87.101:880//twWebAPI/GetAuth';
+        var apiurl =  'https://erp.masada.com.tw:780/twWebAPI/GetAuth'
+        headerParam = {
+            UserId: 'M0000',
+            Pwd: 'M012290493119',
+            TimestampUTC: <?= $now ?>,
+            Sign: '<?= $sign ?>'
+        };
+        obj = {
+            type: 'get',
+            // url: `${corsurl}${apiurl}`,
+            url: `${apiurl}`,
+            dataType: 'json',
+            headers: headerParam,
+            success: function(res) {
+                validation = res.Data['CHI_Authorization'];
+                console.log("validation：",validation);
+                window.parent.postMessage(validation,'http://localhost:3000');
+                // window.parent.postMessage(validation,'https://masada.com.tw');
+            }
+        };
+        jQuery.ajax(obj);
+    }
 </script>
\ No newline at end of file
diff --git a/wms/T8_Authorization_from_bpm.php b/wms/T8_Authorization_from_bpm.php
new file mode 100644
index 00000000..c6ad6829
--- /dev/null
+++ b/wms/T8_Authorization_from_bpm.php
@@ -0,0 +1,43 @@
+<?php
+
+$user_id = "M0000";
+$user_password = "M012290493119";
+
+function get_Auth($user_id = "M0000", $user_password = "M012290493119")
+{
+
+    $now = gmdate("YmdHis");
+    $data = "$user_id." . $now;
+    $sign = hash_hmac('SHA256', $data, 'B2D6395D2883E26C', false);
+
+
+    // $apiurl = 'https://erp.masada.com.tw:780/twWebAPI/GetAuth';
+    // $apiurl = 'http://60.244.87.101:880//twWebAPI/GetAuth';
+    $apiurl = 'http://10.10.145.2:880//twWebAPI/GetAuth';
+    // $apiurl = 'https://erp.masada.com.tw:780/twWebAPI/GetAuth';
+
+    $headerParam = [
+        "UserId: $user_id",
+        "Pwd: $user_password",
+        "TimestampUTC: $now",
+        "Sign: $sign"
+    ];
+
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_URL, $apiurl);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($ch, CURLOPT_HTTPHEADER, $headerParam);
+
+    $response = curl_exec($ch);
+    if ($response === false) {
+        echo 'Curl error: ' . curl_error($ch);
+    } else {
+        // print_r($response);
+        // exit;
+        $result = json_decode($response, true);
+        $validation = $result['Data']['CHI_Authorization'];
+        return $validation;
+    }
+
+    curl_close($ch);
+}
diff --git a/wms/T8_assemble_apply.php b/wms/T8_assemble_apply.php
index 293d0fd3..fea8f22b 100644
--- a/wms/T8_assemble_apply.php
+++ b/wms/T8_assemble_apply.php
@@ -1,71 +1,71 @@
-<?php
-//外購組裝單 (組裝申請單)
-include "T8_Authorization.php";
-?>
-<script>
-    get_Auth();
-    window.addEventListener('message', function(event) {
-        if (event.origin === "http://localhost:3000" && (typeof event.data === "string")) {
-            var validation = event.data;
-            console.log(validation);
-            var apiurl = 'https://erp.masada.com.tw:780/twWebAPI/V1/STKASSY/PostERPData';
-            headerParam = {
-                CHI_Authorization: `${validation}`,
-            };
-            var body = [{
-                "name":"stkAssyMast",
-                "rows":[
-                    {
-                        "BillNo":"TEST02",
-                        "OrgId":"1000",
-                        "TypeId":"CA",
-                        "MaterialId":"3MH00302",
-                        "PersonId":"M0122",
-                        "CompId":"1001",
-                        "DeptId":"220",
-                        "SQuantity":1,
-                        "SUnitId":"SET",
-                        "CurrentState":2,
-                        "CreatorId":"M0122"
-                    }
-                ]
-            },{
-                "name":"stkAssySubMatInfo",
-                "rows":[
-                    {
-                        "BillNo":"TEST02",
-                        "MaterialId":"3MH00302P",
-                        "ComponentBaseQty":1,
-                        "UnitQty":1,
-                        "SUnitId":"SET",
-                        "MarkerNo":"3MH00302",
-                        "CU_MaterialId":"3MH00302"
-                    },{
-                        "BillNo":"TEST02",
-                        "MaterialId":"MX00000001",
-                        "ComponentBaseQty":1,
-                        "UnitQty":3,
-                        "SUnitId":"PCS",
-                        "MarkerNo":"3MH00302",
-                        "CU_MaterialId":"3MH00302"
-                    }
-                ]
-            }];
-            var json = JSON.stringify(body);
-            obj = {
-                type:'POST',
-                url:`${apiurl}`,
-                headers:headerParam,
-                data: json,
-                dataType:"json",
-                success: function(res){
-                    console.log(res.Status);
-                    console.log(res.ErrorMsg);
-                    console.log(res.Data);
-                }
-            };
-            jQuery.ajax(obj);
-
-        }
-    })
+<?php
+//外購組裝單 (組裝申請單)
+include "T8_Authorization.php";
+?>
+<script>
+    get_Auth();
+    window.addEventListener('message', function(event) {
+        if (event.origin === "http://localhost:3000" && (typeof event.data === "string")) {
+            var validation = event.data;
+            console.log(validation);
+            var apiurl = 'https://erp.masada.com.tw:780/twWebAPI/V1/STKASSY/PostERPData';
+            headerParam = {
+                CHI_Authorization: `${validation}`,
+            };
+            var body = [{
+                "name":"stkAssyMast",
+                "rows":[
+                    {
+                        "BillNo":"TEST02",
+                        "OrgId":"1000",
+                        "TypeId":"CA",
+                        "MaterialId":"3MH00302",
+                        "PersonId":"M0122",
+                        "CompId":"1001",
+                        "DeptId":"220",
+                        "SQuantity":1,
+                        "SUnitId":"SET",
+                        "CurrentState":2,
+                        "CreatorId":"M0122"
+                    }
+                ]
+            },{
+                "name":"stkAssySubMatInfo",
+                "rows":[
+                    {
+                        "BillNo":"TEST02",
+                        "MaterialId":"3MH00302P",
+                        "ComponentBaseQty":1,
+                        "UnitQty":1,
+                        "SUnitId":"SET",
+                        "MarkerNo":"3MH00302",
+                        "CU_MaterialId":"3MH00302"
+                    },{
+                        "BillNo":"TEST02",
+                        "MaterialId":"MX00000001",
+                        "ComponentBaseQty":1,
+                        "UnitQty":3,
+                        "SUnitId":"PCS",
+                        "MarkerNo":"3MH00302",
+                        "CU_MaterialId":"3MH00302"
+                    }
+                ]
+            }];
+            var json = JSON.stringify(body);
+            obj = {
+                type:'POST',
+                url:`${apiurl}`,
+                headers:headerParam,
+                data: json,
+                dataType:"json",
+                success: function(res){
+                    console.log(res.Status);
+                    console.log(res.ErrorMsg);
+                    console.log(res.Data);
+                }
+            };
+            jQuery.ajax(obj);
+
+        }
+    })
 </script>
\ No newline at end of file
diff --git a/wms/T8_purBillOrder_search.php b/wms/T8_purBillOrder_search.php
index e3ff95f4..91ebfa26 100644
--- a/wms/T8_purBillOrder_search.php
+++ b/wms/T8_purBillOrder_search.php
@@ -1,23 +1,23 @@
-<?php
-include "./header.php";
-//假設供應商代碼為P
-$BizPartnerId = "P";
-$sql_purBillOrder = "
-SELECT * FROM purBillOrderMaster WHERE BizPartnerId = '$BizPartnerId' AND CurrentState = 2";
-$purMaster = $conn->query($sql_purBillOrder);
-//每筆採購單資料
-foreach($purMaster as $master){
-    //print_r($master); 
-    $BillNo = $master['BillNo'];
-
-    //每筆採購單明細資料
-    $sql_purDetail = "
-    SELECT * FROM purBillOrderDetail WHERE BillNo = '$BillNo'";
-    $purDetail = $conn->query($sql_purDetail);
-    foreach($purDetail as $detail){
-        print_r($detail);
-    }
-    echo "<br>----------------------<br>";
-
-}
-
+<?php
+include "./header.php";
+//假設供應商代碼為P
+$BizPartnerId = "P";
+$sql_purBillOrder = "
+SELECT * FROM purBillOrderMaster WHERE BizPartnerId = '$BizPartnerId' AND CurrentState = 2";
+$purMaster = $conn->query($sql_purBillOrder);
+//每筆採購單資料
+foreach($purMaster as $master){
+    //print_r($master); 
+    $BillNo = $master['BillNo'];
+
+    //每筆採購單明細資料
+    $sql_purDetail = "
+    SELECT * FROM purBillOrderDetail WHERE BillNo = '$BillNo'";
+    $purDetail = $conn->query($sql_purDetail);
+    foreach($purDetail as $detail){
+        print_r($detail);
+    }
+    echo "<br>----------------------<br>";
+
+}
+
diff --git a/wms/T8_purRequestOrder_create.php b/wms/T8_purRequestOrder_create.php
index 2b441114..4df7938a 100644
--- a/wms/T8_purRequestOrder_create.php
+++ b/wms/T8_purRequestOrder_create.php
@@ -1,45 +1,45 @@
-<?php
-include "./header.php";
-date_default_timezone_set('Asia/Taipei');
-
-//表頭
-$BillNo ="TEST01";
-$BillDate = 20231204;
-$PersonId = "M0122";
-$DeptId = "220";
-// $ProjectId = "3MH00545";
-$CreateTime = Date("YmdHis");
-$CurrentState = 2;
-
-//表身
-$ItemType = 0;
-$MaterialId = "MX00011078";
-$SUnitId = "PCS";
-$DemandSQty = 5;   //核准數量
-$RequestSQty = 5;  //請購數量
-$RequireDate=20231205;
-$CurrId="TWD";
-$UnTransQty = 5; //未轉採購基本數量
-$TransQty = 0; //已轉採購基本數量
-$SupplyQty = 5; //供給數量
-$ProjectId="3MH00545"; //合約號
-$SupplyId= "P"; //供應商
-$UnTransOtherSQty = 5;
-$AllowTransOtherSQty = 5;
-$CU_MaterialId="3MH00352"; //作番號 、預留標示號
-
-$sql = "INSERT INTO purRequestOrder(BillNo, BillDate, PersonId, DeptId, CreateTime, CurrentState,
-TypeId, DemandOrgId, FOrgId,CreatorId, CompId) VALUES ('$BillNo',$BillDate,'$PersonId','$DeptId',$CreateTime,$CurrentState,
-'PR','1000','1000','$user_id','1001')";
-
-$sql_sub = "INSERT INTO purApplyOrderDetail(BillNo,RowCode, RowNo, ItemType, MaterialId, SUnitId,
-DemandSQty, DemandQty, RequestSQty,RequestQty, RequireDate, IsPriceWithTax, CurrId, 
-PurOrgId, BpOrgId, SupplyId, UnTransQty, TransQty, SupplyQty, ProjectId, PlanRangeId, 
-UnTransOtherSQty, AllowTransOtherSQty,P_A_DemandOrgId, PurCompId, CU_MaterialId, MarkerNo
-) VALUES ('$BillNo',1,1,$ItemType,'$MaterialId','$SUnitId', 
-$DemandSQty, $DemandSQty, $RequestSQty, $RequestSQty, $RequireDate, 1, '$CurrId',
-'1000', '1000', '$SupplyId', $UnTransQty, $TransQty, $SupplyQty, '$ProjectId', '1000',
-$UnTransOtherSQty, $AllowTransOtherSQty,'1000','1001','$CU_MaterialId','$CU_MaterialId')";
-
-$conn ->query($sql);
+<?php
+include "./header.php";
+date_default_timezone_set('Asia/Taipei');
+
+//表頭
+$BillNo ="TEST01";
+$BillDate = 20231204;
+$PersonId = "M0122";
+$DeptId = "220";
+// $ProjectId = "3MH00545";
+$CreateTime = Date("YmdHis");
+$CurrentState = 2;
+
+//表身
+$ItemType = 0;
+$MaterialId = "MX00011078";
+$SUnitId = "PCS";
+$DemandSQty = 5;   //核准數量
+$RequestSQty = 5;  //請購數量
+$RequireDate=20231205;
+$CurrId="TWD";
+$UnTransQty = 5; //未轉採購基本數量
+$TransQty = 0; //已轉採購基本數量
+$SupplyQty = 5; //供給數量
+$ProjectId="3MH00545"; //合約號
+$SupplyId= "P"; //供應商
+$UnTransOtherSQty = 5;
+$AllowTransOtherSQty = 5;
+$CU_MaterialId="3MH00352"; //作番號 、預留標示號
+
+$sql = "INSERT INTO purRequestOrder(BillNo, BillDate, PersonId, DeptId, CreateTime, CurrentState,
+TypeId, DemandOrgId, FOrgId,CreatorId, CompId) VALUES ('$BillNo',$BillDate,'$PersonId','$DeptId',$CreateTime,$CurrentState,
+'PR','1000','1000','$user_id','1001')";
+
+$sql_sub = "INSERT INTO purApplyOrderDetail(BillNo,RowCode, RowNo, ItemType, MaterialId, SUnitId,
+DemandSQty, DemandQty, RequestSQty,RequestQty, RequireDate, IsPriceWithTax, CurrId, 
+PurOrgId, BpOrgId, SupplyId, UnTransQty, TransQty, SupplyQty, ProjectId, PlanRangeId, 
+UnTransOtherSQty, AllowTransOtherSQty,P_A_DemandOrgId, PurCompId, CU_MaterialId, MarkerNo
+) VALUES ('$BillNo',1,1,$ItemType,'$MaterialId','$SUnitId', 
+$DemandSQty, $DemandSQty, $RequestSQty, $RequestSQty, $RequireDate, 1, '$CurrId',
+'1000', '1000', '$SupplyId', $UnTransQty, $TransQty, $SupplyQty, '$ProjectId', '1000',
+$UnTransOtherSQty, $AllowTransOtherSQty,'1000','1001','$CU_MaterialId','$CU_MaterialId')";
+
+$conn ->query($sql);
 $conn ->query($sql_sub);
\ No newline at end of file
diff --git a/wms/account-create.php b/wms/account-create.php
index 89f2715d..73d8f839 100644
--- a/wms/account-create.php
+++ b/wms/account-create.php
@@ -1,180 +1,180 @@
-<?php
-include "header.php";
-
-// 部門職別
-$db_query = "select department_id, name, role_id, role from department order by department_id";
-$res = mysqli_query($link, $db_query);
-while ($row = mysqli_fetch_assoc($res)) {
-    $depart_arr[$row["department_id"]] = $row["name"];
-    $role_arr[$row["department_id"]][$row["role_id"]] = $row["role"];
-}
-mysqli_free_result($res);
-?>
-<script>
-$(function(){
-    var jroleStr = '<?php echo json_encode($role_arr); ?>';
-    var jroleArr = JSON.parse(jroleStr);
-    var optStr = "";
-    $("select[name=department_id]").change(function(){
-        if ($(this).val() != "") {
-            optStr = "";
-            for (var i in jroleArr[$(this).val()]) {
-                if ('undefined' !== jroleArr[$(this).val()][i]) {
-                    optStr += '<option value="'+i+'">'+jroleArr[$(this).val()][i]+'</option>';
-                }
-            }
-            $("select[name=role_id]").html(optStr);
-        } else $("select[name=role_id]").html('<option value="">請選擇</option>');
-    })
-});
-</script>
-<div class="container">
-
-    <?php
-    
-        include "account-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>">
-        
-    
-        <div>
-            <label for="accounttype">帳號類別(必選)</label>
-            <select name="accounttype" id="accounttype" required>
-                <option selected="selected" disabled="disabled"  style="display: none" value=""></option>			
-                <option value="A">客戶(A)</option>
-                <option value="B">保養人員(B)</option>
-                <!--
-                <option value="C">檢查人員</option>
-                <option value="D">契約人員</option>
-                -->
-                <option value="E">管理人員(E)</option>
-                <option value="M">永佳捷員工(M)</option>
-                <option value="X">未分類(X)</option>
-            </select>
-            <!-- <input type="text" name="accounttype" id="accounttype" placeholder="帳號類別..." required> -->
-           
-        </div>	
-
-        <div>
-            <label for="accountid">請輸入員工、個人客戶ID或公司客戶統編(必填)</label>
-            <input type="text" name="accountid" id="accountid" placeholder="請輸入員工、個人客戶ID或公司客戶統編...(必填)" maxlength="10" required>
-            
-        </div>	
-		
-        <div>
-            <label for="pwd">密碼(必填)</label>
-            <input type="text" name="pwd" id="pwd" required>
-        </div>	
-				
-        <div>
-            <label for="name">姓名(必填)</label>
-            <input type="text" name="name" id="name" required>
-            
-        </div>	
-
-        <div>
-            <label for="tel">電話</label>
-            <input type="text" name="tel" id="tel" maxlength="16">
-            
-        </div>	
-
-        <div>
-            <label for="address">地址</label>
-            <input type="text" name="address" id="address">
-            
-        </div>
-
-        <div>
-            <label for="email">電子郵箱</label>
-            <input type="text" name="email" id="email">
-            
-        </div>
-
-        <div>
-            <label for="lineid">Line ID</label>
-            <input type="text" name="lineid" id="lineid">
-            
-        </div>
-
-        <div>
-            <label for="wechatid">微信ID</label>
-            <input type="text" name="wechatid" id="wechatid">
-           
-        </div>
-
-        <div>
-            <label for="phone_call_help">保養員聯絡手機號(客戶必填)</label>
-            <input type="text" name="phone_call_help" id="phone_call_help"  maxlength="16">
-        </div>
-		
-        <div>
-            <label for="chat_for_help">線上文字客服</label>
-            <input type="text" name="chat_for_help" id="chat_for_help">
-        </div>		
-
-        <div>
-            <label for="remote_help">遠端視頻帳號</label>
-            <input type="text" name="remote_help" id="remote_help">
-        </div>
-
-        <div>
-            <label for="repairerid">服務與支持人員工號(客戶必填)</label>
-            <input type="text" name="repairerid" id="repairerid" maxlength="10">
-            
-        </div>
-
-        <div>
-            <label for="manager">直屬主管工號(員工必填)</label>
-            <input type="text" name="manager" id="manager" maxlength="10">
-            
-        </div>
-        <div>
-            <label for="department_id">部門(員工必填)</label>
-            <select name="department_id">
-                <option value="">請選擇</option>
-                <?php
-                foreach ($depart_arr as $k => $v) {
-                    echo "<option value=\"".$k."\">".$v."</option>";
-                }
-                ?>
-            </select>
-        </div>
-        <div>
-            <label for="role_id">職別(員工必填)</label>
-            <select name="role_id">
-                <option value="">請選擇</option>
-            </select>
-        </div>
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
-            <p class="error"><?php echo $creater_error; ?></p>
-        </div>
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-        <?php if ($user_auth&2) { ?>
-        <div>
-            <button type="submit" name="submit">確定</button>
-        </div>
-        <?php } ?>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
+<?php
+include "header.php";
+
+// 部門職別
+$db_query = "select department_id, name, role_id, role from department order by department_id";
+$res = mysqli_query($link, $db_query);
+while ($row = mysqli_fetch_assoc($res)) {
+    $depart_arr[$row["department_id"]] = $row["name"];
+    $role_arr[$row["department_id"]][$row["role_id"]] = $row["role"];
+}
+mysqli_free_result($res);
+?>
+<script>
+$(function(){
+    var jroleStr = '<?php echo json_encode($role_arr); ?>';
+    var jroleArr = JSON.parse(jroleStr);
+    var optStr = "";
+    $("select[name=department_id]").change(function(){
+        if ($(this).val() != "") {
+            optStr = "";
+            for (var i in jroleArr[$(this).val()]) {
+                if ('undefined' !== jroleArr[$(this).val()][i]) {
+                    optStr += '<option value="'+i+'">'+jroleArr[$(this).val()][i]+'</option>';
+                }
+            }
+            $("select[name=role_id]").html(optStr);
+        } else $("select[name=role_id]").html('<option value="">請選擇</option>');
+    })
+});
+</script>
+<div class="container">
+
+    <?php
+    
+        include "account-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>">
+        
+    
+        <div>
+            <label for="accounttype">帳號類別(必選)</label>
+            <select name="accounttype" id="accounttype" required>
+                <option selected="selected" disabled="disabled"  style="display: none" value=""></option>			
+                <option value="A">客戶(A)</option>
+                <option value="B">保養人員(B)</option>
+                <!--
+                <option value="C">檢查人員</option>
+                <option value="D">契約人員</option>
+                -->
+                <option value="E">管理人員(E)</option>
+                <option value="M">永佳捷員工(M)</option>
+                <option value="X">未分類(X)</option>
+            </select>
+            <!-- <input type="text" name="accounttype" id="accounttype" placeholder="帳號類別..." required> -->
+           
+        </div>	
+
+        <div>
+            <label for="accountid">請輸入員工、個人客戶ID或公司客戶統編(必填)</label>
+            <input type="text" name="accountid" id="accountid" placeholder="請輸入員工、個人客戶ID或公司客戶統編...(必填)" maxlength="10" required>
+            
+        </div>	
+		
+        <div>
+            <label for="pwd">密碼(必填)</label>
+            <input type="text" name="pwd" id="pwd" required>
+        </div>	
+				
+        <div>
+            <label for="name">姓名(必填)</label>
+            <input type="text" name="name" id="name" required>
+            
+        </div>	
+
+        <div>
+            <label for="tel">電話</label>
+            <input type="text" name="tel" id="tel" maxlength="16">
+            
+        </div>	
+
+        <div>
+            <label for="address">地址</label>
+            <input type="text" name="address" id="address">
+            
+        </div>
+
+        <div>
+            <label for="email">電子郵箱</label>
+            <input type="text" name="email" id="email">
+            
+        </div>
+
+        <div>
+            <label for="lineid">Line ID</label>
+            <input type="text" name="lineid" id="lineid">
+            
+        </div>
+
+        <div>
+            <label for="wechatid">微信ID</label>
+            <input type="text" name="wechatid" id="wechatid">
+           
+        </div>
+
+        <div>
+            <label for="phone_call_help">保養員聯絡手機號(客戶必填)</label>
+            <input type="text" name="phone_call_help" id="phone_call_help"  maxlength="16">
+        </div>
+		
+        <div>
+            <label for="chat_for_help">線上文字客服</label>
+            <input type="text" name="chat_for_help" id="chat_for_help">
+        </div>		
+
+        <div>
+            <label for="remote_help">遠端視頻帳號</label>
+            <input type="text" name="remote_help" id="remote_help">
+        </div>
+
+        <div>
+            <label for="repairerid">服務與支持人員工號(客戶必填)</label>
+            <input type="text" name="repairerid" id="repairerid" maxlength="10">
+            
+        </div>
+
+        <div>
+            <label for="manager">直屬主管工號(員工必填)</label>
+            <input type="text" name="manager" id="manager" maxlength="10">
+            
+        </div>
+        <div>
+            <label for="department_id">部門(員工必填)</label>
+            <select name="department_id">
+                <option value="">請選擇</option>
+                <?php
+                foreach ($depart_arr as $k => $v) {
+                    echo "<option value=\"".$k."\">".$v."</option>";
+                }
+                ?>
+            </select>
+        </div>
+        <div>
+            <label for="role_id">職別(員工必填)</label>
+            <select name="role_id">
+                <option value="">請選擇</option>
+            </select>
+        </div>
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
+            <p class="error"><?php echo $creater_error; ?></p>
+        </div>
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+        <?php if ($user_auth&2) { ?>
+        <div>
+            <button type="submit" name="submit">確定</button>
+        </div>
+        <?php } ?>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
diff --git a/wms/account-delete.php b/wms/account-delete.php
index 84654d95..811f23a8 100644
--- a/wms/account-delete.php
+++ b/wms/account-delete.php
@@ -1,19 +1,19 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$sql = "select accountid from account where id = '$id'";
-$res = mysqli_query($link, $sql);
-if ($row = mysqli_fetch_assoc($res)) {
-    $db_query = "delete from account where id = '$id'";
-    mysqli_query($link, $db_query);	
-
-    $db_query = "delete from account_auth where accountid = '".$row["accountid"]."'";
-    mysqli_query($link, $db_query);	
-}
-mysqli_free_result($res);
-header("Refresh:0; url=account-index.php?function_name=account&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$sql = "select accountid from account where id = '$id'";
+$res = mysqli_query($link, $sql);
+if ($row = mysqli_fetch_assoc($res)) {
+    $db_query = "delete from account where id = '$id'";
+    mysqli_query($link, $db_query);	
+
+    $db_query = "delete from account_auth where accountid = '".$row["accountid"]."'";
+    mysqli_query($link, $db_query);	
+}
+mysqli_free_result($res);
+header("Refresh:0; url=account-index.php?function_name=account&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/account-edit.php b/wms/account-edit.php
index 1d10b8f7..3892d111 100644
--- a/wms/account-edit.php
+++ b/wms/account-edit.php
@@ -1,173 +1,173 @@
-<?php
-    include "header.php";
-
-    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-    // 部門職別
-    $db_query = "select department_id, name, role_id, role from department order by department_id";
-    $res = mysqli_query($link, $db_query);
-    while ($row = mysqli_fetch_assoc($res)) {
-        $depart_arr[$row["department_id"]] = $row["name"];
-        $role_arr[$row["department_id"]][$row["role_id"]] = $row["role"];
-    }
-    mysqli_free_result($res);
-
-	$data = array();
-	// sql語法存在變數中
-	$db_query = "SELECT * FROM account WHERE id=$id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$db_query);	
-/*
-    include "inc/record_update.php";
-    
-    try {	
-		// 設置一個空陣列來放資料
-		$data = array();
-		// sql語法存在變數中
-		$db_query = "SELECT * FROM expert WHERE id=$id";
-
-		// 用mysqli_query方法執行(sql語法)將結果存在變數中
-		$data = mysqli_query($link,$db_query);
-	}catch (Exception $e) {
-    echo 'Caught exception: ',  $e->getMessage(), "\n";
-	}
-*/	
-    foreach($data as $data) :
-?>
-<script>
-$(function(){
-    var jroleStr = '<?php echo json_encode($role_arr); ?>';
-    var jroleArr = JSON.parse(jroleStr);
-    var optStr = "";
-    $("select[name=department_id]").change(function(){
-        if ($(this).val() != "") {
-            optStr = "";
-            for (var i in jroleArr[$(this).val()]) {
-                if ('undefined' !== jroleArr[$(this).val()][i]) {
-                    optStr += '<option value="'+i+'">'+jroleArr[$(this).val()][i]+'</option>';
-                }
-            }
-            $("select[name=role_id]").html(optStr);
-        } else $("select[name=role_id]").html('<option value="">請選擇</option>');
-    })
-});
-</script>
-<div class="container">
-    <form class="form-inline" method="post" action="account-record-update.php">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-		
-        <div>
-            <label for="accounttype">帳號類別</label>
-            <input type="text" name="accounttype" id="accounttype" value="<?php echo $data['accounttype']; ?>" readonly>
-        </div>	
-
-        <div>
-            <label for="accountid">帳號</label>
-            <input type="text" name="accountid" id="accountid" value="<?php echo $data['accountid']; ?>" readonly>
-        </div>	
-		
-        <div>
-            <label for="pwd">密碼(必填)</label>
-            <input type="text" name="pwd" id="pwd" value="<?php echo $data['pwd']; ?>">
-        </div>	
-				
-        <div>
-            <label for="name">姓名(必填)</label>
-            <input type="text" name="name" id="name" value="<?php echo $data['name']; ?>">
-        </div>	
-
-        <div>
-            <label for="tel">電話</label>
-            <input type="text" name="tel" id="tel" value="<?php echo $data['tel']; ?>">
-        </div>	
-
-        <div>
-            <label for="address">地址</label>
-            <input type="text" name="address" id="address" value="<?php echo $data['address']; ?>">
-        </div>
-
-        <div>
-            <label for="email">電子郵箱</label>
-            <input type="text" name="email" id="email" value="<?php echo $data['email']; ?>">
-        </div>
-
-        <div>
-            <label for="lineid">Line ID</label>
-            <input type="text" name="lineid" id="lineid" value="<?php echo $data['lineid']; ?>">
-        </div>
-
-        <div>
-            <label for="wechatid">微信ID</label>
-            <input type="text" name="wechatid" id="wechatid" value="<?php echo $data['wechatid']; ?>">
-        </div>
-
-        <div>
-            <label for="phone_call_help">保養員聯絡手機號(客戶必填)</label>
-            <input type="text" name="phone_call_help" id="phone_call_help" value="<?php echo $data['phone_call_help']; ?>">
-        </div>
-		
-        <div>
-            <label for="chat_for_help">線上文字客服</label>
-            <input type="text" name="chat_for_help" id="chat_for_help" value="<?php echo $data['chat_for_help']; ?>">
-        </div>		
-
-        <div>
-            <label for="remote_help">遠端視頻帳號</label>
-            <input type="text" name="remote_help" id="remote_help" value="<?php echo $data['remote_help']; ?>">
-        </div>
-
-        <div>
-            <label for="repairerid">服務與支持人員工號(客戶必填)</label>
-            <input type="text" name="repairerid" id="repairerid" value="<?php echo $data['repairerid']; ?>">
-        </div>
-
-        <div>
-            <label for="manager">直屬主管工號(員工必填)</label>
-            <input type="text" name="manager" id="manager" value="<?php echo $data['manager']; ?>">
-        </div>
-        <div>
-            <label for="department_id">部門(員工必填)</label>
-            <select name="department_id">
-                <option value="">請選擇</option>
-                <?php
-                foreach ($depart_arr as $k => $v) {
-                    echo "<option value=\"".$k."\"";
-                    if ($data["department_id"] == $k) echo " selected";
-                    echo ">".$v."</option>";
-                }
-                ?>
-            </select>
-        </div>
-        <div>
-            <label for="role_id">職別(員工必填)</label>
-            <select name="role_id">
-                <?php
-                foreach ($role_arr[$data["department_id"]] as $k => $v) {
-                    echo "<option value=\"".$k."\"";
-                    if ($data["role_id"] == $k) echo " selected";
-                    echo ">".$v."</option>";
-                }
-                ?>
-            </select>
-        </div>
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
-        </div>
-		
-		
-        <div>
-            <button type="submit" name="update">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
-?>
+<?php
+    include "header.php";
+
+    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+    // 部門職別
+    $db_query = "select department_id, name, role_id, role from department order by department_id";
+    $res = mysqli_query($link, $db_query);
+    while ($row = mysqli_fetch_assoc($res)) {
+        $depart_arr[$row["department_id"]] = $row["name"];
+        $role_arr[$row["department_id"]][$row["role_id"]] = $row["role"];
+    }
+    mysqli_free_result($res);
+
+	$data = array();
+	// sql語法存在變數中
+	$db_query = "SELECT * FROM account WHERE id=$id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$db_query);	
+/*
+    include "inc/record_update.php";
+    
+    try {	
+		// 設置一個空陣列來放資料
+		$data = array();
+		// sql語法存在變數中
+		$db_query = "SELECT * FROM expert WHERE id=$id";
+
+		// 用mysqli_query方法執行(sql語法)將結果存在變數中
+		$data = mysqli_query($link,$db_query);
+	}catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+	}
+*/	
+    foreach($data as $data) :
+?>
+<script>
+$(function(){
+    var jroleStr = '<?php echo json_encode($role_arr); ?>';
+    var jroleArr = JSON.parse(jroleStr);
+    var optStr = "";
+    $("select[name=department_id]").change(function(){
+        if ($(this).val() != "") {
+            optStr = "";
+            for (var i in jroleArr[$(this).val()]) {
+                if ('undefined' !== jroleArr[$(this).val()][i]) {
+                    optStr += '<option value="'+i+'">'+jroleArr[$(this).val()][i]+'</option>';
+                }
+            }
+            $("select[name=role_id]").html(optStr);
+        } else $("select[name=role_id]").html('<option value="">請選擇</option>');
+    })
+});
+</script>
+<div class="container">
+    <form class="form-inline" method="post" action="account-record-update.php">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+		
+        <div>
+            <label for="accounttype">帳號類別</label>
+            <input type="text" name="accounttype" id="accounttype" value="<?php echo $data['accounttype']; ?>" readonly>
+        </div>	
+
+        <div>
+            <label for="accountid">帳號</label>
+            <input type="text" name="accountid" id="accountid" value="<?php echo $data['accountid']; ?>" readonly>
+        </div>	
+		
+        <div>
+            <label for="pwd">密碼(必填)</label>
+            <input type="text" name="pwd" id="pwd" value="<?php echo $data['pwd']; ?>">
+        </div>	
+				
+        <div>
+            <label for="name">姓名(必填)</label>
+            <input type="text" name="name" id="name" value="<?php echo $data['name']; ?>">
+        </div>	
+
+        <div>
+            <label for="tel">電話</label>
+            <input type="text" name="tel" id="tel" value="<?php echo $data['tel']; ?>">
+        </div>	
+
+        <div>
+            <label for="address">地址</label>
+            <input type="text" name="address" id="address" value="<?php echo $data['address']; ?>">
+        </div>
+
+        <div>
+            <label for="email">電子郵箱</label>
+            <input type="text" name="email" id="email" value="<?php echo $data['email']; ?>">
+        </div>
+
+        <div>
+            <label for="lineid">Line ID</label>
+            <input type="text" name="lineid" id="lineid" value="<?php echo $data['lineid']; ?>">
+        </div>
+
+        <div>
+            <label for="wechatid">微信ID</label>
+            <input type="text" name="wechatid" id="wechatid" value="<?php echo $data['wechatid']; ?>">
+        </div>
+
+        <div>
+            <label for="phone_call_help">保養員聯絡手機號(客戶必填)</label>
+            <input type="text" name="phone_call_help" id="phone_call_help" value="<?php echo $data['phone_call_help']; ?>">
+        </div>
+		
+        <div>
+            <label for="chat_for_help">線上文字客服</label>
+            <input type="text" name="chat_for_help" id="chat_for_help" value="<?php echo $data['chat_for_help']; ?>">
+        </div>		
+
+        <div>
+            <label for="remote_help">遠端視頻帳號</label>
+            <input type="text" name="remote_help" id="remote_help" value="<?php echo $data['remote_help']; ?>">
+        </div>
+
+        <div>
+            <label for="repairerid">服務與支持人員工號(客戶必填)</label>
+            <input type="text" name="repairerid" id="repairerid" value="<?php echo $data['repairerid']; ?>">
+        </div>
+
+        <div>
+            <label for="manager">直屬主管工號(員工必填)</label>
+            <input type="text" name="manager" id="manager" value="<?php echo $data['manager']; ?>">
+        </div>
+        <div>
+            <label for="department_id">部門(員工必填)</label>
+            <select name="department_id">
+                <option value="">請選擇</option>
+                <?php
+                foreach ($depart_arr as $k => $v) {
+                    echo "<option value=\"".$k."\"";
+                    if ($data["department_id"] == $k) echo " selected";
+                    echo ">".$v."</option>";
+                }
+                ?>
+            </select>
+        </div>
+        <div>
+            <label for="role_id">職別(員工必填)</label>
+            <select name="role_id">
+                <?php
+                foreach ($role_arr[$data["department_id"]] as $k => $v) {
+                    echo "<option value=\"".$k."\"";
+                    if ($data["role_id"] == $k) echo " selected";
+                    echo ">".$v."</option>";
+                }
+                ?>
+            </select>
+        </div>
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
+        </div>
+		
+		
+        <div>
+            <button type="submit" name="update">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php
+
+    endforeach;
+    
+    include "footer.php";
+
+?>
diff --git a/wms/account-index-submit.php b/wms/account-index-submit.php
index a00176f3..26e75cc4 100644
--- a/wms/account-index-submit.php
+++ b/wms/account-index-submit.php
@@ -1,85 +1,85 @@
-<?php
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    include "database.php";
-    include 'class/Cmail.php';
-
-    header('Content-Type: application/json');
-    $method = $_POST['method'];
-    $id = empty($_POST['id']) ? '' : $_POST['id'];
-    $sql = "
-        SELECT * FROM account WHERE id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $data = mysqli_fetch_assoc($result);
-
-    $cmail = new Cmail();
-    $subject = "永佳捷新人文件";
-    $em_body = "";
-    $file_name = str_replace('/', '\\', __DIR__ . "/public/file/永佳捷雲端空間使用設定方式.pdf");
-    $file[0] = [$file_name, "永佳捷雲端空間使用設定方式.pdf"];
-    $sendlist[0] = [$data['name'], $data['email']];
-
-    // 保養人員
-    if (in_array($data['accounttype'], ['B'])) {
-        $em_body = "
-    您好，我是桃園資訊處的子苹，
-    以下是給新報到同仁的基本資訊，您再參考：
-    
-    員編：" . $data['accountid'] . "
-    公司手機門號：請和資訊人員聯絡
-    你的email：" . $data['email'] . "
-    web收信：http://webmail.masada.com.tw:8081
-    帳號：" . explode('@', $data['email'])[0] . "
-    密碼：" . $data['accountid'] . "
-    登入後密碼可再自行更改
-    除了這個web方式收信，你也可以點擊手機裡的gmail收發信
-    
-    桌面有安裝「維保APP系統」
-    登入帳號 " . $data['accountid'] . "
-    密碼 " . explode('@', $data['email'])[0] . "
-    GPS定位APP的登入帳密跟上面的一樣
-    
-    http://oa.masada.com.tw
-    這是公司內部系統
-    登入帳號：" . $data['accountid'] . "
-    登入密碼：" . explode('@', $data['email'])[0] . "
-    
-    https://cloud.masada.com.tw:1846/
-    這是公司雲端系統
-    預設帳密在信箱 請記得去更改密碼
-    
-    以上，有問題請隨時與資訊聯繫，謝謝！
-";
-    }
-    // 員工
-    if (in_array($data['accounttype'], ['M', 'E'])) {
-        $em_body = "
-    您好，
-    以下是給新報到同仁的基本資訊，您再參考：
-    
-    員編：" . $data['accountid'] . "
-    你的email：" . $data['email'] . "
-    web收信：http://webmail.masada.com.tw:8081
-    帳號：" . explode('@', $data['email'])[0] . "
-    密碼：" . $data['accountid'] . "
-    登入後密碼可再自行更改
-    除了這個web方式收信，你也可以用電腦裡的outlook收發信
-    
-    http://oa.masada.com.tw
-    這是公司內部系統
-    登入帳號：" . $data['accountid'] . "
-    登入密碼：" . explode('@', $data['email'])[0] . "
-    
-    https://cloud.masada.com.tw:1846/
-    這是公司雲端系統
-    預設帳密在信箱 請記得去更改密碼
-    
-    
-    以上，有問題請隨時與資訊聯繫，謝謝！
-            
-    ";
-    }
-
-    $cmail->sendx($subject, $em_body, $sendlist, "永佳捷科技", "", $file);
-    echo json_encode([1, "信件發送成功"]);
-}
+<?php
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    include "database.php";
+    include 'class/Cmail.php';
+
+    header('Content-Type: application/json');
+    $method = $_POST['method'];
+    $id = empty($_POST['id']) ? '' : $_POST['id'];
+    $sql = "
+        SELECT * FROM account WHERE id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $data = mysqli_fetch_assoc($result);
+
+    $cmail = new Cmail();
+    $subject = "永佳捷新人文件";
+    $em_body = "";
+    $file_name = str_replace('/', '\\', __DIR__ . "/public/file/永佳捷雲端空間使用設定方式.pdf");
+    $file[0] = [$file_name, "永佳捷雲端空間使用設定方式.pdf"];
+    $sendlist[0] = [$data['name'], $data['email']];
+
+    // 保養人員
+    if (in_array($data['accounttype'], ['B'])) {
+        $em_body = "
+    您好，我是桃園資訊處的子苹，
+    以下是給新報到同仁的基本資訊，您再參考：
+    
+    員編：" . $data['accountid'] . "
+    公司手機門號：請和資訊人員聯絡
+    你的email：" . $data['email'] . "
+    web收信：http://webmail.masada.com.tw:8081
+    帳號：" . explode('@', $data['email'])[0] . "
+    密碼：" . $data['accountid'] . "
+    登入後密碼可再自行更改
+    除了這個web方式收信，你也可以點擊手機裡的gmail收發信
+    
+    桌面有安裝「維保APP系統」
+    登入帳號 " . $data['accountid'] . "
+    密碼 " . explode('@', $data['email'])[0] . "
+    GPS定位APP的登入帳密跟上面的一樣
+    
+    http://oa.masada.com.tw
+    這是公司內部系統
+    登入帳號：" . $data['accountid'] . "
+    登入密碼：" . explode('@', $data['email'])[0] . "
+    
+    https://cloud.masada.com.tw:1846/
+    這是公司雲端系統
+    預設帳密在信箱 請記得去更改密碼
+    
+    以上，有問題請隨時與資訊聯繫，謝謝！
+";
+    }
+    // 員工
+    if (in_array($data['accounttype'], ['M', 'E'])) {
+        $em_body = "
+    您好，
+    以下是給新報到同仁的基本資訊，您再參考：
+    
+    員編：" . $data['accountid'] . "
+    你的email：" . $data['email'] . "
+    web收信：http://webmail.masada.com.tw:8081
+    帳號：" . explode('@', $data['email'])[0] . "
+    密碼：" . $data['accountid'] . "
+    登入後密碼可再自行更改
+    除了這個web方式收信，你也可以用電腦裡的outlook收發信
+    
+    http://oa.masada.com.tw
+    這是公司內部系統
+    登入帳號：" . $data['accountid'] . "
+    登入密碼：" . explode('@', $data['email'])[0] . "
+    
+    https://cloud.masada.com.tw:1846/
+    這是公司雲端系統
+    預設帳密在信箱 請記得去更改密碼
+    
+    
+    以上，有問題請隨時與資訊聯繫，謝謝！
+            
+    ";
+    }
+
+    $cmail->sendx($subject, $em_body, $sendlist, "永佳捷科技", "", $file);
+    echo json_encode([1, "信件發送成功"]);
+}
diff --git a/wms/account-index.php b/wms/account-index.php
index ed0e9e1d..acba0023 100644
--- a/wms/account-index.php
+++ b/wms/account-index.php
@@ -1,173 +1,198 @@
-<?php
-include "header.php";
-
-$accounttype_arr = ["A" => "客戶", "B" => "保養人員", "C" => "檢查人員", "D" => "契約人員", "M" => "員工", "E" => "管理員(IT)", "X" => "未分類"]; #A=客戶 B=保養人員 C=檢查人員 D=契約人員 E=管理人員 M=永佳捷員工 X=未分類
-
-// 工務總處、王凱欣可瀏覽全部資料
-$sql = "select department_id from account where accountid = '$user_id'";
-$res = mysqli_query($link, $sql);
-$row = mysqli_fetch_row($res);
-$user_department_id = $row[0];
-mysqli_free_result($res);
-
-// 設置一個空陣列來放資料
-$data = array();
-// sql語法存在變數中
-$sql_cmd = sql_myself($user_id);
-if ($user_department_id == "501" || $user_id == "M0105") $sql_cmd = "";
-$sql = "SELECT * FROM account $sql_cmd ORDER BY id";
-// 用mysqli_query方法執行(sql語法)將結果存在變數中
-$data = mysqli_query($link,$sql);
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="account-create.php?function_name=account&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-<?php
-}
-
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:account-index.php");
-        }
-    }
-
-?>
-
-<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;
-   
-}
-
-</style>
-
-    <div style="overflow-x:auto;">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-            <tr>
-                <th>項次</th>
-                <th>帳號類型</th>
-                <th>帳號</th>
-                <!--<th>密碼</th>-->
-                <th>姓名</th>
-                <th>電話</th>
-                <th>地址</th>
-                <th>電子郵件</th>
-                <th>Line ID</th>
-                <th>微信id</th>
-                <th>遠端協助</th>
-                <th>維修ID</th>
-                <th>直屬主管</th>
-                <th>建檔人</th>
-                <th>建檔時間</th>
-                <?php if ($user_auth&2) { ?>
-                <th>修改</th>
-                <!--<th>刪除</th>-->
-                <?php } ?>
-            </tr>
-		</thead>
-		<tbody>			
-
-            <?php foreach($data as $data) : ?>    
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td data-toggle="tooltip" data-placement="right" title="
-					<?php
-						if (isset($accounttype_arr[$data['accounttype']])){
-							echo $accounttype_arr[$data['accounttype']];
-						}else{
-							echo $data['accounttype'];
-						}
-					?>
-					">
-					<?php
-						if (isset($accounttype_arr[$data['accounttype']])){
-							echo $accounttype_arr[$data['accounttype']];
-						}else{
-							echo $data['accounttype'];
-						}
-					?></td>
-                    <td><?php echo $data['accountid']; ?></td>
-                    <!--<td><?php echo $data['pwd']; ?></td>-->
-                    <td><?php echo $data['name']; ?></td>
-                    <td><?php echo $data['tel']; ?></td>
-                    <td><?php echo $data['address']; ?></td>
-                    <td><?php echo $data['email']; ?></td>
-                    <td><?php echo $data['lineid']; ?></td>
-                    <td><?php echo $data['wechatid']; ?></td>
-                    <td><a href="<?php echo $data['remote_help']; ?>">連結<a/></td>
-                    <td><?php echo $data['repairerid']; ?></td>
-                    <td><?php echo $data['manager']; ?></td>
-                    <td><?php echo $data['creater']; ?></td>
-                    <td><?php echo $data['create_at']; ?></td>
-                    <?php if ($user_auth&2) { ?>
-                    <td>
-						<p>
-							<a href="account-edit.php?id=<?php echo $data['id']; ?>&function_name=account&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-								<span class="glyphicon glyphicon-pencil"></span>
-							</a>
-						</p>
-					</td>
-                    <!--<td>
-						<p>
-							<a href="account-delete.php?id=<?php echo $data['id']; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-								<span class="glyphicon glyphicon-remove"></span>
-							</a>
-						</p> 
-					</td>-->
-                    <?php } ?>
-                </tr>
-            <?php endforeach; ?>
-			</tbody>			
-        </table>
-    </div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-
-?>
+<?php
+include "header.php";
+
+$accounttype_arr = ["A" => "客戶", "B" => "保養人員", "C" => "檢查人員", "D" => "契約人員", "M" => "員工", "E" => "管理員(IT)", "X" => "未分類"]; #A=客戶 B=保養人員 C=檢查人員 D=契約人員 E=管理人員 M=永佳捷員工 X=未分類
+
+// 工務總處、王凱欣可瀏覽全部資料
+$sql = "select department_id from account where accountid = '$user_id'";
+$res = mysqli_query($link, $sql);
+$row = mysqli_fetch_row($res);
+$user_department_id = $row[0];
+mysqli_free_result($res);
+
+// 設置一個空陣列來放資料
+$data = array();
+// sql語法存在變數中
+$sql_cmd = sql_myself($user_id);
+if ($user_department_id == "501" || $user_id == "M0105") $sql_cmd = "";
+$sql = "SELECT * FROM account $sql_cmd ORDER BY id";
+// 用mysqli_query方法執行(sql語法)將結果存在變數中
+$data = mysqli_query($link, $sql);
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth & 2) { ?>
+    <p>
+        <a href="account-create.php?function_name=account&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+            <span class="glyphicon glyphicon-plus"></span>
+        </a>
+    </p>
+<?php
+}
+
+if ($data) :
+
+    if ($_SERVER["REQUEST_METHOD"] == "POST") {
+        if (empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])) {
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:account-index.php");
+        }
+    }
+
+?>
+
+    <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;
+
+        }
+    </style>
+
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+            <thead>
+                <tr>
+                    <th>項次</th>
+                    <th>帳號類型</th>
+                    <th>帳號</th>
+                    <!--<th>密碼</th>-->
+                    <th>姓名</th>
+                    <th>電話</th>
+                    <th>地址</th>
+                    <th>電子郵件</th>
+                    <th>Line ID</th>
+                    <th>微信id</th>
+                    <th>遠端協助</th>
+                    <th>維修ID</th>
+                    <th>直屬主管</th>
+                    <th>建檔人</th>
+                    <th>建檔時間</th>
+                    <?php if ($user_auth & 2) { ?>
+                        <th>修改</th>
+                        <th>新人資料</th>
+                        <!--<th>刪除</th>-->
+                    <?php } ?>
+                </tr>
+            </thead>
+            <tbody>
+
+                <?php foreach ($data as $data) : ?>
+                    <tr>
+                        <td><?php echo $data['id']; ?></td>
+                        <td data-toggle="tooltip" data-placement="right" title="
+					<?php
+                    if (isset($accounttype_arr[$data['accounttype']])) {
+                        echo $accounttype_arr[$data['accounttype']];
+                    } else {
+                        echo $data['accounttype'];
+                    }
+                    ?>
+					">
+                            <?php
+                            if (isset($accounttype_arr[$data['accounttype']])) {
+                                echo $accounttype_arr[$data['accounttype']];
+                            } else {
+                                echo $data['accounttype'];
+                            }
+                            ?></td>
+                        <td><?php echo $data['accountid']; ?></td>
+                        <!--<td><?php echo $data['pwd']; ?></td>-->
+                        <td><?php echo $data['name']; ?></td>
+                        <td><?php echo $data['tel']; ?></td>
+                        <td><?php echo $data['address']; ?></td>
+                        <td><?php echo $data['email']; ?></td>
+                        <td><?php echo $data['lineid']; ?></td>
+                        <td><?php echo $data['wechatid']; ?></td>
+                        <td><a href="<?php echo $data['remote_help']; ?>">連結<a /></td>
+                        <td><?php echo $data['repairerid']; ?></td>
+                        <td><?php echo $data['manager']; ?></td>
+                        <td><?php echo $data['creater']; ?></td>
+                        <td><?php echo $data['create_at']; ?></td>
+                        <?php if ($user_auth & 2) { ?>
+                            <td>
+                                <p>
+                                    <a href="account-edit.php?id=<?php echo $data['id']; ?>&function_name=account&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+                                        <span class="glyphicon glyphicon-pencil"></span>
+                                    </a>
+                                </p>
+                            </td>
+                            <!--<td>
+						<p>
+							<a href="account-delete.php?id=<?php echo $data['id']; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+						</p> 
+					</td>-->
+                        <?php } ?>
+                        <td>
+                            <button type="button" class="btn" onclick="sendJuniorStaffDoc(<?php echo $data['id']; ?>)">寄送</button>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+        </table>
+    </div>
+    <script>
+        function sendJuniorStaffDoc(id) {
+            $.ajax({
+                url: window.location.origin + '/wms/account-index-submit.php',
+                type: 'POST',
+                data: {
+                    'method': 'sendJuniorStaffDoc',
+                    'id': id
+                },
+                dataType: 'json',
+                success: function(response) {
+                    alert("寄送成功！");
+                },
+                error: function(xhr, status, error) {
+                    alert("寄送失敗！");
+                }
+            });
+
+        }
+    </script>
+<?php
+
+else :
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+
+?>
\ No newline at end of file
diff --git a/wms/account-receivable-check.php b/wms/account-receivable-check.php
index 1e373b52..061efc7c 100644
--- a/wms/account-receivable-check.php
+++ b/wms/account-receivable-check.php
@@ -1,199 +1,255 @@
-<?php
-include "./header.php";
-//企業名稱 統一編號  聯絡地址
-$Bill = $_POST['Bill'];
-$Bill = json_decode($Bill, true);
-$sql_received = "SELECT * from account_received where BillNo = '$Bill[0]' ORDER BY `pay_id` ASC";
-$pay_received = mysqli_query($link, $sql_received);
-$had_received = 0;
-if (mysqli_num_rows($pay_received) == 0) {
-    foreach ($pay_received as $received) {
-        $had_received += $received['received_amount'];
-    }
-}
-$unreceived = $Bill[12] - $had_received;
-$data = json_encode($Bill);
-?>
-<style>
-    th {
-        text-align: center;
-    }
-
-    td {
-        text-align: right;
-    }
-</style>
-<div style="width: 90%;">
-
-    <div style="padding-left: 2rem; padding-bottom: 1rem;">
-        <a href="account-receivable-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
-            <span class="glyphicon glyphicon-home"></span>
-        </a>
-    </div>
-
-</div>
-<div class="container">
-    <div class="text-center" style="margin-bottom: 20px;">
-        <h3><strong><?= $Bill[4] ?></strong></h3>
-    </div>
-    <form class="form-horizontal">
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="BillNo">合約號</label>
-                <input type="text" class="form-control" id="BillNo" name="BillNo" value="<?= $Bill[0] ?>" disabled>
-            </div>
-            <div class="col-md-3">
-                <label for="DeptId">部門</label>
-                <input type="text" class="form-control" id="DeptId" name="DeptId" value="<?= $Bill[1] ?>" disabled>
-            </div>
-            <div class="col-md-3">
-                <label for="Manager">經理</label>
-                <input type="text" class="form-control" id="Manager" name="Manager" value="<?= $Bill[2] ?>" disabled>
-            </div>
-            <div class="col-md-3">
-                <label for="PersonName">營業員</label>
-                <input type="text" class="form-control" id="PersonName" name="PersonName" value="<?= $Bill[3] ?>" disabled>
-            </div>
-
-        </div>
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="EnterpriseName">抬頭</label>
-                <input type="text" class="form-control" id="EnterpriseName" name="EnterpriseName" value="<?= $Bill[14] ?>" disabled>
-            </div>
-            <div class="col-md-3">
-                <label for="TaxNo">統一編號</label>
-                <input type="text" class="form-control" id="TaxNo" name="TaxNo" value="<?= $Bill[15] ?>" disabled>
-            </div>
-            <div class="col-md-6">
-                <label for="ContactAddress">聯絡地址</label>
-                <input type="text" class="form-control" id="ContactAddress" name="ContactAddress" value="<?= $Bill[16] ?>" disabled>
-            </div>
-        </div>
-        <div>
-            <label for="detail">狀態</label>
-            <textarea class="form-control" style="height: 150px; width: 50%;" name="detail" id="detail" disabled><?= str_replace("<br>", "\n", $Bill[13]) ?></textarea>
-        </div>
-    </form>
-    <div style="width: auto; margin-top: 30px;">
-        <table class="table table-striped table-bordered" style="width:100%;">
-            <thead>
-                <tr>
-                    <th>目前應收</th>
-                    <th>已開發票金額</th>
-                    <th>未開發票金額</th>
-                    <th>已收金額</th>
-                    <th>未收金額</th>
-
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <td><?= number_format(round($Bill[12])) ?></td>
-                    <td><?= number_format(round($Bill[19])) ?></td>
-                    <td><?= number_format(round($Bill[21])) ?></td>
-                    <td><?= number_format(round($Bill[20])) ?></td>
-                    <td><?= number_format(round($Bill[22])) ?></td>
-
-                </tr>
-            </tbody>
-        </table>
-    </div>
-
-
-    <div style="width: auto; margin-top: 30px;">
-        <table class="table table-striped table-bordered" style="width:100%;">
-            <thead>
-                <tr>
-                    <th>簽約款</th>
-                    <th>二次款</th>
-                    <th>貨抵工地款</th>
-                    <th>安裝款</th>
-                    <th>試車款</th>
-                    <th>官檢款</th>
-                    <th>交車款</th>
-
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <td><?= number_format(round($Bill[5])) ?></td>
-                    <td><?= number_format(round($Bill[6])) ?></td>
-                    <td><?= number_format(round($Bill[7])) ?></td>
-                    <td><?= number_format(round($Bill[8])) ?></td>
-                    <td><?= number_format(round($Bill[9])) ?></td>
-                    <td><?= number_format(round($Bill[10])) ?></td>
-                    <td><?= number_format(round($Bill[11])) ?></td>
-
-                </tr>
-            </tbody>
-        </table>
-    </div>
-</div>
-<?php
-include "./footer.php";
-
-?>
-<?php
-if ($user_id == "M0122") {
-?>
-    <button type="button" onclick="create('create',0)" class="btn btn-primary btn-sm pull-right" style="margin-right: 10%;margin-bottom: 10px;">
-        新增收款紀錄<span class=" glyphicon glyphicon-plus"></span></button>
-<?php
-}
-?>
-<div style="margin-right: 10%;margin-left: 10%; justify-content: center;">
-    <table class="table table-striped table-bordered" style="width:100%;">
-        <thead>
-            <tr>
-                <th>發票日期</th>
-                <th>發票金額</th>
-                <th>收款日期</th>
-                <th>收款金額</th>
-                <th>說明</th>
-                <th style="width: 10%;">功能</th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php if ($pay_received) {
-                foreach ($pay_received as $received) { ?>
-                    <tr>
-                        <td><?= $received['invoice_date'] ?></td>
-                        <td><?= number_format($received['invoice_amount']) ?></td>
-                        <td><?= $received['received_date'] ?></td>
-                        <td><?= number_format($received['received_amount']) ?></td>
-                        <td><?= $received['remark'] ?></td>
-                        <td><?php if (in_array(accountidToDepartId($user_id), array('220', '210'))) { ?>
-                                <button type="button" onclick="create('edit',<?= $received['pay_id'] ?>)" class="btn btn-warning btn-sm pull-right" style="margin-right: 10%;margin-bottom: 10px;">
-                                    <span class="glyphicon glyphicon-pencil"></span></button>
-                                <a href="account-receivable-received-delete.php?id=<?php echo $received['pay_id'] ?>&<?= $token_link ?>" class="btn btn-danger btn-sm">
-                                    <span class=" glyphicon glyphicon-trash"></span>
-                                </a>
-                            <?php } ?>
-                        </td>
-                    </tr>
-            <?php }
-            } ?>
-        </tbody>
-    </table>
-</div>
-<script>
-    function create(type,pay_id) {
-        var BillData = <?= $data ?>;
-        var form = document.createElement("form");
-        form.method = 'POST';
-        if(type === 'create'){
-            form.action = "account-receivable-received-create.php?<?= $token_link ?>";
-        }else{
-            form.action = "account-receivable-received-edit.php?pay_id="+pay_id+"&<?= $token_link ?>";
-        }
-        
-        var input = document.createElement("input");
-        input.type = "hidden";
-        input.name = "Bill";
-        input.value = JSON.stringify(BillData);
-        form.appendChild(input);
-        document.body.appendChild(form);
-        form.submit();
-    }
+<?php
+include "./header.php";
+$Bill = $_POST['Bill'];
+$Bill = json_decode($Bill, true);
+print_r($Bill);
+
+// $sql_received = "SELECT * from account_received where BillNo = '$Bill[0]' ORDER BY `pay_id` ASC";
+// $pay_received = mysqli_query($link, $sql_received);
+// $had_received_amount = intval(0);
+// $had_invoice_amount=intval(0);
+// $status_summary = intval(0);
+// if (mysqli_num_rows($pay_received) > 0) {
+//     foreach ($pay_received as $received) {
+//         $had_received_amount += intval($received['received_amount']);
+//         $had_invoice_amount += intval($received['invoice_amount']);
+//         if(in_array(intval($received['status']),array(0,4,5,99))){
+//             $tem_status = intval(0);
+//         }else{
+//             $tem_status = intval($received['status']);
+//         }
+//         if($status_summary < $tem_status){
+//             $status_summary = $tem_status;
+//         }
+//     }
+// }
+
+// $unreceived_amount = intval($Bill[12]) - intval($had_received_amount);
+// $uninvoice_amount = intval($Bill[12]) - intval($had_invoice_amount);
+// $Bill[19] =$had_invoice_amount;
+// $Bill[20] =$had_received_amount;
+// $Bill[21] =$uninvoice_amount;
+// $Bill[22] =$unreceived_amount;
+// $Bill[23] =$status_summary;
+$data = json_encode($Bill);
+?>
+<style>
+    th {
+        text-align: center;
+    }
+
+    td {
+        text-align: right;
+    }
+</style>
+<div style="width: 90%;">
+
+    <div style="padding-left: 2rem; padding-bottom: 1rem;">
+        <a href="account-receivable-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
+            <span class="glyphicon glyphicon-home"></span>
+        </a>
+    </div>
+
+</div>
+<div class="container">
+    <div class="text-center" style="margin-bottom: 20px;">
+        <h3><strong><?= $Bill[4] ?></strong></h3>
+    </div>
+    <form class="form-horizontal">
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="BillNo">合約號</label>
+                <input type="text" class="form-control" id="BillNo" name="BillNo" value="<?= $Bill[10] ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="DeptId">部門</label>
+                <input type="text" class="form-control" id="DeptId" name="DeptId" value="<?= $Bill[1] ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="Manager">經理</label>
+                <input type="text" class="form-control" id="Manager" name="Manager" value="<?= $Bill[2] ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="PersonName">營業員</label>
+                <input type="text" class="form-control" id="PersonName" name="PersonName" value="<?= $Bill[4] ?>" disabled>
+            </div>
+
+        </div>
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="EnterpriseName">抬頭</label>
+                <input type="text" class="form-control" id="EnterpriseName" name="EnterpriseName" value="<?= $Bill[6] ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="TaxNo">統一編號</label>
+                <input type="text" class="form-control" id="TaxNo" name="TaxNo" value="<?= $Bill[7] ?>" disabled>
+            </div>
+            <div class="col-md-6">
+                <label for="ContactAddress">聯絡地址</label>
+                <input type="text" class="form-control" id="ContactAddress" name="ContactAddress" value="<?= $Bill[8] ?>" disabled>
+            </div>
+        </div>
+        <div>
+            <label for="detail">狀態</label>
+            <textarea class="form-control" style="height: 150px; width: 50%;" name="detail" id="detail" disabled><?= str_replace("<br>", "\n", $Bill['facilities']) ?></textarea>
+        </div>
+    </form>
+    <div style="width: auto; margin-top: 30px;">
+        <table class="table table-striped table-bordered" style="width:100%;">
+            <thead>
+                <tr>
+                    <th>目前應收</th>
+                    <!-- <th>已開發票金額</th>
+                    <th>未開發票金額</th>
+                    <th>已收金額</th>
+                    <th>未收金額</th> -->
+
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td><?= number_format(round($Bill['receivable_budget'])) ?></td>
+                    <!-- <td><?= number_format(round($Bill[19])) ?></td>
+                    <td><?= number_format(round($Bill[21])) ?></td>
+                    <td><?= number_format(round($Bill[20])) ?></td>
+                    <td><?= number_format(round($Bill[22])) ?></td> -->
+
+                </tr>
+            </tbody>
+        </table>
+    </div>
+
+
+    <div style="width: auto; margin-top: 30px;">
+        <table class="table table-striped table-bordered" style="width:100%;">
+            <thead>
+                <tr>
+                    <th>簽約款</th>
+                    <th>二次款</th>
+                    <th>貨抵工地款</th>
+                    <th>安裝款</th>
+                    <th>試車款</th>
+                    <th>官檢款</th>
+                    <th>交車款</th>
+                    <th>尾款</th>
+
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td><?= number_format(round($Bill['sign'][1])) ?></td>
+                    <td><?= number_format(round($Bill['second'][1])) ?></td>
+                    <td><?= number_format(round($Bill['arrive'][1])) ?></td>
+                    <td><?= number_format(round($Bill['install'][1])) ?></td>
+                    <td><?= number_format(round($Bill['tryrun'][1])) ?></td>
+                    <td><?= number_format(round($Bill['check'][1])) ?></td>
+                    <td><?= number_format(round($Bill['delivery'][1])) ?></td>
+                    <td><?= number_format(round($Bill['final'][1])) ?></td>
+
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</div>
+<?php
+include "./footer.php";
+
+?>
+<?php
+if ((accountidToDepartId($user_id) == '220') || ($user_id == "M0209")) {
+?>
+    <button type="button" onclick="create('create',0)" class="btn btn-primary btn-sm pull-right" style="margin-right: 10%;margin-bottom: 10px;">
+        新增收款紀錄<span class=" glyphicon glyphicon-plus"></span></button>
+<?php
+}
+?>
+<div style="margin-right: 10%;margin-left: 10%; justify-content: center;">
+    <table class="table table-striped table-bordered" style="width:100%;">
+        <thead>
+            <tr>
+                <th>發票日期</th>
+                <th>發票金額</th>
+                <th>發票號碼</th>
+                <th>收款日期</th>
+                <th>收款金額</th>
+                <th>備註</th>
+                <th>狀態</th>
+                <?php if ((accountidToDepartId($user_id) == '220') || ($user_id == "M0209")) { ?>
+                    <th style="width: 10%;">功能</th>
+                <?php } ?>
+
+            </tr>
+        </thead>
+        <tbody>
+            <?php if ($pay_received) {
+                foreach ($pay_received as $received) { ?>
+                    <tr>
+                        <td><?= $received['invoice_date'] ?></td>
+                        <td><?= number_format($received['invoice_amount']) ?></td>
+                        <td><?= $received['invoice_no'] ?></td>
+                        <td><?= $received['received_date'] ?></td>
+                        <td><?= number_format($received['received_amount']) ?></td>
+                        <td><?= $received['remark'] ?></td>
+                        <td style="text-align: center;">
+                            <?php
+                            switch ($received['status']) {
+                                case 0:
+                                    echo "<span style='color:blue;'>進行中</span>";
+                                    break;
+                                case 1:
+                                    echo "<span style='color:brown;'>催收</span>";
+                                    break;
+                                case 2:
+                                    echo "<span style='color:red;'>法務件 (發函)</span>";
+                                    break;
+                                case 3:
+                                    echo "<span style='color:red;'>法務件 (訴訟)</span>";
+                                    break;
+                                case 4:
+                                    echo "折讓";
+                                    break;
+                                case 5:
+                                    echo "壞帳";
+                                    break;
+                                case 99:
+                                    echo "完成";
+                                    break;
+                            }
+                            ?></td>
+                        <?php if ((accountidToDepartId($user_id) == '220') || ($user_id == "M0209")) { ?>
+                            <td>
+                                <button type="button" onclick="create('edit',<?= $received['pay_id'] ?>)" class="btn btn-warning btn-sm pull-right" style="margin-right: 10%;margin-bottom: 10px;">
+                                    <span class="glyphicon glyphicon-pencil"></span></button>
+                                <!-- <a href="account-receivable-received-delete.php?id=<?php echo $received['pay_id'] ?>&<?= $token_link ?>" class="btn btn-danger btn-sm">
+                                    <span class=" glyphicon glyphicon-trash"></span>
+                                </a> -->
+
+                            </td>
+                        <?php } ?>
+
+                    </tr>
+            <?php }
+            } ?>
+        </tbody>
+    </table>
+</div>
+<script>
+    function create(type, pay_id) {
+        var BillData = <?= $data ?>;
+        var form = document.createElement("form");
+        form.method = 'POST';
+        if (type === 'create') {
+            form.action = "account-receivable-received-create.php?<?= $token_link ?>";
+        } else {
+            form.action = "account-receivable-received-edit.php?pay_id=" + pay_id + "&<?= $token_link ?>";
+        }
+
+        var input = document.createElement("input");
+        input.type = "hidden";
+        input.name = "Bill";
+        input.value = JSON.stringify(BillData);
+        form.appendChild(input);
+        document.body.appendChild(form);
+        form.submit();
+    }
 </script>
\ No newline at end of file
diff --git a/wms/account-receivable-contract.php b/wms/account-receivable-contract.php
index 9eda5895..f37920fb 100644
--- a/wms/account-receivable-contract.php
+++ b/wms/account-receivable-contract.php
@@ -1,39 +1,39 @@
-<?php
-include "header.php";
-// 合約收款款別名稱
-$arrayData = [];
-echo "合約號;客戶名稱;1款;金額;2款;金額;3款;金額;4款;金額;5款;金額;6款;金額;7款;金額;8款;金額;9款;金額;10款;金額;11款;金額;12款</br>";
-$sql_contract = "SELECT a.BillNo, a.PayStage, a.PlanPayAmt,s.BizPartnerId,c.BizPartnerName 
-FROM salOrderStagePay AS a 
-LEFT JOIN salSalesOrder AS s on a.BillNo = s.BillNo 
-LEFT JOIN comBusinessPartner as c ON s.BizPartnerId=c.BizPartnerId 
-WHERE s.ModeId = 'M' AND (s.CurrentState=2 OR s.CurrentState=4)";
-
-$contract = $conn->query($sql_contract);
-foreach ($contract as $cont) {
-    if ($cont['BillNo'] == 'SO20230801002') {
-        $BillNo = 'M231067';
-    }else{
-        $BillNo = $cont['BillNo'];
-    };
-    $PayStage = $cont['PayStage'];
-    $PayAmount = $cont['PlanPayAmt'];
-    $partnerName = $cont['BizPartnerName'];
-    if(isset($arrayData[$BillNo])){
-        array_push($arrayData[$BillNo], $PayStage);
-        array_push($arrayData[$BillNo], $PayAmount);
-        
-    }else{
-        $arrayData[$BillNo][0] = $BillNo;
-        $arrayData[$BillNo][1] = $partnerName;
-        array_push($arrayData[$BillNo], $PayStage);
-        array_push($arrayData[$BillNo], $PayAmount);
-
-    }
-};
-foreach($arrayData as $data){
-    foreach($data as $value){
-        echo $value.";";
-    }
-    echo "</br>";
+<?php
+include "header.php";
+// 合約收款款別名稱
+$arrayData = [];
+echo "合約號;客戶名稱;1款;金額;2款;金額;3款;金額;4款;金額;5款;金額;6款;金額;7款;金額;8款;金額;9款;金額;10款;金額;11款;金額;12款</br>";
+$sql_contract = "SELECT a.BillNo, a.PayStage, a.PlanPayAmt,s.BizPartnerId,c.BizPartnerName 
+FROM salOrderStagePay AS a 
+LEFT JOIN salSalesOrder AS s on a.BillNo = s.BillNo 
+LEFT JOIN comBusinessPartner as c ON s.BizPartnerId=c.BizPartnerId 
+WHERE s.ModeId = 'M' AND (s.CurrentState=2 OR s.CurrentState=4)";
+
+$contract = $conn->query($sql_contract);
+foreach ($contract as $cont) {
+    if ($cont['BillNo'] == 'SO20230801002') {
+        $BillNo = 'M231067';
+    }else{
+        $BillNo = $cont['BillNo'];
+    };
+    $PayStage = $cont['PayStage'];
+    $PayAmount = $cont['PlanPayAmt'];
+    $partnerName = $cont['BizPartnerName'];
+    if(isset($arrayData[$BillNo])){
+        array_push($arrayData[$BillNo], $PayStage);
+        array_push($arrayData[$BillNo], $PayAmount);
+        
+    }else{
+        $arrayData[$BillNo][0] = $BillNo;
+        $arrayData[$BillNo][1] = $partnerName;
+        array_push($arrayData[$BillNo], $PayStage);
+        array_push($arrayData[$BillNo], $PayAmount);
+
+    }
+};
+foreach($arrayData as $data){
+    foreach($data as $value){
+        echo $value.";";
+    }
+    echo "</br>";
 }
\ No newline at end of file
diff --git a/wms/account-receivable-excel.php b/wms/account-receivable-excel.php
new file mode 100644
index 00000000..d9358d2e
--- /dev/null
+++ b/wms/account-receivable-excel.php
@@ -0,0 +1,51 @@
+<?php
+include "./header.php";
+require_once dirname(__DIR__) . '/common/composer/vendor/autoload.php';
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+$Bill = $_POST['Bill'];
+$array_data = array();
+$Bill = json_decode($Bill, true);
+
+foreach($Bill as $key=>$value){
+    // for ($i = 0; $i < 17; $i++) {
+    //     $value[$i] = (isset($value[$i])) ? $value[$i] : 0;
+    // }
+    $array_data[$key][0] = $key;
+    $array_data[$key][1] = $value[1];
+    $array_data[$key][2] = $value[2];
+    $array_data[$key][3] = $value[4];
+    $array_data[$key][4] = $value[5];
+    $array_data[$key][5] = $value[7];
+    $array_data[$key][6] = $value[8];
+    $array_data[$key][7] = $value[6];
+    $array_data[$key][8] = $value['sign'][1];
+    $array_data[$key][9] = $value['second'][1];
+    $array_data[$key][10] = $value['arrive'][1];
+    $array_data[$key][11] = $value['install'][1];
+    $array_data[$key][12] = $value['tryrun'][1];
+    $array_data[$key][13] = $value['check'][1];
+    $array_data[$key][14] = $value['delivery'][1];
+    $array_data[$key][15] = $value['final'][1];
+    $array_data[$key][16] = $value['receivable_budget'];
+    $array_data[$key][17] = str_replace('<br>',';     ',$value['facilities']);
+}
+$spreadsheet = new Spreadsheet();
+$sheet = $spreadsheet->getActiveSheet();
+$colomnHeader = ['合約號','部門','經理','營業員','客戶名稱','統一編號','聯絡地址','抬頭','簽約款',
+'二次款','貨抵工地款','安裝款','試車款','官檢款','交車款','尾款','目前應收','作番狀態'];
+$sheet->fromArray($colomnHeader,NULL,'A1');
+$rowIndex = 2;
+foreach($array_data as $key => $value){
+    $sheet->fromArray([$value], NULL, 'A' . $rowIndex);
+    $sheet->getStyle('R' . $rowIndex)->getAlignment()->setWrapText(true);
+    $rowIndex++;
+}
+$writer = new Xlsx($spreadsheet);
+$excelFileName = 'account-receivable.xlsx';
+$writer->save($excelFileName);
+
+?>
+<script>
+    window.location.href = "account-receivable-index.php?<?= $token_link ?>";
+</script>
\ No newline at end of file
diff --git a/wms/account-receivable-index.php b/wms/account-receivable-index.php
index 0cf5e917..7878d34c 100644
--- a/wms/account-receivable-index.php
+++ b/wms/account-receivable-index.php
@@ -1,345 +1,403 @@
-<?php
-include "header.php";
-require_once dirname(__DIR__) . '/common/composer/vendor/autoload.php';
-
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx as xls;
-//use PhpOffice\PhpSpreadsheet\Reader\Xls;
-use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
-
-$follower = find_follow($user_id);
-$arrayData = [];
-$receivable_array = [];
-$received_array = [];
-//4 簽約   5 二次款   6 貨抵工地   7 安裝 8 試車 9官檢 10 交車
-//arrive_num 貨抵工地   tryrun_num 試車安裝完畢 official_num 官檢完畢  delivery_num 移交  
-$sql_received = "SELECT * from account_received";
-
-$sql_contract = "SELECT a.BillNo, a.PayStage, a.PlanPayAmt,s.BizPartnerId,c.BizPartnerName, s.PersonId,
-c.EnterpriseName, c.TaxNo, c.ContactAddress FROM salOrderStagePay AS a 
-LEFT JOIN salSalesOrder AS s on a.BillNo = s.BillNo 
-LEFT JOIN comBusinessPartner as c ON s.BizPartnerId=c.BizPartnerId 
-WHERE s.ModeId = 'M' AND (s.CurrentState=2 OR s.CurrentState=4) ";
-if (!(in_array(accountidToDepartId($user_id), array('220', '210')))) {
-    $sql_contract .= "AND (s.PersonId = '$user_id'";
-    $sql_received .= " WHERE person_id = '$user_id'";
-    if (count($follower) > 0) {
-        $column_str = "('$user_id'" . ",'";
-        $column_str .= implode("','", $follower);
-        $column_str .= "')";
-        $sql_contract .= " OR s.PersonId IN $column_str)";
-        $sql_received .= " OR person_id IN $column_str)";
-    } else {
-        $sql_contract .= ")";
-    };
-}
-
-$contract = $conn->query($sql_contract);
-$received_data = mysqli_query($link, $sql_received);
-foreach ($received_data as $received) {
-    if ($received['BillNo'] == 'SO20230801001') {
-        $BillNo = 'M230947';
-    } elseif ($received['BillNo'] == 'SO20230801002') {
-        $BillNo = 'M231067';
-    } else {
-        $BillNo = $received['BillNo'];
-    };
-    if (isset($received_array[$BillNo])) {
-        $received_array[$BillNo][0] += $received['invoice_amount'];
-        $received_array[$BillNo][1] += $received['received_amount'];
-    } else {
-        $received_array[$BillNo][0] = $received['invoice_amount'];
-        $received_array[$BillNo][1] = $received['received_amount'];
-    }
-}
-foreach ($contract as $cont) {
-    // print_r($cont);
-    // echo "<br>";
-    if ($cont['BillNo'] == 'SO20230801001') {
-        $BillNo = 'M230947';
-    } elseif ($cont['BillNo'] == 'SO20230801002') {
-        $BillNo = 'M231067';
-    } else {
-        $BillNo = $cont['BillNo'];
-    };
-    $PayStage = $cont['PayStage'];
-    $PayAmount = $cont['PlanPayAmt'];
-    $partnerName = $cont['BizPartnerName'];
-    $EnterpriseName = $cont['EnterpriseName'];
-    $TaxNo = $cont['TaxNo'];
-    $ContactAddress = $cont['ContactAddress'];
-    //4 簽約   5 二次款   6 貨抵工地   7 安裝 8 試車 9官檢 10 交車 
-    if (isset($arrayData[$BillNo])) {
-        if (stristr($PayStage, '二次款') || stristr($PayStage, '出貨前') || stristr($PayStage, '簽約後') || stristr($PayStage, '簽訂後') || stristr($PayStage, '建照核發時') || stristr($PayStage, '簽約60')) {
-            $arrayData[$BillNo][5] = $PayAmount;
-        } elseif ($PayStage == '簽約' || stristr($PayStage, '簽定') || stristr($PayStage, '簽訂') || stristr($PayStage, '訂金')) {
-            $arrayData[$BillNo][4] = $PayAmount;
-        } elseif (stristr($PayStage, '貨抵工地') || stristr($PayStage, '貨底工地')) {
-            $arrayData[$BillNo][6] = $PayAmount;
-        } elseif (stristr($PayStage, '試車') || stristr($PayStage, '驗收完成')) {
-            $arrayData[$BillNo][8] = $PayAmount;
-        } elseif (stristr($PayStage, '安裝')) {
-            $arrayData[$BillNo][7] = $PayAmount;
-        } elseif (stristr($PayStage, '得合格函後6個月') || stristr($PayStage, '核可函取得後6個月') || stristr($PayStage, '交車')) {
-            $arrayData[$BillNo][10] = $PayAmount;
-        } elseif (stristr($PayStage, '合格') || stristr($PayStage, '驗收') || stristr($PayStage, '許可') || stristr($PayStage, '核可')) {
-            $arrayData[$BillNo][9] = $PayAmount;
-        } else {
-            $arrayData[$BillNo][12] = $PayAmount;
-        }
-    } else {
-        $arrayData[$BillNo] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-        $arrayData[$BillNo][3] = $partnerName;
-        $arrayData[$BillNo][13] = $EnterpriseName;
-        $arrayData[$BillNo][14] = $TaxNo;
-        $arrayData[$BillNo][15] = $ContactAddress;
-        if (stristr($PayStage, '二次款') || stristr($PayStage, '出貨前') || stristr($PayStage, '簽約後') || stristr($PayStage, '簽訂後') || stristr($PayStage, '建照核發時') || stristr($PayStage, '簽約60')) {
-            $arrayData[$BillNo][5] = $PayAmount;
-        } elseif ($PayStage == '簽約' || stristr($PayStage, '簽定') || stristr($PayStage, '簽訂') || stristr($PayStage, '訂金')) {
-            $arrayData[$BillNo][4] = $PayAmount;
-        } elseif (stristr($PayStage, '貨抵工地') || stristr($PayStage, '貨底工地')) {
-            $arrayData[$BillNo][6] = $PayAmount;
-        } elseif (stristr($PayStage, '試車') || stristr($PayStage, '驗收完成')) {
-            $arrayData[$BillNo][8] = $PayAmount;
-        } elseif (stristr($PayStage, '安裝')) {
-            $arrayData[$BillNo][7] = $PayAmount;
-        } elseif (stristr($PayStage, '得合格函後6個月') || stristr($PayStage, '核可函取得後6個月') || stristr($PayStage, '交車')) {
-            $arrayData[$BillNo][10] = $PayAmount;
-        } elseif (stristr($PayStage, '合格') || stristr($PayStage, '驗收') || stristr($PayStage, '許可') || stristr($PayStage, '核可')) {
-            $arrayData[$BillNo][9] = $PayAmount;
-        } else {
-            $arrayData[$BillNo][12] = $PayAmount;
-        }
-    }
-}
-
-foreach ($arrayData as $key => $value) {
-    $sql = "SELECT
-tmp2.*,
-d.name AS depart_name
-FROM(
-SELECT 
- a.manager,
- a2.name as manager_name,
- a.name,
- a.department_id,
- w.salesid,
- w.contractno,
- w.facilityno,
- w.estimated_shipping_date,
-w.actual_tofactory_date,
- w.real_arrival_date,
- w.install_end_date,
- w.tryrun_end_date,
- w.official_check_date,
- w.delivery_date
-from wipwholestatus AS w
-left join account AS a
-ON w.salesid = a.accountid
-left join account AS a2
-ON a2.accountid = a.manager
-where w.status = '1' AND w.contractno='" . $key . "'" . "
-
-)AS tmp2
-left join (
-SELECT DISTINCT 
- department_id,
- name
-FROM department
-
-) AS d
-ON d.department_id = tmp2.department_id";
-    $facitities = "";
-    $total_facility_num = 0;
-    $arrive_num = 0;
-    $tryrun_num = 0;
-    $delivery_num = 0;
-    $official_num = 0;
-    $wipwhole_array = mysqli_query($link, $sql);
-    foreach ($wipwhole_array as $wip) {
-        $value[0] = $wip['depart_name'];
-        $value[1] = $wip['manager_name'];
-        $value[2] = $wip['name'];
-        $value[16] = isset($wip['department_id']) ? $wip['department_id'] : '';
-        $value[17] = isset($wip['salesid']) ? $wip['salesid'] : '';
-        if ($wip['delivery_date'] != NULL) {
-            $facitities .= $wip['facilityno'] . " (" . $wip['delivery_date'] . "已移交)  <br>";
-            $total_facility_num += 1;
-            $arrive_num += 1;
-            $tryrun_num += 1;
-            $official_num += 1;
-            $delivery_num += 1;
-        } elseif ($wip['official_check_date'] != NULL) {
-            $facitities .= $wip['facilityno'] . " (" . $wip['official_check_date'] . "官檢完畢)  <br>";
-            $total_facility_num += 1;
-            $arrive_num += 1;
-            $tryrun_num += 1;
-            $official_num += 1;
-        } elseif ($wip['tryrun_end_date'] != NULL) {
-            $facitities .= $wip['facilityno'] . " (" . $wip['tryrun_end_date'] . "試車完畢)  <br>";
-            $total_facility_num += 1;
-            $arrive_num += 1;
-            $tryrun_num += 1;
-        } elseif ($wip['install_end_date'] != NULL) {
-            $facitities .= $wip['facilityno'] . " (" . $wip['install_end_date'] . "安裝完畢)  <br>";
-            $total_facility_num += 1;
-            $arrive_num += 1;
-        } elseif ($wip['real_arrival_date'] != NULL) {
-            $facitities .= $wip['facilityno'] . " (" . $wip['real_arrival_date'] . "貨抵工地)  <br>";
-            $total_facility_num += 1;
-            $arrive_num += 1;
-        } elseif ($wip['actual_tofactory_date'] != NULL) {
-            $facitities .= $wip['facilityno'] . " (" . $wip['actual_tofactory_date'] . "實際到觀音日)  <br>";
-            $total_facility_num += 1;
-        } elseif ($wip['estimated_shipping_date'] != NULL) {
-            $facitities .= $wip['facilityno'] . " (" . $wip['estimated_shipping_date'] . "預計到港)  <br>";
-            $total_facility_num += 1;
-        } else {
-            $facitities .= $wip['facilityno'] . " (預計到港日待確認)  <br>";
-            $total_facility_num += 1;
-        }
-    }
-    $receivable_budget = 0;
-    //這是錢  4 簽約   5 二次款   6 貨抵工地   7 安裝 8 試車 9官檢 10 交車 
-    //這是數量  arrive_num 貨抵工地   tryrun_num 試車安裝完畢 official_num 官檢完畢  delivery_num 移交  
-    if ($total_facility_num > 0) {
-        $receivable_budget = $value[4] + ($value[5] + $value[6]) * ($arrive_num / $total_facility_num) +
-            ($value[7] + $value[8]) * ($tryrun_num / $total_facility_num) + ($value[9]) * ($official_num / $total_facility_num)
-            + ($value[10]) * ($delivery_num / $total_facility_num);
-        $uninvoice_budget = $receivable_budget;
-        $unreceived_budget = $receivable_budget;
-        $received_invoice = 0;
-        $received_budget = 0;
-        if (isset($received_array[$key][0])) {
-            $uninvoice_budget = $receivable_budget - $received_array[$key][0];
-            $received_invoice = $received_array[$key][0];
-        }else{
-            $uninvoice_budget = $receivable_budget;
-        }
-        if (isset($received_array[$key][1])) {
-            $unreceived_budget = $receivable_budget - $received_array[$key][1];
-            $received_budget = $received_array[$key][1];
-        }else{
-            $unreceived_budget = $receivable_budget;
-        }
-    }
-    if (isset($value[0]) && ($value[0] != 0)) {
-        $receivable_array[$key] = [$key, $value[0], $value[1], $value[2], $value[3], $value[4], $value[5], $value[6], $value[7], $value[8], $value[9],
-         $value[10], $receivable_budget, $facitities, $value[13], $value[14], $value[15], $value[16], $value[17], $received_invoice, $received_budget,
-          $uninvoice_budget, $unreceived_budget];
-    }
-}
-$data = json_encode($receivable_array);
-
-// echo "合約號;部門;經理;營業員;客戶名稱;簽約款;二次款;貨抵工地款;安裝款;試車款;官檢款;交車款;目前應收;總作番數;貨抵;安裝試車;官檢;移交數;狀態</br>";
-?>
-<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;
-
-    }
-</style>
-<div style="width:98%;margin:1%">
-    <table id="table_index" class="table table-striped table-bordered" style="width:100%;">
-        <thead>
-            <tr>
-                <th style="width: 120px;">合約號</th>
-                <th style="width: 120px;">部門</th>
-                <th style="width: 80px;">經理</th>
-                <th style="width: 80px;">營業員</th>
-                <th>客戶名稱</th>
-                <!-- <th style="width: 100px;">簽約款</th>
-                <th style="width: 100px;">二次款</th>
-                <th style="width: 100px;">貨抵工地款</th>
-                <th style="width: 100px;">安裝款</th>
-                <th style="width: 100px;">試車款</th>
-                <th style="width: 100px;">官檢款</th>
-                <th style="width: 100px;">交車款</th> -->
-                <th style="width: 100px;">目前應收</th>
-                <th style="width: 150px;">未開發票金額</th>
-                <th style="width: 100px;">未收金額</th>
-                <th>狀態</th>
-                <th style="width: 100px;">操作</th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php
-            foreach ($receivable_array as $contract) {
-            ?>
-                <tr>
-                    <th><?= $contract[0] ?></th>
-                    <td><?= $contract[1] ?></td>
-                    <td><?= $contract[2] ?></td>
-                    <td><?= $contract[3] ?></td>
-                    <td><?= $contract[4] ?></td>
-                    <!-- <td><?= round($contract[5]) ?></td>
-                    <td><?= round($contract[6]) ?></td>
-                    <td><?= round($contract[7]) ?></td>
-                    <td><?= round($contract[8]) ?></td>
-                    <td><?= round($contract[9]) ?></td>
-                    <td><?= round($contract[10]) ?></td>
-                    <td><?= round($contract[11]) ?></td> -->
-                    <td style="text-align: end;"><?= number_format(round($contract[12])) ?></td>
-                    <td style="text-align: end;"><?= number_format(round($contract[21])) ?></td>
-                    <td style="text-align: end;"><?= number_format(round($contract[22])) ?></td>
-                    <td style="text-align: start;"><?= $contract[13] ?></td>
-                    <td><button type="button" onclick="sendData('<?= $contract[0] ?>')" class="btn btn-primary btn-sm"><span class=" glyphicon glyphicon-search"></span></button>
-                    </td>
-                </tr>
-            <?php
-            }
-            ?>
-        </tbody>
-    </table>
-</div>
-<script>
-    function sendData(BillNo) {
-        console.log(BillNo);
-        var BillData = <?= $data ?>;
-        var Bill = BillData[BillNo];
-        console.log(Bill);
-        console.log(typeof(Bill));
-        var form = document.createElement("form");
-        form.method = 'POST';
-        form.action = "account-receivable-check.php?<?= $token_link ?>";
-        var input = document.createElement("input");
-        input.type = "hidden";
-        input.name = "Bill";
-        input.value = JSON.stringify(Bill);
-        form.appendChild(input);
-        document.body.appendChild(form);
-        form.submit();
-
-    }
+<?php
+include "header.php";
+
+$follower = find_follow($user_id);
+$arrayData = [];
+$receivable_array = [];
+$sql_received = "SELECT * FROM arWriteOffBillDetail WHERE (DATALENGTH(OrderBillNo) >0)";
+
+$sql_contract = "SELECT a.BillNo, a.PayStage, a.PlanPayAmt, a.PlanPayDate,s.BizPartnerId,c.BizPartnerName, s.PersonId,
+c.EnterpriseName, c.TaxNo, c.ContactAddress FROM salOrderStagePay AS a 
+LEFT JOIN salSalesOrder AS s on a.BillNo = s.BillNo 
+LEFT JOIN comBusinessPartner AS c ON s.BizPartnerId=c.BizPartnerId 
+WHERE s.ModeId = 'M' AND (s.CurrentState=2 OR s.CurrentState=4) ";
+if (!(in_array(accountidToDepartId($user_id), array('220', '210')))) {
+    $sql_contract .= "AND (s.PersonId = '$user_id'";
+    $sql_received .= " AND (PersonId = '$user_id'";
+    if (count($follower) > 0) {
+        $column_str = "('$user_id'" . ",'";
+        $column_str .= implode("','", $follower);
+        $column_str .= "')";
+        $sql_contract .= " OR s.PersonId IN $column_str)";
+        $sql_received .= " OR PersonId IN $column_str)";
+    } else {
+        $sql_contract .= ")";
+        $sql_received .= ")";
+    };
+}
+$sign60 = array('簽訂後60天', '簽約60日', '簽約後60天', '簽訂後60日內', '訂金支付後60天');
+$sign90 = array('簽約後90天', '簽約後90日', '簽訂後90天');
+$sign120 = array('簽約後120天', '簽約後120日', '簽訂後120天');
+$contract = $conn->query($sql_contract);
+$received_array = $conn->query($sql_received);
+
+// 取收款資料 account_received
+// $received_data = mysqli_query($link, $sql_received);
+// foreach ($received_data as $received) {
+//     if ($received['BillNo'] == 'SO20230801001') {
+//         $BillNo = 'M230947';
+//     } elseif ($received['BillNo'] == 'SO20230801002') {
+//         $BillNo = 'M231067';
+//     } else {
+//         $BillNo = $received['BillNo'];
+//     };
+//     if (isset($received_array[$BillNo])) {
+//         $received_array[$BillNo][0] += $received['invoice_amount'];
+//         $received_array[$BillNo][1] += $received['received_amount'];
+//         $received['status'] = (intval($received['status']) < 4) ? intval($received['status']) : 0;
+//         if ($received_array[$BillNo][2] < intval($received['status'])) {
+//             $received_array[$BillNo][2] = intval($received['status']);
+//         }
+//     } else {
+//         $received_array[$BillNo][0] = $received['invoice_amount'];
+//         $received_array[$BillNo][1] = $received['received_amount'];
+//         $received_array[$BillNo][2] = (intval($received['status']) < 4) ? intval($received['status']) : 0;
+//     }
+// }
+
+// 將T8合約收款階段資料依據款別分類放進arraData裡
+foreach ($contract as $cont) {
+    if ($cont['BillNo'] == 'SO20230801001') {
+        $BillNo = 'M230947';
+    } elseif ($cont['BillNo'] == 'SO20230801002') {
+        $BillNo = 'M231067';
+    } else {
+        $BillNo = $cont['BillNo'];
+    };
+    $PayStage = $cont['PayStage'];
+    $PlanPayDate = $cont['PlanPayDate'];
+    $PayAmount = $cont['PlanPayAmt'];
+    $partnerName = $cont['BizPartnerName'];
+    $EnterpriseName = $cont['EnterpriseName'];
+    $TaxNo = $cont['TaxNo'];
+    $ContactAddress = $cont['ContactAddress'];
+    //['sign'] 0 款項名稱   1 簽約金額   2 簽約日期   ['second'] 0 二次款名  1 二次款金額  2 收款日期   ['arrive'] 0 貨抵工地款名稱   1 貨抵工地款金額   2 貨抵工地收款日期   ['install'] 0 安裝款名   1 安裝金額   2 安裝收款日期     
+    //['tryrun'] 0 試車款名   1試車金額   2 試車收款日期   ['check'] 0 官檢款名   1 官檢金額   2 官檢收款日期   ['delivery'] 0 交車款名  1 交車金額  2 交車收款日期  ['final'] 0 尾款名  1 尾款金額  2 尾款收款日期 
+    if (!(isset($arrayData[$BillNo]))) {
+        // 0 部門id  1 部門名稱   2 經理名稱  3 營業員id  4 營業員名稱 5 客戶名稱 6 抬頭 7 統編 8 通訊地址
+        $arrayData[$BillNo] = [0, 0, 0, 0, 0, 0, 0, 0, 0];
+        $arrayData[$BillNo][5] = $partnerName;
+        $arrayData[$BillNo][6] = $EnterpriseName;
+        $arrayData[$BillNo][7] = $TaxNo;
+        $arrayData[$BillNo][8] = $ContactAddress;
+        $arrayData[$BillNo]['received']= array();
+        $arrayData[$BillNo]['sign'][1] = $arrayData[$BillNo]['second'][1] = $arrayData[$BillNo]['arrive'][1] = $arrayData[$BillNo]['install'][1] = $arrayData[$BillNo]['tryrun'][1] = $arrayData[$BillNo]['check'][1] = $arrayData[$BillNo]['delivery'][1] = $arrayData[$BillNo]['final'][1] = 0;
+        $arrayData[$BillNo]['facilities'] = "";
+        $arrayData[$BillNo]['total_facility_num'] = $arrayData[$BillNo]['delivery_num'] = $arrayData[$BillNo]['check_num'] = $arrayData[$BillNo]['tryrun_num'] = $arrayData[$BillNo]['install_num'] = $arrayData[$BillNo]['arrive_num'] = $arrayData[$BillNo]['second_num'] = $arrayData[$BillNo]['receivable_budget'] = 0;
+    }
+    if (stristr($PayStage, '二次款') || stristr($PayStage, '出貨前') || stristr($PayStage, '簽約後') || stristr($PayStage, '簽訂後') || stristr($PayStage, '建照核發時') || stristr($PayStage, '簽約60')) {
+        $arrayData[$BillNo]['second'][0] = $PayStage;
+        $arrayData[$BillNo]['second'][1] = $PayAmount;
+        $arrayData[$BillNo]['second'][2] = $PlanPayDate;
+        if (isset($arrayData[$BillNo]['sign'][2]) && !is_null($arrayData[$BillNo]['sign'][2])) {
+            $signtime = strtotime(strval($arrayData[$BillNo]['sign'][2]));
+            if (in_array($PayStage, $sign60)) {
+                $secondtime = $signtime + (60 * 86400);
+                $secondtime = date('Ymd', $secondtime);
+                $arrayData[$BillNo]['second'][2] = intval($secondtime);
+            } elseif (in_array($PayStage, $sign90)) {
+                $secondtime = $signtime + (90 * 86400);
+                $secondtime = date('Ymd', $secondtime);
+                $arrayData[$BillNo]['second'][2] = intval($secondtime);
+            } elseif (in_array($PayStage, $sign120)) {
+                $secondtime = $signtime + (120 * 86400);
+                $secondtime = date('Ymd', $secondtime);
+                $arrayData[$BillNo]['second'][2] = intval($secondtime);
+            } elseif (stristr($PayStage, '簽訂後30天')) {
+                $secondtime = $signtime + (30 * 86400);
+                $secondtime = date('Ymd', $secondtime);
+                $arrayData[$BillNo]['second'][2] = intval($secondtime);
+            }
+        }
+    } elseif ($PayStage == '簽約' || stristr($PayStage, '簽定') || stristr($PayStage, '簽訂') || stristr($PayStage, '訂金') || stristr($PayStage, '工地動工')) {
+        $arrayData[$BillNo]['sign'][0] = $PayStage;
+        $arrayData[$BillNo]['sign'][1] = $PayAmount;
+        $arrayData[$BillNo]['sign'][2] = $PlanPayDate;
+    } elseif (stristr($PayStage, '試車')) {
+        $arrayData[$BillNo]['tryrun'][0] = $PayStage;
+        $arrayData[$BillNo]['tryrun'][1] = $PayAmount;
+        $arrayData[$BillNo]['tryrun'][2] = $PlanPayDate;
+    } elseif (stristr($PayStage, '安裝') || stristr($PayStage, '貨抵工地且完工')) {
+        $arrayData[$BillNo]['install'][0] = $PayStage;
+        $arrayData[$BillNo]['install'][1] = $PayAmount;
+        $arrayData[$BillNo]['install'][2] = $PlanPayDate;
+    } elseif (stristr($PayStage, '貨抵工地') || stristr($PayStage, '貨底工地')) {
+        $arrayData[$BillNo]['arrive'][0] = $PayStage;
+        $arrayData[$BillNo]['arrive'][1] = $PayAmount;
+        $arrayData[$BillNo]['arrive'][2] = $PlanPayDate;
+    } elseif (stristr($PayStage, '得合格函後6個月') || stristr($PayStage, '核可函取得後6個月') || stristr($PayStage, '交車')) {
+        $arrayData[$BillNo]['delivery'][0] = $PayStage;
+        $arrayData[$BillNo]['delivery'][1] = $PayAmount;
+        $arrayData[$BillNo]['delivery'][2] = $PlanPayDate;
+    } elseif (stristr($PayStage, '合格') || stristr($PayStage, '驗收') || stristr($PayStage, '許可') || stristr($PayStage, '核可')) {
+        $arrayData[$BillNo]['check'][0] = $PayStage;
+        $arrayData[$BillNo]['check'][1] = $PayAmount;
+        $arrayData[$BillNo]['check'][2] = $PlanPayDate;
+    } elseif (stristr($PayStage, '驗收完成')) {
+        $arrayData[$BillNo]['final'][0] = $PayStage;
+        $arrayData[$BillNo]['final'][1] = $PayAmount;
+        $arrayData[$BillNo]['final'][2] = $PlanPayDate;
+    } else {
+        $arrayData[$BillNo]['other'][1] = $PayAmount;
+        $arrayData[$BillNo]['other'][2] = $PlanPayDate;
+    }
+}
+$sql = "SELECT
+tmp2.*,
+d.name AS depart_name
+FROM(
+SELECT 
+ a.manager,
+ a2.name as manager_name,
+ a.name,
+ a.department_id,
+ w.salesid,
+ w.contractno,
+ w.facilityno,
+ w.estimated_shipping_date,
+w.actual_tofactory_date,
+ w.real_arrival_date,
+ w.install_end_date,
+ w.tryrun_end_date,
+ w.official_check_date,
+ w.delivery_date
+from wipwholestatus AS w
+left join account AS a
+ON w.salesid = a.accountid
+left join account AS a2
+ON a2.accountid = a.manager
+where w.status = '1' AND  w.contract_type='A'
+)AS tmp2
+left join (
+SELECT DISTINCT 
+ department_id,
+ name
+FROM department
+
+) AS d
+ON d.department_id = tmp2.department_id";
+$wipwhole_array = mysqli_query($link, $sql);
+foreach ($wipwhole_array as $wip) {
+    if (isset($arrayData[$wip['contractno']])) {
+        $arrayData[$wip['contractno']][0] = $wip['department_id'];;
+        $arrayData[$wip['contractno']][1] = $wip['depart_name'];
+        $arrayData[$wip['contractno']][2] = $wip['manager_name'];
+        $arrayData[$wip['contractno']][3] = $wip['salesid'];
+        $arrayData[$wip['contractno']][4] = $wip['name'];
+        $arrayData[$wip['contractno']][10] = $wip['contractno'];
+        if (isset($arrayData[$wip['contractno']]['second'][0]) && stristr($arrayData[$wip['contractno']]['second'][0], '出貨前30天')) {
+            $estimate_delivery_time = strtotime($wip['estimated_shipping_date']);
+            $secondtime = $estimate_delivery_time - (30 * 86400);
+            $secondtime = date('Ymd', $secondtime);
+            $arrayData[$wip['contractno']]['second'][2] = intval($secondtime);
+        } elseif (isset($arrayData[$wip['contractno']]['second'][0]) && stristr($arrayData[$wip['contractno']]['second'][0], '出貨前90天')) {
+            $estimate_delivery_time = strtotime($wip['estimated_shipping_date']);
+            $secondtime = $estimate_delivery_time - (90 * 86400);
+            $secondtime = date('Ymd', $secondtime);
+            $arrayData[$wip['contractno']]['second'][2] = intval($secondtime);
+        }
+        if ($wip['delivery_date'] != NULL) {
+            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['delivery_date'] . "已移交)  <br>";
+            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+            $arrayData[$wip['contractno']]['delivery_num'] += 1;
+            $arrayData[$wip['contractno']]['check_num'] += 1;
+            $arrayData[$wip['contractno']]['tryrun_num'] += 1;
+            $arrayData[$wip['contractno']]['install_num'] += 1;
+            $arrayData[$wip['contractno']]['arrive_num'] += 1;
+            $arrayData[$wip['contractno']]['second_num'] += 1;
+        } elseif ($wip['official_check_date'] != NULL) {
+            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['official_check_date'] . "官檢完畢)  <br>";
+            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+            $arrayData[$wip['contractno']]['check_num'] += 1;
+            $arrayData[$wip['contractno']]['tryrun_num'] += 1;
+            $arrayData[$wip['contractno']]['install_num'] += 1;
+            $arrayData[$wip['contractno']]['arrive_num'] += 1;
+            $arrayData[$wip['contractno']]['second_num'] += 1;
+        } elseif ($wip['tryrun_end_date'] != NULL) {
+            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['tryrun_end_date'] . "試車完畢)  <br>";
+            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+            $arrayData[$wip['contractno']]['tryrun_num'] += 1;
+            $arrayData[$wip['contractno']]['install_num'] += 1;
+            $arrayData[$wip['contractno']]['arrive_num'] += 1;
+            $arrayData[$wip['contractno']]['second_num'] += 1;
+        } elseif ($wip['install_end_date'] != NULL) {
+            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['install_end_date'] . "安裝完畢)  <br>";
+            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+            $arrayData[$wip['contractno']]['install_num'] += 1;
+            $arrayData[$wip['contractno']]['arrive_num'] += 1;
+            $arrayData[$wip['contractno']]['second_num'] += 1;
+        } elseif ($wip['real_arrival_date'] != NULL) {
+            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['real_arrival_date'] . "貨抵工地)  <br>";
+            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+            $arrayData[$wip['contractno']]['arrive_num'] += 1;
+            $arrayData[$wip['contractno']]['second_num'] += 1;
+        } elseif (($arrayData[$wip['contractno']]['second'] != NULL) && (isset($arrayData[$wip['contractno']]['second'][2])) && ($arrayData[$wip['contractno']]['second'][2] <= date('Ymd'))) {
+            if ($wip['estimated_shipping_date'] != NULL) {
+                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['estimated_shipping_date'] . "預計出貨日)  <br>";
+                $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+                $arrayData[$wip['contractno']]['second_num'] += 1;
+            } elseif ($wip['actual_tofactory_date'] != NULL) {
+                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['actual_tofactory_date'] . "實際到觀音日)  <br>";
+                $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+                $arrayData[$wip['contractno']]['second_num'] += 1;
+            } else {
+                $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (已達二次款收款條件)  <br>";
+                $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+                $arrayData[$wip['contractno']]['second_num'] += 1;
+            }
+        } elseif ($wip['estimated_shipping_date'] != NULL) {
+            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (" . $wip['estimated_shipping_date'] . "預計到港)  <br>";
+            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+        } else {
+            $arrayData[$wip['contractno']]['facilities'] .= $wip['facilityno'] . " (預計到港日待確認)  <br>";
+            $arrayData[$wip['contractno']]['total_facility_num'] += 1;
+        }
+    }
+}
+
+
+foreach ($arrayData as &$value) {
+    if ($value['total_facility_num'] > 0) {
+        $value['receivable_budget'] = $value['sign'][1] + ($value['second'][1] * ($value['second_num'] / $value['total_facility_num'])) +
+            ($value['arrive'][1] * ($value['arrive_num'] / $value['total_facility_num'])) + ($value['install'][1] * ($value['install_num'] / $value['total_facility_num'])) +
+            ($value['tryrun'][1] * ($value['tryrun_num'] / $value['total_facility_num'])) + ($value['check'][1] * ($value['check_num'] / $value['total_facility_num'])) +
+            (($value['delivery'][1] + $value['final'][1]) * ($value['delivery_num'] / $value['total_facility_num']));
+    }
+}
+//        array_push($arrayData[$wip['contractno']]['received'], ['assaaa',123124,'sdrfrqa']);
+
+foreach($received_array as $received){
+
+    if(isset($arrayData[$received['OrderBillNo']])){
+        array_push($arrayData[$received['OrderBillNo']]['received'], [$received['BillNo'],$received['WriteOffBizPartnerId'],$received['OrderBillNo'],]);
+
+}
+}
+
+$data = json_encode($arrayData);
+
+?>
+<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;
+
+    }
+</style>
+<button type="button" onclick="downloadData()" class="btn btn-warning btn-lg pull-right"><span class="glyphicon glyphicon-download-alt"></span></button>
+
+<div style="width:98%;margin:1%">
+    <table id="table_index" class="table table-striped table-bordered" style="width:100%;">
+        <thead>
+            <tr>
+                <th style="width: 120px;">合約號</th>
+                <th style="width: 120px;">部門</th>
+                <th style="width: 80px;">經理</th>
+                <th style="width: 80px;">營業員</th>
+                <th>客戶名稱</th>
+                <!-- <th style="width: 100px;">簽約款</th>
+                <th style="width: 100px;">二次款</th>
+                <th style="width: 100px;">貨抵工地款</th>
+                <th style="width: 100px;">安裝款</th>
+                <th style="width: 100px;">試車款</th>
+                <th style="width: 100px;">官檢款</th>
+                <th style="width: 100px;">交車款</th>
+                <th style="width: 100px;">尾款</th> -->
+                <th style="width: 100px;">目前應收</th>
+                <!-- <th style="width: 150px;">未開發票金額</th>
+                <th style="width: 100px;">未收金額</th> -->
+                <th>作番狀態</th>
+                <!-- <th style="width: 100px;">收款狀態</th> -->
+                <th style="width: 100px;">操作</th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php
+            foreach ($arrayData as $key =>$value) {
+            ?>
+                <tr>
+                    <th><?= $key ?></th>
+                    <td><?= $value[1] ?></td>
+                    <td><?= $value[2] ?></td>
+                    <td><?= $value[4] ?></td>
+                    <td><?= $value[5] ?></td>
+                    <!-- <td style="text-align: end;"><?= number_format(round($value['sign'][1])) ?></td>
+                    <td style="text-align: end;"><?= number_format(round($value['second'][1])) ?></td>
+                    <td style="text-align: end;"><?= number_format(round($value['arrive'][1])) ?></td>
+                    <td style="text-align: end;"><?= number_format(round($value['install'][1])) ?></td>
+                    <td style="text-align: end;"><?= number_format(round($value['tryrun'][1])) ?></td>
+                    <td style="text-align: end;"><?= number_format(round($value['check'][1])) ?></td>
+                    <td style="text-align: end;"><?= number_format(round($value['delivery'][1])) ?></td>
+                    <td style="text-align: end;"><?= number_format(round($value['final'][1])) ?></td> -->
+                    <td style="text-align: end;"><?= number_format(round($value['receivable_budget'])) ?></td>
+                    <!-- <td style="text-align: end;"><?= number_format(round($value['total_facility_num'])) ?></td> -->
+                    <td style="text-align: start;"><?= $value['facilities'] ?></td>
+                    <td><button type="button" onclick="sendData('<?= $key ?>')" class="btn btn-primary btn-sm"><span class=" glyphicon glyphicon-search"></span></button>
+                    </td>
+                </tr>
+            <?php
+            }
+            ?>
+        </tbody>
+    </table>
+</div>
+<script>
+    function downloadData() {
+        var BillData = <?= $data ?>;
+        var form = document.createElement("form");
+        form.method = 'POST';
+        form.action = "account-receivable-excel.php?<?= $token_link ?>";
+        var input = document.createElement("input");
+        input.type = "hidden";
+        input.name = "Bill";
+        input.value = JSON.stringify(BillData);
+        form.appendChild(input);
+        document.body.appendChild(form);
+        form.submit();
+
+    }
+    function sendData(BillNo) {
+        var BillData = <?= $data ?>;
+        var Bill = BillData[BillNo];
+        var form = document.createElement("form");
+        form.method = 'POST';
+        form.action = "account-receivable-check.php?<?= $token_link ?>";
+        var input = document.createElement("input");
+        input.type = "hidden";
+        input.name = "Bill";
+        input.value = JSON.stringify(Bill);
+        form.appendChild(input);
+        document.body.appendChild(form);
+        form.submit();
+    }
 </script>
\ No newline at end of file
diff --git a/wms/account-receivable-received-create.php b/wms/account-receivable-received-create.php
index ad50abd2..87a627a6 100644
--- a/wms/account-receivable-received-create.php
+++ b/wms/account-receivable-received-create.php
@@ -1,121 +1,124 @@
-<?php
-include "./header.php";
-$Bill = $_POST['Bill'];
-$BillData = json_decode($Bill, true);
-?>
-<div style="width: 90%;">
-
-    <div style="padding-left: 2rem; padding-bottom: 1rem;">
-        <button type="button" onclick="backToIndex()" class="btn btn-outline-primary btn-lg"><span class="glyphicon glyphicon-menu-left"></span></button>
-    </div>
-</div>
-<div class="container">
-    <div class="text-center">
-        <h3><strong><?= $BillData[4] ?></strong></h3>
-        <h4>新增收款資訊</h4>
-    </div>
-    <form class="form-horizontal" id="pay_received" method="POST" action="account-receivable-received-submit.php?type=create&<?= $token_link ?>" enctype="multipart/form-data">
-        <div class="form-group" style="margin-left: 1%;margin-right: 1%;">
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="BillNo">合約號</label>
-                    <input type="text" class="form-control" id="BillNo" name="BillNo" value="<?= $BillData[0] ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="DeptName">部門</label>
-                    <input type="text" class="form-control" id="DeptName" name="DeptName" value="<?= $BillData[1] ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="ManagerName">經理</label>
-                    <input type="text" class="form-control" id="ManagerName" name="ManagerName" value="<?= $BillData[2] ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="PersonName">營業員</label>
-                    <input type="text" class="form-control" id="PersonName" name="PersonName" value="<?= $BillData[3] ?>" disabled>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="EnterpriseName">抬頭</label>
-                    <input type="text" class="form-control" id="EnterpriseName" name="EnterpriseName" value="<?= $BillData[14] ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="TaxNo">統一編號</label>
-                    <input type="text" class="form-control" id="TaxNo" name="TaxNo" value="<?= $BillData[15] ?>" disabled>
-                </div>
-                <div class="col-md-6">
-                    <label for="ContactAddress">聯絡地址</label>
-                    <input type="text" class="form-control" id="ContactAddress" name="ContactAddress" value="<?= $BillData[16] ?>" disabled>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="InvoiceDate">發票開立日期</label>
-                    <input type="date" class="form-control" id="InvoiceDate" name="InvoiceDate" >
-                </div>
-                <div class="col-md-3">
-                    <label for="InvoiceAmount">發票金額</label>
-                    <input type="number" class="form-control" id="InvoiceAmount" name="InvoiceAmount" >
-                </div>
-                <div class="col-md-3">
-                    <label for="InvoiceNo">發票號碼</label>
-                    <input type="text" class="form-control" id="InvoiceNo" name="InvoiceNo" >
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="ReceivedDate">收款日期</label>
-                    <input type="date" class="form-control" id="ReceivedDate" name="ReceivedDate" >
-                </div>
-                <div class="col-md-3">
-                    <label for="ReceivedAmount">收款金額</label>
-                    <input type="number" class="form-control" id="ReceivedAmount" name="ReceivedAmount" >
-                </div>
-                <div class="col-md-3">
-                    <label for="remark">備註</label>
-                    <input type="text" class="form-control" id="remark" name="remark" >
-                </div>
-            </div>
-
-
-            <input type="hidden" name="DeptId" value="<?= $BillData[17] ?>">
-            <input type="hidden" name="PersonId" value="<?= $BillData[18] ?>">
-            <input type="hidden" name="CustName" value="<?= $BillData[4] ?>">
-        </div>
-        <div class="form-group">
-            <div class="col-md-3">
-            </div>
-            <div class="col-md-9">
-                <button type="button" onclick="send()" class="btn btn-primary btn-lg pull-right">送出</button>
-            </div>
-        </div>
-    </form>
-</div>
-
-
-
-<script>
-    function backToIndex() {
-        var Bill = <?= $Bill ?>;
-        var form = document.createElement("form");
-        form.method = 'POST';
-        form.action = "account-receivable-check.php?<?= $token_link ?>";
-        var input = document.createElement("input");
-        input.type = "hidden";
-        input.name = "Bill";
-        input.value = JSON.stringify(Bill);
-        form.appendChild(input);
-        document.body.appendChild(form);
-        form.submit();
-    }
-
-    function send() {
-        event.preventDefault();
-        $("#BillNo").prop("disabled", false);
-        $("#DeptName").prop("disabled", false);
-        $("#ManagerName").prop("disabled", false);
-        $("#PersonName").prop("disabled", false);
-
-        $("#pay_received").submit();
-    }
+<?php
+include "./header.php";
+$Bill = $_POST['Bill'];
+$BillData = json_decode($Bill, true);
+?>
+<div style="width: 90%;">
+
+    <div style="padding-left: 2rem; padding-bottom: 1rem;">
+        <button type="button" onclick="backToIndex()" class="btn btn-outline-primary btn-lg"><span class="glyphicon glyphicon-menu-left"></span></button>
+    </div>
+</div>
+<div class="container">
+    <div class="text-center">
+        <h3><strong><?= $BillData[4] ?></strong></h3>
+        <h4>新增收款資訊</h4>
+    </div>
+    <form class="form-horizontal" id="pay_received" method="POST" action="account-receivable-received-submit.php?type=create&<?= $token_link ?>" enctype="multipart/form-data">
+        <div class="form-group" style="margin-left: 1%;margin-right: 1%;">
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="BillNo">合約號</label>
+                    <input type="text" class="form-control" id="BillNo" name="BillNo" value="<?= $BillData[0] ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="DeptName">部門</label>
+                    <input type="text" class="form-control" id="DeptName" name="DeptName" value="<?= $BillData[1] ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="ManagerName">經理</label>
+                    <input type="text" class="form-control" id="ManagerName" name="ManagerName" value="<?= $BillData[2] ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="PersonName">營業員</label>
+                    <input type="text" class="form-control" id="PersonName" name="PersonName" value="<?= $BillData[3] ?>" disabled>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="EnterpriseName">抬頭</label>
+                    <input type="text" class="form-control" id="EnterpriseName" name="EnterpriseName" value="<?= $BillData[14] ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="TaxNo">統一編號</label>
+                    <input type="text" class="form-control" id="TaxNo" name="TaxNo" value="<?= $BillData[15] ?>" disabled>
+                </div>
+                <div class="col-md-6">
+                    <label for="ContactAddress">聯絡地址</label>
+                    <input type="text" class="form-control" id="ContactAddress" name="ContactAddress" value="<?= $BillData[16] ?>" disabled>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="InvoiceDate">發票開立日期</label>
+                    <input type="date" class="form-control" id="InvoiceDate" name="InvoiceDate" >
+                </div>
+                <div class="col-md-3">
+                    <label for="InvoiceAmount">發票金額</label>
+                    <input type="number" class="form-control" id="InvoiceAmount" name="InvoiceAmount" >
+                </div>
+                <div class="col-md-3">
+                    <label for="InvoiceNo">發票號碼</label>
+                    <input type="text" class="form-control" id="InvoiceNo" name="InvoiceNo" >
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="ReceivedDate">收款日期</label>
+                    <input type="date" class="form-control" id="ReceivedDate" name="ReceivedDate" >
+                </div>
+                <div class="col-md-3">
+                    <label for="ReceivedAmount">收款金額</label>
+                    <input type="number" class="form-control" id="ReceivedAmount" name="ReceivedAmount" >
+                </div>
+                <div class="col-md-3">
+                    <label for="remark">備註</label>
+                    <input type="text" class="form-control" id="remark" name="remark" >
+                </div>
+            </div>
+
+
+            <input type="hidden" name="DeptId" value="<?= $BillData[17] ?>">
+            <input type="hidden" name="PersonId" value="<?= $BillData[18] ?>">
+            <input type="hidden" name="CustName" value="<?= $BillData[4] ?>">
+            <input type="hidden" name="Bill" id="Bill" value="">
+        </div>
+        <div class="form-group">
+            <div class="col-md-3">
+            </div>
+            <div class="col-md-9">
+                <button type="button" onclick="send()" class="btn btn-primary btn-lg pull-right">送出</button>
+            </div>
+        </div>
+    </form>
+</div>
+
+
+
+<script>
+    function backToIndex() {
+        var Bill = <?= $Bill ?>;
+        var form = document.createElement("form");
+        form.method = 'POST';
+        form.action = "account-receivable-check.php?<?= $token_link ?>";
+        var input = document.createElement("input");
+        input.type = "hidden";
+        input.name = "Bill";
+        input.value = JSON.stringify(Bill);
+        form.appendChild(input);
+        document.body.appendChild(form);
+        form.submit();
+    }
+
+    function send() {
+        event.preventDefault();
+        $("#BillNo").prop("disabled", false);
+        $("#DeptName").prop("disabled", false);
+        $("#ManagerName").prop("disabled", false);
+        $("#PersonName").prop("disabled", false);
+        var Bill = <?= $Bill ?>;
+        Bill = JSON.stringify(Bill);
+        $("#Bill").val(Bill);
+        $("#pay_received").submit();
+    }
 </script>
\ No newline at end of file
diff --git a/wms/account-receivable-received-edit.php b/wms/account-receivable-received-edit.php
index bfbb7ea2..1898a961 100644
--- a/wms/account-receivable-received-edit.php
+++ b/wms/account-receivable-received-edit.php
@@ -1,121 +1,142 @@
-<?php
-include "./header.php";
-$Bill = $_POST['Bill'];
-$BillData = json_decode($Bill, true);
-$pay_id = $_GET['pay_id'];
-// echo $pay_id."<br>";
-// print_r($BillData);
-$sql_pay = "SELECT * from account_received where pay_id = '$pay_id'";
-$pay = mysqli_query($link, $sql_pay);
-$pay = mysqli_fetch_assoc($pay);
-
-?>
-<div style="width: 90%;">
-
-    <div style="padding-left: 2rem; padding-bottom: 1rem;">
-        <button type="button" onclick="backToIndex()" class="btn btn-outline-primary btn-lg"><span class="glyphicon glyphicon-menu-left"></span></button>
-    </div>
-</div>
-<div class="container">
-    <div class="text-center">
-        <h3><strong><?= $BillData[4] ?></strong></h3>
-        <h4>編輯收款資訊</h4>
-    </div>
-    <form class="form-horizontal" id="pay_received" method="POST" action="account-receivable-received-submit.php?type=edit&<?= $token_link ?>" enctype="multipart/form-data">
-        <div class="form-group" style="margin-left: 1%;margin-right: 1%;">
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="BillNo">合約號</label>
-                    <input type="text" class="form-control" id="BillNo" name="BillNo" value="<?= $BillData[0] ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="DeptName">部門</label>
-                    <input type="text" class="form-control" id="DeptName" name="DeptName" value="<?= $BillData[1] ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="ManagerName">經理</label>
-                    <input type="text" class="form-control" id="ManagerName" name="ManagerName" value="<?= $BillData[2] ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="PersonName">營業員</label>
-                    <input type="text" class="form-control" id="PersonName" name="PersonName" value="<?= $BillData[3] ?>" disabled>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="EnterpriseName">抬頭</label>
-                    <input type="text" class="form-control" id="EnterpriseName" name="EnterpriseName" value="<?= $BillData[14] ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="TaxNo">統一編號</label>
-                    <input type="text" class="form-control" id="TaxNo" name="TaxNo" value="<?= $BillData[15] ?>" disabled>
-                </div>
-                <div class="col-md-6">
-                    <label for="ContactAddress">聯絡地址</label>
-                    <input type="text" class="form-control" id="ContactAddress" name="ContactAddress" value="<?= $BillData[16] ?>" disabled>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="InvoiceDate">發票開立日期</label>
-                    <input type="date" class="form-control" id="InvoiceDate" name="InvoiceDate" value="<?= $pay['invoice_date'] ?>">
-                </div>
-                <div class="col-md-3">
-                    <label for="InvoiceAmount">發票金額</label>
-                    <input type="number" class="form-control" id="InvoiceAmount" name="InvoiceAmount" value="<?= $pay['invoice_amount'] ?>">
-                </div>
-                <div class="col-md-3">
-                    <label for="InvoiceNo">發票號碼</label>
-                    <input type="text" class="form-control" id="InvoiceNo" name="InvoiceNo" value="<?= $pay['invoice_no'] ?>">
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="ReceivedDate">收款日期</label>
-                    <input type="date" class="form-control" id="ReceivedDate" name="ReceivedDate" value="<?= $pay['received_date'] ?>">
-                </div>
-                <div class="col-md-3">
-                    <label for="ReceivedAmount">收款金額</label>
-                    <input type="number" class="form-control" id="ReceivedAmount" name="ReceivedAmount" value="<?= $pay['received_amount'] ?>">
-                </div>
-                <div class="col-md-3">
-                    <label for="remark">備註</label>
-                    <input type="text" class="form-control" id="remark" name="remark" value="<?= $pay['remark'] ?>">
-                </div>
-            </div>
-
-
-            <input type="hidden" name="pay_id" value="<?= $pay['pay_id'] ?>">
-        </div>
-        <div class="form-group">
-            <div class="col-md-3">
-            </div>
-            <div class="col-md-9">
-                <button type="button" onclick="send()" class="btn btn-primary btn-lg pull-right">送出</button>
-            </div>
-        </div>
-    </form>
-</div>
-
-
-
-<script>
-    function backToIndex() {
-        var Bill = <?= $Bill ?>;
-        var form = document.createElement("form");
-        form.method = 'POST';
-        form.action = "account-receivable-check.php?<?= $token_link ?>";
-        var input = document.createElement("input");
-        input.type = "hidden";
-        input.name = "Bill";
-        input.value = JSON.stringify(Bill);
-        form.appendChild(input);
-        document.body.appendChild(form);
-        form.submit();
-    }
-
-    function send() {
-        event.preventDefault();
-        $("#pay_received").submit();
-    }
+<?php
+include "./header.php";
+$Bill = $_POST['Bill'];
+$BillData = json_decode($Bill, true);
+$pay_id = $_GET['pay_id'];
+// echo $pay_id."<br>";
+// print_r($BillData);
+$sql_pay = "SELECT * from account_received where pay_id = '$pay_id'";
+$pay = mysqli_query($link, $sql_pay);
+$pay = mysqli_fetch_assoc($pay);
+
+?>
+<div style="width: 90%;">
+
+    <div style="padding-left: 2rem; padding-bottom: 1rem;">
+        <button type="button" onclick="backToIndex()" class="btn btn-outline-primary btn-lg"><span class="glyphicon glyphicon-menu-left"></span></button>
+    </div>
+</div>
+
+
+<div class="container">
+    <div class="text-center">
+        <h3><strong><?= $BillData[4] ?></strong></h3>
+        <h4>編輯收款資訊</h4>
+    </div>
+    <form class="form-horizontal" id="pay_received" method="POST" action="account-receivable-received-submit.php?type=edit&<?= $token_link ?>" enctype="multipart/form-data">
+        <div class="form-group" style="margin-left: 1%;margin-right: 1%;">
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="BillNo">合約號</label>
+                    <input type="text" class="form-control" id="BillNo" name="BillNo" value="<?= $BillData[0] ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="DeptName">部門</label>
+                    <input type="text" class="form-control" id="DeptName" name="DeptName" value="<?= $BillData[1] ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="ManagerName">經理</label>
+                    <input type="text" class="form-control" id="ManagerName" name="ManagerName" value="<?= $BillData[2] ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="PersonName">營業員</label>
+                    <input type="text" class="form-control" id="PersonName" name="PersonName" value="<?= $BillData[3] ?>" disabled>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="EnterpriseName">抬頭</label>
+                    <input type="text" class="form-control" id="EnterpriseName" name="EnterpriseName" value="<?= $BillData[14] ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="TaxNo">統一編號</label>
+                    <input type="text" class="form-control" id="TaxNo" name="TaxNo" value="<?= $BillData[15] ?>" disabled>
+                </div>
+                <div class="col-md-6">
+                    <label for="ContactAddress">聯絡地址</label>
+                    <input type="text" class="form-control" id="ContactAddress" name="ContactAddress" value="<?= $BillData[16] ?>" disabled>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="InvoiceDate">發票開立日期</label>
+                    <input type="date" class="form-control" id="InvoiceDate" name="InvoiceDate" value="<?= $pay['invoice_date'] ?>">
+                </div>
+                <div class="col-md-3">
+                    <label for="InvoiceAmount">發票金額</label>
+                    <input type="number" class="form-control" id="InvoiceAmount" name="InvoiceAmount" value="<?= $pay['invoice_amount'] ?>">
+                </div>
+                <div class="col-md-3">
+                    <label for="InvoiceNo">發票號碼</label>
+                    <input type="text" class="form-control" id="InvoiceNo" name="InvoiceNo" value="<?= $pay['invoice_no'] ?>">
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="ReceivedDate">收款日期</label>
+                    <input type="date" class="form-control" id="ReceivedDate" name="ReceivedDate" value="<?= $pay['received_date'] ?>">
+                </div>
+                <div class="col-md-3">
+                    <label for="ReceivedAmount">收款金額</label>
+                    <input type="number" class="form-control" id="ReceivedAmount" name="ReceivedAmount" value="<?= $pay['received_amount'] ?>">
+                </div>
+                <div class="col-md-3">
+                    <label for="remark">備註</label>
+                    <input type="text" class="form-control" id="remark" name="remark" value="<?= $pay['remark'] ?>">
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="status" style="color: red;">狀態</label>
+                    <select id="status" name="status">
+                        <option value=0 <?php if($pay['status'] == 0) echo "selected" ?>>進行中</option>
+                        <option value=1 <?php if($pay['status'] == 1) echo "selected" ?>>催收</option>
+                        <option value=2 <?php if($pay['status'] == 2) echo "selected" ?>>法務件 (發函)</option>
+                        <option value=3 <?php if($pay['status'] == 3) echo "selected" ?>>法務件 (訴訟)</option>
+                        <option value=4 <?php if($pay['status'] == 4) echo "selected" ?>>折讓</option>
+                        <option value=5 <?php if($pay['status'] == 5) echo "selected" ?>>壞帳</option>
+                        <option value=99 <?php if($pay['status'] == 99) echo "selected" ?>>完成</option>
+                    </select>
+                </div>
+            </div>
+
+
+            <input type="hidden" name="pay_id" value="<?= $pay['pay_id'] ?>">
+            <input type="hidden" name="Bill" id="Bill" value="">
+        </div>
+        <div class="form-group">
+            <div class="col-md-3">
+            </div>
+            <div class="col-md-9">
+                <button type="button" onclick="send()" class="btn btn-primary btn-lg pull-right">送出</button>
+            </div>
+        </div>
+    </form>
+</div>
+
+
+
+
+<script>
+    function backToIndex() {
+        var Bill = <?= $Bill ?>;
+        var form = document.createElement("form");
+        form.method = 'POST';
+        form.action = "account-receivable-check.php?<?= $token_link ?>";
+        var input = document.createElement("input");
+        input.type = "hidden";
+        input.name = "Bill";
+        input.value = JSON.stringify(Bill);
+        form.appendChild(input);
+        document.body.appendChild(form);
+        form.submit();
+    }
+
+    function send() {
+        event.preventDefault();
+        var Bill = <?= $Bill ?>;
+        Bill = JSON.stringify(Bill);
+        $("#Bill").val(Bill);
+        $("#pay_received").submit();
+    }
 </script>
\ No newline at end of file
diff --git a/wms/account-receivable-received-submit.php b/wms/account-receivable-received-submit.php
index 4685bc05..8f04f0c1 100644
--- a/wms/account-receivable-received-submit.php
+++ b/wms/account-receivable-received-submit.php
@@ -1,84 +1,96 @@
-<?php
-include "./header.php";
-$type = $_GET['type'];
-$InvoiceNo = empty($_POST['InvoiceNo']) ? NULL : str_replace('-', '', trim($_POST['InvoiceNo']));
-$InvoiceDate = empty($_POST['InvoiceDate']) ? NULL: $_POST['InvoiceDate'];
-
-$invoice_amount = empty($_POST['InvoiceAmount']) ? 0 : $_POST['InvoiceAmount'];
-$received_amount = empty($_POST['ReceivedAmount']) ? 0 : $_POST['ReceivedAmount'];
-$received_date = empty($_POST['ReceivedDate']) ? NULL : $_POST['ReceivedDate'];
-$remark = empty($_POST['remark']) ? '' : $_POST['remark'];
-
-if ($type == 'edit') {
-    $pay_id = $_POST['pay_id'];
-    $sql_query_pay = "SELECT * from account_received where pay_id = $pay_id";
-    $pay = mysqli_query($link, $sql_query_pay);
-    $pay = mysqli_fetch_assoc($pay);
-
-    $sql1 = "UPDATE account_received SET ";
-    if ($InvoiceNo !== $pay['invoice_no']) {
-        $sql1.="invoice_no = '$InvoiceNo',";
-    }
-    if($InvoiceDate !== $pay['invoice_date']){
-        $sql1.="invoice_date = '$InvoiceDate',";
-    }
-    if($invoice_amount != $pay['invoice_amount']){
-        $sql1.="invoice_amount = $invoice_amount,";
-    }
-    if($received_amount != $pay['received_amount']){
-        $sql1.="received_amount = $received_amount,";
-    }
-    if($received_date !== $pay['received_date']){
-        $sql1.="received_date = '$received_date',";
-    }
-    if($remark !== $pay['remark']){
-        $sql1.="remark = '$remark',";
-    }
-    $sql1=substr($sql1,0,-1);
-    $sql = $sql1 . " WHERE pay_id = $pay_id";
-    echo $sql;
-    exit();
-} else {
-    $BillNo = $_POST['BillNo'];
-    $dept_id = $_POST['DeptId'];
-    $dept_name = $_POST['DeptName'];
-    $manager_name = $_POST['ManagerName'];
-    $person_id = $_POST['PersonId'];
-    $person_name = $_POST['PersonName'];
-    $cust_name = $_POST['CustName'];
-    $sql1 = "INSERT INTO account_received (
-        BillNo,dept_id,dept_name,manager_name,person_id,person_name,cust_name";
-    $sql2 = ",CreatorId) VALUES ('$BillNo','$dept_id','$dept_name','$manager_name','$person_id','$person_name','$cust_name'";
-    if (!empty($InvoiceNo)) {
-        $sql1 .= ",invoice_no";
-        $sql2 .= ",'$InvoiceNo'";
-    }
-    if (isset($InvoiceDate)) {
-        $sql1 .= ",invoice_date";
-        $sql2 .= ",'$InvoiceDate'";
-    }
-    if (!empty($invoice_amount)) {
-        $sql1 .= ",invoice_amount";
-        $sql2 .= ",$invoice_amount";
-    }
-    if (!empty($received_amount)) {
-        $sql1 .= ",received_amount";
-        $sql2 .= ",$received_amount";
-    }
-    if (isset($received_date)) {
-        $sql1 .= ",received_date";
-        $sql2 .= ",'$received_date'";
-    }
-    if (!empty($remark)) {
-        $sql1 .= ",remark";
-        $sql2 .= ",'$remark'";
-    }
-    $sql = $sql1 . $sql2 . ",'$user_id')";
-}
-mysqli_query($link, $sql);
-if (mysqli_affected_rows($link)) {
-    echo '<script>alert("新增/更新 成功")</script>';
-    echo $sql;
-} else {
-    echo '<script>alert("新增/更新 失敗")</script>';
-}
+<?php
+include "./header.php";
+$type = $_GET['type'];
+$InvoiceNo = empty($_POST['InvoiceNo']) ? '' : str_replace('-', '', trim($_POST['InvoiceNo']));
+$InvoiceDate = isset($_POST['InvoiceDate']) ? $_POST['InvoiceDate'] : '';
+$Bill = $_POST['Bill'];
+
+$invoice_amount = empty($_POST['InvoiceAmount']) ? 0 : $_POST['InvoiceAmount'];
+$received_amount = empty($_POST['ReceivedAmount']) ? 0 : $_POST['ReceivedAmount'];
+$received_date = isset($_POST['ReceivedDate']) ? $_POST['ReceivedDate'] : '';
+$remark = isset($_POST['remark']) ? $_POST['remark'] : '';
+
+if ($type == 'edit') {
+    $pay_id = $_POST['pay_id'];
+    $status = $_POST['status'];
+    $sql_query_pay = "SELECT * from account_received where pay_id = $pay_id";
+    $pay = mysqli_query($link, $sql_query_pay);
+    $pay = mysqli_fetch_assoc($pay);
+
+    $sql1 = "UPDATE account_received SET ";
+    if ($InvoiceNo !== $pay['invoice_no']) {
+        $sql1 .= "invoice_no = '$InvoiceNo',";
+    }
+    if ($InvoiceDate != $pay['invoice_date']) {
+
+        $sql1 .= "invoice_date = '$InvoiceDate',";
+    }
+    if ($invoice_amount != $pay['invoice_amount']) {
+        $sql1 .= "invoice_amount = $invoice_amount,";
+    }
+    if ($received_amount != $pay['received_amount']) {
+        $sql1 .= "received_amount = $received_amount,";
+    }
+    if ($received_date != $pay['received_date']) {
+        $sql1 .= "received_date = '$received_date',";
+    }
+    if ($remark != $pay['remark']) {
+        $sql1 .= "remark = '$remark',";
+    }
+    if ($status != $pay['status']) {
+        $sql1 .= "status = $status,";
+    }
+    // $sql1 = substr($sql1, 0, -1);
+    $sql = $sql1 . "LastOperatorId = '$user_id' WHERE pay_id = $pay_id";
+} else {
+    $BillNo = $_POST['BillNo'];
+    $dept_id = $_POST['DeptId'];
+    $dept_name = $_POST['DeptName'];
+    $manager_name = $_POST['ManagerName'];
+    $person_id = $_POST['PersonId'];
+    $person_name = $_POST['PersonName'];
+    $cust_name = $_POST['CustName'];
+    $sql1 = "INSERT INTO account_received (
+        BillNo,dept_id,dept_name,manager_name,person_id,person_name,cust_name";
+    $sql2 = ",CreatorId) VALUES ('$BillNo','$dept_id','$dept_name','$manager_name','$person_id','$person_name','$cust_name'";
+    if (isset($InvoiceNo)) {
+        $sql1 .= ",invoice_no";
+        $sql2 .= ",'$InvoiceNo'";
+    }
+    if ((!empty($InvoiceDate))) {
+        $sql1 .= ",invoice_date";
+        $sql2 .= ",'$InvoiceDate'";
+    }
+    if (isset($invoice_amount)) {
+        $sql1 .= ",invoice_amount";
+        $sql2 .= ",$invoice_amount";
+    }
+    if (isset($received_amount)) {
+        $sql1 .= ",received_amount";
+        $sql2 .= ",$received_amount";
+    }
+    if (!(empty($received_date))) {
+        $sql1 .= ",received_date";
+        $sql2 .= ",'$received_date'";
+    }
+    if (!(empty($remark))) {
+        $sql1 .= ",remark";
+        $sql2 .= ",'$remark'";
+    }
+    $sql = $sql1 . $sql2 . ",'$user_id')";
+}
+mysqli_query($link, $sql);
+?>
+<script>
+    var Bill = <?= $Bill ?>;
+    var form = document.createElement("form");
+    form.method = 'POST';
+    form.action = "account-receivable-check.php?<?= $token_link ?>";
+    var input = document.createElement("input");
+    input.type = "hidden";
+    input.name = "Bill";
+    input.value = JSON.stringify(Bill);
+    form.appendChild(input);
+    document.body.appendChild(form);
+    form.submit();
+</script>
\ No newline at end of file
diff --git a/wms/account-receivable.xlsx b/wms/account-receivable.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..8edcb4bd69991dee789a4bd343a32076ab147675
GIT binary patch
literal 55801
zcmY&;V{~Rg(``7J*vZ72m=oK!ZJSSQ+qP}n6Wg}!<caUR_q*R(_x;gbr+b}se(YVR
zs=I2-OMye6fq;Pg1PSnqQWHxMZqNh;0l9?$0YUw@t0iP-3ox+-=qbC~n>gvvx!G7(
zCr!u>G9Zb(c!?a+N@g|i|75ue7(k&?;MK1qk5(CJv3_}akxocSUF1);H59q)Hgn`T
zxC5wN7zgrFSi!K4JEr6zt5P-6tZwX6b{k2A>Hjvjs?+y`v*v8arhi5d5;R1GQ5`zH
z=0GeMz!o&c!+ulL)DtRF>pevH3zITxcmI(BYek%qHar|CGfe;YMbeNFiXb<i3~t8)
ze+<6!go1=Gg&QysqQhV>OAQ(ibAm(StDvNnBAM4@sFV2H%BBVf(+B0(zOK=)D41!I
zQF)?aO|$H?c<w=zWlpkKF2@_jm$E_kE}=9m$_<`;#hTdJZ=q7>On-qmpJM~5>P6JI
z<+r8I=1QrN?J5oU@kcz)@RRM1K4_LU5bK0Q3MH|W)515-XWf=M{FzXK%shqfL^tuy
zXtG-uEM9d!qwmLWt3|3?3cbS8<2K-5?-$<X{tZ~Gdr<lRq5`vpjs5H&1yW!jAh7?e
zo}-Di6FuF3=IVqg%RvS>zZ*}OLeIjc;6I|-y5o7Rj15q;)<>bgQ|h~Ez2DtK>mfVl
z2V+u-<#K~u-rcd6xI$MW7wYIF<u9XFx0|tb&r6rU%hE<Qu!rhHn8a4qTszJ1DUUK%
zpLi?a92A676MTiEN)EyeiE?zlEPhKT-7__vj=?Q5+K%7j58C}uhArXLgx@o7%{y;A
z(OR8n?%oSbYYo@wm<4l}y`<SlMr`LT;zca9grOyeSDmB`B}sS@5e3&}UEj2Qd}(5L
zAeIWB72mz!)x%l|TK;Y?Fd2@W;@%Gp+EXzGy7UjhE9d?<B0<0FRsVxX`#(gm|5-O{
z`u_pN)y~n%(9X{4KkoVe0P6n-5R&lCCrtf|ri-Q|WxNxmzqZy3cu-S|w6%meo6YBo
z3XVAL&wQxdzg4U0BjOiRFYIA*(u+{Fc~p`}r!sZjH)vkW8}DXFf7i8mAYx(2ey=XN
zUa;XZpWr!q|Bjd8rnH~D6Om*@5R(xJJAIJBnJ?p*SR5;x(siX!GkN{JunB$+D_7qL
zGe50Lm_fPk+a<K|{6jC0BkJ^3GU#_s$Rs^>Hm5P9n2s?)+{%HP)Uea`kkeZ(H$tTr
z9Ac#EE<o^onv(CfEBqCRF?o={pht8yMs$yL$owWUHBye{es^$A@ZSLWYx$vg{rh{#
zz(GKe{sClcXC&`vXYWLBU~m5)Y_b*mZ8sR;x^JlAws1K58Q}b@48_?V>kL5?TFhii
zjPe_PhgHR2UXXKzT~zVNl#YyqmXb%DKd-hIj0m#=C225=DP}X}wS3F|9(;{VsVN`@
z*7ifjCbJWTYkf-CD21i15~Hv6E0Jm*x1}UVN8-&Aw|ZYQ6FK*_OG9C03}bh}9ybfk
zII5)R{l>@gj((EKf*V?M*n0TRSnh{=J+<(SSd*)?`@?DF_dxO#$U-S^-UjqxK26GE
zQ(;}tcb7?#>ri&ot;hxq&9tt<u@92$K|aSfNL$0OCa(6-eKBV*3b@SWZce7~0pCL^
zMdA4kn=_>0LMM7j>@Yt=)GZ%5T68EJV_%bP^sYfKCh%iLkOOiI$hp7WAoR9mO>_qp
zp8D|D=*OMHuq!fs>ZegJv<^hB83p+x2tES4Ir-zl8>UCpyFFA?Dv@5I<%-|{=l8@T
zG;02})B53$&k{)AzPAGRonNZ^XI;-8?V3riQJMC8NnRWFpP2v6l#GWwx8pyikpD4-
z{Qom$Want|AF7HI6r=_j(1Le9(Mf9?NVk-Wn()}y5(9RH^^6=_hngkCud6;^O3s!!
zPBP^wN>3gqx<d~eYda))``t|d0`q@Jpv?`6<}U)eXfO-465I|o@5jw4#9?zL$0M~@
zrGG)mO{?3N^^t=Xd6QWSu!gY~E=IyHZpI1;LOGdePyG>ZElG)_)dSCFa1pZNr{i#3
z2NiQ6OyE(B0JU(fi2$LbP?irAm0NI-jMacpd*|~Fn~pWEu4}$Ed(=lbqpuCoUtm5k
z#V$1XO6uX^<sMNHlXO*qCN!ZFA;Yz2uJM}Fvcb-t^vqr$&|NVa;^7S$R)aaz@x<qg
zJ$z^Jgd6=GmHIS+o3(QG;nPld6eLqp2tdg(@kp$%jMC9-*odmPjY1ub*SwK?BY5Ty
z*U1}z8L+&gO*F%qPVxcwtB={f4nXO$A2)1^F=>+Jg}8FPAt0<{gF@z97u@(o?u~`R
zRdHPs^0_?R-2Eh#y}5sn^WOwH#d~UWLV|#l;QUV_{1<Bg<|Z~K|1<yj4@FlRa&{Z6
zXuUT|NFA*W)|AcxoFbR2S1Bd%D6K-VO~O)DlnR7rMLqCW4t;(GTXhqDTQ0v^(9QjI
zI^+_o2bV!VVLacAG9${FEtsr@E&^#2dS7yH?i6}Ft^_7$iI5ZSi;Or@aWII(XTURp
z@Ghq9?aOV5%I#6~hf(M2O@%dASozu_*p!701N^w-aoUVTB#UucXuZ>h?-}JJz^shu
z46F1h1i6raKUaq*ZCSCcT%s%t^C3q1o}S&Ly#qq9q^z8#yJmK&6&N#b)7fvG!Z}4^
z;K^j4Nz58XAUOY48Tn`V5x|dun-GN*2L#6~jq;^*yD#Y?{ZSFBoP)oYlTbr}NHmot
zAD9c6#cI1yYr*`;g#1>~?%lb0%7*O4_46j6aaOIn&btDfaI?tYwT*YK++y3J*WTGx
z@2+%i)wJsNx2CwcLhjgBwQEhmZ0qcIt9*89b#H4z-q7AzQ3LyvpIBNWW(1H6$BZGf
zhn$epA&n>3;7PjRZ=b!uX%t#oI$_>~m#&(B?VK2b_;I(X&q0)HNDi+;X(Nu12sn^|
z*dbL_qbc=hr;i&Goxx^Q#5^fP5Rs(Bsm=JhJ$+DmJbjGa4VsN0`ttfbo&xveehlES
zLpu+o?s$K#u;u3Q<@&te-=&&%E#CEh0?%rDy$pU(;Q{w6$$R-c@AofezJOo#pgp9w
z;-QEZ(!V=IVrF?``&k1)7*S3Ne~G54QrJU?gV)s-z}zmwF`?E-RZMqM=Ygd8t(3k{
zci;;fR+NFZp$?(%(w$UI1kYt<OQ+aQGeb`e3@MLX8F`r}Y;hs4e=!GVOUuxBBA1u7
zj}Wf2|Atne&^kaBgfo7js0KQxz6D6}s-EJD=txJ?Va>-gqHg8=`D<dTh$N_UH+8ME
zcr^LfClgmSJ`O1@T^&W$;lP<&g`L$h%BY0I&JaC4i8~Ftci+C8aGuBj_X(W1IQ+OJ
zO=WSbUp_p_V8^7fEdnh<R(dou%?Yo4ioE;hNV$SphA`)|5Qjf)#2mhwD5)EZP{W_U
zpybVaJyPMEdYU`=2FBZjYvamkiUGHlywj_{5{s&Ck|psL4x1XLC>F0?Ogs^G0)!@$
zxXB}(@veQ<3tI1(*GS^fZ>S&NVLs_pPdl`GfE`^lLoM4@C)WGx!=BPuT=Gn!w&Pu4
zQVjIJ`iyx;!!f*lu=|ZDYXV>)r*q?X&y6Yy0)Lhg4v&!rH5lVbCOJa4!d9lZ`iK<k
zJMo@O-6Z=BTc$z{0i=5E=vEI4<<A2&u>u=mtaRMD3}ivM3z<ilq#k6GO|7<rx&+ug
z(|4;_VCU)-7)S(;Ujq8MX)y7LvG)9u{y0X3uvas6RDXKZTFftN*^yt-2+R+)v+Q@l
zhAA46N<Le1HWYCRisdD*JklH<G#N$bp9GAsL;5gMtE2@>jNGeOj9VqX7WE(7oH1L%
z*Mx}&D{rWaLaOvI`{E_iJlT2J9*0K$>64G1E)l7``iRtAB^Qz!HrlVuNI$C6K2Q?*
zD}aWZkDM9d4d>B0bPZD$R9L`4@N-nYb<=HWlD={G&?=Xai$RJ+d%36u;~gxAj~*~8
zmf_(NeQjqhc>yMKx2>bpkPQoOOFdevJNx5jR0Gd?eVaUTC{>c^BEe5{Tt|&O%z&m*
zWkDLx(CjlwgjDCsT?Mpu2E}(~;Q+y6rFcSPxn!4~ko1McnH7%0hH09`WQ#j4;?N-Y
z#!H=v%T{^jTC!pi$IY?4wUSHh;J|PDlY?adZ)q!(l)$yS2eKOV+qy#CmkU+aLzztm
zt*wU{uccC3N!}$a3>!MH)^n>+58|9yWDH8bXxAd$g54huu<VTt2dqlpmT1k8JRQ`V
zNNZjevsTM2?~XP$*A}zeX4j6&t0lDN=16H?%~z(#*z3Scn>GTO^n@YLQYd@MtEul0
z5Z>nmz=Pd?$9hJyV+|WQ5D?2AP>}yzh5p5QCvyWw6JsTSqlK-R(|>|}b+?AyZz&ft
zAaCz}0X{a`?B&J#yiNza#g718h{Zv;MgDwznE5MJ&<ZUUXQ}9PHpVe=M)4o5hZ#}3
zJtkx?`eZM=v6LC~a-W#%G3lY9@ut@flR|>!NXhQ=TQ*!SDK}mxsoziE@1MOsFMPfq
z3p2g%gL1x~un&A#y};{{+^;jl?~l&huMxfP{qNV_Z(DZYkSpK!Yb)R9gWdNNBHt%)
zr5E_^`|*nT{S^9rkjnS{adLCY_jz{G`!&@2@jB!CF|*_Q{lND*5!?HHHS>Lj==*U;
z{>JwGiRk<GY4<Jtee&<~FMQv3a(rLUxxQbi1il{+H{Va56AWE9zTX==pO29@Ust6&
zpS|DD2j8!uzVBx<k4FOfAN!$tUmu+WKCdSPqaVgzJULZ%pZD*4-?tMtdx)=kMMfiM
z<D(mV(Y@YbCp%KUob~8<SqX?-cHaS6SE7kKqh2JuJxO14D-)?3@xWvCyL;nD?ynA^
z49p@@Z$W0~1lwFmxlXr&gD_c6yYKxYA2QB0g%1%&XIvR?QZ}eZmWW<5vnS));y2e^
zgv3zFqh9q$-Ww`DgWg>|Z2+1twp~`d2T4YmnAA>@7!S+A(ahbWxN@e?yX$wV2~Ljz
zM9O2vFqK8rtcYZ(?P-IgFVBwbwoZJbibaW*jAKW#thg^Sz3q?`=HVVMZ!KasHw}4W
z;@sLwZ$is#YBRtnYqQ7G{a3Us;u%}f73*jAW)|0ANx8b~UH{oQpzG@w%f;CncX@VP
z`v%**J>A#CKPs;H<_-kezGnEo&V0Xskp!2%K(US+p@+_VfG00U&hJFbxhwZ34}Q*O
zw-?^mO<?6s&pZ82|F=m2hG3I<jgG~%%kVzE>yXnYkR`o35&D(cYmLk)5#U$^rMpR%
z3GcQ$`i!*3M?8giw-1>u)lmT;E|w@I;LnHz%#Z1CW%C3ELpj8;fQL@E6X5x}wP&Wd
zgae5^sP+%eV4S{R0D@b)okSCLmj(+3-^it^Y3^jdp3!MCTx-9XX%iN-6yFmrt9r5v
z8)9GJo@J)%3=lGX#zs6%^#q<qGEE7uBG%teO_|<-#x}&*8!;!?LnoBpAN+LmXY-<J
zSC3n0cm)=301KO*CeyWtO4^DG&aGy~P<XAy?9Y%3&UsCn8c{2P(d&{TO+LFs#KNL>
zbe7mLX&Va7bPyJr+FeBBYJ6ATe!AYAJVgfZ7%8*90;buM^2f?Elj3?(+}?%&1|5q+
zvYq9^k*%h7;_7Rl1!sG@E+3o%q@bzl*p`hKdnvY8lOrf`o?7YHHfol&Mk+@1Y402|
zr05VbB!GN%J}kwhU|EEdWb5n9gR5IFnpJBEbI^vTL)|Z0+m|dGhcjVz5b;PYWbgeM
zL@2(=wZlQg^63zm#A`?KIxkV9d1p*sQ(Jn|OBiF+&??P_Qx%FlU<-%V8Q=TQ<rCKx
zKF)Y`UgL15<IC$K##x&@Pv!?MX8kINgn9y766#A65YOP#wI}D)`e*?i!qb*TE|P2&
z=)ZtN@1E-1Qf(k`*|Dw0cx=tc1ltM={x#e3fSm}gMykvp?P-x}sb2zD5Gk-d>#FL+
z`v(>4gtAA~7V8bjuFKLTbZ4!Y>lkBqCS7$BHR};h;yG&N8A&-Dn&eUsTT%~ISUbzF
zVPo&89fb?gFN-{G?iq#DG;+T`bD9@`F7(%nr)mmHB%D2-?Y&S3ba|B$CyUC~zIVy!
z$4|ZeH4X|bc&JYm^!_JO4?qUdZMKATSBVp<bZa<LSm%2HKfWzeBB~z!kQyE*$Kpx;
zyP~tA&uDHapP>KQ(<IX15{F=pamcLqy<;az_0%(t-Wk;EK>G3<p`N0+J!}dGozmlT
zTk%T>KmcDl{tSZ!ugG_<htLe_sD$6{4v1JmodE8^HRTs?V6oYhw`VQDlZo%aDmZ9g
zboFxIgiFgK=0vdbHKZqcd{D@#k@Y$;DhO~(nap0mD`CLa=RC{y>`m(0@aJ-M<h9g0
z)S9Pa$ORU*>*jsm9_3$#P;j-z%w@uMR$h@`_ory{xH;M5HMT}p`81>qJK02^aAMCm
zv*cV@aIdVm+2#@9820R4sRE%U7~zC^JZ5^kxtn`qMR!W|<ba~DIaN^$c%`j~Q`VRj
zlVo>$ftP|zm)A5Tr)=-0t6Lf&J9eT|n@H5jDl=tXYY$k(Cv-i!6Q++x21ym1v!PGX
zK)1~4WQk;U=RP#HaPG0k+<6IEa?_%<XXVzW+kFAk%ns}w`1s690Dv-fP(*5Hx7SsR
z9&tx^hKMB{P~<HnwZ53p(o|$aYau4JJ|t1;nsQjxKVHLUszsHaB~5qY5Sp}|m5t-@
z{b&on<c_|>G>gD!9qeDo8~8ZC80XAl3>j?$;ce_4eewf)2L5h_1wN|EV?=x|V};AK
zK!&CBb(xh?i(juRW%3^JMX1YK-+VN~Tw}on0=z|DmB(F?AC#u_S%}sBQMq`6&G-g-
z0Dp>hp{{OSOL4s<pV#Si;s>Ww2_*!&ph+D)YExYRtLp3-by=2&Qj6rN^<@n7vG_qr
zg$6E$w9CsKI{C&v2}W|HPSXyfhMo}XY#jVuLrOl8m7(zxEESf>8Ozp&=T;-&L$*85
z7@<CoDpSnsgCBOilQzm=Le17ds*4IKV5^u}&_gZ>Iz(JxfxoAt6y^<D(_61v*KABU
z|C&Z8vh3>v@5!v(8-?DV05ozXX%MirMAlq*Y8zb3n!b*rTwJMZ6~_L}WiDCdY<eQ5
zBecGfAgZ~3E)r+=`B`Xu-Q~Gjv%Ju0mg1sL&*gYeJS!yr?SD{jpLf1Ems$i1%Z<-I
zDyh!nYzBuTdk1gy1kfQ6nCOGa@P=G!q|1c0UQW-yHKEP^rjm0RLtE9%oLgRxYFRdI
zs?YqBxa{z5Ej4o0NQ>7x(*oG!-I)L1jq2v6rses0O(`iWTH1e$=H>ZiO(`uaTAP21
zIjh%LLLNU@J8VWxe&s0(t3Msz)*9#h^63LjkWVRv^ozXlCa~Bwa<h{Sw9zN)|J<87
z=fW_jGRto5+KXkUoy4FryLBE5(~$+TeO-EX1m=f&KN98XFLi;&+B^>*Ql&s_qdW8K
zvMYjORM^A&`y&_ZqZ)K5)@0rWU_(C*U;kpu;&aXCx*lVI!5|eXbA5p7j#_1@?l9Nv
z8hh=FGIX}<P*J2JxVz|nC{A#Gvb1X0uT|0T0|O3q0n7)Nqsdo;v&lIbsVm*8deiQh
zu)11Grz%{7=80jm2+5g41{FtERQj6~M7p?#n(jv-yQr7SxP#hLdrV>ZA6u%I-0YgF
zL4_tF|7+Z+10)a)MMnK3IG^qeN;}&SUqHsG?;8{Z81<65FmxH^uUD7;2zslH{Cwic
zzB=$6y(-iWkzekE)f+t(aC~j2|6LM#>D|sl>e&fE-yQkF>VDrHIU?Qkj!E9*SD`Ps
zuzyWo90qDe-r{ptjXB2mgjj-=EmZO&CN##*y;Gmji_U;rg=}zjkA)+Y6l`G^Nno;;
zn`B*H^~G*s=dp3CP3SY#*(Q6G&1c7Zbwsk2j4lL!U~W9Z>~ZO*8C@1+j|txD#AHaX
z<bqT?ImupeIXWF+QfPhw%`G`B<doamzmdTr18fZ2yXHY1TGdTohtkCyXh~*SN~8Iy
z#c<4z%)zU1Z5aG4TWH1zeVXwKmQ9*i2Qcl@3Ng_=g_0`N+2d)OmR71}Ag&~zdyht+
zzfVz&^H<1#CGu;S@EAJWl}a+8sWVp`?WcZYa=uy93p=_$>s(dP7cR`yvXeF;P~%v}
zB^=&iD#%4*Ag0+8p2=zlfjQr?=I%U}G36M&J5Sa>^6;f=e_qY0dz{h0DdO+y&lEU5
z!r(qrlR7xy>FAbjlxoh&FU++s%ZQCoG2`Ja8F6w}i~s=2v1g}$p=HF#Wz9K9+4DUV
zOn{f4pzf{w(_{(h6NeRT6ofXd99cQKn||``9IZU7z4_-}y*{QUI1e`h4+iJljB_CL
z*aads(i);<5tVjE1!-?B(r8N3@!_hVt&P!pV`;xT0&ZHFr0lM|KaOOJ4?BM7Ix;8N
zHn%@X`JPBlvsrgYT-N<`qw6vDv)T7JRdM8bq-w|aNY+N|maGZYD3(SGtuQP2rR+@>
z!K+jg`k%p}bUsCHL28L3Ot8|??3$RU|7SBx2~k4hah8@V67fX*Dh;M1!lPJirb^!t
zzyjC$d(&V-6v~N4&+)N8NxQ=>(49bXWn=CP|7>*0MD+A6pTx6b?60?J=pSX?#p9*n
zwj1cZJFGH>=2H&9+MlMe12^OX?N<>Xs`*<59QeREjImkK1zKsg=p$g=DO&7!^o#t1
zTmiM@O~rzm!L`}Q@>%p^XLMD2k4NGhUUyeY&98!gHL608Y)>IMu=P7lCzhiR>jrF{
zk>a}9S15XA!lLfFrj`(-7)Gq?4Kt9!ZlOx?aw?R_Dkj?0qc_7M=JXMxVzZXZc%Qc-
zb{1Az6<<dzWa2(JP-rv;;WD$awq=aQIk}vqr)K^1bM`8DoK|~^5vLQbCa?qNJf@zW
zyfbrGb4<+zA1j7VY;=mOv;1QBl8Zsqeg#*9D~U>^wiQwawignegU1p+O0S!Hrgu&d
zT}BMY$-RP4W_|@}f|}AJLbLI1Rg<%s>?}C+k7EbA^K&ub<(ra6wtsd=V))D*iZIMV
zeX03@X1C=nbk}*f&*&bm@>BhK>Eutf47EqMmK><HY=4cVq9*jEgej==mr8IL9!SYv
z_g-+0ze8A#E7P<RGax=e1^zH{HMkc3JO^%uF&PWd`mBxGelmQyR5NsfomTjzg^hEc
zCl%0{VA8%{IsGWCoVH~~h`S-{j@JInrT&j0JG_Smv5Bc@awscv0A6xzg)1Dh`Q7mh
zba0O>CxM=U;FYdTIkh=j?&{Rke5@8zgLv9T#JC5$xrH7i3w+NAoMtzPh#qRHZhCt6
zx-~eJl|<m7CFDX$*e9!Z)0CAbBhKj9_JmR<z%~v*##0P6v`3SeATq6Ow>mL!4r3b4
z=sAWD5@+GrP`;j(7l`~M`&}g76E^l33II<aejE)H?5$=>0BcNRDpGcO^<JSwMI$^-
z3DlEc3wICxEO}G&Hdk<$6oF_GR)fq(P^bIpe4ivxmRJf0pY3OAehR@XWaI~|zLF|&
z@bVV(7A)%C)?x)ZAWoBRhS1!bW$Z4bwPZAw(Qp~RgINpegxY=&?wFh?Q*8?W8e$|1
znw*KN*05Cw2!z*$dMO?1B097rFTC@2h;1Z+E(xtwtQ}~i22O$jhp<`%KPbS*9!pJi
z-)xC=*CQ@+_X~r~ErYnN#S&-cG5O|Hbo?3Ls*4}5De-C(5xLH`oa9<HD?EjLyiAn9
zuhFPatxQY;1fipTl#QnZ!aUv+nK?aDIFE_5s*Rm_z1dbIk<h*z7rxWa9bx?1q-&E9
z5yrk7U{1%!!)3R7ZyO~+9TLG$r=YtZ6{hBr%eRKvX*!L+uu82g@wQ>*W%sjKF?2g6
zlTOdc_u+buaiYPBZ~P-dm)g0strG?H$?vF(<ytHl5O#xQeBzcfy>x1k9N?*0yqlv+
z*%nF*saBf_Sfh-5vXkrY$8T!ToKdX@%ZB`)aTq{BK9veCUOfT4t+@#PbHTN4P39!S
zp183R{LCS}P1;7HP&w#6pC)FAVJ>mUqSB3$53C_P{dWlZcj`zavHCM7GUY1WQICM&
zE%BGEqgn)Wg*y+q6~U9O+MrLzusp0LA)Hm&Dw{yj(=aY`+1|nZ4_Soi3G-$JsFs)u
zv2KoQ!E-2asyziKH?<*-aUG83xUihrp(!d|lqMe43gP=7bZ^Lg&KX5%+gBXtNw!Y2
zo;5d;rMu#DWN~|KAJ2Ar=t$>UVSJ3jk#2prVq}H-3apz6u6*2a)K{qaWkbd#FfiKB
zd)VrII;qOGiFvB)hNg&4n*VQEH>7i(tfImtO6__FlzppbP3r0lfPfhnj+rUT>DbR_
z-*|zE@ERIHG(2hhA*=IeuHt+=InnRzkcfjCWN2)0yy!VN1350Lo5OW5Z<iM>mjg+C
z7+p~U@~>%nUMM<Rfn-VtAu%dkT>z2dER!&K{UHvI3SO4t>^U{X4Vab+%A|zyLA&T(
zeH%y6sJ>B<?vVp(MU9SDpa?o|D~bx~yS~(Myl!{t_g<?`0~1qLOzyDQ<2E&`*1YV&
zkx%-FfZOT_n9~qZ>_J7;b0(%a+(K>CNl3h;sV1NU>NPGM8)?XQJwo#VoBb&(hfBw1
zIPqmOt{LyCowl))rk;0HC?lJ7cc92l%QLmc&Sh%4IUMjwsnZi~CHC1Yw}^G3UIoT2
zebbLVarIZe;f#2YsU<@6k0zJjFKoHck{7KxpeWXA&q#AOtCS3H3&)hLwBqNb|7NuO
zqAjbgQyU}b^cpTl?pc6&d9-h%#&H~()r|q$g1_!&!aGh_5dX&*Ef{=b>4UhGNrtxg
zjfH_?_Ia9e8p#;;G^K2)pHAZ%u~}u-M^oB7Is=@Q)|p#&#@C@Cv1@~Mh$l?hd;^P+
zcuSv0GA5Z}igpcyJ5v_mz1xG`B=_Lg67NW&r6=LNgwEPOzXN!}E~-&axwYWa>)ggt
zW$nB9CV6xKBFY`Zd29Sa?KTFfu9paQ%Tp&l7~R})mtZ0`dieVSjm?foRDzgH#~!G7
zPzSv{Z$SsvJVtFR2Ko~a;~@QRfxKpN{$IaJD({ybT2HG=D1}MEqW?&)fHR-4XHB4y
z|3>MZ9z?m4PC-kcOp7bOfcxG2*w6@Tv@wuLwO$&-PpjJ(nFYPBE&xS+Y6!_wrJsxd
z;q|YVN6cG6UU{)4<#UhSfKE^Y+)utz+XfI?$@KLJ%sJ7^O@q9Z;D2@^!;sFBE#;`)
z%?(a``n-mr<^R2d?<14f8Ehr9u#K<Q&_`a)AZ?{}q;sA-L&mrw0F8?Fkek^!Y!YFk
z*j-~~B{V(uCpF3t*;3T)MN5yTZ#>`z)q|$s-?SDdc)qX0x05#2bAEvsVj^9Z0o37L
z`GD*gSf(KSFy!H?Y|%oKEgp~N%{oA;;EZ`K@MMs77L0-B{1+IMh&RqEO92kTN+w}n
z$ZOTFL%(FUnZk`S&vb8s6(gkqLt0eRNccN;dAFbE8VR6Mg-~-N9%|iuQ3)1xHgBHU
z#@|en$Xl#bvYvP4=zlszn?DHQ6cISW1B+x~mn`GL*4#JtE0k^WsY#=dbSMpifairs
zdfsRSm9f&`IxB|6;D*v@|19>Yw;lG<OLta}=gM?D2vcJSbIRyG9N(?Su*~*xzhQ^q
znuf634k2cUl`0=*0s-2LY+~sr@YArqa)*|a-1Q2Wv^T=MiJRA7u^1KTZI>6&m9SNR
zlPH>v9kJ^b9AeAc_X4;F?I}$}yyeOE^1D%~!LL{0IrV{WbXxw9xxc2exKTaWr7!5>
zu`<NM0*;Ka4~IkRLmE7nW<_?<Q$79QEW4m~<g|P9Q>6*WkCdy;xMA^dNvq!bqUxgn
z&@6O5I!g3Z2RhSk7~CStq!;mM@<z2B*P+r9%%yf>aCkv^o&mFQz_KQr+VI|4$u(8^
zqp5IJV#P(sv8z`)&%Tl!7#mS^_~On?!a(?9(ZzP|HFxa@3Kj;dmNW!F1;0WnV4BaX
z4aZqz7eB>K&ECOdkKzS?yE&o^*oB1f4Y}B=u+1?WLp-fx5U$=+_%zf(odzU_Pbw*^
zz2DxGVelDSxrj{r=lrmQG$V{M;t+v)nR;iQ6pD|<)>$;B4o4?g5r5zF{5hI6lT<Oa
z;lVjKY6+%F=a{241H!gC4wIRb{cDZ-3-9y<jF!rPRzEHu5{|L1kB|<}lI7}WbB0S$
zvcO~=-l6{a5%=GjOw7CaYb3Yf1p;LgZyvo2lUhbiGC~Gi10J=&f|jI#1E>lMK!u9X
zhGfmeh8E-2__$%L-1o}CZ~FJV%y(ZN$*ZPAZX{rIDecc|4N1G(rvoU<LnCE^7QkK!
zqS2fvPkMsp$(STO_LQR{%oam0iM>5B*Kos3vM1hrb>gxW_aXy?6JL)4Le}Zqd0w+9
z=zfuK0JPi@Z5q^CimKl+eqBICP84OKITN!fBU6rat4f{5^Go0jpIW8c-~!e5ZBqmr
zxAmPUS@l7NTS&~t0TyQ;+01PFAh!^#jkR)3PeVRrRF{?P=$g-RZE|zym6A+~MKs0)
zZY$kFGQL8%i6&{^SA$nF(V^ok3k(B(JHJ^sYBgTbh1|NVDE;*c@Tb6SG<@BKK8+@e
zW0z-ja14h#2Iuji#%WrjS-z2MPVll>PH+s82L`9$X+AJ~@q#{;YO7@wkXh&xN(3u-
z^_ak)x?f;sQa^jSq|zY!bEbB*@!-JS#cOg~emaUoi+>YZzX>h%v1FDQ&#6u%H@#^Z
zecv28gF`dOGzKF-y->vbSRZ<75%#yc1-)yvTRWtT!JD~$PH7e&s7uE1&pNCu0+Td_
zK{cGCVvDefJt-AbU_G7(X57Zh;M|ZPfDuw-q|v*fSI~uxsJY}2c)+v6@s1E>`u)>>
zZCrG~h^vSdi{8e7K+gpMKHgPt3sjuPl4G83S*)R=?KslK`>?Knv*B@i(JpS9PcJ6k
z)$-6IprV=R?fdN7fxAVt<yzdT;um$2E7HGO^BwL5TrHIcP2mPSwb-69H$po{2#5tn
za3!9<iX*e2<x}cNFu(-aFFZQFLEAyv&Ql-E0Y-A-FQzi=z*-q|l1CR6wuGa`#WP#(
zhj4XHn~&IVIbFuFzgQ64Of1sNF~{SKqJmE3O~vWldId&9Sak&<tU3_IyZdaPh?74F
z2Cg2)(s!+jD>t9y2Pqa1#GG2vHL|wsSDXD1nK7xk<pRt5eiNfWJpoY*Dr&X>WZB^}
zt7XpYMZxbAHYp4<k3JBBk_nimrbLUdJXacMIIp^f$YJ;Hm55!tqeATrxP`kRFYBYy
zw~eC<`)h8^Oqo)Gh1Xin8gW@a7rw-(np;8Ai6!|uBrk?4OU$4w;o@b(jvh+pcP}sf
zatY^DIR%e6ZhOC4WiSgbD>}017WuW*JX+=dJft(P3!2Px!e@Ya@n9s15}=bsBWN*L
zR4?_jZTx#X6OK%$U3|U7O!D|ct4ydbkEupHsd(dN4CuB~DNOOp0zdv4a&t;q#I83G
zZsFLn$#wX0FJQiO9xb8I*6s%+X^-^m0L;IXSo*I(6mk@`wT;EX-#1;0H>Y)Y^lBZp
zD9fQB`zPK)^uFcg&$d?K!>^fT(04hzZ+VSTqVB@|B|F$?1C}fpscH4!xvd8D_UZ(K
z@QV^Q3aVw2Wjj`w$c8Q_Vl*Z3$bIGNv!}3$3#9^S*V6S$u|KXi6FkjG^~g@4kGj59
zfO)5g*C-e6DyG{Q7=0D1_qxCQ57Ed*QqM-wn`J`_D#y}1NJgMOsTdq<sRGRc^vdo7
zI^~wJQg>;w)z@`?rDjRz*dC!h7fZ@uqpP1+L&{rjZ~^e!G>kgWF}O_JK)?f0l@Y}d
ze!*BI-bh?Hb$rTFGag&snYXLs(;lsCP`PO-_DXJ4eCWoi1;k^ESup`XX_o0kZ=_cZ
zjV?i;c3aT$*G5<zT>_4#JqDMdS@<sGZto!3(-n11q#3k1U`}kx@*i1Z;-F}q-o09D
z^X{#TdHK&PNlBOvUtuj|O9|NI7cx|SGOIGZ2|a_$5;HUZ$P!bCcK&K`v!E`}#d<=O
zvx6e8_s}5>c}AhtiviJTUMOeD*}{vsz~MKqZ&uFWzJ?U+puk_iQw7rsHdE{TWrJ43
zhAMKRZmoRCiYiiAXOrYIC0r?pPJ`8t-)u^h%TDD_j-CWUa|_-sDizy32)L4TK%<UB
zEmd;1R4SpC8k`$f0(?U7FAT-rO^Gp5H}{WY9qbQs=<gHMF7TZ(4o3?_1)Io%lk(}l
z@L(6h1q)V#MesjS98LHXr$<GhJ<=!80Ur%82JjZwb-Q+7yk#k+dL>xc_wJUI!;WCG
zU0CEDTk@%#qsS4)9$a#XW$(X!S6W?e&MrZe-A%POgidryfh=9pUbtDSIOVs1*+_Yd
zdEBts)`3T~<nci?&ovOhf&QwHmIrEiaP4&2xF~f{2YdLS_EMvBzbka+(0Rr4pbyKu
z+RGuTQRc`9!;2VgESBZ@bX&$j*7nD)AqHE@M31)8Ce{x%QvW;S@KG&(sxUW7v(=n7
z%sxpkn}KTadJePu`cIC@j?fcg`M6)tDJcTFVeQIbqEQ56LV|l{RJc!K^@#FYSz#fU
znL-_GN@mE8A?bKvtY(Z}z}<1xESIhioMTF6k2>-yRCw62_`Xf;LmNM##Ng=;cO^%5
zRdEBQe|U62nV`Diy7`>vF<-gB$m-<zgNJe_+(0uBc?oa07`NSj!ngAcVNWrdxh<Z@
zU8roQqS@LeZ>guiRjr;v4HI9L^hQl4zDjUb`eJDiBJPZ4!{CLLMJc#686Yl~N7dtT
z_^ni5hi<xg$vB@CvAPGoMmXXSq$${!jfj!V4L#XA3aThEr94rzE;qO|fthq%RJdVB
z;43w}5mg|ma$t+_-q;2&#^jkToVI7wsyl!o&h)vgX*6pLCJ6f0KH)a=!5L<!=dY6J
z8ZDtM#-~o4jl68(E}nyKrBESVF7t@j3s#;2b!tO1&JmDu)Z-0-DzFbVcj4v+ASBA{
z{HYeD{SFUNxK0koGU+81?4)M));jaq5UD<mBB7A+a$;jmbDm>_6b7&=ixv3oQMu(y
zM3rrg7}dG17b;jgS{j{QmtsZ`Z+W&g4T>F{Gq(@6+&M=W$;xvt*_YurIKLwd+EoVQ
zVJe)(t+H0`9rJ;oCV-_MQNz=gl<7*Xqg0mJV0b7`T`sDh#07_J^mE}xKOgOWq}XI5
zFelmVwnqYA1$F3Nsh&r~9YFV55V^A7CZYto%uRwzRkdY=q9hDFx%!ZfkU+aJZ7;Uq
z5L_G7zgc`TA|F89mz*Elq+FX;p?D5%L4HuH;7fU#h`3b*+Et(KYEg5l2!zCJYVg>|
zie6~l$K#PT)4yszmD|r;5q;U+@0a96Us3D41*lz6Omhz&o<Y#yuJx8i;zj$Mqh^g!
zmiB#nZkJ5+eD|Mk!dl4&ldExyqT|f>^B>WSl)f0>`<t1Ca_BczQESQifEP$<X_ysO
zUBPGJs`xKdrrx44)P|Nx+kH^CVgF4Ftu`WLFKN0Vx^mfp>@}ekIc0A(m6CYObtNR4
z)=5Dy?vt6JApt?zVVo6RsR(PTLytdiPdI>DsP2-QN7`kWCj0H3DZTk%MTValcr|u0
zfo1ZEv#=9zAInd{mRifS=Z)?JQ8Id2OvXF`an%!WuA%5)+RZKJyqC09<Is1<mtTRJ
zf-`xvgp!rsdijbjBsoki?tjlY4I#p-3+`>l#mGe4{w9p5f~mu`Gde~VDHOqR4HEW=
z@2Zj0P*<3D3#<T9${)(Hz(fVftQqZAi4cZ=<5l4CbQG(Mrf%q3YWBd0DIb)pR<bz%
zyDdI;iMD$8K%P~yZKhkU*Ed7S+q?eALDX?LE|9;-qyQL84lE#@7OqT*<AkXKXMwSu
z&WB0avKT~u%93@}AoK#ohD_Bac~msUjgfy4^JOrHfglpPXUE5YjMeR}A-3JFvF6Zp
zOaXr2;E}IFz{=e{{dE7zxR#0*KPvf&#YFYMa5iTW&5?u*`Rt}^KFPsV86qRN$6NuP
zo!)5ph^{Ob4L}F^X=>ZC5mw`bp3SdCeqL26(Br;_PzzB^A}z*utE`@KYvg>dfhsWu
zK;L1NADQY?g=lj4kwUtb4!BE*k1unlX{?5+^WQ=|w1yw<QYBBFn2c%Z|1IARI{*$<
z&e7`KsJOjee?(H}i{_nmgSeA$KqG$yP=zuJ|Ma`fFUNdl)ydj6DoB3HAx?h;2=HF!
z#fxoO^H?8Fsd#)X9A%ncfmGq@CAJTvBQzAVO19;N+A<n>oRTq>gm!kPQCvS8764Tq
z?UBLABETCN6mZjm!}t4Wq|wAEe-@0Q=#ptR2d%`<`N%hO@s=(;KAk0HO-J^_i$4c-
zUzgdTJ6U|`PWF`3IvlZcV_{P>{5?gpI8l%lf2Py9v#nMA$%C%lEnF5@YwRkYd^sLJ
z!N4;5%6LK9v+B>K)WYk5X{EO4;OD1P+JzDaRTf?QWw~Zsg?FOC-_1o5I|WWt$N@hw
zr0E9dZxkf+E#TI-B(Szl#`u_r+bcbuMso#nv^ze;kmM27l(&3;9lwY%c4pJmt>os<
zA6hz1^D7Rq(D)|2G*X4*@AU%<YaMk%;GRYh9%MpweUfeO%|$F#6AZ^Y2Ep{)l1!`I
z*nyhARGO{2Uha>-OuFs2=G0=Q5r@bGgp;<q#(DA;W@V8G{9YKis>w3OVHRX*Pm%h;
zasR{vOYrQ)WWtk4DLIb=5h*#Vs%3=SS<r9l{UFr;bREjFzW+4NtHXJ$sB1R_BC3Eq
z5R#`i7(eq$C^*9r7(%=$7z&IK(M%SM2+}{O)s|Tuj;th_S~17GhC~<*5s*_|%@F7c
zT$Q}Iob$hqQaiH@Fmze6aHET~Y`9Ipl17NH@X0int{qGUIOE^CSLvxuz34r4hkj<!
z1NP{wdnX~ltMtRr;NYtA!qNY4yI1~jxo!eNrz&q&so-Nt@Fvl*ALRXSU2UEt$%F=U
zUuh1@!L;t((Zc9PpRQ^4em)J!Y~dl3Lea%|Y|491{Da+{DE=%@=0R2XQ2i}#iQJU)
z8xED!YIiwj_<kex4=07NGil~BW!HmoW3RCz%m#+FtM)o30-fldP3O^3Fhrm5ZE1;i
zy=_7>{GZW8EK<G<vn;>lgP|erj?f#aOjUA+lSw4$XR6H|@gooY2xuZ8qV10_O!N`%
z`srU5k_XFEC|8qNd07tE)yLVMQ5tK>lzN3(N3D$bf5o`Ax<yJaH|$efY`-&1;l<GW
zn(%N-FX@rN=RDPxIL&h+%@3ST4szp`3>zs7qTrS!i%@0A52VY6p-$ZBU<6~=%*>B*
zVKb1hIeDM4D22{Xcy2Xs7M*q}G!2xl#gqph3np|h<4X@Q)cGPudJQt>C(;%E@Do@U
z;G(cqd8!g0q3Gx)C8$Z5m;vF6X*n(^bhlZpKl<s%7OhCN5+6=1Dmp*1W?Pf(>`Ct|
zfJH&c*%OGON0CUE;d$4t;&ge6XRAWj?P4;}>1GsBgYc3PN^~m1cKL<e4Sv+ZGV4f~
zq4|RwHPJ|d<EKSLKIsC@K49Mt`zJ=2W$^^Wd+WT)Ozh$F;RAS;>FWo7r);^m!rD1;
zB8W6vbqcL9ieI?ubBalTfTiltj1*_S_-<#`4=cbsb4QP1(I@7=>M<b0l#*ldMon$Q
zai`z>ijiCrTM}Vs!6-|XCTV@yePP+y4hzWnD{O{tv^R35wggKM);C|{G)6i<+LRyO
zrt8(;^5S1t53;s12Nzctq>FY*bWq#sLEK$Hk5r<6B=VMA!?$OhQh!Q$>yL-sTv&Q2
zIAF)&=tm^I9PFzLb_m+^mNP+IbyizG-+nRm^4JDl!&~r*a_}mrp*1d^n9GqS5kFv7
zX$%PutJ|2{Rgw-rv7OqvSq5=s(IbXe#z`CXb4nAcEa3Z|`Uj<`z4oR*=w(pkGy<3H
z5jY8(W6)Xq_%F4*E0pYtbSK#p<@H2qpjn_krFPOyX1FRsAw>qub&MeDv4pTMR#~-m
z)%|0M&BY&j&XTl}r8;$!XF(6IgSkJlR#K*Ux<MVgLWg%&oUhW~O$3<=x<h@=ke!w4
zI9R8@t0nWxbW7`NYEg*YXp*Q;xC$?3#*C=1m_xorx4YdjE-iVwjc|?ht~;K@G!nL;
zjI&N=9Xu-X)V|#C_=+0f(MPeM$_6$iaG(Z#Nl<wY2RC>ko@*LpO|&*N2<MqpRFGf6
zoqs5EfRVnCNc|Js406!)kf-ZLx8%#_Xa*@W7j78VtFA0^S=Z3thNI1Pn*<=J&WZrB
zq-O_VU_kE}Sv6M>kpgDrCNWWiUBdPC|K&0I`a>QidiE{$nC05Y=94qpqBRX9xb;DB
zZkbrTVVGe4-X9tB@Fq*`J<x4xs(QTtiv7gY2ap_QUw5}h+0suV*>ZVruBtN0=ifvf
zJER*%;Q7$;KN-m)SSxJ09?TE2#c;w2jSAd2f1?FRcP}%NKY3(g+s};$HFY@J(6J!M
z*=fMX=t?<IBgt{)P);O1Ox<0&b=4Omtel_`&+24uTO2rlfnPI|o*V2*IXd%%g<`Fq
zKEcb2-%6w5&B0hVMdGZQW3t&-G<1805X&+M(Gs1$`?${!UB2A$boBX%HvnweM>_E|
zw>lyk*p#R0!;;A~i*IxC!F~!7MAa6ajgF*Fi!v+7osb>8k-w392;^q1(@q4sWpq!`
zAooc{gIk}ECJMma^$To^dQ;fY4sYC)#n4+U`lyn-+O*AxB9>|OS@p@((Nq(!Xm||~
zhR(CSy8;dZG-4%#{x|UcM`xogC<0p27If&I=?bwZP7W-qSd~We&VCa=L_rm))FQYc
zf2ZK%K&{T;zdclBa;%fKY<1jd*gLJ5s`Mcpnx}m&+FqIXWE3tEZROAku(;3}lRc8J
zD=nK`=PSS$_pxSS1k4TD0JOjp3#6bSMd^1LlB<J;T9qd;p5jVXkz=*U%nc!{djiJY
zlVH0bW^@X5GJ_@WD)<B{AVRbrKX8=YTGaBOvCNDjV=+z<hhi@4TdwF8lLb>*dAKDu
zR{D~-J%5DY^KXVGFRxs%!7nb(qZ*XP45Nr6L+sw+Zjim)lbJ4FZnk-~XM=6Rs^mv9
z)rIr577iAl0_iw3jghpXJBUs3dJS8LwMH1zNb$IWz4jZk{4P-@9s=0>P<-2sQo3|E
z$mq+^avpxuz%T?3l*;-fd=Zc2`mXxhDleww@zD{2nSrKFf~n*$$Ut0jiP0cE&w733
zz}bb@l#VTXV^-I74WVY74W^;cJcZ2Ut~bK*pf%I)2g@MbKPK5W+@=V~hM>ZLujF;z
zSwr?OfHe{ALML^V(5$E9zGa%*Ny)xRc*Wdac|BH3#Z)y`35ti@Hu$ebbN8Z{PdB1-
z+YbQC1*LcJoMs>p1w#<;=bSZDVr%{t7y&ZrM}^c&Gz2=|rmrgb^f{Z5PfxP%4P>pJ
zR7)kNw{hsoE>7rC2`jl{r5*r#D7Wm?6H1TxiE~0TMbqCtNO`NLacdZxM3+!Z0ZDIp
z@6y@I5g<pib4!dn#$L*?h+OH@QoLItQ>x4_^=-~ja-@Acjb7l&F4g#$(4F>-*eK}v
zP~LJWS~wtKCLD$^DkR&#8~KLyO2#^ad2i)oLJj*jW)^>sX6am?Vv7i~3<Of2vx@zW
zb-CN_21`}M0p}Gs#x^ZRmncLKVVI?uprt5Cy*PSK$v-qVTVm~q`HCy1NcMc{8Ha_J
z(ErWE^Up^E?~N~|OuM)zw7_h-%$qn&tngHs^bcLk$NoBWwWaSZ7rf8RZNYSBwObVI
z&yI>UH79NJC}cl5YQ<(2g4A-m6^L@H#}CpFRtesP*;R%?^AABS2Bz{Xm3w%#;`&n4
zAwoFj6<1aT`D@xV(+e8piTc2g@=5mxFOHsh_<ND+ZW<E$ReZMkCgIZrEHy9vO93Z=
zcj|%W-KL!_)XSZ_??SJPIy}_br+Sci@{Bx(ztNl~<Ay0(3w1UOeM&;a1_>QhNH_uV
zG1{DMzG&6H2ZQ_P)d2h2PN+cxL*R?s8S(YxJ#z+*pMpN7h{$*XD)2a78e6AuvS<$P
zE{(Z^1Yi8!{G5d>`dV$YXzmjxow*^@sQ=6UNZ7s+JjrEL+qYJDzh+9ylB`i_?jHIj
zKS7Exs`asw7;NV3j1(S*RZn2w?F+t&_v6oxf|63D)yu`2Tu9Y|(`Qag+goA{(ZP~k
zFWRHo{&rsJrZ<h$3GGv!I}=Vk&v|UG#El_10v5=?UUd-O(scZh!lRIL%f^JrVG)-t
zg94R!>YmMwI4T;D+^C%1<3A=zzZ9HkzBm#4UK(o;4Y<y5CBHRy4+_8i?iiNb*&(e-
z`4~=xDJ-N_YKQE6S864%&oUY5YP<zX*cj0OF<6CsyG1$P@Nl+Vm<N;h6%JqEj!RYQ
zB4>~=^f(k$%2=^S)E;>FdV*Hf?d1bDh-}aJhfZh5zV4Q0*$-eM3kiyDQYuKLwPB96
zJI8UAMDwqI@03XQxX#tLn23=)>~G}!mWz-;X?Q#L@6*6AW`EwArjRBI<m47rDy`ms
zuw99tmPnKFCXV1-_hpt0NBCQ)V3l4||I?{poTi>E*6fVnh$&Q}+UyLKI=>%%;SZ(Y
zZu!v<Ye4x~Wpkc^x>fMnL(kQ7R2+GI?pyj)L<#~ZN(E#1M{sZ+kKNmM<ivOp7N+83
zWEbWZ2<}py5q3`Kobw|S)fyFR!8|-nY-lF7m8P7XL|7f+p+-}U0{CksYN0LQLte`q
z*{$~SoS=6z+CZr@zxBTcQMO=Y=ltnBnq#g}fEa$CxC?>vsaQ<~6V>KdgdM^mc&CWx
zAJIO3%V9MYbcK(JklW~kf>5bmBHkwe^6j+obHsuTY+Qk9zD4b%AM><HQrOPsUw;M6
z8fkSYpp2<#T8=TRlYuoAR-}w~`{4s#?WQO|l#-UhgZF{WpDI#1<~pt6g{Gp@EPtbL
zdHeS!@?{-eVOzJBty6#bUFRMfTF^H%d4v4j#4T60W6)JGK^$L+#Sday7)lLmD?>p(
zx@=>VO`z&eq+0`UbHSV4T||3)54?JI?EZ@BQ#)S{fJ!R4r_#F4$)dmzOY{ZYnOlN%
z>vN*g0C*Y2(w8vtwOLFwUTYqW-%qURG<VL=bBrjQ^S)&`*-T_g9A!_k2sWPwz<AB>
zAi<YnZ~}v{x!Y0pKV2BT%iHMNuZf)Ai<;wJGAMdju(bU&{qGcOeM5_hWof+%?*q{{
z1E?>PcVX}icL^iHXdeen!cZ3wLS*#7dB3R%%hCM=Lc-ZPj!IM)N5c7J0S~D!h+{{d
zY#AS_>dNUvWH^-^+Ki!I>n_OA5x|6sO{P;p)sX?G7%jJH2iO@7TNN2FV9#Z}j~4k%
z<>K1$mPo<T#eRZX`c+8tiT-T5{;DEIrwc(XvighOp3-e=n>M~kiPqVtW$VJK4p)bk
z!B$boQ~+}h5b;NQ8V~iUryt`#$)>p)cY^=rZ7YVqsclbn32ib{`(oAJ&+<!LPTkfO
zZ3V>W!v_~me!<i=$7H)6{+OwH<UnW-Zpmpf7_GW7g^Z8oMsAb#%{PZG1|E5@!Z&sy
ztR-$&Y`vBP+3MNSQ;m)0dcf<CX?vTfx4x<|+$u|f(4}FqcB&F)OOi`fJSput9qS(W
z?6O({n9r`%5iNV%;S2kdEe1zB9^tI39#d+OP7X&0oWm~F>;1dzN26%E3$E=Aq)2Kr
zgMbS5tUd;`=t8Z=Inl(;Sj<wTGK85m^32HHkH%q1NQuh?IYcV9!63O*A+E-S!)Ms^
zwo6~hg(oe`D5rgCjI;&uOptJ4laL9J+5f}UJ3vR$MgO7`XM#yGv2EL$*tTukn%K5&
z+sVY5*vSMP+a2Ei{`bE1-hFFzt*+|ov+JDN`)r)r`&ar4&vveoE<6IBIwEgvi@)rp
zvY;<CG~^z&p0-nMc27K}@b?X_Rt`#QZk6&si@BMJ-Yewp3KI2};<SAoTmNZAkSsG|
zRq7r~%vOSJ5QNzTwXTKw$XyZWELd{ND9qnNYk%)TK3_LokarWLVv_ANX2RvV5L9#6
zTVRw>PB2|Kapg^3DTG8qbnVKODqg%K;)mVln(inG43OJtJx%!v%egEoUi96StR50|
z)n*;8ChNVov347*c5cZUqFD@xr`{g_TiVqqDhKF~q5HP(<)gt)LBZTXeyKx4V^fKf
zIJFTLR#QoAV`K_Xp*YXx@1La05b_EZFT?C{aSfB-{a18YID-x6$52TtTPAk~g$k3+
z9e0UOZnkCsC_<375SPi$)ZUn0S}><j&PJb(!RrdUiynnx+3cTJ!Efr-tDjx2DMwVq
z4}|N}KH4F<f3!r`IRqOC;8XlVDoy7H^AE*wsUTcZxS+z8t3vyC@E(<SPX3&z4Qs}0
zPagMF<7f_zvUTg=&2XE3b?mo^AA_RRWiW;>O}I-lfP^>mo_B5mZm@z2H_{JZS@*Qp
zdJ0cx+kYHHpE*NEZSgjT=FNgX+1_S_Mj04;NQ>RP8PkARUMfa$V@|3;fmgUCGMPMe
z6XUSuNWwuxgNHdgGs9Q6;nc87&14~`wAC<Ex=s3Xa<wHcL@JmMK_f`nlM&j~`n}da
zC>2u<1>;9oHz$_O3l~DZ>V#_+j)@j(dNAsV-wT?;5<sET46$Nljvv78k66W!VwWRS
zFFsrwLa@@$Cu;UbtkaCKEQ4$~PC)qGvn8a@)~6XTvmhG%p&?j6ooN7$<U1-Jl2pb&
zPst(3F_E7XTm(r>gSQQ|2SysB!*wy?de}(aEClXmz88}(YpJ)5v<D^{qhob3@p{;V
z-7EtC&x!91w5SgT*rjEud$AMm<ZeAmlKps1uVoe;r$VyKs>eK&ELxsdB)D^WrU#wT
zwrCzo6j2sGhdp2#Znwc~eLcS6?&1%O{_n$!$xxP{tvXDE?Rl3S2U{v_z1TXWqTb@9
zGP-uRvx`88XCs!p3(+|tuOe{des7lke=w008Euv_7>RH!!u6oXd-kS+B)DKL>3AeA
ztV##s?3_hd4vZ{oLVkO1(QEP<hJQ5_xfR7SpU=QvqOmzF9{iU2zTq(L1Y`y64U%RE
zO4Ze=ffe(y&iMyM3ob-m9eXK>wZJu~r*n_0D}`g+LR7hPU^sxqnx!}9e*2UA2kj4l
zihN}ksi);w9Ru1B!Rqf~&OHs)jkMYNu~5&=GS+X|zoT$P%h|XEpzR-aLSm~hD5$~i
zq$-by4m+6|M-=NLMr>CrBOz)vISa-_C;nl^oZie+znsPvt?LFI!^N4MK=HVQy&zD(
zwD!AD%?<-E^j<$+{%Ik%)$)UH*!cF)Dz0^z<m!foGZzlctSH_fi2N<{v3o*!KEDsG
z<tb%x1zB^$T1D=-^Z@fAAR(9fwO`LgGji&@PsRkDhE*EMIUkLu%F`WZsvv=ntpKf;
zd2$}ean5B^1;_g5Sp8C+hNIW{FIL1rD&18DYhGKuPYQX@6dt2AalFgNJg1kQsXoN9
zqcj^jxP+(H$Phwfb=7PyIca2}*v$ux?e@&_o+-$FJ>c3a$P10rM(YBYPKS$PH(jj}
z9Y)vU61W!!=ArU>in6Os`-EqY3V3f;Y}tBK?3eETsS&mieQ_4>9iQJ0f<>EG#~pnt
zZRlddN}KiWhYlcV9)$*80QO~}@qXh=fs(3Qk*SHIkRWl<l9Pbys+8pX%+%`|D=P_Z
zY^HjMS_&d7s|jlO2D;Abqv8}Myn(yk`Z!Tn{oigECSqJ+05$i>%JwzCdj54nsU;7%
z3{T5jyH&k6zVCSg4l_t1dm?uiohgE879S1(wCCaJ97Cnt26OSvR*Tscpny~7$M;F#
zO-#B?b|DS*&@LA&-KKb>vRTo~H}OCuL&%qJ&^trzw-|k~?KgHkp$-T1zPJv1o1XBy
zKW?kh)#c?TVYR;X&#o*UMDKBS_sx;7Y(9egFBs&{hwV>bH`|jBVCYInd{(?x>ot+_
z*`l`*BkIK07|;_ybzivn9DqfB5Dmy57j+eAw3Z4W@*o3Sda>lk`FJ3N?{9oiq4AL}
z#H04rEX@CvtG0AR|4}t55R2diUGXbK`w@P)=lAa%LW=f#>k=J?>igPMlUiq1q>5`#
z52}SKn<aHKKo^1y_+GHSUQ!_<XQN&tZe_h|JBx54@+uvw?=}tM<v^%2Q&Qc+3Y(Q2
zkw(hIS&bz?)SD_j=oqf|x;;(ZNOcr*>SX`L805pn<fS1mrca&u+Nia7S6C7|H$wa&
zz)kLO05tLJYCm3;?b4ViCOxUNIR8kzX)HhS_lM=PDua%0CO<q%cuk2>tQkbAwStoV
zam9&Le>4b1rT$q2CX=q<s~?^KI~-cVD`D#OBQz?+lcKsHCX3S4J(`C?h~&^pb@2<1
z={a~9nk)^gC=3}v+zJf_=C*y)p4`tOXIdexPK)J(c)LPa_xIi|S95~}dT8LEF^!8P
z;<7dbb_;Kc6C<dPzF??(N)yt>ME*PfZk>XioU&&Hums&%2t7JcN)=-XUVjU%5jyXB
zeT_!lVX<cRaQo${Z)MUu*5Kt^it2<dt&pLb+G?6cfHJ`wwWy~#3C4C>DW7((qwat|
z?R<(Nj_hXUqI@`;TxkE$p#=z~`n4Dk!tCxJA>qf>a<;YkGkK3KR#|#tSOVitYn9aD
zI;*YAK^Z1~Z<zf@V&D6Nj^+tD(T*wK(&2DD-k5<~Uy`s}tkJB<2zmS=<L^sUcmpt0
z{AN%<DDE{DJPWfV7OXhg-M$a3_Pnp&uwtpM@vx91JtUfP1H(gSWCVVacLqe7V&PxI
zY^K`Nv6VfHuZ|c#_Gn{yGF3~{HR5tgh`=-Ykl!^Bi7Pb6bE@Ii5REh)_5a7vs|ztW
zM*S!oe-n4TXA;f*s(3;)?)Kw3OzL%6u>BVKF$py$`j$3~GXFuKtev9hcc0B7XyW~l
zV_#1U)bd75^Y*_!HS&JW!A5<vpwog{dW3>hHG>do{X>J5v2{icY(b=OFgM)EOJ4MH
zo*!g0tzMp(p`gV4p{7NBJF#qAIKcciWXvKAPitucmD?9A=0XS5XKYt-vdA~7Nibvy
zvis-FkDVQKV`ajw7ZBCu%3DyPJ97yELtw^c9!kGV&%K!F^oHbf8{YZJY2k1<L+|_r
zWvSS{acC4xNFd*6g)J@xKhQ)ED5AE9zzkUII_aYZo9tuEQpL_~`l9ajACGYt`d1g|
zg6cg&K+@Y)e9XMkW0m{2+umXsSDl0i^qlj;n&wH877~I5RJUX}7}MdbX?|$(%7ltv
zFV-yakbyW%-rxG*%quQYb@$o{CWKFT#;;i0=9cg8n~(kN#{uA0jbh+DU9}C|AF5o|
zu|SS5+P%VfK2K_w-qcNeOE+Zc4en42zLq;eciVR8amqj973y!Yg+a7o{Qf5Ne*CZ2
z5LJaBykpFABK@wwGMAb+T7j|&<+0Rj%})KuD|!}SrH|+-+1w>{w_*S3ExXQfH1Zl0
zoz?C9kl~`f7Rp2q{=~+c=^pY%MlI{qu~!Y#z$mR{VX(~y!6ZaI<-pLURw#spb`_Bt
zPa7+&3bKv@*iMns6z1gR)c8Bu$vnbNQ$R{07!B>b%V1E|i=Hbk1Vyb%`&BoO+j(F0
ze>>w{kFwh3Ra+izRg-?0T55GW;La2=_V>NbVA*G2XlSW6Gotg*Vd2uRW<@6y&iVjT
zTPj@o0c~$jj8>jdap?{Fd+%w}D?Gy(P-ZD2bUrjUdPRrgVeAUizS*6T^W%48f+4e2
zF|hPN=6iisQ~$7bx{J&!ab&bLjJxWph2lulKy@%d0#pQ0=}@^;9Ey_78BMViFizhB
zS>e=t<7?O<;A`wld8l3=noN9KEt85sEuON@_4ZFHLte+i2&zUG)&8U`ngN8-o(&P5
zFXHb|1Nv%bxZzYF7ban4l)?$BKuncX#|{?pH@;qocOQ95=uQDvMQq*q34Px+DTd<_
ztiM8#OC%MG1H-5y3OsIqQSDq(y+`K<Pmwj>FP3ga)PH(Rq3U(B!=5Wl-w<l;6h<V{
z1^BlX<8`FU*>Iad>FfEVv$Yo;F=tlJiv?jvXg8nUA&P48XehZLFhlUS=^ouODZ)9T
zHJ8A*Vk=(PR+K7via+{}Pq3Vwv9Zc{QT44w+S{Cd7(0=}zKo_X<`jm&sLOIvfhx?`
z(W9MntWzfnWn*)u<wveJ<_Dh?k@P$_NXCkN?^*8N`kapKF@X<`_@e<XS2T%Z+Zv}e
zl?i7nmH>iDI$Fl(?AsIlfTv`F1?y+3jc()KLILpuT<md{zjN8#k~cIFMFZ87C{qQ4
z1}<Z#oD<VrdWA)@#W6RuSF|7PQGE+$xwxQJNZUefA&`;v9}?JLXykiPv++u;*M@Sv
z&_hg%4A)|b_kUEDn@FP+@xHXHr<6PnORiz^|JGm7S^I)Bd#rz3$4+anxTrW^Ev|EH
z+LcOmCC)9@74UG!2HjOU^%k=mQK*5!fM8%Jotzn$FP=_{VCxNOrqUUy$Q9Mo%k}|=
z<7~nH(4|KPpI^r;kOI_U6X<k#T62Hp+RUG)*^TG>E6$j3Vj6YNWwBL47m07_q7GTH
z5fOY#HIDcs2(ftb=-PFQe3|D$3Ne4dtYE#n0@g8xJ;=j}fI0k=!W*IAp9%x5@KTk7
zVqLk{PrA;%X?ANI8WHZJF(4)G0&tXNg^_}q-iSqlPKjDu!DR$j@^fzCUXgheoH2<O
zX<`_TZ6QIb;9i#@<#Ts;;J3Q~^8m^e07p-5WYP>ws+1WL4O3<w`LJSY9WQe|?c%NW
z{^5kXO0c?V$-&#}Z>)lw*2>9)8?HGoBnPVwx|4dJh6D<N<M#NB#lk4Zqs<$oybnw$
zm}cc*o_&8fGVh~P`>sgDHWky=lseivWn^SgZ6PuM%Dm`gTp~jDie(;bHcR(m;{b-A
zUv{;BVVhkvE^7eGw}Z6XKo(2cfqRhPqxWIjCn+<=wYY*;^iwq!y(a2+P~jwj)P{B>
z4ku%L@q^@_H)U9jc`65!kSn2aRuM?fKn5`BpOQ~Jod)XV!fL1=tBT_REm#3v3L2(s
zwW2qu^!5FGG448G)s+<9b0KImx2CP{cABk}q%j(Gd?82M>EC{x3yO~m)XumLvzrTB
zRK5pM)hWCxmFe<*vpc9naat{_mXSlTqG3F)@D7#R>Wabgup&5iPk97?_nI%SJv5?O
z_rleu&b>GrTS-9xvY@fjY-!z)$c*;UftTB1U|O_dMzc<mIeJhe1C!G?c~@qi8F(Oj
zGOlTGV_=c$#$D~6C3wt&?a?LCvXQyNpZs~X`p<`Euhc8rMH#-m9b=h0S>yc+!i1-b
zXF>PtHHs;LqW{x{Byr&(qt1g0|1e5+a3GYrpk3fCgGe;vu+`!vx`C;+JpRPnz{#Oe
z%&*B=zfj6MaFr~zSh*}WYthx9d9)3vi2rr0FdF(d)0mIB{x31{nxYu7$X@UAuP`Gu
zdovCcXJ1!$9s+LZRnBOK+Hw^kA!Wd82Q(&ZZ|i`I1{5?<=kV}o=ey$YQ~OF8Lo$*D
zGHph9mnzp8Qt`B+p677k3HQce_upzPH4gMtRVx?pvw@c<u;A8K2tELcX9Dy_@O>iw
zNhTGK2cQ^745YsUvm6RoV+CkFQzF&rluBqRt=3<>>3RGZ&1=Gl#3zYv1K35cQ(gC_
za2d<-fKxv3O?_@X;l-yuP_^|b3adATz7J*J|J&Zro<i^(tpg%3IasL_jX05%tcikg
z4K7ONV~5d@yI<PEYKn=^i)i8bb{7*K+53q9dfG>L)j9W?5$#q#QoQ9?Mi#8Xj4z#)
zo1FgZ`z2Ft5E=T%uhK$%xiV#1&cmWCn`mWivuv^bl>ybYI^{Go%8`pr;PS#^7oh~X
zwXw;(&n&iPE4Z&}dkjgH4DBrNDp(Q574tVwK{t_T@YNDL5$^i=<;eq+09QdW<j6+5
z0oS$`9|xvGt1#!{x*J?ptTcj^Vi!xh#3iMUQq_mZ>s1n8ebR=`ug)ghRy`m|nhEgs
zRmIgQSGF~|^S-4m!bX-3f?b_qzmy(D{AdWTQ*q}K@@rlVQhm}^6b-x0J20vA_HHdg
zVyvSyXk5L2ln3JeVh>N0CVO$o{m7{SE>(#NhxRehRKw^41sMtNh%}T+UxTojg0jS2
zbQK2SCAG$^`}zm3_IJTK45LY$4LOGM{ZN-f+q#?KQ|1t0AzbXM$AwRGLq~aItfs$Y
z&#{|;HUoO!r>ue%3(ZKMGcFpO950<o<5%XZRn1iF4qmrCV66xIJD*@?ouJ!wuQ$Xb
zIPDH`Sz(kC+#KP_&+o3U)=)w6=>tT68?A#C$Ev>n!mp-)g=w@_od+*ajI|)#A7S=-
z3LjVHKZ~KPre8NZ8&zBYVMrpC3MPs3mnS&tic`rGjNz-97QT=0Xk?K7LTDV&Uvw;i
zk13p(O&>ojM^GQhTn58!Sf-eP#z*^rpE~z2aH+zx<nrZ}_=2DWw=^R<9%r!ENyQ5k
zdVckThB(#m)$x9!^$Cd6g?0W!TvNGAtKVM<{I_dQ-=$W-c<)m@FJlg&$KNYLRP6_K
zu~s;*20MwScpJ@LHiT>?=NDT`OglJg+2TAF+hMdIKw(f0BpeCPKNamk=d2kh@h{0a
z&+SIGxn*Ih1F*t*n}L_Vke9wJ3a9)IPJ6Xw=&E|;^m0B@S;&;)Mf`zC@_gXBx9$2q
z<QmRCDC~Kn6#>%{`cfei5#RNDxtJmDg5w)4$G<VS*xz_7-!e)&T>_sjYO)Zz4zc)I
z&=F0;Y~T)u#J_<x^rl5g&9aM`8yQen;FSk+buIgPtwnR#gKhK%ps$*D94#w-rG^}{
zjOx~0oS?g_Rv$IcW*fqdyI5d&J~;b=lEPHBxq-D@G83j;0aD5~At<Lvw4O3078(mJ
z1bMov!^!8~p3Ztm3U%ju6K?!`ops@qtB*H_UH_e|j#A)2H0ZiY0w(hv@Sq7V&a0VG
zaIT8eV&;f3GP1y?GJ$OAV0E7_8lpXgHnsr`so{x}wD{bc34-@OW%V3H;7G0ehP^~>
zXwUAC>LDXdF+@eetxFE?iy%F(i=ZNk4t#q4<gs>qXh@n7Z&I6}AxS_50Bj9brV&Nj
zftb09@Shz=<`i{au6%iVWsvroQqi&VqD+c})!ioBwU4dkUlNuPgUVWP{6K^bYXi|$
zjSVy#?ozXNv#bq+e?FEY(|iggGDAM9WwL}gxmRZ7oHa{PA-=_>-RZ}yR|jZ6ieQ|*
zKVWl1kt4q7bu6&znuLFxvkh^MAZO-%n}nE9pgrx|sC}BzQOvX##yum9%G1B;bPfQx
zUZlKUl&~{DIIog~U%zOHKE$Ao&=<p^e2e@gHnpLyT|Z&%7olOC+HzLuH?gm$f;;h}
zMXPC;gimLXH%dUcZ!OJz{6OPOudF>=TBZ4Tgwh68DV)<y8^EgwHN5ALWTYV|n(If^
zWm>?CmZ^^U*B_K;i$e-}F6sKnzzD}!rFn3j&fgX(W4&M|=3Fwf@n(mwxIAhj9t}Tw
zN04r60<qAmI8w`kJA#QYg!GRjTkKa5e3e#-bFgeCY|7cF2fUU@FP-6_H4589iKiO+
zle<Z<dMWLo>XM8uq1X&+SFqRAXkm=f{d-LcYkRrBePKSgVcS+P&-W3Ts<0wk=B4=6
z0p~MvEib}=>f~lWW!|D4bN_${LJkD=vnA(+isUI5blilL*#h(PsbMP1?p(EMSdnP2
z*4bJzHrv5P_6)eu))N1`I)}3cSLZe|9<Y1((^pi|GA#>Hj|A*Sey-!FD<d=id}>3S
z3ld#&RD@T!s&M+TzXYq}TEw>($ZJk?N18v=a<l-4^GkzsIKyBS9zT`o;}lwJH7axK
z!;R_H;*|wX0L6zQf2m#`ZZ2JVt4y0*@tQUr7lY|c+)-}P4awz~@EG+AeNhgEJ6|k=
zF6AY^!AO(U+(bo%voO(K$#>=-4(qc-35g#;2F_2?IQ)dNyQy&DV@~$>RS0NM#;~-}
z7*J9?A~={}_T}Rai>DmBQ98t$#CAJW9r!$cX-JkpXv%A^VS`Yk%cCUTAA#2gpHuQn
ztCna%RV8OG2uX^A5+ci@-H%X=6>sVbq(yyafHAQH;C1aSoa60(CxD<i6D9*k8&&0J
zn5dE7SS@K3^=Q}_FkOmq$gXHci<lgz(?LM{t@bhRFlT#e^V;sM-X~gSTQZBdhQHRD
z28&lz>r%zkVNurZ^fCDuRkqcWoHq)}fWl4oEd6_$%Ikp=e>KP!<3FDCr^a#MmG|BK
zQE6V~(b9D3dC#e*ky%!avAPhFwPM<utUI4;j6zK%D*6QAeg^P&63U0gn68J@W-%Kg
zGGl4;B`VDi>xX<lgD<7Aj<DY_y|x4RT@%QySP(BsU(ZhfV?2#4)YRlvCztfS_R&ix
zR31UO1L!<bLyz->^DgyUf9^gmcG8#5H>laSuw`aOcCE1jQf2I9JN2<UWcDA!cmGPs
zw{LhW7BC$2B>jxz$Jlg>4#;6S>b|44>+21Wrj!_PKlL<aQA2fovdbeQB^4P!b9xcT
z1xB1;$s-+2eMlJ%&<CLTOB$KIr&CiBp1vh#dMuI9FVT7N&u>z&@H7U%-Vk+?3>qWR
zHX>z~F`ATI^O#zF?#{%vc{WCv^W%m1!4F8{Q~pWUJ6w-<%(rStn5%I{z#M1C9Nb;7
zb>8DP7KCOG5vQ;;g8DD*7??1;w|PAnP_dlcNGZ2k<DS*N_HB)}+P552reJRJ3KyJS
zFfTtnPC}e?Id1VBX5PmWADkNpY{pmC?$YnI7DovjGhfq<mQr2LVEJ2QoVYu#bV#&4
z`BpymcuthhRKiEWm%BIqo~E>S;Fr%DdX~f}^3c%BO$GU?Nz$lhmru-<CN<Psa}5M*
zpdSYGAML~Gztvr+bli5oavwbX=|l*=4S%;u3%2BxtH*l{5xeOE&@g%|IzQv>0Ym<@
z@r%@S-8EdYohHZ#T19Y1?Wu<1@K0z)pz8&ks@3(kprz=XUz!5!eCAdM)sNhTmiE2q
zkop@en*nF2itFm+E;C7Q+kc|x=EuDJ_i2^b_}MD9Apl&bFHkkRA|b~=RRP?koFZxn
z*`<=UGwk~#l+1cTim-G};PR@R9^lY}ODq{27cdacn!{PSJy`GJ4&{DdAY`=9y#R>+
z8=jB9!9pDf!pfxr!LcI#A9y}jFI%(!!R4D#m2=2tLhgCi(Cp(JNY-veK`u>A@U~QC
zS3O%E09Stxx&WZxo!giY+$>e}J|Ht(#Eh9-dtW}-Ck5vWYSyWVCue8;RBW~HIAeJ&
zrrYr^_(P(Ch^j3tZqe|-5Rj~$1I73BO)_V=7GLvH90meo8oPorb;dHDYfC(_)+b?l
z=L9ST*QzxU0iR9JbQ^C)^O{V|HR|9w(NuSyPpz1aOk4R}$w=G;2VhmbJWIxg?4_N^
zidy}f&^S6wa4-l<q(+xv>cwS1YG0`~l;e-9ns_vczJLNPg+}z8?9HU3g1FHhz+#)D
z19`Jg9@LtLNtCI|F|fvo8>zv82(Bxjf_M1n@ZpNd2-xXHYlq|EITi&uDYGh^js<&r
zf^=cwL!PVsGwQwc_K{d1Q|9D-m1zy~pIyBD;G3ZjT${>UIp9&5@eP#&!I;67>n4yu
zTq}q=EsxtWXE08Ho`AOxvq$A;uv}gfJXtTt`}+FZ!G%zeQSj@hguYMJLWH(*Fw>q#
zEJC`?o^Aj(M@rnZ<<xICM0=m%WtB?!KBqn|mA8#Mg-@4H%hCRF!diN#lkV!eP0f7=
zb#X#pb9+pknW{wi!?Vyhm%N!JeZlYJG|xXn)o?7=sT#H_Vy<pAEMKSu7oyK_1#NWI
zWO`)MkBK&RJKj0}ZyC|Ox@4#U$;cxJ8XW0=%gFy16g)ObMgdnC1epGTUfh|kM<ZmH
zf~Z_*mG~+|UV1!Hlir$<KDq<>^7shCt#>wNB<R1K;}s0Jk+&m49sPTHP^?Z1%khMD
z#q(j)>iecoYmDlBU>qnf2!47$k`3fIdUK0;mcFw{i9t7*6iVPMh-OwSmpEdx!D%A(
z6p>&SMxH}%=A^UkvypU`RUrN5v)W^`**uC1TF`2K&%$xS`a5LSk{mwJO@f_cq!lSH
zTY`BHhQD>yrb<zIJv!BcBu{G*A^14{*W*=msU!3Y!AqKu(p8MxPQk7Dr5os`KJ?wa
zRGoC;y0;h--7C7GG~iZDZIs2{&}=0aW5ImCLv$>G5pnn!uUxg$B@c2xF!QCXpmLA^
z!rPa|1#vVH@-J4qf$?ZL)>;Q{cCkzN;eK`JLUbN(D0s0S_N@6w^SAQ{E!tiV$qw=G
z_qEekcf~gAyjnE}_XHYMP~PRT3@wTV%XuSHP9fi&T7Ysi9*YkalaRr;q%|`Nos1|d
zFT%6(>Q6Z?kFLKPr<n7UFpr|j{uw#l$mj7l>{)$HNxQ>C&JK)e3(t-bBmX~0^A=4+
zh$Odf-~ORNe8c*G8S7$cX6EVwg6RZ({SO#(Y_DEBUV9?>tA9Xf+Rm7?FNA)Zg<Pg-
zt}%74Ub)W|-{L~zj7`)MId%8j=WDhWR0@r;gy_?B4Lb%Wcp{|-)Xz0o$j=+Wulr-9
z-S>L{C^I8p;PY1Jx%+g}L0{nW22_Pa`1LgA@bw(f10;Ohbm;T-d%hj>AQbTP1s=42
zJ>CH}zkuam=SW|#4?seL&(FKN$L!XS-2fn98;SO1>NuT|G5-sAcli`g*#CaJ*&p!n
zI(6Oub~S|*5C8;jgAj*b0f2+3_lMK_x$C~VFCfri*H6oC=fm^z6x1o8)#UES`_;$T
z&hWM1m&fbN!=l1<fT!2vX}CdvKk(&oW#Tv;3DhuPF}=V43ovzZ3BnO|czixM_W08N
z`n=^sihnr^+j?_Bd3^(ZAmt1C0Us7ucRy}Uk3TJ6G}^9lfV`mLf9XpwegTK0Z?gP9
z_xkTWK-at%^#1?^)NFq=^=0?>ecgPX2k5=MK4s?zynLKG5DNPFKd&Ou#-Hy#UWJDX
z-r>7{?S8SY=6ybdpZ9-k9t(c#E!G<d_I$nEIpp^P@6PAWAwE|30K?@0wf#K~V}gAB
zAaK!s`>&hr{Lh>1?W?h8+V;)(hwM2<!H?U`FM$6Sp5Nw%Zua}`wZZ2jU@sux{&Cyj
z>jN-6g=Aph-{ao*q5t)Ix+utT)AG6a%KLTqtnkI-@Bel1e12ckzg(Xm;Me(aa9<wq
z0bC3(e^k&qFmBf8?R#qN3~2uh`0@qbPlbcfP@i65cYT2Y_3><Z$K7ute4p31jt+Ic
zH36UTjDo#ykHf3WtBW#U(FfQ2?Yj?{4<A#41_FEz4(3H)Z36304hKj9k5}j2pz(q(
z<#!K!`WfKW4wd)TTYYZw)$nl+VuRP^=hW-&*Zbl_`1NO}z$y|xFQ0Loae)6Hz7c(X
z;~?XD!bZtP&UnqDwOf=aG#~Fja3k{Znx$)-5;aN}vY+lx#(k7TKCG-@>(xMbu=Q>&
z*m3>Yew2jXT+q?E7sWq^>*ManaHlUfPvGhvq1^g8FLFX}zo1}nUT?n!r0MlFJJ|Z0
z&w+zr+|gzV$-%26-TIUt36W1{xlX$iernmN$A#5g-xqAs@7c7|{kMFopmYft@pbVr
zcGCc#Lo!rM)BT}h>NjCL(1rK&zmHP|hzW@U&n1`|`cLFe1c4KBM*D+ubnDl9k%1S_
zj&L6^807o*h8sJ5FgtWprGl4-<U0iP*bZQx@WMy*lRYC6Do?chqS5V^w;1$05enin
z+5fXwG@`=>e&7p{tf1VZl_uj0tM>15KIs-Cv7PQd&2(p>n7a5Vp(cn$3&N}kT6#a3
z`IF+&LHLnb_9EPsEbSsFk6>_|;AE-$QEQ+6kuZ2X8<e9ofJe4ruNm{hN=8V>mBmi0
zj9xISY4?O!r^PIqV}U*&3?)G!$T{GW{YZDc!;dVD4kI6SoKB%r0atXx`3pZHpL5E&
zGpJO$g&&7ygJq#iRwhbT$BPZHm}DHAG=f7e)$W_(3yJy`9S3RZ<W18~=;5s83FK@z
z(hf~Gcx9v#-vguz(4aB)d`RS9Tw;2@O-woTPdfAqWHlK)7itTu)D{qLH+6W*34LOd
z5PhAleu7O&dA_v<SZ=@82DLkAF>pHK>(AfZS&r-bkEGYXKV-k(Z5C61opPQ7{^uhi
z;@f1u+p>wog^@2}B64y&&%&Co0C_09__{Bhv(`$`zaKu@q^lipyb$qdIc{kqq@!*;
zDmTgF<IQ%YB%){-S0IEhOzc=;py{OG_u`~d=bPkS()J!=^5lEQ&r9j=%yR~Ch_mW;
zWs5YxH=bM_L~W{=zRM{~LpBkZBc*COk;TYG4_ac(Kj-%Nc;*PjVQG@I1=_|Jgep9H
z&(%%Pb$wQ*Xtmg;-%hhc$Cu@Z!O&rtEgYk%4f9)rg(|#J;c!Jm#^#6xQ_PYGvs%nQ
zC$b$^ve(%uZVqXYSpw+Xm;XpHzHKQTXLIFbjmk*)S(C)ax8+DIaY?Iqs*3)2rb1Lz
zWDJ=wVe&$ti2qZ6Ad9l(QU;5|r6S^qEa-#(s1{YR-lE5oB`Ow@;hd+qSfR8hg~Gm7
zjHZZsOr6CimRxRmC;EQ3j3yQY+C!7eE1F0)>+Z0;MMKO}9IlvLTA(Hg^U;0P5a=wS
z^4%twhc@609$Jkp(7ki3WIeQ=@Xd27Y14gR_Yru^(@QK1u|Un0b3LtKp%KV(#!y<Y
z)NY~93iD9~#}U=x(3+-*hMWP77Gri_4(aBcr;tpOQgL$<G}Hq+_fjK02QSQ*O@Cgz
zxBcR|ac2!(-Ps?t7MtFuj<khs!J-~!<nrt;nV0K@aQg)QKT@p4V4OlVd1u*!f^3RH
zzpaWQ1nKdeVf|`*5X#qf_YHP49Yt<N3kw~oy=JP7?ufGW*fY@^>HKY){;6`SazC(Y
zi^GWjxUK;9cj`ldA<luHpEpH!tK{OCOAG}0qM7-U7RTy_X#vLwDOOc!5^>J6&vRHg
zpc{cBVyJ>e(jC_@UdeUX)t#s7h{EAHi~plj?mQyIG<!uR+~%ni*7muNausfO)X$yj
zj;ma(jpUw-1aQND1QFzf=5R!{Gp&@v6E@yA#lOf?9WLi>jgTm36mhXaNG(fFvZ<G6
zCD0Aq=yT;LIS3^2t&=-9d)E>ef$k5D#`RXQ%VV6$$F~-lr5?OQcN#|phCBQtghjAL
zMO!PQvdHE>8oZ>8wzEb!;5x@`+v<*K4oiplwewndP{IcF!koi<u__^t-M`WHxUkp3
z;OUgpk8tqQcVGLnSpso_pG;h_4IO1d<$QGAonmv=bTiX-aS5$Y?AoC!nvq$2tX(Z`
zI^+6@B}1XrXSZ+(nP_0g-4)=R`;T;84-u}_^SyGq?3M+uezBd#ar^7=aCPA5phKec
z^mbFebLFR{WD>$0FE=t)=M%;1&S4hM(dO$;Jhpa3=CvDsCi7goF_S{)nV&`fkHed7
zzw_{|l$Am(3diFgKD*A--{$`7GMY0YlMblM+ABdlj%`Zu&ic`|VhMLanj)q!$(M#r
z__A%0CX#)(dheMVZ3@H32h&(2*+a<d?S1Dws6!f`ZN>I_U!plfxx9E~)MmOuGyf4~
zvFm3u?f#nIyw0vC$>XommX}$+jj92VHioUmQEbke@@Cnpj3IAwrcxcZ#SJIC4aN|+
zQ6n_^o%`q=l5M^CZqB<2^nNZ8J<Q?jldjg^M%retOuaO(uuBfLKArgZnPSc5@mrfP
zST@#1nB<v)s&w85v(GX(mzkr$H~%otje8yVT*=CB4x#mJEMXagI=rbjdZ$Bx(zNYX
zLmd{F+~5-aq3R-hYT8zdx%gOGOkD3G(RbqeR8iPjG15j-<dyV3yy*I4M|HlZvdBwC
z%p{Jut$D(|ZGDzwv-jFfNvHT`Z`Nc7OWS@Z-G|Co#p>KM_V?yf^yMeZ^mz(S$)|vi
zuw3-yQJuyTo5F9(t9>EE!=8*B%w(6d42SDiV`qKa+2|Rs>+TY!y{zuyb4v3`)VfaI
zp1Stc$8WNAplQmiXCS_ttPndzIH!-iRMg~kf-XFRdKqcqiVquOtC4(Z-6V(4JL}HA
zUdOSyY~KC6{flNu*Y1#hdH?5`75-DHXi&p?o4)KSX0US;6t~=z=6zJoQRE$@l+8}c
zVh?q>mx{beoY!aU^`!DN{b2C>c#IeLj}WhYoon7ODu&^%{Zt$GA=%m~vq~=~baQM*
ze8h8UQh1pw;<8q>mvir@;EXczaVRlacu|jFyiUU?t3kBIVCpjFF+L>**#o3!qkX|a
z(#tG(K#NVDl*gIg7(0hk*<)KVdnwg#H;L6<1w?{Mj@b0Lu$<;Gt&NxHa$Ru3=)91E
z5;O8dN-AmXf)&1G$_#03rqmWg8mnoif2zF6))vZ_wpHPI?CeW|JML@}8W8^Vyl1)-
zVrvT^Qn#F`Z0H$v2GBUlYtE_nk6$-Z+Q^WtH5c|UVv6vhKKoLU;f4g#@JE$w!9xOA
zF4N8JzgBBkG|u_vD7aZn^7=*$^ZJ+H+|MUDxpGPoSN(Hu_v?;2hn;eN*ES=XZnx<3
zY#F<7wdnHT1bf6Ph=V#?VP=+w(c)q&>bnmF5vQ>Rt&s*-RxpqGreSn-pgG5WH@BM3
zIL2Vkpu~LaTb)Q4lk@=zcV2381Ja67ew#~ZMdR9kqOJYV;oywzR}bGaS$xb58>KxT
ztfRC9j*{;wuu7Z(^Do#7Jg&g8BZNEbUtgpQyX^8H+0}RqaR)WR;I<kgGwPF_L`Y7c
z&BiRgo$}8G<Dm2(b%GFk5yb_iR*~7l^9$gKxkN6>1LLgh?l~u>?+E&=CVjp5%7nDK
zmZ=sWAZ4+8)AA+|n)pO+Cewd;LQyR(s?*jS$$*cJB%{lNRc`@GrwNWLEA@vKlYkd>
z4&ItG%xg3m&1AL99rT%r0j{{8co|HDKKdXK%f%YSi5um$FTC{;Twrwc6iSI&EV`do
zpw7!k)Stcxl@TTI`~IZPj1t1I6u?%H{$3`8Asa-O0gmm0prkW>%5jQQL8f=$+D$m9
zb1aC+n!vMRZ9}D;&)fAwsnKj}izPOFZ>>I>C*#;ae6?|O^cZPQSaB??C;&zbAD%5g
z=6rWhma~{@v^F*NDa&mJ>PGR+r*f9^lbN4oPKe_&o0g*3f!zLF<l=jf4K`yTj*%a6
zTaKLYr*#%t(YQen0Rp7dA3jb=CDTP7jh8Gp#4Jh7q!ngQL>sJ7t5sBs<e_&+qibH(
z%$YjJP@>YkIgo;m83|FqG@e=)4VqGj%D_esqFp!$)SZqg8$g!}qRj%wbeSHR_DuHC
zrcQqLjrB1d)txqFLYmp}sL_&S>EL~WlGx)~=q#BoUT4t@TXYkP6S+CzEE~Po&L_3j
z@mDtHpxIC_S>ZD;uCx<V*^DY{8^OCzh%IYFm$ReY*igUr)_ZQFYPcAMO`)N%%Hzdb
zadSY&==)C<FKCPRzOj5BHPOQb+N!qpq+Q{ntI;k*N&1?j%c;?3RbdG4c`~_7Tc|hY
zOCfmW4mwI*jK=`IBL?}vTAuMoz+SeL+DlVO-#-FFG>a@a-t=W3eksnjDrQK@JjF(p
zpi7~UOFoq{sREg&SW(bKe;j4hN9-r$COLQ}<ztJOs(=o?cUN5sey;0jCQ&NfH>hKX
z9Sj0G(cNZ%qVtnJ^zN-ma-tslk&Q6mCKuwY?va)w=vGHq#_iD}o51jC7nJyEEaUVc
z<nG%bl#=FXbrRxT54I^)+<*TGc^TDwOjhbDT$PwubCjq?aF#Wsc-9P!0;E`0r3tJK
z+&wx<2=F!l?*7lbiY&$4#6K?%yYx63U64P;pp<$iyv`XDMS~vc{6|F_2`!A6D_g{o
zBixV#FK8Ce<!dX7hn4k+hxM)arS2Er7+Goj&Snq><xjgp7m1M~nrJ9}9#7iCAusX4
zNf<G|m?%T^2^5JuDxZiWpk&lg7pL|Zr2*@lkSpU`3%<nU_rBI8tcWtEUBwf>a@A6A
z6(=$?_R5-hTbwWQxZm{{WE_M_1*l@wgei6*6%opbuo8TzPsnmgG+7oz-=msML52f*
z)JeU;Ov9^an0X@$?Hm`5+<lpPlGIT!oGP7y9W=10Y-mj5$x2bNNgH6Rl2QrDyggAr
zM^=<-3t71a<VZcW8v=l#yD2#t9_q;r<RIi)FwNx>`q8R#Buh_$rsyv-)(W)4iVCt(
z5YV!;Xy;yj4@4+%ETy0$Qz8~<P9RoDMHu2$S7PTUz4+1kom<U{%ta10FN7<*E#TDh
z`}f5hO!yvGrf~Y(T%}CN87Y}$*{GwG3U&>Q<mRFzocjtgDujk<W(|x*Do6HG?T#wf
zl2Ia&HNSlCU8yR5@2dijq{$mUiCoPilQtfGx|=&#=QOBBYHHfdk_frT6Ba&)hXKO~
zO}Kj?V+as3V@MawH(6ZnBK2r|ZVfM!8Imm&nBMYCk5uTudj{ABUv$5!;Cuh6GFwJO
zX$FwVLgS{MSKfV>kv5Fc3Le5sf0{Y&m}dP-Df?@(t-ySP7f;H1l&=hZuV8h(2}R8?
zhmR<{M97mh0xI|D(EMli-l<>VmIj$gZIiDhW-cw7xaao%V}j2vV|p<R^d*UZkJiI!
zb;8isI&`ceVU9p7V+6bIUop3;8=BBt$XrV(BWt8UYEdn|)tN81Ngmr%#mC*y>&jLy
zLsoH?3|U%fiBh}#v;0&6dHzUh*ffu=gbEF<JdU`adkgiT%N7u|mxwJQq=E(BRW2B5
zJip0i9XJ)zY{u)cGy!!W_mDKYE^T#z;aX8N(o!TsPQxZFo4u|yAsyf?rkLZPga~ik
zb<Xdl7YkWO2GaL`*g}cRe0KMDfStv6eQ&lK3>4m{mMEQQEoD_=wMFdY+S+(UX#-r<
zMNHFGR0z#9XSm?)G3>KEhPN{#q^w~B>~8{(eYqXBe%a!U44Jl5?pKzHcNqV}e~L&@
zq0Yh?8HHH5v}jY%ugHm|!lYch)agU2qs;4>@;o!NAs(+Ikbl5_v>Qg*eZ6?nJ+4xx
zgrt|}yiHpaEvj>3T$CQ<&3LgwAzWcSsV=PiyGoP|zmMKq@@QhvG!IYqXhQfXgOFLe
zHwn0OrtTc4A{R?qo;7ZxxIl`?J;BYl^2V|KNOs+LG1@tNj!e01m0@>YI!wDtzvq-Z
z->%ay?OO%RfuygdmN}@g)XKE{m6I&Op;FzHshv8rM01qka0gI|sIDVrQh4EGF{xwP
z{7*&!-fA#^GbKuEGfHu3WDnqlvGuh6R%bO4C!qJzB;)#YM2m1dR@t7Zp#fOUKr~<v
z{gdjJlW6kI2{V}m@&6e1#ix%E3pnA;lJd&Dmt?icNQ_kLGyF+Wi7Z+=$Q4PE7E77T
z)4Z?kvW-?=$0%*0muBAeZDx2bQfB^>)M*Ne!F-$J20_2XL%8lkRu*e*k$?3StL?q|
zTPhxU=e(jGPY!cH8$qWkwZJ7~bVOOEp2j*Lca&MC(yN`JixE45l;T!)gvvdST->{c
zJ1C^<KnokV%vvT>2;;p-bs+|s45RgzU$NZzL#1x=(fVRJlMfVJ5&En!QAJFov+7Yx
zHb>aT9u-385m-XahNH;c=DX!P?RZAVao$dmcYYEhi~7w_3>coLhPJ<ciD58wE=p^d
zi)Bq79&u6WWy)F6WG|qJ8TpIiiJVSuRf~mQp71cbdx8vNgCSEsVtik9{Euiu05K83
z%|5J^miIzW@_XqYkRQu~r=wHeBl*Pjgb8n&!Do?D9<1KOV$*(LW;{b4Ydfj3o>C4Q
zrE#b<raL$OtbM0EV`V=5i150k=)x24OWyxEnQ-azQ*9cI{rJ}KyogRt^KSY-s+%qH
zgP=1%)a`wt?{ky};PjQ)n@9`+ziK+G679ffH^J50py-aW&v81-WkxPc!1Y3K?(s$`
zq3=z8fnM{u63O%X`PnOHZ<A*G-)-WLx3&qAhIzriTO<tTn2S%&5;kCdPu#^3=)p~^
z`RFLL8pbovuixqZ>e+Qw%W*y;rW?ljR^|Nq6VJgO=EFpdKzK<^If0pssELty`~!wD
zuaa{f{&5;xtda(jJ`lZ<hSL}k%=SptjI|uZkIJ$*V()J2=Fe%p{ZR?)>EzcuEQEPp
zhRft*!{KJWnI>D1sk^U{P?0A;Q;c7ZKlvz&`k_W)JQI>UAY_(FNAn#HS7e%*&>DN%
zWUfshRVhs`g<;ZxS`AzaKlQqhowv`GP29+$uK*6cr7KZPsSvL9$c^+nLb7r2P)SCS
zuktkBeOKbhV||%sZ$8$69wGuXjgNTRrnTP?TV>3!yV2C@ud;2d9F@W0%VxV?*A825
zFiristtr*eNd;<tOyP=!GjR;D3L4SBK_EJORT|U9-e`bgI+y9v=moVZH=ab=U4KCq
z69zq|3>nN`2LP3uM0QWC#Rdbu+LLW0{jqXFVG@ZBnphZ(XyYCf2GU4MVHC9p3R<|<
zSw=NRX*KtGRIMsk*GNpK^`K!L*Hd4%Z%KKvK6m%>9u?sZ%lwEaBfgtiw-R;-23b|f
zNG*vHI?0hE_OqgFWL3u418kJ8%9!uxuwjJk;;U*HH2JJKZ<TJd4e0u*_3PwiIdsAn
z3rRT9MXcx~6GF<QK~7FXh8;(_Lyq&jk253T3(W-^>JeGj=pfsKNr*Mwz8~dgdSxfk
zn*(LGF+0L#-~OLf=~dp5MG>W-uWzIxQ6Y9lJY>hXr_(PC&3L&DGR9x_k>eLJHaQKy
zEwZr-uE92+W*6(eR=M8fy(TN_Mm}uE@t15dd-KCaFKTjRGUAwr7Y?!!Hm2EV5>L#4
z13{b#JQZdf-$uFpyFwRsLMV&t{HN$m4Jw<5&SV7HsAvK>m%+mKG+*+>_2>d0r%-Fq
z;M|HXON(1!b-={_#zz%#pot06h+6EWX8ahD4W>CV;tLMun#OZ!Ep)xD7^#%^eGpJK
zVW{C}#_DU+8>%#(h>EjLCIz_@mdTh6pk+E~VXi7|O`0JkVjTE-8&4|pI2C4>oT$u$
zKX@XV?%ydycWL4VmavABhLF?v=PT?zs1IQIszd-%<KEoaqb?F6IluROm_fnA2O2(F
zk2gbbQwe}UT}-P=v?ypx41CyZ3k{I&q>^GVI)isFoHmq@BWc(X*De2yls=#?;fJbF
zpAAy902l2)DNbroMp9G!HBk+!mF#o;WK7Ng*}9wwbhl}APiP2@*~7_9UG8MsDfh~i
zOdjLO&Yz~lmn)Z5<G)g=s2ndjf)Z&RoB?um6($ViOG+QzsS~&Tpt!j+Wx$Yu{GpGX
z#wSV%qnxAcQn^>Gl(Pa&m6*P|fu>54TrGvDI$=Q4jHwcVB6W%R>mPFlEfhjn2Rwz=
zAlX!to^``G9JChIxhTCu15J}WIe8M11L*(iY!guwT1(7-wk7$bC&(+vW@3o1s1Tf1
zkqXc&D<(U4&IP<Ghr+FTT-koptm#M4Q=*#XSCm4ji#=7AApb0ZQfKY0$T}5U<^zu6
zi5x0nk<7ISEc+zImz=pSO-X3UZFa^jktIq)^za1_kX7-_Q-kZPspd-G`Mf;M2Mvsu
zcm)uM1xbPCl1FPa<@v9GNna&Lkgo1EVbZu3-)$1GDEglev0afNo=7pWNN&mbvx;P6
z38XxQH00*XvOsV25yL&ha{jc&lrXL)cgFq)x?2KchI#j#uTT5G`irIXPyS<0YVBDZ
zhE=J7QcI+^xPh8zwsZ>m_(^q{rHb5qSiv~C8-kG*OuGMv{cR0|If9Xt5$u$;vz8nK
z{bs3p@|1+mEO`}&QnzgvO_dzETim~<Q|q!fRo3lrP*eH_NGI+j`#L~F$G5Q<Vg_mi
zCvN%p30-$9vAu;RJsz4o`yOPFhKyoS>Xz!FE|SfTU`LuVFMDHS-7e2O6_{p5n&Qw>
zWigQ_58+O=JG>aL)bUt#zDffrG_Hwtou!Q1b;XWI;R#slD96PL_BmMVGRH;Py|T<9
zM3-sSU~LUaW0_i^P<QibnNZ~n%ClVW-8#wp85aqYly%TrcAPqMby9{ijnZnQ()_=y
zqH{K9YCOg{4@>hd1=dBstjw!nynA%A5a4%%&DW)_-z1a|u56Rv`O7XBl(_T5Gn|_g
zJ0q32`!>-4Whmc&uO9OvW2xgqhN{7c0mY$RrsJ>M{$kRqL^$$(Bx3Pq>@a00IC$?m
zX<HCGZoS$`oF9_z;CWtEM32b*a_|06l4^z#HuS|;{oyjd+VZoB-Yv~wvPs_AiV}rN
z_2BN=dO7WKX5mWN^2q#6M{mrEnS9r~zOkn6qw246>2|jWVCWa`jK(@Nwgys$*@9fI
zneadh$-K?KmVF0|S}3MCN*o15L_tmutkL?5bwCP6muU~^&5lJ|zX{ZwaEno2i-bX6
zi-zY~+dFsF^~3*yn#t^*KPmSVR4f~<<8n%-I4F#s%1buT!(+R@73kxGN+^1K5A4GI
zHYbG+a#Qi;&snyOhOTXO7>C>EMl>4y?X})!XuTy!7rv3faj0BdmhH^T_J(jDeebKK
zbUma-=OPLKiF6TY_2aQGwMZ5}c2ac<Bo`ZpkuSy6$8rh0Eo?(&<M^>u5DDUIvYo}5
z&JwJEA4ga#Y6m}?IcjZa`>4laj0A*?GLT%Ae&H3&4&Rd@8Ki;OqZLZ_pZ2@_y8xM8
z<jzKdAe3dux*TU-g+HUpTVXQ((^lkCvs}{g_$?88Saj&(ZRu^r{B$O#ROi1bq4io!
zU9POi+d?<s=0@-01x0WHYzf{Upa>0;U*XNyay<66Zrp1}uB<iQR<@s|#Kb#pj-LPE
za6*y9zj<X&=D4;!Hyfaq?Dkm7K=C1sX04uP-YS75)c7};SB|NKmu83-#*P&NB#GfY
z&J4o!_v6)J5Dg+_nZ|R5;GXR-EPlfY9*%t51nbUeo(s%}>GR)M?Q>#oGwDa@sX0K-
zGJw8lH-l0j_wGZPTw7g$-7c{t2hk=t*ie<BqWjb8m5l8X=fs~9>2`+DIupNzcaXJ@
zwc4v5U!t4~gJb$(GoTM|Q+y3FR~o`<^UBcMCF3;zwJ+Y_qY^U;(r7kD@`zK~9!a(O
zSU*TboW@I9=899ouK_LvrhZSg>qXGaQ&uuDRR61(h0_=n;S9Pz%*Hb&N@y4v?AMG3
zv%ogOF=jHkx5cns_0oN5|A9&O#Q$3DFcpmo<tET9rqDxkQZIlsf5UM$0vcuo>oPX9
ziK6ncZ?VyEy`ZguNLb`$Vzx_b(7q!EfUQeInI4*M7nW;tWhxMmtcq!kxKyN^Okp-P
zC>N#b@*j7~AVxy9QZfaH4Rgelj(cuS!VI?ScE?k^&NdRWOh!C*_@OToT-uCLG8ouz
z9v{Q0r57vwJ!#~r(R*Or$NW3r^4k_@J^OtBomZfst}5j@q&R=3>czMb)ZHq$lH}=l
z7IYwQl);X8k9ncF%|5em^eB+&xnUnGE#+X6Zl8XF`Y7MB(>o=hZ3p7Kv;3A&aZ0uK
zf1E$$?2<w$sT**3O4yTh3er+ZHtr>DUgE~Y;_T_yxmFn&FFVpT-ujP(M>2=C$Mac(
z-3B9s!bXSObddg1MN-<s358fm7dX<Bu474uP<^FJ<4&UfSx$5uu0MW<ijIZ^-|E5m
zOy|Y86T(*A?+NSWz-aM0Gtlks3q1Z+8>GEdlavN|np395og@iim4G(pz!G$uEo<~b
zp>mu6*SVM0Bs>je7P5!j+55Jjd)qO__m6&#pW?+d52i1Ub^#^GYs??plY!mmrO4oF
zJG^NDZZb?n@4OKf-NazA6|XfM8+(wrG<=Y+9JE!2^M+$*;;t5Vs^XbOIlAQ0G%bEu
zxn2intg{-*Z7|iQgVFvknyxx7s^@DjEFDWKh;(=N(gxk#jlj}Ku1X0=cc*lBO1N}N
zH;6P!D^d#h-sSsy|5)||eD2JhxpU5W&hwm^JA=W8VW-)sv{F4W;gFfaP(i$QsNzmn
z(?zw27G_K83CS}F>$8d6d}Hk0cTqgPiUJ#Bo%N@#qjxs=Zkw-3Sw|JA_k-?BGErrO
zUaZc>=8p)>$nDmp<${#P7aV)p-@bHjw&ryi(B)>GZ<&w|QT!}~@765_rp%hPT<}}m
zbdm`H-8U(%6a(ECq%d4~Zy3Fb#0{zUJBaELCD-1+t}YgpUTL-tSUKYmQG8r2o*g2W
z15D_W-%oKDNBp&qjw!+7F*7<G^2t=WHvYiUNNI6=0S|w|AL33ipOSZ65jB354wzjL
ze%N_u9sFt(uf1<HtmeT4W{L+9RkTJ9Wa70Puoy%CZStzOSlqm@g(y4T*w#6*s<$T8
z(o04g-LVWJ;mrhnmdD$J^VXxj@Y*9z0hl2V*rmZ<Haf^qHg<-XD`$3xRUVxo+R!-G
zqlI$UNi4EAez<*e@tv~aKcn0Q@0~sJM$)15W0CX-hCM$-^YH3L$p!z$p(LERxl1%2
zW)S;h@NuDVxoqVR%~*Tk+hZD5?l(%6cWl*{rOD!$FM>D8Q%dee+T{o2H)_&gsp>W>
zfC(mb{+pd<J^3dp3!9k{%b9Irmj6wDKPIhVV$hcE1t*UVM)QJXHMn5$e+kDHS#>yV
ztD@t7q8<;8S#Pa4V%_{q<;FUoKm1;lK(zG&%Hu?szA*OHXC1PH+kch$LQJST@m;t3
z$cKRIL)M>W+659sA=lLXL0h7fa438<3v;l|(_rbEd+^%JMSrux+XaIAwBzsWcQY|T
z?<?+C705f>eP%tEE^vsR!Un^AT3fD?yVBPiwn09FHW**R`(Ds<0@ujtdcN*jhoYA3
zZP8xtK8y6v6HA<3`T6~ee`<0XJ`y|ek|pVRn7NDpNFw{Y96qnz)iO9B-u8_l7Tay{
z-YovQdC9hKo@MW+8ujb>L=dBXr1e+r*z?}fs(@~;f0^5LvO67S$tJNeJkG#E5dLs<
zqF(ry{;{9*>X}pDnCm2WKpo~$BcqVNY{E><g}0e@k%Xq#hLvk1F1WQ?frvcGIo;EM
z?xyCT3YP3uPSAiM5Z+GS$Jg1x$(WWyU1#F$--0wHBWw9WGE5g_BR?M+A@bUwca7W@
zTv?4wZhgddK*@c+ezv;e!;XF`v%Oa*XC?YBaVSF2FIBRW!>G^!@DdX~-5RibJ;JIc
z<F1@VG!FIWRBek{TXIt?!6~ii9D9@@Eonb94w5BYe(-zZ88srO+E~VGi39s}$%RLN
zx2**A{!#y?0b$i#m0m5jUhW6+^m!#WI{QYdre%oH0cF$6Nb42$zMsaK&Ib*uNJBCx
z<Tjqej!e#MIS_g=N-~cztB1|4q3?7MsY>MqiP-Cg$@LT`ZoDQF8H#9FM!Jv4UMF=c
zEnzH`!`=I%QMbSLc;h(1$(i#9Lb9VIs+f&N*xZ~!)Rvam&n-+)HTUD^5B_3{GF>F3
z<Ce!Y!ByTKeRb7xdH;879U>|yEkyUTzHeZj0?n|m$?T+iF@FH}EjQRqUU6vuZc>C_
z?A*vP8+ZlyKh{5px0{%e%271*6g{S(wOpFOy?e{Jz|FQ#e8=if-@*BB-haTJ6z;?m
z9fLQ-u?})YYWdBSD9Vx)_dY+e%zW+^BpHl*#0R&Cy9v+GO8*ldZ#^vGcRc*Xvc$$G
zfZ{967*3@Z`R{9W%C2g7$}Yb9ml6CjWl4xhw25jO&K$L!5?b1@7j)+nmB&{|`vmji
zaXic$xDK<uX*w`T)G!m16PI8tFel9>3iks4sNf)ZK6@v>Ty0Y`btFAW#VuP!lbl(b
zG;9R$sfpU;rI%|v6x58Cd%Uayl*G2ZWeSXX=2UJTzidW<d6?v$=l_f+DDp$lMW%-h
zme$abkF7>W2%ky{;SxnRcEj<;0h;mmz<Qh62~of&lNqP{Wluf<V~jg#^l+)|<K|d?
zTyn#|L72>UGfmO<VuTGU<R~=4CNavN(de1qhNyn)5r-&K=H2Jjw-OC2b^zS#p*7TR
zv8zw&!=oBx+*IUrmz*LjR=o;L)LL+?`;@P!L`MYA=2%|L(lq&#oq3hlwRbNo46I=u
zHi(gH-Fdc(Z_B1FV#Q{7)DwsGscrQ^1#YGjDStg?wa8L~W}R)J#n{U^u{pD^XZNcR
zqK3oRHA=lQJmA04%HLBaZS~*vYq}#1N#B<KH?XD(Dw3P&s}521tXl}-(aOfUI4u>V
zPP!3dL-|Fb7)%3vtR3EkMQGvf`d$39^;LiYvi0<nmpxl%t#l}sO^T6Yx+G8brq-@I
zPY=!+dY*IMG{Z2&cfcB}sqcJH@xQfSV>I{iBx$~LI{$}M(0Ar^5sD)L&mJiOd5g72
zwiE8Q%eYLT8vIW2l<i^<UCQ$({3<?T%1t)aob`WFr)3gM4sHx)F4~KEsY(+0T(GBe
z+Mb2|1ynNvG0f=|>sRP*!fMXE&zBaI@ob!*(n>hiiO#S%Zo2_4W~Yj@p9ZCG(^Eyk
zyqbjX=bEO=u;mg~o{bYzh8yGbxhY$cyJUD`DTO`L;HM1ckFD&r`6wLwbZ<A=9O(Q^
zuS>V!WSYE;WG=S|qqyYqdBKOX@h{*3^aH16mK8?=uUNP>-cZ>&bj~kJ+*SJ(5U&=>
z&L4XPXD2nAPL_>`B`8o!`2CV`x0Gn!r9|CM%o7VYofJh&X`8UP9^C>gV{!K6{`IMu
zSjEz2ewi3DTG0ovMey-*d=N8Sy@<|CCyAi$O=2J*B};D}$hMCX8y7qBA2ieU_h6dC
zV(S{Gbi7&mn)mX`Y((d~8?mQ1pyxlS%i7UFx5A&pv6>7){ZcmHpR3SM+|72IxgD=T
z1y5AXG5Ym}+5<QuL*t8EbY*VnwwAp?n;*gjN4wmh{U&yCMJY(~@Bsxy*Vym|ba%~5
z;|ye(&h2C<Fyh@~i))x%cQ5}^Y1)0VN7=xN9jh<uLD|Bw<tow?Rqs)&$~Y8>bb5x^
z5S=;mg8a{A1J4ReK0l|owD_qJjQfeT2i-JzIfQ%kHpKs>J7-~!n@00?nQ2k<>$|%2
zBms~LU>T!qvQ~IU*u>FBw*rpDDvazHkN+{Yo#8hsKh-3c*F2zn#bUafZZw`t!y)G3
znVq9S330wU$q@|!VywSyGx9k+PK!(nO0E0@9>>9n$z**Z6v|Be2u#9M_;!YKh2=}Z
z+nH#w@Fcr>nzqPy%6=h7c8;-r$#?*Gz+7HSm0);7(;-LFatsgh9Rr|PR)sS0&&O|`
zxWyW)5%Th|iaO@n&X8t5*MW>Ts<Z?rIia&G%YRAt{P06Crp*9TvZk7<U94ZQ570fX
zGKJG#X1LuL!;FBlSkm+<`_l!o(9laA_;Li%Sv27v9D>iex}^okArzYF-@f$aJX0yn
zo!rib1*vDm&2^rM{O)%Lnq_}Haw9=ywph>KX!?(c=g1U;Q=hg|<C_c@yM(P)h@Q4D
z@wCNtJQBD!c|USN#g$dgv7TDDNjy-l2--hH8W-09pM3{T;cyMrf{i}XwCFpCtt}p-
z=NIg4GO2=;cK-N|_c65b$}$5VyG!76&*##iwbiO+Bav`4JT7+M?;gEse6>E-G07~k
zdd6?T$8*m=m0kR{?mdNuyW^50g$8|Tr*Fkd&}N;R>gAILn>;$}2|lMGuS@N(zsQ3O
z9b+w(-SJjMQ>AomS{7GaROg(53MmA)^HX}%=C}nJE=QSxa`#FH88#w#wDDg&!-mOt
zroVVkJY!{7mAzbd-#mRRS+KYEmt+VS2`VFd<30-JZhtp2tP6H)0AooCiqr?@B8zxB
z<a%=y+{b6{+|0J@NP=u&)_p-YK<$m}I{+m%kq+fICj}+u;Mo}Qfb|lC5>xP!HKN(g
zVhmNIl^9LK)!hk5hhFdmxlb!w#tWo-MlZWFtnM&GFUZ?XH1_9;#_}0Qm%*VHH+7fG
zz}q%C2af<5>F+l#dBITwrZS@H5rYUj9Lwjcm{W;wK{36<P_I~`uf??A7F;vxcnkK(
zr%8uC)Vv(-?t(As^`~A)Sn%x4@Cd(oQg=RM8YChtcHuY-6W4d_r+)TsAI)e*EGX4m
zEuZfn`9<M-Z>K}X$A!7+=YmZvvDR}}z4G+nS5I@DeF3{C^{1&0GM#HsnnQ)ci~wvR
ziRRtXT;&8aT%LGoH9=SBxfrrQMo9bYZ1@XZ-4jSqj(o(?vA1DSOP?aA%tOMNv&!A_
z!Vy#A5sylpK!qWbV?vgY5QjGWgGn%M!kF7sBNjL5gylV*$NBJ|5pJyJq%yHdUHF#h
z^OG*PpM~(|a#$M5*v)ksig~!LjXq&hB1L;<eu{$@(aRGxL&h+M4ybKHdH~*fjYDYl
z3Hd1XIAuuM7I|k^T|)Xdc+11(@Z#@J>M^|0HI=Ka(}grSNaisQ$%!dhOwb0g$wDoA
z2ePd<!cK&TaNwE1<2YXi9!C)TP-^&!`vGkR=6Jk}F#tCQ7Zo#C*{aTrKELdF-|SQ>
zWDBj1=vCnIiq(WNR(qkRY)Cn~#A+(LN3YmxuO?NHeg*Im#?cO}xm-wtL&3-}#^~YV
zO+!=6NL<aVqcSGmBW!_v@@C1(;Z_|mjYiyfcHEUZ<xtu2r^Kl8mnO_!OMj~oWr$nf
zwviW`nMfmZt2~rbr0uSB;3LgVynnNuNL0K2HCt$agG3kW)P=c?aMnA+6~|gdd!KyP
zue0;<nXrpXET5`-^bc+*y4YPspOLI3vYAv8UvY}4CX@v90cF+CqnTSN5$x}O=r2p%
zryg&+0$+pK)(TffOI)QJey9@(8P<-eUjZb^leaHL(8i7}0YnxH7PTJkIf}AJ&#N(Q
zgET86j54sKJHx&OZO!0iZi$94r^LK}B6vX{LcYs=-~S0ih}zh8&n+YY*$z#j@6T_3
zn0Y>Dwi^>{9$rI*Su>x)?oGW{|D^>v%J%y!ys*}R(d#j@6T~Hh2bd~+o>z4;Sn>UH
zduwyTa=`qJ`D55)f$*6P@2k@3F7L~=_xmUuiqMju0DF)#&1r8yFiWrGGA&po_nKPD
zRa}Eox_e-uE;1)>Ap2Q)D!&rv2w9bY=kQzRHn$%C)AeTBVU_)kD^8e!EoBBwu3+8D
z=iNu%(iSXYz1i5gN2<N-bJVeOM3f{AtaxBRex{2O3m+it+f>MLM#8Ya+K!JOa}+yv
z8*`+6@-}FnOKHP6Kzpn7rI;gAO7}xxNc(Fvva)kwuQ=Yc$L5~<yzcCh4i1iNLEhd)
zd-;=6$FBiYItCAN#pL|v@VaHw53zFc8QUDgr2k8A@QSW3&jEL)x9$hwP%^KyocC1?
zN%6Yg#0}{IHfdYD?pC6M&b)Rt|1;SF32&X;M`X#R2SqubI5H)4>FdL_ebCaDqM%0u
zRF`D|qQ3h6E3?Uq|Avw(05}I(Uq*&|BUvSq2b0%|Zz%N8?FdHIeXBA5q&-tc_XB7k
z37dd4ZTKr&L;q2N$pOv8MT*%FYqD3&&<GGMMHh$ML>GNd&7SyjJ-|sbi6p;|3kdEC
zjd_R4?1FL)CK9;8E-Cc1V#!Z`V4}ln!ZJd8Q1(-knqgZk02}K1>pP@lP6`|Pf1FjP
zm-ScMcH<dv>-qz2a2;sqRy*knQdPu{vsXFEyIG3Au*g;;A}`gR6XW(6O;>9t^bM+F
z5E*&_8IUb!jl)($ZQX6XD1Tm^lHQDGki%m*qKocT_9xzbxNQD)nOtJ2@91XGR_~vA
zDFy`#%R8l<XR@RG&&zfeYblBrc|BPbM%-@Kyc1YIgj!6331p|4o&MTxv=3A0gj-{4
zP1wjDm-`EO2pyNlhXhKTp2@iX$m%GROrbiCxCs}e2(x~jd0C1tQrh?UA)Yyl-`e9H
zeQeX2|K+1gl6LU?NH(afrA^1#J)*a+u`l}>U5z+#(J!6+PhS(VLS%Z}u1hXYx>)(L
zF{^B+fUG|7D<cPKf2Ovvrb&gPUuQ*xa>~lHX`0~e*AczErUkqzX=R?BUhT2Bg~x9&
zazDM=(;)e<sS#1>b6QX(Iq%MsEmw_1PAXQPk-@CFv_fyPGV@X=;$6u6`GJ~?&exHc
z3TV6Lxb$E(&33A1O6eSRyVxKQ*Il~miN*eNeklzyR4Mvmy76gqsQ$W1Y3vEF>H^Ka
zCZtuc(R3BGJ$G566It2`qw?s3w0{gxP9ARFK)P&>)nlrdBt{J#*|+`*D>gfh2ii=(
z@YD|^G$_-=NMAbASn9-NcxtdX)_x+*iHc#71^`YO$%8d3tL5S@YNjdP7EJj3RlF_Y
zz8WHH|IB+OQ=2c%<Xo;TbXQIs6!z*ZH9)p_B;AduUb3W#hZn0I>*n=-!U!oKmv@0E
zQ-$?umHN~^f*scBReb^ca8=A`96%lAOENj9Xaf(B_-z;qvI$-oOnrVKH{ElJrQ+>g
z?Me1cCG^#Og=t_#ENpk@Q9Ke1u*tkYQbvAS=em_861oKw7TxSU#iz$=DC~9whx&Uo
zGph%zja_P<EGn+ndkWkG2_{hN(f6;OngP6P*IQsA*U(CpvsLPn<gpXk^V&9_Fv=2{
zSS_j~`hU6WQ*-WO6LdCO<}xUZ%(Px$@00EP{uMS;@Q@lCBt4E0s^hR%cQkXHZz@%4
zdOEIL4PDXxI-PqEd)a?$eI%UqwWZHx)w1=jg)n95zuAYuQTr*D9yOI09A62lW;s6p
zyqVDsuzWTdy}X7cyeg>~o=c|=3_l$lxqjsg0!-N*HIf5bj~Xf6M;R;lcLiSXU=^>*
zZe^|!YgCOdi4@Lq%oLpeAUU}vsX?hLk6L)3V5vcs;hC=5{CBgZt;RgT&=KO#-)Gqh
zOuDJ>x4{wU?rod{V94DqCjg6TESp`iLQ&?hrNeN5&r=D&N?ztxD)-1u^0ql?n-~Gg
z1u?vEFSVyzsZHZ=pc@;zRn|z#(xWvy)C_|ntEt;LSh%>PKo}UyZv*PVYSZX!gxuQ7
zz;K3V^y(DLs6$6N*$%E<tUC~WS8L#G=sV(+{Y(ddmIBtp(Tw>#uGp(X^1i&}Wi_*k
z5dHd@%><Bi*&S=c(H^H4Psq00f6iGM)5rmcV7>yjSR%>y#q_2tzSM1#qmNKq?)c9D
z%G-=y=1Y*7Y`WH|p-U$3{P$@no{4d~V+-%RlVzmX5aM{COwMt{(jT3Vth=?zC!Pv^
zYP6YosiCU0wa@^pKdzt;LcCGEI@+fe$m{v*!@KhBXuiNMrzKFWLvi;ghfE^->;fMG
ziglFO);<bs>pgPyNkH8`4$4rmtE*NYEeY<HPkU(Qs|x--GHsk(7y5fd<q7G1-ti5;
z71Hjj%^@_@5Q`UH412oRH?k_>bBfcL3PftYS9@|XL54axnMMos4i(ykkMd;F?4cFf
ztC~40u?PLP&x}a=WCd+RKZH56N{><u1|!#QRs9vxeO1iOjmD^Ir%<q|#il%6jjfpT
z)+uf&WC!3Q9Bt?z8gFO`CJg`2<HdB@)rVJT&Q=K2d>uP74Z?&|!%5{YMJE>XNQdq`
zPx4^FPuHdA*ZmYo_x2<NeLew>-!yTN4SL-f0<iWT<%b=9xWWFf8Da#gC^yfN3aF87
zyn7$A#k>2FSH+JNPn-IL@}^K!I=>zunBA;L1uSewt%1j!S}HLIPzmm3l8kWv15)?z
zI1)?ew*b(Z%dj0~<J6GPIlm3Z|J<FkWCiF}k3{xw2q=e!k1}3pTDEXJ(^bL9aXz<2
z$eM(hl?k~;ZE4^}nw+w{pnMPxYDxk6g$=@&9`$KWZ1T~r=;F4|5x`(s%S(s|S@68O
z-0Ns2`<wwzom9mad?`!aR^L;uy@Mjnb};$q`b+LB7~p5#3VeCyT8sQH52zt@@->$o
z#D?4hc~lyf=tObX^c|PJzSUy?KGmBiZP_mVmU{?Z93UC{lbc71f*gzI+qf-_PZ1f`
zZp7pvN#gr|)&Y%1jj3vz{hRydp2@du(RW%M3Jhii7v6}E>?F)Un(3Bw5^kXKn}14Y
zK-MrmyntdkQsOoGyT*N8W+0x^Lr<T3uSYl?&@gnc5EOe|5(udPTr0!s5mJtEBwRu=
zt%17~Xg+gMJ2<F`-VBYvt^7dV%5mIQFInr7`I@{zx~k^Bgt~8EZ9srZeUIThgUJ32
z?a<GVHT8iJ+jfkj#LgJUEFLgKZSxXfwH`4t9*^2dvk}iAwJV1WQnEH7^)H$R8>yoE
z%dxJ)Ydb9`ZpJ=s)t4&mC*#Rnz!N!8LDFH5&`QEdQ3k8&d6DbEOg4CHCf^BHWi1!@
zNY{=xZ?>M+;{s=$$F60Qr7u0GK~@y^%V7^LxI&xE5pM_QkM;uaiiz1gN+NsT-rb<B
z`~!jX%0GB}6;eJEjj6)76hGhL8gr`wkEAM*d;+&G`XuDdqrZX5KWC&W0PSIE#HU^x
zrdCbzp5@r+)v4g-h$dWv2aCI(t0%P0_L8u5T>2ZEt?2L{%Ke7>uy5;ix2i&$r^qyl
z6HnXPLVYSXQrOrd^K$2dRNu2h8TSau&waTWZND@BhGQo^y_!pj=dY!A+u1wQv=x1$
z^Yu<6SEU9W$&MOG4XMNgnaI9jUwJ*^u$9E{2VYvlKVMWWEt^XUfI`Z1V(PCXJhJob
zzSc`SU%R3P$(WMm?aVO%)QuZ4@FGz5$H(pUJ!P{e@t0~Od6b&3HXsg2yC|0@eOy*J
zVaYz`MyZ9A8_j8q6V9PkBR5EN|6+m#P#g2vb)8uT9V!wTMsX*LB{WPZw2u9i*QmpF
z4rmzRVSRSd4-PAd4G!$w`1Oe0$DsR-2f}0Go6Nu%i|c#d%S`c{=_We)eiH6gDpqc^
z+zj#OmUO^zBTLclcie4D3+RuNJ@@zOp7gmzk8vLlmp;O*%GPTFIK{EjN96!-h4oC;
zG{n9)o?#1Hy$t9-Qu(jS)7GK3qI>rz{1Z*8Y#41fAF{Uj-*2_y{aAjs^?JvtuMr>M
zYg|cy6rPqWg|4BrZ)v`WPTv8Oyv^I6=ujqqQH>`U6R}Y({Mjq~+owKPvcSl6?11$i
z!1&swyIF6{)5YSWiKqWW&do=b5VgOAB6de(6?VLz)3-7Z|HMRGC^ag&Kp9)968|2%
zZ4F)g*JCP+9w4ov6{<9KQ#+sR2;~f`H-Xb7ZgQS8eNHOd@gYvR1|yClL;`=1zz~fx
z>c%0fwd#9Q4=^Fy7AJzQbgGcDNvgYK+h3L7R~4Ah<1UtVN401F(Et<9GB_~t@N}{B
zg@|RtlU7W&G?9%bD}6!wjD-;BPr<o2;aL(89|H*vuP5Ixg5_+;nF=p{&eP5dGMoa#
zE`k;$w5m61npmYvf@;Y+h1wwb+6Idv5>#hcm*jm-D0xG9VIlcWgXs@8pQFusxn1AS
z`f}Iax%_24Gu4d@6v4{8MX04>VUunzf7?dyJ4AT$OZ8GrEcez84UT8I0D2}W(Vrl5
zhVSCR-tFAAmS+}yhTDwsPSb4V9X7@1%<dhAW018kOGkuvpa7ezope_iCc-jZ2tnHn
z7j?$x{8-SJsljLQqU?Jez0NhATm)Ste^S<5lV<G?6{%^6#lW`Dd*;s!f;UtjBcwr9
zzPD`~T(&g6|K#g1yMjePJq6G+tK!8*{0D=<osqY;ATKVv_$f5d3o}ZdYy!t~-l`Q4
zAIn%Qso41A69j^}U?AMg9BMV=5aaZbhW@}8ww6dHdrXL`j8Ef3=Iozqql%2h=Pc^a
z3$Ys&?qUyid~{eo7mEMH473rD)=D(`N*oesX-BYZ2ZgBh1u4(SZa(x5jC@7nGoDVT
z%H80TR|b{PgDz$Xzly&yo0=;!>1;&guawXRGl<V2!S6r6V!A;a!IiHIr<$X}EZsz4
zMg*S+hM4%iMyO3cf^z2aeb!i%sbv&%Agh4aDyrqOOSu(_JJU|BI{9a*@|;ho7rEdI
zm;HJC=4DsJa$o2H9C;^XBHMsWGnV#O3x@c|f5x0<OyQ>E(H|jn#>1wiXpDufnt-D-
zvANuWxdOT=<vmlkFu`&^ts}%So&G6yJ$yJ$(?k7O4j7aV<|tbrWDLE2?;ExHUTYst
zSHDoHh=QZ;Oo@T4b|vZ|sKlTsNT$|rl`<6FKf`B<1V==yRIU6)+$@g^!E7yZNckq}
z!Z^RZxg1v@849=FY|e=;xF#4!wU`X(!8AGGo<xJ<c~(<t6p9|5(IEQbrXZO*KNhNx
z1dBZ?JM)kGA_GV4I+kL=lH=Xpl-Xh6c8h<02qm#jl(F#FsVE#*fm+`XwTwEp&VL>W
zeq`5R3TIiTHUKZx5qKw(1btK>@D2Z=-{v6Jobr7Wvcj;`_d7}i0Xi{CO#JoDa+lc!
z$!(iZWK)2<64fqv|JnR@6xYqCCzz~}oWe*KQ?VSTEaA0*2%MTkylWI{yXS4mYNOiA
z^?)mQY~%ZW%-xikt?O-*Qv0}w#CP@v{p8<M1UZH71nnvG@^J|E@)9w6zh@s!i!B!l
zoKGlU$bj+GJHlrdHgMP+?ksJdjl8N3Yc`;K_oOayLEQu#kSM3yG_N^DS|PJb)t%vO
zf$#RadA2w>hkKx_?|}99oARTt;-Ee$!p42E67?z2=Nd_8#kC4C0t4+@B+0EP#j*?t
z6La^p<@%0~9jE3hWtyo}o-yISpI)pQ?6;tNo8ePNLF~VvX^@tedwNdYL;Xv~2RW@=
zbTxfOa@k0*srZ3m5Lj}i<rx*SNj0eR-n_agf(Y;w+8}s}bV7#b9MaKdnT&G94VOsk
zJGKn@Ahbc?O99DlLpk$Cn5{WVuP!`z-${M*GQK(<He*#?VL@9CjUVB!vZ(FBvY8O*
zh>j&oMx-<-@~P>)VvQ}Uls_7rRKx&$EAHc`wETwmfwSYtBIqY4Pi?9!8St5Fs#F-D
z%JuNi$43iuz#MiHY^*lx1Iv6EGP`mh(E}%^V8F55R}eo%{D3=2C-nM{_TwmhPOWJn
zit{UFw#M{IGpUyT5M-4u7*D<~_IBtf!SWJBSk#Gv_Ct-Jv^q#A^gpVRL;HJ>k}i>J
z5hyeh^@&gryZ;IbYrH#47W;{f_CSsk`#p$OZqV%6YT6t>w@16=hxksEBfi&|vfZ8@
z2(>CUK7u98_7#QjsMqg+8tNP!c~%_alv!>Ip#L(fd@30>@^z3o9}JX143*4o!D!`;
z|NQzt@_RR*fiFy-bNKm$L&}>1W|9E~XrPwVv=k57@wo@-%lmYnvR#tX;>-oQ$36~i
zlBDOG__XuoP^@3YEZ~|g?lokt<2@>jUytz)J!jZK<m2D6AI}rMb3$t5O7V+iJy;gm
zPIdtIg($~?fs`a&1HZLv3L8H`|Btj8mG!j3BgN55n01i=?lsb?gv#Q>38TP3j!j8h
z(s(}&sPJ{!3%bGg`^@c<FWF#$nk&1s?cM)#xYGxK#Kc+lLapQXn!GAk<a4zk_Y;|?
z`PniS$t0}NA-v}hW9RzH7xg7vJS5+3FUb*AC>U;OPCLpP7*!_0R>qT8rTTjG82(Sn
ze6dGk)YRT-^ce%^3lviYW)3~Ixb|viQKLh*g!CWr-5P-LK66)m@LyX+fiunaGy!aR
zg<n*J)Hkz(mpwjbpM-ug3;!AF?Iw2)tbf_`B)VCiyj3#8r)}g7%nf&o9CbY$@3M}k
zWqU)A(tgw_T*!6-$qukKQpKodpJI*1L}i}k3hpv%nufT(r8EHNry&%0f)dP5sNP@A
zHNI2weliUBBdpU-6w<FhAX@Q5qmbIZ<W4ibFKK_bU-_vjREhN{61&Vb^%h}^M0kOo
zzA8dFsnQ_#)?>x9=DUKdh{FQ?LV!gRU7R3R#JeOAk{knjP)|CEtT)uPoD(VXGaZx4
zN_x)sAWbL}URcqdR5-v3(XV1rRs>vwIk<XkvFFy$wa3+`q_Ot90?ZfUyav^OxX~Qy
zWXs%(_6QHmAl|fmN$WT#gjJ*7F|avAoq}$aGu38_E{Yt)BXGFiG<)RZ^SaY5?{Bl>
zMc}SMzaKc*bJy<%Ls{0SUwbVCPNu5&1;zccYVP}G;`7c|LaZ}HD2u5k$V^dPD@v1D
zRb5HPt;aDLaQ?1MKVpQt#-UEp#UJ;pEc$1R)~E%2)<N4H%2K-Q9KO_b<M(e`FSU*@
zZ4t{6ig*1&Qye3ThB0QUYDzj$n}%MPD>75`iELy5m6YFpjv4rb-!+g(>8Tr8X?4%V
zW^xy>M+*s|8(I~kgX9#|*d5<HdT13`;eJaMox&gvg}&&-=GGjh24Na5fC{HhHk*Xn
zVrWJwM;{Vc&fIrhcujVSJW7dXMW(i0-TpCh>}3ekg({SZk4IWxNin)Uz{8zu=i*YE
zy)wXL&NSt35$s2J@*W-Qg~Rw%dM+PZ0Zb58>cKrnKAiHKw)xU#=6C+{d2&vvj3aCJ
z5vj*%z}I-kS%eL~OwiH~WcU1)$rs0Nq}n3;D1Q}G522k@xMaZLu=r>=KV;Ru+$m@F
zCYPawv<HkxU8f#}xB_2;UC&OKT?1j{$l!p$L*(Wcet+9%v@CE~*I@e+85rIdF<;rL
z%8lw+_v~~#(U^=~_6XsC1J<A_Zoc63jicXgD-<SlH^Eyda9eEts+6@=2uFKsztBF9
zGERcg2YwiirX7`x9}w}oW6=g{8A3M?hr6CRhp(xZ3^de0ZjKJHF5~MFPi1_)F;_;y
zAutx22ibH4(+cmm5^ADR3_lE2tArRgwQ#&8FxeS}Z55UH3X+s}1npXF{wcxq9k~Ad
z83kkRg%`zL?X+QoJW6>VU&>CB%)5Y38ZYjK0UPV=J}(bG9SijQl1q>|DIyj0*11v;
z_DhrbPh@z<kOMgA&Z3dV=@I}E>|c89q>t)pyq7*-<gJQVVME=iyjK?z(yTsn$T&pZ
zv!1ykYy7xWp1hMvgI{SYhPqlwe-pL+43c)3t*l~G5u1T*xZ%2jC|pnIRTQ1?K0TAe
zY2Lq+mi?EHa&f=y?JI)C7?WL6r)Gs7`*KD@sX0&yy1F+OxCqMA*nZpHrRP2*2+LGg
z`+Yi4283ai&a_+Xp7T$!@{Tk&vBM<4<47{$yGI%pOa9OeXGw~zvtBr4QpYnR@~k&N
zKwV4a^}eFk?>yI9-FKUra!CSra7%Or3M^}rmZ3JMIQKbd>EV}!jXzRW8J(n3MR3YZ
zgR8oK^Br;R{havjrf;#0wZdff+H9P2a{aGgerdV!@R3q&S31vv*E`c(_g>z-WTn|?
zI$VFdFqdOuk6HI_+*??qr7?&#`nSNTsDEsOybyDo;+MJHZNNpu=9+%aFmfTRcEvPV
z%y18}kR(_tPI=1{lbZ@uo5TxS8f<*NI(eIQT?y~z!?~?IR96L!rg#S)s{eH}Y#~Uq
z{R`|Wfk18AS8f-n?hmQ|J^QDqn7#FT+uV|4g6&Ltl>Vkp%>(TonXA+7He&|;TknVy
z`zg`B|FjVCS$tsrccIE}vN*Pmq98;-;|&XMjd_L-<u^mH&C-9?THx`?JY4AKI^f7n
zc3w;4c1_g;naY~}GK0363wo8SG=W9i%)Mh%ADw?+;)uju<+(-4|Ml|8t5z#z6d1@8
zF1qr0d*iha?c)y;1im>2QE0${3xO%@lYlO6f_66o=XzFd|3}-BN+yihA@C1fXo7hM
zKd^S?|0*x$$*~`TAX%>CxjfssmjDt9Va53Fhfv&c1xmzByn)PJ-L%YgL!U7J&6Kc4
z6tm1Db?BK4(5oR<@gb{}I@9@&JE9}Ye@P+;tfz7@a<XZD$p<*d<oW00gZ)()$s+W{
z>}wodUEknym_6tdjw`4#_95puoK&l7@$K##O*y7on6ZLZG4iG5ck`)&*>r&Y40~3u
zmPw&wB}<0F<4|V4G`hOv2DKy$aQbRraKKQHgDBP(_cuR;rWgS~wX0S)t!ZG!&eOLM
zt{YkkjXxb9drmW^$vq+%w_?Uedv|;wh4xsAZXC*qGR7LuK$cK?DM#eD4jQTzOeNs|
z+$GWCF`0uzew~;*07qy>hdw0lj9X}rs{WAzYjR6!3InxkxkO}jbF7mgpb90n#2bK1
zJzTv-uKhO<4s;puqh!Y45Du~L{X%CfY=WA`A0MfHWYg)}P+Z4c0O{EeOnheZzQ@0U
zWDyp_D79I+&(V8<IYSwGDubcsQ#Uca!(=q%nwG1KmURhK2P)?BN3mSWG%)rt9-HV*
z+oa2d;^dCL&Bs5>M+x2h?{ftS?^a4vT==Ickm|N|>GmCloRhX)2L;AB9SWj6pQE&(
zS47>so*M><Mv18~UBU8Vjq>19PZ|I_*!<-s59Nz5_sQkBw}ZKvvWHSE@^DQQrb|u~
z8h}|{GzP!e;0)aHW~Nt*BMYWYlRQm<+=(NC%Q0rQB7!SLiO68PX{EHM;w?pVFM{U^
zqNGf<U%a4h-%C-tMt!}DPaD<|Qbu`M$&ezCZ8-~Q@MQ8gxXpWL`iiiT%mpo>>f#27
z42%xn4Jf9>n;{L8&4goC7kf9;tFZM6ZVn%}>s_JY%P3Jn`kjW)1G}_x`T^&ey`!Uq
z^u=1r(+je?Nk;6C#6<&u;7O?LfNAh2aQWE}@I9!Gv|_to*9CSp%-a}lGxm^Ej=Yka
z0AH;nBwFSTkg$#25okbCG_GVC<L9=cTDEnCP|CEt!d@lQ*n=bX>YjNneaw&qIr+~|
zEmAHwhxv55!G}j|@OjxjK{ddB!`cn@;#Ema%tjbh=pJ>bhDs~tnRZ4(Jr!CnN_#&h
zIpXTgKd!3aGH^eo9bU-QZq!}EPM?uE!VORaRBg>q$}eRnd}|rZ73h4{N=u?=Olv%F
zI^w#6OciS?R<z0;J#>qMiPYJofi>6BVxsHZ9tj5u#$g~B-8zUk`hYNWC;EqYtn<i|
z**>F@^pm<oK2>CNq}COZEOhh-cBVsUzCoIT1n*BMu`8kSz1QHtBF(?$6&ed8{4PfB
z@OVLAaJ=9ruwS4gfdO^yKC~+4^D<=sd_psUw33}oPc=qEwZ1}UW)t0%pecy(<3Q|`
zRov%s=!Yj>*`I!KGrlYP4e%uo*md%dC@v)%lQQKv2QtQDl!^lU;GPo!)`_m8(d+sC
z3Z=R1K!@phDM7vCXV$>iVAnQgvJm1Lm`te-%DEQ5G8qf$N2xoj-eJwPTh36biRp-2
z$xj&fXmso<j&B_0bex;O(UU_Mz2d2ewpb?K8tV+7=t=J9177#IKB|<!c7-IMIm+<f
z9sENG%x5zL>GmqWM(|B>eAlp?>1}in*I|%T-8k$AI|s6vq75c<<MdsMT|vwjy|o<=
zQl+T;2KN(IFl#&|W&hC%T;3Z`U<;IegZSq7*SfwO{&DE5z^A4*{G;(W?QdS|gi}=f
z+~Q`+Vd{<D=y{CxJ+50O@v`8@ih77l1S9@?w#Ubyw6<~T)V5ocjnT*JpkJSS!Alpg
z?HPVQ{jxq;PE|pqHKmvuBhw5k9k&%b+1dWGJqOG>Lm7$<a#c(6LN+{W!SjiM?;-#*
z_MI?s%%J_lsx@gN2Kj&~4$hYNg~S<QvSG6GXFQ3hj$Sf52qmtPjz*(ER>|{bfS}^V
z7ar=_6J4SdI3+KvLK$R*1@ejaQ!~Bnm?+Y;2P(MqDx#1GdnzMX-&$uj!>EYLB6_7Y
zSCjmv(N)rVz1~bHKw>BE0;HuCB^)rlH;GK@f0A+CqcO3esh+uJCe9HbgU|wIWHxw~
zZ<(^B_o!aUImAgXfNg}EZO+r2?m2-ZoFZUkOI;&TZYue<giVoa79umkf{%9J@Ws64
z#(JIZB2<X*x)I5EsQ`b=L#ngeJjS=!;+j|oaxZ2hD2TLBCp#qo0|>b6vVF+<ricu{
zLDCP<aHn?Z))1IQq5H^zynHaakb9GZxJIEk4s)z9)S-M?QTdCS(bl^AZ58~sp4#n}
z^5U({$NZSAA<~C?Q>qTI!n;)z*U%YKSH*PHVcpC~0bGa?bEbYc5`Xst_&aAxxZ-aS
z#rvmXZIVatPeeuWF*Qwo<TyVl`@gz$(x8;PUPX);k~Ut1v3*4!Wc4@d!De}3!hz(r
zym6Ws=j7<8w;&c*5Fd`DTeUaLqW^nf3VAb<S>scRc@iM<GEn+OC4Lh9u1U}kq)kux
zDb{U<m^>abzwKTf0e-8;coWkm#Czi@9DtOrVx(XFWceYgIPwHHsbCv<k?#b#Gws={
z1JQ?zxaZD*$!bDLCSRvWzxB(K9s@|7!MxV%BteSmez$bem^~Z`Z-l3!Jur*fg_gX(
zhC0u??AK*B;w}){-7Of*0X_f!tU2!)W0*Ng&3lXN1(D-=_a{_nBa4nStjGl8yvXEi
zB5K|V-zCX+v1J=3!_&AQZk>-JO#`JIc4*x12xxy-j+6-^ptb-Fe5*vErnxT?83ydH
zfg)~H8*WsEKNrafehvnAp8tUxhaBSZ&8O08pJH8h-p=NR%(`s^iw04-#gAD(RN#+Q
zU`75`B39Qdm5%IxXyZqmpQj{1v^7$7k3+vztW&Hluv9M~NFrh_CR-~$qL}C5Ve$v;
zqv&(J;Q|(-TDNSt5%_Z=nhq&8t4bu=YjkSyjq(cMd0%&C5)+2}JRb$-;h?%F=Gz5+
z-^d2T(zyzWePCr;LQUbDxA2O@>_`hFqwotKe~#ihg^`}iP(UT}InWFgaV?}BN<NN`
zf%B|^*>~ugs$5*`8tV^gW8U@kKQ#RKZ`?#9%|sZKJHJS;hLXm#@!Ht>&I@7r`daZ7
zpFU}l7IB;{q13oIp#$l01jbq}3k3qaL6$1K@q<$xj$}pj6}r!6AGDh))p(j1An~Jh
zTtOXjKust_#htX1tiw19_1Y^J!ssJQh3}920%nuZnu9=4wg6@6*?)^xt!mPZx=uKV
zV&PY4@KtFVLvq{RZ*fKG860xV(jW4%UWoJNd=yU2wYCA}DulwZz=VavKZ9WR-{vhp
zADuU292NLz_XKBx&B@AEy^>L%l>j2JL^GRA!pi<?RLVhd)kKrN8WTw_&6|Au_p;N=
z`@?OLc#*d#*NQzr;u`Y9m|kcSv$$WXmnc~h;6Y`Ky*?#$7NVt~|FcE>s_?Ae#C<Dh
zVN4jaRTNvEX}^Pd3>wn;`{Bu<%r*Lw{P+fno569fieu8y9Jp@Ca^BmG0+Jk)f<nfV
zW0~%J%>%yF>}($m<M}<kK}I{Q=B^cPs_N~L;0<aZaiG0J-J0N`J-J2QTIZo%`3$ln
zP+ok10=Bzkyxc6>?@%7!0wvqKm=^hDe=HE6X_W^Q74dP^l8Q|VsLtkiS3n+hY<OZz
zc!RFu7ZBZ)R*cr>9$|*S0xpZmS&@$@!&+Zuqou4IR$IX}Lc+Iud6-8HSBKGh*X{;D
z3iZr^I!fI9qzlu0V_xDL>#j723mqz|+UAh~7$MXFOe&n6k=1WODBR|gyNZo(@y((X
zNr?*k>GpPTSbOk+kfiLJuowz(Krrv4oR$W!Ox|6bV-SnG?JE$^0_ZMsJKyvS6QOAG
zgG67tJz{@|rd`rJL-JS*a8;x8?}Z;KZ*Cmr9P#jQXLNoaFsde%m=sfOFvbWX=rR?w
zMW2&6M1FgUvi|e01iN{y`S;$|yEuzD0l@_j7)Uf~zf(|o>vFaUAoIaznyKAD9cdk{
z+KbvE5%kgs?V4$buRn=1ZRlC7=&pA^+dc65EC-mIarkbz@BJJ3y8R!j|FQ7;TKg!j
zBH?3{SB*{{Uzj?sa6^NvWxM=!EZBz3v}<plLj#Ycfmo969Y`qv-$<7R9fAJ1Z;b64
zT=Tl4!Kc)bgm*}#43nG0tvbCFfk|byoln3=UY2EC3O&3P=HNv^&Pnk=RkRh*OGngg
z1y##<)^?wz=Vzt}N3LDOp(KD1^t3urp1b>O>_QhXvUmT4KkVNUJq!i>f?TZ5+%H7P
zBAS5u1@kbt6yL2L*!#f=1Vh_(OOmO$Mwe9~8i}Aitjjv=;im|tcIcTBPV9drDGB*V
zkWp@_iEplof3Cx^<*)#_6^cTiIo{8OVF1I3b>e7nRxOlU@&*kaZLt7ixZacDUUq+=
zWxwT`*<DWq)b1R2^>gR5%$42p$7oEB4&aDQs^+oNGSgcW-mt<iZfn+}Cwyxc75V*j
z|EZuE$|Tkn1~ZL`9&-%7s*}HT&NiQZ1yYP~d+3))M4Q3Zx}RldwQQbEJKH(i4AGIF
zrGz~KW(>hpt64hF3fLuaLRN9>YXMsDZzac+%;F=V=27it%*N!d9J}3PK@L>h-~6Yv
zUe~#MbB^}8aS(ZzNzdfGe3T<uZ_H69KCmA9C2-(b-~eMRt`LSl6CX$AbY+BLu9Bog
z%(cu@EE3N1L=lV-iZ5N(zhgb!R#Rf!M#v7SwJiLuXkY(6F*Ytl_xAk;S!&LlMN4bT
z!KC(h4I@DPi*ziREx$d3{%M+ZHuW}+<+&#J638UUb(VPfv19y{*a6_1gTcC5UjeT|
z2Ef(PcBhf?)L@k9pEtb<pt$6&-IiV-@uT*|^1D-zgCHc_PD`47kjf85>HEcOpm^#k
z$@L7}QCA8MW2)z<)aF$^`lW-jrJW6i1=6`ZCM&Ju4F+g~=ZzR`3JpkPGR||>Hl+Hb
z02xJA$be^co%Ft{;Ft_ubr?ryZxbp7&`1o)y@Vf0!?1SO{eGTR_XwfBF(gZrh&l(B
zOHTh&1YaHRuPU3E!amLM*EyI+Au6uq#Y495hG<xRJ!QnNw13(wJ6i_`NW$+G!D|FX
zyhoT?<d@(KpIo~;ASZi^PS<<^MbERaigTDibCLMEE9mc&89e`!mP{!7A-Q|eSFk5j
z$7tp7BK+CZ^C}r#YF6=a3Is^Sf-(?08q9kISylXqE6KD!<@<OC$Tp#X>T0;)map;=
zYLcAHgQQzY#$wIOfV{5UKsQScU3CCQXM0opG)R~bbx8_~{3s+4AlE+1eeV$oWi9&c
z4qsBT!uKTrG`f*iPW+{PdL8dP<dz#Y1>4PXz!($_94TH;F;>Z-Q>%mkX}A9uBQ?C2
zfGCFd4gPZ0JB(=Pm0jHC7=^`ktiN)@yLroF@-k%7J>mg~?6pPaLPGvRckCKL;jhGi
zOicD;5mmn2$dT;F9fCj<36EUI*j`OimpBv^3dVb8bsx+~4Ch{?%%Ue~Zw0tHVm&QS
zmk?&lP!%Ww)Iw4doa6TB=sm{?m2_Pd%1ZzU6Rm{O-^@&*z;FIA0{+!4an}6<-x-U&
zj)NA1&TN_7M=Fc=nJ@aDMC0bmldDI%pOWXA4*cY5jZi;{wTRnvfC9eNP;s98KE;!j
zD)kg$jKOIx3jf$0WG)-5L_m+ft)G-HS4@SF;&cUNkbbNbj8suL3JqZmDpw%4xaj_5
z3?>il-TdsF#v)_8agNabJ+Y~n<TrGGb9vBT$SkY<R<7_A@BP=hq%Bf!t?XX4NRj~1
zly_g7u8R^8tV;85*cNvmoqWB|w;kxN(|=G@EE$lO`Oyto#f~Xu=WITTPD3^*W!FYr
zBkk^IIAZ${!!)4S@Bw%iOdt23BUKMI`5u1YmMHhTq-OAcoU#deI)!IgAuS$LZA_FV
zNf;mx@h>TWBP=`gL|VfM_Xt2>4p$JvAyOaeIX(vtY07+%#|QqV@ywC4k{0FdG^3@J
zDN0YzLTG!KPAIRV_JX?gNr%M!&p;X_Q6ho280(-CmU<4}7iKj7yVmLm@IRzD2Wr1o
zE*0nIaujyr`WMXs_gUb^A`b{Otbo3Zm%8*KUUetfm>|}IfZ{kdWcF*2Z^*&_s#$U|
z+JS0L143V|DPe;G=Cgi4C&GU`1G++BN5eOO-D+G{kf)sPYuS2RfB1Sqc9(TM4M?%$
zy6!7J`_$?kG<3aYno)7x7{kP|r<-REVC1nR*zBKhYLfWUr%3w}9|sA?qb`xUnYmN4
zC>^2DMlfAIgZWYAMk08d_Z92Zk?~Cy&$y-(@t<e*9g87mxSpn9O(o4OW0TO-_NCWV
z@GU?#!`i|VTiEtHqxsYe4k)NvoaU66m!dCEO(;bu?J08q3n$ZO9{};lK}M6RPzaw@
zE8%_GYpFU6(U&CnSVQ&&C_U5^SFx}s3m{C(2l4dri&4(ePogeJwH`*YDG#J{Grk4l
zSTG9pB4Ws7BB0%By-$R^H`HmSzZQ}JL3$;1UyVw=lDL>Sx>-EHrr6+gWc)k4n*X2d
z*1iK3!Uzi$EG*hXkymw#)H&^u*l1%AeW9)4|H9n?&yD~TtbJ55zT<(08fQUJj(AYU
z>2d$7w{~+I)%uPcI%8=O_D{v6Y~n{YqM?9;4868_MNdQ?>U%=vNOFde-_(d<P%j$u
zbS;xN4PaoSyg2qcyyBJBUyHs1#KpF~TP8&fEsn=5sv1gFV1n9op+E-}icH0?O6)zf
zBgd8;4;0r_KiYpwmz7!Kn^_iX1B>dqqR!LJr<gz-v|}2XIHKcCP2XMLJk$C#!Z5#h
zzz_U(NqcvOL3>w}@P+|)L<JdrVuf^nTEWTW;FQGQg?1Cns(%!9$a~ZwuAmteoVT`%
zEq%6UBb%4J$NTuaX2D-%>YmgAd-bC5kbP3}WX>d(kp`7lHK7bfnR;X)<T`mz^P7sY
zD5e+GorZ6lknCRK<Wm`T7==+pmA8*5D_jdniSDwJ^I@<v6~Fjmql#<;5|mL@go5LM
z_L459m$ryVbjw@kfTg|@roD%54iut|2z5w*?I0szns|V88|+a<{p4*ajH%&*=7ZJD
z^^ENGXXr~oLNYGLo))ApT{3)zK?)4Y#m>z$vf%y8I?aKnh_!C0hKmc$nUDvQ|3gwF
zQQ!tt<JL0P={Q5h98i@DP|@S!7N<blm9G-tAH3Z(uK=n9ym?$f>~=mI{g0+@PRy6X
zkh|`qP?ye+n@7HhtNv8bA=v0!1|r2m--wQ&nWjl*b{!^SWTdU?ohgBc*_$n_OHr|p
zz_O925UNNan*Ohr(&;IYHLW(WL?*K$v+9|G4rC*v88CZ#UzR@RW1A%a(cY*`))|I0
z_dG(EuNzXQh6R4>e0QtJSqk_&WJUEW76G7|98cL_es)j5a2CoxkLw#d4O^f+#}tzT
zv!=Dp_Bp_KF$jM=%6f29FHHa4T$=UE^1yJOdH<daiXmSC*<qs%8lncd2Tyi|yh#``
zWHx`ZN#KJ9kLP(PuaFkA<T;YqD4K)u0Yk3+Nqf|13RFX~?KIjn`#LY6#T_|d#=lN=
z?qOIBmTy5PIH4+`ZO^;JrVAU~caz_v!oAm~WTEw2V=q}7;ahuUn>N^Dj*;8n7zvOy
zc(|GJdSkP8s^`N&-XNIh3g`($xG#>^rHSv<AXhm2K5|=c4o%8oje5v<0Yp6W32bO5
zP0+@g^ccBZB`6<)HDiZO^B<=L#&k*tOkUWCcY|_Ek|`@*6c%tNoPKNmEo$46C%t@d
z4Nkv*8r4kS)JdB!NCGp~sIIhOM9Om6nADC{)jdJ~ked;&9ZftQze8bIWEM^*l=`L+
znitqYmL-(I%(8-VG+<|3GSZ^*%<>kS_q2{EE9s7e_R_bS?vy3~wGiYLZIHBi90;qf
z#wowOF$?^p%Mt@Z$|)MHG#?QESY^82^`PCOv$0hA4HzbQc$82DCO@OVx_y=P&*^-!
zGbA|)u9%Z@&%VZ?e1vO$2^_1ZSKI}cPD#(F9bWCY;zBL{`47W2!q=ed4bsbXXjOy&
zm27|PWxDgvZE9oxWlkjF0tsV4#|A+V`mf_)={0EVzip%DEta@eGY@$5y9H2c)mK^j
z^-a*NH==k@2o3#@e1!@tm)z|HQcdbs8)87D!B1;!L<eu)6q3FJ9iXYt7JC3$6544!
zN^V#YZ}!8-X8orihijmK=mO}K+jd=Q=g7=vesZ1&a8qPrB(dZ`j&_th@3dPrqSihQ
z;SJ3CV%~TI6Al=MVw{z=G)_$L^OSl6^<fsP06`yL%Pm15%Kn!V@CF;qFg2iD=8<4&
zl^q9}swcY+VXxC}gJ)Ic5#=F$8|_noin=lUG4!eTVuN~kaGbg^<)Ko=Ic@HtUapFi
zl6EkAlip_2M#!+;p2E<QD)8k?3I)8Zp%%a*k#%mvHpLu@tG}Vv4IHhQ8BR!vz-{!A
z#{YI2YW@Pm4ogL*s7xh2!IUbEoXA&T0C`1h=4hMS?$410fbg^yK*HPJ{s1C=&9?nt
ziJ#uDFA;nitRohVU$+WIEJ6>S8??49@f+0J)>(~NtU=$r^aC$ttv=|$s=7OOM-W)V
zGo<rl@`?f`D{(xf$xv(BrbaH5wuTAl&Sa0&c#pkh94PSNEPwsPKGVd-S1@z6k2699
zan>njpsG!nDn{kq6Iw2_J9CbBYch?&KiCPJV<S<GTZa{OH1@S~H`T8zYX52Z8OhXR
z@fS($IFEvT#m|7)`*JhK(;O}BrR5)x#N8=UZ{#ot$R)a*1frNSK&Yq64R9Y>KfuTZ
zj33;uBaFNg-d9y&v@_d0VrTmKdK<_)l<9E#v_ACKk#4Q?4R??ymuNBMcJ5u0?*Qc+
z?WR|yOI`s;omlB>p4I#vTcS?NJZPb)LasSG8l}^7n&KEl!kI3~Xi$f_L4*`ro(>7;
zJh@70m&D+O1){7`eeijm{U5Wa<gn_oSiu;^#HGaLY%IuCp}~cD9;67~<S;$16%3*)
zkB1L|?C^Qt8-kbOw(w~~x?c|{aLWDiMu-pt+T)=gV$`J(xm94GYmZ*h@I{UdOiS;h
z5kaja9FUGAh(dq<Rk2W5-(07Yu8E$RJS1rR=`c!k<PLE`LR;NzmORWim8zW6t9k0<
z|JT-)fJ3>x@ez?QBvK>UrDUlP*<Hz!h%C97p(acAl5NZkqRlQ#R499iZnAF~QkFZ}
zLyUb1+1Fv_f4<Rk7ymo+m@(h;z3+FvbIyCtyM8}}HRDXZ^CF8EoI&5ttaG^B$<8dp
zn4S1pp@5Nt#PG?KE6{@*jF@clIlS~dO*>p^tqTiZ!lOfPLf#9r<TA?-Ij_@AO%1}|
zB$=6BV@lPIVN?JHTyudq>)BI3`QXd5vS41h<{J%Vu~;M2AV=pI8KgKI({=D$$Dj6-
zP0KNk3&jnCXoh-Z@zjF6O0&|;Xcv}p=>*^98IN_50;BU45eHG8XUy(@IJiXHU+a`l
zGrEfI)iaQOo3zI?Cn$KTzSAr<H&6Y*VUyVs??m3tuaf<%0d#@UeIs8R5jDe^O75{1
zC5y`QeQ7)oQSI1LDxKbtz7zbY{>iu`l$BguuJMuka~mL|ZuFZf`$g0cS?9d;Rz3!3
za+aG#apAS==+%OXAuuZC&FNh8)9#!T7s1mKS-&az2I;?nY=e`r2tpEr=|L#<^I}l0
z66e+a=+t$3)ZxfGnUfU+jGk+xtur(N8WkfyXd(vkfH-eHlruWzV1zcd*GXbDJv$4t
z*I6wsaY}hCT)<J=tn_T*Cfht?1}%=-r=HF6?Sh!-^I9m0$Ke4VTfOcUvyh2Lud8#X
zR;DG0j`QmC3gGVA3hrS^xi-$n`2vI`ZuQe7wEn>v1H_rgTF4ErpznRoDjV2DIyx65
zgMXJ}&M^bqz=t-*&&UrOub~y~nNIdLwxA=k%ZDxmC<&@FKreR}=$=z$SMUw7fxOPi
zHx86U+z_97V$Ci4a#%Jz+X-<+RA|3dEEdHUg(R<@*~7ARX0G5Ofp_raCtC1Z)8^XC
z)j!mP_Cnoeq4-;O>tsfsNv;4Lw;ZX^k<%#IfocAcFMZ<6LYoJ^O0uTwnxp$xWiEis
zuX|<mvq7=)xs=cEji3!O(QO&y?=pO#JX7~f_~||6hbrirnJwsF1aA~}1HHhV_uH7F
z#{FPV;Xugj{9fo&Rmrmv?s!snX?ZRr95w*E7uLmox6|tpn-Jx|Oj;St4c580j6Tb1
z;p<Rp*f2D~JVIB&B^Fsa(;pt1OrdY&aDz?nAAreUrmc~#ua(Bay}Z<W$g+^S<ex$;
zUK6T5?UF{C)JwGYstRR{^6K$(Nt!H@kkN3nT}|{Vg{+d#JhPR21?Gz(mw*iGZLqL_
z?2D@#Ubm)yYMW<lc|HV-P?>m$22X|zWfSBLT=uJsmwR!0=p_*duYxU`yTTDU?=i&-
z_xsZ)2QoK2aTqi*$b$Z9Tkh{I1<t*><*lX?H!Wfqg9>WhIn4G+?UUG|Lk*L(H4?u%
z5%hdJu)|AT#|Q94D?`FZIR}x5Ulok^q&t94e`x$lyLNJsjN2XCrfCfz28rwE{B1AW
zKI1f+Q>HF~CAF-8<!#=3h0%nbVEIN~ynHX8!oqkP$l+bzn+&-J^djzDd{yG=)>dY1
z@YT7utg<ykQp_QS(U@V5i{a+#dOeyQKOOOcf5?&*PE>UFxAHDvEcsc$vS&wyiwmlO
zk|51~I#JN=W<SH<Vop<IpajO8NCHS;+=M0Kdi+AQdZn}v9KHz>xr@Mz<ftg5sP2^R
zjXgHmxsSDLIU5y}dp92C*IZ|+7(eTR=Xwvv+qn`?gfb1vr2q#n(LF+tP<Uj<x5d6!
zfUx>$5*ba}F|<7qDsnd&NaFNCagT@|#&w~P^FDw560Z(JpSh8TzX;fBs{=f4p*Uw&
z_uW-u@Rk&QDCkTeLG}C-bsU*pH3d<c#)XJtKpQPF|CKIf3gm%4w5=u-_{L8G`^=Eg
zhxl%$pLU4ItQ@3bj!L5=2_Au49rRAy*&6J=%maU0XoyzKVgUlpD&f?^?K6Yt$;o6B
z37utmQ=)RF`53-CX8>U}adP_m8Lg`CszE9|k7?-~r?LWjXv%P<I1DI|MyE!jx$@>+
zpK<wuI+nXNS(b%?S{{Ysm<t|O@Fk|frxk8RjOQNRVm6xC+_#F!{V)M$sB?~<P(4)L
z<cafpcSj90CF4>|?w^HR7p4IZ{8>qpRy!H<!o$tnlJgPmZ={$zXPtOBK7Tw`T?>uJ
zVBNF=kv?KEA{dBx$)mXUkh^H=n(1@<6MkLbPGA$)#&yLQg)715d<2MoSt&!I9if*N
zr%`B@mLgC>$lsIoNj)<Cf}?MdhjC#xGyvVPAYbZ*UAu|1U*j<qbmWV-j0TOYSv>vG
zOEb=3;{DO49u77WeWxFT*$%o;EbHjemKb^9l4_2TALL_dz&;UE<PjpqfWCr9K<!M`
zCIxeew1P)udEXM<%;gS<iR$S1c;!IMTQFx76nZr|8$9k_C!N~Mj(_}BN+cwyJ4cx`
z%iu4yItO{)7h5=fRUlUcVA8tO-wBAQ3@quKxSJF;nhmcrc?bgP>hJmv#C(s4s^iDc
z^|-LTy?rmy(gD*z23<{rBh)#{ulQ-d$#B^z-#|ZLksD`K($LMd92=aJ75(xKz8=Bn
zB5=Cml}IU{C@2D8ZU3`}^{l@|2rWw4$R-HciFO2@{q*%gPp*Dw``GGe9P>(#;|Uy0
zl}Fy`BE`a@9^kn~H`q{5OCe*)-RtdSC4KyRM@Up34d{amLk)@C%gMTm1`?i^egr<{
zas;&s`w5pG)yl*U4`?tCv!Qb9c=4R0L5ik73W|&%D@npc6a-b7HH|v;$l6)V8d7a=
z87;8z+JjWUywTSwLLDMQs~F@qGh!aoJtPonaW<aB=iZX%lbw$_Hh;HYJLy?X6sUMs
z;6e&zBKikjKXKxEF4kP4MYX|V@$wu(pAOx8CfV#hm+Dd;{X=+KjL+<{8{~%`Yv=7a
zJW!aLd^O*(?{d3=6|gdjW@nTIA_#3YJ-+JmFqyRpHuv5dM9p`S*Mioc74LT*rodx(
z<$9{oSF_x1`P65bc?y>4A@;(M?yFhe$Wq)O7_9<}@O?u!BQp!76*?Qm-}c>E3T&R(
zgL;1jE{4S1&h+rh2T?~`>I0Js3j^!Yo;MR_qkmh4DL*}4<^gXgg&nt!L=j_sAt|Jn
zHs_<6u;g}$gO5RFhQ(J@u35bNd4pgNSstdwwl+pif)XOE4?J*$ey|SBMe*u$^nZ5V
z*k31V;5LYSbvfQ|-f=a3`*M5=5@SahOY7cAIkrzGA$xuR`aSj7i@^&@2v!`-CgJWa
z_Y9vEYYFMYAdZ4H^CSYzf4)&Fmga3L`J!<tOp##IhAMnB1#x%}SBEIWNUf-?2u1=w
z-rm5C?JfW7c<Wmgsol{%{#C^7I^IF~cl<nwO;2Hb5se8YgvJ$BP;l79^MhABUiPr$
zt@C~c!3$Sw@NXP@VF|)qp=0|(Y!z!OmflQ((AK9g<%HRJ(+BZ3)lj_OsvN+)WcVE`
zUi(7A8s9fEP+ho+9n|dy&Vc<gXXD1X>qGKIaImAAZbEhEA9|grEj?AxAlN|*0mi(d
z`9e_Wk3Co3jZTK2MOpA^$_3V&_y*etfFTsDddY`ujgTJaYan9vob^<FOM-c3HawP~
z7-Y>};Q7n16Uyv?O3Uj-o<U)Z5ZUCU!uss)j-!SvTrXNdq7{Rmi(EsW6MPMx6Gg$Y
z`M{ZZa=#xtlv_ck?bhu)nq*0D=H%1^O+fH(%at%2U8%+-t5Lbq&n9^x$78|b9%!S~
z@~O{J{=3qs#-?+7^4esJ|MFdxtdq;DO?gk8y&!$%@&4*a;D|{VMZ3iPkdypkA{c7_
z7~H`Wx%`#r2A?F5Z#9q(P_u&Gi3m?L!b5l5h06XoP!5|WBFgQxKSNjd#ePX;(`9vD
z9j>1`y4Z_)!|ZsI?C8s}x%a2{g0P;6IL-8If4AdBLY0c20xP)aiJWW`aRa@@s}4gw
zy`bmqzNzwjnuTft6dohiGK-^x&1V4hdm6R7Zju-+17eJ_Z1duR3WA;x6T{&3yqdhY
zmXMI2KM)YGmZfGzov03=EU%2+&!1BZ*c#s?0c^!AZ~m$Z47nw%nxZycjVq<DCGgv*
zR*|<T?QYb?_AH`WHF*;tSn>~&R0GymCL*_xDQer(#W+9eLQ|8ygAds}ZKxf$y|}nR
zAV*Ty+13{T{$n@K0AUuX%Z}{AZ4OPZrC`?^nj)7St1+8fef(QLyYo{9DyZ`-V@um9
zSYIm95J?^B2T+vr1C+G}_HQI_+$KRf1vIa0>yJvJG-+#giOgS(qb_`0r$|$)DyIN+
zWaW`ca$gfb!6bF5tt7KctL1%OF89)+Y*E~B{8aLE7V<6i)^q*sm3DA7>@n)fT7tKl
ztD*9?l=Iw1d-no=C8@JDzZ$dDRKBvZO(s+4#y06UmN&MW8uI6g?r)70t5t0+|LkT5
zIC7+bZ}YS3J%)4Dl!mOVgg*Kb3W++g9f_o3w~2WpV@sWLktvjw1vLOK>aj7=G|@6K
z>pNh@Kbp)>qAs^LO>}lIjzs1In9+rE@r?81+Y{1Ae(d#W;jNT4B$e``oqc-+v-Fcd
zt`7K4$*WGI%z+Nb;>Tgi&i{_<WT*OXr<|KB#vP-Q(Ox(=$~u1^wTf4n(qP#4s^8!<
z&YC*nszse%*t<2wjx6RUR#%d@R+`SKVK!Grv?siRH<2l-)DeUmZj(y)Z-CwwePbaX
zfZrMp{)GPz#}(;`cK#=ts}%IxAnY`Jk01xkAE{Barp|J`*`s>{_KN+Ry99@=;HlG_
z{wE}l$3FGl9!($U5II!jp2#Y0XI}Jqpmqe?pQ53AaX^M!j0MSQk<gEMbuU1c(~etC
z?9?I6xs{h6O4N^_PsaHq+B+U0*Nl5zSkpAzbZFKsrZP>AF&XL8?V)Gn0*%}U3&Mw)
zUyRZE!xCT%&ojVa2f@*um%y*@-+yy+y@PhWgS_hNj=pUz<>TVKn*mSJIfW^3x;_9W
zX8A=1gFy@)1GYQ&PP^mXg!e?=nL&i5fDrL7!sp<KkF)d+?LU!@|C3MP?|4oOxRe+@
z494*<K2_kz4Y%t?o^I~9rET5a|Eu{1en!fkfcgM9_rSlX9RMQtU)0y#JkkF}emmO#
zS~)l|lXrLbF*DI_;*JB_1uaecq(S-a?u9e<<JVjaVKApEIv6x6J1+t7wZckcaNEJw
z6Me(vj;EumJq;9mH;3H_;(v2^VztBJFFf(xq`QHo|0XT5p^^Tx^LG>P1~2}bI2!dA
s@&7>?@8+^wbpGZ73O%4%05#zkm;V$bBmKRM5D^P_w}Oeo*$w^rAMSywfdBvi

literal 0
HcmV?d00001

diff --git a/wms/account-record-submit.php b/wms/account-record-submit.php
index c738be3b..418e55d2 100644
--- a/wms/account-record-submit.php
+++ b/wms/account-record-submit.php
@@ -1,75 +1,75 @@
-<?php
-$id= "";
-$accounttype= "";
-$accountid= "";
-$pwd= "";
-$name= "";
-$tel= "";
-$address= "";
-$email= "";
-$lineid= "";
-$wechatid= "";
-$phone_call_help= "";
-$chat_for_help= "";
-$remote_help= "";
-$repairerid= "";
-$manager= "";
-$creater= "";
-$create_at= "";
-
-
-
-$id_error = "";
-$accounttype_error= "";
-$accountid_error= "";
-$pwd_error= "";
-$name_error= "";
-$tel_error= "";
-$address_error= "";
-$email_error= "";
-$lineid_error= "";
-$wechatid_error= "";
-$phone_call_help_error= "";
-$chat_for_help_error= "";
-$remote_help_error= "";
-$repairerid_error= "";
-$manager_error= "";
-$creater_error= "";
-$create_at_error= "";
-
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    include "account-user-input.php";
-
-    $db_query  = "INSERT INTO account(accounttype, accountid, pwd, name, tel, address, email, lineid, wechatid, phone_call_help, chat_for_help, remote_help, repairerid, manager, department_id, role_id, creater, create_at) VALUES ";
-    $db_query .= "('$accounttype', '$accountid','$pwd', '$name', '$tel', '$address', '$email', '$lineid', '$wechatid', '$phone_call_help', '$chat_for_help', '$remote_help', '$repairerid', '$manager', '$department_id', '$role_id', '$creater', '$create_at')";
-    $result = mysqli_query($link,$db_query);
-
-    // 新增權限
-    if (($accounttype == "B" || $accounttype == "E" || $accounttype == "M") && $department_id && $role_id) {
-        $db_query  = "insert into account_auth (accountid, permission) ";
-        $db_query .= "select '$accountid', permission from department where department_id = '$department_id' and role_id = '$role_id'";
-        $res = mysqli_query($link, $db_query);
-    }
-    
-    // mysqli_insert_id可以抓到第一筆的id
-    //$new_id= mysqli_insert_id ($link);
-    #echo "新增後的id為 {$id} ";
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-    // 如果有一筆以上代表有更新
-        echo "<script>";
-        echo "alert('新增成功');";
-        echo "location.href='account-index.php?function_name=account&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script>";
-        echo "alert('無新增資料');";
-        echo "location.href='account-index.php?function_name=account&".$token_link."';";
-        echo "</script>";
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+$id= "";
+$accounttype= "";
+$accountid= "";
+$pwd= "";
+$name= "";
+$tel= "";
+$address= "";
+$email= "";
+$lineid= "";
+$wechatid= "";
+$phone_call_help= "";
+$chat_for_help= "";
+$remote_help= "";
+$repairerid= "";
+$manager= "";
+$creater= "";
+$create_at= "";
+
+
+
+$id_error = "";
+$accounttype_error= "";
+$accountid_error= "";
+$pwd_error= "";
+$name_error= "";
+$tel_error= "";
+$address_error= "";
+$email_error= "";
+$lineid_error= "";
+$wechatid_error= "";
+$phone_call_help_error= "";
+$chat_for_help_error= "";
+$remote_help_error= "";
+$repairerid_error= "";
+$manager_error= "";
+$creater_error= "";
+$create_at_error= "";
+
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    include "account-user-input.php";
+
+    $db_query  = "INSERT INTO account(accounttype, accountid, pwd, name, tel, address, email, lineid, wechatid, phone_call_help, chat_for_help, remote_help, repairerid, manager, department_id, role_id, creater, create_at) VALUES ";
+    $db_query .= "('$accounttype', '$accountid','$pwd', '$name', '$tel', '$address', '$email', '$lineid', '$wechatid', '$phone_call_help', '$chat_for_help', '$remote_help', '$repairerid', '$manager', '$department_id', '$role_id', '$creater', '$create_at')";
+    $result = mysqli_query($link,$db_query);
+
+    // 新增權限
+    if (($accounttype == "B" || $accounttype == "E" || $accounttype == "M") && $department_id && $role_id) {
+        $db_query  = "insert into account_auth (accountid, permission) ";
+        $db_query .= "select '$accountid', permission from department where department_id = '$department_id' and role_id = '$role_id'";
+        $res = mysqli_query($link, $db_query);
+    }
+    
+    // mysqli_insert_id可以抓到第一筆的id
+    //$new_id= mysqli_insert_id ($link);
+    #echo "新增後的id為 {$id} ";
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+    // 如果有一筆以上代表有更新
+        echo "<script>";
+        echo "alert('新增成功');";
+        echo "location.href='account-index.php?function_name=account&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script>";
+        echo "alert('無新增資料');";
+        echo "location.href='account-index.php?function_name=account&".$token_link."';";
+        echo "</script>";
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/account-record-update.php b/wms/account-record-update.php
index 9746db8e..b78299b8 100644
--- a/wms/account-record-update.php
+++ b/wms/account-record-update.php
@@ -1,66 +1,66 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-    function user_input( $data ) {
-        $data1 = trim($data);
-        $data2 = stripslashes($data1);
-        $data3 = htmlspecialchars($data2);
-        return $data3;
-    }
-
-    $id           = $_POST['id'];
-    $accounttype    = user_input($_POST["accounttype"]);		
-    $accountid  = user_input($_POST["accountid"]);
-    $pwd         = user_input($_POST["pwd"]);
-    $name        = user_input($_POST["name"]);
-    $tel        = user_input($_POST["tel"]);
-    $address          = user_input($_POST["address"]);
-    $email    = user_input($_POST["email"]);
-    $lineid      = user_input($_POST["lineid"]);
-    $wechatid   = user_input($_POST["wechatid"]);
-    $phone_call_help   = user_input($_POST["phone_call_help"]);
-    $chat_for_help   = user_input($_POST["chat_for_help"]);		
-    $remote_help   = user_input($_POST["remote_help"]);
-    $repairerid  = user_input($_POST["repairerid"]);
-    $manager  = user_input($_POST["manager"]);
-    $department_id  = user_input($_POST["department_id"]);
-    $role_id  = user_input($_POST["role_id"]);
-    $creater      = user_input($_POST["creater"]);
-    $create_at    = date('Y/m/d H:i:s');
-
-
-
-    $db_query  = "UPDATE account set pwd = '$pwd', name = '$name', tel = '$tel', address = '$address', ";
-    $db_query .= "email = '$email', lineid = '$lineid', wechatid = '$wechatid', phone_call_help = '$phone_call_help', chat_for_help = '$chat_for_help', ";
-    $db_query .= "remote_help = '$remote_help', repairerid = '$repairerid', manager = '$manager', ";
-    $db_query .= "department_id = '$department_id', role_id = '$role_id', create_at = '$create_at' WHERE id='$id'";
-    mysqli_query($link, $db_query);
-    $affected = mysqli_affected_rows($link);
-
-    if (($accounttype == "B" || $accounttype == "E" || $accounttype == "M") && $department_id && $role_id) {
-        $sql = "select permission from department where department_id = '$department_id' and role_id = '$role_id'";
-        $res = mysqli_query($link, $sql);
-        if ($row = mysqli_fetch_row($res)) {
-            $db_query = "update account_auth set permission = '$row[0]' where accountid = '$accountid'";
-            mysqli_query($link, $db_query);
-        }
-        mysqli_free_result($res);
-    }
-
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='account-index.php?function_name=account&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='account-index.php?function_name=account&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if(isset($_POST['update'])) {
+    function user_input( $data ) {
+        $data1 = trim($data);
+        $data2 = stripslashes($data1);
+        $data3 = htmlspecialchars($data2);
+        return $data3;
+    }
+
+    $id           = $_POST['id'];
+    $accounttype    = user_input($_POST["accounttype"]);		
+    $accountid  = user_input($_POST["accountid"]);
+    $pwd         = user_input($_POST["pwd"]);
+    $name        = user_input($_POST["name"]);
+    $tel        = user_input($_POST["tel"]);
+    $address          = user_input($_POST["address"]);
+    $email    = user_input($_POST["email"]);
+    $lineid      = user_input($_POST["lineid"]);
+    $wechatid   = user_input($_POST["wechatid"]);
+    $phone_call_help   = user_input($_POST["phone_call_help"]);
+    $chat_for_help   = user_input($_POST["chat_for_help"]);		
+    $remote_help   = user_input($_POST["remote_help"]);
+    $repairerid  = user_input($_POST["repairerid"]);
+    $manager  = user_input($_POST["manager"]);
+    $department_id  = user_input($_POST["department_id"]);
+    $role_id  = user_input($_POST["role_id"]);
+    $creater      = user_input($_POST["creater"]);
+    $create_at    = date('Y/m/d H:i:s');
+
+
+
+    $db_query  = "UPDATE account set pwd = '$pwd', name = '$name', tel = '$tel', address = '$address', ";
+    $db_query .= "email = '$email', lineid = '$lineid', wechatid = '$wechatid', phone_call_help = '$phone_call_help', chat_for_help = '$chat_for_help', ";
+    $db_query .= "remote_help = '$remote_help', repairerid = '$repairerid', manager = '$manager', ";
+    $db_query .= "department_id = '$department_id', role_id = '$role_id', create_at = '$create_at' WHERE id='$id'";
+    mysqli_query($link, $db_query);
+    $affected = mysqli_affected_rows($link);
+
+    if (($accounttype == "B" || $accounttype == "E" || $accounttype == "M") && $department_id && $role_id) {
+        $sql = "select permission from department where department_id = '$department_id' and role_id = '$role_id'";
+        $res = mysqli_query($link, $sql);
+        if ($row = mysqli_fetch_row($res)) {
+            $db_query = "update account_auth set permission = '$row[0]' where accountid = '$accountid'";
+            mysqli_query($link, $db_query);
+        }
+        mysqli_free_result($res);
+    }
+
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='account-index.php?function_name=account&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='account-index.php?function_name=account&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/account-user-input.php b/wms/account-user-input.php
index aa3380c5..2af17727 100644
--- a/wms/account-user-input.php
+++ b/wms/account-user-input.php
@@ -1,65 +1,65 @@
-<?php
-
-//Function to filter the form input
-function user_input( $data ) {
-    $data1 = trim($data);
-    $data2 = stripslashes($data1);
-    $data3 = htmlspecialchars($data2);
-    return $data3;
-}
-
-
-$accounttype    = user_input($_POST["accounttype"]);		
-$accountid  = user_input($_POST["accountid"]);
-#$accountid = $accounttype . $accountid;
-$pwd         = user_input($_POST["pwd"]);
-$name        = user_input($_POST["name"]);
-$tel        = user_input($_POST["tel"]);
-$address     = user_input($_POST["address"]);
-$email    = user_input($_POST["email"]);
-$lineid   = user_input($_POST["lineid"]);
-$wechatid   = user_input($_POST["wechatid"]);
-$phone_call_help   = user_input($_POST["phone_call_help"]);
-$chat_for_help   = user_input($_POST["chat_for_help"]);
-$remote_help   = user_input($_POST["remote_help"]);
-$repairerid  = user_input($_POST["repairerid"]);
-$manager  = user_input($_POST["manager"]);
-$department_id  = user_input($_POST["department_id"]);
-$role_id  = user_input($_POST["role_id"]);
-$creater      = user_input($_POST["creater"]);
-$create_at    = date('Y/m/d H:i:s');
-
-
-
-
-/*
-
-if(empty($_POST["name"])) {
-    $name_error = "Name is required";
-} else {
-    $name = user_input($_POST["name"]);
-    
-    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
-        $name_error = "Only letter and white space are allowed";
-    }
-}
-
-
-/*
-if(empty($_POST["website"])) {
-    $website_error = "Website address is required";
-} else {
-    $website = user_input($_POST["website"]);
-
-    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
-        $website_error = "Invalid website URL";
-    }
-}
-
-if(empty($_POST["comment"])) {
-    $comment = "";
-} else {
-    $comment = user_input($_POST["comment"]);
-}
-*/
-?>
+<?php
+
+//Function to filter the form input
+function user_input( $data ) {
+    $data1 = trim($data);
+    $data2 = stripslashes($data1);
+    $data3 = htmlspecialchars($data2);
+    return $data3;
+}
+
+
+$accounttype    = user_input($_POST["accounttype"]);		
+$accountid  = user_input($_POST["accountid"]);
+#$accountid = $accounttype . $accountid;
+$pwd         = user_input($_POST["pwd"]);
+$name        = user_input($_POST["name"]);
+$tel        = user_input($_POST["tel"]);
+$address     = user_input($_POST["address"]);
+$email    = user_input($_POST["email"]);
+$lineid   = user_input($_POST["lineid"]);
+$wechatid   = user_input($_POST["wechatid"]);
+$phone_call_help   = user_input($_POST["phone_call_help"]);
+$chat_for_help   = user_input($_POST["chat_for_help"]);
+$remote_help   = user_input($_POST["remote_help"]);
+$repairerid  = user_input($_POST["repairerid"]);
+$manager  = user_input($_POST["manager"]);
+$department_id  = user_input($_POST["department_id"]);
+$role_id  = user_input($_POST["role_id"]);
+$creater      = user_input($_POST["creater"]);
+$create_at    = date('Y/m/d H:i:s');
+
+
+
+
+/*
+
+if(empty($_POST["name"])) {
+    $name_error = "Name is required";
+} else {
+    $name = user_input($_POST["name"]);
+    
+    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
+        $name_error = "Only letter and white space are allowed";
+    }
+}
+
+
+/*
+if(empty($_POST["website"])) {
+    $website_error = "Website address is required";
+} else {
+    $website = user_input($_POST["website"]);
+
+    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
+        $website_error = "Invalid website URL";
+    }
+}
+
+if(empty($_POST["comment"])) {
+    $comment = "";
+} else {
+    $comment = user_input($_POST["comment"]);
+}
+*/
+?>
diff --git a/wms/account_auth-create.php b/wms/account_auth-create.php
index 4186c4e0..7448e57c 100644
--- a/wms/account_auth-create.php
+++ b/wms/account_auth-create.php
@@ -1,177 +1,177 @@
-<?php
-include "header.php";
-
-// 部門職別
-$db_query = "select department_id, name, role_id, role from department order by department_id";
-$res = mysqli_query($link, $db_query);
-while ($row = mysqli_fetch_assoc($res)) {
-    $depart_arr[$row["department_id"]] = $row["name"];
-    $role_arr[$row["department_id"]][$row["role_id"]] = $row["role"];
-}
-mysqli_free_result($res);
-
-// 選單結構
-$data = array();
-$db_query = "select * from menu order by main_menu_seq, sub_menu_seq";
-$res = mysqli_query($link, $db_query);
-while ($row = mysqli_fetch_assoc($res)) {
-    $data[$row["main_menu_seq"]]["main_menu"] = $row["main_menu"];
-    $data[$row["main_menu_seq"]][$row["sub_menu_seq"]]["sub_menu"] = $row["sub_menu"];
-    $data[$row["main_menu_seq"]][$row["sub_menu_seq"]]["link_content"] = $row["link_content"];
-    $data[$row["main_menu_seq"]][$row["sub_menu_seq"]]["status"] = $row["status"];
-}
-mysqli_free_result($res);
-//print_r($data);exit;
-?>
-<style>
-table {
-    margin-top:10px;
-}
-.table-off, .table-off > td, .table-off > th {
-    background-color: #d6d8db;
-}
-.label-checkbox { cursor: pointer; }
-</style>
-<script>
-$(function () {
-    var jroleStr = '<?php echo json_encode($role_arr); ?>';
-    var jroleArr = JSON.parse(jroleStr);
-    var optStr = "";
-    $("select[name=department_id]").change(function(){
-        if ($(this).val() != "") {
-            optStr = "";
-            for (var i in jroleArr[$(this).val()]) {
-                if ('undefined' !== jroleArr[$(this).val()][i]) {
-                    optStr += '<option value="'+i+'">'+jroleArr[$(this).val()][i]+'</option>';
-                }
-            }
-            $("select[name=role_id]").html(optStr);
-        } else $("select[name=role_id]").html('<option value="">請選擇</option>');
-    })
-
-    $('#submit').click(function(){
-        var optRStr = "";
-        var optRArr = [];
-        $("input[name=opt_r]").each(function(){
-            optRStr = "";
-            optRStr += $(this).attr('data-auth');
-            if ($(this).prop('checked')) optRStr += ";"+$(this).val();
-            else optRStr += ";X";
-            optRArr.push(optRStr);
-        })
-        $('#opt_r_all').val(optRArr);
-        var optWStr = "";
-        var optWArr = [];
-        $("input[name=opt_w]").each(function(){
-            optWStr = "";
-            optWStr += $(this).attr('data-auth');
-            if ($(this).prop('checked')) optWStr += ";"+$(this).val();
-            else optWStr += ";X";
-            optWArr.push(optWStr);
-        })
-        $('#opt_w_all').val(optWArr);
-    });
-});
-</script>
-<div class="container">
-
-    <?php
-    
-        include "account_auth-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>">
-        <div>
-            <label for="department_id">部門</label>
-            <select name="department_id" required>
-                <option value="">請選擇</option>
-                <?php
-                foreach ($depart_arr as $k => $v) {
-                    echo "<option value=\"".$k."\">".$v."</option>";
-                }
-                ?>
-            </select>
-        </div>
-        <div>
-            <label for="role_id">職別</label>
-            <select name="role_id" required>
-                <?php
-                foreach ($role_arr[$data2["department_id"]] as $k => $v) {
-                    echo "<option value=\"".$k."\">".$v."</option>";
-                }
-                ?>
-            </select>
-        </div>
-            
-        <table class="table table-bordered">
-            <thead>
-                <tr>
-                <th scope="col">主功能名稱</th>
-                <th scope="col">子功能名稱</th>
-                <th scope="col">控管</th>
-                </tr>
-            </thead>
-            <tbody>
-<?php
-foreach($data as $key => $val) {
-    foreach($val as $k2 => $v2) {
-        if ($k2 == "main_menu") continue;
-        $td_str = ($k2 == 1) ? '<td rowspan="'.(count($val)-1).'">'.$val["main_menu"].'</td>' : '';
-        $sta_str = ($v2["status"] == "Y") ? '' : ' class="table-off"';
-?>
-                <tr<?php echo $sta_str; ?>>
-<?php echo $td_str; ?>
-                    <td><?php echo $v2["sub_menu"]; ?></td>
-                    <td>
-                        <label class="label-checkbox">
-                        <input type="checkbox" name="opt_r" value="R" data-auth="<?php echo $key.";".$k2; ?>">
-                        可讀</label>
-                        <label class="label-checkbox">
-                        <input type="checkbox" name="opt_w" value="W" data-auth="<?php echo $key.";".$k2; ?>">
-                        可寫</label>
-                    </td>
-                </tr>
-
-<?php
-    }
-}
-?>
-            </tbody>
-        </table>
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
-            <p class="error"><?php echo $creater_error; ?></p>
-        </div>
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at" value="<?php echo date("Y-m-d H:i:s"); ?>">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-
-        <div>
-			<br>
-            <button type="submit" id="submit" name="submit">確定</button>
-        </div>
-        <input type="hidden" name="opt_r_all" id="opt_r_all">
-        <input type="hidden" name="opt_w_all" id="opt_w_all">
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php
-
-include "footer.php";
-?>
+<?php
+include "header.php";
+
+// 部門職別
+$db_query = "select department_id, name, role_id, role from department order by department_id";
+$res = mysqli_query($link, $db_query);
+while ($row = mysqli_fetch_assoc($res)) {
+    $depart_arr[$row["department_id"]] = $row["name"];
+    $role_arr[$row["department_id"]][$row["role_id"]] = $row["role"];
+}
+mysqli_free_result($res);
+
+// 選單結構
+$data = array();
+$db_query = "select * from menu order by main_menu_seq, sub_menu_seq";
+$res = mysqli_query($link, $db_query);
+while ($row = mysqli_fetch_assoc($res)) {
+    $data[$row["main_menu_seq"]]["main_menu"] = $row["main_menu"];
+    $data[$row["main_menu_seq"]][$row["sub_menu_seq"]]["sub_menu"] = $row["sub_menu"];
+    $data[$row["main_menu_seq"]][$row["sub_menu_seq"]]["link_content"] = $row["link_content"];
+    $data[$row["main_menu_seq"]][$row["sub_menu_seq"]]["status"] = $row["status"];
+}
+mysqli_free_result($res);
+//print_r($data);exit;
+?>
+<style>
+table {
+    margin-top:10px;
+}
+.table-off, .table-off > td, .table-off > th {
+    background-color: #d6d8db;
+}
+.label-checkbox { cursor: pointer; }
+</style>
+<script>
+$(function () {
+    var jroleStr = '<?php echo json_encode($role_arr); ?>';
+    var jroleArr = JSON.parse(jroleStr);
+    var optStr = "";
+    $("select[name=department_id]").change(function(){
+        if ($(this).val() != "") {
+            optStr = "";
+            for (var i in jroleArr[$(this).val()]) {
+                if ('undefined' !== jroleArr[$(this).val()][i]) {
+                    optStr += '<option value="'+i+'">'+jroleArr[$(this).val()][i]+'</option>';
+                }
+            }
+            $("select[name=role_id]").html(optStr);
+        } else $("select[name=role_id]").html('<option value="">請選擇</option>');
+    })
+
+    $('#submit').click(function(){
+        var optRStr = "";
+        var optRArr = [];
+        $("input[name=opt_r]").each(function(){
+            optRStr = "";
+            optRStr += $(this).attr('data-auth');
+            if ($(this).prop('checked')) optRStr += ";"+$(this).val();
+            else optRStr += ";X";
+            optRArr.push(optRStr);
+        })
+        $('#opt_r_all').val(optRArr);
+        var optWStr = "";
+        var optWArr = [];
+        $("input[name=opt_w]").each(function(){
+            optWStr = "";
+            optWStr += $(this).attr('data-auth');
+            if ($(this).prop('checked')) optWStr += ";"+$(this).val();
+            else optWStr += ";X";
+            optWArr.push(optWStr);
+        })
+        $('#opt_w_all').val(optWArr);
+    });
+});
+</script>
+<div class="container">
+
+    <?php
+    
+        include "account_auth-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>">
+        <div>
+            <label for="department_id">部門</label>
+            <select name="department_id" required>
+                <option value="">請選擇</option>
+                <?php
+                foreach ($depart_arr as $k => $v) {
+                    echo "<option value=\"".$k."\">".$v."</option>";
+                }
+                ?>
+            </select>
+        </div>
+        <div>
+            <label for="role_id">職別</label>
+            <select name="role_id" required>
+                <?php
+                foreach ($role_arr[$data2["department_id"]] as $k => $v) {
+                    echo "<option value=\"".$k."\">".$v."</option>";
+                }
+                ?>
+            </select>
+        </div>
+            
+        <table class="table table-bordered">
+            <thead>
+                <tr>
+                <th scope="col">主功能名稱</th>
+                <th scope="col">子功能名稱</th>
+                <th scope="col">控管</th>
+                </tr>
+            </thead>
+            <tbody>
+<?php
+foreach($data as $key => $val) {
+    foreach($val as $k2 => $v2) {
+        if ($k2 == "main_menu") continue;
+        $td_str = ($k2 == 1) ? '<td rowspan="'.(count($val)-1).'">'.$val["main_menu"].'</td>' : '';
+        $sta_str = ($v2["status"] == "Y") ? '' : ' class="table-off"';
+?>
+                <tr<?php echo $sta_str; ?>>
+<?php echo $td_str; ?>
+                    <td><?php echo $v2["sub_menu"]; ?></td>
+                    <td>
+                        <label class="label-checkbox">
+                        <input type="checkbox" name="opt_r" value="R" data-auth="<?php echo $key.";".$k2; ?>">
+                        可讀</label>
+                        <label class="label-checkbox">
+                        <input type="checkbox" name="opt_w" value="W" data-auth="<?php echo $key.";".$k2; ?>">
+                        可寫</label>
+                    </td>
+                </tr>
+
+<?php
+    }
+}
+?>
+            </tbody>
+        </table>
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
+            <p class="error"><?php echo $creater_error; ?></p>
+        </div>
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at" value="<?php echo date("Y-m-d H:i:s"); ?>">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+
+        <div>
+			<br>
+            <button type="submit" id="submit" name="submit">確定</button>
+        </div>
+        <input type="hidden" name="opt_r_all" id="opt_r_all">
+        <input type="hidden" name="opt_w_all" id="opt_w_all">
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php
+
+include "footer.php";
+?>
diff --git a/wms/account_auth-edit.php b/wms/account_auth-edit.php
index 1e641805..a274bf1a 100644
--- a/wms/account_auth-edit.php
+++ b/wms/account_auth-edit.php
@@ -1,182 +1,182 @@
-<?php
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-// 選單結構
-$menu = array();
-$db_query = "select * from menu where status = 'Y' order by main_menu_seq, sub_menu_seq";
-$res = mysqli_query($link, $db_query);
-while ($row = mysqli_fetch_assoc($res)) {
-    $menu[$row["main_menu_seq"]]["main_menu"] = $row["main_menu"];
-    $menu[$row["main_menu_seq"]][$row["sub_menu_seq"]]["sub_menu"] = $row["sub_menu"];
-    $menu[$row["main_menu_seq"]][$row["sub_menu_seq"]]["mlink"] = $row["mlink"];
-    $menu[$row["main_menu_seq"]][$row["sub_menu_seq"]]["link_content"] = $row["link_content"];
-    $menu[$row["main_menu_seq"]][$row["sub_menu_seq"]]["status"] = $row["status"];
-    $menu[$row["main_menu_seq"]][$row["sub_menu_seq"]]["id"] = $row["id"];
-}
-mysqli_free_result($res);
-
-$data = array();
-// sql语法存在变数中
-$db_query = "select * from department where id = '$id'";
-// 用mysqli_query方法执行(sql语法)将结果存在变数中
-$data = mysqli_query($link,$db_query);
-foreach($data as $data) :
-    $permission_arr = json_decode(urldecode($data["permission"]), true);
-
-    $person = "";
-    $sql = "select accountid, name from account where department_id = '".$data["department_id"]."' and role_id = '".$data["role_id"]."' and accounttype <> 'X'";
-    $result = mysqli_query($link, $sql);
-    while ($row_a = mysqli_fetch_row($result)) {
-        $person .= $row_a[1]."(".$row_a[0].")、";
-    }
-    mysqli_free_result($result);
-?>
-<style>
-table {
-    margin-top:10px;
-}
-.table-off, .table-off > td, .table-off > th {
-    background-color: #d6d8db;
-}
-.label-checkbox {
-    cursor: pointer;
-}
-
-body > div > form > table > thead > tr > th:nth-child(3) > label > span {
-    font-size:14px;
-}
-.nextline {
-    width: 100%;
-    height: 0;
-}
-</style>
-<script>
-$(function () {
-    $("input[name=rall]").click(function(){
-        $("input[name=opt_r]").not(this).prop('checked', this.checked);
-    });
-    $("input[name=wall]").click(function(){
-        $("input[name=opt_w]").not(this).prop('checked', this.checked);
-    });
-
-    $('#update').click(function(){
-        var optRStr = "";
-        var optRArr = [];
-        $("input[name=opt_r]").each(function(){
-            optRStr = "";
-            optRStr += $(this).attr('data-auth');
-            if ($(this).prop('checked')) optRStr += ";"+$(this).val();
-            else optRStr += ";0";
-            optRArr.push(optRStr);
-        })
-        $('#opt_r_all').val(optRArr);
-        var optWStr = "";
-        var optWArr = [];
-        $("input[name=opt_w]").each(function(){
-            optWStr = "";
-            optWStr += $(this).attr('data-auth');
-            if ($(this).prop('checked')) optWStr += ";"+$(this).val();
-            else optWStr += ";0";
-            optWArr.push(optWStr);
-        })
-        $('#opt_w_all').val(optWArr);
-    });
-});
-</script>
-<div class="container">
-    <form class="form-inline" method="post" action="account_auth-record-update.php">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-
-        <div>
-            <label for="department_name">部門</label>
-            <input type="text" name="department_name" id="department_name" value="<?php echo $data['name']; ?>" readonly>
-        </div>
-        <div>
-            <label for="role_name">職別</label>
-            <input type="text" name="role_name" id="role_name" value="<?php echo $data['role']; ?>" readonly>
-        </div>
-
-        <table class="table table-bordered">
-            <thead>
-                <tr>
-                <th scope="col">主功能名稱</th>
-                <th scope="col">子功能名稱</th>
-                <th scope="col">
-                    <label class="label-checkbox"><input type="checkbox" name="rall">
-                    全選</label>
-                </th>
-                <th scope="col">
-                    <label class="label-checkbox"><input type="checkbox" name="wall">
-                    全選</label>
-                </th>
-                </tr>
-            </thead>
-            <tbody>
-<?php
-foreach($menu as $key => $val) {
-    foreach($val as $k2 => $v2) {
-        if ($k2 == "main_menu") continue;
-        $td_str = ($k2 == 1) ? '<td rowspan="'.(count($val)-1).'">'.$val["main_menu"].'</td>' : '';
-        $sta_str = ($v2["status"] == "Y") ? '' : ' class="table-off"';
-        $chk_r = $chk_w = "";
-        if (!empty($permission_arr[$v2["mlink"]])) {
-            if ($permission_arr[$v2["mlink"]]&1) $chk_r = " checked";
-            if ($permission_arr[$v2["mlink"]]&2) $chk_w = " checked";
-        }
-?>
-                <tr<?php echo $sta_str; ?>>
-<?php echo $td_str; ?>
-                    <td>
-                        <?php echo $v2["sub_menu"]; ?>
-                    </td>
-                    <td>
-                        <label class="label-checkbox">
-                        <input type="checkbox" name="opt_r" value="1" data-auth="<?php echo $v2["id"]; ?>"<?php echo $chk_r; ?>>
-                        可讀</label>
-                    </td>
-                    <td>
-                        <label class="label-checkbox">
-                        <input type="checkbox" name="opt_w" value="2" data-auth="<?php echo $v2["id"]; ?>"<?php echo $chk_w; ?>>
-                        可寫</label>
-                    </td>
-                </tr>
-
-<?php
-    }
-}
-?>
-            </tbody>
-        </table>
-
-        <div>
-            <label>所屬人員</label>
-            <textarea name="person-info" rows="6" cols="70" class="form-control" readonly><?php echo rtrim($person, "、"); ?></textarea>
-        </div>
-        <div class="nextline"></div>
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
-        </div>
-        <div>
-            <br>
-            <button type="submit" name="update" id="update">確定</button>
-        </div>
-        <input type="hidden" name="opt_r_all" id="opt_r_all">
-        <input type="hidden" name="opt_w_all" id="opt_w_all">
-        <input type="hidden" name="department_id" id="department_id" value="<?php echo $data["department_id"]; ?>">
-        <input type="hidden" name="role_id" id="role_id" value="<?php echo $data["role_id"]; ?>">
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-        <input type="hidden" name="create_at" id="create_at" value="<?php echo date("Y-m-d H:i:s"); ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
-?>
-
+<?php
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+// 選單結構
+$menu = array();
+$db_query = "select * from menu where status = 'Y' order by main_menu_seq, sub_menu_seq";
+$res = mysqli_query($link, $db_query);
+while ($row = mysqli_fetch_assoc($res)) {
+    $menu[$row["main_menu_seq"]]["main_menu"] = $row["main_menu"];
+    $menu[$row["main_menu_seq"]][$row["sub_menu_seq"]]["sub_menu"] = $row["sub_menu"];
+    $menu[$row["main_menu_seq"]][$row["sub_menu_seq"]]["mlink"] = $row["mlink"];
+    $menu[$row["main_menu_seq"]][$row["sub_menu_seq"]]["link_content"] = $row["link_content"];
+    $menu[$row["main_menu_seq"]][$row["sub_menu_seq"]]["status"] = $row["status"];
+    $menu[$row["main_menu_seq"]][$row["sub_menu_seq"]]["id"] = $row["id"];
+}
+mysqli_free_result($res);
+
+$data = array();
+// sql语法存在变数中
+$db_query = "select * from department where id = '$id'";
+// 用mysqli_query方法执行(sql语法)将结果存在变数中
+$data = mysqli_query($link,$db_query);
+foreach($data as $data) :
+    $permission_arr = json_decode(urldecode($data["permission"]), true);
+
+    $person = "";
+    $sql = "select accountid, name from account where department_id = '".$data["department_id"]."' and role_id = '".$data["role_id"]."' and accounttype <> 'X'";
+    $result = mysqli_query($link, $sql);
+    while ($row_a = mysqli_fetch_row($result)) {
+        $person .= $row_a[1]."(".$row_a[0].")、";
+    }
+    mysqli_free_result($result);
+?>
+<style>
+table {
+    margin-top:10px;
+}
+.table-off, .table-off > td, .table-off > th {
+    background-color: #d6d8db;
+}
+.label-checkbox {
+    cursor: pointer;
+}
+
+body > div > form > table > thead > tr > th:nth-child(3) > label > span {
+    font-size:14px;
+}
+.nextline {
+    width: 100%;
+    height: 0;
+}
+</style>
+<script>
+$(function () {
+    $("input[name=rall]").click(function(){
+        $("input[name=opt_r]").not(this).prop('checked', this.checked);
+    });
+    $("input[name=wall]").click(function(){
+        $("input[name=opt_w]").not(this).prop('checked', this.checked);
+    });
+
+    $('#update').click(function(){
+        var optRStr = "";
+        var optRArr = [];
+        $("input[name=opt_r]").each(function(){
+            optRStr = "";
+            optRStr += $(this).attr('data-auth');
+            if ($(this).prop('checked')) optRStr += ";"+$(this).val();
+            else optRStr += ";0";
+            optRArr.push(optRStr);
+        })
+        $('#opt_r_all').val(optRArr);
+        var optWStr = "";
+        var optWArr = [];
+        $("input[name=opt_w]").each(function(){
+            optWStr = "";
+            optWStr += $(this).attr('data-auth');
+            if ($(this).prop('checked')) optWStr += ";"+$(this).val();
+            else optWStr += ";0";
+            optWArr.push(optWStr);
+        })
+        $('#opt_w_all').val(optWArr);
+    });
+});
+</script>
+<div class="container">
+    <form class="form-inline" method="post" action="account_auth-record-update.php">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+
+        <div>
+            <label for="department_name">部門</label>
+            <input type="text" name="department_name" id="department_name" value="<?php echo $data['name']; ?>" readonly>
+        </div>
+        <div>
+            <label for="role_name">職別</label>
+            <input type="text" name="role_name" id="role_name" value="<?php echo $data['role']; ?>" readonly>
+        </div>
+
+        <table class="table table-bordered">
+            <thead>
+                <tr>
+                <th scope="col">主功能名稱</th>
+                <th scope="col">子功能名稱</th>
+                <th scope="col">
+                    <label class="label-checkbox"><input type="checkbox" name="rall">
+                    全選</label>
+                </th>
+                <th scope="col">
+                    <label class="label-checkbox"><input type="checkbox" name="wall">
+                    全選</label>
+                </th>
+                </tr>
+            </thead>
+            <tbody>
+<?php
+foreach($menu as $key => $val) {
+    foreach($val as $k2 => $v2) {
+        if ($k2 == "main_menu") continue;
+        $td_str = ($k2 == 1) ? '<td rowspan="'.(count($val)-1).'">'.$val["main_menu"].'</td>' : '';
+        $sta_str = ($v2["status"] == "Y") ? '' : ' class="table-off"';
+        $chk_r = $chk_w = "";
+        if (!empty($permission_arr[$v2["mlink"]])) {
+            if ($permission_arr[$v2["mlink"]]&1) $chk_r = " checked";
+            if ($permission_arr[$v2["mlink"]]&2) $chk_w = " checked";
+        }
+?>
+                <tr<?php echo $sta_str; ?>>
+<?php echo $td_str; ?>
+                    <td>
+                        <?php echo $v2["sub_menu"]; ?>
+                    </td>
+                    <td>
+                        <label class="label-checkbox">
+                        <input type="checkbox" name="opt_r" value="1" data-auth="<?php echo $v2["id"]; ?>"<?php echo $chk_r; ?>>
+                        可讀</label>
+                    </td>
+                    <td>
+                        <label class="label-checkbox">
+                        <input type="checkbox" name="opt_w" value="2" data-auth="<?php echo $v2["id"]; ?>"<?php echo $chk_w; ?>>
+                        可寫</label>
+                    </td>
+                </tr>
+
+<?php
+    }
+}
+?>
+            </tbody>
+        </table>
+
+        <div>
+            <label>所屬人員</label>
+            <textarea name="person-info" rows="6" cols="70" class="form-control" readonly><?php echo rtrim($person, "、"); ?></textarea>
+        </div>
+        <div class="nextline"></div>
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
+        </div>
+        <div>
+            <br>
+            <button type="submit" name="update" id="update">確定</button>
+        </div>
+        <input type="hidden" name="opt_r_all" id="opt_r_all">
+        <input type="hidden" name="opt_w_all" id="opt_w_all">
+        <input type="hidden" name="department_id" id="department_id" value="<?php echo $data["department_id"]; ?>">
+        <input type="hidden" name="role_id" id="role_id" value="<?php echo $data["role_id"]; ?>">
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+        <input type="hidden" name="create_at" id="create_at" value="<?php echo date("Y-m-d H:i:s"); ?>">
+    </form>
+</div>
+
+<?php
+
+    endforeach;
+    
+    include "footer.php";
+
+?>
+
diff --git a/wms/account_auth-index.php b/wms/account_auth-index.php
index 0ddbff5d..d1dc283b 100644
--- a/wms/account_auth-index.php
+++ b/wms/account_auth-index.php
@@ -1,106 +1,105 @@
-<?php
-include "header.php";
-
-// 設置一個空陣列來放資料
-$data = array();
-// sql語法存在變數中
-$sql = "select * from department order by department_id, role_id";
-
-// 用mysqli_query方法執行(sql語法)將結果存在變數中
-$data = mysqli_query($link,$sql);
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<!--
-<p>
-<a href="account_auth-create.php?function_name=account_auth&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-    <span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
--->
-<?php
-if($data):
-    
-?>
-<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;
-   
-}
-</style>
-<div style="overflow-x:auto;">
-    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-    <thead>
-        <tr>
-            <th>項次</th>
-            <th>部門代碼</th>
-            <th>部門名稱</th>
-            <th>職務代碼</th>
-            <th>職務名稱</th>
-            <th>建檔人</th>
-            <th>建檔時間</th>
-            <th>修改</th>
-        </tr>
-    </thead>
-    <tbody>
-
-        <?php foreach($data as $data) : ?>
-            <tr>
-                <td><?php echo $data['id']; ?></td>
-                <td><?php echo $data['department_id']; ?></td>
-                <td><?php echo $data['name']; ?></td>
-                <td><?php echo $data['role_id']; ?></td>
-                <td><?php echo $data['role']; ?></td>
-                <td><?php echo $data['creater']; ?></td>
-                <td><?php echo $data['create_at']; ?></td>
-                <td>
-                    <p>
-                        <a href="account_auth-edit.php?id=<?php echo $data['id']; ?>&function_name=account_auth&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-                            <span class="glyphicon glyphicon-pencil"></span>
-                        </a>
-                    </p> 
-                </td>
-            </tr>
-        <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-include "footer.php";
+<?php
+include "header.php";
+
+// 設置一個空陣列來放資料
+$data = array();
+// sql語法存在變數中
+$sql = "select * from department order by department_id, role_id";
+
+// 用mysqli_query方法執行(sql語法)將結果存在變數中
+$data = mysqli_query($link,$sql);
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<!--
+<p>
+<a href="account_auth-create.php?function_name=account_auth&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+    <span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+-->
+<?php
+if($data):
+?>
+<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;
+   
+}
+</style>
+<div style="overflow-x:auto;">
+    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+    <thead>
+        <tr>
+            <th>項次</th>
+            <th>部門代碼</th>
+            <th>部門名稱</th>
+            <th>職務代碼</th>
+            <th>職務名稱</th>
+            <th>建檔人</th>
+            <th>建檔時間</th>
+            <th>修改</th>
+        </tr>
+    </thead>
+    <tbody>
+
+        <?php foreach($data as $data) : ?>
+            <tr>
+                <td><?php echo $data['id']; ?></td>
+                <td><?php echo $data['department_id']; ?></td>
+                <td><?php echo $data['name']; ?></td>
+                <td><?php echo $data['role_id']; ?></td>
+                <td><?php echo $data['role']; ?></td>
+                <td><?php echo $data['creater']; ?></td>
+                <td><?php echo $data['create_at']; ?></td>
+                <td>
+                    <p>
+                        <a href="account_auth-edit.php?id=<?php echo $data['id']; ?>&function_name=account_auth&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+                            <span class="glyphicon glyphicon-pencil"></span>
+                        </a>
+                    </p> 
+                </td>
+            </tr>
+        <?php endforeach; ?>
+        </tbody>
+    </table>
+</div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+include "footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/account_auth-record-update.php b/wms/account_auth-record-update.php
index 0cdab8bc..cf0ea3c3 100644
--- a/wms/account_auth-record-update.php
+++ b/wms/account_auth-record-update.php
@@ -1,65 +1,65 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-    foreach ($_POST as $k => $v) {
-        $$k = htmlspecialchars(stripslashes(trim($v)));
-    }
-    //print_r($_POST);exit;
-
-    // 選單各功能的權限
-    $prog_arr = [];
-    $opt_r_arr = explode(",", $opt_r_all);
-    $opt_w_arr = explode(",", $opt_w_all);
-    foreach ($opt_r_arr as $key => $val) {
-        list($menu_id, $auth_r) = explode(";", $val);
-        list($menu_id, $auth_w) = explode(";", $opt_w_arr[$key]);
-
-        // 找出相關程式
-        $sql = "select link_content from menu where id = '$menu_id'";
-        $res = mysqli_query($link, $sql);
-        if ($row = mysqli_fetch_assoc($res)) {
-            if ($row["link_content"]) {
-                $tmp_arr = explode("\r\n", $row["link_content"]);
-                foreach ($tmp_arr as $v) {
-                    $prog_arr[$v] = $auth_r|$auth_w;
-                }
-            }
-        }
-        mysqli_free_result($res);
-
-        if (($key%10)==0) usleep(200000);
-    }
-
-    // 開始更新權限
-    $permission = json_encode($prog_arr, JSON_UNESCAPED_SLASHES);
-    $sql = "update department set permission = '$permission', create_at = '$create_at' where id = '$id'";
-    mysqli_query($link, $sql);
-    $affected = mysqli_affected_rows($link);
-
-    // 更新user權限
-    $sql = "select accountid from account where department_id = '$department_id' and role_id = '$role_id'";
-    $res = mysqli_query($link, $sql);
-    while ($row = mysqli_fetch_row($res)) {
-        $db_query  = "insert into account_auth (accountid, permission) values ('$row[0]', '$permission') ";
-        $db_query .= "ON DUPLICATE KEY UPDATE accountid = '$row[0]', permission = '$permission'";
-        $res_u = mysqli_query($link, $db_query);
-    }
-    mysqli_free_result($res);
-
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='account_auth-index.php?function_name=account_auth&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='account_auth-index.php?function_name=account_auth&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if(isset($_POST['update'])) {
+    foreach ($_POST as $k => $v) {
+        $$k = htmlspecialchars(stripslashes(trim($v)));
+    }
+    //print_r($_POST);exit;
+
+    // 選單各功能的權限
+    $prog_arr = [];
+    $opt_r_arr = explode(",", $opt_r_all);
+    $opt_w_arr = explode(",", $opt_w_all);
+    foreach ($opt_r_arr as $key => $val) {
+        list($menu_id, $auth_r) = explode(";", $val);
+        list($menu_id, $auth_w) = explode(";", $opt_w_arr[$key]);
+
+        // 找出相關程式
+        $sql = "select link_content from menu where id = '$menu_id'";
+        $res = mysqli_query($link, $sql);
+        if ($row = mysqli_fetch_assoc($res)) {
+            if ($row["link_content"]) {
+                $tmp_arr = explode("\r\n", $row["link_content"]);
+                foreach ($tmp_arr as $v) {
+                    $prog_arr[$v] = $auth_r|$auth_w;
+                }
+            }
+        }
+        mysqli_free_result($res);
+
+        if (($key%10)==0) usleep(200000);
+    }
+
+    // 開始更新權限
+    $permission = json_encode($prog_arr, JSON_UNESCAPED_SLASHES);
+    $sql = "update department set permission = '$permission', create_at = '$create_at' where id = '$id'";
+    mysqli_query($link, $sql);
+    $affected = mysqli_affected_rows($link);
+
+    // 更新user權限
+    $sql = "select accountid from account where department_id = '$department_id' and role_id = '$role_id'";
+    $res = mysqli_query($link, $sql);
+    while ($row = mysqli_fetch_row($res)) {
+        $db_query  = "insert into account_auth (accountid, permission) values ('$row[0]', '$permission') ";
+        $db_query .= "ON DUPLICATE KEY UPDATE accountid = '$row[0]', permission = '$permission'";
+        $res_u = mysqli_query($link, $db_query);
+    }
+    mysqli_free_result($res);
+
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='account_auth-index.php?function_name=account_auth&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='account_auth-index.php?function_name=account_auth&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/bargain-create.php b/wms/bargain-create.php
index b39c625e..4188986c 100644
--- a/wms/bargain-create.php
+++ b/wms/bargain-create.php
@@ -1,313 +1,313 @@
-<?php
-include "header.php"; 
-
-$category_arr = ["A" => "生產設備", "B" => "建築工程類", "C" => "工業工程規劃", "D" => "修繕維保服務", "E" => "儀器設備", "F" => "辦公設備", "G" => "辦公家具", "H" => "IT類產品", "I" => "諮詢服務", "J" => "維保電梯配件"];
-
-$sql = "select max(bargainno) as maxno from bargain";
-$res = mysqli_query($link, $sql);
-$row = mysqli_fetch_row($res);
-$bargainno = $row[0] ? $row[0]+1 : date("Ym")."001";
-
-$sql = "select department_id from account where accountid = '$user_id'";
-$res = mysqli_query($link, $sql);
-$row = mysqli_fetch_row($res);
-list($department_id) = $row;
-mysqli_free_result($res);
-
-$department_arr = [];
-$sql = "select department_id, name from department";
-$res = mysqli_query($link, $sql);
-while ($row = mysqli_fetch_row($res)) {
-    $department_arr[$row[0]] = $row[1];
-}
-mysqli_free_result($res);
-?>
-<style>
-
-</style>
-<script>
-function commafy(num) {
-    num = num + "";
-    var re = /(-?\d+)(\d{3})/
-    while (re.test(num)) {
-        num = num.replace(re, "$1,$2")
-    }
-    return num;
-}
-
-$(function(){
-    $('#quantity').keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); })
-    $('#lead_time').keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); })
-    $('#margin_day').keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); })
-    $("input[name=quote_amt_be]").each(function(){
-        $(this).keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); });
-    });
-    $("input[name=quote_amt_ar]").each(function(){
-        $(this).keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); });
-    });
-    $('#btnadd').click(function(){
-        $('#tb1 tr:last').prev().after($("tr[name='supplier_templ']").eq(0).clone().find('input').val('').end());
-        $('#tb1 tr:last').prev().find('td').first().html($("tr[name='supplier_templ']").length);
-    });
-    $('#submit').click(function(){
-        var supIdArr = [];
-        $("input[name='sup_id']").each(function(){ supIdArr.push($(this).val()); })
-        $('#sup_id_all').val(supIdArr);
-        var supplierArr = [];
-        $("input[name='supplier']").each(function(){ supplierArr.push($(this).val()); })
-        $('#supplier_all').val(supplierArr);
-        var quoteAmtBeArr = [];
-        $("input[name='quote_amt_be']").each(function(){ quoteAmtBeArr.push($(this).val().replace(/[,]+/g,"")); })
-        $('#quote_amt_be_all').val(quoteAmtBeArr);
-        var noteBeArr = [];
-        $("input[name='note_be']").each(function(){ noteBeArr.push($(this).val()); })
-        $('#note_be_all').val(noteBeArr);
-        var quoteAmtArArr = [];
-        $("input[name='quote_amt_ar']").each(function(){ quoteAmtArArr.push($(this).val().replace(/[,]+/g,"")); })
-        $('#quote_amt_ar_all').val(quoteAmtArArr);
-        var noteArArr = [];
-        $("input[name='note_ar']").each(function(){ noteArArr.push($(this).val()); })
-        $('#note_ar_all').val(noteArArr);
-        //console.log(itemNameArr);
-        //return false;
-    });
-});
-</script>
-<div class="container">
-<?php
-include "bargain-record-submit.php";
-/*
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-        echo "<p class='error'>Please fill up the required field!</p>";
-    } else {
-        echo "<p class='success'>Record has added successfully</p>";
-    }
-}
-*/
-?>
-
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        <div>
-            <label for="bargainno">申請單號</label>
-            <input type="text" name="bargainno" id="bargainno" value="<?php echo $bargainno; ?>" readonly>
-        </div>
-        <div>
-            <label for="department">作成單位</label>
-            <input type="text" name="department" id="department" value="<?php echo $department_arr[$department_id]; ?>" readonly>
-            <input type="hidden" name="department_id" id="department_id" value="<?php echo $department_id; ?>">
-        </div>
-        <div>
-            <label for="proposer">作成者</label>
-            <input type="text" name="proposer" id="proposer" value="<?php echo $user_name; ?>" readonly>
-        </div>
-        <div>
-            <label for="receiver">收文單位</label>
-            <select name="receiver" id="receiver" required>
-                <option value="">請選擇</option>
-                <?php
-                foreach ($department_arr as $k => $v) {
-                    echo "<option value=\"".$k."\">".$v."</option>";
-                }
-                ?>
-            </select>
-        </div>
-        <div>
-            <label for="response_dt">回答期限</label><br>
-            <input type="date" name="response_dt" id="response_dt" required>
-        </div>
-        <div>
-            <label for="item">項目名稱</label>
-            <input type="text" name="item" id="item" size="60" maxlength="50" required>
-        </div>
-        <div>
-            <label for="annual">年度議價件</label>
-            <select name="annual" id="annual">
-                <option value="Y">是</option>
-                <option value="N">否</option>
-            </select>
-        </div>
-        <div>
-            <label for="urgent">緊急件</label>
-            <select name="urgent" id="urgent">
-                <option value="Y">是</option>
-                <option value="N">否</option>
-            </select>
-        </div>
-        <div>
-            <label for="vendor">指定廠商</label>
-            <select name="vendor" id="vendor">
-                <option value="Y">是</option>
-                <option value="N">否</option>
-            </select>
-        </div>
-        <div>
-            <label for="prospecting">現場勘查</label>
-            <select name="prospecting" id="prospecting">
-                <option value="Y">是</option>
-                <option value="N">否</option>
-            </select>
-        </div>
-        <div>
-            <label for="category">類別</label>
-            <select name="category" id="category" required>
-                <option value="">請選擇</option>
-                <?php
-                foreach ($category_arr as $k => $v) {
-                    echo "<option value=\"".$k."\">".$v."</option>";
-                }
-                ?>
-            </select>
-        </div>
-        <div>
-            <label for="dealer">原廠或原代理商</label>
-            <select name="dealer" id="dealer" required>
-                <option value="Y">是</option>
-                <option value="N">否</option>
-            </select>
-        </div>
-        <div>
-            <label for="reason">理由</label>
-            <input type="text" name="reason" id="reason" size="60" maxlength="50">
-        </div>
-        <div>
-            <label for="brand">品牌</label>
-            <input type="text" name="brand" id="brand" maxlength="25">
-        </div>
-        <div>
-            <label for="model">型號</label>
-            <input type="text" name="model" id="model" maxlength="25">
-        </div>
-        <div>
-            <label for="quantity">預估數量</label>
-            <input type="text" name="quantity" id="quantity" required>
-        </div>
-        <div>
-            <label for="brandkeep">備選品牌</label>
-            <input type="text" name="brandkeep" id="brandkeep" size="60" maxlength="25">
-        </div>
-        <div>
-            <label for="lead_time">交期/施工期(天)</label>
-            <input type="text" name="lead_time" id="lead_time">
-        </div>
-        <div>
-            <label for="margin">質保金</label>
-            <select name="margin" id="margin">
-                <option value="Y">是</option>
-                <option value="N">否</option>
-            </select>
-        </div>
-        <div>
-            <label for="margin_day">質保期限(天)</label>
-            <input type="text" name="margin_day" id="margin_day" required>
-        </div>
-        <div>
-            <label for="acceptance">驗收標準</label>
-            <input type="text" name="acceptance" id="acceptance" size="104" maxlength="50">
-        </div>
-        <div>
-            <label for="purchase_history">歷史購買記錄</label>
-            <select name="purchase_history" id="purchase_history">
-                <option value="Y">是</option>
-                <option value="N">否</option>
-            </select>
-        </div>
-        <div>
-            <label for="attatch1">附件1</label>
-            <div>
-                <input type="file" name="attatch1" id="attatch1">
-            </div>
-        </div>
-        <div>
-            <label for="attatch2">附件2</label>
-            <div>
-                <input type="file" name="attatch2" id="attatch2">
-            </div>
-        </div>
-        <div>
-            <label for="item_description">項目描述</label>
-            <input type="text" name="item_description" id="item_description" size="80" maxlength="120">
-        </div>
-        <div>
-            <label for="repairno">設備維修單號</label>
-            <input type="text" name="repairno" id="repairno" maxlength="20">
-        </div>
-        <div>
-            <label for="category_repair">類別</label>
-            <select name="category_repair" id="category_repair" required>
-                <option value="">請選擇</option>
-                <?php
-                foreach ($category_arr as $k => $v) {
-                    echo "<option value=\"".$k."\">".$v."</option>";
-                }
-                ?>
-            </select>
-        </div>
-        <div>
-            <label for="content">內容</label><br>
-            <textarea class="form-control2" name="content" id="content" rows="4" cols="100"></textarea>
-        </div>
-        <div>
-            <label for="quotation">採購報價單</label>
-            <input type="text" name="quotation" id="quotation" readonly>
-        </div>
-        
-        <div class="table-responsive" style="width:100%;margin-top:10px;">
-            <table id="tb1" class="table table-bordered">
-                <thead>
-                    <tr>
-                        <th colspan="8"><h4>附件上傳及信息維護</h4></th>
-                    </tr>
-                    <tr>
-                        <th rowspan="2" nowrap>序號</th>
-                        <th colspan="4">作成單位提供◎維護信息</th>
-                        <th colspan="3">配合單位提供◎維護信息</th>
-                    </tr>
-                    <tr>
-                        <th nowrap>供應商名稱</th>
-                        <th nowrap>供應商報價單上傳</th>
-                        <th nowrap>報價</th>
-                        <th nowrap>備註</th>
-                        <th nowrap>議價後報價單上傳</th>
-                        <th nowrap>議價後報價</th>
-                        <th nowrap>備註</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr name="supplier_templ">
-                        <td>1</td>
-                        <td><input type="text" name="supplier" class="form-control input-sm" size="10"></td>
-                        <td><input type="file" name="supplier_attatch_be[]" multiple></td>
-                        <td><input type="text" name="quote_amt_be" class="form-control input-sm" size="3"></td>
-                        <td><input type="text" name="note_be" class="form-control input-sm" size="10"></td>
-                        <td><input type="file" name="supplier_attatch_ar[]" multiple></td>
-                        <td><input type="text" name="quote_amt_ar" class="form-control input-sm" size="3"></td>
-                        <td><input type="text" name="note_ar" class="form-control input-sm" size="10"><input type="hidden" name="sup_id"></td>
-                    </tr>
-                        <td colspan="8"><button type="button" id="btnadd" class="btn btn-primary btn-sm" style="float:left;">＋供應商</button></td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at" value="<?php echo date("Y-m-d H:i:s"); ?>">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-        <div>
-            <br>
-            <button type="submit" name="submit" id="submit">確定</button>
-        </div>
-        <input type="hidden" name="sup_id_all" id="sup_id_all">
-        <input type="hidden" name="supplier_all" id="supplier_all">
-        <input type="hidden" name="quote_amt_be_all" id="quote_amt_be_all">
-        <input type="hidden" name="note_be_all" id="note_be_all">
-        <input type="hidden" name="quote_amt_ar_all" id="quote_amt_ar_all">
-        <input type="hidden" name="note_ar_all" id="note_ar_all">
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
+<?php
+include "header.php"; 
+
+$category_arr = ["A" => "生產設備", "B" => "建築工程類", "C" => "工業工程規劃", "D" => "修繕維保服務", "E" => "儀器設備", "F" => "辦公設備", "G" => "辦公家具", "H" => "IT類產品", "I" => "諮詢服務", "J" => "維保電梯配件"];
+
+$sql = "select max(bargainno) as maxno from bargain";
+$res = mysqli_query($link, $sql);
+$row = mysqli_fetch_row($res);
+$bargainno = $row[0] ? $row[0]+1 : date("Ym")."001";
+
+$sql = "select department_id from account where accountid = '$user_id'";
+$res = mysqli_query($link, $sql);
+$row = mysqli_fetch_row($res);
+list($department_id) = $row;
+mysqli_free_result($res);
+
+$department_arr = [];
+$sql = "select department_id, name from department";
+$res = mysqli_query($link, $sql);
+while ($row = mysqli_fetch_row($res)) {
+    $department_arr[$row[0]] = $row[1];
+}
+mysqli_free_result($res);
+?>
+<style>
+
+</style>
+<script>
+function commafy(num) {
+    num = num + "";
+    var re = /(-?\d+)(\d{3})/
+    while (re.test(num)) {
+        num = num.replace(re, "$1,$2")
+    }
+    return num;
+}
+
+$(function(){
+    $('#quantity').keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); })
+    $('#lead_time').keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); })
+    $('#margin_day').keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); })
+    $("input[name=quote_amt_be]").each(function(){
+        $(this).keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); });
+    });
+    $("input[name=quote_amt_ar]").each(function(){
+        $(this).keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); });
+    });
+    $('#btnadd').click(function(){
+        $('#tb1 tr:last').prev().after($("tr[name='supplier_templ']").eq(0).clone().find('input').val('').end());
+        $('#tb1 tr:last').prev().find('td').first().html($("tr[name='supplier_templ']").length);
+    });
+    $('#submit').click(function(){
+        var supIdArr = [];
+        $("input[name='sup_id']").each(function(){ supIdArr.push($(this).val()); })
+        $('#sup_id_all').val(supIdArr);
+        var supplierArr = [];
+        $("input[name='supplier']").each(function(){ supplierArr.push($(this).val()); })
+        $('#supplier_all').val(supplierArr);
+        var quoteAmtBeArr = [];
+        $("input[name='quote_amt_be']").each(function(){ quoteAmtBeArr.push($(this).val().replace(/[,]+/g,"")); })
+        $('#quote_amt_be_all').val(quoteAmtBeArr);
+        var noteBeArr = [];
+        $("input[name='note_be']").each(function(){ noteBeArr.push($(this).val()); })
+        $('#note_be_all').val(noteBeArr);
+        var quoteAmtArArr = [];
+        $("input[name='quote_amt_ar']").each(function(){ quoteAmtArArr.push($(this).val().replace(/[,]+/g,"")); })
+        $('#quote_amt_ar_all').val(quoteAmtArArr);
+        var noteArArr = [];
+        $("input[name='note_ar']").each(function(){ noteArArr.push($(this).val()); })
+        $('#note_ar_all').val(noteArArr);
+        //console.log(itemNameArr);
+        //return false;
+    });
+});
+</script>
+<div class="container">
+<?php
+include "bargain-record-submit.php";
+/*
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+        echo "<p class='error'>Please fill up the required field!</p>";
+    } else {
+        echo "<p class='success'>Record has added successfully</p>";
+    }
+}
+*/
+?>
+
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        <div>
+            <label for="bargainno">申請單號</label>
+            <input type="text" name="bargainno" id="bargainno" value="<?php echo $bargainno; ?>" readonly>
+        </div>
+        <div>
+            <label for="department">作成單位</label>
+            <input type="text" name="department" id="department" value="<?php echo $department_arr[$department_id]; ?>" readonly>
+            <input type="hidden" name="department_id" id="department_id" value="<?php echo $department_id; ?>">
+        </div>
+        <div>
+            <label for="proposer">作成者</label>
+            <input type="text" name="proposer" id="proposer" value="<?php echo $user_name; ?>" readonly>
+        </div>
+        <div>
+            <label for="receiver">收文單位</label>
+            <select name="receiver" id="receiver" required>
+                <option value="">請選擇</option>
+                <?php
+                foreach ($department_arr as $k => $v) {
+                    echo "<option value=\"".$k."\">".$v."</option>";
+                }
+                ?>
+            </select>
+        </div>
+        <div>
+            <label for="response_dt">回答期限</label><br>
+            <input type="date" name="response_dt" id="response_dt" required>
+        </div>
+        <div>
+            <label for="item">項目名稱</label>
+            <input type="text" name="item" id="item" size="60" maxlength="50" required>
+        </div>
+        <div>
+            <label for="annual">年度議價件</label>
+            <select name="annual" id="annual">
+                <option value="Y">是</option>
+                <option value="N">否</option>
+            </select>
+        </div>
+        <div>
+            <label for="urgent">緊急件</label>
+            <select name="urgent" id="urgent">
+                <option value="Y">是</option>
+                <option value="N">否</option>
+            </select>
+        </div>
+        <div>
+            <label for="vendor">指定廠商</label>
+            <select name="vendor" id="vendor">
+                <option value="Y">是</option>
+                <option value="N">否</option>
+            </select>
+        </div>
+        <div>
+            <label for="prospecting">現場勘查</label>
+            <select name="prospecting" id="prospecting">
+                <option value="Y">是</option>
+                <option value="N">否</option>
+            </select>
+        </div>
+        <div>
+            <label for="category">類別</label>
+            <select name="category" id="category" required>
+                <option value="">請選擇</option>
+                <?php
+                foreach ($category_arr as $k => $v) {
+                    echo "<option value=\"".$k."\">".$v."</option>";
+                }
+                ?>
+            </select>
+        </div>
+        <div>
+            <label for="dealer">原廠或原代理商</label>
+            <select name="dealer" id="dealer" required>
+                <option value="Y">是</option>
+                <option value="N">否</option>
+            </select>
+        </div>
+        <div>
+            <label for="reason">理由</label>
+            <input type="text" name="reason" id="reason" size="60" maxlength="50">
+        </div>
+        <div>
+            <label for="brand">品牌</label>
+            <input type="text" name="brand" id="brand" maxlength="25">
+        </div>
+        <div>
+            <label for="model">型號</label>
+            <input type="text" name="model" id="model" maxlength="25">
+        </div>
+        <div>
+            <label for="quantity">預估數量</label>
+            <input type="text" name="quantity" id="quantity" required>
+        </div>
+        <div>
+            <label for="brandkeep">備選品牌</label>
+            <input type="text" name="brandkeep" id="brandkeep" size="60" maxlength="25">
+        </div>
+        <div>
+            <label for="lead_time">交期/施工期(天)</label>
+            <input type="text" name="lead_time" id="lead_time">
+        </div>
+        <div>
+            <label for="margin">質保金</label>
+            <select name="margin" id="margin">
+                <option value="Y">是</option>
+                <option value="N">否</option>
+            </select>
+        </div>
+        <div>
+            <label for="margin_day">質保期限(天)</label>
+            <input type="text" name="margin_day" id="margin_day" required>
+        </div>
+        <div>
+            <label for="acceptance">驗收標準</label>
+            <input type="text" name="acceptance" id="acceptance" size="104" maxlength="50">
+        </div>
+        <div>
+            <label for="purchase_history">歷史購買記錄</label>
+            <select name="purchase_history" id="purchase_history">
+                <option value="Y">是</option>
+                <option value="N">否</option>
+            </select>
+        </div>
+        <div>
+            <label for="attatch1">附件1</label>
+            <div>
+                <input type="file" name="attatch1" id="attatch1">
+            </div>
+        </div>
+        <div>
+            <label for="attatch2">附件2</label>
+            <div>
+                <input type="file" name="attatch2" id="attatch2">
+            </div>
+        </div>
+        <div>
+            <label for="item_description">項目描述</label>
+            <input type="text" name="item_description" id="item_description" size="80" maxlength="120">
+        </div>
+        <div>
+            <label for="repairno">設備維修單號</label>
+            <input type="text" name="repairno" id="repairno" maxlength="20">
+        </div>
+        <div>
+            <label for="category_repair">類別</label>
+            <select name="category_repair" id="category_repair" required>
+                <option value="">請選擇</option>
+                <?php
+                foreach ($category_arr as $k => $v) {
+                    echo "<option value=\"".$k."\">".$v."</option>";
+                }
+                ?>
+            </select>
+        </div>
+        <div>
+            <label for="content">內容</label><br>
+            <textarea class="form-control2" name="content" id="content" rows="4" cols="100"></textarea>
+        </div>
+        <div>
+            <label for="quotation">採購報價單</label>
+            <input type="text" name="quotation" id="quotation" readonly>
+        </div>
+        
+        <div class="table-responsive" style="width:100%;margin-top:10px;">
+            <table id="tb1" class="table table-bordered">
+                <thead>
+                    <tr>
+                        <th colspan="8"><h4>附件上傳及信息維護</h4></th>
+                    </tr>
+                    <tr>
+                        <th rowspan="2" nowrap>序號</th>
+                        <th colspan="4">作成單位提供◎維護信息</th>
+                        <th colspan="3">配合單位提供◎維護信息</th>
+                    </tr>
+                    <tr>
+                        <th nowrap>供應商名稱</th>
+                        <th nowrap>供應商報價單上傳</th>
+                        <th nowrap>報價</th>
+                        <th nowrap>備註</th>
+                        <th nowrap>議價後報價單上傳</th>
+                        <th nowrap>議價後報價</th>
+                        <th nowrap>備註</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr name="supplier_templ">
+                        <td>1</td>
+                        <td><input type="text" name="supplier" class="form-control input-sm" size="10"></td>
+                        <td><input type="file" name="supplier_attatch_be[]" multiple></td>
+                        <td><input type="text" name="quote_amt_be" class="form-control input-sm" size="3"></td>
+                        <td><input type="text" name="note_be" class="form-control input-sm" size="10"></td>
+                        <td><input type="file" name="supplier_attatch_ar[]" multiple></td>
+                        <td><input type="text" name="quote_amt_ar" class="form-control input-sm" size="3"></td>
+                        <td><input type="text" name="note_ar" class="form-control input-sm" size="10"><input type="hidden" name="sup_id"></td>
+                    </tr>
+                        <td colspan="8"><button type="button" id="btnadd" class="btn btn-primary btn-sm" style="float:left;">＋供應商</button></td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at" value="<?php echo date("Y-m-d H:i:s"); ?>">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+        <div>
+            <br>
+            <button type="submit" name="submit" id="submit">確定</button>
+        </div>
+        <input type="hidden" name="sup_id_all" id="sup_id_all">
+        <input type="hidden" name="supplier_all" id="supplier_all">
+        <input type="hidden" name="quote_amt_be_all" id="quote_amt_be_all">
+        <input type="hidden" name="note_be_all" id="note_be_all">
+        <input type="hidden" name="quote_amt_ar_all" id="quote_amt_ar_all">
+        <input type="hidden" name="note_ar_all" id="note_ar_all">
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
 <?php include "footer.php"; ?>
\ No newline at end of file
diff --git a/wms/bargain-delete.php b/wms/bargain-delete.php
index 51d66fd2..786bff07 100644
--- a/wms/bargain-delete.php
+++ b/wms/bargain-delete.php
@@ -1,29 +1,29 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-/* 已進入簽核流程
-$db_query = "select checker_1_result from bargin where id = '$id'";
-$res = mysqli_query($link, $db_query);
-$row = mysqli_fetch_array($res, MYSQLI_ASSOC);
-if (!$row || $row["checker_1_result"]) {
-    mysqli_free_result($res);
-    mysqli_close($link);
-    echo "<script>";
-    //echo "alert('審核中，已無法刪除');";
-    echo "alert('資料無法刪除');";
-    echo "location.href='pricereview-index.php'";
-    echo "</script>";
-    exit;
-}
-*/
-$db_query = "delete from bargain_supplier where bid = '$id'";
-if ($rs = mysqli_query($link, $db_query)) {
-    $db_query = "delete from bargain where id = '$id'";
-    mysqli_query($link, $db_query);
-}
-
-header("Refresh:0; url=bargain-index.php?function_name=bargain&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+/* 已進入簽核流程
+$db_query = "select checker_1_result from bargin where id = '$id'";
+$res = mysqli_query($link, $db_query);
+$row = mysqli_fetch_array($res, MYSQLI_ASSOC);
+if (!$row || $row["checker_1_result"]) {
+    mysqli_free_result($res);
+    mysqli_close($link);
+    echo "<script>";
+    //echo "alert('審核中，已無法刪除');";
+    echo "alert('資料無法刪除');";
+    echo "location.href='pricereview-index.php'";
+    echo "</script>";
+    exit;
+}
+*/
+$db_query = "delete from bargain_supplier where bid = '$id'";
+if ($rs = mysqli_query($link, $db_query)) {
+    $db_query = "delete from bargain where id = '$id'";
+    mysqli_query($link, $db_query);
+}
+
+header("Refresh:0; url=bargain-index.php?function_name=bargain&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/bargain-edit.php b/wms/bargain-edit.php
index 33f6e2da..9fd09dca 100644
--- a/wms/bargain-edit.php
+++ b/wms/bargain-edit.php
@@ -1,375 +1,375 @@
-<?php
-include "header.php"; 
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-
-$category_arr = ["A" => "生產設備", "B" => "建築工程類", "C" => "工業工程規劃", "D" => "修繕維保服務", "E" => "儀器設備", "F" => "辦公設備", "G" => "辦公家具", "H" => "IT類產品", "I" => "諮詢服務", "J" => "維保電梯配件"];
-
-$db_query = "select * from bargain where id = '$id'";
-$data = mysqli_query($link, $db_query);
-
-$department_arr = [];
-$sql = "select department_id, name from department";
-$res = mysqli_query($link, $sql);
-while ($row = mysqli_fetch_row($res)) {
-    $department_arr[$row[0]] = $row[1];
-}
-mysqli_free_result($res);
-
-foreach($data as $data) :
-    $sql = "select name from account where accountid = '".$data['creater']."'";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_row($res);
-    list($creater_name) = $row;
-    mysqli_free_result($res);
-
-    $item_arr = [];
-    $sql = "select * from bargain_supplier where bid = '$id' order by supplier_id";
-    $res = mysqli_query($link, $sql);
-    while ($row = mysqli_fetch_assoc($res)) {
-        $item_arr[$row['supplier_id']]['id'] = $row['id'];
-        $item_arr[$row['supplier_id']]['supplier'] = $row['supplier'];
-        $item_arr[$row['supplier_id']]['supplier_attatch_be'] = $row['supplier_attatch_be'];
-        $item_arr[$row['supplier_id']]['quote_amt_be'] = $row['quote_amt_be'];
-        $item_arr[$row['supplier_id']]['note_be'] = $row['note_be'];
-        $item_arr[$row['supplier_id']]['supplier_attatch_ar'] = $row['supplier_attatch_ar'];
-        $item_arr[$row['supplier_id']]['quote_amt_ar'] = $row['quote_amt_ar'];
-        $item_arr[$row['supplier_id']]['note_ar'] = $row['note_ar'];
-    }
-    mysqli_free_result($res);
-?>
-<style>
-
-</style>
-<script>
-function commafy(num) {
-    num = num + "";
-    var re = /(-?\d+)(\d{3})/
-    while (re.test(num)) {
-        num = num.replace(re, "$1,$2")
-    }
-    return num;
-}
-
-$(function(){
-    $('#quantity').keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); })
-    $('#lead_time').keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); })
-    $('#margin_day').keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); })
-    $("input[name=quote_amt_be]").each(function(){
-        $(this).keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); });
-    });
-    $("input[name=quote_amt_ar]").each(function(){
-        $(this).keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); });
-    });
-    $('#btnadd').click(function(){
-        if ($('tr[name=supplier_templ]').is(':visible') == false) $('tr[name=supplier_templ]').show();
-        else {
-            $('#tb1 tr:last').prev().after($("tr[name='supplier_templ']").eq(0).clone().find('input').val('').end());
-            //$('#tb1 tr:last').find('td').first().html($("tr[name='supplier_templ']").length);
-        }
-    });
-    $('#update').click(function(){
-        var bsidArr = [];
-        $("input[name='bsid']").each(function(){ bsidArr.push($(this).val()); })
-        $('#bsid_all').val(bsidArr);
-        var supIdArr = [];
-        $("input[name='sup_id']").each(function(){ supIdArr.push($(this).val()); })
-        $('#sup_id_all').val(supIdArr);
-        var supplierArr = [];
-        $("input[name='supplier']").each(function(){ supplierArr.push($(this).val()); })
-        $('#supplier_all').val(supplierArr);
-        var supplierAttatchBeAllArr = [];
-        $("input[name='supplier_attatch_be']").each(function(){ supplierAttatchBeAllArr.push($(this).val()); })
-        $('#supplier_attatch_be_all').val(supplierAttatchBeAllArr);
-        var quoteAmtBeArr = [];
-        $("input[name='quote_amt_be']").each(function(){ quoteAmtBeArr.push($(this).val().replace(/[,]+/g,"")); })
-        $('#quote_amt_be_all').val(quoteAmtBeArr);
-        var noteBeArr = [];
-        $("input[name='note_be']").each(function(){ noteBeArr.push($(this).val()); })
-        $('#note_be_all').val(noteBeArr);
-        var supplierAttatchArArr = [];
-        $("input[name='supplier_attatch_ar']").each(function(){ supplierAttatchArArr.push($(this).val()); })
-        $('#supplier_attatch_ar_all').val(supplierAttatchArArr);
-        var quoteAmtArArr = [];
-        $("input[name='quote_amt_ar']").each(function(){ quoteAmtArArr.push($(this).val().replace(/[,]+/g,"")); })
-        $('#quote_amt_ar_all').val(quoteAmtArArr);
-        var noteArArr = [];
-        $("input[name='note_ar']").each(function(){ noteArArr.push($(this).val()); })
-        $('#note_ar_all').val(noteArArr);
-        //console.log(noteArArr);
-        //return false;
-    });
-});
-</script>
-<div class="container">
-    <form class="form-inline" method="post" action="bargain-record-update.php" enctype="multipart/form-data">
-        <div>
-            <label for="bargainno">申請單號</label>
-            <input type="text" name="bargainno" id="bargainno" value="<?php echo $data['bargainno']; ?>" readonly>
-        </div>
-        <div>
-            <label for="department">作成單位</label>
-            <input type="text" name="department" id="department" value="<?php echo $department_arr[$data['department_id']]; ?>" disabled>
-            <input type="hidden" name="department_id" id="department_id" value="<?php echo $data['department_id']; ?>">
-        </div>
-        <div>
-            <label for="proposer">作成者</label>
-            <input type="text" name="proposer" id="proposer" value="<?php echo $creater_name; ?>" disabled>
-        </div>
-        <div>
-            <label for="receiver">收文單位</label>
-            <select name="receiver" id="receiver" required>
-                <option value="">請選擇</option>
-                <?php
-                foreach ($department_arr as $k => $v) {
-                    echo "<option value=\"".$k."\"";
-                    if ($data["receiver"] == $k) echo " selected";
-                    echo ">".$v."</option>";
-                }
-                ?>
-            </select>
-        </div>
-        <div>
-            <label for="response_dt">回答期限</label><br>
-            <input type="date" name="response_dt" id="response_dt" value="<?php echo $data['response_dt']; ?>" required>
-        </div>
-        <div>
-            <label for="item">項目名稱</label>
-            <input type="text" name="item" id="item" size="60" maxlength="50" value="<?php echo $data['item']; ?>" required>
-        </div>
-        <div>
-            <label for="annual">年度議價件</label>
-            <select name="annual" id="annual">
-                <option value="Y"<?php if ($data['annual']=="Y") echo " selected"; ?>>是</option>
-                <option value="N"<?php if ($data['annual']=="N") echo " selected"; ?>>否</option>
-            </select>
-        </div>
-        <div>
-            <label for="urgent">緊急件</label>
-            <select name="urgent" id="urgent">
-                <option value="Y"<?php if ($data['urgent']=="Y") echo " selected"; ?>>是</option>
-                <option value="N"<?php if ($data['urgent']=="N") echo " selected"; ?>>否</option>
-            </select>
-        </div>
-        <div>
-            <label for="vendor">指定廠商</label>
-            <select name="vendor" id="vendor">
-                <option value="Y"<?php if ($data['vendor']=="Y") echo " selected"; ?>>是</option>
-                <option value="N"<?php if ($data['vendor']=="N") echo " selected"; ?>>否</option>
-            </select>
-        </div>
-        <div>
-            <label for="prospecting">現場勘查</label>
-            <select name="prospecting" id="prospecting">
-                <option value="Y"<?php if ($data['prospecting']=="Y") echo " selected"; ?>>是</option>
-                <option value="N"<?php if ($data['prospecting']=="N") echo " selected"; ?>>否</option>
-            </select>
-        </div>
-        <div>
-            <label for="category">類別</label>
-            <select name="category" id="category" required>
-                <option value="">請選擇</option>
-                <?php
-                foreach ($category_arr as $k => $v) {
-                    echo "<option value=\"".$k."\"";
-                    if ($data["category"] == $k) echo " selected";
-                    echo ">".$v."</option>";
-                }
-                ?>
-            </select>
-        </div>
-        <div>
-            <label for="dealer">原廠或原代理商</label>
-            <select name="dealer" id="dealer" required>
-                <option value="Y"<?php if ($data['dealer']=="Y") echo " selected"; ?>>是</option>
-                <option value="N"<?php if ($data['dealer']=="N") echo " selected"; ?>>否</option>
-            </select>
-        </div>
-        <div>
-            <label for="reason">理由</label>
-            <input type="text" name="reason" id="reason" size="60" maxlength="50" value="<?php echo $data['reason']; ?>">
-        </div>
-        <div>
-            <label for="brand">品牌</label>
-            <input type="text" name="brand" id="brand" maxlength="25" value="<?php echo $data['brand']; ?>">
-        </div>
-        <div>
-            <label for="model">型號</label>
-            <input type="text" name="model" id="model" maxlength="25" value="<?php echo $data['model']; ?>">
-        </div>
-        <div>
-            <label for="quantity">預估數量</label>
-            <input type="text" name="quantity" id="quantity" value="<?php echo number_format($data['quantity']); ?>" required>
-        </div>
-        <div>
-            <label for="brandkeep">備選品牌</label>
-            <input type="text" name="brandkeep" id="brandkeep" size="60" maxlength="25" value="<?php echo $data['brandkeep']; ?>">
-        </div>
-        <div>
-            <label for="lead_time">交期/施工期(天)</label>
-            <input type="text" name="lead_time" id="lead_time" value="<?php echo number_format($data['lead_time']); ?>">
-        </div>
-        <div>
-            <label for="margin">質保金</label>
-            <select name="margin" id="margin">
-                <option value="Y"<?php if ($data['margin']=="Y") echo " selected"; ?>>是</option>
-                <option value="N"<?php if ($data['margin']=="N") echo " selected"; ?>>否</option>
-            </select>
-        </div>
-        <div>
-            <label for="margin_day">質保期限(天)</label>
-            <input type="text" name="margin_day" id="margin_day" value="<?php echo number_format($data['margin_day']); ?>" required>
-        </div>
-        <div>
-            <label for="acceptance">驗收標準</label>
-            <input type="text" name="acceptance" id="acceptance" size="104" maxlength="50" value="<?php echo $data['acceptance']; ?>">
-        </div>
-        <div>
-            <label for="purchase_history">歷史購買記錄</label>
-            <select name="purchase_history" id="purchase_history">
-                <option value="Y"<?php if ($data['purchase_history']=="Y") echo " selected"; ?>>是</option>
-                <option value="N"<?php if ($data['purchase_history']=="N") echo " selected"; ?>>否</option>
-            </select>
-        </div>
-        <div>
-            <label for="attatch1">附件1</label>
-            <?php
-            if ($data["attatch1"]) echo "<a href=\"".$data["attatch1"]."\" target=\"_blank\" style=\"font-size:13px;\">".substr($data["attatch1"], strrpos($data["attatch1"],"/")+1)."</a>";
-            ?>
-            <div>
-                <input type="file" name="attatch1" id="attatch1">
-            </div>
-        </div>
-        <div>
-            <label for="attatch2">附件2</label>
-            <?php
-            if ($data["attatch2"]) echo "<a href=\"".$data["attatch2"]."\" target=\"_blank\" style=\"font-size:13px;\">".substr($data["attatch2"], strrpos($data["attatch2"],"/")+1)."</a>";
-            ?>
-            <div>
-                <input type="file" name="attatch2" id="attatch2">
-            </div>
-        </div>
-        <div>
-            <label for="item_description">項目描述</label>
-            <input type="text" name="item_description" id="item_description" size="80" maxlength="120" value="<?php echo $data['item_description']; ?>">
-        </div>
-        <div>
-            <label for="repairno">設備維修單號</label>
-            <input type="text" name="repairno" id="repairno" maxlength="20" value="<?php echo $data['repairno']; ?>">
-        </div>
-        <div>
-            <label for="category_repair">類別</label>
-            <select name="category_repair" id="category_repair" required>
-                <option value="">請選擇</option>
-                <?php
-                foreach ($category_arr as $k => $v) {
-                    echo "<option value=\"".$k."\"";
-                    if ($data["category_repair"] == $k) echo " selected";
-                    echo ">".$v."</option>";
-                }
-                ?>
-            </select>
-        </div>
-        <div>
-            <label for="content">內容</label><br>
-            <textarea class="form-control2" name="content" id="content" rows="4" cols="100"><?php echo $data['content']; ?></textarea>
-        </div>
-        <div>
-            <label for="quotation">採購報價單</label>
-            <input type="text" name="quotation" id="quotation" value="<?php echo $data['quotation']; ?>" readonly>
-        </div>
-        
-        <div class="table-responsive" style="width:100%;margin-top:10px;">
-            <table id="tb1" class="table table-bordered">
-                <thead>
-                    <tr>
-                        <th colspan="8"><h4>附件上傳及信息維護</h4></th>
-                    </tr>
-                    <tr>
-                        <th rowspan="2" nowrap>序號</th>
-                        <th colspan="4">作成單位提供◎維護信息</th>
-                        <th colspan="3">配合單位提供◎維護信息</th>
-                    </tr>
-                    <tr>
-                        <th nowrap>供應商名稱</th>
-                        <th nowrap>供應商報價單上傳</th>
-                        <th nowrap>報價</th>
-                        <th nowrap>備註</th>
-                        <th nowrap>議價後報價單上傳</th>
-                        <th nowrap>議價後報價</th>
-                        <th nowrap>備註</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <?php
-                    foreach ($item_arr as $supplier_id => $val) {
-                    ?>
-                    <tr>
-                        <td><?php echo $supplier_id; ?><input type="hidden" name="sup_id" value="<?php echo $supplier_id; ?>"><input type="hidden" name="bsid" value="<?php echo $val['id']; ?>"></td>
-                        <td><input type="text" name="supplier" class="form-control input-sm" size="10" value="<?php echo $val['supplier']; ?>"></td>
-                        <td>
-                        <?php
-                        if ($val['supplier_attatch_be']) echo "<a href=\"".$val['supplier_attatch_be']."\" target=\"_blank\">".substr($val['supplier_attatch_be'], strrpos($val['supplier_attatch_be'],"/")+1)."</a>";
-                        else echo "--";
-                        ?>
-                        </td>
-                        <td><input type="text" name="quote_amt_be" class="form-control input-sm" size="3" value="<?php echo number_format($val['quote_amt_be']); ?>"></td>
-                        <td><input type="text" name="note_be" class="form-control input-sm" size="10" value="<?php echo $val['note_be']; ?>"></td>
-                        <td>
-                        <?php
-                        if ($val['supplier_attatch_ar']) echo "<a href=\"".$val['supplier_attatch_ar']."\" target=\"_blank\">".substr($val['supplier_attatch_ar'], strrpos($val['supplier_attatch_ar'],"/")+1)."</a>";
-                        else echo "--";
-                        ?>
-                        <td><input type="text" name="quote_amt_ar" class="form-control input-sm" size="3" value="<?php echo number_format($val['quote_amt_ar']); ?>"></td>
-                        <td><input type="text" name="note_ar" class="form-control input-sm" size="10" value="<?php echo $val['note_ar']; ?>"></td>
-                    </tr>
-                    <?php
-                    }
-                    
-                    ?>
-                    <tr name="supplier_templ" style="display:none;">
-                        <td></td>
-                        <td><input type="text" name="supplier" class="form-control input-sm" size="10"></td>
-                        <td><input type="file" name="supplier_attatch_be[]" multiple></td>
-                        <td><input type="text" name="quote_amt_be" class="form-control input-sm" size="3"></td>
-                        <td><input type="text" name="note_be" class="form-control input-sm" size="10"></td>
-                        <td><input type="file" name="supplier_attatch_ar[]" multiple></td>
-                        <td><input type="text" name="quote_amt_ar" class="form-control input-sm" size="3"></td>
-                        <td><input type="text" name="note_ar" class="form-control input-sm" size="10"><input type="hidden" name="sup_id"></td>
-                    </tr>
-                    </tr>
-                        <td colspan="8"><button type="button" id="btnadd" class="btn btn-primary btn-sm" style="float:left;">＋供應商</button></td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at" value="<?php echo date("Y-m-d H:i:s"); ?>">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-        <div>
-            <br>
-            <button type="submit" name="update" id="update">確定</button>
-        </div>
-        <input type="hidden" name="bsid_all" id="bsid_all">
-        <input type="hidden" name="sup_id_all" id="sup_id_all">
-        <input type="hidden" name="supplier_all" id="supplier_all">
-        <input type="hidden" name="supplier_attatch_be_all" id="supplier_attatch_be_all">
-        <input type="hidden" name="quote_amt_be_all" id="quote_amt_be_all">
-        <input type="hidden" name="note_be_all" id="note_be_all">
-        <input type="hidden" name="supplier_attatch_ar_all" id="supplier_attatch_ar_all">
-        <input type="hidden" name="quote_amt_ar_all" id="quote_amt_ar_all">
-        <input type="hidden" name="note_ar_all" id="note_ar_all">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-<?php
-endforeach;
-
-include "footer.php";
+<?php
+include "header.php"; 
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+
+$category_arr = ["A" => "生產設備", "B" => "建築工程類", "C" => "工業工程規劃", "D" => "修繕維保服務", "E" => "儀器設備", "F" => "辦公設備", "G" => "辦公家具", "H" => "IT類產品", "I" => "諮詢服務", "J" => "維保電梯配件"];
+
+$db_query = "select * from bargain where id = '$id'";
+$data = mysqli_query($link, $db_query);
+
+$department_arr = [];
+$sql = "select department_id, name from department";
+$res = mysqli_query($link, $sql);
+while ($row = mysqli_fetch_row($res)) {
+    $department_arr[$row[0]] = $row[1];
+}
+mysqli_free_result($res);
+
+foreach($data as $data) :
+    $sql = "select name from account where accountid = '".$data['creater']."'";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_row($res);
+    list($creater_name) = $row;
+    mysqli_free_result($res);
+
+    $item_arr = [];
+    $sql = "select * from bargain_supplier where bid = '$id' order by supplier_id";
+    $res = mysqli_query($link, $sql);
+    while ($row = mysqli_fetch_assoc($res)) {
+        $item_arr[$row['supplier_id']]['id'] = $row['id'];
+        $item_arr[$row['supplier_id']]['supplier'] = $row['supplier'];
+        $item_arr[$row['supplier_id']]['supplier_attatch_be'] = $row['supplier_attatch_be'];
+        $item_arr[$row['supplier_id']]['quote_amt_be'] = $row['quote_amt_be'];
+        $item_arr[$row['supplier_id']]['note_be'] = $row['note_be'];
+        $item_arr[$row['supplier_id']]['supplier_attatch_ar'] = $row['supplier_attatch_ar'];
+        $item_arr[$row['supplier_id']]['quote_amt_ar'] = $row['quote_amt_ar'];
+        $item_arr[$row['supplier_id']]['note_ar'] = $row['note_ar'];
+    }
+    mysqli_free_result($res);
+?>
+<style>
+
+</style>
+<script>
+function commafy(num) {
+    num = num + "";
+    var re = /(-?\d+)(\d{3})/
+    while (re.test(num)) {
+        num = num.replace(re, "$1,$2")
+    }
+    return num;
+}
+
+$(function(){
+    $('#quantity').keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); })
+    $('#lead_time').keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); })
+    $('#margin_day').keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); })
+    $("input[name=quote_amt_be]").each(function(){
+        $(this).keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); });
+    });
+    $("input[name=quote_amt_ar]").each(function(){
+        $(this).keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); });
+    });
+    $('#btnadd').click(function(){
+        if ($('tr[name=supplier_templ]').is(':visible') == false) $('tr[name=supplier_templ]').show();
+        else {
+            $('#tb1 tr:last').prev().after($("tr[name='supplier_templ']").eq(0).clone().find('input').val('').end());
+            //$('#tb1 tr:last').find('td').first().html($("tr[name='supplier_templ']").length);
+        }
+    });
+    $('#update').click(function(){
+        var bsidArr = [];
+        $("input[name='bsid']").each(function(){ bsidArr.push($(this).val()); })
+        $('#bsid_all').val(bsidArr);
+        var supIdArr = [];
+        $("input[name='sup_id']").each(function(){ supIdArr.push($(this).val()); })
+        $('#sup_id_all').val(supIdArr);
+        var supplierArr = [];
+        $("input[name='supplier']").each(function(){ supplierArr.push($(this).val()); })
+        $('#supplier_all').val(supplierArr);
+        var supplierAttatchBeAllArr = [];
+        $("input[name='supplier_attatch_be']").each(function(){ supplierAttatchBeAllArr.push($(this).val()); })
+        $('#supplier_attatch_be_all').val(supplierAttatchBeAllArr);
+        var quoteAmtBeArr = [];
+        $("input[name='quote_amt_be']").each(function(){ quoteAmtBeArr.push($(this).val().replace(/[,]+/g,"")); })
+        $('#quote_amt_be_all').val(quoteAmtBeArr);
+        var noteBeArr = [];
+        $("input[name='note_be']").each(function(){ noteBeArr.push($(this).val()); })
+        $('#note_be_all').val(noteBeArr);
+        var supplierAttatchArArr = [];
+        $("input[name='supplier_attatch_ar']").each(function(){ supplierAttatchArArr.push($(this).val()); })
+        $('#supplier_attatch_ar_all').val(supplierAttatchArArr);
+        var quoteAmtArArr = [];
+        $("input[name='quote_amt_ar']").each(function(){ quoteAmtArArr.push($(this).val().replace(/[,]+/g,"")); })
+        $('#quote_amt_ar_all').val(quoteAmtArArr);
+        var noteArArr = [];
+        $("input[name='note_ar']").each(function(){ noteArArr.push($(this).val()); })
+        $('#note_ar_all').val(noteArArr);
+        //console.log(noteArArr);
+        //return false;
+    });
+});
+</script>
+<div class="container">
+    <form class="form-inline" method="post" action="bargain-record-update.php" enctype="multipart/form-data">
+        <div>
+            <label for="bargainno">申請單號</label>
+            <input type="text" name="bargainno" id="bargainno" value="<?php echo $data['bargainno']; ?>" readonly>
+        </div>
+        <div>
+            <label for="department">作成單位</label>
+            <input type="text" name="department" id="department" value="<?php echo $department_arr[$data['department_id']]; ?>" disabled>
+            <input type="hidden" name="department_id" id="department_id" value="<?php echo $data['department_id']; ?>">
+        </div>
+        <div>
+            <label for="proposer">作成者</label>
+            <input type="text" name="proposer" id="proposer" value="<?php echo $creater_name; ?>" disabled>
+        </div>
+        <div>
+            <label for="receiver">收文單位</label>
+            <select name="receiver" id="receiver" required>
+                <option value="">請選擇</option>
+                <?php
+                foreach ($department_arr as $k => $v) {
+                    echo "<option value=\"".$k."\"";
+                    if ($data["receiver"] == $k) echo " selected";
+                    echo ">".$v."</option>";
+                }
+                ?>
+            </select>
+        </div>
+        <div>
+            <label for="response_dt">回答期限</label><br>
+            <input type="date" name="response_dt" id="response_dt" value="<?php echo $data['response_dt']; ?>" required>
+        </div>
+        <div>
+            <label for="item">項目名稱</label>
+            <input type="text" name="item" id="item" size="60" maxlength="50" value="<?php echo $data['item']; ?>" required>
+        </div>
+        <div>
+            <label for="annual">年度議價件</label>
+            <select name="annual" id="annual">
+                <option value="Y"<?php if ($data['annual']=="Y") echo " selected"; ?>>是</option>
+                <option value="N"<?php if ($data['annual']=="N") echo " selected"; ?>>否</option>
+            </select>
+        </div>
+        <div>
+            <label for="urgent">緊急件</label>
+            <select name="urgent" id="urgent">
+                <option value="Y"<?php if ($data['urgent']=="Y") echo " selected"; ?>>是</option>
+                <option value="N"<?php if ($data['urgent']=="N") echo " selected"; ?>>否</option>
+            </select>
+        </div>
+        <div>
+            <label for="vendor">指定廠商</label>
+            <select name="vendor" id="vendor">
+                <option value="Y"<?php if ($data['vendor']=="Y") echo " selected"; ?>>是</option>
+                <option value="N"<?php if ($data['vendor']=="N") echo " selected"; ?>>否</option>
+            </select>
+        </div>
+        <div>
+            <label for="prospecting">現場勘查</label>
+            <select name="prospecting" id="prospecting">
+                <option value="Y"<?php if ($data['prospecting']=="Y") echo " selected"; ?>>是</option>
+                <option value="N"<?php if ($data['prospecting']=="N") echo " selected"; ?>>否</option>
+            </select>
+        </div>
+        <div>
+            <label for="category">類別</label>
+            <select name="category" id="category" required>
+                <option value="">請選擇</option>
+                <?php
+                foreach ($category_arr as $k => $v) {
+                    echo "<option value=\"".$k."\"";
+                    if ($data["category"] == $k) echo " selected";
+                    echo ">".$v."</option>";
+                }
+                ?>
+            </select>
+        </div>
+        <div>
+            <label for="dealer">原廠或原代理商</label>
+            <select name="dealer" id="dealer" required>
+                <option value="Y"<?php if ($data['dealer']=="Y") echo " selected"; ?>>是</option>
+                <option value="N"<?php if ($data['dealer']=="N") echo " selected"; ?>>否</option>
+            </select>
+        </div>
+        <div>
+            <label for="reason">理由</label>
+            <input type="text" name="reason" id="reason" size="60" maxlength="50" value="<?php echo $data['reason']; ?>">
+        </div>
+        <div>
+            <label for="brand">品牌</label>
+            <input type="text" name="brand" id="brand" maxlength="25" value="<?php echo $data['brand']; ?>">
+        </div>
+        <div>
+            <label for="model">型號</label>
+            <input type="text" name="model" id="model" maxlength="25" value="<?php echo $data['model']; ?>">
+        </div>
+        <div>
+            <label for="quantity">預估數量</label>
+            <input type="text" name="quantity" id="quantity" value="<?php echo number_format($data['quantity']); ?>" required>
+        </div>
+        <div>
+            <label for="brandkeep">備選品牌</label>
+            <input type="text" name="brandkeep" id="brandkeep" size="60" maxlength="25" value="<?php echo $data['brandkeep']; ?>">
+        </div>
+        <div>
+            <label for="lead_time">交期/施工期(天)</label>
+            <input type="text" name="lead_time" id="lead_time" value="<?php echo number_format($data['lead_time']); ?>">
+        </div>
+        <div>
+            <label for="margin">質保金</label>
+            <select name="margin" id="margin">
+                <option value="Y"<?php if ($data['margin']=="Y") echo " selected"; ?>>是</option>
+                <option value="N"<?php if ($data['margin']=="N") echo " selected"; ?>>否</option>
+            </select>
+        </div>
+        <div>
+            <label for="margin_day">質保期限(天)</label>
+            <input type="text" name="margin_day" id="margin_day" value="<?php echo number_format($data['margin_day']); ?>" required>
+        </div>
+        <div>
+            <label for="acceptance">驗收標準</label>
+            <input type="text" name="acceptance" id="acceptance" size="104" maxlength="50" value="<?php echo $data['acceptance']; ?>">
+        </div>
+        <div>
+            <label for="purchase_history">歷史購買記錄</label>
+            <select name="purchase_history" id="purchase_history">
+                <option value="Y"<?php if ($data['purchase_history']=="Y") echo " selected"; ?>>是</option>
+                <option value="N"<?php if ($data['purchase_history']=="N") echo " selected"; ?>>否</option>
+            </select>
+        </div>
+        <div>
+            <label for="attatch1">附件1</label>
+            <?php
+            if ($data["attatch1"]) echo "<a href=\"".$data["attatch1"]."\" target=\"_blank\" style=\"font-size:13px;\">".substr($data["attatch1"], strrpos($data["attatch1"],"/")+1)."</a>";
+            ?>
+            <div>
+                <input type="file" name="attatch1" id="attatch1">
+            </div>
+        </div>
+        <div>
+            <label for="attatch2">附件2</label>
+            <?php
+            if ($data["attatch2"]) echo "<a href=\"".$data["attatch2"]."\" target=\"_blank\" style=\"font-size:13px;\">".substr($data["attatch2"], strrpos($data["attatch2"],"/")+1)."</a>";
+            ?>
+            <div>
+                <input type="file" name="attatch2" id="attatch2">
+            </div>
+        </div>
+        <div>
+            <label for="item_description">項目描述</label>
+            <input type="text" name="item_description" id="item_description" size="80" maxlength="120" value="<?php echo $data['item_description']; ?>">
+        </div>
+        <div>
+            <label for="repairno">設備維修單號</label>
+            <input type="text" name="repairno" id="repairno" maxlength="20" value="<?php echo $data['repairno']; ?>">
+        </div>
+        <div>
+            <label for="category_repair">類別</label>
+            <select name="category_repair" id="category_repair" required>
+                <option value="">請選擇</option>
+                <?php
+                foreach ($category_arr as $k => $v) {
+                    echo "<option value=\"".$k."\"";
+                    if ($data["category_repair"] == $k) echo " selected";
+                    echo ">".$v."</option>";
+                }
+                ?>
+            </select>
+        </div>
+        <div>
+            <label for="content">內容</label><br>
+            <textarea class="form-control2" name="content" id="content" rows="4" cols="100"><?php echo $data['content']; ?></textarea>
+        </div>
+        <div>
+            <label for="quotation">採購報價單</label>
+            <input type="text" name="quotation" id="quotation" value="<?php echo $data['quotation']; ?>" readonly>
+        </div>
+        
+        <div class="table-responsive" style="width:100%;margin-top:10px;">
+            <table id="tb1" class="table table-bordered">
+                <thead>
+                    <tr>
+                        <th colspan="8"><h4>附件上傳及信息維護</h4></th>
+                    </tr>
+                    <tr>
+                        <th rowspan="2" nowrap>序號</th>
+                        <th colspan="4">作成單位提供◎維護信息</th>
+                        <th colspan="3">配合單位提供◎維護信息</th>
+                    </tr>
+                    <tr>
+                        <th nowrap>供應商名稱</th>
+                        <th nowrap>供應商報價單上傳</th>
+                        <th nowrap>報價</th>
+                        <th nowrap>備註</th>
+                        <th nowrap>議價後報價單上傳</th>
+                        <th nowrap>議價後報價</th>
+                        <th nowrap>備註</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php
+                    foreach ($item_arr as $supplier_id => $val) {
+                    ?>
+                    <tr>
+                        <td><?php echo $supplier_id; ?><input type="hidden" name="sup_id" value="<?php echo $supplier_id; ?>"><input type="hidden" name="bsid" value="<?php echo $val['id']; ?>"></td>
+                        <td><input type="text" name="supplier" class="form-control input-sm" size="10" value="<?php echo $val['supplier']; ?>"></td>
+                        <td>
+                        <?php
+                        if ($val['supplier_attatch_be']) echo "<a href=\"".$val['supplier_attatch_be']."\" target=\"_blank\">".substr($val['supplier_attatch_be'], strrpos($val['supplier_attatch_be'],"/")+1)."</a>";
+                        else echo "--";
+                        ?>
+                        </td>
+                        <td><input type="text" name="quote_amt_be" class="form-control input-sm" size="3" value="<?php echo number_format($val['quote_amt_be']); ?>"></td>
+                        <td><input type="text" name="note_be" class="form-control input-sm" size="10" value="<?php echo $val['note_be']; ?>"></td>
+                        <td>
+                        <?php
+                        if ($val['supplier_attatch_ar']) echo "<a href=\"".$val['supplier_attatch_ar']."\" target=\"_blank\">".substr($val['supplier_attatch_ar'], strrpos($val['supplier_attatch_ar'],"/")+1)."</a>";
+                        else echo "--";
+                        ?>
+                        <td><input type="text" name="quote_amt_ar" class="form-control input-sm" size="3" value="<?php echo number_format($val['quote_amt_ar']); ?>"></td>
+                        <td><input type="text" name="note_ar" class="form-control input-sm" size="10" value="<?php echo $val['note_ar']; ?>"></td>
+                    </tr>
+                    <?php
+                    }
+                    
+                    ?>
+                    <tr name="supplier_templ" style="display:none;">
+                        <td></td>
+                        <td><input type="text" name="supplier" class="form-control input-sm" size="10"></td>
+                        <td><input type="file" name="supplier_attatch_be[]" multiple></td>
+                        <td><input type="text" name="quote_amt_be" class="form-control input-sm" size="3"></td>
+                        <td><input type="text" name="note_be" class="form-control input-sm" size="10"></td>
+                        <td><input type="file" name="supplier_attatch_ar[]" multiple></td>
+                        <td><input type="text" name="quote_amt_ar" class="form-control input-sm" size="3"></td>
+                        <td><input type="text" name="note_ar" class="form-control input-sm" size="10"><input type="hidden" name="sup_id"></td>
+                    </tr>
+                    </tr>
+                        <td colspan="8"><button type="button" id="btnadd" class="btn btn-primary btn-sm" style="float:left;">＋供應商</button></td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at" value="<?php echo date("Y-m-d H:i:s"); ?>">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+        <div>
+            <br>
+            <button type="submit" name="update" id="update">確定</button>
+        </div>
+        <input type="hidden" name="bsid_all" id="bsid_all">
+        <input type="hidden" name="sup_id_all" id="sup_id_all">
+        <input type="hidden" name="supplier_all" id="supplier_all">
+        <input type="hidden" name="supplier_attatch_be_all" id="supplier_attatch_be_all">
+        <input type="hidden" name="quote_amt_be_all" id="quote_amt_be_all">
+        <input type="hidden" name="note_be_all" id="note_be_all">
+        <input type="hidden" name="supplier_attatch_ar_all" id="supplier_attatch_ar_all">
+        <input type="hidden" name="quote_amt_ar_all" id="quote_amt_ar_all">
+        <input type="hidden" name="note_ar_all" id="note_ar_all">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+<?php
+endforeach;
+
+include "footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/bargain-index.php b/wms/bargain-index.php
index 52d8daad..33afaf71 100644
--- a/wms/bargain-index.php
+++ b/wms/bargain-index.php
@@ -1,144 +1,144 @@
-<?php
-include "header.php";
-
-// 設置一個空陣列來放資料
-$data = array();
-
-$category_arr = ["A" => "生產設備", "B" => "建築工程類", "C" => "工業工程規劃", "D" => "修繕維保服務", "E" => "儀器設備", "F" => "辦公設備", "G" => "辦公家具", "H" => "IT類產品", "I" => "諮詢服務", "J" => "維保電梯配件"];
-
-$sql = "select department_id, name from department";
-$res = mysqli_query($link, $sql);
-while ($row = mysqli_fetch_row($res)) {
-    $department_arr[$row[0]] = $row[1];
-}
-mysqli_free_result($res);
-
-// sql語法存在變數中
-$sql = "select * from bargain order by id";
-
-// 用mysqli_query方法執行(sql語法)將結果存在變數中
-$data = mysqli_query($link,$sql);
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<p>
-<a href="bargain-create.php?function_name=bargain&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-
-<?php
-if($data):
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:bargain-index.php");
-        }
-    }
-
-?>
-
-<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;
-   
-}
-
-</style>
-<div style="overflow-x:auto;">
-    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-    <thead>
-        <tr>
-            <th>項次</th>
-            <th>申請單號</th>
-            <th>作成單位</th>
-            <th>作成者</th>
-            <th>收文單位</th>
-            <th>回答期限</th>
-            <th>項目名稱</th>
-            <th>類別</th>
-            <th>品牌</th>
-            <th>型號</th>
-            <th>預估數量</th>
-            <th>建檔人</th>
-            <th>建檔時間</th>
-            <th>修改</th>
-            <th>刪除</th>
-        </tr>
-    </thead>
-    <tbody>
-    <?php foreach($data as $data) : ?>
-        <tr>
-            <td><?php echo $data['id']; ?></td>
-            <td><?php echo $data['bargainno']; ?></td>
-            <td><?php echo $department_arr[$data['department_id']]; ?></td>
-            <td><?php echo $data['proposer']; ?></td>
-            <td><?php echo $department_arr[$data['receiver']]; ?></td>
-            <td><?php echo $data['response_dt']; ?></td>
-            <td><?php echo $data['item']; ?></td>
-            <td><?php echo $category_arr[$data['category']]; ?></td>
-            <td><?php echo $data['brand']; ?></td>
-            <td><?php echo $data['model']; ?></td>
-            <td><?php echo number_format($data['quantity']); ?></td>
-            <td><?php echo $data['creater']; ?></td>
-            <td><?php echo $data['create_at']; ?></td>
-            <td>
-                <p>
-                    <a href="bargain-edit.php?id=<?php echo $data['id']; ?>&function_name=bargain&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-                        <span class="glyphicon glyphicon-pencil"></span>
-                    </a>
-                </p> 
-            </td>
-            <td>
-                <p>
-                    <a href="bargain-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-                        <span class="glyphicon glyphicon-remove"></span>
-                    </a>
-                </p> 
-            </td>
-        </tr>
-    <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
+<?php
+include "header.php";
+
+// 設置一個空陣列來放資料
+$data = array();
+
+$category_arr = ["A" => "生產設備", "B" => "建築工程類", "C" => "工業工程規劃", "D" => "修繕維保服務", "E" => "儀器設備", "F" => "辦公設備", "G" => "辦公家具", "H" => "IT類產品", "I" => "諮詢服務", "J" => "維保電梯配件"];
+
+$sql = "select department_id, name from department";
+$res = mysqli_query($link, $sql);
+while ($row = mysqli_fetch_row($res)) {
+    $department_arr[$row[0]] = $row[1];
+}
+mysqli_free_result($res);
+
+// sql語法存在變數中
+$sql = "select * from bargain order by id";
+
+// 用mysqli_query方法執行(sql語法)將結果存在變數中
+$data = mysqli_query($link,$sql);
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<p>
+<a href="bargain-create.php?function_name=bargain&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+
+<?php
+if($data):
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:bargain-index.php");
+        }
+    }
+
+?>
+
+<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;
+   
+}
+
+</style>
+<div style="overflow-x:auto;">
+    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+    <thead>
+        <tr>
+            <th>項次</th>
+            <th>申請單號</th>
+            <th>作成單位</th>
+            <th>作成者</th>
+            <th>收文單位</th>
+            <th>回答期限</th>
+            <th>項目名稱</th>
+            <th>類別</th>
+            <th>品牌</th>
+            <th>型號</th>
+            <th>預估數量</th>
+            <th>建檔人</th>
+            <th>建檔時間</th>
+            <th>修改</th>
+            <th>刪除</th>
+        </tr>
+    </thead>
+    <tbody>
+    <?php foreach($data as $data) : ?>
+        <tr>
+            <td><?php echo $data['id']; ?></td>
+            <td><?php echo $data['bargainno']; ?></td>
+            <td><?php echo $department_arr[$data['department_id']]; ?></td>
+            <td><?php echo $data['proposer']; ?></td>
+            <td><?php echo $department_arr[$data['receiver']]; ?></td>
+            <td><?php echo $data['response_dt']; ?></td>
+            <td><?php echo $data['item']; ?></td>
+            <td><?php echo $category_arr[$data['category']]; ?></td>
+            <td><?php echo $data['brand']; ?></td>
+            <td><?php echo $data['model']; ?></td>
+            <td><?php echo number_format($data['quantity']); ?></td>
+            <td><?php echo $data['creater']; ?></td>
+            <td><?php echo $data['create_at']; ?></td>
+            <td>
+                <p>
+                    <a href="bargain-edit.php?id=<?php echo $data['id']; ?>&function_name=bargain&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+                        <span class="glyphicon glyphicon-pencil"></span>
+                    </a>
+                </p> 
+            </td>
+            <td>
+                <p>
+                    <a href="bargain-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+                        <span class="glyphicon glyphicon-remove"></span>
+                    </a>
+                </p> 
+            </td>
+        </tr>
+    <?php endforeach; ?>
+        </tbody>
+    </table>
+</div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/bargain-record-submit.php b/wms/bargain-record-submit.php
index a4e2ddcf..b61ef444 100644
--- a/wms/bargain-record-submit.php
+++ b/wms/bargain-record-submit.php
@@ -1,149 +1,149 @@
-<?php
-$accountid= "";
-$facilityno= "";
-$issue_time= "";
-$process= "";
-$memo= "";
-$creater= "";
-$create_at= "";
-
-$accountid_error= "";
-$facilityno_error= "";
-$issue_time_error= "";
-$process_error= "";
-$memo_error= "";
-$creater_error= "";
-$create_at_error= "";
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    //print_r($_POST);
-    //print_r($_FILES);exit;
-    foreach ($_POST as $k => $v) {
-        $$k = htmlspecialchars(stripslashes(trim($v)));
-    }
-
-    $sql = "select max(bargainno) as maxno from bargain";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_row($res);
-    $bargainno_check = $row[0] ? $row[0]+1 : date("Ym")."001";
-    if ($bargainno_check <> $bargainno) $bargainno = $bargainno_check;
-
-    if ($_FILES["attatch1"]["error"] == 0) {
-        $file_name      = $_FILES["attatch1"]["name"];
-        $temp_file_name = $_FILES["attatch1"]["tmp_name"];
-        $file_size      = $_FILES["attatch1"]["size"];
-        $target_dir     = "bargain-uploads/";
-        $target_file1   = strtolower($target_dir.$bargainno."-1-".basename($file_name));
-        $img_file_type  = pathinfo($file_name, PATHINFO_EXTENSION);
-        $upload_ok      = 1;
-        //if (file_exists($target_file1)) unlink($target_file1);
-        foreach (glob($target_dir.$bargainno."-1-*") as $todelfile) {
-            unlink($todelfile);
-        }
-        $upload_res_1 = move_uploaded_file($temp_file_name, $target_file1);
-    } else $target_file1 = "";
-
-    if ($_FILES["attatch2"]["error"] == 0) {
-        $file_name      = $_FILES["attatch2"]["name"];
-        $temp_file_name = $_FILES["attatch2"]["tmp_name"];
-        $file_size      = $_FILES["attatch2"]["size"];
-        $target_dir     = "bargain-uploads/";
-        $target_file2   = strtolower($target_dir.$bargainno."-2-".basename($file_name));
-        $img_file_type  = pathinfo($file_name, PATHINFO_EXTENSION);
-        $upload_ok      = 1;
-        //if (file_exists($target_file2)) unlink($target_file2);
-        foreach (glob($target_dir.$bargainno."-2-*") as $todelfile) {
-            unlink($todelfile);
-        }
-        $upload_res_2 = move_uploaded_file($temp_file_name, $target_file2);
-    } else $target_file2 = "";
-
-    if (($target_file1 && !$upload_res_1) || ($target_file2 && !$upload_res_2)) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('檔案上傳失敗，資料請重建。');";
-        echo "location.href='bargain-index.php?function_name=bargain&".$token_link."';";
-        echo "</script>";
-    }
-
-    $db_query  = "insert into bargain (bargainno, department_id, proposer, receiver, response_dt, item, annual, urgent, vendor, prospecting, category, ";
-    $db_query .= "dealer, reason, brand, model, quantity, brandkeep, lead_time, margin, margin_day, acceptance, purchase_history, ";
-    $db_query .= "attatch1, attatch2, item_description, repairno, category_repair, content, quotation, creater, create_at) values (";
-    $db_query .= "'$bargainno', '$department_id', '$proposer', '$receiver', '$response_dt', '$item', '$annual', '$urgent', '$vendor', '$prospecting', '$category', ";
-    $db_query .= "'$dealer', '$reason', '$brand', '$model', '$quantity', '$brandkeep', '$lead_time', '$margin', '$margin_day', '$acceptance', '$purchase_history', ";
-    $db_query .= "'$target_file1', '$target_file2', '$item_description', '$repairno', '$category_repair', '$content', '$quotation', '$user_id', '$create_at')";
-    $result = mysqli_query($link, $db_query);
-    $affected = mysqli_affected_rows($link);
-    if ($result && $sup_id_all != "") {
-        $bid = mysqli_insert_id($link);
-        $sup_id_arr = explode(",", $sup_id_all);
-        $supplier_arr = explode(",", $supplier_all);
-        $quote_amt_be_arr = explode(",", $quote_amt_be_all);
-        $note_be_arr = explode(",", $note_be_all);
-        $quote_amt_ar_arr = explode(",", $quote_amt_ar_all);
-        $note_ar_arr = explode(",", $note_ar_all);
-        $item_no = 1;
-
-        for ($i=0; $i<count($supplier_arr); $i++) {
-            if (!$sup_id_arr[$i]) $sup_id_arr[$i] = 0;
-            if (!$supplier_arr[$i]) continue;
-
-            if ($_FILES["supplier_attatch_be"]["name"][$i] && ($_FILES["supplier_attatch_be"]["error"][$i] == 0)) {
-                $file_name      = $_FILES["supplier_attatch_be"]["name"][$i];
-                $temp_file_name = $_FILES["supplier_attatch_be"]["tmp_name"][$i];
-                $file_size      = $_FILES["supplier_attatch_be"]["size"][$i];
-                $target_dir     = "bargain-uploads/supplier/";
-                $target_file_be = strtolower($target_dir.$bargainno."-".$item_no."-".basename($file_name));
-                $upload_ok      = 1;
-                $img_file_type  = pathinfo($target_file_be, PATHINFO_EXTENSION);
-                $upload_res_be = move_uploaded_file($temp_file_name, $target_file_be);
-            } else $target_file_be = "";
-            
-            if ($_FILES["supplier_attatch_ar"]["name"][$i] && ($_FILES["supplier_attatch_ar"]["error"][$i] == 0)) {
-                $file_name      = $_FILES["supplier_attatch_ar"]["name"][$i];
-                $temp_file_name = $_FILES["supplier_attatch_ar"]["tmp_name"][$i];
-                $file_size      = $_FILES["supplier_attatch_ar"]["size"][$i];
-                $target_dir     = "bargain-uploads/supplier/";
-                $target_file_ar = strtolower($target_dir.$bargainno."-".$item_no."-".basename($file_name));
-                $upload_ok      = 1;
-                $img_file_type  = pathinfo($target_file_ar, PATHINFO_EXTENSION);
-                $upload_res_ar = move_uploaded_file($temp_file_name, $target_file_ar);
-            } else $target_file_ar = "";
-
-            if (($target_file_be && !$upload_res_be) || ($target_file_ar && !$upload_res_ar)) {
-                $sql = "delete from bargain where id = '$bid'";
-                mysqli_query($link, $sql);
-                $sql = "delete from bargain_supplier where bid = '$bid'";
-                mysqli_query($link, $sql);
-                echo "<script type ='text/JavaScript'>";
-                echo "alert('檔案上傳失敗，資料請重建！".$sql."');";
-                echo "location.href='bargain-index.php?function_name=bargain&".$token_link."';";
-                echo "</script>";
-            }
-
-            $quote_amt_be_arr[$i] = str_replace(",", "", $quote_amt_be_arr[$i]);
-            $quote_amt_ar_all[$i] = str_replace(",", "", $quote_amt_ar_all[$i]);
-            $db_query  = "insert into bargain_supplier (bid, supplier_id, supplier, supplier_attatch_be, quote_amt_be, note_be, ";
-            $db_query .= "supplier_attatch_ar, quote_amt_ar, note_ar, creater, create_at) values (";
-            $db_query .= "'$bid', '$item_no', '$supplier_arr[$i]',  '$target_file_be', '$quote_amt_be_arr[$i]', '$note_be_arr[$i]', ";
-            $db_query .= "'$target_file_ar', '$quote_amt_ar_arr[$i]', '$note_ar_arr[$i]', '$user_id', '$create_at')";
-            $result = mysqli_query($link, $db_query);
-            $item_no++;
-        }
-    }
-
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功(申請單號：".$bargainno.")');";
-        echo "location.href='bargain-index.php?function_name=bargain&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='bargain-index.php?function_name=bargain&".$token_link."';";
-        echo "</script>";
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+$accountid= "";
+$facilityno= "";
+$issue_time= "";
+$process= "";
+$memo= "";
+$creater= "";
+$create_at= "";
+
+$accountid_error= "";
+$facilityno_error= "";
+$issue_time_error= "";
+$process_error= "";
+$memo_error= "";
+$creater_error= "";
+$create_at_error= "";
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    //print_r($_POST);
+    //print_r($_FILES);exit;
+    foreach ($_POST as $k => $v) {
+        $$k = htmlspecialchars(stripslashes(trim($v)));
+    }
+
+    $sql = "select max(bargainno) as maxno from bargain";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_row($res);
+    $bargainno_check = $row[0] ? $row[0]+1 : date("Ym")."001";
+    if ($bargainno_check <> $bargainno) $bargainno = $bargainno_check;
+
+    if ($_FILES["attatch1"]["error"] == 0) {
+        $file_name      = $_FILES["attatch1"]["name"];
+        $temp_file_name = $_FILES["attatch1"]["tmp_name"];
+        $file_size      = $_FILES["attatch1"]["size"];
+        $target_dir     = "bargain-uploads/";
+        $target_file1   = strtolower($target_dir.$bargainno."-1-".basename($file_name));
+        $img_file_type  = pathinfo($file_name, PATHINFO_EXTENSION);
+        $upload_ok      = 1;
+        //if (file_exists($target_file1)) unlink($target_file1);
+        foreach (glob($target_dir.$bargainno."-1-*") as $todelfile) {
+            unlink($todelfile);
+        }
+        $upload_res_1 = move_uploaded_file($temp_file_name, $target_file1);
+    } else $target_file1 = "";
+
+    if ($_FILES["attatch2"]["error"] == 0) {
+        $file_name      = $_FILES["attatch2"]["name"];
+        $temp_file_name = $_FILES["attatch2"]["tmp_name"];
+        $file_size      = $_FILES["attatch2"]["size"];
+        $target_dir     = "bargain-uploads/";
+        $target_file2   = strtolower($target_dir.$bargainno."-2-".basename($file_name));
+        $img_file_type  = pathinfo($file_name, PATHINFO_EXTENSION);
+        $upload_ok      = 1;
+        //if (file_exists($target_file2)) unlink($target_file2);
+        foreach (glob($target_dir.$bargainno."-2-*") as $todelfile) {
+            unlink($todelfile);
+        }
+        $upload_res_2 = move_uploaded_file($temp_file_name, $target_file2);
+    } else $target_file2 = "";
+
+    if (($target_file1 && !$upload_res_1) || ($target_file2 && !$upload_res_2)) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('檔案上傳失敗，資料請重建。');";
+        echo "location.href='bargain-index.php?function_name=bargain&".$token_link."';";
+        echo "</script>";
+    }
+
+    $db_query  = "insert into bargain (bargainno, department_id, proposer, receiver, response_dt, item, annual, urgent, vendor, prospecting, category, ";
+    $db_query .= "dealer, reason, brand, model, quantity, brandkeep, lead_time, margin, margin_day, acceptance, purchase_history, ";
+    $db_query .= "attatch1, attatch2, item_description, repairno, category_repair, content, quotation, creater, create_at) values (";
+    $db_query .= "'$bargainno', '$department_id', '$proposer', '$receiver', '$response_dt', '$item', '$annual', '$urgent', '$vendor', '$prospecting', '$category', ";
+    $db_query .= "'$dealer', '$reason', '$brand', '$model', '$quantity', '$brandkeep', '$lead_time', '$margin', '$margin_day', '$acceptance', '$purchase_history', ";
+    $db_query .= "'$target_file1', '$target_file2', '$item_description', '$repairno', '$category_repair', '$content', '$quotation', '$user_id', '$create_at')";
+    $result = mysqli_query($link, $db_query);
+    $affected = mysqli_affected_rows($link);
+    if ($result && $sup_id_all != "") {
+        $bid = mysqli_insert_id($link);
+        $sup_id_arr = explode(",", $sup_id_all);
+        $supplier_arr = explode(",", $supplier_all);
+        $quote_amt_be_arr = explode(",", $quote_amt_be_all);
+        $note_be_arr = explode(",", $note_be_all);
+        $quote_amt_ar_arr = explode(",", $quote_amt_ar_all);
+        $note_ar_arr = explode(",", $note_ar_all);
+        $item_no = 1;
+
+        for ($i=0; $i<count($supplier_arr); $i++) {
+            if (!$sup_id_arr[$i]) $sup_id_arr[$i] = 0;
+            if (!$supplier_arr[$i]) continue;
+
+            if ($_FILES["supplier_attatch_be"]["name"][$i] && ($_FILES["supplier_attatch_be"]["error"][$i] == 0)) {
+                $file_name      = $_FILES["supplier_attatch_be"]["name"][$i];
+                $temp_file_name = $_FILES["supplier_attatch_be"]["tmp_name"][$i];
+                $file_size      = $_FILES["supplier_attatch_be"]["size"][$i];
+                $target_dir     = "bargain-uploads/supplier/";
+                $target_file_be = strtolower($target_dir.$bargainno."-".$item_no."-".basename($file_name));
+                $upload_ok      = 1;
+                $img_file_type  = pathinfo($target_file_be, PATHINFO_EXTENSION);
+                $upload_res_be = move_uploaded_file($temp_file_name, $target_file_be);
+            } else $target_file_be = "";
+            
+            if ($_FILES["supplier_attatch_ar"]["name"][$i] && ($_FILES["supplier_attatch_ar"]["error"][$i] == 0)) {
+                $file_name      = $_FILES["supplier_attatch_ar"]["name"][$i];
+                $temp_file_name = $_FILES["supplier_attatch_ar"]["tmp_name"][$i];
+                $file_size      = $_FILES["supplier_attatch_ar"]["size"][$i];
+                $target_dir     = "bargain-uploads/supplier/";
+                $target_file_ar = strtolower($target_dir.$bargainno."-".$item_no."-".basename($file_name));
+                $upload_ok      = 1;
+                $img_file_type  = pathinfo($target_file_ar, PATHINFO_EXTENSION);
+                $upload_res_ar = move_uploaded_file($temp_file_name, $target_file_ar);
+            } else $target_file_ar = "";
+
+            if (($target_file_be && !$upload_res_be) || ($target_file_ar && !$upload_res_ar)) {
+                $sql = "delete from bargain where id = '$bid'";
+                mysqli_query($link, $sql);
+                $sql = "delete from bargain_supplier where bid = '$bid'";
+                mysqli_query($link, $sql);
+                echo "<script type ='text/JavaScript'>";
+                echo "alert('檔案上傳失敗，資料請重建！".$sql."');";
+                echo "location.href='bargain-index.php?function_name=bargain&".$token_link."';";
+                echo "</script>";
+            }
+
+            $quote_amt_be_arr[$i] = str_replace(",", "", $quote_amt_be_arr[$i]);
+            $quote_amt_ar_all[$i] = str_replace(",", "", $quote_amt_ar_all[$i]);
+            $db_query  = "insert into bargain_supplier (bid, supplier_id, supplier, supplier_attatch_be, quote_amt_be, note_be, ";
+            $db_query .= "supplier_attatch_ar, quote_amt_ar, note_ar, creater, create_at) values (";
+            $db_query .= "'$bid', '$item_no', '$supplier_arr[$i]',  '$target_file_be', '$quote_amt_be_arr[$i]', '$note_be_arr[$i]', ";
+            $db_query .= "'$target_file_ar', '$quote_amt_ar_arr[$i]', '$note_ar_arr[$i]', '$user_id', '$create_at')";
+            $result = mysqli_query($link, $db_query);
+            $item_no++;
+        }
+    }
+
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功(申請單號：".$bargainno.")');";
+        echo "location.href='bargain-index.php?function_name=bargain&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='bargain-index.php?function_name=bargain&".$token_link."';";
+        echo "</script>";
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/bargain-record-update.php b/wms/bargain-record-update.php
index d3b27af3..097c5499 100644
--- a/wms/bargain-record-update.php
+++ b/wms/bargain-record-update.php
@@ -1,144 +1,144 @@
-<?php
-include "header.php";
-
-if (isset($_POST['update'])) {
-    foreach ($_POST as $k => $v) {
-        $$k = htmlspecialchars(stripslashes(trim($v)));
-    }
-    //print_r($_POST);
-    //print_r($_FILES);exit;
-
-    $sql_atta = "";
-
-    $quantity = str_replace(",", "", $quantity);
-    $lead_time = str_replace(",", "", $lead_time);
-    $margin_day = str_replace(",", "", $margin_day);
-
-    if ($_FILES["attatch1"]["error"] == 0) {
-        $file_name      = $_FILES["attatch1"]["name"];
-        $temp_file_name = $_FILES["attatch1"]["tmp_name"];
-        $file_size      = $_FILES["attatch1"]["size"];
-        $target_dir     = "bargain-uploads/";
-        $target_file1   = strtolower($target_dir.$bargainno."-1-".basename($file_name));
-        $img_file_type  = pathinfo($file_name, PATHINFO_EXTENSION);
-        $upload_ok      = 1;
-        //if (file_exists($target_file1)) unlink($target_file1);
-        foreach (glob($target_dir.$bargainno."-1-*") as $todelfile) {
-            unlink($todelfile);
-        }
-        $upload_res_1 = move_uploaded_file($temp_file_name, $target_file1);
-        $sql_atta .= "attatch1 = '$target_file1', ";
-    } else $target_file1 = "";
-
-    if ($_FILES["attatch2"]["error"] == 0) {
-        $file_name      = $_FILES["attatch2"]["name"];
-        $temp_file_name = $_FILES["attatch2"]["tmp_name"];
-        $file_size      = $_FILES["attatch2"]["size"];
-        $target_dir     = "bargain-uploads/";
-        $target_file2   = strtolower($target_dir.$bargainno."-2-".basename($file_name));
-        $img_file_type  = pathinfo($file_name, PATHINFO_EXTENSION);
-        $upload_ok      = 1;
-        //if (file_exists($target_file2)) unlink($target_file2);
-        foreach (glob($target_dir.$bargainno."-2-*") as $todelfile) {
-            unlink($todelfile);
-        }
-        $upload_res_2 = move_uploaded_file($temp_file_name, $target_file2);
-        $sql_atta .= "attatch2 = '$target_file2', ";
-    } else $target_file2 = "";
-
-    if (($target_file1 && !$upload_res_1) || ($target_file2 && !$upload_res_2)) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('檔案上傳失敗，請重新操作。');";
-        echo "location.href='bargain-index.php?function_name=bargain&".$token_link."';";
-        echo "</script>";
-    }
-
-    $db_query  = "update bargain set receiver = '$receiver', response_dt = '$response_dt', item = '$item', annual = '$annual', urgent = '$urgent', ";
-    $db_query .= "vendor = '$vendor', prospecting = '$prospecting', category = '$category', dealer = '$dealer', reason = '$reason', brand = '$brand', ";
-    $db_query .= "model = '$model', quantity = '$quantity', brandkeep = '$brandkeep', lead_time = '$lead_time', margin = '$margin', margin_day = '$margin_day', ";
-    $db_query .= "acceptance = '$acceptance', purchase_history = '$purchase_history', item_description = '$item_description', repairno = '$repairno', ";
-    $db_query .= $sql_atta;
-    $db_query .= "category_repair = '$category_repair', content = '$content', quotation = '$quotation', create_dt = '$create_at' ";
-    $db_query .= "where id = '$id'";
-    $result = mysqli_query($link, $db_query);
-    $affected = mysqli_affected_rows($link);
-    if ($result && $sup_id_all != "") {
-        $bsid_arr = explode(",", $bsid_all);
-        $sup_id_arr = explode(",", $sup_id_all);
-        $supplier_arr = explode(",", rtrim($supplier_all, ","));
-        $quote_amt_be_arr = explode(",", $quote_amt_be_all);
-        $note_be_arr = explode(",", $note_be_all);
-        $quote_amt_ar_arr = explode(",", $quote_amt_ar_all);
-        $note_ar_arr = explode(",", $note_ar_all);
-        $item_no = 1;
-
-        // 有新增的供應商
-        $new_sup_cnt = count($supplier_arr) - count($bsid_arr);
-        if ($new_sup_cnt > 0) $next_sup_id = max($sup_id_arr)+1;
-        $idx = 0;
-        for ($i=0; $i<count($supplier_arr); $i++) {
-            if ($new_sup_cnt > 0 && $bsid_arr[$i] == "") {  // 新增
-                $target_file_be = $target_file_ar = "";
-                if ($_FILES["supplier_attatch_be"]["name"]) {   // 有上傳檔案
-                    if ($_FILES["supplier_attatch_be"]["name"][$idx] && ($_FILES["supplier_attatch_be"]["error"][$idx] == 0)) {
-                        $file_name      = $_FILES["supplier_attatch_be"]["name"][$idx];
-                        $temp_file_name = $_FILES["supplier_attatch_be"]["tmp_name"][$idx];
-                        $file_size      = $_FILES["supplier_attatch_be"]["size"][$idx];
-                        $target_dir     = "bargain-uploads/supplier/";
-                        $target_file_be = strtolower($target_dir.$bargainno."-".$next_sup_id."-".basename($file_name));
-                        $upload_ok      = 1;
-                        $img_file_type  = pathinfo($target_file_be, PATHINFO_EXTENSION);
-                        $upload_res_be = move_uploaded_file($temp_file_name, $target_file_be);
-                    }
-                }
-                if ($_FILES["supplier_attatch_ar"]["name"]) {   // 有上傳檔案
-                    if ($_FILES["supplier_attatch_ar"]["name"][$idx] && ($_FILES["supplier_attatch_ar"]["error"][$idx] == 0)) {
-                        $file_name      = $_FILES["supplier_attatch_ar"]["name"][$idx];
-                        $temp_file_name = $_FILES["supplier_attatch_ar"]["tmp_name"][$idx];
-                        $file_size      = $_FILES["supplier_attatch_ar"]["size"][$idx];
-                        $target_dir     = "bargain-uploads/supplier/";
-                        $target_file_ar = strtolower($target_dir.$bargainno."-".$next_sup_id."-".basename($file_name));
-                        $upload_ok      = 1;
-                        $img_file_type  = pathinfo($target_file_ar, PATHINFO_EXTENSION);
-                        $upload_res_ar = move_uploaded_file($temp_file_name, $target_file_ar);
-                    }
-                }
-                if ($upload_res_be || $upload_res_ar) $idx++;
-                if (($target_file_be && !$upload_res_be) || ($target_file_ar && !$upload_res_ar)) {
-                    echo "<script type ='text/JavaScript'>";
-                    echo "alert('檔案上傳失敗，請重新操作！".$sql."');";
-                    echo "location.href='bargain-index.php?function_name=bargain&".$token_link."';";
-                    echo "</script>";
-                }
-                $db_query  = "insert into bargain_supplier (bid, supplier_id, supplier, supplier_attatch_be, quote_amt_be, note_be, ";
-                $db_query .= "supplier_attatch_ar, quote_amt_ar, note_ar, creater, create_at) values (";
-                $db_query .= "'$id', '$next_sup_id', '$supplier_arr[$i]',  '$target_file_be', '$quote_amt_be_arr[$i]', '$note_be_arr[$i]', ";
-                $db_query .= "'$target_file_ar', '$quote_amt_ar_arr[$i]', '$note_ar_arr[$i]', '$user_id', '$create_at')";
-                $result = mysqli_query($link, $db_query);
-                $next_sup_id++;
-            } else {    // 修改(不支援重傳檔案)
-                $db_query  = "update bargain_supplier set supplier = '$supplier_arr[$i]', quote_amt_be = '$quote_amt_be_arr[$i]', ";
-                $db_query .= "note_be = '$note_be_arr[$i]', quote_amt_ar = '$quote_amt_ar_arr[$i]', ";
-                $db_query .= "note_ar = '$note_ar_arr[$i]', create_at = '$create_at' ";
-                $db_query .= "where id = '$bsid_arr[$i]'";
-                $result = mysqli_query($link, $db_query);
-            }
-        }
-    }
-
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='bargain-index.php?function_name=bargain&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='bargain-index.php?function_name=bargain&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if (isset($_POST['update'])) {
+    foreach ($_POST as $k => $v) {
+        $$k = htmlspecialchars(stripslashes(trim($v)));
+    }
+    //print_r($_POST);
+    //print_r($_FILES);exit;
+
+    $sql_atta = "";
+
+    $quantity = str_replace(",", "", $quantity);
+    $lead_time = str_replace(",", "", $lead_time);
+    $margin_day = str_replace(",", "", $margin_day);
+
+    if ($_FILES["attatch1"]["error"] == 0) {
+        $file_name      = $_FILES["attatch1"]["name"];
+        $temp_file_name = $_FILES["attatch1"]["tmp_name"];
+        $file_size      = $_FILES["attatch1"]["size"];
+        $target_dir     = "bargain-uploads/";
+        $target_file1   = strtolower($target_dir.$bargainno."-1-".basename($file_name));
+        $img_file_type  = pathinfo($file_name, PATHINFO_EXTENSION);
+        $upload_ok      = 1;
+        //if (file_exists($target_file1)) unlink($target_file1);
+        foreach (glob($target_dir.$bargainno."-1-*") as $todelfile) {
+            unlink($todelfile);
+        }
+        $upload_res_1 = move_uploaded_file($temp_file_name, $target_file1);
+        $sql_atta .= "attatch1 = '$target_file1', ";
+    } else $target_file1 = "";
+
+    if ($_FILES["attatch2"]["error"] == 0) {
+        $file_name      = $_FILES["attatch2"]["name"];
+        $temp_file_name = $_FILES["attatch2"]["tmp_name"];
+        $file_size      = $_FILES["attatch2"]["size"];
+        $target_dir     = "bargain-uploads/";
+        $target_file2   = strtolower($target_dir.$bargainno."-2-".basename($file_name));
+        $img_file_type  = pathinfo($file_name, PATHINFO_EXTENSION);
+        $upload_ok      = 1;
+        //if (file_exists($target_file2)) unlink($target_file2);
+        foreach (glob($target_dir.$bargainno."-2-*") as $todelfile) {
+            unlink($todelfile);
+        }
+        $upload_res_2 = move_uploaded_file($temp_file_name, $target_file2);
+        $sql_atta .= "attatch2 = '$target_file2', ";
+    } else $target_file2 = "";
+
+    if (($target_file1 && !$upload_res_1) || ($target_file2 && !$upload_res_2)) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('檔案上傳失敗，請重新操作。');";
+        echo "location.href='bargain-index.php?function_name=bargain&".$token_link."';";
+        echo "</script>";
+    }
+
+    $db_query  = "update bargain set receiver = '$receiver', response_dt = '$response_dt', item = '$item', annual = '$annual', urgent = '$urgent', ";
+    $db_query .= "vendor = '$vendor', prospecting = '$prospecting', category = '$category', dealer = '$dealer', reason = '$reason', brand = '$brand', ";
+    $db_query .= "model = '$model', quantity = '$quantity', brandkeep = '$brandkeep', lead_time = '$lead_time', margin = '$margin', margin_day = '$margin_day', ";
+    $db_query .= "acceptance = '$acceptance', purchase_history = '$purchase_history', item_description = '$item_description', repairno = '$repairno', ";
+    $db_query .= $sql_atta;
+    $db_query .= "category_repair = '$category_repair', content = '$content', quotation = '$quotation', create_dt = '$create_at' ";
+    $db_query .= "where id = '$id'";
+    $result = mysqli_query($link, $db_query);
+    $affected = mysqli_affected_rows($link);
+    if ($result && $sup_id_all != "") {
+        $bsid_arr = explode(",", $bsid_all);
+        $sup_id_arr = explode(",", $sup_id_all);
+        $supplier_arr = explode(",", rtrim($supplier_all, ","));
+        $quote_amt_be_arr = explode(",", $quote_amt_be_all);
+        $note_be_arr = explode(",", $note_be_all);
+        $quote_amt_ar_arr = explode(",", $quote_amt_ar_all);
+        $note_ar_arr = explode(",", $note_ar_all);
+        $item_no = 1;
+
+        // 有新增的供應商
+        $new_sup_cnt = count($supplier_arr) - count($bsid_arr);
+        if ($new_sup_cnt > 0) $next_sup_id = max($sup_id_arr)+1;
+        $idx = 0;
+        for ($i=0; $i<count($supplier_arr); $i++) {
+            if ($new_sup_cnt > 0 && $bsid_arr[$i] == "") {  // 新增
+                $target_file_be = $target_file_ar = "";
+                if ($_FILES["supplier_attatch_be"]["name"]) {   // 有上傳檔案
+                    if ($_FILES["supplier_attatch_be"]["name"][$idx] && ($_FILES["supplier_attatch_be"]["error"][$idx] == 0)) {
+                        $file_name      = $_FILES["supplier_attatch_be"]["name"][$idx];
+                        $temp_file_name = $_FILES["supplier_attatch_be"]["tmp_name"][$idx];
+                        $file_size      = $_FILES["supplier_attatch_be"]["size"][$idx];
+                        $target_dir     = "bargain-uploads/supplier/";
+                        $target_file_be = strtolower($target_dir.$bargainno."-".$next_sup_id."-".basename($file_name));
+                        $upload_ok      = 1;
+                        $img_file_type  = pathinfo($target_file_be, PATHINFO_EXTENSION);
+                        $upload_res_be = move_uploaded_file($temp_file_name, $target_file_be);
+                    }
+                }
+                if ($_FILES["supplier_attatch_ar"]["name"]) {   // 有上傳檔案
+                    if ($_FILES["supplier_attatch_ar"]["name"][$idx] && ($_FILES["supplier_attatch_ar"]["error"][$idx] == 0)) {
+                        $file_name      = $_FILES["supplier_attatch_ar"]["name"][$idx];
+                        $temp_file_name = $_FILES["supplier_attatch_ar"]["tmp_name"][$idx];
+                        $file_size      = $_FILES["supplier_attatch_ar"]["size"][$idx];
+                        $target_dir     = "bargain-uploads/supplier/";
+                        $target_file_ar = strtolower($target_dir.$bargainno."-".$next_sup_id."-".basename($file_name));
+                        $upload_ok      = 1;
+                        $img_file_type  = pathinfo($target_file_ar, PATHINFO_EXTENSION);
+                        $upload_res_ar = move_uploaded_file($temp_file_name, $target_file_ar);
+                    }
+                }
+                if ($upload_res_be || $upload_res_ar) $idx++;
+                if (($target_file_be && !$upload_res_be) || ($target_file_ar && !$upload_res_ar)) {
+                    echo "<script type ='text/JavaScript'>";
+                    echo "alert('檔案上傳失敗，請重新操作！".$sql."');";
+                    echo "location.href='bargain-index.php?function_name=bargain&".$token_link."';";
+                    echo "</script>";
+                }
+                $db_query  = "insert into bargain_supplier (bid, supplier_id, supplier, supplier_attatch_be, quote_amt_be, note_be, ";
+                $db_query .= "supplier_attatch_ar, quote_amt_ar, note_ar, creater, create_at) values (";
+                $db_query .= "'$id', '$next_sup_id', '$supplier_arr[$i]',  '$target_file_be', '$quote_amt_be_arr[$i]', '$note_be_arr[$i]', ";
+                $db_query .= "'$target_file_ar', '$quote_amt_ar_arr[$i]', '$note_ar_arr[$i]', '$user_id', '$create_at')";
+                $result = mysqli_query($link, $db_query);
+                $next_sup_id++;
+            } else {    // 修改(不支援重傳檔案)
+                $db_query  = "update bargain_supplier set supplier = '$supplier_arr[$i]', quote_amt_be = '$quote_amt_be_arr[$i]', ";
+                $db_query .= "note_be = '$note_be_arr[$i]', quote_amt_ar = '$quote_amt_ar_arr[$i]', ";
+                $db_query .= "note_ar = '$note_ar_arr[$i]', create_at = '$create_at' ";
+                $db_query .= "where id = '$bsid_arr[$i]'";
+                $result = mysqli_query($link, $db_query);
+            }
+        }
+    }
+
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='bargain-index.php?function_name=bargain&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='bargain-index.php?function_name=bargain&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/board-create.php b/wms/board-create.php
index e4bd345a..2db0fa67 100644
--- a/wms/board-create.php
+++ b/wms/board-create.php
@@ -1,51 +1,80 @@
-<?php
-include "header.php"; 
-?>
-<script>
-$(function(){
-});
-</script>
-<div class="container">
-<?php
-include "board-record-submit.php";
-/*
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-        echo "<p class='error'>Please fill up the required field!</p>";
-    } else {
-        echo "<p class='success'>Record has added successfully</p>";
-    }
-}
-*/
-?>
-
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        <div>
-            <label for="title">主旨</label>
-            <input type="text" name="title" id="title" size="30" maxlength="25" required>
-        </div>
-        <!--<div>
-            <label for="pin">置頂</label>
-            <select name="pin" id="pin">
-                <option value="Y">是</option>
-                <option value="N" selected>否</option>
-            </select>
-        </div>-->
-        <div>
-            <label for="attatch1">附件上傳</label>
-            <div>
-                <input type="file" name="attatch1" id="attatch1">
-            </div>
-        </div>
-        <div>
-            <label for="content">公告內容</label><br>
-            <textarea class="form-control2" name="content" id="content" rows="8" cols="100" required></textarea>
-        </div>
-        <div>
-            <button type="submit" name="submit" id="submit">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
+<?php
+include "header.php";
+?>
+<script>
+    $(function() {});
+</script>
+<div class="container">
+    <?php
+    include "board-record-submit.php";
+    /*
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+        echo "<p class='error'>Please fill up the required field!</p>";
+    } else {
+        echo "<p class='success'>Record has added successfully</p>";
+    }
+}
+*/
+    ?>
+
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
+        <div class='container'>
+            <div class='row'>
+                <div class='col-md-6 col-12'>
+                    <label for="title">主旨</label>
+                    <input type="text" name="title" id="title" size="30" maxlength="25" required>
+                </div>
+                <div class='col-md-6 col-12'>
+                    <label for="attatch1">附件上傳</label>
+                    <div>
+                        <input type="file" name="attatch1" id="attatch1">
+                    </div>
+                </div>
+            </div>
+            <div class='row'>
+                <div class='col-md-3 col-3'>
+                    <label>連結名稱</label>
+                    <input type="text" id="linkName">
+                </div>
+                <div class='col-md-9 col-6'>
+                    <label>連結網址</label>
+                    <input type="text" id="linkURL">
+                </div>
+                <div class='col-md-2 col-2'>
+                    <button type='button' onclick="insertLink()">插入超連結</button>
+                </div>
+            </div>
+            <div class='row'>
+                <div class='col-md-12 col-12'>
+                    <label for="content">公告內容</label><br>
+                    <textarea class="form-control2" name="content" id="content" rows="8" cols="100" required></textarea>
+                </div>
+            </div>
+            <br />
+            <div class='row'>
+                <div class='col-md-12 col-12'>
+                    <input type="hidden" name="token" value="<?php echo $token; ?>">
+                    <button type="submit" name="submit" id="submit">確定</button>
+                </div>
+            </div>
+    </form>
+</div>
+<script>
+    function insertLink() {
+        var linkName = document.getElementById('linkName').value;
+        var linkURL = document.getElementById('linkURL').value;
+
+        if (linkName !== '' && linkURL !== '') {
+            var textarea = document.getElementById('content');
+            var link = '<a style="color:blue" href="' + linkURL + '">' + linkName + '</a>';
+
+            // 插入超連結到 textarea 中
+            textarea.value += link;
+        } else {
+            alert('請輸入連結名稱和 URL');
+        }
+    }
+</script>
+
 <?php include "footer.php"; ?>
\ No newline at end of file
diff --git a/wms/board-delete.php b/wms/board-delete.php
index 1c9d73d9..808cf094 100644
--- a/wms/board-delete.php
+++ b/wms/board-delete.php
@@ -1,23 +1,23 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "update board set status = 'N', create_at = NOW() where id = '$id' and creater = '$user_id'";
-$res = mysqli_query($link, $db_query);
-/*
-$db_query = "select attach from board where id = '$id'";
-$res = mysqli_query($link, $db_query);
-$row = mysqli_fetch_row($res);
-$target_file = $row[0];
-mysqli_free_result($res);
-
-$db_query = "delete from board where id = '$id'";
-mysqli_query($link, $db_query);
-unlink($target_file);
-*/
-//header("Location:board-index.php");
-header("Refresh:0; url=board-index.php?function_name=board&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "update board set status = 'N', create_at = NOW() where id = '$id' and creater = '$user_id'";
+$res = mysqli_query($link, $db_query);
+/*
+$db_query = "select attach from board where id = '$id'";
+$res = mysqli_query($link, $db_query);
+$row = mysqli_fetch_row($res);
+$target_file = $row[0];
+mysqli_free_result($res);
+
+$db_query = "delete from board where id = '$id'";
+mysqli_query($link, $db_query);
+unlink($target_file);
+*/
+//header("Location:board-index.php");
+header("Refresh:0; url=board-index.php?function_name=board&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/board-edit.php b/wms/board-edit.php
index e9f2f168..2e8c49b5 100644
--- a/wms/board-edit.php
+++ b/wms/board-edit.php
@@ -1,60 +1,60 @@
-<?php
-exit;
-require_once "database.php";
-include "header.php"; 
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "select * from board where id = '$id'";
-$data = mysqli_query($link, $db_query);
-
-foreach($data as $data) :
-?>
-<script>
-$(function(){
-});
-</script>
-<div class="container">
-    <form class="form-inline" method="post" action="board-record-update.php" enctype="multipart/form-data">
-        <div>
-            <label for="title">主旨</label>
-            <input type="text" name="title" id="title" size="30" maxlength="25" value="<?php echo $data['title']; ?>" required>
-        </div>
-        <!--<div>
-            <label for="sdate">開始日期</label><br>
-            <input type="date" name="sdate" id="sdate" value="<?php echo $data['sdate']; ?>" required>
-        </div>
-        <div>
-            <label for="edate">結束日期</label><br>
-            <input type="date" name="edate" id="edate" value="<?php echo $data['edate']; ?>" required>
-        </div>-->
-        <div>
-            <label for="pin">置頂</label>
-            <select name="pin" id="pin">
-                <option value="Y"<?php if ($data["pin"]>1) echo " selected"; ?>>是</option>
-                <option value="N"<?php if ($data["pin"]==1) echo " selected"; ?>>否</option>
-            </select>
-        </div>
-        <div>
-            <label for="attatch1">附件上傳</label>
-            <a href="<?php echo $data['attach']; ?>" target="_blank"><?php echo str_replace("/wms/board-attach/","",$data['attach']); ?></a>
-            <div>
-                <input type="file" name="attatch1" id="attatch1">
-            </div>
-        </div>
-        <div>
-            <label for="content">公告內容</label><br>
-            <textarea class="form-control2" name="content" id="content" rows="8" cols="100" required><?php echo $data['content']; ?></textarea>
-        </div>
-        <div>
-            <br>
-            <button type="submit" name="update" id="update">確定</button>
-        </div>
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-    </form>
-</div>
-<?php
-endforeach;
-
-include "footer.php";
+<?php
+exit;
+require_once "database.php";
+include "header.php"; 
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "select * from board where id = '$id'";
+$data = mysqli_query($link, $db_query);
+
+foreach($data as $data) :
+?>
+<script>
+$(function(){
+});
+</script>
+<div class="container">
+    <form class="form-inline" method="post" action="board-record-update.php" enctype="multipart/form-data">
+        <div>
+            <label for="title">主旨</label>
+            <input type="text" name="title" id="title" size="30" maxlength="25" value="<?php echo $data['title']; ?>" required>
+        </div>
+        <!--<div>
+            <label for="sdate">開始日期</label><br>
+            <input type="date" name="sdate" id="sdate" value="<?php echo $data['sdate']; ?>" required>
+        </div>
+        <div>
+            <label for="edate">結束日期</label><br>
+            <input type="date" name="edate" id="edate" value="<?php echo $data['edate']; ?>" required>
+        </div>-->
+        <div>
+            <label for="pin">置頂</label>
+            <select name="pin" id="pin">
+                <option value="Y"<?php if ($data["pin"]>1) echo " selected"; ?>>是</option>
+                <option value="N"<?php if ($data["pin"]==1) echo " selected"; ?>>否</option>
+            </select>
+        </div>
+        <div>
+            <label for="attatch1">附件上傳</label>
+            <a href="<?php echo $data['attach']; ?>" target="_blank"><?php echo str_replace("/wms/board-attach/","",$data['attach']); ?></a>
+            <div>
+                <input type="file" name="attatch1" id="attatch1">
+            </div>
+        </div>
+        <div>
+            <label for="content">公告內容</label><br>
+            <textarea class="form-control2" name="content" id="content" rows="8" cols="100" required><?php echo $data['content']; ?></textarea>
+        </div>
+        <div>
+            <br>
+            <button type="submit" name="update" id="update">確定</button>
+        </div>
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+    </form>
+</div>
+<?php
+endforeach;
+
+include "footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/board-file.php b/wms/board-file.php
index 58d57ce8..4628950a 100644
--- a/wms/board-file.php
+++ b/wms/board-file.php
@@ -1,19 +1,19 @@
-<?php
-ob_start();
-include "header.php"; 
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "select attach from board where id = '$id'";
-$res = mysqli_query($link, $db_query);
-if ($row = mysqli_fetch_row($res)) {
-    header("Location: /wms/".$row[0]);
-    exit;
-} else {
-    echo "<script type ='text/JavaScript'>";
-    echo "alert('檔案下載失敗！');";
-    echo "</script>";
-    header("Refresh:0; url=board-index.php?function_name=board&".$token_link);
-}
-ob_end_flush();
+<?php
+ob_start();
+include "header.php"; 
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "select attach from board where id = '$id'";
+$res = mysqli_query($link, $db_query);
+if ($row = mysqli_fetch_row($res)) {
+    header("Location: /wms/".$row[0]);
+    exit;
+} else {
+    echo "<script type ='text/JavaScript'>";
+    echo "alert('檔案下載失敗！');";
+    echo "</script>";
+    header("Refresh:0; url=board-index.php?function_name=board&".$token_link);
+}
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/board-index.php b/wms/board-index.php
index c3dd41a6..80932de7 100644
--- a/wms/board-index.php
+++ b/wms/board-index.php
@@ -1,108 +1,201 @@
-<?php
-include "header.php";
-
-// 設置一個空陣列來放資料
-$data = array();
-
-// sql語法存在變數中
-$sql = "select * from board where status = 'Y' order by id";
-
-// 用mysqli_query方法執行(sql語法)將結果存在變數中
-$data = mysqli_query($link,$sql);
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="board-create.php?function_name=board&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-<?php
-}
-if($data):
-?>
-
-<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;
-   
-}
-
-</style>
-<div style="overflow-x:auto;">
-    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-    <thead>
-        <tr>
-            <th>項次</th>
-            <th>主旨</th>
-            <th>附件</th>
-            <!--<th>是否置頂</th>-->
-            <th>建檔人</th>
-            <th>建檔時間</th>
-            <th>關閉公告</th>
-        </tr>
-    </thead>
-    <tbody>
-    <?php foreach($data as $data) : ?>
-        <tr>
-            <td><?php echo $data['id']; ?></td>
-            <td><?php echo $data['title']; ?></td>
-            <td><a href="/wms/board-file.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" target="_blank"><?php echo str_replace("board-attach/","",$data['attach']); ?></a></td>
-            <!--<td><?php if ($data['pin'] > 1) echo "是"; else echo "否"; ?></td>-->
-            <td><?php echo $data['creater']; ?></td>
-            <td><?php echo $data['create_at']; ?></td>
-            <td>
-                <p>
-                <?php if (($data['creater'] == $user_id) && ($data['status']=="Y")) { ?>
-                    <a href="board-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('確認關閉公告嗎？')">
-                        <span class="glyphicon glyphicon-remove"></span>
-                    </a>
-                <?php } else echo "-"; ?>
-                </p>
-            </td>
-        </tr>
-    <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
+<?php
+include "header.php";
+
+// 設置一個空陣列來放資料
+$data = array();
+
+// sql語法存在變數中
+$sql = "select * from board where status = 'Y' order by id";
+
+// 用mysqli_query方法執行(sql語法)將結果存在變數中
+$data = mysqli_query($link, $sql);
+$data2 = $data;
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth & 2) { ?>
+    <p>
+        <a href="board-create.php?function_name=board&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+            <span class="glyphicon glyphicon-plus"></span>
+        </a>
+    </p>
+<?php
+}
+if ($data) :
+?>
+
+    <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;
+
+        }
+
+
+        /* The Modal (background) */
+        .modal {
+            display: none;
+            /* Hidden by default */
+            position: fixed;
+            /* Stay in place */
+            z-index: 1;
+            /* Sit on top */
+            padding-top: 100px;
+            /* Location of the box */
+            left: 0;
+            top: 0;
+            width: 100%;
+            /* Full width */
+            height: 100%;
+            /* Full height */
+            overflow: auto;
+            /* Enable scroll if needed */
+
+        }
+
+        .modal .back {
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background-color: rgba(0, 0, 0, 0.4);
+            /* Black w/ opacity */
+        }
+
+        /* Modal Content */
+        .modal-content {
+            z-index: 9;
+            background-color: #fefefe;
+            margin: auto;
+            padding: 20px;
+            border: 1px solid #888;
+            width: 80%;
+        }
+
+        /* The Close Button */
+        .close {
+            color: #aaaaaa;
+            float: right;
+            font-size: 28px;
+            font-weight: bold;
+        }
+
+        .close:hover,
+        .close:focus {
+            color: #000;
+            text-decoration: none;
+            cursor: pointer;
+        }
+    </style>
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+            <thead>
+                <tr>
+                    <th>項次</th>
+                    <th>主旨</th>
+                    <th>附件</th>
+                    <!--<th>是否置頂</th>-->
+                    <th>建檔人</th>
+                    <th>建檔時間</th>
+                    <th>關閉公告</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php foreach ($data as $data) : ?>
+                    <tr>
+                        <td><?php echo $data['id']; ?></td>
+                        <!-- <td><?php echo $data['title']; ?></td> -->
+                        <td><a onclick="openModal('<?php echo $data['id']; ?>')" href="#"><?php echo $data['title']; ?></button></a>
+                        <td><a href="/wms/board-file.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" target="_blank"><?php echo str_replace("board-attach/", "", $data['attach']); ?></a></td>
+                        <!--<td><?php if ($data['pin'] > 1) echo "是";
+                                else echo "否"; ?></td>-->
+                        <td><?php echo $data['creater']; ?></td>
+                        <td><?php echo $data['create_at']; ?></td>
+                        <td>
+                            <p>
+                                <?php if (($data['creater'] == $user_id) && ($data['status'] == "Y")) { ?>
+                                    <a href="board-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('確認關閉公告嗎？')">
+                                        <span class="glyphicon glyphicon-remove"></span>
+                                    </a>
+                                <?php } else echo "-"; ?>
+                            </p>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+        </table>
+    </div>
+
+    <?php
+
+    foreach ($data2 as $data2) :
+    ?>
+
+        <div id="myModal<?php echo $data2['id']; ?>" class="modal">
+            <div class="back"></div>
+            <div class="modal-content">
+                <button type="button" class="close myCloseBtn" id="">X</button>
+                <div class='col-12' style='text-align:center'>
+                    <h3><?php echo $data2['title']; ?></h3>
+                    <br/>
+                    <?php echo nl2br($data2['content']); ?>
+                </div>
+            </div>
+        </div>
+    <?php endforeach; ?>
+
+    <script>
+        var modal = document.getElementById("myModal");
+
+        function openModal(id) {
+            $("#myModal" + id).show();
+        }
+        $(".myCloseBtn").click(function(e) {
+            $(".modal").hide();
+        });
+        $(".back").click(function(e) {
+            $(".modal").hide();
+        });
+    </script>
+<?php
+
+else :
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/board-record-submit.php b/wms/board-record-submit.php
index d3adb28b..355be238 100644
--- a/wms/board-record-submit.php
+++ b/wms/board-record-submit.php
@@ -1,52 +1,53 @@
-<?php
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    //print_r($_POST);
-    //print_r($_FILES);exit;
-    foreach ($_POST as $k => $v) {
-        $$k = htmlspecialchars(stripslashes(trim($v)));
-    }
-
-    function get_basename($filename) {  
-        return preg_replace('/^.+[\\\\\\/]/', '', $filename);
-    }
-
-    if ($_FILES["attatch1"]["error"] == 0) {
-        $file_name      = $_FILES["attatch1"]["name"];
-        $temp_file_name = $_FILES["attatch1"]["tmp_name"];
-        $file_size      = $_FILES["attatch1"]["size"];
-        $target_dir     = "board-attach/";
-        $target_file1   = strtolower($target_dir.get_basename($file_name));
-        $img_file_type  = pathinfo($file_name, PATHINFO_EXTENSION);
-        $upload_ok      = 1;
-        if (file_exists($target_file1)) unlink($target_file1);
-        $upload_res_1 = move_uploaded_file($temp_file_name, $target_file1);
-    } else $target_file1 = "";
-
-
-    if ($target_file1 && !$upload_res_1) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('檔案上傳失敗，資料請重建。');";
-        echo "location.href='board-index.php?function_name=board&token=".$token."';";
-        echo "</script>";
-    }
-
-    $db_query  = "insert into board (title, content, attach, pin, creater, create_at) values (";
-    $db_query .= "'$title', '$content', '$target_file1', '1', '".$user_id."', NOW())";
-    $result = mysqli_query($link, $db_query);
-    if (mysqli_affected_rows($link) > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='board-index.php?function_name=board&token=".$token."';";
-        echo "</script>";
-    } elseif (mysqli_affected_rows($link)==0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='board-index.php?function_name=board&token=".$token."';";
-        echo "</script>";
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-
-    mysqli_close($link);
-}
+<?php
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    //print_r($_POST);
+    //print_r($_FILES);exit;
+    foreach ($_POST as $k => $v) {
+        // $$k = htmlspecialchars(stripslashes(trim($v)));
+        $$k = trim($v);
+    }
+
+    function get_basename($filename) {  
+        return preg_replace('/^.+[\\\\\\/]/', '', $filename);
+    }
+
+    if ($_FILES["attatch1"]["error"] == 0) {
+        $file_name      = $_FILES["attatch1"]["name"];
+        $temp_file_name = $_FILES["attatch1"]["tmp_name"];
+        $file_size      = $_FILES["attatch1"]["size"];
+        $target_dir     = "board-attach/";
+        $target_file1   = strtolower($target_dir.get_basename($file_name));
+        $img_file_type  = pathinfo($file_name, PATHINFO_EXTENSION);
+        $upload_ok      = 1;
+        if (file_exists($target_file1)) unlink($target_file1);
+        $upload_res_1 = move_uploaded_file($temp_file_name, $target_file1);
+    } else $target_file1 = "";
+
+
+    if ($target_file1 && !$upload_res_1) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('檔案上傳失敗，資料請重建。');";
+        echo "location.href='board-index.php?function_name=board&token=".$token."';";
+        echo "</script>";
+    }
+
+    $db_query  = "insert into board (title, content, attach, pin, creater, create_at) values (";
+    $db_query .= "'$title', '$content', '$target_file1', '1', '".$user_id."', NOW())";
+    $result = mysqli_query($link, $db_query);
+    if (mysqli_affected_rows($link) > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='board-index.php?function_name=board&token=".$token."';";
+        echo "</script>";
+    } elseif (mysqli_affected_rows($link)==0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='board-index.php?function_name=board&token=".$token."';";
+        echo "</script>";
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+
+    mysqli_close($link);
+}
 ?>
\ No newline at end of file
diff --git a/wms/board-record-update.php b/wms/board-record-update.php
index e11ff195..89341386 100644
--- a/wms/board-record-update.php
+++ b/wms/board-record-update.php
@@ -1,52 +1,52 @@
-<?php
-exit;
-require_once "database.php";
-
-if (isset($_POST['update'])) {
-    foreach ($_POST as $k => $v) {
-        $$k = htmlspecialchars(stripslashes(trim($v)));
-    }
-    //print_r($_POST);
-    //print_r($_FILES);exit;
-
-    function get_basename($filename) {  
-        return preg_replace('/^.+[\\\\\\/]/', '', $filename);
-    }
-
-    $pin = ($pin == "Y") ? "99" : "1";
-    $sql_atta = "";
-
-    if ($_FILES["attatch1"]["error"] == 0) {
-        $file_name      = $_FILES["attatch1"]["name"];
-        $temp_file_name = $_FILES["attatch1"]["tmp_name"];
-        $file_size      = $_FILES["attatch1"]["size"];
-        $target_dir     = "board-attach/";
-        $target_file1   = strtolower($target_dir.get_basename($file_name));
-        $img_file_type  = pathinfo($file_name, PATHINFO_EXTENSION);
-        $upload_ok      = 1;
-        if (file_exists($target_file1)) unlink($target_file1);
-        $upload_res_1 = move_uploaded_file($temp_file_name, $target_file1);
-        $sql_atta .= "path = '$target_file1', ";
-    } else $target_file1 = "";
-
-    if ($target_file1 && !$upload_res_1) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('檔案上傳失敗，請重新操作。');";
-        echo "location.href='board-index.php';";
-        echo "</script>";
-    }
-
-    $db_query  = "update board set title = '$title', pin = '$pin', ";
-    $db_query .= $sql_atta;
-    $db_query .= "content = '$content'";
-    $db_query .= "where id = '$id'";
-    $result = mysqli_query($link, $db_query);
-
-    mysqli_close($link);
-
-    echo "<script type ='text/JavaScript'>";
-    echo "alert('修改成功');";
-    echo "location.href='board-index.php';";
-    echo "</script>";
-}
+<?php
+exit;
+require_once "database.php";
+
+if (isset($_POST['update'])) {
+    foreach ($_POST as $k => $v) {
+        $$k = htmlspecialchars(stripslashes(trim($v)));
+    }
+    //print_r($_POST);
+    //print_r($_FILES);exit;
+
+    function get_basename($filename) {  
+        return preg_replace('/^.+[\\\\\\/]/', '', $filename);
+    }
+
+    $pin = ($pin == "Y") ? "99" : "1";
+    $sql_atta = "";
+
+    if ($_FILES["attatch1"]["error"] == 0) {
+        $file_name      = $_FILES["attatch1"]["name"];
+        $temp_file_name = $_FILES["attatch1"]["tmp_name"];
+        $file_size      = $_FILES["attatch1"]["size"];
+        $target_dir     = "board-attach/";
+        $target_file1   = strtolower($target_dir.get_basename($file_name));
+        $img_file_type  = pathinfo($file_name, PATHINFO_EXTENSION);
+        $upload_ok      = 1;
+        if (file_exists($target_file1)) unlink($target_file1);
+        $upload_res_1 = move_uploaded_file($temp_file_name, $target_file1);
+        $sql_atta .= "path = '$target_file1', ";
+    } else $target_file1 = "";
+
+    if ($target_file1 && !$upload_res_1) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('檔案上傳失敗，請重新操作。');";
+        echo "location.href='board-index.php';";
+        echo "</script>";
+    }
+
+    $db_query  = "update board set title = '$title', pin = '$pin', ";
+    $db_query .= $sql_atta;
+    $db_query .= "content = '$content'";
+    $db_query .= "where id = '$id'";
+    $result = mysqli_query($link, $db_query);
+
+    mysqli_close($link);
+
+    echo "<script type ='text/JavaScript'>";
+    echo "alert('修改成功');";
+    echo "location.href='board-index.php';";
+    echo "</script>";
+}
 ?>
\ No newline at end of file
diff --git a/wms/change-password-update.php b/wms/change-password-update.php
index ffdaa8ed..489350b0 100644
--- a/wms/change-password-update.php
+++ b/wms/change-password-update.php
@@ -1,48 +1,48 @@
-<?php
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-
-    require_once "database.php";
-
-    $token = $_REQUEST["token"];
-    $token_link = "token=" . $_REQUEST["token"];
-    list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
-
-    $old_pwd = $_REQUEST['old_pwd'];
-    $new_pwd = $_REQUEST['new_pwd'];
-
-    $data = array(); # 設置一個空陣列來放資料
-    $real_user_id = "";
-    $real_pwd = "";
-    $sql = "SELECT * FROM account where ((accountid = '$user_id') and (pwd = '$old_pwd'))"; # sql語法存在變數中
-    $data = mysqli_query($link, $sql); # 用mysqli_query方法執行(sql語法)將結果存在變數中
-    foreach ($data as $data) {
-        $real_user_id = $data['accountid'];
-        $real_pwd = $data['pwd'];
-    }
-
-    #如果帳號密碼都正確才可update
-    if (strlen($real_user_id) > 0) {
-        $sql_query = "UPDATE account set pwd = '$new_pwd' where ((accountid = '$user_id') and (pwd = '$old_pwd'))";
-        mysqli_query($link, $sql_query);
-        $result_message = "
-            <script>
-                alert('修改成功!');
-                location.href='change-password.php?" . $token_link . "';
-            </script>
-        ";
-    } else {
-        $result_message = "
-                <script>
-                    alert('帳號密碼錯誤!');
-                    location.href='change-password.php?" . $token_link . "';
-                </script>
-            ";
-    }
-    echo $result_message;
-}
-
-mysqli_close($link);
-?>
-<script>
-
+<?php
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+
+    require_once "database.php";
+
+    $token = $_REQUEST["token"];
+    $token_link = "token=" . $_REQUEST["token"];
+    list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
+
+    $old_pwd = $_REQUEST['old_pwd'];
+    $new_pwd = $_REQUEST['new_pwd'];
+
+    $data = array(); # 設置一個空陣列來放資料
+    $real_user_id = "";
+    $real_pwd = "";
+    $sql = "SELECT * FROM account where ((accountid = '$user_id') and (pwd = '$old_pwd'))"; # sql語法存在變數中
+    $data = mysqli_query($link, $sql); # 用mysqli_query方法執行(sql語法)將結果存在變數中
+    foreach ($data as $data) {
+        $real_user_id = $data['accountid'];
+        $real_pwd = $data['pwd'];
+    }
+
+    #如果帳號密碼都正確才可update
+    if (strlen($real_user_id) > 0) {
+        $sql_query = "UPDATE account set pwd = '$new_pwd' where ((accountid = '$user_id') and (pwd = '$old_pwd'))";
+        mysqli_query($link, $sql_query);
+        $result_message = "
+            <script>
+                alert('修改成功!');
+                location.href='change-password.php?" . $token_link . "';
+            </script>
+        ";
+    } else {
+        $result_message = "
+                <script>
+                    alert('帳號密碼錯誤!');
+                    location.href='change-password.php?" . $token_link . "';
+                </script>
+            ";
+    }
+    echo $result_message;
+}
+
+mysqli_close($link);
+?>
+<script>
+
 </script>
\ No newline at end of file
diff --git a/wms/change-password.php b/wms/change-password.php
index 363eb337..8a221d76 100644
--- a/wms/change-password.php
+++ b/wms/change-password.php
@@ -1,77 +1,77 @@
-<?php
-if ($_REQUEST["token"]) {
-    $item = substr($_REQUEST["token"], 0, strpos($_REQUEST["token"], "."));
-    if ($item) {
-        require_once "header.php";
-    }
-}
-?>
-
-
-
-<!-- 主頁header -->
-<?php
-require_once "header.php";
-require_once "database.php"; # 載入db.php來連結資料庫
-$data = array(); # 設置一個空陣列來放資料
-$sql = "SELECT * FROM account where (accountid = '$user_id')"; # sql語法存在變數中
-$data = mysqli_query($link, $sql); # 用mysqli_query方法執行(sql語法)將結果存在變數中
-
-
-foreach ($data as $data) {
-    $phone_call_help = $data['phone_call_help'];
-}
-
-
-?>
-<div>
-    <div id="loader">
-        <div class="spinner-border text-primary" role="status"></div>
-    </div>
-    <div class="appHeader bg-primary text-light">
-        <div class="left">
-            <a href="javascript:;" class="headerButton goBack">
-                <ion-icon name="chevron-back-outline"></ion-icon>
-            </a>
-        </div>
-        <div class="pageTitle">變更密碼</div>
-    </div>
-    <div id="appCapsule">
-        <div class="section full mt-2">
-            <div class="section-title">請輸入變更前後密碼!</div>
-            <div class="wide-block pt-2 pb-2">
-                <form action="change-password-update.php?token=<?php echo $_REQUEST["token"];?>" method="post" enctype="multipart/form-data">
-                    <!-- 以下是要傳遞的資料 -->
-                    <input type="hidden" name="token" value="<?php echo $token; ?>" />
-                    <!-- 以上是要傳遞的資料 -->
-                    <div class="form-group boxed">
-                        <div class="input-wrapper">
-                            <input type="text" class="form-control" name="old_pwd" placeholder="變更前密碼">
-                            <i class="clear-input">
-                                <ion-icon name="close-circle"></ion-icon>
-                            </i>
-                        </div>
-                    </div>
-                    <div class="form-group boxed">
-                        <div class="input-wrapper">
-                            <input type="text" class="form-control" name="new_pwd" placeholder="變更後密碼">
-                            <i class="clear-input">
-                                <ion-icon name="close-circle"></ion-icon>
-                            </i>
-                        </div>
-                    </div>
-                    <div class="mt-1">
-                        <button type="submit" class="btn btn-primary btn-lg btn-block">
-                            確定
-                        </button>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
-    <!-- * App Capsule -->
-</div>
-<?php
-
-mysqli_close($link);
+<?php
+if ($_REQUEST["token"]) {
+    $item = substr($_REQUEST["token"], 0, strpos($_REQUEST["token"], "."));
+    if ($item) {
+        require_once "header.php";
+    }
+}
+?>
+
+
+
+<!-- 主頁header -->
+<?php
+require_once "header.php";
+require_once "database.php"; # 載入db.php來連結資料庫
+$data = array(); # 設置一個空陣列來放資料
+$sql = "SELECT * FROM account where (accountid = '$user_id')"; # sql語法存在變數中
+$data = mysqli_query($link, $sql); # 用mysqli_query方法執行(sql語法)將結果存在變數中
+
+
+foreach ($data as $data) {
+    $phone_call_help = $data['phone_call_help'];
+}
+
+
+?>
+<div>
+    <div id="loader">
+        <div class="spinner-border text-primary" role="status"></div>
+    </div>
+    <div class="appHeader bg-primary text-light">
+        <div class="left">
+            <a href="javascript:;" class="headerButton goBack">
+                <ion-icon name="chevron-back-outline"></ion-icon>
+            </a>
+        </div>
+        <div class="pageTitle">變更密碼</div>
+    </div>
+    <div id="appCapsule">
+        <div class="section full mt-2">
+            <div class="section-title">請輸入變更前後密碼!</div>
+            <div class="wide-block pt-2 pb-2">
+                <form action="change-password-update.php?token=<?php echo $_REQUEST["token"];?>" method="post" enctype="multipart/form-data">
+                    <!-- 以下是要傳遞的資料 -->
+                    <input type="hidden" name="token" value="<?php echo $token; ?>" />
+                    <!-- 以上是要傳遞的資料 -->
+                    <div class="form-group boxed">
+                        <div class="input-wrapper">
+                            <input type="text" class="form-control" name="old_pwd" placeholder="變更前密碼">
+                            <i class="clear-input">
+                                <ion-icon name="close-circle"></ion-icon>
+                            </i>
+                        </div>
+                    </div>
+                    <div class="form-group boxed">
+                        <div class="input-wrapper">
+                            <input type="text" class="form-control" name="new_pwd" placeholder="變更後密碼">
+                            <i class="clear-input">
+                                <ion-icon name="close-circle"></ion-icon>
+                            </i>
+                        </div>
+                    </div>
+                    <div class="mt-1">
+                        <button type="submit" class="btn btn-primary btn-lg btn-block">
+                            確定
+                        </button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!-- * App Capsule -->
+</div>
+<?php
+
+mysqli_close($link);
 ?>
\ No newline at end of file
diff --git a/wms/combo-create.php b/wms/combo-create.php
index 97b39d4d..f99a86df 100644
--- a/wms/combo-create.php
+++ b/wms/combo-create.php
@@ -1,86 +1,86 @@
-<?php
-include "header.php";
-?>
-
-<div class="container">
-
-    <?php
-    
-        include "combo-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        
-    
-        <div>
-            <label for="combono">保養套餐號</label>
-            <input type="text" name="combono" id="combono">
-           
-        </div>	
-		
-        <div>
-            <label for="part">部位</label>
-            <input type="text" name="part" id="part">
-        </div>	
-				
-        <div>
-            <label for="partid">部位類別</label>
-            <input type="text" name="partid" id="partid">
-            
-        </div>	
-
-        <div>
-            <label for="comboitem">部位類別序號</label>
-            <input type="text" name="comboitem" id="comboitem" value="1">
-            
-        </div>	
-
-        <div>
-            <label for="detail">保養內容</label>
-            <input type="text" name="detail" id="detail">
-            
-        </div>
-
-        <div>
-            <label for="enable">是否啟用</label>
-			<Select name="enable" id="enable" required>
-				<option selected="selected" disabled="disabled"  style="display: none" value=""></option>			
-				<Option Value="1">啟用</Option>
-				<Option Value="0">停用</Option>			
-			</Select>
-            <!-- <input type="text" name="enable" id="enable" value="1"> -->
-            
-        </div>
-
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
-            <p class="error"><?php echo $creater_error; ?></p>
-        </div>
-
-        <div class="bottom-margin">
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-
-        <div>
-			<br>
-            <button type="submit" name="submit">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
+<?php
+include "header.php";
+?>
+
+<div class="container">
+
+    <?php
+    
+        include "combo-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        
+    
+        <div>
+            <label for="combono">保養套餐號</label>
+            <input type="text" name="combono" id="combono">
+           
+        </div>	
+		
+        <div>
+            <label for="part">部位</label>
+            <input type="text" name="part" id="part">
+        </div>	
+				
+        <div>
+            <label for="partid">部位類別</label>
+            <input type="text" name="partid" id="partid">
+            
+        </div>	
+
+        <div>
+            <label for="comboitem">部位類別序號</label>
+            <input type="text" name="comboitem" id="comboitem" value="1">
+            
+        </div>	
+
+        <div>
+            <label for="detail">保養內容</label>
+            <input type="text" name="detail" id="detail">
+            
+        </div>
+
+        <div>
+            <label for="enable">是否啟用</label>
+			<Select name="enable" id="enable" required>
+				<option selected="selected" disabled="disabled"  style="display: none" value=""></option>			
+				<Option Value="1">啟用</Option>
+				<Option Value="0">停用</Option>			
+			</Select>
+            <!-- <input type="text" name="enable" id="enable" value="1"> -->
+            
+        </div>
+
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
+            <p class="error"><?php echo $creater_error; ?></p>
+        </div>
+
+        <div class="bottom-margin">
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+
+        <div>
+			<br>
+            <button type="submit" name="submit">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
diff --git a/wms/combo-delete.php b/wms/combo-delete.php
index 2a8e8814..396488b7 100644
--- a/wms/combo-delete.php
+++ b/wms/combo-delete.php
@@ -1,12 +1,12 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "DELETE FROM combo WHERE id='$id'";
-mysqli_query($link, $db_query);	
-
-header("Refresh:0; url=combo-index.php?function_name=combo&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "DELETE FROM combo WHERE id='$id'";
+mysqli_query($link, $db_query);	
+
+header("Refresh:0; url=combo-index.php?function_name=combo&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/combo-edit.php b/wms/combo-edit.php
index c28c0368..7c529ace 100644
--- a/wms/combo-edit.php
+++ b/wms/combo-edit.php
@@ -1,93 +1,93 @@
-<?php
-    include "header.php";
-
-    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-	
-	$data = array();
-	// sql語法存在變數中
-	$db_query = "SELECT * FROM combo WHERE id=$id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$db_query);	
-/*
-    include "inc/record_update.php";
-    
-    try {	
-		// 設置一個空陣列來放資料
-		$data = array();
-		// sql語法存在變數中
-		$db_query = "SELECT * FROM expert WHERE id=$id";
-
-		// 用mysqli_query方法執行(sql語法)將結果存在變數中
-		$data = mysqli_query($link,$db_query);
-	}catch (Exception $e) {
-    echo 'Caught exception: ',  $e->getMessage(), "\n";
-	}
-*/	
-    foreach($data as $data) :
-?>
-
-<div class="container">
-    <form class="form-inline" method="post" action="combo-record-update.php" enctype="multipart/form-data">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-		
-        <div>
-            <label for="combono">保養套餐號</label>
-            <input type="text" name="combono" id="combono" value="<?php echo $data['combono']; ?>">
-        </div>	
-
-        <div>
-            <label for="part">部位</label>
-            <input type="text" name="part" id="part" value="<?php echo $data['part']; ?>">
-        </div>	
-		
-        <div>
-            <label for="partid">部位類別</label>
-            <input type="text" name="partid" id="partid" value="<?php echo $data['partid']; ?>">
-        </div>	
-				
-        <div>
-            <label for="comboitem">部位類別序號</label>
-            <input type="text" name="comboitem" id="comboitem" value="<?php echo $data['comboitem']; ?>">
-        </div>	
-
-        <div>
-            <label for="detail">保養內容</label>
-            <input type="text" name="detail" id="detail" value="<?php echo $data['detail']; ?>">
-        </div>	
-
-        <div>
-            <label for="enable">是否啟用</label>
-			<Select name="enable" id="enable" required>
-					<?php
-						if($data["enable"] == 1){
-							echo "<Option Value='1' selected='selected'>啟用</Option> <Option Value='0'>停用</Option>";
-						}else{
-							echo "<Option Value='0' selected='selected'>停用</Option> <Option Value='1'>啟用</Option>";
-						}
-					?>					
-			</Select>		
-            <!-- <input type="text" name="enable" id="enable" value=""> -->
-        </div>
-
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
-        </div>
-		
-        <div>
-			<br>
-            <button type="submit" name="update">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
-?>
-
+<?php
+    include "header.php";
+
+    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+	
+	$data = array();
+	// sql語法存在變數中
+	$db_query = "SELECT * FROM combo WHERE id=$id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$db_query);	
+/*
+    include "inc/record_update.php";
+    
+    try {	
+		// 設置一個空陣列來放資料
+		$data = array();
+		// sql語法存在變數中
+		$db_query = "SELECT * FROM expert WHERE id=$id";
+
+		// 用mysqli_query方法執行(sql語法)將結果存在變數中
+		$data = mysqli_query($link,$db_query);
+	}catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+	}
+*/	
+    foreach($data as $data) :
+?>
+
+<div class="container">
+    <form class="form-inline" method="post" action="combo-record-update.php" enctype="multipart/form-data">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+		
+        <div>
+            <label for="combono">保養套餐號</label>
+            <input type="text" name="combono" id="combono" value="<?php echo $data['combono']; ?>">
+        </div>	
+
+        <div>
+            <label for="part">部位</label>
+            <input type="text" name="part" id="part" value="<?php echo $data['part']; ?>">
+        </div>	
+		
+        <div>
+            <label for="partid">部位類別</label>
+            <input type="text" name="partid" id="partid" value="<?php echo $data['partid']; ?>">
+        </div>	
+				
+        <div>
+            <label for="comboitem">部位類別序號</label>
+            <input type="text" name="comboitem" id="comboitem" value="<?php echo $data['comboitem']; ?>">
+        </div>	
+
+        <div>
+            <label for="detail">保養內容</label>
+            <input type="text" name="detail" id="detail" value="<?php echo $data['detail']; ?>">
+        </div>	
+
+        <div>
+            <label for="enable">是否啟用</label>
+			<Select name="enable" id="enable" required>
+					<?php
+						if($data["enable"] == 1){
+							echo "<Option Value='1' selected='selected'>啟用</Option> <Option Value='0'>停用</Option>";
+						}else{
+							echo "<Option Value='0' selected='selected'>停用</Option> <Option Value='1'>啟用</Option>";
+						}
+					?>					
+			</Select>		
+            <!-- <input type="text" name="enable" id="enable" value=""> -->
+        </div>
+
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
+        </div>
+		
+        <div>
+			<br>
+            <button type="submit" name="update">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php
+
+    endforeach;
+    
+    include "footer.php";
+
+?>
+
diff --git a/wms/combo-index.php b/wms/combo-index.php
index 64b75531..4831f536 100644
--- a/wms/combo-index.php
+++ b/wms/combo-index.php
@@ -1,140 +1,140 @@
-<?php
-    include "header.php";
-
-    // 設置一個空陣列來放資料
-    $data = array();
-    // sql語法存在變數中
-    $sql_cmd = sql_myself($user_id);
-    $sql = "SELECT * FROM combo $sql_cmd ORDER BY id";
-
-    // 用mysqli_query方法執行(sql語法)將結果存在變數中
-    $data = mysqli_query($link,$sql);
-?>
-
-<!-- <a href="combo-create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="combo-create.php?function_name=combo&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-
-<?php
-}
-
-
-
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:combo-index.php");
-        }
-    }
-
-?>
-
-<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;
-   
-}
-
-</style>
-
-    <div style="overflow-x:auto;">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-            <tr>
-                <th>項次</th>
-                <th>保養套餐號</th>
-                <th>部位</th>
-                <th>部位類別</th>
-                <th>部位類別序號</th>
-                <th>保養內容</th>
-                <th>是否啟用</th>
-                <th>建檔人</th>
-                <th>建檔時間</th>				
-                <?php if ($user_auth&2) { ?>
-                <th>修改</th>
-                <th>刪除</th>
-                <?php } ?>
-            </tr>
-		</thead>
-		<tbody>			
-
-            <?php foreach($data as $data) : ?>    
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td><?php echo $data['combono']; ?></td>
-                    <td><?php echo $data['part']; ?></td>
-                    <td><?php echo $data['partid']; ?></td>
-                    <td><?php echo $data['comboitem']; ?></td>
-                    <td><?php echo $data['detail']; ?></td>
-                    <td><?php echo $data['enable']; ?></td>
-                    <td><?php echo $data['creater']; ?></td>
-                    <td><?php echo $data['create_at']; ?></td>
-                    <?php if ($user_auth&2) { ?>
-                    <td>
-						<p>
-							<a href="combo-edit.php?id=<?php echo $data['id']; ?>&function_name=combo&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-								<span class="glyphicon glyphicon-pencil"></span>
-							</a>
-						</p> 
-					</td>
-                    <td>
-						<p>
-							<a href="combo-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-								<span class="glyphicon glyphicon-remove"></span>
-							</a>
-						</p> 
-					</td>
-                    <?php } ?>
-                </tr>
-            <?php endforeach; ?>
-			</tbody>			
-        </table>
-    </div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-
+<?php
+    include "header.php";
+
+    // 設置一個空陣列來放資料
+    $data = array();
+    // sql語法存在變數中
+    $sql_cmd = sql_myself($user_id);
+    $sql = "SELECT * FROM combo $sql_cmd ORDER BY id";
+
+    // 用mysqli_query方法執行(sql語法)將結果存在變數中
+    $data = mysqli_query($link,$sql);
+?>
+
+<!-- <a href="combo-create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth&2) { ?>
+<p>
+<a href="combo-create.php?function_name=combo&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+
+<?php
+}
+
+
+
+if($data):
+    
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:combo-index.php");
+        }
+    }
+
+?>
+
+<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;
+   
+}
+
+</style>
+
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+            <tr>
+                <th>項次</th>
+                <th>保養套餐號</th>
+                <th>部位</th>
+                <th>部位類別</th>
+                <th>部位類別序號</th>
+                <th>保養內容</th>
+                <th>是否啟用</th>
+                <th>建檔人</th>
+                <th>建檔時間</th>				
+                <?php if ($user_auth&2) { ?>
+                <th>修改</th>
+                <th>刪除</th>
+                <?php } ?>
+            </tr>
+		</thead>
+		<tbody>			
+
+            <?php foreach($data as $data) : ?>    
+                <tr>
+                    <td><?php echo $data['id']; ?></td>
+                    <td><?php echo $data['combono']; ?></td>
+                    <td><?php echo $data['part']; ?></td>
+                    <td><?php echo $data['partid']; ?></td>
+                    <td><?php echo $data['comboitem']; ?></td>
+                    <td><?php echo $data['detail']; ?></td>
+                    <td><?php echo $data['enable']; ?></td>
+                    <td><?php echo $data['creater']; ?></td>
+                    <td><?php echo $data['create_at']; ?></td>
+                    <?php if ($user_auth&2) { ?>
+                    <td>
+						<p>
+							<a href="combo-edit.php?id=<?php echo $data['id']; ?>&function_name=combo&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+								<span class="glyphicon glyphicon-pencil"></span>
+							</a>
+						</p> 
+					</td>
+                    <td>
+						<p>
+							<a href="combo-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+						</p> 
+					</td>
+                    <?php } ?>
+                </tr>
+            <?php endforeach; ?>
+			</tbody>			
+        </table>
+    </div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+
 ?>
\ No newline at end of file
diff --git a/wms/combo-record-submit.php b/wms/combo-record-submit.php
index f7994b9e..aca5529d 100644
--- a/wms/combo-record-submit.php
+++ b/wms/combo-record-submit.php
@@ -1,42 +1,42 @@
-<?php
-$combono= "";
-$part= "";
-$partid= "";
-$comboitem= "";
-$detail= "";
-$enable= "";
-$creater= "";
-$create_at= "";
-
-$combono_error= "";
-$part_error= "";
-$partid_error= "";
-$comboitem_error= "";
-$detail_error= "";
-$enable_error= "";
-$creater_error = "";
-$create_at_error = "";
-
-
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    include "combo-user-input.php";
-
-    $db_query = "INSERT INTO combo(combono, part, partid, comboitem,detail, enable,creater, create_at) VALUES ('$combono', '$part', '$partid', '$comboitem','$detail', '$enable','$creater', '$create_at')";    	                      
-    $result = mysqli_query($link,$db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='combo-index.php?function_name=combo&".$token_link."';";
-        echo "</script>";  
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='combo-index.php?function_name=combo&".$token_link."';";
-        echo "</script>";  
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
-?>
+<?php
+$combono= "";
+$part= "";
+$partid= "";
+$comboitem= "";
+$detail= "";
+$enable= "";
+$creater= "";
+$create_at= "";
+
+$combono_error= "";
+$part_error= "";
+$partid_error= "";
+$comboitem_error= "";
+$detail_error= "";
+$enable_error= "";
+$creater_error = "";
+$create_at_error = "";
+
+
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    include "combo-user-input.php";
+
+    $db_query = "INSERT INTO combo(combono, part, partid, comboitem,detail, enable,creater, create_at) VALUES ('$combono', '$part', '$partid', '$comboitem','$detail', '$enable','$creater', '$create_at')";    	                      
+    $result = mysqli_query($link,$db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='combo-index.php?function_name=combo&".$token_link."';";
+        echo "</script>";  
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='combo-index.php?function_name=combo&".$token_link."';";
+        echo "</script>";  
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
+?>
diff --git a/wms/combo-record-update.php b/wms/combo-record-update.php
index a59b305b..9aef6af5 100644
--- a/wms/combo-record-update.php
+++ b/wms/combo-record-update.php
@@ -1,41 +1,41 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-    function user_input( $data ) {
-        $data1 = trim($data);
-        $data2 = stripslashes($data1);
-        $data3 = htmlspecialchars($data2);
-        return $data3;
-    }
-
-            
-    $id     = $_POST['id'];
-    $combono   = user_input($_POST["combono"]);	
-    $part	   = user_input($_POST["part"]);	
-    $partid       = user_input($_POST["partid"]);	
-    $comboitem       = user_input($_POST["comboitem"]);	
-    $detail        = user_input($_POST["detail"]);	
-    $enable     = user_input($_POST["enable"]);	
-    $creater      = user_input($_POST["creater"]);	
-    $create_at     = date('Y/m/d H:i:s');
-
-    $db_query = "UPDATE combo set combono = '$combono', part = '$part', partid = '$partid', comboitem = '$comboitem', detail = '$detail', enable = '$enable',create_at = '$create_at' WHERE id='$id'";
-    mysqli_query($link, $db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='combo-index.php?function_name=combo&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='combo-index.php?function_name=combo&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if(isset($_POST['update'])) {
+    function user_input( $data ) {
+        $data1 = trim($data);
+        $data2 = stripslashes($data1);
+        $data3 = htmlspecialchars($data2);
+        return $data3;
+    }
+
+            
+    $id     = $_POST['id'];
+    $combono   = user_input($_POST["combono"]);	
+    $part	   = user_input($_POST["part"]);	
+    $partid       = user_input($_POST["partid"]);	
+    $comboitem       = user_input($_POST["comboitem"]);	
+    $detail        = user_input($_POST["detail"]);	
+    $enable     = user_input($_POST["enable"]);	
+    $creater      = user_input($_POST["creater"]);	
+    $create_at     = date('Y/m/d H:i:s');
+
+    $db_query = "UPDATE combo set combono = '$combono', part = '$part', partid = '$partid', comboitem = '$comboitem', detail = '$detail', enable = '$enable',create_at = '$create_at' WHERE id='$id'";
+    mysqli_query($link, $db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='combo-index.php?function_name=combo&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='combo-index.php?function_name=combo&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/combo-user-input.php b/wms/combo-user-input.php
index af1ef76d..6c5e5e9b 100644
--- a/wms/combo-user-input.php
+++ b/wms/combo-user-input.php
@@ -1,54 +1,54 @@
-<?php
-
-//Function to filter the form input
-function user_input( $data ) {
-    $data1 = trim($data);
-    $data2 = stripslashes($data1);
-    $data3 = htmlspecialchars($data2);
-    return $data3;
-}
-
-$combono   = user_input($_POST["combono"]);	
-$part	   = user_input($_POST["part"]);	
-$partid       = user_input($_POST["partid"]);	
-$comboitem       = user_input($_POST["comboitem"]);	
-$detail        = user_input($_POST["detail"]);	
-$enable     = user_input($_POST["enable"]);	
-$creater      = user_input($_POST["creater"]);	
-$create_at     = date('Y/m/d H:i:s');
-
-
-
-
-/*
-
-if(empty($_POST["name"])) {
-    $name_error = "Name is required";
-} else {
-    $name = user_input($_POST["name"]);
-    
-    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
-        $name_error = "Only letter and white space are allowed";
-    }
-}
-
-
-/*
-if(empty($_POST["website"])) {
-    $website_error = "Website address is required";
-} else {
-    $website = user_input($_POST["website"]);
-
-    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
-        $website_error = "Invalid website URL";
-    }
-}
-
-if(empty($_POST["comment"])) {
-    $comment = "";
-} else {
-    $comment = user_input($_POST["comment"]);
-}
-*/
-?>
-
+<?php
+
+//Function to filter the form input
+function user_input( $data ) {
+    $data1 = trim($data);
+    $data2 = stripslashes($data1);
+    $data3 = htmlspecialchars($data2);
+    return $data3;
+}
+
+$combono   = user_input($_POST["combono"]);	
+$part	   = user_input($_POST["part"]);	
+$partid       = user_input($_POST["partid"]);	
+$comboitem       = user_input($_POST["comboitem"]);	
+$detail        = user_input($_POST["detail"]);	
+$enable     = user_input($_POST["enable"]);	
+$creater      = user_input($_POST["creater"]);	
+$create_at     = date('Y/m/d H:i:s');
+
+
+
+
+/*
+
+if(empty($_POST["name"])) {
+    $name_error = "Name is required";
+} else {
+    $name = user_input($_POST["name"]);
+    
+    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
+        $name_error = "Only letter and white space are allowed";
+    }
+}
+
+
+/*
+if(empty($_POST["website"])) {
+    $website_error = "Website address is required";
+} else {
+    $website = user_input($_POST["website"]);
+
+    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
+        $website_error = "Invalid website URL";
+    }
+}
+
+if(empty($_POST["comment"])) {
+    $comment = "";
+} else {
+    $comment = user_input($_POST["comment"]);
+}
+*/
+?>
+
diff --git a/wms/contract-create.php b/wms/contract-create.php
index b1241568..3e28f217 100644
--- a/wms/contract-create.php
+++ b/wms/contract-create.php
@@ -1,126 +1,126 @@
-<?php
-include "header.php";
-?>
-
-<div class="container">
-
-    <?php
-    
-        include "contract-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        
-    
-		<div>
-            <label for="contracttype">合約類型(必填)</label>
-			<Select name="contracttype" id="contracttype" required>
-				<option selected="selected" disabled="disabled"  style="display: none" value=""></option>			
-				<Option Value="A">定期保養</Option>
-				<Option Value="B">單次保養</Option>	
-				<Option Value="C">單次維修</Option>					
-			</Select>			
-        </div>	
-
-        <div>
-            <label for="contractno">合約號(必填)</label>
-            <input type="text" name="contractno" id="contractno" required>
-        </div>	
-		
-        <div>
-            <label for="company">公司名稱</label>
-            <input type="text" name="company" id="company" >
-        </div>	
-				
-        <div>
-            <label for="taxid">統一編號</label>
-            <input type="text" name="taxid" id="taxid" >
-        </div>	
-
-        <div>
-            <label for="address">地址</label>
-            <input type="text" name="address" id="address" >
-        </div>	
-
-        <div>
-            <label for="tel">電話</label>
-            <input type="text" name="tel" id="tel" >
-        </div>
-
-        <div>
-            <label for="promiser">立約人</label>
-            <input type="text" name="promiser" id="promiser">
-        </div>
-
-        <div>
-            <label for="customerid">客戶維護帳號(必填)</label>
-            <input type="text" name="customerid" id="customerid" required>
-        </div>
-
-        <div>
-            <label for="contractperson">業務聯繫人</label>
-            <input type="text" name="contractperson" id="contractperson" >
-        </div>
-
-        <div>
-            <label for="contractaddress">業務聯繫人地址</label>
-            <input type="text" name="contractaddress" id="contractaddress" >
-        </div>
-
-        <div>
-            <label for="contracttel">業務聯繫人電話(必填)</label>
-            <input type="text" name="contracttel" id="contracttel" required>
-        </div>
-
-        <div>
-            <label for="contractemail">業務聯繫人郵件地址</label>
-            <input type="text" name="contractemail" id="contractemail" >
-        </div>
-
-        <div>
-            <label for="contract_employee">契約人員工號</label>
-            <input type="text" name="contract_employee" id="contract_employee" >
-        </div>
-
-        <div>
-            <label for="start_date">合約起始年月日(必填)</label><br>
-            <input type="text" data-date-format="yyyy-mm-dd" name="start_date" id="start_date" value="<?php echo date('Y-m-d'); ?>" required>
-        </div>
-
-        <div>
-            <label for="end_date">合約終止年月日(必填)</label><br>
-            <input type="text" data-date-format="yyyy-mm-dd" name="end_date" id="end_date" value="<?php echo date('Y-m-d',strtotime('+364 day')); ?>" required>
-        </div>
-       
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
-            <p class="error"><?php echo $creater_error; ?></p>
-        </div>
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-
-        <div>
-			<br>
-            <button type="submit" name="submit">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
+<?php
+include "header.php";
+?>
+
+<div class="container">
+
+    <?php
+    
+        include "contract-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        
+    
+		<div>
+            <label for="contracttype">合約類型(必填)</label>
+			<Select name="contracttype" id="contracttype" required>
+				<option selected="selected" disabled="disabled"  style="display: none" value=""></option>			
+				<Option Value="A">定期保養</Option>
+				<Option Value="B">單次保養</Option>	
+				<Option Value="C">單次維修</Option>					
+			</Select>			
+        </div>	
+
+        <div>
+            <label for="contractno">合約號(必填)</label>
+            <input type="text" name="contractno" id="contractno" required>
+        </div>	
+		
+        <div>
+            <label for="company">公司名稱</label>
+            <input type="text" name="company" id="company" >
+        </div>	
+				
+        <div>
+            <label for="taxid">統一編號</label>
+            <input type="text" name="taxid" id="taxid" >
+        </div>	
+
+        <div>
+            <label for="address">地址</label>
+            <input type="text" name="address" id="address" >
+        </div>	
+
+        <div>
+            <label for="tel">電話</label>
+            <input type="text" name="tel" id="tel" >
+        </div>
+
+        <div>
+            <label for="promiser">立約人</label>
+            <input type="text" name="promiser" id="promiser">
+        </div>
+
+        <div>
+            <label for="customerid">客戶維護帳號(必填)</label>
+            <input type="text" name="customerid" id="customerid" required>
+        </div>
+
+        <div>
+            <label for="contractperson">業務聯繫人</label>
+            <input type="text" name="contractperson" id="contractperson" >
+        </div>
+
+        <div>
+            <label for="contractaddress">業務聯繫人地址</label>
+            <input type="text" name="contractaddress" id="contractaddress" >
+        </div>
+
+        <div>
+            <label for="contracttel">業務聯繫人電話(必填)</label>
+            <input type="text" name="contracttel" id="contracttel" required>
+        </div>
+
+        <div>
+            <label for="contractemail">業務聯繫人郵件地址</label>
+            <input type="text" name="contractemail" id="contractemail" >
+        </div>
+
+        <div>
+            <label for="contract_employee">契約人員工號</label>
+            <input type="text" name="contract_employee" id="contract_employee" >
+        </div>
+
+        <div>
+            <label for="start_date">合約起始年月日(必填)</label><br>
+            <input type="text" data-date-format="yyyy-mm-dd" name="start_date" id="start_date" value="<?php echo date('Y-m-d'); ?>" required>
+        </div>
+
+        <div>
+            <label for="end_date">合約終止年月日(必填)</label><br>
+            <input type="text" data-date-format="yyyy-mm-dd" name="end_date" id="end_date" value="<?php echo date('Y-m-d',strtotime('+364 day')); ?>" required>
+        </div>
+       
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
+            <p class="error"><?php echo $creater_error; ?></p>
+        </div>
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+
+        <div>
+			<br>
+            <button type="submit" name="submit">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
diff --git a/wms/contract-delete.php b/wms/contract-delete.php
index 10371003..a8884d8b 100644
--- a/wms/contract-delete.php
+++ b/wms/contract-delete.php
@@ -1,12 +1,12 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "DELETE FROM contract WHERE id='$id'";
-mysqli_query($link, $db_query);	
-
-header("Refresh:0; url=contract-index.php?function_name=contract&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "DELETE FROM contract WHERE id='$id'";
+mysqli_query($link, $db_query);	
+
+header("Refresh:0; url=contract-index.php?function_name=contract&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/contract-edit.php b/wms/contract-edit.php
index 9df494e6..c643d2a6 100644
--- a/wms/contract-edit.php
+++ b/wms/contract-edit.php
@@ -1,142 +1,142 @@
-<?php
-    include "header.php";
-
-    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-	
-	$data = array();
-	// sql語法存在變數中
-	$db_query = "SELECT * FROM contract WHERE id=$id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$db_query);	
-/*
-    include "inc/record_update.php";
-    
-    try {	
-		// 設置一個空陣列來放資料
-		$data = array();
-		// sql語法存在變數中
-		$db_query = "SELECT * FROM expert WHERE id=$id";
-
-		// 用mysqli_query方法執行(sql語法)將結果存在變數中
-		$data = mysqli_query($link,$db_query);
-	}catch (Exception $e) {
-    echo 'Caught exception: ',  $e->getMessage(), "\n";
-	}
-*/	
-    foreach($data as $data) :
-?>
-
-<div class="container">
-    <form class="form-inline" method="post" action="contract-record-update.php" enctype="multipart/form-data">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-		
-        <div>
-            <label for="contracttype">合約類型</label>
-			<Select name="contracttype" id="contracttype" required>
-					<?php
-						switch ($data['contracttype']) {
-							case "A":
-								echo "<Option Value='A' selected='selected'>定期保養</Option> <Option Value='B'>單次保養</Option> <Option Value='C'>單次維修</Option>";
-								break;
-							case "B":
-								echo "<Option Value='A'>定期保養</Option> <Option Value='B' selected='selected'>單次保養</Option> <Option Value='C'>單次維修</Option>";
-								break;
-							case "C":
-								echo "<Option Value='A'>定期保養</Option> <Option Value='B'>單次保養</Option> <Option Value='C' selected='selected'>單次維修</Option>";
-								break;
-						}					
-					?>					
-			</Select>				
-        </div>	
-
-        <div>
-            <label for="contractno">合約號</label>
-            <input type="text" name="contractno" id="contractno" value="<?php echo $data['contractno']; ?>">
-        </div>	
-		
-        <div>
-            <label for="company">公司名稱</label>
-            <input type="text" name="company" id="company" value="<?php echo $data['company']; ?>">
-        </div>	
-				
-        <div>
-            <label for="taxid">統一編號</label>
-            <input type="text" name="taxid" id="taxid" value="<?php echo $data['taxid']; ?>">
-        </div>	
-
-        <div>
-            <label for="address">地址</label>
-            <input type="text" name="address" id="address" value="<?php echo $data['address']; ?>">
-        </div>	
-
-        <div>
-            <label for="tel">電話</label>
-            <input type="text" name="tel" id="tel" value="<?php echo $data['tel']; ?>">
-        </div>
-
-        <div>
-            <label for="promiser">立約人</label>
-            <input type="text" name="promiser" id="promiser" value="<?php echo $data['promiser']; ?>">
-        </div>
-
-        <div>
-            <label for="customerid">客戶維護帳號</label>
-            <input type="text" name="customerid" id="customerid" value="<?php echo $data['customerid']; ?>">
-        </div>
-
-        <div>
-            <label for="contractperson">業務聯繫人</label>
-            <input type="text" name="contractperson" id="contractperson" value="<?php echo $data['contractperson']; ?>">
-        </div>
-
-        <div>
-            <label for="contractaddress">業務聯繫人地址</label>
-            <input type="text" name="contractaddress" id="contractaddress" value="<?php echo $data['contractaddress']; ?>">
-        </div>
-
-        <div>
-            <label for="contracttel">業務聯繫人電話</label>
-            <input type="text" name="contracttel" id="contracttel" value="<?php echo $data['contracttel']; ?>">
-        </div>
-
-        <div>
-            <label for="contractemail">業務聯繫人郵件地址</label>
-            <input type="text" name="contractemail" id="contractemail" value="<?php echo $data['contractemail']; ?>">
-        </div>
-
-        <div>
-            <label for="contract_employee">契約人員工號</label>
-            <input type="text" name="contract_employee" id="contract_employee" value="<?php echo $data['contract_employee']; ?>">
-        </div>
-
-        <div>
-            <label for="start_date">合約起始年月日</label>
-            <input type="text" name="start_date" id="start_date" value="<?php echo $data['start_date']; ?>">
-        </div>
-
-        <div>
-            <label for="end_date">合約終止年月日</label>
-            <input type="text" name="end_date" id="end_date" value="<?php echo $data['end_date']; ?>">
-        </div>
-
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
-        </div>
-		
-        <div>
-			<br>
-            <button type="submit" name="update">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
-?>
+<?php
+    include "header.php";
+
+    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+	
+	$data = array();
+	// sql語法存在變數中
+	$db_query = "SELECT * FROM contract WHERE id=$id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$db_query);	
+/*
+    include "inc/record_update.php";
+    
+    try {	
+		// 設置一個空陣列來放資料
+		$data = array();
+		// sql語法存在變數中
+		$db_query = "SELECT * FROM expert WHERE id=$id";
+
+		// 用mysqli_query方法執行(sql語法)將結果存在變數中
+		$data = mysqli_query($link,$db_query);
+	}catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+	}
+*/	
+    foreach($data as $data) :
+?>
+
+<div class="container">
+    <form class="form-inline" method="post" action="contract-record-update.php" enctype="multipart/form-data">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+		
+        <div>
+            <label for="contracttype">合約類型</label>
+			<Select name="contracttype" id="contracttype" required>
+					<?php
+						switch ($data['contracttype']) {
+							case "A":
+								echo "<Option Value='A' selected='selected'>定期保養</Option> <Option Value='B'>單次保養</Option> <Option Value='C'>單次維修</Option>";
+								break;
+							case "B":
+								echo "<Option Value='A'>定期保養</Option> <Option Value='B' selected='selected'>單次保養</Option> <Option Value='C'>單次維修</Option>";
+								break;
+							case "C":
+								echo "<Option Value='A'>定期保養</Option> <Option Value='B'>單次保養</Option> <Option Value='C' selected='selected'>單次維修</Option>";
+								break;
+						}					
+					?>					
+			</Select>				
+        </div>	
+
+        <div>
+            <label for="contractno">合約號</label>
+            <input type="text" name="contractno" id="contractno" value="<?php echo $data['contractno']; ?>">
+        </div>	
+		
+        <div>
+            <label for="company">公司名稱</label>
+            <input type="text" name="company" id="company" value="<?php echo $data['company']; ?>">
+        </div>	
+				
+        <div>
+            <label for="taxid">統一編號</label>
+            <input type="text" name="taxid" id="taxid" value="<?php echo $data['taxid']; ?>">
+        </div>	
+
+        <div>
+            <label for="address">地址</label>
+            <input type="text" name="address" id="address" value="<?php echo $data['address']; ?>">
+        </div>	
+
+        <div>
+            <label for="tel">電話</label>
+            <input type="text" name="tel" id="tel" value="<?php echo $data['tel']; ?>">
+        </div>
+
+        <div>
+            <label for="promiser">立約人</label>
+            <input type="text" name="promiser" id="promiser" value="<?php echo $data['promiser']; ?>">
+        </div>
+
+        <div>
+            <label for="customerid">客戶維護帳號</label>
+            <input type="text" name="customerid" id="customerid" value="<?php echo $data['customerid']; ?>">
+        </div>
+
+        <div>
+            <label for="contractperson">業務聯繫人</label>
+            <input type="text" name="contractperson" id="contractperson" value="<?php echo $data['contractperson']; ?>">
+        </div>
+
+        <div>
+            <label for="contractaddress">業務聯繫人地址</label>
+            <input type="text" name="contractaddress" id="contractaddress" value="<?php echo $data['contractaddress']; ?>">
+        </div>
+
+        <div>
+            <label for="contracttel">業務聯繫人電話</label>
+            <input type="text" name="contracttel" id="contracttel" value="<?php echo $data['contracttel']; ?>">
+        </div>
+
+        <div>
+            <label for="contractemail">業務聯繫人郵件地址</label>
+            <input type="text" name="contractemail" id="contractemail" value="<?php echo $data['contractemail']; ?>">
+        </div>
+
+        <div>
+            <label for="contract_employee">契約人員工號</label>
+            <input type="text" name="contract_employee" id="contract_employee" value="<?php echo $data['contract_employee']; ?>">
+        </div>
+
+        <div>
+            <label for="start_date">合約起始年月日</label>
+            <input type="text" name="start_date" id="start_date" value="<?php echo $data['start_date']; ?>">
+        </div>
+
+        <div>
+            <label for="end_date">合約終止年月日</label>
+            <input type="text" name="end_date" id="end_date" value="<?php echo $data['end_date']; ?>">
+        </div>
+
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
+        </div>
+		
+        <div>
+			<br>
+            <button type="submit" name="update">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php
+
+    endforeach;
+    
+    include "footer.php";
+
+?>
diff --git a/wms/contract-index.php b/wms/contract-index.php
index 8f510483..bde2374d 100644
--- a/wms/contract-index.php
+++ b/wms/contract-index.php
@@ -1,162 +1,162 @@
-<?php
-include "header.php";
-
-// 工務總處可瀏覽全部資料
-$sql = "select department_id from account where accountid = '$user_id'";
-$res = mysqli_query($link, $sql);
-$row = mysqli_fetch_row($res);
-$user_department_id = $row[0];
-mysqli_free_result($res);
-
-// 設置一個空陣列來放資料
-$data = array();
-// sql語法存在變數中
-$sql_cmd = sql_myself($user_id);
-if ($user_department_id == "501" || $user_id == "M0105") $sql_cmd = "";
-$sql = "SELECT * FROM contract $sql_cmd ORDER BY id";
-
-// 用mysqli_query方法執行(sql語法)將結果存在變數中
-$data = mysqli_query($link,$sql);
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="contract-create.php?function_name=contract&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-<?php
-}
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:contract-index.php");
-        }
-    }
-
-?>
-
-<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;
-   
-}
-
-</style>
-
-    <div style="overflow-x:auto;">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-            <tr>
-                <th>項次</th>
-                <th>合約類型</th>
-                <th>合約號</th>
-                <th>公司名稱</th>
-                <th>統一編號</th>
-                <th>地址</th>
-                <th>電話</th>
-                <th>立約人</th>
-                <th>客戶維護帳號</th>
-                <th>業務聯繫人</th>
-                <th>業務聯繫人地址</th>
-                <th>業務聯繫人電話</th>
-                <th>業務聯繫人郵件地址</th>
-                <th>契約人員工號</th>
-                <th>合約起始日</th>
-                <th>合約終止日</th>
-                <th>建檔人</th>
-                <th>建檔時間</th>
-                <?php if ($user_auth&2) { ?>
-                <th>修改</th>
-                <!--<th>刪除</th>-->
-                <?php } ?>
-            </tr>
-		</thead>
-		<tbody>			
-
-            <?php foreach($data as $data) : ?>    
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td><?php echo $data['contracttype']; ?></td>
-                    <td><?php echo $data['contractno']; ?></td>
-                    <td><?php echo $data['company']; ?></td>
-                    <td><?php echo $data['taxid']; ?></td>
-                    <td><?php echo $data['address']; ?></td>
-                    <td><?php echo $data['tel']; ?></td>
-                    <td><?php echo $data['promiser']; ?></td>
-                    <td><?php echo $data['customerid']; ?></td>
-                    <td><?php echo $data['contractperson']; ?></td>
-                    <td><?php echo $data['contractaddress']; ?></td>
-                    <td><?php echo $data['contracttel']; ?></td>
-                    <td><?php echo $data['contractemail']; ?></td>
-                    <td><?php echo $data['contract_employee']; ?></td>
-                    <td><?php echo $data['start_date']; ?></td>
-                    <td><?php echo $data['end_date']; ?></td>
-                    <td><?php echo $data['creater']; ?></td>
-                    <td><?php echo $data['create_at']; ?></td>
-                    <?php if ($user_auth&2) { ?>
-                    <td>
-						<p>
-							<a href="contract-edit.php?id=<?php echo $data['id']; ?>&function_name=contract&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-								<span class="glyphicon glyphicon-pencil"></span>
-							</a>
-						</p> 
-					</td>
-                    <!--<td>
-						<p>
-							<a href="contract-delete.php?id=<?php echo $data['id']; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-								<span class="glyphicon glyphicon-remove"></span>
-							</a>
-						</p> 
-					</td>-->
-                    <?php } ?>
-                </tr>
-            <?php endforeach; ?>
-			</tbody>			
-        </table>
-    </div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-
-?>
+<?php
+include "header.php";
+
+// 工務總處可瀏覽全部資料
+$sql = "select department_id from account where accountid = '$user_id'";
+$res = mysqli_query($link, $sql);
+$row = mysqli_fetch_row($res);
+$user_department_id = $row[0];
+mysqli_free_result($res);
+
+// 設置一個空陣列來放資料
+$data = array();
+// sql語法存在變數中
+$sql_cmd = sql_myself($user_id);
+if ($user_department_id == "501" || $user_id == "M0105") $sql_cmd = "";
+$sql = "SELECT * FROM contract $sql_cmd ORDER BY id";
+
+// 用mysqli_query方法執行(sql語法)將結果存在變數中
+$data = mysqli_query($link,$sql);
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth&2) { ?>
+<p>
+<a href="contract-create.php?function_name=contract&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+<?php
+}
+if($data):
+    
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:contract-index.php");
+        }
+    }
+
+?>
+
+<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;
+   
+}
+
+</style>
+
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+            <tr>
+                <th>項次</th>
+                <th>合約類型</th>
+                <th>合約號</th>
+                <th>公司名稱</th>
+                <th>統一編號</th>
+                <th>地址</th>
+                <th>電話</th>
+                <th>立約人</th>
+                <th>客戶維護帳號</th>
+                <th>業務聯繫人</th>
+                <th>業務聯繫人地址</th>
+                <th>業務聯繫人電話</th>
+                <th>業務聯繫人郵件地址</th>
+                <th>契約人員工號</th>
+                <th>合約起始日</th>
+                <th>合約終止日</th>
+                <th>建檔人</th>
+                <th>建檔時間</th>
+                <?php if ($user_auth&2) { ?>
+                <th>修改</th>
+                <!--<th>刪除</th>-->
+                <?php } ?>
+            </tr>
+		</thead>
+		<tbody>			
+
+            <?php foreach($data as $data) : ?>    
+                <tr>
+                    <td><?php echo $data['id']; ?></td>
+                    <td><?php echo $data['contracttype']; ?></td>
+                    <td><?php echo $data['contractno']; ?></td>
+                    <td><?php echo $data['company']; ?></td>
+                    <td><?php echo $data['taxid']; ?></td>
+                    <td><?php echo $data['address']; ?></td>
+                    <td><?php echo $data['tel']; ?></td>
+                    <td><?php echo $data['promiser']; ?></td>
+                    <td><?php echo $data['customerid']; ?></td>
+                    <td><?php echo $data['contractperson']; ?></td>
+                    <td><?php echo $data['contractaddress']; ?></td>
+                    <td><?php echo $data['contracttel']; ?></td>
+                    <td><?php echo $data['contractemail']; ?></td>
+                    <td><?php echo $data['contract_employee']; ?></td>
+                    <td><?php echo $data['start_date']; ?></td>
+                    <td><?php echo $data['end_date']; ?></td>
+                    <td><?php echo $data['creater']; ?></td>
+                    <td><?php echo $data['create_at']; ?></td>
+                    <?php if ($user_auth&2) { ?>
+                    <td>
+						<p>
+							<a href="contract-edit.php?id=<?php echo $data['id']; ?>&function_name=contract&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+								<span class="glyphicon glyphicon-pencil"></span>
+							</a>
+						</p> 
+					</td>
+                    <!--<td>
+						<p>
+							<a href="contract-delete.php?id=<?php echo $data['id']; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+						</p> 
+					</td>-->
+                    <?php } ?>
+                </tr>
+            <?php endforeach; ?>
+			</tbody>			
+        </table>
+    </div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+
+?>
diff --git a/wms/contract-record-submit.php b/wms/contract-record-submit.php
index 7b6ea47e..724e430a 100644
--- a/wms/contract-record-submit.php
+++ b/wms/contract-record-submit.php
@@ -1,61 +1,61 @@
-<?php
-$contracttype= "";
-$contractno= "";
-$company= "";
-$taxid= "";
-$address= "";
-$tel= "";
-$promiser= "";
-$customerid= "";
-$contractperson= "";
-$contractaddress= "";
-$contracttel= "";
-$contractemail= "";
-$contract_employee= "";
-$start_date= "";
-$end_date= "";
-$creater= "";
-$create_at= "";
-
-$contracttype_error= "";
-$contractno_error= "";
-$company_error= "";
-$taxid_error= "";
-$address_error= "";
-$tel_error= "";
-$promiser_error= "";
-$customerid_error= "";
-$contractperson_error= "";
-$contractaddress_error= "";
-$contracttel_error= "";
-$contractemail_error= "";
-$contract_employee_error= "";
-$start_date_error= "";
-$end_date_error= "";
-$creater_error = "";
-$create_at_error = "";
-
-
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    include "contract-user-input.php";
-
-    $db_query = "INSERT INTO contract(contracttype, contractno, company, taxid, address, tel, promiser, customerid, contractperson, contractaddress, contracttel, contractemail,contract_employee,start_date,end_date, creater, create_at) VALUES ('$contracttype', '$contractno', '$company', '$taxid', '$address', '$tel', '$promiser', '$customerid', '$contractperson', '$contractaddress', '$contracttel', '$contractemail','$contract_employee','$start_date','$end_date', '$creater', '$create_at')";    	                        
-    $result = mysqli_query($link,$db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='contract-index.php?function_name=contract&".$token_link."';";
-        echo "</script>";  
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='contract-index.php?function_name=contract&".$token_link."';";
-        echo "</script>";  
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
-?>
+<?php
+$contracttype= "";
+$contractno= "";
+$company= "";
+$taxid= "";
+$address= "";
+$tel= "";
+$promiser= "";
+$customerid= "";
+$contractperson= "";
+$contractaddress= "";
+$contracttel= "";
+$contractemail= "";
+$contract_employee= "";
+$start_date= "";
+$end_date= "";
+$creater= "";
+$create_at= "";
+
+$contracttype_error= "";
+$contractno_error= "";
+$company_error= "";
+$taxid_error= "";
+$address_error= "";
+$tel_error= "";
+$promiser_error= "";
+$customerid_error= "";
+$contractperson_error= "";
+$contractaddress_error= "";
+$contracttel_error= "";
+$contractemail_error= "";
+$contract_employee_error= "";
+$start_date_error= "";
+$end_date_error= "";
+$creater_error = "";
+$create_at_error = "";
+
+
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    include "contract-user-input.php";
+
+    $db_query = "INSERT INTO contract(contracttype, contractno, company, taxid, address, tel, promiser, customerid, contractperson, contractaddress, contracttel, contractemail,contract_employee,start_date,end_date, creater, create_at) VALUES ('$contracttype', '$contractno', '$company', '$taxid', '$address', '$tel', '$promiser', '$customerid', '$contractperson', '$contractaddress', '$contracttel', '$contractemail','$contract_employee','$start_date','$end_date', '$creater', '$create_at')";    	                        
+    $result = mysqli_query($link,$db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='contract-index.php?function_name=contract&".$token_link."';";
+        echo "</script>";  
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='contract-index.php?function_name=contract&".$token_link."';";
+        echo "</script>";  
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
+?>
diff --git a/wms/contract-record-update.php b/wms/contract-record-update.php
index fabd375f..443f06ee 100644
--- a/wms/contract-record-update.php
+++ b/wms/contract-record-update.php
@@ -1,50 +1,50 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-
-    function user_input( $data ) {
-        $data1 = trim($data);
-        $data2 = stripslashes($data1);
-        $data3 = htmlspecialchars($data2);
-        return $data3;
-    }
-
-    $id           = $_POST['id'];
-    $contracttype    = user_input($_POST["contracttype"]);
-    $contractno   = user_input($_POST["contractno"]);
-    $company        = user_input($_POST["company"]);
-    $taxid       = user_input($_POST["taxid"]);
-    $address       = user_input($_POST["address"]);
-    $tel        = user_input($_POST["tel"]);
-    $promiser     = user_input($_POST["promiser"]);
-    $customerid       = user_input($_POST["customerid"]);
-    $contractperson   = user_input($_POST["contractperson"]);
-    $contractaddress    = user_input($_POST["contractaddress"]);
-    $contracttel   = user_input($_POST["contracttel"]);
-    $contractemail   = user_input($_POST["contractemail"]);
-    $contract_employee   = user_input($_POST["contract_employee"]);
-    $start_date   = user_input($_POST["start_date"]);
-    $end_date   = user_input($_POST["end_date"]);
-    $creater      = user_input($_POST["creater"]);
-    $create_at    = date('Y/m/d H:i:s');
-
-    $db_query = "UPDATE contract set contracttype = '$contracttype', contractno = '$contractno', company = '$company', taxid = '$taxid', address = '$address', tel = '$tel', promiser = '$promiser', customerid = '$customerid', contractperson = '$contractperson', contractaddress = '$contractaddress', contracttel = '$contracttel', contractemail = '$contractemail', contract_employee = '$contract_employee',start_date = '$start_date',end_date = '$end_date',create_at = '$create_at' WHERE id='$id'";
-    mysqli_query($link, $db_query);	
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='contract-index.php?function_name=contract&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='contract-index.php?function_name=contract&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if(isset($_POST['update'])) {
+
+    function user_input( $data ) {
+        $data1 = trim($data);
+        $data2 = stripslashes($data1);
+        $data3 = htmlspecialchars($data2);
+        return $data3;
+    }
+
+    $id           = $_POST['id'];
+    $contracttype    = user_input($_POST["contracttype"]);
+    $contractno   = user_input($_POST["contractno"]);
+    $company        = user_input($_POST["company"]);
+    $taxid       = user_input($_POST["taxid"]);
+    $address       = user_input($_POST["address"]);
+    $tel        = user_input($_POST["tel"]);
+    $promiser     = user_input($_POST["promiser"]);
+    $customerid       = user_input($_POST["customerid"]);
+    $contractperson   = user_input($_POST["contractperson"]);
+    $contractaddress    = user_input($_POST["contractaddress"]);
+    $contracttel   = user_input($_POST["contracttel"]);
+    $contractemail   = user_input($_POST["contractemail"]);
+    $contract_employee   = user_input($_POST["contract_employee"]);
+    $start_date   = user_input($_POST["start_date"]);
+    $end_date   = user_input($_POST["end_date"]);
+    $creater      = user_input($_POST["creater"]);
+    $create_at    = date('Y/m/d H:i:s');
+
+    $db_query = "UPDATE contract set contracttype = '$contracttype', contractno = '$contractno', company = '$company', taxid = '$taxid', address = '$address', tel = '$tel', promiser = '$promiser', customerid = '$customerid', contractperson = '$contractperson', contractaddress = '$contractaddress', contracttel = '$contracttel', contractemail = '$contractemail', contract_employee = '$contract_employee',start_date = '$start_date',end_date = '$end_date',create_at = '$create_at' WHERE id='$id'";
+    mysqli_query($link, $db_query);	
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='contract-index.php?function_name=contract&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='contract-index.php?function_name=contract&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/contract-user-input.php b/wms/contract-user-input.php
index a9afa2f8..99d39bae 100644
--- a/wms/contract-user-input.php
+++ b/wms/contract-user-input.php
@@ -1,63 +1,63 @@
-<?php
-
-//Function to filter the form input
-function user_input( $data ) {
-    $data1 = trim($data);
-    $data2 = stripslashes($data1);
-    $data3 = htmlspecialchars($data2);
-    return $data3;
-}
-
-
-$contracttype    = user_input($_POST["contracttype"]);
-$contractno   = user_input($_POST["contractno"]);
-$company        = user_input($_POST["company"]);
-$taxid       = user_input($_POST["taxid"]);
-$address       = user_input($_POST["address"]);
-$tel        = user_input($_POST["tel"]);
-$promiser     = user_input($_POST["promiser"]);
-$customerid       = user_input($_POST["customerid"]);
-$contractperson   = user_input($_POST["contractperson"]);
-$contractaddress    = user_input($_POST["contractaddress"]);
-$contracttel   = user_input($_POST["contracttel"]);
-$contractemail   = user_input($_POST["contractemail"]);
-$contract_employee   = user_input($_POST["contract_employee"]);
-$start_date   = user_input($_POST["start_date"]);
-$end_date   = user_input($_POST["end_date"]);
-$creater      = user_input($_POST["creater"]);
-$create_at    = date('Y/m/d H:i:s');
-
-
-
-
-/*
-
-if(empty($_POST["name"])) {
-    $name_error = "Name is required";
-} else {
-    $name = user_input($_POST["name"]);
-    
-    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
-        $name_error = "Only letter and white space are allowed";
-    }
-}
-
-
-/*
-if(empty($_POST["website"])) {
-    $website_error = "Website address is required";
-} else {
-    $website = user_input($_POST["website"]);
-
-    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
-        $website_error = "Invalid website URL";
-    }
-}
-
-if(empty($_POST["comment"])) {
-    $comment = "";
-} else {
-    $comment = user_input($_POST["comment"]);
-}
-*/
-?>
+<?php
+
+//Function to filter the form input
+function user_input( $data ) {
+    $data1 = trim($data);
+    $data2 = stripslashes($data1);
+    $data3 = htmlspecialchars($data2);
+    return $data3;
+}
+
+
+$contracttype    = user_input($_POST["contracttype"]);
+$contractno   = user_input($_POST["contractno"]);
+$company        = user_input($_POST["company"]);
+$taxid       = user_input($_POST["taxid"]);
+$address       = user_input($_POST["address"]);
+$tel        = user_input($_POST["tel"]);
+$promiser     = user_input($_POST["promiser"]);
+$customerid       = user_input($_POST["customerid"]);
+$contractperson   = user_input($_POST["contractperson"]);
+$contractaddress    = user_input($_POST["contractaddress"]);
+$contracttel   = user_input($_POST["contracttel"]);
+$contractemail   = user_input($_POST["contractemail"]);
+$contract_employee   = user_input($_POST["contract_employee"]);
+$start_date   = user_input($_POST["start_date"]);
+$end_date   = user_input($_POST["end_date"]);
+$creater      = user_input($_POST["creater"]);
+$create_at    = date('Y/m/d H:i:s');
+
+
+
+
+/*
+
+if(empty($_POST["name"])) {
+    $name_error = "Name is required";
+} else {
+    $name = user_input($_POST["name"]);
+    
+    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
+        $name_error = "Only letter and white space are allowed";
+    }
+}
+
+
+/*
+if(empty($_POST["website"])) {
+    $website_error = "Website address is required";
+} else {
+    $website = user_input($_POST["website"]);
+
+    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
+        $website_error = "Invalid website URL";
+    }
+}
+
+if(empty($_POST["comment"])) {
+    $comment = "";
+} else {
+    $comment = user_input($_POST["comment"]);
+}
+*/
+?>
diff --git a/wms/custom-create-contract.php b/wms/custom-create-contract.php
index 53351972..abc9a495 100644
--- a/wms/custom-create-contract.php
+++ b/wms/custom-create-contract.php
@@ -1,226 +1,226 @@
-
-<?php
-// 載入db.php來連結資料庫
-require_once "database.php";
-include "header.php";
-
-// 查詢提交成功的賬戶信息
-$accountid=$_REQUEST['accountid'];
-
-if(!empty($accountid)){
-	$sql = "SELECT * FROM account where accountid='$accountid'";
-	$accountdata = mysqli_query($link,$sql);
-	$row = mysqli_fetch_array($accountdata, MYSQLI_ASSOC);
-
-}
-
-if($_POST['type']=='contract'){
-	$contracttype    = $_POST["contracttype"];
-	$contractno   = $_POST["contractno"];
-	$company        = $_POST["company"];
-	$taxid       = $_POST["taxid"];
-	$address       = $_POST["address"];
-	$tel        = $_POST["tel"];
-	$promiser     = $_POST["promiser"];
-	$customerid       = $_POST["customerid"];
-	$contractperson   = $_POST["contractperson"];
-	$contractaddress    = $_POST["contractaddress"];
-	$contracttel   = $_POST["contracttel"];
-	$contractemail   = $_POST["contractemail"];
-	$contract_employee   = $_POST["contract_employee"];
-	$start_date   = $_POST["start_date"];
-	$end_date   = $_POST["end_date"];
-	$creater      = $_POST["creater"];
-	$create_at    = date('Y/m/d H:i:s');
-    //根據合約編號判斷合約是否存在
-
-    $contractsql = "SELECT * FROM contract where contractno='$contractno'";
-    $contract_nums_rows=mysqli_num_rows(mysqli_query($link,$contractsql));
-    if($contract_nums_rows==0) {
-        $db_query = "INSERT INTO contract(contracttype, contractno, company, taxid, address, tel, promiser, customerid, contractperson, contractaddress, contracttel, contractemail,contract_employee,start_date,end_date, creater, create_at) VALUES ('$contracttype', '$contractno', '$company', '$taxid', '$address', '$tel', '$promiser', '$customerid', '$contractperson', '$contractaddress', '$contracttel', '$contractemail','$contract_employee','$start_date','$end_date', '$creater', '$create_at')";
-        mysqli_query($link,$db_query);
-        if (mysqli_affected_rows($link)>0) {
-            echo "合約添加成功";
-            header('location:custom-create-facility.php?accountid='.$customerid.'&contractno='.$contractno);
-            exit();
-        }
-        else{
-            echo "<h1 class='text-center'>合約添加失敗</h1>";
-
-        }
-    } else{
-
-    }
-
-
-}
-
-
-
-?>
-
-
-<div class="container" id="accountadd">
-    <table  class="table  table-bordered" style="width:100%">
-        <thead>
-        <tr>
-            <th>帳號類型</th>
-            <th>帳號</th>
-            <th>密碼</th>
-            <th>姓名</th>
-            <th>電話</th>
-            <th>地址</th>
-            <th>電子郵件</th>
-            <th>Line ID</th>
-            <th>微信id</th>
-            <th>維修ID</th>
-            <th>直屬主管</th>
-            <th>建檔人</th>
-            <th>建檔時間</th>
-
-        </tr>
-        </thead>
-        <tbody>
-            <tr>
-
-                <td><?php echo $row['accounttype']; ?></td>
-                <td><?php echo $row['accountid']; ?></td>
-                <td><?php echo $row['pwd']; ?></td>
-                <td><?php echo $row['name']; ?></td>
-                <td><?php echo $row['tel']; ?></td>
-                <td><?php echo $row['address']; ?></td>
-                <td><?php echo $row['email']; ?></td>
-                <td><?php echo $row['lineid']; ?></td>
-                <td><?php echo $row['wechatid']; ?></td>
-                <td><?php echo $row['repairerid']; ?></td>
-                <td><?php echo $row['manager']; ?></td>
-                <td><?php echo $row['creater']; ?></td>
-                <td><?php echo $row['create_at']; ?></td>
-
-            </tr>
-
-        </tbody>
-    </table>
-
-    <div class="text-center"> <h3>合約資料添加</h3> </div>
-    <form class="form-horizontal"  name="account" method="POST" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="contracttype">合約類型(必填)</label>
-                <Select  class="form-control"  name="contracttype" id="contracttype" required>
-                    <option selected="selected" disabled="disabled"  style="display: none" value=""></option>
-                    <Option Value="A">定期保養</Option>
-                    <Option Value="B">單次保養</Option>
-                    <Option Value="C">單次維修</Option>
-                </Select>
-
-            </div>
-            <div class="col-md-9 ">
-                <button type="submit"    class="btn btn-primary btn-lg pull-right" >點擊後提交合約資料</button>
-            </div>
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="contractno">合約號(必填)</label>
-                <input   class="form-control"   type="text" name="contractno" id="contractno" required>
-            </div>
-
-            <div class="col-md-3">
-                <label for="company">公司名稱</label>
-                <input class="form-control"  type="text" name="company" id="company" >
-            </div>
-
-            <div class="col-md-3">
-                <label for="taxid">統一編號</label>
-                <input  class="form-control"  type="text" name="taxid" id="taxid" >
-            </div>
-
-            <div class="col-md-3">
-                <label for="address">地址</label>
-                <input class="form-control"  type="text" name="address" id="address" >
-            </div>
-        </div>
-
-        <div class="form-group">
-
-            <div class="col-md-3" >
-                <label for="tel">電話</label>
-                <input class="form-control"  type="text" name="tel" id="tel" >
-            </div>
-
-            <div class="col-md-3" >
-                <label for="promiser">立約人</label>
-                <input class="form-control"  type="text" name="promiser" id="promiser">
-            </div>
-
-            <div class="col-md-3">
-                <label for="customerid">客戶維護帳號(必填)</label>
-                <input class="form-control"  type="text" name="customerid" id="customerid"  value="<?php echo $row['accountid']; ?>"  required>
-            </div class="col-md-3">
-
-            <div class="col-md-3">
-                <label for="contractperson">業務聯繫人</label>
-                <input class="form-control"  type="text" name="contractperson" id="contractperson" >
-            </div>
-
-        </div>
-
-        <div class="form-group">
-
-            <div class="col-md-3">
-                <label for="contractaddress">業務聯繫人地址</label>
-                <input class="form-control"  type="text" name="contractaddress" id="contractaddress" >
-            </div>
-
-            <div class="col-md-3">
-                <label for="contracttel">業務聯繫人電話(必填)</label>
-                <input class="form-control"  type="text" name="contracttel" id="contracttel" required>
-            </div>
-
-            <div class="col-md-3">
-                <label for="contractemail">業務聯繫人郵件地址</label>
-                <input class="form-control"  type="text" name="contractemail" id="contractemail" >
-            </div>
-
-            <div class="col-md-3">
-                <label for="contract_employee">契約人員工號</label>
-                <input class="form-control"  type="text" name="contract_employee" id="contract_employee" >
-            </div>
-
-
-        </div>
-
-
-
-        <div class="form-group">
-
-            <div class="col-md-3">
-                <label for="start_date">合約起始年月日(必填)</label><br>
-                <input class="form-control"  type="text" data-date-format="yyyy-mm-dd" name="start_date" id="start_date" value="<?php echo date('Y-m-d'); ?>" required>
-            </div>
-
-            <div class="col-md-3">
-                <label for="end_date">合約終止年月日(必填)</label><br>
-                <input class="form-control"  type="text" data-date-format="yyyy-mm-dd" name="end_date" id="end_date" value="<?php echo date('Y-m-d',strtotime('+364 day')); ?>" required>
-            </div>
-
-            <div class="col-md-3">
-                <label for="creater">建檔人</label>
-                <input class="form-control"  type="text" name="creater" id="creater" value="<?php echo $user_id;?>">
-
-            </div>
-            <div class="col-md-3">
-                <input  class="form-control" type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
-                <input  class="form-control" type="hidden" name="type" id="create_at" value="contract">
-            </div>
-
-
-        </div>
-
-
-    </form>
-</div>
-
-
-
+
+<?php
+// 載入db.php來連結資料庫
+require_once "database.php";
+include "header.php";
+
+// 查詢提交成功的賬戶信息
+$accountid=$_REQUEST['accountid'];
+
+if(!empty($accountid)){
+	$sql = "SELECT * FROM account where accountid='$accountid'";
+	$accountdata = mysqli_query($link,$sql);
+	$row = mysqli_fetch_array($accountdata, MYSQLI_ASSOC);
+
+}
+
+if($_POST['type']=='contract'){
+	$contracttype    = $_POST["contracttype"];
+	$contractno   = $_POST["contractno"];
+	$company        = $_POST["company"];
+	$taxid       = $_POST["taxid"];
+	$address       = $_POST["address"];
+	$tel        = $_POST["tel"];
+	$promiser     = $_POST["promiser"];
+	$customerid       = $_POST["customerid"];
+	$contractperson   = $_POST["contractperson"];
+	$contractaddress    = $_POST["contractaddress"];
+	$contracttel   = $_POST["contracttel"];
+	$contractemail   = $_POST["contractemail"];
+	$contract_employee   = $_POST["contract_employee"];
+	$start_date   = $_POST["start_date"];
+	$end_date   = $_POST["end_date"];
+	$creater      = $_POST["creater"];
+	$create_at    = date('Y/m/d H:i:s');
+    //根據合約編號判斷合約是否存在
+
+    $contractsql = "SELECT * FROM contract where contractno='$contractno'";
+    $contract_nums_rows=mysqli_num_rows(mysqli_query($link,$contractsql));
+    if($contract_nums_rows==0) {
+        $db_query = "INSERT INTO contract(contracttype, contractno, company, taxid, address, tel, promiser, customerid, contractperson, contractaddress, contracttel, contractemail,contract_employee,start_date,end_date, creater, create_at) VALUES ('$contracttype', '$contractno', '$company', '$taxid', '$address', '$tel', '$promiser', '$customerid', '$contractperson', '$contractaddress', '$contracttel', '$contractemail','$contract_employee','$start_date','$end_date', '$creater', '$create_at')";
+        mysqli_query($link,$db_query);
+        if (mysqli_affected_rows($link)>0) {
+            echo "合約添加成功";
+            header('location:custom-create-facility.php?accountid='.$customerid.'&contractno='.$contractno);
+            exit();
+        }
+        else{
+            echo "<h1 class='text-center'>合約添加失敗</h1>";
+
+        }
+    } else{
+
+    }
+
+
+}
+
+
+
+?>
+
+
+<div class="container" id="accountadd">
+    <table  class="table  table-bordered" style="width:100%">
+        <thead>
+        <tr>
+            <th>帳號類型</th>
+            <th>帳號</th>
+            <th>密碼</th>
+            <th>姓名</th>
+            <th>電話</th>
+            <th>地址</th>
+            <th>電子郵件</th>
+            <th>Line ID</th>
+            <th>微信id</th>
+            <th>維修ID</th>
+            <th>直屬主管</th>
+            <th>建檔人</th>
+            <th>建檔時間</th>
+
+        </tr>
+        </thead>
+        <tbody>
+            <tr>
+
+                <td><?php echo $row['accounttype']; ?></td>
+                <td><?php echo $row['accountid']; ?></td>
+                <td><?php echo $row['pwd']; ?></td>
+                <td><?php echo $row['name']; ?></td>
+                <td><?php echo $row['tel']; ?></td>
+                <td><?php echo $row['address']; ?></td>
+                <td><?php echo $row['email']; ?></td>
+                <td><?php echo $row['lineid']; ?></td>
+                <td><?php echo $row['wechatid']; ?></td>
+                <td><?php echo $row['repairerid']; ?></td>
+                <td><?php echo $row['manager']; ?></td>
+                <td><?php echo $row['creater']; ?></td>
+                <td><?php echo $row['create_at']; ?></td>
+
+            </tr>
+
+        </tbody>
+    </table>
+
+    <div class="text-center"> <h3>合約資料添加</h3> </div>
+    <form class="form-horizontal"  name="account" method="POST" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="contracttype">合約類型(必填)</label>
+                <Select  class="form-control"  name="contracttype" id="contracttype" required>
+                    <option selected="selected" disabled="disabled"  style="display: none" value=""></option>
+                    <Option Value="A">定期保養</Option>
+                    <Option Value="B">單次保養</Option>
+                    <Option Value="C">單次維修</Option>
+                </Select>
+
+            </div>
+            <div class="col-md-9 ">
+                <button type="submit"    class="btn btn-primary btn-lg pull-right" >點擊後提交合約資料</button>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="contractno">合約號(必填)</label>
+                <input   class="form-control"   type="text" name="contractno" id="contractno" required>
+            </div>
+
+            <div class="col-md-3">
+                <label for="company">公司名稱</label>
+                <input class="form-control"  type="text" name="company" id="company" >
+            </div>
+
+            <div class="col-md-3">
+                <label for="taxid">統一編號</label>
+                <input  class="form-control"  type="text" name="taxid" id="taxid" >
+            </div>
+
+            <div class="col-md-3">
+                <label for="address">地址</label>
+                <input class="form-control"  type="text" name="address" id="address" >
+            </div>
+        </div>
+
+        <div class="form-group">
+
+            <div class="col-md-3" >
+                <label for="tel">電話</label>
+                <input class="form-control"  type="text" name="tel" id="tel" >
+            </div>
+
+            <div class="col-md-3" >
+                <label for="promiser">立約人</label>
+                <input class="form-control"  type="text" name="promiser" id="promiser">
+            </div>
+
+            <div class="col-md-3">
+                <label for="customerid">客戶維護帳號(必填)</label>
+                <input class="form-control"  type="text" name="customerid" id="customerid"  value="<?php echo $row['accountid']; ?>"  required>
+            </div class="col-md-3">
+
+            <div class="col-md-3">
+                <label for="contractperson">業務聯繫人</label>
+                <input class="form-control"  type="text" name="contractperson" id="contractperson" >
+            </div>
+
+        </div>
+
+        <div class="form-group">
+
+            <div class="col-md-3">
+                <label for="contractaddress">業務聯繫人地址</label>
+                <input class="form-control"  type="text" name="contractaddress" id="contractaddress" >
+            </div>
+
+            <div class="col-md-3">
+                <label for="contracttel">業務聯繫人電話(必填)</label>
+                <input class="form-control"  type="text" name="contracttel" id="contracttel" required>
+            </div>
+
+            <div class="col-md-3">
+                <label for="contractemail">業務聯繫人郵件地址</label>
+                <input class="form-control"  type="text" name="contractemail" id="contractemail" >
+            </div>
+
+            <div class="col-md-3">
+                <label for="contract_employee">契約人員工號</label>
+                <input class="form-control"  type="text" name="contract_employee" id="contract_employee" >
+            </div>
+
+
+        </div>
+
+
+
+        <div class="form-group">
+
+            <div class="col-md-3">
+                <label for="start_date">合約起始年月日(必填)</label><br>
+                <input class="form-control"  type="text" data-date-format="yyyy-mm-dd" name="start_date" id="start_date" value="<?php echo date('Y-m-d'); ?>" required>
+            </div>
+
+            <div class="col-md-3">
+                <label for="end_date">合約終止年月日(必填)</label><br>
+                <input class="form-control"  type="text" data-date-format="yyyy-mm-dd" name="end_date" id="end_date" value="<?php echo date('Y-m-d',strtotime('+364 day')); ?>" required>
+            </div>
+
+            <div class="col-md-3">
+                <label for="creater">建檔人</label>
+                <input class="form-control"  type="text" name="creater" id="creater" value="<?php echo $user_id;?>">
+
+            </div>
+            <div class="col-md-3">
+                <input  class="form-control" type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
+                <input  class="form-control" type="hidden" name="type" id="create_at" value="contract">
+            </div>
+
+
+        </div>
+
+
+    </form>
+</div>
+
+
+
diff --git a/wms/custom-create-facility.php b/wms/custom-create-facility.php
index ea412955..7ab034b5 100644
--- a/wms/custom-create-facility.php
+++ b/wms/custom-create-facility.php
@@ -1,272 +1,272 @@
-
-<?php
-// 載入db.php來連結資料庫
-require_once "database.php";
-include "header.php";
-
-// 查詢提交成功的賬戶信息
-$accountid=$_REQUEST['accountid'];
-$contractno=$_REQUEST['contractno'];
-if(!empty($accountid)&&!empty($contractno)){
-	$accountsql = "SELECT * FROM account where accountid='$accountid'";
-	$accountdata = mysqli_query($link,$accountsql);
-	$row = mysqli_fetch_array($accountdata, MYSQLI_ASSOC);
-
-	$contractsql = "SELECT * FROM contract where contractno='$contractno'";
-	$contractdata=mysqli_query($link,$contractsql);
-	$contractrows= mysqli_fetch_array($contractdata, MYSQLI_ASSOC);
-}
-
-
-if($_POST['type']=='facility'){
-
- 	$contractno   = $_POST["contractno"];//合同號
-	$customerid       = $_POST["customerid"];//客戶編號
-	$creater      = $_POST["creater"];//建檔人
-	$create_at     = date('Y/m/d H:i:s');//創建時間
-
-    $facilitynos=json_decode($_POST['facilitynos'], true);
-	$weights=json_decode($_POST['weights'], true);
-	$numberofstops=json_decode($_POST['numberofstops'], true);
-	$numberoffloors=json_decode($_POST['numberoffloors'], true);
-	$opentypes=json_decode($_POST['opentypes'], true);
-	$speeds=json_decode($_POST['speeds'], true);
-	$repairtypes=json_decode($_POST['repairtypes'], true);
-	$longitudes=json_decode($_POST['longitudes'], true);
-	$latitudes=json_decode($_POST['latitudes'], true);
-	$addresss=json_decode($_POST['addresss'], true);
-	$repairerids=json_decode($_POST['repairerids'], true);
-	$repairernames=json_decode($_POST['repairernames'], true);
-	$success=0;
-	print_r($facilitynos);
-
-	for ($i = 0; $i<sizeof($facilitynos); $i++) {
-	echo $db_query3 = "INSERT INTO facility(contractno, facilityno, customerid, weight,numberofstop, numberoffloor,opentype,speed,repairtype,longitude, latitude, address,repairerid,repairername,creater, create_at) VALUES
-     ('$contractno', '$facilitynos[$i]', '$customerid', '$weights[$i]','$numberofstops[$i]', '$numberoffloors[$i]','$opentypes[$i]','$speeds[$i]','$repairtypes[$i]','$longitudes[$i]', '$latitudes[$i]', '$addresss[$i]','$repairerids[$i]','$repairernames[$i]','$creater', '$create_at')";
-	  mysqli_query($link,$db_query3);
-	if (mysqli_affected_rows($link)>0) {
-		$success++;
-	}
-
-	}
-
-	echo $success;
-	exit();
-	if($success>0){
-        $jsonres['code']='200';
-	    return json_encode($jsonres);
-//       	header('location:custom-create-schedule.php?accountid='.$customerid.'&contractno='.$contractno);
-//		exit();
-    } ;
-
-}
-
-?>
-
-
-<div class="container" id="accountadd">
-    <table  class="table  table-bordered" style="width:100%">
-        <thead>
-        <tr>
-            <th>帳號類型</th>
-            <th>帳號</th>
-            <th>密碼</th>
-            <th>姓名</th>
-            <th>電話</th>
-            <th>地址</th>
-            <th>電子郵件</th>
-            <th>Line ID</th>
-            <th>微信id</th>
-            <th>維修ID</th>
-            <th>直屬主管</th>
-            <th>建檔人</th>
-            <th>建檔時間</th>
-
-        </tr>
-        </thead>
-        <tbody>
-            <tr>
-
-                <td><?php echo $row['accounttype']; ?></td>
-                <td><?php echo $row['accountid']; ?></td>
-                <td><?php echo $row['pwd']; ?></td>
-                <td><?php echo $row['name']; ?></td>
-                <td><?php echo $row['tel']; ?></td>
-                <td><?php echo $row['address']; ?></td>
-                <td><?php echo $row['email']; ?></td>
-                <td><?php echo $row['lineid']; ?></td>
-                <td><?php echo $row['wechatid']; ?></td>
-                <td><?php echo $row['repairerid']; ?></td>
-                <td><?php echo $row['manager']; ?></td>
-                <td><?php echo $row['creater']; ?></td>
-                <td><?php echo $row['create_at']; ?></td>
-
-            </tr>
-
-        </tbody>
-    </table>
-    <table   class="table  table-bordered" style="width:100%">
-        <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>
-            <th>合約終止日</th>
-            <th>建檔人</th>
-            <th>建檔時間</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr>
-
-            <td><?php echo $contractrows['contracttype']; ?></td>
-            <td><?php echo $contractrows['contractno']; ?></td>
-            <td><?php echo $contractrows['company']; ?></td>
-            <td><?php echo $contractrows['taxid']; ?></td>
-            <td><?php echo $contractrows['address']; ?></td>
-            <td><?php echo $contractrows['tel']; ?></td>
-            <td><?php echo $contractrows['promiser']; ?></td>
-            <td><?php echo $contractrows['customerid']; ?></td>
-<!--            <td>--><?php //echo $contractrows['contractperson']; ?><!--</td>-->
-<!--            <td>--><?php //echo $contractrows['contractaddress']; ?><!--</td>-->
-            <td><?php echo $contractrows['contracttel']; ?></td>
-            <td><?php echo $contractrows['contractemail']; ?></td>
-            <td><?php echo $contractrows['contract_employee']; ?></td>
-            <td><?php echo $contractrows['start_date']; ?></td>
-            <td><?php echo $contractrows['end_date']; ?></td>
-            <td><?php echo $contractrows['creater']; ?></td>
-            <td><?php echo $contractrows['create_at']; ?></td>
-
-        </tr>
-
-        </tbody>
-    </table>
-    <div class="text-center"> <h3>作番資料添加</h3> </div>
-
-    <div class="form-horizontal"     >
-
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="contractno">合約號(必填)</label>
-                <input class="form-control contractno"  type="text"   id="contractno"  value="<?php echo $contractrows['contractno']; ?>" required>
-            </div>
-            <div class="col-md-3">
-                <label for="customerid">客戶編號(必填)</label>
-                <input class="form-control customerid" type="text"   id="customerid"  value="<?php echo $contractrows['customerid']; ?>"  required>
-            </div>
-            <div class="col-md-3">
-                <label for="creater">建檔人</label>
-                <input class="form-control creater"  type="text"   id="creater" value="<?php echo $user_id;?>" >
-            </div>
-            <div class="col-md-3">
-                <input  class="form-control create_at" type="hidden"   id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
-                <input  class="form-control type" type="hidden"   id="type" value="facility">
-            </div>
-            <div class="col-md-3 ">
-                <button    onclick="tijiao()"  class="btn btn-primary btn-lg pull-right" >點擊後提交作番資料</button>
-            </div>
-        </div>
-        <div id="facility">
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="facilityno">作番號(必填)</label>
-                <input  class="form-control facilitynos"  type="text"   id="facilityno" required>
-            </div>
-
-            <div class="col-md-3">
-                <label for="weight">重量(必填)</label>
-                <input  class="form-control weights "  type="text"   id="weight" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-
-            </div>
-
-            <div class="col-md-3">
-                <label for="numberofstop">停數(必填)</label>
-                <input  class="form-control numberofstops" type="text"   id="numberofstop" onkeyup="if(value<0)value=0;if(value.length>3)value=value.slice(0,3);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-
-            </div>
-
-            <div class="col-md-3" >
-                <label for="numberoffloor">樓層數(必填)</label>
-                <input class="form-control numberoffloors"  type="text"   id="numberoffloor" onkeyup="if(value<0)value=0;if(value.length>3)value=value.slice(0,3);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-
-            </div>
-        </div>
-        <div class="form-group">
-            <div class="col-md-3" >
-                <label for="opentype">開門方式(必填)</label>
-                <Select class="form-control opentypes"    id="opentype" required>
-                    <option selected="selected" disabled="disabled"  style="display: none" value=""></option>
-                    <Option Value="CO">CO</Option>
-                    <Option Value="SO">SO</Option>
-                    <Option Value="CO-SO">CO-SO</Option>
-                </Select>
-            </div>
-
-            <div class="col-md-3">
-                <label for="speed">速度(必填)</label>
-                <input class="form-control speeds" type="text"   id="speed" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, '$1')" required>
-
-            </div class="col-md-3">
-
-            <div class="col-md-3">
-                <label for="repairtype">維修型態(必填)</label>
-                <Select class="form-control repairtypes"   id="repairtype" required>
-                    <option selected="selected" disabled="disabled"  style="display: none" value=""></option>
-                    <Option Value="A">定期保養</Option>
-                    <Option Value="B">單次保養</Option>
-                    <Option Value="C">單次維修</Option>
-                </Select>
-            </div>
-
-            <div class="col-md-3">
-                <label for="address">地址</label>
-                <input class="form-control addresss"  type="text"   id="address" >
-            </div>
-
-        </div>
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="longitude">經度(必填)</label>
-                <input class="form-control longitudes" type="text"   id="longitude" onkeyup="if(value<0)value=0;if(value.length>11)value=value.slice(0,11);value=value.replace(/^\D*(\d*(?:\.\d{0,7})?).*$/g, '$1')" required>
-
-            </div>
-
-            <div class="col-md-3">
-                <label for="latitude">緯度(必填)</label>
-                <input class="form-control latitudes"  type="latitude"   id="latitude" onkeyup="if(value<0)value=0;if(value.length>11)value=value.slice(0,11);value=value.replace(/^\D*(\d*(?:\.\d{0,7})?).*$/g, '$1')" required>
-
-            </div>
-
-
-            <div class="col-md-3">
-                <label for="repairerid">維修人員工號(必填)</label>
-                <input class="form-control repairerids"  type="text"   id="repairerid" required>
-            </div>
-
-            <div class="col-md-3">
-                <label for="repairername">維修人員姓名(必填)</label>
-                <input class="form-control repairernames" type="text"   id="repairername" required>
-            </div>
-
-        </div>
-        </div>
-        <div class="form-group">
-            <div class="col-md-12 text-center"  >
-                <h1 onclick="tan('f')" style="cursor: pointer;">+</h1>
-            </div>
-        </div>
-    </div>
-
-</div>
-
+
+<?php
+// 載入db.php來連結資料庫
+require_once "database.php";
+include "header.php";
+
+// 查詢提交成功的賬戶信息
+$accountid=$_REQUEST['accountid'];
+$contractno=$_REQUEST['contractno'];
+if(!empty($accountid)&&!empty($contractno)){
+	$accountsql = "SELECT * FROM account where accountid='$accountid'";
+	$accountdata = mysqli_query($link,$accountsql);
+	$row = mysqli_fetch_array($accountdata, MYSQLI_ASSOC);
+
+	$contractsql = "SELECT * FROM contract where contractno='$contractno'";
+	$contractdata=mysqli_query($link,$contractsql);
+	$contractrows= mysqli_fetch_array($contractdata, MYSQLI_ASSOC);
+}
+
+
+if($_POST['type']=='facility'){
+
+ 	$contractno   = $_POST["contractno"];//合同號
+	$customerid       = $_POST["customerid"];//客戶編號
+	$creater      = $_POST["creater"];//建檔人
+	$create_at     = date('Y/m/d H:i:s');//創建時間
+
+    $facilitynos=json_decode($_POST['facilitynos'], true);
+	$weights=json_decode($_POST['weights'], true);
+	$numberofstops=json_decode($_POST['numberofstops'], true);
+	$numberoffloors=json_decode($_POST['numberoffloors'], true);
+	$opentypes=json_decode($_POST['opentypes'], true);
+	$speeds=json_decode($_POST['speeds'], true);
+	$repairtypes=json_decode($_POST['repairtypes'], true);
+	$longitudes=json_decode($_POST['longitudes'], true);
+	$latitudes=json_decode($_POST['latitudes'], true);
+	$addresss=json_decode($_POST['addresss'], true);
+	$repairerids=json_decode($_POST['repairerids'], true);
+	$repairernames=json_decode($_POST['repairernames'], true);
+	$success=0;
+	print_r($facilitynos);
+
+	for ($i = 0; $i<sizeof($facilitynos); $i++) {
+	echo $db_query3 = "INSERT INTO facility(contractno, facilityno, customerid, weight,numberofstop, numberoffloor,opentype,speed,repairtype,longitude, latitude, address,repairerid,repairername,creater, create_at) VALUES
+     ('$contractno', '$facilitynos[$i]', '$customerid', '$weights[$i]','$numberofstops[$i]', '$numberoffloors[$i]','$opentypes[$i]','$speeds[$i]','$repairtypes[$i]','$longitudes[$i]', '$latitudes[$i]', '$addresss[$i]','$repairerids[$i]','$repairernames[$i]','$creater', '$create_at')";
+	  mysqli_query($link,$db_query3);
+	if (mysqli_affected_rows($link)>0) {
+		$success++;
+	}
+
+	}
+
+	echo $success;
+	exit();
+	if($success>0){
+        $jsonres['code']='200';
+	    return json_encode($jsonres);
+//       	header('location:custom-create-schedule.php?accountid='.$customerid.'&contractno='.$contractno);
+//		exit();
+    } ;
+
+}
+
+?>
+
+
+<div class="container" id="accountadd">
+    <table  class="table  table-bordered" style="width:100%">
+        <thead>
+        <tr>
+            <th>帳號類型</th>
+            <th>帳號</th>
+            <th>密碼</th>
+            <th>姓名</th>
+            <th>電話</th>
+            <th>地址</th>
+            <th>電子郵件</th>
+            <th>Line ID</th>
+            <th>微信id</th>
+            <th>維修ID</th>
+            <th>直屬主管</th>
+            <th>建檔人</th>
+            <th>建檔時間</th>
+
+        </tr>
+        </thead>
+        <tbody>
+            <tr>
+
+                <td><?php echo $row['accounttype']; ?></td>
+                <td><?php echo $row['accountid']; ?></td>
+                <td><?php echo $row['pwd']; ?></td>
+                <td><?php echo $row['name']; ?></td>
+                <td><?php echo $row['tel']; ?></td>
+                <td><?php echo $row['address']; ?></td>
+                <td><?php echo $row['email']; ?></td>
+                <td><?php echo $row['lineid']; ?></td>
+                <td><?php echo $row['wechatid']; ?></td>
+                <td><?php echo $row['repairerid']; ?></td>
+                <td><?php echo $row['manager']; ?></td>
+                <td><?php echo $row['creater']; ?></td>
+                <td><?php echo $row['create_at']; ?></td>
+
+            </tr>
+
+        </tbody>
+    </table>
+    <table   class="table  table-bordered" style="width:100%">
+        <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>
+            <th>合約終止日</th>
+            <th>建檔人</th>
+            <th>建檔時間</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+
+            <td><?php echo $contractrows['contracttype']; ?></td>
+            <td><?php echo $contractrows['contractno']; ?></td>
+            <td><?php echo $contractrows['company']; ?></td>
+            <td><?php echo $contractrows['taxid']; ?></td>
+            <td><?php echo $contractrows['address']; ?></td>
+            <td><?php echo $contractrows['tel']; ?></td>
+            <td><?php echo $contractrows['promiser']; ?></td>
+            <td><?php echo $contractrows['customerid']; ?></td>
+<!--            <td>--><?php //echo $contractrows['contractperson']; ?><!--</td>-->
+<!--            <td>--><?php //echo $contractrows['contractaddress']; ?><!--</td>-->
+            <td><?php echo $contractrows['contracttel']; ?></td>
+            <td><?php echo $contractrows['contractemail']; ?></td>
+            <td><?php echo $contractrows['contract_employee']; ?></td>
+            <td><?php echo $contractrows['start_date']; ?></td>
+            <td><?php echo $contractrows['end_date']; ?></td>
+            <td><?php echo $contractrows['creater']; ?></td>
+            <td><?php echo $contractrows['create_at']; ?></td>
+
+        </tr>
+
+        </tbody>
+    </table>
+    <div class="text-center"> <h3>作番資料添加</h3> </div>
+
+    <div class="form-horizontal"     >
+
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="contractno">合約號(必填)</label>
+                <input class="form-control contractno"  type="text"   id="contractno"  value="<?php echo $contractrows['contractno']; ?>" required>
+            </div>
+            <div class="col-md-3">
+                <label for="customerid">客戶編號(必填)</label>
+                <input class="form-control customerid" type="text"   id="customerid"  value="<?php echo $contractrows['customerid']; ?>"  required>
+            </div>
+            <div class="col-md-3">
+                <label for="creater">建檔人</label>
+                <input class="form-control creater"  type="text"   id="creater" value="<?php echo $user_id;?>" >
+            </div>
+            <div class="col-md-3">
+                <input  class="form-control create_at" type="hidden"   id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
+                <input  class="form-control type" type="hidden"   id="type" value="facility">
+            </div>
+            <div class="col-md-3 ">
+                <button    onclick="tijiao()"  class="btn btn-primary btn-lg pull-right" >點擊後提交作番資料</button>
+            </div>
+        </div>
+        <div id="facility">
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="facilityno">作番號(必填)</label>
+                <input  class="form-control facilitynos"  type="text"   id="facilityno" required>
+            </div>
+
+            <div class="col-md-3">
+                <label for="weight">重量(必填)</label>
+                <input  class="form-control weights "  type="text"   id="weight" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+
+            </div>
+
+            <div class="col-md-3">
+                <label for="numberofstop">停數(必填)</label>
+                <input  class="form-control numberofstops" type="text"   id="numberofstop" onkeyup="if(value<0)value=0;if(value.length>3)value=value.slice(0,3);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+
+            </div>
+
+            <div class="col-md-3" >
+                <label for="numberoffloor">樓層數(必填)</label>
+                <input class="form-control numberoffloors"  type="text"   id="numberoffloor" onkeyup="if(value<0)value=0;if(value.length>3)value=value.slice(0,3);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-3" >
+                <label for="opentype">開門方式(必填)</label>
+                <Select class="form-control opentypes"    id="opentype" required>
+                    <option selected="selected" disabled="disabled"  style="display: none" value=""></option>
+                    <Option Value="CO">CO</Option>
+                    <Option Value="SO">SO</Option>
+                    <Option Value="CO-SO">CO-SO</Option>
+                </Select>
+            </div>
+
+            <div class="col-md-3">
+                <label for="speed">速度(必填)</label>
+                <input class="form-control speeds" type="text"   id="speed" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, '$1')" required>
+
+            </div class="col-md-3">
+
+            <div class="col-md-3">
+                <label for="repairtype">維修型態(必填)</label>
+                <Select class="form-control repairtypes"   id="repairtype" required>
+                    <option selected="selected" disabled="disabled"  style="display: none" value=""></option>
+                    <Option Value="A">定期保養</Option>
+                    <Option Value="B">單次保養</Option>
+                    <Option Value="C">單次維修</Option>
+                </Select>
+            </div>
+
+            <div class="col-md-3">
+                <label for="address">地址</label>
+                <input class="form-control addresss"  type="text"   id="address" >
+            </div>
+
+        </div>
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="longitude">經度(必填)</label>
+                <input class="form-control longitudes" type="text"   id="longitude" onkeyup="if(value<0)value=0;if(value.length>11)value=value.slice(0,11);value=value.replace(/^\D*(\d*(?:\.\d{0,7})?).*$/g, '$1')" required>
+
+            </div>
+
+            <div class="col-md-3">
+                <label for="latitude">緯度(必填)</label>
+                <input class="form-control latitudes"  type="latitude"   id="latitude" onkeyup="if(value<0)value=0;if(value.length>11)value=value.slice(0,11);value=value.replace(/^\D*(\d*(?:\.\d{0,7})?).*$/g, '$1')" required>
+
+            </div>
+
+
+            <div class="col-md-3">
+                <label for="repairerid">維修人員工號(必填)</label>
+                <input class="form-control repairerids"  type="text"   id="repairerid" required>
+            </div>
+
+            <div class="col-md-3">
+                <label for="repairername">維修人員姓名(必填)</label>
+                <input class="form-control repairernames" type="text"   id="repairername" required>
+            </div>
+
+        </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-12 text-center"  >
+                <h1 onclick="tan('f')" style="cursor: pointer;">+</h1>
+            </div>
+        </div>
+    </div>
+
+</div>
+
diff --git a/wms/custom-create-schedule.php b/wms/custom-create-schedule.php
index 2e1400bf..c9a2dfa4 100644
--- a/wms/custom-create-schedule.php
+++ b/wms/custom-create-schedule.php
@@ -1,230 +1,230 @@
-
-<?php
-// 載入db.php來連結資料庫
-require_once "database.php";
-include "header.php";
-
-$accountid=$_REQUEST['accountid'];
-$contractno=$_REQUEST['contractno'];
-$facilitydata=[];//初始化
-if(!empty($accountid)&&!empty($contractno)){
-    //查詢賬戶信息
- 	$accountsql = "SELECT * FROM account where accountid='$accountid'";
-	$accountdata = mysqli_query($link,$accountsql);
-	$row = mysqli_fetch_array($accountdata, MYSQLI_ASSOC);
-	//查詢合同信息
-	$contractsql = "SELECT * FROM contract where contractno='$contractno'";
-	$contractdata=mysqli_query($link,$contractsql);
-	$contractrows= mysqli_fetch_array($contractdata, MYSQLI_ASSOC);
-	//查詢作番信息(可能多條)
-	$facilitysql = "SELECT * FROM facility where contractno='$contractno'";
-	$facilitydata=mysqli_query($link,$facilitysql);
-
-}
-
-
-
-?>
-
-
-<div class="container" id="accountadd">
-    <table  class="table  table-bordered" style="width:100%">
-        <thead>
-        <tr>
-            <th>帳號類型</th>
-            <th>帳號</th>
-            <th>密碼</th>
-            <th>姓名</th>
-            <th>電話</th>
-            <th>地址</th>
-            <th>電子郵件</th>
-            <th>Line ID</th>
-            <th>微信id</th>
-            <th>維修ID</th>
-            <th>直屬主管</th>
-            <th>建檔人</th>
-            <th>建檔時間</th>
-
-        </tr>
-        </thead>
-        <tbody>
-            <tr>
-
-                <td><?php echo $row['accounttype']; ?></td>
-                <td><?php echo $row['accountid']; ?></td>
-                <td><?php echo $row['pwd']; ?></td>
-                <td><?php echo $row['name']; ?></td>
-                <td><?php echo $row['tel']; ?></td>
-                <td><?php echo $row['address']; ?></td>
-                <td><?php echo $row['email']; ?></td>
-                <td><?php echo $row['lineid']; ?></td>
-                <td><?php echo $row['wechatid']; ?></td>
-                <td><?php echo $row['repairerid']; ?></td>
-                <td><?php echo $row['manager']; ?></td>
-                <td><?php echo $row['creater']; ?></td>
-                <td><?php echo $row['create_at']; ?></td>
-
-            </tr>
-
-        </tbody>
-    </table>
-    <table   class="table  table-bordered" style="width:100%">
-        <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>
-            <th>合約終止日</th>
-            <th>建檔人</th>
-            <th>建檔時間</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr>
-
-            <td><?php echo $contractrows['contracttype']; ?></td>
-            <td><?php echo $contractrows['contractno']; ?></td>
-            <td><?php echo $contractrows['company']; ?></td>
-            <td><?php echo $contractrows['taxid']; ?></td>
-            <td><?php echo $contractrows['address']; ?></td>
-            <td><?php echo $contractrows['tel']; ?></td>
-            <td><?php echo $contractrows['promiser']; ?></td>
-            <td><?php echo $contractrows['customerid']; ?></td>
-            <!--            <td>--><?php //echo $contractrows['contractperson']; ?><!--</td>-->
-            <!--            <td>--><?php //echo $contractrows['contractaddress']; ?><!--</td>-->
-            <td><?php echo $contractrows['contracttel']; ?></td>
-            <td><?php echo $contractrows['contractemail']; ?></td>
-            <td><?php echo $contractrows['contract_employee']; ?></td>
-            <td><?php echo $contractrows['start_date']; ?></td>
-            <td><?php echo $contractrows['end_date']; ?></td>
-            <td><?php echo $contractrows['creater']; ?></td>
-            <td><?php echo $contractrows['create_at']; ?></td>
-
-        </tr>
-
-        </tbody>
-    </table>
-    <table   class="table table-striped table-bordered" style="width:100%">
-        <thead>
-        <tr>
-            <th>合約號</th>
-            <th>作番號</th>
-            <th>客戶編號</th>
-            <th>重量</th>
-            <th>停數</th>
-            <th>樓層數</th>
-            <th>開門方式</th>
-            <th>速度</th>
-            <th>維修型態</th>
-            <th>經度</th>
-            <th>緯度</th>
-            <th>地址</th>
-            <th>維修人員工號</th>
-            <th>維修人員姓名</th>
-            <th>建檔人</th>
-            <th>建檔時間</th>
-
-        </tr>
-        </thead>
-        <tbody>
-		<?php foreach($facilitydata as $data) : ?>
-            <tr>
-
-                <td><?php echo $data['contractno']; ?></td>
-                <td><?php echo $data['facilityno']; ?></td>
-                <td><?php echo $data['customerid']; ?></td>
-                <td><?php echo $data['weight']; ?></td>
-                <td><?php echo $data['numberofstop']; ?></td>
-                <td><?php echo $data['numberoffloor']; ?></td>
-                <td><?php echo $data['opentype']; ?></td>
-                <td><?php echo $data['speed']; ?></td>
-                <td><?php echo $data['repairtype']; ?></td>
-                <td><?php echo $data['longitude']; ?></td>
-                <td><?php echo $data['latitude']; ?></td>
-                <td><?php echo $data['address']; ?></td>
-                <td><?php echo $data['repairerid']; ?></td>
-                <td><?php echo $data['repairername']; ?></td>
-                <td><?php echo $data['creater']; ?></td>
-                <td><?php echo $data['create_at']; ?></td>
-            </tr>
-		<?php endforeach; ?>
-
-
-
-        </tbody>
-    </table>
-    <div class="text-center"> <h3>保養行程資料添加</h3> </div>
-    <div class="form-horizontal">
-
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="contractno">合約號(必填)</label>
-                <input class="form-control contractno"  type="text"   id="contractno"  value="<?php echo $contractrows['contractno']; ?>" required>
-            </div>
-            <div class="col-md-3">
-                <label for="creater">建檔人</label>
-                <input class="form-control creater"  type="text"   id="creater" value="<?php echo $user_id;?>" >
-            </div>
-            <div class="col-md-3">
-                <input  class="form-control create_at" type="hidden"   id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
-                <input  class="form-control type" type="hidden"   id="type" value="schedule">
-            </div>
-            <div class="col-md-6 ">
-                <button  onclick="tijiaosch()"   class="btn btn-primary btn-lg pull-right" >點擊後提交保養行程資料</button>
-            </div>
-        </div>
-        <div id="schedule">
-        <div class="form-group"  >
-            <div class="col-md-3">
-                <label for="facilityno">作番號(必填)</label>
-                <input  class="form-control facilitynos"  type="text"   id="facilityno" required>
-            </div>
-
-            <div class="col-md-2">
-                <label for="combono">保養套餐編號(必填)</label>
-                <input class="form-control combonos" type="text"   id="combono" required>
-            </div>
-            <div class="col-md-2">
-                <label for="duedate">應保養日期(必填)</label>
-                <input class="form-control duedates"  type="text "   id="duedate"  value="<?php echo date('Y/m/d'); ?>" required>
-
-            </div>
-            <div class="col-md-2">
-                <label for="repairerid">保養人員工號(必填)</label>
-                <input  class="form-control repairerids"  type="text"   id="repairerid" required>
-            </div>
-
-            <div class="col-md-3">
-                <label for="repairername">保養人員姓名(必填)</label>
-                <input  class="form-control repairernames"  type="text"   id="repairername" required>
-            </div>
-
-        </div>
-        </div>
-
-
-
-        <div class="form-group">
-            <div class="col-md-12 text-center"  >
-                <h1 onclick="tan('s')" style="cursor: pointer;">+</h1>
-            </div>
-        </div>
-
-    </div>
-</div>
-
-
-
-
-
+
+<?php
+// 載入db.php來連結資料庫
+require_once "database.php";
+include "header.php";
+
+$accountid=$_REQUEST['accountid'];
+$contractno=$_REQUEST['contractno'];
+$facilitydata=[];//初始化
+if(!empty($accountid)&&!empty($contractno)){
+    //查詢賬戶信息
+ 	$accountsql = "SELECT * FROM account where accountid='$accountid'";
+	$accountdata = mysqli_query($link,$accountsql);
+	$row = mysqli_fetch_array($accountdata, MYSQLI_ASSOC);
+	//查詢合同信息
+	$contractsql = "SELECT * FROM contract where contractno='$contractno'";
+	$contractdata=mysqli_query($link,$contractsql);
+	$contractrows= mysqli_fetch_array($contractdata, MYSQLI_ASSOC);
+	//查詢作番信息(可能多條)
+	$facilitysql = "SELECT * FROM facility where contractno='$contractno'";
+	$facilitydata=mysqli_query($link,$facilitysql);
+
+}
+
+
+
+?>
+
+
+<div class="container" id="accountadd">
+    <table  class="table  table-bordered" style="width:100%">
+        <thead>
+        <tr>
+            <th>帳號類型</th>
+            <th>帳號</th>
+            <th>密碼</th>
+            <th>姓名</th>
+            <th>電話</th>
+            <th>地址</th>
+            <th>電子郵件</th>
+            <th>Line ID</th>
+            <th>微信id</th>
+            <th>維修ID</th>
+            <th>直屬主管</th>
+            <th>建檔人</th>
+            <th>建檔時間</th>
+
+        </tr>
+        </thead>
+        <tbody>
+            <tr>
+
+                <td><?php echo $row['accounttype']; ?></td>
+                <td><?php echo $row['accountid']; ?></td>
+                <td><?php echo $row['pwd']; ?></td>
+                <td><?php echo $row['name']; ?></td>
+                <td><?php echo $row['tel']; ?></td>
+                <td><?php echo $row['address']; ?></td>
+                <td><?php echo $row['email']; ?></td>
+                <td><?php echo $row['lineid']; ?></td>
+                <td><?php echo $row['wechatid']; ?></td>
+                <td><?php echo $row['repairerid']; ?></td>
+                <td><?php echo $row['manager']; ?></td>
+                <td><?php echo $row['creater']; ?></td>
+                <td><?php echo $row['create_at']; ?></td>
+
+            </tr>
+
+        </tbody>
+    </table>
+    <table   class="table  table-bordered" style="width:100%">
+        <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>
+            <th>合約終止日</th>
+            <th>建檔人</th>
+            <th>建檔時間</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+
+            <td><?php echo $contractrows['contracttype']; ?></td>
+            <td><?php echo $contractrows['contractno']; ?></td>
+            <td><?php echo $contractrows['company']; ?></td>
+            <td><?php echo $contractrows['taxid']; ?></td>
+            <td><?php echo $contractrows['address']; ?></td>
+            <td><?php echo $contractrows['tel']; ?></td>
+            <td><?php echo $contractrows['promiser']; ?></td>
+            <td><?php echo $contractrows['customerid']; ?></td>
+            <!--            <td>--><?php //echo $contractrows['contractperson']; ?><!--</td>-->
+            <!--            <td>--><?php //echo $contractrows['contractaddress']; ?><!--</td>-->
+            <td><?php echo $contractrows['contracttel']; ?></td>
+            <td><?php echo $contractrows['contractemail']; ?></td>
+            <td><?php echo $contractrows['contract_employee']; ?></td>
+            <td><?php echo $contractrows['start_date']; ?></td>
+            <td><?php echo $contractrows['end_date']; ?></td>
+            <td><?php echo $contractrows['creater']; ?></td>
+            <td><?php echo $contractrows['create_at']; ?></td>
+
+        </tr>
+
+        </tbody>
+    </table>
+    <table   class="table table-striped table-bordered" style="width:100%">
+        <thead>
+        <tr>
+            <th>合約號</th>
+            <th>作番號</th>
+            <th>客戶編號</th>
+            <th>重量</th>
+            <th>停數</th>
+            <th>樓層數</th>
+            <th>開門方式</th>
+            <th>速度</th>
+            <th>維修型態</th>
+            <th>經度</th>
+            <th>緯度</th>
+            <th>地址</th>
+            <th>維修人員工號</th>
+            <th>維修人員姓名</th>
+            <th>建檔人</th>
+            <th>建檔時間</th>
+
+        </tr>
+        </thead>
+        <tbody>
+		<?php foreach($facilitydata as $data) : ?>
+            <tr>
+
+                <td><?php echo $data['contractno']; ?></td>
+                <td><?php echo $data['facilityno']; ?></td>
+                <td><?php echo $data['customerid']; ?></td>
+                <td><?php echo $data['weight']; ?></td>
+                <td><?php echo $data['numberofstop']; ?></td>
+                <td><?php echo $data['numberoffloor']; ?></td>
+                <td><?php echo $data['opentype']; ?></td>
+                <td><?php echo $data['speed']; ?></td>
+                <td><?php echo $data['repairtype']; ?></td>
+                <td><?php echo $data['longitude']; ?></td>
+                <td><?php echo $data['latitude']; ?></td>
+                <td><?php echo $data['address']; ?></td>
+                <td><?php echo $data['repairerid']; ?></td>
+                <td><?php echo $data['repairername']; ?></td>
+                <td><?php echo $data['creater']; ?></td>
+                <td><?php echo $data['create_at']; ?></td>
+            </tr>
+		<?php endforeach; ?>
+
+
+
+        </tbody>
+    </table>
+    <div class="text-center"> <h3>保養行程資料添加</h3> </div>
+    <div class="form-horizontal">
+
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="contractno">合約號(必填)</label>
+                <input class="form-control contractno"  type="text"   id="contractno"  value="<?php echo $contractrows['contractno']; ?>" required>
+            </div>
+            <div class="col-md-3">
+                <label for="creater">建檔人</label>
+                <input class="form-control creater"  type="text"   id="creater" value="<?php echo $user_id;?>" >
+            </div>
+            <div class="col-md-3">
+                <input  class="form-control create_at" type="hidden"   id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
+                <input  class="form-control type" type="hidden"   id="type" value="schedule">
+            </div>
+            <div class="col-md-6 ">
+                <button  onclick="tijiaosch()"   class="btn btn-primary btn-lg pull-right" >點擊後提交保養行程資料</button>
+            </div>
+        </div>
+        <div id="schedule">
+        <div class="form-group"  >
+            <div class="col-md-3">
+                <label for="facilityno">作番號(必填)</label>
+                <input  class="form-control facilitynos"  type="text"   id="facilityno" required>
+            </div>
+
+            <div class="col-md-2">
+                <label for="combono">保養套餐編號(必填)</label>
+                <input class="form-control combonos" type="text"   id="combono" required>
+            </div>
+            <div class="col-md-2">
+                <label for="duedate">應保養日期(必填)</label>
+                <input class="form-control duedates"  type="text "   id="duedate"  value="<?php echo date('Y/m/d'); ?>" required>
+
+            </div>
+            <div class="col-md-2">
+                <label for="repairerid">保養人員工號(必填)</label>
+                <input  class="form-control repairerids"  type="text"   id="repairerid" required>
+            </div>
+
+            <div class="col-md-3">
+                <label for="repairername">保養人員姓名(必填)</label>
+                <input  class="form-control repairernames"  type="text"   id="repairername" required>
+            </div>
+
+        </div>
+        </div>
+
+
+
+        <div class="form-group">
+            <div class="col-md-12 text-center"  >
+                <h1 onclick="tan('s')" style="cursor: pointer;">+</h1>
+            </div>
+        </div>
+
+    </div>
+</div>
+
+
+
+
+
diff --git a/wms/custom-create.php b/wms/custom-create.php
index aa0aeadc..d7ae5960 100644
--- a/wms/custom-create.php
+++ b/wms/custom-create.php
@@ -1,383 +1,383 @@
-
-<?php
-// 載入db.php來連結資料庫
-require_once "database.php";
-include "header.php";
-
-if($_POST['type']=='account'){
-	$accounttype    = $_POST["accounttype"];
-	$accountid  = $_POST["accountid"];
-	$pwd         = $_POST["pwd"];
-	$name        = $_POST["name"];
-	$tel        = $_POST["tel"];
-	$address     = $_POST["address"];
-	$email    = $_POST["email"];
-	$lineid   = $_POST["lineid"];
-	$wechatid   = $_POST["wechatid"];
-	$phone_call_help   = $_POST["phone_call_help"];
-	$chat_for_help   = $_POST["chat_for_help"];
-	$remote_help   = $_POST["remote_help"];
-	$repairerid  = $_POST["repairerid"];
-	$manager  = $_POST["manager"];
-	$creater      = $_POST["creater"];
-	$create_at    = date('Y/m/d H:i:s');
-	//查詢是否重複錄入
-
-    $sql = "SELECT * FROM account where accountid='$accountid'";
-    $data = mysqli_query($link,$sql);
-    $nums_rows=mysqli_num_rows($data);
-    if($nums_rows==0){
-        //添加用戶
-        $db_query = "INSERT INTO account(accounttype, accountid, pwd, name, tel, address, email, lineid, wechatid, phone_call_help, chat_for_help, remote_help, repairerid, manager, creater, create_at) VALUES ('$accounttype', '$accountid','$pwd', '$name', '$tel', '$address', '$email', '$lineid', '$wechatid', '$phone_call_help', '$chat_for_help', '$remote_help', '$repairerid', '$manager', '$creater', '$create_at')";
-        mysqli_query($link,$db_query);
-        if (mysqli_affected_rows($link)>0) {
-            header('location:custom-create-contract.php?accountid='.$accountid);
-            exit();
-        }
-        elseif(mysqli_affected_rows($link)==0) {
-
-        }
-    }
-    else{
-          echo "<h1 class='text-center'>賬戶已經存在</h1>";
-    }
-
-
-
-
-
-}
-
-?>
- <script type ='text/JavaScript'>
-     function accounthide(){
-         $('#accountadd').addClass('hidden');
-     }
-
-
- </script>
-
-
-<div class="container" id="accountadd">
-    <div class="text-center"> <h3>賬號資料添加</h3> </div>
-    <form class="form-horizontal"  name="account" method="POST" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="accounttype">帳號類別(必選)</label>
-                <Select class="form-control"  name="accounttype" id="accounttype" required>
-                    <option selected="selected" disabled="disabled"  style="display: none" value=""></option>
-                    <Option Value="A">客戶</Option>
-                    <Option Value="B">保養人員</Option>
-                    <Option Value="C">檢查人員</Option>
-                    <Option Value="D">契約人員</Option>
-                    <Option Value="E">管理人員</Option>
-                </Select>
-            </div>
-            <div class="col-md-9 ">
-                <button type="submit"    class="btn btn-primary btn-lg pull-right" >點擊後提交賬戶資料</button>
-            </div>
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="accountid">員工、個人客戶ID或公司客戶統編(必填)</label>
-                <input  class="form-control" type="text" name="accountid" id="accountid" placeholder="請輸入員工、個人客戶ID或公司客戶統編(必填)"   required>
-
-            </div>
-
-            <div class="col-md-3">
-                <label for="pwd">密碼(必填)</label>
-                <input  class="form-control"  type="text" name="pwd" id="pwd" required>
-            </div>
-
-            <div class="col-md-3">
-                <label for="name">姓名(必填)</label>
-                <input  class="form-control"  type="text" name="name" id="name" required>
-            </div>
-
-            <div class="col-md-3">
-                <label for="tel">電話</label>
-                <input  class="form-control"  type="text" name="tel" id="tel" maxlength="16">
-            </div>
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="address">地址</label>
-                <input  class="form-control" type="text" name="address" id="address">
-            </div>
-
-            <div class="col-md-3">
-                <label for="email">電子郵箱</label>
-                <input  class="form-control" type="text" name="email" id="email">
-
-            </div>
-
-            <div class="col-md-3">
-                <label for="lineid">Line ID</label>
-                <input  class="form-control" type="text" name="lineid" id="lineid">
-            </div>
-
-            <div class="col-md-3">
-                <label for="wechatid">微信ID</label>
-                <input  class="form-control" type="text" name="wechatid" id="wechatid">
-            </div>
-
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="phone_call_help">聯絡手機號(必填)</label>
-                <input  class="form-control" type="text" name="phone_call_help" id="phone_call_help"  maxlength="16" required>
-            </div>
-
-            <div class="col-md-3">
-                <label for="chat_for_help">線上文字客服</label>
-                <input  class="form-control" type="text" name="chat_for_help" id="chat_for_help">
-            </div>
-
-            <div class="col-md-3">
-                <label for="remote_help">遠端視頻帳號</label>
-                <input  class="form-control" type="text" name="remote_help" id="remote_help">
-            </div>
-
-            <div class="col-md-3">
-                <label for="repairerid">服務與支持人員工號(客戶必填)</label>
-                <input  class="form-control" type="text" name="repairerid" id="repairerid" maxlength="10">
-            </div>
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="manager">直屬主管工號(保養人員必填)</label>
-                <input  class="form-control" type="text" name="manager" id="manager" maxlength="10">
-            </div>
-
-            <div class="col-md-3">
-                <label for="creater">建檔人</label>
-                <input  class="form-control" type="text" name="creater" id="creater" value="<?php echo $user_id;?>">
-            </div>
-
-            <div class="col-md-3">
-                <input  class="form-control" type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
-                <input  class="form-control" type="hidden" name="type" id="create_at" value="account">
-            </div>
-
-        </div>
-
-
-    </form>
-</div>
-
-<div class="container hidden">
-    <label for="fileToUpload">合約資料添加</label>
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-
-        <div>
-            <label for="contracttype">合約類型(必填)</label>
-            <Select name="contracttype" id="contracttype" required>
-                <option selected="selected" disabled="disabled"  style="display: none" value=""></option>
-                <Option Value="A">定期保養</Option>
-                <Option Value="B">單次保養</Option>
-                <Option Value="C">單次維修</Option>
-            </Select>
-        </div>
-
-        <div>
-            <label for="contractno">合約號(必填)</label>
-            <input  class="form-control" type="text" name="contractno" id="contractno" required>
-        </div>
-
-        <div>
-            <label for="company">公司名稱</label>
-            <input type="text" name="company" id="company" >
-        </div>
-
-        <div>
-            <label for="taxid">統一編號</label>
-            <input type="text" name="taxid" id="taxid" >
-        </div>
-
-        <div>
-            <label for="address">地址</label>
-            <input type="text" name="address" id="address" >
-        </div>
-
-        <div>
-            <label for="tel">電話</label>
-            <input type="text" name="tel" id="tel" >
-        </div>
-
-        <div>
-            <label for="promiser">立約人</label>
-            <input type="text" name="promiser" id="promiser">
-        </div>
-
-        <div>
-            <label for="customerid">客戶維護帳號(必填)</label>
-            <input type="text" name="customerid" id="customerid" required>
-        </div>
-
-        <div>
-            <label for="contractperson">業務聯繫人</label>
-            <input type="text" name="contractperson" id="contractperson" >
-        </div>
-
-        <div>
-            <label for="contractaddress">業務聯繫人地址</label>
-            <input type="text" name="contractaddress" id="contractaddress" >
-        </div>
-
-        <div>
-            <label for="contracttel">業務聯繫人電話(必填)</label>
-            <input type="text" name="contracttel" id="contracttel" required>
-        </div>
-
-        <div>
-            <label for="contractemail">業務聯繫人郵件地址</label>
-            <input type="text" name="contractemail" id="contractemail" >
-        </div>
-
-        <div>
-            <label for="contract_employee">契約人員工號</label>
-            <input type="text" name="contract_employee" id="contract_employee" >
-        </div>
-
-        <div>
-            <label for="start_date">合約起始年月日(必填)</label><br>
-            <input type="text" data-date-format="yyyy-mm-dd" name="start_date" id="start_date" value="<?php echo date('Y-m-d'); ?>" required>
-        </div>
-
-        <div>
-            <label for="end_date">合約終止年月日(必填)</label><br>
-            <input type="text" data-date-format="yyyy-mm-dd" name="end_date" id="end_date" value="<?php echo date('Y-m-d',strtotime('+364 day')); ?>" required>
-        </div>
-
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater">
-<!--            <p class="error">--><?php //echo $creater_error; ?><!--</p>-->
-        </div>
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
-<!--            <p class="error">--><?php //echo $create_at_error; ?><!--</p>-->
-        </div>
-
-        <div>
-            <br>
-            <button type="submit" name="submit">確定</button>
-        </div>
-
-    </form
-</div>
-
-<div class="container hidden">
-    <label for="fileToUpload">作番資料添加</label>
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-
-
-        <div>
-            <label for="contractno">合約號(必填)</label>
-            <input type="text" name="contractno" id="contractno" required>
-        </div>
-
-        <div>
-            <label for="facilityno">作番號(必填)</label>
-            <input type="text" name="facilityno" id="facilityno" required>
-        </div>
-
-        <div>
-            <label for="customerid">客戶編號(必填)</label>
-            <input type="text" name="customerid" id="customerid" required>
-        </div>
-
-        <div>
-            <label for="weight">重量(必填)</label>
-            <input type="text" name="weight" id="weight" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="numberofstop">停數(必填)</label>
-            <input type="text" name="numberofstop" id="numberofstop" onkeyup="if(value<0)value=0;if(value.length>3)value=value.slice(0,3);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="numberoffloor">樓層數(必填)</label>
-            <input type="text" name="numberoffloor" id="numberoffloor" onkeyup="if(value<0)value=0;if(value.length>3)value=value.slice(0,3);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="opentype">開門方式(必填)</label>
-            <Select name="opentype" id="opentype" required>
-                <option selected="selected" disabled="disabled"  style="display: none" value=""></option>
-                <Option Value="CO">CO</Option>
-                <Option Value="SO">SO</Option>
-                <Option Value="CO-SO">CO-SO</Option>
-            </Select>
-            <!-- <input type="text" name="opentype" id="opentype" > -->
-        </div>
-
-        <div>
-            <label for="speed">速度(必填)</label>
-            <input type="text" name="speed" id="speed" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="repairtype">維修型態(必填)</label>
-            <Select name="repairtype" id="repairtype" required>
-                <option selected="selected" disabled="disabled"  style="display: none" value=""></option>
-                <Option Value="A">定期保養</Option>
-                <Option Value="B">單次保養</Option>
-                <Option Value="C">單次維修</Option>
-            </Select>
-            <!-- <input type="text" name="repairtype" id="repairtype" > -->
-        </div>
-
-        <div>
-            <label for="longitude">經度(必填)</label>
-            <input type="text" name="longitude" id="longitude" onkeyup="if(value<0)value=0;if(value.length>11)value=value.slice(0,11);value=value.replace(/^\D*(\d*(?:\.\d{0,7})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="latitude">緯度(必填)</label>
-            <input type="latitude" name="latitude" id="latitude" onkeyup="if(value<0)value=0;if(value.length>11)value=value.slice(0,11);value=value.replace(/^\D*(\d*(?:\.\d{0,7})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="address">地址</label>
-            <input type="text" name="address" id="address" >
-        </div>
-
-        <div>
-            <label for="repairerid">維修人員工號(必填)</label>
-            <input type="text" name="repairerid" id="repairerid" required>
-        </div>
-
-        <div>
-            <label for="repairername">維修人員姓名(必填)</label>
-            <input type="text" name="repairername" id="repairername" required>
-        </div>
-
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater">
-        </div>
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-
-        <div>
-            <button type="submit" name="submit">確定</button>
-        </div>
-
-    </form>
-
-</div>
-
-
-
+
+<?php
+// 載入db.php來連結資料庫
+require_once "database.php";
+include "header.php";
+
+if($_POST['type']=='account'){
+	$accounttype    = $_POST["accounttype"];
+	$accountid  = $_POST["accountid"];
+	$pwd         = $_POST["pwd"];
+	$name        = $_POST["name"];
+	$tel        = $_POST["tel"];
+	$address     = $_POST["address"];
+	$email    = $_POST["email"];
+	$lineid   = $_POST["lineid"];
+	$wechatid   = $_POST["wechatid"];
+	$phone_call_help   = $_POST["phone_call_help"];
+	$chat_for_help   = $_POST["chat_for_help"];
+	$remote_help   = $_POST["remote_help"];
+	$repairerid  = $_POST["repairerid"];
+	$manager  = $_POST["manager"];
+	$creater      = $_POST["creater"];
+	$create_at    = date('Y/m/d H:i:s');
+	//查詢是否重複錄入
+
+    $sql = "SELECT * FROM account where accountid='$accountid'";
+    $data = mysqli_query($link,$sql);
+    $nums_rows=mysqli_num_rows($data);
+    if($nums_rows==0){
+        //添加用戶
+        $db_query = "INSERT INTO account(accounttype, accountid, pwd, name, tel, address, email, lineid, wechatid, phone_call_help, chat_for_help, remote_help, repairerid, manager, creater, create_at) VALUES ('$accounttype', '$accountid','$pwd', '$name', '$tel', '$address', '$email', '$lineid', '$wechatid', '$phone_call_help', '$chat_for_help', '$remote_help', '$repairerid', '$manager', '$creater', '$create_at')";
+        mysqli_query($link,$db_query);
+        if (mysqli_affected_rows($link)>0) {
+            header('location:custom-create-contract.php?accountid='.$accountid);
+            exit();
+        }
+        elseif(mysqli_affected_rows($link)==0) {
+
+        }
+    }
+    else{
+          echo "<h1 class='text-center'>賬戶已經存在</h1>";
+    }
+
+
+
+
+
+}
+
+?>
+ <script type ='text/JavaScript'>
+     function accounthide(){
+         $('#accountadd').addClass('hidden');
+     }
+
+
+ </script>
+
+
+<div class="container" id="accountadd">
+    <div class="text-center"> <h3>賬號資料添加</h3> </div>
+    <form class="form-horizontal"  name="account" method="POST" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="accounttype">帳號類別(必選)</label>
+                <Select class="form-control"  name="accounttype" id="accounttype" required>
+                    <option selected="selected" disabled="disabled"  style="display: none" value=""></option>
+                    <Option Value="A">客戶</Option>
+                    <Option Value="B">保養人員</Option>
+                    <Option Value="C">檢查人員</Option>
+                    <Option Value="D">契約人員</Option>
+                    <Option Value="E">管理人員</Option>
+                </Select>
+            </div>
+            <div class="col-md-9 ">
+                <button type="submit"    class="btn btn-primary btn-lg pull-right" >點擊後提交賬戶資料</button>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="accountid">員工、個人客戶ID或公司客戶統編(必填)</label>
+                <input  class="form-control" type="text" name="accountid" id="accountid" placeholder="請輸入員工、個人客戶ID或公司客戶統編(必填)"   required>
+
+            </div>
+
+            <div class="col-md-3">
+                <label for="pwd">密碼(必填)</label>
+                <input  class="form-control"  type="text" name="pwd" id="pwd" required>
+            </div>
+
+            <div class="col-md-3">
+                <label for="name">姓名(必填)</label>
+                <input  class="form-control"  type="text" name="name" id="name" required>
+            </div>
+
+            <div class="col-md-3">
+                <label for="tel">電話</label>
+                <input  class="form-control"  type="text" name="tel" id="tel" maxlength="16">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="address">地址</label>
+                <input  class="form-control" type="text" name="address" id="address">
+            </div>
+
+            <div class="col-md-3">
+                <label for="email">電子郵箱</label>
+                <input  class="form-control" type="text" name="email" id="email">
+
+            </div>
+
+            <div class="col-md-3">
+                <label for="lineid">Line ID</label>
+                <input  class="form-control" type="text" name="lineid" id="lineid">
+            </div>
+
+            <div class="col-md-3">
+                <label for="wechatid">微信ID</label>
+                <input  class="form-control" type="text" name="wechatid" id="wechatid">
+            </div>
+
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="phone_call_help">聯絡手機號(必填)</label>
+                <input  class="form-control" type="text" name="phone_call_help" id="phone_call_help"  maxlength="16" required>
+            </div>
+
+            <div class="col-md-3">
+                <label for="chat_for_help">線上文字客服</label>
+                <input  class="form-control" type="text" name="chat_for_help" id="chat_for_help">
+            </div>
+
+            <div class="col-md-3">
+                <label for="remote_help">遠端視頻帳號</label>
+                <input  class="form-control" type="text" name="remote_help" id="remote_help">
+            </div>
+
+            <div class="col-md-3">
+                <label for="repairerid">服務與支持人員工號(客戶必填)</label>
+                <input  class="form-control" type="text" name="repairerid" id="repairerid" maxlength="10">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="manager">直屬主管工號(保養人員必填)</label>
+                <input  class="form-control" type="text" name="manager" id="manager" maxlength="10">
+            </div>
+
+            <div class="col-md-3">
+                <label for="creater">建檔人</label>
+                <input  class="form-control" type="text" name="creater" id="creater" value="<?php echo $user_id;?>">
+            </div>
+
+            <div class="col-md-3">
+                <input  class="form-control" type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
+                <input  class="form-control" type="hidden" name="type" id="create_at" value="account">
+            </div>
+
+        </div>
+
+
+    </form>
+</div>
+
+<div class="container hidden">
+    <label for="fileToUpload">合約資料添加</label>
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+
+        <div>
+            <label for="contracttype">合約類型(必填)</label>
+            <Select name="contracttype" id="contracttype" required>
+                <option selected="selected" disabled="disabled"  style="display: none" value=""></option>
+                <Option Value="A">定期保養</Option>
+                <Option Value="B">單次保養</Option>
+                <Option Value="C">單次維修</Option>
+            </Select>
+        </div>
+
+        <div>
+            <label for="contractno">合約號(必填)</label>
+            <input  class="form-control" type="text" name="contractno" id="contractno" required>
+        </div>
+
+        <div>
+            <label for="company">公司名稱</label>
+            <input type="text" name="company" id="company" >
+        </div>
+
+        <div>
+            <label for="taxid">統一編號</label>
+            <input type="text" name="taxid" id="taxid" >
+        </div>
+
+        <div>
+            <label for="address">地址</label>
+            <input type="text" name="address" id="address" >
+        </div>
+
+        <div>
+            <label for="tel">電話</label>
+            <input type="text" name="tel" id="tel" >
+        </div>
+
+        <div>
+            <label for="promiser">立約人</label>
+            <input type="text" name="promiser" id="promiser">
+        </div>
+
+        <div>
+            <label for="customerid">客戶維護帳號(必填)</label>
+            <input type="text" name="customerid" id="customerid" required>
+        </div>
+
+        <div>
+            <label for="contractperson">業務聯繫人</label>
+            <input type="text" name="contractperson" id="contractperson" >
+        </div>
+
+        <div>
+            <label for="contractaddress">業務聯繫人地址</label>
+            <input type="text" name="contractaddress" id="contractaddress" >
+        </div>
+
+        <div>
+            <label for="contracttel">業務聯繫人電話(必填)</label>
+            <input type="text" name="contracttel" id="contracttel" required>
+        </div>
+
+        <div>
+            <label for="contractemail">業務聯繫人郵件地址</label>
+            <input type="text" name="contractemail" id="contractemail" >
+        </div>
+
+        <div>
+            <label for="contract_employee">契約人員工號</label>
+            <input type="text" name="contract_employee" id="contract_employee" >
+        </div>
+
+        <div>
+            <label for="start_date">合約起始年月日(必填)</label><br>
+            <input type="text" data-date-format="yyyy-mm-dd" name="start_date" id="start_date" value="<?php echo date('Y-m-d'); ?>" required>
+        </div>
+
+        <div>
+            <label for="end_date">合約終止年月日(必填)</label><br>
+            <input type="text" data-date-format="yyyy-mm-dd" name="end_date" id="end_date" value="<?php echo date('Y-m-d',strtotime('+364 day')); ?>" required>
+        </div>
+
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater">
+<!--            <p class="error">--><?php //echo $creater_error; ?><!--</p>-->
+        </div>
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
+<!--            <p class="error">--><?php //echo $create_at_error; ?><!--</p>-->
+        </div>
+
+        <div>
+            <br>
+            <button type="submit" name="submit">確定</button>
+        </div>
+
+    </form
+</div>
+
+<div class="container hidden">
+    <label for="fileToUpload">作番資料添加</label>
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+
+
+        <div>
+            <label for="contractno">合約號(必填)</label>
+            <input type="text" name="contractno" id="contractno" required>
+        </div>
+
+        <div>
+            <label for="facilityno">作番號(必填)</label>
+            <input type="text" name="facilityno" id="facilityno" required>
+        </div>
+
+        <div>
+            <label for="customerid">客戶編號(必填)</label>
+            <input type="text" name="customerid" id="customerid" required>
+        </div>
+
+        <div>
+            <label for="weight">重量(必填)</label>
+            <input type="text" name="weight" id="weight" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="numberofstop">停數(必填)</label>
+            <input type="text" name="numberofstop" id="numberofstop" onkeyup="if(value<0)value=0;if(value.length>3)value=value.slice(0,3);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="numberoffloor">樓層數(必填)</label>
+            <input type="text" name="numberoffloor" id="numberoffloor" onkeyup="if(value<0)value=0;if(value.length>3)value=value.slice(0,3);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="opentype">開門方式(必填)</label>
+            <Select name="opentype" id="opentype" required>
+                <option selected="selected" disabled="disabled"  style="display: none" value=""></option>
+                <Option Value="CO">CO</Option>
+                <Option Value="SO">SO</Option>
+                <Option Value="CO-SO">CO-SO</Option>
+            </Select>
+            <!-- <input type="text" name="opentype" id="opentype" > -->
+        </div>
+
+        <div>
+            <label for="speed">速度(必填)</label>
+            <input type="text" name="speed" id="speed" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="repairtype">維修型態(必填)</label>
+            <Select name="repairtype" id="repairtype" required>
+                <option selected="selected" disabled="disabled"  style="display: none" value=""></option>
+                <Option Value="A">定期保養</Option>
+                <Option Value="B">單次保養</Option>
+                <Option Value="C">單次維修</Option>
+            </Select>
+            <!-- <input type="text" name="repairtype" id="repairtype" > -->
+        </div>
+
+        <div>
+            <label for="longitude">經度(必填)</label>
+            <input type="text" name="longitude" id="longitude" onkeyup="if(value<0)value=0;if(value.length>11)value=value.slice(0,11);value=value.replace(/^\D*(\d*(?:\.\d{0,7})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="latitude">緯度(必填)</label>
+            <input type="latitude" name="latitude" id="latitude" onkeyup="if(value<0)value=0;if(value.length>11)value=value.slice(0,11);value=value.replace(/^\D*(\d*(?:\.\d{0,7})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="address">地址</label>
+            <input type="text" name="address" id="address" >
+        </div>
+
+        <div>
+            <label for="repairerid">維修人員工號(必填)</label>
+            <input type="text" name="repairerid" id="repairerid" required>
+        </div>
+
+        <div>
+            <label for="repairername">維修人員姓名(必填)</label>
+            <input type="text" name="repairername" id="repairername" required>
+        </div>
+
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater">
+        </div>
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+
+        <div>
+            <button type="submit" name="submit">確定</button>
+        </div>
+
+    </form>
+
+</div>
+
+
+
diff --git a/wms/data_collection_merge_export_submit.php b/wms/data_collection_merge_export_submit.php
index fb64e9c1..401e9a39 100644
--- a/wms/data_collection_merge_export_submit.php
+++ b/wms/data_collection_merge_export_submit.php
@@ -1,111 +1,111 @@
-<?php
-#error_reporting(E_ALL);
-#ini_set('display_errors', "On");
-ob_start();
-$user_id = '73376';
-require_once "../database.php";
-/**
-
-
-
- */
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    //   include "header.php";
-    // 载入db.php来连结资料库
-    require_once "../database.php";
-    require_once '../PHPExcel/PHPExcel.php';
-    require_once '../PHPExcel/IOFactory.php';
-    //$target_dir = "../inv-uploads/";
-    $target_file = 'data_collection_merge_template.xlsx';
-    $EXTENSION = pathinfo($target_file, PATHINFO_EXTENSION);
-
-    if ($EXTENSION == 'xls') {
-        $objReader = PHPExcel_IOFactory::createReader('Excel5'); //支持xls
-    } else {
-        $objReader = PHPExcel_IOFactory::createReader('Excel2007'); //支持xlsx是
-    }
-    $objPHPExcel = $objReader->load($target_file); //读取上传到服务器的文件
-    $sheet = $objPHPExcel->getSheet(0); //拿到第一个sheet数据
-    $highestRow = $sheet->getHighestRow(); // 取得总行数
-    $highestColumn = $sheet->getHighestColumn(); // 取得总列数
-    $highestColumn = PHPExcel_Cell::columnIndexFromString($highestColumn); // 转换字母为对应的统计数字；
-    $excelArray = array();
-    $data = [];
-    $data['yyyymm'] =    $_POST['yyyymm'];
-    $i = 2;
-    $sql_get = "select *From ec_purchase_order where yyyymm='" . $data['yyyymm'] . "' ";
-    $res_get = mysqli_fetch_all(mysqli_query($link, $sql_get), MYSQLI_ASSOC);
-    #excel 第一行 从B3-H3
-    foreach ($res_get  as $key => $val) {
-        //  var_dump( $key);
-        //	$_val = $sheet->getCellByColumnAndRow(0, $i++)->getCalculatedValue();
-        //if ($_val == "") return;
-        //   $value = $sheet->getCell($key)->getValue();
-        // var_dump( $val);
-        # 1	銀行編碼
-        $sheet->setCellValueExplicit('A' . ($key + 2), '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #2	繳款帳號
-        $sheet->setCellValueExplicit('B' . ($key + 2), date("Y-m-d"), \PHPExcel_Cell_DataType::TYPE_STRING);
-        #3	客戶屬性
-        $sheet->setCellValueExplicit('C' . ($key + 2), '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #4	幣別
-        $sheet->setCellValueExplicit('D' . ($key + 2),  'TWD', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #5	客戶代號
-        $sheet->setCellValueExplicit('E' . ($key + 2),   substr($val['customerid'], 1), \PHPExcel_Cell_DataType::TYPE_STRING);
-        # 6客戶名稱
-        $sheet->setCellValueExplicit('F' . ($key + 2),   $val['customer_name'], \PHPExcel_Cell_DataType::TYPE_STRING);
-        # 7	繳費說明1
-        $sheet->setCellValueExplicit('G' . ($key + 2), '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        # 8 繳費說明2
-        $sheet->setCellValueExplicit('H' . ($key + 2), '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #9	繳費說明3
-        $sheet->setCellValueExplicit('I' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #10	繳費說明3
-        $sheet->setCellValueExplicit('J' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #11	繳費說明4
-        $sheet->setCellValueExplicit('K' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #12繳費說明5
-        $sheet->setCellValueExplicit('L' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #13	繳款截止日
-        $sheet->setCellValueExplicit('M' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #14	期別說明
-        $sheet->setCellValueExplicit('N' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #15	繳費通路別-銀行
-        $sheet->setCellValueExplicit('O' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #16 繳費通路別-郵局
-        $sheet->setCellValueExplicit('P' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #17	應繳總額
-        $sheet->setCellValueExplicit('Q' . ($key + 2), $val['summary_price'], \PHPExcel_Cell_DataType::TYPE_STRING);
-        #18	保留欄1
-        $sheet->setCellValueExplicit('R' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #19	保留欄2
-        $sheet->setCellValueExplicit('S' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #20	收費項目
-        $sheet->setCellValueExplicit('T' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #21	應繳金額
-        $sheet->setCellValueExplicit('U' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #22	說明
-        $sheet->setCellValueExplicit('V' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #23	收費項目
-        $sheet->setCellValueExplicit('W' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #24	應繳金額
-        $sheet->setCellValueExplicit('X' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #25	說明
-        $sheet->setCellValueExplicit('Y' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        #26	結尾符號
-        $sheet->setCellValueExplicit('Z' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
-        // $data[$excel_field_mapping[$key]] = (empty($value) || $value == '') ? 'null' : "'" . $value . "'"; //读取excel数据到数组
-    }
-
-    //页面导出
-    header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
-    //设置下载的文件名称
-    header('Content-Disposition: attachment;filename=' . urlencode('代收資料匯入檔') . '.xlsx');
-    header('Cache-Control: max-age=0');
-    header('Cache-Control: max-age=1');
-    header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-    header('Cache-Control: cache, must-revalidate');
-    header('Pragma: public');
-    $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
-    $objWriter->save('php://output');
-}
+<?php
+#error_reporting(E_ALL);
+#ini_set('display_errors', "On");
+ob_start();
+$user_id = '73376';
+require_once "../database.php";
+/**
+
+
+
+ */
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    //   include "header.php";
+    // 载入db.php来连结资料库
+    require_once "../database.php";
+    require_once '../PHPExcel/PHPExcel.php';
+    require_once '../PHPExcel/IOFactory.php';
+    //$target_dir = "../inv-uploads/";
+    $target_file = 'data_collection_merge_template.xlsx';
+    $EXTENSION = pathinfo($target_file, PATHINFO_EXTENSION);
+
+    if ($EXTENSION == 'xls') {
+        $objReader = PHPExcel_IOFactory::createReader('Excel5'); //支持xls
+    } else {
+        $objReader = PHPExcel_IOFactory::createReader('Excel2007'); //支持xlsx是
+    }
+    $objPHPExcel = $objReader->load($target_file); //读取上传到服务器的文件
+    $sheet = $objPHPExcel->getSheet(0); //拿到第一个sheet数据
+    $highestRow = $sheet->getHighestRow(); // 取得总行数
+    $highestColumn = $sheet->getHighestColumn(); // 取得总列数
+    $highestColumn = PHPExcel_Cell::columnIndexFromString($highestColumn); // 转换字母为对应的统计数字；
+    $excelArray = array();
+    $data = [];
+    $data['yyyymm'] =    $_POST['yyyymm'];
+    $i = 2;
+    $sql_get = "select *From ec_purchase_order where yyyymm='" . $data['yyyymm'] . "' ";
+    $res_get = mysqli_fetch_all(mysqli_query($link, $sql_get), MYSQLI_ASSOC);
+    #excel 第一行 从B3-H3
+    foreach ($res_get  as $key => $val) {
+        //  var_dump( $key);
+        //	$_val = $sheet->getCellByColumnAndRow(0, $i++)->getCalculatedValue();
+        //if ($_val == "") return;
+        //   $value = $sheet->getCell($key)->getValue();
+        // var_dump( $val);
+        # 1	銀行編碼
+        $sheet->setCellValueExplicit('A' . ($key + 2), '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #2	繳款帳號
+        $sheet->setCellValueExplicit('B' . ($key + 2), date("Y-m-d"), \PHPExcel_Cell_DataType::TYPE_STRING);
+        #3	客戶屬性
+        $sheet->setCellValueExplicit('C' . ($key + 2), '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #4	幣別
+        $sheet->setCellValueExplicit('D' . ($key + 2),  'TWD', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #5	客戶代號
+        $sheet->setCellValueExplicit('E' . ($key + 2),   substr($val['customerid'], 1), \PHPExcel_Cell_DataType::TYPE_STRING);
+        # 6客戶名稱
+        $sheet->setCellValueExplicit('F' . ($key + 2),   $val['customer_name'], \PHPExcel_Cell_DataType::TYPE_STRING);
+        # 7	繳費說明1
+        $sheet->setCellValueExplicit('G' . ($key + 2), '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        # 8 繳費說明2
+        $sheet->setCellValueExplicit('H' . ($key + 2), '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #9	繳費說明3
+        $sheet->setCellValueExplicit('I' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #10	繳費說明3
+        $sheet->setCellValueExplicit('J' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #11	繳費說明4
+        $sheet->setCellValueExplicit('K' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #12繳費說明5
+        $sheet->setCellValueExplicit('L' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #13	繳款截止日
+        $sheet->setCellValueExplicit('M' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #14	期別說明
+        $sheet->setCellValueExplicit('N' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #15	繳費通路別-銀行
+        $sheet->setCellValueExplicit('O' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #16 繳費通路別-郵局
+        $sheet->setCellValueExplicit('P' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #17	應繳總額
+        $sheet->setCellValueExplicit('Q' . ($key + 2), $val['summary_price'], \PHPExcel_Cell_DataType::TYPE_STRING);
+        #18	保留欄1
+        $sheet->setCellValueExplicit('R' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #19	保留欄2
+        $sheet->setCellValueExplicit('S' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #20	收費項目
+        $sheet->setCellValueExplicit('T' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #21	應繳金額
+        $sheet->setCellValueExplicit('U' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #22	說明
+        $sheet->setCellValueExplicit('V' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #23	收費項目
+        $sheet->setCellValueExplicit('W' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #24	應繳金額
+        $sheet->setCellValueExplicit('X' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #25	說明
+        $sheet->setCellValueExplicit('Y' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        #26	結尾符號
+        $sheet->setCellValueExplicit('Z' . ($key + 2),  '', \PHPExcel_Cell_DataType::TYPE_STRING);
+        // $data[$excel_field_mapping[$key]] = (empty($value) || $value == '') ? 'null' : "'" . $value . "'"; //读取excel数据到数组
+    }
+
+    //页面导出
+    header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+    //设置下载的文件名称
+    header('Content-Disposition: attachment;filename=' . urlencode('代收資料匯入檔') . '.xlsx');
+    header('Cache-Control: max-age=0');
+    header('Cache-Control: max-age=1');
+    header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+    header('Cache-Control: cache, must-revalidate');
+    header('Pragma: public');
+    $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
+    $objWriter->save('php://output');
+}
diff --git a/wms/database.php b/wms/database.php
index 2311059e..88d5ebe9 100644
--- a/wms/database.php
+++ b/wms/database.php
@@ -1,42 +1,42 @@
-<?php
-date_default_timezone_set("Asia/Taipei");
-$envFile = __DIR__ . '/../.env'; // .env 文件的路径
-
-if (file_exists($envFile)) {
-    $lines = file($envFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-    if ($lines !== false) {
-        foreach ($lines as $line) {
-            list($key, $value) = explode('=', $line, 2);
-            $key = trim($key);
-            $value = trim($value);
-            // 设置环境变量
-            putenv("$key=$value");
-        }
-    }
-}
-date_default_timezone_set("Asia/Taipei");
-$host = getenv('DB_HOST');
-$dbuser = getenv('DB_USERNAME');
-$dbpassword = getenv('DB_PASSWORD');
-$dbname = getenv('DB_DATABASE');
-$link = mysqli_connect($host, $dbuser, $dbpassword, $dbname);
-
-$sqlsrv = getenv('sqlsrv');
-$Database = getenv('Database');
-$Account = getenv('Account');
-$Password = getenv('Password');
-try {
-    $conn = new PDO("sqlsrv:Server=$sqlsrv;Database=$Database", "$Account", "$Password");
-    if ($conn) {
-        $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-    }
-} catch (PDOException $e) {
-    echo "fail";
-    echo $e->getMessage();
-}
-if ($link) {
-    mysqli_query($link, 'SET NAMES utf8');
-    // echo "正確連接資料庫";
-} else {
-    echo "不正確連接資料庫</br>" . mysqli_connect_error();
-}
\ No newline at end of file
+<?php
+date_default_timezone_set("Asia/Taipei");
+$envFile = __DIR__ . '/../.env'; // .env 文件的路径
+
+if (file_exists($envFile)) {
+    $lines = file($envFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+    if ($lines !== false) {
+        foreach ($lines as $line) {
+            list($key, $value) = explode('=', $line, 2);
+            $key = trim($key);
+            $value = trim($value);
+            // 设置环境变量
+            putenv("$key=$value");
+        }
+    }
+}
+date_default_timezone_set("Asia/Taipei");
+$host = getenv('DB_HOST');
+$dbuser = getenv('DB_USERNAME');
+$dbpassword = getenv('DB_PASSWORD');
+$dbname = getenv('DB_DATABASE');
+$link = mysqli_connect($host, $dbuser, $dbpassword, $dbname);
+
+$sqlsrv = getenv('sqlsrv');
+$Database = getenv('Database');
+$Account = getenv('Account');
+$Password = getenv('Password');
+try {
+    $conn = new PDO("sqlsrv:Server=$sqlsrv;Database=$Database", "$Account", "$Password");
+    if ($conn) {
+        $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+    }
+} catch (PDOException $e) {
+    echo "fail";
+    echo $e->getMessage();
+}
+if ($link) {
+    mysqli_query($link, 'SET NAMES utf8');
+    // echo "正確連接資料庫";
+} else {
+    echo "不正確連接資料庫</br>" . mysqli_connect_error();
+}
diff --git a/wms/delivery_info-create.php b/wms/delivery_info-create.php
index dc66fa39..ceec1ab7 100644
--- a/wms/delivery_info-create.php
+++ b/wms/delivery_info-create.php
@@ -1,92 +1,92 @@
-<?php
-include "header.php";
-?>
-
-<div class="container">
-
-    <?php
-    
-        include "delivery_info-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        
-    
-        <div>
-            <label for="deliver_no">貨運單號</label>
-            <input type="text" name="deliver_no" id="deliver_no" >
-        </div>	
-
-        <div>
-            <label for="orderer_id">訂購人編號</label>
-            <input type="text" name="orderer_id" id="orderer_id" value="<?php echo $user_id; ?>">
-        </div>	
-
-        <div>
-            <label for="orderer_name">訂購人姓名</label>
-            <input type="text" name="orderer_name" id="orderer_name" value="<?php echo $user_name; ?>">
-        </div>	
-
-        <div>
-            <label for="contact_person">收件聯繫人</label>
-            <input type="text" name="contact_person" id="contact_person" >
-        </div>	
-
-        <div>
-            <label for="tel">連絡電話</label>
-            <input type="text" name="tel" id="tel" >
-        </div>	
-
-        <div>
-            <label for="address">收件地址</label>
-            <input type="text" name="address" id="address" >
-        </div>	
-
-        <div>
-            <label for="total_price_equipments">物料總價</label>
-            <input type="text" name="total_price_equipments" id="total_price_equipments" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>	
-
-        <div>
-            <label for="delivery_fee">運費</label>
-            <input type="text" name="delivery_fee" id="delivery_fee" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>	
-
-        <div>
-            <label for="tax_fee">稅金</label>
-            <input type="text" name="tax_fee" id="tax_fee" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>	
-
-        <div>
-            <label for="summation">合計</label>
-            <input type="text" name="summation" id="summation" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>	
-
-
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at" value="<?php echo date('Y/m/d H:i:s'); ?>">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-
-        <div>
-			<br>
-            <button type="submit" name="submit">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
+<?php
+include "header.php";
+?>
+
+<div class="container">
+
+    <?php
+    
+        include "delivery_info-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        
+    
+        <div>
+            <label for="deliver_no">貨運單號</label>
+            <input type="text" name="deliver_no" id="deliver_no" >
+        </div>	
+
+        <div>
+            <label for="orderer_id">訂購人編號</label>
+            <input type="text" name="orderer_id" id="orderer_id" value="<?php echo $user_id; ?>">
+        </div>	
+
+        <div>
+            <label for="orderer_name">訂購人姓名</label>
+            <input type="text" name="orderer_name" id="orderer_name" value="<?php echo $user_name; ?>">
+        </div>	
+
+        <div>
+            <label for="contact_person">收件聯繫人</label>
+            <input type="text" name="contact_person" id="contact_person" >
+        </div>	
+
+        <div>
+            <label for="tel">連絡電話</label>
+            <input type="text" name="tel" id="tel" >
+        </div>	
+
+        <div>
+            <label for="address">收件地址</label>
+            <input type="text" name="address" id="address" >
+        </div>	
+
+        <div>
+            <label for="total_price_equipments">物料總價</label>
+            <input type="text" name="total_price_equipments" id="total_price_equipments" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>	
+
+        <div>
+            <label for="delivery_fee">運費</label>
+            <input type="text" name="delivery_fee" id="delivery_fee" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>	
+
+        <div>
+            <label for="tax_fee">稅金</label>
+            <input type="text" name="tax_fee" id="tax_fee" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>	
+
+        <div>
+            <label for="summation">合計</label>
+            <input type="text" name="summation" id="summation" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>	
+
+
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at" value="<?php echo date('Y/m/d H:i:s'); ?>">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+
+        <div>
+			<br>
+            <button type="submit" name="submit">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
diff --git a/wms/delivery_info-delete.php b/wms/delivery_info-delete.php
index 462714e3..5e5eacc4 100644
--- a/wms/delivery_info-delete.php
+++ b/wms/delivery_info-delete.php
@@ -1,12 +1,12 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "DELETE FROM delivery_info WHERE id='$id'";
-mysqli_query($link, $db_query);	
-
-header("Refresh:0; url=delivery_info-index.php?function_name=delivery_info&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "DELETE FROM delivery_info WHERE id='$id'";
+mysqli_query($link, $db_query);	
+
+header("Refresh:0; url=delivery_info-index.php?function_name=delivery_info&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/delivery_info-edit.php b/wms/delivery_info-edit.php
index 04341dbe..88e5b07e 100644
--- a/wms/delivery_info-edit.php
+++ b/wms/delivery_info-edit.php
@@ -1,104 +1,104 @@
-<?php
-    include "header.php";
-
-    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-	
-	$data = array();
-	// sql語法存在變數中
-	$db_query = "SELECT * FROM delivery_info WHERE id=$id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$db_query);	
-/*
-    include "inc/record_update.php";
-    
-    try {	
-		// 設置一個空陣列來放資料
-		$data = array();
-		// sql語法存在變數中
-		$db_query = "SELECT * FROM expert WHERE id=$id";
-
-		// 用mysqli_query方法執行(sql語法)將結果存在變數中
-		$data = mysqli_query($link,$db_query);
-	}catch (Exception $e) {
-    echo 'Caught exception: ',  $e->getMessage(), "\n";
-	}
-*/	
-    foreach($data as $data) :
-?>
-
-<div class="container">
-    <form class="form-inline" method="post" action="delivery_info-record-update.php" enctype="multipart/form-data">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-		
-        <div>
-            <label for="deliver_no">貨運單號</label>
-            <input type="text" name="deliver_no" id="deliver_no" value="<?php echo $data['deliver_no']; ?>">
-        </div>	
-
-        <div>
-            <label for="orderer_id">訂購人編號</label>
-            <input type="text" name="orderer_id" id="orderer_id" value="<?php echo $data['orderer_id']; ?>">
-        </div>	
-
-        <div>
-            <label for="orderer_name">訂購人姓名</label>
-            <input type="text" name="orderer_name" id="orderer_name" value="<?php echo $data['orderer_name']; ?>">
-        </div>	
-
-        <div>
-            <label for="contact_person">收件聯繫人</label>
-            <input type="text" name="contact_person" id="contact_person" value="<?php echo $data['contact_person']; ?>">
-        </div>	
-
-        <div>
-            <label for="tel">連絡電話</label>
-            <input type="text" name="tel" id="tel" value="<?php echo $data['tel']; ?>">
-        </div>	
-
-        <div>
-            <label for="address">收件地址</label>
-            <input type="text" name="address" id="address" value="<?php echo $data['address']; ?>">
-        </div>	
-
-        <div>
-            <label for="total_price_equipments">物料總價</label>
-            <input type="text" name="total_price_equipments" id="total_price_equipments" value="<?php echo $data['total_price_equipments']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>	
-
-        <div>
-            <label for="delivery_fee">運費</label>
-            <input type="text" name="delivery_fee" id="delivery_fee" value="<?php echo $data['delivery_fee']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>	
-
-        <div>
-            <label for="tax_fee">稅金</label>
-            <input type="text" name="tax_fee" id="tax_fee" value="<?php echo $data['tax_fee']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>	
-
-        <div>
-            <label for="summation">合計</label>
-            <input type="text" name="summation" id="summation" value="<?php echo $data['summation']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>	
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at" value="<?php echo $data['create_at']; ?>">
-        </div>	
-		
-        <div>
-			<br>
-            <button type="submit" name="update">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
-?>
-
+<?php
+    include "header.php";
+
+    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+	
+	$data = array();
+	// sql語法存在變數中
+	$db_query = "SELECT * FROM delivery_info WHERE id=$id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$db_query);	
+/*
+    include "inc/record_update.php";
+    
+    try {	
+		// 設置一個空陣列來放資料
+		$data = array();
+		// sql語法存在變數中
+		$db_query = "SELECT * FROM expert WHERE id=$id";
+
+		// 用mysqli_query方法執行(sql語法)將結果存在變數中
+		$data = mysqli_query($link,$db_query);
+	}catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+	}
+*/	
+    foreach($data as $data) :
+?>
+
+<div class="container">
+    <form class="form-inline" method="post" action="delivery_info-record-update.php" enctype="multipart/form-data">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+		
+        <div>
+            <label for="deliver_no">貨運單號</label>
+            <input type="text" name="deliver_no" id="deliver_no" value="<?php echo $data['deliver_no']; ?>">
+        </div>	
+
+        <div>
+            <label for="orderer_id">訂購人編號</label>
+            <input type="text" name="orderer_id" id="orderer_id" value="<?php echo $data['orderer_id']; ?>">
+        </div>	
+
+        <div>
+            <label for="orderer_name">訂購人姓名</label>
+            <input type="text" name="orderer_name" id="orderer_name" value="<?php echo $data['orderer_name']; ?>">
+        </div>	
+
+        <div>
+            <label for="contact_person">收件聯繫人</label>
+            <input type="text" name="contact_person" id="contact_person" value="<?php echo $data['contact_person']; ?>">
+        </div>	
+
+        <div>
+            <label for="tel">連絡電話</label>
+            <input type="text" name="tel" id="tel" value="<?php echo $data['tel']; ?>">
+        </div>	
+
+        <div>
+            <label for="address">收件地址</label>
+            <input type="text" name="address" id="address" value="<?php echo $data['address']; ?>">
+        </div>	
+
+        <div>
+            <label for="total_price_equipments">物料總價</label>
+            <input type="text" name="total_price_equipments" id="total_price_equipments" value="<?php echo $data['total_price_equipments']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>	
+
+        <div>
+            <label for="delivery_fee">運費</label>
+            <input type="text" name="delivery_fee" id="delivery_fee" value="<?php echo $data['delivery_fee']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>	
+
+        <div>
+            <label for="tax_fee">稅金</label>
+            <input type="text" name="tax_fee" id="tax_fee" value="<?php echo $data['tax_fee']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>	
+
+        <div>
+            <label for="summation">合計</label>
+            <input type="text" name="summation" id="summation" value="<?php echo $data['summation']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>	
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at" value="<?php echo $data['create_at']; ?>">
+        </div>	
+		
+        <div>
+			<br>
+            <button type="submit" name="update">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php
+
+    endforeach;
+    
+    include "footer.php";
+
+?>
+
diff --git a/wms/delivery_info-index.php b/wms/delivery_info-index.php
index f5cc85bd..df0faee5 100644
--- a/wms/delivery_info-index.php
+++ b/wms/delivery_info-index.php
@@ -1,147 +1,147 @@
-<?php
-    include "header.php";
-	
-	// 設置一個空陣列來放資料
-	$data = array();
-	// sql語法存在變數中
-    $sql_cmd = sql_myself($user_id, "orderer_id");
-	$sql = "SELECT * FROM delivery_info $sql_cmd ORDER BY id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$sql);
-
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="delivery_info-create.php?function_name=delivery_info&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-
-<?php
-}
-
-
-
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:delivery_info-index.php");
-        }
-    }
-
-?>
-
-<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;
-   
-}
-
-</style>
-
-    <div style="overflow-x:auto;">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-            <tr>
-                <th>項次</th>
-                <th>貨運單號</th>
-                <th>訂購人編號</th>
-                <th>訂購人姓名</th>
-                <th>收件聯繫人</th>
-                <th>連絡電話</th>
-                <th>收件地址</th>				
-                <th>物料總價</th>
-                <th>運費</th>
-                <th>稅金</th>
-                <th>合計</th>	
-                <th>建檔日</th>					
-                <?php if ($user_auth&2) { ?>
-                <th>修改</th>
-                <th>刪除</th>
-                <?php } ?>
-            </tr>
-		</thead>
-		<tbody>			
-
-            <?php foreach($data as $data) : ?>    
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td><?php echo $data['deliver_no']; ?></td>
-                    <td><?php echo $data['orderer_id']; ?></td>
-                    <td><?php echo $data['orderer_name']; ?></td>					
-                    <td><?php echo $data['contact_person']; ?></td>
-                    <td><?php echo $data['tel']; ?></td>	
-                    <td><?php echo $data['address']; ?></td>	
-                    <td><?php echo $data['total_price_equipments']; ?></td>	
-                    <td><?php echo $data['delivery_fee']; ?></td>		
-                    <td><?php echo $data['tax_fee']; ?></td>	
-                    <td><?php echo $data['summation']; ?></td>					
-                    <td><?php echo $data['create_at']; ?></td>
-                    <?php if ($user_auth&2) { ?>
-                    <td>
-						<p>
-							<a href="delivery_info-edit.php?id=<?php echo $data['id']; ?>&function_name=delivery_info&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-								<span class="glyphicon glyphicon-pencil"></span>
-							</a>
-						</p> 
-					</td>
-                    <td>
-						<p>
-							<a href="delivery_info-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-								<span class="glyphicon glyphicon-remove"></span>
-							</a>
-						</p> 
-					</td>
-                    <?php } ?>
-                </tr>
-            <?php endforeach; ?>
-			</tbody>			
-        </table>
-    </div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-
+<?php
+    include "header.php";
+	
+	// 設置一個空陣列來放資料
+	$data = array();
+	// sql語法存在變數中
+    $sql_cmd = sql_myself($user_id, "orderer_id");
+	$sql = "SELECT * FROM delivery_info $sql_cmd ORDER BY id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$sql);
+
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth&2) { ?>
+<p>
+<a href="delivery_info-create.php?function_name=delivery_info&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+
+<?php
+}
+
+
+
+if($data):
+    
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:delivery_info-index.php");
+        }
+    }
+
+?>
+
+<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;
+   
+}
+
+</style>
+
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+            <tr>
+                <th>項次</th>
+                <th>貨運單號</th>
+                <th>訂購人編號</th>
+                <th>訂購人姓名</th>
+                <th>收件聯繫人</th>
+                <th>連絡電話</th>
+                <th>收件地址</th>				
+                <th>物料總價</th>
+                <th>運費</th>
+                <th>稅金</th>
+                <th>合計</th>	
+                <th>建檔日</th>					
+                <?php if ($user_auth&2) { ?>
+                <th>修改</th>
+                <th>刪除</th>
+                <?php } ?>
+            </tr>
+		</thead>
+		<tbody>			
+
+            <?php foreach($data as $data) : ?>    
+                <tr>
+                    <td><?php echo $data['id']; ?></td>
+                    <td><?php echo $data['deliver_no']; ?></td>
+                    <td><?php echo $data['orderer_id']; ?></td>
+                    <td><?php echo $data['orderer_name']; ?></td>					
+                    <td><?php echo $data['contact_person']; ?></td>
+                    <td><?php echo $data['tel']; ?></td>	
+                    <td><?php echo $data['address']; ?></td>	
+                    <td><?php echo $data['total_price_equipments']; ?></td>	
+                    <td><?php echo $data['delivery_fee']; ?></td>		
+                    <td><?php echo $data['tax_fee']; ?></td>	
+                    <td><?php echo $data['summation']; ?></td>					
+                    <td><?php echo $data['create_at']; ?></td>
+                    <?php if ($user_auth&2) { ?>
+                    <td>
+						<p>
+							<a href="delivery_info-edit.php?id=<?php echo $data['id']; ?>&function_name=delivery_info&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+								<span class="glyphicon glyphicon-pencil"></span>
+							</a>
+						</p> 
+					</td>
+                    <td>
+						<p>
+							<a href="delivery_info-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+						</p> 
+					</td>
+                    <?php } ?>
+                </tr>
+            <?php endforeach; ?>
+			</tbody>			
+        </table>
+    </div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+
 ?>
\ No newline at end of file
diff --git a/wms/delivery_info-record-submit.php b/wms/delivery_info-record-submit.php
index 8095d0e2..e137ff20 100644
--- a/wms/delivery_info-record-submit.php
+++ b/wms/delivery_info-record-submit.php
@@ -1,49 +1,49 @@
-<?php
-$deliver_no= "";
-$orderer_id= "";
-$orderer_name= "";
-$contact_person= "";
-$tel= "";
-$address= "";
-$total_price_equipments= "";
-$delivery_fee= "";
-$tax_fee= "";
-$summation= "";
-$create_at= "";
-
-
-$deliver_no_error= "";
-$orderer_id_error= "";
-$orderer_name_error= "";
-$contact_person_error= "";
-$tel_error= "";
-$address_error= "";
-$total_price_equipments_error= "";
-$delivery_fee_error= "";
-$tax_fee_error= "";
-$summation_error= "";
-$create_at_error = "";
-
-
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    include "delivery_info-user-input.php";
-
-    $db_query = "INSERT INTO delivery_info (deliver_no, orderer_id, orderer_name, contact_person, tel, address, total_price_equipments, delivery_fee, tax_fee, summation, create_at) VALUES ('$deliver_no', '$orderer_id', '$orderer_name', '$contact_person','$tel', '$address', '$total_price_equipments', '$delivery_fee', '$tax_fee', '$summation', '$create_at')";    	                      
-    $result = mysqli_query($link,$db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='delivery_info-index.php?function_name=delivery_info&".$token_link."';";
-        echo "</script>";  
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='delivery_info-index.php?function_name=delivery_info&".$token_link."';";
-        echo "</script>";  
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
-?>
+<?php
+$deliver_no= "";
+$orderer_id= "";
+$orderer_name= "";
+$contact_person= "";
+$tel= "";
+$address= "";
+$total_price_equipments= "";
+$delivery_fee= "";
+$tax_fee= "";
+$summation= "";
+$create_at= "";
+
+
+$deliver_no_error= "";
+$orderer_id_error= "";
+$orderer_name_error= "";
+$contact_person_error= "";
+$tel_error= "";
+$address_error= "";
+$total_price_equipments_error= "";
+$delivery_fee_error= "";
+$tax_fee_error= "";
+$summation_error= "";
+$create_at_error = "";
+
+
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    include "delivery_info-user-input.php";
+
+    $db_query = "INSERT INTO delivery_info (deliver_no, orderer_id, orderer_name, contact_person, tel, address, total_price_equipments, delivery_fee, tax_fee, summation, create_at) VALUES ('$deliver_no', '$orderer_id', '$orderer_name', '$contact_person','$tel', '$address', '$total_price_equipments', '$delivery_fee', '$tax_fee', '$summation', '$create_at')";    	                      
+    $result = mysqli_query($link,$db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='delivery_info-index.php?function_name=delivery_info&".$token_link."';";
+        echo "</script>";  
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='delivery_info-index.php?function_name=delivery_info&".$token_link."';";
+        echo "</script>";  
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
+?>
diff --git a/wms/delivery_info-record-update.php b/wms/delivery_info-record-update.php
index 3c04a926..45befd4a 100644
--- a/wms/delivery_info-record-update.php
+++ b/wms/delivery_info-record-update.php
@@ -1,44 +1,44 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-    function user_input( $data ) {
-        $data1 = trim($data);
-        $data2 = stripslashes($data1);
-        $data3 = htmlspecialchars($data2);
-        return $data3;
-    }
-
-    $id     = $_POST['id'];
-    $deliver_no   = user_input($_POST["deliver_no"]);	
-    $orderer_id   = user_input($_POST["orderer_id"]);	
-    $orderer_name   = user_input($_POST["orderer_name"]);	
-    $contact_person   = user_input($_POST["contact_person"]);	
-    $tel   = user_input($_POST["tel"]);	
-    $address   = user_input($_POST["address"]);	
-    $total_price_equipments   = user_input($_POST["total_price_equipments"]);	
-    $delivery_fee   = user_input($_POST["delivery_fee"]);	
-    $tax_fee   = user_input($_POST["tax_fee"]);	
-    $summation   = user_input($_POST["summation"]);	
-    $create_at     = user_input($_POST["create_at"]);
-
-    $db_query = "UPDATE delivery_info set deliver_no = '$deliver_no', orderer_id = '$orderer_id', orderer_name = '$orderer_name', contact_person = '$contact_person', tel = '$tel', address = '$address', total_price_equipments = '$total_price_equipments', delivery_fee = '$delivery_fee', tax_fee = '$tax_fee', summation = '$summation', create_at = '$create_at' WHERE id='$id'";
-    mysqli_query($link, $db_query);
-    header("location: delivery_info-index.php");
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='delivery_info-index.php?function_name=delivery_info&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='delivery_info-index.php?function_name=delivery_info&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if(isset($_POST['update'])) {
+    function user_input( $data ) {
+        $data1 = trim($data);
+        $data2 = stripslashes($data1);
+        $data3 = htmlspecialchars($data2);
+        return $data3;
+    }
+
+    $id     = $_POST['id'];
+    $deliver_no   = user_input($_POST["deliver_no"]);	
+    $orderer_id   = user_input($_POST["orderer_id"]);	
+    $orderer_name   = user_input($_POST["orderer_name"]);	
+    $contact_person   = user_input($_POST["contact_person"]);	
+    $tel   = user_input($_POST["tel"]);	
+    $address   = user_input($_POST["address"]);	
+    $total_price_equipments   = user_input($_POST["total_price_equipments"]);	
+    $delivery_fee   = user_input($_POST["delivery_fee"]);	
+    $tax_fee   = user_input($_POST["tax_fee"]);	
+    $summation   = user_input($_POST["summation"]);	
+    $create_at     = user_input($_POST["create_at"]);
+
+    $db_query = "UPDATE delivery_info set deliver_no = '$deliver_no', orderer_id = '$orderer_id', orderer_name = '$orderer_name', contact_person = '$contact_person', tel = '$tel', address = '$address', total_price_equipments = '$total_price_equipments', delivery_fee = '$delivery_fee', tax_fee = '$tax_fee', summation = '$summation', create_at = '$create_at' WHERE id='$id'";
+    mysqli_query($link, $db_query);
+    header("location: delivery_info-index.php");
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='delivery_info-index.php?function_name=delivery_info&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='delivery_info-index.php?function_name=delivery_info&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/delivery_info-user-input.php b/wms/delivery_info-user-input.php
index 9a78ebd9..b8c4aec9 100644
--- a/wms/delivery_info-user-input.php
+++ b/wms/delivery_info-user-input.php
@@ -1,58 +1,58 @@
-<?php
-
-//Function to filter the form input
-function user_input( $data ) {
-    $data1 = trim($data);
-    $data2 = stripslashes($data1);
-    $data3 = htmlspecialchars($data2);
-    return $data3;
-}
-
-
-$deliver_no   = user_input($_POST["deliver_no"]);	
-$orderer_id   = user_input($_POST["orderer_id"]);	
-$orderer_name   = user_input($_POST["orderer_name"]);	
-$contact_person   = user_input($_POST["contact_person"]);	
-$tel   = user_input($_POST["tel"]);	
-$address   = user_input($_POST["address"]);	
-$total_price_equipments   = user_input($_POST["total_price_equipments"]);	
-$delivery_fee   = user_input($_POST["delivery_fee"]);	
-$tax_fee   = user_input($_POST["tax_fee"]);	
-$summation   = user_input($_POST["summation"]);	
-$create_at     = user_input($_POST["create_at"]);
-
-
-
-
-/*
-
-if(empty($_POST["name"])) {
-    $name_error = "Name is required";
-} else {
-    $name = user_input($_POST["name"]);
-    
-    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
-        $name_error = "Only letter and white space are allowed";
-    }
-}
-
-
-/*
-if(empty($_POST["website"])) {
-    $website_error = "Website address is required";
-} else {
-    $website = user_input($_POST["website"]);
-
-    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
-        $website_error = "Invalid website URL";
-    }
-}
-
-if(empty($_POST["comment"])) {
-    $comment = "";
-} else {
-    $comment = user_input($_POST["comment"]);
-}
-*/
-?>
-
+<?php
+
+//Function to filter the form input
+function user_input( $data ) {
+    $data1 = trim($data);
+    $data2 = stripslashes($data1);
+    $data3 = htmlspecialchars($data2);
+    return $data3;
+}
+
+
+$deliver_no   = user_input($_POST["deliver_no"]);	
+$orderer_id   = user_input($_POST["orderer_id"]);	
+$orderer_name   = user_input($_POST["orderer_name"]);	
+$contact_person   = user_input($_POST["contact_person"]);	
+$tel   = user_input($_POST["tel"]);	
+$address   = user_input($_POST["address"]);	
+$total_price_equipments   = user_input($_POST["total_price_equipments"]);	
+$delivery_fee   = user_input($_POST["delivery_fee"]);	
+$tax_fee   = user_input($_POST["tax_fee"]);	
+$summation   = user_input($_POST["summation"]);	
+$create_at     = user_input($_POST["create_at"]);
+
+
+
+
+/*
+
+if(empty($_POST["name"])) {
+    $name_error = "Name is required";
+} else {
+    $name = user_input($_POST["name"]);
+    
+    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
+        $name_error = "Only letter and white space are allowed";
+    }
+}
+
+
+/*
+if(empty($_POST["website"])) {
+    $website_error = "Website address is required";
+} else {
+    $website = user_input($_POST["website"]);
+
+    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
+        $website_error = "Invalid website URL";
+    }
+}
+
+if(empty($_POST["comment"])) {
+    $comment = "";
+} else {
+    $comment = user_input($_POST["comment"]);
+}
+*/
+?>
+
diff --git a/wms/delivery_log-create.php b/wms/delivery_log-create.php
index a8cd1042..bf85f7bf 100644
--- a/wms/delivery_log-create.php
+++ b/wms/delivery_log-create.php
@@ -1,66 +1,66 @@
-<?php
-include "header.php";
-?>
-
-<div class="container">
-
-    <?php
-    
-        include "delivery_log-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        
-    
-        <div>
-            <label for="delivery_no">貨運單號</label>
-            <input type="text" name="delivery_no" id="delivery_no" >
-        </div>	
-
-        <div>
-            <label for="issue_time">實際抵達時間</label>
-            <input type="text" name="issue_time" id="issue_time" value="<?php echo date('Y/m/d H:i:s'); ?>">
-        </div>	
-		
-        <div>
-            <label for="location">地點</label>
-            <input type="text" name="location" id="location">
-        </div>	
-				
-        <div>
-            <label for="memo">備註</label>
-            <input type="text" name="memo" id="memo" >
-        </div>
-
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
-            <p class="error"><?php echo $creater_error; ?></p>
-        </div>
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-
-        <div>
-			<br>
-            <button type="submit" name="submit">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
+<?php
+include "header.php";
+?>
+
+<div class="container">
+
+    <?php
+    
+        include "delivery_log-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        
+    
+        <div>
+            <label for="delivery_no">貨運單號</label>
+            <input type="text" name="delivery_no" id="delivery_no" >
+        </div>	
+
+        <div>
+            <label for="issue_time">實際抵達時間</label>
+            <input type="text" name="issue_time" id="issue_time" value="<?php echo date('Y/m/d H:i:s'); ?>">
+        </div>	
+		
+        <div>
+            <label for="location">地點</label>
+            <input type="text" name="location" id="location">
+        </div>	
+				
+        <div>
+            <label for="memo">備註</label>
+            <input type="text" name="memo" id="memo" >
+        </div>
+
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
+            <p class="error"><?php echo $creater_error; ?></p>
+        </div>
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+
+        <div>
+			<br>
+            <button type="submit" name="submit">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
diff --git a/wms/delivery_log-delete.php b/wms/delivery_log-delete.php
index b1e23338..9512bfd9 100644
--- a/wms/delivery_log-delete.php
+++ b/wms/delivery_log-delete.php
@@ -1,12 +1,12 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "DELETE FROM delivery_log WHERE id='$id'";
-mysqli_query($link, $db_query);	
-
-header("Refresh:0; url=delivery_log-index.php?function_name=delivery_log&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "DELETE FROM delivery_log WHERE id='$id'";
+mysqli_query($link, $db_query);	
+
+header("Refresh:0; url=delivery_log-index.php?function_name=delivery_log&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/delivery_log-edit.php b/wms/delivery_log-edit.php
index c69dd25a..c096eeaf 100644
--- a/wms/delivery_log-edit.php
+++ b/wms/delivery_log-edit.php
@@ -1,75 +1,75 @@
-<?php
-    include "header.php";
-
-    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-	
-	$data = array();
-	// sql語法存在變數中
-	$db_query = "SELECT * FROM delivery_log WHERE id=$id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$db_query);	
-/*
-    include "inc/record_update.php";
-    
-    try {	
-		// 設置一個空陣列來放資料
-		$data = array();
-		// sql語法存在變數中
-		$db_query = "SELECT * FROM expert WHERE id=$id";
-
-		// 用mysqli_query方法執行(sql語法)將結果存在變數中
-		$data = mysqli_query($link,$db_query);
-	}catch (Exception $e) {
-    echo 'Caught exception: ',  $e->getMessage(), "\n";
-	}
-*/	
-    foreach($data as $data) :
-?>
-
-<div class="container">
-    <form class="form-inline" method="post" action="delivery_log-record-update.php" enctype="multipart/form-data">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-		
-        <div>
-            <label for="delivery_no">貨運單號</label>
-            <input type="text" name="delivery_no" id="delivery_no" value="<?php echo $data['deliver_no']; ?>">
-        </div>	
-
-        <div>
-            <label for="issue_time">實際抵達時間</label>
-            <input type="text" name="issue_time" id="issue_time" value="<?php echo $data['issue_time']; ?>">
-        </div>	
-		
-        <div>
-            <label for="location">地點</label>
-            <input type="text" name="location" id="location" value="<?php echo $data['location']; ?>">
-        </div>	
-				
-        <div>
-            <label for="memo">備註</label>
-            <input type="text" name="memo" id="memo" value="<?php echo $data['memo']; ?>">
-        </div>	
-
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
-        </div>
-		
-		
-        <div>
-			<br>
-            <button type="submit" name="update">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
-?>
-
+<?php
+    include "header.php";
+
+    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+	
+	$data = array();
+	// sql語法存在變數中
+	$db_query = "SELECT * FROM delivery_log WHERE id=$id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$db_query);	
+/*
+    include "inc/record_update.php";
+    
+    try {	
+		// 設置一個空陣列來放資料
+		$data = array();
+		// sql語法存在變數中
+		$db_query = "SELECT * FROM expert WHERE id=$id";
+
+		// 用mysqli_query方法執行(sql語法)將結果存在變數中
+		$data = mysqli_query($link,$db_query);
+	}catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+	}
+*/	
+    foreach($data as $data) :
+?>
+
+<div class="container">
+    <form class="form-inline" method="post" action="delivery_log-record-update.php" enctype="multipart/form-data">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+		
+        <div>
+            <label for="delivery_no">貨運單號</label>
+            <input type="text" name="delivery_no" id="delivery_no" value="<?php echo $data['deliver_no']; ?>">
+        </div>	
+
+        <div>
+            <label for="issue_time">實際抵達時間</label>
+            <input type="text" name="issue_time" id="issue_time" value="<?php echo $data['issue_time']; ?>">
+        </div>	
+		
+        <div>
+            <label for="location">地點</label>
+            <input type="text" name="location" id="location" value="<?php echo $data['location']; ?>">
+        </div>	
+				
+        <div>
+            <label for="memo">備註</label>
+            <input type="text" name="memo" id="memo" value="<?php echo $data['memo']; ?>">
+        </div>	
+
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
+        </div>
+		
+		
+        <div>
+			<br>
+            <button type="submit" name="update">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php
+
+    endforeach;
+    
+    include "footer.php";
+
+?>
+
diff --git a/wms/delivery_log-index.php b/wms/delivery_log-index.php
index bfa64956..d94d9c3e 100644
--- a/wms/delivery_log-index.php
+++ b/wms/delivery_log-index.php
@@ -1,137 +1,137 @@
-<?php
-    include "header.php";
-	
-	// 設置一個空陣列來放資料
-	$data = array();
-	// sql語法存在變數中
-    $sql_cmd = sql_myself($user_id);
-	$sql = "SELECT * FROM delivery_log $sql_cmd ORDER BY id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$sql);
-
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="delivery_log-create.php?function_name=delivery_log&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-
-<?php
-}
-
-
-
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:delivery_log-index.php");
-        }
-    }
-
-?>
-
-<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;
-   
-}
-
-</style>
-
-    <div style="overflow-x:auto;">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-            <tr>
-                <th>項次</th>
-                <th>貨運單號</th>
-                <th>實際抵達時間</th>
-                <th>地點</th>
-                <th>備註</th>
-                <th>建檔人</th>
-                <th>建檔時間</th>				
-                <?php if ($user_auth&2) { ?>
-                <th>修改</th>
-                <th>刪除</th>
-                <?php } ?>
-            </tr>
-		</thead>
-		<tbody>			
-
-            <?php foreach($data as $data) : ?>    
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td><?php echo $data['deliver_no']; ?></td>
-                    <td><?php echo $data['issue_time']; ?></td>
-                    <td><?php echo $data['location']; ?></td>
-                    <td><?php echo $data['memo']; ?></td>
-                    <td><?php echo $data['creater']; ?></td>
-                    <td><?php echo $data['create_at']; ?></td>
-                    <?php if ($user_auth&2) { ?>
-                    <td>
-						<p>
-							<a href="delivery_log-edit.php?id=<?php echo $data['id']; ?>&function_name=delivery_log&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-								<span class="glyphicon glyphicon-pencil"></span>
-							</a>
-						</p> 
-					</td>
-                    <td>
-						<p>
-							<a href="delivery_log-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-								<span class="glyphicon glyphicon-remove"></span>
-							</a>
-						</p> 
-					</td>
-                    <?php } ?>
-                </tr>
-            <?php endforeach; ?>
-			</tbody>			
-        </table>
-    </div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-
+<?php
+    include "header.php";
+	
+	// 設置一個空陣列來放資料
+	$data = array();
+	// sql語法存在變數中
+    $sql_cmd = sql_myself($user_id);
+	$sql = "SELECT * FROM delivery_log $sql_cmd ORDER BY id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$sql);
+
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth&2) { ?>
+<p>
+<a href="delivery_log-create.php?function_name=delivery_log&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+
+<?php
+}
+
+
+
+if($data):
+    
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:delivery_log-index.php");
+        }
+    }
+
+?>
+
+<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;
+   
+}
+
+</style>
+
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+            <tr>
+                <th>項次</th>
+                <th>貨運單號</th>
+                <th>實際抵達時間</th>
+                <th>地點</th>
+                <th>備註</th>
+                <th>建檔人</th>
+                <th>建檔時間</th>				
+                <?php if ($user_auth&2) { ?>
+                <th>修改</th>
+                <th>刪除</th>
+                <?php } ?>
+            </tr>
+		</thead>
+		<tbody>			
+
+            <?php foreach($data as $data) : ?>    
+                <tr>
+                    <td><?php echo $data['id']; ?></td>
+                    <td><?php echo $data['deliver_no']; ?></td>
+                    <td><?php echo $data['issue_time']; ?></td>
+                    <td><?php echo $data['location']; ?></td>
+                    <td><?php echo $data['memo']; ?></td>
+                    <td><?php echo $data['creater']; ?></td>
+                    <td><?php echo $data['create_at']; ?></td>
+                    <?php if ($user_auth&2) { ?>
+                    <td>
+						<p>
+							<a href="delivery_log-edit.php?id=<?php echo $data['id']; ?>&function_name=delivery_log&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+								<span class="glyphicon glyphicon-pencil"></span>
+							</a>
+						</p> 
+					</td>
+                    <td>
+						<p>
+							<a href="delivery_log-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+						</p> 
+					</td>
+                    <?php } ?>
+                </tr>
+            <?php endforeach; ?>
+			</tbody>			
+        </table>
+    </div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+
 ?>
\ No newline at end of file
diff --git a/wms/delivery_log-record-submit.php b/wms/delivery_log-record-submit.php
index 040cb275..3f97abee 100644
--- a/wms/delivery_log-record-submit.php
+++ b/wms/delivery_log-record-submit.php
@@ -1,38 +1,38 @@
-<?php
-$deliver_no= "";
-$issue_time= "";
-$location= "";
-$memo= "";
-$creater= "";
-$create_at= "";
-
-$deliver_no_error= "";
-$issue_time_error= "";
-$location_error= "";
-$memo_error= "";
-$creater_error = "";
-$create_at_error = "";
-
-
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    include "delivery_log-user-input.php";
-
-    $db_query = "INSERT INTO delivery_log(deliver_no, issue_time, location, memo,creater,create_at) VALUES ('$deliver_no', '$issue_time', '$location', '$memo','$creater', '$create_at')";    	                      
-    $result = mysqli_query($link,$db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='delivery_log-index.php?function_name=delivery_log&".$token_link."';";
-        echo "</script>";  
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='delivery_log-index.php?function_name=delivery_log&".$token_link."';";
-        echo "</script>";  
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
-?>
+<?php
+$deliver_no= "";
+$issue_time= "";
+$location= "";
+$memo= "";
+$creater= "";
+$create_at= "";
+
+$deliver_no_error= "";
+$issue_time_error= "";
+$location_error= "";
+$memo_error= "";
+$creater_error = "";
+$create_at_error = "";
+
+
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    include "delivery_log-user-input.php";
+
+    $db_query = "INSERT INTO delivery_log(deliver_no, issue_time, location, memo,creater,create_at) VALUES ('$deliver_no', '$issue_time', '$location', '$memo','$creater', '$create_at')";    	                      
+    $result = mysqli_query($link,$db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='delivery_log-index.php?function_name=delivery_log&".$token_link."';";
+        echo "</script>";  
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='delivery_log-index.php?function_name=delivery_log&".$token_link."';";
+        echo "</script>";  
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
+?>
diff --git a/wms/delivery_log-record-update.php b/wms/delivery_log-record-update.php
index 5d3c4fc5..561b3ec5 100644
--- a/wms/delivery_log-record-update.php
+++ b/wms/delivery_log-record-update.php
@@ -1,38 +1,38 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-    function user_input( $data ) {
-        $data1 = trim($data);
-        $data2 = stripslashes($data1);
-        $data3 = htmlspecialchars($data2);
-        return $data3;
-    }
-
-    $id     = $_POST['id'];
-    $deliver_no   = user_input($_POST["delivery_no"]);	
-    $issue_time	   = user_input($_POST["issue_time"]);	
-    $location       = user_input($_POST["location"]);	
-    $memo       = user_input($_POST["memo"]);	
-    $creater      = user_input($_POST["creater"]);	
-    $create_at     = date('Y/m/d H:i:s');
-
-    $db_query = "UPDATE delivery_log set deliver_no = '$deliver_no', issue_time = '$issue_time', location = '$location', memo = '$memo',create_at = '$create_at' WHERE id='$id'";
-    mysqli_query($link, $db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='delivery_log-index.php?function_name=delivery_log&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='delivery_log-index.php?function_name=delivery_log&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if(isset($_POST['update'])) {
+    function user_input( $data ) {
+        $data1 = trim($data);
+        $data2 = stripslashes($data1);
+        $data3 = htmlspecialchars($data2);
+        return $data3;
+    }
+
+    $id     = $_POST['id'];
+    $deliver_no   = user_input($_POST["delivery_no"]);	
+    $issue_time	   = user_input($_POST["issue_time"]);	
+    $location       = user_input($_POST["location"]);	
+    $memo       = user_input($_POST["memo"]);	
+    $creater      = user_input($_POST["creater"]);	
+    $create_at     = date('Y/m/d H:i:s');
+
+    $db_query = "UPDATE delivery_log set deliver_no = '$deliver_no', issue_time = '$issue_time', location = '$location', memo = '$memo',create_at = '$create_at' WHERE id='$id'";
+    mysqli_query($link, $db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='delivery_log-index.php?function_name=delivery_log&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='delivery_log-index.php?function_name=delivery_log&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/delivery_log-user-input.php b/wms/delivery_log-user-input.php
index 0bfb6ec0..921880f4 100644
--- a/wms/delivery_log-user-input.php
+++ b/wms/delivery_log-user-input.php
@@ -1,53 +1,53 @@
-<?php
-
-//Function to filter the form input
-function user_input( $data ) {
-    $data1 = trim($data);
-    $data2 = stripslashes($data1);
-    $data3 = htmlspecialchars($data2);
-    return $data3;
-}
-
-
-$deliver_no   = user_input($_POST["delivery_no"]);	
-$issue_time	   = user_input($_POST["issue_time"]);	
-$location       = user_input($_POST["location"]);	
-$memo       = user_input($_POST["memo"]);	
-$creater      = user_input($_POST["creater"]);	
-$create_at     = date('Y/m/d H:i:s');
-
-
-
-
-/*
-
-if(empty($_POST["name"])) {
-    $name_error = "Name is required";
-} else {
-    $name = user_input($_POST["name"]);
-    
-    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
-        $name_error = "Only letter and white space are allowed";
-    }
-}
-
-
-/*
-if(empty($_POST["website"])) {
-    $website_error = "Website address is required";
-} else {
-    $website = user_input($_POST["website"]);
-
-    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
-        $website_error = "Invalid website URL";
-    }
-}
-
-if(empty($_POST["comment"])) {
-    $comment = "";
-} else {
-    $comment = user_input($_POST["comment"]);
-}
-*/
-?>
-
+<?php
+
+//Function to filter the form input
+function user_input( $data ) {
+    $data1 = trim($data);
+    $data2 = stripslashes($data1);
+    $data3 = htmlspecialchars($data2);
+    return $data3;
+}
+
+
+$deliver_no   = user_input($_POST["delivery_no"]);	
+$issue_time	   = user_input($_POST["issue_time"]);	
+$location       = user_input($_POST["location"]);	
+$memo       = user_input($_POST["memo"]);	
+$creater      = user_input($_POST["creater"]);	
+$create_at     = date('Y/m/d H:i:s');
+
+
+
+
+/*
+
+if(empty($_POST["name"])) {
+    $name_error = "Name is required";
+} else {
+    $name = user_input($_POST["name"]);
+    
+    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
+        $name_error = "Only letter and white space are allowed";
+    }
+}
+
+
+/*
+if(empty($_POST["website"])) {
+    $website_error = "Website address is required";
+} else {
+    $website = user_input($_POST["website"]);
+
+    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
+        $website_error = "Invalid website URL";
+    }
+}
+
+if(empty($_POST["comment"])) {
+    $comment = "";
+} else {
+    $comment = user_input($_POST["comment"]);
+}
+*/
+?>
+
diff --git a/wms/demo.dart b/wms/demo.dart
index 593a71bc..213ba8c0 100644
--- a/wms/demo.dart
+++ b/wms/demo.dart
@@ -1,4 +1,4 @@
-void main() {
-  String  name="测试";
-  print("1231v\${name}/${name}");
-}
+void main() {
+  String  name="测试";
+  print("1231v\${name}/${name}");
+}
diff --git a/wms/ec_purchase_order_submit.php b/wms/ec_purchase_order_submit.php
index 227a34c2..e97eb315 100644
--- a/wms/ec_purchase_order_submit.php
+++ b/wms/ec_purchase_order_submit.php
@@ -1,188 +1,188 @@
-<?php
-//error_reporting(E_ALL);
-ob_start();
-//ini_set('display_errors', "On");
-
-require_once "../database.php";
-
-$customerid = "";
-$inv_customer_id = "";
-$inv_customer_name = "";
-$customer_name = "";
-$item_no = "";
-$item_name = "";
-$num = "";
-$unit_price = "";
-$pre_tax_price = "";
-$business_tax = "";
-$summary_price = "";
-#$delivery_date = "";
-$summary = "";
-$contract_begin_date = "";
-$contract_end_date = "";
-$salesman = "";
-$operator_name = "";
-$enter_date = "";
-$creater = "";
-$create_at = "";
-#excel字段與mysql表字段映射
-$excel_field_mapping = [
-	0 => "date_seq",
-	1 => "customerid",
-	2 => "inv_customer_id",
-	3 => "inv_customer_name",
-	4 => "customer_name",
-	5 => "item_no",
-	6 => "item_name",
-	7 => "num",
-	8 => "unit_price",
-	9 => "pre_tax_price",
-	10 => "business_tax",
-	11 => "summary_price",
-	12 => "delivery_date",
-	13 => "summary",
-	14 => "contract_begin_date",
-	15 => "contract_end_date",
-	16 => "salesman",
-	17 => "operator_name",
-	18 => "enter_date",
-];
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-	include "header.php";
-	// 载入db.php来连结资料库
-	require_once "../database.php";
-	require_once '../PHPExcel/PHPExcel.php';
-	require_once '../PHPExcel/IOFactory.php';
-
-	$file_name = $_FILES["file"]["name"];
-	$temp_file_name = $_FILES["file"]["tmp_name"];
-	//$target_dir = "../inv-uploads/ec/" . $_POST['yyyymm'] . "/";
-
-	//if (is_dir($target_dir) || mkdir($target_dir, '0777'));
-	$target_dir = "../inv-uploads/";
-
-	$target_file = strtolower($target_dir . strtotime("now") . "." . pathinfo($file_name, PATHINFO_EXTENSION));
-	$EXTENSION = pathinfo($target_file, PATHINFO_EXTENSION);
-	if (move_uploaded_file($temp_file_name, $target_file)) {
-		if ($EXTENSION == 'xls') {
-			$objReader = PHPExcel_IOFactory::createReader('Excel5'); //支持xls
-		} else {
-			$objReader = PHPExcel_IOFactory::createReader('Excel2007'); //支持xlsx是
-		}
-		$objPHPExcel = $objReader->load($target_file); //读取上传到服务器的文件
-		$sheet = $objPHPExcel->getSheet(0); //拿到第一个sheet数据
-		$highestRow = $sheet->getHighestRow(); // 取得总行数
-		$highestColumn = $sheet->getHighestColumn(); // 取得总列数
-		$highestColumn = PHPExcel_Cell::columnIndexFromString($highestColumn); // 转换字母为对应的统计数字；
-		$excelArray = array();
-		$success_in = 0;
-		$fail_in = 0;
-		#循環讀取excel ec_purchase_order
-		/**
-		 * 1.将表格存放在 ec_purchase_order_tmp表,group by 是否有重复记录,有则定向到ec_purchase_order_import显示
-		 * 2.ec_purchase_order_tmp表group by 后无重复, 则union  ec_purchase_order 是否有重复记录,有则定向到ec_purchase_order_import显示
-		 * 3.如果没有重复资料,则重定向到ec_purchase_order页面
-		 */
-		# 1.将表格存放在 ec_purchase_order_tmp表,group by 是否有重复记录,有则定向到ec_purchase_order_import显示
-		mysqli_query($link, "delete from  ec_purchase_order_tmp where form_key='" . $_POST['form_key'] . "'");
-
-		for ($row = 3; $row <= $highestRow - 3; $row++) {
-			$val = $sheet->getCellByColumnAndRow(0, $row)->getCalculatedValue();
-			if ($val == "") return;
-			$data = [];
-			for ($column = 0; $column < $highestColumn; $column++) {
-				$val = $sheet->getCellByColumnAndRow($column, $row)->getCalculatedValue();
-				//上午 오전 am  下午 오후 pm  2023-03-06 오후 12:47:28
-				#包含上午 오전
-				if ($column == 18 &&    mb_strpos($val, '오전')) {
-					$_am = str_replace('오전', "",		$val);
-					//echo "_A:" . $_am . 'AM';
-					$val = date("Y-m-d  G:i:s",  strtotime($_am . 'AM'));
-				} elseif ($column == 18 &&    mb_strpos($val, '오후')) {
-					$_pm = str_replace('오후', "",	$val);
-					$val = date("Y-m-d  G:i:s",  strtotime($_pm . 'PM'));
-				}
-				$data[$excel_field_mapping[$column]] = (empty($val) || $val == '') ? 'null' : "'" . $val . "'"; //读取excel数据到数组
-			}
-			$data['yyyymm'] =	$_POST['yyyymm'];
-			$data['form_key'] =	$_POST['form_key'];
-			$db_query1 = 'insert into  ec_purchase_order_tmp(' . implode(array_keys($data), ',') . ') values (' . implode(array_values($data), ',') . ')';
-			mysqli_query($link, $db_query1);
-		}
-
-		#ec_purchase_order_tmp表group by 是否有重复记录,有则定向到ec_purchase_order_import显示
-		#gorup by 
-
-		$sql_group_epot = "
-		SELECT count(*)  cnt,
-					date_seq,
-					customerid,
-					item_no,
-					num,
-					unit_price,
-					pre_tax_price,
-					business_tax,
-					summary_price,
-					enter_date From ec_purchase_order_tmp
-					WHERE form_key = '" . $_POST['form_key'] . "'
-					GROUP BY  date_Seq, customerid, item_no, num, unit_price, pre_tax_price, business_tax, summary_price, enter_date
-					HAVING COUNT(*) > 1";
-
-		$res_group_epot = mysqli_fetch_row(mysqli_query($link, $sql_group_epot));
-		#存在重复的记录ec_purchase_order_import
-		if (!empty($res_group_epot)) {
-			header("location: ec_purchase_order_import.php?error_form_key=" . $_POST['form_key']);
-			exit();
-		}
-		$sql_group_epo = "
-				SELECT
-				count(*) cnt,
-				a.date_seq,
-				a.customerid,
-				a.item_no,
-				a.num,
-				a.unit_price,
-				a.pre_tax_price,
-				a.business_tax,
-				a.summary_price,
-				a.enter_date
-			FROM
-				ec_purchase_order a,
-				ec_purchase_order_tmp b
-			WHERE
-				a.date_seq = b.date_seq
-			AND a.customerid = b.customerid
-			AND a.item_no = b.item_no
-			AND a.num = b.num
-			AND a.unit_price = b.unit_price
-			AND a.pre_tax_price = b.pre_tax_price
-			AND a.business_tax = b.business_tax
-			AND a.summary_price = b.summary_price
-			AND a.enter_date = b.enter_date
-			GROUP BY a.date_seq, a.customerid, a.item_no, a.num, a.unit_price,
-				a.pre_tax_price, a.business_tax, a.summary_price, 	a.enter_date";
-
-		$res_group_epo = mysqli_fetch_row(mysqli_query($link, $sql_group_epo));
-		//	echo 	$sql_group_epo;
-		//	exit();
-		#存在重复的记录ec_purchase_order_import
-		if (!empty($res_group_epo)) {
-			header("location: ec_purchase_order_import.php?error_form_key=" . $_POST['form_key']);
-			exit();
-		}
-		#不存在重复记录则插入到ec_purchase_order
-		$sql_ins_epo = "insert into ec_purchase_order(id,date_seq,customerid,inv_customer_id,inv_customer_name,customer_name,item_no,item_name,num,unit_price,pre_tax_price,business_tax,summary_price,delivery_date,summary,contract_begin_date,contract_end_date,salesman,operator_name,enter_date,yyyymm,form_key,creater,create_at )
-		select   id,date_seq,customerid,inv_customer_id,inv_customer_name,customer_name,item_no,item_name,num,unit_price,pre_tax_price,business_tax,summary_price,delivery_date,summary,contract_begin_date,contract_end_date,salesman,operator_name,enter_date,yyyymm,form_key,creater,create_at From 
-		ec_purchase_order_tmp
-		where form_key='" . $_POST['form_key'] . "'";
-		mysqli_query($link,	$sql_ins_epo);
-		mysqli_query($link, "delete from ec_purchase_order_tmp where form_key='" . $_POST['form_key'] . "' ");
-
-		mysqli_close($link);
-	}
-}
-#echo  $fail_in;
-header("location: ec_purchase_order.php");
-
-die();
+<?php
+//error_reporting(E_ALL);
+ob_start();
+//ini_set('display_errors', "On");
+
+require_once "../database.php";
+
+$customerid = "";
+$inv_customer_id = "";
+$inv_customer_name = "";
+$customer_name = "";
+$item_no = "";
+$item_name = "";
+$num = "";
+$unit_price = "";
+$pre_tax_price = "";
+$business_tax = "";
+$summary_price = "";
+#$delivery_date = "";
+$summary = "";
+$contract_begin_date = "";
+$contract_end_date = "";
+$salesman = "";
+$operator_name = "";
+$enter_date = "";
+$creater = "";
+$create_at = "";
+#excel字段與mysql表字段映射
+$excel_field_mapping = [
+	0 => "date_seq",
+	1 => "customerid",
+	2 => "inv_customer_id",
+	3 => "inv_customer_name",
+	4 => "customer_name",
+	5 => "item_no",
+	6 => "item_name",
+	7 => "num",
+	8 => "unit_price",
+	9 => "pre_tax_price",
+	10 => "business_tax",
+	11 => "summary_price",
+	12 => "delivery_date",
+	13 => "summary",
+	14 => "contract_begin_date",
+	15 => "contract_end_date",
+	16 => "salesman",
+	17 => "operator_name",
+	18 => "enter_date",
+];
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+	include "header.php";
+	// 载入db.php来连结资料库
+	require_once "../database.php";
+	require_once '../PHPExcel/PHPExcel.php';
+	require_once '../PHPExcel/IOFactory.php';
+
+	$file_name = $_FILES["file"]["name"];
+	$temp_file_name = $_FILES["file"]["tmp_name"];
+	//$target_dir = "../inv-uploads/ec/" . $_POST['yyyymm'] . "/";
+
+	//if (is_dir($target_dir) || mkdir($target_dir, '0777'));
+	$target_dir = "../inv-uploads/";
+
+	$target_file = strtolower($target_dir . strtotime("now") . "." . pathinfo($file_name, PATHINFO_EXTENSION));
+	$EXTENSION = pathinfo($target_file, PATHINFO_EXTENSION);
+	if (move_uploaded_file($temp_file_name, $target_file)) {
+		if ($EXTENSION == 'xls') {
+			$objReader = PHPExcel_IOFactory::createReader('Excel5'); //支持xls
+		} else {
+			$objReader = PHPExcel_IOFactory::createReader('Excel2007'); //支持xlsx是
+		}
+		$objPHPExcel = $objReader->load($target_file); //读取上传到服务器的文件
+		$sheet = $objPHPExcel->getSheet(0); //拿到第一个sheet数据
+		$highestRow = $sheet->getHighestRow(); // 取得总行数
+		$highestColumn = $sheet->getHighestColumn(); // 取得总列数
+		$highestColumn = PHPExcel_Cell::columnIndexFromString($highestColumn); // 转换字母为对应的统计数字；
+		$excelArray = array();
+		$success_in = 0;
+		$fail_in = 0;
+		#循環讀取excel ec_purchase_order
+		/**
+		 * 1.将表格存放在 ec_purchase_order_tmp表,group by 是否有重复记录,有则定向到ec_purchase_order_import显示
+		 * 2.ec_purchase_order_tmp表group by 后无重复, 则union  ec_purchase_order 是否有重复记录,有则定向到ec_purchase_order_import显示
+		 * 3.如果没有重复资料,则重定向到ec_purchase_order页面
+		 */
+		# 1.将表格存放在 ec_purchase_order_tmp表,group by 是否有重复记录,有则定向到ec_purchase_order_import显示
+		mysqli_query($link, "delete from  ec_purchase_order_tmp where form_key='" . $_POST['form_key'] . "'");
+
+		for ($row = 3; $row <= $highestRow - 3; $row++) {
+			$val = $sheet->getCellByColumnAndRow(0, $row)->getCalculatedValue();
+			if ($val == "") return;
+			$data = [];
+			for ($column = 0; $column < $highestColumn; $column++) {
+				$val = $sheet->getCellByColumnAndRow($column, $row)->getCalculatedValue();
+				//上午 오전 am  下午 오후 pm  2023-03-06 오후 12:47:28
+				#包含上午 오전
+				if ($column == 18 &&    mb_strpos($val, '오전')) {
+					$_am = str_replace('오전', "",		$val);
+					//echo "_A:" . $_am . 'AM';
+					$val = date("Y-m-d  G:i:s",  strtotime($_am . 'AM'));
+				} elseif ($column == 18 &&    mb_strpos($val, '오후')) {
+					$_pm = str_replace('오후', "",	$val);
+					$val = date("Y-m-d  G:i:s",  strtotime($_pm . 'PM'));
+				}
+				$data[$excel_field_mapping[$column]] = (empty($val) || $val == '') ? 'null' : "'" . $val . "'"; //读取excel数据到数组
+			}
+			$data['yyyymm'] =	$_POST['yyyymm'];
+			$data['form_key'] =	$_POST['form_key'];
+			$db_query1 = 'insert into  ec_purchase_order_tmp(' . implode(array_keys($data), ',') . ') values (' . implode(array_values($data), ',') . ')';
+			mysqli_query($link, $db_query1);
+		}
+
+		#ec_purchase_order_tmp表group by 是否有重复记录,有则定向到ec_purchase_order_import显示
+		#gorup by 
+
+		$sql_group_epot = "
+		SELECT count(*)  cnt,
+					date_seq,
+					customerid,
+					item_no,
+					num,
+					unit_price,
+					pre_tax_price,
+					business_tax,
+					summary_price,
+					enter_date From ec_purchase_order_tmp
+					WHERE form_key = '" . $_POST['form_key'] . "'
+					GROUP BY  date_Seq, customerid, item_no, num, unit_price, pre_tax_price, business_tax, summary_price, enter_date
+					HAVING COUNT(*) > 1";
+
+		$res_group_epot = mysqli_fetch_row(mysqli_query($link, $sql_group_epot));
+		#存在重复的记录ec_purchase_order_import
+		if (!empty($res_group_epot)) {
+			header("location: ec_purchase_order_import.php?error_form_key=" . $_POST['form_key']);
+			exit();
+		}
+		$sql_group_epo = "
+				SELECT
+				count(*) cnt,
+				a.date_seq,
+				a.customerid,
+				a.item_no,
+				a.num,
+				a.unit_price,
+				a.pre_tax_price,
+				a.business_tax,
+				a.summary_price,
+				a.enter_date
+			FROM
+				ec_purchase_order a,
+				ec_purchase_order_tmp b
+			WHERE
+				a.date_seq = b.date_seq
+			AND a.customerid = b.customerid
+			AND a.item_no = b.item_no
+			AND a.num = b.num
+			AND a.unit_price = b.unit_price
+			AND a.pre_tax_price = b.pre_tax_price
+			AND a.business_tax = b.business_tax
+			AND a.summary_price = b.summary_price
+			AND a.enter_date = b.enter_date
+			GROUP BY a.date_seq, a.customerid, a.item_no, a.num, a.unit_price,
+				a.pre_tax_price, a.business_tax, a.summary_price, 	a.enter_date";
+
+		$res_group_epo = mysqli_fetch_row(mysqli_query($link, $sql_group_epo));
+		//	echo 	$sql_group_epo;
+		//	exit();
+		#存在重复的记录ec_purchase_order_import
+		if (!empty($res_group_epo)) {
+			header("location: ec_purchase_order_import.php?error_form_key=" . $_POST['form_key']);
+			exit();
+		}
+		#不存在重复记录则插入到ec_purchase_order
+		$sql_ins_epo = "insert into ec_purchase_order(id,date_seq,customerid,inv_customer_id,inv_customer_name,customer_name,item_no,item_name,num,unit_price,pre_tax_price,business_tax,summary_price,delivery_date,summary,contract_begin_date,contract_end_date,salesman,operator_name,enter_date,yyyymm,form_key,creater,create_at )
+		select   id,date_seq,customerid,inv_customer_id,inv_customer_name,customer_name,item_no,item_name,num,unit_price,pre_tax_price,business_tax,summary_price,delivery_date,summary,contract_begin_date,contract_end_date,salesman,operator_name,enter_date,yyyymm,form_key,creater,create_at From 
+		ec_purchase_order_tmp
+		where form_key='" . $_POST['form_key'] . "'";
+		mysqli_query($link,	$sql_ins_epo);
+		mysqli_query($link, "delete from ec_purchase_order_tmp where form_key='" . $_POST['form_key'] . "' ");
+
+		mysqli_close($link);
+	}
+}
+#echo  $fail_in;
+header("location: ec_purchase_order.php");
+
+die();
diff --git a/wms/equipment-create.php b/wms/equipment-create.php
index 00ff8931..9b007127 100644
--- a/wms/equipment-create.php
+++ b/wms/equipment-create.php
@@ -1,100 +1,100 @@
-<?php
-include "header.php";
-?>
-
-<div class="container">
-
-    <?php
-    
-        include "equipment-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        
- 		<div>
-            <label for="category">類別</label>
-            <input type="text" name="category" id="category">
-        </div>	
- 
-		<div>
-            <label for="equipment_id">部品號</label>
-            <input type="text" name="equipment_id" id="equipment_id">
-        </div>	
-
-        <div>
-            <label for="equipment_name">部品名稱</label>
-            <input type="text" name="equipment_name" id="equipment_name">
-        </div>	
-		
-        <div>
-            <label for="brand">廠牌</label>
-            <input type="text" name="brand" id="brand">
-        </div>	
-				
-        <div>
-            <label for="spec">規格</label>
-            <input type="text" name="spec" id="spec" >
-        </div>	
-
-        <div>
-            <label for="count_type">計量單位</label>
-            <input type="text" name="count_type" id="count_type" >
-        </div>	
-        
-        <div>
-            <label for="inventory">庫存數</label>
-            <input type="text" name="inventory" id="inventory" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="list_price">牌價</label>
-            <input type="text" name="list_price" id="list_price">
-        </div>
-
-        <div>
-            <label for="discount">折扣</label>
-            <input type="text" name="discount" id="discount" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="final_price">最後售價</label>
-            <input type="text" name="final_price" id="final_price" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
-        </div>
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at">
-        </div>
-
-        <div class="bottom-margin">
-            <label for="fileToUpload">上傳圖片</label>
-			<div>
-				<input type="file" name="fileToUpload" id="fileToUpload">
-			</div>			
-        </div>
-		<p>
-		<div>
-			<button type="submit" name="submit">確定</button>
-		</div>		
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
+<?php
+include "header.php";
+?>
+
+<div class="container">
+
+    <?php
+    
+        include "equipment-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        
+ 		<div>
+            <label for="category">類別</label>
+            <input type="text" name="category" id="category">
+        </div>	
+ 
+		<div>
+            <label for="equipment_id">部品號</label>
+            <input type="text" name="equipment_id" id="equipment_id">
+        </div>	
+
+        <div>
+            <label for="equipment_name">部品名稱</label>
+            <input type="text" name="equipment_name" id="equipment_name">
+        </div>	
+		
+        <div>
+            <label for="brand">廠牌</label>
+            <input type="text" name="brand" id="brand">
+        </div>	
+				
+        <div>
+            <label for="spec">規格</label>
+            <input type="text" name="spec" id="spec" >
+        </div>	
+
+        <div>
+            <label for="count_type">計量單位</label>
+            <input type="text" name="count_type" id="count_type" >
+        </div>	
+        
+        <div>
+            <label for="inventory">庫存數</label>
+            <input type="text" name="inventory" id="inventory" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="list_price">牌價</label>
+            <input type="text" name="list_price" id="list_price">
+        </div>
+
+        <div>
+            <label for="discount">折扣</label>
+            <input type="text" name="discount" id="discount" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="final_price">最後售價</label>
+            <input type="text" name="final_price" id="final_price" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
+        </div>
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at">
+        </div>
+
+        <div class="bottom-margin">
+            <label for="fileToUpload">上傳圖片</label>
+			<div>
+				<input type="file" name="fileToUpload" id="fileToUpload">
+			</div>			
+        </div>
+		<p>
+		<div>
+			<button type="submit" name="submit">確定</button>
+		</div>		
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
diff --git a/wms/equipment-delete.php b/wms/equipment-delete.php
index b4ab8e3d..d305d257 100644
--- a/wms/equipment-delete.php
+++ b/wms/equipment-delete.php
@@ -1,12 +1,12 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "DELETE FROM equipment WHERE id='$id'";
-mysqli_query($link, $db_query);	
-
-header("Refresh:0; url=equipment-index.php?function_name=equipment&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "DELETE FROM equipment WHERE id='$id'";
+mysqli_query($link, $db_query);	
+
+header("Refresh:0; url=equipment-index.php?function_name=equipment&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/equipment-edit.php b/wms/equipment-edit.php
index fafd9839..caab6f63 100644
--- a/wms/equipment-edit.php
+++ b/wms/equipment-edit.php
@@ -1,113 +1,113 @@
-<?php
-    include "header.php";
-
-    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-	
-	$data = array();
-	// sql語法存在變數中
-	$db_query = "SELECT * FROM equipment  WHERE id=$id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$db_query);	
-/*
-    include "inc/record_update.php";
-    
-    try {	
-		// 設置一個空陣列來放資料
-		$data = array();
-		// sql語法存在變數中
-		$db_query = "SELECT * FROM expert WHERE id=$id";
-
-		// 用mysqli_query方法執行(sql語法)將結果存在變數中
-		$data = mysqli_query($link,$db_query);
-	}catch (Exception $e) {
-    echo 'Caught exception: ',  $e->getMessage(), "\n";
-	}
-*/	
-    foreach($data as $data) :
-?>
-
-<div class="container">
-    <form class="form-inline" method="post" action="equipment-record-update.php" enctype="multipart/form-data">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-	
-        <div>
-            <label for="category">類別</label>
-            <input type="text" name="category" id="category" value="<?php echo $data['category']; ?>">
-        </div>	
-	
-        <div>
-            <label for="equipment_id">部品號</label>
-            <input type="text" name="equipment_id" id="equipment_id" value="<?php echo $data['equipment_id']; ?>">
-        </div>	
-
-        <div>
-            <label for="equipment_name">部品名稱</label>
-            <input type="text" name="equipment_name" id="equipment_name" value="<?php echo $data['equipment_name']; ?>">
-        </div>	
-		
-        <div>
-            <label for="brand">廠牌</label>
-            <input type="text" name="brand" id="brand" value="<?php echo $data['brand']; ?>">
-        </div>	
-				
-        <div>
-            <label for="spec">規格</label>
-            <input type="text" name="spec" id="spec" value="<?php echo $data['spec']; ?>">
-        </div>	
-
-        <div>
-            <label for="count_type">計量單位</label>
-            <input type="text" name="count_type" id="count_type" value="<?php echo $data['count_type']; ?>">
-        </div>	
-        
-        <div>
-            <label for="inventory">庫存數</label>
-            <input type="text" name="inventory" id="inventory" value="<?php echo $data['inventory']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="list_price">牌價</label>
-            <input type="text" name="list_price" id="list_price" value="<?php echo $data['list_price']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="discount">折扣</label>
-            <input type="text" name="discount" id="discount" value="<?php echo $data['discount']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="final_price">最後售價</label>
-            <input type="text" name="final_price" id="final_price" value="<?php echo $data['final_price']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
-        </div>
-
-        
-        <div class="bottom-margin">
-			<label for="create_at">圖片</label>
-			<a><?php echo $data['picture']; ?></a>
-            <img width="125px" src="<?php echo $data['picture']?>" alt="" class="index-image">
-        </div>
-        <div class="bottom-margin">
-            <input type="file" name="fileToUpload" id="fileToUpload">
-        </div>
-		
-        <div>
-            <button type="submit" name="update">確定</button>
-        </div>
-		<input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
-?>
-
+<?php
+    include "header.php";
+
+    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+	
+	$data = array();
+	// sql語法存在變數中
+	$db_query = "SELECT * FROM equipment  WHERE id=$id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$db_query);	
+/*
+    include "inc/record_update.php";
+    
+    try {	
+		// 設置一個空陣列來放資料
+		$data = array();
+		// sql語法存在變數中
+		$db_query = "SELECT * FROM expert WHERE id=$id";
+
+		// 用mysqli_query方法執行(sql語法)將結果存在變數中
+		$data = mysqli_query($link,$db_query);
+	}catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+	}
+*/	
+    foreach($data as $data) :
+?>
+
+<div class="container">
+    <form class="form-inline" method="post" action="equipment-record-update.php" enctype="multipart/form-data">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+	
+        <div>
+            <label for="category">類別</label>
+            <input type="text" name="category" id="category" value="<?php echo $data['category']; ?>">
+        </div>	
+	
+        <div>
+            <label for="equipment_id">部品號</label>
+            <input type="text" name="equipment_id" id="equipment_id" value="<?php echo $data['equipment_id']; ?>">
+        </div>	
+
+        <div>
+            <label for="equipment_name">部品名稱</label>
+            <input type="text" name="equipment_name" id="equipment_name" value="<?php echo $data['equipment_name']; ?>">
+        </div>	
+		
+        <div>
+            <label for="brand">廠牌</label>
+            <input type="text" name="brand" id="brand" value="<?php echo $data['brand']; ?>">
+        </div>	
+				
+        <div>
+            <label for="spec">規格</label>
+            <input type="text" name="spec" id="spec" value="<?php echo $data['spec']; ?>">
+        </div>	
+
+        <div>
+            <label for="count_type">計量單位</label>
+            <input type="text" name="count_type" id="count_type" value="<?php echo $data['count_type']; ?>">
+        </div>	
+        
+        <div>
+            <label for="inventory">庫存數</label>
+            <input type="text" name="inventory" id="inventory" value="<?php echo $data['inventory']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="list_price">牌價</label>
+            <input type="text" name="list_price" id="list_price" value="<?php echo $data['list_price']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="discount">折扣</label>
+            <input type="text" name="discount" id="discount" value="<?php echo $data['discount']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="final_price">最後售價</label>
+            <input type="text" name="final_price" id="final_price" value="<?php echo $data['final_price']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
+        </div>
+
+        
+        <div class="bottom-margin">
+			<label for="create_at">圖片</label>
+			<a><?php echo $data['picture']; ?></a>
+            <img width="125px" src="<?php echo $data['picture']?>" alt="" class="index-image">
+        </div>
+        <div class="bottom-margin">
+            <input type="file" name="fileToUpload" id="fileToUpload">
+        </div>
+		
+        <div>
+            <button type="submit" name="update">確定</button>
+        </div>
+		<input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php
+
+    endforeach;
+    
+    include "footer.php";
+
+?>
+
diff --git a/wms/equipment-index.php b/wms/equipment-index.php
index 7027b33c..083a8701 100644
--- a/wms/equipment-index.php
+++ b/wms/equipment-index.php
@@ -1,151 +1,151 @@
-<?php
-    include "header.php";
-	
-	// 設置一個空陣列來放資料
-	$data = array();
-	// sql語法存在變數中
-    $sql_cmd = sql_myself($user_id);
-	$sql = "SELECT * FROM equipment $sql_cmd ORDER BY id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$sql);
-
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="equipment-create.php?function_name=equipment&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-
-<?php
-}
-
-
-
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:equipment-index.php");
-        }
-    }
-
-?>
-
-<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;
-   
-}
-
-</style>
-
-    <div style="overflow-x:auto;">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-            <tr>
-                <th>項次</th>
-				<th>類別</th>				
-                <th>部品號</th>
-                <th>部品名稱</th>
-                <th class="width_style_1" >照片</th>				
-                <th>廠牌</th>
-                <th>規格</th>
-                <th>計量單位</th>
-                <th>庫存數</th>
-                <th>牌價</th>
-                <th>折扣</th>
-                <th>最後售價</th>
-                <th>建檔人</th>
-                <th>建檔時間</th>				
-                <?php if ($user_auth&2) { ?>
-                <th>修改</th>
-                <th>刪除</th>
-                <?php } ?>
-            </tr>
-		</thead>
-		<tbody>			
-
-            <?php foreach($data as $data) : ?>    
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td><?php echo $data['category']; ?></td>					
-                    <td><?php echo $data['equipment_id']; ?></td>
-                    <td><?php echo $data['equipment_name']; ?></td>
-                    <td class="width_style_1"><img src="<?php echo $data['picture']; ?>" alt="" class="index-image"></td>				
-                    <td><?php echo $data['brand']; ?></td>
-                    <td><?php echo $data['spec']; ?></td>
-                    <td><?php echo $data['count_type']; ?></td>
-                    <td><?php echo $data['inventory']; ?></td>
-                    <td><?php echo $data['list_price']; ?></td>
-                    <td><?php echo $data['discount']; ?></td>
-                    <td><?php echo $data['final_price']; ?></td>
-                    <td><?php echo $data['creater']; ?></td>
-                    <td><?php echo $data['create_at']; ?></td>
-                    <?php if ($user_auth&2) { ?>
-                    <td>
-						<p>
-							<a href="equipment-edit.php?id=<?php echo $data['id']; ?>&function_name=equipment&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-								<span class="glyphicon glyphicon-pencil"></span>
-							</a>
-						</p> 
-					</td>
-                    <td>
-						<p>
-							<a href="equipment-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-								<span class="glyphicon glyphicon-remove"></span>
-							</a>
-						</p> 
-					</td>
-                    <?php } ?>
-                </tr>
-            <?php endforeach; ?>
-			</tbody>			
-        </table>
-    </div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-
+<?php
+    include "header.php";
+	
+	// 設置一個空陣列來放資料
+	$data = array();
+	// sql語法存在變數中
+    $sql_cmd = sql_myself($user_id);
+	$sql = "SELECT * FROM equipment $sql_cmd ORDER BY id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$sql);
+
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth&2) { ?>
+<p>
+<a href="equipment-create.php?function_name=equipment&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+
+<?php
+}
+
+
+
+if($data):
+    
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:equipment-index.php");
+        }
+    }
+
+?>
+
+<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;
+   
+}
+
+</style>
+
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+            <tr>
+                <th>項次</th>
+				<th>類別</th>				
+                <th>部品號</th>
+                <th>部品名稱</th>
+                <th class="width_style_1" >照片</th>				
+                <th>廠牌</th>
+                <th>規格</th>
+                <th>計量單位</th>
+                <th>庫存數</th>
+                <th>牌價</th>
+                <th>折扣</th>
+                <th>最後售價</th>
+                <th>建檔人</th>
+                <th>建檔時間</th>				
+                <?php if ($user_auth&2) { ?>
+                <th>修改</th>
+                <th>刪除</th>
+                <?php } ?>
+            </tr>
+		</thead>
+		<tbody>			
+
+            <?php foreach($data as $data) : ?>    
+                <tr>
+                    <td><?php echo $data['id']; ?></td>
+                    <td><?php echo $data['category']; ?></td>					
+                    <td><?php echo $data['equipment_id']; ?></td>
+                    <td><?php echo $data['equipment_name']; ?></td>
+                    <td class="width_style_1"><img src="<?php echo $data['picture']; ?>" alt="" class="index-image"></td>				
+                    <td><?php echo $data['brand']; ?></td>
+                    <td><?php echo $data['spec']; ?></td>
+                    <td><?php echo $data['count_type']; ?></td>
+                    <td><?php echo $data['inventory']; ?></td>
+                    <td><?php echo $data['list_price']; ?></td>
+                    <td><?php echo $data['discount']; ?></td>
+                    <td><?php echo $data['final_price']; ?></td>
+                    <td><?php echo $data['creater']; ?></td>
+                    <td><?php echo $data['create_at']; ?></td>
+                    <?php if ($user_auth&2) { ?>
+                    <td>
+						<p>
+							<a href="equipment-edit.php?id=<?php echo $data['id']; ?>&function_name=equipment&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+								<span class="glyphicon glyphicon-pencil"></span>
+							</a>
+						</p> 
+					</td>
+                    <td>
+						<p>
+							<a href="equipment-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+						</p> 
+					</td>
+                    <?php } ?>
+                </tr>
+            <?php endforeach; ?>
+			</tbody>			
+        </table>
+    </div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+
 ?>
\ No newline at end of file
diff --git a/wms/equipment-record-submit.php b/wms/equipment-record-submit.php
index 7f621f0b..d5a40dd3 100644
--- a/wms/equipment-record-submit.php
+++ b/wms/equipment-record-submit.php
@@ -1,123 +1,123 @@
-<?php
-$category= "";
-$equipment_id= "";
-$equipment_name= "";
-$brand= "";
-$spec= "";
-$count_type= "";
-$inventory= "";
-$list_price= "";
-$discount= "";
-$final_price= "";
-$creater= "";	
-$create_at= "";
-$fileToUpload = "";
-
-$category_error= "";
-$equipment_id_error= "";
-$equipment_name_error= "";
-$brand_error= "";
-$spec_error= "";
-$count_type_error= "";
-$inventory_error= "";
-$list_price_error= "";
-$discount_error= "";
-$final_price_error= "";
-$creater_error = "";
-$create_at_error = "";
-
-
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    include "equipment-user-input.php";
-
-    $file_name      = $_FILES["fileToUpload"]["name"];
-    $temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
-    $file_size      = $_FILES["fileToUpload"]["size"];
-    $target_dir     = "equipment-uploads/";
-    $target_file    = strtolower($target_dir . basename($file_name));
-    $upload_ok      = 1;
-    $img_file_type  = pathinfo($target_file, PATHINFO_EXTENSION);
-
-    #$db_query = "INSERT INTO equipment(equipment_id, equipment_name, brand,spec, count_type,inventory,list_price,discount,final_price,picture,creater, create_at) VALUES ('$equipment_id', '$equipment_name', '$brand','$spec', '$count_type','$inventory','$list_price','$discount','$final_price','$target_file','$creater', '$create_at')";
-
-    $file_name      = $_FILES["fileToUpload"]["name"];
-    $temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
-    $file_size      = $_FILES["fileToUpload"]["size"];
-    $target_dir     = "equipment-uploads/";
-    $target_file    = strtolower($target_dir . basename($file_name));
-    $upload_ok      = 1;
-    $img_file_type  = pathinfo($target_file, PATHINFO_EXTENSION);
-
-    //Check if image is an actual image or fake image
-    
-    if(strlen($target_file) <= strlen("equipment-uploads/")){
-
-        $db_query = "INSERT INTO equipment(equipment_id, equipment_name, brand,spec, count_type,inventory,list_price,discount,final_price, creater, create_at) VALUES ('$equipment_id', '$equipment_name', '$brand','$spec', '$count_type','$inventory','$list_price','$discount','$final_price', '$creater', '$create_at')";    	                      
-        // 用mysqli_query方法執行(sql語法)將結果存在變數中
-        $result = mysqli_query($link,$db_query);
-        #echo $result;
-
-    }else {
-
-        $check_img = getimagesize($temp_file_name);
-
-        if($check_img == false) {
-            echo "<font color='#FF0000'>File is not an image</font>";
-            $upload_ok = 0;
-        } else {
-            //echo "File is an image - " . $check_img["mime"];
-            $upload_ok = 1;
-
-            //Check if file already exists
-            if(file_exists($target_file)) {
-                echo "<font color='#FF0000'>File is already uploaded!</font>";
-                $upload_ok = 0;
-            } else {
-                //Check file size
-                if($file_size > 500000) {
-                    echo "<font color='#FF0000'>Please enter a file size between 5mb</font>";
-                    $upload_ok = 0;
-                } else {
-                    //Allow certain file formats
-                    if($img_file_type != "jpg" && $img_file_type != "png" && $img_file_type != "jpeg" && $img_file_type != "gif") {
-                        echo "<font color='#FF0000'>JPG, PNG, JPEG and GIF files are allowed</font>";
-                        $upload_ok = 0;
-                    } else {
-                        //Check if $upload_ok is set to 0 by an error
-                        if($upload_ok === 0) {
-                            echo "<font color='#FF0000'>File has not been uploaded</font>";
-                        } else {
-                            if(move_uploaded_file($temp_file_name, $target_file)){
-                                
-                                
-                                // sql語法存在變數中
-                                // $db_query = "INSERT INTO expert (id, expert_id, personal_id, name, title, picture, major, tel, tel_count, chat_id, chat_count, video_call, video_count, onsite_call, onsite_count, creater, create_at) VALUE (`$id`, `$expert_id`, `$personal_id`, `$name`, `$title`, `$target_file`, `$major`, `$tel`, `$tel_count`, `$chat_id`, `$chat_count`, `$video_call`, `$video_count`, `$onsite_call`, `$onsite_count`, `$creater`, `$create_at`)";
-                                $db_query = "INSERT INTO equipment(equipment_id, equipment_name, brand,spec, count_type,inventory,list_price,discount,final_price,picture,creater, create_at) VALUES ('$equipment_id', '$equipment_name', '$brand','$spec', '$count_type','$inventory','$list_price','$discount','$final_price','$target_file','$creater', '$create_at')";
-
-                                // 用mysqli_query方法執行(sql語法)將結果存在變數中
-                                $result = mysqli_query($link,$db_query);
-                                
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='equipment-index.php?function_name=equipment&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='equipment-index.php?function_name=equipment&".$token_link."';";
-        echo "</script>";  
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+$category= "";
+$equipment_id= "";
+$equipment_name= "";
+$brand= "";
+$spec= "";
+$count_type= "";
+$inventory= "";
+$list_price= "";
+$discount= "";
+$final_price= "";
+$creater= "";	
+$create_at= "";
+$fileToUpload = "";
+
+$category_error= "";
+$equipment_id_error= "";
+$equipment_name_error= "";
+$brand_error= "";
+$spec_error= "";
+$count_type_error= "";
+$inventory_error= "";
+$list_price_error= "";
+$discount_error= "";
+$final_price_error= "";
+$creater_error = "";
+$create_at_error = "";
+
+
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    include "equipment-user-input.php";
+
+    $file_name      = $_FILES["fileToUpload"]["name"];
+    $temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
+    $file_size      = $_FILES["fileToUpload"]["size"];
+    $target_dir     = "equipment-uploads/";
+    $target_file    = strtolower($target_dir . basename($file_name));
+    $upload_ok      = 1;
+    $img_file_type  = pathinfo($target_file, PATHINFO_EXTENSION);
+
+    #$db_query = "INSERT INTO equipment(equipment_id, equipment_name, brand,spec, count_type,inventory,list_price,discount,final_price,picture,creater, create_at) VALUES ('$equipment_id', '$equipment_name', '$brand','$spec', '$count_type','$inventory','$list_price','$discount','$final_price','$target_file','$creater', '$create_at')";
+
+    $file_name      = $_FILES["fileToUpload"]["name"];
+    $temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
+    $file_size      = $_FILES["fileToUpload"]["size"];
+    $target_dir     = "equipment-uploads/";
+    $target_file    = strtolower($target_dir . basename($file_name));
+    $upload_ok      = 1;
+    $img_file_type  = pathinfo($target_file, PATHINFO_EXTENSION);
+
+    //Check if image is an actual image or fake image
+    
+    if(strlen($target_file) <= strlen("equipment-uploads/")){
+
+        $db_query = "INSERT INTO equipment(equipment_id, equipment_name, brand,spec, count_type,inventory,list_price,discount,final_price, creater, create_at) VALUES ('$equipment_id', '$equipment_name', '$brand','$spec', '$count_type','$inventory','$list_price','$discount','$final_price', '$creater', '$create_at')";    	                      
+        // 用mysqli_query方法執行(sql語法)將結果存在變數中
+        $result = mysqli_query($link,$db_query);
+        #echo $result;
+
+    }else {
+
+        $check_img = getimagesize($temp_file_name);
+
+        if($check_img == false) {
+            echo "<font color='#FF0000'>File is not an image</font>";
+            $upload_ok = 0;
+        } else {
+            //echo "File is an image - " . $check_img["mime"];
+            $upload_ok = 1;
+
+            //Check if file already exists
+            if(file_exists($target_file)) {
+                echo "<font color='#FF0000'>File is already uploaded!</font>";
+                $upload_ok = 0;
+            } else {
+                //Check file size
+                if($file_size > 500000) {
+                    echo "<font color='#FF0000'>Please enter a file size between 5mb</font>";
+                    $upload_ok = 0;
+                } else {
+                    //Allow certain file formats
+                    if($img_file_type != "jpg" && $img_file_type != "png" && $img_file_type != "jpeg" && $img_file_type != "gif") {
+                        echo "<font color='#FF0000'>JPG, PNG, JPEG and GIF files are allowed</font>";
+                        $upload_ok = 0;
+                    } else {
+                        //Check if $upload_ok is set to 0 by an error
+                        if($upload_ok === 0) {
+                            echo "<font color='#FF0000'>File has not been uploaded</font>";
+                        } else {
+                            if(move_uploaded_file($temp_file_name, $target_file)){
+                                
+                                
+                                // sql語法存在變數中
+                                // $db_query = "INSERT INTO expert (id, expert_id, personal_id, name, title, picture, major, tel, tel_count, chat_id, chat_count, video_call, video_count, onsite_call, onsite_count, creater, create_at) VALUE (`$id`, `$expert_id`, `$personal_id`, `$name`, `$title`, `$target_file`, `$major`, `$tel`, `$tel_count`, `$chat_id`, `$chat_count`, `$video_call`, `$video_count`, `$onsite_call`, `$onsite_count`, `$creater`, `$create_at`)";
+                                $db_query = "INSERT INTO equipment(equipment_id, equipment_name, brand,spec, count_type,inventory,list_price,discount,final_price,picture,creater, create_at) VALUES ('$equipment_id', '$equipment_name', '$brand','$spec', '$count_type','$inventory','$list_price','$discount','$final_price','$target_file','$creater', '$create_at')";
+
+                                // 用mysqli_query方法執行(sql語法)將結果存在變數中
+                                $result = mysqli_query($link,$db_query);
+                                
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='equipment-index.php?function_name=equipment&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='equipment-index.php?function_name=equipment&".$token_link."';";
+        echo "</script>";  
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/equipment-record-update.php b/wms/equipment-record-update.php
index bad238a6..2673d8ef 100644
--- a/wms/equipment-record-update.php
+++ b/wms/equipment-record-update.php
@@ -1,80 +1,80 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-    function user_input( $data ) {
-        $data1 = trim($data);
-        $data2 = stripslashes($data1);
-        $data3 = htmlspecialchars($data2);
-        return $data3;
-    }
-
-    $id     = $_POST['id'];
-    $category     = $_POST['categoryd'];
-    $equipment_id   = user_input($_POST["equipment_id"]);	
-    $equipment_name	   = user_input($_POST["equipment_name"]);	
-    $brand       = user_input($_POST["brand"]);	
-    $spec        = user_input($_POST["spec"]);	
-    $count_type     = user_input($_POST["count_type"]);	
-    $inventory      = user_input($_POST["inventory"]);	
-    $list_price     = user_input($_POST["list_price"]);	
-    $discount     = user_input($_POST["discount"]);	
-    $final_price     = user_input($_POST["final_price"]);	
-    $picture     = user_input($_POST["picture"]);	
-    $creater      = user_input($_POST["creater"]);	
-    $create_at     = date('Y/m/d H:i:s');
-
-    $file_name      = $_FILES["fileToUpload"]["name"];
-    $temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
-    $file_size      = $_FILES["fileToUpload"]["size"];
-    $target_dir     = "equipment-uploads/";
-    $target_file    = strtolower($target_dir . basename($file_name));
-    $upload_ok      = 1;
-    $img_file_type  = pathinfo($target_file, PATHINFO_EXTENSION);	
-    
-    if(strlen($target_file) <= strlen("equipment-uploads/")){
-        $db_query = "UPDATE equipment set category = '$category', equipment_id = '$equipment_id', equipment_name = '$equipment_name', brand = '$brand', spec = '$spec', count_type = '$count_type',inventory = '$inventory',list_price = '$list_price',discount = '$discount',final_price = '$final_price',create_at = '$create_at' WHERE id='$id'";
-            mysqli_query($link, $db_query);						
-
-    }else {
-
-        if($file_size > 500000) {
-            echo "<font color='#FF0000'>Please enter a file size between 5mb</font>";
-            $upload_ok = 0;
-        } else { //
-            //Allow certain file formats
-            if($img_file_type != "jpg" && $img_file_type != "png" && $img_file_type != "jpeg" && $img_file_type != "gif") {
-                //echo "JPG, PNG, JPEG and GIF files are allowed";
-                $upload_ok = 0;
-            } else {
-                //Check if $upload_ok is set to 0 by an error
-                if($upload_ok === 0) {
-                    echo "<font color='#FF0000'>File has not been uploaded</font>";
-                } else {
-                    if(move_uploaded_file($temp_file_name, $target_file)){
-                        $db_query = "UPDATE equipment set category = '$category', equipment_id = '$equipment_id', equipment_name = '$equipment_name', brand = '$brand', spec = '$spec', count_type = '$count_type',inventory = '$inventory',list_price = '$list_price',discount = '$discount',final_price = '$final_price',picture = '$target_file',create_at = '$create_at' WHERE id='$id'";
-                        mysqli_query($link, $db_query);						
-                        header("location: equipment-index.php");
-                    }
-                }
-            }
-        }   
-
-    }
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='equipment-index.php?function_name=equipment&".$token_link."';";
-        echo "</script>"; 
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='equipment-index.php?function_name=equipment&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if(isset($_POST['update'])) {
+    function user_input( $data ) {
+        $data1 = trim($data);
+        $data2 = stripslashes($data1);
+        $data3 = htmlspecialchars($data2);
+        return $data3;
+    }
+
+    $id     = $_POST['id'];
+    $category     = $_POST['categoryd'];
+    $equipment_id   = user_input($_POST["equipment_id"]);	
+    $equipment_name	   = user_input($_POST["equipment_name"]);	
+    $brand       = user_input($_POST["brand"]);	
+    $spec        = user_input($_POST["spec"]);	
+    $count_type     = user_input($_POST["count_type"]);	
+    $inventory      = user_input($_POST["inventory"]);	
+    $list_price     = user_input($_POST["list_price"]);	
+    $discount     = user_input($_POST["discount"]);	
+    $final_price     = user_input($_POST["final_price"]);	
+    $picture     = user_input($_POST["picture"]);	
+    $creater      = user_input($_POST["creater"]);	
+    $create_at     = date('Y/m/d H:i:s');
+
+    $file_name      = $_FILES["fileToUpload"]["name"];
+    $temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
+    $file_size      = $_FILES["fileToUpload"]["size"];
+    $target_dir     = "equipment-uploads/";
+    $target_file    = strtolower($target_dir . basename($file_name));
+    $upload_ok      = 1;
+    $img_file_type  = pathinfo($target_file, PATHINFO_EXTENSION);	
+    
+    if(strlen($target_file) <= strlen("equipment-uploads/")){
+        $db_query = "UPDATE equipment set category = '$category', equipment_id = '$equipment_id', equipment_name = '$equipment_name', brand = '$brand', spec = '$spec', count_type = '$count_type',inventory = '$inventory',list_price = '$list_price',discount = '$discount',final_price = '$final_price',create_at = '$create_at' WHERE id='$id'";
+            mysqli_query($link, $db_query);						
+
+    }else {
+
+        if($file_size > 500000) {
+            echo "<font color='#FF0000'>Please enter a file size between 5mb</font>";
+            $upload_ok = 0;
+        } else { //
+            //Allow certain file formats
+            if($img_file_type != "jpg" && $img_file_type != "png" && $img_file_type != "jpeg" && $img_file_type != "gif") {
+                //echo "JPG, PNG, JPEG and GIF files are allowed";
+                $upload_ok = 0;
+            } else {
+                //Check if $upload_ok is set to 0 by an error
+                if($upload_ok === 0) {
+                    echo "<font color='#FF0000'>File has not been uploaded</font>";
+                } else {
+                    if(move_uploaded_file($temp_file_name, $target_file)){
+                        $db_query = "UPDATE equipment set category = '$category', equipment_id = '$equipment_id', equipment_name = '$equipment_name', brand = '$brand', spec = '$spec', count_type = '$count_type',inventory = '$inventory',list_price = '$list_price',discount = '$discount',final_price = '$final_price',picture = '$target_file',create_at = '$create_at' WHERE id='$id'";
+                        mysqli_query($link, $db_query);						
+                        header("location: equipment-index.php");
+                    }
+                }
+            }
+        }   
+
+    }
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='equipment-index.php?function_name=equipment&".$token_link."';";
+        echo "</script>"; 
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='equipment-index.php?function_name=equipment&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/equipment-user-input.php b/wms/equipment-user-input.php
index 458d7ccb..1a9a46ef 100644
--- a/wms/equipment-user-input.php
+++ b/wms/equipment-user-input.php
@@ -1,57 +1,57 @@
-<?php
-
-//Function to filter the form input
-function user_input( $data ) {
-    $data1 = trim($data);
-    $data2 = stripslashes($data1);
-    $data3 = htmlspecialchars($data2);
-    return $data3;
-}
-
-$category   = user_input($_POST["category"]);	
-$equipment_id   = user_input($_POST["equipment_id"]);	
-$equipment_name	   = user_input($_POST["equipment_name"]);		
-$brand       = user_input($_POST["brand"]);	
-$spec        = user_input($_POST["spec"]);	
-$count_type     = user_input($_POST["count_type"]);	
-$inventory      = user_input($_POST["inventory"]);	
-$list_price     = user_input($_POST["list_price"]);	
-$discount     = user_input($_POST["discount"]);	
-$final_price     = user_input($_POST["final_price"]);	
-$creater      = user_input($_POST["creater"]);	
-$create_at     = date('Y/m/d H:i:s');
-
-
-
-/*
-
-if(empty($_POST["name"])) {
-    $name_error = "Name is required";
-} else {
-    $name = user_input($_POST["name"]);
-    
-    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
-        $name_error = "Only letter and white space are allowed";
-    }
-}
-
-
-/*
-if(empty($_POST["website"])) {
-    $website_error = "Website address is required";
-} else {
-    $website = user_input($_POST["website"]);
-
-    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
-        $website_error = "Invalid website URL";
-    }
-}
-
-if(empty($_POST["comment"])) {
-    $comment = "";
-} else {
-    $comment = user_input($_POST["comment"]);
-}
-*/
-?>
-
+<?php
+
+//Function to filter the form input
+function user_input( $data ) {
+    $data1 = trim($data);
+    $data2 = stripslashes($data1);
+    $data3 = htmlspecialchars($data2);
+    return $data3;
+}
+
+$category   = user_input($_POST["category"]);	
+$equipment_id   = user_input($_POST["equipment_id"]);	
+$equipment_name	   = user_input($_POST["equipment_name"]);		
+$brand       = user_input($_POST["brand"]);	
+$spec        = user_input($_POST["spec"]);	
+$count_type     = user_input($_POST["count_type"]);	
+$inventory      = user_input($_POST["inventory"]);	
+$list_price     = user_input($_POST["list_price"]);	
+$discount     = user_input($_POST["discount"]);	
+$final_price     = user_input($_POST["final_price"]);	
+$creater      = user_input($_POST["creater"]);	
+$create_at     = date('Y/m/d H:i:s');
+
+
+
+/*
+
+if(empty($_POST["name"])) {
+    $name_error = "Name is required";
+} else {
+    $name = user_input($_POST["name"]);
+    
+    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
+        $name_error = "Only letter and white space are allowed";
+    }
+}
+
+
+/*
+if(empty($_POST["website"])) {
+    $website_error = "Website address is required";
+} else {
+    $website = user_input($_POST["website"]);
+
+    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
+        $website_error = "Invalid website URL";
+    }
+}
+
+if(empty($_POST["comment"])) {
+    $comment = "";
+} else {
+    $comment = user_input($_POST["comment"]);
+}
+*/
+?>
+
diff --git a/wms/estimated_shipping_date_report.php b/wms/estimated_shipping_date_report.php
index a428e639..3b0db952 100644
--- a/wms/estimated_shipping_date_report.php
+++ b/wms/estimated_shipping_date_report.php
@@ -1,1339 +1,1339 @@
-<?php
-// ini_set('display_errors', 'on');
-require dirname(__DIR__) . '/common/composer/vendor/autoload.php';
-
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-use PhpOffice\PhpSpreadsheet\Style\Fill;
-
-include "header.php";
-
-$start_y = empty($_POST['start_month']) ? '2023' : substr($_POST['start_month'], 0, 4);
-$end_y = empty($_POST['end_month']) ? '2023' : substr($_POST['end_month'], 0, 4);
-$start_m = empty($_POST['start_month']) ? '01' : substr($_POST['start_month'], 5, 2);
-$end_m = empty($_POST['end_month']) ? '12' : substr($_POST['end_month'], 5, 2);
-
-$sql = "
-    SELECT
-        this_order.contract_type,
-        this_order.sub_address,
-        this_order.date_year,
-        this_order.date_month,
-        COUNT(this_order.sub_address) AS facility_count
-    FROM(
-        SELECT 
-            SUBSTR(TRIM(w.address),1,2) AS sub_address,
-            SUBSTR(CONVERT(real_contract_arrival_date, DATETIME),1,4) AS date_year,
-            SUBSTR(CONVERT(real_contract_arrival_date, DATETIME),6,2) AS date_month,
-            w.facility_kind,
-            w.contract_type
-        FROM wipwholestatus AS w
-        WHERE status = '1'
-        AND real_contract_arrival_date >= '$start_y-$start_m-1'
-        AND real_contract_arrival_date <= '$end_y-$end_m-31'
-    ) AS this_order
-    WHERE 1 = 1
-    GROUP BY this_order.contract_type,
-    this_order.sub_address,
-    this_order.date_year,
-    this_order.date_month
-";
-$result = mysqli_query($link, $sql);
-$data = [];
-while ($row = $result->fetch_assoc()) {
-    $data[] = $row;
-}
-
-function findData($data, $searchData)
-{
-    foreach ($data as $item) {
-        if (
-            $item['contract_type'] == $searchData['contract_type']
-            && $item['sub_address'] == $searchData['sub_address']
-            && $item['date_year'] == $searchData['date_year']
-            && $item['date_month'] == $searchData['date_month']
-        ) {
-            return $item['facility_count'];
-        }
-    }
-    return 0;
-}
-
-function findDataByCity($data, $searchData)
-{
-    $count = 0;
-    $start_y = $searchData['start_y'];
-    $start_m = $searchData['start_m'];
-    $end_y = $searchData['end_y'];
-    $end_m = $searchData['end_m'];
-    for ($i = $start_y; $i <= $end_y; $i++) {
-        $this_start_m = $i == $start_y ? $start_m : 1;
-        $this_end_m = $i == $start_y ? 12 : $end_m;
-        for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-            foreach ($data as $item) {
-                if (
-                    $item['contract_type'] == $searchData['contract_type']
-                    && $item['sub_address'] == $searchData['sub_address']
-                    && $item['date_year'] == $i
-                    && $item['date_month'] == str_pad($j, 2, '0', STR_PAD_LEFT)
-                ) {
-                    $count += $item['facility_count'];
-                }
-            }
-        }
-    }
-    return $count;
-}
-
-function findDataByYearMonth($data, $searchData)
-{
-    $count = 0;
-    foreach ($data as $item) {
-        if (
-            $item['contract_type'] == $searchData['contract_type']
-            && $item['date_year'] ==  $searchData['date_year']
-            && $item['date_month'] ==  $searchData['date_month']
-        ) {
-            $count += $item['facility_count'];
-        }
-    }
-    return $count;
-}
-
-function findAllDataByYearMonth($data, $searchData)
-{
-    $count = 0;
-    $start_y = $searchData['start_y'];
-    $start_m = $searchData['start_m'];
-    $end_y = $searchData['end_y'];
-    $end_m = $searchData['end_m'];
-    for ($i = $start_y; $i <= $end_y; $i++) {
-        $this_start_m = $i == $start_y ? $start_m : 1;
-        $this_end_m = $i == $start_y ? 12 : $end_m;
-        for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-            foreach ($data as $item) {
-                if (
-                    $item['contract_type'] == $searchData['contract_type']
-                    && $item['date_year'] == $i
-                    && $item['date_month'] == str_pad($j, 2, '0', STR_PAD_LEFT)
-                ) {
-                    $count += $item['facility_count'];
-                }
-            }
-        }
-    }
-    return $count;
-}
-
-$sql = "
-    SELECT
-        new_order.facility_kind,
-        COUNT(new_order.facility_kind) AS facility_count
-    FROM(
-        SELECT 
-            w.facility_kind
-        FROM wipwholestatus AS w
-        WHERE 1=1
-        AND status = '1'
-        AND contract_type = 'A'
-        AND real_contract_arrival_date >= '$start_y-$start_m-1'
-        AND real_contract_arrival_date <= '$end_y-$end_m-31'
-    ) AS new_order
-    WHERE 1 = 1
-    GROUP BY new_order.facility_kind
-";
-$result = mysqli_query($link, $sql);
-$data2 = [];
-while ($row = $result->fetch_assoc()) {
-    $data2[] = $row;
-}
-
-function findFacilityTypeAllCount($data2)
-{
-    $count = 0;
-    foreach ($data2 as $row) {
-        $count += $row['facility_count'];
-    }
-    return $count;
-}
-
-function getFacilityNamebyType($facility_kind)
-{
-    $arr = array(
-        'MAE100' => '小機房',
-        'MAM200' => '無機房',
-        'MAH100' => '小電梯',
-        'MAQ100' => '強驅梯',
-        'MAF100' => '貨梯',
-        'MAP100' => '平台梯',
-        '' => '未分類'
-    );
-    return isset($arr[$facility_kind]) ? $arr[$facility_kind] : "";
-}
-
-$sql = "
-    SELECT 
-        w.renovate_type
-    FROM wipwholestatus AS w
-    WHERE 1=1
-    AND status = '1'
-    AND real_contract_arrival_date >= '$start_y-$start_m-1'
-    AND real_contract_arrival_date <= '$end_y-$end_m-31'
-    AND contract_type = 'B'
-";
-$result = mysqli_query($link, $sql);
-$data3 = [];
-while ($row = $result->fetch_assoc()) {
-    $data3[] = $row;
-}
-
-// 分開計算
-
-// $M1 = 0;
-// $M2 = 0;
-// $M3 = 0;
-// $M4 = 0;
-// $MA = 0;
-// $M_count = 0;
-// foreach ($data3 as $row) {
-//     $renovate_type_arr = json_decode($row['renovate_type']);
-//     foreach ($renovate_type_arr as $row2) {
-//         if ($row2 == 'M1')
-//             $M1++;
-//         if ($row2 == 'M2')
-//             $M2++;
-//         if ($row2 == 'M3')
-//             $M3++;
-//         if ($row2 == 'M4')
-//             $M4++;
-//         if ($row2 == 'MA')
-//             $MA++;
-//     }
-// }
-// $M_count = $M1 + $M2 + $M3 + $M4 + $MA;
-
-$M_count = count($data3);
-$m_type_arr = [];
-$m_type_arr[''] = 0;
-foreach ($data3 as $row) {
-    $m_type_arr[implode("+", json_decode($row['renovate_type']))] = 0;
-}
-foreach ($data3 as $row) {
-    $m_type_arr[implode("+", json_decode($row['renovate_type']))]++;
-}
-
-
-//數字轉英文(0=>A、1=>B、26=>AA...以此類推)
-function num2alpha($n)
-{
-    for ($r = ""; $n >= 0; $n = intval($n / 26) - 1)
-        $r = chr($n % 26 + 0x41) . $r;
-    return $r;
-}
-
-//英文轉數字(A=>0、B=>1、AA=>26...以此類推)
-function alpha2num($a)
-{
-    $l = strlen($a);
-    $n = 0;
-    for ($i = 0; $i < $l; $i++)
-        $n = $n * 26 + ord($a[$i]) - 0x40;
-    return $n - 1;
-}
-if($_SERVER["REQUEST_METHOD"] == 'POST'){
-    if ($_POST['excel_output'] == 'excel_output') {
-        $spreadsheet = new Spreadsheet();
-        $sheet = $spreadsheet->getActiveSheet();
-        $sheet->setTitle('出貨總表');
-
-        $title_col_num = 3;
-        for ($i = $start_y; $i <= $end_y; $i++) {
-            $this_start_m = $i == $start_y ? $start_m : 1;
-            $this_end_m = $i == $start_y ? 12 : $end_m;
-            for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                $title_col_num += 2;
-                if ($i == $end_y && $j == ($end_m + 1)) {
-                    break;
-                }
-            }
-        }
-        $sheet->mergeCells('A1:' . num2alpha($title_col_num) . '1');
-        $sheet->setCellValue('A1', '出貨地區預定明細');
-
-        $title_col_num = 0;
-        $sheet->setCellValue(num2alpha($title_col_num) . '2', '');
-        $title_col_num++;
-        $sheet->setCellValue(num2alpha($title_col_num) . '2', '');
-        $title_col_num++;
-
-        for ($i = $start_y; $i <= $end_y; $i++) {
-            $this_start_m = $i == $start_y ? $start_m : 1;
-            $this_end_m = $i == $start_y ? 12 : $end_m;
-            for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                if ($i == $end_y && $j == ($end_m + 1))
-                    break;
-                $sheet->mergeCells(num2alpha($title_col_num) . '2:' . num2alpha($title_col_num + 1) . '2');
-                $sheet->setCellValue(num2alpha($title_col_num) . '2', $i . '年' . $j . '月');
-                $title_col_num += 2;
-            }
-        }
-
-        $sheet->setCellValue(num2alpha($title_col_num) . '2', '累計台數');
-        $title_col_num++;
-        $sheet->setCellValue(num2alpha($title_col_num) . '2', '累計台數');
-        $title_col_num++;
-
-        $title_col_num = 0;
-        $sheet->setCellValue(num2alpha($title_col_num) . '3', '區域');
-        $title_col_num = 2;
-
-        for ($i = $start_y; $i <= $end_y; $i++) {
-            $this_start_m = $i == $start_y ? $start_m : 1;
-            $this_end_m = $i == $start_y ? 12 : $end_m;
-            for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                if ($i == $end_y && $j == ($end_m + 1)) {
-                    break;
-                }
-                $sheet->setCellValue(num2alpha($title_col_num) . '3', '新梯');
-                $title_col_num++;
-                $sheet->setCellValue(num2alpha($title_col_num) . '3', '汰改');
-                $title_col_num++;
-            }
-        }
-        $sheet->setCellValue(num2alpha($title_col_num) . '3', '新梯');
-        $title_col_num++;
-        $sheet->setCellValue(num2alpha($title_col_num) . '3', '汰改');
-        $title_col_num++;
-
-        $area_arr = [
-            [4, 6, '台北'],
-            [7, 9, '桃竹苗'],
-            [10, 13, '中部'],
-            [14, 17, '南部'],
-            [18, 20, '宜花東'],
-            [21, 21, '未分類']
-        ];
-        foreach ($area_arr as $row) {
-            $title_col_num = 0;
-            $sheet->mergeCells(num2alpha($title_col_num) . $row[0] . ':' . num2alpha($title_col_num) . $row[1]);
-            $sheet->setCellValue(num2alpha($title_col_num) . $row[0], $row[2]);
-        }
-
-        $area_arr = [
-            [4, '台北'],
-            [5, '新北'],
-            [6, '基隆'],
-            [7, '桃園'],
-            [8, '新竹'],
-            [9, '苗栗'],
-            [10, '台中'],
-            [11, '南投'],
-            [12, '彰化'],
-            [13, '雲林'],
-            [14, '嘉義'],
-            [15, '台南'],
-            [16, '高雄'],
-            [17, '屏東'],
-            [18, '宜蘭'],
-            [19, '花蓮'],
-            [20, '台東'],
-            [21, '']
-        ];
-        foreach ($area_arr as $row) {
-            $title_col_num = 0;
-            $title_col_num++;
-            $sheet->setCellValue(num2alpha($title_col_num) . $row[0], $row[1]);
-            for ($i = $start_y; $i <= $end_y; $i++) {
-                $this_start_m = $i == $start_y ? $start_m : 1;
-                $this_end_m = $i == $start_y ? 12 : $end_m;
-                for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                    if ($i == $end_y && $j == ($end_m + 1)) {
-                        break;
-                    }
-                    $tmp_arr = array(
-                        'date_year' => $i,
-                        'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                        'sub_address' => $row[1],
-                        'contract_type' => 'A',
-                    );
-                    $title_col_num++;
-                    $sheet->setCellValue(num2alpha($title_col_num) . $row[0], findData($data, $tmp_arr));
-                    $tmp_arr['contract_type'] = 'B';
-                    $title_col_num++;
-                    $sheet->setCellValue(num2alpha($title_col_num) . $row[0], findData($data, $tmp_arr));
-                }
-            }
-            $tmp_arr = array(
-                'start_y' => $start_y,
-                'end_y' => $end_y,
-                'start_m' =>  $start_m,
-                'end_m' =>  $end_m,
-                'sub_address' => $row[1],
-                'contract_type' => 'A',
-            );
-            $title_col_num++;
-            $sheet->setCellValue(num2alpha($title_col_num) . $row[0], findDataByCity($data, $tmp_arr));
-            $tmp_arr['contract_type'] = 'B';
-            $title_col_num++;
-            $sheet->setCellValue(num2alpha($title_col_num) . $row[0], findDataByCity($data, $tmp_arr));
-        }
-
-
-        $title_col_num = 0;
-        $title_col_num++;
-        $sheet->setCellValue(num2alpha($title_col_num) . '22', "合計");
-        for ($i = $start_y; $i <= $end_y; $i++) {
-            $this_start_m = $i == $start_y ? $start_m : 1;
-            $this_end_m = $i == $start_y ? 12 : $end_m;
-            for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                if ($i == $end_y && $j == ($end_m + 1))
-                    break;
-                $tmp_arr = array(
-                    'date_year' => $i,
-                    'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                    'contract_type' => 'A',
-                );
-                $title_col_num++;
-                $sheet->setCellValue(num2alpha($title_col_num) . '22', findDataByYearMonth($data, $tmp_arr));
-                $tmp_arr['contract_type'] = 'B';
-                $title_col_num++;
-                $sheet->setCellValue(num2alpha($title_col_num) . '22', findDataByYearMonth($data, $tmp_arr));
-            }
-        }
-        $tmp_arr = array(
-            'start_y' => $start_y,
-            'end_y' =>  $end_y,
-            'start_m' => $start_m,
-            'end_m' =>  $end_m,
-            'contract_type' => 'A',
-        );
-        $title_col_num++;
-        $sheet->setCellValue(num2alpha($title_col_num) . '22', findAllDataByYearMonth($data, $tmp_arr));
-        $tmp_arr['contract_type'] = 'B';
-        $title_col_num++;
-        $sheet->setCellValue(num2alpha($title_col_num) . '22', findAllDataByYearMonth($data, $tmp_arr));
-
-
-
-
-        $sheet->mergeCells('A25:I25');
-        $sheet->setCellValue('A25', '受定規格分析');
-
-        $title_col_num = 0;
-        $sheet->setCellValue(num2alpha($title_col_num) . '26', "代碼");
-        foreach ($data2 as $row) {
-            $title_col_num++;
-            $sheet->setCellValue(num2alpha($title_col_num) . '26', $row['facility_kind']);
-        }
-
-        $title_col_num = 0;
-        $sheet->setCellValue(num2alpha($title_col_num) . '27', "機種");
-        foreach ($data2 as $row) {
-            $title_col_num++;
-            $sheet->setCellValue(num2alpha($title_col_num) . '27', getFacilityNamebyType($row['facility_kind']));
-        }
-        $title_col_num++;
-        $sheet->setCellValue(num2alpha($title_col_num) . '27', "合計");
-
-        $title_col_num = 0;
-        $sheet->setCellValue(num2alpha($title_col_num) . '28', "數量");
-        foreach ($data2 as $row) {
-            $title_col_num++;
-            $sheet->setCellValue(num2alpha($title_col_num) . '28', $row['facility_count']);
-        }
-        $title_col_num++;
-        $sheet->setCellValue(num2alpha($title_col_num) . '28', findFacilityTypeAllCount($data2));
-
-        $title_col_num = 0;
-        $sheet->setCellValue(num2alpha($title_col_num) . '29', "百分比");
-        foreach ($data2 as $row) {
-            $title_col_num++;
-            $sheet->setCellValue(num2alpha($title_col_num) . '29', (round($row['facility_count'] / findFacilityTypeAllCount($data2), 4) * 100) . "%");
-        }
-        $title_col_num++;
-        $sheet->setCellValue(num2alpha($title_col_num) . '29', "100%");
-
-
-        $sheet->mergeCells('A32:G32');
-        $sheet->setCellValue('G25', '舊改受訂規格分析');
-
-        $title_col_num = 0;
-        $sheet->setCellValue(num2alpha($title_col_num++) . '33', "類型");
-        foreach ($m_type_arr as $key => $val) {
-            $title_tmp = empty($key) ? '未分類' : $key;
-            $sheet->setCellValue(num2alpha($title_col_num++) . '33', $title_tmp);
-        }
-        $sheet->setCellValue(num2alpha($title_col_num++) . '33', "合計");
-
-        $title_col_num = 0;
-        $sheet->setCellValue(num2alpha($title_col_num++) . '34', "數量");
-        foreach ($m_type_arr as $key => $val) {
-            $sheet->setCellValue(num2alpha($title_col_num++) . '34', $val);
-        }
-        $sheet->setCellValue(num2alpha($title_col_num++) . '34', $M_count);
-
-        $title_col_num = 0;
-        $sheet->setCellValue(num2alpha($title_col_num++) . '35', "百分比");
-        foreach ($m_type_arr as $key => $val) {
-            $sheet->setCellValue(num2alpha($title_col_num++) . '35', (round($val / $M_count, 4) * 100) . "%");
-        }
-        $sheet->setCellValue(num2alpha($title_col_num++) . '35', "100%");
-
-
-        $writer = new Xlsx($spreadsheet);
-        $file_path = dirname(__DIR__) . '/wms/excel/' . 'estimated_shipping_date_report.xlsx';
-        try {
-            $writer->save($file_path);
-            // 回傳檔案路徑給 JavaScript
-            echo $file_path;
-        } catch (Exception $e) {
-            echo 'Error: ' . $e->getMessage();
-        }
-        exit();
-    }
-}
-
-?>
-<style>
-
-</style>
-<h3 class="text-center">出貨地區預定明細</h3>
-<div class="col-md-12 text-center">
-    <form method="post">
-        區間選擇
-        <input type="month" id="start_month" name="start_month" value="<?php echo $start_y . '-' . $start_m; ?>" />
-        ～
-        <input type="month" id="end_month" name="end_month" value="<?php echo $end_y . '-' . $end_m; ?>" />
-        <button class="btn btn-primary btn-sm">選擇</button>
-        <button class="btn btn-primary btn-sm" type="button" onclick="generateButton()">下載</button>
-    </form>
-</div>
-<br /><br />
-<div style="width:98%;overflow-x:auto;" class="scroll-container">
-    <table class="table table-striped">
-        <thead>
-            <tr>
-                <th></th>
-                <th></th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        echo "<th colspan='2' class='text-center' style='vertical-align: middle'>$i 年<br/> $j 月</th>";
-                    }
-                }
-                ?>
-                <th>累計台數</th>
-                <th>累計台數</th>
-            </tr>
-            <tr>
-                <th>區域</th>
-                <th></th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        echo "<th>新梯</th>";
-                        echo "<th>汰改</th>";
-                    }
-                }
-                ?>
-                <th>新梯</th>
-                <th>汰改</th>
-            </tr>
-            <tr>
-                <th rowspan="3" class="text-center" style="vertical-align: middle"> 台北</th>
-                <th>台北</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '台北',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '台北',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th>新北</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '新北',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '新北',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th>基隆</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '基隆',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '基隆',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th rowspan="3" class="text-center" style="vertical-align: middle"> 桃竹苗</th>
-                <th>桃園</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '桃園',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '桃園',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th>新竹</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '新竹',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '新竹',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th>苗栗</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '苗栗',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '苗栗',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th rowspan="4" class="text-center" style="vertical-align: middle"> 中部</th>
-                <th>台中</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '台中',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '台中',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th>南投</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '南投',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '南投',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th>彰化</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '彰化',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '彰化',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th>雲林</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '雲林',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '雲林',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th rowspan="4" class="text-center" style="vertical-align: middle"> 南部</th>
-                <th>嘉義</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '嘉義',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '嘉義',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th>台南</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '台南',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '台南',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th>高雄</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '高雄',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '高雄',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th>屏東</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '屏東',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '屏東',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th rowspan="3" class="text-center" style="vertical-align: middle"> 宜花東</th>
-                <th>宜蘭</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '宜蘭',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '宜蘭',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th>花蓮</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '花蓮',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '花蓮',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th>台東</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '台東',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '台東',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th class="text-center" style="vertical-align: middle"> 未分類</th>
-                <th></th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'sub_address' => '',
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' => $end_y,
-                    'start_m' =>  $start_m,
-                    'end_m' =>  $end_m,
-                    'sub_address' => '',
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-            <tr>
-                <th></th>
-                <th>合計</th>
-                <?php
-                for ($i = $start_y; $i <= $end_y; $i++) {
-                    $this_start_m = $i == $start_y ? $start_m : 1;
-                    $this_end_m = $i == $start_y ? 12 : $end_m;
-                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
-                        if ($i == $end_y && $j == ($end_m + 1))
-                            break;
-                        $tmp_arr = array(
-                            'date_year' => $i,
-                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
-                            'contract_type' => 'A',
-                        );
-                        echo "<td>" . findDataByYearMonth($data, $tmp_arr) . "</td>";
-                        $tmp_arr['contract_type'] = 'B';
-                        echo "<td>" . findDataByYearMonth($data, $tmp_arr) . "</td>";
-                    }
-                }
-                $tmp_arr = array(
-                    'start_y' => $start_y,
-                    'end_y' =>  $end_y,
-                    'start_m' => $start_m,
-                    'end_m' =>  $end_m,
-                    'contract_type' => 'A',
-                );
-                echo "<td>" . findAllDataByYearMonth($data, $tmp_arr) . "</td>";
-                $tmp_arr['contract_type'] = 'B';
-                echo "<td>" . findAllDataByYearMonth($data, $tmp_arr) . "</td>";
-                ?>
-            </tr>
-        </thead>
-    </table>
-</div>
-
-<br /><br />
-
-<div class="col-12 col-md-8">
-    <table class="table table-striped">
-        <thead>
-            <tr>
-                <td colsapn="<?php echo count($data2); ?>">受定規格分析</td>
-            </tr>
-        </thead>
-        <tbody>
-            <tr>
-                <th>代碼</th>
-                <?php
-                foreach ($data2 as $row) {
-                    echo "<td>" . $row['facility_kind'] . "</td>";
-                }
-                ?>
-                <th></th>
-            </tr>
-            <tr>
-                <th>機種</th>
-                <?php
-                foreach ($data2 as $row) {
-                    echo "<td>" . getFacilityNamebyType($row['facility_kind']) . "</td>";
-                }
-                ?>
-                <th>合計</th>
-            </tr>
-            <tr>
-                <th>數量</th>
-                <?php
-                foreach ($data2 as $row) {
-                    echo "<td>" . $row['facility_count'] . "</td>";
-                }
-                ?>
-                <th><?php echo findFacilityTypeAllCount($data2); ?></th>
-            </tr>
-            <tr>
-                <th>百分比</th>
-                <?php
-                foreach ($data2 as $row) {
-                    echo "<td>" . (round($row['facility_count'] / findFacilityTypeAllCount($data2), 4) * 100) . "%" . "</td>";
-                }
-                ?>
-                <th><?php echo "100%"; ?></th>
-            </tr>
-        </tbody>
-    </table>
-</div>
-
-<br /><br />
-
-<div class="col-12 col-md-4">
-    <table class="table table-striped">
-        <thead>
-            <tr>
-                <td>舊改受訂規格分析</td>
-            </tr>
-        </thead>
-        <tbody>
-            <tr>
-                <th>類型</th>
-                <?php
-                foreach ($m_type_arr as $key => $val) {
-                    $title_tmp = empty($key) ? '未分類' : $key;
-                    echo "<th>" . $title_tmp . "</th>";
-                }
-                ?>
-                <th>合計</th>
-            </tr>
-            <tr>
-                <th>數量</th>
-                <?php
-                foreach ($m_type_arr as $key => $val) {
-                    echo "<th>" . $val . "</th>";
-                }
-                ?>
-                <th><?php echo $M_count; ?></th>
-            </tr>
-            <tr>
-                <th>百分比</th>
-                <?php
-                foreach ($m_type_arr as $key => $val) {
-                    echo "<th>" . round($val / $M_count, 4) * 100 . "%" . "</th>";
-                }
-                ?>
-                <th>100%</th>
-            </tr>
-        </tbody>
-    </table>
-</div>
-<script>
-    const formData = new FormData();
-    formData.append("start_month", $("#start_month").val());
-    formData.append("end_month", $("#end_month").val());
-    formData.append("excel_output", "excel_output");
-    // 使用 JavaScript 監聽按鈕點擊事件
-    function generateButton() {
-        // 使用 XMLHttpRequest 來呼叫 PHP 檔案，生成 Excel
-        var xhr = new XMLHttpRequest();
-        xhr.open('POST', window.location.origin + "/wms/estimated_shipping_date_report.php?<?= $token_link ?>", true);
-        xhr.responseType = 'text';
-        xhr.onload = function() {
-            if (xhr.status === 200) {
-                // 取得 PHP 回傳的檔案路徑
-                var response = xhr.responseText;
-                var file_path = xhr.responseText;
-                // 創建下載連結
-                var link = document.createElement('a');
-                link.setAttribute('href', window.location.origin + "/wms/excel/estimated_shipping_date_report.xlsx");
-                // 設定下載的檔案名稱
-                link.setAttribute('download', '出貨地區預定明細.xlsx');
-                link.style.display = 'none';
-                document.body.appendChild(link);
-                link.click();
-                document.body.removeChild(link);
-            }
-        };
-        xhr.send(formData);
-    }
-
-
-
-
-
-
-    const scrollContainer = document.querySelector('.scroll-container');
-    let isDragging = false;
-    let startX;
-
-    scrollContainer.addEventListener('mousedown', (e) => {
-        isDragging = true;
-        startX = e.clientX + scrollContainer.scrollLeft;
-        scrollContainer.style.cursor = 'grabbing';
-    });
-
-    window.addEventListener('mousemove', (e) => {
-        if (!isDragging) return;
-        e.preventDefault();
-        const x = startX - e.clientX;
-        scrollContainer.scrollLeft = x;
-    });
-
-    window.addEventListener('mouseup', () => {
-        isDragging = false;
-        scrollContainer.style.cursor = 'grab';
-    });
-
-    scrollContainer.addEventListener('mouseleave', () => {
-        if (!isDragging) return;
-        isDragging = false;
-        scrollContainer.style.cursor = 'grab';
-    });
+<?php
+// ini_set('display_errors', 'on');
+require dirname(__DIR__) . '/common/composer/vendor/autoload.php';
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+
+include "header.php";
+
+$start_y = empty($_POST['start_month']) ? '2023' : substr($_POST['start_month'], 0, 4);
+$end_y = empty($_POST['end_month']) ? '2023' : substr($_POST['end_month'], 0, 4);
+$start_m = empty($_POST['start_month']) ? '01' : substr($_POST['start_month'], 5, 2);
+$end_m = empty($_POST['end_month']) ? '12' : substr($_POST['end_month'], 5, 2);
+
+$sql = "
+    SELECT
+        this_order.contract_type,
+        this_order.sub_address,
+        this_order.date_year,
+        this_order.date_month,
+        COUNT(this_order.sub_address) AS facility_count
+    FROM(
+        SELECT 
+            SUBSTR(TRIM(w.address),1,2) AS sub_address,
+            SUBSTR(CONVERT(real_contract_arrival_date, DATETIME),1,4) AS date_year,
+            SUBSTR(CONVERT(real_contract_arrival_date, DATETIME),6,2) AS date_month,
+            w.facility_kind,
+            w.contract_type
+        FROM wipwholestatus AS w
+        WHERE status = '1'
+        AND real_contract_arrival_date >= '$start_y-$start_m-1'
+        AND real_contract_arrival_date <= '$end_y-$end_m-31'
+    ) AS this_order
+    WHERE 1 = 1
+    GROUP BY this_order.contract_type,
+    this_order.sub_address,
+    this_order.date_year,
+    this_order.date_month
+";
+$result = mysqli_query($link, $sql);
+$data = [];
+while ($row = $result->fetch_assoc()) {
+    $data[] = $row;
+}
+
+function findData($data, $searchData)
+{
+    foreach ($data as $item) {
+        if (
+            $item['contract_type'] == $searchData['contract_type']
+            && $item['sub_address'] == $searchData['sub_address']
+            && $item['date_year'] == $searchData['date_year']
+            && $item['date_month'] == $searchData['date_month']
+        ) {
+            return $item['facility_count'];
+        }
+    }
+    return 0;
+}
+
+function findDataByCity($data, $searchData)
+{
+    $count = 0;
+    $start_y = $searchData['start_y'];
+    $start_m = $searchData['start_m'];
+    $end_y = $searchData['end_y'];
+    $end_m = $searchData['end_m'];
+    for ($i = $start_y; $i <= $end_y; $i++) {
+        $this_start_m = $i == $start_y ? $start_m : 1;
+        $this_end_m = $i == $start_y ? 12 : $end_m;
+        for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+            foreach ($data as $item) {
+                if (
+                    $item['contract_type'] == $searchData['contract_type']
+                    && $item['sub_address'] == $searchData['sub_address']
+                    && $item['date_year'] == $i
+                    && $item['date_month'] == str_pad($j, 2, '0', STR_PAD_LEFT)
+                ) {
+                    $count += $item['facility_count'];
+                }
+            }
+        }
+    }
+    return $count;
+}
+
+function findDataByYearMonth($data, $searchData)
+{
+    $count = 0;
+    foreach ($data as $item) {
+        if (
+            $item['contract_type'] == $searchData['contract_type']
+            && $item['date_year'] ==  $searchData['date_year']
+            && $item['date_month'] ==  $searchData['date_month']
+        ) {
+            $count += $item['facility_count'];
+        }
+    }
+    return $count;
+}
+
+function findAllDataByYearMonth($data, $searchData)
+{
+    $count = 0;
+    $start_y = $searchData['start_y'];
+    $start_m = $searchData['start_m'];
+    $end_y = $searchData['end_y'];
+    $end_m = $searchData['end_m'];
+    for ($i = $start_y; $i <= $end_y; $i++) {
+        $this_start_m = $i == $start_y ? $start_m : 1;
+        $this_end_m = $i == $start_y ? 12 : $end_m;
+        for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+            foreach ($data as $item) {
+                if (
+                    $item['contract_type'] == $searchData['contract_type']
+                    && $item['date_year'] == $i
+                    && $item['date_month'] == str_pad($j, 2, '0', STR_PAD_LEFT)
+                ) {
+                    $count += $item['facility_count'];
+                }
+            }
+        }
+    }
+    return $count;
+}
+
+$sql = "
+    SELECT
+        new_order.facility_kind,
+        COUNT(new_order.facility_kind) AS facility_count
+    FROM(
+        SELECT 
+            w.facility_kind
+        FROM wipwholestatus AS w
+        WHERE 1=1
+        AND status = '1'
+        AND contract_type = 'A'
+        AND real_contract_arrival_date >= '$start_y-$start_m-1'
+        AND real_contract_arrival_date <= '$end_y-$end_m-31'
+    ) AS new_order
+    WHERE 1 = 1
+    GROUP BY new_order.facility_kind
+";
+$result = mysqli_query($link, $sql);
+$data2 = [];
+while ($row = $result->fetch_assoc()) {
+    $data2[] = $row;
+}
+
+function findFacilityTypeAllCount($data2)
+{
+    $count = 0;
+    foreach ($data2 as $row) {
+        $count += $row['facility_count'];
+    }
+    return $count;
+}
+
+function getFacilityNamebyType($facility_kind)
+{
+    $arr = array(
+        'MAE100' => '小機房',
+        'MAM200' => '無機房',
+        'MAH100' => '小電梯',
+        'MAQ100' => '強驅梯',
+        'MAF100' => '貨梯',
+        'MAP100' => '平台梯',
+        '' => '未分類'
+    );
+    return isset($arr[$facility_kind]) ? $arr[$facility_kind] : "";
+}
+
+$sql = "
+    SELECT 
+        w.renovate_type
+    FROM wipwholestatus AS w
+    WHERE 1=1
+    AND status = '1'
+    AND real_contract_arrival_date >= '$start_y-$start_m-1'
+    AND real_contract_arrival_date <= '$end_y-$end_m-31'
+    AND contract_type = 'B'
+";
+$result = mysqli_query($link, $sql);
+$data3 = [];
+while ($row = $result->fetch_assoc()) {
+    $data3[] = $row;
+}
+
+// 分開計算
+
+// $M1 = 0;
+// $M2 = 0;
+// $M3 = 0;
+// $M4 = 0;
+// $MA = 0;
+// $M_count = 0;
+// foreach ($data3 as $row) {
+//     $renovate_type_arr = json_decode($row['renovate_type']);
+//     foreach ($renovate_type_arr as $row2) {
+//         if ($row2 == 'M1')
+//             $M1++;
+//         if ($row2 == 'M2')
+//             $M2++;
+//         if ($row2 == 'M3')
+//             $M3++;
+//         if ($row2 == 'M4')
+//             $M4++;
+//         if ($row2 == 'MA')
+//             $MA++;
+//     }
+// }
+// $M_count = $M1 + $M2 + $M3 + $M4 + $MA;
+
+$M_count = count($data3);
+$m_type_arr = [];
+$m_type_arr[''] = 0;
+foreach ($data3 as $row) {
+    $m_type_arr[implode("+", json_decode($row['renovate_type']))] = 0;
+}
+foreach ($data3 as $row) {
+    $m_type_arr[implode("+", json_decode($row['renovate_type']))]++;
+}
+
+
+//數字轉英文(0=>A、1=>B、26=>AA...以此類推)
+function num2alpha($n)
+{
+    for ($r = ""; $n >= 0; $n = intval($n / 26) - 1)
+        $r = chr($n % 26 + 0x41) . $r;
+    return $r;
+}
+
+//英文轉數字(A=>0、B=>1、AA=>26...以此類推)
+function alpha2num($a)
+{
+    $l = strlen($a);
+    $n = 0;
+    for ($i = 0; $i < $l; $i++)
+        $n = $n * 26 + ord($a[$i]) - 0x40;
+    return $n - 1;
+}
+if($_SERVER["REQUEST_METHOD"] == 'POST'){
+    if ($_POST['excel_output'] == 'excel_output') {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setTitle('出貨總表');
+
+        $title_col_num = 3;
+        for ($i = $start_y; $i <= $end_y; $i++) {
+            $this_start_m = $i == $start_y ? $start_m : 1;
+            $this_end_m = $i == $start_y ? 12 : $end_m;
+            for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                $title_col_num += 2;
+                if ($i == $end_y && $j == ($end_m + 1)) {
+                    break;
+                }
+            }
+        }
+        $sheet->mergeCells('A1:' . num2alpha($title_col_num) . '1');
+        $sheet->setCellValue('A1', '出貨地區預定明細');
+
+        $title_col_num = 0;
+        $sheet->setCellValue(num2alpha($title_col_num) . '2', '');
+        $title_col_num++;
+        $sheet->setCellValue(num2alpha($title_col_num) . '2', '');
+        $title_col_num++;
+
+        for ($i = $start_y; $i <= $end_y; $i++) {
+            $this_start_m = $i == $start_y ? $start_m : 1;
+            $this_end_m = $i == $start_y ? 12 : $end_m;
+            for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                if ($i == $end_y && $j == ($end_m + 1))
+                    break;
+                $sheet->mergeCells(num2alpha($title_col_num) . '2:' . num2alpha($title_col_num + 1) . '2');
+                $sheet->setCellValue(num2alpha($title_col_num) . '2', $i . '年' . $j . '月');
+                $title_col_num += 2;
+            }
+        }
+
+        $sheet->setCellValue(num2alpha($title_col_num) . '2', '累計台數');
+        $title_col_num++;
+        $sheet->setCellValue(num2alpha($title_col_num) . '2', '累計台數');
+        $title_col_num++;
+
+        $title_col_num = 0;
+        $sheet->setCellValue(num2alpha($title_col_num) . '3', '區域');
+        $title_col_num = 2;
+
+        for ($i = $start_y; $i <= $end_y; $i++) {
+            $this_start_m = $i == $start_y ? $start_m : 1;
+            $this_end_m = $i == $start_y ? 12 : $end_m;
+            for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                if ($i == $end_y && $j == ($end_m + 1)) {
+                    break;
+                }
+                $sheet->setCellValue(num2alpha($title_col_num) . '3', '新梯');
+                $title_col_num++;
+                $sheet->setCellValue(num2alpha($title_col_num) . '3', '汰改');
+                $title_col_num++;
+            }
+        }
+        $sheet->setCellValue(num2alpha($title_col_num) . '3', '新梯');
+        $title_col_num++;
+        $sheet->setCellValue(num2alpha($title_col_num) . '3', '汰改');
+        $title_col_num++;
+
+        $area_arr = [
+            [4, 6, '台北'],
+            [7, 9, '桃竹苗'],
+            [10, 13, '中部'],
+            [14, 17, '南部'],
+            [18, 20, '宜花東'],
+            [21, 21, '未分類']
+        ];
+        foreach ($area_arr as $row) {
+            $title_col_num = 0;
+            $sheet->mergeCells(num2alpha($title_col_num) . $row[0] . ':' . num2alpha($title_col_num) . $row[1]);
+            $sheet->setCellValue(num2alpha($title_col_num) . $row[0], $row[2]);
+        }
+
+        $area_arr = [
+            [4, '台北'],
+            [5, '新北'],
+            [6, '基隆'],
+            [7, '桃園'],
+            [8, '新竹'],
+            [9, '苗栗'],
+            [10, '台中'],
+            [11, '南投'],
+            [12, '彰化'],
+            [13, '雲林'],
+            [14, '嘉義'],
+            [15, '台南'],
+            [16, '高雄'],
+            [17, '屏東'],
+            [18, '宜蘭'],
+            [19, '花蓮'],
+            [20, '台東'],
+            [21, '']
+        ];
+        foreach ($area_arr as $row) {
+            $title_col_num = 0;
+            $title_col_num++;
+            $sheet->setCellValue(num2alpha($title_col_num) . $row[0], $row[1]);
+            for ($i = $start_y; $i <= $end_y; $i++) {
+                $this_start_m = $i == $start_y ? $start_m : 1;
+                $this_end_m = $i == $start_y ? 12 : $end_m;
+                for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                    if ($i == $end_y && $j == ($end_m + 1)) {
+                        break;
+                    }
+                    $tmp_arr = array(
+                        'date_year' => $i,
+                        'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                        'sub_address' => $row[1],
+                        'contract_type' => 'A',
+                    );
+                    $title_col_num++;
+                    $sheet->setCellValue(num2alpha($title_col_num) . $row[0], findData($data, $tmp_arr));
+                    $tmp_arr['contract_type'] = 'B';
+                    $title_col_num++;
+                    $sheet->setCellValue(num2alpha($title_col_num) . $row[0], findData($data, $tmp_arr));
+                }
+            }
+            $tmp_arr = array(
+                'start_y' => $start_y,
+                'end_y' => $end_y,
+                'start_m' =>  $start_m,
+                'end_m' =>  $end_m,
+                'sub_address' => $row[1],
+                'contract_type' => 'A',
+            );
+            $title_col_num++;
+            $sheet->setCellValue(num2alpha($title_col_num) . $row[0], findDataByCity($data, $tmp_arr));
+            $tmp_arr['contract_type'] = 'B';
+            $title_col_num++;
+            $sheet->setCellValue(num2alpha($title_col_num) . $row[0], findDataByCity($data, $tmp_arr));
+        }
+
+
+        $title_col_num = 0;
+        $title_col_num++;
+        $sheet->setCellValue(num2alpha($title_col_num) . '22', "合計");
+        for ($i = $start_y; $i <= $end_y; $i++) {
+            $this_start_m = $i == $start_y ? $start_m : 1;
+            $this_end_m = $i == $start_y ? 12 : $end_m;
+            for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                if ($i == $end_y && $j == ($end_m + 1))
+                    break;
+                $tmp_arr = array(
+                    'date_year' => $i,
+                    'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                    'contract_type' => 'A',
+                );
+                $title_col_num++;
+                $sheet->setCellValue(num2alpha($title_col_num) . '22', findDataByYearMonth($data, $tmp_arr));
+                $tmp_arr['contract_type'] = 'B';
+                $title_col_num++;
+                $sheet->setCellValue(num2alpha($title_col_num) . '22', findDataByYearMonth($data, $tmp_arr));
+            }
+        }
+        $tmp_arr = array(
+            'start_y' => $start_y,
+            'end_y' =>  $end_y,
+            'start_m' => $start_m,
+            'end_m' =>  $end_m,
+            'contract_type' => 'A',
+        );
+        $title_col_num++;
+        $sheet->setCellValue(num2alpha($title_col_num) . '22', findAllDataByYearMonth($data, $tmp_arr));
+        $tmp_arr['contract_type'] = 'B';
+        $title_col_num++;
+        $sheet->setCellValue(num2alpha($title_col_num) . '22', findAllDataByYearMonth($data, $tmp_arr));
+
+
+
+
+        $sheet->mergeCells('A25:I25');
+        $sheet->setCellValue('A25', '受定規格分析');
+
+        $title_col_num = 0;
+        $sheet->setCellValue(num2alpha($title_col_num) . '26', "代碼");
+        foreach ($data2 as $row) {
+            $title_col_num++;
+            $sheet->setCellValue(num2alpha($title_col_num) . '26', $row['facility_kind']);
+        }
+
+        $title_col_num = 0;
+        $sheet->setCellValue(num2alpha($title_col_num) . '27', "機種");
+        foreach ($data2 as $row) {
+            $title_col_num++;
+            $sheet->setCellValue(num2alpha($title_col_num) . '27', getFacilityNamebyType($row['facility_kind']));
+        }
+        $title_col_num++;
+        $sheet->setCellValue(num2alpha($title_col_num) . '27', "合計");
+
+        $title_col_num = 0;
+        $sheet->setCellValue(num2alpha($title_col_num) . '28', "數量");
+        foreach ($data2 as $row) {
+            $title_col_num++;
+            $sheet->setCellValue(num2alpha($title_col_num) . '28', $row['facility_count']);
+        }
+        $title_col_num++;
+        $sheet->setCellValue(num2alpha($title_col_num) . '28', findFacilityTypeAllCount($data2));
+
+        $title_col_num = 0;
+        $sheet->setCellValue(num2alpha($title_col_num) . '29', "百分比");
+        foreach ($data2 as $row) {
+            $title_col_num++;
+            $sheet->setCellValue(num2alpha($title_col_num) . '29', (round($row['facility_count'] / findFacilityTypeAllCount($data2), 4) * 100) . "%");
+        }
+        $title_col_num++;
+        $sheet->setCellValue(num2alpha($title_col_num) . '29', "100%");
+
+
+        $sheet->mergeCells('A32:G32');
+        $sheet->setCellValue('G25', '舊改受訂規格分析');
+
+        $title_col_num = 0;
+        $sheet->setCellValue(num2alpha($title_col_num++) . '33', "類型");
+        foreach ($m_type_arr as $key => $val) {
+            $title_tmp = empty($key) ? '未分類' : $key;
+            $sheet->setCellValue(num2alpha($title_col_num++) . '33', $title_tmp);
+        }
+        $sheet->setCellValue(num2alpha($title_col_num++) . '33', "合計");
+
+        $title_col_num = 0;
+        $sheet->setCellValue(num2alpha($title_col_num++) . '34', "數量");
+        foreach ($m_type_arr as $key => $val) {
+            $sheet->setCellValue(num2alpha($title_col_num++) . '34', $val);
+        }
+        $sheet->setCellValue(num2alpha($title_col_num++) . '34', $M_count);
+
+        $title_col_num = 0;
+        $sheet->setCellValue(num2alpha($title_col_num++) . '35', "百分比");
+        foreach ($m_type_arr as $key => $val) {
+            $sheet->setCellValue(num2alpha($title_col_num++) . '35', (round($val / $M_count, 4) * 100) . "%");
+        }
+        $sheet->setCellValue(num2alpha($title_col_num++) . '35', "100%");
+
+
+        $writer = new Xlsx($spreadsheet);
+        $file_path = dirname(__DIR__) . '/wms/excel/' . 'estimated_shipping_date_report.xlsx';
+        try {
+            $writer->save($file_path);
+            // 回傳檔案路徑給 JavaScript
+            echo $file_path;
+        } catch (Exception $e) {
+            echo 'Error: ' . $e->getMessage();
+        }
+        exit();
+    }
+}
+
+?>
+<style>
+
+</style>
+<h3 class="text-center">出貨地區預定明細</h3>
+<div class="col-md-12 text-center">
+    <form method="post">
+        區間選擇
+        <input type="month" id="start_month" name="start_month" value="<?php echo $start_y . '-' . $start_m; ?>" />
+        ～
+        <input type="month" id="end_month" name="end_month" value="<?php echo $end_y . '-' . $end_m; ?>" />
+        <button class="btn btn-primary btn-sm">選擇</button>
+        <button class="btn btn-primary btn-sm" type="button" onclick="generateButton()">下載</button>
+    </form>
+</div>
+<br /><br />
+<div style="width:98%;overflow-x:auto;" class="scroll-container">
+    <table class="table table-striped">
+        <thead>
+            <tr>
+                <th></th>
+                <th></th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        echo "<th colspan='2' class='text-center' style='vertical-align: middle'>$i 年<br/> $j 月</th>";
+                    }
+                }
+                ?>
+                <th>累計台數</th>
+                <th>累計台數</th>
+            </tr>
+            <tr>
+                <th>區域</th>
+                <th></th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        echo "<th>新梯</th>";
+                        echo "<th>汰改</th>";
+                    }
+                }
+                ?>
+                <th>新梯</th>
+                <th>汰改</th>
+            </tr>
+            <tr>
+                <th rowspan="3" class="text-center" style="vertical-align: middle"> 台北</th>
+                <th>台北</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '台北',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '台北',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th>新北</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '新北',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '新北',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th>基隆</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '基隆',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '基隆',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th rowspan="3" class="text-center" style="vertical-align: middle"> 桃竹苗</th>
+                <th>桃園</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '桃園',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '桃園',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th>新竹</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '新竹',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '新竹',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th>苗栗</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '苗栗',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '苗栗',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th rowspan="4" class="text-center" style="vertical-align: middle"> 中部</th>
+                <th>台中</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '台中',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '台中',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th>南投</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '南投',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '南投',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th>彰化</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '彰化',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '彰化',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th>雲林</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '雲林',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '雲林',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th rowspan="4" class="text-center" style="vertical-align: middle"> 南部</th>
+                <th>嘉義</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '嘉義',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '嘉義',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th>台南</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '台南',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '台南',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th>高雄</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '高雄',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '高雄',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th>屏東</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '屏東',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '屏東',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th rowspan="3" class="text-center" style="vertical-align: middle"> 宜花東</th>
+                <th>宜蘭</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '宜蘭',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '宜蘭',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th>花蓮</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '花蓮',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '花蓮',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th>台東</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '台東',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '台東',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th class="text-center" style="vertical-align: middle"> 未分類</th>
+                <th></th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'sub_address' => '',
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findData($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' => $end_y,
+                    'start_m' =>  $start_m,
+                    'end_m' =>  $end_m,
+                    'sub_address' => '',
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findDataByCity($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+            <tr>
+                <th></th>
+                <th>合計</th>
+                <?php
+                for ($i = $start_y; $i <= $end_y; $i++) {
+                    $this_start_m = $i == $start_y ? $start_m : 1;
+                    $this_end_m = $i == $start_y ? 12 : $end_m;
+                    for ($j = $this_start_m; $j <= $this_end_m; $j++) {
+                        if ($i == $end_y && $j == ($end_m + 1))
+                            break;
+                        $tmp_arr = array(
+                            'date_year' => $i,
+                            'date_month' =>  str_pad($j, 2, '0', STR_PAD_LEFT),
+                            'contract_type' => 'A',
+                        );
+                        echo "<td>" . findDataByYearMonth($data, $tmp_arr) . "</td>";
+                        $tmp_arr['contract_type'] = 'B';
+                        echo "<td>" . findDataByYearMonth($data, $tmp_arr) . "</td>";
+                    }
+                }
+                $tmp_arr = array(
+                    'start_y' => $start_y,
+                    'end_y' =>  $end_y,
+                    'start_m' => $start_m,
+                    'end_m' =>  $end_m,
+                    'contract_type' => 'A',
+                );
+                echo "<td>" . findAllDataByYearMonth($data, $tmp_arr) . "</td>";
+                $tmp_arr['contract_type'] = 'B';
+                echo "<td>" . findAllDataByYearMonth($data, $tmp_arr) . "</td>";
+                ?>
+            </tr>
+        </thead>
+    </table>
+</div>
+
+<br /><br />
+
+<div class="col-12 col-md-8">
+    <table class="table table-striped">
+        <thead>
+            <tr>
+                <td colsapn="<?php echo count($data2); ?>">受定規格分析</td>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <th>代碼</th>
+                <?php
+                foreach ($data2 as $row) {
+                    echo "<td>" . $row['facility_kind'] . "</td>";
+                }
+                ?>
+                <th></th>
+            </tr>
+            <tr>
+                <th>機種</th>
+                <?php
+                foreach ($data2 as $row) {
+                    echo "<td>" . getFacilityNamebyType($row['facility_kind']) . "</td>";
+                }
+                ?>
+                <th>合計</th>
+            </tr>
+            <tr>
+                <th>數量</th>
+                <?php
+                foreach ($data2 as $row) {
+                    echo "<td>" . $row['facility_count'] . "</td>";
+                }
+                ?>
+                <th><?php echo findFacilityTypeAllCount($data2); ?></th>
+            </tr>
+            <tr>
+                <th>百分比</th>
+                <?php
+                foreach ($data2 as $row) {
+                    echo "<td>" . (round($row['facility_count'] / findFacilityTypeAllCount($data2), 4) * 100) . "%" . "</td>";
+                }
+                ?>
+                <th><?php echo "100%"; ?></th>
+            </tr>
+        </tbody>
+    </table>
+</div>
+
+<br /><br />
+
+<div class="col-12 col-md-4">
+    <table class="table table-striped">
+        <thead>
+            <tr>
+                <td>舊改受訂規格分析</td>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <th>類型</th>
+                <?php
+                foreach ($m_type_arr as $key => $val) {
+                    $title_tmp = empty($key) ? '未分類' : $key;
+                    echo "<th>" . $title_tmp . "</th>";
+                }
+                ?>
+                <th>合計</th>
+            </tr>
+            <tr>
+                <th>數量</th>
+                <?php
+                foreach ($m_type_arr as $key => $val) {
+                    echo "<th>" . $val . "</th>";
+                }
+                ?>
+                <th><?php echo $M_count; ?></th>
+            </tr>
+            <tr>
+                <th>百分比</th>
+                <?php
+                foreach ($m_type_arr as $key => $val) {
+                    echo "<th>" . round($val / $M_count, 4) * 100 . "%" . "</th>";
+                }
+                ?>
+                <th>100%</th>
+            </tr>
+        </tbody>
+    </table>
+</div>
+<script>
+    const formData = new FormData();
+    formData.append("start_month", $("#start_month").val());
+    formData.append("end_month", $("#end_month").val());
+    formData.append("excel_output", "excel_output");
+    // 使用 JavaScript 監聽按鈕點擊事件
+    function generateButton() {
+        // 使用 XMLHttpRequest 來呼叫 PHP 檔案，生成 Excel
+        var xhr = new XMLHttpRequest();
+        xhr.open('POST', window.location.origin + "/wms/estimated_shipping_date_report.php?<?= $token_link ?>", true);
+        xhr.responseType = 'text';
+        xhr.onload = function() {
+            if (xhr.status === 200) {
+                // 取得 PHP 回傳的檔案路徑
+                var response = xhr.responseText;
+                var file_path = xhr.responseText;
+                // 創建下載連結
+                var link = document.createElement('a');
+                link.setAttribute('href', window.location.origin + "/wms/excel/estimated_shipping_date_report.xlsx");
+                // 設定下載的檔案名稱
+                link.setAttribute('download', '出貨地區預定明細.xlsx');
+                link.style.display = 'none';
+                document.body.appendChild(link);
+                link.click();
+                document.body.removeChild(link);
+            }
+        };
+        xhr.send(formData);
+    }
+
+
+
+
+
+
+    const scrollContainer = document.querySelector('.scroll-container');
+    let isDragging = false;
+    let startX;
+
+    scrollContainer.addEventListener('mousedown', (e) => {
+        isDragging = true;
+        startX = e.clientX + scrollContainer.scrollLeft;
+        scrollContainer.style.cursor = 'grabbing';
+    });
+
+    window.addEventListener('mousemove', (e) => {
+        if (!isDragging) return;
+        e.preventDefault();
+        const x = startX - e.clientX;
+        scrollContainer.scrollLeft = x;
+    });
+
+    window.addEventListener('mouseup', () => {
+        isDragging = false;
+        scrollContainer.style.cursor = 'grab';
+    });
+
+    scrollContainer.addEventListener('mouseleave', () => {
+        if (!isDragging) return;
+        isDragging = false;
+        scrollContainer.style.cursor = 'grab';
+    });
 </script>
\ No newline at end of file
diff --git a/wms/excel-upload.php b/wms/excel-upload.php
index 1a9d842d..bb2c5fe1 100644
--- a/wms/excel-upload.php
+++ b/wms/excel-upload.php
@@ -1,244 +1,244 @@
-
-<?php
-include "header.php";
-require_once 'PHPExcel/PHPExcel.php';
-require_once 'PHPExcel/IOFactory.php';
-$file_name = $_FILES["fileToUpload"]["name"];
-$temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
-$target_dir = "excel-uploads/";
-$target_file = strtolower($target_dir . iconv("UTF-8", "big5",basename($file_name)));
-$EXTENSION = pathinfo($target_file, PATHINFO_EXTENSION);
-if (move_uploaded_file($temp_file_name, $target_file)) {
-    if ($EXTENSION == 'xls') {
-        $objReader = PHPExcel_IOFactory::createReader('Excel5');//支持xls
-    } else {
-        $objReader = PHPExcel_IOFactory::createReader('Excel2007');//支持xlsx
-    }
-    $objPHPExcel = $objReader->load($target_file); //读取上传到服务器的文件
-    $sheet = $objPHPExcel->getSheet(0);//拿到第一个sheet数据
-    $highestRow = $sheet->getHighestRow(); // 取得总行数
-    $highestColumn = $sheet->getHighestColumn(); // 取得总列数
-    $highestColumn = PHPExcel_Cell::columnIndexFromString($highestColumn); // 转换字母为对应的统计数字；
-    $excelArray = array();
-    for ($row = 2; $row <= $highestRow; $row++) {
-        $val = $sheet->getCellByColumnAndRow(0, $row)->getCalculatedValue();
-        if ($val == "") return;
-        for ($column = 1; $column < $highestColumn; $column++) {
-            $val = $sheet->getCellByColumnAndRow($column, $row)->getCalculatedValue();
-            $excelArray[$row][] = $val; //读取excel数据到数组
-        }
-        /*
-        (
-            [2] => Array
-                (
-                    [0] => M230875
-                    [1] => 3TX23001
-                    [2] => 桃園市中壢區榮民南路81巷8號
-                    [3] => 121.25820796563
-                    [4] => 24.955059621474
-                    [5] => 梁智芳
-                    [6] => 
-                    [7] => 921389826
-                    [8] => M0089
-                    [9] => 郭玠德
-                    [10] => 0905-378-991
-                    [11] => 2023/07/14
-                    [12] => BW002
-                    [13] => 
-                    [14] => 45108
-                    [15] => 45473
-                    [16] => 
-                )
-        )*/
-        //print_r($excelArray);exit;
-        echo  "第".$row;
-
-        // excel欄位名稱
-        list($contractno, $facilityno, $address, $longitude, $latitude, $name, $customerid, $tel, $repairerid, $repairer_name, $repairer_tel, $duedate, $combono, $receivable_date, $c_start_date, $c_end_date) = $excelArray[$row];
-        $customerid = (!$customerid) ? $contractno : $customerid;
-        $repairer_tel =  str_pad(str_replace("-", "", $repairer_tel), 10, "0", STR_PAD_LEFT);   // 保養員手机号
-        $combono = substr($combono,-5);//套餐编码
-        $area = mb_substr($address, 0, 3);
-        if (is_numeric($duedate)) $duedate = date("Y-m-d", ($duedate-25569)*24*60*60);   // 預保養日
-        if (is_numeric($c_start_date)) $c_start_date = date("Y-m-d", ($c_start_date-25569)*24*60*60);   // 合約起始日
-        if (is_numeric($c_end_date)) $c_end_date = date("Y-m-d", ($c_end_date-25569)*24*60*60); // 合約終止日
-        
-        // 创建客户信息
-        $accountid= $contractno; //账户id
-        //判断账户是否存在
-        $sql = "select * from account where accountid = '$accountid'";
-        $data = mysqli_query($link,$sql);
-        $nums_rows = mysqli_num_rows($data);
-        if($nums_rows==0){
-            //添加用户
-            $accounttype = "A"; //账户类型
-            $pwd = "123";//账户默认密码
-
-            //查询保养员电话
-            $sqlfre = "SELECT name, tel FROM account where accountid = '$repairerid' and accounttype = 'B'";
-            $repairerdata = mysqli_query($link, $sqlfre); # 用mysqli_query方法执行(sql语法)将结果存在变数中
-            if ($rowdata = mysqli_fetch_assoc($repairerdata)) {
-                $db_repair_name = $rowdata['name'];
-                $db_repair_tel = $rowdata['tel'];
-            }
-            mysqli_free_result($repairerdata);
-
-            if ($db_repair_name == $repairer_name && (str_pad(str_replace("-", "", $db_repair_tel), 10, "0", STR_PAD_LEFT)) == $repairer_tel) {
-                $create_at    = date('Y/m/d H:i:s');//账户创建时间
-                $db_query1  = "insert into account(accounttype, accountid, pwd, name, tel, address,phone_call_help, repairerid, creater, create_at) values (";
-                $db_query1 .= "'$accounttype', '$accountid', '$pwd', '$name', '$tel', '$address', '$repairer_tel',  '$repairerid','$user_id', '$create_at')";
-                mysqli_query($link,$db_query1);
-                if (mysqli_affected_rows($link) > 0) {
-                    echo "客户账户新增成功\r\n";
-                    $repair_right = 1;
-                }
-                elseif(mysqli_affected_rows($link)==0) {
-                    echo "无新增资料";
-                }
-            } else {
-                echo "保養員姓名或電話有誤";
-            }
-        } else {
-            echo "账户已经存在";
-            $repair_right = 1;
-        }
-
-        if ($repair_right) {
-            //创建合约信息
-            //判断合约是否存在
-            $contractsql = "select * from contract where contractno = '$contractno'";
-            $contract_nums_rows=mysqli_num_rows(mysqli_query($link,$contractsql));
-            if($contract_nums_rows==0){
-                $contracttype= "A";
-                $company= $name;//公司名称默认客户姓名
-                $taxid= " ";//统一编码
-                $promiser= $name;//契约人,个人客户默认客户姓名
-                $contractperson= $name;//联系人
-                $contractaddress= $address;//联系地址
-                $contracttel= $tel;//联络电话
-                $contractemail= "";
-                $contract_employee= "";//契约员工号
-                $create_at = date('Y/m/d H:i:s');//合同创建时间
-                $db_query2 = "INSERT INTO contract(contracttype, contractno, company, taxid, address, tel, promiser, customerid, contractperson, contractaddress, contracttel, contractemail,contract_employee,start_date,end_date, creater, create_at) VALUES ('$contracttype', '$contractno', '$company', '$taxid', '$address', '$tel', '$promiser', '$customerid', '$contractperson', '$contractaddress', '$contracttel', '$contractemail','$contract_employee','$c_start_date','$c_end_date', '$user_id', '$create_at')";
-                mysqli_query($link,$db_query2);
-                if (mysqli_affected_rows($link)>0) {
-                    echo "合约新增成功\r\n";
-                }
-                elseif(mysqli_affected_rows($link)==0) {
-                    echo "无新增资料";
-                }
-            }else{
-                echo "合约已经存在";
-            }
-
-            //创建作番信息
-            switch ($facilityno) {
-                case (preg_match('/TX/', $facilityno) ? true : false):
-                case (preg_match('/JX/', $facilityno) ? true : false):
-                    $facility_kind = "MAE100";
-                    break;
-                case (preg_match('/TW/', $facilityno) ? true : false):
-                    $facility_kind = "MAM200";
-                    break;
-                case (preg_match('/TH/', $facilityno) ? true : false):
-                    $facility_kind = "MAH100";
-                    break;
-                case (preg_match('/TZ/', $facilityno) ? true : false):
-                    $facility_kind = "MAZ100";
-                    break;
-                case (preg_match('/TH/', $facilityno) ? true : false):
-                    $facility_kind = "MAQ100";
-                    break;
-                default:
-                    $facility_kind = "";
-            }
-            $facilitsql = "SELECT * FROM facility where facilityno='$facilityno' and contractno='$contractno'";
-            $facilit_nums_rows=mysqli_num_rows(mysqli_query($link,$facilitsql));
-            if($facilit_nums_rows==0){
-                $weight= "450";//重量
-                $numberofpassenger = "6";   // 人乘
-                $numberofstop= "2";//停数
-                $numberoffloor= "2";//楼层数
-                $opentype= "CO-SO";//开门方式
-                $speed= "60";//速度
-                $repairtype= "A";//维护类型
-                $create_at = date('Y/m/d H:i:s');//作番创建时间
-
-                $db_query3 = "INSERT INTO facility(contractno, facilityno, customerid, weight,numberofpassenger,numberofstop, numberoffloor,opentype,speed,repairtype,facility_kind,longitude, latitude, address,repairerid,repairername,area,creater, create_at) VALUES ('$contractno', '$facilityno', '$customerid', '$weight','$numberofpassenger','$numberofstop', '$numberoffloor','$opentype','$speed','$repairtype','$facility_kind','$longitude', '$latitude', '$address','$repairerid','$repairer_name','$area','$user_id', '$create_at')";
-                mysqli_query($link,$db_query3);
-                if (mysqli_affected_rows($link)>0) {
-                    echo "作番新增成功\n";
-                }
-                elseif(mysqli_affected_rows($link)==0) {
-                    echo "无新增资料";
-                }
-            }else{
-                echo "作番已经存在";
-            }
-            //创建保养计划
-            echo "保养日期";
-            $schedulesql = "SELECT * FROM schedule where facilityno='$facilityno' and duedate='$duedate'";
-            $schedule_nums_rows=mysqli_num_rows(mysqli_query($link,$schedulesql));
-            if($schedule_nums_rows==0){
-                $create_at = date('Y/m/d H:i:s');//作番创建时间
-                $db_query4 = "INSERT INTO schedule(contractno, facilityno, combono, repairerid, repairername, duedate, creater, create_at) VALUES ('$contractno', '$facilityno', '$combono', '$repairerid', '$repairer_name', '$duedate', '$user_id', '$create_at')";
-                $resiult=mysqli_query($link,$db_query4);
-
-                if (mysqli_affected_rows($link)>0) {
-                    echo $combono."作番保养计划新增成功\r\n";
-                }
-                elseif(mysqli_affected_rows($link)==0) {
-                    echo "无新增资料";
-                }
-            }else{
-                echo "作番保养计划已经存在";
-            }
-        }
-    }
-    mysqli_close($link);
-}
-
-//for ($i = 0; $i <= sizeof($excelArray); $i++) {
-//	//处理数据
-//// 创建客户信息
-//	echo "循环读取数据插入数据库---".$row."---";
-//	echo$accounttype= "A"; //账户类型
-//	echo$accountid= $excelArray[$row][6]; //账户id
-//	echo$pwd= "123";//账户默认密码
-//	echo$name= $excelArray[$row][5];//账户姓名
-//	echo$address= $excelArray[$row][2];//账户地址
-//	echo$phone_call_help=$excelArray[$row][7];//联络手机号
-//	echo$repairerid=$excelArray[$row][8];//服务与支持人员工号
-//	echo$creater   = 'vensen';//建档人
-//	echo$create_at    = date('Y/m/d H:i:s');//账户创建时间
-////判断账户是否存在
-//    $sqlselect='select * from account where accountid='.$accountid;
-//	$res = mysqli_query($link,$sqlselect);
-//	echo "------结果".'<br>';
-//	print_r($res);
-//
-//	echo "------".'<br>';
-//}
-//
-// var_dump($excelArray);
-
-?>
-
-
-<div class="container">
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>"
-          enctype="multipart/form-data">
-
-        <div class="bottom-margin">資料
-            <label for="fileToUpload">上傳</label>
-            <div>
-                <input type="file" name="fileToUpload" id="fileToUpload">
-            </div>
-            <div class="bottom-margin">
-                <button type="submit" name="submit">確定</button>
-            </div>
-        </div>
-<input type="hidden" name="token" value="<?php echo $_GET['token']; ?>">
-    </form>
-</div>
-
+
+<?php
+include "header.php";
+require_once 'PHPExcel/PHPExcel.php';
+require_once 'PHPExcel/IOFactory.php';
+$file_name = $_FILES["fileToUpload"]["name"];
+$temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
+$target_dir = "excel-uploads/";
+$target_file = strtolower($target_dir . iconv("UTF-8", "big5",basename($file_name)));
+$EXTENSION = pathinfo($target_file, PATHINFO_EXTENSION);
+if (move_uploaded_file($temp_file_name, $target_file)) {
+    if ($EXTENSION == 'xls') {
+        $objReader = PHPExcel_IOFactory::createReader('Excel5');//支持xls
+    } else {
+        $objReader = PHPExcel_IOFactory::createReader('Excel2007');//支持xlsx
+    }
+    $objPHPExcel = $objReader->load($target_file); //读取上传到服务器的文件
+    $sheet = $objPHPExcel->getSheet(0);//拿到第一个sheet数据
+    $highestRow = $sheet->getHighestRow(); // 取得总行数
+    $highestColumn = $sheet->getHighestColumn(); // 取得总列数
+    $highestColumn = PHPExcel_Cell::columnIndexFromString($highestColumn); // 转换字母为对应的统计数字；
+    $excelArray = array();
+    for ($row = 2; $row <= $highestRow; $row++) {
+        $val = $sheet->getCellByColumnAndRow(0, $row)->getCalculatedValue();
+        if ($val == "") return;
+        for ($column = 1; $column < $highestColumn; $column++) {
+            $val = $sheet->getCellByColumnAndRow($column, $row)->getCalculatedValue();
+            $excelArray[$row][] = $val; //读取excel数据到数组
+        }
+        /*
+        (
+            [2] => Array
+                (
+                    [0] => M230875
+                    [1] => 3TX23001
+                    [2] => 桃園市中壢區榮民南路81巷8號
+                    [3] => 121.25820796563
+                    [4] => 24.955059621474
+                    [5] => 梁智芳
+                    [6] => 
+                    [7] => 921389826
+                    [8] => M0089
+                    [9] => 郭玠德
+                    [10] => 0905-378-991
+                    [11] => 2023/07/14
+                    [12] => BW002
+                    [13] => 
+                    [14] => 45108
+                    [15] => 45473
+                    [16] => 
+                )
+        )*/
+        //print_r($excelArray);exit;
+        echo  "第".$row;
+
+        // excel欄位名稱
+        list($contractno, $facilityno, $address, $longitude, $latitude, $name, $customerid, $tel, $repairerid, $repairer_name, $repairer_tel, $duedate, $combono, $receivable_date, $c_start_date, $c_end_date) = $excelArray[$row];
+        $customerid = (!$customerid) ? $contractno : $customerid;
+        $repairer_tel =  str_pad(str_replace("-", "", $repairer_tel), 10, "0", STR_PAD_LEFT);   // 保養員手机号
+        $combono = substr($combono,-5);//套餐编码
+        $area = mb_substr($address, 0, 3);
+        if (is_numeric($duedate)) $duedate = date("Y-m-d", ($duedate-25569)*24*60*60);   // 預保養日
+        if (is_numeric($c_start_date)) $c_start_date = date("Y-m-d", ($c_start_date-25569)*24*60*60);   // 合約起始日
+        if (is_numeric($c_end_date)) $c_end_date = date("Y-m-d", ($c_end_date-25569)*24*60*60); // 合約終止日
+        
+        // 创建客户信息
+        $accountid= $contractno; //账户id
+        //判断账户是否存在
+        $sql = "select * from account where accountid = '$accountid'";
+        $data = mysqli_query($link,$sql);
+        $nums_rows = mysqli_num_rows($data);
+        if($nums_rows==0){
+            //添加用户
+            $accounttype = "A"; //账户类型
+            $pwd = "123";//账户默认密码
+
+            //查询保养员电话
+            $sqlfre = "SELECT name, tel FROM account where accountid = '$repairerid' and accounttype = 'B'";
+            $repairerdata = mysqli_query($link, $sqlfre); # 用mysqli_query方法执行(sql语法)将结果存在变数中
+            if ($rowdata = mysqli_fetch_assoc($repairerdata)) {
+                $db_repair_name = $rowdata['name'];
+                $db_repair_tel = $rowdata['tel'];
+            }
+            mysqli_free_result($repairerdata);
+
+            if ($db_repair_name == $repairer_name && (str_pad(str_replace("-", "", $db_repair_tel), 10, "0", STR_PAD_LEFT)) == $repairer_tel) {
+                $create_at    = date('Y/m/d H:i:s');//账户创建时间
+                $db_query1  = "insert into account(accounttype, accountid, pwd, name, tel, address,phone_call_help, repairerid, creater, create_at) values (";
+                $db_query1 .= "'$accounttype', '$accountid', '$pwd', '$name', '$tel', '$address', '$repairer_tel',  '$repairerid','$user_id', '$create_at')";
+                mysqli_query($link,$db_query1);
+                if (mysqli_affected_rows($link) > 0) {
+                    echo "客户账户新增成功\r\n";
+                    $repair_right = 1;
+                }
+                elseif(mysqli_affected_rows($link)==0) {
+                    echo "无新增资料";
+                }
+            } else {
+                echo "保養員姓名或電話有誤";
+            }
+        } else {
+            echo "账户已经存在";
+            $repair_right = 1;
+        }
+
+        if ($repair_right) {
+            //创建合约信息
+            //判断合约是否存在
+            $contractsql = "select * from contract where contractno = '$contractno'";
+            $contract_nums_rows=mysqli_num_rows(mysqli_query($link,$contractsql));
+            if($contract_nums_rows==0){
+                $contracttype= "A";
+                $company= $name;//公司名称默认客户姓名
+                $taxid= " ";//统一编码
+                $promiser= $name;//契约人,个人客户默认客户姓名
+                $contractperson= $name;//联系人
+                $contractaddress= $address;//联系地址
+                $contracttel= $tel;//联络电话
+                $contractemail= "";
+                $contract_employee= "";//契约员工号
+                $create_at = date('Y/m/d H:i:s');//合同创建时间
+                $db_query2 = "INSERT INTO contract(contracttype, contractno, company, taxid, address, tel, promiser, customerid, contractperson, contractaddress, contracttel, contractemail,contract_employee,start_date,end_date, creater, create_at) VALUES ('$contracttype', '$contractno', '$company', '$taxid', '$address', '$tel', '$promiser', '$customerid', '$contractperson', '$contractaddress', '$contracttel', '$contractemail','$contract_employee','$c_start_date','$c_end_date', '$user_id', '$create_at')";
+                mysqli_query($link,$db_query2);
+                if (mysqli_affected_rows($link)>0) {
+                    echo "合约新增成功\r\n";
+                }
+                elseif(mysqli_affected_rows($link)==0) {
+                    echo "无新增资料";
+                }
+            }else{
+                echo "合约已经存在";
+            }
+
+            //创建作番信息
+            switch ($facilityno) {
+                case (preg_match('/TX/', $facilityno) ? true : false):
+                case (preg_match('/JX/', $facilityno) ? true : false):
+                    $facility_kind = "MAE100";
+                    break;
+                case (preg_match('/TW/', $facilityno) ? true : false):
+                    $facility_kind = "MAM200";
+                    break;
+                case (preg_match('/TH/', $facilityno) ? true : false):
+                    $facility_kind = "MAH100";
+                    break;
+                case (preg_match('/TZ/', $facilityno) ? true : false):
+                    $facility_kind = "MAZ100";
+                    break;
+                case (preg_match('/TH/', $facilityno) ? true : false):
+                    $facility_kind = "MAQ100";
+                    break;
+                default:
+                    $facility_kind = "";
+            }
+            $facilitsql = "SELECT * FROM facility where facilityno='$facilityno' and contractno='$contractno'";
+            $facilit_nums_rows=mysqli_num_rows(mysqli_query($link,$facilitsql));
+            if($facilit_nums_rows==0){
+                $weight= "450";//重量
+                $numberofpassenger = "6";   // 人乘
+                $numberofstop= "2";//停数
+                $numberoffloor= "2";//楼层数
+                $opentype= "CO-SO";//开门方式
+                $speed= "60";//速度
+                $repairtype= "A";//维护类型
+                $create_at = date('Y/m/d H:i:s');//作番创建时间
+
+                $db_query3 = "INSERT INTO facility(contractno, facilityno, customerid, weight,numberofpassenger,numberofstop, numberoffloor,opentype,speed,repairtype,facility_kind,longitude, latitude, address,repairerid,repairername,area,creater, create_at) VALUES ('$contractno', '$facilityno', '$customerid', '$weight','$numberofpassenger','$numberofstop', '$numberoffloor','$opentype','$speed','$repairtype','$facility_kind','$longitude', '$latitude', '$address','$repairerid','$repairer_name','$area','$user_id', '$create_at')";
+                mysqli_query($link,$db_query3);
+                if (mysqli_affected_rows($link)>0) {
+                    echo "作番新增成功\n";
+                }
+                elseif(mysqli_affected_rows($link)==0) {
+                    echo "无新增资料";
+                }
+            }else{
+                echo "作番已经存在";
+            }
+            //创建保养计划
+            echo "保养日期";
+            $schedulesql = "SELECT * FROM schedule where facilityno='$facilityno' and duedate='$duedate'";
+            $schedule_nums_rows=mysqli_num_rows(mysqli_query($link,$schedulesql));
+            if($schedule_nums_rows==0){
+                $create_at = date('Y/m/d H:i:s');//作番创建时间
+                $db_query4 = "INSERT INTO schedule(contractno, facilityno, combono, repairerid, repairername, duedate, creater, create_at) VALUES ('$contractno', '$facilityno', '$combono', '$repairerid', '$repairer_name', '$duedate', '$user_id', '$create_at')";
+                $resiult=mysqli_query($link,$db_query4);
+
+                if (mysqli_affected_rows($link)>0) {
+                    echo $combono."作番保养计划新增成功\r\n";
+                }
+                elseif(mysqli_affected_rows($link)==0) {
+                    echo "无新增资料";
+                }
+            }else{
+                echo "作番保养计划已经存在";
+            }
+        }
+    }
+    mysqli_close($link);
+}
+
+//for ($i = 0; $i <= sizeof($excelArray); $i++) {
+//	//处理数据
+//// 创建客户信息
+//	echo "循环读取数据插入数据库---".$row."---";
+//	echo$accounttype= "A"; //账户类型
+//	echo$accountid= $excelArray[$row][6]; //账户id
+//	echo$pwd= "123";//账户默认密码
+//	echo$name= $excelArray[$row][5];//账户姓名
+//	echo$address= $excelArray[$row][2];//账户地址
+//	echo$phone_call_help=$excelArray[$row][7];//联络手机号
+//	echo$repairerid=$excelArray[$row][8];//服务与支持人员工号
+//	echo$creater   = 'vensen';//建档人
+//	echo$create_at    = date('Y/m/d H:i:s');//账户创建时间
+////判断账户是否存在
+//    $sqlselect='select * from account where accountid='.$accountid;
+//	$res = mysqli_query($link,$sqlselect);
+//	echo "------结果".'<br>';
+//	print_r($res);
+//
+//	echo "------".'<br>';
+//}
+//
+// var_dump($excelArray);
+
+?>
+
+
+<div class="container">
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>"
+          enctype="multipart/form-data">
+
+        <div class="bottom-margin">資料
+            <label for="fileToUpload">上傳</label>
+            <div>
+                <input type="file" name="fileToUpload" id="fileToUpload">
+            </div>
+            <div class="bottom-margin">
+                <button type="submit" name="submit">確定</button>
+            </div>
+        </div>
+<input type="hidden" name="token" value="<?php echo $_GET['token']; ?>">
+    </form>
+</div>
+
diff --git a/wms/expert-create.php b/wms/expert-create.php
index 3c24d689..2b8379d6 100644
--- a/wms/expert-create.php
+++ b/wms/expert-create.php
@@ -1,131 +1,131 @@
-<?php
-include "header.php"; 
-?>
-
-<div class="container">
-
-    <?php
-    
-        include "expert-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        
-    
-        <div>
-            <label for="expert_id">專家ID</label>
-            <input type="text" name="expert_id" id="expert_id" placeholder="請輸入專家ID..." required>
-            <p class="error"><?php echo $expert_id_error; ?></p>
-        </div>	
-
-        <div>
-            <label for="personal_id">身分證字號</label>
-            <input type="text" name="personal_id" id="personal_id">
-            <p class="error"><?php echo $personal_id_error; ?></p>
-        </div>	
-		
-        <div>
-            <label for="name">顯示姓名</label>
-            <input type="text" name="name" id="name">
-            <p class="error"><?php echo $name_error; ?></p>
-        </div>	
-				
-        <div>
-            <label for="title">稱謂</label>
-            <input type="text" name="title" id="title">
-            <p class="error"><?php echo $title_error; ?></p>
-        </div>	
-
-        <div>
-            <label for="major">專長</label>
-            <input type="text" name="major" id="major">
-            <p class="error"><?php echo $major_error; ?></p>
-        </div>	
-
-        <div>
-            <label for="tel">電話</label>
-            <input type="text" name="tel" id="tel">
-            <p class="error"><?php echo $tel_error; ?></p>
-        </div>
-
-        <div>
-            <label for="tel_count">電話支援次數</label>
-            <input type="text" name="tel_count" id="tel_count" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-            <p class="error"><?php echo $tel_count_error; ?></p>
-        </div>
-
-        <div>
-            <label for="chat_id">文字客服連結</label>
-            <input type="text" name="chat_id" id="chat_id">
-            <p class="error"><?php echo $chat_id_error; ?></p>
-        </div>
-
-        <div>
-            <label for="chat_count">文字客服次數</label>
-            <input type="text" name="chat_count" id="chat_count" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-            <p class="error"><?php echo $chat_count_error; ?></p>
-        </div>
-
-        <div>
-            <label for="video_call">遠程視頻連結</label>
-            <input type="text" name="video_call" id="video_call">
-            <p class="error"><?php echo $video_call_error; ?></p>
-        </div>
-
-        <div>
-            <label for="video_count">遠程視頻次數</label>
-            <input type="text" name="video_count" id="video_count" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-            <p class="error"><?php echo $video_count_error; ?></p>
-        </div>
-
-        <div>
-            <label for="onsite_call">現場支援電話</label>
-            <input type="text" name="onsite_call" id="onsite_call">
-            <p class="error"><?php echo $onsite_call_error; ?></p>
-        </div>
-
-        <div>
-            <label for="onsite_count">現場支援次數</label>
-            <input type="text" name="onsite_count" id="onsite_count" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-            <p class="error"><?php echo $onsite_count_error; ?></p>
-        </div>
-
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
-            <p class="error"><?php echo $creater_error; ?></p>
-        </div>
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-		
-        <div class="bottom-margin">
-            <label for="fileToUpload">上傳圖片</label>
-			<div>
-				<input type="file" name="fileToUpload" id="fileToUpload">
-			</div>
-			<div class="bottom-margin">
-				<button type="submit" name="submit">確定</button>
-			</div>			
-        </div>
-
-
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
+<?php
+include "header.php"; 
+?>
+
+<div class="container">
+
+    <?php
+    
+        include "expert-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        
+    
+        <div>
+            <label for="expert_id">專家ID</label>
+            <input type="text" name="expert_id" id="expert_id" placeholder="請輸入專家ID..." required>
+            <p class="error"><?php echo $expert_id_error; ?></p>
+        </div>	
+
+        <div>
+            <label for="personal_id">身分證字號</label>
+            <input type="text" name="personal_id" id="personal_id">
+            <p class="error"><?php echo $personal_id_error; ?></p>
+        </div>	
+		
+        <div>
+            <label for="name">顯示姓名</label>
+            <input type="text" name="name" id="name">
+            <p class="error"><?php echo $name_error; ?></p>
+        </div>	
+				
+        <div>
+            <label for="title">稱謂</label>
+            <input type="text" name="title" id="title">
+            <p class="error"><?php echo $title_error; ?></p>
+        </div>	
+
+        <div>
+            <label for="major">專長</label>
+            <input type="text" name="major" id="major">
+            <p class="error"><?php echo $major_error; ?></p>
+        </div>	
+
+        <div>
+            <label for="tel">電話</label>
+            <input type="text" name="tel" id="tel">
+            <p class="error"><?php echo $tel_error; ?></p>
+        </div>
+
+        <div>
+            <label for="tel_count">電話支援次數</label>
+            <input type="text" name="tel_count" id="tel_count" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+            <p class="error"><?php echo $tel_count_error; ?></p>
+        </div>
+
+        <div>
+            <label for="chat_id">文字客服連結</label>
+            <input type="text" name="chat_id" id="chat_id">
+            <p class="error"><?php echo $chat_id_error; ?></p>
+        </div>
+
+        <div>
+            <label for="chat_count">文字客服次數</label>
+            <input type="text" name="chat_count" id="chat_count" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+            <p class="error"><?php echo $chat_count_error; ?></p>
+        </div>
+
+        <div>
+            <label for="video_call">遠程視頻連結</label>
+            <input type="text" name="video_call" id="video_call">
+            <p class="error"><?php echo $video_call_error; ?></p>
+        </div>
+
+        <div>
+            <label for="video_count">遠程視頻次數</label>
+            <input type="text" name="video_count" id="video_count" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+            <p class="error"><?php echo $video_count_error; ?></p>
+        </div>
+
+        <div>
+            <label for="onsite_call">現場支援電話</label>
+            <input type="text" name="onsite_call" id="onsite_call">
+            <p class="error"><?php echo $onsite_call_error; ?></p>
+        </div>
+
+        <div>
+            <label for="onsite_count">現場支援次數</label>
+            <input type="text" name="onsite_count" id="onsite_count" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+            <p class="error"><?php echo $onsite_count_error; ?></p>
+        </div>
+
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
+            <p class="error"><?php echo $creater_error; ?></p>
+        </div>
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+		
+        <div class="bottom-margin">
+            <label for="fileToUpload">上傳圖片</label>
+			<div>
+				<input type="file" name="fileToUpload" id="fileToUpload">
+			</div>
+			<div class="bottom-margin">
+				<button type="submit" name="submit">確定</button>
+			</div>			
+        </div>
+
+
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
diff --git a/wms/expert-delete.php b/wms/expert-delete.php
index 6bc526e6..697bc1ce 100644
--- a/wms/expert-delete.php
+++ b/wms/expert-delete.php
@@ -1,12 +1,12 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "DELETE FROM expert WHERE id='$id'";
-mysqli_query($link, $db_query);	
-
-header("Refresh:0; url=expert-index.php?function_name=expert&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "DELETE FROM expert WHERE id='$id'";
+mysqli_query($link, $db_query);	
+
+header("Refresh:0; url=expert-index.php?function_name=expert&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/expert-edit.php b/wms/expert-edit.php
index 9400e6f2..3d81d910 100644
--- a/wms/expert-edit.php
+++ b/wms/expert-edit.php
@@ -1,126 +1,126 @@
-<?php
-    include "header.php";
-
-    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-	
-	$data = array();
-	// sql語法存在變數中
-	$db_query = "SELECT * FROM expert WHERE id=$id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$db_query);	
-/*
-    include "inc/expert-record-update.php";
-    
-    try {	
-		// 設置一個空陣列來放資料
-		$data = array();
-		// sql語法存在變數中
-		$db_query = "SELECT * FROM expert WHERE id=$id";
-
-		// 用mysqli_query方法執行(sql語法)將結果存在變數中
-		$data = mysqli_query($link,$db_query);
-	}catch (Exception $e) {
-    echo 'Caught exception: ',  $e->getMessage(), "\n";
-	}
-*/	
-    foreach($data as $data) :
-?>
-
-<div class="container">
-    <form class="form-inline" method="post" action="expert-record-update.php" enctype="multipart/form-data">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-		
-        <div>
-            <label for="expert_id">專家ID</label>
-            <input type="text" name="expert_id" id="expert_id" value="<?php echo $data['expert_id']; ?>" required>
-        </div>	
-
-        <div>
-            <label for="personal_id">身分證字號</label>
-            <input type="text" name="personal_id" id="personal_id" value="<?php echo $data['personal_id']; ?>">
-        </div>	
-		
-        <div>
-            <label for="name">顯示姓名</label>
-            <input type="text" name="name" id="name" value="<?php echo $data['name']; ?>">
-        </div>	
-				
-        <div>
-            <label for="title">稱謂</label>
-            <input type="text" name="title" id="title" value="<?php echo $data['title']; ?>">
-        </div>	
-
-        <div>
-            <label for="major">專長</label>
-            <input type="text" name="major" id="major" value="<?php echo $data['major']; ?>">
-        </div>	
-
-        <div>
-            <label for="tel">電話</label>
-            <input type="text" name="tel" id="tel" value="<?php echo $data['tel']; ?>">
-        </div>
-
-        <div>
-            <label for="tel_count">電話支援次數</label>
-            <input type="text" name="tel_count" id="tel_count" value="<?php echo $data['tel_count']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="chat_id">文字客服連結</label>
-            <input type="text" name="chat_id" id="chat_id" value="<?php echo $data['chat_id']; ?>">
-        </div>
-
-        <div>
-            <label for="chat_count">文字客服次數</label>
-            <input type="text" name="chat_count" id="chat_count" value="<?php echo $data['chat_count']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="video_call">遠程視頻連結</label>
-            <input type="text" name="video_call" id="video_call" value="<?php echo $data['video_call']; ?>">
-        </div>
-
-        <div>
-            <label for="video_count">遠程視頻次數</label>
-            <input type="text" name="video_count" id="video_count" value="<?php echo $data['video_count']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="onsite_call">現場支援電話</label>
-            <input type="text" name="onsite_call" id="onsite_call" value="<?php echo $data['onsite_call']; ?>">
-        </div>
-
-        <div>
-            <label for="onsite_count">現場支援次數</label>
-            <input type="text" name="onsite_count" id="onsite_count" value="<?php echo $data['onsite_count']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
-        </div>
-		
-        <div class="bottom-margin">
-			<label for="create_at">頭像</label>
-			<a><?php echo $data['picture']; ?></a>
-            <img width="125px" src="<?php echo $data['picture']?>" alt="" class="index-image">
-        </div>
-        <div class="bottom-margin">
-            <input type="file" name="fileToUpload" id="fileToUpload">
-        </div>
-		
-        <div>
-            <button type="submit" name="update">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
-?>
+<?php
+    include "header.php";
+
+    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+	
+	$data = array();
+	// sql語法存在變數中
+	$db_query = "SELECT * FROM expert WHERE id=$id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$db_query);	
+/*
+    include "inc/expert-record-update.php";
+    
+    try {	
+		// 設置一個空陣列來放資料
+		$data = array();
+		// sql語法存在變數中
+		$db_query = "SELECT * FROM expert WHERE id=$id";
+
+		// 用mysqli_query方法執行(sql語法)將結果存在變數中
+		$data = mysqli_query($link,$db_query);
+	}catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+	}
+*/	
+    foreach($data as $data) :
+?>
+
+<div class="container">
+    <form class="form-inline" method="post" action="expert-record-update.php" enctype="multipart/form-data">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+		
+        <div>
+            <label for="expert_id">專家ID</label>
+            <input type="text" name="expert_id" id="expert_id" value="<?php echo $data['expert_id']; ?>" required>
+        </div>	
+
+        <div>
+            <label for="personal_id">身分證字號</label>
+            <input type="text" name="personal_id" id="personal_id" value="<?php echo $data['personal_id']; ?>">
+        </div>	
+		
+        <div>
+            <label for="name">顯示姓名</label>
+            <input type="text" name="name" id="name" value="<?php echo $data['name']; ?>">
+        </div>	
+				
+        <div>
+            <label for="title">稱謂</label>
+            <input type="text" name="title" id="title" value="<?php echo $data['title']; ?>">
+        </div>	
+
+        <div>
+            <label for="major">專長</label>
+            <input type="text" name="major" id="major" value="<?php echo $data['major']; ?>">
+        </div>	
+
+        <div>
+            <label for="tel">電話</label>
+            <input type="text" name="tel" id="tel" value="<?php echo $data['tel']; ?>">
+        </div>
+
+        <div>
+            <label for="tel_count">電話支援次數</label>
+            <input type="text" name="tel_count" id="tel_count" value="<?php echo $data['tel_count']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="chat_id">文字客服連結</label>
+            <input type="text" name="chat_id" id="chat_id" value="<?php echo $data['chat_id']; ?>">
+        </div>
+
+        <div>
+            <label for="chat_count">文字客服次數</label>
+            <input type="text" name="chat_count" id="chat_count" value="<?php echo $data['chat_count']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="video_call">遠程視頻連結</label>
+            <input type="text" name="video_call" id="video_call" value="<?php echo $data['video_call']; ?>">
+        </div>
+
+        <div>
+            <label for="video_count">遠程視頻次數</label>
+            <input type="text" name="video_count" id="video_count" value="<?php echo $data['video_count']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="onsite_call">現場支援電話</label>
+            <input type="text" name="onsite_call" id="onsite_call" value="<?php echo $data['onsite_call']; ?>">
+        </div>
+
+        <div>
+            <label for="onsite_count">現場支援次數</label>
+            <input type="text" name="onsite_count" id="onsite_count" value="<?php echo $data['onsite_count']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
+        </div>
+		
+        <div class="bottom-margin">
+			<label for="create_at">頭像</label>
+			<a><?php echo $data['picture']; ?></a>
+            <img width="125px" src="<?php echo $data['picture']?>" alt="" class="index-image">
+        </div>
+        <div class="bottom-margin">
+            <input type="file" name="fileToUpload" id="fileToUpload">
+        </div>
+		
+        <div>
+            <button type="submit" name="update">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php
+
+    endforeach;
+    
+    include "footer.php";
+
+?>
diff --git a/wms/expert-index.php b/wms/expert-index.php
index 367a15b4..34925839 100644
--- a/wms/expert-index.php
+++ b/wms/expert-index.php
@@ -1,154 +1,154 @@
-<?php
-include "header.php";
-
-// 設置一個空陣列來放資料
-$data = array();
-// sql語法存在變數中
-$sql_cmd = sql_myself($user_id);
-$sql = "SELECT * FROM expert $sql_cmd ORDER BY id";
-
-// 用mysqli_query方法執行(sql語法)將結果存在變數中
-$data = mysqli_query($link,$sql);
-?>
-
-<!-- <a href="expert-account-create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="expert-create.php?function_name=expert&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-
-<?php
-}
-
-
-
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:expert-index.php");
-        }
-    }
-
-?>
-<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;
-   
-}
-
-</style>
-    <div style="overflow-x:auto;">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-            <tr>
-                <th>項次</th>
-                <th>專家ID</th>
-                <th>身分證字號</th>
-                <th>顯示姓名</th>
-                <th>稱謂</th>
-                <th class="width_style_1">頭像</th>
-                <th class="width_style_1">專長</th>
-                <th>電話</th>
-                <th>電話支援次數</th>
-                <th>Chat帳號</th>
-                <th>Chat支援次數</th>
-                <th>Video帳號</th>
-                <th>遠程視頻次數</th>
-                <th>現場支援客服窗口</th>
-                <th>現場支援次數</th>
-                <th>建檔人</th>
-                <th>建檔時間</th>				
-                <?php if ($user_auth&2) { ?>
-                <th>修改</th>
-                <th>刪除</th>
-                <?php } ?>
-            </tr>
-		</thead>
-		<tbody>			
-
-            <?php foreach($data as $data) : ?>    
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td><?php echo $data['expert_id']; ?></td>
-                    <td><?php echo $data['personal_id']; ?></td>
-                    <td><?php echo $data['name']; ?></td>
-                    <td><?php echo $data['title']; ?></td>
-                    <td class="width_style_1"><img src="<?php echo $data['picture']; ?>" alt="" class="index-image"></td>
-                    <td class="width_style_1"><?php echo $data['major']; ?></td>
-                    <td><?php echo $data['tel']; ?></td>
-                    <td><?php echo $data['tel_count']; ?></td>
-                    <td><a href="<?php echo $data['chat_id']; ?>">連結</a></td>
-                    <td><?php echo $data['chat_count']; ?></td>
-                    <td><a href="<?php echo $data['video_call']; ?>">連結</a></td>
-                    <td><?php echo $data['video_count']; ?></td>
-                    <td><?php echo $data['onsite_call']; ?></td>
-                    <td><?php echo $data['onsite_count']; ?></td>
-                    <td><?php echo $data['creater']; ?></td>
-                    <td><?php echo $data['create_at']; ?></td>
-                    <?php if ($user_auth&2) { ?>
-                    <td>
-						<p>
-							<a href="expert-edit.php?id=<?php echo $data['id']; ?>&function_name=expert&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-								<span class="glyphicon glyphicon-pencil"></span>
-							</a>
-						</p> 
-					</td>
-                    <td>
-						<p>
-							<a href="expert-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-								<span class="glyphicon glyphicon-remove"></span>
-							</a>
-						</p> 
-					</td>
-                    <?php } ?>
-                </tr>
-            <?php endforeach; ?>
-			</tbody>			
-        </table>
-    </div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-
-?>
+<?php
+include "header.php";
+
+// 設置一個空陣列來放資料
+$data = array();
+// sql語法存在變數中
+$sql_cmd = sql_myself($user_id);
+$sql = "SELECT * FROM expert $sql_cmd ORDER BY id";
+
+// 用mysqli_query方法執行(sql語法)將結果存在變數中
+$data = mysqli_query($link,$sql);
+?>
+
+<!-- <a href="expert-account-create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth&2) { ?>
+<p>
+<a href="expert-create.php?function_name=expert&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+
+<?php
+}
+
+
+
+if($data):
+    
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:expert-index.php");
+        }
+    }
+
+?>
+<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;
+   
+}
+
+</style>
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+            <tr>
+                <th>項次</th>
+                <th>專家ID</th>
+                <th>身分證字號</th>
+                <th>顯示姓名</th>
+                <th>稱謂</th>
+                <th class="width_style_1">頭像</th>
+                <th class="width_style_1">專長</th>
+                <th>電話</th>
+                <th>電話支援次數</th>
+                <th>Chat帳號</th>
+                <th>Chat支援次數</th>
+                <th>Video帳號</th>
+                <th>遠程視頻次數</th>
+                <th>現場支援客服窗口</th>
+                <th>現場支援次數</th>
+                <th>建檔人</th>
+                <th>建檔時間</th>				
+                <?php if ($user_auth&2) { ?>
+                <th>修改</th>
+                <th>刪除</th>
+                <?php } ?>
+            </tr>
+		</thead>
+		<tbody>			
+
+            <?php foreach($data as $data) : ?>    
+                <tr>
+                    <td><?php echo $data['id']; ?></td>
+                    <td><?php echo $data['expert_id']; ?></td>
+                    <td><?php echo $data['personal_id']; ?></td>
+                    <td><?php echo $data['name']; ?></td>
+                    <td><?php echo $data['title']; ?></td>
+                    <td class="width_style_1"><img src="<?php echo $data['picture']; ?>" alt="" class="index-image"></td>
+                    <td class="width_style_1"><?php echo $data['major']; ?></td>
+                    <td><?php echo $data['tel']; ?></td>
+                    <td><?php echo $data['tel_count']; ?></td>
+                    <td><a href="<?php echo $data['chat_id']; ?>">連結</a></td>
+                    <td><?php echo $data['chat_count']; ?></td>
+                    <td><a href="<?php echo $data['video_call']; ?>">連結</a></td>
+                    <td><?php echo $data['video_count']; ?></td>
+                    <td><?php echo $data['onsite_call']; ?></td>
+                    <td><?php echo $data['onsite_count']; ?></td>
+                    <td><?php echo $data['creater']; ?></td>
+                    <td><?php echo $data['create_at']; ?></td>
+                    <?php if ($user_auth&2) { ?>
+                    <td>
+						<p>
+							<a href="expert-edit.php?id=<?php echo $data['id']; ?>&function_name=expert&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+								<span class="glyphicon glyphicon-pencil"></span>
+							</a>
+						</p> 
+					</td>
+                    <td>
+						<p>
+							<a href="expert-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+						</p> 
+					</td>
+                    <?php } ?>
+                </tr>
+            <?php endforeach; ?>
+			</tbody>			
+        </table>
+    </div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+
+?>
diff --git a/wms/expert-record-submit.php b/wms/expert-record-submit.php
index 11fb7ba7..7c58ad4e 100644
--- a/wms/expert-record-submit.php
+++ b/wms/expert-record-submit.php
@@ -1,136 +1,136 @@
-<?php
-$id = "";
-$expert_id = "";
-$personal_id = "";
-$name = "";
-$title = "";
-$major = "";
-$tel = "";
-$tel_count = "";
-$chat_id = "";
-$chat_count = "";
-$video_call = "";
-$video_count = "";
-$onsite_call = "";
-$onsite_count = "";
-$creater = "";
-$create_at = "";
-$fileToUpload = "";
-
-$id_error = "";
-$expert_id_error = "";
-$personal_id_error = "";
-$name_error = "";
-$title_error = "";
-$major_error = "";
-$tel_error = "";
-$tel_count_error = "";
-$chat_id_error = "";
-$chat_count_error = "";
-$video_call_error = "";
-$video_count_error = "";
-$onsite_call_error = "";
-$onsite_count_error = "";
-$creater_error = "";
-$create_at_error = "";
-# $name_error = $email_error = $comment_error = $website_error = "";
-
-
-
-
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    include "expert-user-input.php";
-
-    $file_name      = $_FILES["fileToUpload"]["name"];
-    $temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
-    $file_size      = $_FILES["fileToUpload"]["size"];
-    $target_dir     = "expert-uploads/";
-    $target_file    = strtolower($target_dir . basename($file_name));
-    $upload_ok      = 1;
-    $img_file_type  = pathinfo($target_file, PATHINFO_EXTENSION);
-
-    $db_query = "INSERT INTO expert (expert_id,personal_id,name,title,picture,major,tel,tel_count,chat_id,chat_count,video_call,video_count,onsite_call,onsite_count,creater) VALUES ('$expert_id', '$personal_id', '$name', '$title', '$target_file' ,'$major', '$tel', '$tel_count', '$chat_id', '$chat_count', '$video_call', '$video_count', '$onsite_call', '$onsite_count', '$creater')";
-
-    $file_name      = $_FILES["fileToUpload"]["name"];
-    $temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
-    $file_size      = $_FILES["fileToUpload"]["size"];
-    $target_dir     = "expert-uploads/";
-    $target_file    = strtolower($target_dir . basename($file_name));
-    $upload_ok      = 1;
-    $img_file_type  = pathinfo($target_file, PATHINFO_EXTENSION);
-
-    //Check if image is an actual image or fake image
-    
-    if(strlen($target_file) <= strlen("expert-uploads/")){
-
-        $db_query = "INSERT INTO expert(expert_id, personal_id, name, title, major, tel, tel_count, chat_id, chat_count, video_call, video_count, onsite_call, onsite_count, creater) VALUES ('$expert_id', '$personal_id', '$name', '$title', '$major', '$tel', '$tel_count', '$chat_id', '$chat_count', '$video_call', '$video_count', '$onsite_call', '$onsite_count', '$creater')";
-        // 用mysqli_query方法執行(sql語法)將結果存在變數中
-        $result = mysqli_query($link,$db_query);
-        #echo $result;
-
-    }else {
-
-        $check_img = getimagesize($temp_file_name);
-
-        if($check_img == false) {
-            echo "<font color='#FF0000'>File is not an image</font>";
-            $upload_ok = 0;
-        } else {
-            //echo "File is an image - " . $check_img["mime"];
-            $upload_ok = 1;
-
-            //Check if file already exists
-            if(file_exists($target_file)) {
-                echo "<font color='#FF0000'>File is already uploaded!</font>";
-                $upload_ok = 0;
-            } else {
-                //Check file size
-                if($file_size > 500000) {
-                    echo "<font color='#FF0000'>Please enter a file size between 5mb</font>";
-                    $upload_ok = 0;
-                } else {
-                    //Allow certain file formats
-                    if($img_file_type != "jpg" && $img_file_type != "png" && $img_file_type != "jpeg" && $img_file_type != "gif") {
-                        echo "<font color='#FF0000'>JPG, PNG, JPEG and GIF files are allowed</font>";
-                        $upload_ok = 0;
-                    } else {
-                        //Check if $upload_ok is set to 0 by an error
-                        if($upload_ok === 0) {
-                            echo "<font color='#FF0000'>File has not been uploaded</font>";
-                        } else {
-                            if(move_uploaded_file($temp_file_name, $target_file)){
-                                
-                                
-                                // sql語法存在變數中
-                                // $db_query = "INSERT INTO expert (id, expert_id, personal_id, name, title, picture, major, tel, tel_count, chat_id, chat_count, video_call, video_count, onsite_call, onsite_count, creater, create_at) VALUE (`$id`, `$expert_id`, `$personal_id`, `$name`, `$title`, `$target_file`, `$major`, `$tel`, `$tel_count`, `$chat_id`, `$chat_count`, `$video_call`, `$video_count`, `$onsite_call`, `$onsite_count`, `$creater`, `$create_at`)";
-                                $db_query = "INSERT INTO expert(expert_id, personal_id, name, title, picture, major, tel, tel_count, chat_id, chat_count, video_call, video_count, onsite_call, onsite_count, creater) VALUES ('$expert_id', '$personal_id', '$name', '$title', '$target_file', '$major', '$tel', '$tel_count', '$chat_id', '$chat_count', '$video_call', '$video_count', '$onsite_call', '$onsite_count', '$creater')";
-
-                                // 用mysqli_query方法執行(sql語法)將結果存在變數中
-                                $result = mysqli_query($link,$db_query);
-                                
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='expert-index.php?function_name=expert&".$token_link."';";
-        echo "</script>";  
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='expert-index.php?function_name=expert&".$token_link."';";
-        echo "</script>";  
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
-?>
+<?php
+$id = "";
+$expert_id = "";
+$personal_id = "";
+$name = "";
+$title = "";
+$major = "";
+$tel = "";
+$tel_count = "";
+$chat_id = "";
+$chat_count = "";
+$video_call = "";
+$video_count = "";
+$onsite_call = "";
+$onsite_count = "";
+$creater = "";
+$create_at = "";
+$fileToUpload = "";
+
+$id_error = "";
+$expert_id_error = "";
+$personal_id_error = "";
+$name_error = "";
+$title_error = "";
+$major_error = "";
+$tel_error = "";
+$tel_count_error = "";
+$chat_id_error = "";
+$chat_count_error = "";
+$video_call_error = "";
+$video_count_error = "";
+$onsite_call_error = "";
+$onsite_count_error = "";
+$creater_error = "";
+$create_at_error = "";
+# $name_error = $email_error = $comment_error = $website_error = "";
+
+
+
+
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    include "expert-user-input.php";
+
+    $file_name      = $_FILES["fileToUpload"]["name"];
+    $temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
+    $file_size      = $_FILES["fileToUpload"]["size"];
+    $target_dir     = "expert-uploads/";
+    $target_file    = strtolower($target_dir . basename($file_name));
+    $upload_ok      = 1;
+    $img_file_type  = pathinfo($target_file, PATHINFO_EXTENSION);
+
+    $db_query = "INSERT INTO expert (expert_id,personal_id,name,title,picture,major,tel,tel_count,chat_id,chat_count,video_call,video_count,onsite_call,onsite_count,creater) VALUES ('$expert_id', '$personal_id', '$name', '$title', '$target_file' ,'$major', '$tel', '$tel_count', '$chat_id', '$chat_count', '$video_call', '$video_count', '$onsite_call', '$onsite_count', '$creater')";
+
+    $file_name      = $_FILES["fileToUpload"]["name"];
+    $temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
+    $file_size      = $_FILES["fileToUpload"]["size"];
+    $target_dir     = "expert-uploads/";
+    $target_file    = strtolower($target_dir . basename($file_name));
+    $upload_ok      = 1;
+    $img_file_type  = pathinfo($target_file, PATHINFO_EXTENSION);
+
+    //Check if image is an actual image or fake image
+    
+    if(strlen($target_file) <= strlen("expert-uploads/")){
+
+        $db_query = "INSERT INTO expert(expert_id, personal_id, name, title, major, tel, tel_count, chat_id, chat_count, video_call, video_count, onsite_call, onsite_count, creater) VALUES ('$expert_id', '$personal_id', '$name', '$title', '$major', '$tel', '$tel_count', '$chat_id', '$chat_count', '$video_call', '$video_count', '$onsite_call', '$onsite_count', '$creater')";
+        // 用mysqli_query方法執行(sql語法)將結果存在變數中
+        $result = mysqli_query($link,$db_query);
+        #echo $result;
+
+    }else {
+
+        $check_img = getimagesize($temp_file_name);
+
+        if($check_img == false) {
+            echo "<font color='#FF0000'>File is not an image</font>";
+            $upload_ok = 0;
+        } else {
+            //echo "File is an image - " . $check_img["mime"];
+            $upload_ok = 1;
+
+            //Check if file already exists
+            if(file_exists($target_file)) {
+                echo "<font color='#FF0000'>File is already uploaded!</font>";
+                $upload_ok = 0;
+            } else {
+                //Check file size
+                if($file_size > 500000) {
+                    echo "<font color='#FF0000'>Please enter a file size between 5mb</font>";
+                    $upload_ok = 0;
+                } else {
+                    //Allow certain file formats
+                    if($img_file_type != "jpg" && $img_file_type != "png" && $img_file_type != "jpeg" && $img_file_type != "gif") {
+                        echo "<font color='#FF0000'>JPG, PNG, JPEG and GIF files are allowed</font>";
+                        $upload_ok = 0;
+                    } else {
+                        //Check if $upload_ok is set to 0 by an error
+                        if($upload_ok === 0) {
+                            echo "<font color='#FF0000'>File has not been uploaded</font>";
+                        } else {
+                            if(move_uploaded_file($temp_file_name, $target_file)){
+                                
+                                
+                                // sql語法存在變數中
+                                // $db_query = "INSERT INTO expert (id, expert_id, personal_id, name, title, picture, major, tel, tel_count, chat_id, chat_count, video_call, video_count, onsite_call, onsite_count, creater, create_at) VALUE (`$id`, `$expert_id`, `$personal_id`, `$name`, `$title`, `$target_file`, `$major`, `$tel`, `$tel_count`, `$chat_id`, `$chat_count`, `$video_call`, `$video_count`, `$onsite_call`, `$onsite_count`, `$creater`, `$create_at`)";
+                                $db_query = "INSERT INTO expert(expert_id, personal_id, name, title, picture, major, tel, tel_count, chat_id, chat_count, video_call, video_count, onsite_call, onsite_count, creater) VALUES ('$expert_id', '$personal_id', '$name', '$title', '$target_file', '$major', '$tel', '$tel_count', '$chat_id', '$chat_count', '$video_call', '$video_count', '$onsite_call', '$onsite_count', '$creater')";
+
+                                // 用mysqli_query方法執行(sql語法)將結果存在變數中
+                                $result = mysqli_query($link,$db_query);
+                                
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='expert-index.php?function_name=expert&".$token_link."';";
+        echo "</script>";  
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='expert-index.php?function_name=expert&".$token_link."';";
+        echo "</script>";  
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
+?>
diff --git a/wms/expert-record-update.php b/wms/expert-record-update.php
index 43c98238..ab4eb021 100644
--- a/wms/expert-record-update.php
+++ b/wms/expert-record-update.php
@@ -1,85 +1,85 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-
-    function user_input( $data ) {
-        $data1 = trim($data);
-        $data2 = stripslashes($data1);
-        $data3 = htmlspecialchars($data2);
-        return $data3;
-    }
-
-    $id           = $_POST['id'];
-    $expert_id    = user_input($_POST["expert_id"]);		
-    $personal_id  = user_input($_POST["personal_id"]);
-    $name         = user_input($_POST["name"]);
-    $title        = user_input($_POST["title"]);
-    $major        = user_input($_POST["major"]);
-    $tel          = user_input($_POST["tel"]);
-    $tel_count    = user_input($_POST["tel_count"]);
-    $chat_id      = user_input($_POST["chat_id"]);
-    $chat_count   = user_input($_POST["chat_count"]);
-    $video_call   = user_input($_POST["video_call"]);
-    $video_count  = user_input($_POST["video_count"]);
-    $onsite_call  = user_input($_POST["onsite_call"]);
-    $onsite_count = user_input($_POST["onsite_count"]);
-    $creater      = user_input($_POST["creater"]);
-    $create_at    = date('Y/m/d H:i:s');
-
-    $file_name      = $_FILES["fileToUpload"]["name"];
-    $temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
-    $file_size      = $_FILES["fileToUpload"]["size"];
-    $target_dir     = "expert-uploads/";
-    $target_file    = strtolower($target_dir . basename($file_name));
-    $upload_ok      = 1;
-    $img_file_type  = pathinfo($target_file, PATHINFO_EXTENSION);
-    
-
-    if(strlen($target_file) <= strlen("expert-uploads/")){
-        $db_query = "UPDATE expert set expert_id = '$expert_id', personal_id = '$personal_id', name = '$name', title = '$title', major = '$major', tel = '$tel', tel_count = '$tel_count', chat_id = '$chat_id', chat_count = '$chat_count', video_call = '$video_call', video_count = '$video_count', onsite_call = '$onsite_call', onsite_count = '$onsite_count', create_at = '$create_at' WHERE id='$id'";
-            mysqli_query($link, $db_query);						
-
-    }else {
-
-        if($file_size > 500000) {
-            echo "<font color='#FF0000'>Please enter a file size between 5mb</font>";
-            $upload_ok = 0;
-        } else { //
-            //Allow certain file formats
-            if($img_file_type != "jpg" && $img_file_type != "png" && $img_file_type != "jpeg" && $img_file_type != "gif") {
-                //echo "JPG, PNG, JPEG and GIF files are allowed";
-                $upload_ok = 0;
-            } else {
-                //Check if $upload_ok is set to 0 by an error
-                if($upload_ok === 0) {
-                    echo "<font color='#FF0000'>File has not been uploaded</font>";
-                } else {
-                    if(move_uploaded_file($temp_file_name, $target_file)){
-                        $db_query = "UPDATE expert set expert_id = '$expert_id', personal_id = '$personal_id', name = '$name', title = '$title', picture = '$target_file', major = '$major', tel = '$tel', tel_count = '$tel_count', chat_id = '$chat_id', chat_count = '$chat_count', video_call = '$video_call', video_count = '$video_count', onsite_call = '$onsite_call', onsite_count = '$onsite_count', create_at = '$create_at' WHERE id='$id'";
-                        mysqli_query($link, $db_query);
-                    }
-                }
-            }
-        }   
-
-    }
-
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='expert-index.php?function_name=expert&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料')";
-        echo "location.href='expert-index.php?function_name=expert&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if(isset($_POST['update'])) {
+
+    function user_input( $data ) {
+        $data1 = trim($data);
+        $data2 = stripslashes($data1);
+        $data3 = htmlspecialchars($data2);
+        return $data3;
+    }
+
+    $id           = $_POST['id'];
+    $expert_id    = user_input($_POST["expert_id"]);		
+    $personal_id  = user_input($_POST["personal_id"]);
+    $name         = user_input($_POST["name"]);
+    $title        = user_input($_POST["title"]);
+    $major        = user_input($_POST["major"]);
+    $tel          = user_input($_POST["tel"]);
+    $tel_count    = user_input($_POST["tel_count"]);
+    $chat_id      = user_input($_POST["chat_id"]);
+    $chat_count   = user_input($_POST["chat_count"]);
+    $video_call   = user_input($_POST["video_call"]);
+    $video_count  = user_input($_POST["video_count"]);
+    $onsite_call  = user_input($_POST["onsite_call"]);
+    $onsite_count = user_input($_POST["onsite_count"]);
+    $creater      = user_input($_POST["creater"]);
+    $create_at    = date('Y/m/d H:i:s');
+
+    $file_name      = $_FILES["fileToUpload"]["name"];
+    $temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
+    $file_size      = $_FILES["fileToUpload"]["size"];
+    $target_dir     = "expert-uploads/";
+    $target_file    = strtolower($target_dir . basename($file_name));
+    $upload_ok      = 1;
+    $img_file_type  = pathinfo($target_file, PATHINFO_EXTENSION);
+    
+
+    if(strlen($target_file) <= strlen("expert-uploads/")){
+        $db_query = "UPDATE expert set expert_id = '$expert_id', personal_id = '$personal_id', name = '$name', title = '$title', major = '$major', tel = '$tel', tel_count = '$tel_count', chat_id = '$chat_id', chat_count = '$chat_count', video_call = '$video_call', video_count = '$video_count', onsite_call = '$onsite_call', onsite_count = '$onsite_count', create_at = '$create_at' WHERE id='$id'";
+            mysqli_query($link, $db_query);						
+
+    }else {
+
+        if($file_size > 500000) {
+            echo "<font color='#FF0000'>Please enter a file size between 5mb</font>";
+            $upload_ok = 0;
+        } else { //
+            //Allow certain file formats
+            if($img_file_type != "jpg" && $img_file_type != "png" && $img_file_type != "jpeg" && $img_file_type != "gif") {
+                //echo "JPG, PNG, JPEG and GIF files are allowed";
+                $upload_ok = 0;
+            } else {
+                //Check if $upload_ok is set to 0 by an error
+                if($upload_ok === 0) {
+                    echo "<font color='#FF0000'>File has not been uploaded</font>";
+                } else {
+                    if(move_uploaded_file($temp_file_name, $target_file)){
+                        $db_query = "UPDATE expert set expert_id = '$expert_id', personal_id = '$personal_id', name = '$name', title = '$title', picture = '$target_file', major = '$major', tel = '$tel', tel_count = '$tel_count', chat_id = '$chat_id', chat_count = '$chat_count', video_call = '$video_call', video_count = '$video_count', onsite_call = '$onsite_call', onsite_count = '$onsite_count', create_at = '$create_at' WHERE id='$id'";
+                        mysqli_query($link, $db_query);
+                    }
+                }
+            }
+        }   
+
+    }
+
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='expert-index.php?function_name=expert&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料')";
+        echo "location.href='expert-index.php?function_name=expert&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/expert-user-input.php b/wms/expert-user-input.php
index aff20bd4..2a442c3b 100644
--- a/wms/expert-user-input.php
+++ b/wms/expert-user-input.php
@@ -1,59 +1,59 @@
-<?php
-
-//Function to filter the form input
-function user_input( $data ) {
-    $data1 = trim($data);
-    $data2 = stripslashes($data1);
-    $data3 = htmlspecialchars($data2);
-    return $data3;
-}
-
-$expert_id = user_input($_POST["expert_id"]);
-$personal_id = user_input($_POST["personal_id"]);
-$name = user_input($_POST["name"]);
-$title = user_input($_POST["title"]);
-$major = user_input($_POST["major"]);
-$tel = user_input($_POST["tel"]);
-$tel_count = user_input($_POST["tel_count"]);
-$chat_id = user_input($_POST["chat_id"]);
-$chat_count = user_input($_POST["chat_count"]);
-$video_call = user_input($_POST["video_call"]);
-$video_count = user_input($_POST["video_count"]);
-$onsite_call = user_input($_POST["onsite_call"]);
-$onsite_count = user_input($_POST["onsite_count"]);
-$creater = user_input($_POST["creater"]);
-$create_at = user_input($_POST["create_at"]);
-
-
-
-/*
-
-if(empty($_POST["name"])) {
-    $name_error = "Name is required";
-} else {
-    $name = user_input($_POST["name"]);
-    
-    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
-        $name_error = "Only letter and white space are allowed";
-    }
-}
-
-
-/*
-if(empty($_POST["website"])) {
-    $website_error = "Website address is required";
-} else {
-    $website = user_input($_POST["website"]);
-
-    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
-        $website_error = "Invalid website URL";
-    }
-}
-
-if(empty($_POST["comment"])) {
-    $comment = "";
-} else {
-    $comment = user_input($_POST["comment"]);
-}
-*/
-?>
+<?php
+
+//Function to filter the form input
+function user_input( $data ) {
+    $data1 = trim($data);
+    $data2 = stripslashes($data1);
+    $data3 = htmlspecialchars($data2);
+    return $data3;
+}
+
+$expert_id = user_input($_POST["expert_id"]);
+$personal_id = user_input($_POST["personal_id"]);
+$name = user_input($_POST["name"]);
+$title = user_input($_POST["title"]);
+$major = user_input($_POST["major"]);
+$tel = user_input($_POST["tel"]);
+$tel_count = user_input($_POST["tel_count"]);
+$chat_id = user_input($_POST["chat_id"]);
+$chat_count = user_input($_POST["chat_count"]);
+$video_call = user_input($_POST["video_call"]);
+$video_count = user_input($_POST["video_count"]);
+$onsite_call = user_input($_POST["onsite_call"]);
+$onsite_count = user_input($_POST["onsite_count"]);
+$creater = user_input($_POST["creater"]);
+$create_at = user_input($_POST["create_at"]);
+
+
+
+/*
+
+if(empty($_POST["name"])) {
+    $name_error = "Name is required";
+} else {
+    $name = user_input($_POST["name"]);
+    
+    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
+        $name_error = "Only letter and white space are allowed";
+    }
+}
+
+
+/*
+if(empty($_POST["website"])) {
+    $website_error = "Website address is required";
+} else {
+    $website = user_input($_POST["website"]);
+
+    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
+        $website_error = "Invalid website URL";
+    }
+}
+
+if(empty($_POST["comment"])) {
+    $comment = "";
+} else {
+    $comment = user_input($_POST["comment"]);
+}
+*/
+?>
diff --git a/wms/facility-create.php b/wms/facility-create.php
index 5e5a58fa..6551104c 100644
--- a/wms/facility-create.php
+++ b/wms/facility-create.php
@@ -1,126 +1,126 @@
-<?php
-include "header.php";
-?>
-
-<div class="container">
-
-    <?php
-    
-        include "facility-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        
-    
-        <div>
-            <label for="contractno">合約號(必填)</label>
-            <input type="text" name="contractno" id="contractno" required>
-        </div>	
-
-        <div>
-            <label for="facilityno">作番號(必填)</label>
-            <input type="text" name="facilityno" id="facilityno" required>
-        </div>	
-		
-        <div>
-            <label for="customerid">客戶編號(必填)</label>
-            <input type="text" name="customerid" id="customerid" required>
-        </div>	
-				
-        <div>
-            <label for="weight">重量(必填)</label>
-            <input type="text" name="weight" id="weight" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>	
-
-        <div>
-            <label for="numberofstop">停數(必填)</label>
-            <input type="text" name="numberofstop" id="numberofstop" onkeyup="if(value<0)value=0;if(value.length>3)value=value.slice(0,3);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>	
-        
-        <div>
-            <label for="numberoffloor">樓層數(必填)</label>
-            <input type="text" name="numberoffloor" id="numberoffloor" onkeyup="if(value<0)value=0;if(value.length>3)value=value.slice(0,3);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="opentype">開門方式(必填)</label>
-			<Select name="opentype" id="opentype" required>
-				<option selected="selected" disabled="disabled"  style="display: none" value=""></option>			
-				<Option Value="CO">CO</Option>
-				<Option Value="SO">SO</Option>	
-				<Option Value="CO-SO">CO-SO</Option>					
-			</Select>			
-            <!-- <input type="text" name="opentype" id="opentype" > -->
-        </div>
-
-        <div>
-            <label for="speed">速度(必填)</label>
-            <input type="text" name="speed" id="speed" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="repairtype">維修型態(必填)</label>
-			<Select name="repairtype" id="repairtype" required>
-				<option selected="selected" disabled="disabled"  style="display: none" value=""></option>			
-				<Option Value="A">定期保養</Option>
-				<Option Value="B">單次保養</Option>	
-				<Option Value="C">單次維修</Option>					
-			</Select>			
-            <!-- <input type="text" name="repairtype" id="repairtype" > -->
-        </div>
-		
-        <div>
-            <label for="longitude">經度(必填)</label>
-            <input type="text" name="longitude" id="longitude" onkeyup="if(value<0)value=0;if(value.length>11)value=value.slice(0,11);value=value.replace(/^\D*(\d*(?:\.\d{0,7})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="latitude">緯度(必填)</label>
-            <input type="latitude" name="latitude" id="latitude" onkeyup="if(value<0)value=0;if(value.length>11)value=value.slice(0,11);value=value.replace(/^\D*(\d*(?:\.\d{0,7})?).*$/g, '$1')" required>
-        </div>		
-
-        <div>
-            <label for="address">地址</label>
-            <input type="text" name="address" id="address" >
-        </div>
-
-        <div>
-            <label for="repairerid">維修人員工號(必填)</label>
-            <input type="text" name="repairerid" id="repairerid" required>
-        </div>
-
-        <div>
-            <label for="repairername">維修人員姓名(必填)</label>
-            <input type="text" name="repairername" id="repairername" required>
-        </div>
-
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
-        </div>
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-
-        <div>
-            <button type="submit" name="submit">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
+<?php
+include "header.php";
+?>
+
+<div class="container">
+
+    <?php
+    
+        include "facility-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        
+    
+        <div>
+            <label for="contractno">合約號(必填)</label>
+            <input type="text" name="contractno" id="contractno" required>
+        </div>	
+
+        <div>
+            <label for="facilityno">作番號(必填)</label>
+            <input type="text" name="facilityno" id="facilityno" required>
+        </div>	
+		
+        <div>
+            <label for="customerid">客戶編號(必填)</label>
+            <input type="text" name="customerid" id="customerid" required>
+        </div>	
+				
+        <div>
+            <label for="weight">重量(必填)</label>
+            <input type="text" name="weight" id="weight" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>	
+
+        <div>
+            <label for="numberofstop">停數(必填)</label>
+            <input type="text" name="numberofstop" id="numberofstop" onkeyup="if(value<0)value=0;if(value.length>3)value=value.slice(0,3);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>	
+        
+        <div>
+            <label for="numberoffloor">樓層數(必填)</label>
+            <input type="text" name="numberoffloor" id="numberoffloor" onkeyup="if(value<0)value=0;if(value.length>3)value=value.slice(0,3);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="opentype">開門方式(必填)</label>
+			<Select name="opentype" id="opentype" required>
+				<option selected="selected" disabled="disabled"  style="display: none" value=""></option>			
+				<Option Value="CO">CO</Option>
+				<Option Value="SO">SO</Option>	
+				<Option Value="CO-SO">CO-SO</Option>					
+			</Select>			
+            <!-- <input type="text" name="opentype" id="opentype" > -->
+        </div>
+
+        <div>
+            <label for="speed">速度(必填)</label>
+            <input type="text" name="speed" id="speed" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="repairtype">維修型態(必填)</label>
+			<Select name="repairtype" id="repairtype" required>
+				<option selected="selected" disabled="disabled"  style="display: none" value=""></option>			
+				<Option Value="A">定期保養</Option>
+				<Option Value="B">單次保養</Option>	
+				<Option Value="C">單次維修</Option>					
+			</Select>			
+            <!-- <input type="text" name="repairtype" id="repairtype" > -->
+        </div>
+		
+        <div>
+            <label for="longitude">經度(必填)</label>
+            <input type="text" name="longitude" id="longitude" onkeyup="if(value<0)value=0;if(value.length>11)value=value.slice(0,11);value=value.replace(/^\D*(\d*(?:\.\d{0,7})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="latitude">緯度(必填)</label>
+            <input type="latitude" name="latitude" id="latitude" onkeyup="if(value<0)value=0;if(value.length>11)value=value.slice(0,11);value=value.replace(/^\D*(\d*(?:\.\d{0,7})?).*$/g, '$1')" required>
+        </div>		
+
+        <div>
+            <label for="address">地址</label>
+            <input type="text" name="address" id="address" >
+        </div>
+
+        <div>
+            <label for="repairerid">維修人員工號(必填)</label>
+            <input type="text" name="repairerid" id="repairerid" required>
+        </div>
+
+        <div>
+            <label for="repairername">維修人員姓名(必填)</label>
+            <input type="text" name="repairername" id="repairername" required>
+        </div>
+
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
+        </div>
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+
+        <div>
+            <button type="submit" name="submit">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
diff --git a/wms/facility-delete.php b/wms/facility-delete.php
index a41ba6a2..37a25785 100644
--- a/wms/facility-delete.php
+++ b/wms/facility-delete.php
@@ -1,12 +1,12 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "DELETE FROM facility WHERE id='$id'";
-mysqli_query($link, $db_query);	
-
-header("Refresh:0; url=facility-index.php?function_name=facility&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "DELETE FROM facility WHERE id='$id'";
+mysqli_query($link, $db_query);	
+
+header("Refresh:0; url=facility-index.php?function_name=facility&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/facility-edit.php b/wms/facility-edit.php
index a2c3f5b7..9abbcd8e 100644
--- a/wms/facility-edit.php
+++ b/wms/facility-edit.php
@@ -1,153 +1,153 @@
-<?php
-    include "header.php";
-
-    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-	
-	$data = array();
-	// sql語法存在變數中
-	$db_query = "SELECT * FROM facility  WHERE id=$id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$db_query);	
-/*
-    include "inc/record_update.php";
-    
-    try {	
-		// 設置一個空陣列來放資料
-		$data = array();
-		// sql語法存在變數中
-		$db_query = "SELECT * FROM expert WHERE id=$id";
-
-		// 用mysqli_query方法執行(sql語法)將結果存在變數中
-		$data = mysqli_query($link,$db_query);
-	}catch (Exception $e) {
-    echo 'Caught exception: ',  $e->getMessage(), "\n";
-	}
-*/	
-    foreach($data as $data) :
-?>
-
-<div class="container">
-    <form class="form-inline" method="post" action="facility-record-update.php" enctype="multipart/form-data">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-		
-        <div>
-            <label for="contractno">合約號</label>
-            <input type="text" name="contractno" id="contractno" value="<?php echo $data['contractno']; ?>" required>
-        </div>	
-
-        <div>
-            <label for="facilityno">作番號</label>
-            <input type="text" name="facilityno" id="facilityno" value="<?php echo $data['facilityno']; ?>" required>
-        </div>	
-		
-        <div>
-            <label for="customerid">客戶編號</label>
-            <input type="text" name="customerid" id="customerid" value="<?php echo $data['customerid']; ?>" required>
-        </div>	
-				
-        <div>
-            <label for="weight">重量</label>
-            <input type="text" name="weight" id="weight" value="<?php echo $data['weight']; ?>" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>	
-
-        <div>
-            <label for="numberofstop">停數</label>
-            <input type="text" name="numberofstop" id="numberofstop" value="<?php echo $data['numberofstop']; ?>" onkeyup="if(value<0)value=0;if(value.length>3)value=value.slice(0,3);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>	
-        
-        <div>
-            <label for="numberoffloor">樓層數</label>
-            <input type="text" name="numberoffloor" id="numberoffloor" value="<?php echo $data['numberoffloor']; ?>" onkeyup="if(value<0)value=0;if(value.length>3)value=value.slice(0,3);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="opentype">開門方式</label>
-			<Select name="opentype" id="opentype" required>
-					<?php
-						switch ($data['opentype']) {
-							case "CO":
-								echo "<Option Value='CO' selected='selected'>CO</Option> <Option Value='OS'>SO</Option> <Option Value='CO-SO'>CO-SO</Option>";
-								break;
-							case "SO":
-								echo "<Option Value='CO'>CO</Option> <Option Value='SO' selected='selected'>SO</Option> <Option Value='CO-SO'>CO-SO</Option>";
-								break;
-							case "CO-SO":
-								echo "<Option Value='CO'>CO</Option> <Option Value='SO'>SO</Option> <Option Value='CO-SO' selected='selected'>CO-SO</Option>";
-								break;
-						}					
-					?>					
-			</Select>				
-            <!-- <input type="text" name="opentype" id="opentype" value=""> -->
-        </div>
-
-        <div>
-            <label for="speed">速度</label>
-            <input type="text" name="speed" id="speed" value="<?php echo $data['speed']; ?>" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="repairtype">維修型態</label>
-			<Select name="repairtype" id="repairtype" required>
-					<?php
-						switch ($data['repairtype']) {
-							case "A":
-								echo "<Option Value='A' selected='selected'>定期保養</Option> <Option Value='B'>單次保養</Option> <Option Value='C'>單次維修</Option>";
-								break;
-							case "B":
-								echo "<Option Value='A'>定期保養</Option> <Option Value='B' selected='selected'>單次保養</Option> <Option Value='C'>單次維修</Option>";
-								break;
-							case "C":
-								echo "<Option Value='A'>定期保養</Option> <Option Value='B'>單次保養</Option> <Option Value='C' selected='selected'>單次維修</Option>";
-								break;
-						}					
-					?>					
-			</Select>				
-            <!-- <input type="text" name="repairtype" id="repairtype" value=""> -->
-        </div>
-		
-        <div>
-            <label for="longitude">經度(必填)</label>
-            <input type="text" name="longitude" id="longitude" value="<?php echo $data['longitude']; ?>">
-        </div>
-
-        <div>
-            <label for="latitude">緯度(必填)</label>
-            <input type="latitude" name="latitude" id="latitude" value="<?php echo $data['latitude']; ?>"d>
-        </div>			
-
-        <div>
-            <label for="address">地址</label>
-            <input type="text" name="address" id="address" value="<?php echo $data['address']; ?>">
-        </div>
-
-        <div>
-            <label for="repairerid">維修人員工號</label>
-            <input type="text" name="repairerid" id="repairerid" value="<?php echo $data['repairerid']; ?>">
-        </div>
-
-        <div>
-            <label for="repairername">維修人員姓名</label>
-            <input type="text" name="repairername" id="repairername" value="<?php echo $data['repairername']; ?>">
-        </div>
-
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
-        </div>
-		
-        <div>
-            <button type="submit" name="update">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
-?>
-
+<?php
+    include "header.php";
+
+    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+	
+	$data = array();
+	// sql語法存在變數中
+	$db_query = "SELECT * FROM facility  WHERE id=$id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$db_query);	
+/*
+    include "inc/record_update.php";
+    
+    try {	
+		// 設置一個空陣列來放資料
+		$data = array();
+		// sql語法存在變數中
+		$db_query = "SELECT * FROM expert WHERE id=$id";
+
+		// 用mysqli_query方法執行(sql語法)將結果存在變數中
+		$data = mysqli_query($link,$db_query);
+	}catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+	}
+*/	
+    foreach($data as $data) :
+?>
+
+<div class="container">
+    <form class="form-inline" method="post" action="facility-record-update.php" enctype="multipart/form-data">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+		
+        <div>
+            <label for="contractno">合約號</label>
+            <input type="text" name="contractno" id="contractno" value="<?php echo $data['contractno']; ?>" required>
+        </div>	
+
+        <div>
+            <label for="facilityno">作番號</label>
+            <input type="text" name="facilityno" id="facilityno" value="<?php echo $data['facilityno']; ?>" required>
+        </div>	
+		
+        <div>
+            <label for="customerid">客戶編號</label>
+            <input type="text" name="customerid" id="customerid" value="<?php echo $data['customerid']; ?>" required>
+        </div>	
+				
+        <div>
+            <label for="weight">重量</label>
+            <input type="text" name="weight" id="weight" value="<?php echo $data['weight']; ?>" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>	
+
+        <div>
+            <label for="numberofstop">停數</label>
+            <input type="text" name="numberofstop" id="numberofstop" value="<?php echo $data['numberofstop']; ?>" onkeyup="if(value<0)value=0;if(value.length>3)value=value.slice(0,3);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>	
+        
+        <div>
+            <label for="numberoffloor">樓層數</label>
+            <input type="text" name="numberoffloor" id="numberoffloor" value="<?php echo $data['numberoffloor']; ?>" onkeyup="if(value<0)value=0;if(value.length>3)value=value.slice(0,3);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="opentype">開門方式</label>
+			<Select name="opentype" id="opentype" required>
+					<?php
+						switch ($data['opentype']) {
+							case "CO":
+								echo "<Option Value='CO' selected='selected'>CO</Option> <Option Value='OS'>SO</Option> <Option Value='CO-SO'>CO-SO</Option>";
+								break;
+							case "SO":
+								echo "<Option Value='CO'>CO</Option> <Option Value='SO' selected='selected'>SO</Option> <Option Value='CO-SO'>CO-SO</Option>";
+								break;
+							case "CO-SO":
+								echo "<Option Value='CO'>CO</Option> <Option Value='SO'>SO</Option> <Option Value='CO-SO' selected='selected'>CO-SO</Option>";
+								break;
+						}					
+					?>					
+			</Select>				
+            <!-- <input type="text" name="opentype" id="opentype" value=""> -->
+        </div>
+
+        <div>
+            <label for="speed">速度</label>
+            <input type="text" name="speed" id="speed" value="<?php echo $data['speed']; ?>" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="repairtype">維修型態</label>
+			<Select name="repairtype" id="repairtype" required>
+					<?php
+						switch ($data['repairtype']) {
+							case "A":
+								echo "<Option Value='A' selected='selected'>定期保養</Option> <Option Value='B'>單次保養</Option> <Option Value='C'>單次維修</Option>";
+								break;
+							case "B":
+								echo "<Option Value='A'>定期保養</Option> <Option Value='B' selected='selected'>單次保養</Option> <Option Value='C'>單次維修</Option>";
+								break;
+							case "C":
+								echo "<Option Value='A'>定期保養</Option> <Option Value='B'>單次保養</Option> <Option Value='C' selected='selected'>單次維修</Option>";
+								break;
+						}					
+					?>					
+			</Select>				
+            <!-- <input type="text" name="repairtype" id="repairtype" value=""> -->
+        </div>
+		
+        <div>
+            <label for="longitude">經度(必填)</label>
+            <input type="text" name="longitude" id="longitude" value="<?php echo $data['longitude']; ?>">
+        </div>
+
+        <div>
+            <label for="latitude">緯度(必填)</label>
+            <input type="latitude" name="latitude" id="latitude" value="<?php echo $data['latitude']; ?>"d>
+        </div>			
+
+        <div>
+            <label for="address">地址</label>
+            <input type="text" name="address" id="address" value="<?php echo $data['address']; ?>">
+        </div>
+
+        <div>
+            <label for="repairerid">維修人員工號</label>
+            <input type="text" name="repairerid" id="repairerid" value="<?php echo $data['repairerid']; ?>">
+        </div>
+
+        <div>
+            <label for="repairername">維修人員姓名</label>
+            <input type="text" name="repairername" id="repairername" value="<?php echo $data['repairername']; ?>">
+        </div>
+
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
+        </div>
+		
+        <div>
+            <button type="submit" name="update">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php
+
+    endforeach;
+    
+    include "footer.php";
+
+?>
+
diff --git a/wms/facility-excel-upload.php b/wms/facility-excel-upload.php
index d43b5f0a..5c07d1db 100644
--- a/wms/facility-excel-upload.php
+++ b/wms/facility-excel-upload.php
@@ -1,115 +1,115 @@
-            <?php
-            // 载入db.php来连结资料库
-            require_once "database.php";
-            include "header.php";
-            require_once 'PHPExcel/PHPExcel.php';
-            require_once 'PHPExcel/IOFactory.php';
-            $file_name = $_FILES["fileToUpload"]["name"];
-            $temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
-            $target_dir = "expert-uploads/";
-            $target_file = strtolower($target_dir . iconv("UTF-8", "gbk", basename($file_name)));
-            $EXTENSION = pathinfo($target_file, PATHINFO_EXTENSION);
-            if (move_uploaded_file($temp_file_name, $target_file)) {
-                if ($EXTENSION == 'xls') {
-                    $objReader = PHPExcel_IOFactory::createReader('Excel5');//支持xls
-                } else {
-                    $objReader = PHPExcel_IOFactory::createReader('Excel2007');//支持xlsx
-                }
-                $objPHPExcel = $objReader->load($target_file); //读取上传到服务器的文件
-                $sheet = $objPHPExcel->getSheet(0);//拿到第一个sheet数据
-                $highestRow = $sheet->getHighestRow(); // 取得总行数
-                 $highestColumn = $sheet->getHighestColumn(); // 取得总列数
-                 $highestColumn = PHPExcel_Cell::columnIndexFromString($highestColumn); // 转换字母为对应的统计数字；
-                 $excelArray = array();
-                for ($row = 2; $row <= $highestRow; $row++) {
-                 $val = $sheet->getCellByColumnAndRow(0, $row)->getCalculatedValue();
-
-                    if ($val == "") return;
-                    for ($column = 1; $column < $highestColumn; $column++) {
-                        $val = $sheet->getCellByColumnAndRow($column, $row)->getCalculatedValue();
-                        $excelArray[$row][] = $val; //读取excel数据到数组
-                    }
-
-                    $facilityno = $excelArray[$row][1]; //作番id
-                    $facilitsql = "SELECT * FROM facility where facilityno='$facilityno'";
-                    $facilit_nums_rows = mysqli_num_rows(mysqli_query($link, $facilitsql));
-                    if ($facilit_nums_rows == 0) {
-                        echo $row;
-                        $contractno = $excelArray[$row][0]?:'null'; //合约号
-                        $facilityno = $excelArray[$row][1]?:'null'; //作番号
-                        $address = $excelArray[$row][2]?:'null'; //作番安装地址
-                        $longitude = $excelArray[$row][3]?:'null';//纬度
-                        $latitude = $excelArray[$row][4]?:'null';//经度
-                        $customerid = $excelArray[$row][5]?:'null'; //客户/业主名称
-                        $customercode = $excelArray[$row][6]?:'null'; //业主ID或统一信用代码
-                        $customerlinknumber = $excelArray[$row][7]?:'null'; //业主联络电话或手机
-                        $repairerid = $excelArray[$row][8]?:'null'; //保养员工号
-                        $repairername = $excelArray[$row][9]?:'null'; //保养员姓名
-                        $repairerphonenumber = $excelArray[$row][10]?:'null'; //保养员手机号
-                        $baoyangdate= $excelArray[$row][11]?:'null'; //保养日期
-                        $maintainance= $excelArray[$row][12]?:'null'; //保养计划类别.保養別\r\nA=全包\r\nB=半包\r\nC=清包\r\nD=半包:2個月保養一次
-                        $yingshoukuandate= $excelArray[$row][13]?:'null'; //应收款日期
-                        $contractstartdate= $excelArray[$row][14]?:'null'; //合约起始年月日
-                        $contractenddate= $excelArray[$row][15]?:'null'; //合约终止年月日
-                        $facilitychuchangno= $excelArray[$row][16]?:'null'; //原作番出厂编号
-                        $contractpersonid= $excelArray[$row][17]?:'null'; //契约人员工号
-                        $contractpersonname= $excelArray[$row][18]?:'null'; //契约人员姓名
-                        $weight= $excelArray[$row][19]?:'null'; //载重/输送能力
-                        $numberoffloor= $excelArray[$row][20]?:'null'; //层站,停数/提升高度
-                        $speed= $excelArray[$row][21]?:'null'; //速度
-                        $brand= $excelArray[$row][22]?:'null'; //品牌,型号
-                        $officialregistrationcode= $excelArray[$row][13]?:'null'; //官方注册代码
-                        $manufacturedate= $excelArray[$row][24]?:'null'; //制造日期
-                        $creater = "batch";
-                        $create_at = date('Y/m/d H:i:s');
-                        //无效字段
-                        $numberofstop='0';
-                        $opentype='0';
-                        $repairtype='0';
-                      echo   $db_query1 = "INSERT INTO facility(contractno, facilityno, customerid, weight,numberofstop, numberoffloor,opentype,speed,repairtype,longitude, latitude, address,repairerid,repairername,creater, create_at) VALUES ('$contractno', '$facilityno', '$customerid', '$weight','$numberofstop', '$numberoffloor','$opentype','$speed','$repairtype','$longitude', '$latitude', '$address','$repairerid','$repairername','$creater', '$create_at')";
-                        
-                        mysqli_query($link, $db_query1);
-                        if (mysqli_affected_rows($link) > 0) {
-                            echo "作番新增成功\n";
-                            //添加作番拓展字段
-                            $facilityid=mysqli_insert_id($link);
-                            $db_query2 = "INSERT INTO facility_extends(facilityid,facilitychuchangno,contractpersonid,contractpersonname,brand,officialregistrationcode,manufacturedate,creater, create_at) VALUES (";
-                            $db_query2.=" '$facilityid', '$facilitychuchangno','$contractpersonid','$contractpersonname','$brand','$officialregistrationcode','$manufacturedate','$creater', '$create_at')";
-
-
-                            mysqli_query($link, $db_query2);
-                            if (mysqli_affected_rows($link) > 0) {
-                                echo  '扩展添加成功';
-                            }
-
-                        } elseif (mysqli_affected_rows($link) == 0) {
-                            echo "无新增资料";
-                        }
-                    } else {
-                        echo "作番已经存在";
-                        echo  $facilityno;
-                    }
-
-                  //print_r($excelArray);
-                }
-                mysqli_close($link);
-            }
-
-            ?>
-            <div class="container">
-                <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>"
-                      enctype="multipart/form-data">
-
-                    <div class="bottom-margin">资料
-                        <label for="fileToUpload">上传</label>
-                        <div>
-                            <input type="file" name="fileToUpload" id="fileToUpload">
-                        </div>
-                        <div class="bottom-margin">
-                            <button type="submit" name="submit">确定</button>
-                        </div>
-                    </div>
-
-                </form>
-            </div>
-
+            <?php
+            // 载入db.php来连结资料库
+            require_once "database.php";
+            include "header.php";
+            require_once 'PHPExcel/PHPExcel.php';
+            require_once 'PHPExcel/IOFactory.php';
+            $file_name = $_FILES["fileToUpload"]["name"];
+            $temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
+            $target_dir = "expert-uploads/";
+            $target_file = strtolower($target_dir . iconv("UTF-8", "gbk", basename($file_name)));
+            $EXTENSION = pathinfo($target_file, PATHINFO_EXTENSION);
+            if (move_uploaded_file($temp_file_name, $target_file)) {
+                if ($EXTENSION == 'xls') {
+                    $objReader = PHPExcel_IOFactory::createReader('Excel5');//支持xls
+                } else {
+                    $objReader = PHPExcel_IOFactory::createReader('Excel2007');//支持xlsx
+                }
+                $objPHPExcel = $objReader->load($target_file); //读取上传到服务器的文件
+                $sheet = $objPHPExcel->getSheet(0);//拿到第一个sheet数据
+                $highestRow = $sheet->getHighestRow(); // 取得总行数
+                 $highestColumn = $sheet->getHighestColumn(); // 取得总列数
+                 $highestColumn = PHPExcel_Cell::columnIndexFromString($highestColumn); // 转换字母为对应的统计数字；
+                 $excelArray = array();
+                for ($row = 2; $row <= $highestRow; $row++) {
+                 $val = $sheet->getCellByColumnAndRow(0, $row)->getCalculatedValue();
+
+                    if ($val == "") return;
+                    for ($column = 1; $column < $highestColumn; $column++) {
+                        $val = $sheet->getCellByColumnAndRow($column, $row)->getCalculatedValue();
+                        $excelArray[$row][] = $val; //读取excel数据到数组
+                    }
+
+                    $facilityno = $excelArray[$row][1]; //作番id
+                    $facilitsql = "SELECT * FROM facility where facilityno='$facilityno'";
+                    $facilit_nums_rows = mysqli_num_rows(mysqli_query($link, $facilitsql));
+                    if ($facilit_nums_rows == 0) {
+                        echo $row;
+                        $contractno = $excelArray[$row][0]?:'null'; //合约号
+                        $facilityno = $excelArray[$row][1]?:'null'; //作番号
+                        $address = $excelArray[$row][2]?:'null'; //作番安装地址
+                        $longitude = $excelArray[$row][3]?:'null';//纬度
+                        $latitude = $excelArray[$row][4]?:'null';//经度
+                        $customerid = $excelArray[$row][5]?:'null'; //客户/业主名称
+                        $customercode = $excelArray[$row][6]?:'null'; //业主ID或统一信用代码
+                        $customerlinknumber = $excelArray[$row][7]?:'null'; //业主联络电话或手机
+                        $repairerid = $excelArray[$row][8]?:'null'; //保养员工号
+                        $repairername = $excelArray[$row][9]?:'null'; //保养员姓名
+                        $repairerphonenumber = $excelArray[$row][10]?:'null'; //保养员手机号
+                        $baoyangdate= $excelArray[$row][11]?:'null'; //保养日期
+                        $maintainance= $excelArray[$row][12]?:'null'; //保养计划类别.保養別\r\nA=全包\r\nB=半包\r\nC=清包\r\nD=半包:2個月保養一次
+                        $yingshoukuandate= $excelArray[$row][13]?:'null'; //应收款日期
+                        $contractstartdate= $excelArray[$row][14]?:'null'; //合约起始年月日
+                        $contractenddate= $excelArray[$row][15]?:'null'; //合约终止年月日
+                        $facilitychuchangno= $excelArray[$row][16]?:'null'; //原作番出厂编号
+                        $contractpersonid= $excelArray[$row][17]?:'null'; //契约人员工号
+                        $contractpersonname= $excelArray[$row][18]?:'null'; //契约人员姓名
+                        $weight= $excelArray[$row][19]?:'null'; //载重/输送能力
+                        $numberoffloor= $excelArray[$row][20]?:'null'; //层站,停数/提升高度
+                        $speed= $excelArray[$row][21]?:'null'; //速度
+                        $brand= $excelArray[$row][22]?:'null'; //品牌,型号
+                        $officialregistrationcode= $excelArray[$row][13]?:'null'; //官方注册代码
+                        $manufacturedate= $excelArray[$row][24]?:'null'; //制造日期
+                        $creater = "batch";
+                        $create_at = date('Y/m/d H:i:s');
+                        //无效字段
+                        $numberofstop='0';
+                        $opentype='0';
+                        $repairtype='0';
+                      echo   $db_query1 = "INSERT INTO facility(contractno, facilityno, customerid, weight,numberofstop, numberoffloor,opentype,speed,repairtype,longitude, latitude, address,repairerid,repairername,creater, create_at) VALUES ('$contractno', '$facilityno', '$customerid', '$weight','$numberofstop', '$numberoffloor','$opentype','$speed','$repairtype','$longitude', '$latitude', '$address','$repairerid','$repairername','$creater', '$create_at')";
+                        
+                        mysqli_query($link, $db_query1);
+                        if (mysqli_affected_rows($link) > 0) {
+                            echo "作番新增成功\n";
+                            //添加作番拓展字段
+                            $facilityid=mysqli_insert_id($link);
+                            $db_query2 = "INSERT INTO facility_extends(facilityid,facilitychuchangno,contractpersonid,contractpersonname,brand,officialregistrationcode,manufacturedate,creater, create_at) VALUES (";
+                            $db_query2.=" '$facilityid', '$facilitychuchangno','$contractpersonid','$contractpersonname','$brand','$officialregistrationcode','$manufacturedate','$creater', '$create_at')";
+
+
+                            mysqli_query($link, $db_query2);
+                            if (mysqli_affected_rows($link) > 0) {
+                                echo  '扩展添加成功';
+                            }
+
+                        } elseif (mysqli_affected_rows($link) == 0) {
+                            echo "无新增资料";
+                        }
+                    } else {
+                        echo "作番已经存在";
+                        echo  $facilityno;
+                    }
+
+                  //print_r($excelArray);
+                }
+                mysqli_close($link);
+            }
+
+            ?>
+            <div class="container">
+                <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>"
+                      enctype="multipart/form-data">
+
+                    <div class="bottom-margin">资料
+                        <label for="fileToUpload">上传</label>
+                        <div>
+                            <input type="file" name="fileToUpload" id="fileToUpload">
+                        </div>
+                        <div class="bottom-margin">
+                            <button type="submit" name="submit">确定</button>
+                        </div>
+                    </div>
+
+                </form>
+            </div>
+
diff --git a/wms/facility-index.php b/wms/facility-index.php
index 0458a6e5..8815b5c8 100644
--- a/wms/facility-index.php
+++ b/wms/facility-index.php
@@ -1,161 +1,161 @@
-<?php
-include "header.php";
-
-// 工務總處可瀏覽全部資料
-$sql = "select department_id from account where accountid = '$user_id'";
-$res = mysqli_query($link, $sql);
-$row = mysqli_fetch_row($res);
-$user_department_id = $row[0];
-mysqli_free_result($res);
-
-// 設置一個空陣列來放資料
-$data = array();
-// sql語法存在變數中
-$sql_cmd = sql_myself($user_id);
-if ($user_department_id == "501" || $user_id == "M0105") $sql_cmd = "";
-$sql = "SELECT * FROM facility $sql_cmd ORDER BY id";
-
-// 用mysqli_query方法執行(sql語法)將結果存在變數中
-$data = mysqli_query($link,$sql);
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="facility-create.php?function_name=facility&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-<?php
-}
-
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:facility-index.php");
-        }
-    }
-
-?>
-
-<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;
-   
-}
-
-</style>
-
-    <div style="overflow-x:auto;">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-            <tr>
-                <th>項次</th>
-                <th>合約號</th>
-                <th>作番號</th>
-                <th>客戶編號</th>
-                <th>重量</th>
-                <th>停數</th>
-                <th>樓層數</th>
-                <th>開門方式</th>
-                <th>速度</th>
-                <th>維修型態</th>
-                <th>經度</th>	
-                <th>緯度</th>
-                <th>地址</th>				
-                <th>維修人員工號</th>
-                <th>維修人員姓名</th>
-                <th>建檔人</th>
-                <th>建檔時間</th>
-                <?php if ($user_auth&2) { ?>
-                <th>修改</th>
-                <th>刪除</th>
-                <?php } ?>
-            </tr>
-		</thead>
-		<tbody>			
-
-            <?php foreach($data as $data) : ?>    
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td><?php echo $data['contractno']; ?></td>
-                    <td><?php echo $data['facilityno']; ?></td>
-                    <td><?php echo $data['customerid']; ?></td>
-                    <td><?php echo $data['weight']; ?></td>
-                    <td><?php echo $data['numberofstop']; ?></td>
-                    <td><?php echo $data['numberoffloor']; ?></td>
-                    <td><?php echo $data['opentype']; ?></td>
-                    <td><?php echo $data['speed']; ?></td>
-                    <td><?php echo $data['repairtype']; ?></td>
-                    <td><?php echo $data['longitude']; ?></td>
-                    <td><?php echo $data['latitude']; ?></td>
-                    <td><?php echo $data['address']; ?></td>					
-                    <td><?php echo $data['repairerid']; ?></td>
-                    <td><?php echo $data['repairername']; ?></td>
-                    <td><?php echo $data['creater']; ?></td>
-                    <td><?php echo $data['create_at']; ?></td>
-                    <?php if ($user_auth&2) { ?>
-                    <td>
-						<p>
-							<a href="facility-edit.php?id=<?php echo $data['id']; ?>&function_name=facility&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-								<span class="glyphicon glyphicon-pencil"></span>
-							</a>
-						</p> 
-					</td>
-                    <td>
-						<p>
-							<a href="facility-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-								<span class="glyphicon glyphicon-remove"></span>
-							</a>
-						</p> 
-					</td>
-                    <?php } ?>
-                </tr>
-            <?php endforeach; ?>
-			</tbody>			
-        </table>
-    </div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-
+<?php
+include "header.php";
+
+// 工務總處可瀏覽全部資料
+$sql = "select department_id from account where accountid = '$user_id'";
+$res = mysqli_query($link, $sql);
+$row = mysqli_fetch_row($res);
+$user_department_id = $row[0];
+mysqli_free_result($res);
+
+// 設置一個空陣列來放資料
+$data = array();
+// sql語法存在變數中
+$sql_cmd = sql_myself($user_id);
+if ($user_department_id == "501" || $user_id == "M0105") $sql_cmd = "";
+$sql = "SELECT * FROM facility $sql_cmd ORDER BY id";
+
+// 用mysqli_query方法執行(sql語法)將結果存在變數中
+$data = mysqli_query($link,$sql);
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth&2) { ?>
+<p>
+<a href="facility-create.php?function_name=facility&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+<?php
+}
+
+if($data):
+    
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:facility-index.php");
+        }
+    }
+
+?>
+
+<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;
+   
+}
+
+</style>
+
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+            <tr>
+                <th>項次</th>
+                <th>合約號</th>
+                <th>作番號</th>
+                <th>客戶編號</th>
+                <th>重量</th>
+                <th>停數</th>
+                <th>樓層數</th>
+                <th>開門方式</th>
+                <th>速度</th>
+                <th>維修型態</th>
+                <th>經度</th>	
+                <th>緯度</th>
+                <th>地址</th>				
+                <th>維修人員工號</th>
+                <th>維修人員姓名</th>
+                <th>建檔人</th>
+                <th>建檔時間</th>
+                <?php if ($user_auth&2) { ?>
+                <th>修改</th>
+                <th>刪除</th>
+                <?php } ?>
+            </tr>
+		</thead>
+		<tbody>			
+
+            <?php foreach($data as $data) : ?>    
+                <tr>
+                    <td><?php echo $data['id']; ?></td>
+                    <td><?php echo $data['contractno']; ?></td>
+                    <td><?php echo $data['facilityno']; ?></td>
+                    <td><?php echo $data['customerid']; ?></td>
+                    <td><?php echo $data['weight']; ?></td>
+                    <td><?php echo $data['numberofstop']; ?></td>
+                    <td><?php echo $data['numberoffloor']; ?></td>
+                    <td><?php echo $data['opentype']; ?></td>
+                    <td><?php echo $data['speed']; ?></td>
+                    <td><?php echo $data['repairtype']; ?></td>
+                    <td><?php echo $data['longitude']; ?></td>
+                    <td><?php echo $data['latitude']; ?></td>
+                    <td><?php echo $data['address']; ?></td>					
+                    <td><?php echo $data['repairerid']; ?></td>
+                    <td><?php echo $data['repairername']; ?></td>
+                    <td><?php echo $data['creater']; ?></td>
+                    <td><?php echo $data['create_at']; ?></td>
+                    <?php if ($user_auth&2) { ?>
+                    <td>
+						<p>
+							<a href="facility-edit.php?id=<?php echo $data['id']; ?>&function_name=facility&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+								<span class="glyphicon glyphicon-pencil"></span>
+							</a>
+						</p> 
+					</td>
+                    <td>
+						<p>
+							<a href="facility-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+						</p> 
+					</td>
+                    <?php } ?>
+                </tr>
+            <?php endforeach; ?>
+			</tbody>			
+        </table>
+    </div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+
 ?>
\ No newline at end of file
diff --git a/wms/facility-record-submit.php b/wms/facility-record-submit.php
index 2388acd4..506b4aff 100644
--- a/wms/facility-record-submit.php
+++ b/wms/facility-record-submit.php
@@ -1,59 +1,59 @@
-<?php
-$contractno= "";
-$facilityno= "";
-$customerid= "";
-$weight= "";
-$numberofstop= "";
-$numberoffloor= "";
-$opentype= "";
-$speed= "";
-$repairtype= "";
-$longitude= "";
-$latitude= "";
-$address= "";
-$repairerid= "";
-$repairername= "";
-$creater= "";	
-$create_at= "";
-
-$contractno_error= "";
-$facilityno_error= "";
-$customerid_error= "";
-$weight_error= "";
-$numberofstop_error= "";
-$numberoffloor_error= "";
-$opentype_error= "";
-$speed_error= "";
-$repairtype_error= "";
-$longitude_error= "";
-$latitude_error= "";
-$address_error= "";
-$repairerid_error= "";
-$repairername_error= "";
-$creater_error = "";
-$create_at_error = "";
-
-
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    include "facility-user-input.php";
-
-    $db_query = "INSERT INTO facility(contractno, facilityno, customerid, weight,numberofstop, numberoffloor,opentype,speed,repairtype,longitude, latitude, address,repairerid,repairername,creater, create_at) VALUES ('$contractno', '$facilityno', '$customerid', '$weight','$numberofstop', '$numberoffloor','$opentype','$speed','$repairtype','$longitude', '$latitude', '$address','$repairerid','$repairername','$creater', '$create_at')";    	                      
-    $result = mysqli_query($link,$db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='facility-index.php?function_name=facility&".$token_link."';";
-        echo "</script>";  
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='facility-index.php?function_name=facility&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
-?>
+<?php
+$contractno= "";
+$facilityno= "";
+$customerid= "";
+$weight= "";
+$numberofstop= "";
+$numberoffloor= "";
+$opentype= "";
+$speed= "";
+$repairtype= "";
+$longitude= "";
+$latitude= "";
+$address= "";
+$repairerid= "";
+$repairername= "";
+$creater= "";	
+$create_at= "";
+
+$contractno_error= "";
+$facilityno_error= "";
+$customerid_error= "";
+$weight_error= "";
+$numberofstop_error= "";
+$numberoffloor_error= "";
+$opentype_error= "";
+$speed_error= "";
+$repairtype_error= "";
+$longitude_error= "";
+$latitude_error= "";
+$address_error= "";
+$repairerid_error= "";
+$repairername_error= "";
+$creater_error = "";
+$create_at_error = "";
+
+
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    include "facility-user-input.php";
+
+    $db_query = "INSERT INTO facility(contractno, facilityno, customerid, weight,numberofstop, numberoffloor,opentype,speed,repairtype,longitude, latitude, address,repairerid,repairername,creater, create_at) VALUES ('$contractno', '$facilityno', '$customerid', '$weight','$numberofstop', '$numberoffloor','$opentype','$speed','$repairtype','$longitude', '$latitude', '$address','$repairerid','$repairername','$creater', '$create_at')";    	                      
+    $result = mysqli_query($link,$db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='facility-index.php?function_name=facility&".$token_link."';";
+        echo "</script>";  
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='facility-index.php?function_name=facility&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
+?>
diff --git a/wms/facility-record-update.php b/wms/facility-record-update.php
index efd415c4..15275bd9 100644
--- a/wms/facility-record-update.php
+++ b/wms/facility-record-update.php
@@ -1,49 +1,49 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-
-    function user_input( $data ) {
-        $data1 = trim($data);
-        $data2 = stripslashes($data1);
-        $data3 = htmlspecialchars($data2);
-        return $data3;
-    }
-
-    $id     = $_POST['id'];
-    $contractno   = user_input($_POST["contractno"]);
-    $facilityno	   = user_input($_POST["facilityno"]);
-    $customerid       = user_input($_POST["customerid"]);
-    $weight       = user_input($_POST["weight"]);
-    $numberofstop        = user_input($_POST["numberofstop"]);
-    $numberoffloor     = user_input($_POST["numberoffloor"]);
-    $opentype      = user_input($_POST["opentype"]);
-    $speed     = user_input($_POST["speed"]);
-    $repairtype     = user_input($_POST["repairtype"]);
-    $longitude     = user_input($_POST["longitude"]);
-    $latitude     = user_input($_POST["latitude"]);
-    $address     = user_input($_POST["address"]);
-    $repairerid     = user_input($_POST["repairerid"]);
-    $repairername     = user_input($_POST["repairername"]);
-    $creater      = user_input($_POST["creater"]);	
-    $create_at     = date('Y/m/d H:i:s');
-
-    $db_query = "UPDATE facility set contractno = '$contractno', facilityno = '$facilityno', customerid = '$customerid', weight = '$weight', numberofstop = '$numberofstop', numberoffloor = '$numberoffloor',opentype = '$opentype',speed = '$speed',repairtype = '$repairtype',longitude = '$longitude',latitude = '$latitude',address = '$address',repairerid = '$repairerid',repairername = '$repairername',create_at = '$create_at' WHERE id='$id'";
-    mysqli_query($link, $db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='facility-index.php?function_name=facility&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='facility-index.php?function_name=facility&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if(isset($_POST['update'])) {
+
+    function user_input( $data ) {
+        $data1 = trim($data);
+        $data2 = stripslashes($data1);
+        $data3 = htmlspecialchars($data2);
+        return $data3;
+    }
+
+    $id     = $_POST['id'];
+    $contractno   = user_input($_POST["contractno"]);
+    $facilityno	   = user_input($_POST["facilityno"]);
+    $customerid       = user_input($_POST["customerid"]);
+    $weight       = user_input($_POST["weight"]);
+    $numberofstop        = user_input($_POST["numberofstop"]);
+    $numberoffloor     = user_input($_POST["numberoffloor"]);
+    $opentype      = user_input($_POST["opentype"]);
+    $speed     = user_input($_POST["speed"]);
+    $repairtype     = user_input($_POST["repairtype"]);
+    $longitude     = user_input($_POST["longitude"]);
+    $latitude     = user_input($_POST["latitude"]);
+    $address     = user_input($_POST["address"]);
+    $repairerid     = user_input($_POST["repairerid"]);
+    $repairername     = user_input($_POST["repairername"]);
+    $creater      = user_input($_POST["creater"]);	
+    $create_at     = date('Y/m/d H:i:s');
+
+    $db_query = "UPDATE facility set contractno = '$contractno', facilityno = '$facilityno', customerid = '$customerid', weight = '$weight', numberofstop = '$numberofstop', numberoffloor = '$numberoffloor',opentype = '$opentype',speed = '$speed',repairtype = '$repairtype',longitude = '$longitude',latitude = '$latitude',address = '$address',repairerid = '$repairerid',repairername = '$repairername',create_at = '$create_at' WHERE id='$id'";
+    mysqli_query($link, $db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='facility-index.php?function_name=facility&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='facility-index.php?function_name=facility&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/facility-user-input.php b/wms/facility-user-input.php
index 15cfa191..b9d0b7c2 100644
--- a/wms/facility-user-input.php
+++ b/wms/facility-user-input.php
@@ -1,61 +1,61 @@
-<?php
-
-//Function to filter the form input
-function user_input( $data ) {
-    $data1 = trim($data);
-    $data2 = stripslashes($data1);
-    $data3 = htmlspecialchars($data2);
-    return $data3;
-}
-
-$contractno   = user_input($_POST["contractno"]);
-$facilityno	   = user_input($_POST["facilityno"]);
-$customerid       = user_input($_POST["customerid"]);
-$weight       = user_input($_POST["weight"]);
-$numberofstop        = user_input($_POST["numberofstop"]);
-$numberoffloor     = user_input($_POST["numberoffloor"]);
-$opentype      = user_input($_POST["opentype"]);
-$speed     = user_input($_POST["speed"]);
-$repairtype     = user_input($_POST["repairtype"]);
-$longitude     = user_input($_POST["longitude"]);
-$latitude     = user_input($_POST["latitude"]);
-$address     = user_input($_POST["address"]);
-$repairerid     = user_input($_POST["repairerid"]);
-$repairername     = user_input($_POST["repairername"]);
-$creater      = user_input($_POST["creater"]);	
-$create_at     = date('Y/m/d H:i:s');
-
-
-
-/*
-
-if(empty($_POST["name"])) {
-    $name_error = "Name is required";
-} else {
-    $name = user_input($_POST["name"]);
-    
-    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
-        $name_error = "Only letter and white space are allowed";
-    }
-}
-
-
-/*
-if(empty($_POST["website"])) {
-    $website_error = "Website address is required";
-} else {
-    $website = user_input($_POST["website"]);
-
-    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
-        $website_error = "Invalid website URL";
-    }
-}
-
-if(empty($_POST["comment"])) {
-    $comment = "";
-} else {
-    $comment = user_input($_POST["comment"]);
-}
-*/
-?>
-
+<?php
+
+//Function to filter the form input
+function user_input( $data ) {
+    $data1 = trim($data);
+    $data2 = stripslashes($data1);
+    $data3 = htmlspecialchars($data2);
+    return $data3;
+}
+
+$contractno   = user_input($_POST["contractno"]);
+$facilityno	   = user_input($_POST["facilityno"]);
+$customerid       = user_input($_POST["customerid"]);
+$weight       = user_input($_POST["weight"]);
+$numberofstop        = user_input($_POST["numberofstop"]);
+$numberoffloor     = user_input($_POST["numberoffloor"]);
+$opentype      = user_input($_POST["opentype"]);
+$speed     = user_input($_POST["speed"]);
+$repairtype     = user_input($_POST["repairtype"]);
+$longitude     = user_input($_POST["longitude"]);
+$latitude     = user_input($_POST["latitude"]);
+$address     = user_input($_POST["address"]);
+$repairerid     = user_input($_POST["repairerid"]);
+$repairername     = user_input($_POST["repairername"]);
+$creater      = user_input($_POST["creater"]);	
+$create_at     = date('Y/m/d H:i:s');
+
+
+
+/*
+
+if(empty($_POST["name"])) {
+    $name_error = "Name is required";
+} else {
+    $name = user_input($_POST["name"]);
+    
+    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
+        $name_error = "Only letter and white space are allowed";
+    }
+}
+
+
+/*
+if(empty($_POST["website"])) {
+    $website_error = "Website address is required";
+} else {
+    $website = user_input($_POST["website"]);
+
+    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
+        $website_error = "Invalid website URL";
+    }
+}
+
+if(empty($_POST["comment"])) {
+    $comment = "";
+} else {
+    $comment = user_input($_POST["comment"]);
+}
+*/
+?>
+
diff --git a/wms/facility_current_status-create.php b/wms/facility_current_status-create.php
index f50317a4..0ad86577 100644
--- a/wms/facility_current_status-create.php
+++ b/wms/facility_current_status-create.php
@@ -1,65 +1,65 @@
-<?php
-include "header.php";
-?>
-
-<div class="container">
-
-    <?php
-    
-        include "facility_current_status-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        
-    
-    <div>
-            <label for="contractno">合約號(必填)</label>
-            <input type="text" name="contractno" id="contractno" required>
-        </div>	
-
-        <div>
-            <label for="customerid">顧客編號(必填)</label>
-            <input type="text" name="customerid" id="customerid" required>
-        </div>	
-		
-        <div>
-            <label for="facilityno">作番號(必填)</label>
-            <input type="text" name="facilityno" id="facilityno" required>
-        </div>	
-				
-        <div>
-            <label for="walking_hours">運轉時數(必填)</label>
-            <input type="text" name="walking_hours" id="walking_hours" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>	
-
-        <div>
-            <label for="walking_times">運轉次數(必填)</label>
-            <input type="text" name="walking_times" id="walking_times" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>			
-		
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at" >
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-
-        <div>
-            <button type="submit" name="submit">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
+<?php
+include "header.php";
+?>
+
+<div class="container">
+
+    <?php
+    
+        include "facility_current_status-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        
+    
+    <div>
+            <label for="contractno">合約號(必填)</label>
+            <input type="text" name="contractno" id="contractno" required>
+        </div>	
+
+        <div>
+            <label for="customerid">顧客編號(必填)</label>
+            <input type="text" name="customerid" id="customerid" required>
+        </div>	
+		
+        <div>
+            <label for="facilityno">作番號(必填)</label>
+            <input type="text" name="facilityno" id="facilityno" required>
+        </div>	
+				
+        <div>
+            <label for="walking_hours">運轉時數(必填)</label>
+            <input type="text" name="walking_hours" id="walking_hours" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>	
+
+        <div>
+            <label for="walking_times">運轉次數(必填)</label>
+            <input type="text" name="walking_times" id="walking_times" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>			
+		
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at" >
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+
+        <div>
+            <button type="submit" name="submit">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
diff --git a/wms/facility_current_status-delete.php b/wms/facility_current_status-delete.php
index 88ad8d71..e3f6ffd2 100644
--- a/wms/facility_current_status-delete.php
+++ b/wms/facility_current_status-delete.php
@@ -1,12 +1,12 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "DELETE FROM facility_current_status WHERE id='$id'";
-mysqli_query($link, $db_query);	
-
-header("Refresh:0; url=facility_current_status-index.php?function_name=facility_current_sta&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "DELETE FROM facility_current_status WHERE id='$id'";
+mysqli_query($link, $db_query);	
+
+header("Refresh:0; url=facility_current_status-index.php?function_name=facility_current_sta&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/facility_current_status-edit.php b/wms/facility_current_status-edit.php
index aa82e8dd..4ad5b98b 100644
--- a/wms/facility_current_status-edit.php
+++ b/wms/facility_current_status-edit.php
@@ -1,73 +1,73 @@
-<?php
-    include "header.php";
-
-    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-	$data = array();
-	// sql語法存在變數中
-	$db_query = "SELECT * FROM facility_current_status WHERE id=$id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$db_query);	
-/*
-    include "inc/record_update.php";
-    
-    try {	
-		// 設置一個空陣列來放資料
-		$data = array();
-		// sql語法存在變數中
-		$db_query = "SELECT * FROM expert WHERE id=$id";
-
-		// 用mysqli_query方法執行(sql語法)將結果存在變數中
-		$data = mysqli_query($link,$db_query);
-	}catch (Exception $e) {
-    echo 'Caught exception: ',  $e->getMessage(), "\n";
-	}
-*/	
-    foreach($data as $data) :
-?>
-
-<div class="container">
-    <form class="form-inline" method="post" action="facility_current_status-record-update.php" enctype="multipart/form-data">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-		
-        <div>
-            <label for="contractno">合約號</label>
-            <input type="text" name="contractno" id="contractno" value="<?php echo $data['contractno']; ?>" required>
-        </div>	
-
-        <div>
-            <label for="customerid">顧客編號</label>
-            <input type="text" name="customerid" id="customerid" value="<?php echo $data['customerid']; ?>" required>
-        </div>	
-		
-        <div>
-            <label for="facilityno">作番號</label>
-            <input type="text" name="facilityno" id="facilityno" value="<?php echo $data['facilityno']; ?>" required>
-        </div>	
-				
-        <div>
-            <label for="walking_hours">運轉時數</label>
-            <input type="text" name="walking_hours" id="walking_hours" value="<?php echo $data['walking_hours']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>	
-
-        <div>
-            <label for="walking_times">運轉次數</label>
-            <input type="text" name="walking_times" id="walking_times" value="<?php echo $data['walking_times']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>			
-		
-        <div>
-            <button type="submit" name="update">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
-?>
-
+<?php
+    include "header.php";
+
+    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+	$data = array();
+	// sql語法存在變數中
+	$db_query = "SELECT * FROM facility_current_status WHERE id=$id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$db_query);	
+/*
+    include "inc/record_update.php";
+    
+    try {	
+		// 設置一個空陣列來放資料
+		$data = array();
+		// sql語法存在變數中
+		$db_query = "SELECT * FROM expert WHERE id=$id";
+
+		// 用mysqli_query方法執行(sql語法)將結果存在變數中
+		$data = mysqli_query($link,$db_query);
+	}catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+	}
+*/	
+    foreach($data as $data) :
+?>
+
+<div class="container">
+    <form class="form-inline" method="post" action="facility_current_status-record-update.php" enctype="multipart/form-data">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+		
+        <div>
+            <label for="contractno">合約號</label>
+            <input type="text" name="contractno" id="contractno" value="<?php echo $data['contractno']; ?>" required>
+        </div>	
+
+        <div>
+            <label for="customerid">顧客編號</label>
+            <input type="text" name="customerid" id="customerid" value="<?php echo $data['customerid']; ?>" required>
+        </div>	
+		
+        <div>
+            <label for="facilityno">作番號</label>
+            <input type="text" name="facilityno" id="facilityno" value="<?php echo $data['facilityno']; ?>" required>
+        </div>	
+				
+        <div>
+            <label for="walking_hours">運轉時數</label>
+            <input type="text" name="walking_hours" id="walking_hours" value="<?php echo $data['walking_hours']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>	
+
+        <div>
+            <label for="walking_times">運轉次數</label>
+            <input type="text" name="walking_times" id="walking_times" value="<?php echo $data['walking_times']; ?>" onkeyup="value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>			
+		
+        <div>
+            <button type="submit" name="update">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php
+
+    endforeach;
+    
+    include "footer.php";
+
+?>
+
diff --git a/wms/facility_current_status-index.php b/wms/facility_current_status-index.php
index 8937d7d1..4ea1f57f 100644
--- a/wms/facility_current_status-index.php
+++ b/wms/facility_current_status-index.php
@@ -1,136 +1,136 @@
-<?php
-    include "header.php";
-
-	// 設置一個空陣列來放資料
-	$data = array();
-	// sql語法存在變數中
-	$sql = "SELECT * FROM facility_current_status ORDER BY id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$sql);
-
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="facility_current_status-create.php?function_name=facility_current_sta&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-
-<?php
-}
-
-
-
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:facility_current_status-index.php");
-        }
-    }
-
-?>
-
-<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;
-   
-}
-
-</style>
-
-    <div style="overflow-x:auto;">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-            <tr>
-                <th>項次</th>
-                <th>合約號</th>
-                <th>顧客編號</th>
-                <th>作番號</th>
-                <th>運轉時數</th>
-                <th>運轉次數</th>
-                <th>建檔時間</th>				
-                <?php if ($user_auth&2) { ?>
-                <th>修改</th>
-                <th>刪除</th>
-                <?php } ?>
-            </tr>
-		</thead>
-		<tbody>			
-
-            <?php foreach($data as $data) : ?>    
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td><?php echo $data['contractno']; ?></td>
-                    <td><?php echo $data['customerid']; ?></td>
-                    <td><?php echo $data['facilityno']; ?></td>
-                    <td><?php echo $data['walking_hours']; ?></td>
-                    <td><?php echo $data['walking_times']; ?></td>
-                    <td><?php echo $data['create_at']; ?></td>
-                    <?php if ($user_auth&2) { ?>
-                    <td>
-						<p>
-							<a href="facility_current_status-edit.php?id=<?php echo $data['id']; ?>&function_name=facility_current_sta&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-								<span class="glyphicon glyphicon-pencil"></span>
-							</a>
-						</p> 
-					</td>
-                    <td>
-						<p>
-							<a href="facility_current_status-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-								<span class="glyphicon glyphicon-remove"></span>
-							</a>
-						</p> 
-					</td>
-                    <?php } ?>
-                </tr>
-            <?php endforeach; ?>
-			</tbody>			
-        </table>
-    </div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-
+<?php
+    include "header.php";
+
+	// 設置一個空陣列來放資料
+	$data = array();
+	// sql語法存在變數中
+	$sql = "SELECT * FROM facility_current_status ORDER BY id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$sql);
+
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth&2) { ?>
+<p>
+<a href="facility_current_status-create.php?function_name=facility_current_sta&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+
+<?php
+}
+
+
+
+if($data):
+    
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:facility_current_status-index.php");
+        }
+    }
+
+?>
+
+<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;
+   
+}
+
+</style>
+
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+            <tr>
+                <th>項次</th>
+                <th>合約號</th>
+                <th>顧客編號</th>
+                <th>作番號</th>
+                <th>運轉時數</th>
+                <th>運轉次數</th>
+                <th>建檔時間</th>				
+                <?php if ($user_auth&2) { ?>
+                <th>修改</th>
+                <th>刪除</th>
+                <?php } ?>
+            </tr>
+		</thead>
+		<tbody>			
+
+            <?php foreach($data as $data) : ?>    
+                <tr>
+                    <td><?php echo $data['id']; ?></td>
+                    <td><?php echo $data['contractno']; ?></td>
+                    <td><?php echo $data['customerid']; ?></td>
+                    <td><?php echo $data['facilityno']; ?></td>
+                    <td><?php echo $data['walking_hours']; ?></td>
+                    <td><?php echo $data['walking_times']; ?></td>
+                    <td><?php echo $data['create_at']; ?></td>
+                    <?php if ($user_auth&2) { ?>
+                    <td>
+						<p>
+							<a href="facility_current_status-edit.php?id=<?php echo $data['id']; ?>&function_name=facility_current_sta&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+								<span class="glyphicon glyphicon-pencil"></span>
+							</a>
+						</p> 
+					</td>
+                    <td>
+						<p>
+							<a href="facility_current_status-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+						</p> 
+					</td>
+                    <?php } ?>
+                </tr>
+            <?php endforeach; ?>
+			</tbody>			
+        </table>
+    </div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+
 ?>
\ No newline at end of file
diff --git a/wms/facility_current_status-record-submit.php b/wms/facility_current_status-record-submit.php
index 48e3416b..f3eb5013 100644
--- a/wms/facility_current_status-record-submit.php
+++ b/wms/facility_current_status-record-submit.php
@@ -1,38 +1,38 @@
-<?php
-$contractno= "";
-$customerid= "";
-$facilityno= "";
-$walking_hours= "";
-$walking_times= "";
-$create_at= "";
-
-$contractno_error= "";
-$customerid_error= "";
-$facilityno_error= "";
-$walking_hours_error= "";
-$walking_times_error= "";
-$create_at_error = "";
-
-
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    include "facility_current_status-user-input.php";
-
-    $db_query = "INSERT INTO facility_current_status(contractno, customerid, facilityno, walking_hours,walking_times,create_at) VALUES ('$contractno', '$customerid', '$facilityno', '$walking_hours','$walking_times','$create_at')";    	                      
-    $result = mysqli_query($link,$db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='facility_current_status-index.php?function_name=facility_current_sta&".$token_link."';";
-        echo "</script>";  
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='facility_current_status-index.php?function_name=facility_current_sta&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
-?>
+<?php
+$contractno= "";
+$customerid= "";
+$facilityno= "";
+$walking_hours= "";
+$walking_times= "";
+$create_at= "";
+
+$contractno_error= "";
+$customerid_error= "";
+$facilityno_error= "";
+$walking_hours_error= "";
+$walking_times_error= "";
+$create_at_error = "";
+
+
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    include "facility_current_status-user-input.php";
+
+    $db_query = "INSERT INTO facility_current_status(contractno, customerid, facilityno, walking_hours,walking_times,create_at) VALUES ('$contractno', '$customerid', '$facilityno', '$walking_hours','$walking_times','$create_at')";    	                      
+    $result = mysqli_query($link,$db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='facility_current_status-index.php?function_name=facility_current_sta&".$token_link."';";
+        echo "</script>";  
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='facility_current_status-index.php?function_name=facility_current_sta&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
+?>
diff --git a/wms/facility_current_status-record-update.php b/wms/facility_current_status-record-update.php
index 82d6b12c..9a465fb2 100644
--- a/wms/facility_current_status-record-update.php
+++ b/wms/facility_current_status-record-update.php
@@ -1,38 +1,38 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-    function user_input( $data ) {
-        $data1 = trim($data);
-        $data2 = stripslashes($data1);
-        $data3 = htmlspecialchars($data2);
-        return $data3;
-    }
-
-    $id     = $_POST['id'];
-    $contractno   = user_input($_POST["contractno"]);	
-    $customerid	   = user_input($_POST["customerid"]);	
-    $facilityno       = user_input($_POST["facilityno"]);	
-    $walking_hours    = user_input($_POST["walking_hours"]);	
-    $walking_times   = user_input($_POST["walking_times"]);	
-    $create_at     = date('Y/m/d H:i:s');
-
-    $db_query = "UPDATE facility_current_status set contractno = '$contractno', customerid = '$customerid', facilityno = '$facilityno', walking_hours = '$walking_hours', walking_times = '$walking_times',create_at = '$create_at' WHERE id='$id'";
-    mysqli_query($link, $db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='facility_current_status-index.php?function_name=facility_current_sta&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='facility_current_status-index.php?function_name=facility_current_sta&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if(isset($_POST['update'])) {
+    function user_input( $data ) {
+        $data1 = trim($data);
+        $data2 = stripslashes($data1);
+        $data3 = htmlspecialchars($data2);
+        return $data3;
+    }
+
+    $id     = $_POST['id'];
+    $contractno   = user_input($_POST["contractno"]);	
+    $customerid	   = user_input($_POST["customerid"]);	
+    $facilityno       = user_input($_POST["facilityno"]);	
+    $walking_hours    = user_input($_POST["walking_hours"]);	
+    $walking_times   = user_input($_POST["walking_times"]);	
+    $create_at     = date('Y/m/d H:i:s');
+
+    $db_query = "UPDATE facility_current_status set contractno = '$contractno', customerid = '$customerid', facilityno = '$facilityno', walking_hours = '$walking_hours', walking_times = '$walking_times',create_at = '$create_at' WHERE id='$id'";
+    mysqli_query($link, $db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='facility_current_status-index.php?function_name=facility_current_sta&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='facility_current_status-index.php?function_name=facility_current_sta&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/facility_current_status-user-input.php b/wms/facility_current_status-user-input.php
index 0ed578cb..ece78d34 100644
--- a/wms/facility_current_status-user-input.php
+++ b/wms/facility_current_status-user-input.php
@@ -1,52 +1,52 @@
-<?php
-
-//Function to filter the form input
-function user_input( $data ) {
-    $data1 = trim($data);
-    $data2 = stripslashes($data1);
-    $data3 = htmlspecialchars($data2);
-    return $data3;
-}
-
-$contractno   = user_input($_POST["contractno"]);	
-$customerid	   = user_input($_POST["customerid"]);	
-$facilityno       = user_input($_POST["facilityno"]);	
-$walking_hours    = user_input($_POST["walking_hours"]);	
-$walking_times   = user_input($_POST["walking_times"]);	
-$create_at     = date('Y/m/d H:i:s');
-
-
-
-
-/*
-
-if(empty($_POST["name"])) {
-    $name_error = "Name is required";
-} else {
-    $name = user_input($_POST["name"]);
-    
-    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
-        $name_error = "Only letter and white space are allowed";
-    }
-}
-
-
-/*
-if(empty($_POST["website"])) {
-    $website_error = "Website address is required";
-} else {
-    $website = user_input($_POST["website"]);
-
-    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
-        $website_error = "Invalid website URL";
-    }
-}
-
-if(empty($_POST["comment"])) {
-    $comment = "";
-} else {
-    $comment = user_input($_POST["comment"]);
-}
-*/
-?>
-
+<?php
+
+//Function to filter the form input
+function user_input( $data ) {
+    $data1 = trim($data);
+    $data2 = stripslashes($data1);
+    $data3 = htmlspecialchars($data2);
+    return $data3;
+}
+
+$contractno   = user_input($_POST["contractno"]);	
+$customerid	   = user_input($_POST["customerid"]);	
+$facilityno       = user_input($_POST["facilityno"]);	
+$walking_hours    = user_input($_POST["walking_hours"]);	
+$walking_times   = user_input($_POST["walking_times"]);	
+$create_at     = date('Y/m/d H:i:s');
+
+
+
+
+/*
+
+if(empty($_POST["name"])) {
+    $name_error = "Name is required";
+} else {
+    $name = user_input($_POST["name"]);
+    
+    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
+        $name_error = "Only letter and white space are allowed";
+    }
+}
+
+
+/*
+if(empty($_POST["website"])) {
+    $website_error = "Website address is required";
+} else {
+    $website = user_input($_POST["website"]);
+
+    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
+        $website_error = "Invalid website URL";
+    }
+}
+
+if(empty($_POST["comment"])) {
+    $comment = "";
+} else {
+    $comment = user_input($_POST["comment"]);
+}
+*/
+?>
+
diff --git a/wms/facilityapi.php b/wms/facilityapi.php
index 75b0d8b0..2355786a 100644
--- a/wms/facilityapi.php
+++ b/wms/facilityapi.php
@@ -1,56 +1,56 @@
-
-<?php
-
-require_once "database.php";
-
-if($_POST['type']=='facility'){
-
- 	$contractno   = $_POST["contractno"];//合同号
-	$customerid       = $_POST["customerid"];//客户编号
-	$creater      = $_POST["creater"];//建档人
-	$create_at     = date('Y/m/d H:i:s');//创建时间
-    $facilitynos=json_decode($_POST['facilitynos'], true);
-	$weights=json_decode($_POST['weights'], true);
-	$numberofstops=json_decode($_POST['numberofstops'], true);
-	$numberoffloors=json_decode($_POST['numberoffloors'], true);
-	$opentypes=json_decode($_POST['opentypes'], true);
-	$speeds=json_decode($_POST['speeds'], true);
-	$repairtypes=json_decode($_POST['repairtypes'], true);
-	$longitudes=json_decode($_POST['longitudes'], true);
-	$latitudes=json_decode($_POST['latitudes'], true);
-	$addresss=json_decode($_POST['addresss'], true);
-	$repairerids=json_decode($_POST['repairerids'], true);
-	$repairernames=json_decode($_POST['repairernames'], true);
-     $num=0;
-	for ($i = 0; $i<sizeof($facilitynos); $i++) {
-      //判断是否已经存在
-        $facilitsql = "SELECT * FROM facility where facilityno='$facilitynos[$i]'";
-        $facilit_nums_rows=mysqli_num_rows(mysqli_query($link,$facilitsql));
-        if($facilit_nums_rows==0){
-        $db_query3 = "INSERT INTO facility(contractno, facilityno, customerid, weight,numberofstop, numberoffloor,opentype,speed,repairtype,longitude, latitude, address,repairerid,repairername,creater, create_at) VALUES
-        ('$contractno', '$facilitynos[$i]', '$customerid', '$weights[$i]','$numberofstops[$i]', '$numberoffloors[$i]','$opentypes[$i]','$speeds[$i]','$repairtypes[$i]','$longitudes[$i]', '$latitudes[$i]', '$addresss[$i]','$repairerids[$i]','$repairernames[$i]','$creater', '$create_at')";
-            mysqli_query($link,$db_query3);
-            if (mysqli_affected_rows($link)>0) {
-                $num++;
-            }
-            }
-
-	     }
-    if ($num>0) {
-        $jsonres['code']='200';
-        $jsonres['num']=$num;
-        echo json_encode($jsonres);
-    }else{
-        $jsonres['code']='1';
-        $jsonres['num']=0;
-        echo json_encode($jsonres);
-
-    }
-
-
-
-}
-
-?>
-
-
+
+<?php
+
+require_once "database.php";
+
+if($_POST['type']=='facility'){
+
+ 	$contractno   = $_POST["contractno"];//合同号
+	$customerid       = $_POST["customerid"];//客户编号
+	$creater      = $_POST["creater"];//建档人
+	$create_at     = date('Y/m/d H:i:s');//创建时间
+    $facilitynos=json_decode($_POST['facilitynos'], true);
+	$weights=json_decode($_POST['weights'], true);
+	$numberofstops=json_decode($_POST['numberofstops'], true);
+	$numberoffloors=json_decode($_POST['numberoffloors'], true);
+	$opentypes=json_decode($_POST['opentypes'], true);
+	$speeds=json_decode($_POST['speeds'], true);
+	$repairtypes=json_decode($_POST['repairtypes'], true);
+	$longitudes=json_decode($_POST['longitudes'], true);
+	$latitudes=json_decode($_POST['latitudes'], true);
+	$addresss=json_decode($_POST['addresss'], true);
+	$repairerids=json_decode($_POST['repairerids'], true);
+	$repairernames=json_decode($_POST['repairernames'], true);
+     $num=0;
+	for ($i = 0; $i<sizeof($facilitynos); $i++) {
+      //判断是否已经存在
+        $facilitsql = "SELECT * FROM facility where facilityno='$facilitynos[$i]'";
+        $facilit_nums_rows=mysqli_num_rows(mysqli_query($link,$facilitsql));
+        if($facilit_nums_rows==0){
+        $db_query3 = "INSERT INTO facility(contractno, facilityno, customerid, weight,numberofstop, numberoffloor,opentype,speed,repairtype,longitude, latitude, address,repairerid,repairername,creater, create_at) VALUES
+        ('$contractno', '$facilitynos[$i]', '$customerid', '$weights[$i]','$numberofstops[$i]', '$numberoffloors[$i]','$opentypes[$i]','$speeds[$i]','$repairtypes[$i]','$longitudes[$i]', '$latitudes[$i]', '$addresss[$i]','$repairerids[$i]','$repairernames[$i]','$creater', '$create_at')";
+            mysqli_query($link,$db_query3);
+            if (mysqli_affected_rows($link)>0) {
+                $num++;
+            }
+            }
+
+	     }
+    if ($num>0) {
+        $jsonres['code']='200';
+        $jsonres['num']=$num;
+        echo json_encode($jsonres);
+    }else{
+        $jsonres['code']='1';
+        $jsonres['num']=0;
+        echo json_encode($jsonres);
+
+    }
+
+
+
+}
+
+?>
+
+
diff --git a/wms/footer.php b/wms/footer.php
index 8bb6f616..6313ddfa 100644
--- a/wms/footer.php
+++ b/wms/footer.php
@@ -1,6 +1,6 @@
-
-  </p>
-</div>
-
-</body>
-</html>
+
+  </p>
+</div>
+
+</body>
+</html>
diff --git a/wms/forms-create.php b/wms/forms-create.php
index 4e094632..79a10abe 100644
--- a/wms/forms-create.php
+++ b/wms/forms-create.php
@@ -1,46 +1,46 @@
-<?php
-include "header.php"; 
-?>
-<script>
-$(function(){
-    //$('#seq').keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); })
-});
-</script>
-<div class="container">
-<?php
-include "forms-record-submit.php";
-/*
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-        echo "<p class='error'>Please fill up the required field!</p>";
-    } else {
-        echo "<p class='success'>Record has added successfully</p>";
-    }
-}
-*/
-?>
-
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        <div>
-            <label for="title">表單名稱</label>
-            <input type="text" name="title" id="title" size="30" maxlength="25" required>
-        </div>
-        <!--<div>
-            <label for="seq">順序</label>
-            <input type="text" name="seq" id="seq" value="1" data-bs-toggle="tooltip" title="數字愈前面，排序愈前面" size="1" maxlength="1" required>
-        </div>-->
-        <div>
-            <label for="attatch1">檔案上傳</label>
-            <div>
-                <input type="file" name="attatch1" id="attatch1" required>
-            </div>
-        </div>
-        <div>
-            <br>
-            <button type="submit" name="submit" id="submit">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
+<?php
+include "header.php"; 
+?>
+<script>
+$(function(){
+    //$('#seq').keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); })
+});
+</script>
+<div class="container">
+<?php
+include "forms-record-submit.php";
+/*
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+        echo "<p class='error'>Please fill up the required field!</p>";
+    } else {
+        echo "<p class='success'>Record has added successfully</p>";
+    }
+}
+*/
+?>
+
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        <div>
+            <label for="title">表單名稱</label>
+            <input type="text" name="title" id="title" size="30" maxlength="25" required>
+        </div>
+        <!--<div>
+            <label for="seq">順序</label>
+            <input type="text" name="seq" id="seq" value="1" data-bs-toggle="tooltip" title="數字愈前面，排序愈前面" size="1" maxlength="1" required>
+        </div>-->
+        <div>
+            <label for="attatch1">檔案上傳</label>
+            <div>
+                <input type="file" name="attatch1" id="attatch1" required>
+            </div>
+        </div>
+        <div>
+            <br>
+            <button type="submit" name="submit" id="submit">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
 <?php include "footer.php"; ?>
\ No newline at end of file
diff --git a/wms/forms-delete.php b/wms/forms-delete.php
index 9ba6b8d6..ddec0a4a 100644
--- a/wms/forms-delete.php
+++ b/wms/forms-delete.php
@@ -1,23 +1,23 @@
-<?php
-ob_start();
-include "header.php"; 
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "update form_list set status = 'N', create_at = NOW() where id = '$id' and creater = '$user_id'";
-$res = mysqli_query($link, $db_query);
-/*
-$db_query = "select path from form_list where id = '$id'";
-$res = mysqli_query($link, $db_query);
-$row = mysqli_fetch_row($res);
-$target_file = $row[0];
-mysqli_free_result($res);
-
-$db_query = "delete from form_list where id = '$id'";
-mysqli_query($link, $db_query);
-unlink($target_file);
-*/
-//header("Location:forms-index.php");
-header("Refresh:0; url=forms-index.php?function_name=forms&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php"; 
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "update form_list set status = 'N', create_at = NOW() where id = '$id' and creater = '$user_id'";
+$res = mysqli_query($link, $db_query);
+/*
+$db_query = "select path from form_list where id = '$id'";
+$res = mysqli_query($link, $db_query);
+$row = mysqli_fetch_row($res);
+$target_file = $row[0];
+mysqli_free_result($res);
+
+$db_query = "delete from form_list where id = '$id'";
+mysqli_query($link, $db_query);
+unlink($target_file);
+*/
+//header("Location:forms-index.php");
+header("Refresh:0; url=forms-index.php?function_name=forms&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/forms-edit.php b/wms/forms-edit.php
index a488c341..f64c1034 100644
--- a/wms/forms-edit.php
+++ b/wms/forms-edit.php
@@ -1,45 +1,45 @@
-<?php
-exit;
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "select * from form_list where id = '$id'";
-$data = mysqli_query($link, $db_query);
-
-foreach($data as $data) :
-?>
-<script>
-$(function(){
-    //$('#seq').keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); })
-});
-</script>
-<div class="container">
-    <form class="form-inline" method="post" action="forms-record-update.php" enctype="multipart/form-data">
-        <div>
-            <label for="title">表單名稱</label>
-            <input type="text" name="title" id="title" size="30" maxlength="25" value="<?php echo $data['title']; ?>" required>
-        </div>
-        <!--<div>
-            <label for="seq">順序</label>
-            <input type="text" name="seq" id="seq" size="1" maxlength="1" value="<?php echo $data['seq']; ?>" required>
-        </div>-->
-        <div>
-            <label for="attatch1">檔案上傳</label>
-            <a href="<?php echo $data['path']; ?>" target="_blank"><?php echo str_replace("/wms/public-forms/","",$data['path']); ?></a>
-            <div>
-                <input type="file" name="attatch1" id="attatch1">
-            </div>
-        </div>
-        <div>
-            <br>
-            <button type="submit" name="update" id="update">確定</button>
-        </div>
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-    </form>
-</div>
-<?php
-endforeach;
-
-include "footer.php";
+<?php
+exit;
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "select * from form_list where id = '$id'";
+$data = mysqli_query($link, $db_query);
+
+foreach($data as $data) :
+?>
+<script>
+$(function(){
+    //$('#seq').keyup(function(){ $(this).val($(this).val().replace(/\D/g, "").replace(/\B(?=(\d{3})+(?!\d))/g, ",")); })
+});
+</script>
+<div class="container">
+    <form class="form-inline" method="post" action="forms-record-update.php" enctype="multipart/form-data">
+        <div>
+            <label for="title">表單名稱</label>
+            <input type="text" name="title" id="title" size="30" maxlength="25" value="<?php echo $data['title']; ?>" required>
+        </div>
+        <!--<div>
+            <label for="seq">順序</label>
+            <input type="text" name="seq" id="seq" size="1" maxlength="1" value="<?php echo $data['seq']; ?>" required>
+        </div>-->
+        <div>
+            <label for="attatch1">檔案上傳</label>
+            <a href="<?php echo $data['path']; ?>" target="_blank"><?php echo str_replace("/wms/public-forms/","",$data['path']); ?></a>
+            <div>
+                <input type="file" name="attatch1" id="attatch1">
+            </div>
+        </div>
+        <div>
+            <br>
+            <button type="submit" name="update" id="update">確定</button>
+        </div>
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+    </form>
+</div>
+<?php
+endforeach;
+
+include "footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/forms-file.php b/wms/forms-file.php
index 6d9c9ec3..b263089d 100644
--- a/wms/forms-file.php
+++ b/wms/forms-file.php
@@ -1,19 +1,19 @@
-<?php
-ob_start();
-include "header.php"; 
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "select path from form_list where id = '$id'";
-$res = mysqli_query($link, $db_query);
-if ($row = mysqli_fetch_row($res)) {
-    header("Location: /wms/".$row[0]);
-    exit;
-} else {
-    echo "<script type ='text/JavaScript'>";
-    echo "alert('檔案下載失敗！');";
-    echo "</script>";
-    header("Refresh:0; url=forms-index.php?function_name=forms&".$token_link);
-}
-ob_end_flush();
+<?php
+ob_start();
+include "header.php"; 
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "select path from form_list where id = '$id'";
+$res = mysqli_query($link, $db_query);
+if ($row = mysqli_fetch_row($res)) {
+    header("Location: /wms/".$row[0]);
+    exit;
+} else {
+    echo "<script type ='text/JavaScript'>";
+    echo "alert('檔案下載失敗！');";
+    echo "</script>";
+    header("Refresh:0; url=forms-index.php?function_name=forms&".$token_link);
+}
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/forms-index.php b/wms/forms-index.php
index be0e2fa0..68bbc205 100644
--- a/wms/forms-index.php
+++ b/wms/forms-index.php
@@ -1,105 +1,105 @@
-<?php
-include "header.php";
-
-// 設置一個空陣列來放資料
-$data = array();
-
-// sql語法存在變數中
-$sql = "select * from form_list where status = 'Y' order by id";
-
-// 用mysqli_query方法執行(sql語法)將結果存在變數中
-$data = mysqli_query($link,$sql);
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="forms-create.php?function_name=forms&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-<?php
-}
-if($data):
-?>
-
-<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;
-   
-}
-</style>
-<div style="overflow-x:auto;">
-    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-    <thead>
-        <tr>
-            <th>項次</th>
-            <th>表單名稱</th>
-            <!--<th>順序（數字愈小排在愈前面）</th>-->
-            <th>建檔人</th>
-            <th>建檔時間</th>
-            <th>關閉表單</th>
-        </tr>
-    </thead>
-    <tbody>
-    <?php foreach($data as $data) : ?>
-        <tr>
-            <td><?php echo $data['id']; ?></td>
-            <td><a href="/wms/forms-file.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" target="_blank"><?php echo $data['title']; ?></a></td>
-            <!--<td><?php echo $data['seq']; ?></td>-->
-            <td><?php echo $data['creater']; ?></td>
-            <td><?php echo $data['create_at']; ?></td>
-            <td>
-                <p>
-                <?php if (($user_auth&2) && ($data['creater'] == $user_id) && ($data['status']=="Y")) { ?>
-                    <a href="forms-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('確認關閉表單嗎？')">
-                        <span class="glyphicon glyphicon-remove"></span>
-                    </a>
-                <?php } else echo "-"; ?>
-                </p>
-            </td>
-        </tr>
-    <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
+<?php
+include "header.php";
+
+// 設置一個空陣列來放資料
+$data = array();
+
+// sql語法存在變數中
+$sql = "select * from form_list where status = 'Y' order by id";
+
+// 用mysqli_query方法執行(sql語法)將結果存在變數中
+$data = mysqli_query($link,$sql);
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth&2) { ?>
+<p>
+<a href="forms-create.php?function_name=forms&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+<?php
+}
+if($data):
+?>
+
+<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;
+   
+}
+</style>
+<div style="overflow-x:auto;">
+    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+    <thead>
+        <tr>
+            <th>項次</th>
+            <th>表單名稱</th>
+            <!--<th>順序（數字愈小排在愈前面）</th>-->
+            <th>建檔人</th>
+            <th>建檔時間</th>
+            <th>關閉表單</th>
+        </tr>
+    </thead>
+    <tbody>
+    <?php foreach($data as $data) : ?>
+        <tr>
+            <td><?php echo $data['id']; ?></td>
+            <td><a href="/wms/forms-file.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" target="_blank"><?php echo $data['title']; ?></a></td>
+            <!--<td><?php echo $data['seq']; ?></td>-->
+            <td><?php echo $data['creater']; ?></td>
+            <td><?php echo $data['create_at']; ?></td>
+            <td>
+                <p>
+                <?php if (($user_auth&2) && ($data['creater'] == $user_id) && ($data['status']=="Y")) { ?>
+                    <a href="forms-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('確認關閉表單嗎？')">
+                        <span class="glyphicon glyphicon-remove"></span>
+                    </a>
+                <?php } else echo "-"; ?>
+                </p>
+            </td>
+        </tr>
+    <?php endforeach; ?>
+        </tbody>
+    </table>
+</div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/forms-record-submit.php b/wms/forms-record-submit.php
index 81f49059..14ae12a4 100644
--- a/wms/forms-record-submit.php
+++ b/wms/forms-record-submit.php
@@ -1,48 +1,48 @@
-<?php
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    //print_r($_POST);
-    //print_r($_FILES);exit;
-    foreach ($_POST as $k => $v) {
-        $$k = htmlspecialchars(stripslashes(trim($v)));
-    }
-
-    if ($_FILES["attatch1"]["error"] == 0) {
-        $file_name      = $_FILES["attatch1"]["name"];
-        $temp_file_name = $_FILES["attatch1"]["tmp_name"];
-        $file_size      = $_FILES["attatch1"]["size"];
-        $target_dir     = "public-forms/";
-        $target_file1   = strtolower($target_dir.basename($file_name));
-        $img_file_type  = pathinfo($file_name, PATHINFO_EXTENSION);
-        $upload_ok      = 1;
-        if (file_exists($target_file1)) unlink($target_file1);
-        $upload_res_1 = move_uploaded_file($temp_file_name, $target_file1);
-    } else $target_file1 = "";
-
-
-    if ($target_file1 && !$upload_res_1) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('檔案上傳失敗，資料請重建。');";
-        echo "location.href='forms-index.php?function_name=forms&token=".$token."';";
-        echo "</script>";
-    }
-
-    $db_query  = "insert into form_list (title, path, seq, creater, create_at) values (";
-    $db_query .= "'$title', '$target_file1', '1', '$user_id', NOW())";
-    $result = mysqli_query($link, $db_query);
-    if (mysqli_affected_rows($link) > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='forms-index.php?function_name=forms&".$token_link."';";
-        echo "</script>";
-    } elseif (mysqli_affected_rows($link)==0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='forms-index.php?function_name=forms&".$token_link."';";
-        echo "</script>";
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-
-    mysqli_close($link);
-}
+<?php
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    //print_r($_POST);
+    //print_r($_FILES);exit;
+    foreach ($_POST as $k => $v) {
+        $$k = htmlspecialchars(stripslashes(trim($v)));
+    }
+
+    if ($_FILES["attatch1"]["error"] == 0) {
+        $file_name      = $_FILES["attatch1"]["name"];
+        $temp_file_name = $_FILES["attatch1"]["tmp_name"];
+        $file_size      = $_FILES["attatch1"]["size"];
+        $target_dir     = "public-forms/";
+        $target_file1   = strtolower($target_dir.basename($file_name));
+        $img_file_type  = pathinfo($file_name, PATHINFO_EXTENSION);
+        $upload_ok      = 1;
+        if (file_exists($target_file1)) unlink($target_file1);
+        $upload_res_1 = move_uploaded_file($temp_file_name, $target_file1);
+    } else $target_file1 = "";
+
+
+    if ($target_file1 && !$upload_res_1) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('檔案上傳失敗，資料請重建。');";
+        echo "location.href='forms-index.php?function_name=forms&token=".$token."';";
+        echo "</script>";
+    }
+
+    $db_query  = "insert into form_list (title, path, seq, creater, create_at) values (";
+    $db_query .= "'$title', '$target_file1', '1', '$user_id', NOW())";
+    $result = mysqli_query($link, $db_query);
+    if (mysqli_affected_rows($link) > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='forms-index.php?function_name=forms&".$token_link."';";
+        echo "</script>";
+    } elseif (mysqli_affected_rows($link)==0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='forms-index.php?function_name=forms&".$token_link."';";
+        echo "</script>";
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+
+    mysqli_close($link);
+}
 ?>
\ No newline at end of file
diff --git a/wms/forms-record-update.php b/wms/forms-record-update.php
index 2ae482d4..63e69283 100644
--- a/wms/forms-record-update.php
+++ b/wms/forms-record-update.php
@@ -1,47 +1,47 @@
-<?php
-exit;
-require_once "database.php";
-
-if (isset($_POST['update'])) {
-    foreach ($_POST as $k => $v) {
-        $$k = htmlspecialchars(stripslashes(trim($v)));
-    }
-    //print_r($_POST);
-    //print_r($_FILES);exit;
-
-    $sql_atta = "";
-
-    if ($_FILES["attatch1"]["error"] == 0) {
-        $file_name      = $_FILES["attatch1"]["name"];
-        $temp_file_name = $_FILES["attatch1"]["tmp_name"];
-        $file_size      = $_FILES["attatch1"]["size"];
-        $target_dir     = "public-forms/";
-        $target_file1   = strtolower($target_dir.basename($file_name));
-        $img_file_type  = pathinfo($file_name, PATHINFO_EXTENSION);
-        $upload_ok      = 1;
-        if (file_exists($target_file1)) unlink($target_file1);
-        $upload_res_1 = move_uploaded_file($temp_file_name, $target_file1);
-        $sql_atta .= "path = '$target_file1', ";
-    } else $target_file1 = "";
-
-    if ($target_file1 && !$upload_res_1) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('檔案上傳失敗，請重新操作。');";
-        echo "location.href='forms-index.php';";
-        echo "</script>";
-    }
-
-    $db_query  = "update form_list set title = '$title', ";
-    $db_query .= $sql_atta;
-    $db_query .= "seq = '$seq'";
-    $db_query .= "where id = '$id'";
-    $result = mysqli_query($link, $db_query);
-
-    mysqli_close($link);
-
-    echo "<script type ='text/JavaScript'>";
-    echo "alert('修改成功');";
-    echo "location.href='forms-index.php';";
-    echo "</script>";
-}
+<?php
+exit;
+require_once "database.php";
+
+if (isset($_POST['update'])) {
+    foreach ($_POST as $k => $v) {
+        $$k = htmlspecialchars(stripslashes(trim($v)));
+    }
+    //print_r($_POST);
+    //print_r($_FILES);exit;
+
+    $sql_atta = "";
+
+    if ($_FILES["attatch1"]["error"] == 0) {
+        $file_name      = $_FILES["attatch1"]["name"];
+        $temp_file_name = $_FILES["attatch1"]["tmp_name"];
+        $file_size      = $_FILES["attatch1"]["size"];
+        $target_dir     = "public-forms/";
+        $target_file1   = strtolower($target_dir.basename($file_name));
+        $img_file_type  = pathinfo($file_name, PATHINFO_EXTENSION);
+        $upload_ok      = 1;
+        if (file_exists($target_file1)) unlink($target_file1);
+        $upload_res_1 = move_uploaded_file($temp_file_name, $target_file1);
+        $sql_atta .= "path = '$target_file1', ";
+    } else $target_file1 = "";
+
+    if ($target_file1 && !$upload_res_1) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('檔案上傳失敗，請重新操作。');";
+        echo "location.href='forms-index.php';";
+        echo "</script>";
+    }
+
+    $db_query  = "update form_list set title = '$title', ";
+    $db_query .= $sql_atta;
+    $db_query .= "seq = '$seq'";
+    $db_query .= "where id = '$id'";
+    $result = mysqli_query($link, $db_query);
+
+    mysqli_close($link);
+
+    echo "<script type ='text/JavaScript'>";
+    echo "alert('修改成功');";
+    echo "location.href='forms-index.php';";
+    echo "</script>";
+}
 ?>
\ No newline at end of file
diff --git a/wms/fun_global.php b/wms/fun_global.php
index aa1f8e69..11c44c8d 100644
--- a/wms/fun_global.php
+++ b/wms/fun_global.php
@@ -1,574 +1,601 @@
-<?php
-/**
- * 組sql語法：限制可查詢範圍
- * 系統管理員、總經理權限全開
- * 
- * @param string $user_id:使用者ID
- * @param string $column:欄位名稱
- * 
- * @return string
- */
-function sql_myself($user_id, $column="creater") {
-    global $link;
-
-    $follower_arr = []; // 下屬列表
-    $sql_cmd = "where ($column = '$user_id'";
-    $follower_arr = find_follow($user_id);
-    if (count($follower_arr) > 0) {
-        $column_str = implode("','", $follower_arr);
-        $sql_cmd .= " or ($column in ('$column_str'))";
-    }
-    $sql_cmd .= ")";
-
-    $sql = "select department_id from account where accountid = '$user_id'";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_assoc($res);
-    $department_id = $row["department_id"];
-    if ($department_id == "20" || $department_id == "220") $sql_cmd = "";
-
-    return $sql_cmd;
-}
-
-
-/**
- * 下屬列表
- * @param string $user_id:使用者ID
- * @param array $ret:下屬ID
- * @return array
- */
-function find_follow($user_id, &$ret=[]) {
-    global $link;
-
-    $sql = "select accountid from account where manager = '$user_id'";
-    $res = mysqli_query($link, $sql);
-    while ($row = mysqli_fetch_assoc($res)) {
-        $ret[] = $row["accountid"];
-        find_follow($row["accountid"], $ret);
-    }
-    mysqli_free_result($res);
-
-    return $ret;
-}
-
-/**
- * 上級主管排列
- * @param string $user_id:使用者ID
- * @param array $ret:上級主管ID
- * @return array
- */
-function manage_class($user_id, &$ret=[]) {
-    global $link;
-
-    $sql = "select manager from account where accountid = '$user_id'";
-    $res = mysqli_query($link, $sql);
-    while ($row = mysqli_fetch_assoc($res)) {
-        if ($row["manager"] == "M0001") return; // 董事長略過
-        $ret[] = $row["manager"];
-        manage_class($row["manager"], $ret);
-    }
-    mysqli_free_result($res);
-
-    return $ret;
-}
-
-/**
- * 新梯(營銷)價審簽核順位
- * @param string $rate:破價比
- * @param string $user_id:使用者ID
- * @param array $ret:簽核人ID
- * @return array
- * 
- */
-function pricereview_class($rate, $user_id, &$ret=[]) {
-    global $link;
-
-    $sql = "select manager from account where accountid = '$user_id'";
-    $res = mysqli_query($link, $sql);
-    while ($row = mysqli_fetch_assoc($res)) {
-        if ($row["manager"] == "M0001") return; // 董事長略過
-        if ($row["manager"] != "M0060" && $row["manager"] != "M0006" && $row["manager"] != "M0008") {
-            $ret[1] = $row["manager"].",,";
-            pricereview_class($rate, $row["manager"], $ret);
-        } else {
-            $ret[2] = "M0024,,<##>M0107,,";         // 業務部專員：M0024許伃廷、M0107許紓晴(第2關有多位審核人)
-            $ret[3] = "M0060,,";                    // 業務協理
-            if ($rate < 75) $ret[4] = "M0006,,";    // 總經理
-        }
-    }
-    mysqli_free_result($res);
-
-    return $ret;
-}
-
-/**
- * 汰改(契約)價審簽核順位
- * @param string $rate:破價比
- * @param string $user_id:使用者ID
- * @param string $renovate_flag:REN=M1改
- * @return array
- * 
- */
-function pricereview_renovate_class($rate, $user_id, $renovate_flag) {
-    global $link;
-
-    $sql = "select manager from account where accountid = '$user_id'";
-    $res = mysqli_query($link, $sql);
-    if ($row = mysqli_fetch_assoc($res)) {
-        if ($row["manager"] == "M0001") return; // 董事長略過
-        if ($row["manager"] != "M0060" && $row["manager"] != "M0006" && $row["manager"] != "M0008") {
-            $ret[1] = $row["manager"];
-        } else {
-            $ret[1] = $user_id;
-        }
-    }
-    mysqli_free_result($res);
-
-    if ($renovate_flag == "REN") {
-        if ($rate < 80) $ret[3] = "M0008";  // 詹總
-        if ($rate < 60) $ret[4] = "M0006";  // 總經理
-    } else {
-        // 全汰改
-        if ($rate < 80) $ret[3] = "M0008";  // 詹總
-        if ($rate < 75) $ret[4] = "M0006";  // 總經理
-    }
-
-    return $ret;
-}
-
-/**
- * 檢查使用者選單權限
- * 
- * @param string $user_id
- * @param string $token
- * @return string
- */
-function check_user_permission($user_id, $token) {
-    global $link;
-
-    // 不檢查清單
-    $ignore_url_arr = ['/wms/index.php', '/wms/notice-index.php', '/wms/notice-edit.php', '/wms/change-password.php', '/wms/wipwhole-change-contractdate.php', '/wms/wipwhole-change-planning-customer-name.php','/wms/test.php', '/wms/mkt/pricereview_mi-api.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;    // 管理員
-        else {
-            $sql2 = "select permission from account_auth where accountid = '$user_id'";
-            $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);
-        }
-    }
-    mysqli_free_result($res);
-
-    if (!$do) {
-        echo "無權限操作，請洽管理員。";
-        exit;
-        echo "<script>alert('無權限操作，請洽管理員。');if (history.length==1) location.href='/wms/index.php?token=".$token."'; else history.go(-1);</script>";
-    } else return $do;
-}
-
-/**
- * 員工編號對應姓名表
- * @return array
- */
-function accountid2name() {
-    global $link;
-
-    $arr = [];
-    $sql = "select accountid, name from account where accounttype in ('B','E','M')";
-    $res = mysqli_query($link, $sql);
-    while ($row = mysqli_fetch_row($res)) {
-        $arr[$row[0]] = $row[1];
-    }
-    mysqli_free_result($res);
-
-    return $arr;
-}
-
-/**
- * 員工信箱
- * @param array $uid 員工編號
- * @return array
- */
-function accountid2email($uid) {
-    global $link;
-
-    if (is_array($uid)) $accountid = implode("','", $uid);
-    else $accountid = $uid;
-    if (empty($accountid)) return;
-
-    $arr = [];
-    $sql = "select accountid, email from account where accountid in ('$accountid') and accounttype in ('B','E','M')";
-    $res = mysqli_query($link, $sql);
-    while ($row = mysqli_fetch_row($res)) {
-        $arr[$row[0]] = $row[1];
-    }
-    mysqli_free_result($res);
-
-    return $arr;
-}
-
-/**
- * 寫入簽核表
- * @param string $flow_id
- * @param string $id:價審單序號
- * @param string $content:卷號
- * @param string|array $user_id:下位簽核者
- * @param string $seq:順序
- */
-function do_assign($flow_id, $id, $content, $user_id, $seq=0) {
-    global $link;
-
-    $tds = date("Y-m-d H:i:s");
-    if ($seq == 0) {
-        $sql = "select appwms.nextval('form_key') form_key";
-        $res = mysqli_query($link, $sql);
-        if ($row = mysqli_fetch_row($res)) {
-            $form_key = $row[0];
-            $sql2 = "insert into flow (system_id, flow_id, form_id, form_key, flow_code) values ('prm', '$flow_id', '$id', '$form_key', 'A')";
-            mysqli_query($link, $sql2);
-        }
-    } else {
-        $sql = "select max(form_key) from flow where form_id = '$id' and flow_id = '$flow_id'";
-        $res = mysqli_query($link, $sql);
-        $row = mysqli_fetch_row($res);
-        $form_key = $row[0];
-    }
-    if (!is_array($user_id)) $user_id_arr[] = $user_id;
-    else $user_id_arr = $user_id;
-    foreach ($user_id_arr as $uk => $uval) {
-        if ($seq == 0) {
-            $sql2 = "insert into subflow (form_key, seq, current_assigner, create_date) values ('$form_key', '$seq', '$uval', '$tds')";
-            mysqli_query($link, $sql2);
-            $sql2 = "insert into assign (form_key, seq, assigner, assign_opinion) values ('$form_key', '$seq', '$uval', '$content')";
-            mysqli_query($link, $sql2);
-        } else {
-            if ($uk == 0) {
-                $sql2 = "update subflow set current_assigner = '$uval', update_date = '$tds' where form_key = '$form_key' and seq = '$seq'";
-                mysqli_query($link, $sql2);
-                $affected = mysqli_affected_rows($link);
-                if ($affected == 0) {
-                    $sql2 = "update subflow set seq = '$seq', current_assigner = '$uval', update_date = '$tds' where form_key = '$form_key'";
-                    mysqli_query($link, $sql2);
-                } else {
-                    $sql2 = "delete from subflow where form_key = '$form_key' and seq < $seq";
-                    mysqli_query($link, $sql2);
-                }
-            } else {
-                $sql2 = "insert into subflow (form_key, seq, current_assigner, update_date) values ('$form_key', ($seq+1), '$uval', '$tds')";
-                mysqli_query($link, $sql2);
-            }
-            $sql2 = "update assign set seq = '$seq', assigner = '$uval' where form_key = '$form_key'";
-            mysqli_query($link, $sql2);
-        }
-    }
-}
-
-/**
- * 簽核結案
- * @param string $system_id
- * @param string $flow_id
- * @param string $id:價審單序號
- * @param string $content:卷號
- */
-function end_flow($system_id, $flow_id, $id, $content) {
-    global $link;
-
-    $tds = date("Y-m-d H:i:s");
-    $sql = "select max(form_key) from flow where form_id = '$id' and system_id = '$system_id' and flow_id = '$flow_id'";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_row($res);
-    $form_key = $row[0];
-    mysqli_free_result($res);
-    if ($form_key) {
-        $sql = "update subflow set current_assigner = '00000', update_date = '$tds' where form_key = '$form_key'";
-        mysqli_query($link, $sql);
-        $sql = "update flow set flow_code = 'Z' where system_id = '$system_id' and flow_id = '$flow_id' and form_id = '$id' and form_key = '$form_key'";
-        mysqli_query($link, $sql);
-    }
-    $sql = "select ekind, person from pricereview_main where id = '$id'";
-    $res = mysqli_query($link, $sql);
-    if ($row = mysqli_fetch_row($res)) {
-        $content = $row[0]."價格審查結案通知 > ".$content;
-        $kind = ($row[0] == "新梯") ? 3 : 4;
-        $sql2  = "insert into notice (kind, related_id, title, permission, creater, create_at) values (";
-        $sql2 .= "'$kind', '$id', '$content', '$row[1]', 'system', '$tds')";
-        $res2 = mysqli_query($link, $sql2);
-    }
-}
-
-
-/**
- * 員工編號轉姓名
- * @return array
- */
-function accountidToName($accountid)
-{
-    global $link;
-
-    $name = "";
-    $sql = "select name from account where accountid = '$accountid' ";
-    $res = mysqli_query($link, $sql);
-    while ($row = mysqli_fetch_row($res)) {
-        $name = $row[0];
-    }
-    mysqli_free_result($res);
-    return $name;
-}
-
-/**
- * 寫入簽核表 -- 作番大日程 wws
- * @param string $form_id:作番大日程 id
- * @param string $flow_code:簽核狀態
- * @param string $user_id:下位簽核者
- */
-function do_wws_assign($user_id, $form_id, $flow_code)
-{
-    global $link;
-    $tds = date("Y-m-d H:i:s");
-    $sql = "select appwms.nextval('form_key') form_key";
-    $res = mysqli_query($link, $sql);
-    if ($row = mysqli_fetch_row($res)) {
-        $form_key = $row[0];
-        $sql = "insert into flow (system_id, flow_id, form_key, form_id,flow_code) values ('wws', 'wws01', '$form_key', '$form_id','$flow_code');";
-        mysqli_query($link, $sql);
-        $sql = "insert into subflow (form_key, seq, current_assigner, create_date) values ('$form_key', '1', '$user_id', '$tds');";
-        mysqli_query($link, $sql);
-    }
-}
-
-/**
- * 簽核表下一階段 -- 作番大日程 wws
- * @param string $form_key:簽核表主鍵
- * @param string $flow_code:簽核狀態
- * @param string $user_id:下位簽核者
- */
-function do_wws_next_assign($user_id, $form_key, $flow_code)
-{
-    global $link;
-    $tds = date("Y-m-d H:i:s");
-    $sql = "
-        UPDATE flow SET
-            flow_code = '$flow_code'
-        WHERE form_key = '$form_key'
-    ";
-    mysqli_query($link, $sql);
-    $sql = "
-        UPDATE subflow SET
-            current_assigner = '$user_id',
-            create_date = '$tds'
-        WHERE form_key = '$form_key'
-    ";
-    mysqli_query($link, $sql);
-}
-
-/**
- * 檢查 post 過來的值，若是空值就回傳預設的值(預設null)
- * @param string $post_val:post 過來的值
- * @param string $default_val: 若post值是空值想回傳的值
- */
-function postCheck($post_val, $default_val = null)
-{
-    return empty($_POST[$post_val]) ? $default_val : htmlspecialchars(stripslashes(trim($_POST[$post_val])));
-}
-
-/**
- * 寫入簽核表 -- 作番大日程 wws (汰改)
- * @param string $form_id:作番大日程 id
- * @param string $flow_code:簽核狀態
- * @param string $user_id:下位簽核者
- */
-function do_wws2_assign($user_id, $form_id, $flow_code)
-{
-    
-    global $link;
-    $tds = date("Y-m-d H:i:s");
-    $sql = "select appwms.nextval('form_key') form_key";
-    $res = mysqli_query($link, $sql);
-    if ($row = mysqli_fetch_row($res)) {
-        $form_key = $row[0];
-        $sql = "insert into flow (system_id, flow_id, form_key, form_id,flow_code) values ('wws', 'wws02', '$form_key', '$form_id','$flow_code');";
-        mysqli_query($link, $sql);
-        $sql = "insert into subflow (form_key, seq, current_assigner, create_date) values ('$form_key', '1', '$user_id', '$tds');";
-        mysqli_query($link, $sql);
-    }
-}
-
-/**
- * 員工編號轉部門代碼
- * @return array
- */
-function accountidToDepartId($accountid)
-{
-    global $link;
-
-    $name = "";
-    $sql = "select department_id from account where accountid = '$accountid' ";
-    $res = mysqli_query($link, $sql);
-    while ($row = mysqli_fetch_row($res)) {
-        $name = $row[0];
-    }
-    mysqli_free_result($res);
-    return $name;
-}
-
-/**
- * 部門代碼轉部門名稱
- * @return array
- */
-function departIdToDepartName($department_id)
-{
-    global $link;
-
-    $name = "";
-    $sql = "select name from department where department_id = '$department_id' ";
-    $res = mysqli_query($link, $sql);
-    while ($row = mysqli_fetch_row($res)) {
-        $name = $row[0];
-    }
-    mysqli_free_result($res);
-    return $name;
-}
-
-/**
- * 員工編號轉職稱id
- * @return array
- */
-function accountidToRoleId($accountid)
-{
-    global $link;
-    $name = "";
-    $sql = "
-        select 
-            d.role_id 
-        from account AS a
-        LEFT JOIN department AS d
-        ON a.department_id = d.department_id
-        AND a.role_id = d.role_id
-        where a.accountid = '$accountid' 
-    ";
-    $res = mysqli_query($link, $sql);
-    while ($row = mysqli_fetch_row($res)) {
-        $name = $row[0];
-    }
-    mysqli_free_result($res);
-    return $name;
-}
-
-/**
- * 員工編號轉職稱名稱
- * @return array
- */
-function accountidToRoleName($accountid)
-{
-    global $link;
-    $name = "";
-    $sql = "
-        select 
-            d.role 
-        from account AS a
-        LEFT JOIN department AS d
-        ON a.department_id = d.department_id
-        AND a.role_id = d.role_id
-        where a.accountid = '$accountid' 
-    ";
-    $res = mysqli_query($link, $sql);
-    while ($row = mysqli_fetch_row($res)) {
-        $name = $row[0];
-    }
-    mysqli_free_result($res);
-    return $name;
-}
-
-/**
- * 組電梯規格名稱
- * @param array $arr:[電梯種類,人乘/載重,停數,開門方式,速度]
- * @return string 規格名,載重
- */
-function facility_spec($arr) {
-    if (empty($arr)) return;
-    list($kind, $seat, $stop, $op, $speed) = $arr;
-    if (strlen($speed) == 1) $speed = str_pad($speed, 2, "0", STR_PAD_LEFT);
-    $seat2weight_arr = ["A3" => 320, "A8" => 320, "G10" => 320, "G20" => 320, "G5" => 320, "G6" => 320,
-                        "280-1-A" => 280, "280-1-L" => 280, "280-2-A" => 280, "280-2-L" => 280,
-                        "320-1-A" => 320, "320-1-L" => 320, "320-2-A" => 320, "320-2-L" => 320,
-                        "6" => 450, "8" => 550, "9" => 600, "10" => 700, "11" => 750, "12" => 800,
-                        "13" => 900, "15" => 1000, "17" => 1150, "20" => 1350, "24" => 1600];
-    switch ($kind) {
-        case "MAQ100":
-            $weight = $seat2weight_arr[$seat];
-            $ret = $kind."-".$weight."-".$stop."-".$op.$speed;
-            break;
-        case "MAP100":
-            $weight = $seat2weight_arr[$seat];
-            $ret = $kind."-".$weight."*".$stop."-".$op.$speed;
-            break;
-        case "MAM200":
-        case "MAH100":
-            $weight = $seat2weight_arr[$seat];
-            $ret = $kind."-".$seat."*".$stop."-".$op.$speed;
-            break;
-        case "MAF100":
-            $weight = $seat;
-            $ret = $kind."-".$seat."*".$stop."-".$op.$speed;
-            break;
-        case "MAE100":
-            $weight = $seat2weight_arr[$seat];
-            $ret = $kind."-".$seat."*".$stop."-".$op.$speed;
-            break;
-        case "M1+M4(2:1)":
-        case "M1+M4(1:1)":
-        case "M1":
-            $weight = $seat2weight_arr[$seat];
-            $ret = "P".$seat."-".$seat2weight_arr[$seat]."-".$op."-".$speed."-".$stop;
-            break;
-        default:
-            $weight = $ret = "";
-    }
-    return $ret.",".$weight;
-}
-
-/**
- * 最新簽核進度
- * @param array $arr:[簽核人1,簽核人2,簽核人3,簽核人4]
- * @return array 進度,下位審批人
- */
-function sign_status($arr) {
-    $ret = [];
-    foreach ($arr as $k => $sign) {
-        $sign_nos = 0;
-        $sign_nt_arr = [];
-        $sign_arr = explode("<##>", $sign);
-        foreach ($sign_arr as $v) {
-            if (strlen($v) == 7) {
-                $sign_nos++;
-                $sign_nt_arr[] = str_replace(",,", "", $v);
-            }
-        }
-        if (count($sign_arr) == $sign_nos) {
-            $ret["sign_st"] = $k+1;
-            $ret["sign_nt"] = $sign_nt_arr;
-            return $ret;
-        }
-    }
-    if (empty($ret)) {
-        $ret["sign_st"] = 99;   // 已審完
-        $ret["sign_nt"] = "";
-    }
-    return $ret;
-}
-
-function getAccounttype($link,$user_id){
-    $sql = "SELECT * FROM account where accountid = '$user_id'"; 
-    $data = mysqli_query($link, $sql); 
-    $row = mysqli_fetch_array($data, MYSQLI_ASSOC);
-    return $row['accounttype'];
-}
\ No newline at end of file
+<?php
+
+/**
+ * 組sql語法：限制可查詢範圍
+ * 系統管理員、總經理權限全開
+ * 
+ * @param string $user_id:使用者ID
+ * @param string $column:欄位名稱
+ * 
+ * @return string
+ */
+function sql_myself($user_id, $column = "creater")
+{
+    global $link;
+
+    $follower_arr = []; // 下屬列表
+    $sql_cmd = "where ($column = '$user_id'";
+    $follower_arr = find_follow($user_id);
+    if (count($follower_arr) > 0) {
+        $column_str = implode("','", $follower_arr);
+        $sql_cmd .= " or ($column in ('$column_str'))";
+    }
+    $sql_cmd .= ")";
+
+    $sql = "select department_id from account where accountid = '$user_id'";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_assoc($res);
+    $department_id = $row["department_id"];
+    if ($department_id == "20" || $department_id == "220") $sql_cmd = "";
+
+    return $sql_cmd;
+}
+
+
+/**
+ * 下屬列表
+ * @param string $user_id:使用者ID
+ * @param array $ret:下屬ID
+ * @return array
+ */
+function find_follow($user_id, &$ret = [])
+{
+    global $link;
+
+    $sql = "select accountid from account where manager = '$user_id'";
+    $res = mysqli_query($link, $sql);
+    while ($row = mysqli_fetch_assoc($res)) {
+        $ret[] = $row["accountid"];
+        find_follow($row["accountid"], $ret);
+    }
+    mysqli_free_result($res);
+
+    return $ret;
+}
+
+/**
+ * 上級主管排列
+ * @param string $user_id:使用者ID
+ * @param array $ret:上級主管ID
+ * @return array
+ */
+function manage_class($user_id, &$ret = [])
+{
+    global $link;
+
+    $sql = "select manager from account where accountid = '$user_id'";
+    $res = mysqli_query($link, $sql);
+    while ($row = mysqli_fetch_assoc($res)) {
+        if ($row["manager"] == "M0001") return; // 董事長略過
+        $ret[] = $row["manager"];
+        manage_class($row["manager"], $ret);
+    }
+    mysqli_free_result($res);
+
+    return $ret;
+}
+
+/**
+ * 新梯(營銷)價審簽核順位
+ * @param string $rate:破價比
+ * @param string $user_id:使用者ID
+ * @param array $ret:簽核人ID
+ * @return array
+ * 
+ */
+function pricereview_class($rate, $user_id, &$ret = [])
+{
+    global $link;
+
+    $sql = "select manager from account where accountid = '$user_id'";
+    $res = mysqli_query($link, $sql);
+    while ($row = mysqli_fetch_assoc($res)) {
+        if ($row["manager"] == "M0001") return; // 董事長略過
+        if ($row["manager"] != "M0060" && $row["manager"] != "M0006" && $row["manager"] != "M0008") {
+            $ret[1] = $row["manager"] . ",,";
+            pricereview_class($rate, $row["manager"], $ret);
+        } else {
+            $ret[2] = "M0024,,<##>M0107,,";         // 業務部專員：M0024許伃廷、M0107許紓晴(第2關有多位審核人)
+            $ret[3] = "M0060,,";                    // 業務協理
+            if ($rate < 75) $ret[4] = "M0006,,";    // 總經理
+        }
+    }
+    mysqli_free_result($res);
+
+    return $ret;
+}
+
+/**
+ * 汰改(契約)價審簽核順位
+ * @param string $rate:破價比
+ * @param string $user_id:使用者ID
+ * @param string $renovate_flag:REN=M1改
+ * @return array
+ * 
+ */
+function pricereview_renovate_class($rate, $user_id, $renovate_flag)
+{
+    global $link;
+
+    $sql = "select manager from account where accountid = '$user_id'";
+    $res = mysqli_query($link, $sql);
+    if ($row = mysqli_fetch_assoc($res)) {
+        if ($row["manager"] == "M0001") return; // 董事長略過
+        if ($row["manager"] != "M0060" && $row["manager"] != "M0006" && $row["manager"] != "M0008") {
+            $ret[1] = $row["manager"];
+        } else {
+            $ret[1] = $user_id;
+        }
+    }
+    mysqli_free_result($res);
+
+    if ($renovate_flag == "REN") {
+        if ($rate < 80) $ret[3] = "M0008";  // 詹總
+        if ($rate < 60) $ret[4] = "M0006";  // 總經理
+    } else {
+        // 全汰改
+        if ($rate < 80) $ret[3] = "M0008";  // 詹總
+        if ($rate < 75) $ret[4] = "M0006";  // 總經理
+    }
+
+    return $ret;
+}
+
+/**
+ * 檢查使用者選單權限
+ * 
+ * @param string $user_id
+ * @param string $token
+ * @return string
+ */
+function check_user_permission($user_id, $token)
+{
+    global $link;
+
+    // 不檢查清單
+    $ignore_url_arr = [
+        '/wms/index.php',
+        '/wms/notice-index.php',
+        '/wms/notice-edit.php',
+        '/wms/change-password.php',
+        '/wms/wipwhole-change-contractdate.php',
+        '/wms/wipwhole-change-planning-customer-name.php',
+        '/wms/test.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;    // 管理員
+        else {
+            $sql2 = "select permission from account_auth where accountid = '$user_id'";
+            $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);
+        }
+    }
+    mysqli_free_result($res);
+
+    if (!$do) {
+        // 判斷是否從藍凌過來
+        if (!empty($_GET['employee_no'])) {
+            echo "無權限操作，請洽管理員。";
+            exit;
+        }
+        echo "<script>alert('無權限操作，請洽管理員。');if (history.length==1) location.href='/wms/index.php?token=" . $token . "'; else history.go(-1);</script>";
+    } else return $do;
+}
+
+/**
+ * 員工編號對應姓名表
+ * @return array
+ */
+function accountid2name()
+{
+    global $link;
+
+    $arr = [];
+    $sql = "select accountid, name from account where accounttype in ('B','E','M')";
+    $res = mysqli_query($link, $sql);
+    while ($row = mysqli_fetch_row($res)) {
+        $arr[$row[0]] = $row[1];
+    }
+    mysqli_free_result($res);
+
+    return $arr;
+}
+
+/**
+ * 員工信箱
+ * @param array $uid 員工編號
+ * @return array
+ */
+function accountid2email($uid)
+{
+    global $link;
+
+    if (is_array($uid)) $accountid = implode("','", $uid);
+    else $accountid = $uid;
+    if (empty($accountid)) return;
+
+    $arr = [];
+    $sql = "select accountid, email from account where accountid in ('$accountid') and accounttype in ('B','E','M')";
+    $res = mysqli_query($link, $sql);
+    while ($row = mysqli_fetch_row($res)) {
+        $arr[$row[0]] = $row[1];
+    }
+    mysqli_free_result($res);
+
+    return $arr;
+}
+
+/**
+ * 寫入簽核表
+ * @param string $flow_id
+ * @param string $id:價審單序號
+ * @param string $content:卷號
+ * @param string|array $user_id:下位簽核者
+ * @param string $seq:順序
+ */
+function do_assign($flow_id, $id, $content, $user_id, $seq = 0)
+{
+    global $link;
+
+    $tds = date("Y-m-d H:i:s");
+    if ($seq == 0) {
+        $sql = "select appwms.nextval('form_key') form_key";
+        $res = mysqli_query($link, $sql);
+        if ($row = mysqli_fetch_row($res)) {
+            $form_key = $row[0];
+            $sql2 = "insert into flow (system_id, flow_id, form_id, form_key, flow_code) values ('prm', '$flow_id', '$id', '$form_key', 'A')";
+            mysqli_query($link, $sql2);
+        }
+    } else {
+        $sql = "select max(form_key) from flow where form_id = '$id' and flow_id = '$flow_id'";
+        $res = mysqli_query($link, $sql);
+        $row = mysqli_fetch_row($res);
+        $form_key = $row[0];
+    }
+    if (!is_array($user_id)) $user_id_arr[] = $user_id;
+    else $user_id_arr = $user_id;
+    foreach ($user_id_arr as $uk => $uval) {
+        if ($seq == 0) {
+            $sql2 = "insert into subflow (form_key, seq, current_assigner, create_date) values ('$form_key', '$seq', '$uval', '$tds')";
+            mysqli_query($link, $sql2);
+            $sql2 = "insert into assign (form_key, seq, assigner, assign_opinion) values ('$form_key', '$seq', '$uval', '$content')";
+            mysqli_query($link, $sql2);
+        } else {
+            if ($uk == 0) {
+                $sql2 = "update subflow set current_assigner = '$uval', update_date = '$tds' where form_key = '$form_key' and seq = '$seq'";
+                mysqli_query($link, $sql2);
+                $affected = mysqli_affected_rows($link);
+                if ($affected == 0) {
+                    $sql2 = "update subflow set seq = '$seq', current_assigner = '$uval', update_date = '$tds' where form_key = '$form_key'";
+                    mysqli_query($link, $sql2);
+                } else {
+                    $sql2 = "delete from subflow where form_key = '$form_key' and seq < $seq";
+                    mysqli_query($link, $sql2);
+                }
+            } else {
+                $sql2 = "insert into subflow (form_key, seq, current_assigner, update_date) values ('$form_key', ($seq+1), '$uval', '$tds')";
+                mysqli_query($link, $sql2);
+            }
+            $sql2 = "update assign set seq = '$seq', assigner = '$uval' where form_key = '$form_key'";
+            mysqli_query($link, $sql2);
+        }
+    }
+}
+
+/**
+ * 簽核結案
+ * @param string $system_id
+ * @param string $flow_id
+ * @param string $id:價審單序號
+ * @param string $content:卷號
+ */
+function end_flow($system_id, $flow_id, $id, $content)
+{
+    global $link;
+
+    $tds = date("Y-m-d H:i:s");
+    $sql = "select max(form_key) from flow where form_id = '$id' and system_id = '$system_id' and flow_id = '$flow_id'";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_row($res);
+    $form_key = $row[0];
+    mysqli_free_result($res);
+    if ($form_key) {
+        $sql = "update subflow set current_assigner = '00000', update_date = '$tds' where form_key = '$form_key'";
+        mysqli_query($link, $sql);
+        $sql = "update flow set flow_code = 'Z' where system_id = '$system_id' and flow_id = '$flow_id' and form_id = '$id' and form_key = '$form_key'";
+        mysqli_query($link, $sql);
+    }
+    $sql = "select ekind, person from pricereview_main where id = '$id'";
+    $res = mysqli_query($link, $sql);
+    if ($row = mysqli_fetch_row($res)) {
+        $content = $row[0] . "價格審查結案通知 > " . $content;
+        $kind = ($row[0] == "新梯") ? 3 : 4;
+        $sql2  = "insert into notice (kind, related_id, title, permission, creater, create_at) values (";
+        $sql2 .= "'$kind', '$id', '$content', '$row[1]', 'system', '$tds')";
+        $res2 = mysqli_query($link, $sql2);
+    }
+}
+
+
+/**
+ * 員工編號轉姓名
+ * @return array
+ */
+function accountidToName($accountid)
+{
+    global $link;
+
+    $name = "";
+    $sql = "select name from account where accountid = '$accountid' ";
+    $res = mysqli_query($link, $sql);
+    while ($row = mysqli_fetch_row($res)) {
+        $name = $row[0];
+    }
+    mysqli_free_result($res);
+    return $name;
+}
+
+/**
+ * 寫入簽核表 -- 作番大日程 wws
+ * @param string $form_id:作番大日程 id
+ * @param string $flow_code:簽核狀態
+ * @param string $user_id:下位簽核者
+ */
+function do_wws_assign($user_id, $form_id, $flow_code)
+{
+    global $link;
+    $tds = date("Y-m-d H:i:s");
+    $sql = "select appwms.nextval('form_key') form_key";
+    $res = mysqli_query($link, $sql);
+    if ($row = mysqli_fetch_row($res)) {
+        $form_key = $row[0];
+        $sql = "insert into flow (system_id, flow_id, form_key, form_id,flow_code) values ('wws', 'wws01', '$form_key', '$form_id','$flow_code');";
+        mysqli_query($link, $sql);
+        $sql = "insert into subflow (form_key, seq, current_assigner, create_date) values ('$form_key', '1', '$user_id', '$tds');";
+        mysqli_query($link, $sql);
+    }
+}
+
+/**
+ * 簽核表下一階段 -- 作番大日程 wws
+ * @param string $form_key:簽核表主鍵
+ * @param string $flow_code:簽核狀態
+ * @param string $user_id:下位簽核者
+ */
+function do_wws_next_assign($user_id, $form_key, $flow_code)
+{
+    global $link;
+    $tds = date("Y-m-d H:i:s");
+    $sql = "
+        UPDATE flow SET
+            flow_code = '$flow_code'
+        WHERE form_key = '$form_key'
+    ";
+    mysqli_query($link, $sql);
+    $sql = "
+        UPDATE subflow SET
+            current_assigner = '$user_id',
+            create_date = '$tds'
+        WHERE form_key = '$form_key'
+    ";
+    mysqli_query($link, $sql);
+}
+
+/**
+ * 檢查 post 過來的值，若是空值就回傳預設的值(預設null)
+ * @param string $post_val:post 過來的值
+ * @param string $default_val: 若post值是空值想回傳的值
+ */
+function postCheck($post_val, $default_val = null)
+{
+    return empty($_POST[$post_val]) ? $default_val : htmlspecialchars(stripslashes(trim($_POST[$post_val])));
+}
+
+/**
+ * 寫入簽核表 -- 作番大日程 wws (汰改)
+ * @param string $form_id:作番大日程 id
+ * @param string $flow_code:簽核狀態
+ * @param string $user_id:下位簽核者
+ */
+function do_wws2_assign($user_id, $form_id, $flow_code)
+{
+
+    global $link;
+    $tds = date("Y-m-d H:i:s");
+    $sql = "select appwms.nextval('form_key') form_key";
+    $res = mysqli_query($link, $sql);
+    if ($row = mysqli_fetch_row($res)) {
+        $form_key = $row[0];
+        $sql = "insert into flow (system_id, flow_id, form_key, form_id,flow_code) values ('wws', 'wws02', '$form_key', '$form_id','$flow_code');";
+        mysqli_query($link, $sql);
+        $sql = "insert into subflow (form_key, seq, current_assigner, create_date) values ('$form_key', '1', '$user_id', '$tds');";
+        mysqli_query($link, $sql);
+    }
+}
+
+/**
+ * 員工編號轉部門代碼
+ * @return array
+ */
+function accountidToDepartId($accountid)
+{
+    global $link;
+
+    $name = "";
+    $sql = "select department_id from account where accountid = '$accountid' ";
+    $res = mysqli_query($link, $sql);
+    while ($row = mysqli_fetch_row($res)) {
+        $name = $row[0];
+    }
+    mysqli_free_result($res);
+    return $name;
+}
+
+/**
+ * 部門代碼轉部門名稱
+ * @return array
+ */
+function departIdToDepartName($department_id)
+{
+    global $link;
+
+    $name = "";
+    $sql = "select name from department where department_id = '$department_id' ";
+    $res = mysqli_query($link, $sql);
+    while ($row = mysqli_fetch_row($res)) {
+        $name = $row[0];
+    }
+    mysqli_free_result($res);
+    return $name;
+}
+
+/**
+ * 員工編號轉職稱id
+ * @return array
+ */
+function accountidToRoleId($accountid)
+{
+    global $link;
+    $name = "";
+    $sql = "
+        select 
+            d.role_id 
+        from account AS a
+        LEFT JOIN department AS d
+        ON a.department_id = d.department_id
+        AND a.role_id = d.role_id
+        where a.accountid = '$accountid' 
+    ";
+    $res = mysqli_query($link, $sql);
+    while ($row = mysqli_fetch_row($res)) {
+        $name = $row[0];
+    }
+    mysqli_free_result($res);
+    return $name;
+}
+
+/**
+ * 員工編號轉職稱名稱
+ * @return array
+ */
+function accountidToRoleName($accountid)
+{
+    global $link;
+    $name = "";
+    $sql = "
+        select 
+            d.role 
+        from account AS a
+        LEFT JOIN department AS d
+        ON a.department_id = d.department_id
+        AND a.role_id = d.role_id
+        where a.accountid = '$accountid' 
+    ";
+    $res = mysqli_query($link, $sql);
+    while ($row = mysqli_fetch_row($res)) {
+        $name = $row[0];
+    }
+    mysqli_free_result($res);
+    return $name;
+}
+
+/**
+ * 組電梯規格名稱
+ * @param array $arr:[電梯種類,人乘/載重,停數,開門方式,速度]
+ * @return string 規格名,載重
+ */
+function facility_spec($arr)
+{
+    if (empty($arr)) return;
+    list($kind, $seat, $stop, $op, $speed) = $arr;
+    if (strlen($speed) == 1) $speed = str_pad($speed, 2, "0", STR_PAD_LEFT);
+    $seat2weight_arr = [
+        "A3" => 320, "A8" => 320, "G10" => 320, "G20" => 320, "G5" => 320, "G6" => 320,
+        "280-1-A" => 280, "280-1-L" => 280, "280-2-A" => 280, "280-2-L" => 280,
+        "320-1-A" => 320, "320-1-L" => 320, "320-2-A" => 320, "320-2-L" => 320,
+        "6" => 450, "8" => 550, "9" => 600, "10" => 700, "11" => 750, "12" => 800,
+        "13" => 900, "15" => 1000, "17" => 1150, "20" => 1350, "24" => 1600
+    ];
+    switch ($kind) {
+        case "MAQ100":
+            $weight = $seat2weight_arr[$seat];
+            $ret = $kind . "-" . $weight . "-" . $stop . "-" . $op . $speed;
+            break;
+        case "MAP100":
+            $weight = $seat2weight_arr[$seat];
+            $ret = $kind . "-" . $weight . "*" . $stop . "-" . $op . $speed;
+            break;
+        case "MAM200":
+        case "MAH100":
+            $weight = $seat2weight_arr[$seat];
+            $ret = $kind . "-" . $seat . "*" . $stop . "-" . $op . $speed;
+            break;
+        case "MAF100":
+            $weight = $seat;
+            $ret = $kind . "-" . $seat . "*" . $stop . "-" . $op . $speed;
+            break;
+        case "MAE100":
+            $weight = $seat2weight_arr[$seat];
+            $ret = $kind . "-" . $seat . "*" . $stop . "-" . $op . $speed;
+            break;
+        case "M1+M4(2:1)":
+        case "M1+M4(1:1)":
+        case "M1":
+            $weight = $seat2weight_arr[$seat];
+            $ret = "P" . $seat . "-" . $seat2weight_arr[$seat] . "-" . $op . "-" . $speed . "-" . $stop;
+            break;
+        default:
+            $weight = $ret = "";
+    }
+    return $ret . "," . $weight;
+}
+
+/**
+ * 最新簽核進度
+ * @param array $arr:[簽核人1,簽核人2,簽核人3,簽核人4]
+ * @return array 進度,下位審批人
+ */
+function sign_status($arr)
+{
+    $ret = [];
+    foreach ($arr as $k => $sign) {
+        $sign_nos = 0;
+        $sign_nt_arr = [];
+        $sign_arr = explode("<##>", $sign);
+        foreach ($sign_arr as $v) {
+            if (strlen($v) == 7) {
+                $sign_nos++;
+                $sign_nt_arr[] = str_replace(",,", "", $v);
+            }
+        }
+        if (count($sign_arr) == $sign_nos) {
+            $ret["sign_st"] = $k + 1;
+            $ret["sign_nt"] = $sign_nt_arr;
+            return $ret;
+        }
+    }
+    if (empty($ret)) {
+        $ret["sign_st"] = 99;   // 已審完
+        $ret["sign_nt"] = "";
+    }
+    return $ret;
+}
+
+function getAccounttype($link, $user_id)
+{
+    $sql = "SELECT * FROM account where accountid = '$user_id'";
+    $data = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($data, MYSQLI_ASSOC);
+    return $row['accounttype'];
+}
diff --git a/wms/gary.php b/wms/gary.php
index 90696e89..760eeae4 100644
--- a/wms/gary.php
+++ b/wms/gary.php
@@ -1,61 +1,123 @@
-<?php
-ini_set('display_errors', 'on');
-
-include "fun_global.php";
-include "database.php";
-
-// account table
-$accounttype = "A";
-$accountid = "";
-$pwd = "123";
-$name = "";
-$creater = "";
-$create_at = date("Y-m-d H:i:s");
-
-// 檢查 accountid 是否未重複並寫入 account 資料表
-$sql = "
-    SELECT DISTINCT
-        a.accountid,
-        w.contractno,
-        w.custom
-    FROM wipwholestatus AS w
-    LEFT JOIN (
-        SELECT 
-            accountid
-        FROM account 
-    ) AS a
-    ON a.accountid = w.contractno
-    WHERE a.accountid IS NULL
-";
-$data = mysqli_query($link, $sql);
-
-$J = 0;
-foreach ($data as $key => $row) :
-   echo $row['accountid']."<br>";
-   echo $J++;
-    if (empty($row['accountid'])) {
-        
-        $accountid = $row['contractno'];
-        $name = $row['custom'];
-        echo $sql2 = "
-            INSERT INTO account (
-                accounttype,
-                accountid,
-                pwd,
-                name,
-                creater,
-                create_at
-            ) VALUES (
-                '$accounttype',
-                '$accountid',
-                '$pwd',
-                '$name',
-                '$creater',
-                '$create_at'
-            )
-        ";
-        echo "<br/>";
-        mysqli_query($link, $sql2);
-    }
-endforeach;
-
+<?php
+// 接收 referer 參數
+if (isset($_GET['referer'])) {
+    $referer = urldecode($_GET['referer']);
+    echo "HTTP_REFERER 是： $referer";
+    echo "<br/>";
+    date_default_timezone_set('Asia/Taipei');
+    $currentTimestamp = time();
+    $hashReferer = "";
+    for ($i = -3; $i <= 3; $i++) {
+        $modifiedTimestamp = strtotime("$i seconds", $currentTimestamp);
+        $formattedTime = date("Y-m-d H:i:s", $modifiedTimestamp);
+        $hashReferer .= md5("https://bpm.masada.com.twMasada@2023".$formattedTime);
+    }
+    echo $hashReferer;
+    if (strpos($hashReferer, $referer)) {
+        echo "login";
+    }
+} else {
+    echo "沒有 HTTP_REFERER 資訊可用";
+}
+echo "<br/>";
+if(isset($_SERVER['HTTP_REFERER'])) {
+    $referrer = $_SERVER['HTTP_REFERER'];
+    echo "來自於: $referrer";
+} else {
+    echo "沒有 referrer 資訊可用";
+}
+echo "<br/>";
+if (isset($_SERVER['REMOTE_ADDR'])) {
+    $visitor_ip = $_SERVER['REMOTE_ADDR'];
+    echo "訪問者的 IP 地址是： $visitor_ip";
+} else {
+    echo "REMOTE_ADDR : 無法獲取訪問者的 IP 地址";
+}
+echo "<br/>";
+if (isset($_SERVER['HTTP_CLIENT_IP'])) {
+    $visitor_ip = $_SERVER['HTTP_CLIENT_IP'];
+    echo "訪問者的 IP 地址是： $visitor_ip";
+} else {
+    echo "HTTP_CLIENT_IP : 無法獲取訪問者的 IP 地址";
+}
+echo "<br/>";
+
+if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+    $visitor_ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+    echo "訪問者的 IP 地址是： $visitor_ip";
+} else {
+    echo "HTTP_X_FORWARDED_FOR : 法獲取訪問者的 IP 地址";
+}
+echo "<br/>";
+
+
+?>
+<script>
+    var referrer = document.referrer;
+    console.log("前一個網頁是：" + referrer);
+</script>
+<?php
+exit;
+ini_set('display_errors', 'on');
+echo $referrer = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : "抓不到";
+
+exit;
+include "fun_global.php";
+include "database.php";
+print_r(manage_class("M0117"));
+echo manage_class("M0117")[0];
+
+// // account table
+// $accounttype = "A";
+// $accountid = "";
+// $pwd = "123";
+// $name = "";
+// $creater = "";
+// $create_at = date("Y-m-d H:i:s");
+
+// // 檢查 accountid 是否未重複並寫入 account 資料表
+// $sql = "
+//     SELECT DISTINCT
+//         a.accountid,
+//         w.contractno,
+//         w.custom
+//     FROM wipwholestatus AS w
+//     LEFT JOIN (
+//         SELECT 
+//             accountid
+//         FROM account 
+//     ) AS a
+//     ON a.accountid = w.contractno
+//     WHERE a.accountid IS NULL
+// ";
+// $data = mysqli_query($link, $sql);
+
+// $J = 0;
+// foreach ($data as $key => $row) :
+//    echo $row['accountid']."<br>";
+//    echo $J++;
+//     if (empty($row['accountid'])) {
+        
+//         $accountid = $row['contractno'];
+//         $name = $row['custom'];
+//         echo $sql2 = "
+//             INSERT INTO account (
+//                 accounttype,
+//                 accountid,
+//                 pwd,
+//                 name,
+//                 creater,
+//                 create_at
+//             ) VALUES (
+//                 '$accounttype',
+//                 '$accountid',
+//                 '$pwd',
+//                 '$name',
+//                 '$creater',
+//                 '$create_at'
+//             )
+//         ";
+//         echo "<br/>";
+//         mysqli_query($link, $sql2);
+//     }
+// endforeach;
diff --git a/wms/gary_info.php b/wms/gary_info.php
index acc92863..5218758c 100644
--- a/wms/gary_info.php
+++ b/wms/gary_info.php
@@ -1,3 +1,3 @@
-<?php
-
+<?php
+
 	echo phpinfo();
\ No newline at end of file
diff --git a/wms/header.php b/wms/header.php
index d45a9305..5c227349 100644
--- a/wms/header.php
+++ b/wms/header.php
@@ -9,38 +9,38 @@ ini_set('display_errors', 'off');
 
 function CreateToken($user_id, $user_name)
 {
-  date_default_timezone_set("Asia/Taipei");
-  $start_time = date("Y-m-d H:i:s");
-  $end_time = date('Y-m-d H:i:s', strtotime('+24 hour')); #设定24小时
-  $info = $user_id . '.' . base64_encode(urlencode($user_name)) . '.' . $start_time . '.' . $end_time; //设置token过期时间为一天
-  $encryption_code = "MASADA!^***";
-  //根据以上信息信息生成签名（密钥为 SIGNATURE 自定义全局常量)
-  $signature = hash_hmac('md5', $info, $encryption_code);
-  //最后将这两部分拼接起来，得到最终的Token字符串
-  return $token = $info . '.' . $signature;
+    date_default_timezone_set("Asia/Taipei");
+    $start_time = date("Y-m-d H:i:s");
+    $end_time = date('Y-m-d H:i:s', strtotime('+24 hour')); #设定24小时
+    $info = $user_id . '.' . base64_encode(urlencode($user_name)) . '.' . $start_time . '.' . $end_time; //设置token过期时间为一天
+    $encryption_code = "MASADA!^***";
+    //根据以上信息信息生成签名（密钥为 SIGNATURE 自定义全局常量)
+    $signature = hash_hmac('md5', $info, $encryption_code);
+    //最后将这两部分拼接起来，得到最终的Token字符串
+    return $token = $info . '.' . $signature;
 }
 
 
 require_once dirname(__FILE__) . "/../mkt/database.php";
 include "fun_global.php";
 if (isset($_REQUEST["function_name"])) {
-  $function_name = $_REQUEST["function_name"];
-  $function_flag = True;
+    $function_name = $_REQUEST["function_name"];
+    $function_flag = True;
 } else {
-  $function_name = "";
-  $function_flag = False;
+    $function_name = "";
+    $function_flag = False;
 }
 /**
  * 連線T8 MSSQL
  */
 try {
-  $conn = new PDO("sqlsrv:Server=erp.masada.com.tw;Database=T8MASADA", "masada", "ztPmPP!HRoV6SL3E");
-  if ($conn) {
-    $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-  }
+    $conn = new PDO("sqlsrv:Server=erp.masada.com.tw;Database=T8MASADA", "masada", "ztPmPP!HRoV6SL3E");
+    if ($conn) {
+        $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+    }
 } catch (PDOException $e) {
-  //echo "fail";
-  //echo $e->getMessage();
+    //echo "fail";
+    //echo $e->getMessage();
 }
 
 
@@ -57,32 +57,32 @@ try {
 $token = isset($_REQUEST["token"]) ? $_REQUEST["token"] : "";
 
 if (count(explode(".", $token)) > 1) {
-  $token_link = "token=" . $_REQUEST["token"];
-  list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
-  $user_name = urldecode(base64_decode($enc_user_name));
+    $token_link = "token=" . $_REQUEST["token"];
+    list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
+    $user_name = urldecode(base64_decode($enc_user_name));
 } else {
-  $referrer = isset($_GET['referer']) ? $_GET['referer'] : "";
-  date_default_timezone_set('Asia/Taipei');
-  $currentTimestamp = time();
-  $hashReferer = "";
-  for ($i = -3; $i <= 3; $i++) {
-    $modifiedTimestamp = strtotime("$i seconds", $currentTimestamp);
-    $formattedTime = date("Y-m-d H:i:s", $modifiedTimestamp);
-    $hashReferer .= md5("https://bpm.masada.com.twMasada@2023" . $formattedTime);
-  }
-  if (strpos($hashReferer, $referrer)) {
-    $user_id = !empty($_GET["employee_no"]) ? $_GET["employee_no"] : $user_id;
-    $login_dt = !empty($_GET["timestamp"]) ? substr($_GET["timestamp"], 0, 10) : $login_dt;
-    $login_dt = date('Y-m-d H:i:s', $login_dt);
-    // 藍凌超連結過來 token 設置永久
-    $login_dt = (date("Y") + 100) . "-12-31 23:59:59";
-    $user_name = accountid2name()[$user_id];
-    $token = CreateToken($user_id, $user_name);
-    $token_link = "token=" . $token;
-  } else {
-    echo "非法訪問！";
-    echo "<script>location.href='/wms/login.php'</script>";
-  }
+    $referrer = isset($_GET['referer']) ? $_GET['referer'] : "";
+    date_default_timezone_set('Asia/Taipei');
+    $currentTimestamp = time();
+    $hashReferer = "";
+    for ($i = -3; $i <= 3; $i++) {
+        $modifiedTimestamp = strtotime("$i seconds", $currentTimestamp);
+        $formattedTime = date("Y-m-d H:i:s", $modifiedTimestamp);
+        $hashReferer .= md5("https://bpm.masada.com.twMasada@2023" . $formattedTime);
+    }
+    if (strpos($hashReferer, $referrer)) {
+        $user_id = !empty($_GET["employee_no"]) ? $_GET["employee_no"] : $user_id;
+        $login_dt = !empty($_GET["timestamp"]) ? substr($_GET["timestamp"], 0, 10) : $login_dt;
+        $login_dt = date('Y-m-d H:i:s', $login_dt);
+        // 藍凌超連結過來 token 設置永久
+        $login_dt = (date("Y") + 100) . "-12-31 23:59:59";
+        $user_name = accountid2name()[$user_id];
+        $token = CreateToken($user_id, $user_name);
+        $token_link = "token=" . $token;
+    } else {
+        echo "非法訪問！";
+        echo "<script>location.href='/wms/login.php'</script>";
+    }
 }
 
 include 'IncludeCommon.php';
@@ -90,13 +90,13 @@ $includecommon = new IncludeCommon();
 $accounttype = getAccounttype($link, $user_id);
 $login_json = null;
 if (strlen($accounttype) != 0) {
-  $jsonres['menu'] = $includecommon->menu_v3($user_id, $accounttype);
-  $login_json =  json_encode($jsonres, JSON_UNESCAPED_UNICODE);
+    $jsonres['menu'] = $includecommon->menu_v3($user_id, $accounttype);
+    $login_json =  json_encode($jsonres, JSON_UNESCAPED_UNICODE);
 }
 ?>
 <script>
-  res = eval("(" + JSON.stringify(<?php echo $login_json; ?>) + ")");
-  window.localStorage.setItem("menu_<?php echo $user_id; ?>", res.menu);
+    res = eval("(" + JSON.stringify(<?php echo $login_json; ?>) + ")");
+    window.localStorage.setItem("menu_<?php echo $user_id; ?>", res.menu);
 </script>
 <?php
 
@@ -110,196 +110,196 @@ $user_auth = check_user_permission($user_id, $token);
 <html>
 
 <head>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="apple-mobile-web-app-capable" content="yes" />
-  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-  <title>Masada後臺系統</title>
-  <link rel="stylesheet" href="<?php dirname(__DIR__); ?>/wms/css/styles.css" />
-  <link rel="stylesheet" href="<?php dirname(__DIR__); ?>/wms/css/bootstrap.min.css">
-  <style>
-    a svg {
-      display: inline-block;
-      vertical-align: text-top;
-    }
-
-    .nav .icon {
-      display: none;
-    }
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+    <title>Masada後臺系統</title>
+    <link rel="stylesheet" href="<?php dirname(__DIR__); ?>/wms/css/styles.css" />
+    <link rel="stylesheet" href="<?php dirname(__DIR__); ?>/wms/css/bootstrap.min.css">
+    <style>
+        a svg {
+            display: inline-block;
+            vertical-align: text-top;
+        }
 
-    input:read-only {
-      background-color: #eee5e5;
-    }
+        .nav .icon {
+            display: none;
+        }
 
-    @media screen and (max-width: 992px) {
-      .header-right {
-        float: left !important;
-        margin-top: -40px;
-        margin-left: -15px;
-      }
-
-      /*.nav.navbar-nav a:not(:last-child), .dropdown {*/
-      .nav.navbar-nav a,
-      .dropdown {
-        display: none;
-      }
-
-      .nav.navbar-nav .icon {
-        color: #fff;
-        display: block;
-        position: fixed;
-        right: 0;
-        top: 0;
-      }
-    }
+        input:read-only {
+            background-color: #eee5e5;
+        }
 
-    @media screen and (max-width: 992px) {
-      .nav.navbar-nav.responsive {
-        position: relative;
-      }
-
-      .nav.navbar-nav.responsive a.icon {
-        position: fixed;
-        right: 0;
-        top: 0;
-      }
-
-      .nav.navbar-nav.responsive li {
-        float: none;
-        display: block;
-        text-align: left;
-      }
-
-      .nav.navbar-nav.responsive .dropdown {
-        float: none;
-      }
-
-      .nav.navbar-nav.responsive .dropdown li {
-        position: relative;
-      }
-
-      .nav.navbar-nav.responsive .dropdown a {
-        display: block;
-        width: 100%;
-        text-align: left;
-        top: -10px;
-        line-height: 10px;
-      }
-
-      .navbar-inverse .navbar-nav .open .dropdown-menu>li>a {
-        color: #000;
-      }
-
-      .nav.navbar-nav.responsive .dropdown ul {
-        width: 200px;
-        background-color: #fff;
-      }
-
-      .navbar-nav .open .dropdown-menu {
-        position: absolute;
-      }
-    }
+        @media screen and (max-width: 992px) {
+            .header-right {
+                float: left !important;
+                margin-top: -40px;
+                margin-left: -15px;
+            }
+
+            /*.nav.navbar-nav a:not(:last-child), .dropdown {*/
+            .nav.navbar-nav a,
+            .dropdown {
+                display: none;
+            }
+
+            .nav.navbar-nav .icon {
+                color: #fff;
+                display: block;
+                position: fixed;
+                right: 0;
+                top: 0;
+            }
+        }
 
-    @media screen and (max-width: 992px) {
-      #member_content_phone {
-        display: inline-grid !important;
-      }
-    }
-  </style>
-  <script src="<?php dirname(__DIR__); ?>/wms/css/jquery.min.js"></script>
-  <script src="<?php dirname(__DIR__); ?>/wms/css/bootstrap.min.js"></script>
-  <script src="<?php dirname(__DIR__); ?>/wms/css/jquery.dataTables.min.js"></script>
-  <script src="<?php dirname(__DIR__); ?>/wms/css/dataTables.bootstrap4.min.js"></script>
-  <script src="<?php dirname(__DIR__); ?>/wms/css/function.js"></script>
-  <script>
-    $(document).ready(function() {
-      if ($('#table_index').length !== 0) $('#table_index').DataTable();
-
-      if (window.localStorage) {
-        //var tokendata=window.localStorage.getItem("token");
-        //var namedata=window.localStorage.getItem("name");
-        //var logindata=window.localStorage.getItem("login");
-        var menudata = window.localStorage.getItem("menu_<?php echo $user_id; ?>");
-        //if(tokendata==null || namedata==null || menudata==null){
-        if (menudata == null) {
-          window.location.href = "<?php dirname(__DIR__); ?>/wms/login.php";
+        @media screen and (max-width: 992px) {
+            .nav.navbar-nav.responsive {
+                position: relative;
+            }
+
+            .nav.navbar-nav.responsive a.icon {
+                position: fixed;
+                right: 0;
+                top: 0;
+            }
+
+            .nav.navbar-nav.responsive li {
+                float: none;
+                display: block;
+                text-align: left;
+            }
+
+            .nav.navbar-nav.responsive .dropdown {
+                float: none;
+            }
+
+            .nav.navbar-nav.responsive .dropdown li {
+                position: relative;
+            }
+
+            .nav.navbar-nav.responsive .dropdown a {
+                display: block;
+                width: 100%;
+                text-align: left;
+                top: -10px;
+                line-height: 10px;
+            }
+
+            .navbar-inverse .navbar-nav .open .dropdown-menu>li>a {
+                color: #000;
+            }
+
+            .nav.navbar-nav.responsive .dropdown ul {
+                width: 200px;
+                background-color: #fff;
+            }
+
+            .navbar-nav .open .dropdown-menu {
+                position: absolute;
+            }
         }
-      } else {
-        //        var tokendata=$.cookie("token");
-      }
-
-
-      var url = "<?php dirname(__DIR__); ?>/wms/headerapi.php";
-      $.ajax({
-        method: 'post',
-        url: url,
-        data: {
-          token: '<?php echo $token; ?>'
-        },
-        success: function(data) {
-          var res = eval('(' + data + ')');
-          //console.log(res);
-          if (res.code != '200') {
-            window.location.href = '<?php dirname(__DIR__); ?>/wms/login.php?errno=3';
-          }
+
+        @media screen and (max-width: 992px) {
+            #member_content_phone {
+                display: inline-grid !important;
+            }
         }
-      });
-
-      var mdata = JSON.parse(menudata);
-      var menuStr = '';
-      var checkAuth = 0;
-      var m = 1;
-      for (var i in mdata) {
-        menuStr += '<li class="dropdown">';
-        menuStr += '<a class="dropdown-toggle" data-toggle="dropdown" href="#">' + i;
-        menuStr += '<span class="caret"></span></a>';
-        menuStr += '<ul class="dropdown-menu">';
-        for (var j in mdata[i]) {
-          for (var k in mdata[i][j]) {
-            menuStr += '<li';
-            if (k == '<?php echo $function_name; ?>') menuStr += " class='active'";
-            menuStr += '><a href="<?php dirname(__DIR__); ?>/wms/' + mdata[i][j][k] + '?function_name=' + k + '&<?php echo $token_link; ?>"';
-            if (k.indexOf('open-') !== -1) menuStr += ' target="_blank"';
-            menuStr += '>' + j + '</a></li>';
-            if (mdata[i][j][k] == window.location.pathname) checkAuth = 1;
-            m++;
-          }
+    </style>
+    <script src="<?php dirname(__DIR__); ?>/wms/css/jquery.min.js"></script>
+    <script src="<?php dirname(__DIR__); ?>/wms/css/bootstrap.min.js"></script>
+    <script src="<?php dirname(__DIR__); ?>/wms/css/jquery.dataTables.min.js"></script>
+    <script src="<?php dirname(__DIR__); ?>/wms/css/dataTables.bootstrap4.min.js"></script>
+    <script src="<?php dirname(__DIR__); ?>/wms/css/function.js"></script>
+    <script>
+        $(document).ready(function() {
+            if ($('#table_index').length !== 0) $('#table_index').DataTable();
+
+            if (window.localStorage) {
+                //var tokendata=window.localStorage.getItem("token");
+                //var namedata=window.localStorage.getItem("name");
+                //var logindata=window.localStorage.getItem("login");
+                var menudata = window.localStorage.getItem("menu_<?php echo $user_id; ?>");
+                //if(tokendata==null || namedata==null || menudata==null){
+                if (menudata == null) {
+                    window.location.href = "<?php dirname(__DIR__); ?>/wms/login.php";
+                }
+            } else {
+                //        var tokendata=$.cookie("token");
+            }
+
+
+            var url = "<?php dirname(__DIR__); ?>/wms/headerapi.php";
+            $.ajax({
+                method: 'post',
+                url: url,
+                data: {
+                    token: '<?php echo $token; ?>'
+                },
+                success: function(data) {
+                    var res = eval('(' + data + ')');
+                    //console.log(res);
+                    if (res.code != '200') {
+                        window.location.href = '<?php dirname(__DIR__); ?>/wms/login.php?errno=3';
+                    }
+                }
+            });
+
+            var mdata = JSON.parse(menudata);
+            var menuStr = '';
+            var checkAuth = 0;
+            var m = 1;
+            for (var i in mdata) {
+                menuStr += '<li class="dropdown">';
+                menuStr += '<a class="dropdown-toggle" data-toggle="dropdown" href="#">' + i;
+                menuStr += '<span class="caret"></span></a>';
+                menuStr += '<ul class="dropdown-menu">';
+                for (var j in mdata[i]) {
+                    for (var k in mdata[i][j]) {
+                        menuStr += '<li';
+                        if (k == '<?php echo $function_name; ?>') menuStr += " class='active'";
+                        menuStr += '><a href="<?php dirname(__DIR__); ?>/wms/' + mdata[i][j][k] + '?function_name=' + k + '&<?php echo $token_link; ?>"';
+                        if (k.indexOf('open-') !== -1) menuStr += ' target="_blank"';
+                        menuStr += '>' + j + '</a></li>';
+                        if (mdata[i][j][k] == window.location.pathname) checkAuth = 1;
+                        m++;
+                    }
+                }
+                menuStr += '</ul>';
+                menuStr += '</li>';
+            }
+            menuStr += '<li><a href="javascript:void(0);" class="icon" onclick="myFunction()"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-grid-3x3-gap-fill" viewBox="0 0 16 16"><path d="M1 2a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2zm5 0a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H7a1 1 0 0 1-1-1V2zm5 0a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1h-2a1 1 0 0 1-1-1V2zM1 7a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V7zm5 0a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H7a1 1 0 0 1-1-1V7zm5 0a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1h-2a1 1 0 0 1-1-1V7zM1 12a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1v-2zm5 0a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H7a1 1 0 0 1-1-1v-2zm5 0a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1h-2a1 1 0 0 1-1-1v-2z"/></svg></a></li>';
+            /*
+            if (checkAuth == 0 && ('/wms/custom-create.php' != window.location.pathname)) {
+                window.location.href='login.php?errno=4';
+            }
+            */
+            $('#menu_content').html(menuStr);
+
+            $('.dropdown a').on('click', function() {
+                $('.dropdown').removeClass('open');
+            });
+        });
+
+        function myFunction() {
+            var x = document.getElementById("menu_content");
+            if (x.className === "nav navbar-nav") {
+                x.className += " responsive";
+            } else {
+                x.className = "nav navbar-nav";
+            }
         }
-        menuStr += '</ul>';
-        menuStr += '</li>';
-      }
-      menuStr += '<li><a href="javascript:void(0);" class="icon" onclick="myFunction()"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-grid-3x3-gap-fill" viewBox="0 0 16 16"><path d="M1 2a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2zm5 0a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H7a1 1 0 0 1-1-1V2zm5 0a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1h-2a1 1 0 0 1-1-1V2zM1 7a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V7zm5 0a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H7a1 1 0 0 1-1-1V7zm5 0a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1h-2a1 1 0 0 1-1-1V7zM1 12a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1v-2zm5 0a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1H7a1 1 0 0 1-1-1v-2zm5 0a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1h-2a1 1 0 0 1-1-1v-2z"/></svg></a></li>';
-      /*
-      if (checkAuth == 0 && ('/wms/custom-create.php' != window.location.pathname)) {
-          window.location.href='login.php?errno=4';
-      }
-      */
-      $('#menu_content').html(menuStr);
-
-      $('.dropdown a').on('click', function() {
-        $('.dropdown').removeClass('open');
-      });
-    });
-
-    function myFunction() {
-      var x = document.getElementById("menu_content");
-      if (x.className === "nav navbar-nav") {
-        x.className += " responsive";
-      } else {
-        x.className = "nav navbar-nav";
-      }
-    }
-  </script>
+    </script>
 </head>
 
 <body>
-  <nav class="navbar navbar-inverse">
-    <div class="container-fluid">
-      <div class="navbar-header">
-        <a class="navbar-brand" href="<?php dirname(__DIR__); ?>/wms/index.php?<?php echo $token_link; ?>">Masada</a>
-      </div>
-      <ul class="nav navbar-nav" id="menu_content">
-      </ul>
-      <!--
+    <nav class="navbar navbar-inverse">
+        <div class="container-fluid">
+            <div class="navbar-header">
+                <a class="navbar-brand" href="<?php dirname(__DIR__); ?>/wms/index.php?<?php echo $token_link; ?>">Masada</a>
+            </div>
+            <ul class="nav navbar-nav" id="menu_content">
+            </ul>
+            <!--
     <div class="topnav" id="myTopnav">
       <a href="#home" class="active">Home</a>
       <a href="#news">News</a>
@@ -319,53 +319,53 @@ $user_auth = check_user_permission($user_id, $token);
     </div>
     -->
 
-      <div class="header-right">
-        <ul class="nav navbar-nav" id="member_content">
-          <li class="dropdown d-lg-none">
-            <a class="dropdown-toggle" data-toggle="dropdown" href="#" style='padding:0px;padding-top:5px;'>
-              <?php echo $user_name . "(" . $user_id . ")" . "<br/>" . $login_dt; ?>
-              <span class="caret"></span>
-            </a>
-            <ul class="dropdown-menu">
-              <li>
-                <a style="color:#000;" href="<?php dirname(__DIR__); ?>/wms/change-password.php?<?php echo $token_link; ?>" class="navbar-brand" style="font-size:14px;line-height:34px;">
-                  <svg viewBox="0 0 24 24" width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg">
-                    <g id="SVGRepo_bgCarrier" stroke-width="0"></g>
-                    <g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g>
-                    <g id="SVGRepo_iconCarrier">
-                      <rect width="24" height="24" fill="white"></rect>
-                      <path d="M2.5 12C2.5 12.2761 2.72386 12.5 3 12.5C3.27614 12.5 3.5 12.2761 3.5 12H2.5ZM3.5 12C3.5 7.30558 7.30558 3.5 12 3.5V2.5C6.75329 2.5 2.5 6.75329 2.5 12H3.5ZM12 3.5C15.3367 3.5 18.2252 5.4225 19.6167 8.22252L20.5122 7.77748C18.9583 4.65062 15.7308 2.5 12 2.5V3.5Z" fill="#000000"></path>
-                      <path d="M20.4716 2.42157V8.07843H14.8147" stroke="#000000" stroke-linecap="round" stroke-linejoin="round"></path>
-                      <path d="M21.5 12C21.5 11.7239 21.2761 11.5 21 11.5C20.7239 11.5 20.5 11.7239 20.5 12L21.5 12ZM20.5 12C20.5 16.6944 16.6944 20.5 12 20.5L12 21.5C17.2467 21.5 21.5 17.2467 21.5 12L20.5 12ZM12 20.5C8.66333 20.5 5.77477 18.5775 4.38328 15.7775L3.48776 16.2225C5.04168 19.3494 8.26923 21.5 12 21.5L12 20.5Z" fill="#000000"></path>
-                      <path d="M3.52844 21.5784L3.52844 15.9216L9.18529 15.9216" stroke="#000000" stroke-linecap="round" stroke-linejoin="round"></path>
-                    </g>
-                  </svg>
-                  更改密碼
-                </a>
-              </li>
-              <li>
-                <a style="color:#000;" href="<?php dirname(__DIR__); ?>/wms/logout.php?<?php echo $token_link; ?>" class="navbar-brand" style="font-size:14px;line-height:34px;">
-                  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-box-arrow-right" viewBox="0 0 16 16">
-                    <path fill-rule="evenodd" d="M10 12.5a.5.5 0 0 1-.5.5h-8a.5.5 0 0 1-.5-.5v-9a.5.5 0 0 1 .5-.5h8a.5.5 0 0 1 .5.5v2a.5.5 0 0 0 1 0v-2A1.5 1.5 0 0 0 9.5 2h-8A1.5 1.5 0 0 0 0 3.5v9A1.5 1.5 0 0 0 1.5 14h8a1.5 1.5 0 0 0 1.5-1.5v-2a.5.5 0 0 0-1 0v2z" />
-                    <path fill-rule="evenodd" d="M15.854 8.354a.5.5 0 0 0 0-.708l-3-3a.5.5 0 0 0-.708.708L14.293 7.5H5.5a.5.5 0 0 0 0 1h8.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3z" />
-                  </svg>
-                  登出
-                </a>
-              </li>
-            </ul>
-          </li>
-        </ul>
-        <div id="member_content_phone" style="display:none">
-          <span class="navbar-brand">
-            <h5><?php echo $user_name . "(" . $user_id . ")" . $login_dt; ?></h5>
-          </span>
-          <a href="<?php dirname(__DIR__); ?>/wms/change-password.php?<?php echo $token_link; ?>" class="navbar-brand" style="font-size:14px;line-height:34px;">
-            更改密碼</a>
-          <a href="<?php dirname(__DIR__); ?>/wms/logout.php?<?php echo $token_link; ?>" class="navbar-brand" style="font-size:14px;line-height:34px;"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-box-arrow-right" viewBox="0 0 16 16">
-              <path fill-rule="evenodd" d="M10 12.5a.5.5 0 0 1-.5.5h-8a.5.5 0 0 1-.5-.5v-9a.5.5 0 0 1 .5-.5h8a.5.5 0 0 1 .5.5v2a.5.5 0 0 0 1 0v-2A1.5 1.5 0 0 0 9.5 2h-8A1.5 1.5 0 0 0 0 3.5v9A1.5 1.5 0 0 0 1.5 14h8a1.5 1.5 0 0 0 1.5-1.5v-2a.5.5 0 0 0-1 0v2z" />
-              <path fill-rule="evenodd" d="M15.854 8.354a.5.5 0 0 0 0-.708l-3-3a.5.5 0 0 0-.708.708L14.293 7.5H5.5a.5.5 0 0 0 0 1h8.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3z" />
-            </svg>
-            登出</a>
-        </div>
-      </div>
-  </nav>
\ No newline at end of file
+            <div class="header-right">
+                <ul class="nav navbar-nav" id="member_content">
+                    <li class="dropdown d-lg-none">
+                        <a class="dropdown-toggle" data-toggle="dropdown" href="#" style='padding:0px;padding-top:5px;'>
+                            <?php echo $user_name . "(" . $user_id . ")" . "<br/>" . $login_dt; ?>
+                            <span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li>
+                                <a style="color:#000;" href="<?php dirname(__DIR__); ?>/wms/change-password.php?<?php echo $token_link; ?>" class="navbar-brand" style="font-size:14px;line-height:34px;">
+                                    <svg viewBox="0 0 24 24" width="16" height="16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                        <g id="SVGRepo_bgCarrier" stroke-width="0"></g>
+                                        <g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g>
+                                        <g id="SVGRepo_iconCarrier">
+                                            <rect width="24" height="24" fill="white"></rect>
+                                            <path d="M2.5 12C2.5 12.2761 2.72386 12.5 3 12.5C3.27614 12.5 3.5 12.2761 3.5 12H2.5ZM3.5 12C3.5 7.30558 7.30558 3.5 12 3.5V2.5C6.75329 2.5 2.5 6.75329 2.5 12H3.5ZM12 3.5C15.3367 3.5 18.2252 5.4225 19.6167 8.22252L20.5122 7.77748C18.9583 4.65062 15.7308 2.5 12 2.5V3.5Z" fill="#000000"></path>
+                                            <path d="M20.4716 2.42157V8.07843H14.8147" stroke="#000000" stroke-linecap="round" stroke-linejoin="round"></path>
+                                            <path d="M21.5 12C21.5 11.7239 21.2761 11.5 21 11.5C20.7239 11.5 20.5 11.7239 20.5 12L21.5 12ZM20.5 12C20.5 16.6944 16.6944 20.5 12 20.5L12 21.5C17.2467 21.5 21.5 17.2467 21.5 12L20.5 12ZM12 20.5C8.66333 20.5 5.77477 18.5775 4.38328 15.7775L3.48776 16.2225C5.04168 19.3494 8.26923 21.5 12 21.5L12 20.5Z" fill="#000000"></path>
+                                            <path d="M3.52844 21.5784L3.52844 15.9216L9.18529 15.9216" stroke="#000000" stroke-linecap="round" stroke-linejoin="round"></path>
+                                        </g>
+                                    </svg>
+                                    更改密碼
+                                </a>
+                            </li>
+                            <li>
+                                <a style="color:#000;" href="<?php dirname(__DIR__); ?>/wms/logout.php?<?php echo $token_link; ?>" class="navbar-brand" style="font-size:14px;line-height:34px;">
+                                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-box-arrow-right" viewBox="0 0 16 16">
+                                        <path fill-rule="evenodd" d="M10 12.5a.5.5 0 0 1-.5.5h-8a.5.5 0 0 1-.5-.5v-9a.5.5 0 0 1 .5-.5h8a.5.5 0 0 1 .5.5v2a.5.5 0 0 0 1 0v-2A1.5 1.5 0 0 0 9.5 2h-8A1.5 1.5 0 0 0 0 3.5v9A1.5 1.5 0 0 0 1.5 14h8a1.5 1.5 0 0 0 1.5-1.5v-2a.5.5 0 0 0-1 0v2z" />
+                                        <path fill-rule="evenodd" d="M15.854 8.354a.5.5 0 0 0 0-.708l-3-3a.5.5 0 0 0-.708.708L14.293 7.5H5.5a.5.5 0 0 0 0 1h8.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3z" />
+                                    </svg>
+                                    登出
+                                </a>
+                            </li>
+                        </ul>
+                    </li>
+                </ul>
+                <div id="member_content_phone" style="display:none">
+                    <span class="navbar-brand">
+                        <h5><?php echo $user_name . "(" . $user_id . ")" . $login_dt; ?></h5>
+                    </span>
+                    <a href="<?php dirname(__DIR__); ?>/wms/change-password.php?<?php echo $token_link; ?>" class="navbar-brand" style="font-size:14px;line-height:34px;">
+                        更改密碼</a>
+                    <a href="<?php dirname(__DIR__); ?>/wms/logout.php?<?php echo $token_link; ?>" class="navbar-brand" style="font-size:14px;line-height:34px;"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-box-arrow-right" viewBox="0 0 16 16">
+                            <path fill-rule="evenodd" d="M10 12.5a.5.5 0 0 1-.5.5h-8a.5.5 0 0 1-.5-.5v-9a.5.5 0 0 1 .5-.5h8a.5.5 0 0 1 .5.5v2a.5.5 0 0 0 1 0v-2A1.5 1.5 0 0 0 9.5 2h-8A1.5 1.5 0 0 0 0 3.5v9A1.5 1.5 0 0 0 1.5 14h8a1.5 1.5 0 0 0 1.5-1.5v-2a.5.5 0 0 0-1 0v2z" />
+                            <path fill-rule="evenodd" d="M15.854 8.354a.5.5 0 0 0 0-.708l-3-3a.5.5 0 0 0-.708.708L14.293 7.5H5.5a.5.5 0 0 0 0 1h8.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3z" />
+                        </svg>
+                        登出</a>
+                </div>
+            </div>
+    </nav>
\ No newline at end of file
diff --git a/wms/header_nomenu.php b/wms/header_nomenu.php
index 028b5485..43f8176a 100644
--- a/wms/header_nomenu.php
+++ b/wms/header_nomenu.php
@@ -1,24 +1,24 @@
-<?php
-require_once dirname(__FILE__)."/database.php";
-include "fun_global.php";
-if (isset($_REQUEST["function_name"])) {
-    $function_name = $_REQUEST["function_name"];
-    $function_flag = True;
-}else{
-    $function_name = "";
-    $function_flag = False;
-}
-
-/*****************************
- * global:
- * $token
- * $token_link  含token的連結
- * $user_id     使用者ID
- * $user_name   使用者姓名
- * $login_dt    登入時間
- * $user_auth   使用權限:1,2,3
- *****************************/
-$token = $_REQUEST["token"];
-$token_link = "token=".$_REQUEST["token"];
-list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
-$user_name = urldecode(base64_decode($enc_user_name));
+<?php
+require_once dirname(__FILE__)."/database.php";
+include "fun_global.php";
+if (isset($_REQUEST["function_name"])) {
+    $function_name = $_REQUEST["function_name"];
+    $function_flag = True;
+}else{
+    $function_name = "";
+    $function_flag = False;
+}
+
+/*****************************
+ * global:
+ * $token
+ * $token_link  含token的連結
+ * $user_id     使用者ID
+ * $user_name   使用者姓名
+ * $login_dt    登入時間
+ * $user_auth   使用權限:1,2,3
+ *****************************/
+$token = $_REQUEST["token"];
+$token_link = "token=".$_REQUEST["token"];
+list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
+$user_name = urldecode(base64_decode($enc_user_name));
diff --git a/wms/headerapi.php b/wms/headerapi.php
index e1089093..4352efe8 100644
--- a/wms/headerapi.php
+++ b/wms/headerapi.php
@@ -1,25 +1,25 @@
-<?php
-include 'IncludeCommon.php';
-// 检查token
-if (!empty($_POST['token'])) {
-//if(!empty($_SESSION['token'])){
-    $includecommon = new IncludeCommon();
-    $token=$_POST['token'];
-    $result=$includecommon->CheckToken($token);
-    $user_id = $result['user_id'];
-    $token_code = $result['code'];
-    $token_message = $result['message'];
-
-    if ($token_code <> "200") {
-        $jsonres['code']='1';
-        echo json_encode($jsonres);
-    } else {
-        $jsonres['code']='200';
-        $jsonres['user_id']=$user_id;
-        echo json_encode($jsonres);
-    }
-} else {
-    $jsonres['code']='1';
-    echo json_encode($jsonres);
-}
+<?php
+include 'IncludeCommon.php';
+// 检查token
+if (!empty($_POST['token'])) {
+//if(!empty($_SESSION['token'])){
+    $includecommon = new IncludeCommon();
+    $token=$_POST['token'];
+    $result=$includecommon->CheckToken($token);
+    $user_id = $result['user_id'];
+    $token_code = $result['code'];
+    $token_message = $result['message'];
+
+    if ($token_code <> "200") {
+        $jsonres['code']='1';
+        echo json_encode($jsonres);
+    } else {
+        $jsonres['code']='200';
+        $jsonres['user_id']=$user_id;
+        echo json_encode($jsonres);
+    }
+} else {
+    $jsonres['code']='1';
+    echo json_encode($jsonres);
+}
 ?>
\ No newline at end of file
diff --git a/wms/index.php b/wms/index.php
index c9b3d9af..36904536 100644
--- a/wms/index.php
+++ b/wms/index.php
@@ -1,216 +1,216 @@
-<?php
-include "header.php";
-// 載入db.php來連結資料庫
-//require_once "database.php";
-?>
-<style type="text/css">
-body {
-    overflow: hidden; /* Hide scrollbars */
-}
-
-*{
-    margin: 0;
-    padding: 0;
-}
-.main{
-    width: 100%;
-    height: 100%;
-    position: absolute;
-}
-.quarter-lt-div{
-    width: 25%;
-    height: 45%;
-    float: left;
-    /*border-right:1px solid rgb(204, 204, 204);
-    border-bottom:1px solid rgb(204, 204, 204);*/
-}
-.quarter-ct-div{
-    width: 50%;
-    height: 45%;
-    float: left;
-}
-.quarter-rt-div{
-    width: 25%;
-    height: 45%;
-    float: left;
-    /*border-left:1px solid rgb(204, 204, 204);
-    border-bottom:1px solid rgb(204, 204, 204);*/
-}
-.quarter-lb-div{
-    width: 25%;
-    height: 50%;
-    float: left;
-    /*border-right:1px solid rgb(204, 204, 204);*/
-}
-.quarter-rb-div{
-    width: 25%;
-    height: 50%;
-    float: right;
-    /*border-left:1px solid rgb(204, 204, 204);*/
-}
-
-.modal-body {
-    margin-top: 10px;
-}
-
-@media screen and (max-width: 992px){
-    body{
-        overflow: scroll;
-    }
-    .quarter-lt-div{
-        width: 100%;
-        /*height: 25%;*/
-        /*border-right-style: none;*/
-    }
-    /*
-    .quarter-lt-div iframe{
-        overflow: scroll;
-    }
-    */
-    .quarter-ct-div{
-        width: 100%;
-        height: 60%;
-        /*border-bottom:2px solid rgb(204, 204, 204);*/
-    }
-    .quarter-ct-div iframe{
-        height:100%;
-    }
-    .quarter-rt-div{
-        width: 100%;
-        /*height: 30%;*/
-        /*border-top:1px solid rgb(204, 204, 204);
-        border-left-style: none;*/
-    }
-    .quarter-lb-div{
-        width: 100%;
-        /*height: 30%;*/
-        /*border-right-style: none;*/
-    }
-    .quarter-rb-div{
-        width: 100%;
-        /*height: 30%;*/
-        /*border-top:2px solid rgb(204, 204, 204);
-        border-left-style: none;*/
-    }
-}
-</style>
-
-<script src="css/bootstrap_3.3.7_js_bootstrap.min.js"></script>
-
-
-<!-- Modal -->
-<div class="modal fade" id="boardModal" tabindex="-1" role="dialog" aria-labelledby="boardModalLabel" aria-hidden="true">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <!--
-            <div class="modal-header">
-                <h4 class="modal-title" id="boardModalLabel"></h4>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            -->
-            <div class="modal-body">
-                <table class="table table-bordered">
-                    <tbody>
-                        <tr>
-                            <th scope="row">主旨</th>
-                            <td class="board-title"></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">內容</th>
-                            <td class="board-content"></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">附件</th>
-                            <td class="board-attach"></td>
-                        </tr>
-                        <tr>
-                            <th scope="row" nowrap>建檔人員</th>
-                            <td class="board-creater"></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">建檔時間</th>
-                            <td class="board-create_at"></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">關閉</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<!-- Notice Modal -->
-<div class="modal fade" id="noticeModal" tabindex="-1" role="dialog" aria-labelledby="noticeModalLabel" aria-hidden="true">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <!--
-            <div class="modal-header">
-                <h4 class="modal-title" id="noticeModalLabel"></h4>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            -->
-            <div class="modal-body">
-                <table class="table table-bordered">
-                    <tbody>
-                        <tr>
-                            <th scope="row">主旨</th>
-                            <td class="notice-title"></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">內容</th>
-                            <td class="notice-content"></td>
-                        </tr>
-                        <tr>
-                            <th scope="row" nowrap>建檔人員</th>
-                            <td class="notice-creater"></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">建檔時間</th>
-                            <td class="notice-create_at"></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">關閉</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div style="overflow-x:auto;">
-    <div class="main" style="margin-top:-20px;">
-        <div class="quarter-lt-div">
-            <iframe name="main" src="frame/form.php?t=<?php echo time(); ?>&token=<?php echo $token; ?>" width="100%" height="100%" scrolling="no" frameborder="0" allowfullscreen="true">
-            Loading...</iframe>
-        </div>
-        <div class="quarter-ct-div">
-            <iframe name="main" src="frame/calendar/index.php?t=<?php echo time(); ?>&token=<?php echo $token; ?>" width="100%" height="200%" scrolling="no" frameborder="0" allowfullscreen="true">
-            Loading...</iframe>
-        </div>
-        <div class="quarter-rt-div">
-            <iframe name="main" src="frame/notice.php?t=<?php echo time(); ?>&token=<?php echo $token; ?>" width="100%" height="100%" scrolling="no" frameborder="0" allowfullscreen="true">
-            Loading...</iframe>
-        </div>
-        <div class="quarter-lb-div">
-            <iframe name="main" src="frame/board.php?t=<?php echo time(); ?>&token=<?php echo $token; ?>" width="100%" height="100%" scrolling="no" frameborder="0" allowfullscreen="true">
-            Loading...</iframe>
-        </div>
-        <div class="quarter-rb-div">
-            <iframe name="main" src="frame/pending.php?t=<?php echo time(); ?>&token=<?php echo $token; ?>" width="100%" height="100%" scrolling="no" frameborder="0" allowfullscreen="true">
-            Loading...</iframe>
-        </div>
-    </div>
-    
-</div>
-<?php
-#代表結束連線
-mysqli_close($link);
-include "footer.php";
+<?php
+include "header.php";
+// 載入db.php來連結資料庫
+//require_once "database.php";
+?>
+<style type="text/css">
+body {
+    overflow: hidden; /* Hide scrollbars */
+}
+
+*{
+    margin: 0;
+    padding: 0;
+}
+.main{
+    width: 100%;
+    height: 100%;
+    position: absolute;
+}
+.quarter-lt-div{
+    width: 25%;
+    height: 45%;
+    float: left;
+    /*border-right:1px solid rgb(204, 204, 204);
+    border-bottom:1px solid rgb(204, 204, 204);*/
+}
+.quarter-ct-div{
+    width: 50%;
+    height: 45%;
+    float: left;
+}
+.quarter-rt-div{
+    width: 25%;
+    height: 45%;
+    float: left;
+    /*border-left:1px solid rgb(204, 204, 204);
+    border-bottom:1px solid rgb(204, 204, 204);*/
+}
+.quarter-lb-div{
+    width: 25%;
+    height: 50%;
+    float: left;
+    /*border-right:1px solid rgb(204, 204, 204);*/
+}
+.quarter-rb-div{
+    width: 25%;
+    height: 50%;
+    float: right;
+    /*border-left:1px solid rgb(204, 204, 204);*/
+}
+
+.modal-body {
+    margin-top: 10px;
+}
+
+@media screen and (max-width: 992px){
+    body{
+        overflow: scroll;
+    }
+    .quarter-lt-div{
+        width: 100%;
+        /*height: 25%;*/
+        /*border-right-style: none;*/
+    }
+    /*
+    .quarter-lt-div iframe{
+        overflow: scroll;
+    }
+    */
+    .quarter-ct-div{
+        width: 100%;
+        height: 60%;
+        /*border-bottom:2px solid rgb(204, 204, 204);*/
+    }
+    .quarter-ct-div iframe{
+        height:100%;
+    }
+    .quarter-rt-div{
+        width: 100%;
+        /*height: 30%;*/
+        /*border-top:1px solid rgb(204, 204, 204);
+        border-left-style: none;*/
+    }
+    .quarter-lb-div{
+        width: 100%;
+        /*height: 30%;*/
+        /*border-right-style: none;*/
+    }
+    .quarter-rb-div{
+        width: 100%;
+        /*height: 30%;*/
+        /*border-top:2px solid rgb(204, 204, 204);
+        border-left-style: none;*/
+    }
+}
+</style>
+
+<script src="css/bootstrap_3.3.7_js_bootstrap.min.js"></script>
+
+
+<!-- Modal -->
+<div class="modal fade" id="boardModal" tabindex="-1" role="dialog" aria-labelledby="boardModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <!--
+            <div class="modal-header">
+                <h4 class="modal-title" id="boardModalLabel"></h4>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            -->
+            <div class="modal-body">
+                <table class="table table-bordered">
+                    <tbody>
+                        <tr>
+                            <th scope="row">主旨</th>
+                            <td class="board-title"></td>
+                        </tr>
+                        <tr>
+                            <th scope="row">內容</th>
+                            <td class="board-content"></td>
+                        </tr>
+                        <tr>
+                            <th scope="row">附件</th>
+                            <td class="board-attach"></td>
+                        </tr>
+                        <tr>
+                            <th scope="row" nowrap>建檔人員</th>
+                            <td class="board-creater"></td>
+                        </tr>
+                        <tr>
+                            <th scope="row">建檔時間</th>
+                            <td class="board-create_at"></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">關閉</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!-- Notice Modal -->
+<div class="modal fade" id="noticeModal" tabindex="-1" role="dialog" aria-labelledby="noticeModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <!--
+            <div class="modal-header">
+                <h4 class="modal-title" id="noticeModalLabel"></h4>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            -->
+            <div class="modal-body">
+                <table class="table table-bordered">
+                    <tbody>
+                        <tr>
+                            <th scope="row">主旨</th>
+                            <td class="notice-title"></td>
+                        </tr>
+                        <tr>
+                            <th scope="row">內容</th>
+                            <td class="notice-content"></td>
+                        </tr>
+                        <tr>
+                            <th scope="row" nowrap>建檔人員</th>
+                            <td class="notice-creater"></td>
+                        </tr>
+                        <tr>
+                            <th scope="row">建檔時間</th>
+                            <td class="notice-create_at"></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">關閉</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div style="overflow-x:auto;">
+    <div class="main" style="margin-top:-20px;">
+        <div class="quarter-lt-div">
+            <iframe name="main" src="frame/form.php?t=<?php echo time(); ?>&token=<?php echo $token; ?>" width="100%" height="100%" scrolling="no" frameborder="0" allowfullscreen="true">
+            Loading...</iframe>
+        </div>
+        <div class="quarter-ct-div">
+            <iframe name="main" src="frame/calendar/index.php?t=<?php echo time(); ?>&token=<?php echo $token; ?>" width="100%" height="200%" scrolling="no" frameborder="0" allowfullscreen="true">
+            Loading...</iframe>
+        </div>
+        <div class="quarter-rt-div">
+            <iframe name="main" src="frame/notice.php?t=<?php echo time(); ?>&token=<?php echo $token; ?>" width="100%" height="100%" scrolling="no" frameborder="0" allowfullscreen="true">
+            Loading...</iframe>
+        </div>
+        <div class="quarter-lb-div">
+            <iframe name="main" src="frame/board.php?t=<?php echo time(); ?>&token=<?php echo $token; ?>" width="100%" height="100%" scrolling="no" frameborder="0" allowfullscreen="true">
+            Loading...</iframe>
+        </div>
+        <div class="quarter-rb-div">
+            <iframe name="main" src="frame/pending.php?t=<?php echo time(); ?>&token=<?php echo $token; ?>" width="100%" height="100%" scrolling="no" frameborder="0" allowfullscreen="true">
+            Loading...</iframe>
+        </div>
+    </div>
+    
+</div>
+<?php
+#代表結束連線
+mysqli_close($link);
+include "footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/login.php b/wms/login.php
index 60adcba2..0a9088bd 100644
--- a/wms/login.php
+++ b/wms/login.php
@@ -1,150 +1,150 @@
-<?php
-// 維護專用 
-// include "maintenance.php";
-// $maintenancePeriod = "2023-11-17 15:30 AM 至 17:30 PM";
-// $maintenancePage = new MaintenancePage($maintenancePeriod);
-// $maintenancePage->displayPage();
-?>
-<!doctype html>
-<html lang="en">
-<!-- 主頁header -->
-
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, viewport-fit=cover" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-    <meta name="theme-color" content="#000000">
-    <title>Masada內部管理系統</title>
-    <!--
-	<meta name="description" content="Mobilekit HTML Mobile UI Kit">
-	<meta name="keywords" content="bootstrap 4, mobile template, cordova, phonegap, mobile, html" />
-	-->
-    <link rel="stylesheet" href="assets/css/style.css">
-
-    <!--    <link rel="manifest" href="__manifest.json">-->
-    <script src="css/jquery.min.js"></script>
-    <script src="css/function.js"></script>
-
-</head>
-<!-- * 主頁header -->
-
-<body>
-    <!-- App Header -->
-
-    <div class="appHeader bg-primary text-light">
-        <!--
-	<div class="left">
-		<a href="javascript:;" class="headerButton goBack">
-			<ion-icon name="chevron-back-outline"></ion-icon>
-		</a>
-	</div>
-	-->
-        <div class="pageTitle">登入管理系統</div>
-        <!--
-	<div class="right">
-		<a href="tel:+886 12345678901" class="headerButton">
-			<ion-icon name="call-outline"></ion-icon>
-		</a>
-	</div>
-	-->
-    </div>
-    <!-- * App Header -->
-
-    <!-- App Capsule -->
-    <div id="appCapsule">
-
-        <div class="section full mt-2">
-            <!-- <div class="section-title">請輸入帳號、密碼!</div> -->
-
-            <div class="wide-block pt-2 pb-2">
-                <div class="form-horizontal">
-                    <!-- 以下是要傳遞的資料 -->
-                    <!--            <input type="hidden" name="key" value="032580295e2d320b3a258bef473e8w32e0b24431" />-->
-                    <!--            <input type="hidden" name="pid" value="pid12345"  />-->
-                    <input type="hidden" name="source_flag" value="web" />
-                    <input type="hidden" name="token" value="">
-                    <!-- 以上是要傳遞的資料 -->
-                    <div class="form-group boxed">
-                        <div class="input-wrapper">
-                            <input type="text" class="form-control account" id="account_input" placeholder="帳號">
-                            <i class="clear-input">
-                                <ion-icon name="close-circle"></ion-icon>
-                            </i>
-                        </div>
-                    </div>
-                    <div class="form-group boxed">
-                        <div class="input-wrapper">
-                            <input type="password" class="form-control password" id="password_input" placeholder="密碼">
-                            <i class="clear-input">
-                                <ion-icon name="close-circle"></ion-icon>
-                            </i>
-                        </div>
-                    </div>
-
-                    <div class="mt-1">
-                        <button onclick="login()" class="btn btn-primary btn-lg btn-block">
-                            確定
-                        </button>
-                    </div>
-
-                </div>
-                <?php
-                if (!empty($_GET['errno'])) {
-                    if ($_GET['errno'] == 1) {
-                        echo "帳號或密碼錯誤";
-                    } else if ($_GET['errno'] == 2) {
-                        echo "請輸入帳號密碼";
-                    } else if ($_GET['errno'] == 3) {
-                        echo "非法訪問，請輸入帳號和密碼";
-                    } else if ($_GET['errno'] == 4) {
-                        echo "無使用權限";
-                    }
-                }
-                ?>
-
-            </div>
-
-
-        </div>
-
-    </div>
-    <!-- * App Capsule -->
-
-    <!-- * 主頁頁尾 -->
-    <div class="appFooter">
-        <!-- <img src="assets/img/logo6.png" alt="icon" class="footer-logo mb-2"> -->
-        <img src="assets/img/logo.png" width="50%" height="50%" alt="icon"><br>
-        <!--
-	<div class="footer-title">
-		Copyright c Quickfix 2021. All Rights By <a href="http://www.bootstrapmb.com/">bootstrapmb</a>.
-	</div>
-	-->
-        <div class="footer-title">
-            <!--Copyright c Masada維保 2022. All Rights By <a href="#">Masada</a>.-->
-            Copyright c 2022. All Rights By <a href="#">Masada</a>.
-        </div>
-        <div>Masada電梯，聰明的就懂!</div>
-
-
-
-    </div>
-    <!-- 主頁頁尾按鈕 -->
-
-    <script>
-        $(document).ready(function() {
-            // 綁定按鍵按下事件
-            $("#account_input,#password_input").keypress(function(event) {
-                if (event.which === 13 || event.keyCode === 13) {
-                    login();
-                    // 防止預設的表單提交行為
-                    event.preventDefault();
-                }
-            });
-        });
-    </script>
-
-
-</body>
-
+<?php
+// 維護專用 
+// include "maintenance.php";
+// $maintenancePeriod = "2023-11-17 15:30 AM 至 17:30 PM";
+// $maintenancePage = new MaintenancePage($maintenancePeriod);
+// $maintenancePage->displayPage();
+?>
+<!doctype html>
+<html lang="en">
+<!-- 主頁header -->
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, viewport-fit=cover" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+    <meta name="theme-color" content="#000000">
+    <title>Masada內部管理系統</title>
+    <!--
+	<meta name="description" content="Mobilekit HTML Mobile UI Kit">
+	<meta name="keywords" content="bootstrap 4, mobile template, cordova, phonegap, mobile, html" />
+	-->
+    <link rel="stylesheet" href="assets/css/style.css">
+
+    <!--    <link rel="manifest" href="__manifest.json">-->
+    <script src="css/jquery.min.js"></script>
+    <script src="css/function.js"></script>
+
+</head>
+<!-- * 主頁header -->
+
+<body>
+    <!-- App Header -->
+
+    <div class="appHeader bg-primary text-light">
+        <!--
+	<div class="left">
+		<a href="javascript:;" class="headerButton goBack">
+			<ion-icon name="chevron-back-outline"></ion-icon>
+		</a>
+	</div>
+	-->
+        <div class="pageTitle">登入管理系統</div>
+        <!--
+	<div class="right">
+		<a href="tel:+886 12345678901" class="headerButton">
+			<ion-icon name="call-outline"></ion-icon>
+		</a>
+	</div>
+	-->
+    </div>
+    <!-- * App Header -->
+
+    <!-- App Capsule -->
+    <div id="appCapsule">
+
+        <div class="section full mt-2">
+            <!-- <div class="section-title">請輸入帳號、密碼!</div> -->
+
+            <div class="wide-block pt-2 pb-2">
+                <div class="form-horizontal">
+                    <!-- 以下是要傳遞的資料 -->
+                    <!--            <input type="hidden" name="key" value="032580295e2d320b3a258bef473e8w32e0b24431" />-->
+                    <!--            <input type="hidden" name="pid" value="pid12345"  />-->
+                    <input type="hidden" name="source_flag" value="web" />
+                    <input type="hidden" name="token" value="">
+                    <!-- 以上是要傳遞的資料 -->
+                    <div class="form-group boxed">
+                        <div class="input-wrapper">
+                            <input type="text" class="form-control account" id="account_input" placeholder="帳號">
+                            <i class="clear-input">
+                                <ion-icon name="close-circle"></ion-icon>
+                            </i>
+                        </div>
+                    </div>
+                    <div class="form-group boxed">
+                        <div class="input-wrapper">
+                            <input type="password" class="form-control password" id="password_input" placeholder="密碼">
+                            <i class="clear-input">
+                                <ion-icon name="close-circle"></ion-icon>
+                            </i>
+                        </div>
+                    </div>
+
+                    <div class="mt-1">
+                        <button onclick="login()" class="btn btn-primary btn-lg btn-block">
+                            確定
+                        </button>
+                    </div>
+
+                </div>
+                <?php
+                if (!empty($_GET['errno'])) {
+                    if ($_GET['errno'] == 1) {
+                        echo "帳號或密碼錯誤";
+                    } else if ($_GET['errno'] == 2) {
+                        echo "請輸入帳號密碼";
+                    } else if ($_GET['errno'] == 3) {
+                        echo "非法訪問，請輸入帳號和密碼";
+                    } else if ($_GET['errno'] == 4) {
+                        echo "無使用權限";
+                    }
+                }
+                ?>
+
+            </div>
+
+
+        </div>
+
+    </div>
+    <!-- * App Capsule -->
+
+    <!-- * 主頁頁尾 -->
+    <div class="appFooter">
+        <!-- <img src="assets/img/logo6.png" alt="icon" class="footer-logo mb-2"> -->
+        <img src="assets/img/logo.png" width="50%" height="50%" alt="icon"><br>
+        <!--
+	<div class="footer-title">
+		Copyright c Quickfix 2021. All Rights By <a href="http://www.bootstrapmb.com/">bootstrapmb</a>.
+	</div>
+	-->
+        <div class="footer-title">
+            <!--Copyright c Masada維保 2022. All Rights By <a href="#">Masada</a>.-->
+            Copyright c 2022. All Rights By <a href="#">Masada</a>.
+        </div>
+        <div>Masada電梯，聰明的就懂!</div>
+
+
+
+    </div>
+    <!-- 主頁頁尾按鈕 -->
+
+    <script>
+        $(document).ready(function() {
+            // 綁定按鍵按下事件
+            $("#account_input,#password_input").keypress(function(event) {
+                if (event.which === 13 || event.keyCode === 13) {
+                    login();
+                    // 防止預設的表單提交行為
+                    event.preventDefault();
+                }
+            });
+        });
+    </script>
+
+
+</body>
+
 </html>
\ No newline at end of file
diff --git a/wms/loginapi.php b/wms/loginapi.php
index 63a1cbb2..e7386d4f 100644
--- a/wms/loginapi.php
+++ b/wms/loginapi.php
@@ -1,74 +1,74 @@
-<?php
-// 载入db.php来连结资料库
-// error_reporting(E_ALL);#
-ini_set("display_errors","On");
-date_default_timezone_set("Asia/Taipei");
-// require_once "database.php";
-require_once dirname(__FILE__) . "/../mkt/database.php";
-include 'IncludeCommon.php';
-
-if(!empty($_REQUEST["account"])&& !empty($_REQUEST["password"])) {
-    $account = $_REQUEST["account"];
-    $password = $_REQUEST["password"];
-    $includecommon = new IncludeCommon();
-    $data = array(); # 设置一个空阵列来放资料is
-    $sql = "SELECT * FROM account where ((accountid = '$account') and (pwd = '$password'))"; # sql语法存在变数中
-    $data = mysqli_query($link, $sql); # 用mysqli_query方法执行(sql语法)将结果存在变数中
-    $row = mysqli_fetch_array($data, MYSQLI_ASSOC);
-    $accounttype = $row['accounttype'];
-    $user_name = $row['name'];
-    // 修正小寫登入 token 會帶入小寫的bug //M0117修改于 2023/07/31 13:45
-    $accountid = $row['accountid'];
-    if (strlen($accounttype) != 0) {
-        // B=保養員 M=永佳捷員工 E=管理員
-        if ($accounttype == "B" || $accounttype == "M" || $accounttype == "E" || $accounttype == "W"){
-            $token = $includecommon->CreateToken($accountid, $user_name);
-            $response_result =['list'=>''] ;  // $includecommon->menu('tw',$accounttype); // 获取当前角色下的菜单 //P0044修改于 2023/06/13 17:40
-            $response_menu = $includecommon->menu_v3($accountid, $accounttype);  // 依帳號檢視功能目錄(暫時全開:menu.status=Y)
-            if (is_array($response_result["list"])) {
-                for ($i = 0; $i < count($response_result["list"]); $i++) {
-                    $response_result["list"][$i]["path"] = $response_result["list"][$i]["path"] . "?token=" . $token;
-                }
-            }
-            $response_result["note"] = "success";
-            $response_result["token"] = $token;
-            //setcookie('token',$token);
-            //$domain = ($_SERVER['HTTP_HOST'] != 'localhost') ? $_SERVER['HTTP_HOST'] : false;
-            //setcookie('ecur', base64_encode($account), time()+86400, '/', $domain); // 加密過的登入帳號，用來做資料庫查詢
-
-            // 下屬員工
-            $farr = [];
-            $sqlm = "select accountid from account where manager = '$account'";
-            $res_m = mysqli_query($link, $sqlm);
-            while ($row_m = mysqli_fetch_row($res_m)) {
-                $farr[] = $row_m[0];
-            }
-            mysqli_free_result($res_m);
-
-            /*
-            $_mem["id"]     = $account;             // 登入帳號
-            $_mem["type"]   = $row["accounttype"];  // 帳號別
-            $_mem["name"]   = $row["name"];         // 姓名
-            $_mem["follow"] = implode(",", $farr);  // 下屬員工
-            $_mem["login"]  = date("Y-m-d H:i:s");  // 登入時間
-            setcookie("_mem", serialize($_mem));
-            */
-            $includecommon->save_log_response('web',$account, $response_result);//创建登录日志
-            $jsonres['code']='200';
-            $jsonres['token']=$token;
-            $jsonres['name']=$user_name;
-            $jsonres['login']=date("Y-m-d H:i:s");  // 登入時間
-            $jsonres['uid']=$account;
-            $jsonres['menu']=$response_menu;
-            echo  json_encode($jsonres);
-        }else{
-            $jsonres['code']='1';
-            echo  json_encode($jsonres);
-        }
-    } else {
-        $jsonres['code']='1';
-        echo  json_encode($jsonres);
-    }
-    mysqli_close($link); #代表结束连线
-}
-?>
+<?php
+// 载入db.php来连结资料库
+// error_reporting(E_ALL);#
+ini_set("display_errors","On");
+date_default_timezone_set("Asia/Taipei");
+// require_once "database.php";
+require_once dirname(__FILE__) . "/../mkt/database.php";
+include 'IncludeCommon.php';
+
+if(!empty($_REQUEST["account"])&& !empty($_REQUEST["password"])) {
+    $account = $_REQUEST["account"];
+    $password = $_REQUEST["password"];
+    $includecommon = new IncludeCommon();
+    $data = array(); # 设置一个空阵列来放资料is
+    $sql = "SELECT * FROM account where ((accountid = '$account') and (pwd = '$password'))"; # sql语法存在变数中
+    $data = mysqli_query($link, $sql); # 用mysqli_query方法执行(sql语法)将结果存在变数中
+    $row = mysqli_fetch_array($data, MYSQLI_ASSOC);
+    $accounttype = $row['accounttype'];
+    $user_name = $row['name'];
+    // 修正小寫登入 token 會帶入小寫的bug //M0117修改于 2023/07/31 13:45
+    $accountid = strtoupper($row['accountid']);
+    if (strlen($accounttype) != 0) {
+        // B=保養員 M=永佳捷員工 E=管理員
+        if ($accounttype == "B" || $accounttype == "M" || $accounttype == "E" || $accounttype == "W"){
+            $token = $includecommon->CreateToken($accountid, $user_name);
+            $response_result =['list'=>''] ;  // $includecommon->menu('tw',$accounttype); // 获取当前角色下的菜单 //P0044修改于 2023/06/13 17:40
+            $response_menu = $includecommon->menu_v3($accountid, $accounttype);  // 依帳號檢視功能目錄(暫時全開:menu.status=Y)
+            if (is_array($response_result["list"])) {
+                for ($i = 0; $i < count($response_result["list"]); $i++) {
+                    $response_result["list"][$i]["path"] = $response_result["list"][$i]["path"] . "?token=" . $token;
+                }
+            }
+            $response_result["note"] = "success";
+            $response_result["token"] = $token;
+            //setcookie('token',$token);
+            //$domain = ($_SERVER['HTTP_HOST'] != 'localhost') ? $_SERVER['HTTP_HOST'] : false;
+            //setcookie('ecur', base64_encode($account), time()+86400, '/', $domain); // 加密過的登入帳號，用來做資料庫查詢
+
+            // 下屬員工
+            $farr = [];
+            $sqlm = "select accountid from account where manager = '$account'";
+            $res_m = mysqli_query($link, $sqlm);
+            while ($row_m = mysqli_fetch_row($res_m)) {
+                $farr[] = $row_m[0];
+            }
+            mysqli_free_result($res_m);
+
+            /*
+            $_mem["id"]     = $account;             // 登入帳號
+            $_mem["type"]   = $row["accounttype"];  // 帳號別
+            $_mem["name"]   = $row["name"];         // 姓名
+            $_mem["follow"] = implode(",", $farr);  // 下屬員工
+            $_mem["login"]  = date("Y-m-d H:i:s");  // 登入時間
+            setcookie("_mem", serialize($_mem));
+            */
+            $includecommon->save_log_response('web',$account, $response_result);//创建登录日志
+            $jsonres['code']='200';
+            $jsonres['token']=$token;
+            $jsonres['name']=$user_name;
+            $jsonres['login']=date("Y-m-d H:i:s");  // 登入時間
+            $jsonres['uid']=$account;
+            $jsonres['menu']=$response_menu;
+            echo  json_encode($jsonres);
+        }else{
+            $jsonres['code']='1';
+            echo  json_encode($jsonres);
+        }
+    } else {
+        $jsonres['code']='1';
+        echo  json_encode($jsonres);
+    }
+    mysqli_close($link); #代表结束连线
+}
+?>
diff --git a/wms/logout.php b/wms/logout.php
index 1f1adee1..26bd9cec 100644
--- a/wms/logout.php
+++ b/wms/logout.php
@@ -1,15 +1,15 @@
-<?php
-if ($_REQUEST["token"]) {
-    $item = substr($_REQUEST["token"], 0, strpos($_REQUEST["token"], "."));
-    if ($item) {
-?>
-<script>
-    localStorage.removeItem('menu_<?php echo $item; ?>');
-    //alert("已完成登出！");
-</script>
-<?php
-        header("Refresh:0; url=/wms/login.php");
-        exit;
-    }
-}
+<?php
+if ($_REQUEST["token"]) {
+    $item = substr($_REQUEST["token"], 0, strpos($_REQUEST["token"], "."));
+    if ($item) {
+?>
+<script>
+    localStorage.removeItem('menu_<?php echo $item; ?>');
+    //alert("已完成登出！");
+</script>
+<?php
+        header("Refresh:0; url=/wms/login.php");
+        exit;
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/maintenance.php b/wms/maintenance.php
index 4498d257..aaf5757b 100644
--- a/wms/maintenance.php
+++ b/wms/maintenance.php
@@ -1,77 +1,77 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <title>維護中</title>
-    <style>
-        body {
-            margin: 0;
-            padding: 0;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            height: 100vh;
-            background-color: #f0f0f0;
-            /* 背景顏色可以自行調整 */
-            font-family: Arial, sans-serif;
-        }
-
-        .maintenance-container {
-            text-align: center;
-        }
-
-        h1 {
-            font-size: 2em;
-            color: #333;
-            /* 標題文字顏色 */
-        }
-
-        p {
-            font-size: 1.2em;
-            color: #666;
-            /* 內文文字顏色 */
-        }
-
-        /* 加入一些樣式以使文字顯示更為標題化 */
-        .logo-text {
-            font-size: 2em;
-            color: #FF5733;
-            /* 橘色 */
-            font-weight: bold;
-            /* text-transform: uppercase; */
-            /* 轉換成大寫 */
-            letter-spacing: 2px;
-            /* 調整字母間距 */
-            font-family: Arial, sans-serif;
-            /* 字型設定 */
-        }
-    </style>
-</head>
-
-<body>
-    <?php
-    class MaintenancePage
-    {
-        private $maintenancePeriod;
-
-        public function __construct($maintenancePeriod)
-        {
-            $this->maintenancePeriod = $maintenancePeriod;
-        }
-
-        public function displayPage()
-        {
-            echo '<div class="maintenance-container">';
-            echo '<p class="logo-text">MASADA</p>';
-            echo '<h1>系統維護中</h1>';
-            echo '<p>維護時段：' . $this->maintenancePeriod . '</p>';
-            echo '</div>';
-            exit;
-        }
-    }
-
-    ?>
-</body>
-
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <title>維護中</title>
+    <style>
+        body {
+            margin: 0;
+            padding: 0;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            background-color: #f0f0f0;
+            /* 背景顏色可以自行調整 */
+            font-family: Arial, sans-serif;
+        }
+
+        .maintenance-container {
+            text-align: center;
+        }
+
+        h1 {
+            font-size: 2em;
+            color: #333;
+            /* 標題文字顏色 */
+        }
+
+        p {
+            font-size: 1.2em;
+            color: #666;
+            /* 內文文字顏色 */
+        }
+
+        /* 加入一些樣式以使文字顯示更為標題化 */
+        .logo-text {
+            font-size: 2em;
+            color: #FF5733;
+            /* 橘色 */
+            font-weight: bold;
+            /* text-transform: uppercase; */
+            /* 轉換成大寫 */
+            letter-spacing: 2px;
+            /* 調整字母間距 */
+            font-family: Arial, sans-serif;
+            /* 字型設定 */
+        }
+    </style>
+</head>
+
+<body>
+    <?php
+    class MaintenancePage
+    {
+        private $maintenancePeriod;
+
+        public function __construct($maintenancePeriod)
+        {
+            $this->maintenancePeriod = $maintenancePeriod;
+        }
+
+        public function displayPage()
+        {
+            echo '<div class="maintenance-container">';
+            echo '<p class="logo-text">MASADA</p>';
+            echo '<h1>系統維護中</h1>';
+            echo '<p>維護時段：' . $this->maintenancePeriod . '</p>';
+            echo '</div>';
+            exit;
+        }
+    }
+
+    ?>
+</body>
+
 </html>
\ No newline at end of file
diff --git a/wms/meeting-create.php b/wms/meeting-create.php
index aa2ae4b8..ec59dddb 100644
--- a/wms/meeting-create.php
+++ b/wms/meeting-create.php
@@ -1,142 +1,142 @@
-<?php
-include "header.php";
-
-// 與會人員部門選單
-$attend_str = "";
-$sql = "select department_id, name from department group by department_id order by department_id;";
-$res = mysqli_query($link, $sql);
-while ($row = mysqli_fetch_row($res)) {
-    list($department_id, $department_name) = $row;
-    $sql2 = "select accountid, name from account where department_id = '$department_id' order by role_id";
-    $res2 = mysqli_query($link, $sql2);
-    while ($row2 = mysqli_fetch_row($res2)) {
-        $attend_str .= '<option value="'.$row2[0].'" data-section="'.$department_name.'" data-index="1">'.$row2[1].'</option>';
-    }
-    mysqli_free_result($res2);
-}
-mysqli_free_result($res);
-
-// 會議時間
-$stime_str = $etime_str = "";
-$now_min  = date("i");
-if ($now_min < 30) $next_start = date("H").":30:00";
-else $next_start = date("H", strtotime("+1 hour")).":00:00";
-$next_end = date("H:i:s", strtotime("+1 hour -1 second", strtotime($next_start)));
-//echo $next_start."~".$next_end;
-for ($i=8; $i<24; $i++) {
-    $hour = str_pad($i, 2, "0", STR_PAD_LEFT);
-    for ($j=0; $j<2; $j++) {
-        $min = str_pad($j*30, 2, "0", STR_PAD_LEFT);
-        $stime_sel = $hour.":".$min.":00";
-        $stime_str .= '<option value="'.$stime_sel.'"';
-        if ($next_start == $stime_sel) $stime_str .= ' selected';
-        $stime_str .= '>'.substr($stime_sel, 0, 5).'</option>';
-
-        $min = str_pad($j*30+29, 2, "0", STR_PAD_LEFT);
-        $etime_sel = $hour.":".$min.":59";
-        $etime_sel_text = date("H:i", strtotime("+1 second", strtotime($etime_sel)));
-        $etime_str .= '<option value="'.$etime_sel.'"';
-        if ($next_end == $etime_sel) $etime_str .= ' selected';
-        $etime_str .= '>'.$etime_sel_text.'</option>';
-    }
-}
-?>
-<link rel="stylesheet" href="css/tree/jquery.tree-multiselect.min.css">
-<script src="css/tree/jquery-ui.min.js"></script>
-<script src="css/tree/jquery.tree-multiselect.js"></script>
-<style type="text/css">
-@media screen and (max-width: 992px){
-    
-}
-</style>
-<div class="container">
-<?php
-include "meeting-record-submit.php";
-/*
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-        echo "<p class='error'>Please fill up the required field!</p>";
-    } else {
-        echo "<p class='success'>Record has added successfully</p>";
-    }
-}
-*/
-?>
-
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>">
-        <div>
-            <label for="title">會議主題</label>
-            <input type="text" name="title" id="title" size="30" maxlength="25" required>
-        </div>
-        <div>
-            <label for="mdate">會議日期</label><br>
-            <input type="date" name="mdate" id="mdate" class="form-control" value="<?php echo date("Y-m-d"); ?>" required>
-        </div>
-        <div>
-            <label for="stime">開始時間</label>
-            <select name="stime">
-                <?php echo $stime_str; ?>
-            </select>
-        </div>
-        <div>
-            <label for="etime">結束時間</label>
-            <select name="etime">
-                <?php echo $etime_str; ?>
-            </select>
-        </div>
-        <div>
-            <label for="room">地點</label>
-            <select name="room" id="room" required>
-                <option value="">請選擇</option>
-                <option value="1">C區會議室1</option>
-                <option value="2">C區會議室2</option>
-                <option value="3">大直會議室</option>
-                <option value="4">網路會議</option>
-                <option value="5">其他</option>
-            </select>
-        </div>
-        <div>
-            <label for="equip">使用資源</label>
-            <input type="text" name="equip" id="equip" size="30" maxlength="25">
-        </div>
-        <div>
-            <label for="content">會議內容</label><br>
-            <textarea class="form-control" name="content" id="content" rows="8" cols="70" required></textarea>
-        </div>
-        <div style="width:100%">
-            <label for="attend">與會人員</label><br>
-            <select id="attend" multiple="multiple">
-            <?php echo $attend_str; ?>
-                <!--
-                <option value="abc" data-section="section/ayy" data-index="1">abc</option>
-                <option value="ayyy" >ayyy</option>
-                <option value="disabled1" readonly>wow it's readonly</option>
-                <option value="disabled2" readonly>also readonly!</option>
-                -->
-            </select>
-        </div>
-        <div>
-            <br>
-            <button type="submit" name="submit" id="submit">確定</button>
-            <h4 class="text-danger">按下「確定」後，系統將發信通知已勾選的與會人員！</h4>
-        </div>
-        <input type="hidden" name="create_at" value="<?php echo date("Y-m-d H:i:s"); ?>">
-        <input type="hidden" name="attend_all" id="attend_all">
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-<script>
-var tree = $("#attend").treeMultiselect({
-    allowBatchSelection: true,
-    //enableSelectAll: true,
-    //searchable: true,
-    sortable: true,
-    startCollapsed: true
-});
-$(function(){
-    $('#submit').click(function(){
-        $('#attend_all').val($("#attend").val());
-    });
-});
-</script>
-<?php include "footer.php"; ?>
+<?php
+include "header.php";
+
+// 與會人員部門選單
+$attend_str = "";
+$sql = "select department_id, name from department group by department_id order by department_id;";
+$res = mysqli_query($link, $sql);
+while ($row = mysqli_fetch_row($res)) {
+    list($department_id, $department_name) = $row;
+    $sql2 = "select accountid, name from account where department_id = '$department_id' order by role_id";
+    $res2 = mysqli_query($link, $sql2);
+    while ($row2 = mysqli_fetch_row($res2)) {
+        $attend_str .= '<option value="'.$row2[0].'" data-section="'.$department_name.'" data-index="1">'.$row2[1].'</option>';
+    }
+    mysqli_free_result($res2);
+}
+mysqli_free_result($res);
+
+// 會議時間
+$stime_str = $etime_str = "";
+$now_min  = date("i");
+if ($now_min < 30) $next_start = date("H").":30:00";
+else $next_start = date("H", strtotime("+1 hour")).":00:00";
+$next_end = date("H:i:s", strtotime("+1 hour -1 second", strtotime($next_start)));
+//echo $next_start."~".$next_end;
+for ($i=8; $i<24; $i++) {
+    $hour = str_pad($i, 2, "0", STR_PAD_LEFT);
+    for ($j=0; $j<2; $j++) {
+        $min = str_pad($j*30, 2, "0", STR_PAD_LEFT);
+        $stime_sel = $hour.":".$min.":00";
+        $stime_str .= '<option value="'.$stime_sel.'"';
+        if ($next_start == $stime_sel) $stime_str .= ' selected';
+        $stime_str .= '>'.substr($stime_sel, 0, 5).'</option>';
+
+        $min = str_pad($j*30+29, 2, "0", STR_PAD_LEFT);
+        $etime_sel = $hour.":".$min.":59";
+        $etime_sel_text = date("H:i", strtotime("+1 second", strtotime($etime_sel)));
+        $etime_str .= '<option value="'.$etime_sel.'"';
+        if ($next_end == $etime_sel) $etime_str .= ' selected';
+        $etime_str .= '>'.$etime_sel_text.'</option>';
+    }
+}
+?>
+<link rel="stylesheet" href="css/tree/jquery.tree-multiselect.min.css">
+<script src="css/tree/jquery-ui.min.js"></script>
+<script src="css/tree/jquery.tree-multiselect.js"></script>
+<style type="text/css">
+@media screen and (max-width: 992px){
+    
+}
+</style>
+<div class="container">
+<?php
+include "meeting-record-submit.php";
+/*
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+        echo "<p class='error'>Please fill up the required field!</p>";
+    } else {
+        echo "<p class='success'>Record has added successfully</p>";
+    }
+}
+*/
+?>
+
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>">
+        <div>
+            <label for="title">會議主題</label>
+            <input type="text" name="title" id="title" size="30" maxlength="25" required>
+        </div>
+        <div>
+            <label for="mdate">會議日期</label><br>
+            <input type="date" name="mdate" id="mdate" class="form-control" value="<?php echo date("Y-m-d"); ?>" required>
+        </div>
+        <div>
+            <label for="stime">開始時間</label>
+            <select name="stime">
+                <?php echo $stime_str; ?>
+            </select>
+        </div>
+        <div>
+            <label for="etime">結束時間</label>
+            <select name="etime">
+                <?php echo $etime_str; ?>
+            </select>
+        </div>
+        <div>
+            <label for="room">地點</label>
+            <select name="room" id="room" required>
+                <option value="">請選擇</option>
+                <option value="1">C區會議室1</option>
+                <option value="2">C區會議室2</option>
+                <option value="3">大直會議室</option>
+                <option value="4">網路會議</option>
+                <option value="5">其他</option>
+            </select>
+        </div>
+        <div>
+            <label for="equip">使用資源</label>
+            <input type="text" name="equip" id="equip" size="30" maxlength="25">
+        </div>
+        <div>
+            <label for="content">會議內容</label><br>
+            <textarea class="form-control" name="content" id="content" rows="8" cols="70" required></textarea>
+        </div>
+        <div style="width:100%">
+            <label for="attend">與會人員</label><br>
+            <select id="attend" multiple="multiple">
+            <?php echo $attend_str; ?>
+                <!--
+                <option value="abc" data-section="section/ayy" data-index="1">abc</option>
+                <option value="ayyy" >ayyy</option>
+                <option value="disabled1" readonly>wow it's readonly</option>
+                <option value="disabled2" readonly>also readonly!</option>
+                -->
+            </select>
+        </div>
+        <div>
+            <br>
+            <button type="submit" name="submit" id="submit">確定</button>
+            <h4 class="text-danger">按下「確定」後，系統將發信通知已勾選的與會人員！</h4>
+        </div>
+        <input type="hidden" name="create_at" value="<?php echo date("Y-m-d H:i:s"); ?>">
+        <input type="hidden" name="attend_all" id="attend_all">
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+<script>
+var tree = $("#attend").treeMultiselect({
+    allowBatchSelection: true,
+    //enableSelectAll: true,
+    //searchable: true,
+    sortable: true,
+    startCollapsed: true
+});
+$(function(){
+    $('#submit').click(function(){
+        $('#attend_all').val($("#attend").val());
+    });
+});
+</script>
+<?php include "footer.php"; ?>
diff --git a/wms/meeting-delete.php b/wms/meeting-delete.php
index 393fd523..80eff995 100644
--- a/wms/meeting-delete.php
+++ b/wms/meeting-delete.php
@@ -1,70 +1,70 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$create_at = date("Y-m-d H:i:s");
-$db_query = "select title, content, attend, creater from meeting where id = '$id'";
-$result = mysqli_query($link, $db_query);
-if ($row = mysqli_fetch_assoc($result)) {
-    // 僅限發起人有權限編輯
-    if ($row['creater'] != $user_id) {
-        echo "<script type='text/JavaScript'>";
-        echo "alert('無修改權限！');";
-        echo "history.go(-1);";
-        echo "</script>";
-    }
-
-    // 會議取消
-    $db_query = "update meeting set status = 'N' where id = '$id'";
-    $res = mysqli_query($link, $db_query);
-
-    // 刪除行事曆
-    $db_query = "delete from events where related_id = '$id'";
-    mysqli_query($link, $db_query);
-
-    if ($row["attend"]) {
-        $mail_list = [];
-        $pos = strpos($row["attend"], $row["creater"]);
-        if ($pos === false) $notice_list = $row["attend"].",".$row["creater"];
-        else $notice_list = $row["attend"];
-        $notice_list_str = str_replace(",", "','", $notice_list);
-        $sql = "select name, email from account where accountid in ('$notice_list_str')";
-        $res = mysqli_query($link, $sql);
-        $mail_list = mysqli_fetch_all($res);
-        mysqli_free_result($res);
-
-        // 新增通知
-        $title_notice = "[會議取消]".$row["title"];
-        $db_query  = "insert into notice (kind, related_id, title, content, permission, creater, create_at) values (";
-        $db_query .= "'2', '$id', '$title_notice', '".$row["content"]."', '".$notice_list."', '".$row["creater"]."', '$create_at')";
-        mysqli_query($link, $db_query);
-        /*
-        // 發信
-        $mail_list = [];
-        $attend_str = str_replace(",", "','", $row["attend"]);
-        $sql = "select name, email from account where accountid in ('$attend_str')";
-        $res_a = mysqli_query($link, $sql);
-        $mail_list = mysqli_fetch_all($res_a);
-        mysqli_free_result($res_a);
-        */
-
-        include "class/Cmail.php";
-        $sendmail = new Cmail;
-        $sendmail->sendx($title_notice, $row["content"], $mail_list);
-    }
-}
-mysqli_free_result($result);
-
-
-/*
-$db_query = "delete from meeting where id = '$id'";
-mysqli_query($link, $db_query);
-
-$db_query = "delete from notice where related_id = '$id' and kind = '會議'";
-mysqli_query($link, $db_query);
-*/
-header("Refresh:0; url=meeting-index.php?function_name=meeting&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$create_at = date("Y-m-d H:i:s");
+$db_query = "select title, content, attend, creater from meeting where id = '$id'";
+$result = mysqli_query($link, $db_query);
+if ($row = mysqli_fetch_assoc($result)) {
+    // 僅限發起人有權限編輯
+    if ($row['creater'] != $user_id) {
+        echo "<script type='text/JavaScript'>";
+        echo "alert('無修改權限！');";
+        echo "history.go(-1);";
+        echo "</script>";
+    }
+
+    // 會議取消
+    $db_query = "update meeting set status = 'N' where id = '$id'";
+    $res = mysqli_query($link, $db_query);
+
+    // 刪除行事曆
+    $db_query = "delete from events where related_id = '$id'";
+    mysqli_query($link, $db_query);
+
+    if ($row["attend"]) {
+        $mail_list = [];
+        $pos = strpos($row["attend"], $row["creater"]);
+        if ($pos === false) $notice_list = $row["attend"].",".$row["creater"];
+        else $notice_list = $row["attend"];
+        $notice_list_str = str_replace(",", "','", $notice_list);
+        $sql = "select name, email from account where accountid in ('$notice_list_str')";
+        $res = mysqli_query($link, $sql);
+        $mail_list = mysqli_fetch_all($res);
+        mysqli_free_result($res);
+
+        // 新增通知
+        $title_notice = "[會議取消]".$row["title"];
+        $db_query  = "insert into notice (kind, related_id, title, content, permission, creater, create_at) values (";
+        $db_query .= "'2', '$id', '$title_notice', '".$row["content"]."', '".$notice_list."', '".$row["creater"]."', '$create_at')";
+        mysqli_query($link, $db_query);
+        /*
+        // 發信
+        $mail_list = [];
+        $attend_str = str_replace(",", "','", $row["attend"]);
+        $sql = "select name, email from account where accountid in ('$attend_str')";
+        $res_a = mysqli_query($link, $sql);
+        $mail_list = mysqli_fetch_all($res_a);
+        mysqli_free_result($res_a);
+        */
+
+        include "class/Cmail.php";
+        $sendmail = new Cmail;
+        $sendmail->sendx($title_notice, $row["content"], $mail_list);
+    }
+}
+mysqli_free_result($result);
+
+
+/*
+$db_query = "delete from meeting where id = '$id'";
+mysqli_query($link, $db_query);
+
+$db_query = "delete from notice where related_id = '$id' and kind = '會議'";
+mysqli_query($link, $db_query);
+*/
+header("Refresh:0; url=meeting-index.php?function_name=meeting&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/meeting-edit.php b/wms/meeting-edit.php
index 44ae48b2..1b4fe893 100644
--- a/wms/meeting-edit.php
+++ b/wms/meeting-edit.php
@@ -1,193 +1,193 @@
-<?php
-include "header.php"; 
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "select * from meeting where id = '$id'";
-$data = mysqli_query($link, $db_query);
-
-foreach($data as $data) :
-    // 會議時間
-    $stime_str = $etime_str = "";
-    //$now_min  = date("i");
-    //if ($now_min < 30) $next_start = date("H").":30:00";
-    //else $next_start = date("H", strtotime("+1 hour")).":00:00";
-    //$next_end = date("H:i:s", strtotime("+1 hour -1 second", strtotime($next_start)));
-    //echo $next_start."~".$next_end;
-    for ($i=8; $i<24; $i++) {
-        $hour = str_pad($i, 2, "0", STR_PAD_LEFT);
-        for ($j=0; $j<2; $j++) {
-            $min = str_pad($j*30, 2, "0", STR_PAD_LEFT);
-            $stime_sel = $hour.":".$min.":00";
-            $stime_str .= '<option value="'.$stime_sel.'"';
-            if ($data["stime"] == $stime_sel) $stime_str .= ' selected';
-            $stime_str .= '>'.substr($stime_sel, 0, 5).'</option>';
-    
-            $min = str_pad($j*30+29, 2, "0", STR_PAD_LEFT);
-            $etime_sel = $hour.":".$min.":59";
-            $etime_sel_text = date("H:i", strtotime("+1 second", strtotime($etime_sel)));
-            $etime_str .= '<option value="'.$etime_sel.'"';
-            if ($data["etime"] == $etime_sel) $etime_str .= ' selected';
-            $etime_str .= '>'.$etime_sel_text.'</option>';
-        }
-    }
-
-    //if ($data["attend"]) {
-        $attend_arr = $attend_id_arr = [];
-        //$join_str = "";
-        if ($data["attend"]) $attend_id_arr = explode(",", $data["attend"]);
-
-        // 與會人員部門選單
-        $attend_str = "";
-        $sql = "select department_id, name from department group by department_id order by department_id;";
-        $res = mysqli_query($link, $sql);
-        while ($row = mysqli_fetch_row($res)) {
-            list($department_id, $department_name) = $row;
-            $sql2 = "select accountid, name from account where department_id = '$department_id' order by role_id";
-            $res2 = mysqli_query($link, $sql2);
-            while ($row2 = mysqli_fetch_row($res2)) {
-                $attend_str .= '<option value="'.$row2[0].'" data-section="'.$department_name.'" data-index="1"';
-                if (in_array($row2[0], $attend_id_arr)) $attend_str .= ' selected';
-                $attend_str .= '>'.$row2[1].'</option>';
-            }
-            mysqli_free_result($res2);
-        }
-        mysqli_free_result($res);
-
-        /*
-        $aid_str = str_replace(",", "','", $data["attend"]);
-        $sql  = "select distinct a.accountid, a.name, d.name 'department_name' from account a, department d ";
-        $sql .= "where a.department_id = d.department_id and a.accountid in ('$aid_str')";
-        $res = mysqli_query($link, $sql);
-        while ($row = mysqli_fetch_array($res)) {
-            $attend_arr[$row["accountid"]]["name"] = $row["name"];
-            $attend_arr[$row["accountid"]]["department_name"] = $row["department_name"];
-        }
-        mysqli_free_result($res);
-        
-        foreach ($attend_id_arr as $k => $v) {
-            $join_str .= '<div class="item" data-key="'.$k.'" data-value="'.$v.'"><span class="remove-selected">×</span>'.$attend_arr[$v]["name"].'<span class="section-name">'.$attend_arr[$v]["department_name"].'</span></div>';
-        }
-        */
-        
-    //}
-/*
-<div class="selected ui-sortable">
-
-<div class="item" data-key="0" data-value="M0001">
-<span class="remove-selected">×</span>許作名<span class="section-name">管理總處</span>
-</div>
-
-<div class="item" data-key="1" data-value="M0006">
-<span class="remove-selected">×</span>蔡定憲<span class="section-name">管理總處</span>
-</div>
-
-<div class="item" data-key="2" data-value="M0010">
-<span class="remove-selected">×</span>葉俊麟<span class="section-name">管理總處</span>
-</div>
-
-<div class="item" data-key="3" data-value="M0093">
-<span class="remove-selected">×</span>江振寬<span class="section-name">管理總處</span>
-</div>
-
-</div>
-
-*/
-?>
-<link rel="stylesheet" href="css/tree/jquery.tree-multiselect.min.css">
-<script src="css/tree/jquery-ui.min.js"></script>
-<script src="css/tree/jquery.tree-multiselect.js"></script>
-
-<div class="container">
-    <form class="form-inline" method="post" action="meeting-record-update.php">
-        <div>
-            <label for="title">會議主題</label>
-            <input type="text" name="title" id="title" size="30" maxlength="25" value="<?php echo $data['title']; ?>" required>
-        </div>
-        <div>
-            <label for="mdate">會議日期</label><br>
-            <input type="date" name="mdate" id="mdate" class="form-control" value="<?php echo $data['mdate']; ?>" required>
-        </div>
-        <div>
-            <label for="stime">開始時間</label><br>
-            <select name="stime">
-                <?php echo $stime_str; ?>
-            </select>
-        </div>
-        <div>
-            <label for="etime">結束時間</label><br>
-            <select name="etime">
-                <?php echo $etime_str; ?>
-            </select>
-        </div>
-        <div>
-            <label for="room">地點</label>
-            <select name="room" id="room" required>
-                <option value="">請選擇</option>
-                <option value="1"<?php if ($data['room']==1) echo " selected"; ?>>C區會議室1</option>
-                <option value="2"<?php if ($data['room']==2) echo " selected"; ?>>C區會議室2</option>
-                <option value="3"<?php if ($data['room']==3) echo " selected"; ?>>大直會議室</option>
-                <option value="4"<?php if ($data['room']==4) echo " selected"; ?>>網路會議</option>
-                <option value="5"<?php if ($data['room']==5) echo " selected"; ?>>其他</option>
-            </select>
-        </div>
-        <div>
-            <label for="equip">使用資源</label>
-            <input type="text" name="equip" id="equip" value="<?php echo $data['equip']; ?>" size="30" maxlength="25">
-        </div>
-        <div>
-            <label for="content">會議內容</label><br>
-            <textarea class="form-control" name="content" id="content" rows="8" cols="70" required><?php echo $data['content']; ?></textarea>
-        </div>
-        <div style="width:100%">
-            <label for="attend">與會人員</label><br>
-            <select id="attend" multiple="multiple">
-            <?php echo $attend_str; ?>
-            </select>
-        </div>
-        <?php if (($user_auth&2) && $data["creater"] == $user_id) { ?>
-        <div>
-            <br>
-            <button type="submit" name="update" id="update">確定</button>
-            <h4 class="text-danger">按下「確定」後，系統將發信通知已勾選的與會人員！</h4>
-        </div>
-        <?php } ?>
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-        <input type="hidden" name="creater" value="<?php echo $data["creater"]; ?>">
-        <input type="hidden" name="create_at" value="<?php echo date("Y-m-d H:i:s"); ?>">
-        <input type="hidden" name="attend_all" id="attend_all">
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-<script>
-var tree = $("#attend").treeMultiselect({
-    allowBatchSelection: true,
-    //enableSelectAll: true,
-    //searchable: true,
-    sortable: true,
-    startCollapsed: true
-});
-$(function(){
-    /*
-// 先不提供編輯人員功能
-$('.selections').hide();
-$('.item').each(function(){
-    $('.remove-selected').remove();
-})
-*/
-//////////////////////////////////////////
-
-
-
-
-    //$('.ui-sortable').html('<?php echo $join_str; ?>');
-    $('#update').click(function(){
-        $('#attend_all').val($("#attend").val());
-    });
-});
-</script>
-<?php
-endforeach;
-
-include "footer.php";
+<?php
+include "header.php"; 
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "select * from meeting where id = '$id'";
+$data = mysqli_query($link, $db_query);
+
+foreach($data as $data) :
+    // 會議時間
+    $stime_str = $etime_str = "";
+    //$now_min  = date("i");
+    //if ($now_min < 30) $next_start = date("H").":30:00";
+    //else $next_start = date("H", strtotime("+1 hour")).":00:00";
+    //$next_end = date("H:i:s", strtotime("+1 hour -1 second", strtotime($next_start)));
+    //echo $next_start."~".$next_end;
+    for ($i=8; $i<24; $i++) {
+        $hour = str_pad($i, 2, "0", STR_PAD_LEFT);
+        for ($j=0; $j<2; $j++) {
+            $min = str_pad($j*30, 2, "0", STR_PAD_LEFT);
+            $stime_sel = $hour.":".$min.":00";
+            $stime_str .= '<option value="'.$stime_sel.'"';
+            if ($data["stime"] == $stime_sel) $stime_str .= ' selected';
+            $stime_str .= '>'.substr($stime_sel, 0, 5).'</option>';
+    
+            $min = str_pad($j*30+29, 2, "0", STR_PAD_LEFT);
+            $etime_sel = $hour.":".$min.":59";
+            $etime_sel_text = date("H:i", strtotime("+1 second", strtotime($etime_sel)));
+            $etime_str .= '<option value="'.$etime_sel.'"';
+            if ($data["etime"] == $etime_sel) $etime_str .= ' selected';
+            $etime_str .= '>'.$etime_sel_text.'</option>';
+        }
+    }
+
+    //if ($data["attend"]) {
+        $attend_arr = $attend_id_arr = [];
+        //$join_str = "";
+        if ($data["attend"]) $attend_id_arr = explode(",", $data["attend"]);
+
+        // 與會人員部門選單
+        $attend_str = "";
+        $sql = "select department_id, name from department group by department_id order by department_id;";
+        $res = mysqli_query($link, $sql);
+        while ($row = mysqli_fetch_row($res)) {
+            list($department_id, $department_name) = $row;
+            $sql2 = "select accountid, name from account where department_id = '$department_id' order by role_id";
+            $res2 = mysqli_query($link, $sql2);
+            while ($row2 = mysqli_fetch_row($res2)) {
+                $attend_str .= '<option value="'.$row2[0].'" data-section="'.$department_name.'" data-index="1"';
+                if (in_array($row2[0], $attend_id_arr)) $attend_str .= ' selected';
+                $attend_str .= '>'.$row2[1].'</option>';
+            }
+            mysqli_free_result($res2);
+        }
+        mysqli_free_result($res);
+
+        /*
+        $aid_str = str_replace(",", "','", $data["attend"]);
+        $sql  = "select distinct a.accountid, a.name, d.name 'department_name' from account a, department d ";
+        $sql .= "where a.department_id = d.department_id and a.accountid in ('$aid_str')";
+        $res = mysqli_query($link, $sql);
+        while ($row = mysqli_fetch_array($res)) {
+            $attend_arr[$row["accountid"]]["name"] = $row["name"];
+            $attend_arr[$row["accountid"]]["department_name"] = $row["department_name"];
+        }
+        mysqli_free_result($res);
+        
+        foreach ($attend_id_arr as $k => $v) {
+            $join_str .= '<div class="item" data-key="'.$k.'" data-value="'.$v.'"><span class="remove-selected">×</span>'.$attend_arr[$v]["name"].'<span class="section-name">'.$attend_arr[$v]["department_name"].'</span></div>';
+        }
+        */
+        
+    //}
+/*
+<div class="selected ui-sortable">
+
+<div class="item" data-key="0" data-value="M0001">
+<span class="remove-selected">×</span>許作名<span class="section-name">管理總處</span>
+</div>
+
+<div class="item" data-key="1" data-value="M0006">
+<span class="remove-selected">×</span>蔡定憲<span class="section-name">管理總處</span>
+</div>
+
+<div class="item" data-key="2" data-value="M0010">
+<span class="remove-selected">×</span>葉俊麟<span class="section-name">管理總處</span>
+</div>
+
+<div class="item" data-key="3" data-value="M0093">
+<span class="remove-selected">×</span>江振寬<span class="section-name">管理總處</span>
+</div>
+
+</div>
+
+*/
+?>
+<link rel="stylesheet" href="css/tree/jquery.tree-multiselect.min.css">
+<script src="css/tree/jquery-ui.min.js"></script>
+<script src="css/tree/jquery.tree-multiselect.js"></script>
+
+<div class="container">
+    <form class="form-inline" method="post" action="meeting-record-update.php">
+        <div>
+            <label for="title">會議主題</label>
+            <input type="text" name="title" id="title" size="30" maxlength="25" value="<?php echo $data['title']; ?>" required>
+        </div>
+        <div>
+            <label for="mdate">會議日期</label><br>
+            <input type="date" name="mdate" id="mdate" class="form-control" value="<?php echo $data['mdate']; ?>" required>
+        </div>
+        <div>
+            <label for="stime">開始時間</label><br>
+            <select name="stime">
+                <?php echo $stime_str; ?>
+            </select>
+        </div>
+        <div>
+            <label for="etime">結束時間</label><br>
+            <select name="etime">
+                <?php echo $etime_str; ?>
+            </select>
+        </div>
+        <div>
+            <label for="room">地點</label>
+            <select name="room" id="room" required>
+                <option value="">請選擇</option>
+                <option value="1"<?php if ($data['room']==1) echo " selected"; ?>>C區會議室1</option>
+                <option value="2"<?php if ($data['room']==2) echo " selected"; ?>>C區會議室2</option>
+                <option value="3"<?php if ($data['room']==3) echo " selected"; ?>>大直會議室</option>
+                <option value="4"<?php if ($data['room']==4) echo " selected"; ?>>網路會議</option>
+                <option value="5"<?php if ($data['room']==5) echo " selected"; ?>>其他</option>
+            </select>
+        </div>
+        <div>
+            <label for="equip">使用資源</label>
+            <input type="text" name="equip" id="equip" value="<?php echo $data['equip']; ?>" size="30" maxlength="25">
+        </div>
+        <div>
+            <label for="content">會議內容</label><br>
+            <textarea class="form-control" name="content" id="content" rows="8" cols="70" required><?php echo $data['content']; ?></textarea>
+        </div>
+        <div style="width:100%">
+            <label for="attend">與會人員</label><br>
+            <select id="attend" multiple="multiple">
+            <?php echo $attend_str; ?>
+            </select>
+        </div>
+        <?php if (($user_auth&2) && $data["creater"] == $user_id) { ?>
+        <div>
+            <br>
+            <button type="submit" name="update" id="update">確定</button>
+            <h4 class="text-danger">按下「確定」後，系統將發信通知已勾選的與會人員！</h4>
+        </div>
+        <?php } ?>
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+        <input type="hidden" name="creater" value="<?php echo $data["creater"]; ?>">
+        <input type="hidden" name="create_at" value="<?php echo date("Y-m-d H:i:s"); ?>">
+        <input type="hidden" name="attend_all" id="attend_all">
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+<script>
+var tree = $("#attend").treeMultiselect({
+    allowBatchSelection: true,
+    //enableSelectAll: true,
+    //searchable: true,
+    sortable: true,
+    startCollapsed: true
+});
+$(function(){
+    /*
+// 先不提供編輯人員功能
+$('.selections').hide();
+$('.item').each(function(){
+    $('.remove-selected').remove();
+})
+*/
+//////////////////////////////////////////
+
+
+
+
+    //$('.ui-sortable').html('<?php echo $join_str; ?>');
+    $('#update').click(function(){
+        $('#attend_all').val($("#attend").val());
+    });
+});
+</script>
+<?php
+endforeach;
+
+include "footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/meeting-index.php b/wms/meeting-index.php
index c14cce46..019f7e9f 100644
--- a/wms/meeting-index.php
+++ b/wms/meeting-index.php
@@ -1,127 +1,127 @@
-<?php
-include "header.php";
-
-$room_arr = ["1" => "C區會議室1", "2" => "C區會議室2", "3" => "大直會議室"];
-$etime_arr = ["07:59" => "08:00", "08:29" => "08:30", "08:59" => "09:00", "09:29" => "09:30", "09:59" => "10:00", "10:29" => "10:30", 
-              "10:59" => "11:00", "11:29" => "11:30", "11:59" => "12:00", "12:29" => "12:30", "12:59" => "13:00", "13:29" => "13:30", 
-              "13:59" => "14:00", "14:29" => "14:30", "14:59" => "15:00", "15:29" => "15:30", "15:59" => "16:00", "16:29" => "16:30", 
-              "16:59" => "17:00", "17:29" => "17:30", "17:59" => "18:00", "18:29" => "18:30", "18:59" => "19:00", "19:29" => "19:30", 
-              "19:59" => "20:00", "20:29" => "20:30", "20:59" => "21:00", "21:29" => "21:30", "21:59" => "22:00", "22:29" => "22:30", 
-              "22:59" => "23:00", "23:29" => "23:30", "23:59" => "00:00"]; 
-
-// 設置一個空陣列來放資料
-$data = array();
-
-// sql語法存在變數中
-$sql = "select * from meeting where (creater = '$user_id' or attend like '%$user_id%') order by id";
-
-// 用mysqli_query方法執行(sql語法)將結果存在變數中
-$data = mysqli_query($link,$sql);
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="meeting-create.php?function_name=meeting&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-
-<?php
-}
-if($data):
-?>
-
-<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;
-   
-}
-
-</style>
-<div style="overflow-x:auto;">
-    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-    <thead>
-        <tr>
-            <th>項次</th>
-            <th>會議主題</th>
-            <th>日期</th>
-            <th>開始時間</th>
-            <th>結束時間</th>
-            <th>地點</th>
-            <th>狀態</th>
-            <th>建檔人</th>
-            <th>建檔時間</th>
-            <?php if ($user_auth&2) { ?>
-            <th>取消</th>
-            <?php } ?>
-        </tr>
-    </thead>
-    <tbody>
-    <?php foreach($data as $data) : ?>
-        <tr>
-            <td><?php echo $data['id']; ?></td>
-            <td><a href="meeting-edit.php?id=<?php echo $data['id']; ?>&function_name=meeting&<?php echo $token_link; ?>"><?php echo $data['title']; ?></a></td>
-            <td><?php echo $data['mdate']; ?></td>
-            <td><?php echo substr($data['stime'], 0, 5); ?></td>
-            <td><?php echo $etime_arr[substr($data['etime'], 0, 5)]; ?></td>
-            <td><?php echo $room_arr[$data['room']]; ?></td>
-            <td><?php if ($data['status']=="Y")  echo "正常"; else echo "已取消"; ?></td>
-            <td><?php echo $data['creater']; ?></td>
-            <td><?php echo $data['create_at']; ?></td>
-            <?php if ($user_auth&2) { ?>
-            <td>
-                <p>
-                <?php if (($data['creater'] == $user_id) && ($data['status']=="Y")) { ?>
-                    <a href="meeting-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-                        <span class="glyphicon glyphicon-remove"></span>
-                    </a>
-                <?php } else echo "-"; ?>
-                </p>
-            </td>
-            <?php } ?>
-        </tr>
-    <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
+<?php
+include "header.php";
+
+$room_arr = ["1" => "C區會議室1", "2" => "C區會議室2", "3" => "大直會議室"];
+$etime_arr = ["07:59" => "08:00", "08:29" => "08:30", "08:59" => "09:00", "09:29" => "09:30", "09:59" => "10:00", "10:29" => "10:30", 
+              "10:59" => "11:00", "11:29" => "11:30", "11:59" => "12:00", "12:29" => "12:30", "12:59" => "13:00", "13:29" => "13:30", 
+              "13:59" => "14:00", "14:29" => "14:30", "14:59" => "15:00", "15:29" => "15:30", "15:59" => "16:00", "16:29" => "16:30", 
+              "16:59" => "17:00", "17:29" => "17:30", "17:59" => "18:00", "18:29" => "18:30", "18:59" => "19:00", "19:29" => "19:30", 
+              "19:59" => "20:00", "20:29" => "20:30", "20:59" => "21:00", "21:29" => "21:30", "21:59" => "22:00", "22:29" => "22:30", 
+              "22:59" => "23:00", "23:29" => "23:30", "23:59" => "00:00"]; 
+
+// 設置一個空陣列來放資料
+$data = array();
+
+// sql語法存在變數中
+$sql = "select * from meeting where (creater = '$user_id' or attend like '%$user_id%') order by id";
+
+// 用mysqli_query方法執行(sql語法)將結果存在變數中
+$data = mysqli_query($link,$sql);
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth&2) { ?>
+<p>
+<a href="meeting-create.php?function_name=meeting&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+
+<?php
+}
+if($data):
+?>
+
+<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;
+   
+}
+
+</style>
+<div style="overflow-x:auto;">
+    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+    <thead>
+        <tr>
+            <th>項次</th>
+            <th>會議主題</th>
+            <th>日期</th>
+            <th>開始時間</th>
+            <th>結束時間</th>
+            <th>地點</th>
+            <th>狀態</th>
+            <th>建檔人</th>
+            <th>建檔時間</th>
+            <?php if ($user_auth&2) { ?>
+            <th>取消</th>
+            <?php } ?>
+        </tr>
+    </thead>
+    <tbody>
+    <?php foreach($data as $data) : ?>
+        <tr>
+            <td><?php echo $data['id']; ?></td>
+            <td><a href="meeting-edit.php?id=<?php echo $data['id']; ?>&function_name=meeting&<?php echo $token_link; ?>"><?php echo $data['title']; ?></a></td>
+            <td><?php echo $data['mdate']; ?></td>
+            <td><?php echo substr($data['stime'], 0, 5); ?></td>
+            <td><?php echo $etime_arr[substr($data['etime'], 0, 5)]; ?></td>
+            <td><?php echo $room_arr[$data['room']]; ?></td>
+            <td><?php if ($data['status']=="Y")  echo "正常"; else echo "已取消"; ?></td>
+            <td><?php echo $data['creater']; ?></td>
+            <td><?php echo $data['create_at']; ?></td>
+            <?php if ($user_auth&2) { ?>
+            <td>
+                <p>
+                <?php if (($data['creater'] == $user_id) && ($data['status']=="Y")) { ?>
+                    <a href="meeting-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+                        <span class="glyphicon glyphicon-remove"></span>
+                    </a>
+                <?php } else echo "-"; ?>
+                </p>
+            </td>
+            <?php } ?>
+        </tr>
+    <?php endforeach; ?>
+        </tbody>
+    </table>
+</div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/meeting-record-submit.php b/wms/meeting-record-submit.php
index d5d20cbc..d2d91fc3 100644
--- a/wms/meeting-record-submit.php
+++ b/wms/meeting-record-submit.php
@@ -1,79 +1,79 @@
-<?php
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    foreach ($_POST as $k => $v) {
-        $$k = htmlspecialchars(stripslashes(trim($v)));
-    }
-
-    // 發信名單
-    $mail_list = [];
-    // 與會人員名單:$attend_all
-    // 會議發起人也發系統通知及會議通知:$notice_list
-    if ($attend_all) {
-        $pos = strpos($attend_all, $user_id);
-        if ($pos === false) $notice_list = $attend_all.",".$user_id;
-        else $notice_list = $attend_all;
-        $notice_list_str = str_replace(",", "','", $notice_list);
-        $sql = "select name, email from account where accountid in ('$notice_list_str')";
-        $res = mysqli_query($link, $sql);
-        $mail_list = mysqli_fetch_all($res);
-        mysqli_free_result($res);
-    }
-
-    // 會議時間是否重覆
-    $check_sdate = $mdate." ".$stime;
-    $check_edate = $mdate." ".$etime;
-    $db_query  = "select count(*) from meeting where ( ";
-    $db_query .= "('$check_edate' >= concat(mdate, ' ', stime) && '$check_edate' <= concat(mdate, ' ', etime)) or ";
-    $db_query .= "('$check_sdate' >= concat(mdate, ' ', stime) && '$check_sdate' <= concat(mdate, ' ', etime))) and room = '$room'";
-    $result = mysqli_query($link, $db_query);
-    $row = mysqli_fetch_row($result);
-    if ($row[0] > 0) {
-        echo "<script type='text/JavaScript'>";
-        echo "alert('無法建立此會議，請確認會議時間是否衝突或會議室是否已有人預訂。');";
-        echo "history.go(-1);";
-        echo "</script>";
-    } else {
-        // 儲存會議資料
-        $db_query  = "insert into meeting (title, mdate, stime, etime, room, content, equip, status, attend, creater, create_at) values (";
-        $db_query .= "'$title', '$mdate', '$stime', '$etime', '$room', '$content', '$equip', 'Y', '$attend_all', '$user_id', '$create_at')";
-        $result = mysqli_query($link, $db_query);
-        if (mysqli_affected_rows($link) > 0) {
-            $new_id = mysqli_insert_id($link);  // 會議流水號
-
-            if ($attend_all) {
-                // 通知列表
-                $sql = "insert into notice (kind, related_id, title, content, permission, creater, create_at) values ('2', '$new_id', '$title', '$content', '$notice_list', '$user_id', '$create_at')";
-                $res = mysqli_query($link, $sql);
-
-                // 寫入行事曆/會議:橘色
-                $notice_list_arr = explode(",", $notice_list);
-                foreach ($notice_list_arr as $accountid) {
-                    $sql = "insert into events (related_id, accountid, title, description, color, date) values ('$new_id', '$accountid', '$title', '$content', '#FF5809', '$check_sdate')"; 
-                    $res = mysqli_query($link, $sql);
-                }
-
-                // 發信
-                include "class/Cmail.php";
-                $sendmail = new Cmail;
-                $sendmail->sendx($title, $content, $mail_list);
-            }
-
-            if (mysqli_affected_rows($link) > 0) {
-                mysqli_close($link);
-                echo "<script type ='text/JavaScript'>";
-                echo "alert('新增成功');";
-                echo "location.href='meeting-index.php?function_name=meeting&token=".$token."';";
-                echo "</script>";
-            }
-        } elseif (mysqli_affected_rows($link)==0) {
-            mysqli_close($link);
-            echo "<script type ='text/JavaScript'>";
-            echo "alert('無新增資料');";
-            echo "location.href='meeting-index.php?function_name=meeting&token=".$token."';";
-            echo "</script>";
-        } else {
-            echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-        }
-    }
-}
+<?php
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    foreach ($_POST as $k => $v) {
+        $$k = htmlspecialchars(stripslashes(trim($v)));
+    }
+
+    // 發信名單
+    $mail_list = [];
+    // 與會人員名單:$attend_all
+    // 會議發起人也發系統通知及會議通知:$notice_list
+    if ($attend_all) {
+        $pos = strpos($attend_all, $user_id);
+        if ($pos === false) $notice_list = $attend_all.",".$user_id;
+        else $notice_list = $attend_all;
+        $notice_list_str = str_replace(",", "','", $notice_list);
+        $sql = "select name, email from account where accountid in ('$notice_list_str')";
+        $res = mysqli_query($link, $sql);
+        $mail_list = mysqli_fetch_all($res);
+        mysqli_free_result($res);
+    }
+
+    // 會議時間是否重覆
+    $check_sdate = $mdate." ".$stime;
+    $check_edate = $mdate." ".$etime;
+    $db_query  = "select count(*) from meeting where ( ";
+    $db_query .= "('$check_edate' >= concat(mdate, ' ', stime) && '$check_edate' <= concat(mdate, ' ', etime)) or ";
+    $db_query .= "('$check_sdate' >= concat(mdate, ' ', stime) && '$check_sdate' <= concat(mdate, ' ', etime))) and room = '$room'";
+    $result = mysqli_query($link, $db_query);
+    $row = mysqli_fetch_row($result);
+    if ($row[0] > 0) {
+        echo "<script type='text/JavaScript'>";
+        echo "alert('無法建立此會議，請確認會議時間是否衝突或會議室是否已有人預訂。');";
+        echo "history.go(-1);";
+        echo "</script>";
+    } else {
+        // 儲存會議資料
+        $db_query  = "insert into meeting (title, mdate, stime, etime, room, content, equip, status, attend, creater, create_at) values (";
+        $db_query .= "'$title', '$mdate', '$stime', '$etime', '$room', '$content', '$equip', 'Y', '$attend_all', '$user_id', '$create_at')";
+        $result = mysqli_query($link, $db_query);
+        if (mysqli_affected_rows($link) > 0) {
+            $new_id = mysqli_insert_id($link);  // 會議流水號
+
+            if ($attend_all) {
+                // 通知列表
+                $sql = "insert into notice (kind, related_id, title, content, permission, creater, create_at) values ('2', '$new_id', '$title', '$content', '$notice_list', '$user_id', '$create_at')";
+                $res = mysqli_query($link, $sql);
+
+                // 寫入行事曆/會議:橘色
+                $notice_list_arr = explode(",", $notice_list);
+                foreach ($notice_list_arr as $accountid) {
+                    $sql = "insert into events (related_id, accountid, title, description, color, date) values ('$new_id', '$accountid', '$title', '$content', '#FF5809', '$check_sdate')"; 
+                    $res = mysqli_query($link, $sql);
+                }
+
+                // 發信
+                include "class/Cmail.php";
+                $sendmail = new Cmail;
+                $sendmail->sendx($title, $content, $mail_list);
+            }
+
+            if (mysqli_affected_rows($link) > 0) {
+                mysqli_close($link);
+                echo "<script type ='text/JavaScript'>";
+                echo "alert('新增成功');";
+                echo "location.href='meeting-index.php?function_name=meeting&token=".$token."';";
+                echo "</script>";
+            }
+        } elseif (mysqli_affected_rows($link)==0) {
+            mysqli_close($link);
+            echo "<script type ='text/JavaScript'>";
+            echo "alert('無新增資料');";
+            echo "location.href='meeting-index.php?function_name=meeting&token=".$token."';";
+            echo "</script>";
+        } else {
+            echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+        }
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/meeting-record-update.php b/wms/meeting-record-update.php
index 5e9dce97..ada83db1 100644
--- a/wms/meeting-record-update.php
+++ b/wms/meeting-record-update.php
@@ -1,104 +1,104 @@
-<?php
-include "header.php";
-
-if (isset($_POST['update'])) {
-    foreach ($_POST as $k => $v) {
-        $$k = htmlspecialchars(stripslashes(trim($v)));
-    }
-    //print_r($_POST);exit;
-
-    // 僅限發起人有權限編輯
-    if ($creater != $user_id) {
-        echo "<script type='text/JavaScript'>";
-        echo "alert('無修改權限！');";
-        echo "history.go(-1);";
-        echo "</script>";
-    }
-
-    // 發信名單
-    /*
-    $mail_list = [];
-    // 與會人員名單:$attend_all
-    // 會議發起人也發系統通知及會議通知:$notice_list
-    if ($attend_all) {
-        $pos = strpos($attend_all, $user_id);
-        if ($pos === false) $notice_list = $attend_all.",".$user_id;
-        else $notice_list = $attend_all;
-        $notice_list_str = str_replace(",", "','", $notice_list);
-        $sql = "select name, email from account where accountid in ('$notice_list_str')";
-        $res = mysqli_query($link, $sql);
-        $mail_list = mysqli_fetch_all($res);
-        mysqli_free_result($res);
-    }
-    */
-
-    // 會議時間是否重覆
-    $check_sdate = $mdate." ".$stime;
-    $check_edate = $mdate." ".$etime;
-    $db_query  = "select count(*) from meeting where ( ";
-    $db_query .= "('$check_edate' >= concat(mdate, ' ', stime) && '$check_edate' <= concat(mdate, ' ', etime)) or ";
-    $db_query .= "('$check_sdate' >= concat(mdate, ' ', stime) && '$check_sdate' <= concat(mdate, ' ', etime))) and room = '$room' and status = 'Y' and id <> '$id'";
-    $result = mysqli_query($link, $db_query);
-    $row = mysqli_fetch_row($result);
-    if ($row[0] > 0) {
-        echo "<script type='text/JavaScript'>";
-        echo "alert('無法建立此會議，請確認會議時間是否衝突或會議室是否已有人預訂。');";
-        echo "history.go(-1);";
-        echo "</script>";
-    } else {
-        $mail_list = [];
-        // 原先與會人員
-        $db_query = "select attend from meeting where id = '$id'";
-        $res = mysqli_query($link, $db_query);
-        $row_a = mysqli_fetch_assoc($res);
-        $attend_all_ori = $row_a["attend"];
-        mysqli_free_result($res);
-        $attend_all_new = $attend_all.",".$attend_all_ori;
-        $pos = strpos($attend_all_new, $creater);
-        if ($pos === false) $notice_list = $attend_all_new.",".$creater;
-        else $notice_list = $attend_all_new;
-        $notice_list_arr = explode(",", $notice_list);
-        $notice_all_arr = array_unique($notice_list_arr);   // 需要通知的人員
-        $notice_all = implode(",", $notice_all_arr);
-        $notice_all_str = implode("','", $notice_all_arr);
-        $sql = "select name, email from account where accountid in ('$notice_all_str')";
-        $res = mysqli_query($link, $sql);
-        $mail_list = mysqli_fetch_all($res);
-        mysqli_free_result($res);
-
-        // 更新會議資料
-        $db_query  = "update meeting set title = '$title', mdate = '$mdate', stime = '$stime', etime = '$etime', room = '$room', content = '$content', ";
-        $db_query .= "equip = '$equip', attend = '$attend_all', create_at = '$create_at' ";
-        $db_query .= "where id = '$id'";
-        $res = mysqli_query($link, $db_query);
-
-        // 通知列表
-        if ($notice_all) {
-            $title_notice = "[會議異動]".$title;
-            $db_query  = "insert into notice (kind, related_id, title, content, permission, creater, create_at) values (";
-            $db_query .= "'2', '$id', '$title_notice', '$content', '$notice_all', '$creater', '$create_at')";
-            $res = mysqli_query($link, $db_query);
-
-            // 寫入行事曆/會議:橘色
-            $db_query = "delete from events where related_id = '$id'";
-            $res = mysqli_query($link, $db_query);
-            foreach ($notice_all_arr as $accountid) {
-                $sql = "insert into events (related_id, accountid, title, description, color, date) values ('$id', '$accountid', '$title.', '$content', '#FF5809', '$check_sdate')"; 
-                $res = mysqli_query($link, $sql);
-            }
-
-            // 發信
-            include "class/Cmail.php";
-            $sendmail = new Cmail;
-            $sendmail->sendx($title_notice, $content, $mail_list);
-        }
-
-        mysqli_close($link);
-
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('修改成功');";
-        echo "location.href='meeting-index.php?function_name=meeting&token=".$token."';";
-        echo "</script>";
-    }
-}
+<?php
+include "header.php";
+
+if (isset($_POST['update'])) {
+    foreach ($_POST as $k => $v) {
+        $$k = htmlspecialchars(stripslashes(trim($v)));
+    }
+    //print_r($_POST);exit;
+
+    // 僅限發起人有權限編輯
+    if ($creater != $user_id) {
+        echo "<script type='text/JavaScript'>";
+        echo "alert('無修改權限！');";
+        echo "history.go(-1);";
+        echo "</script>";
+    }
+
+    // 發信名單
+    /*
+    $mail_list = [];
+    // 與會人員名單:$attend_all
+    // 會議發起人也發系統通知及會議通知:$notice_list
+    if ($attend_all) {
+        $pos = strpos($attend_all, $user_id);
+        if ($pos === false) $notice_list = $attend_all.",".$user_id;
+        else $notice_list = $attend_all;
+        $notice_list_str = str_replace(",", "','", $notice_list);
+        $sql = "select name, email from account where accountid in ('$notice_list_str')";
+        $res = mysqli_query($link, $sql);
+        $mail_list = mysqli_fetch_all($res);
+        mysqli_free_result($res);
+    }
+    */
+
+    // 會議時間是否重覆
+    $check_sdate = $mdate." ".$stime;
+    $check_edate = $mdate." ".$etime;
+    $db_query  = "select count(*) from meeting where ( ";
+    $db_query .= "('$check_edate' >= concat(mdate, ' ', stime) && '$check_edate' <= concat(mdate, ' ', etime)) or ";
+    $db_query .= "('$check_sdate' >= concat(mdate, ' ', stime) && '$check_sdate' <= concat(mdate, ' ', etime))) and room = '$room' and status = 'Y' and id <> '$id'";
+    $result = mysqli_query($link, $db_query);
+    $row = mysqli_fetch_row($result);
+    if ($row[0] > 0) {
+        echo "<script type='text/JavaScript'>";
+        echo "alert('無法建立此會議，請確認會議時間是否衝突或會議室是否已有人預訂。');";
+        echo "history.go(-1);";
+        echo "</script>";
+    } else {
+        $mail_list = [];
+        // 原先與會人員
+        $db_query = "select attend from meeting where id = '$id'";
+        $res = mysqli_query($link, $db_query);
+        $row_a = mysqli_fetch_assoc($res);
+        $attend_all_ori = $row_a["attend"];
+        mysqli_free_result($res);
+        $attend_all_new = $attend_all.",".$attend_all_ori;
+        $pos = strpos($attend_all_new, $creater);
+        if ($pos === false) $notice_list = $attend_all_new.",".$creater;
+        else $notice_list = $attend_all_new;
+        $notice_list_arr = explode(",", $notice_list);
+        $notice_all_arr = array_unique($notice_list_arr);   // 需要通知的人員
+        $notice_all = implode(",", $notice_all_arr);
+        $notice_all_str = implode("','", $notice_all_arr);
+        $sql = "select name, email from account where accountid in ('$notice_all_str')";
+        $res = mysqli_query($link, $sql);
+        $mail_list = mysqli_fetch_all($res);
+        mysqli_free_result($res);
+
+        // 更新會議資料
+        $db_query  = "update meeting set title = '$title', mdate = '$mdate', stime = '$stime', etime = '$etime', room = '$room', content = '$content', ";
+        $db_query .= "equip = '$equip', attend = '$attend_all', create_at = '$create_at' ";
+        $db_query .= "where id = '$id'";
+        $res = mysqli_query($link, $db_query);
+
+        // 通知列表
+        if ($notice_all) {
+            $title_notice = "[會議異動]".$title;
+            $db_query  = "insert into notice (kind, related_id, title, content, permission, creater, create_at) values (";
+            $db_query .= "'2', '$id', '$title_notice', '$content', '$notice_all', '$creater', '$create_at')";
+            $res = mysqli_query($link, $db_query);
+
+            // 寫入行事曆/會議:橘色
+            $db_query = "delete from events where related_id = '$id'";
+            $res = mysqli_query($link, $db_query);
+            foreach ($notice_all_arr as $accountid) {
+                $sql = "insert into events (related_id, accountid, title, description, color, date) values ('$id', '$accountid', '$title.', '$content', '#FF5809', '$check_sdate')"; 
+                $res = mysqli_query($link, $sql);
+            }
+
+            // 發信
+            include "class/Cmail.php";
+            $sendmail = new Cmail;
+            $sendmail->sendx($title_notice, $content, $mail_list);
+        }
+
+        mysqli_close($link);
+
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('修改成功');";
+        echo "location.href='meeting-index.php?function_name=meeting&token=".$token."';";
+        echo "</script>";
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/menu-create.php b/wms/menu-create.php
index ab991b23..2e2ca053 100644
--- a/wms/menu-create.php
+++ b/wms/menu-create.php
@@ -1,97 +1,97 @@
-<?php
-include "header.php";
-$creater_error = "";
-$create_at_error = "";
-?>
-<script>
-$(function () {
-    
-});
-</script>
-<div class="container">
-
-    <?php
-    
-        include "menu-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        <div>
-            <label for="main_menu">主功能名稱</label>
-            <input type="text" name="main_menu" id="main_menu" required>
-        </div>
-        <div>
-            <label for="main_menu_seq">主功能排序</label>
-            <select name="main_menu_seq" id="main_menu_seq">
-                <?php
-                for ($i=1;$i<21;$i++) {
-                    echo '<option value="'.$i.'">'.$i.'</option>';
-                }
-                ?>
-            </select>
-        </div>
-        <div>
-            <label for="sub_menu">子功能名稱</label>
-            <input type="text" name="sub_menu" id="sub_menu" required>
-        </div>
-        <div>
-            <label for="sub_menu_seq">子功能排序</label>
-            <select name="sub_menu_seq" id="sub_menu_seq">
-                <?php
-                for ($i=1;$i<21;$i++) {
-                    echo '<option value="'.$i.'">'.$i.'</option>';
-                }
-                ?>
-            </select>
-        </div>
-        <div>
-            <label for="sub_menu_eng">子功能英文名</label>
-            <input type="text" name="sub_menu_eng" id="sub_menu_eng" required>
-        </div>
-        <div>
-            <label for="mlink">主網址</label>
-            <input type="text" name="mlink" id="mlink" size="30" placeholder="/wms/" required>
-        </div>
-        <div>
-            <label for="link_content">程式列表</label>
-            <textarea name="link_content" id="link_content" rows="10" cols="60" class="form-control" required></textarea>
-        </div>
-        <div>
-            <label for="status">狀態</label>
-            <select name="status" id="status">
-                <option value="N">隱藏</option>
-                <!--<option value="T">測試</option>-->
-                <option value="Y">正常</option>
-            </select>
-        </div>
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
-            <p class="error"><?php echo $creater_error; ?></p>
-        </div>
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at" value="<?php echo date("Y-m-d H:i:s"); ?>">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-        <div>
-            <br>
-            <button type="submit" name="submit">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
+<?php
+include "header.php";
+$creater_error = "";
+$create_at_error = "";
+?>
+<script>
+$(function () {
+    
+});
+</script>
+<div class="container">
+
+    <?php
+    
+        include "menu-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        <div>
+            <label for="main_menu">主功能名稱</label>
+            <input type="text" name="main_menu" id="main_menu" required>
+        </div>
+        <div>
+            <label for="main_menu_seq">主功能排序</label>
+            <select name="main_menu_seq" id="main_menu_seq">
+                <?php
+                for ($i=1;$i<21;$i++) {
+                    echo '<option value="'.$i.'">'.$i.'</option>';
+                }
+                ?>
+            </select>
+        </div>
+        <div>
+            <label for="sub_menu">子功能名稱</label>
+            <input type="text" name="sub_menu" id="sub_menu" required>
+        </div>
+        <div>
+            <label for="sub_menu_seq">子功能排序</label>
+            <select name="sub_menu_seq" id="sub_menu_seq">
+                <?php
+                for ($i=1;$i<21;$i++) {
+                    echo '<option value="'.$i.'">'.$i.'</option>';
+                }
+                ?>
+            </select>
+        </div>
+        <div>
+            <label for="sub_menu_eng">子功能英文名</label>
+            <input type="text" name="sub_menu_eng" id="sub_menu_eng" required>
+        </div>
+        <div>
+            <label for="mlink">主網址</label>
+            <input type="text" name="mlink" id="mlink" size="30" placeholder="/wms/" required>
+        </div>
+        <div>
+            <label for="link_content">程式列表</label>
+            <textarea name="link_content" id="link_content" rows="10" cols="60" class="form-control" required></textarea>
+        </div>
+        <div>
+            <label for="status">狀態</label>
+            <select name="status" id="status">
+                <option value="N">隱藏</option>
+                <!--<option value="T">測試</option>-->
+                <option value="Y">正常</option>
+            </select>
+        </div>
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
+            <p class="error"><?php echo $creater_error; ?></p>
+        </div>
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at" value="<?php echo date("Y-m-d H:i:s"); ?>">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+        <div>
+            <br>
+            <button type="submit" name="submit">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
diff --git a/wms/menu-delete.php b/wms/menu-delete.php
index 9601f2d2..6bcc07f5 100644
--- a/wms/menu-delete.php
+++ b/wms/menu-delete.php
@@ -1,12 +1,12 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "DELETE FROM menu WHERE id='$id'";
-mysqli_query($link, $db_query);	
-
-header("Refresh:0; url=menu-index.php?function_name=menu&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "DELETE FROM menu WHERE id='$id'";
+mysqli_query($link, $db_query);	
+
+header("Refresh:0; url=menu-index.php?function_name=menu&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/menu-edit.php b/wms/menu-edit.php
index b7602d89..b6b95ab1 100644
--- a/wms/menu-edit.php
+++ b/wms/menu-edit.php
@@ -1,95 +1,302 @@
-<?php
-    include "header.php";
-    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-    $data = array();
-    // sql语法存在变数中
-    $db_query = "SELECT * FROM menu WHERE id = $id";
-    // 用mysqli_query方法执行(sql语法)将结果存在变数中
-    $data = mysqli_query($link, $db_query);	
-
-    foreach($data as $data) :
-        //$link_content = str_replace(',', PHP_EOL, $data['link_content']);
-?>
-<script>
-$(function () {
-
-});
-</script>
-<div class="container">
-    <form class="form-inline" method="post" action="menu-record-update.php">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-        <div>
-            <label for="main_menu">主功能名稱</label>
-            <input type="text" name="main_menu" id="main_menu" value="<?php echo $data['main_menu']; ?>" required>
-        </div>
-        <div>
-            <label for="main_menu_seq">主功能排序</label>
-            <select name="main_menu_seq" id="main_menu_seq">
-                <?php
-                for ($i=1;$i<21;$i++) {
-                    echo '<option value="'.$i.'"';
-                    if ($i == $data["main_menu_seq"]) echo " selected";
-                    echo '>'.$i.'</option>';
-                }
-                ?>
-            </select>
-        </div>
-        <div>
-            <label for="sub_menu">子功能名稱</label>
-            <input type="text" name="sub_menu" id="sub_menu" value="<?php echo $data['sub_menu']; ?>" required>
-        </div>
-        <div>
-            <label for="sub_menu_seq">子功能排序</label>
-            <select name="sub_menu_seq" id="sub_menu_seq">
-                <?php
-                for ($i=1;$i<21;$i++) {
-                    echo '<option value="'.$i.'"';
-                    if ($i == $data["sub_menu_seq"]) echo " selected";
-                    echo '>'.$i.'</option>';
-                }
-                ?>
-            </select>
-        </div>
-        <div>
-            <label for="sub_menu_eng">子功能英文名</label>
-            <input type="text" name="sub_menu_eng" id="sub_menu_eng" value="<?php echo $data['sub_menu_eng']; ?>" required>
-        </div>
-        <div>
-            <label for="mlink">主網址</label>
-            <input type="text" name="mlink" id="mlink" size="30" value="<?php echo $data['mlink']; ?>" required>
-        </div>
-        <div>
-            <label for="link_content">程式列表</label>
-            <textarea name="link_content" id="link_content" rows="10" cols="60" class="form-control" required><?php echo $data['link_content']; ?></textarea>
-        </div>
-        <div>
-            <label for="status">狀態</label>
-            <select name="status" id="status">
-                <option value="N"<?php if ($data["status"]=="N") echo " selected"; ?>>隱藏</option>
-                <!--<option value="T"<?php if ($data["status"]=="T") echo " selected"; ?>>測試</option>-->
-                <option value="Y"<?php if ($data["status"]=="Y") echo " selected"; ?>>正常</option>
-            </select>
-        </div>
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
-        </div>
-		
-		
-        <div>
-			<br>
-            <button type="submit" name="update">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-        <input type="hidden" name="create_at" id="create_at" value="<?php echo date("Y-m-d H:i:s"); ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
+<style>
+    input,
+    select {
+        margin: 0 0 !important;
+        vertical-align: middle !important;
+    }
+
+    .mybutton {
+        padding: 3px !important;
+    }
+</style>
+
+<?php
+include "header.php";
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+// sql语法存在变数中
+$db_query = "SELECT * FROM menu WHERE id = $id";
+// 用mysqli_query方法执行(sql语法)将结果存在变数中
+$result = mysqli_query($link, $db_query);
+$data = mysqli_fetch_assoc($result);
+mysqli_free_result($result);
+
+$db_query = "
+    SELECT * FROM department
+    ORDER BY department_id ASC
+";
+$result = mysqli_query($link, $db_query);
+$data2 = mysqli_fetch_all($result, MYSQLI_ASSOC);
+mysqli_free_result($result);
+
+//$link_content = str_replace(',', PHP_EOL, $data['link_content']);
+?>
+<div class="container">
+    <form class="form-inline" method="post" action="menu-record-update.php">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+        <div class="row col-md-12 col-sm-12">
+            <div class="col-md-2 col-sm-12">
+                <label for="main_menu">主功能名稱</label>
+                <input type="text" name="main_menu" id="main_menu" value="<?php echo $data['main_menu']; ?>" required>
+            </div>
+            <div class="col-md-2 col-sm-12">
+                <label for="main_menu_seq">主功能排序</label>
+                <select name="main_menu_seq" id="main_menu_seq">
+                    <?php
+                    for ($i = 1; $i < 21; $i++) {
+                        echo '<option value="' . $i . '"';
+                        if ($i == $data["main_menu_seq"]) echo " selected";
+                        echo '>' . $i . '</option>';
+                    }
+                    ?>
+                </select>
+            </div>
+            <div class="col-md-2 col-sm-12">
+                <label for="sub_menu">子功能名稱</label>
+                <input type="text" name="sub_menu" id="sub_menu" value="<?php echo $data['sub_menu']; ?>" required>
+            </div>
+            <div class="col-md-2 col-sm-12">
+                <label for="sub_menu_seq">子功能排序</label>
+                <select name="sub_menu_seq" id="sub_menu_seq">
+                    <?php
+                    for ($i = 1; $i < 21; $i++) {
+                        echo '<option value="' . $i . '"';
+                        if ($i == $data["sub_menu_seq"]) echo " selected";
+                        echo '>' . $i . '</option>';
+                    }
+                    ?>
+                </select>
+            </div>
+            <div class="col-md-2 col-sm-12">
+                <label for="sub_menu_eng">子功能英文名</label>
+                <input type="text" name="sub_menu_eng" id="sub_menu_eng" value="<?php echo $data['sub_menu_eng']; ?>" required>
+            </div>
+            <div class="col-md-2 col-sm-12">
+                <label for="mlink">主網址</label>
+                <input type="text" name="mlink" id="mlink" size="30" value="<?php echo $data['mlink']; ?>" required>
+            </div>
+            <div class="col-md-4 col-sm-12">
+                <label for="status">狀態</label>
+                <select name="status" id="status">
+                    <option value="N" <?php if ($data["status"] == "N") echo " selected"; ?>>隱藏</option>
+                    <!--<option value="T"<?php if ($data["status"] == "T") echo " selected"; ?>>測試</option>-->
+                    <option value="Y" <?php if ($data["status"] == "Y") echo " selected"; ?>>正常</option>
+                </select>
+            </div>
+            <div class="col-md-4 col-sm-12">
+                <label for="creater">建檔人</label>
+                <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
+            </div>
+            <div class="col-md-12 col-sm-12" style="margin-top:15px;">
+                <label class='col-md-12' for="link_content">程式列表</label>
+                <textarea name="link_content" id="link_content" rows="10" cols="60" class="form-control" required><?php echo $data['link_content']; ?></textarea>
+            </div>
+        </div>
+
+        <div class="row col-md-12 col-sm-12" style="margin-top:15px;">
+            <div class="col-md-4 col-sm-12">
+                <label class='col-md-12' for="selectL1">可讀權限</label>
+                <select multiple="multiple" id="selectL1" style="width:100%;height:300px; border:4px #A0A0A4 outset; padding:4px; ">
+                    <?php
+                    foreach ($data2 as $row) {
+                        $menu_permission = json_decode($row['permission']);
+                        $status = false;
+                        foreach ($menu_permission as $key => $value) {
+                            if ($key == $data['mlink'] && in_array($value, ['1'])) {
+                                $status = true;
+                                break;
+                            }
+                        }
+                        if (!$status)
+                            echo "<option value='" . $row['id'] . "'>" . $row['name'] . "_" . $row['role'] . "</option>";
+                    }
+                    ?>
+                </select>
+            </div>
+            <div class="col-md-1 col-sm-12">
+                <label class='col-md-12' for="add">　</label>
+                <button id="add1" type="button" class="btn mybutton">添加</button>
+                <button id="remove1" type="button" class="btn mybutton">移除</button>
+                <button id="add_all1" type="button" class="btn mybutton">全部添加</button>
+                <button id="remove_all1" type="button" class="btn mybutton">全部移除</button>
+            </div>
+            <div class="col-md-4 col-sm-12">
+                <label class='col-md-12' for="selectR1">　</label>
+                <select multiple="multiple" id="selectR1" name="can_read[]" style="width:100%;height:300px;;border:4px #A0A0A4 outset; padding:4px;">
+                    <?php
+                    foreach ($data2 as $row) {
+                        $menu_permission = json_decode($row['permission']);
+                        foreach ($menu_permission as $key => $value) {
+                            if ($key == $data['mlink'] && in_array($value, ['1'])) {
+                                echo "<option value='" . $row['id'] . "'>" . $row['name'] . "_" . $row['role'] . "</option>";
+                            }
+                        }
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="row col-md-12 col-sm-12" style="margin-top:15px;">
+            <div class="col-md-4 col-sm-12">
+                <label class='col-md-12' for="selectL2">可寫權限</label>
+                <select multiple="multiple" id="selectL2" style="width:100%;height:300px; border:4px #A0A0A4 outset; padding:4px; ">
+                    <?php
+                    foreach ($data2 as $row) {
+                        $menu_permission = json_decode($row['permission']);
+                        $status = false;
+                        foreach ($menu_permission as $key => $value) {
+                            if ($key == $data['mlink'] && in_array($value, ['2', '3'])) {
+                                $status = true;
+                                break;
+                            }
+                        }
+                        if (!$status)
+                            echo "<option value='" . $row['id'] . "'>" . $row['name'] . "_" . $row['role'] . "</option>";
+                    }
+                    ?>
+                </select>
+            </div>
+            <div class="col-md-1 col-sm-12">
+                <label class='col-md-12' for="add">　</label>
+                <button id="add2" type="button" class="btn mybutton">添加</button>
+                <button id="remove2" type="button" class="btn mybutton">移除</button>
+                <button id="add_all2" type="button" class="btn mybutton">全部添加</button>
+                <button id="remove_all2" type="button" class="btn mybutton">全部移除</button>
+            </div>
+            <div class="col-md-4 col-sm-12">
+                <label class='col-md-12' for="selectR2">　</label>
+                <select multiple="multiple" id="selectR2" name="can_write[]" style="width:100%;height:300px;;border:4px #A0A0A4 outset; padding:4px;">
+                    <?php
+                    foreach ($data2 as $row) {
+                        $menu_permission = json_decode($row['permission']);
+                        foreach ($menu_permission as $key => $value) {
+                            if ($key == $data['mlink'] && in_array($value, ['2', '3'])) {
+                                echo "<option value='" . $row['id'] . "'>" . $row['name'] . "_" . $row['role'] . "</option>";
+                            }
+                        }
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="row col-md-12 col-sm-12">
+            <div class="col-md-12 col-sm-12">
+                <button class="pull-right" type="submit" name="update" id="update_btn" disabled>請先鎖定再提交</button>
+                <button class="pull-right" type="button" onclick="lockAuthSelect()">鎖定權限</button>
+            </div>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+        <input type="hidden" name="create_at" id="create_at" value="<?php echo date("Y-m-d H:i:s"); ?>">
+    </form>
+</div>
+
+<script>
+    $(function() {
+        lrSelectChange('selectL', 'selectR', '1');
+        lrSelectChange('selectL', 'selectR', '2');
+    });
+
+    function lockAuthSelect() {
+        $("#selectR1 option").prop("selected", true);
+        $("#selectR2 option").prop("selected", true);
+        $("#update_btn").text("提交").removeAttr("disabled");
+    }
+
+    function lrSelectChange(lSelect, rSelect, id) {
+        lSelect = lSelect + id;
+        rSelect = rSelect + id;
+        //移到右边
+        $('#add' + id).click(function() {
+            //获取选中的选项，删除并追加给对方
+            for (var i = 0; i < $('#' + lSelect + ' option:selected').length; i++) {
+                $('#' + lSelect + ' option:selected')[i].text = $('#' + lSelect + ' option:selected')[i].text
+                $('#' + lSelect + ' option:selected')[i].value = $('#' + lSelect + ' option:selected')[i].value
+            }
+            $('#' + lSelect + ' option:selected').appendTo('#' + rSelect);
+            $("#update_btn").text("請先鎖定再提交").attr("disabled", "disabled");
+        });
+        //移到左边
+        $('#remove' + id).click(function() {
+            for (var i = 0; i < $('#' + rSelect + ' option:selected').length; i++) {
+                $('#' + rSelect + ' option:selected')[i].text = $('#' + rSelect + ' option:selected')[i].text
+                $('#' + rSelect + ' option:selected')[i].value = $('#' + rSelect + ' option:selected')[i].value
+            }
+            $('#' + rSelect + ' option:selected').appendTo('#' + lSelect + '');
+            $("#update_btn").text("請先鎖定再提交").attr("disabled", "disabled");
+        });
+        //全部移到右边
+        $('#add_all' + id).click(function() {
+            for (var i = 0; i < $('#' + lSelect + ' option').length; i++) {
+                $('#' + lSelect + ' option')[i].text = $('#' + lSelect + ' option')[i].text
+                $('#' + lSelect + ' option')[i].value = $('#' + lSelect + ' option')[i].value
+            }
+            //获取全部的选项,删除并追加给对方
+            $('#' + lSelect + ' option').appendTo('#' + rSelect + '');
+            $("#update_btn").text("請先鎖定再提交").attr("disabled", "disabled");
+        });
+        //全部移到左边
+        $('#remove_all' + id).click(function() {
+            for (var i = 0; i < $('#' + rSelect + ' option').length; i++) {
+                $('#' + rSelect + ' option')[i].text = $('#' + rSelect + ' option')[i].text
+                $('#' + rSelect + ' option')[i].value = $('#' + rSelect + ' option')[i].value
+            }
+            $('#' + rSelect + ' option').appendTo('#' + lSelect + '');
+            $("#update_btn").text("請先鎖定再提交").attr("disabled", "disabled");
+        });
+        //双击选项,左边到右边
+        $('#' + lSelect + '').dblclick(function() { //绑定双击事件
+            for (var i = 0; i < $('#' + lSelect + ' option:selected').length; i++) {
+                $('#' + lSelect + ' option:selected')[i].text = $('#' + lSelect + ' option:selected')[i].text
+                $('#' + lSelect + ' option:selected')[i].value = $('#' + lSelect + ' option:selected')[i].value
+            }
+            $('#' + lSelect + ' option:selected').appendTo('#' + rSelect + '');
+            $("#update_btn").text("請先鎖定再提交").attr("disabled", "disabled");
+        });
+        //双击选项，右边到左边
+        $('#' + rSelect + '').dblclick(function() {
+            for (var i = 0; i < $('#selectR1 option:selected').length; i++) {
+                $('#' + rSelect + ' option:selected')[i].text = $('#' + rSelect + ' option:selected')[i].text
+                $('#' + rSelect + ' option:selected')[i].value = $('#' + rSelect + ' option:selected')[i].value
+            }
+            $('#' + rSelect + ' option:selected').appendTo('#' + lSelect + '');
+            $("#update_btn").text("請先鎖定再提交").attr("disabled", "disabled");
+        });
+        $('#' + rSelect + '').click(function() {
+            $("#update_btn").text("請先鎖定再提交").attr("disabled", "disabled");
+            if ($('#' + rSelect + ' option:selected').length > 1) { //右侧选中多个时，只允许点击一个使其变序
+                return;
+            }
+            if (($("option:selected", this).text().substring($("option:selected", this).text().length - 4, $("option:selected", this).text().length)) == '(升序)') {
+                var a = $("option:selected", this).text();
+                $("option:selected", this).prop('text', a)
+                var b = $("option:selected", this).val();
+                b = b.replace("$asc", "$desc")
+                $("option:selected", this).prop('value', b)
+                return
+            }
+            if (($("option:selected", this).text().substring($("option:selected", this).text().length - 4, $("option:selected", this).text().length)) == '(降序)') {
+                var a = $("option:selected", this).text();
+                $("option:selected", this).prop('text', a)
+                var b = $("option:selected", this).val();
+                b = b.replace("$desc", "$asc")
+                $("option:selected", this).prop('value', b)
+                return
+            }
+        });
+    }
+
+    $(function() {
+
+
+    });
+</script>
+
+<?php
+
+
+
+include "footer.php";
+
 ?>
\ No newline at end of file
diff --git a/wms/menu-index.php b/wms/menu-index.php
index 2de37f3b..337ddd14 100644
--- a/wms/menu-index.php
+++ b/wms/menu-index.php
@@ -1,127 +1,127 @@
-<?php
-include "header.php";
-
-// 設置一個空陣列來放資料
-$data = array();
-// sql語法存在變數中
-$sql = "SELECT * FROM menu ORDER BY id";
-
-// 用mysqli_query方法執行(sql語法)將結果存在變數中
-$data = mysqli_query($link,$sql);
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="menu-create.php?function_name=menu&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-<?php
-}
-
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:menu-index.php");
-        }
-    }
-
-?>
-
-<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;
-   
-}
-
-</style>
-
-    <div style="overflow-x:auto;">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-            <thead>
-                <tr>
-                    <th>項次</th>
-                    <th>主功能排序</th>
-                    <th>主功能名稱</th>
-                    <th>子功能排序</th>
-                    <th>子功能名稱</th>
-                    <th>狀能</th>
-                    <th>建檔人</th>
-                    <th>建檔時間</th>
-                    <th>修改</th>
-                    <th>刪除</th>
-                </tr>
-            </thead>
-            <tbody>
-            <?php foreach($data as $data) : ?>
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td><?php echo $data['main_menu_seq']; ?></td>
-                    <td><?php echo $data['main_menu']; ?></td>
-                    <td><?php echo $data['sub_menu_seq']; ?></td>
-                    <td><?php echo $data['sub_menu']; ?></td>
-                    <td><?php echo $data['status']; ?></td>
-                    <td><?php echo $data['creater']; ?></td>
-                    <td><?php echo $data['create_at']; ?></td>
-                    <td>
-                        <p>
-                            <a href="menu-edit.php?id=<?php echo $data['id']; ?>&function_name=menu&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-                                <span class="glyphicon glyphicon-pencil"></span>
-                            </a>
-                        </p> 
-                    </td>
-                    <td>
-                        <p>
-                            <a href="menu-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-                                <span class="glyphicon glyphicon-remove"></span>
-                            </a>
-                        </p> 
-                    </td>
-                </tr>
-            <?php endforeach; ?>
-            </tbody>
-        </table>
-    </div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-include "footer.php";
+<?php
+include "header.php";
+
+// 設置一個空陣列來放資料
+$data = array();
+// sql語法存在變數中
+$sql = "SELECT * FROM menu ORDER BY id";
+
+// 用mysqli_query方法執行(sql語法)將結果存在變數中
+$data = mysqli_query($link,$sql);
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth&2) { ?>
+<p>
+<a href="menu-create.php?function_name=menu&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+<?php
+}
+
+if($data):
+    
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:menu-index.php");
+        }
+    }
+
+?>
+
+<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;
+   
+}
+
+</style>
+
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+            <thead>
+                <tr>
+                    <th>項次</th>
+                    <th>主功能排序</th>
+                    <th>主功能名稱</th>
+                    <th>子功能排序</th>
+                    <th>子功能名稱</th>
+                    <th>狀能</th>
+                    <th>建檔人</th>
+                    <th>建檔時間</th>
+                    <th>修改</th>
+                    <th>刪除</th>
+                </tr>
+            </thead>
+            <tbody>
+            <?php foreach($data as $data) : ?>
+                <tr>
+                    <td><?php echo $data['id']; ?></td>
+                    <td><?php echo $data['main_menu_seq']; ?></td>
+                    <td><?php echo $data['main_menu']; ?></td>
+                    <td><?php echo $data['sub_menu_seq']; ?></td>
+                    <td><?php echo $data['sub_menu']; ?></td>
+                    <td><?php echo $data['status']; ?></td>
+                    <td><?php echo $data['creater']; ?></td>
+                    <td><?php echo $data['create_at']; ?></td>
+                    <td>
+                        <p>
+                            <a href="menu-edit.php?id=<?php echo $data['id']; ?>&function_name=menu&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+                                <span class="glyphicon glyphicon-pencil"></span>
+                            </a>
+                        </p> 
+                    </td>
+                    <td>
+                        <p>
+                            <a href="menu-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+                                <span class="glyphicon glyphicon-remove"></span>
+                            </a>
+                        </p> 
+                    </td>
+                </tr>
+            <?php endforeach; ?>
+            </tbody>
+        </table>
+    </div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+include "footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/menu-record-submit.php b/wms/menu-record-submit.php
index dbccedf7..8d013a90 100644
--- a/wms/menu-record-submit.php
+++ b/wms/menu-record-submit.php
@@ -1,28 +1,28 @@
-<?php
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    foreach ($_POST as $k => $v) {
-        $$k = htmlspecialchars(stripslashes(trim($v)));
-    }
-
-    //$link_content = str_replace(PHP_EOL, ',', $link_content);
-    $db_query  = "INSERT INTO menu(main_menu_seq, main_menu, sub_menu_seq, sub_menu, sub_menu_eng, mlink, link_content, status, creater, create_at) VALUES ";
-    $db_query .= "('$main_menu_seq', '$main_menu', '$sub_menu_seq', '$sub_menu', '$sub_menu_eng', '$mlink', '$link_content', '$status', '$creater', '$create_at')";
-    $result = mysqli_query($link, $db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='menu-index.php?function_name=menu&".$token_link."';";
-        echo "</script>";  
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='menu-index.php?function_name=menu&".$token_link."';";
-        echo "</script>";
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
-?>
+<?php
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    foreach ($_POST as $k => $v) {
+        $$k = htmlspecialchars(stripslashes(trim($v)));
+    }
+
+    //$link_content = str_replace(PHP_EOL, ',', $link_content);
+    $db_query  = "INSERT INTO menu(main_menu_seq, main_menu, sub_menu_seq, sub_menu, sub_menu_eng, mlink, link_content, status, creater, create_at) VALUES ";
+    $db_query .= "('$main_menu_seq', '$main_menu', '$sub_menu_seq', '$sub_menu', '$sub_menu_eng', '$mlink', '$link_content', '$status', '$creater', '$create_at')";
+    $result = mysqli_query($link, $db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='menu-index.php?function_name=menu&".$token_link."';";
+        echo "</script>";  
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='menu-index.php?function_name=menu&".$token_link."';";
+        echo "</script>";
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
+?>
diff --git a/wms/menu-record-update.php b/wms/menu-record-update.php
index 81d07022..db9baf75 100644
--- a/wms/menu-record-update.php
+++ b/wms/menu-record-update.php
@@ -1,29 +1,172 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-    foreach ($_POST as $k => $v) {
-        $$k = htmlspecialchars(stripslashes(trim($v)));
-    }
-
-    //$link_content = str_replace(PHP_EOL, ',', $link_content);
-    $db_query  = "UPDATE menu set main_menu_seq = '$main_menu_seq', main_menu = '$main_menu', sub_menu_seq = '$sub_menu_seq', sub_menu = '$sub_menu', ";
-    $db_query .= "sub_menu_eng = '$sub_menu_eng', mlink = '$mlink', link_content = '$link_content', status = '$status', create_at = '$create_at' WHERE id='$id'";
-    mysqli_query($link, $db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='menu-index.php?function_name=menu&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='menu-index.php?function_name=menu&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
-?>
\ No newline at end of file
+<?php
+ini_set('display_errors', 'on');
+include "header.php";
+
+$auth_change_status = false;
+
+if (isset($_POST['update'])) {
+
+    // foreach ($_POST as $k => $v) {
+    //     $$k = htmlspecialchars(stripslashes(trim($v)));
+    // }
+
+    if (!empty($_POST['can_read'])) {
+        $auth_change_status = true;
+        $link_content = explode("\r\n", $_POST['link_content']);
+        foreach ($_POST['can_read'] as $id) {
+
+            // 更新部門可寫權限 json
+            $permission = [];
+            $department_id = 0;
+            $role_id = 0;
+
+            $sql = "
+                SELECT 
+                    department_id,
+                    role_id,
+                    permission
+                FROM department
+                WHERE 1=1
+                AND id = '$id'
+            ";
+            $result = mysqli_query($link, $sql);
+            $data = mysqli_fetch_assoc($result);
+            $department_id = $data['department_id'];
+            $role_id = $data['role_id'];
+            mysqli_free_result($result);
+            $permission = json_decode($data['permission'], true);
+            foreach ($link_content as $row) {
+                $permission[$row] = '1';
+            }
+            $new_permiccion = json_encode($permission);
+
+            // 更改此職位權限
+            $sql = "
+                UPDATE department
+                SET permission = '$new_permiccion'
+                WHERE 1=1
+                AND id = '$id'
+            ";
+            mysqli_query($link, $sql);
+
+            // 更改此職位底下所有員工的權限
+            $sql = "
+                SELECT accountid
+                FROM account
+                WHERE 1=1
+                AND department_id = '$department_id'
+                AND role_id = '$role_id'
+            ";
+            $result = mysqli_query($link, $sql);
+            $data2 = mysqli_fetch_all($result, MYSQLI_ASSOC);
+            mysqli_free_result($result);
+            foreach ($data2 as $row) {
+                $sql = "
+                    UPDATE account_auth
+                    SET permission = '$new_permiccion'
+                    WHERE 1=1
+                    AND accountid = '" . $row['accountid'] . "'
+                ";
+                mysqli_query($link, $sql);
+            }
+        }
+    }
+
+    if (!empty($_POST['can_write'])) {
+        $auth_change_status = true;
+        $link_content = explode("\r\n", $_POST['link_content']);
+        foreach ($_POST['can_write'] as $id) {
+
+            // 更新部門可寫權限 json
+            $permission = [];
+            $department_id = 0;
+            $role_id = 0;
+
+            $sql = "
+                SELECT 
+                    department_id,
+                    role_id,
+                    permission
+                FROM department
+                WHERE 1=1
+                AND id = '$id'
+            ";
+            $result = mysqli_query($link, $sql);
+            $data = mysqli_fetch_assoc($result);
+            $department_id = $data['department_id'];
+            $role_id = $data['role_id'];
+            mysqli_free_result($result);
+            $permission = json_decode($data['permission'], true);
+            foreach ($link_content as $row) {
+                $permission[$row] = '3';
+            }
+            $new_permiccion = json_encode($permission);
+
+            // 更改此職位權限
+            $sql = "
+                UPDATE department
+                SET permission = '$new_permiccion'
+                WHERE 1=1
+                AND id = '$id'
+            ";
+            mysqli_query($link, $sql);
+
+            // 更改此職位底下所有員工的權限
+            $sql = "
+                SELECT accountid
+                FROM account
+                WHERE 1=1
+                AND department_id = '$department_id'
+                AND role_id = '$role_id'
+            ";
+            $result = mysqli_query($link, $sql);
+            $data2 = mysqli_fetch_all($result, MYSQLI_ASSOC);
+            mysqli_free_result($result);
+            foreach ($data2 as $row) {
+                $sql = "
+                    UPDATE account_auth
+                    SET permission = '$new_permiccion'
+                    WHERE 1=1
+                    AND accountid = '" . $row['accountid'] . "'
+                ";
+                mysqli_query($link, $sql);
+            }
+        }
+    }
+    $main_menu_seq = empty($_POST['main_menu_seq']) ? '' : $_POST['main_menu_seq'];
+    $main_menu = empty($_POST['main_menu']) ? '' : $_POST['main_menu'];
+    $sub_menu_seq = empty($_POST['sub_menu_seq']) ? '' : $_POST['sub_menu_seq'];
+    $sub_menu = empty($_POST['sub_menu']) ? '' : $_POST['sub_menu'];
+    $sub_menu_eng = empty($_POST['sub_menu_eng']) ? '' : $_POST['sub_menu_eng'];
+    $mlink = empty($_POST['mlink']) ? '' : $_POST['mlink'];
+    $link_content = empty($_POST['link_content']) ? '' : $_POST['link_content'];
+    $status = empty($_POST['status']) ? '' : $_POST['status'];
+    $id = empty($_POST['id']) ? '' : $_POST['id'];
+    $create_at = date('Y-m-d H:i:s');
+
+    //$link_content = str_replace(PHP_EOL, ',', $link_content);
+    $db_query  = "UPDATE menu set main_menu_seq = '$main_menu_seq', main_menu = '$main_menu', sub_menu_seq = '$sub_menu_seq', sub_menu = '$sub_menu', ";
+    $db_query .= "sub_menu_eng = '$sub_menu_eng', mlink = '$mlink', link_content = '$link_content', status = '$status', create_at = '$create_at' WHERE id='$id'";
+
+    mysqli_query($link, $db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='menu-index.php?function_name=menu&" . $token_link . "';";
+        echo "</script>";
+    } elseif ($auth_change_status == true) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('權限調整成功');";
+        echo "location.href='menu-index.php?function_name=menu&" . $token_link . "';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='menu-index.php?function_name=menu&" . $token_link . "';";
+        echo "</script>";
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
diff --git a/wms/new-elevator-contract-create.php b/wms/new-elevator-contract-create.php
index c6a08b5e..882ad4cd 100644
--- a/wms/new-elevator-contract-create.php
+++ b/wms/new-elevator-contract-create.php
@@ -1,71 +1,71 @@
-<?php
-include "header.php";
-
-include "new-elevator-contract-submit.php";
-?>
-<style>
-    .form-control2 {
-        margin: 0 !important;
-    }
-</style>
-<div class="container-fluid">
-    <form class="" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
-        <div class="row">
-            <div class="col-6 col-md-3 form-group">
-                <label for="contractno">合約號</label>
-                <select class="form-control" id="contractno" name="contractno[]">
-                    <option>qwe</option>
-                    <option>abc</option>
-                    <option>zcx</option>
-                </select>
-            </div>
-            <div class="col-6 col-md-3 form-group">
-                <label for="facilityno">作番號</label>
-                <input class="form-control form-control2" type="text" name="facilityno" id="facilityno">
-            </div>
-            <div class="col-6 col-md-3 form-group">
-                <label for="receivable_date">應繳款日</label>
-                <input class="form-control form-control2" type="text" data-date-format="yyyy-mm-dd" name="receivable_date" id="receivable_date" value="<?php echo date('Y/m/d H:i:s'); ?>">
-            </div>
-            <div class="col-6 col-md-3 form-group">
-                <label for="status">收款狀態</label>
-                <Select class="form-control" name="status" id="status" required>
-                    <option selected="selected" disabled="disabled" style="display: none" value=""></option>
-                    <Option Value="P">待結案</Option>
-                    <Option Value="E">已結案</Option>
-                </Select>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-6 col-md-3 form-group">
-                <label for="creater">建檔人</label>
-                <input class="form-control" type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
-                <p class="error"><?php echo $creater_error; ?></p>
-            </div>
-            <div class="col-6 col-md-3 form-group">
-                <input class="form-control" type="hidden" name="create_at" id="create_at" value="<?php echo date('Y/m/d H:i:s'); ?>">
-                <p class="error"><?php echo $create_at_error; ?></p>
-            </div>
-            <div class="col-6 col-md-3 form-group">
-                <button class="btn btn-primary" type="submit" name="submit">確定</button>
-            </div>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
-
-<link rel="stylesheet" href="//code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css">
-<script src="//code.jquery.com/jquery-1.9.1.js"></script>
-<script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
-<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
-<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
-<script type="text/javascript">
-    $(document).ready(function() {
-        // var jsonData = <?php //echo $row['contractno']; 
-                            ?>;
-        $('#contractno').select2();
-        // $("#contractno").val(jsonData).trigger("change");
-    });
+<?php
+include "header.php";
+
+include "new-elevator-contract-submit.php";
+?>
+<style>
+    .form-control2 {
+        margin: 0 !important;
+    }
+</style>
+<div class="container-fluid">
+    <form class="" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
+        <div class="row">
+            <div class="col-6 col-md-3 form-group">
+                <label for="contractno">合約號</label>
+                <select class="form-control" id="contractno" name="contractno[]">
+                    <option>qwe</option>
+                    <option>abc</option>
+                    <option>zcx</option>
+                </select>
+            </div>
+            <div class="col-6 col-md-3 form-group">
+                <label for="facilityno">作番號</label>
+                <input class="form-control form-control2" type="text" name="facilityno" id="facilityno">
+            </div>
+            <div class="col-6 col-md-3 form-group">
+                <label for="receivable_date">應繳款日</label>
+                <input class="form-control form-control2" type="text" data-date-format="yyyy-mm-dd" name="receivable_date" id="receivable_date" value="<?php echo date('Y/m/d H:i:s'); ?>">
+            </div>
+            <div class="col-6 col-md-3 form-group">
+                <label for="status">收款狀態</label>
+                <Select class="form-control" name="status" id="status" required>
+                    <option selected="selected" disabled="disabled" style="display: none" value=""></option>
+                    <Option Value="P">待結案</Option>
+                    <Option Value="E">已結案</Option>
+                </Select>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-6 col-md-3 form-group">
+                <label for="creater">建檔人</label>
+                <input class="form-control" type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
+                <p class="error"><?php echo $creater_error; ?></p>
+            </div>
+            <div class="col-6 col-md-3 form-group">
+                <input class="form-control" type="hidden" name="create_at" id="create_at" value="<?php echo date('Y/m/d H:i:s'); ?>">
+                <p class="error"><?php echo $create_at_error; ?></p>
+            </div>
+            <div class="col-6 col-md-3 form-group">
+                <button class="btn btn-primary" type="submit" name="submit">確定</button>
+            </div>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
+
+<link rel="stylesheet" href="//code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css">
+<script src="//code.jquery.com/jquery-1.9.1.js"></script>
+<script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
+<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
+<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
+<script type="text/javascript">
+    $(document).ready(function() {
+        // var jsonData = <?php //echo $row['contractno']; 
+                            ?>;
+        $('#contractno').select2();
+        // $("#contractno").val(jsonData).trigger("change");
+    });
 </script>
\ No newline at end of file
diff --git a/wms/new-order-contract-excel-upload.php b/wms/new-order-contract-excel-upload.php
index 83b922df..014b7264 100644
--- a/wms/new-order-contract-excel-upload.php
+++ b/wms/new-order-contract-excel-upload.php
@@ -1,179 +1,179 @@
-<?php
-ini_set('display_errors', 'on');
-
-include "header.php";
-require_once 'PHPExcel/PHPExcel.php';
-require_once 'PHPExcel/IOFactory.php';
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    $file_name = $_FILES["fileToUpload"]["name"];
-    $temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
-    $target_dir = "excel-uploads/";
-    $target_file = strtolower($target_dir . iconv("UTF-8", "big5", basename($file_name)));
-    $EXTENSION = pathinfo($target_file, PATHINFO_EXTENSION);
-    if (move_uploaded_file($temp_file_name, $target_file)) {
-
-        $objReader = PHPExcel_IOFactory::createReader('Excel2007');
-        if ($EXTENSION == 'xls')
-            $objReader = PHPExcel_IOFactory::createReader('Excel5');
-
-        // 讀取上傳到服務器的 excel
-        // 將讀取模式設置為僅讀取值，並保留格式
-        // 指標到第一個sheet
-        $objPHPExcel = $objReader->load($target_file);
-        $sheet = $objPHPExcel->getSheet(0);
-
-        // 取得所有資料列數
-        // 取得所有欄位行數
-        $highestRow = $sheet->getHighestRow();
-        $highestColumn = $sheet->getHighestColumn();
-
-        // 轉換 excel 欄位英文為數字
-        $highestColumn = PHPExcel_Cell::columnIndexFromString($highestColumn);
-        $excelArray = array();
-
-        for ($row = 1; $row <= $highestRow; $row++) {
-            // $val = $sheet->getCellByColumnAndRow(0, $row)->getCalculatedValue();
-
-            // 遇到整列空值跳出寫入陣列
-            $break_point = true;
-            for ($column = 1; $column < $highestColumn; $column++) {
-                $val = $sheet->getCellByColumnAndRow($column, $row)->getValue();
-                if (!empty($val)) {
-                    $break_point = false;
-                    break;
-                }
-            }
-            if ($break_point)
-                break;
-
-            for ($column = 1; $column < $highestColumn; $column++) {
-                $val = $sheet->getCellByColumnAndRow($column, $row)->getValue();
-                // 讀取 EXCEL 資料到陣列
-                $excelArray[$row][] = $val;
-            }
-        }
-
-        for ($i = 1; $i < count($excelArray) + 1; $i++) {
-            print_r($excelArray[$i]);
-            echo "<br/><br/>";
-            // 寫入 account table
-            if ($i > 1) {
-                if (checkAccountStatus($link, $excelArray[$i])) {
-                    addAccount($link, $user_id, $excelArray[$i]);
-                }
-            }
-        }
-
-        mysqli_close($link);
-    }
-}
-
-
-function checkContractStatus($link, $excelArray)
-{
-    $contractno = $excelArray[0];
-    $sql = "
-        SELECT 
-            * 
-        FROM contract_new_order
-        WHERE 1=1
-        AND contractno = '$contractno';
-    ";
-    $result = mysqli_query($link, $sql);
-    if ($result->num_rows > 0) {
-        return false;
-    } else {
-        return true;
-    }
-}
-// INSERT INTO `contract_new_order` (`id`, `contracttype`, `contractno`, `facilityno`, `company`, `taxid`, `address`, `tel`, `promiser`, `customerid`, `contractperson`, `contractaddress`, `contracttel`, `contractemail`, `contract_employee`, `order_date`, `all_amount_details`, `all_amount`, `facility_kind`, `weight`, `numberofpassenger`, `numberofstop`, `numberoffloor`, `opentype`, `speed`, `creater`, `create_at`) VALUES (NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP)
-function checkAccountStatus($link, $excelArray)
-{
-    $accountid = $excelArray[0];
-    $sql = "
-        SELECT 
-            * 
-        FROM account
-        WHERE 1=1
-        AND accountid = '$accountid';
-    ";
-    $result = mysqli_query($link, $sql);
-    if ($result->num_rows > 0) {
-        return false;
-    } else {
-        return true;
-    }
-}
-
-function nameToAccountid($link, $name)
-{
-    $sql = "
-        SELECT
-            accountid 
-        FROM account 
-        WHERE accountid = '$name' ";
-    $res = mysqli_query($link, $sql);
-    while ($row = mysqli_fetch_row($res))
-        $name = $row[0];
-    mysqli_free_result($res);
-    return $name;
-}
-
-function addAccount($link, $user_id, $excelArray)
-{
-    $accounttype = 'A';
-    $accountid = $excelArray[0];
-    $pwd = empty($excelArray[23]) ? $excelArray[24] : $excelArray[23];
-    $name = $excelArray[22];
-    $tel = $excelArray[24];
-    $address = $excelArray[12];
-    $email = $excelArray[25];
-    $repairerid = nameToAccountid($link, $excelArray[2]);
-    $creater = $user_id;
-    $create_at = date("Y-m-d H:i:s");
-    $sql = "
-        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'
-        )
-    ";
-    mysqli_query($link, $sql);
-}
-?>
-
-
-<div class="container">
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
-
-        <div class="bottom-margin">資料
-            <label for="fileToUpload">上傳</label>
-            <div>
-                <input type="file" name="fileToUpload" id="fileToUpload">
-            </div>
-            <div class="bottom-margin">
-                <button type="submit" name="submit">確定</button>
-            </div>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $_GET['token']; ?>">
-    </form>
+<?php
+ini_set('display_errors', 'on');
+
+include "header.php";
+require_once 'PHPExcel/PHPExcel.php';
+require_once 'PHPExcel/IOFactory.php';
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    $file_name = $_FILES["fileToUpload"]["name"];
+    $temp_file_name = $_FILES["fileToUpload"]["tmp_name"];
+    $target_dir = "excel-uploads/";
+    $target_file = strtolower($target_dir . iconv("UTF-8", "big5", basename($file_name)));
+    $EXTENSION = pathinfo($target_file, PATHINFO_EXTENSION);
+    if (move_uploaded_file($temp_file_name, $target_file)) {
+
+        $objReader = PHPExcel_IOFactory::createReader('Excel2007');
+        if ($EXTENSION == 'xls')
+            $objReader = PHPExcel_IOFactory::createReader('Excel5');
+
+        // 讀取上傳到服務器的 excel
+        // 將讀取模式設置為僅讀取值，並保留格式
+        // 指標到第一個sheet
+        $objPHPExcel = $objReader->load($target_file);
+        $sheet = $objPHPExcel->getSheet(0);
+
+        // 取得所有資料列數
+        // 取得所有欄位行數
+        $highestRow = $sheet->getHighestRow();
+        $highestColumn = $sheet->getHighestColumn();
+
+        // 轉換 excel 欄位英文為數字
+        $highestColumn = PHPExcel_Cell::columnIndexFromString($highestColumn);
+        $excelArray = array();
+
+        for ($row = 1; $row <= $highestRow; $row++) {
+            // $val = $sheet->getCellByColumnAndRow(0, $row)->getCalculatedValue();
+
+            // 遇到整列空值跳出寫入陣列
+            $break_point = true;
+            for ($column = 1; $column < $highestColumn; $column++) {
+                $val = $sheet->getCellByColumnAndRow($column, $row)->getValue();
+                if (!empty($val)) {
+                    $break_point = false;
+                    break;
+                }
+            }
+            if ($break_point)
+                break;
+
+            for ($column = 1; $column < $highestColumn; $column++) {
+                $val = $sheet->getCellByColumnAndRow($column, $row)->getValue();
+                // 讀取 EXCEL 資料到陣列
+                $excelArray[$row][] = $val;
+            }
+        }
+
+        for ($i = 1; $i < count($excelArray) + 1; $i++) {
+            print_r($excelArray[$i]);
+            echo "<br/><br/>";
+            // 寫入 account table
+            if ($i > 1) {
+                if (checkAccountStatus($link, $excelArray[$i])) {
+                    addAccount($link, $user_id, $excelArray[$i]);
+                }
+            }
+        }
+
+        mysqli_close($link);
+    }
+}
+
+
+function checkContractStatus($link, $excelArray)
+{
+    $contractno = $excelArray[0];
+    $sql = "
+        SELECT 
+            * 
+        FROM contract_new_order
+        WHERE 1=1
+        AND contractno = '$contractno';
+    ";
+    $result = mysqli_query($link, $sql);
+    if ($result->num_rows > 0) {
+        return false;
+    } else {
+        return true;
+    }
+}
+// INSERT INTO `contract_new_order` (`id`, `contracttype`, `contractno`, `facilityno`, `company`, `taxid`, `address`, `tel`, `promiser`, `customerid`, `contractperson`, `contractaddress`, `contracttel`, `contractemail`, `contract_employee`, `order_date`, `all_amount_details`, `all_amount`, `facility_kind`, `weight`, `numberofpassenger`, `numberofstop`, `numberoffloor`, `opentype`, `speed`, `creater`, `create_at`) VALUES (NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, CURRENT_TIMESTAMP)
+function checkAccountStatus($link, $excelArray)
+{
+    $accountid = $excelArray[0];
+    $sql = "
+        SELECT 
+            * 
+        FROM account
+        WHERE 1=1
+        AND accountid = '$accountid';
+    ";
+    $result = mysqli_query($link, $sql);
+    if ($result->num_rows > 0) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+function nameToAccountid($link, $name)
+{
+    $sql = "
+        SELECT
+            accountid 
+        FROM account 
+        WHERE accountid = '$name' ";
+    $res = mysqli_query($link, $sql);
+    while ($row = mysqli_fetch_row($res))
+        $name = $row[0];
+    mysqli_free_result($res);
+    return $name;
+}
+
+function addAccount($link, $user_id, $excelArray)
+{
+    $accounttype = 'A';
+    $accountid = $excelArray[0];
+    $pwd = empty($excelArray[23]) ? $excelArray[24] : $excelArray[23];
+    $name = $excelArray[22];
+    $tel = $excelArray[24];
+    $address = $excelArray[12];
+    $email = $excelArray[25];
+    $repairerid = nameToAccountid($link, $excelArray[2]);
+    $creater = $user_id;
+    $create_at = date("Y-m-d H:i:s");
+    $sql = "
+        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'
+        )
+    ";
+    mysqli_query($link, $sql);
+}
+?>
+
+
+<div class="container">
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
+
+        <div class="bottom-margin">資料
+            <label for="fileToUpload">上傳</label>
+            <div>
+                <input type="file" name="fileToUpload" id="fileToUpload">
+            </div>
+            <div class="bottom-margin">
+                <button type="submit" name="submit">確定</button>
+            </div>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $_GET['token']; ?>">
+    </form>
 </div>
\ No newline at end of file
diff --git a/wms/ngfeedback-create-submit.php b/wms/ngfeedback-create-submit.php
index 6020aa3b..90d6f44c 100644
--- a/wms/ngfeedback-create-submit.php
+++ b/wms/ngfeedback-create-submit.php
@@ -1,61 +1,61 @@
-<?php
-require_once "database.php";
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-	$do_ins = true;
-	$input = &$_POST;
-	$data = array_reduce(array(
-		"facilityno", "sitename", "siteaddress", "ngdescribe", "creater"
-	), function ($acc, $key) use ($input) {
-		switch ($key) {
-			default:
-				$acc[$key] = htmlspecialchars(stripslashes(trim($input[$key])));
-		}
-		return $acc;
-	}, array("create_at" => date("Y-m-d H:i:s")));
-	
-	if ($_FILES) {
-		$upd_base_path = "/wms/ngfeedback-uploads";
-		if (!is_dir($_SERVER["DOCUMENT_ROOT"] . "/" . $upd_base_path)) {
-			mkdir($_SERVER["DOCUMENT_ROOT"] . "/" . $upd_base_path, 0777, true);
-		}
-		// file_put_contents("./izumi_debug.log", print_r($_FILES, true)."\r\n", FILE_APPEND);
-		if ($_FILES["ngimage"]["error"] == UPLOAD_ERR_OK) {
-			# 將檔案移至指定位置
-			$data["ngimage"] = $upd_base_path . "/" . implode("__", array($data["facilityno"], strtotime($data["create_at"]))) . "." . pathinfo($_FILES["ngimage"]["name"], PATHINFO_EXTENSION);
-			move_uploaded_file($_FILES["ngimage"]["tmp_name"], $_SERVER["DOCUMENT_ROOT"] . "/" . $data["ngimage"]);
-		} else {
-			$do_ins = false;
-            echo "<script type ='text/JavaScript'>";
-            echo "alert('新增失敗，請重新操作[F]')";
-            echo "</script>";
-        }
-	}
-	if ($do_ins) {
-		$db_query = sprintf("INSERT INTO ngfeedback (%s) VALUES (%s)", 
-						implode(",", array_keys($data)), 
-						implode(",", array_fill(0, count($data), "?")));
-		$stmt = $link->prepare($db_query);
-		// 此處僅有字串格式
-		$stmt->bind_param(implode("", array_fill(0, count($data), "s")), ...array_values($data));
-		$stmt->execute();
-		if ($mid = mysqli_insert_id($link)) {
-			// header("Location: );
-			if (mysqli_affected_rows($link) > 0) {
-				echo "<script type ='text/JavaScript'>";
-				echo "alert('新增成功');";
-				echo "window.location.href='/wms/ngfeedback-index.php?function_name=ngfeedback&token=".$_POST["token"]."';";
-				echo "</script>";
-				//header("Location: pricereview-index.php");
-			} else {
-				echo "<script type ='text/JavaScript'>";
-				echo "alert('新增失敗，請重新操作[I]')";
-				echo "</script>";
-			}
-		} else {
-			echo "<script type ='text/JavaScript'>";
-			echo "alert('新增失敗，請重新操作[M]')";
-			echo "</script>";
-		}
-	}
-}
+<?php
+require_once "database.php";
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+	$do_ins = true;
+	$input = &$_POST;
+	$data = array_reduce(array(
+		"facilityno", "sitename", "siteaddress", "ngdescribe", "creater"
+	), function ($acc, $key) use ($input) {
+		switch ($key) {
+			default:
+				$acc[$key] = htmlspecialchars(stripslashes(trim($input[$key])));
+		}
+		return $acc;
+	}, array("create_at" => date("Y-m-d H:i:s")));
+	
+	if ($_FILES) {
+		$upd_base_path = "/wms/ngfeedback-uploads";
+		if (!is_dir($_SERVER["DOCUMENT_ROOT"] . "/" . $upd_base_path)) {
+			mkdir($_SERVER["DOCUMENT_ROOT"] . "/" . $upd_base_path, 0777, true);
+		}
+		// file_put_contents("./izumi_debug.log", print_r($_FILES, true)."\r\n", FILE_APPEND);
+		if ($_FILES["ngimage"]["error"] == UPLOAD_ERR_OK) {
+			# 將檔案移至指定位置
+			$data["ngimage"] = $upd_base_path . "/" . implode("__", array($data["facilityno"], strtotime($data["create_at"]))) . "." . pathinfo($_FILES["ngimage"]["name"], PATHINFO_EXTENSION);
+			move_uploaded_file($_FILES["ngimage"]["tmp_name"], $_SERVER["DOCUMENT_ROOT"] . "/" . $data["ngimage"]);
+		} else {
+			$do_ins = false;
+            echo "<script type ='text/JavaScript'>";
+            echo "alert('新增失敗，請重新操作[F]')";
+            echo "</script>";
+        }
+	}
+	if ($do_ins) {
+		$db_query = sprintf("INSERT INTO ngfeedback (%s) VALUES (%s)", 
+						implode(",", array_keys($data)), 
+						implode(",", array_fill(0, count($data), "?")));
+		$stmt = $link->prepare($db_query);
+		// 此處僅有字串格式
+		$stmt->bind_param(implode("", array_fill(0, count($data), "s")), ...array_values($data));
+		$stmt->execute();
+		if ($mid = mysqli_insert_id($link)) {
+			// header("Location: );
+			if (mysqli_affected_rows($link) > 0) {
+				echo "<script type ='text/JavaScript'>";
+				echo "alert('新增成功');";
+				echo "window.location.href='/wms/ngfeedback-index.php?function_name=ngfeedback&token=".$_POST["token"]."';";
+				echo "</script>";
+				//header("Location: pricereview-index.php");
+			} else {
+				echo "<script type ='text/JavaScript'>";
+				echo "alert('新增失敗，請重新操作[I]')";
+				echo "</script>";
+			}
+		} else {
+			echo "<script type ='text/JavaScript'>";
+			echo "alert('新增失敗，請重新操作[M]')";
+			echo "</script>";
+		}
+	}
+}
 ?>
\ No newline at end of file
diff --git a/wms/ngfeedback-create.php b/wms/ngfeedback-create.php
index 44d9b02e..b026dd37 100644
--- a/wms/ngfeedback-create.php
+++ b/wms/ngfeedback-create.php
@@ -1,196 +1,196 @@
-<?php
-require_once "database.php";
-include "header.php";
-
-include "ngfeedback-create-submit.php";
-
-$sql = "
-	SELECT
-		facilityno
-	FROM facility
-";
-$result = mysqli_query($link, $sql);
-$opts = mysqli_fetch_all($result, MYSQLI_ASSOC);
-
-?>
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<link rel="stylesheet" href="/wms/css/autoComplete.02.min.css">
-<style>
-	select,
-	textarea {
-		margin: 8px 0;
-	}
-
-	.autoComplete_wrapper {
-		width: 100%;
-	}
-
-	.autoComplete_wrapper>input,
-	input[type=file]+.img-preview,
-	input[type=file],
-	textarea {
-		width: 100%;
-		padding: 12px 20px;
-		margin: 8px 0;
-		display: block;
-		border: 1px solid #ccc;
-		border-radius: 4px;
-		box-sizing: border-box;
-		font-size: inherit;
-		height: auto;
-	}
-
-	.img-preview {
-		position: relative;
-		background-color: var(--bs-white, #fff);
-	}
-
-	.img-preview>.btn-icon {
-		position: absolute;
-		top: 1px;
-		right: 1px;
-		font-weight: 600;
-		cursor: pointer;
-	}
-
-	.btn-icon>svg {
-		width: 32px;
-		height: 32px;
-	}
-
-	.autoComplete_wrapper>ul[role=listbox] {
-		margin-top: -12px;
-	}
-
-	input[type=file][accept^=image].preview {
-		display: none;
-	}
-
-	input[type=file][accept^=image]:not(.preview)+.img-preview {
-		display: none;
-	}
-</style>
-<div class="container">
-	<form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
-		<input type="hidden" name="token" value="<?= $token; ?>">
-		<input type="hidden" name="creater" value="<?= $user_id; ?>">
-		<div class="form-group">
-			<div class="row">
-				<div class="col-md-3">
-					<label for="facilityno">電梯ID</label>
-					<!-- <input type="text" name="facilityno" id="facilityno" maxlength="15" required> -->
-					<select name="facilityno" id="facilityno" required>
-						<?php
-							echo "<option value=''>請選擇</option>";
-							foreach($opts as $opt){
-								echo "<option value='" . $opt["facilityno"] . "'>" . $opt["facilityno"] . "</option>";
-							}
-						?>
-					</select>
-				</div>
-				<div class="col-md-3">
-					<label for="sitename">現場名稱</label>
-					<input type="text" name="sitename" id="sitename" maxlength="20">
-				</div>
-				<div class="col-md-6">
-					<label for="siteaddress">現場地址</label>
-					<input type="text" name="siteaddress" id="siteaddress" maxlength="255" required>
-				</div>
-			</div>
-			<div class="col-md-6">
-				<label for="ngdescribe">簡述不良內容</label>
-				<textarea name="ngdescribe" id="ngdescribe" rows="4" maxlength="128" required></textarea>
-			</div>
-			<div class="col-md-6">
-				<label for="ngimage">照片上傳</label>
-				<input type="file" name="ngimage" id="ngimage" accept="image/*" required>
-				<div id="ngimage-preview" class="img-preview">
-					<img src="#" alt="preview image" style="margin: 0 auto; width: 100%; height: auto; border-radius: 0; float: none;" />
-					<i class="btn-icon bi bi-x-square-fill" data-pid="ngimage" alt="移除照片" role="button" onclick="javascript:image_remove(this)" style="color: var(--bs-red, #dc3545);">
-						<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x-square-fill" viewBox="0 0 16 16">
-							<path d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm3.354 4.646L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 1 1 .708-.708z" />
-						</svg>
-					</i>
-				</div>
-			</div>
-		</div>
-		<div class="form-group">
-			<div class="col-md-12 ">
-				<button type="submit" class="btn btn-primary btn-lg">點擊後建立不良反饋單</button>
-			</div>
-		</div>
-	</form>
-</div>
-<script src="https://cdn.jsdelivr.net/npm/@tarekraafat/autocomplete.js@10.2.7/dist/autoComplete.min.js"></script>
-<script>
-	$(document).ready(function() {
-		// $('#facilityno').select2();
-		$("#facilityno").selectize();
-	});
-
-	function image_preview(event) {
-		var input = event.target;
-		var image = document.querySelector(`#${input.id}-preview > img`);
-		if (input.files && input.files[0]) {
-			var reader = new FileReader();
-			reader.onload = function(e) {
-				image.src = e.target.result;
-				$(`#${input.id}`).addClass("preview");
-			}
-			reader.readAsDataURL(input.files[0]);
-			return;
-		}
-		$(`#${input.id}`).removeClass("preview");
-	}
-
-	function image_remove(el) {
-		var pid = $(el).attr("data-pid");
-		var input = document.querySelector(`input#${pid}`);
-		input.value = "";
-		$(`#${pid}`).removeClass("preview");
-	}
-	$(function() {
-		$("#ngimage").on("change", function(event) {
-			image_preview(event);
-		}).trigger("change");
-
-		const autoCompleteJS = new autoComplete({
-			selector: "#facilityno",
-			data: {
-				src: async () => {
-					if (!autoCompleteJS.input.value || autoCompleteJS.input.value.length < 2) {
-						return [];
-					}
-					try {
-						const source = await fetch('/wms/ngfeedbackapi.php?' + new URLSearchParams({
-							type: "facilityno",
-							term: autoCompleteJS.input.value,
-							rn: 10,
-						}));
-						const data = await source.json();
-						return data.data;
-					} catch (error) {
-						return error;
-					}
-				},
-				keys: ["facilityno", "address"],
-			},
-			resultItem: {
-				highlight: false
-			},
-			events: {
-				input: {
-					selection: (event) => {
-						const selection = event.detail.selection.value;
-						autoCompleteJS.input.value = selection["facilityno"];
-						$("#siteaddress").val(selection["address"]);
-					}
-				}
-			}
-		});
-	});
-</script>
-<?php
-include "footer.php";
+<?php
+require_once "database.php";
+include "header.php";
+
+include "ngfeedback-create-submit.php";
+
+$sql = "
+	SELECT
+		facilityno
+	FROM facility
+";
+$result = mysqli_query($link, $sql);
+$opts = mysqli_fetch_all($result, MYSQLI_ASSOC);
+
+?>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<link rel="stylesheet" href="/wms/css/autoComplete.02.min.css">
+<style>
+	select,
+	textarea {
+		margin: 8px 0;
+	}
+
+	.autoComplete_wrapper {
+		width: 100%;
+	}
+
+	.autoComplete_wrapper>input,
+	input[type=file]+.img-preview,
+	input[type=file],
+	textarea {
+		width: 100%;
+		padding: 12px 20px;
+		margin: 8px 0;
+		display: block;
+		border: 1px solid #ccc;
+		border-radius: 4px;
+		box-sizing: border-box;
+		font-size: inherit;
+		height: auto;
+	}
+
+	.img-preview {
+		position: relative;
+		background-color: var(--bs-white, #fff);
+	}
+
+	.img-preview>.btn-icon {
+		position: absolute;
+		top: 1px;
+		right: 1px;
+		font-weight: 600;
+		cursor: pointer;
+	}
+
+	.btn-icon>svg {
+		width: 32px;
+		height: 32px;
+	}
+
+	.autoComplete_wrapper>ul[role=listbox] {
+		margin-top: -12px;
+	}
+
+	input[type=file][accept^=image].preview {
+		display: none;
+	}
+
+	input[type=file][accept^=image]:not(.preview)+.img-preview {
+		display: none;
+	}
+</style>
+<div class="container">
+	<form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
+		<input type="hidden" name="token" value="<?= $token; ?>">
+		<input type="hidden" name="creater" value="<?= $user_id; ?>">
+		<div class="form-group">
+			<div class="row">
+				<div class="col-md-3">
+					<label for="facilityno">電梯ID</label>
+					<!-- <input type="text" name="facilityno" id="facilityno" maxlength="15" required> -->
+					<select name="facilityno" id="facilityno" required>
+						<?php
+							echo "<option value=''>請選擇</option>";
+							foreach($opts as $opt){
+								echo "<option value='" . $opt["facilityno"] . "'>" . $opt["facilityno"] . "</option>";
+							}
+						?>
+					</select>
+				</div>
+				<div class="col-md-3">
+					<label for="sitename">現場名稱</label>
+					<input type="text" name="sitename" id="sitename" maxlength="20">
+				</div>
+				<div class="col-md-6">
+					<label for="siteaddress">現場地址</label>
+					<input type="text" name="siteaddress" id="siteaddress" maxlength="255" required>
+				</div>
+			</div>
+			<div class="col-md-6">
+				<label for="ngdescribe">簡述不良內容</label>
+				<textarea name="ngdescribe" id="ngdescribe" rows="4" maxlength="128" required></textarea>
+			</div>
+			<div class="col-md-6">
+				<label for="ngimage">照片上傳</label>
+				<input type="file" name="ngimage" id="ngimage" accept="image/*" required>
+				<div id="ngimage-preview" class="img-preview">
+					<img src="#" alt="preview image" style="margin: 0 auto; width: 100%; height: auto; border-radius: 0; float: none;" />
+					<i class="btn-icon bi bi-x-square-fill" data-pid="ngimage" alt="移除照片" role="button" onclick="javascript:image_remove(this)" style="color: var(--bs-red, #dc3545);">
+						<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x-square-fill" viewBox="0 0 16 16">
+							<path d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm3.354 4.646L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 1 1 .708-.708z" />
+						</svg>
+					</i>
+				</div>
+			</div>
+		</div>
+		<div class="form-group">
+			<div class="col-md-12 ">
+				<button type="submit" class="btn btn-primary btn-lg">點擊後建立不良反饋單</button>
+			</div>
+		</div>
+	</form>
+</div>
+<script src="https://cdn.jsdelivr.net/npm/@tarekraafat/autocomplete.js@10.2.7/dist/autoComplete.min.js"></script>
+<script>
+	$(document).ready(function() {
+		// $('#facilityno').select2();
+		$("#facilityno").selectize();
+	});
+
+	function image_preview(event) {
+		var input = event.target;
+		var image = document.querySelector(`#${input.id}-preview > img`);
+		if (input.files && input.files[0]) {
+			var reader = new FileReader();
+			reader.onload = function(e) {
+				image.src = e.target.result;
+				$(`#${input.id}`).addClass("preview");
+			}
+			reader.readAsDataURL(input.files[0]);
+			return;
+		}
+		$(`#${input.id}`).removeClass("preview");
+	}
+
+	function image_remove(el) {
+		var pid = $(el).attr("data-pid");
+		var input = document.querySelector(`input#${pid}`);
+		input.value = "";
+		$(`#${pid}`).removeClass("preview");
+	}
+	$(function() {
+		$("#ngimage").on("change", function(event) {
+			image_preview(event);
+		}).trigger("change");
+
+		const autoCompleteJS = new autoComplete({
+			selector: "#facilityno",
+			data: {
+				src: async () => {
+					if (!autoCompleteJS.input.value || autoCompleteJS.input.value.length < 2) {
+						return [];
+					}
+					try {
+						const source = await fetch('/wms/ngfeedbackapi.php?' + new URLSearchParams({
+							type: "facilityno",
+							term: autoCompleteJS.input.value,
+							rn: 10,
+						}));
+						const data = await source.json();
+						return data.data;
+					} catch (error) {
+						return error;
+					}
+				},
+				keys: ["facilityno", "address"],
+			},
+			resultItem: {
+				highlight: false
+			},
+			events: {
+				input: {
+					selection: (event) => {
+						const selection = event.detail.selection.value;
+						autoCompleteJS.input.value = selection["facilityno"];
+						$("#siteaddress").val(selection["address"]);
+					}
+				}
+			}
+		});
+	});
+</script>
+<?php
+include "footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/ngfeedback-index.php b/wms/ngfeedback-index.php
index e2c8e44f..d3348692 100644
--- a/wms/ngfeedback-index.php
+++ b/wms/ngfeedback-index.php
@@ -1,469 +1,469 @@
-<?php
-include "header.php";
-$depart_id = accountidToDepartId($user_id);
-
-$dt_setup = array(
-	"columns" => array(
-		array(
-			"key" => "SEQ",
-			"field" => "id",
-			"label" => "項次",
-			"style" => "",
-			"width" => "60",
-		),
-		array(
-			"key" => "create_at",
-			"field" => "create_at",
-			"label" => "反饋日期",
-			"style" => "",
-			"width" => "120",
-		),
-		array(
-			"key" => "facilityno",
-			"field" => "facilityno",
-			"label" => "電梯編號",
-			"style" => "",
-			"width" => "120",
-		),
-		array(
-			"key" => "onsite_name",
-			"field" => "sitename",
-			"label" => "現場名稱",
-			"style" => "",
-			"width" => "120",
-		),
-		array(
-			"key" => "onsite_address",
-			"field" => "siteaddress",
-			"label" => "現場地址",
-			"style" => "",
-			"width" => "180",
-		),
-		array(
-			"key" => "creater",
-			"field" => "creater",
-			"label" => "不良單填單人員",
-			"style" => "",
-			"width" => "120",
-		),
-		array(
-			"key" => "describe",
-			"field" => "ngdescribe",
-			"label" => "簡述不良內容",
-			"style" => "",
-			"width" => "180",
-		),
-		array(
-			"key" => "ngimage",
-			"field" => "ngimage",
-			"label" => "照片上傳",
-			"style" => "",
-			"width" => "180",
-		),
-		array(
-			"key" => "verify", 
-			"field" => "verify",
-			"label" => "品證人員",
-			"style" => "",
-			"width" => "120",
-		),
-		array(
-			"key" => "investigation_reason",
-			"field" => "investigationreason",
-			"label" => "現場調查原因",
-			"style" => "",
-			"width" => "180",
-		),
-		array(
-			"key" => "countermeasure",
-			"field" => "countermeasure",
-			"label" => "對策方式及再發防止",
-			"style" => "",
-			"width" => "180",
-		),
-		array(
-			"key" => "responsible_depart",
-			"field" => "responsibledepartment",
-			"label" => "判定責任單位",
-			"style" => "",
-			"width" => "120",
-		),
-		array(
-			"key" => "responsible_depart_leader",
-			"field" => "responsibledepartmentleader",
-			"label" => "責任單位主管",
-			"style" => "",
-			"width" => "120",
-		),
-		array(
-			"key" => "responsible_depart_responder",
-			"field" => "responder",
-			"label" => "責任單位回覆人",
-			"style" => "",
-			"width" => "120",
-		),
-		array(
-			"key" => "progress",
-			"field" => "progress",
-			"label" => "處理進度",
-			"style" => "",
-			"width" => "120",
-		),
-		array(
-			"key" => "reply_time",
-			"field" => "reply_at",
-			"label" => "回覆時間",
-			"style" => "",
-			"width" => "120",
-		),
-		array(
-			"key" => "reply_history",
-			"field" => "replyhistory",
-			"label" => "責任單位回覆",
-			"style" => "",
-			"width" => "360",
-		),
-		array(
-			"key" => "update_time",
-			"field" => "update_at",
-			"label" => "更新時間",
-			"style" => "",
-			"width" => "120",
-		),
-		array(
-			"key" => "reviewresult",
-			"field" => "reviewresult",
-			"label" => "判定結果",
-			"style" => "",
-			"width" => "120",
-		),
-		array(
-			"key" => "ngfeedback_type",
-			"field" => "ngfeedback_type",
-			"label" => "判定種類",
-			"style" => "",
-			"width" => "80",
-		),
-		array(
-			"key" => "responsiblesupplier",
-			"field" => "responsiblesupplier",
-			"label" => "責任供應商",
-			"style" => "",
-			"width" => "120",
-		),
-		array(
-			"key" => "closer",
-			"field" => "closer",
-			"label" => "結案人員",
-			"style" => "",
-			"width" => "120",
-		),
-		array(
-			"key" => "close_time",
-			"field" => "close_at",
-			"label" => "結案時間",
-			"style" => "",
-			"width" => "120",
-		),
-	),
-	"datas" => array()
-);
-
-$progress = array(
-	"0" => "待判定", 
-	"1" => "待處理", 
-	"2" => "處理中", 
-	"9" => "已完成"
-);
-
-$result = array(
-	"N" => "判定不良品",
-	"G" => "判定良品"
-);
-
-$sql = "
-	select *,
-		f_return_account_name(verify) as verify_name, 
-		f_return_account_name(creater) as creater_name, 
-		f_return_account_name(responsibledepartmentleader) as responsibledepartmentleader_name,
-		f_return_account_name(responder) as responder_name,
-		f_return_account_name(closer) as closer_name,
-		f_return_department_name(responsibledepartment) as responsibledepartment_name
-	from ngfeedback 
-";
-if(accountidToDepartId($user_id !== '912')){
-	$sql .= sql_myself($user_id);
-}
-
-$rtn = mysqli_query($link, $sql);
-$dt_setup["datas"] = mysqli_fetch_all($rtn, MYSQLI_ASSOC);
-
-
-// 結束連線
-mysqli_close($link);
-if ($user_auth&2) {
-?>
-<p><a href="ngfeedback-create.php?function_name=ngfeedback&<?php echo $token_link; ?>" class="btn btn-info btn-sm" style="margin-left: 12px"> <span class="glyphicon glyphicon-plus"></span></a></p>
-<?php
-}
-?>
-<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;
-
-}
-.dataTables_scrollHead .dataTable {
-	margin-bottom: -2px;
-}
-.dataTables_scrollBody .dataTable {
-	margin-bottom: 0;
-}
-td[key=ngimage] > img {
-	width: 163px;
-}
-.middle-center {
-	position: absolute;
-	top: 50%; 
-	left: 50%; 
-	transform: translate(-50%,-50%); 
-	transform-origin:50% 50%;
-	text-align: center;
-}
-#dialog_pic {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100vw;
-	height: 100vh;
-	background: rgba(0, 0, 0, 0.65);
-	z-index: 99;
-	display: none;
-}
-#dialog_pic > .dialog-body {
-	width: auto;
-	max-width: 96%;
-	max-height: 96%;
-	padding: 12px;
-	background: var(--bs-white, #fff);
-	border-radius: 6px;
-	overflow: auto;
-}
-#dialog_pic > .dialog-body > img {
-	width: 100%;
-	height: 100%;
-    object-fit: contain;
-}
-td[key=reply_history] > div {
-	white-space: pre-line;
-}
-@media screen and (max-width: 600px) {
-
-    table {
-        border: 0;
-    }
-
-    table thead {
-        display: none;
-    }
-
-    table tr {
-        margin-bottom: 10px;
-        display: block;
-        border-bottom: 2px solid #ddd;
-    }
-
-    table td {
-        display: block;
-        text-align: right;
-        font-size: 14px;
-        border-bottom: 1px dotted #ccc;
-		width: 100%;
-		min-height: 36px;
-    }
-
-    table td:last-child {
-        border-bottom: 0;
-    }
-
-    table td:before {
-        content: attr(data-label);
-        float: left;
-        text-transform: uppercase;
-        font-weight: bold;
-    }
-	
-	#dialog_pic > .dialog-body {
-		width: 100%;
-	}
-}
-</style>
-<div style="overflow-x:auto;">
-	<table id="table_index" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-			<tr>
-				<?php
-				foreach ($dt_setup["columns"] as $col) {
-					echo "<th key='".$col["key"]."' width='".$col["width"]."' style='".$col["style"]."'>".$col["label"]."</th>";
-				}
-				?>
-			</tr>
-		</thead>
-		<tbody>
-			<?php
-			foreach($dt_setup["datas"] as $row) {
-				echo "<tr>";
-				foreach ($dt_setup["columns"] as $col) {
-					echo "<td key='".$col["key"]."' width='".$col["width"]."' data-label='".$col["label"]."' style='".$col["style"]."'>";
-					switch ($col["field"]) {
-						case "ngimage":
-							echo "<img class='image-fluid result_pics zoom' src='..".$row[$col["field"]]."'/>";
-							break;
-						case "reviewresult":
-							if (!$row["reviewresult"] && $row["progress"] == "9" && in_array($depart_id, array("220", "912"))) {
-								echo "<a href=\"ngfeedback-update.php?function_name=ngfeedback&no=".$row["id"]."&$token_link\" class='btn btn-info btn-sm'><span style='font-size: 1.125em; font-weight: 600;'>品證人員填寫</span></a>";
-								break;
-							}
-						case "verify":
-							if ($col["field"] == "verify" && !$row["verify"] && in_array($depart_id, array("220", "912"))) {
-								echo "<a href=\"ngfeedback-update.php?function_name=ngfeedback&no=".$row["id"]."&$token_link\" class='btn btn-info btn-sm'><span style='font-size: 1.125em; font-weight: 600;'>品證人員填寫</span></a>";
-								break;
-							}
-						case "responder":
-							if (!in_array($row["progress"], array("0", "9")) && $col["field"] == "responder" && $row["responder"] && ($depart_id == "220" || $row["responder"] == $user_id)) {
-								echo "<a href=\"ngfeedback-update-reply.php?function_name=ngfeedback&no=".$row["id"]."&$token_link\" class='btn btn-info btn-sm'><span style='font-size: 1.125em; font-weight: 600;'>".$row["responder"]." 填寫</span></a>";
-								break;
-							}
-						default:
-							if (in_array($col["field"], array("creater", "verify", "responsibledepartmentleader", "responsibledepartment", "responder", "closer"))) {
-								echo "<div>".implode(" ", array($row[$col["field"]], $row[$col["field"]."_name"]))."</div>";
-							} else if ($col["field"] == "progress" && isset($progress[$row[$col["field"]]])) {
-								echo "<div data-progress='".$row[$col["field"]]."'>".$progress[$row[$col["field"]]]."</div>";
-							} else if ($col["field"] == "reviewresult" && isset($result[$row[$col["field"]]])) {
-								echo "<div data-result='".$row[$col["field"]]."'>".$result[$row[$col["field"]]]."</div>";
-							} else {
-								echo "<div>".$row[$col["field"]]."</div>";
-							}
-					} 
-					echo "</td>";
-				}
-				echo "</tr>";
-			}
-			?>
-		</tbody>
-	</table>
-</div>
-<div id="dialog_pic">
-	<div class="dialog-body middle-center">
-		<img src="#"  style="width: 100%; height: auto;"/>
-	</div>
-</div>
-<script>
-	var searchContent = "";
-	var showNum = 10;
-	var nowPage = 1;
-	
-    var table = $('#table_index').DataTable({
-		"scrollX": true,
-		/*
-		"language": {
-			"emptyTable": "無資料...",
-			"processing": "處理中...",
-			"loadingRecords": "載入中...",
-			"lengthMenu": "顯示_MENU_　筆",
-			"zeroRecords": "沒有符合的結果",
-			"info": "第 _START_ 至 _END_ 項，共 _TOTAL_ 項",
-			"infoEmpty": "第 0 至 0 項，共 0 項",
-			"infoFiltered": "(從 _MAX_ 項結果中過濾)",
-			"infoPostFix": "",
-			"search": "",
-			"paginate": {
-				"first": "第一頁",
-				"previous": "上一頁",
-				"next": "下一頁",
-				"last": "最後一頁"
-			},
-			"aria": {
-				"sortAscending": ": 升冪排列",
-				"sortDescending": ": 降冪排列"
-			}
-		}
-		*/
-	}, {
-		"order": [
-			[4, "desc"],
-			[8, "asc"]
-		]
-	});
-	
-    // var table = $('#table_index').DataTable();
-    table.search(searchContent).draw();
-    table.page.len(showNum).draw();
-    table.page((nowPage) - 1).draw('page');
-
-    // 監聽頁碼
-    table.on('page.dt', function() {
-        searchDatatable(table);
-    });
-
-    // 監聽資料筆數
-    table.on('length.dt', function(e, settings, len) {
-        searchDatatable(table);
-    });
-
-    // 監聽搜尋事件
-    $("#table_index_filter > label > input").change(function() {
-        searchDatatable(table);
-    });
-	
-	function searchDatatable(table) {
-		showNum = table.page.len();
-		nowPage = table.page.info().page + 1;
-		searchContent = table.search();
-		/*
-		window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" +
-			"&showNum=" + showNum + "&nowPage=" + nowPage + "&searchContent=" + searchContent + "&sheetNum=" + sheetNum +
-			"&contractno=" + contractno + "&facilityno=" + facilityno + "&custom=" + custom +
-			"&site_survey_contact_verify=" + site_survey_contact_verify + "&real_contract_arrival_date_start=" + real_contract_arrival_date_start +
-			"&real_contract_arrival_date_end=" + real_contract_arrival_date_end + "&area_no=" + area_no;
-		*/
-	}
-	
-	$(function() {	
-		$('img.zoom').on('click', function() { 
-			$('#dialog_pic img').attr("src", $(this).attr("src"));
-			$('#dialog_pic').show();
-		});
-		// 点击显示的大图，触发事件，当触发当前页面内里任何处位置，就会隐藏显示的大图
-		$('#dialog_pic').on('click', function() {      
-			$(this).hide();
-		});
-	});
+<?php
+include "header.php";
+$depart_id = accountidToDepartId($user_id);
+
+$dt_setup = array(
+	"columns" => array(
+		array(
+			"key" => "SEQ",
+			"field" => "id",
+			"label" => "項次",
+			"style" => "",
+			"width" => "60",
+		),
+		array(
+			"key" => "create_at",
+			"field" => "create_at",
+			"label" => "反饋日期",
+			"style" => "",
+			"width" => "120",
+		),
+		array(
+			"key" => "facilityno",
+			"field" => "facilityno",
+			"label" => "電梯編號",
+			"style" => "",
+			"width" => "120",
+		),
+		array(
+			"key" => "onsite_name",
+			"field" => "sitename",
+			"label" => "現場名稱",
+			"style" => "",
+			"width" => "120",
+		),
+		array(
+			"key" => "onsite_address",
+			"field" => "siteaddress",
+			"label" => "現場地址",
+			"style" => "",
+			"width" => "180",
+		),
+		array(
+			"key" => "creater",
+			"field" => "creater",
+			"label" => "不良單填單人員",
+			"style" => "",
+			"width" => "120",
+		),
+		array(
+			"key" => "describe",
+			"field" => "ngdescribe",
+			"label" => "簡述不良內容",
+			"style" => "",
+			"width" => "180",
+		),
+		array(
+			"key" => "ngimage",
+			"field" => "ngimage",
+			"label" => "照片上傳",
+			"style" => "",
+			"width" => "180",
+		),
+		array(
+			"key" => "verify", 
+			"field" => "verify",
+			"label" => "品證人員",
+			"style" => "",
+			"width" => "120",
+		),
+		array(
+			"key" => "investigation_reason",
+			"field" => "investigationreason",
+			"label" => "現場調查原因",
+			"style" => "",
+			"width" => "180",
+		),
+		array(
+			"key" => "countermeasure",
+			"field" => "countermeasure",
+			"label" => "對策方式及再發防止",
+			"style" => "",
+			"width" => "180",
+		),
+		array(
+			"key" => "responsible_depart",
+			"field" => "responsibledepartment",
+			"label" => "判定責任單位",
+			"style" => "",
+			"width" => "120",
+		),
+		array(
+			"key" => "responsible_depart_leader",
+			"field" => "responsibledepartmentleader",
+			"label" => "責任單位主管",
+			"style" => "",
+			"width" => "120",
+		),
+		array(
+			"key" => "responsible_depart_responder",
+			"field" => "responder",
+			"label" => "責任單位回覆人",
+			"style" => "",
+			"width" => "120",
+		),
+		array(
+			"key" => "progress",
+			"field" => "progress",
+			"label" => "處理進度",
+			"style" => "",
+			"width" => "120",
+		),
+		array(
+			"key" => "reply_time",
+			"field" => "reply_at",
+			"label" => "回覆時間",
+			"style" => "",
+			"width" => "120",
+		),
+		array(
+			"key" => "reply_history",
+			"field" => "replyhistory",
+			"label" => "責任單位回覆",
+			"style" => "",
+			"width" => "360",
+		),
+		array(
+			"key" => "update_time",
+			"field" => "update_at",
+			"label" => "更新時間",
+			"style" => "",
+			"width" => "120",
+		),
+		array(
+			"key" => "reviewresult",
+			"field" => "reviewresult",
+			"label" => "判定結果",
+			"style" => "",
+			"width" => "120",
+		),
+		array(
+			"key" => "ngfeedback_type",
+			"field" => "ngfeedback_type",
+			"label" => "判定種類",
+			"style" => "",
+			"width" => "80",
+		),
+		array(
+			"key" => "responsiblesupplier",
+			"field" => "responsiblesupplier",
+			"label" => "責任供應商",
+			"style" => "",
+			"width" => "120",
+		),
+		array(
+			"key" => "closer",
+			"field" => "closer",
+			"label" => "結案人員",
+			"style" => "",
+			"width" => "120",
+		),
+		array(
+			"key" => "close_time",
+			"field" => "close_at",
+			"label" => "結案時間",
+			"style" => "",
+			"width" => "120",
+		),
+	),
+	"datas" => array()
+);
+
+$progress = array(
+	"0" => "待判定", 
+	"1" => "待處理", 
+	"2" => "處理中", 
+	"9" => "已完成"
+);
+
+$result = array(
+	"N" => "判定不良品",
+	"G" => "判定良品"
+);
+
+$sql = "
+	select *,
+		f_return_account_name(verify) as verify_name, 
+		f_return_account_name(creater) as creater_name, 
+		f_return_account_name(responsibledepartmentleader) as responsibledepartmentleader_name,
+		f_return_account_name(responder) as responder_name,
+		f_return_account_name(closer) as closer_name,
+		f_return_department_name(responsibledepartment) as responsibledepartment_name
+	from ngfeedback 
+";
+if(accountidToDepartId($user_id !== '912')){
+	$sql .= sql_myself($user_id);
+}
+
+$rtn = mysqli_query($link, $sql);
+$dt_setup["datas"] = mysqli_fetch_all($rtn, MYSQLI_ASSOC);
+
+
+// 結束連線
+mysqli_close($link);
+if ($user_auth&2) {
+?>
+<p><a href="ngfeedback-create.php?function_name=ngfeedback&<?php echo $token_link; ?>" class="btn btn-info btn-sm" style="margin-left: 12px"> <span class="glyphicon glyphicon-plus"></span></a></p>
+<?php
+}
+?>
+<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;
+
+}
+.dataTables_scrollHead .dataTable {
+	margin-bottom: -2px;
+}
+.dataTables_scrollBody .dataTable {
+	margin-bottom: 0;
+}
+td[key=ngimage] > img {
+	width: 163px;
+}
+.middle-center {
+	position: absolute;
+	top: 50%; 
+	left: 50%; 
+	transform: translate(-50%,-50%); 
+	transform-origin:50% 50%;
+	text-align: center;
+}
+#dialog_pic {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100vw;
+	height: 100vh;
+	background: rgba(0, 0, 0, 0.65);
+	z-index: 99;
+	display: none;
+}
+#dialog_pic > .dialog-body {
+	width: auto;
+	max-width: 96%;
+	max-height: 96%;
+	padding: 12px;
+	background: var(--bs-white, #fff);
+	border-radius: 6px;
+	overflow: auto;
+}
+#dialog_pic > .dialog-body > img {
+	width: 100%;
+	height: 100%;
+    object-fit: contain;
+}
+td[key=reply_history] > div {
+	white-space: pre-line;
+}
+@media screen and (max-width: 600px) {
+
+    table {
+        border: 0;
+    }
+
+    table thead {
+        display: none;
+    }
+
+    table tr {
+        margin-bottom: 10px;
+        display: block;
+        border-bottom: 2px solid #ddd;
+    }
+
+    table td {
+        display: block;
+        text-align: right;
+        font-size: 14px;
+        border-bottom: 1px dotted #ccc;
+		width: 100%;
+		min-height: 36px;
+    }
+
+    table td:last-child {
+        border-bottom: 0;
+    }
+
+    table td:before {
+        content: attr(data-label);
+        float: left;
+        text-transform: uppercase;
+        font-weight: bold;
+    }
+	
+	#dialog_pic > .dialog-body {
+		width: 100%;
+	}
+}
+</style>
+<div style="overflow-x:auto;">
+	<table id="table_index" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+			<tr>
+				<?php
+				foreach ($dt_setup["columns"] as $col) {
+					echo "<th key='".$col["key"]."' width='".$col["width"]."' style='".$col["style"]."'>".$col["label"]."</th>";
+				}
+				?>
+			</tr>
+		</thead>
+		<tbody>
+			<?php
+			foreach($dt_setup["datas"] as $row) {
+				echo "<tr>";
+				foreach ($dt_setup["columns"] as $col) {
+					echo "<td key='".$col["key"]."' width='".$col["width"]."' data-label='".$col["label"]."' style='".$col["style"]."'>";
+					switch ($col["field"]) {
+						case "ngimage":
+							echo "<img class='image-fluid result_pics zoom' src='..".$row[$col["field"]]."'/>";
+							break;
+						case "reviewresult":
+							if (!$row["reviewresult"] && $row["progress"] == "9" && in_array($depart_id, array("220", "912"))) {
+								echo "<a href=\"ngfeedback-update.php?function_name=ngfeedback&no=".$row["id"]."&$token_link\" class='btn btn-info btn-sm'><span style='font-size: 1.125em; font-weight: 600;'>品證人員填寫</span></a>";
+								break;
+							}
+						case "verify":
+							if ($col["field"] == "verify" && !$row["verify"] && in_array($depart_id, array("220", "912"))) {
+								echo "<a href=\"ngfeedback-update.php?function_name=ngfeedback&no=".$row["id"]."&$token_link\" class='btn btn-info btn-sm'><span style='font-size: 1.125em; font-weight: 600;'>品證人員填寫</span></a>";
+								break;
+							}
+						case "responder":
+							if (!in_array($row["progress"], array("0", "9")) && $col["field"] == "responder" && $row["responder"] && ($depart_id == "220" || $row["responder"] == $user_id)) {
+								echo "<a href=\"ngfeedback-update-reply.php?function_name=ngfeedback&no=".$row["id"]."&$token_link\" class='btn btn-info btn-sm'><span style='font-size: 1.125em; font-weight: 600;'>".$row["responder"]." 填寫</span></a>";
+								break;
+							}
+						default:
+							if (in_array($col["field"], array("creater", "verify", "responsibledepartmentleader", "responsibledepartment", "responder", "closer"))) {
+								echo "<div>".implode(" ", array($row[$col["field"]], $row[$col["field"]."_name"]))."</div>";
+							} else if ($col["field"] == "progress" && isset($progress[$row[$col["field"]]])) {
+								echo "<div data-progress='".$row[$col["field"]]."'>".$progress[$row[$col["field"]]]."</div>";
+							} else if ($col["field"] == "reviewresult" && isset($result[$row[$col["field"]]])) {
+								echo "<div data-result='".$row[$col["field"]]."'>".$result[$row[$col["field"]]]."</div>";
+							} else {
+								echo "<div>".$row[$col["field"]]."</div>";
+							}
+					} 
+					echo "</td>";
+				}
+				echo "</tr>";
+			}
+			?>
+		</tbody>
+	</table>
+</div>
+<div id="dialog_pic">
+	<div class="dialog-body middle-center">
+		<img src="#"  style="width: 100%; height: auto;"/>
+	</div>
+</div>
+<script>
+	var searchContent = "";
+	var showNum = 10;
+	var nowPage = 1;
+	
+    var table = $('#table_index').DataTable({
+		"scrollX": true,
+		/*
+		"language": {
+			"emptyTable": "無資料...",
+			"processing": "處理中...",
+			"loadingRecords": "載入中...",
+			"lengthMenu": "顯示_MENU_　筆",
+			"zeroRecords": "沒有符合的結果",
+			"info": "第 _START_ 至 _END_ 項，共 _TOTAL_ 項",
+			"infoEmpty": "第 0 至 0 項，共 0 項",
+			"infoFiltered": "(從 _MAX_ 項結果中過濾)",
+			"infoPostFix": "",
+			"search": "",
+			"paginate": {
+				"first": "第一頁",
+				"previous": "上一頁",
+				"next": "下一頁",
+				"last": "最後一頁"
+			},
+			"aria": {
+				"sortAscending": ": 升冪排列",
+				"sortDescending": ": 降冪排列"
+			}
+		}
+		*/
+	}, {
+		"order": [
+			[4, "desc"],
+			[8, "asc"]
+		]
+	});
+	
+    // var table = $('#table_index').DataTable();
+    table.search(searchContent).draw();
+    table.page.len(showNum).draw();
+    table.page((nowPage) - 1).draw('page');
+
+    // 監聽頁碼
+    table.on('page.dt', function() {
+        searchDatatable(table);
+    });
+
+    // 監聽資料筆數
+    table.on('length.dt', function(e, settings, len) {
+        searchDatatable(table);
+    });
+
+    // 監聽搜尋事件
+    $("#table_index_filter > label > input").change(function() {
+        searchDatatable(table);
+    });
+	
+	function searchDatatable(table) {
+		showNum = table.page.len();
+		nowPage = table.page.info().page + 1;
+		searchContent = table.search();
+		/*
+		window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" +
+			"&showNum=" + showNum + "&nowPage=" + nowPage + "&searchContent=" + searchContent + "&sheetNum=" + sheetNum +
+			"&contractno=" + contractno + "&facilityno=" + facilityno + "&custom=" + custom +
+			"&site_survey_contact_verify=" + site_survey_contact_verify + "&real_contract_arrival_date_start=" + real_contract_arrival_date_start +
+			"&real_contract_arrival_date_end=" + real_contract_arrival_date_end + "&area_no=" + area_no;
+		*/
+	}
+	
+	$(function() {	
+		$('img.zoom').on('click', function() { 
+			$('#dialog_pic img').attr("src", $(this).attr("src"));
+			$('#dialog_pic').show();
+		});
+		// 点击显示的大图，触发事件，当触发当前页面内里任何处位置，就会隐藏显示的大图
+		$('#dialog_pic').on('click', function() {      
+			$(this).hide();
+		});
+	});
 </script>
\ No newline at end of file
diff --git a/wms/ngfeedback-update-reply-submit.php b/wms/ngfeedback-update-reply-submit.php
index 697a8b6e..d7830097 100644
--- a/wms/ngfeedback-update-reply-submit.php
+++ b/wms/ngfeedback-update-reply-submit.php
@@ -1,45 +1,45 @@
-<?php
-require_once "database.php";
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-	$input = &$_POST;
-	$data = array_reduce(array(
-		"responder", "progress", "replyinput"
-	), function ($acc, $key) use ($input) {
-		switch ($key) {
-			default:
-				$acc[$key] = htmlspecialchars(stripslashes(trim($input[$key]))) ?: null;
-		}
-		return $acc;
-	}, array());
-	
-	$db_query = "UPDATE ngfeedback as ng 
-				INNER JOIN ( 
-					SELECT 
-						? as id, 
-						? as responder, 
-						? as progress, 
-						CONCAT(f_return_account_name(?), '(', ?, ') ', ?) as replyinput, 
-						CURRENT_TIMESTAMP as reply_at 
-				) as reply ON reply.id = ng.id
-				SET 
-					ng.responder = reply.responder, 
-					ng.replyhistory = CONCAT(IFNULL(ng.replyhistory, ''), IF(ng.replyhistory IS NULL, '', CHAR(10)), '[', reply.reply_at, '] ', reply.replyinput), 
-					ng.reply_at = reply.reply_at, 
-					ng.progress = reply.progress";
-	$stmt = $link->prepare($db_query);
-	$stmt->bind_param("isisss", $_POST["no"], $data["responder"], $data["progress"], $_POST["user_id"], $_POST["user_id"], $data["replyinput"]);
-	$stmt->execute();
-	
-	if (mysqli_affected_rows($link) > 0) {
-		echo "<script type ='text/JavaScript'>";
-		echo "alert('更新成功');";
-		echo "window.location.href='/wms/ngfeedback-index.php?function_name=ngfeedback&token=".$_POST["token"]."';";
-		echo "</script>";
-		//header("Location: pricereview-index.php");
-	} else {
-		echo "<script type ='text/JavaScript'>";
-		echo "alert('更新失敗，請重新操作[I]')";
-		echo "</script>";
-	}
-}
+<?php
+require_once "database.php";
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+	$input = &$_POST;
+	$data = array_reduce(array(
+		"responder", "progress", "replyinput"
+	), function ($acc, $key) use ($input) {
+		switch ($key) {
+			default:
+				$acc[$key] = htmlspecialchars(stripslashes(trim($input[$key]))) ?: null;
+		}
+		return $acc;
+	}, array());
+	
+	$db_query = "UPDATE ngfeedback as ng 
+				INNER JOIN ( 
+					SELECT 
+						? as id, 
+						? as responder, 
+						? as progress, 
+						CONCAT(f_return_account_name(?), '(', ?, ') ', ?) as replyinput, 
+						CURRENT_TIMESTAMP as reply_at 
+				) as reply ON reply.id = ng.id
+				SET 
+					ng.responder = reply.responder, 
+					ng.replyhistory = CONCAT(IFNULL(ng.replyhistory, ''), IF(ng.replyhistory IS NULL, '', CHAR(10)), '[', reply.reply_at, '] ', reply.replyinput), 
+					ng.reply_at = reply.reply_at, 
+					ng.progress = reply.progress";
+	$stmt = $link->prepare($db_query);
+	$stmt->bind_param("isisss", $_POST["no"], $data["responder"], $data["progress"], $_POST["user_id"], $_POST["user_id"], $data["replyinput"]);
+	$stmt->execute();
+	
+	if (mysqli_affected_rows($link) > 0) {
+		echo "<script type ='text/JavaScript'>";
+		echo "alert('更新成功');";
+		echo "window.location.href='/wms/ngfeedback-index.php?function_name=ngfeedback&token=".$_POST["token"]."';";
+		echo "</script>";
+		//header("Location: pricereview-index.php");
+	} else {
+		echo "<script type ='text/JavaScript'>";
+		echo "alert('更新失敗，請重新操作[I]')";
+		echo "</script>";
+	}
+}
 ?>
\ No newline at end of file
diff --git a/wms/ngfeedback-update-reply.php b/wms/ngfeedback-update-reply.php
index 5f0c6026..c88ec626 100644
--- a/wms/ngfeedback-update-reply.php
+++ b/wms/ngfeedback-update-reply.php
@@ -1,173 +1,173 @@
-<?php
-require_once "database.php";
-include "header.php";
-
-include "ngfeedback-update-reply-submit.php";
-
-$db_query = "SELECT *, 
-				f_return_account_name(verify) as verify_name, 
-				f_return_account_name(creater) as creater_name, 
-				f_return_account_name(responsibledepartmentleader) as responsibledepartmentleader_name,
-				f_return_department_name(responsibledepartment) as responsibledepartment_name
-			FROM ngfeedback WHERE id = ?";
-$stmt = $link->prepare($db_query);
-// 此處僅有字串格式
-$stmt->bind_param("i", ...[$_REQUEST["no"]]);
-$stmt->execute();
-$result = $stmt->get_result();
-$data = mysqli_fetch_assoc($result);
-
-$db_query = "SELECT accountid, name FROM account 
-			WHERE accounttype NOT IN ('A', 'X') AND department_id = ?";
-$stmt = $link->prepare($db_query);
-// 此處僅有字串格式
-$stmt->bind_param("i", ...[$data["responsibledepartment"]]);
-$stmt->execute();
-$result = $stmt->get_result();
-$opts = mysqli_fetch_all($result, MYSQLI_ASSOC);
-?>
-<style>
-	select,
-	textarea {
-		margin: 8px 0;
-	}
-
-	div.input-style,
-	textarea {
-		width: 100%;
-		padding: 12px 20px;
-		margin: 8px 0;
-		display: block;
-		border: 1px solid #ccc;
-		border-radius: 4px;
-		box-sizing: border-box;
-		background: var(--bs-white, #fff);
-		white-space: pre;
-	}
-
-	div.input-style:empty:after {
-		content: " ";
-	}
-</style>
-<div class="container">
-	<form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
-		<input type="hidden" name="token" value="<?= $token; ?>">
-		<input type="hidden" name="user_id" value="<?= $user_id; ?>">
-		<input type="hidden" name="no" value="<?= $data["id"]; ?>">
-		<div class="form-group">
-			<div class="col-md-3">
-				<label for="responder">責任單位回覆人</label>
-				<select name="responder" id="responder" <? echo $data["responsibledepartmentleader"] == $user_id ? "" : "readonly"; ?>required>
-					<?php
-					foreach ($opts as $opt) {
-						echo "<option value='" . $opt["accountid"] . "' " . ($opt["accountid"] == $data["responder"] ? 'selected' : '') . ">" . sprintf("%s (%s)", $opt["name"], $opt["accountid"]) . "</option>";
-					}
-					?>
-				</select>
-			</div>
-			<div class="col-md-3">
-				<label for="progress">處理狀態</label>
-				<select name="progress" id="progress">
-					<?php
-					foreach (array(
-						"1" => "待處理",
-						"2" => "處理中",
-						"9" => "已完成"
-					) as $val => $text) {
-						echo sprintf("<option value='%d' %s>%s</option>", $val, ($data["progress"] == $val ? "selected" : ""), $text);
-					}
-					?>
-				</select>
-			</div>
-		</div>
-		<div class="form-group">
-			<div class="col-md-6">
-				<label for="replyhistory">回覆詳細</label>
-				<textarea class="input-style" id="replyhistory" rows="6" style="resize: none;" disabled><?= $data["replyhistory"] ?></textarea>
-			</div>
-			<div class="col-md-6">
-				<label for="replyinput">責任單位回覆</label>
-				<textarea name="replyinput" id="replyinput" rows="6" maxlength="64" style="resize: none;" required></textarea>
-			</div>
-		</div>
-		<div class="form-group">
-			<div class="col-md-12">
-				<button type="submit" class="btn btn-primary btn-lg">點擊後更新不良反饋單</button>
-			</div>
-		</div>
-	</form>
-</div>
-<div class="container">
-	<form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
-		<div class="form-group">
-			<div class="col-md-3">
-				<h3 style="font-weight: 700;">品證部門回覆</h3>
-			</div>
-			<div class="col-md-3">
-				<label for="verify">品證人員</label>
-				<div class="input-style" id="verify"><?= implode(" ", array($data["verify"], $data["verify_name"])) ?></div>
-			</div>
-			<div class="col-md-3">
-				<label for="responsibledepartment">判定責任單位</label>
-				<div class="input-style" id="responsibledepartment"><?= $data["responsibledepartment_name"] ?></div>
-			</div>
-			<div class="col-md-3">
-				<label for="responsibledepartmentleader">判定責任單位主管</label>
-				<div class="input-style" id="responsibledepartmentleader"><?= implode(" ", array($data["responsibledepartmentleader"], $data["responsibledepartmentleader_name"])) ?></div>
-			</div>
-		</div>
-		<div class="form-group">
-			<div class="col-md-6">
-				<label for="investigationreason">現場調查原因</label>
-				<textarea class="input-style" id="investigationreason" rows="6" maxlength="128" style="resize: none;" disabled><?= $data["investigationreason"] ?></textarea>
-			</div>
-			<div class="col-md-6">
-				<label for="countermeasure">對策方法及再發防止</label>
-				<textarea class="input-style" id="countermeasure" rows="6" maxlength="128" style="resize: none;" disabled><?= $data["countermeasure"] ?></textarea>
-			</div>
-		</div>
-	</form>
-</div>
-<div class="container">
-	<form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
-		<div class="form-group">
-			<div class="col-md-3">
-				<h3 style="font-weight: 700;">不良單基本資料</h3>
-			</div>
-			<div class="col-md-3">
-				<label for="id">項次</label>
-				<div class="input-style" id="id"><?= $data["id"] ?></div>
-			</div>
-			<div class="col-md-3">
-				<label for="create_at">反饋日期</label>
-				<div class="input-style" id="create_at"><?= $data["create_at"] ?></div>
-			</div>
-			<div class="col-md-3">
-				<label for="creater">不良單填寫人</label>
-				<div class="input-style" id="creater"><?= implode(" ", array($data["creater"], $data["creater_name"])) ?></div>
-			</div>
-		</div>
-		<div class="form-group">
-			<div class="col-md-3">
-				<label for="facilityno">電梯ID</label>
-				<div class="input-style" id="facilityno"><?= $data["facilityno"] ?></div>
-			</div>
-			<div class="col-md-3">
-				<label for="sitename">現場名稱</label>
-				<div class="input-style" id="sitename"><?= $data["sitename"] ?></div>
-			</div>
-			<div class="col-md-6">
-				<label for="siteaddress">現場地址</label>
-				<div class="input-style" id="siteaddress"><?= $data["siteaddress"] ?></div>
-			</div>
-			<div class="col-md-6">
-				<label for="ngdescribe">簡述不良內容</label>
-				<textarea class="input-style" id="ngdescribe" rows="6" maxlength="128" style="resize: none;" disabled><?= $data["ngdescribe"] ?></textarea>
-			</div>
-			<div class="col-md-6">
-				<label for="ngimage">照片上傳</label>
-				<div class="input-style" id="ngimage"><?php echo $data["ngimage"] ? "<img src='.." . $data["ngimage"] . "' style='margin: 0 auto; width: 100%; height: auto; border-radius: 0; float: none;'/>" : ""; ?></div>
-			</div>
-		</div>
-	</form>
+<?php
+require_once "database.php";
+include "header.php";
+
+include "ngfeedback-update-reply-submit.php";
+
+$db_query = "SELECT *, 
+				f_return_account_name(verify) as verify_name, 
+				f_return_account_name(creater) as creater_name, 
+				f_return_account_name(responsibledepartmentleader) as responsibledepartmentleader_name,
+				f_return_department_name(responsibledepartment) as responsibledepartment_name
+			FROM ngfeedback WHERE id = ?";
+$stmt = $link->prepare($db_query);
+// 此處僅有字串格式
+$stmt->bind_param("i", ...[$_REQUEST["no"]]);
+$stmt->execute();
+$result = $stmt->get_result();
+$data = mysqli_fetch_assoc($result);
+
+$db_query = "SELECT accountid, name FROM account 
+			WHERE accounttype NOT IN ('A', 'X') AND department_id = ?";
+$stmt = $link->prepare($db_query);
+// 此處僅有字串格式
+$stmt->bind_param("i", ...[$data["responsibledepartment"]]);
+$stmt->execute();
+$result = $stmt->get_result();
+$opts = mysqli_fetch_all($result, MYSQLI_ASSOC);
+?>
+<style>
+	select,
+	textarea {
+		margin: 8px 0;
+	}
+
+	div.input-style,
+	textarea {
+		width: 100%;
+		padding: 12px 20px;
+		margin: 8px 0;
+		display: block;
+		border: 1px solid #ccc;
+		border-radius: 4px;
+		box-sizing: border-box;
+		background: var(--bs-white, #fff);
+		white-space: pre;
+	}
+
+	div.input-style:empty:after {
+		content: " ";
+	}
+</style>
+<div class="container">
+	<form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
+		<input type="hidden" name="token" value="<?= $token; ?>">
+		<input type="hidden" name="user_id" value="<?= $user_id; ?>">
+		<input type="hidden" name="no" value="<?= $data["id"]; ?>">
+		<div class="form-group">
+			<div class="col-md-3">
+				<label for="responder">責任單位回覆人</label>
+				<select name="responder" id="responder" <? echo $data["responsibledepartmentleader"] == $user_id ? "" : "readonly"; ?>required>
+					<?php
+					foreach ($opts as $opt) {
+						echo "<option value='" . $opt["accountid"] . "' " . ($opt["accountid"] == $data["responder"] ? 'selected' : '') . ">" . sprintf("%s (%s)", $opt["name"], $opt["accountid"]) . "</option>";
+					}
+					?>
+				</select>
+			</div>
+			<div class="col-md-3">
+				<label for="progress">處理狀態</label>
+				<select name="progress" id="progress">
+					<?php
+					foreach (array(
+						"1" => "待處理",
+						"2" => "處理中",
+						"9" => "已完成"
+					) as $val => $text) {
+						echo sprintf("<option value='%d' %s>%s</option>", $val, ($data["progress"] == $val ? "selected" : ""), $text);
+					}
+					?>
+				</select>
+			</div>
+		</div>
+		<div class="form-group">
+			<div class="col-md-6">
+				<label for="replyhistory">回覆詳細</label>
+				<textarea class="input-style" id="replyhistory" rows="6" style="resize: none;" disabled><?= $data["replyhistory"] ?></textarea>
+			</div>
+			<div class="col-md-6">
+				<label for="replyinput">責任單位回覆</label>
+				<textarea name="replyinput" id="replyinput" rows="6" maxlength="64" style="resize: none;" required></textarea>
+			</div>
+		</div>
+		<div class="form-group">
+			<div class="col-md-12">
+				<button type="submit" class="btn btn-primary btn-lg">點擊後更新不良反饋單</button>
+			</div>
+		</div>
+	</form>
+</div>
+<div class="container">
+	<form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
+		<div class="form-group">
+			<div class="col-md-3">
+				<h3 style="font-weight: 700;">品證部門回覆</h3>
+			</div>
+			<div class="col-md-3">
+				<label for="verify">品證人員</label>
+				<div class="input-style" id="verify"><?= implode(" ", array($data["verify"], $data["verify_name"])) ?></div>
+			</div>
+			<div class="col-md-3">
+				<label for="responsibledepartment">判定責任單位</label>
+				<div class="input-style" id="responsibledepartment"><?= $data["responsibledepartment_name"] ?></div>
+			</div>
+			<div class="col-md-3">
+				<label for="responsibledepartmentleader">判定責任單位主管</label>
+				<div class="input-style" id="responsibledepartmentleader"><?= implode(" ", array($data["responsibledepartmentleader"], $data["responsibledepartmentleader_name"])) ?></div>
+			</div>
+		</div>
+		<div class="form-group">
+			<div class="col-md-6">
+				<label for="investigationreason">現場調查原因</label>
+				<textarea class="input-style" id="investigationreason" rows="6" maxlength="128" style="resize: none;" disabled><?= $data["investigationreason"] ?></textarea>
+			</div>
+			<div class="col-md-6">
+				<label for="countermeasure">對策方法及再發防止</label>
+				<textarea class="input-style" id="countermeasure" rows="6" maxlength="128" style="resize: none;" disabled><?= $data["countermeasure"] ?></textarea>
+			</div>
+		</div>
+	</form>
+</div>
+<div class="container">
+	<form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
+		<div class="form-group">
+			<div class="col-md-3">
+				<h3 style="font-weight: 700;">不良單基本資料</h3>
+			</div>
+			<div class="col-md-3">
+				<label for="id">項次</label>
+				<div class="input-style" id="id"><?= $data["id"] ?></div>
+			</div>
+			<div class="col-md-3">
+				<label for="create_at">反饋日期</label>
+				<div class="input-style" id="create_at"><?= $data["create_at"] ?></div>
+			</div>
+			<div class="col-md-3">
+				<label for="creater">不良單填寫人</label>
+				<div class="input-style" id="creater"><?= implode(" ", array($data["creater"], $data["creater_name"])) ?></div>
+			</div>
+		</div>
+		<div class="form-group">
+			<div class="col-md-3">
+				<label for="facilityno">電梯ID</label>
+				<div class="input-style" id="facilityno"><?= $data["facilityno"] ?></div>
+			</div>
+			<div class="col-md-3">
+				<label for="sitename">現場名稱</label>
+				<div class="input-style" id="sitename"><?= $data["sitename"] ?></div>
+			</div>
+			<div class="col-md-6">
+				<label for="siteaddress">現場地址</label>
+				<div class="input-style" id="siteaddress"><?= $data["siteaddress"] ?></div>
+			</div>
+			<div class="col-md-6">
+				<label for="ngdescribe">簡述不良內容</label>
+				<textarea class="input-style" id="ngdescribe" rows="6" maxlength="128" style="resize: none;" disabled><?= $data["ngdescribe"] ?></textarea>
+			</div>
+			<div class="col-md-6">
+				<label for="ngimage">照片上傳</label>
+				<div class="input-style" id="ngimage"><?php echo $data["ngimage"] ? "<img src='.." . $data["ngimage"] . "' style='margin: 0 auto; width: 100%; height: auto; border-radius: 0; float: none;'/>" : ""; ?></div>
+			</div>
+		</div>
+	</form>
 </div>
\ No newline at end of file
diff --git a/wms/ngfeedback-update-submit.php b/wms/ngfeedback-update-submit.php
index c1d71cef..762bf203 100644
--- a/wms/ngfeedback-update-submit.php
+++ b/wms/ngfeedback-update-submit.php
@@ -1,92 +1,92 @@
-<?php
-require_once "database.php";
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-	$input = &$_POST;
-	if ($input["progress"] == "9") {
-		
-		$data = array_reduce(array(
-			"reviewresult", "responsiblesupplier", "closer" , "ngfeedback_type"
-		), function ($acc, $key) use ($input) {
-			switch ($key) {
-				default:
-					$acc[$key] = htmlspecialchars(stripslashes(trim($input[$key]))) ?: null;
-			}
-			return $acc;
-		}, array("close_at" => date("Y-m-d H:i:s")));
-		$db_query = sprintf("UPDATE ngfeedback SET %s WHERE id = ?", 
-						implode(",", array_map(
-										function ($_k) { 
-											return sprintf("%s = ?", $_k); 
-										}, array_keys($data)
-									)
-						));
-		$stmt = $link->prepare($db_query);
-		// 此處僅有字串格式
-		$stmt->bind_param(implode("", array_fill(0, count($data) + 1, "s")), ...array_values(array_merge($data, array("id" => $_POST["no"]))));
-		$stmt->execute();
-		if (mysqli_affected_rows($link) > 0) {
-			echo "<script type ='text/JavaScript'>";
-			echo "alert('更新成功');";
-			echo "window.location.href='/wms/ngfeedback-index.php?function_name=ngfeedback&token=".$_POST["token"]."';";
-			echo "</script>";
-			//header("Location: pricereview-index.php");
-		} else {
-			echo "<script type ='text/JavaScript'>";
-			echo "alert('更新失敗，請重新操作[I]')";
-			echo "</script>";
-		}
-	} else {
-		$data = array_reduce(array(
-			"responsibledepartment", "investigationreason", "countermeasure", "verify"
-		), function ($acc, $key) use ($input) {
-			switch ($key) {
-				default:
-					$acc[$key] = htmlspecialchars(stripslashes(trim($input[$key]))) ?: null;
-			}
-			return $acc;
-		}, array("progress" => "1", "update_at" => date("Y-m-d H:i:s")));
-		
-		if ($data["responsibledepartment"]) {
-			$db_query = "SELECT accountid FROM account WHERE department_id = ? ORDER BY role_id ASC, create_at DESC LIMIT 0 , 1";
-			$stmt = $link->prepare($db_query);
-			// 此處僅有字串格式
-			$stmt->bind_param("s", $data["responsibledepartment"]);
-			$stmt->execute();
-			$result = $stmt->get_result();
-			$uarr = mysqli_fetch_assoc($result);
-			$data["responsibledepartmentleader"] = isset($uarr["accountid"]) ? $uarr["accountid"] : null;
-			// 責任單位回覆人預設主管
-			$data["responder"] = isset($uarr["accountid"]) ? $uarr["accountid"] : null;
-		}
-		
-		if ($data["responsibledepartmentleader"]) { 
-			$db_query = sprintf("UPDATE ngfeedback SET %s WHERE id = ?", 
-							implode(",", array_map(
-											function ($_k) { 
-												return sprintf("%s = ?", $_k); 
-											}, array_keys($data)
-										)
-							));
-			$stmt = $link->prepare($db_query);
-			// 此處僅有字串格式
-			$stmt->bind_param(implode("", array_fill(0, count($data) + 1, "s")), ...array_values(array_merge($data, array("id" => $_POST["no"]))));
-			$stmt->execute();
-			if (mysqli_affected_rows($link) > 0) {
-				echo "<script type ='text/JavaScript'>";
-				echo "alert('更新成功');";
-				echo "window.location.href='/wms/ngfeedback-index.php?function_name=ngfeedback&token=".$_POST["token"]."';";
-				echo "</script>";
-				//header("Location: pricereview-index.php");
-			} else {
-				echo "<script type ='text/JavaScript'>";
-				echo "alert('更新失敗，請重新操作[I]')";
-				echo "</script>";
-			}
-		} else {
-			echo "<script type ='text/JavaScript'>";
-			echo "alert('更新失敗，請重新操作[L]')";
-			echo "</script>";
-		}
-	}
-}
+<?php
+require_once "database.php";
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+	$input = &$_POST;
+	if ($input["progress"] == "9") {
+		
+		$data = array_reduce(array(
+			"reviewresult", "responsiblesupplier", "closer" , "ngfeedback_type"
+		), function ($acc, $key) use ($input) {
+			switch ($key) {
+				default:
+					$acc[$key] = htmlspecialchars(stripslashes(trim($input[$key]))) ?: null;
+			}
+			return $acc;
+		}, array("close_at" => date("Y-m-d H:i:s")));
+		$db_query = sprintf("UPDATE ngfeedback SET %s WHERE id = ?", 
+						implode(",", array_map(
+										function ($_k) { 
+											return sprintf("%s = ?", $_k); 
+										}, array_keys($data)
+									)
+						));
+		$stmt = $link->prepare($db_query);
+		// 此處僅有字串格式
+		$stmt->bind_param(implode("", array_fill(0, count($data) + 1, "s")), ...array_values(array_merge($data, array("id" => $_POST["no"]))));
+		$stmt->execute();
+		if (mysqli_affected_rows($link) > 0) {
+			echo "<script type ='text/JavaScript'>";
+			echo "alert('更新成功');";
+			echo "window.location.href='/wms/ngfeedback-index.php?function_name=ngfeedback&token=".$_POST["token"]."';";
+			echo "</script>";
+			//header("Location: pricereview-index.php");
+		} else {
+			echo "<script type ='text/JavaScript'>";
+			echo "alert('更新失敗，請重新操作[I]')";
+			echo "</script>";
+		}
+	} else {
+		$data = array_reduce(array(
+			"responsibledepartment", "investigationreason", "countermeasure", "verify"
+		), function ($acc, $key) use ($input) {
+			switch ($key) {
+				default:
+					$acc[$key] = htmlspecialchars(stripslashes(trim($input[$key]))) ?: null;
+			}
+			return $acc;
+		}, array("progress" => "1", "update_at" => date("Y-m-d H:i:s")));
+		
+		if ($data["responsibledepartment"]) {
+			$db_query = "SELECT accountid FROM account WHERE department_id = ? ORDER BY role_id ASC, create_at DESC LIMIT 0 , 1";
+			$stmt = $link->prepare($db_query);
+			// 此處僅有字串格式
+			$stmt->bind_param("s", $data["responsibledepartment"]);
+			$stmt->execute();
+			$result = $stmt->get_result();
+			$uarr = mysqli_fetch_assoc($result);
+			$data["responsibledepartmentleader"] = isset($uarr["accountid"]) ? $uarr["accountid"] : null;
+			// 責任單位回覆人預設主管
+			$data["responder"] = isset($uarr["accountid"]) ? $uarr["accountid"] : null;
+		}
+		
+		if ($data["responsibledepartmentleader"]) { 
+			$db_query = sprintf("UPDATE ngfeedback SET %s WHERE id = ?", 
+							implode(",", array_map(
+											function ($_k) { 
+												return sprintf("%s = ?", $_k); 
+											}, array_keys($data)
+										)
+							));
+			$stmt = $link->prepare($db_query);
+			// 此處僅有字串格式
+			$stmt->bind_param(implode("", array_fill(0, count($data) + 1, "s")), ...array_values(array_merge($data, array("id" => $_POST["no"]))));
+			$stmt->execute();
+			if (mysqli_affected_rows($link) > 0) {
+				echo "<script type ='text/JavaScript'>";
+				echo "alert('更新成功');";
+				echo "window.location.href='/wms/ngfeedback-index.php?function_name=ngfeedback&token=".$_POST["token"]."';";
+				echo "</script>";
+				//header("Location: pricereview-index.php");
+			} else {
+				echo "<script type ='text/JavaScript'>";
+				echo "alert('更新失敗，請重新操作[I]')";
+				echo "</script>";
+			}
+		} else {
+			echo "<script type ='text/JavaScript'>";
+			echo "alert('更新失敗，請重新操作[L]')";
+			echo "</script>";
+		}
+	}
+}
 ?>
\ No newline at end of file
diff --git a/wms/ngfeedback-update.php b/wms/ngfeedback-update.php
index a8d24647..63f1957d 100644
--- a/wms/ngfeedback-update.php
+++ b/wms/ngfeedback-update.php
@@ -1,236 +1,236 @@
-<?php
-require_once "database.php";
-include "header.php";
-
-include "ngfeedback-update-submit.php";
-
-$db_query = "
-    SELECT *, 
-        f_return_account_name(verify) AS verify_name, 
-        f_return_account_name(creater) AS creater_name, 
-        f_return_account_name(responsibledepartmentleader) AS responsibledepartmentleader_name,
-        f_return_account_name(responder) AS responder_name,
-        f_return_department_name(responsibledepartment) AS responsibledepartment_name
-    FROM ngfeedback WHERE id = ?
-";
-$stmt = $link->prepare($db_query);
-// 此處僅有字串格式
-$stmt->bind_param("i", ...[$_REQUEST["no"]]);
-$stmt->execute();
-$result = $stmt->get_result();
-$data = mysqli_fetch_assoc($result);
-
-$progress = array(
-    "0" => "待判定",
-    "1" => "待處理",
-    "2" => "處理中",
-    "9" => "已完成"
-);
-?>
-<style>
-    select,
-    textarea {
-        margin: 8px 0;
-    }
-
-    div.input-style,
-    textarea {
-        width: 100%;
-        padding: 12px 20px;
-        margin: 8px 0;
-        display: block;
-        border: 1px solid #ccc;
-        border-radius: 4px;
-        box-sizing: border-box;
-        background: var(--bs-white, #fff);
-        white-space: pre;
-    }
-
-    div.input-style:empty:after {
-        content: " ";
-    }
-</style>
-<?php if ($data["progress"] == "9") { // determination 
-?>
-    <div class="container">
-        <form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
-            <input type="hidden" name="token" value="<?= $token; ?>">
-            <input type="hidden" name="closer" value="<?= $user_id; ?>">
-            <input type="hidden" name="progress" value="<?= $data["progress"]; ?>">
-            <input type="hidden" name="no" value="<?= $data["id"]; ?>">
-            <div class="form-group">
-                <div class="col-md-12">
-                    <h3 style="font-weight: 700;">審查結果填寫</h3>
-                </div>
-                <div class="col-md-3">
-                    <label for="reviewresult">審查判定結果</label>
-                    <select id="reviewresult" name="reviewresult">
-                        <option value="N">判定不良品</option>
-                        <option value="G">判定良品</option>
-                    </select>
-                </div>
-                <div class="col-md-3">
-                    <label for="ngfeedback_type">審查判定類型</label>
-                    <select id="ngfeedback_type" name="ngfeedback_type">
-                        <option value="sr">sr</option>
-                        <option value="sq">sq</option>
-                    </select>
-                </div>
-                <div class="col-md-6">
-                    <label for="responsiblesupplier">責任供應商</label>
-                    <input type="text" name="responsiblesupplier" id="responsiblesupplier" maxlength="20" placeholder="ex: 永佳捷科技">
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-12">
-                    <button type="submit" class="btn btn-primary btn-lg">點擊後結束不良反饋單</button>
-                </div>
-            </div>
-        </form>
-    </div>
-    <div class="container">
-        <form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
-            <div class="form-group">
-                <div class="col-md-3">
-                    <h3 style="font-weight: 700;">責任單位回覆</h3>
-                </div>
-                <div class="col-md-3">
-                    <label for="responder">責任單位回覆人</label>
-                    <div class="input-style" id="responder"><?= implode(" ", array($data["responder"], $data["responder_name"])) ?></div>
-                </div>
-                <div class="col-md-3">
-                    <label for="progress">處理狀態</label>
-                    <div class="input-style" id="progress"><?= $progress[$data["progress"]] ?></div>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-12">
-                    <label for="replyhistory">回覆詳細</label>
-                    <textarea class="input-style" id="replyhistory" rows="6" style="resize: none;" disabled><?= $data["replyhistory"] ?></textarea>
-                </div>
-            </div>
-        </form>
-    </div>
-    <div class="container">
-        <form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
-            <div class="form-group">
-                <div class="col-md-3">
-                    <h3 style="font-weight: 700;">品證部門填寫</h3>
-                </div>
-                <div class="col-md-3">
-                    <label for="verify">結案人員</label>
-                    <div class="input-style" id="verify"><?= implode(" ", array($data["verify"], $data["verify_name"])) ?></div>
-                </div>
-                <div class="col-md-3">
-                    <label for="responsibledepartment">判定責任單位</label>
-                    <div class="input-style" id="responsibledepartment"><?= $data["responsibledepartment_name"] ?></div>
-                </div>
-                <div class="col-md-3">
-                    <label for="responsibledepartmentleader">判定責任單位主管</label>
-                    <div class="input-style" id="responsibledepartmentleader"><?= implode(" ", array($data["responsibledepartmentleader"], $data["responsibledepartmentleader_name"])) ?></div>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-6">
-                    <label for="investigationreason">現場調查原因</label>
-                    <textarea class="input-style" id="investigationreason" rows="6" maxlength="128" style="resize: none;" disabled><?= $data["investigationreason"] ?></textarea>
-                </div>
-                <div class="col-md-6">
-                    <label for="countermeasure">對策方法及再發防止</label>
-                    <textarea class="input-style" id="countermeasure" rows="6" maxlength="128" style="resize: none;" disabled><?= $data["countermeasure"] ?></textarea>
-                </div>
-            </div>
-        </form>
-    </div>
-<?php } else { ?>
-    <div class="container">
-        <form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
-            <input type="hidden" name="token" value="<?= $token; ?>">
-            <input type="hidden" name="verify" value="<?= $user_id; ?>">
-            <input type="hidden" name="progress" value="<?= $data["progress"]; ?>">
-            <input type="hidden" name="no" value="<?= $data["id"]; ?>">
-            <div class="form-group">
-                <div class="col-md-3">
-                    <h3 style="font-weight: 700;">品證部門判定</h3>
-                </div>
-                <div class="col-md-3">
-                    <label for="responsibledepartment">判定責任單位</label>
-                    <select name="responsibledepartment" id="responsibledepartment" required>
-                        <option value="250">廠務部</option>
-                        <option value="321">業務部</option>
-                        <option value="50">工務總處</option>
-                        <option value="521">安裝開發支援部</option>
-                        <option value="531">北區維修保養部</option>
-                        <option value="532">桃竹維修保養部</option>
-                        <option value="533">中區維修保養部</option>
-                        <option value="534">南區維修保養部</option>
-                        <option value="541">宜花東工事部</option>
-                        <option value="542">北區工事部</option>
-                        <option value="543">桃竹工事部</option>
-                        <option value="544">中區工事部</option>
-                        <option value="545">南區工事部</option>
-                        <option value="platform">普來特富</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-6">
-                    <label for="investigationreason">現場調查原因</label>
-                    <textarea name="investigationreason" id="investigationreason" rows="6" maxlength="128" required></textarea>
-                </div>
-                <div class="col-md-6">
-                    <label for="countermeasure">對策方法及再發防止</label>
-                    <textarea name="countermeasure" id="countermeasure" rows="6" maxlength="255" required></textarea>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-md-12">
-                    <button type="submit" class="btn btn-primary btn-lg">點擊後更新不良反饋單</button>
-                </div>
-            </div>
-        </form>
-    </div>
-<?php } ?>
-<div class="container">
-    <form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
-        <div class="form-group">
-            <div class="col-md-3">
-                <h3 style="font-weight: 700;">不良單基本資料</h3>
-            </div>
-            <div class="col-md-3">
-                <label for="id">項次</label>
-                <div class="input-style" id="id"><?= $data["id"] ?></div>
-            </div>
-            <div class="col-md-3">
-                <label for="create_at">反饋日期</label>
-                <div class="input-style" id="create_at"><?= $data["create_at"] ?></div>
-            </div>
-            <div class="col-md-3">
-                <label for="creater">不良單填寫人</label>
-                <div class="input-style" id="creater"><?= implode(" ", array($data["creater"], $data["creater_name"])) ?></div>
-            </div>
-        </div>
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="facilityno">電梯ID</label>
-                <div class="input-style" id="facilityno"><?= $data["facilityno"] ?></div>
-            </div>
-            <div class="col-md-3">
-                <label for="sitename">現場名稱</label>
-                <div class="input-style" id="sitename"><?= $data["sitename"] ?></div>
-            </div>
-            <div class="col-md-6">
-                <label for="siteaddress">現場地址</label>
-                <div class="input-style" id="siteaddress"><?= $data["siteaddress"] ?></div>
-            </div>
-            <div class="col-md-6">
-                <label for="ngdescribe">簡述不良內容</label>
-                <textarea class="input-style" id="ngdescribe" rows="6" maxlength="128" style="resize: none;" disabled><?= $data["ngdescribe"] ?></textarea>
-            </div>
-            <div class="col-md-6">
-                <label for="ngimage">照片上傳</label>
-                <div class="input-style" id="ngimage"><?php echo $data["ngimage"] ? "<img src='.." . $data["ngimage"] . "' style='margin: 0 auto; width: 100%; height: auto; border-radius: 0; float: none;'/>" : ""; ?></div>
-            </div>
-        </div>
-    </form>
+<?php
+require_once "database.php";
+include "header.php";
+
+include "ngfeedback-update-submit.php";
+
+$db_query = "
+    SELECT *, 
+        f_return_account_name(verify) AS verify_name, 
+        f_return_account_name(creater) AS creater_name, 
+        f_return_account_name(responsibledepartmentleader) AS responsibledepartmentleader_name,
+        f_return_account_name(responder) AS responder_name,
+        f_return_department_name(responsibledepartment) AS responsibledepartment_name
+    FROM ngfeedback WHERE id = ?
+";
+$stmt = $link->prepare($db_query);
+// 此處僅有字串格式
+$stmt->bind_param("i", ...[$_REQUEST["no"]]);
+$stmt->execute();
+$result = $stmt->get_result();
+$data = mysqli_fetch_assoc($result);
+
+$progress = array(
+    "0" => "待判定",
+    "1" => "待處理",
+    "2" => "處理中",
+    "9" => "已完成"
+);
+?>
+<style>
+    select,
+    textarea {
+        margin: 8px 0;
+    }
+
+    div.input-style,
+    textarea {
+        width: 100%;
+        padding: 12px 20px;
+        margin: 8px 0;
+        display: block;
+        border: 1px solid #ccc;
+        border-radius: 4px;
+        box-sizing: border-box;
+        background: var(--bs-white, #fff);
+        white-space: pre;
+    }
+
+    div.input-style:empty:after {
+        content: " ";
+    }
+</style>
+<?php if ($data["progress"] == "9") { // determination 
+?>
+    <div class="container">
+        <form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
+            <input type="hidden" name="token" value="<?= $token; ?>">
+            <input type="hidden" name="closer" value="<?= $user_id; ?>">
+            <input type="hidden" name="progress" value="<?= $data["progress"]; ?>">
+            <input type="hidden" name="no" value="<?= $data["id"]; ?>">
+            <div class="form-group">
+                <div class="col-md-12">
+                    <h3 style="font-weight: 700;">審查結果填寫</h3>
+                </div>
+                <div class="col-md-3">
+                    <label for="reviewresult">審查判定結果</label>
+                    <select id="reviewresult" name="reviewresult">
+                        <option value="N">判定不良品</option>
+                        <option value="G">判定良品</option>
+                    </select>
+                </div>
+                <div class="col-md-3">
+                    <label for="ngfeedback_type">審查判定類型</label>
+                    <select id="ngfeedback_type" name="ngfeedback_type">
+                        <option value="sr">sr</option>
+                        <option value="sq">sq</option>
+                    </select>
+                </div>
+                <div class="col-md-6">
+                    <label for="responsiblesupplier">責任供應商</label>
+                    <input type="text" name="responsiblesupplier" id="responsiblesupplier" maxlength="20" placeholder="ex: 永佳捷科技">
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-md-12">
+                    <button type="submit" class="btn btn-primary btn-lg">點擊後結束不良反饋單</button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div class="container">
+        <form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
+            <div class="form-group">
+                <div class="col-md-3">
+                    <h3 style="font-weight: 700;">責任單位回覆</h3>
+                </div>
+                <div class="col-md-3">
+                    <label for="responder">責任單位回覆人</label>
+                    <div class="input-style" id="responder"><?= implode(" ", array($data["responder"], $data["responder_name"])) ?></div>
+                </div>
+                <div class="col-md-3">
+                    <label for="progress">處理狀態</label>
+                    <div class="input-style" id="progress"><?= $progress[$data["progress"]] ?></div>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-md-12">
+                    <label for="replyhistory">回覆詳細</label>
+                    <textarea class="input-style" id="replyhistory" rows="6" style="resize: none;" disabled><?= $data["replyhistory"] ?></textarea>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div class="container">
+        <form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
+            <div class="form-group">
+                <div class="col-md-3">
+                    <h3 style="font-weight: 700;">品證部門填寫</h3>
+                </div>
+                <div class="col-md-3">
+                    <label for="verify">結案人員</label>
+                    <div class="input-style" id="verify"><?= implode(" ", array($data["verify"], $data["verify_name"])) ?></div>
+                </div>
+                <div class="col-md-3">
+                    <label for="responsibledepartment">判定責任單位</label>
+                    <div class="input-style" id="responsibledepartment"><?= $data["responsibledepartment_name"] ?></div>
+                </div>
+                <div class="col-md-3">
+                    <label for="responsibledepartmentleader">判定責任單位主管</label>
+                    <div class="input-style" id="responsibledepartmentleader"><?= implode(" ", array($data["responsibledepartmentleader"], $data["responsibledepartmentleader_name"])) ?></div>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-md-6">
+                    <label for="investigationreason">現場調查原因</label>
+                    <textarea class="input-style" id="investigationreason" rows="6" maxlength="128" style="resize: none;" disabled><?= $data["investigationreason"] ?></textarea>
+                </div>
+                <div class="col-md-6">
+                    <label for="countermeasure">對策方法及再發防止</label>
+                    <textarea class="input-style" id="countermeasure" rows="6" maxlength="128" style="resize: none;" disabled><?= $data["countermeasure"] ?></textarea>
+                </div>
+            </div>
+        </form>
+    </div>
+<?php } else { ?>
+    <div class="container">
+        <form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
+            <input type="hidden" name="token" value="<?= $token; ?>">
+            <input type="hidden" name="verify" value="<?= $user_id; ?>">
+            <input type="hidden" name="progress" value="<?= $data["progress"]; ?>">
+            <input type="hidden" name="no" value="<?= $data["id"]; ?>">
+            <div class="form-group">
+                <div class="col-md-3">
+                    <h3 style="font-weight: 700;">品證部門判定</h3>
+                </div>
+                <div class="col-md-3">
+                    <label for="responsibledepartment">判定責任單位</label>
+                    <select name="responsibledepartment" id="responsibledepartment" required>
+                        <option value="250">廠務部</option>
+                        <option value="321">業務部</option>
+                        <option value="50">工務總處</option>
+                        <option value="521">安裝開發支援部</option>
+                        <option value="531">北區維修保養部</option>
+                        <option value="532">桃竹維修保養部</option>
+                        <option value="533">中區維修保養部</option>
+                        <option value="534">南區維修保養部</option>
+                        <option value="541">宜花東工事部</option>
+                        <option value="542">北區工事部</option>
+                        <option value="543">桃竹工事部</option>
+                        <option value="544">中區工事部</option>
+                        <option value="545">南區工事部</option>
+                        <option value="platform">普來特富</option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-md-6">
+                    <label for="investigationreason">現場調查原因</label>
+                    <textarea name="investigationreason" id="investigationreason" rows="6" maxlength="128" required></textarea>
+                </div>
+                <div class="col-md-6">
+                    <label for="countermeasure">對策方法及再發防止</label>
+                    <textarea name="countermeasure" id="countermeasure" rows="6" maxlength="255" required></textarea>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-md-12">
+                    <button type="submit" class="btn btn-primary btn-lg">點擊後更新不良反饋單</button>
+                </div>
+            </div>
+        </form>
+    </div>
+<?php } ?>
+<div class="container">
+    <form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
+        <div class="form-group">
+            <div class="col-md-3">
+                <h3 style="font-weight: 700;">不良單基本資料</h3>
+            </div>
+            <div class="col-md-3">
+                <label for="id">項次</label>
+                <div class="input-style" id="id"><?= $data["id"] ?></div>
+            </div>
+            <div class="col-md-3">
+                <label for="create_at">反饋日期</label>
+                <div class="input-style" id="create_at"><?= $data["create_at"] ?></div>
+            </div>
+            <div class="col-md-3">
+                <label for="creater">不良單填寫人</label>
+                <div class="input-style" id="creater"><?= implode(" ", array($data["creater"], $data["creater_name"])) ?></div>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="facilityno">電梯ID</label>
+                <div class="input-style" id="facilityno"><?= $data["facilityno"] ?></div>
+            </div>
+            <div class="col-md-3">
+                <label for="sitename">現場名稱</label>
+                <div class="input-style" id="sitename"><?= $data["sitename"] ?></div>
+            </div>
+            <div class="col-md-6">
+                <label for="siteaddress">現場地址</label>
+                <div class="input-style" id="siteaddress"><?= $data["siteaddress"] ?></div>
+            </div>
+            <div class="col-md-6">
+                <label for="ngdescribe">簡述不良內容</label>
+                <textarea class="input-style" id="ngdescribe" rows="6" maxlength="128" style="resize: none;" disabled><?= $data["ngdescribe"] ?></textarea>
+            </div>
+            <div class="col-md-6">
+                <label for="ngimage">照片上傳</label>
+                <div class="input-style" id="ngimage"><?php echo $data["ngimage"] ? "<img src='.." . $data["ngimage"] . "' style='margin: 0 auto; width: 100%; height: auto; border-radius: 0; float: none;'/>" : ""; ?></div>
+            </div>
+        </div>
+    </form>
 </div>
\ No newline at end of file
diff --git a/wms/ngfeedbackapi.php b/wms/ngfeedbackapi.php
index 4cdd9e8a..566c9064 100644
--- a/wms/ngfeedbackapi.php
+++ b/wms/ngfeedbackapi.php
@@ -1,24 +1,24 @@
-<?php
-// include "header_nomenu.php";
-require_once dirname(__FILE__)."/database.php";
-
-if ($_SERVER["REQUEST_METHOD"] == "GET") {
-	switch ($_GET["type"]) {
-		case "facilityno":
-			$stmt = $link->prepare("SELECT facilityno, address FROM facility 
-									WHERE facilityno LIKE CONCAT(?, '%') ORDER BY facilityno ASC LIMIT 0 , ?");
-			// 此處僅有字串格式term
-			$stmt->bind_param("si", ...[$_GET["term"], $_GET["rn"]]);
-			$stmt->execute();
-			$datas = $stmt->get_result()->fetch_all(MYSQLI_ASSOC);
-			break;
-	}
-	
-}
-
-die(json_encode(array(
-	"count" => count($datas), 
-	"data" => $datas
-)));
-exit;
+<?php
+// include "header_nomenu.php";
+require_once dirname(__FILE__)."/database.php";
+
+if ($_SERVER["REQUEST_METHOD"] == "GET") {
+	switch ($_GET["type"]) {
+		case "facilityno":
+			$stmt = $link->prepare("SELECT facilityno, address FROM facility 
+									WHERE facilityno LIKE CONCAT(?, '%') ORDER BY facilityno ASC LIMIT 0 , ?");
+			// 此處僅有字串格式term
+			$stmt->bind_param("si", ...[$_GET["term"], $_GET["rn"]]);
+			$stmt->execute();
+			$datas = $stmt->get_result()->fetch_all(MYSQLI_ASSOC);
+			break;
+	}
+	
+}
+
+die(json_encode(array(
+	"count" => count($datas), 
+	"data" => $datas
+)));
+exit;
 ?>
\ No newline at end of file
diff --git a/wms/notice-delete.php b/wms/notice-delete.php
index 63895076..f86c3f94 100644
--- a/wms/notice-delete.php
+++ b/wms/notice-delete.php
@@ -1,11 +1,11 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "update notice set haveread = 1 where id = '$id'";
-$res = mysqli_query($link, $db_query);
-header("Refresh:0; url=notice-index.php?function_name=notice&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "update notice set haveread = 1 where id = '$id'";
+$res = mysqli_query($link, $db_query);
+header("Refresh:0; url=notice-index.php?function_name=notice&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/notice-edit.php b/wms/notice-edit.php
index 5107fef5..20c30215 100644
--- a/wms/notice-edit.php
+++ b/wms/notice-edit.php
@@ -1,47 +1,47 @@
-<?php
-include "header.php"; 
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "select * from notice where id = '$id'";
-$data = mysqli_query($link, $db_query);
-
-foreach($data as $data) :
-?>
-<style>
-.nextline {
-    width: 100%;
-    height: 0;
-}
-</style>
-<script>
-$(function(){
-    $('#btn').click(function(){
-        history.go(-1);
-    });
-});
-</script>
-<div class="container">
-    <form class="form-inline" method="post" action="#">
-        <div>
-            <label for="title">標題</label>
-            <input type="text" name="title" id="title" size="30" maxlength="25" value="<?php echo $data['title']; ?>" required>
-        </div>
-        <div class="nextline"></div>
-        <div>
-            <label for="content">內容</label><br>
-            <textarea class="form-control2" name="content" id="content" rows="8" cols="100" required><?php echo $data['content']; ?></textarea>
-        </div>
-        <div class="nextline"></div>
-        <div>
-            <br>
-            <button type="button" name="btn" id="btn">回上頁</button>
-        </div>
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-    </form>
-</div>
-<?php
-endforeach;
-
-include "footer.php";
+<?php
+include "header.php"; 
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "select * from notice where id = '$id'";
+$data = mysqli_query($link, $db_query);
+
+foreach($data as $data) :
+?>
+<style>
+.nextline {
+    width: 100%;
+    height: 0;
+}
+</style>
+<script>
+$(function(){
+    $('#btn').click(function(){
+        history.go(-1);
+    });
+});
+</script>
+<div class="container">
+    <form class="form-inline" method="post" action="#">
+        <div>
+            <label for="title">標題</label>
+            <input type="text" name="title" id="title" size="30" maxlength="25" value="<?php echo $data['title']; ?>" required>
+        </div>
+        <div class="nextline"></div>
+        <div>
+            <label for="content">內容</label><br>
+            <textarea class="form-control2" name="content" id="content" rows="8" cols="100" required><?php echo $data['content']; ?></textarea>
+        </div>
+        <div class="nextline"></div>
+        <div>
+            <br>
+            <button type="button" name="btn" id="btn">回上頁</button>
+        </div>
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+    </form>
+</div>
+<?php
+endforeach;
+
+include "footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/notice-index.php b/wms/notice-index.php
index 29a92789..097cd59f 100644
--- a/wms/notice-index.php
+++ b/wms/notice-index.php
@@ -1,105 +1,105 @@
-<?php
-include "header.php";
-
-// 設置一個空陣列來放資料
-$data = array();
-
-// sql語法存在變數中
-$sql  = "select * from notice ";
-$sql .= "where (permission like '%".$user_id."%' or permission = 'ALL' or creater = '$user_id') ";
-$sql .= "order by id";
-
-// 用mysqli_query方法執行(sql語法)將結果存在變數中
-$data = mysqli_query($link,$sql);
-?>
-
-<!--
-<p>
-<a href="notice-create.php?<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
--->
-<?php
-if($data):
-?>
-
-<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;
-   
-}
-</style>
-<div style="overflow-x:auto;">
-    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-    <thead>
-        <tr>
-            <th>項次</th>
-            <th>類別</th>
-            <th>標題</th>
-            <th>內容</th>
-			<th>確認</th>
-            <th>建檔人</th>
-            <th>建檔時間</th>
-        </tr>
-    </thead>
-    <tbody>
-    <?php foreach($data as $data) : if (is_null($data['haveread'])):?>
-        <tr>
-            <td><?php echo $data['id']; ?></td>
-            <td><?php if ($data['kind']=='1') echo "系統"; else echo "會議"; ?></td>
-            <td><?php echo $data['title']; ?></td>
-            <td><?php echo $data['content']; ?></td>
-			<!-- <td><?php if ($data['haveread']=='1') echo "已確認"; else echo "新通知"; ?></td> -->
-            <!-- <td><button onclick="checked(event, <?php echo $data['id'];?>)" >不再通知</button></td> -->
-            <td><a href="notice-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('確認關閉通知嗎？')">
-                        <span class="glyphicon glyphicon-ok"></span>
-                    </a></td>
-            <td><?php echo $data['creater']; ?></td>
-            <td><?php echo $data['create_at']; ?></td>
-        </tr>
-        <?php endif;?>
-    <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-?>
+<?php
+include "header.php";
+
+// 設置一個空陣列來放資料
+$data = array();
+
+// sql語法存在變數中
+$sql  = "select * from notice ";
+$sql .= "where (permission like '%".$user_id."%' or permission = 'ALL' or creater = '$user_id') ";
+$sql .= "order by id";
+
+// 用mysqli_query方法執行(sql語法)將結果存在變數中
+$data = mysqli_query($link,$sql);
+?>
+
+<!--
+<p>
+<a href="notice-create.php?<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+-->
+<?php
+if($data):
+?>
+
+<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;
+   
+}
+</style>
+<div style="overflow-x:auto;">
+    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+    <thead>
+        <tr>
+            <th>項次</th>
+            <th>類別</th>
+            <th>標題</th>
+            <th>內容</th>
+			<th>確認</th>
+            <th>建檔人</th>
+            <th>建檔時間</th>
+        </tr>
+    </thead>
+    <tbody>
+    <?php foreach($data as $data) : if (is_null($data['haveread'])):?>
+        <tr>
+            <td><?php echo $data['id']; ?></td>
+            <td><?php if ($data['kind']=='1') echo "系統"; else echo "會議"; ?></td>
+            <td><?php echo $data['title']; ?></td>
+            <td><?php echo $data['content']; ?></td>
+			<!-- <td><?php if ($data['haveread']=='1') echo "已確認"; else echo "新通知"; ?></td> -->
+            <!-- <td><button onclick="checked(event, <?php echo $data['id'];?>)" >不再通知</button></td> -->
+            <td><a href="notice-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('確認關閉通知嗎？')">
+                        <span class="glyphicon glyphicon-ok"></span>
+                    </a></td>
+            <td><?php echo $data['creater']; ?></td>
+            <td><?php echo $data['create_at']; ?></td>
+        </tr>
+        <?php endif;?>
+    <?php endforeach; ?>
+        </tbody>
+    </table>
+</div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+?>
diff --git a/wms/pending_list.php b/wms/pending_list.php
index 0007c141..fdc87042 100644
--- a/wms/pending_list.php
+++ b/wms/pending_list.php
@@ -1,120 +1,120 @@
-<?php
-    // 載入db.php來連結資料庫
-    require_once "database.php";
-    include "header.php";
-	
-	// 設置一個空陣列來放資料
-	$data = array();
-	// sql語法存在變數中
-	$sql = "SELECT * FROM pending ORDER BY id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$sql);
-
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<!--
-<p>
-<a href="facility_current_status-create.php" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
--->
-<?php
-
-
-
-
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:pending-index.php");
-        }
-    }
-
-?>
-
-<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;
-   
-}
-
-</style>
-
-    <div style="overflow-x:auto;">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-            <tr>
-                <th>項次</th>
-                <th>表單主題</th>
-                <th>表單內容</th>
-                <th>填寫日期</th>
-                <th>申請人</th>
-                <th>所屬部門</th>
-                <th>主旨</th>
-                <th>建檔時間</th>
-            </tr>
-		</thead>
-		<tbody>			
-
-            <?php foreach($data as $data) : ?>    
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                </tr>
-            <?php endforeach; ?>
-			</tbody>			
-        </table>
-    </div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-
+<?php
+    // 載入db.php來連結資料庫
+    require_once "database.php";
+    include "header.php";
+	
+	// 設置一個空陣列來放資料
+	$data = array();
+	// sql語法存在變數中
+	$sql = "SELECT * FROM pending ORDER BY id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$sql);
+
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<!--
+<p>
+<a href="facility_current_status-create.php" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+-->
+<?php
+
+
+
+
+if($data):
+    
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:pending-index.php");
+        }
+    }
+
+?>
+
+<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;
+   
+}
+
+</style>
+
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+            <tr>
+                <th>項次</th>
+                <th>表單主題</th>
+                <th>表單內容</th>
+                <th>填寫日期</th>
+                <th>申請人</th>
+                <th>所屬部門</th>
+                <th>主旨</th>
+                <th>建檔時間</th>
+            </tr>
+		</thead>
+		<tbody>			
+
+            <?php foreach($data as $data) : ?>    
+                <tr>
+                    <td><?php echo $data['id']; ?></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                </tr>
+            <?php endforeach; ?>
+			</tbody>			
+        </table>
+    </div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+
 ?>
\ No newline at end of file
diff --git a/wms/pre_order-create.php b/wms/pre_order-create.php
index 7738a066..e590e1d8 100644
--- a/wms/pre_order-create.php
+++ b/wms/pre_order-create.php
@@ -1,132 +1,132 @@
-<?php
-include "header.php";
-?>
-
-<div class="container">
-
-    <?php
-    
-        include "pre_order-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        
-    
-
-
-		<div>
-            <label for="order_id">訂貨編號</label>
-            <input type="text" name="order_id" id="order_id" required>
-        </div>	
-
-        <div>
-            <label for="equipment_id">部品編號</label>
-            <input type="text" name="equipment_id" id="equipment_id" required>
-        </div>	
-
-        <div>
-            <label for="equipment_name">部品名稱</label>
-            <input type="text" name="equipment_name" id="equipment_name" required>
-        </div>	
-		
-        <div>
-            <label for="brand">廠牌</label>
-            <input type="text" name="brand" id="brand" required>
-        </div>	
-				
-        <div>
-            <label for="spec">規格</label>
-            <input type="text" name="spec" id="spec" required>
-        </div>	
-
-        <div>
-            <label for="count_type">計量單位</label>
-            <input type="text" name="count_type" id="count_type" required>
-        </div>	
-        
-        <div>
-            <label for="price">價格</label>
-            <input type="text" name="price" id="price" onkeyup="if(value<0)value=0;if(value.length>9)value=value.slice(0,9);value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="quantity">數量</label>
-            <input type="text" name="quantity" id="quantity" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="total_price">總價</label>
-            <input type="text" name="total_price" id="total_price" onkeyup="if(value<0)value=0;if(value.length>10)value=value.slice(0,10);value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="orderer_id">訂購人帳號</label>
-            <input type="text" name="orderer_id" id="orderer_id" value="<?php echo $user_id; ?>" required>
-        </div>
-
-        <div>
-            <label for="orderer_name">訂購人姓名</label>
-            <input type="text" name="orderer_name" id="orderer_name" value="<?php echo $user_name; ?>" required>
-        </div>
-        
-        <div>
-            <label for="contact_person">收件聯繫人</label>
-            <input type="text" name="contact_person" id="contact_person" required>
-        </div>
-
-        <div>
-            <label for="tel">連絡電話</label>
-            <input type="text" name="tel" id="tel" required>
-        </div>
-
-        <div>
-            <label for="address">地址</label>
-            <input type="text" name="address" id="address" required>
-        </div>
-
-        <div>
-            <label for="status">狀態</label>
-			<Select name="status" id="status" required>
-				<option selected="selected" disabled="disabled"  style="display: none" value=""></option>			
-				<Option Value="C">確認中</Option>
-				<Option Value="P">備貨中</Option>	
-				<Option Value="S">在途中</Option>		
-				<Option Value="E">已結案</Option>
-			</Select>				
-            <!-- <input type="text" name="status" id="status" > -->
-        </div>
-
-        <div>
-            <label for="deliver_no">貨運單號</label>
-            <input type="text" name="deliver_no" id="deliver_no" required>
-        </div>
-
-        <div>
-            <label for="memo">備註</label>
-            <input type="text" name="memo" id="memo" >
-        </div>
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at">
-        </div>
-
-        <div>
-            <button type="submit" name="submit">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
+<?php
+include "header.php";
+?>
+
+<div class="container">
+
+    <?php
+    
+        include "pre_order-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        
+    
+
+
+		<div>
+            <label for="order_id">訂貨編號</label>
+            <input type="text" name="order_id" id="order_id" required>
+        </div>	
+
+        <div>
+            <label for="equipment_id">部品編號</label>
+            <input type="text" name="equipment_id" id="equipment_id" required>
+        </div>	
+
+        <div>
+            <label for="equipment_name">部品名稱</label>
+            <input type="text" name="equipment_name" id="equipment_name" required>
+        </div>	
+		
+        <div>
+            <label for="brand">廠牌</label>
+            <input type="text" name="brand" id="brand" required>
+        </div>	
+				
+        <div>
+            <label for="spec">規格</label>
+            <input type="text" name="spec" id="spec" required>
+        </div>	
+
+        <div>
+            <label for="count_type">計量單位</label>
+            <input type="text" name="count_type" id="count_type" required>
+        </div>	
+        
+        <div>
+            <label for="price">價格</label>
+            <input type="text" name="price" id="price" onkeyup="if(value<0)value=0;if(value.length>9)value=value.slice(0,9);value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="quantity">數量</label>
+            <input type="text" name="quantity" id="quantity" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="total_price">總價</label>
+            <input type="text" name="total_price" id="total_price" onkeyup="if(value<0)value=0;if(value.length>10)value=value.slice(0,10);value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="orderer_id">訂購人帳號</label>
+            <input type="text" name="orderer_id" id="orderer_id" value="<?php echo $user_id; ?>" required>
+        </div>
+
+        <div>
+            <label for="orderer_name">訂購人姓名</label>
+            <input type="text" name="orderer_name" id="orderer_name" value="<?php echo $user_name; ?>" required>
+        </div>
+        
+        <div>
+            <label for="contact_person">收件聯繫人</label>
+            <input type="text" name="contact_person" id="contact_person" required>
+        </div>
+
+        <div>
+            <label for="tel">連絡電話</label>
+            <input type="text" name="tel" id="tel" required>
+        </div>
+
+        <div>
+            <label for="address">地址</label>
+            <input type="text" name="address" id="address" required>
+        </div>
+
+        <div>
+            <label for="status">狀態</label>
+			<Select name="status" id="status" required>
+				<option selected="selected" disabled="disabled"  style="display: none" value=""></option>			
+				<Option Value="C">確認中</Option>
+				<Option Value="P">備貨中</Option>	
+				<Option Value="S">在途中</Option>		
+				<Option Value="E">已結案</Option>
+			</Select>				
+            <!-- <input type="text" name="status" id="status" > -->
+        </div>
+
+        <div>
+            <label for="deliver_no">貨運單號</label>
+            <input type="text" name="deliver_no" id="deliver_no" required>
+        </div>
+
+        <div>
+            <label for="memo">備註</label>
+            <input type="text" name="memo" id="memo" >
+        </div>
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at">
+        </div>
+
+        <div>
+            <button type="submit" name="submit">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
diff --git a/wms/pre_order-delete.php b/wms/pre_order-delete.php
index 70b7939e..2b120c6d 100644
--- a/wms/pre_order-delete.php
+++ b/wms/pre_order-delete.php
@@ -1,12 +1,12 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "DELETE FROM pre_order WHERE id='$id'";
-mysqli_query($link, $db_query);	
-
-header("Refresh:0; url=pre_order-index.php?function_name=pre_order&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "DELETE FROM pre_order WHERE id='$id'";
+mysqli_query($link, $db_query);	
+
+header("Refresh:0; url=pre_order-index.php?function_name=pre_order&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/pre_order-edit.php b/wms/pre_order-edit.php
index ff38529f..d5c62513 100644
--- a/wms/pre_order-edit.php
+++ b/wms/pre_order-edit.php
@@ -1,151 +1,151 @@
-<?php
-    include "header.php";
-
-    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-	
-	$data = array();
-	// sql語法存在變數中
-	$db_query = "SELECT * FROM pre_order  WHERE id=$id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$db_query);	
-/*
-    include "inc/record_update.php";
-    
-    try {	
-		// 設置一個空陣列來放資料
-		$data = array();
-		// sql語法存在變數中
-		$db_query = "SELECT * FROM expert WHERE id=$id";
-
-		// 用mysqli_query方法執行(sql語法)將結果存在變數中
-		$data = mysqli_query($link,$db_query);
-	}catch (Exception $e) {
-    echo 'Caught exception: ',  $e->getMessage(), "\n";
-	}
-*/	
-    foreach($data as $data) :
-?>
-
-<div class="container">
-    <form class="form-inline" method="post" action="pre_order-record-update.php" enctype="multipart/form-data">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-		
-        <div>
-            <label for="order_id">訂貨編號</label>
-            <input type="text" name="order_id" id="order_id" value="<?php echo $data['order_id']; ?>">
-        </div>	
-
-        <div>
-            <label for="equipment_id">部品編號</label>
-            <input type="text" name="equipment_id" id="equipment_id" value="<?php echo $data['equipment_id']; ?>">
-        </div>	
-
-        <div>
-            <label for="equipment_name">部品名稱</label>
-            <input type="text" name="equipment_name" id="equipment_name" value="<?php echo $data['equipment_name']; ?>">
-        </div>	
-		
-        <div>
-            <label for="brand">廠牌</label>
-            <input type="text" name="brand" id="brand" value="<?php echo $data['brand']; ?>">
-        </div>	
-				
-        <div>
-            <label for="spec">規格</label>
-            <input type="text" name="spec" id="spec" value="<?php echo $data['spec']; ?>">
-        </div>	
-
-        <div>
-            <label for="count_type">計量單位</label>
-            <input type="text" name="count_type" id="count_type" value="<?php echo $data['count_type']; ?>">
-        </div>	
-        
-        <div>
-            <label for="price">價格</label>
-            <input type="text" name="price" id="price" value="<?php echo $data['price']; ?>" onkeyup="if(value<0)value=0;if(value.length>9)value=value.slice(0,9);value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="quantity">數量</label>
-            <input type="text" name="quantity" id="quantity" value="<?php echo $data['quantity']; ?>" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="total_price">總價</label>
-            <input type="text" name="total_price" id="total_price" value="<?php echo $data['total_price']; ?>" onkeyup="if(value<0)value=0;if(value.length>10)value=value.slice(0,10);value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="orderer_id">訂購人帳號</label>
-            <input type="text" name="orderer_id" id="orderer_id" value="<?php echo $data['orderer_id']; ?>" required>
-        </div>
-
-        <div>
-            <label for="orderer_name">訂購人姓名</label>
-            <input type="text" name="orderer_name" id="orderer_name" value="<?php echo $data['orderer_name']; ?>" required>
-        </div>
-        
-        <div>
-            <label for="contact_person">收件聯繫人</label>
-            <input type="text" name="contact_person" id="contact_person" value="<?php echo $data['contact_person']; ?>" required>
-        </div>
-
-        <div>
-            <label for="tel">連絡電話</label>
-            <input type="text" name="tel" id="tel" value="<?php echo $data['tel']; ?>" required>
-        </div>
-
-        <div>
-            <label for="address">地址</label>
-            <input type="text" name="address" id="address" value="<?php echo $data['address']; ?>" required>
-        </div>
-
-        <div>
-            <label for="status">狀態</label>
-			<Select name="status" id="status" required>
-					<?php
-						switch ($data['status']) {
-							case "C":
-								echo "<Option Value='C' selected='selected'>確認中</Option> <Option Value='P'>備貨中</Option> <Option Value='S'>在途中</Option> <Option Value='E'>已結案</Option>";
-								break;
-							case "P":
-								echo "<Option Value='C'>確認中</Option> <Option Value='P' selected='selected'>備貨中</Option> <Option Value='S'>在途中</Option> <Option Value='E'>已結案</Option>";
-								break;
-							case "S":
-								echo "<Option Value='C'>確認中</Option> <Option Value='P'>備貨中</Option> <Option Value='S' selected='selected'>在途中</Option> <Option Value='E'>已結案</Option>";
-								break;
-							case "E":
-								echo "<Option Value='C'>確認中</Option> <Option Value='P'>備貨中</Option> <Option Value='S'>在途中</Option> <Option Value='E' selected='selected'>已結案</Option>";
-								break;								
-						}					
-					?>					
-			</Select>				
-            <!-- <input type="text" name="status" id="status" value="" required> -->
-        </div>
-
-        <div>
-            <label for="deliver_no">貨運單號</label>
-            <input type="text" name="deliver_no" id="deliver_no" value="<?php echo $data['deliver_no']; ?>" required>
-        </div>
-
-        <div>
-            <label for="memo">備註</label>
-            <input type="text" name="memo" id="memo" value="<?php echo $data['memo']; ?>">
-        </div>	
-		
-        <div>
-            <button type="submit" name="update">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
-?>
-
+<?php
+    include "header.php";
+
+    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+	
+	$data = array();
+	// sql語法存在變數中
+	$db_query = "SELECT * FROM pre_order  WHERE id=$id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$db_query);	
+/*
+    include "inc/record_update.php";
+    
+    try {	
+		// 設置一個空陣列來放資料
+		$data = array();
+		// sql語法存在變數中
+		$db_query = "SELECT * FROM expert WHERE id=$id";
+
+		// 用mysqli_query方法執行(sql語法)將結果存在變數中
+		$data = mysqli_query($link,$db_query);
+	}catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+	}
+*/	
+    foreach($data as $data) :
+?>
+
+<div class="container">
+    <form class="form-inline" method="post" action="pre_order-record-update.php" enctype="multipart/form-data">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+		
+        <div>
+            <label for="order_id">訂貨編號</label>
+            <input type="text" name="order_id" id="order_id" value="<?php echo $data['order_id']; ?>">
+        </div>	
+
+        <div>
+            <label for="equipment_id">部品編號</label>
+            <input type="text" name="equipment_id" id="equipment_id" value="<?php echo $data['equipment_id']; ?>">
+        </div>	
+
+        <div>
+            <label for="equipment_name">部品名稱</label>
+            <input type="text" name="equipment_name" id="equipment_name" value="<?php echo $data['equipment_name']; ?>">
+        </div>	
+		
+        <div>
+            <label for="brand">廠牌</label>
+            <input type="text" name="brand" id="brand" value="<?php echo $data['brand']; ?>">
+        </div>	
+				
+        <div>
+            <label for="spec">規格</label>
+            <input type="text" name="spec" id="spec" value="<?php echo $data['spec']; ?>">
+        </div>	
+
+        <div>
+            <label for="count_type">計量單位</label>
+            <input type="text" name="count_type" id="count_type" value="<?php echo $data['count_type']; ?>">
+        </div>	
+        
+        <div>
+            <label for="price">價格</label>
+            <input type="text" name="price" id="price" value="<?php echo $data['price']; ?>" onkeyup="if(value<0)value=0;if(value.length>9)value=value.slice(0,9);value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="quantity">數量</label>
+            <input type="text" name="quantity" id="quantity" value="<?php echo $data['quantity']; ?>" onkeyup="if(value<0)value=0;if(value.length>4)value=value.slice(0,4);value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="total_price">總價</label>
+            <input type="text" name="total_price" id="total_price" value="<?php echo $data['total_price']; ?>" onkeyup="if(value<0)value=0;if(value.length>10)value=value.slice(0,10);value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="orderer_id">訂購人帳號</label>
+            <input type="text" name="orderer_id" id="orderer_id" value="<?php echo $data['orderer_id']; ?>" required>
+        </div>
+
+        <div>
+            <label for="orderer_name">訂購人姓名</label>
+            <input type="text" name="orderer_name" id="orderer_name" value="<?php echo $data['orderer_name']; ?>" required>
+        </div>
+        
+        <div>
+            <label for="contact_person">收件聯繫人</label>
+            <input type="text" name="contact_person" id="contact_person" value="<?php echo $data['contact_person']; ?>" required>
+        </div>
+
+        <div>
+            <label for="tel">連絡電話</label>
+            <input type="text" name="tel" id="tel" value="<?php echo $data['tel']; ?>" required>
+        </div>
+
+        <div>
+            <label for="address">地址</label>
+            <input type="text" name="address" id="address" value="<?php echo $data['address']; ?>" required>
+        </div>
+
+        <div>
+            <label for="status">狀態</label>
+			<Select name="status" id="status" required>
+					<?php
+						switch ($data['status']) {
+							case "C":
+								echo "<Option Value='C' selected='selected'>確認中</Option> <Option Value='P'>備貨中</Option> <Option Value='S'>在途中</Option> <Option Value='E'>已結案</Option>";
+								break;
+							case "P":
+								echo "<Option Value='C'>確認中</Option> <Option Value='P' selected='selected'>備貨中</Option> <Option Value='S'>在途中</Option> <Option Value='E'>已結案</Option>";
+								break;
+							case "S":
+								echo "<Option Value='C'>確認中</Option> <Option Value='P'>備貨中</Option> <Option Value='S' selected='selected'>在途中</Option> <Option Value='E'>已結案</Option>";
+								break;
+							case "E":
+								echo "<Option Value='C'>確認中</Option> <Option Value='P'>備貨中</Option> <Option Value='S'>在途中</Option> <Option Value='E' selected='selected'>已結案</Option>";
+								break;								
+						}					
+					?>					
+			</Select>				
+            <!-- <input type="text" name="status" id="status" value="" required> -->
+        </div>
+
+        <div>
+            <label for="deliver_no">貨運單號</label>
+            <input type="text" name="deliver_no" id="deliver_no" value="<?php echo $data['deliver_no']; ?>" required>
+        </div>
+
+        <div>
+            <label for="memo">備註</label>
+            <input type="text" name="memo" id="memo" value="<?php echo $data['memo']; ?>">
+        </div>	
+		
+        <div>
+            <button type="submit" name="update">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php
+
+    endforeach;
+    
+    include "footer.php";
+
+?>
+
diff --git a/wms/pre_order-index.php b/wms/pre_order-index.php
index d3653674..fe4cadd1 100644
--- a/wms/pre_order-index.php
+++ b/wms/pre_order-index.php
@@ -1,164 +1,164 @@
-<?php
-    include "header.php";
-
-	
-	// 設置一個空陣列來放資料
-	$data = array();
-	// sql語法存在變數中
-    $sql_cmd = sql_myself($user_id, "orderer_id");
-	$sql = "SELECT * FROM pre_order $sql_cmd ORDER BY id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$sql);
-
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="pre_order-create.php?function_name=pre_order&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-
-<?php
-}
-
-
-
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:pre_order-index.php");
-        }
-    }
-
-?>
-
-<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;
-   
-}
-
-</style>
-
-    <div style="overflow-x:auto;">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-            <tr>
-                <th>項次</th>
-                <th>訂貨編號</th>
-                <th>部品編號</th>
-                <th>部品名稱</th>		
-                <th>廠牌</th>
-                <th>規格</th>
-                <th>計量單位</th>
-                <th class="width_style_1">示意圖</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 ($user_auth&2) { ?>
-                <th>修改</th>
-                <th>刪除</th>
-                <?php } ?>
-            </tr>
-		</thead>
-		<tbody>			
-
-            <?php foreach($data as $data) : ?>    
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td><?php echo $data['order_id']; ?></td>
-                    <td><?php echo $data['equipment_id']; ?></td>
-                    <td><?php echo $data['equipment_name']; ?></td>
-                    <td><?php echo $data['brand']; ?></td>
-                    <td><?php echo $data['spec']; ?></td>
-                    <td><?php echo $data['count_type']; ?></td>
-                    <td class="width_style_1"><img src="<?php echo $data['picture']; ?>" alt="" class="index-image"></td>				
-                    <td><?php echo $data['price']; ?></td>
-                    <td><?php echo $data['quantity']; ?></td>
-                    <td><?php echo $data['total_price']; ?></td>
-                    <td><?php echo $data['orderer_id']; ?></td>
-                    <td><?php echo $data['orderer_name']; ?></td>
-                    <td><?php echo $data['contact_person']; ?></td>
-                    <td><?php echo $data['tel']; ?></td>
-                    <td><?php echo $data['address']; ?></td>
-                    <td><?php echo $data['status']; ?></td>
-                    <td><?php echo $data['deliver_no']; ?></td>
-                    <td><?php echo $data['memo']; ?></td>
-                    <td><?php echo $data['create_at']; ?></td>
-                    <?php if ($user_auth&2) { ?>
-                    <td>
-						<p>
-							<a href="pre_order-edit.php?id=<?php echo $data['id']; ?>&function_name=pre_order&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-								<span class="glyphicon glyphicon-pencil"></span>
-							</a>
-						</p> 
-					</td>
-                    <td>
-						<p>
-							<a href="pre_order-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-								<span class="glyphicon glyphicon-remove"></span>
-							</a>
-						</p> 
-					</td>
-                    <?php } ?>
-                </tr>
-            <?php endforeach; ?>
-			</tbody>
-        </table>
-    </div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-
+<?php
+    include "header.php";
+
+	
+	// 設置一個空陣列來放資料
+	$data = array();
+	// sql語法存在變數中
+    $sql_cmd = sql_myself($user_id, "orderer_id");
+	$sql = "SELECT * FROM pre_order $sql_cmd ORDER BY id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$sql);
+
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth&2) { ?>
+<p>
+<a href="pre_order-create.php?function_name=pre_order&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+
+<?php
+}
+
+
+
+if($data):
+    
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:pre_order-index.php");
+        }
+    }
+
+?>
+
+<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;
+   
+}
+
+</style>
+
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+            <tr>
+                <th>項次</th>
+                <th>訂貨編號</th>
+                <th>部品編號</th>
+                <th>部品名稱</th>		
+                <th>廠牌</th>
+                <th>規格</th>
+                <th>計量單位</th>
+                <th class="width_style_1">示意圖</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 ($user_auth&2) { ?>
+                <th>修改</th>
+                <th>刪除</th>
+                <?php } ?>
+            </tr>
+		</thead>
+		<tbody>			
+
+            <?php foreach($data as $data) : ?>    
+                <tr>
+                    <td><?php echo $data['id']; ?></td>
+                    <td><?php echo $data['order_id']; ?></td>
+                    <td><?php echo $data['equipment_id']; ?></td>
+                    <td><?php echo $data['equipment_name']; ?></td>
+                    <td><?php echo $data['brand']; ?></td>
+                    <td><?php echo $data['spec']; ?></td>
+                    <td><?php echo $data['count_type']; ?></td>
+                    <td class="width_style_1"><img src="<?php echo $data['picture']; ?>" alt="" class="index-image"></td>				
+                    <td><?php echo $data['price']; ?></td>
+                    <td><?php echo $data['quantity']; ?></td>
+                    <td><?php echo $data['total_price']; ?></td>
+                    <td><?php echo $data['orderer_id']; ?></td>
+                    <td><?php echo $data['orderer_name']; ?></td>
+                    <td><?php echo $data['contact_person']; ?></td>
+                    <td><?php echo $data['tel']; ?></td>
+                    <td><?php echo $data['address']; ?></td>
+                    <td><?php echo $data['status']; ?></td>
+                    <td><?php echo $data['deliver_no']; ?></td>
+                    <td><?php echo $data['memo']; ?></td>
+                    <td><?php echo $data['create_at']; ?></td>
+                    <?php if ($user_auth&2) { ?>
+                    <td>
+						<p>
+							<a href="pre_order-edit.php?id=<?php echo $data['id']; ?>&function_name=pre_order&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+								<span class="glyphicon glyphicon-pencil"></span>
+							</a>
+						</p> 
+					</td>
+                    <td>
+						<p>
+							<a href="pre_order-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+						</p> 
+					</td>
+                    <?php } ?>
+                </tr>
+            <?php endforeach; ?>
+			</tbody>
+        </table>
+    </div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+
 ?>
\ No newline at end of file
diff --git a/wms/pre_order-record-submit.php b/wms/pre_order-record-submit.php
index ef7c0e59..33738b89 100644
--- a/wms/pre_order-record-submit.php
+++ b/wms/pre_order-record-submit.php
@@ -1,65 +1,65 @@
-<?php
-$order_id= "";
-$equipment_id= "";
-$equipment_name= "";
-$brand= "";
-$spec= "";
-
-$count_type= "";
-$price= "";
-$quantity= "";
-$total_price= "";
-$orderer_id= "";
-$orderer_name= "";
-$contact_person= "";
-$tel= "";
-$address= "";
-$status= "";
-$deliver_no= "";
-$memo= "";	
-$create_at= "";
-
-
-$order_id_error= "";
-$equipment_id_error= "";
-$equipment_name_error= "";
-$brand_error= "";
-$spec_error= "";
-
-$count_type_error= "";
-$price_error= "";
-$quantity_error= "";
-$total_price_error= "";
-$orderer_id_error= "";
-$orderer_name_error= "";
-$contact_person_error= "";
-$tel_error= "";
-$address_error= "";
-$status_error= "";
-$deliver_no_error= "";
-$memo_error= "";	
-$create_at_error = "";
-
-
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    include "pre_order-user-input.php";
-
-    $db_query = "INSERT INTO pre_order(order_id,equipment_id, equipment_name, brand,spec, count_type,price,quantity,total_price,orderer_id,orderer_name,contact_person,tel,address,status, deliver_no,memo,create_at) VALUES ('$order_id','$equipment_id', '$equipment_name', '$brand','$spec', '$count_type','$price','$quantity','$total_price','$orderer_id','$orderer_name','$contact_person','$tel','$address','$status', '$deliver_no','$memo','$create_at')";    	                      
-    $result = mysqli_query($link,$db_query);		
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='pre_order-index.php?function_name=pre_order&".$token_link."';";
-        echo "</script>";  
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='pre_order-index.php?function_name=pre_order&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
-?>
+<?php
+$order_id= "";
+$equipment_id= "";
+$equipment_name= "";
+$brand= "";
+$spec= "";
+
+$count_type= "";
+$price= "";
+$quantity= "";
+$total_price= "";
+$orderer_id= "";
+$orderer_name= "";
+$contact_person= "";
+$tel= "";
+$address= "";
+$status= "";
+$deliver_no= "";
+$memo= "";	
+$create_at= "";
+
+
+$order_id_error= "";
+$equipment_id_error= "";
+$equipment_name_error= "";
+$brand_error= "";
+$spec_error= "";
+
+$count_type_error= "";
+$price_error= "";
+$quantity_error= "";
+$total_price_error= "";
+$orderer_id_error= "";
+$orderer_name_error= "";
+$contact_person_error= "";
+$tel_error= "";
+$address_error= "";
+$status_error= "";
+$deliver_no_error= "";
+$memo_error= "";	
+$create_at_error = "";
+
+
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    include "pre_order-user-input.php";
+
+    $db_query = "INSERT INTO pre_order(order_id,equipment_id, equipment_name, brand,spec, count_type,price,quantity,total_price,orderer_id,orderer_name,contact_person,tel,address,status, deliver_no,memo,create_at) VALUES ('$order_id','$equipment_id', '$equipment_name', '$brand','$spec', '$count_type','$price','$quantity','$total_price','$orderer_id','$orderer_name','$contact_person','$tel','$address','$status', '$deliver_no','$memo','$create_at')";    	                      
+    $result = mysqli_query($link,$db_query);		
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='pre_order-index.php?function_name=pre_order&".$token_link."';";
+        echo "</script>";  
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='pre_order-index.php?function_name=pre_order&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
+?>
diff --git a/wms/pre_order-record-update.php b/wms/pre_order-record-update.php
index 5cb19fe6..a5dc8c13 100644
--- a/wms/pre_order-record-update.php
+++ b/wms/pre_order-record-update.php
@@ -1,51 +1,51 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-
-    function user_input( $data ) {
-        $data1 = trim($data);
-        $data2 = stripslashes($data1);
-        $data3 = htmlspecialchars($data2);
-        return $data3;
-    }
-
-    $id     = $_POST['id'];
-    $order_id = user_input($_POST["order_id"]);
-    $equipment_id   = user_input($_POST["equipment_id"]);
-    $equipment_name	   = user_input($_POST["equipment_name"]);
-    $brand       = user_input($_POST["brand"]);
-    $spec        = user_input($_POST["spec"]);
-    $count_type     = user_input($_POST["count_type"]);
-    $price     = user_input($_POST["price"]);
-    $quantity      = user_input($_POST["quantity"]);
-    $total_price     = user_input($_POST["total_price"]);
-    $orderer_id     = user_input($_POST["orderer_id"]);
-    $orderer_name     = user_input($_POST["orderer_name"]);
-    $contact_person     = user_input($_POST["contact_person"]);
-    $tel      = user_input($_POST["tel"]);
-    $address      = user_input($_POST["address"]);
-    $status      = user_input($_POST["status"]);
-    $deliver_no      = user_input($_POST["deliver_no"]);
-    $memo      = user_input($_POST["memo"]);		
-    $create_at     = date('Y/m/d H:i:s');
-
-    $db_query = "UPDATE pre_order set order_id = '$order_id', equipment_id = '$equipment_id', equipment_name = '$equipment_name', brand = '$brand', spec = '$spec',count_type = '$count_type',price = '$price',quantity = '$quantity',total_price = '$total_price',orderer_id = '$orderer_id',orderer_name = '$orderer_name',contact_person = '$contact_person',tel = '$tel',address = '$address',status = '$status',deliver_no = '$deliver_no',memo = '$memo',create_at = '$create_at' WHERE id='$id'";
-    mysqli_query($link, $db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='pre_order-index.php?function_name=pre_order&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='pre_order-index.php?function_name=pre_order&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if(isset($_POST['update'])) {
+
+    function user_input( $data ) {
+        $data1 = trim($data);
+        $data2 = stripslashes($data1);
+        $data3 = htmlspecialchars($data2);
+        return $data3;
+    }
+
+    $id     = $_POST['id'];
+    $order_id = user_input($_POST["order_id"]);
+    $equipment_id   = user_input($_POST["equipment_id"]);
+    $equipment_name	   = user_input($_POST["equipment_name"]);
+    $brand       = user_input($_POST["brand"]);
+    $spec        = user_input($_POST["spec"]);
+    $count_type     = user_input($_POST["count_type"]);
+    $price     = user_input($_POST["price"]);
+    $quantity      = user_input($_POST["quantity"]);
+    $total_price     = user_input($_POST["total_price"]);
+    $orderer_id     = user_input($_POST["orderer_id"]);
+    $orderer_name     = user_input($_POST["orderer_name"]);
+    $contact_person     = user_input($_POST["contact_person"]);
+    $tel      = user_input($_POST["tel"]);
+    $address      = user_input($_POST["address"]);
+    $status      = user_input($_POST["status"]);
+    $deliver_no      = user_input($_POST["deliver_no"]);
+    $memo      = user_input($_POST["memo"]);		
+    $create_at     = date('Y/m/d H:i:s');
+
+    $db_query = "UPDATE pre_order set order_id = '$order_id', equipment_id = '$equipment_id', equipment_name = '$equipment_name', brand = '$brand', spec = '$spec',count_type = '$count_type',price = '$price',quantity = '$quantity',total_price = '$total_price',orderer_id = '$orderer_id',orderer_name = '$orderer_name',contact_person = '$contact_person',tel = '$tel',address = '$address',status = '$status',deliver_no = '$deliver_no',memo = '$memo',create_at = '$create_at' WHERE id='$id'";
+    mysqli_query($link, $db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='pre_order-index.php?function_name=pre_order&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='pre_order-index.php?function_name=pre_order&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/pre_order-user-input.php b/wms/pre_order-user-input.php
index 286940b4..347137f0 100644
--- a/wms/pre_order-user-input.php
+++ b/wms/pre_order-user-input.php
@@ -1,63 +1,63 @@
-<?php
-
-//Function to filter the form input
-function user_input( $data ) {
-    $data1 = trim($data);
-    $data2 = stripslashes($data1);
-    $data3 = htmlspecialchars($data2);
-    return $data3;
-}
-
-$order_id = user_input($_POST["order_id"]);
-$equipment_id   = user_input($_POST["equipment_id"]);
-$equipment_name	   = user_input($_POST["equipment_name"]);
-$brand       = user_input($_POST["brand"]);
-$spec        = user_input($_POST["spec"]);
-$count_type     = user_input($_POST["count_type"]);
-$price     = user_input($_POST["price"]);
-$quantity      = user_input($_POST["quantity"]);
-$total_price     = user_input($_POST["total_price"]);
-$orderer_id     = user_input($_POST["orderer_id"]);
-$orderer_name     = user_input($_POST["orderer_name"]);
-$contact_person     = user_input($_POST["contact_person"]);
-$tel      = user_input($_POST["tel"]);
-$address      = user_input($_POST["address"]);
-$status      = user_input($_POST["status"]);
-$deliver_no      = user_input($_POST["deliver_no"]);
-$memo      = user_input($_POST["memo"]);		
-$create_at     = date('Y/m/d H:i:s');
-
-
-
-/*
-
-if(empty($_POST["name"])) {
-    $name_error = "Name is required";
-} else {
-    $name = user_input($_POST["name"]);
-    
-    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
-        $name_error = "Only letter and white space are allowed";
-    }
-}
-
-
-/*
-if(empty($_POST["website"])) {
-    $website_error = "Website address is required";
-} else {
-    $website = user_input($_POST["website"]);
-
-    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
-        $website_error = "Invalid website URL";
-    }
-}
-
-if(empty($_POST["comment"])) {
-    $comment = "";
-} else {
-    $comment = user_input($_POST["comment"]);
-}
-*/
-?>
-
+<?php
+
+//Function to filter the form input
+function user_input( $data ) {
+    $data1 = trim($data);
+    $data2 = stripslashes($data1);
+    $data3 = htmlspecialchars($data2);
+    return $data3;
+}
+
+$order_id = user_input($_POST["order_id"]);
+$equipment_id   = user_input($_POST["equipment_id"]);
+$equipment_name	   = user_input($_POST["equipment_name"]);
+$brand       = user_input($_POST["brand"]);
+$spec        = user_input($_POST["spec"]);
+$count_type     = user_input($_POST["count_type"]);
+$price     = user_input($_POST["price"]);
+$quantity      = user_input($_POST["quantity"]);
+$total_price     = user_input($_POST["total_price"]);
+$orderer_id     = user_input($_POST["orderer_id"]);
+$orderer_name     = user_input($_POST["orderer_name"]);
+$contact_person     = user_input($_POST["contact_person"]);
+$tel      = user_input($_POST["tel"]);
+$address      = user_input($_POST["address"]);
+$status      = user_input($_POST["status"]);
+$deliver_no      = user_input($_POST["deliver_no"]);
+$memo      = user_input($_POST["memo"]);		
+$create_at     = date('Y/m/d H:i:s');
+
+
+
+/*
+
+if(empty($_POST["name"])) {
+    $name_error = "Name is required";
+} else {
+    $name = user_input($_POST["name"]);
+    
+    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
+        $name_error = "Only letter and white space are allowed";
+    }
+}
+
+
+/*
+if(empty($_POST["website"])) {
+    $website_error = "Website address is required";
+} else {
+    $website = user_input($_POST["website"]);
+
+    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
+        $website_error = "Invalid website URL";
+    }
+}
+
+if(empty($_POST["comment"])) {
+    $comment = "";
+} else {
+    $comment = user_input($_POST["comment"]);
+}
+*/
+?>
+
diff --git a/wms/purchase-create.php b/wms/purchase-create.php
index 2123de06..73686042 100644
--- a/wms/purchase-create.php
+++ b/wms/purchase-create.php
@@ -1,184 +1,184 @@
-<?php
-include "header.php"; 
-?>
-<script>
-$(function () {
-    $('#quantity').keyup(function(){ $(this).val($(this).val().replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')); })
-});
-</script>
-<div class="container">
-<?php
-include "purchase-record-submit.php";
-/*
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-        echo "<p class='error'>Please fill up the required field!</p>";
-    } else {
-        echo "<p class='success'>Record has added successfully</p>";
-    }
-}
-*/
-?>
-
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        <div>
-            <label for="accountid">申請單號</label>
-            <input type="text" name="accountid" id="accountid" value="202303001" readonly>
-        </div>
-        <div>
-            <label for="facilityno">作成單位</label>
-            <input type="text" name="facilityno" id="facilityno" required>
-        </div>
-        <div>
-            <label for="issue_time">作成者</label>
-            <input type="text" name="creater" id="creater" required>
-        </div>
-        <div>
-            <label for="issue_time">收文單位</label>
-            <input type="text" name="facilityno" id="facilityno" required>
-        </div>
-        <div>
-            <label for="issue_time">回答期限</label><br>
-            <input type="date" name="facilityno" id="facilityno" required>
-        </div>
-        <div>
-            <label for="issue_time">項目名稱</label>
-            <input type="text" name="facilityno" id="facilityno" size="60" required>
-        </div>
-        <div>
-            <label for="issue_time">年度議價件</label>
-            <input type="text" name="facilityno" id="facilityno" required>
-        </div>
-        <div>
-            <label for="issue_time">緊急件</label>
-            <select name="process" id="process" required>
-                <option value="Y">是</option>
-                <option value="N">否</option>
-            </select>
-        </div>
-        <div>
-            <label for="issue_time">指定廠商</label>
-            <input type="text" name="facilityno" id="facilityno">
-        </div>
-        <div>
-            <label for="issue_time">現場勘查</label>
-            <select name="process" id="process" required>
-                <option value="Y">是</option>
-                <option value="N">否</option>
-            </select>
-        </div>
-        <div>
-            <label for="issue_time">項目名稱</label>
-            <input type="text" name="facilityno" id="facilityno" size="60">
-        </div>
-        <div>
-            <label for="issue_time">類別</label>
-            <select name="process" id="process" required>
-                <option value="1">治具類</option>
-            </select>
-        </div>
-        <div>
-            <label for="issue_time">原廠或原代理商</label>
-            <select name="process" id="process" required>
-                <option value="Y">是</option>
-                <option value="N">否</option>
-            </select>
-        </div>
-        <div>
-            <label for="issue_time">理由</label>
-            <input type="text" name="facilityno" id="facilityno" size="60">
-        </div>
-        <div>
-            <label for="issue_time">品牌</label>
-            <input type="text" name="facilityno" id="facilityno">
-        </div>
-        <div>
-            <label for="issue_time">型號</label>
-            <input type="text" name="facilityno" id="facilityno">
-        </div>
-        <div>
-            <label for="quantity">預估數量</label>
-            <input type="text" name="quantity" id="quantity" required>
-        </div>
-        <div>
-            <label for="issue_time">備選品牌</label>
-            <input type="text" name="facilityno" id="facilityno" size="60">
-        </div>
-        <div>
-            <label for="issue_time">付款方式(每家廠商需一致)</label>
-            <input type="text" name="facilityno" id="facilityno" required>
-        </div>
-        <div>
-            <label for="issue_time">交期/施工期(天)</label>
-            <input type="text" name="facilityno" id="facilityno" required>
-        </div>
-        <div>
-            <label for="issue_time">質保金</label>
-            <select name="process" id="process" required>
-                <option value="Y">是</option>
-                <option value="N">否</option>
-            </select>
-        </div>
-        <div>
-            <label for="issue_time">質保期限(天)</label>
-            <input type="text" name="facilityno" id="facilityno" required>
-        </div>
-        <div>
-            <label for="issue_time">驗收標準</label>
-            <input type="text" name="facilityno" id="facilityno" size="60" required>
-        </div>
-        <div>
-            <label for="issue_time">歷史購買記錄</label>
-            <input type="text" name="facilityno" id="facilityno">
-        </div>
-        <div>
-            <label for="issue_time">附件</label>
-            <input type="text" name="facilityno" id="facilityno" size="30">
-        </div>
-        <div>
-            <label for="issue_time">附件</label>
-            <input type="text" name="facilityno" id="facilityno" size="30">
-        </div>
-        <div>
-            <label for="issue_time">項目描述</label>
-            <input type="text" name="facilityno" id="facilityno" size="80">
-        </div>
-        <div>
-            <label for="issue_time">設備維修單號</label>
-            <input type="text" name="facilityno" id="facilityno">
-        </div>
-        <div>
-            <label for="issue_time">類別</label>
-            <select name="process" id="process" required>
-                <option value="1">治具類</option>
-            </select>
-        </div>
-        <div>
-            <label for="issue_time">內容</label><br>
-            <textarea class="form-control2" name="content" id="content" rows="4" cols="100"  ></textarea>
-        </div>
-        <div>
-            <label for="issue_time">採購報價單</label>
-            <input type="text" name="facilityno" id="facilityno" readonly>
-        </div>
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-        <div class="bottom-margin">
-            <label for="fileToUpload">上傳檔案</label>
-			<div>
-				<input type="file" name="fileToUpload" id="fileToUpload">
-			</div>
-        </div>
-        <div>
-			<br>
-            <button type="submit" name="submit">確定</button>
-        </div>
-
-    </form>
-</div>
-
+<?php
+include "header.php"; 
+?>
+<script>
+$(function () {
+    $('#quantity').keyup(function(){ $(this).val($(this).val().replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')); })
+});
+</script>
+<div class="container">
+<?php
+include "purchase-record-submit.php";
+/*
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+        echo "<p class='error'>Please fill up the required field!</p>";
+    } else {
+        echo "<p class='success'>Record has added successfully</p>";
+    }
+}
+*/
+?>
+
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        <div>
+            <label for="accountid">申請單號</label>
+            <input type="text" name="accountid" id="accountid" value="202303001" readonly>
+        </div>
+        <div>
+            <label for="facilityno">作成單位</label>
+            <input type="text" name="facilityno" id="facilityno" required>
+        </div>
+        <div>
+            <label for="issue_time">作成者</label>
+            <input type="text" name="creater" id="creater" required>
+        </div>
+        <div>
+            <label for="issue_time">收文單位</label>
+            <input type="text" name="facilityno" id="facilityno" required>
+        </div>
+        <div>
+            <label for="issue_time">回答期限</label><br>
+            <input type="date" name="facilityno" id="facilityno" required>
+        </div>
+        <div>
+            <label for="issue_time">項目名稱</label>
+            <input type="text" name="facilityno" id="facilityno" size="60" required>
+        </div>
+        <div>
+            <label for="issue_time">年度議價件</label>
+            <input type="text" name="facilityno" id="facilityno" required>
+        </div>
+        <div>
+            <label for="issue_time">緊急件</label>
+            <select name="process" id="process" required>
+                <option value="Y">是</option>
+                <option value="N">否</option>
+            </select>
+        </div>
+        <div>
+            <label for="issue_time">指定廠商</label>
+            <input type="text" name="facilityno" id="facilityno">
+        </div>
+        <div>
+            <label for="issue_time">現場勘查</label>
+            <select name="process" id="process" required>
+                <option value="Y">是</option>
+                <option value="N">否</option>
+            </select>
+        </div>
+        <div>
+            <label for="issue_time">項目名稱</label>
+            <input type="text" name="facilityno" id="facilityno" size="60">
+        </div>
+        <div>
+            <label for="issue_time">類別</label>
+            <select name="process" id="process" required>
+                <option value="1">治具類</option>
+            </select>
+        </div>
+        <div>
+            <label for="issue_time">原廠或原代理商</label>
+            <select name="process" id="process" required>
+                <option value="Y">是</option>
+                <option value="N">否</option>
+            </select>
+        </div>
+        <div>
+            <label for="issue_time">理由</label>
+            <input type="text" name="facilityno" id="facilityno" size="60">
+        </div>
+        <div>
+            <label for="issue_time">品牌</label>
+            <input type="text" name="facilityno" id="facilityno">
+        </div>
+        <div>
+            <label for="issue_time">型號</label>
+            <input type="text" name="facilityno" id="facilityno">
+        </div>
+        <div>
+            <label for="quantity">預估數量</label>
+            <input type="text" name="quantity" id="quantity" required>
+        </div>
+        <div>
+            <label for="issue_time">備選品牌</label>
+            <input type="text" name="facilityno" id="facilityno" size="60">
+        </div>
+        <div>
+            <label for="issue_time">付款方式(每家廠商需一致)</label>
+            <input type="text" name="facilityno" id="facilityno" required>
+        </div>
+        <div>
+            <label for="issue_time">交期/施工期(天)</label>
+            <input type="text" name="facilityno" id="facilityno" required>
+        </div>
+        <div>
+            <label for="issue_time">質保金</label>
+            <select name="process" id="process" required>
+                <option value="Y">是</option>
+                <option value="N">否</option>
+            </select>
+        </div>
+        <div>
+            <label for="issue_time">質保期限(天)</label>
+            <input type="text" name="facilityno" id="facilityno" required>
+        </div>
+        <div>
+            <label for="issue_time">驗收標準</label>
+            <input type="text" name="facilityno" id="facilityno" size="60" required>
+        </div>
+        <div>
+            <label for="issue_time">歷史購買記錄</label>
+            <input type="text" name="facilityno" id="facilityno">
+        </div>
+        <div>
+            <label for="issue_time">附件</label>
+            <input type="text" name="facilityno" id="facilityno" size="30">
+        </div>
+        <div>
+            <label for="issue_time">附件</label>
+            <input type="text" name="facilityno" id="facilityno" size="30">
+        </div>
+        <div>
+            <label for="issue_time">項目描述</label>
+            <input type="text" name="facilityno" id="facilityno" size="80">
+        </div>
+        <div>
+            <label for="issue_time">設備維修單號</label>
+            <input type="text" name="facilityno" id="facilityno">
+        </div>
+        <div>
+            <label for="issue_time">類別</label>
+            <select name="process" id="process" required>
+                <option value="1">治具類</option>
+            </select>
+        </div>
+        <div>
+            <label for="issue_time">內容</label><br>
+            <textarea class="form-control2" name="content" id="content" rows="4" cols="100"  ></textarea>
+        </div>
+        <div>
+            <label for="issue_time">採購報價單</label>
+            <input type="text" name="facilityno" id="facilityno" readonly>
+        </div>
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+        <div class="bottom-margin">
+            <label for="fileToUpload">上傳檔案</label>
+			<div>
+				<input type="file" name="fileToUpload" id="fileToUpload">
+			</div>
+        </div>
+        <div>
+			<br>
+            <button type="submit" name="submit">確定</button>
+        </div>
+
+    </form>
+</div>
+
 <?php include "footer.php"; ?>
\ No newline at end of file
diff --git a/wms/purchase-record-submit.php b/wms/purchase-record-submit.php
index 93ff68ff..3bce0619 100644
--- a/wms/purchase-record-submit.php
+++ b/wms/purchase-record-submit.php
@@ -1,62 +1,62 @@
-<?php
-require_once "database.php";
-
-$accountid= "";
-$facilityno= "";
-$issue_time= "";
-$process= "";
-$memo= "";
-$creater= "";
-$create_at= "";
-
-$accountid_error= "";
-$facilityno_error= "";
-$issue_time_error= "";
-$process_error= "";
-$memo_error= "";
-$creater_error= "";
-$create_at_error= "";
-
-
-
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-
-
-        include "purchase-user-input.php";
-
-
-		echo "<script type ='text/JavaScript'>";
-		echo "alert('新增成功');";
-		echo "location.href='purchase-create.php';";
-		echo "</script>";  
-        /*                           
-        $db_query = "INSERT INTO wipproduction(accountid, facilityno, issue_time, process, creater,create_at) VALUES ('$accountid', '$facilityno', '$issue_time', '$process', '$creater', '$create_at')";    	                      
-		$result = mysqli_query($link,$db_query);
-        
-                
-
-		if (mysqli_affected_rows($link)>0) {
-		// 如果有一筆以上代表有更新
-		// mysqli_insert_id可以抓到第一筆的id
-			$new_id= mysqli_insert_id ($link);
-			echo "<script type ='text/JavaScript'>";
-			echo "alert('新增成功');";
-            echo "location.href='wipproduction-index.php';";
-			echo "</script>";  
-		}
-		elseif(mysqli_affected_rows($link)==0) {
-			echo "<script type ='text/JavaScript'>";
-			echo "alert('無新增資料');";
-            echo "location.href='wipproduction-index.php';";
-			echo "</script>";  
-		}
-		else {
-			echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-		}
-		*/
-		mysqli_close($link);		
-		
-        //header("location: wipproduction-index.php");
-}
-
-?>
+<?php
+require_once "database.php";
+
+$accountid= "";
+$facilityno= "";
+$issue_time= "";
+$process= "";
+$memo= "";
+$creater= "";
+$create_at= "";
+
+$accountid_error= "";
+$facilityno_error= "";
+$issue_time_error= "";
+$process_error= "";
+$memo_error= "";
+$creater_error= "";
+$create_at_error= "";
+
+
+
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+
+
+        include "purchase-user-input.php";
+
+
+		echo "<script type ='text/JavaScript'>";
+		echo "alert('新增成功');";
+		echo "location.href='purchase-create.php';";
+		echo "</script>";  
+        /*                           
+        $db_query = "INSERT INTO wipproduction(accountid, facilityno, issue_time, process, creater,create_at) VALUES ('$accountid', '$facilityno', '$issue_time', '$process', '$creater', '$create_at')";    	                      
+		$result = mysqli_query($link,$db_query);
+        
+                
+
+		if (mysqli_affected_rows($link)>0) {
+		// 如果有一筆以上代表有更新
+		// mysqli_insert_id可以抓到第一筆的id
+			$new_id= mysqli_insert_id ($link);
+			echo "<script type ='text/JavaScript'>";
+			echo "alert('新增成功');";
+            echo "location.href='wipproduction-index.php';";
+			echo "</script>";  
+		}
+		elseif(mysqli_affected_rows($link)==0) {
+			echo "<script type ='text/JavaScript'>";
+			echo "alert('無新增資料');";
+            echo "location.href='wipproduction-index.php';";
+			echo "</script>";  
+		}
+		else {
+			echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+		}
+		*/
+		mysqli_close($link);		
+		
+        //header("location: wipproduction-index.php");
+}
+
+?>
diff --git a/wms/ranking-create.php b/wms/ranking-create.php
index 34452258..aee4b18d 100644
--- a/wms/ranking-create.php
+++ b/wms/ranking-create.php
@@ -1,267 +1,267 @@
-
-<?php
-include "header.php";
-
-if($_POST['type']=='rank'){
-    $sign_date=$_POST["sign_date"];
-    $sign_type=$_POST["sign_type"];
-    $name= $_POST["name"];
-    $picture= empty($_POST["picture"])?0:$_POST["picture"];
-    $contractno= $_POST["contractno"];
-    $facilityno= $_POST["facilityno"];
-    $receivable= $_POST["receivable"];
-    $receivable_date=date("Y-m-d",strtotime( $_POST["receivable_date"]));
-    $tai_count= $_POST["tai_count"];
-    $repairername= $_POST["repairername"];
-    $area= $_POST["area"];
-    $address= $_POST["address"];
-    $repair_type= $_POST["repair_type"];
-    $fee_type= $_POST["fee_type"];
-    $invoice_date=date("Y-m-d",strtotime( $_POST["invoice_date"]));
-    $invoice_amount= empty($_POST["invoice_amount"])?0:$_POST["invoice_amount"];
-    $startrepair_date= date("Y-m-d",strtotime( $_POST["startrepair_date"]));
-    $securitycheckend_date= date("Y-m-d",strtotime( $_POST["securitycheckend_date"]));
-    $changeallow_status=empty($_POST["changeallow_status"])?1:$_POST["changeallow_status"];
-    $isrepair_status= empty($_POST["isrepair_status"])?1:$_POST["isrepair_status"];
-    $reinsurancer= $_POST["reinsurancer"];
-    $numberoffloor= empty($_POST["numberoffloor"])?0:$_POST["numberoffloor"];
-    $personno= empty($_POST["personno"])?0:$_POST["personno"];
-    $speed= empty($_POST["speed"])?0:$_POST["speed"];
-    $facilitok_date= date("Y-m-d",strtotime( $_POST["facilitok_date"]));
-    $creater  = $_POST["creater"];
-	$create_at = date('Y/m/d H:i:s');
-	//查詢是否重複錄入
-    $sql = "SELECT * FROM ranking where contractno='$contractno'";
-    $data = mysqli_query($link,$sql);
-    $nums_rows=mysqli_num_rows($data);
-
-    if($nums_rows==0){
-        //添加
-       $db_query = "INSERT INTO `ranking` (`sign_date`,`sign_type`,`name`, `picture`, `contractno`, `facilityno`, `receivable`, `receivable_date`, `tai_count`, `repairername`, `area`,
-           `address`, `repair_type`, `fee_type`, `invoice_date`, `invoice_amount`, `startrepair_date`, `changeallow_status`,  `reinsurancer`, `numberoffloor`, `personno`, `speed`, `facilitok_date`, `creater`, `create_at`)
-          VALUES( '$sign_date','$sign_type','$name', '$picture', '$contractno', '$facilityno', '$receivable','$receivable_date', '$tai_count', '$repairername', '$area', '$address', 
-          '$repair_type', '$fee_type', '$invoice_date', '$invoice_amount','$startrepair_date',  '$changeallow_status',  '$reinsurancer',
-           '$numberoffloor', '$personno', '$speed', '$facilitok_date', '$creater', '$create_at')";
-//        print_r ($db_query);
-//        exit();
-        mysqli_query($link,$db_query);
-        if (mysqli_affected_rows($link)>0) {
-            echo "insert";
-            #$sToken = "4XcWd2eMfN6C0ACNRALwKzJNYCSNzHr6aAQeED7hJrk";  #Owen個人單個帳號測試
-            $sToken = "QAO0u9cb9sqWD27vRrwkSR32LkT34Fl0JbJkOmtuP7Y";  #永佳捷經理會議群組
-            #$sToken = "lI2Cya7tSRjg8Rpolgd1UwuLhsXjwfWNtwLEEwUGlBw";  #工作小助手
-//            $sMessage = "賀成交!!!最新業績排行榜如下。" . "\n";
-
-            if($sign_type=='保養'){
-                $sMessage = "賀成交!!!最新保養業績排行榜如下。" . "\n";
-                $sMessage .= "https://www.masada.com.tw/phb/phb.html" . "\n";
-            }elseif ($sign_type=='新梯'){
-                $sMessage = "賀成交!!!最新新梯業績排行榜如下。" . "\n";
-                $sMessage .= "https://www.masada.com.tw/phb/xphb.html" . "\n";
-            }elseif ($sign_type=='改造'){
-                $sMessage = "賀成交!!!最新改造業績排行榜如下。" . "\n";
-                $sMessage .= "https://www.masada.com.tw/phb/gphb.html" . "\n";
-            }else{
-                $sMessage .= "";
-            }
-
-            #$sMessage .= "Second " . "\n";
-
-            $chOne = curl_init();
-            curl_setopt( $chOne, CURLOPT_URL, "https://notify-api.line.me/api/notify");
-            curl_setopt( $chOne, CURLOPT_SSL_VERIFYHOST, 0);
-            curl_setopt( $chOne, CURLOPT_SSL_VERIFYPEER, 0);
-            curl_setopt( $chOne, CURLOPT_POST, 1);
-            curl_setopt( $chOne, CURLOPT_POSTFIELDS, "message=".$sMessage);
-            $headers = array( 'Content-type: application/x-www-form-urlencoded', 'Authorization: Bearer '.$sToken.'', );
-            curl_setopt($chOne, CURLOPT_HTTPHEADER, $headers);
-            curl_setopt( $chOne, CURLOPT_RETURNTRANSFER, 1);
-            $result = curl_exec( $chOne );
-
-            if($result){
-                echo "Success!";
-            }else{
-                echo "Failure!";
-            }
-
-
-            exit();
-        }
-        elseif(mysqli_affected_rows($link)==0) {
-             echo "新增失敗";
-             echo $db_query;
-             exit();
-        }
-    }
-    else{
-          echo "<h1 class='text-center'>資料已經存在</h1>";
-    }
-
-
-
-
-
-}
-
-?>
-<div class="container" id="accountadd">
-    <div class="text-center"> <h3>排行榜資料添加</h3> </div>
-    <form class="form-horizontal"  name="account" method="POST" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        <div class="form-group">
-            <div class="col-md-3">
-
-            </div>
-            <div class="col-md-9 ">
-                <button type="submit"    class="btn btn-primary btn-lg pull-right" >點擊後提交排行榜資料</button>
-            </div>
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="name">契約人員</label>
-                <input  class="form-control" type="text" name="name" id="name" placeholder="請輸入契約人員姓名"   required>
-
-            </div>
-
-            <div class="col-md-3">
-                <label for="pwd">簽約類型</label>
-
-                <Select  name="sign_type" id="sign_type"   >
-                    <Option selected="selected" Value="保養">保養</Option>
-                    <Option Value="新梯">新梯</Option>
-                    <Option Value="改造">改造</Option>
-                </Select>
-            </div>
-
-            <div class="col-md-3">
-                <label for="name">合約號</label>
-                <input  class="form-control"  type="text" name="contractno" id="contractno" required>
-            </div>
-
-            <div class="col-md-3">
-                <label for="tel">作番號</label>
-                <input  class="form-control"  type="text" name="facilityno" id="facilityno" maxlength="16" required>
-
-
-        </div>
-
-        <div class="form-group">
-
-            <div class="col-md-3">
-                <label for="email">簽約日期</label>
-                <input  class="form-control" type="text" name="sign_date" id="sign_date" value="<?php date('Y/m/d H:i:s'); ?>" required>
-
-            </div>
-            <div class="col-md-3">
-                <label for="lineid">台數</label>
-                <input  class="form-control" type="text" name="tai_count" id="tai_count" required>
-            </div>
-
-            <div class="col-md-3">
-                <label for="address">合約價格</label>
-                <input  class="form-control" type="text" name="receivable" id="receivable" required>
-            </div>
-
-            <div class="col-md-3">
-                <label for="email">合約期間</label>
-                <input  class="form-control" type="text" name="receivable_date" id="receivable_date" value="<?php date('Y/m/d H:i:s'); ?>" required>
-
-            </div>
-
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="wechatid">保養員</label>
-                <input  class="form-control" type="text" name="repairername" id="repairername">
-            </div>
-            <div class="col-md-3">
-                <label for="phone_call_help">區域</label>
-                <input  class="form-control" type="text" name="area" id="area"  maxlength="16" >
-            </div>
-
-            <div class="col-md-3">
-                <label for="chat_for_help">大樓地址</label>
-                <input  class="form-control" type="text" name="address" id="address">
-            </div>
-
-            <div class="col-md-3">
-                <label for="remote_help">保養類別</label>
-                <input  class="form-control" type="text" name="repair_type" id="repair_type">
-            </div>
-
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="repairerid">繳費類型</label>
-                <input  class="form-control" type="text" name="fee_type" id="fee_type">
-            </div>
-            <div class="col-md-3">
-                <label for="manager">發票開立日期</label>
-                <input  class="form-control" type="text" name="invoice_date" id="invoice_date">
-            </div>
-
-            <div class="col-md-3">
-                <label for="manager">發票開立金額</label>
-                <input  class="form-control" type="text" name="invoice_amount" id="invoice_amount">
-            </div>
-
-            <div class="col-md-3">
-                <label for="creater">入保日</label>
-                <input  class="form-control" type="text" name="startrepair_date" id="startrepair_date">
-            </div>
-
-
-        </div>
-
-        <div class="form-group">
-
-            <div class="col-md-3">
-                <label for="creater">安檢到期日</label>
-                <input  class="form-control" type="text" name="securitycheckend_date" id="securitycheckend_date">
-            </div>
-
-            <div class="col-md-3">
-                <label for="manager">變更許可證</label>
-                <input  class="form-control" type="text" name="changeallow_status" id="changeallow_status">
-            </div>
-
-            <div class="col-md-3">
-                <label for="manager">是否改造</label>
-                <input  class="form-control" type="text" name="isrepair_status" id="isrepair_status">
-            </div>
-
-            <div class="col-md-3">
-                <label for="creater">前保險商</label>
-                <input  class="form-control" type="text" name="reinsurancer" id="reinsurancer">
-            </div>
-            <div class="col-md-3">
-                <label for="creater">樓層</label>
-                <input  class="form-control" type="text" name="numberoffloor" id="numberoffloor">
-            </div>
-            <div class="col-md-3">
-                <label for="creater">人乘</label>
-                <input  class="form-control" type="text" name="personno" id="personno">
-            </div>
-            <div class="col-md-3">
-                <label for="creater">速度</label>
-                <input  class="form-control" type="text" name="speed" id="speed">
-            </div>
-            <div class="col-md-3">
-                <label for="creater">交車日期</label>
-                <input  class="form-control" type="text" name="facilitok_date" id="facilitok_date">
-            </div>
-            <div class="col-md-3">
-                <label for="creater">建檔人</label>
-                <input  class="form-control" type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
-            </div>
-            <div class="col-md-3">
-                <input  class="form-control" type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
-                <input  class="form-control" type="hidden" name="type" id="create_at" value="rank">
-            </div>
-        </div>
-
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
+
+<?php
+include "header.php";
+
+if($_POST['type']=='rank'){
+    $sign_date=$_POST["sign_date"];
+    $sign_type=$_POST["sign_type"];
+    $name= $_POST["name"];
+    $picture= empty($_POST["picture"])?0:$_POST["picture"];
+    $contractno= $_POST["contractno"];
+    $facilityno= $_POST["facilityno"];
+    $receivable= $_POST["receivable"];
+    $receivable_date=date("Y-m-d",strtotime( $_POST["receivable_date"]));
+    $tai_count= $_POST["tai_count"];
+    $repairername= $_POST["repairername"];
+    $area= $_POST["area"];
+    $address= $_POST["address"];
+    $repair_type= $_POST["repair_type"];
+    $fee_type= $_POST["fee_type"];
+    $invoice_date=date("Y-m-d",strtotime( $_POST["invoice_date"]));
+    $invoice_amount= empty($_POST["invoice_amount"])?0:$_POST["invoice_amount"];
+    $startrepair_date= date("Y-m-d",strtotime( $_POST["startrepair_date"]));
+    $securitycheckend_date= date("Y-m-d",strtotime( $_POST["securitycheckend_date"]));
+    $changeallow_status=empty($_POST["changeallow_status"])?1:$_POST["changeallow_status"];
+    $isrepair_status= empty($_POST["isrepair_status"])?1:$_POST["isrepair_status"];
+    $reinsurancer= $_POST["reinsurancer"];
+    $numberoffloor= empty($_POST["numberoffloor"])?0:$_POST["numberoffloor"];
+    $personno= empty($_POST["personno"])?0:$_POST["personno"];
+    $speed= empty($_POST["speed"])?0:$_POST["speed"];
+    $facilitok_date= date("Y-m-d",strtotime( $_POST["facilitok_date"]));
+    $creater  = $_POST["creater"];
+	$create_at = date('Y/m/d H:i:s');
+	//查詢是否重複錄入
+    $sql = "SELECT * FROM ranking where contractno='$contractno'";
+    $data = mysqli_query($link,$sql);
+    $nums_rows=mysqli_num_rows($data);
+
+    if($nums_rows==0){
+        //添加
+       $db_query = "INSERT INTO `ranking` (`sign_date`,`sign_type`,`name`, `picture`, `contractno`, `facilityno`, `receivable`, `receivable_date`, `tai_count`, `repairername`, `area`,
+           `address`, `repair_type`, `fee_type`, `invoice_date`, `invoice_amount`, `startrepair_date`, `changeallow_status`,  `reinsurancer`, `numberoffloor`, `personno`, `speed`, `facilitok_date`, `creater`, `create_at`)
+          VALUES( '$sign_date','$sign_type','$name', '$picture', '$contractno', '$facilityno', '$receivable','$receivable_date', '$tai_count', '$repairername', '$area', '$address', 
+          '$repair_type', '$fee_type', '$invoice_date', '$invoice_amount','$startrepair_date',  '$changeallow_status',  '$reinsurancer',
+           '$numberoffloor', '$personno', '$speed', '$facilitok_date', '$creater', '$create_at')";
+//        print_r ($db_query);
+//        exit();
+        mysqli_query($link,$db_query);
+        if (mysqli_affected_rows($link)>0) {
+            echo "insert";
+            #$sToken = "4XcWd2eMfN6C0ACNRALwKzJNYCSNzHr6aAQeED7hJrk";  #Owen個人單個帳號測試
+            $sToken = "QAO0u9cb9sqWD27vRrwkSR32LkT34Fl0JbJkOmtuP7Y";  #永佳捷經理會議群組
+            #$sToken = "lI2Cya7tSRjg8Rpolgd1UwuLhsXjwfWNtwLEEwUGlBw";  #工作小助手
+//            $sMessage = "賀成交!!!最新業績排行榜如下。" . "\n";
+
+            if($sign_type=='保養'){
+                $sMessage = "賀成交!!!最新保養業績排行榜如下。" . "\n";
+                $sMessage .= "https://www.masada.com.tw/phb/phb.html" . "\n";
+            }elseif ($sign_type=='新梯'){
+                $sMessage = "賀成交!!!最新新梯業績排行榜如下。" . "\n";
+                $sMessage .= "https://www.masada.com.tw/phb/xphb.html" . "\n";
+            }elseif ($sign_type=='改造'){
+                $sMessage = "賀成交!!!最新改造業績排行榜如下。" . "\n";
+                $sMessage .= "https://www.masada.com.tw/phb/gphb.html" . "\n";
+            }else{
+                $sMessage .= "";
+            }
+
+            #$sMessage .= "Second " . "\n";
+
+            $chOne = curl_init();
+            curl_setopt( $chOne, CURLOPT_URL, "https://notify-api.line.me/api/notify");
+            curl_setopt( $chOne, CURLOPT_SSL_VERIFYHOST, 0);
+            curl_setopt( $chOne, CURLOPT_SSL_VERIFYPEER, 0);
+            curl_setopt( $chOne, CURLOPT_POST, 1);
+            curl_setopt( $chOne, CURLOPT_POSTFIELDS, "message=".$sMessage);
+            $headers = array( 'Content-type: application/x-www-form-urlencoded', 'Authorization: Bearer '.$sToken.'', );
+            curl_setopt($chOne, CURLOPT_HTTPHEADER, $headers);
+            curl_setopt( $chOne, CURLOPT_RETURNTRANSFER, 1);
+            $result = curl_exec( $chOne );
+
+            if($result){
+                echo "Success!";
+            }else{
+                echo "Failure!";
+            }
+
+
+            exit();
+        }
+        elseif(mysqli_affected_rows($link)==0) {
+             echo "新增失敗";
+             echo $db_query;
+             exit();
+        }
+    }
+    else{
+          echo "<h1 class='text-center'>資料已經存在</h1>";
+    }
+
+
+
+
+
+}
+
+?>
+<div class="container" id="accountadd">
+    <div class="text-center"> <h3>排行榜資料添加</h3> </div>
+    <form class="form-horizontal"  name="account" method="POST" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        <div class="form-group">
+            <div class="col-md-3">
+
+            </div>
+            <div class="col-md-9 ">
+                <button type="submit"    class="btn btn-primary btn-lg pull-right" >點擊後提交排行榜資料</button>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="name">契約人員</label>
+                <input  class="form-control" type="text" name="name" id="name" placeholder="請輸入契約人員姓名"   required>
+
+            </div>
+
+            <div class="col-md-3">
+                <label for="pwd">簽約類型</label>
+
+                <Select  name="sign_type" id="sign_type"   >
+                    <Option selected="selected" Value="保養">保養</Option>
+                    <Option Value="新梯">新梯</Option>
+                    <Option Value="改造">改造</Option>
+                </Select>
+            </div>
+
+            <div class="col-md-3">
+                <label for="name">合約號</label>
+                <input  class="form-control"  type="text" name="contractno" id="contractno" required>
+            </div>
+
+            <div class="col-md-3">
+                <label for="tel">作番號</label>
+                <input  class="form-control"  type="text" name="facilityno" id="facilityno" maxlength="16" required>
+
+
+        </div>
+
+        <div class="form-group">
+
+            <div class="col-md-3">
+                <label for="email">簽約日期</label>
+                <input  class="form-control" type="text" name="sign_date" id="sign_date" value="<?php date('Y/m/d H:i:s'); ?>" required>
+
+            </div>
+            <div class="col-md-3">
+                <label for="lineid">台數</label>
+                <input  class="form-control" type="text" name="tai_count" id="tai_count" required>
+            </div>
+
+            <div class="col-md-3">
+                <label for="address">合約價格</label>
+                <input  class="form-control" type="text" name="receivable" id="receivable" required>
+            </div>
+
+            <div class="col-md-3">
+                <label for="email">合約期間</label>
+                <input  class="form-control" type="text" name="receivable_date" id="receivable_date" value="<?php date('Y/m/d H:i:s'); ?>" required>
+
+            </div>
+
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="wechatid">保養員</label>
+                <input  class="form-control" type="text" name="repairername" id="repairername">
+            </div>
+            <div class="col-md-3">
+                <label for="phone_call_help">區域</label>
+                <input  class="form-control" type="text" name="area" id="area"  maxlength="16" >
+            </div>
+
+            <div class="col-md-3">
+                <label for="chat_for_help">大樓地址</label>
+                <input  class="form-control" type="text" name="address" id="address">
+            </div>
+
+            <div class="col-md-3">
+                <label for="remote_help">保養類別</label>
+                <input  class="form-control" type="text" name="repair_type" id="repair_type">
+            </div>
+
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="repairerid">繳費類型</label>
+                <input  class="form-control" type="text" name="fee_type" id="fee_type">
+            </div>
+            <div class="col-md-3">
+                <label for="manager">發票開立日期</label>
+                <input  class="form-control" type="text" name="invoice_date" id="invoice_date">
+            </div>
+
+            <div class="col-md-3">
+                <label for="manager">發票開立金額</label>
+                <input  class="form-control" type="text" name="invoice_amount" id="invoice_amount">
+            </div>
+
+            <div class="col-md-3">
+                <label for="creater">入保日</label>
+                <input  class="form-control" type="text" name="startrepair_date" id="startrepair_date">
+            </div>
+
+
+        </div>
+
+        <div class="form-group">
+
+            <div class="col-md-3">
+                <label for="creater">安檢到期日</label>
+                <input  class="form-control" type="text" name="securitycheckend_date" id="securitycheckend_date">
+            </div>
+
+            <div class="col-md-3">
+                <label for="manager">變更許可證</label>
+                <input  class="form-control" type="text" name="changeallow_status" id="changeallow_status">
+            </div>
+
+            <div class="col-md-3">
+                <label for="manager">是否改造</label>
+                <input  class="form-control" type="text" name="isrepair_status" id="isrepair_status">
+            </div>
+
+            <div class="col-md-3">
+                <label for="creater">前保險商</label>
+                <input  class="form-control" type="text" name="reinsurancer" id="reinsurancer">
+            </div>
+            <div class="col-md-3">
+                <label for="creater">樓層</label>
+                <input  class="form-control" type="text" name="numberoffloor" id="numberoffloor">
+            </div>
+            <div class="col-md-3">
+                <label for="creater">人乘</label>
+                <input  class="form-control" type="text" name="personno" id="personno">
+            </div>
+            <div class="col-md-3">
+                <label for="creater">速度</label>
+                <input  class="form-control" type="text" name="speed" id="speed">
+            </div>
+            <div class="col-md-3">
+                <label for="creater">交車日期</label>
+                <input  class="form-control" type="text" name="facilitok_date" id="facilitok_date">
+            </div>
+            <div class="col-md-3">
+                <label for="creater">建檔人</label>
+                <input  class="form-control" type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
+            </div>
+            <div class="col-md-3">
+                <input  class="form-control" type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
+                <input  class="form-control" type="hidden" name="type" id="create_at" value="rank">
+            </div>
+        </div>
+
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
diff --git a/wms/receivable-create.php b/wms/receivable-create.php
index b8c5eb62..413efda9 100644
--- a/wms/receivable-create.php
+++ b/wms/receivable-create.php
@@ -1,106 +1,106 @@
-<?php
-include "header.php";
-?>
-
-<div class="container">
-
-    <?php
-    
-        include "receivable-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        
-    
-        <div>
-            <label for="contractno">合約號</label>
-            <input type="text" name="contractno" id="contractno">
-           
-        </div>	
-
-        <div>
-            <label for="facilityno">作番號</label>
-            <input type="text" name="facilityno" id="facilityno">
-            
-        </div>	
-		
-        <div>
-            <label for="receivable_date">應繳款日</label>
-            <input type="text" data-date-format="yyyy-mm-dd" name="receivable_date" id="receivable_date" value="<?php echo date('Y/m/d H:i:s'); ?>">
-        </div>	
-				
-        <div>
-            <label for="actual_date">實繳款日</label>
-            <input type="text" data-date-format="yyyy-mm-dd" name="actual_date" id="actual_date" value="<?php echo date('Y/m/d H:i:s'); ?>">
-            
-        </div>	
-
-        <div>
-            <label for="receivable">應繳款金額</label>
-            <input type="text" name="receivable" id="receivable" onkeyup="if(value<0)value=0;value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-            
-        </div>	
-
-        <div>
-            <label for="actual">實繳款金額</label>
-            <input type="text" name="actual" id="actual" onkeyup="if(value<0)value=0;value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="currency">幣別</label>
-            <input type="text" name="currency" id="currency">
-        </div>
-
-        <div>
-            <label for="owner">款項負責人工號</label>
-            <input type="text" name="owner" id="owner">
-        </div>
-
-        <div>
-            <label for="status">收款狀態</label>
-			<Select name="status" id="status" required>
-				<option selected="selected" disabled="disabled"  style="display: none" value=""></option>			
-				<Option Value="P">待結案</Option>
-				<Option Value="E">已結案</Option>
-			</Select>			
-            <!-- <input type="text" name="status" id="status"> -->
-        </div>
-
-        <div>
-            <label for="note">備註</label>
-            <input type="text" name="note" id="note">
-        </div>
-
-       
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
-            <p class="error"><?php echo $creater_error; ?></p>
-        </div>
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at" value="<?php echo date('Y/m/d H:i:s'); ?>">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-
-        <div>
-			<br>
-            <button type="submit" name="submit">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
+<?php
+include "header.php";
+?>
+
+<div class="container">
+
+    <?php
+    
+        include "receivable-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        
+    
+        <div>
+            <label for="contractno">合約號</label>
+            <input type="text" name="contractno" id="contractno">
+           
+        </div>	
+
+        <div>
+            <label for="facilityno">作番號</label>
+            <input type="text" name="facilityno" id="facilityno">
+            
+        </div>	
+		
+        <div>
+            <label for="receivable_date">應繳款日</label>
+            <input type="text" data-date-format="yyyy-mm-dd" name="receivable_date" id="receivable_date" value="<?php echo date('Y/m/d H:i:s'); ?>">
+        </div>	
+				
+        <div>
+            <label for="actual_date">實繳款日</label>
+            <input type="text" data-date-format="yyyy-mm-dd" name="actual_date" id="actual_date" value="<?php echo date('Y/m/d H:i:s'); ?>">
+            
+        </div>	
+
+        <div>
+            <label for="receivable">應繳款金額</label>
+            <input type="text" name="receivable" id="receivable" onkeyup="if(value<0)value=0;value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+            
+        </div>	
+
+        <div>
+            <label for="actual">實繳款金額</label>
+            <input type="text" name="actual" id="actual" onkeyup="if(value<0)value=0;value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="currency">幣別</label>
+            <input type="text" name="currency" id="currency">
+        </div>
+
+        <div>
+            <label for="owner">款項負責人工號</label>
+            <input type="text" name="owner" id="owner">
+        </div>
+
+        <div>
+            <label for="status">收款狀態</label>
+			<Select name="status" id="status" required>
+				<option selected="selected" disabled="disabled"  style="display: none" value=""></option>			
+				<Option Value="P">待結案</Option>
+				<Option Value="E">已結案</Option>
+			</Select>			
+            <!-- <input type="text" name="status" id="status"> -->
+        </div>
+
+        <div>
+            <label for="note">備註</label>
+            <input type="text" name="note" id="note">
+        </div>
+
+       
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
+            <p class="error"><?php echo $creater_error; ?></p>
+        </div>
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at" value="<?php echo date('Y/m/d H:i:s'); ?>">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+
+        <div>
+			<br>
+            <button type="submit" name="submit">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
diff --git a/wms/receivable-delete.php b/wms/receivable-delete.php
index 14ed1db5..a08b09e8 100644
--- a/wms/receivable-delete.php
+++ b/wms/receivable-delete.php
@@ -1,12 +1,12 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "DELETE FROM receivable WHERE id='$id'";
-mysqli_query($link, $db_query);	
-
-header("Refresh:0; url=receivable-index.php?function_name=receivable&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "DELETE FROM receivable WHERE id='$id'";
+mysqli_query($link, $db_query);	
+
+header("Refresh:0; url=receivable-index.php?function_name=receivable&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/receivable-edit.php b/wms/receivable-edit.php
index 7d754239..50cee8ce 100644
--- a/wms/receivable-edit.php
+++ b/wms/receivable-edit.php
@@ -1,115 +1,115 @@
-<?php
-    include "header.php";
-
-    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-	
-	$data = array();
-	// sql語法存在變數中
-	$db_query = "SELECT * FROM receivable WHERE id=$id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$db_query);	
-/*
-    include "inc/record_update.php";
-    
-    try {	
-		// 設置一個空陣列來放資料
-		$data = array();
-		// sql語法存在變數中
-		$db_query = "SELECT * FROM expert WHERE id=$id";
-
-		// 用mysqli_query方法執行(sql語法)將結果存在變數中
-		$data = mysqli_query($link,$db_query);
-	}catch (Exception $e) {
-    echo 'Caught exception: ',  $e->getMessage(), "\n";
-	}
-*/	
-    foreach($data as $data) :
-?>
-
-<div class="container">
-    <form class="form-inline" method="post" action="receivable-record-update.php" enctype="multipart/form-data">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-		
-        <div>
-            <label for="contractno">合約號</label>
-            <input type="text" name="contractno" id="contractno" value="<?php echo $data['contractno']; ?>">
-        </div>	
-
-        <div>
-            <label for="facilityno">作番號</label>
-            <input type="text" name="facilityno" id="facilityno" value="<?php echo $data['facilityno']; ?>">
-        </div>	
-		
-        <div>
-            <label for="receivable_date">應繳款日</label>
-            <input type="text" data-date-format="yyyy-mm-dd" name="receivable_date" id="receivable_date" value="<?php echo $data['receivable_date']; ?>">
-        </div>	
-				
-        <div>
-            <label for="actual_date">實繳款日</label>
-            <input type="text" data-date-format="yyyy-mm-dd" name="actual_date" id="actual_date" value="<?php echo $data['actual_date']; ?>">
-        </div>	
-
-        <div>
-            <label for="receivable">應繳款金額</label>
-            <input type="text" name="receivable" id="receivable" value="<?php echo $data['receivable']; ?>" onkeyup="if(value<0)value=0;value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>	
-
-        <div>
-            <label for="actual">實繳款金額</label>
-            <input type="text" name="actual" id="actual" value="<?php echo $data['actual']; ?>" onkeyup="if(value<0)value=0;value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
-        </div>
-
-        <div>
-            <label for="currency">幣別</label>
-            <input type="text" name="currency" id="currency" value="<?php echo $data['currency']; ?>">
-        </div>
-
-        <div>
-            <label for="owner">款項負責人工號</label>
-            <input type="text" name="owner" id="owner" value="<?php echo $data['owner']; ?>">
-        </div>
-
-        <div>
-            <label for="status">收款狀態</label>
-			<Select name="status" id="status" required>
-					<?php
-						switch ($data['status']) {
-							case "P":
-								echo "<Option Value='P' selected='selected'>待結案</Option> <Option Value='E'>已結案</Option>";
-								break;
-							case "E":
-								echo "<Option Value='P'>待結案</Option> <Option Value='E' selected='selected'>已結案</Option>";
-								break;							
-						}					
-					?>					
-			</Select>			
-            <!-- <input type="text" name="status" id="status" value=""> -->
-        </div>
-
-        <div>
-            <label for="note">備註</label>
-			<input type="text" name="note" id="note" value="<?php echo $data['note']; ?>">
-        </div>
-        
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
-        </div>
-		
-		
-        <div>
-            <button type="submit" name="update">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
-?>
+<?php
+    include "header.php";
+
+    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+	
+	$data = array();
+	// sql語法存在變數中
+	$db_query = "SELECT * FROM receivable WHERE id=$id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$db_query);	
+/*
+    include "inc/record_update.php";
+    
+    try {	
+		// 設置一個空陣列來放資料
+		$data = array();
+		// sql語法存在變數中
+		$db_query = "SELECT * FROM expert WHERE id=$id";
+
+		// 用mysqli_query方法執行(sql語法)將結果存在變數中
+		$data = mysqli_query($link,$db_query);
+	}catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+	}
+*/	
+    foreach($data as $data) :
+?>
+
+<div class="container">
+    <form class="form-inline" method="post" action="receivable-record-update.php" enctype="multipart/form-data">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+		
+        <div>
+            <label for="contractno">合約號</label>
+            <input type="text" name="contractno" id="contractno" value="<?php echo $data['contractno']; ?>">
+        </div>	
+
+        <div>
+            <label for="facilityno">作番號</label>
+            <input type="text" name="facilityno" id="facilityno" value="<?php echo $data['facilityno']; ?>">
+        </div>	
+		
+        <div>
+            <label for="receivable_date">應繳款日</label>
+            <input type="text" data-date-format="yyyy-mm-dd" name="receivable_date" id="receivable_date" value="<?php echo $data['receivable_date']; ?>">
+        </div>	
+				
+        <div>
+            <label for="actual_date">實繳款日</label>
+            <input type="text" data-date-format="yyyy-mm-dd" name="actual_date" id="actual_date" value="<?php echo $data['actual_date']; ?>">
+        </div>	
+
+        <div>
+            <label for="receivable">應繳款金額</label>
+            <input type="text" name="receivable" id="receivable" value="<?php echo $data['receivable']; ?>" onkeyup="if(value<0)value=0;value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>	
+
+        <div>
+            <label for="actual">實繳款金額</label>
+            <input type="text" name="actual" id="actual" value="<?php echo $data['actual']; ?>" onkeyup="if(value<0)value=0;value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" required>
+        </div>
+
+        <div>
+            <label for="currency">幣別</label>
+            <input type="text" name="currency" id="currency" value="<?php echo $data['currency']; ?>">
+        </div>
+
+        <div>
+            <label for="owner">款項負責人工號</label>
+            <input type="text" name="owner" id="owner" value="<?php echo $data['owner']; ?>">
+        </div>
+
+        <div>
+            <label for="status">收款狀態</label>
+			<Select name="status" id="status" required>
+					<?php
+						switch ($data['status']) {
+							case "P":
+								echo "<Option Value='P' selected='selected'>待結案</Option> <Option Value='E'>已結案</Option>";
+								break;
+							case "E":
+								echo "<Option Value='P'>待結案</Option> <Option Value='E' selected='selected'>已結案</Option>";
+								break;							
+						}					
+					?>					
+			</Select>			
+            <!-- <input type="text" name="status" id="status" value=""> -->
+        </div>
+
+        <div>
+            <label for="note">備註</label>
+			<input type="text" name="note" id="note" value="<?php echo $data['note']; ?>">
+        </div>
+        
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
+        </div>
+		
+		
+        <div>
+            <button type="submit" name="update">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php
+
+    endforeach;
+    
+    include "footer.php";
+
+?>
diff --git a/wms/receivable-index.php b/wms/receivable-index.php
index a5862d76..10db7921 100644
--- a/wms/receivable-index.php
+++ b/wms/receivable-index.php
@@ -1,141 +1,141 @@
-<?php
-    include "header.php";
-	
-	// 設置一個空陣列來放資料
-	$data = array();
-	// sql語法存在變數中
-    $sql_cmd = sql_myself($user_id);
-	$sql = "SELECT * FROM receivable $sql_cmd ORDER BY id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$sql);
-
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<p>
-<a href="receivable-create.php?function_name=receivable&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-
-<?php
-
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:receivable-index.php");
-        }
-    }
-
-?>
-
-<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;
-   
-}
-
-</style>
-
-    <div style="overflow-x:auto;">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-            <tr>
-                <th>項次</th>
-                <th>合約號</th>
-                <th>作番號</th>
-                <th>應繳款日</th>
-                <th>實繳款日</th>
-                <th>應繳款金額</th>
-                <th>實繳款金額</th>
-                <th>幣別</th>
-                <th>款項負責人工號</th>
-                <th>收款狀態</th>
-                <th>備註</th>
-                <th>建檔人</th>
-                <th>建檔時間</th>				
-                <th>修改</th>
-                <th>刪除</th>				
-            </tr>
-		</thead>
-		<tbody>			
-
-            <?php foreach($data as $data) : ?>    
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td><?php echo $data['contractno']; ?></td>
-                    <td><?php echo $data['facilityno']; ?></td>
-                    <td><?php echo $data['receivable_date']; ?></td>
-                    <td><?php echo $data['actual_date']; ?></td>
-                    <td><?php echo $data['receivable']; ?></td>
-                    <td><?php echo $data['actual']; ?></td>
-                    <td><?php echo $data['currency']; ?></td>
-                    <td><?php echo $data['owner']; ?></td>
-                    <td><?php echo $data['status']; ?></td>
-                    <td><?php echo $data['note']; ?></td>
-                    <td><?php echo $data['creater']; ?></td>
-                    <td><?php echo $data['create_at']; ?></td>
-                    <td>
-						<p>
-							<a href="receivable-edit.php?id=<?php echo $data['id']; ?>&function_name=receivable&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-								<span class="glyphicon glyphicon-pencil"></span>
-							</a>
-						</p> 
-					</td>
-                    <td>
-						<p>
-							<a href="receivable-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-								<span class="glyphicon glyphicon-remove"></span>
-							</a>
-						</p> 
-					</td>
-                </tr>
-            <?php endforeach; ?>
-			</tbody>			
-        </table>
-    </div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-
-?>
+<?php
+    include "header.php";
+	
+	// 設置一個空陣列來放資料
+	$data = array();
+	// sql語法存在變數中
+    $sql_cmd = sql_myself($user_id);
+	$sql = "SELECT * FROM receivable $sql_cmd ORDER BY id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$sql);
+
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<p>
+<a href="receivable-create.php?function_name=receivable&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+
+<?php
+
+if($data):
+    
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:receivable-index.php");
+        }
+    }
+
+?>
+
+<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;
+   
+}
+
+</style>
+
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+            <tr>
+                <th>項次</th>
+                <th>合約號</th>
+                <th>作番號</th>
+                <th>應繳款日</th>
+                <th>實繳款日</th>
+                <th>應繳款金額</th>
+                <th>實繳款金額</th>
+                <th>幣別</th>
+                <th>款項負責人工號</th>
+                <th>收款狀態</th>
+                <th>備註</th>
+                <th>建檔人</th>
+                <th>建檔時間</th>				
+                <th>修改</th>
+                <th>刪除</th>				
+            </tr>
+		</thead>
+		<tbody>			
+
+            <?php foreach($data as $data) : ?>    
+                <tr>
+                    <td><?php echo $data['id']; ?></td>
+                    <td><?php echo $data['contractno']; ?></td>
+                    <td><?php echo $data['facilityno']; ?></td>
+                    <td><?php echo $data['receivable_date']; ?></td>
+                    <td><?php echo $data['actual_date']; ?></td>
+                    <td><?php echo $data['receivable']; ?></td>
+                    <td><?php echo $data['actual']; ?></td>
+                    <td><?php echo $data['currency']; ?></td>
+                    <td><?php echo $data['owner']; ?></td>
+                    <td><?php echo $data['status']; ?></td>
+                    <td><?php echo $data['note']; ?></td>
+                    <td><?php echo $data['creater']; ?></td>
+                    <td><?php echo $data['create_at']; ?></td>
+                    <td>
+						<p>
+							<a href="receivable-edit.php?id=<?php echo $data['id']; ?>&function_name=receivable&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+								<span class="glyphicon glyphicon-pencil"></span>
+							</a>
+						</p> 
+					</td>
+                    <td>
+						<p>
+							<a href="receivable-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+						</p> 
+					</td>
+                </tr>
+            <?php endforeach; ?>
+			</tbody>			
+        </table>
+    </div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+
+?>
diff --git a/wms/receivable-record-submit.php b/wms/receivable-record-submit.php
index 61a0bb3e..11a847b8 100644
--- a/wms/receivable-record-submit.php
+++ b/wms/receivable-record-submit.php
@@ -1,48 +1,48 @@
-<?php
-$contractno= "";
-$facilityno= "";
-$receivable_date= "";
-$actual_date= "";
-$receivable= "";
-$actual= "";
-$currency= "";
-$owner= "";
-$status= "";
-$note= "";
-
-$contractno_error= "";
-$facilityno_error= "";
-$receivable_date_error= "";
-$actual_date_error= "";
-$receivable_error= "";
-$actual_error= "";
-$currency_error= "";
-$owner_error= "";
-$status_error= "";
-$note_error= "";
-$creater_error = "";
-$create_at_error = "";
-
-
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    include "receivable-user-input.php";
-
-    $db_query = "INSERT INTO receivable(contractno, facilityno, receivable_date, actual_date, receivable, actual, currency, owner, status, note, creater, create_at) VALUES ('$contractno', '$facilityno', '$receivable_date', '$actual_date', '$receivable', '$actual', '$currency', '$owner', '$status', '$note', '$creater', '$create_at')";    	                        
-    $result = mysqli_query($link,$db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='receivable-index.php?function_name=receivable&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='receivable-index.php?function_name=receivable&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
-?>
+<?php
+$contractno= "";
+$facilityno= "";
+$receivable_date= "";
+$actual_date= "";
+$receivable= "";
+$actual= "";
+$currency= "";
+$owner= "";
+$status= "";
+$note= "";
+
+$contractno_error= "";
+$facilityno_error= "";
+$receivable_date_error= "";
+$actual_date_error= "";
+$receivable_error= "";
+$actual_error= "";
+$currency_error= "";
+$owner_error= "";
+$status_error= "";
+$note_error= "";
+$creater_error = "";
+$create_at_error = "";
+
+
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    include "receivable-user-input.php";
+
+    $db_query = "INSERT INTO receivable(contractno, facilityno, receivable_date, actual_date, receivable, actual, currency, owner, status, note, creater, create_at) VALUES ('$contractno', '$facilityno', '$receivable_date', '$actual_date', '$receivable', '$actual', '$currency', '$owner', '$status', '$note', '$creater', '$create_at')";    	                        
+    $result = mysqli_query($link,$db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='receivable-index.php?function_name=receivable&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='receivable-index.php?function_name=receivable&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
+?>
diff --git a/wms/receivable-record-update.php b/wms/receivable-record-update.php
index 48efb840..45fad217 100644
--- a/wms/receivable-record-update.php
+++ b/wms/receivable-record-update.php
@@ -1,44 +1,44 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-    function user_input( $data ) {
-        $data1 = trim($data);
-        $data2 = stripslashes($data1);
-        $data3 = htmlspecialchars($data2);
-        return $data3;
-    }
-
-    $id           = $_POST['id'];
-    $contractno    = user_input($_POST["contractno"]);
-    $facilityno   = user_input($_POST["facilityno"]);
-    $receivable_date    = user_input($_POST["receivable_date"]);
-    $actual_date       = user_input($_POST["actual_date"]);
-    $receivable       = user_input($_POST["receivable"]);
-    $actual        = user_input($_POST["actual"]);
-    $currency     = user_input($_POST["currency"]);
-    $owner       = user_input($_POST["owner"]);
-    $status   = user_input($_POST["status"]);
-    $note    = user_input($_POST["note"]);
-    $creater      = user_input($_POST["creater"]);
-    $create_at    = date('Y/m/d H:i:s');
-
-    $db_query = "UPDATE receivable set contractno = '$contractno', facilityno = '$facilityno', receivable_date = '$receivable_date', actual_date = '$actual_date', receivable = '$receivable',  actual = '$actual', currency = '$currency', owner = '$owner', status = '$status', note = '$note', create_at = '$create_at' WHERE id='$id'";
-    mysqli_query($link, $db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='receivable-index.php?function_name=receivable&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='receivable-index.php?function_name=receivable&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if(isset($_POST['update'])) {
+    function user_input( $data ) {
+        $data1 = trim($data);
+        $data2 = stripslashes($data1);
+        $data3 = htmlspecialchars($data2);
+        return $data3;
+    }
+
+    $id           = $_POST['id'];
+    $contractno    = user_input($_POST["contractno"]);
+    $facilityno   = user_input($_POST["facilityno"]);
+    $receivable_date    = user_input($_POST["receivable_date"]);
+    $actual_date       = user_input($_POST["actual_date"]);
+    $receivable       = user_input($_POST["receivable"]);
+    $actual        = user_input($_POST["actual"]);
+    $currency     = user_input($_POST["currency"]);
+    $owner       = user_input($_POST["owner"]);
+    $status   = user_input($_POST["status"]);
+    $note    = user_input($_POST["note"]);
+    $creater      = user_input($_POST["creater"]);
+    $create_at    = date('Y/m/d H:i:s');
+
+    $db_query = "UPDATE receivable set contractno = '$contractno', facilityno = '$facilityno', receivable_date = '$receivable_date', actual_date = '$actual_date', receivable = '$receivable',  actual = '$actual', currency = '$currency', owner = '$owner', status = '$status', note = '$note', create_at = '$create_at' WHERE id='$id'";
+    mysqli_query($link, $db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='receivable-index.php?function_name=receivable&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='receivable-index.php?function_name=receivable&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/receivable-user-input.php b/wms/receivable-user-input.php
index 19ccbf70..7b23c249 100644
--- a/wms/receivable-user-input.php
+++ b/wms/receivable-user-input.php
@@ -1,59 +1,59 @@
-<?php
-
-//Function to filter the form input
-function user_input( $data ) {
-    $data1 = trim($data);
-    $data2 = stripslashes($data1);
-    $data3 = htmlspecialchars($data2);
-    return $data3;
-}
-
-
-
-		$contractno    = user_input($_POST["contractno"]);
-		$facilityno   = user_input($_POST["facilityno"]);
-		$receivable_date    = user_input($_POST["receivable_date"]);
-		$actual_date       = user_input($_POST["actual_date"]);
-		$receivable       = user_input($_POST["receivable"]);
-		$actual        = user_input($_POST["actual"]);
-		$currency     = user_input($_POST["currency"]);
-		$owner       = user_input($_POST["owner"]);
-		$status   = user_input($_POST["status"]);
-		$note    = user_input($_POST["note"]);
-		$creater      = user_input($_POST["creater"]);
-		$create_at    = date('Y/m/d H:i:s');
-
-
-
-
-/*
-
-if(empty($_POST["name"])) {
-    $name_error = "Name is required";
-} else {
-    $name = user_input($_POST["name"]);
-    
-    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
-        $name_error = "Only letter and white space are allowed";
-    }
-}
-
-
-/*
-if(empty($_POST["website"])) {
-    $website_error = "Website address is required";
-} else {
-    $website = user_input($_POST["website"]);
-
-    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
-        $website_error = "Invalid website URL";
-    }
-}
-
-if(empty($_POST["comment"])) {
-    $comment = "";
-} else {
-    $comment = user_input($_POST["comment"]);
-}
-*/
-?>
+<?php
+
+//Function to filter the form input
+function user_input( $data ) {
+    $data1 = trim($data);
+    $data2 = stripslashes($data1);
+    $data3 = htmlspecialchars($data2);
+    return $data3;
+}
+
+
+
+		$contractno    = user_input($_POST["contractno"]);
+		$facilityno   = user_input($_POST["facilityno"]);
+		$receivable_date    = user_input($_POST["receivable_date"]);
+		$actual_date       = user_input($_POST["actual_date"]);
+		$receivable       = user_input($_POST["receivable"]);
+		$actual        = user_input($_POST["actual"]);
+		$currency     = user_input($_POST["currency"]);
+		$owner       = user_input($_POST["owner"]);
+		$status   = user_input($_POST["status"]);
+		$note    = user_input($_POST["note"]);
+		$creater      = user_input($_POST["creater"]);
+		$create_at    = date('Y/m/d H:i:s');
+
+
+
+
+/*
+
+if(empty($_POST["name"])) {
+    $name_error = "Name is required";
+} else {
+    $name = user_input($_POST["name"]);
+    
+    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
+        $name_error = "Only letter and white space are allowed";
+    }
+}
+
+
+/*
+if(empty($_POST["website"])) {
+    $website_error = "Website address is required";
+} else {
+    $website = user_input($_POST["website"]);
+
+    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
+        $website_error = "Invalid website URL";
+    }
+}
+
+if(empty($_POST["comment"])) {
+    $comment = "";
+} else {
+    $comment = user_input($_POST["comment"]);
+}
+*/
+?>
diff --git a/wms/reimburse-import.php b/wms/reimburse-import.php
index 3403f954..6456171b 100644
--- a/wms/reimburse-import.php
+++ b/wms/reimburse-import.php
@@ -1,31 +1,31 @@
-<?php
-// Load Composer's autoloader
-require_once '/common/composer/vendor/autoload.php';
-
-// Import PhpSpreadsheet classes into the global namespace
-// These must be at the top of your script, not inside a function
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Xls;
-//use PhpOffice\PhpSpreadsheet\Reader\Xls;
-use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
-
-$reader = new \PhpOffice\PhpSpreadsheet\Reader\Xls();
-$spreadsheet = $reader->load("reimburse-sample.xls");
-echo "success";
-//var_dump($spreadsheet);
-//json_encode(var_dump($spreadsheet));
-$sheet = $spreadsheet->getActiveSheet();
-$sheet->setCellValue('H3','M1111230707');
-$sheet->setCellValue('H6','資訊部');
-$writer = new Xls($spreadsheet);
-$writer->save('0720helloworld3.xls');
-
-// $spreadsheet = new Spreadsheet();
-// $sheet = $spreadsheet->getActiveSheet();
-// $sheet->setCellValue('A1', 'Hello World !');
-
-// $writer = new Xlsx($spreadsheet);
-// $writer->save('hello world.xlsx');
-
-
+<?php
+// Load Composer's autoloader
+require_once '/common/composer/vendor/autoload.php';
+
+// Import PhpSpreadsheet classes into the global namespace
+// These must be at the top of your script, not inside a function
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xls;
+//use PhpOffice\PhpSpreadsheet\Reader\Xls;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+$reader = new \PhpOffice\PhpSpreadsheet\Reader\Xls();
+$spreadsheet = $reader->load("reimburse-sample.xls");
+echo "success";
+//var_dump($spreadsheet);
+//json_encode(var_dump($spreadsheet));
+$sheet = $spreadsheet->getActiveSheet();
+$sheet->setCellValue('H3','M1111230707');
+$sheet->setCellValue('H6','資訊部');
+$writer = new Xls($spreadsheet);
+$writer->save('0720helloworld3.xls');
+
+// $spreadsheet = new Spreadsheet();
+// $sheet = $spreadsheet->getActiveSheet();
+// $sheet->setCellValue('A1', 'Hello World !');
+
+// $writer = new Xlsx($spreadsheet);
+// $writer->save('hello world.xlsx');
+
+
  echo "success";
\ No newline at end of file
diff --git a/wms/reimburse-import01.php b/wms/reimburse-import01.php
index b609bd68..b73303b3 100644
--- a/wms/reimburse-import01.php
+++ b/wms/reimburse-import01.php
@@ -1,31 +1,31 @@
-<?php
-// Load Composer's autoloader
-// require_once 'C:\xampp\htdocs\wms\excel\vendor\autoload.php';
-require_once dirname(__DIR__) . '/common/composer/vendor/autoload.php';
-// Import PhpSpreadsheet classes into the global namespace
-// These must be at the top of your script, not inside a function
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx as xls;
-//use PhpOffice\PhpSpreadsheet\Reader\Xls;
-use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
-
-$reader = new \PhpOffice\PhpSpreadsheet\Reader\Xls();
-$spreadsheet = $reader->load("reimburse-sample.xls");
-echo "success";
-//var_dump($spreadsheet);
-//json_encode(var_dump($spreadsheet));
-$sheet = $spreadsheet->getActiveSheet();
-$sheet->setCellValue('H3','M1111230707');
-$sheet->setCellValue('H6','資訊部');
-$writer = new Xls($spreadsheet);
-$writer->save('0817helloworld3.xlsx');
-
-// $spreadsheet = new Spreadsheet();
-// $sheet = $spreadsheet->getActiveSheet();
-// $sheet->setCellValue('A1', 'Hello World !');
-
-// $writer = new Xlsx($spreadsheet);
-// $writer->save('hello world.xlsx');
-
-
+<?php
+// Load Composer's autoloader
+// require_once 'C:\xampp\htdocs\wms\excel\vendor\autoload.php';
+require_once dirname(__DIR__) . '/common/composer/vendor/autoload.php';
+// Import PhpSpreadsheet classes into the global namespace
+// These must be at the top of your script, not inside a function
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx as xls;
+//use PhpOffice\PhpSpreadsheet\Reader\Xls;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+$reader = new \PhpOffice\PhpSpreadsheet\Reader\Xls();
+$spreadsheet = $reader->load("reimburse-sample.xls");
+echo "success";
+//var_dump($spreadsheet);
+//json_encode(var_dump($spreadsheet));
+$sheet = $spreadsheet->getActiveSheet();
+$sheet->setCellValue('H3','M1111230707');
+$sheet->setCellValue('H6','資訊部');
+$writer = new Xls($spreadsheet);
+$writer->save('0817helloworld3.xlsx');
+
+// $spreadsheet = new Spreadsheet();
+// $sheet = $spreadsheet->getActiveSheet();
+// $sheet->setCellValue('A1', 'Hello World !');
+
+// $writer = new Xlsx($spreadsheet);
+// $writer->save('hello world.xlsx');
+
+
  echo "success";
\ No newline at end of file
diff --git a/wms/repair-create.php b/wms/repair-create.php
index b6a81c74..37eb17c7 100644
--- a/wms/repair-create.php
+++ b/wms/repair-create.php
@@ -1,131 +1,131 @@
-<?php
-include "header.php";
-?>
-
-<div class="container">
-
-    <?php
-    
-        include "repair-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        
-    
-    <div>
-            <label for="fixnumber">維修編號</label>
-            <input type="text" name="fixnumber" id="fixnumber" >
-        </div>	
-
-        <div>
-            <label for="customerid">客戶編號</label>
-            <input type="text" name="customerid" id="customerid">
-        </div>	
-		
-        <div>
-            <label for="contractno">合約編號</label>
-            <input type="text" name="contractno" id="contractno" >
-        </div>	
-				
-        <div>
-            <label for="facilityno">電梯編號</label>
-            <input type="text" name="facilityno" id="facilityno" >
-        </div>	
-
-        <div>
-            <label for="damage_detail">故障內容</label>
-            <input type="text" name="damage_detail" id="damage_detail" >
-        </div>	
-		
-		<!--
-        <div>
-            <label for="file_path">上傳圖片</label>
-            <input type="text" name="file_path" id="file_path" >
-        </div>
-		-->
-		
-        <div>
-            <label for="contact_person">聯絡人</label>
-            <input type="text" name="contact_person" id="contact_person" >
-        </div>
-
-        <div>
-            <label for="contact_number">聯繫電話</label>
-            <input type="text" name="contact_number" id="contact_number" >
-        </div>
-
-        <div>
-            <label for="repairerid">保養人員工號</label>
-            <input type="text" name="repairerid" id="repairerid" value="<?php echo $user_id; ?>">
-        </div>
-
-        <div>
-            <label for="repairername">保養人員</label>
-            <input type="text" name="repairername" id="repairername" value="<?php echo $user_name; ?>">
-        </div>
-
-        <div>
-            <label for="phone_call_help">技術支持電話</label>
-            <input type="text" name="phone_call_help" id="phone_call_help" >
-        </div>
-
-        <div>
-            <label for="actual_repairerid">實際處理人員工號</label>
-            <input type="text" name="actual_repairerid" id="actual_repairerid" >
-        </div>
-		
-        <div>
-            <label for="actual_repairername">實際處理人員</label>
-            <input type="text" name="actual_repairername" id="actual_repairername" >
-        </div>		
-
-        <div>
-            <label for="progress_flag">處理進度</label>
-			<Select name="progress_flag" id="progress_flag" required>
-				<option selected="selected" disabled="disabled"  style="display: none" value=""></option>			
-				<Option Value="C">修理中</Option>
-				<Option Value="E">結案</Option>
-			</Select>			
-            <!-- <input type="text" name="status" id="status"> -->
-        </div>
-
-        <div>
-            <label for="memo">備註</label>
-            <input type="text" name="memo" id="memo" >
-        </div>
-
-        <div>
-            <!-- <label for="create_date">報修時間</label> -->
-            <input type="hidden" name="create_date" id="create_date" value="<?php echo date('Y/m/d H:i:s'); ?>">
-        </div>
-
-        <div>
-            <label for="start_date">開始處理時間</label>
-            <input type="text" name="start_date" id="start_date" value="<?php echo date('Y/m/d H:i:s'); ?>">
-        </div>
-
-        <div>
-            <label for="end_date">結案時間</label>
-            <input type="text" name="end_date" id="end_date" value="<?php echo date('Y/m/d H:i:s'); ?>">
-        </div>
-
-        <div>
-			<br>
-            <button type="submit" name="submit">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
+<?php
+include "header.php";
+?>
+
+<div class="container">
+
+    <?php
+    
+        include "repair-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        
+    
+    <div>
+            <label for="fixnumber">維修編號</label>
+            <input type="text" name="fixnumber" id="fixnumber" >
+        </div>	
+
+        <div>
+            <label for="customerid">客戶編號</label>
+            <input type="text" name="customerid" id="customerid">
+        </div>	
+		
+        <div>
+            <label for="contractno">合約編號</label>
+            <input type="text" name="contractno" id="contractno" >
+        </div>	
+				
+        <div>
+            <label for="facilityno">電梯編號</label>
+            <input type="text" name="facilityno" id="facilityno" >
+        </div>	
+
+        <div>
+            <label for="damage_detail">故障內容</label>
+            <input type="text" name="damage_detail" id="damage_detail" >
+        </div>	
+		
+		<!--
+        <div>
+            <label for="file_path">上傳圖片</label>
+            <input type="text" name="file_path" id="file_path" >
+        </div>
+		-->
+		
+        <div>
+            <label for="contact_person">聯絡人</label>
+            <input type="text" name="contact_person" id="contact_person" >
+        </div>
+
+        <div>
+            <label for="contact_number">聯繫電話</label>
+            <input type="text" name="contact_number" id="contact_number" >
+        </div>
+
+        <div>
+            <label for="repairerid">保養人員工號</label>
+            <input type="text" name="repairerid" id="repairerid" value="<?php echo $user_id; ?>">
+        </div>
+
+        <div>
+            <label for="repairername">保養人員</label>
+            <input type="text" name="repairername" id="repairername" value="<?php echo $user_name; ?>">
+        </div>
+
+        <div>
+            <label for="phone_call_help">技術支持電話</label>
+            <input type="text" name="phone_call_help" id="phone_call_help" >
+        </div>
+
+        <div>
+            <label for="actual_repairerid">實際處理人員工號</label>
+            <input type="text" name="actual_repairerid" id="actual_repairerid" >
+        </div>
+		
+        <div>
+            <label for="actual_repairername">實際處理人員</label>
+            <input type="text" name="actual_repairername" id="actual_repairername" >
+        </div>		
+
+        <div>
+            <label for="progress_flag">處理進度</label>
+			<Select name="progress_flag" id="progress_flag" required>
+				<option selected="selected" disabled="disabled"  style="display: none" value=""></option>			
+				<Option Value="C">修理中</Option>
+				<Option Value="E">結案</Option>
+			</Select>			
+            <!-- <input type="text" name="status" id="status"> -->
+        </div>
+
+        <div>
+            <label for="memo">備註</label>
+            <input type="text" name="memo" id="memo" >
+        </div>
+
+        <div>
+            <!-- <label for="create_date">報修時間</label> -->
+            <input type="hidden" name="create_date" id="create_date" value="<?php echo date('Y/m/d H:i:s'); ?>">
+        </div>
+
+        <div>
+            <label for="start_date">開始處理時間</label>
+            <input type="text" name="start_date" id="start_date" value="<?php echo date('Y/m/d H:i:s'); ?>">
+        </div>
+
+        <div>
+            <label for="end_date">結案時間</label>
+            <input type="text" name="end_date" id="end_date" value="<?php echo date('Y/m/d H:i:s'); ?>">
+        </div>
+
+        <div>
+			<br>
+            <button type="submit" name="submit">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
diff --git a/wms/repair-delete.php b/wms/repair-delete.php
index b71a025b..09024dda 100644
--- a/wms/repair-delete.php
+++ b/wms/repair-delete.php
@@ -1,12 +1,12 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "DELETE FROM repair WHERE id='$id'";
-mysqli_query($link, $db_query);	
-
-header("Refresh:0; url=repair-index.php?function_name=repair&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "DELETE FROM repair WHERE id='$id'";
+mysqli_query($link, $db_query);	
+
+header("Refresh:0; url=repair-index.php?function_name=repair&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/repair-edit.php b/wms/repair-edit.php
index 18dc9eb5..d75e0f95 100644
--- a/wms/repair-edit.php
+++ b/wms/repair-edit.php
@@ -1,152 +1,152 @@
-<?php
-    include "header.php";
-
-    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-	
-	$data = array();
-	// sql語法存在變數中
-	$db_query = "SELECT * FROM repair WHERE id=$id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$db_query);	
-/*
-    include "inc/record_update.php";
-    
-    try {	
-		// 設置一個空陣列來放資料
-		$data = array();
-		// sql語法存在變數中
-		$db_query = "SELECT * FROM expert WHERE id=$id";
-
-		// 用mysqli_query方法執行(sql語法)將結果存在變數中
-		$data = mysqli_query($link,$db_query);
-	}catch (Exception $e) {
-    echo 'Caught exception: ',  $e->getMessage(), "\n";
-	}
-*/	
-    foreach($data as $data) :
-?>
-
-<div class="container">
-    <form class="form-inline" method="post" action="repair-record-update.php" enctype="multipart/form-data">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-		
-        <div>
-            <label for="fixnumber">維修編號</label>
-            <input type="text" name="fixnumber" id="fixnumber" value="<?php echo $data['fixnumber']; ?>">
-        </div>	
-
-        <div>
-            <label for="customerid">客戶編號</label>
-            <input type="text" name="customerid" id="customerid" value="<?php echo $data['customerid']; ?>">
-        </div>	
-		
-        <div>
-            <label for="contractno">合約編號</label>
-            <input type="text" name="contractno" id="contractno" value="<?php echo $data['contractno']; ?>">
-        </div>	
-				
-        <div>
-            <label for="facilityno">電梯編號</label>
-            <input type="text" name="facilityno" id="facilityno" value="<?php echo $data['facilityno']; ?>">
-        </div>	
-
-        <div>
-            <label for="damage_detail">故障內容</label>
-            <input type="text" name="damage_detail" id="damage_detail" value="<?php echo $data['damage_detail']; ?>">
-        </div>	
-		
-		<!--
-        <div>
-            <label for="file_path">上傳圖片</label>
-            <input type="text" name="file_path" id="file_path" value="<?php echo $data['file_path']; ?>">
-        </div>
-		-->
-
-        <div>
-            <label for="contact_person">聯絡人</label>
-            <input type="text" name="contact_person" id="contact_person" value="<?php echo $data['contact_person']; ?>">
-        </div>
-
-        <div>
-            <label for="contact_number">聯繫電話</label>
-            <input type="text" name="contact_number" id="contact_number" value="<?php echo $data['contact_number']; ?>">
-        </div>
-
-        <div>
-            <label for="repairerid">保養人員工號</label>
-            <input type="text" name="repairerid" id="repairerid" value="<?php echo $data['repairerid']; ?>">
-        </div>
-
-        <div>
-            <label for="repairername">保養人員</label>
-            <input type="text" name="repairername" id="repairername" value="<?php echo $data['repairername']; ?>">
-        </div>
-
-        <div>
-            <label for="phone_call_help">技術支持電話</label>
-            <input type="text" name="phone_call_help" id="phone_call_help" value="<?php echo $data['phone_call_help']; ?>">
-        </div>
-
-        <div>
-            <label for="actual_repairerid">實際處理人員工號</label>
-            <input type="text" name="actual_repairerid" id="actual_repairerid" value="<?php echo $data['actual_repairerid']; ?>">
-        </div>
-
-        <div>
-            <label for="actual_repairername">實際處理人員</label>
-            <input type="text" name="actual_repairername" id="actual_repairername" value="<?php echo $data['actual_repairername']; ?>">
-        </div>
-		
-        <div>
-            <label for="progress_flag">處理進度</label>
-			<Select name="progress_flag" id="progress_flag" required>
-					<?php
-						switch ($data['progress_flag']) {
-							case "C":
-								echo "<Option Value='C' selected='selected'>修理中</Option> <Option Value='E'>結案</Option>";
-								break;
-							case "E":
-								echo "<Option Value='C'>修理中</Option> <Option Value='E' selected='selected'>結案</Option>";
-								break;							
-						}					
-					?>					
-			</Select>			
-            <!-- <input type="text" name="status" id="status" value=""> -->
-        </div>		
-
-        <div>
-            <label for="memo">備註</label>
-            <input type="text" name="memo" id="memo" value="<?php echo $data['memo']; ?>">
-        </div>
-
-        <div>
-            <label for="create_date">報修時間</label>
-            <input type="text" name="create_date" id="create_date" value="<?php echo $data['create_date']; ?>">
-        </div>
-
-        <div>
-            <label for="start_date">開始處理時間</label>
-            <input type="text" name="start_date" id="start_date" value="<?php echo $data['start_date']; ?>">
-        </div>
-
-        <div>
-            <label for="end_date">結案時間</label>
-            <input type="text" name="end_date" id="end_date" value="<?php echo $data['end_date']; ?>">
-        </div>
-
-		
-        <div>
-            <button type="submit" name="update">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
-?>
+<?php
+    include "header.php";
+
+    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+	
+	$data = array();
+	// sql語法存在變數中
+	$db_query = "SELECT * FROM repair WHERE id=$id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$db_query);	
+/*
+    include "inc/record_update.php";
+    
+    try {	
+		// 設置一個空陣列來放資料
+		$data = array();
+		// sql語法存在變數中
+		$db_query = "SELECT * FROM expert WHERE id=$id";
+
+		// 用mysqli_query方法執行(sql語法)將結果存在變數中
+		$data = mysqli_query($link,$db_query);
+	}catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+	}
+*/	
+    foreach($data as $data) :
+?>
+
+<div class="container">
+    <form class="form-inline" method="post" action="repair-record-update.php" enctype="multipart/form-data">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+		
+        <div>
+            <label for="fixnumber">維修編號</label>
+            <input type="text" name="fixnumber" id="fixnumber" value="<?php echo $data['fixnumber']; ?>">
+        </div>	
+
+        <div>
+            <label for="customerid">客戶編號</label>
+            <input type="text" name="customerid" id="customerid" value="<?php echo $data['customerid']; ?>">
+        </div>	
+		
+        <div>
+            <label for="contractno">合約編號</label>
+            <input type="text" name="contractno" id="contractno" value="<?php echo $data['contractno']; ?>">
+        </div>	
+				
+        <div>
+            <label for="facilityno">電梯編號</label>
+            <input type="text" name="facilityno" id="facilityno" value="<?php echo $data['facilityno']; ?>">
+        </div>	
+
+        <div>
+            <label for="damage_detail">故障內容</label>
+            <input type="text" name="damage_detail" id="damage_detail" value="<?php echo $data['damage_detail']; ?>">
+        </div>	
+		
+		<!--
+        <div>
+            <label for="file_path">上傳圖片</label>
+            <input type="text" name="file_path" id="file_path" value="<?php echo $data['file_path']; ?>">
+        </div>
+		-->
+
+        <div>
+            <label for="contact_person">聯絡人</label>
+            <input type="text" name="contact_person" id="contact_person" value="<?php echo $data['contact_person']; ?>">
+        </div>
+
+        <div>
+            <label for="contact_number">聯繫電話</label>
+            <input type="text" name="contact_number" id="contact_number" value="<?php echo $data['contact_number']; ?>">
+        </div>
+
+        <div>
+            <label for="repairerid">保養人員工號</label>
+            <input type="text" name="repairerid" id="repairerid" value="<?php echo $data['repairerid']; ?>">
+        </div>
+
+        <div>
+            <label for="repairername">保養人員</label>
+            <input type="text" name="repairername" id="repairername" value="<?php echo $data['repairername']; ?>">
+        </div>
+
+        <div>
+            <label for="phone_call_help">技術支持電話</label>
+            <input type="text" name="phone_call_help" id="phone_call_help" value="<?php echo $data['phone_call_help']; ?>">
+        </div>
+
+        <div>
+            <label for="actual_repairerid">實際處理人員工號</label>
+            <input type="text" name="actual_repairerid" id="actual_repairerid" value="<?php echo $data['actual_repairerid']; ?>">
+        </div>
+
+        <div>
+            <label for="actual_repairername">實際處理人員</label>
+            <input type="text" name="actual_repairername" id="actual_repairername" value="<?php echo $data['actual_repairername']; ?>">
+        </div>
+		
+        <div>
+            <label for="progress_flag">處理進度</label>
+			<Select name="progress_flag" id="progress_flag" required>
+					<?php
+						switch ($data['progress_flag']) {
+							case "C":
+								echo "<Option Value='C' selected='selected'>修理中</Option> <Option Value='E'>結案</Option>";
+								break;
+							case "E":
+								echo "<Option Value='C'>修理中</Option> <Option Value='E' selected='selected'>結案</Option>";
+								break;							
+						}					
+					?>					
+			</Select>			
+            <!-- <input type="text" name="status" id="status" value=""> -->
+        </div>		
+
+        <div>
+            <label for="memo">備註</label>
+            <input type="text" name="memo" id="memo" value="<?php echo $data['memo']; ?>">
+        </div>
+
+        <div>
+            <label for="create_date">報修時間</label>
+            <input type="text" name="create_date" id="create_date" value="<?php echo $data['create_date']; ?>">
+        </div>
+
+        <div>
+            <label for="start_date">開始處理時間</label>
+            <input type="text" name="start_date" id="start_date" value="<?php echo $data['start_date']; ?>">
+        </div>
+
+        <div>
+            <label for="end_date">結案時間</label>
+            <input type="text" name="end_date" id="end_date" value="<?php echo $data['end_date']; ?>">
+        </div>
+
+		
+        <div>
+            <button type="submit" name="update">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php
+
+    endforeach;
+    
+    include "footer.php";
+
+?>
diff --git a/wms/repair-index.php b/wms/repair-index.php
index 02e14a09..0f904f6e 100644
--- a/wms/repair-index.php
+++ b/wms/repair-index.php
@@ -1,167 +1,167 @@
-<?php
-    include "header.php";
-	
-	// 設置一個空陣列來放資料
-	$data = array();
-	// sql語法存在變數中
-    $sql_cmd = sql_myself($user_id, "repairerid");
-    // 客服:莊雅涵
-    if ($user_id == "M0112") {
-        $last6mon = date("Y/m/d 00:00:00", strtotime("-6 month"));
-        $sql_cmd = "where create_date >= '$last6mon'";
-    }
-	$sql = "SELECT * FROM repair $sql_cmd ORDER BY id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$sql);
-
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="repair-create.php?function_name=repair&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-
-<?php
-}
-
-
-
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:repair-index.php");
-        }
-    }
-
-?>
-
-
-<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;
-   
-}
-
-</style>
-
-    <div style="overflow-x:auto;">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-            <tr>
-                <th>項次</th>
-                <th>維修編號</th>
-                <th>客戶編號</th>
-                <th>合約編號</th>
-                <th>電梯編號</th>
-                <th>故障內容</th>
-                <th class="width_style_1">圖片</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 ($user_auth&2) { ?>
-                <th>修改</th>
-                <th>刪除</th>
-                <?php } ?>
-            </tr>
-		</thead>
-		<tbody>			
-
-            <?php foreach($data as $data) : ?>    
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td><?php echo $data['fixnumber']; ?></td>
-                    <td><?php echo $data['customerid']; ?></td>
-                    <td><?php echo $data['contractno']; ?></td>
-                    <td><?php echo $data['facilityno']; ?></td>
-                    <td><?php echo $data['damage_detail']; ?></td>
-                    <td class="width_style_1"><img src="<?php echo '../app/' . $data['file_path']; ?>" alt="" class="index-image"></td>
-                    <td><?php echo $data['contact_person']; ?></td>
-                    <td><?php echo $data['contact_number']; ?></td>
-                    <td><?php echo $data['repairerid']; ?></td>
-                    <td><?php echo $data['repairername']; ?></td>
-                    <td><?php echo $data['phone_call_help']; ?></td>					
-                    <td><?php echo $data['actual_repairerid']; ?></td>
-                    <td><?php echo $data['actual_repairername']; ?></td>					
-                    <td><?php echo $data['progress_flag']; ?></td>
-                    <td><?php echo $data['memo']; ?></td>
-                    <td><?php echo $data['create_date']; ?></td>
-                    <td><?php echo $data['start_date']; ?></td>
-                    <td><?php echo $data['end_date']; ?></td>
-                    <?php if ($user_auth&2) { ?>
-                    <td>
-						<p>
-							<a href="repair-edit.php?id=<?php echo $data['id']; ?>&function_name=repair&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-								<span class="glyphicon glyphicon-pencil"></span>
-							</a>
-						</p> 
-					</td>
-                    <td>
-						<p>
-							<a href="repair-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-								<span class="glyphicon glyphicon-remove"></span>
-							</a>
-						</p> 
-					</td>
-                    <?php } ?>
-                </tr>
-            <?php endforeach; ?>
-			</tbody>			
-        </table>
-    </div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-
-?>
+<?php
+    include "header.php";
+	
+	// 設置一個空陣列來放資料
+	$data = array();
+	// sql語法存在變數中
+    $sql_cmd = sql_myself($user_id, "repairerid");
+    // 客服:莊雅涵
+    if ($user_id == "M0112") {
+        $last6mon = date("Y/m/d 00:00:00", strtotime("-6 month"));
+        $sql_cmd = "where create_date >= '$last6mon'";
+    }
+	$sql = "SELECT * FROM repair $sql_cmd ORDER BY id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$sql);
+
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth&2) { ?>
+<p>
+<a href="repair-create.php?function_name=repair&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+
+<?php
+}
+
+
+
+if($data):
+    
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:repair-index.php");
+        }
+    }
+
+?>
+
+
+<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;
+   
+}
+
+</style>
+
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+            <tr>
+                <th>項次</th>
+                <th>維修編號</th>
+                <th>客戶編號</th>
+                <th>合約編號</th>
+                <th>電梯編號</th>
+                <th>故障內容</th>
+                <th class="width_style_1">圖片</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 ($user_auth&2) { ?>
+                <th>修改</th>
+                <th>刪除</th>
+                <?php } ?>
+            </tr>
+		</thead>
+		<tbody>			
+
+            <?php foreach($data as $data) : ?>    
+                <tr>
+                    <td><?php echo $data['id']; ?></td>
+                    <td><?php echo $data['fixnumber']; ?></td>
+                    <td><?php echo $data['customerid']; ?></td>
+                    <td><?php echo $data['contractno']; ?></td>
+                    <td><?php echo $data['facilityno']; ?></td>
+                    <td><?php echo $data['damage_detail']; ?></td>
+                    <td class="width_style_1"><img src="<?php echo '../app/' . $data['file_path']; ?>" alt="" class="index-image"></td>
+                    <td><?php echo $data['contact_person']; ?></td>
+                    <td><?php echo $data['contact_number']; ?></td>
+                    <td><?php echo $data['repairerid']; ?></td>
+                    <td><?php echo $data['repairername']; ?></td>
+                    <td><?php echo $data['phone_call_help']; ?></td>					
+                    <td><?php echo $data['actual_repairerid']; ?></td>
+                    <td><?php echo $data['actual_repairername']; ?></td>					
+                    <td><?php echo $data['progress_flag']; ?></td>
+                    <td><?php echo $data['memo']; ?></td>
+                    <td><?php echo $data['create_date']; ?></td>
+                    <td><?php echo $data['start_date']; ?></td>
+                    <td><?php echo $data['end_date']; ?></td>
+                    <?php if ($user_auth&2) { ?>
+                    <td>
+						<p>
+							<a href="repair-edit.php?id=<?php echo $data['id']; ?>&function_name=repair&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+								<span class="glyphicon glyphicon-pencil"></span>
+							</a>
+						</p> 
+					</td>
+                    <td>
+						<p>
+							<a href="repair-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+						</p> 
+					</td>
+                    <?php } ?>
+                </tr>
+            <?php endforeach; ?>
+			</tbody>			
+        </table>
+    </div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+
+?>
diff --git a/wms/repair-record-submit.php b/wms/repair-record-submit.php
index 4ef5255d..bda5d04c 100644
--- a/wms/repair-record-submit.php
+++ b/wms/repair-record-submit.php
@@ -1,66 +1,66 @@
-<?php
-$fixnumber= "";
-$customerid= "";
-$contractno= "";
-$facilityno= "";
-$damage_detail= "";
-#$file_path= "";
-
-$contact_person= "";
-$contact_number= "";
-$repairerid= "";
-$repairername= "";
-$phone_call_help= "";
-$actual_repairerid= "";
-$actual_repairername= "";
-$progress_flag= "";
-$memo= "";
-$create_date= "";
-$start_date= "";
-$end_date= "";
-
-
-$fixnumberr_error= "";
-$customeridr_error= "";
-$contractnor_error= "";
-$facilitynor_error= "";
-$damage_detailr_error= "";
-#$file_pathr_error= "";
-
-$contact_personr_error= "";
-$contact_numberr_error= "";
-$repaireridr_error= "";
-$repairernamer_error= "";
-$phone_call_helpr_error= "";
-$actual_repaireridr_error= "";
-$actual_repairernamer_error= "";
-$progress_flagr_error= "";
-$memor_error= "";
-$create_dater_error= "";
-$start_dater_error= "";
-$end_dater_error= "";
-
-
-
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    include "repair-user-input.php";
-
-    $db_query = "INSERT INTO repair(fixnumber, customerid, contractno, facilityno, damage_detail, contact_person, contact_number, repairerid, repairername, phone_call_help, actual_repairerid, actual_repairername, progress_flag,memo,create_date,start_date,end_date) VALUES ('$fixnumber', '$customerid', '$contractno', '$facilityno', '$damage_detail', '$contact_person', '$contact_number', '$repairerid', '$repairername', '$phone_call_help', '$actual_repairerid', '$actual_repairername', '$progress_flag','$memo','$create_date','$start_date','$end_date')";    	                        
-    $result = mysqli_query($link,$db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='repair-index.php?function_name=repair&".$token_link."';";
-        echo "</script>";  
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='repair-index.php?function_name=repair&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
-?>
+<?php
+$fixnumber= "";
+$customerid= "";
+$contractno= "";
+$facilityno= "";
+$damage_detail= "";
+#$file_path= "";
+
+$contact_person= "";
+$contact_number= "";
+$repairerid= "";
+$repairername= "";
+$phone_call_help= "";
+$actual_repairerid= "";
+$actual_repairername= "";
+$progress_flag= "";
+$memo= "";
+$create_date= "";
+$start_date= "";
+$end_date= "";
+
+
+$fixnumberr_error= "";
+$customeridr_error= "";
+$contractnor_error= "";
+$facilitynor_error= "";
+$damage_detailr_error= "";
+#$file_pathr_error= "";
+
+$contact_personr_error= "";
+$contact_numberr_error= "";
+$repaireridr_error= "";
+$repairernamer_error= "";
+$phone_call_helpr_error= "";
+$actual_repaireridr_error= "";
+$actual_repairernamer_error= "";
+$progress_flagr_error= "";
+$memor_error= "";
+$create_dater_error= "";
+$start_dater_error= "";
+$end_dater_error= "";
+
+
+
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    include "repair-user-input.php";
+
+    $db_query = "INSERT INTO repair(fixnumber, customerid, contractno, facilityno, damage_detail, contact_person, contact_number, repairerid, repairername, phone_call_help, actual_repairerid, actual_repairername, progress_flag,memo,create_date,start_date,end_date) VALUES ('$fixnumber', '$customerid', '$contractno', '$facilityno', '$damage_detail', '$contact_person', '$contact_number', '$repairerid', '$repairername', '$phone_call_help', '$actual_repairerid', '$actual_repairername', '$progress_flag','$memo','$create_date','$start_date','$end_date')";    	                        
+    $result = mysqli_query($link,$db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='repair-index.php?function_name=repair&".$token_link."';";
+        echo "</script>";  
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='repair-index.php?function_name=repair&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
+?>
diff --git a/wms/repair-record-update.php b/wms/repair-record-update.php
index 49ac59c9..29eeb997 100644
--- a/wms/repair-record-update.php
+++ b/wms/repair-record-update.php
@@ -1,50 +1,50 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-    function user_input( $data ) {
-        $data1 = trim($data);
-        $data2 = stripslashes($data1);
-        $data3 = htmlspecialchars($data2);
-        return $data3;
-    }
-
-    $id           = $_POST['id'];
-    $fixnumber    = user_input($_POST["fixnumber"]);
-    $customerid   = user_input($_POST["customerid"]);
-    $contractno        = user_input($_POST["contractno"]);
-    $facilityno       = user_input($_POST["facilityno"]);
-    $damage_detail       = user_input($_POST["damage_detail"]);
-    #$file_path        = user_input($_POST["file_path"]);
-    $contact_person     = user_input($_POST["contact_person"]);
-    $contact_number       = user_input($_POST["contact_number"]);
-    $repairerid   = user_input($_POST["repairerid"]);
-    $repairername    = user_input($_POST["repairername"]);
-    $phone_call_help       = user_input($_POST["phone_call_help"]);
-    $actual_repairerid   = user_input($_POST["actual_repairerid"]);
-    $actual_repairername   = user_input($_POST["actual_repairername"]);
-    $progress_flag   = user_input($_POST["progress_flag"]);
-    $memo   = user_input($_POST["memo"]);
-    $create_date   = user_input($_POST["create_date"]);
-    $start_date   = user_input($_POST["start_date"]);
-    $end_date   = user_input($_POST["end_date"]);
-
-    $db_query = "UPDATE repair set fixnumber = '$fixnumber', customerid = '$customerid', contractno = '$contractno', facilityno = '$facilityno', damage_detail = '$damage_detail', contact_person = '$contact_person', contact_number = '$contact_number', repairerid = '$repairerid', repairername = '$repairername', phone_call_help = '$phone_call_help', actual_repairerid = '$actual_repairerid', progress_flag = '$progress_flag', memo = '$memo',create_date = '$create_date',start_date = '$start_date',end_date = '$end_date' WHERE id='$id'";
-    mysqli_query($link, $db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='repair-index.php?function_name=repair&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='repair-index.php?function_name=repair&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if(isset($_POST['update'])) {
+    function user_input( $data ) {
+        $data1 = trim($data);
+        $data2 = stripslashes($data1);
+        $data3 = htmlspecialchars($data2);
+        return $data3;
+    }
+
+    $id           = $_POST['id'];
+    $fixnumber    = user_input($_POST["fixnumber"]);
+    $customerid   = user_input($_POST["customerid"]);
+    $contractno        = user_input($_POST["contractno"]);
+    $facilityno       = user_input($_POST["facilityno"]);
+    $damage_detail       = user_input($_POST["damage_detail"]);
+    #$file_path        = user_input($_POST["file_path"]);
+    $contact_person     = user_input($_POST["contact_person"]);
+    $contact_number       = user_input($_POST["contact_number"]);
+    $repairerid   = user_input($_POST["repairerid"]);
+    $repairername    = user_input($_POST["repairername"]);
+    $phone_call_help       = user_input($_POST["phone_call_help"]);
+    $actual_repairerid   = user_input($_POST["actual_repairerid"]);
+    $actual_repairername   = user_input($_POST["actual_repairername"]);
+    $progress_flag   = user_input($_POST["progress_flag"]);
+    $memo   = user_input($_POST["memo"]);
+    $create_date   = user_input($_POST["create_date"]);
+    $start_date   = user_input($_POST["start_date"]);
+    $end_date   = user_input($_POST["end_date"]);
+
+    $db_query = "UPDATE repair set fixnumber = '$fixnumber', customerid = '$customerid', contractno = '$contractno', facilityno = '$facilityno', damage_detail = '$damage_detail', contact_person = '$contact_person', contact_number = '$contact_number', repairerid = '$repairerid', repairername = '$repairername', phone_call_help = '$phone_call_help', actual_repairerid = '$actual_repairerid', progress_flag = '$progress_flag', memo = '$memo',create_date = '$create_date',start_date = '$start_date',end_date = '$end_date' WHERE id='$id'";
+    mysqli_query($link, $db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='repair-index.php?function_name=repair&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='repair-index.php?function_name=repair&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/repair-user-input.php b/wms/repair-user-input.php
index 6f580fe0..4146fa25 100644
--- a/wms/repair-user-input.php
+++ b/wms/repair-user-input.php
@@ -1,65 +1,65 @@
-<?php
-
-//Function to filter the form input
-function user_input( $data ) {
-    $data1 = trim($data);
-    $data2 = stripslashes($data1);
-    $data3 = htmlspecialchars($data2);
-    return $data3;
-}
-
-
-$fixnumber    = user_input($_POST["fixnumber"]);
-$customerid   = user_input($_POST["customerid"]);
-$contractno        = user_input($_POST["contractno"]);
-$facilityno       = user_input($_POST["facilityno"]);
-$damage_detail       = user_input($_POST["damage_detail"]);
-#$file_path        = user_input($_POST["file_path"]);
-$contact_person     = user_input($_POST["contact_person"]);
-$contact_number       = user_input($_POST["contact_number"]);
-$repairerid   = user_input($_POST["repairerid"]);
-$repairername    = user_input($_POST["repairername"]);
-
-$phone_call_help    = user_input($_POST["phone_call_help"]);
-$actual_repairerid   = user_input($_POST["actual_repairerid"]);
-$actual_repairername   = user_input($_POST["actual_repairername"]);
-$progress_flag   = user_input($_POST["progress_flag"]);
-$memo   = user_input($_POST["memo"]);
-$create_date   = user_input($_POST["create_date"]);
-$start_date   = user_input($_POST["start_date"]);
-$end_date   = user_input($_POST["end_date"]);
-
-
-
-
-/*
-
-if(empty($_POST["name"])) {
-    $name_error = "Name is required";
-} else {
-    $name = user_input($_POST["name"]);
-    
-    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
-        $name_error = "Only letter and white space are allowed";
-    }
-}
-
-
-/*
-if(empty($_POST["website"])) {
-    $website_error = "Website address is required";
-} else {
-    $website = user_input($_POST["website"]);
-
-    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
-        $website_error = "Invalid website URL";
-    }
-}
-
-if(empty($_POST["comment"])) {
-    $comment = "";
-} else {
-    $comment = user_input($_POST["comment"]);
-}
-*/
-?>
+<?php
+
+//Function to filter the form input
+function user_input( $data ) {
+    $data1 = trim($data);
+    $data2 = stripslashes($data1);
+    $data3 = htmlspecialchars($data2);
+    return $data3;
+}
+
+
+$fixnumber    = user_input($_POST["fixnumber"]);
+$customerid   = user_input($_POST["customerid"]);
+$contractno        = user_input($_POST["contractno"]);
+$facilityno       = user_input($_POST["facilityno"]);
+$damage_detail       = user_input($_POST["damage_detail"]);
+#$file_path        = user_input($_POST["file_path"]);
+$contact_person     = user_input($_POST["contact_person"]);
+$contact_number       = user_input($_POST["contact_number"]);
+$repairerid   = user_input($_POST["repairerid"]);
+$repairername    = user_input($_POST["repairername"]);
+
+$phone_call_help    = user_input($_POST["phone_call_help"]);
+$actual_repairerid   = user_input($_POST["actual_repairerid"]);
+$actual_repairername   = user_input($_POST["actual_repairername"]);
+$progress_flag   = user_input($_POST["progress_flag"]);
+$memo   = user_input($_POST["memo"]);
+$create_date   = user_input($_POST["create_date"]);
+$start_date   = user_input($_POST["start_date"]);
+$end_date   = user_input($_POST["end_date"]);
+
+
+
+
+/*
+
+if(empty($_POST["name"])) {
+    $name_error = "Name is required";
+} else {
+    $name = user_input($_POST["name"]);
+    
+    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
+        $name_error = "Only letter and white space are allowed";
+    }
+}
+
+
+/*
+if(empty($_POST["website"])) {
+    $website_error = "Website address is required";
+} else {
+    $website = user_input($_POST["website"]);
+
+    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
+        $website_error = "Invalid website URL";
+    }
+}
+
+if(empty($_POST["comment"])) {
+    $comment = "";
+} else {
+    $comment = user_input($_POST["comment"]);
+}
+*/
+?>
diff --git a/wms/rib-feeapply-test.php b/wms/rib-feeapply-test.php
index 8d179213..666e25a4 100644
--- a/wms/rib-feeapply-test.php
+++ b/wms/rib-feeapply-test.php
@@ -1,12 +1,12 @@
-<?php
-include "./header.php";
-$BillNo = 'CM0122231106';
-$rib_query = "SELECT * FROM rib WHERE BillNo = '$BillNo'";
-$rib = mysqli_query($link, $rib_query);
-foreach ($rib as $rib){
-    $rib_id = $rib['rib_id'];
-    $BillDate = $rib['BillDate'];
-    
-}
-$OrgId = $FOrgId ='1000';
+<?php
+include "./header.php";
+$BillNo = 'CM0122231106';
+$rib_query = "SELECT * FROM rib WHERE BillNo = '$BillNo'";
+$rib = mysqli_query($link, $rib_query);
+foreach ($rib as $rib){
+    $rib_id = $rib['rib_id'];
+    $BillDate = $rib['BillDate'];
+    
+}
+$OrgId = $FOrgId ='1000';
 echo $rib_id."<br>".$BillDate."<br>".$OrgId;
\ No newline at end of file
diff --git a/wms/rib-test.php b/wms/rib-test.php
index ee591f50..124e579b 100644
--- a/wms/rib-test.php
+++ b/wms/rib-test.php
@@ -1,92 +1,92 @@
-<?php
-$today = strtotime("now");
-echo $today;
-$delivery_date = strtotime("2023-11-03");
-echo "<br>".$delivery_date;
-$final_date = strtotime("2023-05-03 +6 months");
-echo "<br>".$final_date;
-echo "<br>-------<br>".gettype($final_date);
-exit();
-include "T8_Authorization.php";
-echo "發貨單";
-?>
-<script>
-  get_Auth();
-  window.addEventListener('message', function(event) {
-    if (event.origin === "http://localhost:3000" && (typeof event.data === "string")) {
-      var validation = event.data;
-      console.log("成功要到認證");
-      console.log(validation);
-
-      // var corsurl = 'http://cors-anywhere.herokuapp.com/';
-      var apiurl = 'https://erp.masada.com.tw:780/twWebAPI/V1/SALDISPATCHLIST/PostERPData';
-      headerParam = {
-        CHI_Authorization: `${validation}`,
-      };
-      var body = [{
-          "name": "salDispatchListMaster",
-          "rows": [{
-            "BillNo": "TEST03",
-            "BillDate": 20231108,
-            "SupplyFOrgId": "1000",
-            "FOrgId": "1000",
-            "TypeId": "SP",
-            "OrgId": "1000",
-            "CompId": "1001",
-            "ModeId": "T",
-            "BizPartnerId": "M230575",
-            "PersonId": "M0122",
-            "CurrId": "TWD",
-            "CurrOAmount": 1,
-            "CurrLAmount": 1,
-            "TrusteeWarehouseId": "",
-            "SendGoodsDate": 20231108,
-            "DueToId": "M230575",
-            "TaxId": "ST005",
-            "CreditorOrgId": "1000",
-            "CreditorCompId": "1001",
-            "CreditorCurrOAmount": 1,
-            "CreditorCurrLAmount": 1,
-            "TradeConditionId": "",
-            "TrusteeWarehouseBPType": 0,
-            "CurrentState":2
-          }]
-        },
-        {
-          "name": "salDispatchListDetail",
-          "rows": [{
-            "SupplyCompId": "1001",
-            "SupplyOrgId": "1000",
-            "DispatchCompId": "1001",
-            "DispatchOrgId": "1000",
-            "SQuantity": "1",
-            "TaxId": "ST005",
-            "BillNo": "TEST03",
-            "RowCode": 1,
-            "ItemType": 0,
-            "MaterialId": "3JX05302",
-            "SUnitId": "SET",
-            "SPrice": "150000",
-            "WarehouseId":"100"
-          }]
-        }
-      ];
-      var json = JSON.stringify(body);
-      obj = {
-        type: 'POST',
-        // url: `${corsurl}${apiurl}`,
-        url: `${apiurl}`,
-        // dataType: 'json',
-        headers: headerParam,
-        data: json,
-        dataType: "json",
-        success: function(res) {
-          console.log(res.Status);
-          console.log(res.ErrorMsg);
-          console.log(res.Data);
-        }
-      };
-      jQuery.ajax(obj);
-    }
-  })
+<?php
+$today = strtotime("now");
+echo $today;
+$delivery_date = strtotime("2023-11-03");
+echo "<br>".$delivery_date;
+$final_date = strtotime("2023-05-03 +6 months");
+echo "<br>".$final_date;
+echo "<br>-------<br>".gettype($final_date);
+exit();
+include "T8_Authorization.php";
+echo "發貨單";
+?>
+<script>
+  get_Auth();
+  window.addEventListener('message', function(event) {
+    if (event.origin === "http://localhost:3000" && (typeof event.data === "string")) {
+      var validation = event.data;
+      console.log("成功要到認證");
+      console.log(validation);
+
+      // var corsurl = 'http://cors-anywhere.herokuapp.com/';
+      var apiurl = 'https://erp.masada.com.tw:780/twWebAPI/V1/SALDISPATCHLIST/PostERPData';
+      headerParam = {
+        CHI_Authorization: `${validation}`,
+      };
+      var body = [{
+          "name": "salDispatchListMaster",
+          "rows": [{
+            "BillNo": "TEST03",
+            "BillDate": 20231108,
+            "SupplyFOrgId": "1000",
+            "FOrgId": "1000",
+            "TypeId": "SP",
+            "OrgId": "1000",
+            "CompId": "1001",
+            "ModeId": "T",
+            "BizPartnerId": "M230575",
+            "PersonId": "M0122",
+            "CurrId": "TWD",
+            "CurrOAmount": 1,
+            "CurrLAmount": 1,
+            "TrusteeWarehouseId": "",
+            "SendGoodsDate": 20231108,
+            "DueToId": "M230575",
+            "TaxId": "ST005",
+            "CreditorOrgId": "1000",
+            "CreditorCompId": "1001",
+            "CreditorCurrOAmount": 1,
+            "CreditorCurrLAmount": 1,
+            "TradeConditionId": "",
+            "TrusteeWarehouseBPType": 0,
+            "CurrentState":2
+          }]
+        },
+        {
+          "name": "salDispatchListDetail",
+          "rows": [{
+            "SupplyCompId": "1001",
+            "SupplyOrgId": "1000",
+            "DispatchCompId": "1001",
+            "DispatchOrgId": "1000",
+            "SQuantity": "1",
+            "TaxId": "ST005",
+            "BillNo": "TEST03",
+            "RowCode": 1,
+            "ItemType": 0,
+            "MaterialId": "3JX05302",
+            "SUnitId": "SET",
+            "SPrice": "150000",
+            "WarehouseId":"100"
+          }]
+        }
+      ];
+      var json = JSON.stringify(body);
+      obj = {
+        type: 'POST',
+        // url: `${corsurl}${apiurl}`,
+        url: `${apiurl}`,
+        // dataType: 'json',
+        headers: headerParam,
+        data: json,
+        dataType: "json",
+        success: function(res) {
+          console.log(res.Status);
+          console.log(res.ErrorMsg);
+          console.log(res.Data);
+        }
+      };
+      jQuery.ajax(obj);
+    }
+  })
 </script>
\ No newline at end of file
diff --git a/wms/rib-test02.php b/wms/rib-test02.php
index 84b23798..09a6c882 100644
--- a/wms/rib-test02.php
+++ b/wms/rib-test02.php
@@ -1,35 +1,35 @@
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
-<?php
-$now = gmdate("YmdHis");
-$data = 'M0000.' . $now;
-$sign = hash_hmac('SHA256', $data, '964C834F7BF2BB70', false);
-
-?>
-
-<script>
-    function get_Auth() {
-        var api_key = '964C834F7BF2BB70';
-        var validation = "";
-        // var corsurl = 'http://cors-anywhere.herokuapp.com/';
-        var apiurl = 'http://60.244.87.101:780//twWebAPI/GetAuth';
-        headerParam = {
-            UserId: 'M0000',
-            Pwd: 'M012290493119',
-            TimestampUTC: <?= $now ?>,
-            Sign: '<?= $sign ?>'
-        };
-        obj = {
-            type: 'get',
-            // url: `${corsurl}${apiurl}`,
-            url: `${apiurl}`,
-            dataType: 'json',
-            headers: headerParam,
-            success: function(res) {
-                validation = res.Data['CHI_Authorization'];
-                window.parent.postMessage(validation,'http://localhost:3000');
-                // window.parent.postMessage(validation,'https://masada.com.tw');
-            }
-        };
-        jQuery.ajax(obj);
-    }
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+<?php
+$now = gmdate("YmdHis");
+$data = 'M0000.' . $now;
+$sign = hash_hmac('SHA256', $data, '964C834F7BF2BB70', false);
+
+?>
+
+<script>
+    function get_Auth() {
+        var api_key = '964C834F7BF2BB70';
+        var validation = "";
+        // var corsurl = 'http://cors-anywhere.herokuapp.com/';
+        var apiurl = 'http://60.244.87.101:780//twWebAPI/GetAuth';
+        headerParam = {
+            UserId: 'M0000',
+            Pwd: 'M012290493119',
+            TimestampUTC: <?= $now ?>,
+            Sign: '<?= $sign ?>'
+        };
+        obj = {
+            type: 'get',
+            // url: `${corsurl}${apiurl}`,
+            url: `${apiurl}`,
+            dataType: 'json',
+            headers: headerParam,
+            success: function(res) {
+                validation = res.Data['CHI_Authorization'];
+                window.parent.postMessage(validation,'http://localhost:3000');
+                // window.parent.postMessage(validation,'https://masada.com.tw');
+            }
+        };
+        jQuery.ajax(obj);
+    }
 </script>
\ No newline at end of file
diff --git a/wms/rib01-business-check.php b/wms/rib01-business-check.php
index f60daff4..100354fa 100644
--- a/wms/rib01-business-check.php
+++ b/wms/rib01-business-check.php
@@ -1,281 +1,281 @@
-<?php
-include "./header.php";
-$BillNo = $_GET['BillNo'];
-$state = $_GET['state'];
-//取得表頭數據
-$date_sql = "SELECT * from rib_business WHERE (BillNo='$BillNo')";
-$query_rib = mysqli_query($link, $date_sql);
-foreach ($query_rib as $q) {
-    $rib = $q;
-}
-// 連線T8MASADA 
-
-$member = array();
-//取得人員名單與使用者的部門
-$sql_mydept =  "SELECT UserId, Username FROM capMembership";
-$deptmem = $conn->query($sql_mydept);
-foreach ($deptmem as $mem) {
-    $userid = $mem['UserId'];
-    $username = $mem['Username'];
-    $member["$userid"] = [$username];
-};
-$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
-$allpeople = $conn->query($sql_dept);
-foreach ($allpeople as $man) {
-    if ($man['PersonId'] == $user_id) {
-        $mydepart = $man['DeptId'];
-    }
-    $personid = $man['PersonId'];
-    $depart = $man['DeptId'];
-    if (isset($member["$personid"])) {
-        array_push($member["$personid"], "$depart");
-    };
-}
-//取得部門代碼
-$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
-$deptype = $conn->query($sql_department);
-
-//取得供應商
-$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
-$BizPartner = $conn->query($sql_Biz);
-$conn = null;
-
-
-?>
-<div style="width: 90%;">
-
-    <div style="padding-left: 2rem; padding-bottom: 1rem;">
-        <a href="rib01-business-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
-            <span class="glyphicon glyphicon-home"></span>
-        </a>
-    </div>
-</div>
-<div class="container" id="ribadd">
-    <div class="text-center">
-        <h3>報銷單據 (廠商)</h3>
-    </div>
-    <form class="form-horizontal" name="ribbizadd" id="ribbizadd" method="POST" action="rib01-business-edit.php?BillNo=<?= $BillNo ?>&submit=edit&state=0&<?= $token_link ?>" enctype="multipart/form-data">
-        <div class="form-group">
-            <div class="col-md-6">
-                <label for="BillNo">單據編號</label>
-                <input class="form-control" type="text" name="BillNo" id="BillNo" value="<?php echo $BillNo ?>" disabled>
-            </div>
-            <div class="col-md-6">
-                <label for="BillDate">單據日期</label>
-                <input class="form-control" type="text" name="BillDate" id="BillDate" value=<?= $rib['BillDate'] ?> disabled>
-            </div>
-
-        </div>
-        <div class="form-group">
-            <div class="col-md-6">
-                <label for="DeptId" style="color: red;">採購部門</label>
-                <select name="DeptId" id="DeptId" class="form-control" disabled>
-                    <?php
-                    foreach ($deptype as $dept) { ?>
-                        <option value="<?php echo $dept['DeptId']; ?>" <?php
-                                                                        if ($dept['DeptId'] == $rib['DeptId']) {
-                                                                            echo "selected";
-                                                                        } ?>><?php echo $dept['DeptName']; ?></option>
-                    <?php };
-                    ?>
-                </select>
-            </div>
-            <div class="col-md-6">
-                <label for="PersonId" style="color: red;">採購人員</label>
-                <select name="PersonId" id="PersonId" class="form-control" disabled>
-                    <option value="" style="display:flex" id="WriteOffoption">請選擇採購人員</option>
-                    <?php
-                    foreach ($member as $key => $value) { ?>
-                        <option value="<?php echo $key; ?>" id="<?= 'WriteOff' . $value[1] . "-" . $value[0] ?>" <?php if ($key == $rib['PersonId']) {
-                                                                                                                        echo "selected";
-                                                                                                                    } ?>> <?php echo $value[0]; ?> </option>
-                    <?php }
-                    ?>
-                </select>
-            </div>
-        </div>
-
-        <div class="form-group">
-
-            <div class="col-md-4">
-                <label for="CurrId" style="color: red;">幣別</label>
-                <select name="CurrId" id="CurrId" class="form-control" disabled>
-                    <option value="TWD" <?php if ($rib['CurrId'] == 'TWD') {
-                                            echo "selected";
-                                        } ?>>台幣</option>
-                    <option value="CNY" <?php if ($rib['CurrId'] == 'CNY') {
-                                            echo "selected";
-                                        } ?>>人民幣</option>
-                    <option value="EUR" <?php if ($rib['CurrId'] == 'EUR') {
-                                            echo "selected";
-                                        } ?>>歐元</option>
-                    <option value="HKD" <?php if ($rib['CurrId'] == 'HKD') {
-                                            echo "selected";
-                                        } ?>>港幣</option>
-                    <option value="USD" <?php if ($rib['CurrId'] == 'USD') {
-                                            echo "selected";
-                                        } ?>>美元</option>
-                </select>
-            </div>
-            <div class="col-md-4">
-                <label for="TaxId" style="color: red;">稅碼</label>
-                <select name="TaxId" class="form-control" disabled>
-                    <option value="ST005" <?php if ($rib['TaxId'] == 'ST005') {
-                                                echo "selected";
-                                            } ?>>營業稅5%</option>
-                    <option value="ST101" <?php if ($rib['TaxId'] == 'ST101') {
-                                                echo "selected";
-                                            } ?>>零稅</option>
-                    <option value="ST102" <?php if ($rib['TaxId'] == 'ST102') {
-                                                echo "selected";
-                                            } ?>>免稅</option>
-                </select>
-            </div>
-            <div class="col-md-4">
-                <label for="comSupplierId" style="color: red;">供應商</label>
-                <select name="comSupplierId" id="comSupplierId" disabled>
-                    <option value=""></option>
-                    <?php
-                    foreach ($BizPartner as $BizKey => $BizValue) { ?>
-                        <option value="<?= $BizValue['BizPartnerId'] ?>" <?php if ($rib['BizPartnerId'] == $BizValue['BizPartnerId']) {
-                                                                                echo "selected";
-                                                                            } ?>><?= $BizValue['BizPartnerId'] . $BizValue['BizPartnerName'] ?></option>
-                    <?php } ?>
-                </select>
-            </div>
-        </div>
-
-        <div class="form-group">
-
-
-        </div>
-        <hr>
-        <div class="form-group">
-            <div class="col-md-3">
-
-            </div>
-            <div class="col-md-9 ">
-                <button type="submit" class="btn btn-primary btn-lg pull-right">修改</button>
-            </div>
-        </div>
-    </form>
-</div>
-<?php
-include "./footer.php";
-
-
-$RowCode = 1;
-if (isset($pay_data)) {
-    $RowCode += mysqli_num_rows($pay_data);
-};
-//取得費用項目代碼
-$sql_feetype = "SELECT * from feetype";
-$feetype_query = mysqli_query($link, $sql_feetype);
-$feetype = mysqli_fetch_all($feetype_query, MYSQLI_ASSOC);
-?>
-
-<div style="margin: 1%;display:flex; justify-content:center;">
-
-    <div style="width: 80%;">
-        <?php
-        if ($state == 0) :
-        ?>
-            <a href="rib02-business-create.php?BillNo=<?php echo $rib['BillNo'] ?>&RowCode=<?= $RowCode ?>&CurrId=<?= $CurrId ?>&<?= $token_link ?>" class="btn btn-info btn-lg pull-right" style="margin: 1 rem;">
-                <span class=" glyphicon glyphicon-plus"></span>
-            </a>
-
-
-            <table class="table table-striped table-bordered" style="width:100%">
-                <thead>
-                    <tr>
-                        <th>發票日期</th>
-                        <th>數量</th>
-                        <th>單價</th>
-                        <th>費用項目</th>
-                        <th>原幣報銷金額</th>
-                        <th>說明</th>
-                        <th>發票號碼</th>
-                        <th style="width: 10%;">功能</th>
-
-                    </tr>
-                </thead>
-                <tbody>
-                    <?php
-                    if (isset($pay_data)) :
-                    ?>
-                        <?php foreach ($pay_data as $pay) : ?>
-                            <tr>
-                                <td><?= $pay['FeeDate'] ?></td>
-                                <td><?= round($pay['Quantity']) ?></td>
-                                <td><?= round($pay['Price']) ?></td>
-                                <td><?php foreach ($feetype as $feetyp) {
-                                        if ($feetyp['FeeTypeId'] == $pay['FeeTypeId']) {
-                                            echo $feetyp['FeeTypeName'];
-                                        }
-                                    } ?></td>
-                                <td><?= round($pay['OAmount']) ?></td>
-                                <td><?= $pay['FeeNoteShow'] ?></td>
-                                <td><?= $pay['InvoiceNo'] ?></td>
-                                <?php if ($state == 0) { ?>
-                                    <td> <a href="rib02-edit.php?id=<?php echo $pay['ribsub_id'] ?>&state=0&<?= $token_link ?>" class="btn btn-warning btn-sm">
-                                            <span class=" glyphicon glyphicon-pencil"></span>
-                                        </a>
-                                        <a href="rib02-delete.php?ribsub_id=<?php echo $pay['ribsub_id'] ?>&rib_id=<?php echo $pay['rib_id'] ?>&<?= $token_link ?>" class="btn btn-danger btn-sm">
-                                            <span class=" glyphicon glyphicon-trash"></span>
-                                        </a>
-                                    </td>
-                                <?php } elseif ($state == 1 && $user_id == "M0056") { ?>
-                                    <td><a href="rib02-edit.php?id=<?php echo $pay['ribsub_id'] ?>&state=1&<?= $token_link ?>" class="btn btn-warning btn-sm">
-                                            <span class=" glyphicon glyphicon-pencil"></span>
-                                        </a>
-                                    </td>
-
-                                <?php } else { ?>
-                                    <td> <a href="rib02-check.php?id=<?php echo $pay['ribsub_id'] ?>&<?= $token_link ?>" class="btn btn-primary btn-sm">
-                                            <span class="glyphicon glyphicon-search"></span>
-                                        </a>
-                                    </td>
-                                <?php
-                                } ?>
-                            </tr>
-                        <?php endforeach ?>
-                </tbody>
-            </table>
-    </div>
-<?php
-                    endif;
-?>
-</div>
-
-
-<?php
-        endif;
-?>
-
-
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script>
-    $(document).ready(function() {
-        $("#comSupplierId").selectize();
-    })
-    $(function() {
-        $("#DeptId").change(function() {
-            changeWriteOffId($('#DeptId').val());
-        })
-    })
-
-    function changeWriteOffId(SelectedDept) {
-        var SelectDeptId = 'WriteOff' + SelectedDept + "-";
-        for (var i = 0; i < PersonId.options.length; i++) {
-            PersonId.options[i].selected = false;
-            let thisid = PersonId.options[i].id
-            if (thisid.search(SelectDeptId) === 0) {
-                PersonId.options[i].style['display'] = '';
-            } else {
-                PersonId.options[i].style['display'] = 'none';
-            };
-
-        };
-    };
+<?php
+include "./header.php";
+$BillNo = $_GET['BillNo'];
+$state = $_GET['state'];
+//取得表頭數據
+$date_sql = "SELECT * from rib_business WHERE (BillNo='$BillNo')";
+$query_rib = mysqli_query($link, $date_sql);
+foreach ($query_rib as $q) {
+    $rib = $q;
+}
+// 連線T8MASADA 
+
+$member = array();
+//取得人員名單與使用者的部門
+$sql_mydept =  "SELECT UserId, Username FROM capMembership";
+$deptmem = $conn->query($sql_mydept);
+foreach ($deptmem as $mem) {
+    $userid = $mem['UserId'];
+    $username = $mem['Username'];
+    $member["$userid"] = [$username];
+};
+$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
+$allpeople = $conn->query($sql_dept);
+foreach ($allpeople as $man) {
+    if ($man['PersonId'] == $user_id) {
+        $mydepart = $man['DeptId'];
+    }
+    $personid = $man['PersonId'];
+    $depart = $man['DeptId'];
+    if (isset($member["$personid"])) {
+        array_push($member["$personid"], "$depart");
+    };
+}
+//取得部門代碼
+$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
+$deptype = $conn->query($sql_department);
+
+//取得供應商
+$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
+$BizPartner = $conn->query($sql_Biz);
+$conn = null;
+
+
+?>
+<div style="width: 90%;">
+
+    <div style="padding-left: 2rem; padding-bottom: 1rem;">
+        <a href="rib01-business-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
+            <span class="glyphicon glyphicon-home"></span>
+        </a>
+    </div>
+</div>
+<div class="container" id="ribadd">
+    <div class="text-center">
+        <h3>報銷單據 (廠商)</h3>
+    </div>
+    <form class="form-horizontal" name="ribbizadd" id="ribbizadd" method="POST" action="rib01-business-edit.php?BillNo=<?= $BillNo ?>&submit=edit&state=0&<?= $token_link ?>" enctype="multipart/form-data">
+        <div class="form-group">
+            <div class="col-md-6">
+                <label for="BillNo">單據編號</label>
+                <input class="form-control" type="text" name="BillNo" id="BillNo" value="<?php echo $BillNo ?>" disabled>
+            </div>
+            <div class="col-md-6">
+                <label for="BillDate">單據日期</label>
+                <input class="form-control" type="text" name="BillDate" id="BillDate" value=<?= $rib['BillDate'] ?> disabled>
+            </div>
+
+        </div>
+        <div class="form-group">
+            <div class="col-md-6">
+                <label for="DeptId" style="color: red;">採購部門</label>
+                <select name="DeptId" id="DeptId" class="form-control" disabled>
+                    <?php
+                    foreach ($deptype as $dept) { ?>
+                        <option value="<?php echo $dept['DeptId']; ?>" <?php
+                                                                        if ($dept['DeptId'] == $rib['DeptId']) {
+                                                                            echo "selected";
+                                                                        } ?>><?php echo $dept['DeptName']; ?></option>
+                    <?php };
+                    ?>
+                </select>
+            </div>
+            <div class="col-md-6">
+                <label for="PersonId" style="color: red;">採購人員</label>
+                <select name="PersonId" id="PersonId" class="form-control" disabled>
+                    <option value="" style="display:flex" id="WriteOffoption">請選擇採購人員</option>
+                    <?php
+                    foreach ($member as $key => $value) { ?>
+                        <option value="<?php echo $key; ?>" id="<?= 'WriteOff' . $value[1] . "-" . $value[0] ?>" <?php if ($key == $rib['PersonId']) {
+                                                                                                                        echo "selected";
+                                                                                                                    } ?>> <?php echo $value[0]; ?> </option>
+                    <?php }
+                    ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+
+            <div class="col-md-4">
+                <label for="CurrId" style="color: red;">幣別</label>
+                <select name="CurrId" id="CurrId" class="form-control" disabled>
+                    <option value="TWD" <?php if ($rib['CurrId'] == 'TWD') {
+                                            echo "selected";
+                                        } ?>>台幣</option>
+                    <option value="CNY" <?php if ($rib['CurrId'] == 'CNY') {
+                                            echo "selected";
+                                        } ?>>人民幣</option>
+                    <option value="EUR" <?php if ($rib['CurrId'] == 'EUR') {
+                                            echo "selected";
+                                        } ?>>歐元</option>
+                    <option value="HKD" <?php if ($rib['CurrId'] == 'HKD') {
+                                            echo "selected";
+                                        } ?>>港幣</option>
+                    <option value="USD" <?php if ($rib['CurrId'] == 'USD') {
+                                            echo "selected";
+                                        } ?>>美元</option>
+                </select>
+            </div>
+            <div class="col-md-4">
+                <label for="TaxId" style="color: red;">稅碼</label>
+                <select name="TaxId" class="form-control" disabled>
+                    <option value="ST005" <?php if ($rib['TaxId'] == 'ST005') {
+                                                echo "selected";
+                                            } ?>>營業稅5%</option>
+                    <option value="ST101" <?php if ($rib['TaxId'] == 'ST101') {
+                                                echo "selected";
+                                            } ?>>零稅</option>
+                    <option value="ST102" <?php if ($rib['TaxId'] == 'ST102') {
+                                                echo "selected";
+                                            } ?>>免稅</option>
+                </select>
+            </div>
+            <div class="col-md-4">
+                <label for="comSupplierId" style="color: red;">供應商</label>
+                <select name="comSupplierId" id="comSupplierId" disabled>
+                    <option value=""></option>
+                    <?php
+                    foreach ($BizPartner as $BizKey => $BizValue) { ?>
+                        <option value="<?= $BizValue['BizPartnerId'] ?>" <?php if ($rib['BizPartnerId'] == $BizValue['BizPartnerId']) {
+                                                                                echo "selected";
+                                                                            } ?>><?= $BizValue['BizPartnerId'] . $BizValue['BizPartnerName'] ?></option>
+                    <?php } ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+
+
+        </div>
+        <hr>
+        <div class="form-group">
+            <div class="col-md-3">
+
+            </div>
+            <div class="col-md-9 ">
+                <button type="submit" class="btn btn-primary btn-lg pull-right">修改</button>
+            </div>
+        </div>
+    </form>
+</div>
+<?php
+include "./footer.php";
+
+
+$RowCode = 1;
+if (isset($pay_data)) {
+    $RowCode += mysqli_num_rows($pay_data);
+};
+//取得費用項目代碼
+$sql_feetype = "SELECT * from feetype";
+$feetype_query = mysqli_query($link, $sql_feetype);
+$feetype = mysqli_fetch_all($feetype_query, MYSQLI_ASSOC);
+?>
+
+<div style="margin: 1%;display:flex; justify-content:center;">
+
+    <div style="width: 80%;">
+        <?php
+        if ($state == 0) :
+        ?>
+            <a href="rib02-business-create.php?BillNo=<?php echo $rib['BillNo'] ?>&RowCode=<?= $RowCode ?>&CurrId=<?= $CurrId ?>&<?= $token_link ?>" class="btn btn-info btn-lg pull-right" style="margin: 1 rem;">
+                <span class=" glyphicon glyphicon-plus"></span>
+            </a>
+
+
+            <table class="table table-striped table-bordered" style="width:100%">
+                <thead>
+                    <tr>
+                        <th>發票日期</th>
+                        <th>數量</th>
+                        <th>單價</th>
+                        <th>費用項目</th>
+                        <th>原幣報銷金額</th>
+                        <th>說明</th>
+                        <th>發票號碼</th>
+                        <th style="width: 10%;">功能</th>
+
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php
+                    if (isset($pay_data)) :
+                    ?>
+                        <?php foreach ($pay_data as $pay) : ?>
+                            <tr>
+                                <td><?= $pay['FeeDate'] ?></td>
+                                <td><?= round($pay['Quantity']) ?></td>
+                                <td><?= round($pay['Price']) ?></td>
+                                <td><?php foreach ($feetype as $feetyp) {
+                                        if ($feetyp['FeeTypeId'] == $pay['FeeTypeId']) {
+                                            echo $feetyp['FeeTypeName'];
+                                        }
+                                    } ?></td>
+                                <td><?= round($pay['OAmount']) ?></td>
+                                <td><?= $pay['FeeNoteShow'] ?></td>
+                                <td><?= $pay['InvoiceNo'] ?></td>
+                                <?php if ($state == 0) { ?>
+                                    <td> <a href="rib02-edit.php?id=<?php echo $pay['ribsub_id'] ?>&state=0&<?= $token_link ?>" class="btn btn-warning btn-sm">
+                                            <span class=" glyphicon glyphicon-pencil"></span>
+                                        </a>
+                                        <a href="rib02-delete.php?ribsub_id=<?php echo $pay['ribsub_id'] ?>&rib_id=<?php echo $pay['rib_id'] ?>&<?= $token_link ?>" class="btn btn-danger btn-sm">
+                                            <span class=" glyphicon glyphicon-trash"></span>
+                                        </a>
+                                    </td>
+                                <?php } elseif ($state == 1 && $user_id == "M0056") { ?>
+                                    <td><a href="rib02-edit.php?id=<?php echo $pay['ribsub_id'] ?>&state=1&<?= $token_link ?>" class="btn btn-warning btn-sm">
+                                            <span class=" glyphicon glyphicon-pencil"></span>
+                                        </a>
+                                    </td>
+
+                                <?php } else { ?>
+                                    <td> <a href="rib02-check.php?id=<?php echo $pay['ribsub_id'] ?>&<?= $token_link ?>" class="btn btn-primary btn-sm">
+                                            <span class="glyphicon glyphicon-search"></span>
+                                        </a>
+                                    </td>
+                                <?php
+                                } ?>
+                            </tr>
+                        <?php endforeach ?>
+                </tbody>
+            </table>
+    </div>
+<?php
+                    endif;
+?>
+</div>
+
+
+<?php
+        endif;
+?>
+
+
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script>
+    $(document).ready(function() {
+        $("#comSupplierId").selectize();
+    })
+    $(function() {
+        $("#DeptId").change(function() {
+            changeWriteOffId($('#DeptId').val());
+        })
+    })
+
+    function changeWriteOffId(SelectedDept) {
+        var SelectDeptId = 'WriteOff' + SelectedDept + "-";
+        for (var i = 0; i < PersonId.options.length; i++) {
+            PersonId.options[i].selected = false;
+            let thisid = PersonId.options[i].id
+            if (thisid.search(SelectDeptId) === 0) {
+                PersonId.options[i].style['display'] = '';
+            } else {
+                PersonId.options[i].style['display'] = 'none';
+            };
+
+        };
+    };
 </script>
\ No newline at end of file
diff --git a/wms/rib01-business-create.php b/wms/rib01-business-create.php
index 04daf132..0ef1c737 100644
--- a/wms/rib01-business-create.php
+++ b/wms/rib01-business-create.php
@@ -1,220 +1,220 @@
-<?php
-include "./header.php";
-// 產生mysql單據編號
-$MaxBillNo = 0;
-$curreny_date = date('ym');
-$query_rib = array();
-$sqlname = "B" . $user_id;
-$sqlname .= $curreny_date;
-$date_sql = "SELECT BillNo from rib_business WHERE (BillNo LIKE '$sqlname%')";
-$query_rib = mysqli_query($link, $date_sql);
-$myNo = mysqli_fetch_all($query_rib);
-foreach ($myNo as $thisMyNo) {
-    $thisMyNo = (int)substr($thisMyNo[0], -2);
-    if ($thisMyNo > $MaxBillNo) {
-        $MaxBillNo = $thisMyNo;
-    }
-}
-$BillNo = $sqlname;
-// 連線T8MASADA 
-
-$member = array();
-//取得人員名單與使用者的部門
-$sql_mydept =  "SELECT UserId, Username FROM capMembership";
-$deptmem = $conn->query($sql_mydept);
-foreach ($deptmem as $mem) {
-    $userid = $mem['UserId'];
-    $username = $mem['Username'];
-    $member["$userid"] = [$username];
-};
-$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
-$allpeople = $conn->query($sql_dept);
-foreach ($allpeople as $man) {
-    if ($man['PersonId'] == $user_id) {
-        $mydepart = $man['DeptId'];
-    }
-    $personid = $man['PersonId'];
-    $depart = $man['DeptId'];
-    if (isset($member["$personid"])) {
-        array_push($member["$personid"], "$depart");
-    };
-}
-//取得部門代碼
-$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
-$deptype = $conn->query($sql_department);
-
-//取得供應商
-$BusinessPartner = array();
-$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
-$BizPartner = $conn->query($sql_Biz);
-$bizcount = 0;
-foreach ($BizPartner as $biz) {
-    $bizKey = $biz['BizPartnerId'];
-    $bizValue = $biz['BizPartnerName'];
-    array_push($BusinessPartner, $bizKey);
-    $bizcount += 1;
-}
-$BizJSON = json_encode($BusinessPartner);
-
-$MaxBillNo += 1;
-if ($MaxBillNo < 10) {
-    $BillNo .= "0" . strval($MaxBillNo);
-} else {
-    $BillNo .= strval($MaxBillNo);
-}
-?>
-<div style="width: 90%;">
-
-    <div style="padding-left: 2rem; padding-bottom: 1rem;">
-        <a href="rib01-business-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
-            <span class="glyphicon glyphicon-home"></span>
-        </a>
-    </div>
-</div>
-<div class="container" id="ribadd">
-    <div class="text-center">
-        <h3>報銷單據 (廠商)</h3>
-    </div>
-    <form class="form-horizontal" name="ribbizadd" id="ribbizadd" method="POST" action="rib01-business-submit.php?submit=add&state=0&<?= $token_link ?>" enctype="multipart/form-data">
-        <div class="form-group">
-            <div class="col-md-6">
-                <label for="BillNo">單據編號</label>
-                <input class="form-control" type="text" name="BillNo" id="BillNo" value="<?php echo $BillNo ?>" disabled>
-            </div>
-            <div class="col-md-6">
-                <label for="BillDate">單據日期</label>
-                <input class="form-control" type="text" name="BillDate" id="BillDate" value=<?= date('Ymd') ?> disabled>
-            </div>
-
-        </div>
-        <div class="form-group">
-            <div class="col-md-6">
-                <label for="DeptId" style="color: red;">採購部門</label>
-                <select name="DeptId" id="DeptId" class="form-control" required>
-                    <?php
-                    foreach ($deptype as $dept) { ?>
-                        <option value="<?php echo $dept['DeptId']; ?>" <?php
-                                                                        if ($dept['DeptId'] == $mydepart) {
-                                                                            echo "selected";
-                                                                        } ?>><?php echo $dept['DeptName']; ?></option>
-                    <?php };
-                    ?>
-                </select>
-            </div>
-            <div class="col-md-6">
-                <label for="PersonId" style="color: red;">採購人員</label>
-                <select name="PersonId" id="PersonId" class="form-control" required>
-                    <option value="" style="display:flex" id="WriteOffoption">請選擇採購人員</option>
-                    <?php
-                    foreach ($member as $key => $value) { ?>
-                        <option value="<?php echo $key; ?>" id="<?= 'WriteOff' . $value[1] . "-" . $value[0] ?>" <?php if ($key == $user_id) {
-                                                                                                                        echo "selected";
-                                                                                                                    } ?>> <?php echo $value[0]; ?> </option>
-                    <?php }
-                    ?>
-                </select>
-            </div>
-        </div>
-
-        <div class="form-group">
-
-            <div class="col-md-4">
-                <label for="CurrId" style="color: red;">幣別</label>
-                <select name="CurrId" id="CurrId" class="form-control">
-                    <option value="TWD" selected>台幣</option>
-                    <option value="CNY">人民幣</option>
-                    <option value="EUR">歐元</option>
-                    <option value="HKD">港幣</option>
-                    <option value="USD">美元</option>
-                </select>
-            </div>
-            <div class="col-md-4">
-                <label for="TaxId" style="color: red;">稅碼</label>
-                <select name="TaxId" class="form-control" required>
-                    <option value="ST005" selected>營業稅5%</option>
-                    <option value="ST101">零稅</option>
-                    <option value="ST102">免稅</option>
-                </select>
-            </div>
-            <div class="col-md-4">
-                <label for="BizPartnerId" style="color: red;">供應商統一編號</label>
-                <input id="BizPartnerId" name="BizPartnerId" class="form-control" onblur="checkBiz()">
-            </div>
-        </div>
-        <div class="form-group">
-
-
-        </div>
-        <hr>
-        <div class="form-group">
-            <div class="col-md-3">
-
-            </div>
-            <div class="col-md-9 ">
-                <button type="button" onclick="send()" class="btn btn-primary btn-lg pull-right">下一步</button>
-            </div>
-        </div>
-    </form>
-</div>
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script>
-    var bizok = 0;
-    $(document).ready(function() {
-        $("#comSupplierId").selectize();
-    })
-    $(function() {
-        $("#DeptId").change(function() {
-            changeWriteOffId($('#DeptId').val());
-        })
-    })
-
-    function checkBiz() {
-        var biz = $("#BizPartnerId").val();
-        if (biz.length != 8) {
-            bizok = 0;
-            alert("統一編號格式錯誤");
-        } else {
-            var BizArray = <?php echo $BizJSON; ?>;
-            var answer = 0;
-            for (var partner = 0; partner < <?= $bizcount ?>; partner++) {
-                var value = BizArray[partner];
-                if (biz == value) {
-                    answer += 1
-                }
-            }
-            if (answer == 1) {
-                bizok = 1;
-                alert("供應商認證成功")
-            } else {
-                bizok = 0;
-                alert("無此供應商，請聯絡採購人員建立供應商")
-            }
-        }
-    }
-
-    function changeWriteOffId(SelectedDept) {
-        var SelectDeptId = 'WriteOff' + SelectedDept + "-";
-        for (var i = 0; i < PersonId.options.length; i++) {
-            PersonId.options[i].selected = false;
-            let thisid = PersonId.options[i].id
-            if (thisid.search(SelectDeptId) === 0) {
-                PersonId.options[i].style['display'] = '';
-            } else {
-                PersonId.options[i].style['display'] = 'none';
-            };
-
-        };
-    };
-
-    function send() {
-        if (bizok != 1) {
-            alert("請輸入供應商");
-            return;
-        } else {
-            $("#BillNo").prop("disabled", false);
-            $("#BillDate").prop("disabled", false);
-            $('#ribbizadd').submit();
-        }
-    }
+<?php
+include "./header.php";
+// 產生mysql單據編號
+$MaxBillNo = 0;
+$curreny_date = date('ym');
+$query_rib = array();
+$sqlname = "B" . $user_id;
+$sqlname .= $curreny_date;
+$date_sql = "SELECT BillNo from rib_business WHERE (BillNo LIKE '$sqlname%')";
+$query_rib = mysqli_query($link, $date_sql);
+$myNo = mysqli_fetch_all($query_rib);
+foreach ($myNo as $thisMyNo) {
+    $thisMyNo = (int)substr($thisMyNo[0], -2);
+    if ($thisMyNo > $MaxBillNo) {
+        $MaxBillNo = $thisMyNo;
+    }
+}
+$BillNo = $sqlname;
+// 連線T8MASADA 
+
+$member = array();
+//取得人員名單與使用者的部門
+$sql_mydept =  "SELECT UserId, Username FROM capMembership";
+$deptmem = $conn->query($sql_mydept);
+foreach ($deptmem as $mem) {
+    $userid = $mem['UserId'];
+    $username = $mem['Username'];
+    $member["$userid"] = [$username];
+};
+$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
+$allpeople = $conn->query($sql_dept);
+foreach ($allpeople as $man) {
+    if ($man['PersonId'] == $user_id) {
+        $mydepart = $man['DeptId'];
+    }
+    $personid = $man['PersonId'];
+    $depart = $man['DeptId'];
+    if (isset($member["$personid"])) {
+        array_push($member["$personid"], "$depart");
+    };
+}
+//取得部門代碼
+$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
+$deptype = $conn->query($sql_department);
+
+//取得供應商
+$BusinessPartner = array();
+$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
+$BizPartner = $conn->query($sql_Biz);
+$bizcount = 0;
+foreach ($BizPartner as $biz) {
+    $bizKey = $biz['BizPartnerId'];
+    $bizValue = $biz['BizPartnerName'];
+    array_push($BusinessPartner, $bizKey);
+    $bizcount += 1;
+}
+$BizJSON = json_encode($BusinessPartner);
+
+$MaxBillNo += 1;
+if ($MaxBillNo < 10) {
+    $BillNo .= "0" . strval($MaxBillNo);
+} else {
+    $BillNo .= strval($MaxBillNo);
+}
+?>
+<div style="width: 90%;">
+
+    <div style="padding-left: 2rem; padding-bottom: 1rem;">
+        <a href="rib01-business-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
+            <span class="glyphicon glyphicon-home"></span>
+        </a>
+    </div>
+</div>
+<div class="container" id="ribadd">
+    <div class="text-center">
+        <h3>報銷單據 (廠商)</h3>
+    </div>
+    <form class="form-horizontal" name="ribbizadd" id="ribbizadd" method="POST" action="rib01-business-submit.php?submit=add&state=0&<?= $token_link ?>" enctype="multipart/form-data">
+        <div class="form-group">
+            <div class="col-md-6">
+                <label for="BillNo">單據編號</label>
+                <input class="form-control" type="text" name="BillNo" id="BillNo" value="<?php echo $BillNo ?>" disabled>
+            </div>
+            <div class="col-md-6">
+                <label for="BillDate">單據日期</label>
+                <input class="form-control" type="text" name="BillDate" id="BillDate" value=<?= date('Ymd') ?> disabled>
+            </div>
+
+        </div>
+        <div class="form-group">
+            <div class="col-md-6">
+                <label for="DeptId" style="color: red;">採購部門</label>
+                <select name="DeptId" id="DeptId" class="form-control" required>
+                    <?php
+                    foreach ($deptype as $dept) { ?>
+                        <option value="<?php echo $dept['DeptId']; ?>" <?php
+                                                                        if ($dept['DeptId'] == $mydepart) {
+                                                                            echo "selected";
+                                                                        } ?>><?php echo $dept['DeptName']; ?></option>
+                    <?php };
+                    ?>
+                </select>
+            </div>
+            <div class="col-md-6">
+                <label for="PersonId" style="color: red;">採購人員</label>
+                <select name="PersonId" id="PersonId" class="form-control" required>
+                    <option value="" style="display:flex" id="WriteOffoption">請選擇採購人員</option>
+                    <?php
+                    foreach ($member as $key => $value) { ?>
+                        <option value="<?php echo $key; ?>" id="<?= 'WriteOff' . $value[1] . "-" . $value[0] ?>" <?php if ($key == $user_id) {
+                                                                                                                        echo "selected";
+                                                                                                                    } ?>> <?php echo $value[0]; ?> </option>
+                    <?php }
+                    ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+
+            <div class="col-md-4">
+                <label for="CurrId" style="color: red;">幣別</label>
+                <select name="CurrId" id="CurrId" class="form-control">
+                    <option value="TWD" selected>台幣</option>
+                    <option value="CNY">人民幣</option>
+                    <option value="EUR">歐元</option>
+                    <option value="HKD">港幣</option>
+                    <option value="USD">美元</option>
+                </select>
+            </div>
+            <div class="col-md-4">
+                <label for="TaxId" style="color: red;">稅碼</label>
+                <select name="TaxId" class="form-control" required>
+                    <option value="ST005" selected>營業稅5%</option>
+                    <option value="ST101">零稅</option>
+                    <option value="ST102">免稅</option>
+                </select>
+            </div>
+            <div class="col-md-4">
+                <label for="BizPartnerId" style="color: red;">供應商統一編號</label>
+                <input id="BizPartnerId" name="BizPartnerId" class="form-control" onblur="checkBiz()">
+            </div>
+        </div>
+        <div class="form-group">
+
+
+        </div>
+        <hr>
+        <div class="form-group">
+            <div class="col-md-3">
+
+            </div>
+            <div class="col-md-9 ">
+                <button type="button" onclick="send()" class="btn btn-primary btn-lg pull-right">下一步</button>
+            </div>
+        </div>
+    </form>
+</div>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script>
+    var bizok = 0;
+    $(document).ready(function() {
+        $("#comSupplierId").selectize();
+    })
+    $(function() {
+        $("#DeptId").change(function() {
+            changeWriteOffId($('#DeptId').val());
+        })
+    })
+
+    function checkBiz() {
+        var biz = $("#BizPartnerId").val();
+        if (biz.length != 8) {
+            bizok = 0;
+            alert("統一編號格式錯誤");
+        } else {
+            var BizArray = <?php echo $BizJSON; ?>;
+            var answer = 0;
+            for (var partner = 0; partner < <?= $bizcount ?>; partner++) {
+                var value = BizArray[partner];
+                if (biz == value) {
+                    answer += 1
+                }
+            }
+            if (answer == 1) {
+                bizok = 1;
+                alert("供應商認證成功")
+            } else {
+                bizok = 0;
+                alert("無此供應商，請聯絡採購人員建立供應商")
+            }
+        }
+    }
+
+    function changeWriteOffId(SelectedDept) {
+        var SelectDeptId = 'WriteOff' + SelectedDept + "-";
+        for (var i = 0; i < PersonId.options.length; i++) {
+            PersonId.options[i].selected = false;
+            let thisid = PersonId.options[i].id
+            if (thisid.search(SelectDeptId) === 0) {
+                PersonId.options[i].style['display'] = '';
+            } else {
+                PersonId.options[i].style['display'] = 'none';
+            };
+
+        };
+    };
+
+    function send() {
+        if (bizok != 1) {
+            alert("請輸入供應商");
+            return;
+        } else {
+            $("#BillNo").prop("disabled", false);
+            $("#BillDate").prop("disabled", false);
+            $('#ribbizadd').submit();
+        }
+    }
 </script>
\ No newline at end of file
diff --git a/wms/rib01-business-edit.php b/wms/rib01-business-edit.php
index c9e867c3..85f2cdfa 100644
--- a/wms/rib01-business-edit.php
+++ b/wms/rib01-business-edit.php
@@ -1,181 +1,181 @@
-<?php
-include "./header.php";
-$BillNo = $_GET['BillNo'];
-$state = $_GET['state'];
-//取得表頭數據
-$date_sql = "SELECT * from rib_business WHERE (BillNo='$BillNo')";
-$query_rib = mysqli_query($link, $date_sql);
-foreach ($query_rib as $q) {
-    $rib = $q;
-}
-// 連線T8MASADA 
-
-$member = array();
-//取得人員名單與使用者的部門
-$sql_mydept =  "SELECT UserId, Username FROM capMembership";
-$deptmem = $conn->query($sql_mydept);
-foreach ($deptmem as $mem) {
-    $userid = $mem['UserId'];
-    $username = $mem['Username'];
-    $member["$userid"] = [$username];
-};
-$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
-$allpeople = $conn->query($sql_dept);
-foreach ($allpeople as $man) {
-    if ($man['PersonId'] == $user_id) {
-        $mydepart = $man['DeptId'];
-    }
-    $personid = $man['PersonId'];
-    $depart = $man['DeptId'];
-    if (isset($member["$personid"])) {
-        array_push($member["$personid"], "$depart");
-    };
-}
-//取得部門代碼
-$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
-$deptype = $conn->query($sql_department);
-
-//取得供應商
-$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
-$BizPartner = $conn->query($sql_Biz);
-$conn = null;
-
-
-?>
-<div style="width: 90%;">
-
-    <div style="padding-left: 2rem; padding-bottom: 1rem;">
-        <a href="rib01-business-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
-            <span class="glyphicon glyphicon-home"></span>
-        </a>
-    </div>
-</div>
-<div class="container" id="ribadd">
-    <div class="text-center">
-        <h3>報銷單據 (廠商)</h3>
-    </div>
-    <form class="form-horizontal" name="ribbizadd" id="ribbizadd" method="POST" action="rib01-business-edit.php?submit=edit&state=0&<?= $token_link ?>" enctype="multipart/form-data">
-        <div class="form-group">
-            <div class="col-md-6">
-                <label for="BillNo">單據編號</label>
-                <input class="form-control" type="text" name="BillNo" id="BillNo" value="<?php echo $BillNo ?>" disabled>
-            </div>
-            <div class="col-md-6">
-                <label for="BillDate">單據日期</label>
-                <input class="form-control" type="text" name="BillDate" id="BillDate" value=<?= $rib['BillDate'] ?> disabled>
-            </div>
-
-        </div>
-        <div class="form-group">
-            <div class="col-md-6">
-                <label for="DeptId" style="color: red;">採購部門</label>
-                <select name="DeptId" id="DeptId" class="form-control">
-                    <?php
-                    foreach ($deptype as $dept) { ?>
-                        <option value="<?php echo $dept['DeptId']; ?>" <?php
-                                                                        if ($dept['DeptId'] == $rib['DeptId']) {
-                                                                            echo "selected";
-                                                                        } ?>><?php echo $dept['DeptName']; ?></option>
-                    <?php };
-                    ?>
-                </select>
-            </div>
-            <div class="col-md-6">
-                <label for="PersonId" style="color: red;">採購人員</label>
-                <select name="PersonId" id="PersonId" class="form-control">
-                    <option value="" style="display:flex" id="WriteOffoption">請選擇採購人員</option>
-                    <?php
-                    foreach ($member as $key => $value) { ?>
-                        <option value="<?php echo $key; ?>" id="<?= 'WriteOff' . $value[1] . "-" . $value[0] ?>" <?php if ($key == $rib['PersonId']) {
-                                                                                                                        echo "selected";
-                                                                                                                    } ?>> <?php echo $value[0]; ?> </option>
-                    <?php }
-                    ?>
-                </select>
-            </div>
-        </div>
-
-        <div class="form-group">
-
-            <div class="col-md-4">
-                <label for="CurrId" style="color: red;">幣別</label>
-                <select name="CurrId" id="CurrId" class="form-control">
-                    <option value="TWD" <?php if ($rib['CurrId'] == 'TWD') {
-                                            echo "selected";
-                                        } ?>>台幣</option>
-                    <option value="CNY" <?php if ($rib['CurrId'] == 'CNY') {
-                                            echo "selected";
-                                        } ?>>人民幣</option>
-                    <option value="EUR" <?php if ($rib['CurrId'] == 'EUR') {
-                                            echo "selected";
-                                        } ?>>歐元</option>
-                    <option value="HKD" <?php if ($rib['CurrId'] == 'HKD') {
-                                            echo "selected";
-                                        } ?>>港幣</option>
-                    <option value="USD" <?php if ($rib['CurrId'] == 'USD') {
-                                            echo "selected";
-                                        } ?>>美元</option>
-                </select>
-            </div>
-            <div class="col-md-4">
-                <label for="TaxId" style="color: red;">稅碼</label>
-                <select name="TaxId" class="form-control">
-                    <option value="ST005" <?php if ($rib['TaxId'] == 'ST005') {
-                                                echo "selected";
-                                            } ?>>營業稅5%</option>
-                    <option value="ST101" <?php if ($rib['TaxId'] == 'ST101') {
-                                                echo "selected";
-                                            } ?>>零稅</option>
-                    <option value="ST102" <?php if ($rib['TaxId'] == 'ST102') {
-                                                echo "selected";
-                                            } ?>>免稅</option>
-                </select>
-            </div>
-            <div class="col-md-4">
-                <label for="BizPartnerId" style="color: red;">供應商統一編號</label>
-                <input id="BizPartnerId" name="BizPartnerId" class="form-control" onblur="checkBiz()" value="<?= $rib['BizPartnerId'] ?>">
-            </div>
-        </div>
-
-        <div class="form-group">
-
-
-        </div>
-        <hr>
-        <div class="form-group">
-            <div class="col-md-3">
-
-            </div>
-            <div class="col-md-9 ">
-                <button type="submit" class="btn btn-primary btn-lg pull-right">修改</button>
-            </div>
-        </div>
-    </form>
-</div>
-
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script>
-    $(document).ready(function() {
-        $("#comSupplierId").selectize();
-    })
-    $(function() {
-        $("#DeptId").change(function() {
-            changeWriteOffId($('#DeptId').val());
-        })
-    })
-
-    function changeWriteOffId(SelectedDept) {
-        var SelectDeptId = 'WriteOff' + SelectedDept + "-";
-        for (var i = 0; i < PersonId.options.length; i++) {
-            PersonId.options[i].selected = false;
-            let thisid = PersonId.options[i].id
-            if (thisid.search(SelectDeptId) === 0) {
-                PersonId.options[i].style['display'] = '';
-            } else {
-                PersonId.options[i].style['display'] = 'none';
-            };
-
-        };
-    };
+<?php
+include "./header.php";
+$BillNo = $_GET['BillNo'];
+$state = $_GET['state'];
+//取得表頭數據
+$date_sql = "SELECT * from rib_business WHERE (BillNo='$BillNo')";
+$query_rib = mysqli_query($link, $date_sql);
+foreach ($query_rib as $q) {
+    $rib = $q;
+}
+// 連線T8MASADA 
+
+$member = array();
+//取得人員名單與使用者的部門
+$sql_mydept =  "SELECT UserId, Username FROM capMembership";
+$deptmem = $conn->query($sql_mydept);
+foreach ($deptmem as $mem) {
+    $userid = $mem['UserId'];
+    $username = $mem['Username'];
+    $member["$userid"] = [$username];
+};
+$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
+$allpeople = $conn->query($sql_dept);
+foreach ($allpeople as $man) {
+    if ($man['PersonId'] == $user_id) {
+        $mydepart = $man['DeptId'];
+    }
+    $personid = $man['PersonId'];
+    $depart = $man['DeptId'];
+    if (isset($member["$personid"])) {
+        array_push($member["$personid"], "$depart");
+    };
+}
+//取得部門代碼
+$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
+$deptype = $conn->query($sql_department);
+
+//取得供應商
+$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
+$BizPartner = $conn->query($sql_Biz);
+$conn = null;
+
+
+?>
+<div style="width: 90%;">
+
+    <div style="padding-left: 2rem; padding-bottom: 1rem;">
+        <a href="rib01-business-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
+            <span class="glyphicon glyphicon-home"></span>
+        </a>
+    </div>
+</div>
+<div class="container" id="ribadd">
+    <div class="text-center">
+        <h3>報銷單據 (廠商)</h3>
+    </div>
+    <form class="form-horizontal" name="ribbizadd" id="ribbizadd" method="POST" action="rib01-business-edit.php?submit=edit&state=0&<?= $token_link ?>" enctype="multipart/form-data">
+        <div class="form-group">
+            <div class="col-md-6">
+                <label for="BillNo">單據編號</label>
+                <input class="form-control" type="text" name="BillNo" id="BillNo" value="<?php echo $BillNo ?>" disabled>
+            </div>
+            <div class="col-md-6">
+                <label for="BillDate">單據日期</label>
+                <input class="form-control" type="text" name="BillDate" id="BillDate" value=<?= $rib['BillDate'] ?> disabled>
+            </div>
+
+        </div>
+        <div class="form-group">
+            <div class="col-md-6">
+                <label for="DeptId" style="color: red;">採購部門</label>
+                <select name="DeptId" id="DeptId" class="form-control">
+                    <?php
+                    foreach ($deptype as $dept) { ?>
+                        <option value="<?php echo $dept['DeptId']; ?>" <?php
+                                                                        if ($dept['DeptId'] == $rib['DeptId']) {
+                                                                            echo "selected";
+                                                                        } ?>><?php echo $dept['DeptName']; ?></option>
+                    <?php };
+                    ?>
+                </select>
+            </div>
+            <div class="col-md-6">
+                <label for="PersonId" style="color: red;">採購人員</label>
+                <select name="PersonId" id="PersonId" class="form-control">
+                    <option value="" style="display:flex" id="WriteOffoption">請選擇採購人員</option>
+                    <?php
+                    foreach ($member as $key => $value) { ?>
+                        <option value="<?php echo $key; ?>" id="<?= 'WriteOff' . $value[1] . "-" . $value[0] ?>" <?php if ($key == $rib['PersonId']) {
+                                                                                                                        echo "selected";
+                                                                                                                    } ?>> <?php echo $value[0]; ?> </option>
+                    <?php }
+                    ?>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+
+            <div class="col-md-4">
+                <label for="CurrId" style="color: red;">幣別</label>
+                <select name="CurrId" id="CurrId" class="form-control">
+                    <option value="TWD" <?php if ($rib['CurrId'] == 'TWD') {
+                                            echo "selected";
+                                        } ?>>台幣</option>
+                    <option value="CNY" <?php if ($rib['CurrId'] == 'CNY') {
+                                            echo "selected";
+                                        } ?>>人民幣</option>
+                    <option value="EUR" <?php if ($rib['CurrId'] == 'EUR') {
+                                            echo "selected";
+                                        } ?>>歐元</option>
+                    <option value="HKD" <?php if ($rib['CurrId'] == 'HKD') {
+                                            echo "selected";
+                                        } ?>>港幣</option>
+                    <option value="USD" <?php if ($rib['CurrId'] == 'USD') {
+                                            echo "selected";
+                                        } ?>>美元</option>
+                </select>
+            </div>
+            <div class="col-md-4">
+                <label for="TaxId" style="color: red;">稅碼</label>
+                <select name="TaxId" class="form-control">
+                    <option value="ST005" <?php if ($rib['TaxId'] == 'ST005') {
+                                                echo "selected";
+                                            } ?>>營業稅5%</option>
+                    <option value="ST101" <?php if ($rib['TaxId'] == 'ST101') {
+                                                echo "selected";
+                                            } ?>>零稅</option>
+                    <option value="ST102" <?php if ($rib['TaxId'] == 'ST102') {
+                                                echo "selected";
+                                            } ?>>免稅</option>
+                </select>
+            </div>
+            <div class="col-md-4">
+                <label for="BizPartnerId" style="color: red;">供應商統一編號</label>
+                <input id="BizPartnerId" name="BizPartnerId" class="form-control" onblur="checkBiz()" value="<?= $rib['BizPartnerId'] ?>">
+            </div>
+        </div>
+
+        <div class="form-group">
+
+
+        </div>
+        <hr>
+        <div class="form-group">
+            <div class="col-md-3">
+
+            </div>
+            <div class="col-md-9 ">
+                <button type="submit" class="btn btn-primary btn-lg pull-right">修改</button>
+            </div>
+        </div>
+    </form>
+</div>
+
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script>
+    $(document).ready(function() {
+        $("#comSupplierId").selectize();
+    })
+    $(function() {
+        $("#DeptId").change(function() {
+            changeWriteOffId($('#DeptId').val());
+        })
+    })
+
+    function changeWriteOffId(SelectedDept) {
+        var SelectDeptId = 'WriteOff' + SelectedDept + "-";
+        for (var i = 0; i < PersonId.options.length; i++) {
+            PersonId.options[i].selected = false;
+            let thisid = PersonId.options[i].id
+            if (thisid.search(SelectDeptId) === 0) {
+                PersonId.options[i].style['display'] = '';
+            } else {
+                PersonId.options[i].style['display'] = 'none';
+            };
+
+        };
+    };
 </script>
\ No newline at end of file
diff --git a/wms/rib01-business-index.php b/wms/rib01-business-index.php
index 98242024..bb54b965 100644
--- a/wms/rib01-business-index.php
+++ b/wms/rib01-business-index.php
@@ -1,242 +1,242 @@
-<?php
-ini_set('display_errors', 'on');
-include "./header.php";
-
-// 設置一個空陣列來放資料
-$data = array();
-// sql語法存在變數中
-$sql = "select * from rib_business ";
-
-// 是否為會計 阿娥 
-if ($user_id == 'M0056') {
-    $sql .= "WHERE ((CurrentState =1) or (CreatorId= '$user_id')or (PersonId= '$user_id'))";
-    $data = mysqli_query($link, $sql);
-} else {
-
-    // 找下屬
-    $follower = [];
-    $follower = find_follow('$user_id');
-
-    if (count($follower) > 0) {
-        echo "有下屬";
-        $column_str = "('$user_id'" . ",'";
-        $column_str .= implode("','", $follower);
-        $column_str .= "')";
-        $sql .= "WHERE ((PersonId in $column_str) or (CreatorId in $column_str))";
-    } else {
-        $sql .= "WHERE ((PersonId= '$user_id') or (CreatorId= '$user_id'))";
-    };
-    $data = mysqli_query($link, $sql);
-}
-$DeptName = array();
-// 連線T8MASADA 
-
-$member = array();
-//取得人員名單與使用者的部門
-$sql_mydept =  "SELECT UserId, Username FROM capMembership";
-$deptmem = $conn->query($sql_mydept);
-foreach ($deptmem as $mem) {
-    $userid = $mem['UserId'];
-    $username = $mem['Username'];
-    $member["$userid"] = [$username];
-};
-$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
-$allpeople = $conn->query($sql_dept);
-foreach ($allpeople as $man) {
-    if ($man['PersonId'] == $user_id) {
-        $mydepart = $man['DeptId'];
-    }
-    $personid = $man['PersonId'];
-    $depart = $man['DeptId'];
-    if (isset($member["$personid"])) {
-        array_push($member["$personid"], "$depart");
-    };
-}
-
-//取得部門代碼
-$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
-$deptype = $conn->query($sql_department);
-foreach ($deptype as $dept) {
-    $deptid = $dept['DeptId'];
-    $deptname = $dept['DeptName'];
-    $DeptName[$deptid] = $deptname;
-}
-//取得供應商
-$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
-$BizPartner = $conn->query($sql_Biz);
-foreach ($BizPartner as $partner) {
-    $partnerid = $partner['BizPartnerId'];
-    $partnername = $partner['BizPartnerName'];
-    $Supplier[$partnerid] = $partnername;
-}
-
-?>
-<!-- 
-新增單據 -->
-<p>
-    <a href="rib01-business-create.php?<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-        <span class="glyphicon glyphicon-plus"></span>
-    </a>
-</p>
-
-<?php
-if ($data) :
-?>
-
-    <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;
-
-        }
-    </style>
-    <div style="width:98% ;margin: 1%">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-            <thead>
-                <tr>
-                    <th>單據編號</th>
-                    <th>單據日期</th>
-                    <th>供應商</th>
-                    <th>報銷人</th>
-                    <th>報銷部門</th>
-                    <th>幣別</th>
-                    <th>報銷金額</th>
-                    <th style="width: 8%;">狀態</th>
-                    <th style="width: 7%;">功能</th>
-                </tr>
-            </thead>
-            <tbody>
-
-                <?php foreach ($data as $data) : ?>
-                    <tr>
-                        <td><?php echo $data['BillNo']; ?></td>
-                        <td><?php echo substr($data['BillDate'], 0, 10); ?></td>
-                        <td><?php $supp = $data['BizPartnerId'];
-                            echo $Supplier[$supp]; ?></td>
-                        <td><?php echo accountidToName($data['PersonId']); ?></td>
-                        <td><?php $depid = $data['DeptId'];
-                            echo $DeptName[$depid] ?></td>
-                        <td><?php if ($data['CurrId'] == "USD") : echo "美金";
-                            elseif ($data['CurrId'] == "TWD") : echo "台幣";
-                            elseif ($data['CurrId'] == "CNY") : echo "人民幣";
-                            elseif ($data['CurrId'] == "HKD") : echo "港幣";
-                            elseif ($data['CurrId'] == "EUR") : echo "歐元";
-                            endif;    ?> </td>
-                        <td><?php echo $data['total_OAmount']; ?> </td>
-                        <td><?php if ($data['CurrentState'] == 0) : echo "草稿";
-                            elseif ($data['CurrentState'] == 1) : echo "審核中";
-                            elseif ($data['CurrentState'] == 2) : echo "通過";
-                            elseif ($data['CurrentState'] == 3) : echo "作廢";
-                            elseif ($data['CurrentState'] == 5) : echo "退回";
-                            else : echo "結案";
-                            endif ?>
-                        </td>
-                        <td>
-                            <p>
-                                <?php if ($user_id == 'M0056' && $data['CurrentState'] == 1) {
-                                ?>
-                                    <a href="rib01-check.php?BillNo=<?php echo $data['BillNo'] ?>&state=1&<?= $token_link ?>" class="btn btn-success btn-sm">
-                                        <span class="glyphicon glyphicon-pawn"></span>
-                                    </a>
-                                <?php
-                                } else { ?>
-                                    <?php if ($data['CurrentState'] == 0) : ?>
-                                        <a href="rib01-business-check.php?BillNo=<?php echo $data['BillNo'] ?>&state=0&<?= $token_link ?>" class="btn btn-warning btn-sm">
-                                            <span class="glyphicon glyphicon-pencil"></span>
-                                        </a>
-                                    <?php elseif ($data['CurrentState'] == 1) : ?>
-                                        <a href="rib01-check.php?BillNo=<?php echo $data['BillNo'] ?>&state=1&<?= $token_link ?>" class="btn btn-primary btn-sm">
-                                            <span class=" glyphicon glyphicon-search"></span>
-                                        </a>
-                                        <button type="button" onclick="download(<?= $data['BillNo'] ?>)" class="btn btn-info btn-sm"><span class="glyphicon glyphicon-download-alt"></span></button>
-                                        <!-- <a href="rib03-download.php?id=<?php echo $data['BillNo'] ?>&<?= $token_link ?>" class="btn btn-info btn-sm">
-                                            <span class="glyphicon glyphicon-download-alt"></span>
-                                        </a> -->
-                                    <?php elseif ($data['CurrentState'] == 2) : ?>
-                                        <a href="rib01-check.php?BillNo=<?php echo $data['BillNo'] ?>&state=2&<?= $token_link ?>" class="btn btn-info btn-sm">
-                                            <span class=" glyphicon glyphicon-ok"></span>
-                                        </a>
-                                    <?php elseif ($data['CurrentState'] == 3) : ?>
-                                        <a href="rib01-check.php?BillNo=<?php echo $data['BillNo'] ?>&state=2&<?= $token_link ?>" class="btn btn-primary btn-sm">
-                                            <span class="glyphicon glyphicon-search"></span>
-                                        </a>
-                                    <?php elseif ($data['CurrentState'] == 5) : ?>
-                                        <a href="rib01-check.php?BillNo=<?php echo $data['BillNo'] ?>&state=2&<?= $token_link ?>" class="btn btn-primary btn-sm">
-                                            <span class="glyphicon glyphicon-search"></span>
-                                        </a>
-                                <?php endif;
-                                } ?>
-
-                            </p>
-                        </td>
-                    </tr>
-                <?php endforeach; ?>
-            </tbody>
-        </table>
-    </div>
-    <script>
-        function download(ribid) {
-            var xhr = new XMLHttpRequest();
-            var url = window.location.origin + "/wms/rib03-download.php?ribid=" + ribid + "&<?= $token_link ?>";
-            xhr.open('GET', url, true);
-            xhr.send();
-            xhr.responseType = 'text';
-            xhr.onload = function() {
-                if (xhr.status === 200) {
-                    console.log("ok");
-                    var file_path = xhr.responseText;
-                    var link = document.createElement('a');
-                    link.setAttribute('href', window.location.origin + "/wms/WriteOff.xlsx");
-                    link.setAttribute('download', '費用報銷單.xlsx');
-                    link.style.display = 'none';
-                    document.body.appendChild(link);
-                    link.click();
-                    document.body.removeChild(link);
-                    // window.open('rib-test.php','-----');
-                }
-            };
-
-        }
-        // function openpdf(ribid){
-        //     window.open('rib-test.php','-----');
-
-        // }
-    </script>
-
-<?php
-else :
-    echo "<h2>There is no record!</h2>";
-endif;
-
-include "./footer.php";
+<?php
+ini_set('display_errors', 'on');
+include "./header.php";
+
+// 設置一個空陣列來放資料
+$data = array();
+// sql語法存在變數中
+$sql = "select * from rib_business ";
+
+// 是否為會計 阿娥 
+if ($user_id == 'M0056') {
+    $sql .= "WHERE ((CurrentState =1) or (CreatorId= '$user_id')or (PersonId= '$user_id'))";
+    $data = mysqli_query($link, $sql);
+} else {
+
+    // 找下屬
+    $follower = [];
+    $follower = find_follow('$user_id');
+
+    if (count($follower) > 0) {
+        echo "有下屬";
+        $column_str = "('$user_id'" . ",'";
+        $column_str .= implode("','", $follower);
+        $column_str .= "')";
+        $sql .= "WHERE ((PersonId in $column_str) or (CreatorId in $column_str))";
+    } else {
+        $sql .= "WHERE ((PersonId= '$user_id') or (CreatorId= '$user_id'))";
+    };
+    $data = mysqli_query($link, $sql);
+}
+$DeptName = array();
+// 連線T8MASADA 
+
+$member = array();
+//取得人員名單與使用者的部門
+$sql_mydept =  "SELECT UserId, Username FROM capMembership";
+$deptmem = $conn->query($sql_mydept);
+foreach ($deptmem as $mem) {
+    $userid = $mem['UserId'];
+    $username = $mem['Username'];
+    $member["$userid"] = [$username];
+};
+$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
+$allpeople = $conn->query($sql_dept);
+foreach ($allpeople as $man) {
+    if ($man['PersonId'] == $user_id) {
+        $mydepart = $man['DeptId'];
+    }
+    $personid = $man['PersonId'];
+    $depart = $man['DeptId'];
+    if (isset($member["$personid"])) {
+        array_push($member["$personid"], "$depart");
+    };
+}
+
+//取得部門代碼
+$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
+$deptype = $conn->query($sql_department);
+foreach ($deptype as $dept) {
+    $deptid = $dept['DeptId'];
+    $deptname = $dept['DeptName'];
+    $DeptName[$deptid] = $deptname;
+}
+//取得供應商
+$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
+$BizPartner = $conn->query($sql_Biz);
+foreach ($BizPartner as $partner) {
+    $partnerid = $partner['BizPartnerId'];
+    $partnername = $partner['BizPartnerName'];
+    $Supplier[$partnerid] = $partnername;
+}
+
+?>
+<!-- 
+新增單據 -->
+<p>
+    <a href="rib01-business-create.php?<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+        <span class="glyphicon glyphicon-plus"></span>
+    </a>
+</p>
+
+<?php
+if ($data) :
+?>
+
+    <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;
+
+        }
+    </style>
+    <div style="width:98% ;margin: 1%">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+            <thead>
+                <tr>
+                    <th>單據編號</th>
+                    <th>單據日期</th>
+                    <th>供應商</th>
+                    <th>報銷人</th>
+                    <th>報銷部門</th>
+                    <th>幣別</th>
+                    <th>報銷金額</th>
+                    <th style="width: 8%;">狀態</th>
+                    <th style="width: 7%;">功能</th>
+                </tr>
+            </thead>
+            <tbody>
+
+                <?php foreach ($data as $data) : ?>
+                    <tr>
+                        <td><?php echo $data['BillNo']; ?></td>
+                        <td><?php echo substr($data['BillDate'], 0, 10); ?></td>
+                        <td><?php $supp = $data['BizPartnerId'];
+                            echo $Supplier[$supp]; ?></td>
+                        <td><?php echo accountidToName($data['PersonId']); ?></td>
+                        <td><?php $depid = $data['DeptId'];
+                            echo $DeptName[$depid] ?></td>
+                        <td><?php if ($data['CurrId'] == "USD") : echo "美金";
+                            elseif ($data['CurrId'] == "TWD") : echo "台幣";
+                            elseif ($data['CurrId'] == "CNY") : echo "人民幣";
+                            elseif ($data['CurrId'] == "HKD") : echo "港幣";
+                            elseif ($data['CurrId'] == "EUR") : echo "歐元";
+                            endif;    ?> </td>
+                        <td><?php echo $data['total_OAmount']; ?> </td>
+                        <td><?php if ($data['CurrentState'] == 0) : echo "草稿";
+                            elseif ($data['CurrentState'] == 1) : echo "審核中";
+                            elseif ($data['CurrentState'] == 2) : echo "通過";
+                            elseif ($data['CurrentState'] == 3) : echo "作廢";
+                            elseif ($data['CurrentState'] == 5) : echo "退回";
+                            else : echo "結案";
+                            endif ?>
+                        </td>
+                        <td>
+                            <p>
+                                <?php if ($user_id == 'M0056' && $data['CurrentState'] == 1) {
+                                ?>
+                                    <a href="rib01-check.php?BillNo=<?php echo $data['BillNo'] ?>&state=1&<?= $token_link ?>" class="btn btn-success btn-sm">
+                                        <span class="glyphicon glyphicon-pawn"></span>
+                                    </a>
+                                <?php
+                                } else { ?>
+                                    <?php if ($data['CurrentState'] == 0) : ?>
+                                        <a href="rib01-business-check.php?BillNo=<?php echo $data['BillNo'] ?>&state=0&<?= $token_link ?>" class="btn btn-warning btn-sm">
+                                            <span class="glyphicon glyphicon-pencil"></span>
+                                        </a>
+                                    <?php elseif ($data['CurrentState'] == 1) : ?>
+                                        <a href="rib01-check.php?BillNo=<?php echo $data['BillNo'] ?>&state=1&<?= $token_link ?>" class="btn btn-primary btn-sm">
+                                            <span class=" glyphicon glyphicon-search"></span>
+                                        </a>
+                                        <button type="button" onclick="download(<?= $data['BillNo'] ?>)" class="btn btn-info btn-sm"><span class="glyphicon glyphicon-download-alt"></span></button>
+                                        <!-- <a href="rib03-download.php?id=<?php echo $data['BillNo'] ?>&<?= $token_link ?>" class="btn btn-info btn-sm">
+                                            <span class="glyphicon glyphicon-download-alt"></span>
+                                        </a> -->
+                                    <?php elseif ($data['CurrentState'] == 2) : ?>
+                                        <a href="rib01-check.php?BillNo=<?php echo $data['BillNo'] ?>&state=2&<?= $token_link ?>" class="btn btn-info btn-sm">
+                                            <span class=" glyphicon glyphicon-ok"></span>
+                                        </a>
+                                    <?php elseif ($data['CurrentState'] == 3) : ?>
+                                        <a href="rib01-check.php?BillNo=<?php echo $data['BillNo'] ?>&state=2&<?= $token_link ?>" class="btn btn-primary btn-sm">
+                                            <span class="glyphicon glyphicon-search"></span>
+                                        </a>
+                                    <?php elseif ($data['CurrentState'] == 5) : ?>
+                                        <a href="rib01-check.php?BillNo=<?php echo $data['BillNo'] ?>&state=2&<?= $token_link ?>" class="btn btn-primary btn-sm">
+                                            <span class="glyphicon glyphicon-search"></span>
+                                        </a>
+                                <?php endif;
+                                } ?>
+
+                            </p>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+        </table>
+    </div>
+    <script>
+        function download(ribid) {
+            var xhr = new XMLHttpRequest();
+            var url = window.location.origin + "/wms/rib03-download.php?ribid=" + ribid + "&<?= $token_link ?>";
+            xhr.open('GET', url, true);
+            xhr.send();
+            xhr.responseType = 'text';
+            xhr.onload = function() {
+                if (xhr.status === 200) {
+                    console.log("ok");
+                    var file_path = xhr.responseText;
+                    var link = document.createElement('a');
+                    link.setAttribute('href', window.location.origin + "/wms/WriteOff.xlsx");
+                    link.setAttribute('download', '費用報銷單.xlsx');
+                    link.style.display = 'none';
+                    document.body.appendChild(link);
+                    link.click();
+                    document.body.removeChild(link);
+                    // window.open('rib-test.php','-----');
+                }
+            };
+
+        }
+        // function openpdf(ribid){
+        //     window.open('rib-test.php','-----');
+
+        // }
+    </script>
+
+<?php
+else :
+    echo "<h2>There is no record!</h2>";
+endif;
+
+include "./footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/rib01-business-submit.php b/wms/rib01-business-submit.php
index 088b9e43..d012397d 100644
--- a/wms/rib01-business-submit.php
+++ b/wms/rib01-business-submit.php
@@ -1,30 +1,30 @@
-<?php
-include "./header.php";
-$submit = $_GET['submit'];
-$state = $_GET['state'];
-$BillNo = $_POST['BillNo'];
-$BillDate = (int)$_POST['BillDate'];
-$CurrId = $_POST['CurrId'];
-$DeptId = $_POST['DeptId'];
-$PersonId = $_POST['PersonId'];
-$BizPartnerId = $_POST['BizPartnerId'];
-$TaxId = $_POST['TaxId'];
-
-if ($submit == "add") {
-    $SQL1 = "INSERT INTO rib_business (`BillNo`,`BillDate`,`BizPartnerId`,`CurrId`,`TaxId`,
-    `PersonId`,`DeptId`,`CreditAgeDate`,`RecBizPartnerId`,`CurrentState`,`CreatorId`) VALUES (
-    '$BillNo',$BillDate,'$BizPartnerId','$CurrId','$TaxId','$PersonId','$DeptId',$BillDate,'$BizPartnerId',
-    0,'$user_id')";
-    mysqli_query($link, $SQL1);
-    if (mysqli_affected_rows($link)) {
-        echo '<script>alert("新增 成功")</script>';
-    } else {
-        echo '<script>alert("新增 失敗")</script>';
-    }
-    echo $SQL1;
-?>
-    <!-- <script>
-        window.location.href = "rib02-business-create.php?BillNo=<?php echo $BillNo ?>&RowCode=1&TaxId=<?= $TaxId?>&<?= $token_link ?>";
-    </script> -->
-<?php
-}
+<?php
+include "./header.php";
+$submit = $_GET['submit'];
+$state = $_GET['state'];
+$BillNo = $_POST['BillNo'];
+$BillDate = (int)$_POST['BillDate'];
+$CurrId = $_POST['CurrId'];
+$DeptId = $_POST['DeptId'];
+$PersonId = $_POST['PersonId'];
+$BizPartnerId = $_POST['BizPartnerId'];
+$TaxId = $_POST['TaxId'];
+
+if ($submit == "add") {
+    $SQL1 = "INSERT INTO rib_business (`BillNo`,`BillDate`,`BizPartnerId`,`CurrId`,`TaxId`,
+    `PersonId`,`DeptId`,`CreditAgeDate`,`RecBizPartnerId`,`CurrentState`,`CreatorId`) VALUES (
+    '$BillNo',$BillDate,'$BizPartnerId','$CurrId','$TaxId','$PersonId','$DeptId',$BillDate,'$BizPartnerId',
+    0,'$user_id')";
+    mysqli_query($link, $SQL1);
+    if (mysqli_affected_rows($link)) {
+        echo '<script>alert("新增 成功")</script>';
+    } else {
+        echo '<script>alert("新增 失敗")</script>';
+    }
+    echo $SQL1;
+?>
+    <!-- <script>
+        window.location.href = "rib02-business-create.php?BillNo=<?php echo $BillNo ?>&RowCode=1&TaxId=<?= $TaxId?>&<?= $token_link ?>";
+    </script> -->
+<?php
+}
diff --git a/wms/rib01-check.php b/wms/rib01-check.php
index 2aad50ad..6ef49006 100644
--- a/wms/rib01-check.php
+++ b/wms/rib01-check.php
@@ -1,406 +1,406 @@
-<?php
-include "./header.php";
-$rib_id = isset($_GET['id']) ? $_GET['id'] : NULL;
-$BillNo = isset($_GET['BillNo']) ? $_GET['BillNo'] : NULL;
-// 取得 rib WHERE rib_id 的資料
-$db_query = "SELECT * from rib where rib_id='$rib_id'";
-if (empty($rib_id)) {
-    $db_query = "SELECT * from rib where BillNo='$BillNo'";
-}
-$res = mysqli_query($link, $db_query);
-$state = $_GET['state'];
-$CurrId = "";
-foreach ($res as $dat) {
-    $CurrId = $dat['CurrId'];
-    $rib_id = $dat['rib_id'];
-    $BillNo = $dat['BillNo'];
-}
-//取得 rib_sub的資料
-$pay_data = array();
-$pay_sql = "select * from rib_sub where rib_id = $rib_id";
-$pay_data = mysqli_query($link, $pay_sql);
-$totalOAmount = 0;
-$CurrLAmount = 0;
-if ($pay_data) {
-    foreach ($pay_data as $pdat) {
-        $totalOAmount += $pdat['OAmount'];
-        $CurrLAmount = $pdat['CurrentLAmount'];
-    }
-}
-// 連線T8MASADA 
-
-$member = array();
-//取得人員名單與使用者的部門
-
-$sql_mydept =  "SELECT UserId, Username FROM capMembership";
-$deptmem = $conn->query($sql_mydept);
-foreach ($deptmem as $mem) {
-    $userid = $mem['UserId'];
-    $username = $mem['Username'];
-    $member["$userid"] = [$username];
-};
-$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
-$allpeople = $conn->query($sql_dept);
-foreach ($allpeople as $man) {
-    if ($man['PersonId'] == $user_id) {
-        $mydepart = $man['DeptId'];
-    }
-    $personid = $man['PersonId'];
-    $depart = $man['DeptId'];
-    if (isset($member["$personid"])) {
-        array_push($member["$personid"], "$depart");
-    }
-}
-
-//取得部門代碼
-$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
-$deptype = $conn->query($sql_department);
-
-
-?>
-<div style="width: 90%;">
-
-    <div style="padding-left: 2rem; padding-bottom: 1rem;">
-        <a href="rib01-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
-            <span class="glyphicon glyphicon-home"></span>
-        </a>
-    </div>
-
-</div>
-<?php
-
-if ($state == 0) :
-?>
-    <div style="width: 90%;">
-
-        <div style="padding-left: 2rem;">
-            <a href="rib03-submit.php?id=<?= $rib_id ?>&state=1&<?php echo $token_link; ?>" class="btn btn-success btn-lg pull-right">
-                提交並列印報銷黏存單 <span class="glyphicon glyphicon-send"></span>
-            </a>
-        </div>
-
-    </div>
-    <div style="padding-left: 2rem;">
-        <p>
-            <a href="rib01-delete.php?id=<?= $rib_id ?>&<?php echo $token_link; ?>" class="btn btn-danger btn-lg">
-                <span class="glyphicon glyphicon-trash"></span>
-            </a>
-        </p>
-    </div>
-<?php
-elseif ($state == 1 && ($user_id == "M0056" || $user_id == "M0209")) :
-?>
-    <div style="width: 90%;">
-
-        <div style="padding-left: 2rem;">
-            <a href="rib03-submit.php?id=<?= $rib_id ?>&state=2&<?php echo $token_link; ?>" class="btn btn-success btn-lg pull-right">
-                核准並上傳T8 <span class="glyphicon glyphicon-cloud-upload"></span>
-            </a>
-        </div>
-
-    </div>
-    <div style="padding-left: 2rem;">
-        <p>
-            <a href="rib01-delete.php?id=<?= $rib_id ?>&state=1&<?php echo $token_link; ?>" class="btn btn-danger btn-lg">
-                <span class="glyphicon glyphicon-remove-sign"> 退回</span>
-            </a>
-        </p>
-    </div>
-<?php
-elseif ($state == 1) :
-?>
-
-    <div style="padding-left: 2rem;">
-        <p>
-            <a href="rib01-delete.php?id=<?= $rib_id ?>&state=1&<?php echo $token_link; ?>" class="btn btn-danger btn-lg">
-                <span class="glyphicon glyphicon-remove-sign"> 撤回</span>
-            </a>
-        </p>
-    </div>
-<?php
-endif
-?>
-
-
-<div class="container" id="accountedit">
-    <div class="text-center">
-        <h3>報銷單據</h3>
-    </div>
-    <form class="form-horizontal" name="ribedit" method="POST" action="rib01-edit.php?id=<?php echo $data['rib_id'] ?>&state=0&<?= $token_link ?>" enctype="multipart/form-data">
-        <?php
-        foreach ($res as $data) :; ?>
-
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="BillNo">單據編號</label>
-                    <input class="form-control" type="text" name="BillNo" id="BillNo" value="<?php echo $data['BillNo'] ?>" required disabled>
-
-                </div>
-                <div class="col-md-3">
-                    <label for="BillDate">單據日期</label>
-                    <!-- <textarea class="form-control"  name="rib_title" id="rib_title" required></textarea> -->
-                    <input class="form-control" type="number" name="BillDate" id="BillDate" value=<?= $data['BillDate'] ?> required disabled>
-                </div>
-
-                <div class="col-md-3">
-                    <label for="CurrId">幣別</label>
-                    <select name="CurrId" class="form-control" disabled>
-                        <option value="TWD" <?php if ($data['CurrId'] === "TWD") {
-                                                echo "selected";
-                                            } ?>>台幣</option>
-                        <option value="CNY" <?php if ($data['CurrId'] === "CNY") {
-                                                echo "selected";
-                                            } ?>>人民幣</option>
-                        <option value="EUR" <?php if ($data['CurrId'] === "EUR") {
-                                                echo "selected";
-                                            } ?>>歐元</option>
-                        <option value="HKD" <?php if ($data['CurrId'] === "HKD") {
-                                                echo "selected";
-                                            } ?>>港幣</option>
-                        <option value="USD" <?php if ($data['CurrId'] === "USD") {
-                                                echo "selected";
-                                            } ?>>美元</option>
-                    </select>
-                </div>
-
-                <div class="col-md-3">
-                    <label for="TransactId">經辦人</label>
-                    <select name="TransactId" id="TransactId" class="form-control" disabled>
-                        <?php
-                        foreach ($member as $key => $value) { ?>
-                            <option value="<?php echo $key; ?>" <?php if ($key == $data['TransactId']) {
-                                                                    echo "selected";
-                                                                } ?>> <?php echo $value[0]; ?> </option>
-                        <?php }; ?>
-                    </select>
-
-
-                </div>
-            </div>
-
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="DeptId">報銷單位</label>
-                    <select name="DeptId" id="DeptId" class="form-control" required disabled>
-                        <?php
-                        foreach ($deptype as $dept) { ?>
-                            <option value="<?php echo $dept['DeptId']; ?>" <?php
-                                                                            if ($dept['DeptId'] == $data['DeptId']) {
-                                                                                echo "selected";
-                                                                            } ?>><?php echo $dept['DeptName']; ?></option>
-                        <?php };
-                        ?>
-                    </select>
-                </div>
-
-                <div class="col-md-3">
-                    <label for="WriteOffId">報銷人</label>
-                    <select name="WriteOffId" id="WriteOffId" class="form-control" required disabled>
-                        <?php
-                        foreach ($member as $key => $value) { ?>
-                            <option value="<?php echo $key; ?>" style="display:none" id="<?= 'WriteOff' . $value[1] . $value[0] ?>" <?php if ($key == $data['WriteOffId']) {
-                                                                                                                                        echo "selected";
-                                                                                                                                    } ?>> <?php echo $value[0]; ?> </option>
-                        <?php }
-                        ?>
-                    </select>
-                </div>
-                <div class="col-md-3">
-                    <label for="pay_type">付款方式</label>
-                    <select class="form-control" name="pay_type" id="pay_type" disabled>
-                        <option value=0 <?php if ($data['pay_type'] == 0) {
-                                            echo "selected";
-                                        } ?>>現金</option>
-                        <option value=1 <?php if ($data['pay_type'] == 1) {
-                                            echo "selected";
-                                        } ?>>銀行轉帳</option>
-                    </select>
-                </div>
-
-                <div class="col-md-3">
-                    <label for="GatheringPersonId">收款人</label>
-                    <select name="GatheringPersonId" id="GatheringPersonId" class="form-control" required disabled>
-                        <?php
-                        foreach ($member as $key => $value) {
-                        ?>
-                            <option value="<?php echo $key; ?>" id="<?= 'Gathering' . $value[1] . $value[0] ?>" <?php if ($key == $data['GatheringPersonId']) {
-                                                                                                                    echo "selected";
-                                                                                                                } ?>> <?php echo $value[0]; ?> </option>
-                        <?php }; ?>
-                    </select>
-                </div>
-            </div>
-            <?php
-            if (($user_id == "M0056" || $user_id == "M0209") && $state == 1) { ?>
-                <div class="form-group">
-
-                    <div class="col-md-3">
-                        <label for="WriteOffAmount">報銷金額 (原幣)</label>
-                        <input name="WriteOffAmount" id="WriteOffAmount" class="form-control" type="number" value="<?= round($data['WriteOffAmount']) ?>" disabled>
-                    </div>
-                    <div class="col-md-3">
-                        <label for="OAmount">未稅報銷金額 (原幣)</label>
-                        <input name="OAmount" id="OAmount" class="form-control" value="<?= round($data['OAmount']) ?>" disabled>
-                    </div>
-                    <div class="col-md-3">
-                        <label for="OTax">稅金 (原幣)</label>
-                        <input name="OTax" id="OTax" class="form-control" value="<?= round($data['OTax']) ?>" disabled>
-                    </div>
-                    <div class="col-md-3">
-                        <label for="CurrentLAmount">匯率</label>
-                        <input name="CurrentLAmount" id="CurrentLAmount" class="form-control" value="<?= round($CurrLAmount) ?>" disabled>
-                    </div>
-
-                </div>
-                <div class="form-group">
-
-                    <div class="col-md-3">
-                        <label for="LAmountWithTax">本幣報銷金額</label>
-                        <input name="LAmountWithTax" id="LAmountWithTax" class="form-control" type="number" value="<?= round($data['LAmountWithTax']) ?>" disabled>
-                    </div>
-                    <div class="col-md-3">
-                        <label for="LAmount">本幣未稅報銷金額</label>
-                        <input name="LAmount" id="LAmount" class="form-control" value="<?= round($data['LAmount']) ?>" disabled>
-                    </div>
-                    <div class="col-md-3">
-                        <label for="LTax">本幣稅金</label>
-                        <input name="LTax" id="LTax" class="form-control" value="<?= round($data['LTax']) ?>" disabled>
-                    </div>
-                </div>
-            <?php
-            } else { ?>
-                <div class="form-group">
-                    <div class="col-md-3">
-                        <label for="totalOAmount">報銷金額 (原幣)</label>
-                        <input name="totalOAmount" id="totalOAmount" class="form-control" type="number" value="<?= round($totalOAmount) ?>" disabled>
-                    </div>
-                </div>
-            <?php
-            } ?>
-
-            <div class="form-group">
-                <input type="hidden" name="token" value="<?php echo $token; ?>">
-                <input type="hidden" name="type" id="type" value="rib">
-                <input type="hidden" name="rib_id" id="rib_id" value="<?= $rib_id ?>">
-            </div>
-
-        <?php
-        endforeach;
-        if ($state == 0) :
-        ?>
-            <div class="form-group">
-                <div class="col-md-7">
-
-                </div>
-
-                <a href="rib01-edit.php?id=<?php echo $rib_id ?>&state=0&<?= $token_link ?>" class="btn btn-primary btn-lg pull-right">
-                    修改報銷單
-                </a>
-            </div>
-        <?php
-        elseif ($state == 1 && ($user_id == "M0056" || $user_id == "M0209")) :
-        ?>
-            <div class="form-group">
-                <div class="col-md-7">
-
-                </div>
-
-                <a href="rib01-edit.php?id=<?php echo $rib_id ?>&state=1&<?= $token_link ?>" class="btn btn-primary btn-lg pull-right">
-                    修改報銷單
-                </a>
-            </div>
-
-        <?php
-        endif
-        ?>
-    </form>
-</div>
-<?php
-
-include "./footer.php";
-
-$RowCode = 1;
-if ($pay_data) {
-    $RowCode += mysqli_num_rows($pay_data);
-};
-//取得費用項目代碼
-$sql_feetype = "SELECT * from feetype";
-$feetype_query = mysqli_query($link, $sql_feetype);
-$feetype = mysqli_fetch_all($feetype_query, MYSQLI_ASSOC);
-?>
-
-<div style="margin: 1%;display:flex; justify-content:center;">
-    <?php
-    if ($pay_data) :
-    ?>
-        <div style="width: 80%;">
-            <?php
-            if (($state == 0)||($user_id=='M0056') || $user_id=='M0209') :
-            ?>
-                <a href="rib02-create.php?id=<?php echo $data['rib_id'] ?>&RowCode=<?= $RowCode ?>&CurrId=<?= $CurrId ?>&<?= $token_link ?>" class="btn btn-info btn-lg pull-right" style="margin: 1 rem;">
-                    <span class=" glyphicon glyphicon-plus"></span>
-                </a>
-            <?php
-            endif;
-            ?>
-            <table class="table table-striped table-bordered" style="width:100%">
-                <thead>
-                    <tr>
-                        <th>發票日期</th>
-                        <th>數量</th>
-                        <th>單價</th>
-                        <th>費用/產品</th>
-                        <th>原幣報銷金額</th>
-                        <th>說明</th>
-                        <th>發票號碼</th>
-                        <th style="width: 10%;">功能</th>
-
-                    </tr>
-                </thead>
-                <tbody>
-                    <?php foreach ($pay_data as $pay) : ?>
-                        <tr>
-                            <td><?= $pay['FeeDate'] ?></td>
-                            <td><?= round($pay['Quantity']) ?></td>
-                            <td><?= round($pay['Price']) ?></td>
-                            <td><?php foreach ($feetype as $feetyp) {
-                                    if ($feetyp['FeeTypeId'] == $pay['FeeTypeId']) {
-                                        echo $feetyp['FeeTypeName'];
-                                    }
-                                } ?></td>
-                            <td><?= round($pay['OAmount']) ?></td>
-                            <td><?= $pay['FeeNoteShow'] ?></td>
-                            <td><?= $pay['InvoiceNo'] ?></td>
-                            <?php if ($state == 0) { ?>
-                                <td> <a href="rib02-edit.php?id=<?php echo $pay['ribsub_id'] ?>&state=0&<?= $token_link ?>" class="btn btn-warning btn-sm">
-                                        <span class=" glyphicon glyphicon-pencil"></span>
-                                    </a>
-                                    <a href="rib02-delete.php?ribsub_id=<?php echo $pay['ribsub_id'] ?>&rib_id=<?php echo $pay['rib_id'] ?>&<?= $token_link ?>" class="btn btn-danger btn-sm">
-                                        <span class=" glyphicon glyphicon-trash"></span>
-                                    </a>
-                                </td>
-                            <?php } elseif ($state == 1 && ($user_id == "M0056" || $user_id == "M0209")) { ?>
-                                <td><a href="rib02-edit.php?id=<?php echo $pay['ribsub_id'] ?>&state=1&<?= $token_link ?>" class="btn btn-warning btn-sm">
-                                        <span class=" glyphicon glyphicon-pencil"></span>
-                                    </a>
-                                    <a href="rib02-delete.php?ribsub_id=<?php echo $pay['ribsub_id'] ?>&rib_id=<?php echo $pay['rib_id'] ?>&<?= $token_link ?>" class="btn btn-danger btn-sm">
-                                        <span class=" glyphicon glyphicon-trash"></span>
-                                    </a>
-                                </td>
-
-                            <?php } else { ?>
-                                <td> <a href="rib02-check.php?id=<?php echo $pay['ribsub_id'] ?>&<?= $token_link ?>" class="btn btn-primary btn-sm">
-                                        <span class="glyphicon glyphicon-search"></span>
-                                    </a>
-                                </td>
-                            <?php
-                            } ?>
-                        </tr>
-                    <?php endforeach ?>
-                </tbody>
-            </table>
-        </div>
-    <?php
-    endif;
-    ?>
+<?php
+include "./header.php";
+$rib_id = isset($_GET['id']) ? $_GET['id'] : NULL;
+$BillNo = isset($_GET['BillNo']) ? $_GET['BillNo'] : NULL;
+// 取得 rib WHERE rib_id 的資料
+$db_query = "SELECT * from rib where rib_id='$rib_id'";
+if (empty($rib_id)) {
+    $db_query = "SELECT * from rib where BillNo='$BillNo'";
+}
+$res = mysqli_query($link, $db_query);
+$state = $_GET['state'];
+$CurrId = "";
+foreach ($res as $dat) {
+    $CurrId = $dat['CurrId'];
+    $rib_id = $dat['rib_id'];
+    $BillNo = $dat['BillNo'];
+}
+//取得 rib_sub的資料
+$pay_data = array();
+$pay_sql = "select * from rib_sub where rib_id = $rib_id";
+$pay_data = mysqli_query($link, $pay_sql);
+$totalOAmount = 0;
+$CurrLAmount = 0;
+if ($pay_data) {
+    foreach ($pay_data as $pdat) {
+        $totalOAmount += $pdat['OAmount'];
+        $CurrLAmount = $pdat['CurrentLAmount'];
+    }
+}
+// 連線T8MASADA 
+
+$member = array();
+//取得人員名單與使用者的部門
+
+$sql_mydept =  "SELECT UserId, Username FROM capMembership";
+$deptmem = $conn->query($sql_mydept);
+foreach ($deptmem as $mem) {
+    $userid = $mem['UserId'];
+    $username = $mem['Username'];
+    $member["$userid"] = [$username];
+};
+$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
+$allpeople = $conn->query($sql_dept);
+foreach ($allpeople as $man) {
+    if ($man['PersonId'] == $user_id) {
+        $mydepart = $man['DeptId'];
+    }
+    $personid = $man['PersonId'];
+    $depart = $man['DeptId'];
+    if (isset($member["$personid"])) {
+        array_push($member["$personid"], "$depart");
+    }
+}
+
+//取得部門代碼
+$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
+$deptype = $conn->query($sql_department);
+
+
+?>
+<div style="width: 90%;">
+
+    <div style="padding-left: 2rem; padding-bottom: 1rem;">
+        <a href="rib01-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
+            <span class="glyphicon glyphicon-home"></span>
+        </a>
+    </div>
+
+</div>
+<?php
+
+if ($state == 0) :
+?>
+    <div style="width: 90%;">
+
+        <div style="padding-left: 2rem;">
+            <a href="rib03-submit.php?id=<?= $rib_id ?>&state=1&<?php echo $token_link; ?>" class="btn btn-success btn-lg pull-right">
+                提交並列印報銷黏存單 <span class="glyphicon glyphicon-send"></span>
+            </a>
+        </div>
+
+    </div>
+    <div style="padding-left: 2rem;">
+        <p>
+            <a href="rib01-delete.php?id=<?= $rib_id ?>&<?php echo $token_link; ?>" class="btn btn-danger btn-lg">
+                <span class="glyphicon glyphicon-trash"></span>
+            </a>
+        </p>
+    </div>
+<?php
+elseif ($state == 1 && ($user_id == "M0056" || $user_id == "M0209")) :
+?>
+    <div style="width: 90%;">
+
+        <div style="padding-left: 2rem;">
+            <a href="rib03-submit.php?id=<?= $rib_id ?>&state=2&<?php echo $token_link; ?>" class="btn btn-success btn-lg pull-right">
+                核准並上傳T8 <span class="glyphicon glyphicon-cloud-upload"></span>
+            </a>
+        </div>
+
+    </div>
+    <div style="padding-left: 2rem;">
+        <p>
+            <a href="rib01-delete.php?id=<?= $rib_id ?>&state=1&<?php echo $token_link; ?>" class="btn btn-danger btn-lg">
+                <span class="glyphicon glyphicon-remove-sign"> 退回</span>
+            </a>
+        </p>
+    </div>
+<?php
+elseif ($state == 1) :
+?>
+
+    <div style="padding-left: 2rem;">
+        <p>
+            <a href="rib01-delete.php?id=<?= $rib_id ?>&state=1&<?php echo $token_link; ?>" class="btn btn-danger btn-lg">
+                <span class="glyphicon glyphicon-remove-sign"> 撤回</span>
+            </a>
+        </p>
+    </div>
+<?php
+endif
+?>
+
+
+<div class="container" id="accountedit">
+    <div class="text-center">
+        <h3>報銷單據</h3>
+    </div>
+    <form class="form-horizontal" name="ribedit" method="POST" action="rib01-edit.php?id=<?php echo $data['rib_id'] ?>&state=0&<?= $token_link ?>" enctype="multipart/form-data">
+        <?php
+        foreach ($res as $data) :; ?>
+
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="BillNo">單據編號</label>
+                    <input class="form-control" type="text" name="BillNo" id="BillNo" value="<?php echo $data['BillNo'] ?>" required disabled>
+
+                </div>
+                <div class="col-md-3">
+                    <label for="BillDate">單據日期</label>
+                    <!-- <textarea class="form-control"  name="rib_title" id="rib_title" required></textarea> -->
+                    <input class="form-control" type="number" name="BillDate" id="BillDate" value=<?= $data['BillDate'] ?> required disabled>
+                </div>
+
+                <div class="col-md-3">
+                    <label for="CurrId">幣別</label>
+                    <select name="CurrId" class="form-control" disabled>
+                        <option value="TWD" <?php if ($data['CurrId'] === "TWD") {
+                                                echo "selected";
+                                            } ?>>台幣</option>
+                        <option value="CNY" <?php if ($data['CurrId'] === "CNY") {
+                                                echo "selected";
+                                            } ?>>人民幣</option>
+                        <option value="EUR" <?php if ($data['CurrId'] === "EUR") {
+                                                echo "selected";
+                                            } ?>>歐元</option>
+                        <option value="HKD" <?php if ($data['CurrId'] === "HKD") {
+                                                echo "selected";
+                                            } ?>>港幣</option>
+                        <option value="USD" <?php if ($data['CurrId'] === "USD") {
+                                                echo "selected";
+                                            } ?>>美元</option>
+                    </select>
+                </div>
+
+                <div class="col-md-3">
+                    <label for="TransactId">經辦人</label>
+                    <select name="TransactId" id="TransactId" class="form-control" disabled>
+                        <?php
+                        foreach ($member as $key => $value) { ?>
+                            <option value="<?php echo $key; ?>" <?php if ($key == $data['TransactId']) {
+                                                                    echo "selected";
+                                                                } ?>> <?php echo $value[0]; ?> </option>
+                        <?php }; ?>
+                    </select>
+
+
+                </div>
+            </div>
+
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="DeptId">報銷單位</label>
+                    <select name="DeptId" id="DeptId" class="form-control" required disabled>
+                        <?php
+                        foreach ($deptype as $dept) { ?>
+                            <option value="<?php echo $dept['DeptId']; ?>" <?php
+                                                                            if ($dept['DeptId'] == $data['DeptId']) {
+                                                                                echo "selected";
+                                                                            } ?>><?php echo $dept['DeptName']; ?></option>
+                        <?php };
+                        ?>
+                    </select>
+                </div>
+
+                <div class="col-md-3">
+                    <label for="WriteOffId">報銷人</label>
+                    <select name="WriteOffId" id="WriteOffId" class="form-control" required disabled>
+                        <?php
+                        foreach ($member as $key => $value) { ?>
+                            <option value="<?php echo $key; ?>" style="display:none" id="<?= 'WriteOff' . $value[1] . $value[0] ?>" <?php if ($key == $data['WriteOffId']) {
+                                                                                                                                        echo "selected";
+                                                                                                                                    } ?>> <?php echo $value[0]; ?> </option>
+                        <?php }
+                        ?>
+                    </select>
+                </div>
+                <div class="col-md-3">
+                    <label for="pay_type">付款方式</label>
+                    <select class="form-control" name="pay_type" id="pay_type" disabled>
+                        <option value=0 <?php if ($data['pay_type'] == 0) {
+                                            echo "selected";
+                                        } ?>>現金</option>
+                        <option value=1 <?php if ($data['pay_type'] == 1) {
+                                            echo "selected";
+                                        } ?>>銀行轉帳</option>
+                    </select>
+                </div>
+
+                <div class="col-md-3">
+                    <label for="GatheringPersonId">收款人</label>
+                    <select name="GatheringPersonId" id="GatheringPersonId" class="form-control" required disabled>
+                        <?php
+                        foreach ($member as $key => $value) {
+                        ?>
+                            <option value="<?php echo $key; ?>" id="<?= 'Gathering' . $value[1] . $value[0] ?>" <?php if ($key == $data['GatheringPersonId']) {
+                                                                                                                    echo "selected";
+                                                                                                                } ?>> <?php echo $value[0]; ?> </option>
+                        <?php }; ?>
+                    </select>
+                </div>
+            </div>
+            <?php
+            if (($user_id == "M0056" || $user_id == "M0209") && $state == 1) { ?>
+                <div class="form-group">
+
+                    <div class="col-md-3">
+                        <label for="WriteOffAmount">報銷金額 (原幣)</label>
+                        <input name="WriteOffAmount" id="WriteOffAmount" class="form-control" type="number" value="<?= round($data['WriteOffAmount']) ?>" disabled>
+                    </div>
+                    <div class="col-md-3">
+                        <label for="OAmount">未稅報銷金額 (原幣)</label>
+                        <input name="OAmount" id="OAmount" class="form-control" value="<?= round($data['OAmount']) ?>" disabled>
+                    </div>
+                    <div class="col-md-3">
+                        <label for="OTax">稅金 (原幣)</label>
+                        <input name="OTax" id="OTax" class="form-control" value="<?= round($data['OTax']) ?>" disabled>
+                    </div>
+                    <div class="col-md-3">
+                        <label for="CurrentLAmount">匯率</label>
+                        <input name="CurrentLAmount" id="CurrentLAmount" class="form-control" value="<?= round($CurrLAmount) ?>" disabled>
+                    </div>
+
+                </div>
+                <div class="form-group">
+
+                    <div class="col-md-3">
+                        <label for="LAmountWithTax">本幣報銷金額</label>
+                        <input name="LAmountWithTax" id="LAmountWithTax" class="form-control" type="number" value="<?= round($data['LAmountWithTax']) ?>" disabled>
+                    </div>
+                    <div class="col-md-3">
+                        <label for="LAmount">本幣未稅報銷金額</label>
+                        <input name="LAmount" id="LAmount" class="form-control" value="<?= round($data['LAmount']) ?>" disabled>
+                    </div>
+                    <div class="col-md-3">
+                        <label for="LTax">本幣稅金</label>
+                        <input name="LTax" id="LTax" class="form-control" value="<?= round($data['LTax']) ?>" disabled>
+                    </div>
+                </div>
+            <?php
+            } else { ?>
+                <div class="form-group">
+                    <div class="col-md-3">
+                        <label for="totalOAmount">報銷金額 (原幣)</label>
+                        <input name="totalOAmount" id="totalOAmount" class="form-control" type="number" value="<?= round($totalOAmount) ?>" disabled>
+                    </div>
+                </div>
+            <?php
+            } ?>
+
+            <div class="form-group">
+                <input type="hidden" name="token" value="<?php echo $token; ?>">
+                <input type="hidden" name="type" id="type" value="rib">
+                <input type="hidden" name="rib_id" id="rib_id" value="<?= $rib_id ?>">
+            </div>
+
+        <?php
+        endforeach;
+        if ($state == 0) :
+        ?>
+            <div class="form-group">
+                <div class="col-md-7">
+
+                </div>
+
+                <a href="rib01-edit.php?id=<?php echo $rib_id ?>&state=0&<?= $token_link ?>" class="btn btn-primary btn-lg pull-right">
+                    修改報銷單
+                </a>
+            </div>
+        <?php
+        elseif ($state == 1 && ($user_id == "M0056" || $user_id == "M0209")) :
+        ?>
+            <div class="form-group">
+                <div class="col-md-7">
+
+                </div>
+
+                <a href="rib01-edit.php?id=<?php echo $rib_id ?>&state=1&<?= $token_link ?>" class="btn btn-primary btn-lg pull-right">
+                    修改報銷單
+                </a>
+            </div>
+
+        <?php
+        endif
+        ?>
+    </form>
+</div>
+<?php
+
+include "./footer.php";
+
+$RowCode = 1;
+if ($pay_data) {
+    $RowCode += mysqli_num_rows($pay_data);
+};
+//取得費用項目代碼
+$sql_feetype = "SELECT * from feetype";
+$feetype_query = mysqli_query($link, $sql_feetype);
+$feetype = mysqli_fetch_all($feetype_query, MYSQLI_ASSOC);
+?>
+
+<div style="margin: 1%;display:flex; justify-content:center;">
+    <?php
+    if ($pay_data) :
+    ?>
+        <div style="width: 80%;">
+            <?php
+            if (($state == 0)||($user_id=='M0056') || $user_id=='M0209') :
+            ?>
+                <a href="rib02-create.php?id=<?php echo $data['rib_id'] ?>&RowCode=<?= $RowCode ?>&CurrId=<?= $CurrId ?>&<?= $token_link ?>" class="btn btn-info btn-lg pull-right" style="margin: 1 rem;">
+                    <span class=" glyphicon glyphicon-plus"></span>
+                </a>
+            <?php
+            endif;
+            ?>
+            <table class="table table-striped table-bordered" style="width:100%">
+                <thead>
+                    <tr>
+                        <th>發票日期</th>
+                        <th>數量</th>
+                        <th>單價</th>
+                        <th>費用/產品</th>
+                        <th>原幣報銷金額</th>
+                        <th>說明</th>
+                        <th>發票號碼</th>
+                        <th style="width: 10%;">功能</th>
+
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php foreach ($pay_data as $pay) : ?>
+                        <tr>
+                            <td><?= $pay['FeeDate'] ?></td>
+                            <td><?= round($pay['Quantity']) ?></td>
+                            <td><?= round($pay['Price']) ?></td>
+                            <td><?php foreach ($feetype as $feetyp) {
+                                    if ($feetyp['FeeTypeId'] == $pay['FeeTypeId']) {
+                                        echo $feetyp['FeeTypeName'];
+                                    }
+                                } ?></td>
+                            <td><?= round($pay['OAmount']) ?></td>
+                            <td><?= $pay['FeeNoteShow'] ?></td>
+                            <td><?= $pay['InvoiceNo'] ?></td>
+                            <?php if ($state == 0) { ?>
+                                <td> <a href="rib02-edit.php?id=<?php echo $pay['ribsub_id'] ?>&state=0&<?= $token_link ?>" class="btn btn-warning btn-sm">
+                                        <span class=" glyphicon glyphicon-pencil"></span>
+                                    </a>
+                                    <a href="rib02-delete.php?ribsub_id=<?php echo $pay['ribsub_id'] ?>&rib_id=<?php echo $pay['rib_id'] ?>&<?= $token_link ?>" class="btn btn-danger btn-sm">
+                                        <span class=" glyphicon glyphicon-trash"></span>
+                                    </a>
+                                </td>
+                            <?php } elseif ($state == 1 && ($user_id == "M0056" || $user_id == "M0209")) { ?>
+                                <td><a href="rib02-edit.php?id=<?php echo $pay['ribsub_id'] ?>&state=1&<?= $token_link ?>" class="btn btn-warning btn-sm">
+                                        <span class=" glyphicon glyphicon-pencil"></span>
+                                    </a>
+                                    <a href="rib02-delete.php?ribsub_id=<?php echo $pay['ribsub_id'] ?>&rib_id=<?php echo $pay['rib_id'] ?>&<?= $token_link ?>" class="btn btn-danger btn-sm">
+                                        <span class=" glyphicon glyphicon-trash"></span>
+                                    </a>
+                                </td>
+
+                            <?php } else { ?>
+                                <td> <a href="rib02-check.php?id=<?php echo $pay['ribsub_id'] ?>&<?= $token_link ?>" class="btn btn-primary btn-sm">
+                                        <span class="glyphicon glyphicon-search"></span>
+                                    </a>
+                                </td>
+                            <?php
+                            } ?>
+                        </tr>
+                    <?php endforeach ?>
+                </tbody>
+            </table>
+        </div>
+    <?php
+    endif;
+    ?>
 </div>
\ No newline at end of file
diff --git a/wms/rib01-create.php b/wms/rib01-create.php
index a14a5700..78df79bc 100644
--- a/wms/rib01-create.php
+++ b/wms/rib01-create.php
@@ -33,7 +33,6 @@ foreach ($deptmem as $mem) {
     $username = $mem['Username'];
     $member["$userid"] = [$username];
 };
-// print_r($member);
 $sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE (DeptId!='0001')";
 $allpeople = $conn->query($sql_dept);
 foreach ($allpeople as $man) {
@@ -124,6 +123,9 @@ if ($MaxBillNo < 10) {
                     <option value="" style="display:flex" id="WriteOffoption">請選擇報銷人</option>
                     <?php
                     foreach ($member as $key => $value) { ?>
+                        <!-- <option value="<?php echo $value['UserId']; ?>" style="display:none" id="<?= 'WriteOff' . $value['UserId'] . $key ?>" <?php if ($value['UserId'] == $user_id) {
+                                                                                                                                                        echo "selected";
+                                                                                                                                                    } ?>> <?php echo $value['Username']; ?> </option> -->
                         <option value="<?php echo $key; ?>" id="<?= 'WriteOff' . $value[1] . "-" . $value[0] ?>" <?php if ($key == $user_id) {
                                                                                                                         echo "selected";
                                                                                                                     } ?>> <?php echo $value[0]; ?> </option>
@@ -140,18 +142,15 @@ if ($MaxBillNo < 10) {
             </div>
             <div class="col-md-3">
                 <label for="GatheringPersonId" style="color: red;">收款人</label>
-                <select name="GatheringPersonId" id="GatheringPersonId" class="form-control">
+                <select name="GatheringPersonId" id="GatheringPersonId" >
                     <option value="" style="display:flex" id="GatheringOption">請選擇收款人</option>
                     <?php
-                    // foreach ($deptmem as $key => $value) {
                     foreach ($member as $key => $value) {
                     ?>
-                        <!-- <option value="<?php echo $value['accountid']; ?>" id="<?= 'Gathering' . $value['department_id'] ?>" <?php if ($value['accountid'] == $user_id) {
-                                                                                                                                        echo "selected";
-                                                                                                                                    } ?>> <?php echo $value['name']; ?> </option> -->
-                        <option value="<?php echo $key; ?>" id="<?= 'Gathering' . $value[1] . "-" . $value[0] ?>" <?php if ($key == $user_id) {
+
+                        <option value="<?php echo $key; ?>" id="<?= 'Gathering' . $value[1] . "-" . $value[0] ?>" style="display:flex" <?php if ($key == $user_id) {
                                                                                                                         echo "selected";
-                                                                                                                    } ?>> <?php echo $value[0]; ?> </option>
+                                                                                                                    } ?>> <?php echo $key.$value[0]; ?> </option>
                     <?php }; ?>
                 </select>
             </div>
@@ -178,7 +177,12 @@ if ($MaxBillNo < 10) {
         </div>
     </form>
 </div>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script>
+    $(document).ready(function() {
+        $('#GatheringPersonId').selectize();
+    })
     $(function() {
         $("#DeptId").change(function() {
             changeWriteOffId($('#DeptId').val());
diff --git a/wms/rib01-delete.php b/wms/rib01-delete.php
index 9c726833..e850b9d2 100644
--- a/wms/rib01-delete.php
+++ b/wms/rib01-delete.php
@@ -1,71 +1,71 @@
-<?php
-include "./header.php";
-$rib_id = isset($_GET['id']) ? $_GET['id'] : die('ERROR:Rib_id is not found.');
-$state = isset($_GET['state'])?$_GET['state']:0;
-if ($state==1&& ($user_id == "M0056" || $user_id == "M0209")){
-    ?>
-    <script type="text/javascript">
-    
-    if (confirm("確定要退回此單據?")==true) {
-        <?php
-        $sql = "update rib SET CurrentState=5 WHERE rib_id= $rib_id";
-        $data = mysqli_query($link, $sql);
-        if ($data) {
-            echo "alert('表單退回')";
-        } else {
-            echo "alert('失敗')";
-        }
-        ?>
-    } else {
-        alert('取消操作')
-    }
-</script>
-<?php
-}
-elseif($state==1&& $user_id!="M0056" && $user_id!="M0209"){
-    ?>
-    <script type="text/javascript">
-    
-    if (confirm("確定要撤回此單據? \n 撤回後須 重新 登打一張單據")==true) {
-        <?php
-        $sql = "update rib SET CurrentState=3, LastOperatorId='$user_id' WHERE rib_id= $rib_id";
-        $data = mysqli_query($link, $sql);
-        if ($data) {
-            echo "alert('表單撤回')";
-        } else {
-            echo "alert('失敗')";
-        }
-        ?>
-    } else {
-        alert('取消操作')
-    }
-</script>
-<?php
-}
-elseif($state == 2){}
-else{
-?>
-<script type="text/javascript">
-    var check = confirm("確定要刪除此單據?")
-    if (check == true) {
-        <?php
-        $sql = "update rib SET CurrentState=3 WHERE rib_id= $rib_id";
-        $data = mysqli_query($link, $sql);
-        if ($data) {
-            echo "alert('成功刪除表單')";
-        } else {
-            echo "alert('刪除失敗')";
-        }
-        ?>
-    } else {
-        alert('取消操作')
-    }
-</script>
-
-<?php
-} ;
-?>
-<script>
-    url = "rib01-index.php?<?php echo $token_link ?>";
-    window.location.href = "rib01-index.php?<?= $token_link ?>";
+<?php
+include "./header.php";
+$rib_id = isset($_GET['id']) ? $_GET['id'] : die('ERROR:Rib_id is not found.');
+$state = isset($_GET['state'])?$_GET['state']:0;
+if ($state==1&& ($user_id == "M0056" || $user_id == "M0209")){
+    ?>
+    <script type="text/javascript">
+    
+    if (confirm("確定要退回此單據?")==true) {
+        <?php
+        $sql = "update rib SET CurrentState=5 WHERE rib_id= $rib_id";
+        $data = mysqli_query($link, $sql);
+        if ($data) {
+            echo "alert('表單退回')";
+        } else {
+            echo "alert('失敗')";
+        }
+        ?>
+    } else {
+        alert('取消操作')
+    }
+</script>
+<?php
+}
+elseif($state==1&& $user_id!="M0056" && $user_id!="M0209"){
+    ?>
+    <script type="text/javascript">
+    
+    if (confirm("確定要撤回此單據? \n 撤回後須 重新 登打一張單據")==true) {
+        <?php
+        $sql = "update rib SET CurrentState=3, LastOperatorId='$user_id' WHERE rib_id= $rib_id";
+        $data = mysqli_query($link, $sql);
+        if ($data) {
+            echo "alert('表單撤回')";
+        } else {
+            echo "alert('失敗')";
+        }
+        ?>
+    } else {
+        alert('取消操作')
+    }
+</script>
+<?php
+}
+elseif($state == 2){}
+else{
+?>
+<script type="text/javascript">
+    var check = confirm("確定要刪除此單據?")
+    if (check == true) {
+        <?php
+        $sql = "update rib SET CurrentState=3 WHERE rib_id= $rib_id";
+        $data = mysqli_query($link, $sql);
+        if ($data) {
+            echo "alert('成功刪除表單')";
+        } else {
+            echo "alert('刪除失敗')";
+        }
+        ?>
+    } else {
+        alert('取消操作')
+    }
+</script>
+
+<?php
+} ;
+?>
+<script>
+    url = "rib01-index.php?<?php echo $token_link ?>";
+    window.location.href = "rib01-index.php?<?= $token_link ?>";
 </script>
\ No newline at end of file
diff --git a/wms/rib01-edit.php b/wms/rib01-edit.php
index 65531ae1..e916daaf 100644
--- a/wms/rib01-edit.php
+++ b/wms/rib01-edit.php
@@ -1,331 +1,331 @@
-<?php
-include "./header.php";
-$rib_id = isset($_GET['id']) ? $_GET['id'] : die('ERROR:Rib_id is not found.');
-$state = isset($_GET['state']) ? $_GET['state'] : 0;
-$db_query = "SELECT * from rib where rib_id='$rib_id'";
-$res = mysqli_query($link, $db_query);
-
-// 找出使用者的部門
-// 取得部門代碼
-//取得人員名單
-
-// 連線T8MASADA 
-
-$member = array();
-
-//取得人員名單與使用者的部門
-$sql_mydept =  "SELECT UserId, Username FROM capMembership";
-$deptmem = $conn->query($sql_mydept);
-foreach ($deptmem as $mem) {
-    $userid = $mem['UserId'];
-    $username = $mem['Username'];
-    $member["$userid"] = [$username];
-};
-$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
-$allpeople = $conn->query($sql_dept);
-foreach ($allpeople as $man) {
-    if ($man['PersonId'] == $user_id) {
-        $mydepart = $man['DeptId'];
-    }
-    $personid = $man['PersonId'];
-    $depart = $man['DeptId'];
-    if (isset($member["$personid"])) {
-        array_push($member["$personid"], "$depart");
-    }
-}
-
-//取得部門代碼
-$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
-$deptype = $conn->query($sql_department);
-
-
-//取得 rib_sub的資料
-$pay_data = array();
-$pay_sql = "select * from rib_sub where rib_id = $rib_id";
-$pay_data = mysqli_query($link, $pay_sql);
-$totalOAmount = 0;
-$CurrLAmount = 0;
-if ($pay_data) {
-    foreach ($pay_data as $pdat) {
-        $totalOAmount += $pdat['OAmount'];
-        $CurrLAmount = $pdat['CurrentLAmount'];
-    }
-}
-
-?>
-
-<div style="width: 90%;">
-
-    <div style="padding-left: 2rem; padding-bottom: 1rem;">
-        <a href="rib01-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
-            <span class="glyphicon glyphicon-home"></span>
-        </a>
-    </div>
-</div>
-<div class="container" id="ribedit">
-    <div class="text-center">
-        <h3>報銷單據</h3>
-    </div>
-    <form class="form-horizontal" name="ribeditfrom" id="ribeditform" method="POST" action="rib01-submit.php?submit=edit&state=<?= $state ?>&<?= $token_link ?>" enctype="multipart/form-data">
-        <?php
-        foreach ($res as $data) :; ?>
-
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="BillNo">單據編號</label>
-                    <input class="form-control" type="text" name="BillNo" id="BillNo" value="<?php echo $data['BillNo'] ?>" disabled>
-
-                </div>
-                <div class="col-md-3">
-                    <label for="BillDate" style="color: red;">單據日期</label>
-                    <input class="form-control" type="number" name="BillDate" id="BillDate" value=<?= date('Ymd') ?> disabled>
-                </div>
-
-                <div class="col-md-3">
-                    <label for="CurrId" style="color: red;">幣別</label>
-                    <select name="CurrId" id="CurrId" class="form-control" <?php if ($state == 1) {
-                                                                                echo "disabled";
-                                                                            } ?>>
-                        <option value="TWD" <?php if ($data['CurrId'] === "TWD") {
-                                                echo "selected";
-                                            } ?>>台幣</option>
-                        <option value="CNY" <?php if ($data['CurrId'] === "CNY") {
-                                                echo "selected";
-                                            } ?>>人民幣</option>
-                        <option value="EUR" <?php if ($data['CurrId'] === "EUR") {
-                                                echo "selected";
-                                            } ?>>歐元</option>
-                        <option value="HKD" <?php if ($data['CurrId'] === "HKD") {
-                                                echo "selected";
-                                            } ?>>港幣</option>
-                        <option value="USD" <?php if ($data['CurrId'] === "USD") {
-                                                echo "selected";
-                                            } ?>>美元</option>
-                    </select>
-                </div>
-
-                <div class="col-md-3">
-                    <label for="TransactId" style="color: red;">經辦人</label>
-                    <select name="TransactId" id="TransactId" class="form-control" <?php if ($state == 1) {
-                                                                                        echo "disabled";
-                                                                                    } ?>>
-                        <option value="<?php echo $user_id; ?>"> <?php echo $user_name; ?> </option>
-                    </select>
-
-
-                </div>
-            </div>
-
-            <div class="form-group">
-
-                <!-- <div class="col-md-3">
-                    <label for="WriteOffType">報銷人類型</label>
-                    <select name="WriteOffType" id="WriteOffType" class="form-control">
-                        <option value=0 <?php if ($data['WriteOffType'] == 0) {
-                                            echo "selected";
-                                        } ?>>客戶</option>
-                        <option value=1 <?php if ($data['WriteOffType'] == 1) {
-                                            echo "selected";
-                                        } ?>>廠商</option>
-                        <option value=2 <?php if ($data['WriteOffType'] == 2) {
-                                            echo "selected";
-                                        } ?>>員工</option>
-                        <option value=3 <?php if ($data['WriteOffType'] == 3) {
-                                            echo "selected";
-                                        } ?>>其他</option>
-                        <option value=4 <?php if ($data['WriteOffType'] == 4) {
-                                            echo "selected";
-                                        } ?>>公司</option>
-                    </select>
-
-                </div> -->
-                <div class="col-md-3">
-                    <label for="DeptId" style="color: red;">報銷單位</label>
-                    <select name="DeptId" id="DeptId" class="form-control" required>
-                        <?php
-                        foreach ($deptype as $dept) { ?>
-                            <option value="<?php echo $dept['DeptId']; ?>" <?php
-                                                                            if ($dept['DeptId'] == $data['DeptId']) {
-                                                                                echo "selected";
-                                                                            } ?>><?php echo $dept['DeptName']; ?></option>
-                        <?php };
-                        ?>
-                    </select>
-                </div>
-
-
-                <div class="col-md-3">
-                    <label for="WriteOffId" style="color: red;">報銷人</label>
-                    <select name="WriteOffId" id="WriteOffId" class="form-control" required>
-                        <option value="" id="WriteOffOption">請選擇報銷人</option>
-                        <?php
-                        foreach ($member as $key => $value) { ?>
-                            <option value="<?php echo $key; ?>" id="<?= 'WriteOff' . $value[1] . $value[0] ?>" <?php if ($key == $data['WriteOffId']) {
-                                                                                                                    echo "selected";
-                                                                                                                } ?>> <?php echo $value[0]; ?> </option>
-                        <?php }
-                        ?>
-                    </select>
-                </div>
-                <div class="col-md-3">
-                    <label for="pay_type">付款方式</label>
-                    <select name="pay_type" id="pay_type" class="form-control" required <?php if ($state == 1) {
-                                                                                            echo "disabled";
-                                                                                        } ?>>
-                        <option value=0 <?php if ($data['pay_type'] == 0) {
-                                            echo "selected";
-                                        } ?>>現金</option>
-                        <option value=1 <?php if ($data['pay_type'] == 1) {
-                                            echo "selected";
-                                        } ?>>銀行轉帳</option>
-                    </select>
-                </div>
-
-                <div class="col-md-3">
-                    <label for="GatheringPersonId" style="color: red;">收款人</label>
-                    <select name="GatheringPersonId" id="GatheringPersonId" class="form-control" required <?php if ($state == 1) {
-                                                                                                                echo "disabled";
-                                                                                                            } ?>>
-                        <?php
-                        foreach ($member as $key => $value) {
-                        ?>
-                            <option value="<?php echo $key; ?>" id="<?= 'Gathering' . $value[1] . $value[0] ?>" <?php if ($key == $data['GatheringPersonId']) {
-                                                                                                                    echo "selected";
-                                                                                                                } ?>> <?php echo $value[0]; ?> </option>
-                        <?php }; ?>
-                    </select>
-                </div>
-
-
-
-            </div>
-
-            <div class="form-group">
-
-            </div>
-            <div class="form-group">
-                <?php
-                if (($user_id == "M0056" || $user_id == "M0209") && $state == 1) { ?>
-                    <div class="form-group">
-
-                        <div class="col-md-3">
-                            <label for="WriteOffAmount">報銷金額 (原幣)</label>
-                            <input name="WriteOffAmount" id="WriteOffAmount" class="form-control" type="number" value="<?= round($data['WriteOffAmount']) ?>" disabled>
-                        </div>
-                        <div class="col-md-3">
-                            <label for="OAmount">未稅報銷金額 (原幣)</label>
-                            <input name="OAmount" id="OAmount" class="form-control" value="<?= round($data['OAmount']) ?>" disabled>
-                        </div>
-                        <div class="col-md-3">
-                            <label for="OTax">稅金 (原幣)</label>
-                            <input name="OTax" id="OTax" class="form-control" value="<?= round($data['OTax']) ?>" disabled>
-                        </div>
-                        <div class="col-md-3">
-                            <label for="CurrentLAmount">匯率</label>
-                            <input name="CurrentLAmount" id="CurrentLAmount" class="form-control" value="<?= round($CurrLAmount) ?>" disabled>
-                        </div>
-
-                    </div>
-                    <div class="form-group">
-
-                        <div class="col-md-3">
-                            <label for="LAmountWithTax">本幣報銷金額</label>
-                            <input name="LAmountWithTax" id="LAmountWithTax" class="form-control" type="number" value="<?= round($data['LAmountWithTax']) ?>" disabled>
-                        </div>
-                        <div class="col-md-3">
-                            <label for="LAmount">本幣未稅報銷金額</label>
-                            <input name="LAmount" id="LAmount" class="form-control" value="<?= round($data['LAmount']) ?>" disabled>
-                        </div>
-                        <div class="col-md-3">
-                            <label for="LTax">本幣稅金</label>
-                            <input name="LTax" id="LTax" class="form-control" value="<?= round($data['LTax']) ?>" disabled>
-                        </div>
-                    </div>
-                <?php
-                } else { ?>
-                    <div class="form-group">
-                        <div class="col-md-3">
-                            <label for="totalOAmount">報銷金額 (原幣)</label>
-                            <input name="totalOAmount" id="totalOAmount" class="form-control" type="number" value="<?= round($totalOAmount) ?>" disabled>
-                        </div>
-                    </div>
-                <?php
-                } ?>
-                <div class="form-group">
-                    <input type="hidden" name="token" value="<?php echo $token; ?>">
-                    <input type="hidden" name="type" id="type" value="rib">
-                    <input type="hidden" name="rib_id" id="rib_id" value="<?= $rib_id ?>">
-                </div>
-            <?php
-        endforeach
-            ?>
-
-
-            <div class="form-group">
-                <div class="col-md-7">
-
-                </div>
-                <div class="col-md-5">
-                    <button onclick="sendedit()" type="button" class="btn btn-primary btn-lg pull-right">暫存報銷單據</button>
-                </div>
-            </div>
-    </form>
-</div>
-<script>
-    $(function() {
-        $('#DeptId').change(function() {
-            changeWriteOffId($('#DeptId').val());
-        })
-    })
-
-    function changeWriteOffId(SelectedDept) {
-        var GatheringSelectDeptId = 'Gathering' + SelectedDept;
-        var SelectDeptId = 'WriteOff' + SelectedDept;
-        for (var i = 0; i < WriteOffId.options.length; i++) {
-            WriteOffId.options[i].selected = false;
-            let thisid = WriteOffId.options[i].id
-            if (thisid.search(SelectDeptId) === 0) {
-                WriteOffId.options[i].style['display'] = '';
-            } else {
-                WriteOffId.options[i].style['display'] = 'none';
-            };
-
-        };
-
-        for (var j = 0; j < GatheringPersonId.options.length; j++) {
-            let Gatherid = GatheringPersonId.options[j].id
-            if (Gatherid.search(GatheringSelectDeptId) === 0 || GatheringPersonId.options[j].value === "<?= $user_id ?>") {
-                GatheringPersonId.options[j].style['display'] = '';
-            } else {
-                GatheringPersonId.options[j].style['display'] = 'none';
-            };
-        }
-    };
-
-    function sendedit() {
-        $("#BillNo").prop("disabled", false);
-        $("#CurrId").prop("disabled", false);
-        $("#TransactId").prop("disabled", false);
-        $("#WriteOffType").prop("disabled", false);
-        $("#DeptId").prop("disabled", false);
-        $("#WriteOffId").prop("disabled", false);
-        $("#pay_type").prop("disabled", false);
-        $("#GatheringPersonId").prop("disabled", false);
-        $("#TelNo").prop("disabled", false);
-        $("#BankId").prop("disabled", false);
-        $("#BankAccount").prop("disabled", false);
-        $("#BankAccountName").prop("disabled", false);
-        $("#WriteOffAmount").prop("disabled", false);
-        $("#OAmount").prop("disabled", false);
-        $("#OTax").prop("disabled", false);
-        $("#CurrentLAmount").prop("disabled", false);
-        $("#LAmountWithTax").prop("disabled", false);
-        $("#LAmount").prop("disabled", false);
-        $("#LTax").prop("disabled", false);
-        $("#totalOAmount").prop("disabled", false);
-        $('#ribeditform').submit();
-    }
-</script>
-<?php
-
-include "./footer.php";
+<?php
+include "./header.php";
+$rib_id = isset($_GET['id']) ? $_GET['id'] : die('ERROR:Rib_id is not found.');
+$state = isset($_GET['state']) ? $_GET['state'] : 0;
+$db_query = "SELECT * from rib where rib_id='$rib_id'";
+$res = mysqli_query($link, $db_query);
+
+// 找出使用者的部門
+// 取得部門代碼
+//取得人員名單
+
+// 連線T8MASADA 
+
+$member = array();
+
+//取得人員名單與使用者的部門
+$sql_mydept =  "SELECT UserId, Username FROM capMembership";
+$deptmem = $conn->query($sql_mydept);
+foreach ($deptmem as $mem) {
+    $userid = $mem['UserId'];
+    $username = $mem['Username'];
+    $member["$userid"] = [$username];
+};
+$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
+$allpeople = $conn->query($sql_dept);
+foreach ($allpeople as $man) {
+    if ($man['PersonId'] == $user_id) {
+        $mydepart = $man['DeptId'];
+    }
+    $personid = $man['PersonId'];
+    $depart = $man['DeptId'];
+    if (isset($member["$personid"])) {
+        array_push($member["$personid"], "$depart");
+    }
+}
+
+//取得部門代碼
+$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
+$deptype = $conn->query($sql_department);
+
+
+//取得 rib_sub的資料
+$pay_data = array();
+$pay_sql = "select * from rib_sub where rib_id = $rib_id";
+$pay_data = mysqli_query($link, $pay_sql);
+$totalOAmount = 0;
+$CurrLAmount = 0;
+if ($pay_data) {
+    foreach ($pay_data as $pdat) {
+        $totalOAmount += $pdat['OAmount'];
+        $CurrLAmount = $pdat['CurrentLAmount'];
+    }
+}
+
+?>
+
+<div style="width: 90%;">
+
+    <div style="padding-left: 2rem; padding-bottom: 1rem;">
+        <a href="rib01-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
+            <span class="glyphicon glyphicon-home"></span>
+        </a>
+    </div>
+</div>
+<div class="container" id="ribedit">
+    <div class="text-center">
+        <h3>報銷單據</h3>
+    </div>
+    <form class="form-horizontal" name="ribeditfrom" id="ribeditform" method="POST" action="rib01-submit.php?submit=edit&state=<?= $state ?>&<?= $token_link ?>" enctype="multipart/form-data">
+        <?php
+        foreach ($res as $data) :; ?>
+
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="BillNo">單據編號</label>
+                    <input class="form-control" type="text" name="BillNo" id="BillNo" value="<?php echo $data['BillNo'] ?>" disabled>
+
+                </div>
+                <div class="col-md-3">
+                    <label for="BillDate" style="color: red;">單據日期</label>
+                    <input class="form-control" type="number" name="BillDate" id="BillDate" value=<?= date('Ymd') ?> disabled>
+                </div>
+
+                <div class="col-md-3">
+                    <label for="CurrId" style="color: red;">幣別</label>
+                    <select name="CurrId" id="CurrId" class="form-control" <?php if ($state == 1) {
+                                                                                echo "disabled";
+                                                                            } ?>>
+                        <option value="TWD" <?php if ($data['CurrId'] === "TWD") {
+                                                echo "selected";
+                                            } ?>>台幣</option>
+                        <option value="CNY" <?php if ($data['CurrId'] === "CNY") {
+                                                echo "selected";
+                                            } ?>>人民幣</option>
+                        <option value="EUR" <?php if ($data['CurrId'] === "EUR") {
+                                                echo "selected";
+                                            } ?>>歐元</option>
+                        <option value="HKD" <?php if ($data['CurrId'] === "HKD") {
+                                                echo "selected";
+                                            } ?>>港幣</option>
+                        <option value="USD" <?php if ($data['CurrId'] === "USD") {
+                                                echo "selected";
+                                            } ?>>美元</option>
+                    </select>
+                </div>
+
+                <div class="col-md-3">
+                    <label for="TransactId" style="color: red;">經辦人</label>
+                    <select name="TransactId" id="TransactId" class="form-control" <?php if ($state == 1) {
+                                                                                        echo "disabled";
+                                                                                    } ?>>
+                        <option value="<?php echo $user_id; ?>"> <?php echo $user_name; ?> </option>
+                    </select>
+
+
+                </div>
+            </div>
+
+            <div class="form-group">
+
+                <!-- <div class="col-md-3">
+                    <label for="WriteOffType">報銷人類型</label>
+                    <select name="WriteOffType" id="WriteOffType" class="form-control">
+                        <option value=0 <?php if ($data['WriteOffType'] == 0) {
+                                            echo "selected";
+                                        } ?>>客戶</option>
+                        <option value=1 <?php if ($data['WriteOffType'] == 1) {
+                                            echo "selected";
+                                        } ?>>廠商</option>
+                        <option value=2 <?php if ($data['WriteOffType'] == 2) {
+                                            echo "selected";
+                                        } ?>>員工</option>
+                        <option value=3 <?php if ($data['WriteOffType'] == 3) {
+                                            echo "selected";
+                                        } ?>>其他</option>
+                        <option value=4 <?php if ($data['WriteOffType'] == 4) {
+                                            echo "selected";
+                                        } ?>>公司</option>
+                    </select>
+
+                </div> -->
+                <div class="col-md-3">
+                    <label for="DeptId" style="color: red;">報銷單位</label>
+                    <select name="DeptId" id="DeptId" class="form-control" required>
+                        <?php
+                        foreach ($deptype as $dept) { ?>
+                            <option value="<?php echo $dept['DeptId']; ?>" <?php
+                                                                            if ($dept['DeptId'] == $data['DeptId']) {
+                                                                                echo "selected";
+                                                                            } ?>><?php echo $dept['DeptName']; ?></option>
+                        <?php };
+                        ?>
+                    </select>
+                </div>
+
+
+                <div class="col-md-3">
+                    <label for="WriteOffId" style="color: red;">報銷人</label>
+                    <select name="WriteOffId" id="WriteOffId" class="form-control" required>
+                        <option value="" id="WriteOffOption">請選擇報銷人</option>
+                        <?php
+                        foreach ($member as $key => $value) { ?>
+                            <option value="<?php echo $key; ?>" id="<?= 'WriteOff' . $value[1] . $value[0] ?>" <?php if ($key == $data['WriteOffId']) {
+                                                                                                                    echo "selected";
+                                                                                                                } ?>> <?php echo $value[0]; ?> </option>
+                        <?php }
+                        ?>
+                    </select>
+                </div>
+                <div class="col-md-3">
+                    <label for="pay_type">付款方式</label>
+                    <select name="pay_type" id="pay_type" class="form-control" required <?php if ($state == 1) {
+                                                                                            echo "disabled";
+                                                                                        } ?>>
+                        <option value=0 <?php if ($data['pay_type'] == 0) {
+                                            echo "selected";
+                                        } ?>>現金</option>
+                        <option value=1 <?php if ($data['pay_type'] == 1) {
+                                            echo "selected";
+                                        } ?>>銀行轉帳</option>
+                    </select>
+                </div>
+
+                <div class="col-md-3">
+                    <label for="GatheringPersonId" style="color: red;">收款人</label>
+                    <select name="GatheringPersonId" id="GatheringPersonId" class="form-control" required <?php if ($state == 1) {
+                                                                                                                echo "disabled";
+                                                                                                            } ?>>
+                        <?php
+                        foreach ($member as $key => $value) {
+                        ?>
+                            <option value="<?php echo $key; ?>" id="<?= 'Gathering' . $value[1] . $value[0] ?>" <?php if ($key == $data['GatheringPersonId']) {
+                                                                                                                    echo "selected";
+                                                                                                                } ?>> <?php echo $value[0]; ?> </option>
+                        <?php }; ?>
+                    </select>
+                </div>
+
+
+
+            </div>
+
+            <div class="form-group">
+
+            </div>
+            <div class="form-group">
+                <?php
+                if (($user_id == "M0056" || $user_id == "M0209") && $state == 1) { ?>
+                    <div class="form-group">
+
+                        <div class="col-md-3">
+                            <label for="WriteOffAmount">報銷金額 (原幣)</label>
+                            <input name="WriteOffAmount" id="WriteOffAmount" class="form-control" type="number" value="<?= round($data['WriteOffAmount']) ?>" disabled>
+                        </div>
+                        <div class="col-md-3">
+                            <label for="OAmount">未稅報銷金額 (原幣)</label>
+                            <input name="OAmount" id="OAmount" class="form-control" value="<?= round($data['OAmount']) ?>" disabled>
+                        </div>
+                        <div class="col-md-3">
+                            <label for="OTax">稅金 (原幣)</label>
+                            <input name="OTax" id="OTax" class="form-control" value="<?= round($data['OTax']) ?>" disabled>
+                        </div>
+                        <div class="col-md-3">
+                            <label for="CurrentLAmount">匯率</label>
+                            <input name="CurrentLAmount" id="CurrentLAmount" class="form-control" value="<?= round($CurrLAmount) ?>" disabled>
+                        </div>
+
+                    </div>
+                    <div class="form-group">
+
+                        <div class="col-md-3">
+                            <label for="LAmountWithTax">本幣報銷金額</label>
+                            <input name="LAmountWithTax" id="LAmountWithTax" class="form-control" type="number" value="<?= round($data['LAmountWithTax']) ?>" disabled>
+                        </div>
+                        <div class="col-md-3">
+                            <label for="LAmount">本幣未稅報銷金額</label>
+                            <input name="LAmount" id="LAmount" class="form-control" value="<?= round($data['LAmount']) ?>" disabled>
+                        </div>
+                        <div class="col-md-3">
+                            <label for="LTax">本幣稅金</label>
+                            <input name="LTax" id="LTax" class="form-control" value="<?= round($data['LTax']) ?>" disabled>
+                        </div>
+                    </div>
+                <?php
+                } else { ?>
+                    <div class="form-group">
+                        <div class="col-md-3">
+                            <label for="totalOAmount">報銷金額 (原幣)</label>
+                            <input name="totalOAmount" id="totalOAmount" class="form-control" type="number" value="<?= round($totalOAmount) ?>" disabled>
+                        </div>
+                    </div>
+                <?php
+                } ?>
+                <div class="form-group">
+                    <input type="hidden" name="token" value="<?php echo $token; ?>">
+                    <input type="hidden" name="type" id="type" value="rib">
+                    <input type="hidden" name="rib_id" id="rib_id" value="<?= $rib_id ?>">
+                </div>
+            <?php
+        endforeach
+            ?>
+
+
+            <div class="form-group">
+                <div class="col-md-7">
+
+                </div>
+                <div class="col-md-5">
+                    <button onclick="sendedit()" type="button" class="btn btn-primary btn-lg pull-right">暫存報銷單據</button>
+                </div>
+            </div>
+    </form>
+</div>
+<script>
+    $(function() {
+        $('#DeptId').change(function() {
+            changeWriteOffId($('#DeptId').val());
+        })
+    })
+
+    function changeWriteOffId(SelectedDept) {
+        var GatheringSelectDeptId = 'Gathering' + SelectedDept;
+        var SelectDeptId = 'WriteOff' + SelectedDept;
+        for (var i = 0; i < WriteOffId.options.length; i++) {
+            WriteOffId.options[i].selected = false;
+            let thisid = WriteOffId.options[i].id
+            if (thisid.search(SelectDeptId) === 0) {
+                WriteOffId.options[i].style['display'] = '';
+            } else {
+                WriteOffId.options[i].style['display'] = 'none';
+            };
+
+        };
+
+        for (var j = 0; j < GatheringPersonId.options.length; j++) {
+            let Gatherid = GatheringPersonId.options[j].id
+            if (Gatherid.search(GatheringSelectDeptId) === 0 || GatheringPersonId.options[j].value === "<?= $user_id ?>") {
+                GatheringPersonId.options[j].style['display'] = '';
+            } else {
+                GatheringPersonId.options[j].style['display'] = 'none';
+            };
+        }
+    };
+
+    function sendedit() {
+        $("#BillNo").prop("disabled", false);
+        $("#CurrId").prop("disabled", false);
+        $("#TransactId").prop("disabled", false);
+        $("#WriteOffType").prop("disabled", false);
+        $("#DeptId").prop("disabled", false);
+        $("#WriteOffId").prop("disabled", false);
+        $("#pay_type").prop("disabled", false);
+        $("#GatheringPersonId").prop("disabled", false);
+        $("#TelNo").prop("disabled", false);
+        $("#BankId").prop("disabled", false);
+        $("#BankAccount").prop("disabled", false);
+        $("#BankAccountName").prop("disabled", false);
+        $("#WriteOffAmount").prop("disabled", false);
+        $("#OAmount").prop("disabled", false);
+        $("#OTax").prop("disabled", false);
+        $("#CurrentLAmount").prop("disabled", false);
+        $("#LAmountWithTax").prop("disabled", false);
+        $("#LAmount").prop("disabled", false);
+        $("#LTax").prop("disabled", false);
+        $("#totalOAmount").prop("disabled", false);
+        $('#ribeditform').submit();
+    }
+</script>
+<?php
+
+include "./footer.php";
diff --git a/wms/rib01-index.php b/wms/rib01-index.php
index 81bb5fe3..c4dd0f49 100644
--- a/wms/rib01-index.php
+++ b/wms/rib01-index.php
@@ -1,221 +1,221 @@
-<?php
-ini_set('display_errors', 'on');
-include "./header.php";
-
-// 設置一個空陣列來放資料
-$data = array();
-// sql語法存在變數中
-$sql = "select * from rib ";
-
-// 是否為會計 阿娥 
-if (($user_id == "M0056" || $user_id == "M0209")) {
-    $sql .= "WHERE ((CurrentState =1) or (TransactId= '$user_id') or (WriteOffId='$user_id') or (GatheringPersonId='$user_id'))";
-    $data = mysqli_query($link, $sql);
-} else {
-
-    // 找下屬
-    $follower = [];
-    $follower = find_follow('$user_id');
-
-    if (count($follower) > 0) {
-        echo "有下屬";
-        $column_str = "('$user_id'" . ",'";
-        $column_str .= implode("','", $follower);
-        $column_str .= "')";
-        $sql .= "WHERE ((TransactId in $column_str) or (WriteOffId in $column_str) or (GatheringPersonId in $column_str))";
-    } else {
-
-        $sql .= "WHERE ((TransactId= '$user_id') or (WriteOffId='$user_id') or (GatheringPersonId='$user_id'))";
-    };
-    $data = mysqli_query($link, $sql);
-}
-// 取得部門代碼
-$sql_depid = "SELECT department_id, name from department";
-$dept_query = mysqli_query($link, $sql_depid);
-$deptype = mysqli_fetch_all($dept_query, MYSQLI_ASSOC);
-
-?>
-<!-- 
-新增單據 -->
-<p>
-    <a href="rib01-create.php?<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-        <span class="glyphicon glyphicon-plus"></span>
-    </a>
-</p>
-
-<?php
-if ($data) :
-?>
-
-    <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;
-
-        }
-    </style>
-    <div style="width:98% ;margin: 1%">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-            <thead>
-                <tr>
-                    <th>單據編號</th>
-                    <th>單據日期</th>
-                    <th>付款方式</th>
-                    <th>經辦人</th>
-                    <th>報銷部門</th>
-                    <th>報銷人</th>
-                    <th>幣別</th>
-                    <?php
-                    if (($user_id == "M0056" || $user_id == "M0209")) { ?>
-                        <th>報銷金額</th>
-                    <?php } ?>
-                    <th style="width: 8%;">狀態</th>
-                    <th style="width: 7%;">功能</th>
-                </tr>
-            </thead>
-            <tbody>
-
-                <?php foreach ($data as $data) : ?>
-                    <tr>
-                        <td><?php echo $data['BillNo']; ?></td>
-                        <td><?php echo substr($data['BillDate'], 0, 10); ?></td>
-                        <td><?php if ($data['pay_type'] == 0) {
-                                echo "現金";
-                            } elseif ($data['pay_type'] == 1) {
-                                echo "銀行轉帳";
-                            }; ?></td>
-                        <td><?php echo accountidToName($data['TransactId']); ?></td>
-                        <td><?php foreach ($deptype as $dept) {
-                                if ($data["DeptId"] == $dept['department_id']) {
-                                    echo $dept['name'];
-                                    break;
-                                }
-                            } ?></td>
-                        <td><?php echo accountidToName($data['WriteOffId']); ?></td>
-                        <td><?php if ($data['CurrId'] == "USD") : echo "美金";
-                            elseif ($data['CurrId'] == "TWD") : echo "台幣";
-                            elseif ($data['CurrId'] == "CNY") : echo "人民幣";
-                            elseif ($data['CurrId'] == "HKD") : echo "港幣";
-                            elseif ($data['CurrId'] == "EUR") : echo "歐元";
-                            endif;    ?> </td>
-                        <?php
-                        if (($user_id == "M0056" || $user_id == "M0209")) { ?>
-                            <td><?php echo $data['OAmountWithTax']; ?> </td>
-                        <?php } ?>
-                        <td><?php if ($data['CurrentState'] == 0) : echo "草稿";
-                            elseif ($data['CurrentState'] == 1) : echo "審核中";
-                            elseif ($data['CurrentState'] == 2) : echo "通過";
-                            elseif ($data['CurrentState'] == 3) : echo "作廢";
-                            elseif ($data['CurrentState'] == 5) : echo "退回";
-                            else : echo "結案";
-                            endif ?>
-                        </td>
-                        <td>
-                            <p>
-                                <?php if (($user_id == "M0056" || $user_id == "M0209") && $data['CurrentState'] == 1) {
-                                ?>
-                                    <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=1&<?= $token_link ?>" class="btn btn-success btn-sm">
-                                        <span class="glyphicon glyphicon-pawn"></span>
-                                    </a>
-                                <?php
-                                } else { ?>
-                                    <?php if ($data['CurrentState'] == 0) : ?>
-                                        <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=0&<?= $token_link ?>" class="btn btn-warning btn-sm">
-                                            <span class="glyphicon glyphicon-pencil"></span>
-                                        </a>
-                                    <?php elseif ($data['CurrentState'] == 1) : ?>
-                                        <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=1&<?= $token_link ?>" class="btn btn-primary btn-sm">
-                                            <span class=" glyphicon glyphicon-search"></span>
-                                        </a>
-                                        <button type="button" onclick="download(<?= $data['rib_id'] ?>)" class="btn btn-info btn-sm"><span class="glyphicon glyphicon-download-alt"></span></button>
-                                        <!-- <a href="rib03-download.php?id=<?php echo $data['rib_id'] ?>&<?= $token_link ?>" class="btn btn-info btn-sm">
-                                            <span class="glyphicon glyphicon-download-alt"></span>
-                                        </a> -->
-                                    <?php elseif ($data['CurrentState'] == 2) : ?>
-                                        <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=2&<?= $token_link ?>" class="btn btn-info btn-sm">
-                                            <span class=" glyphicon glyphicon-ok"></span>
-                                        </a>
-                                    <?php elseif ($data['CurrentState'] == 3) : ?>
-                                        <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=2&<?= $token_link ?>" class="btn btn-primary btn-sm">
-                                            <span class="glyphicon glyphicon-search"></span>
-                                        </a>
-                                    <?php elseif ($data['CurrentState'] == 5) : ?>
-                                        <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=2&<?= $token_link ?>" class="btn btn-primary btn-sm">
-                                            <span class="glyphicon glyphicon-search"></span>
-                                        </a>
-                                <?php endif;
-                                } ?>
-
-                            </p>
-                        </td>
-                    </tr>
-                <?php endforeach; ?>
-            </tbody>
-        </table>
-    </div>
-    <script>
-        function download(ribid) {
-            var xhr = new XMLHttpRequest();
-            var url = window.location.origin + "/wms/rib03-download.php?ribid=" + ribid + "&<?= $token_link ?>";
-            xhr.open('GET', url, true);
-            xhr.send();
-            xhr.responseType = 'text';
-            xhr.onload = function() {
-                if (xhr.status === 200) {
-                    console.log("ok");
-                    var file_path = xhr.responseText;
-                    var link = document.createElement('a');
-                    link.setAttribute('href', window.location.origin + "/wms/WriteOff.xlsx");
-                    link.setAttribute('download', '費用報銷單.xlsx');
-                    link.style.display = 'none';
-                    document.body.appendChild(link);
-                    link.click();
-                    document.body.removeChild(link);
-                    // window.open('rib-test.php','-----');
-                }
-            };
-
-        }
-        // function openpdf(ribid){
-        //     window.open('rib-test.php','-----');
-
-        // }
-    </script>
-
-<?php
-else :
-    echo "<h2>There is no record!</h2>";
-endif;
-
-include "./footer.php";
+<?php
+ini_set('display_errors', 'on');
+include "./header.php";
+
+// 設置一個空陣列來放資料
+$data = array();
+// sql語法存在變數中
+$sql = "select * from rib ";
+
+// 是否為會計 阿娥 
+if (($user_id == "M0056" || $user_id == "M0209")) {
+    $sql .= "WHERE ((CurrentState =1) or (TransactId= '$user_id') or (WriteOffId='$user_id') or (GatheringPersonId='$user_id'))";
+    $data = mysqli_query($link, $sql);
+} else {
+
+    // 找下屬
+    $follower = [];
+    $follower = find_follow('$user_id');
+
+    if (count($follower) > 0) {
+        echo "有下屬";
+        $column_str = "('$user_id'" . ",'";
+        $column_str .= implode("','", $follower);
+        $column_str .= "')";
+        $sql .= "WHERE ((TransactId in $column_str) or (WriteOffId in $column_str) or (GatheringPersonId in $column_str))";
+    } else {
+
+        $sql .= "WHERE ((TransactId= '$user_id') or (WriteOffId='$user_id') or (GatheringPersonId='$user_id'))";
+    };
+    $data = mysqli_query($link, $sql);
+}
+// 取得部門代碼
+$sql_depid = "SELECT department_id, name from department";
+$dept_query = mysqli_query($link, $sql_depid);
+$deptype = mysqli_fetch_all($dept_query, MYSQLI_ASSOC);
+
+?>
+<!-- 
+新增單據 -->
+<p>
+    <a href="rib01-create.php?<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+        <span class="glyphicon glyphicon-plus"></span>
+    </a>
+</p>
+
+<?php
+if ($data) :
+?>
+
+    <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;
+
+        }
+    </style>
+    <div style="width:98% ;margin: 1%">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+            <thead>
+                <tr>
+                    <th>單據編號</th>
+                    <th>單據日期</th>
+                    <th>付款方式</th>
+                    <th>經辦人</th>
+                    <th>報銷部門</th>
+                    <th>報銷人</th>
+                    <th>幣別</th>
+                    <?php
+                    if (($user_id == "M0056" || $user_id == "M0209")) { ?>
+                        <th>報銷金額</th>
+                    <?php } ?>
+                    <th style="width: 8%;">狀態</th>
+                    <th style="width: 7%;">功能</th>
+                </tr>
+            </thead>
+            <tbody>
+
+                <?php foreach ($data as $data) : ?>
+                    <tr>
+                        <td><?php echo $data['BillNo']; ?></td>
+                        <td><?php echo substr($data['BillDate'], 0, 10); ?></td>
+                        <td><?php if ($data['pay_type'] == 0) {
+                                echo "現金";
+                            } elseif ($data['pay_type'] == 1) {
+                                echo "銀行轉帳";
+                            }; ?></td>
+                        <td><?php echo accountidToName($data['TransactId']); ?></td>
+                        <td><?php foreach ($deptype as $dept) {
+                                if ($data["DeptId"] == $dept['department_id']) {
+                                    echo $dept['name'];
+                                    break;
+                                }
+                            } ?></td>
+                        <td><?php echo accountidToName($data['WriteOffId']); ?></td>
+                        <td><?php if ($data['CurrId'] == "USD") : echo "美金";
+                            elseif ($data['CurrId'] == "TWD") : echo "台幣";
+                            elseif ($data['CurrId'] == "CNY") : echo "人民幣";
+                            elseif ($data['CurrId'] == "HKD") : echo "港幣";
+                            elseif ($data['CurrId'] == "EUR") : echo "歐元";
+                            endif;    ?> </td>
+                        <?php
+                        if (($user_id == "M0056" || $user_id == "M0209")) { ?>
+                            <td><?php echo $data['OAmountWithTax']; ?> </td>
+                        <?php } ?>
+                        <td><?php if ($data['CurrentState'] == 0) : echo "草稿";
+                            elseif ($data['CurrentState'] == 1) : echo "審核中";
+                            elseif ($data['CurrentState'] == 2) : echo "通過";
+                            elseif ($data['CurrentState'] == 3) : echo "作廢";
+                            elseif ($data['CurrentState'] == 5) : echo "退回";
+                            else : echo "結案";
+                            endif ?>
+                        </td>
+                        <td>
+                            <p>
+                                <?php if (($user_id == "M0056" || $user_id == "M0209") && $data['CurrentState'] == 1) {
+                                ?>
+                                    <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=1&<?= $token_link ?>" class="btn btn-success btn-sm">
+                                        <span class="glyphicon glyphicon-pawn"></span>
+                                    </a>
+                                <?php
+                                } else { ?>
+                                    <?php if ($data['CurrentState'] == 0) : ?>
+                                        <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=0&<?= $token_link ?>" class="btn btn-warning btn-sm">
+                                            <span class="glyphicon glyphicon-pencil"></span>
+                                        </a>
+                                    <?php elseif ($data['CurrentState'] == 1) : ?>
+                                        <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=1&<?= $token_link ?>" class="btn btn-primary btn-sm">
+                                            <span class=" glyphicon glyphicon-search"></span>
+                                        </a>
+                                        <button type="button" onclick="download(<?= $data['rib_id'] ?>)" class="btn btn-info btn-sm"><span class="glyphicon glyphicon-download-alt"></span></button>
+                                        <!-- <a href="rib03-download.php?id=<?php echo $data['rib_id'] ?>&<?= $token_link ?>" class="btn btn-info btn-sm">
+                                            <span class="glyphicon glyphicon-download-alt"></span>
+                                        </a> -->
+                                    <?php elseif ($data['CurrentState'] == 2) : ?>
+                                        <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=2&<?= $token_link ?>" class="btn btn-info btn-sm">
+                                            <span class=" glyphicon glyphicon-ok"></span>
+                                        </a>
+                                    <?php elseif ($data['CurrentState'] == 3) : ?>
+                                        <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=2&<?= $token_link ?>" class="btn btn-primary btn-sm">
+                                            <span class="glyphicon glyphicon-search"></span>
+                                        </a>
+                                    <?php elseif ($data['CurrentState'] == 5) : ?>
+                                        <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=2&<?= $token_link ?>" class="btn btn-primary btn-sm">
+                                            <span class="glyphicon glyphicon-search"></span>
+                                        </a>
+                                <?php endif;
+                                } ?>
+
+                            </p>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+        </table>
+    </div>
+    <script>
+        function download(ribid) {
+            var xhr = new XMLHttpRequest();
+            var url = window.location.origin + "/wms/rib03-download.php?ribid=" + ribid + "&<?= $token_link ?>";
+            xhr.open('GET', url, true);
+            xhr.send();
+            xhr.responseType = 'text';
+            xhr.onload = function() {
+                if (xhr.status === 200) {
+                    console.log("ok");
+                    var file_path = xhr.responseText;
+                    var link = document.createElement('a');
+                    link.setAttribute('href', window.location.origin + "/wms/WriteOff.xlsx");
+                    link.setAttribute('download', '費用報銷單.xlsx');
+                    link.style.display = 'none';
+                    document.body.appendChild(link);
+                    link.click();
+                    document.body.removeChild(link);
+                    // window.open('rib-test.php','-----');
+                }
+            };
+
+        }
+        // function openpdf(ribid){
+        //     window.open('rib-test.php','-----');
+
+        // }
+    </script>
+
+<?php
+else :
+    echo "<h2>There is no record!</h2>";
+endif;
+
+include "./footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/rib01-submit.php b/wms/rib01-submit.php
index 281d4eca..82bc134e 100644
--- a/wms/rib01-submit.php
+++ b/wms/rib01-submit.php
@@ -1,104 +1,104 @@
-<?php
-include "./header.php";
-
-
-$submit = $_GET['submit'];
-$current_date = date('Y-m-d H:i:s');
-$state = $_GET['state'];
-
-$rib_id = empty($_POST['rib_id']) ? NULL : $_POST['rib_id'];
-$BillNo = empty($_POST["BillNo"]) ? NULL : $_POST['BillNo'];
-$BillDate = intval(date('Ymd'));
-$CurrId = $_POST["CurrId"];
-$TransactId = $_POST["TransactId"];
-$pay_type = $_POST['pay_type'];
-$WriteOffType = 2;
-$DeptId = $_POST["DeptId"];
-$WriteOffId = $_POST["WriteOffId"];
-$GatheringPersonId = empty($_POST["GatheringPersonId"]) ? NULL : $_POST["GatheringPersonId"];
-$OAmountWithTax = empty($_POST["OAmountWithTax"]) ? NULL : $_POST["OAmountWithTax"];
-$CostCenterId = empty($_POST["CostCenterId"]) ? NULL : $_POST["CostCenterId"];
-//連線T8MASADA 取得收款人銀行帳戶資料
-
-$sql = "SELECT * FROM comCompanyPersonAccountSetting WHERE PersonId='$GatheringPersonId'";
-$bank = $conn->query($sql);
-$conn = null;
-while ($bankInfo = $bank->fetch(PDO::FETCH_ASSOC)) {
-    $BankId = $bankInfo['BankId'];
-    $BankName = $bankInfo['BankName'];
-    $BankAccount = $bankInfo['BankAccount'];
-    $BankAccountName = $bankInfo['AccountName'];
-}
-
-$SQL1 = "";
-
-if ($submit == "edit") {
-    $SQL1 = "UPDATE rib SET BillDate=$BillDate, CurrId='$CurrId', TransactId='$TransactId',
-    WriteOffType=$WriteOffType, DeptId='$DeptId', WriteOffId='$WriteOffId',GatheringPersonId='$GatheringPersonId',pay_type=$pay_type,LastOperatorId='$user_id'";
-    $SQL1 .= empty($BankId) ? "" : ", BankId= '$BankId'";
-    $SQL1 .= empty($BankName) ? "" : ", BankName= '$BankName'";
-    $SQL1 .= empty($BankAccount) ? "" : ", BankAccount= '$BankAccount'";
-    $SQL1 .= empty($BankAccountName) ? "" : ", BankAccountName= '$BankAccountName'";
-    $SQL1 .= empty($OAmountWithTax) ? "" : ", OAmountWithTax= '$OAmountWithTax'";
-    $SQL1 .= empty($rib_title) ? "" : ", rib_title= '$rib_title'";
-    $SQL1 .= " WHERE rib_id = '$rib_id'";
-}
-
-if ($submit == "add") {
-    $SQL1 = "INSERT INTO rib (`BillNo`,`BillDate`,`CurrId`,`TransactId`,`DeptId`,`WriteOffId`,`TypeId`,`IsTaxBill`,
-    `IsPayment`,`CurrentState`,`FlowState`,`VaryState`,`PermitState`,`HadPayOAmount`,`HadPayLAmount`,`IsContainTax`,`pay_type`,`OrgId`,`CreatorId`";
-    $SQL1 .= empty($WriteOffType) ? "" : ",`WriteOffType`";
-    $SQL1 .= empty($GatheringPersonId) ? "" : ",`GatheringPersonId`";
-    $SQL1 .= empty($BankId) ? "" : ",`BankId`";
-    $SQL1 .= empty($BankName) ? "" : ",`BankName`";
-    $SQL1 .= empty($BankAccount) ? "" : ",`BankAccount`";
-    $SQL1 .= empty($BankAccountName) ? "" : ",`BankAccountName`";
-    $SQL1 .= empty($rib_title) ? "" : ",`rib_title`";
-    $SQL1 .= empty($CostCenterId) ? "" : ",`CostCenterId`";
-
-
-    $SQL2 = ") VALUES ('$BillNo',$BillDate,'$CurrId','$TransactId','$DeptId','$WriteOffId','CF',1,0,0,0,0,0,0,0,1,$pay_type,'1000','$user_id'";
-    $SQL2 .= empty($WriteOffType) ? "" : "," . $WriteOffType;
-    $SQL2 .= empty($GatheringPersonId) ? "" : ",'" . $GatheringPersonId . "'";
-    $SQL2 .= empty($BankId) ? "" : ",'" . $BankId . "'";
-    $SQL2 .= empty($BankName) ? "" : ",'" . $BankName . "'";
-    $SQL2 .= empty($BankAccount) ? "" : ",'" . $BankAccount . "'";
-    $SQL2 .= empty($BankAccountName) ? "" : ",'" . $BankAccountName . "'";
-    $SQL2 .= empty($rib_title) ? "" : ",'" . $rib_title . "'";
-    $SQL1 .= empty($CostCenterId) ? "" : ",'" . $CostCenterId . "'";
-    $SQL2 .= ")";
-
-    $SQL1 .= $SQL2;
-}
-
-
-//上傳資料庫
-mysqli_query($link, $SQL1);
-if (mysqli_affected_rows($link)) {
-    //echo "success";
-    echo '<script>alert("新增/更新 成功")</script>';
-} else {
-    echo '<script>alert("新增/更新 失敗")</script>';
-}
-
-//增加紀錄
-if (($user_id == "M0056" || $user_id == "M0209")) {
-    $sql_submit = str_replace("'", "", $SQL1);
-    $sql_rib = "UPDATE rib SET LastOperatorId = '$user_id', LastOperation='$sql_submit' WHERE rib_id=$rib_id";
-    mysqli_query($link, $sql_rib);
-}
-
-if ($submit == "edit") {
-?>
-    <script>
-        window.location.href = "rib01-check.php?id=<?php echo $rib_id ?>&state=<?= $state ?>&<?= $token_link ?>";
-    </script>
-
-<?php
-} else {
-?>
-    <script>
-        window.location.href = "rib02-create.php?BillNo=<?php echo $BillNo ?>&RowCode=1&CurrId=<?= $CurrId ?>&<?= $token_link ?>";
-    </script>
-<?php
-}
+<?php
+include "./header.php";
+
+
+$submit = $_GET['submit'];
+$current_date = date('Y-m-d H:i:s');
+$state = $_GET['state'];
+
+$rib_id = empty($_POST['rib_id']) ? NULL : $_POST['rib_id'];
+$BillNo = empty($_POST["BillNo"]) ? NULL : $_POST['BillNo'];
+$BillDate = intval(date('Ymd'));
+$CurrId = $_POST["CurrId"];
+$TransactId = $_POST["TransactId"];
+$pay_type = $_POST['pay_type'];
+$WriteOffType = 2;
+$DeptId = $_POST["DeptId"];
+$WriteOffId = $_POST["WriteOffId"];
+$GatheringPersonId = empty($_POST["GatheringPersonId"]) ? NULL : $_POST["GatheringPersonId"];
+$OAmountWithTax = empty($_POST["OAmountWithTax"]) ? NULL : $_POST["OAmountWithTax"];
+$CostCenterId = empty($_POST["CostCenterId"]) ? NULL : $_POST["CostCenterId"];
+//連線T8MASADA 取得收款人銀行帳戶資料
+
+$sql = "SELECT * FROM comCompanyPersonAccountSetting WHERE PersonId='$GatheringPersonId'";
+$bank = $conn->query($sql);
+$conn = null;
+while ($bankInfo = $bank->fetch(PDO::FETCH_ASSOC)) {
+    $BankId = $bankInfo['BankId'];
+    $BankName = $bankInfo['BankName'];
+    $BankAccount = $bankInfo['BankAccount'];
+    $BankAccountName = $bankInfo['AccountName'];
+}
+
+$SQL1 = "";
+
+if ($submit == "edit") {
+    $SQL1 = "UPDATE rib SET BillDate=$BillDate, CurrId='$CurrId', TransactId='$TransactId',
+    WriteOffType=$WriteOffType, DeptId='$DeptId', WriteOffId='$WriteOffId',GatheringPersonId='$GatheringPersonId',pay_type=$pay_type,LastOperatorId='$user_id'";
+    $SQL1 .= empty($BankId) ? "" : ", BankId= '$BankId'";
+    $SQL1 .= empty($BankName) ? "" : ", BankName= '$BankName'";
+    $SQL1 .= empty($BankAccount) ? "" : ", BankAccount= '$BankAccount'";
+    $SQL1 .= empty($BankAccountName) ? "" : ", BankAccountName= '$BankAccountName'";
+    $SQL1 .= empty($OAmountWithTax) ? "" : ", OAmountWithTax= '$OAmountWithTax'";
+    $SQL1 .= empty($rib_title) ? "" : ", rib_title= '$rib_title'";
+    $SQL1 .= " WHERE rib_id = '$rib_id'";
+}
+
+if ($submit == "add") {
+    $SQL1 = "INSERT INTO rib (`BillNo`,`BillDate`,`CurrId`,`TransactId`,`DeptId`,`WriteOffId`,`TypeId`,`IsTaxBill`,
+    `IsPayment`,`CurrentState`,`FlowState`,`VaryState`,`PermitState`,`HadPayOAmount`,`HadPayLAmount`,`IsContainTax`,`pay_type`,`OrgId`,`CreatorId`";
+    $SQL1 .= empty($WriteOffType) ? "" : ",`WriteOffType`";
+    $SQL1 .= empty($GatheringPersonId) ? "" : ",`GatheringPersonId`";
+    $SQL1 .= empty($BankId) ? "" : ",`BankId`";
+    $SQL1 .= empty($BankName) ? "" : ",`BankName`";
+    $SQL1 .= empty($BankAccount) ? "" : ",`BankAccount`";
+    $SQL1 .= empty($BankAccountName) ? "" : ",`BankAccountName`";
+    $SQL1 .= empty($rib_title) ? "" : ",`rib_title`";
+    $SQL1 .= empty($CostCenterId) ? "" : ",`CostCenterId`";
+
+
+    $SQL2 = ") VALUES ('$BillNo',$BillDate,'$CurrId','$TransactId','$DeptId','$WriteOffId','CF',1,0,0,0,0,0,0,0,1,$pay_type,'1000','$user_id'";
+    $SQL2 .= empty($WriteOffType) ? "" : "," . $WriteOffType;
+    $SQL2 .= empty($GatheringPersonId) ? "" : ",'" . $GatheringPersonId . "'";
+    $SQL2 .= empty($BankId) ? "" : ",'" . $BankId . "'";
+    $SQL2 .= empty($BankName) ? "" : ",'" . $BankName . "'";
+    $SQL2 .= empty($BankAccount) ? "" : ",'" . $BankAccount . "'";
+    $SQL2 .= empty($BankAccountName) ? "" : ",'" . $BankAccountName . "'";
+    $SQL2 .= empty($rib_title) ? "" : ",'" . $rib_title . "'";
+    $SQL1 .= empty($CostCenterId) ? "" : ",'" . $CostCenterId . "'";
+    $SQL2 .= ")";
+
+    $SQL1 .= $SQL2;
+}
+
+
+//上傳資料庫
+mysqli_query($link, $SQL1);
+if (mysqli_affected_rows($link)) {
+    //echo "success";
+    echo '<script>alert("新增/更新 成功")</script>';
+} else {
+    echo '<script>alert("新增/更新 失敗")</script>';
+}
+
+//增加紀錄
+if (($user_id == "M0056" || $user_id == "M0209")) {
+    $sql_submit = str_replace("'", "", $SQL1);
+    $sql_rib = "UPDATE rib SET LastOperatorId = '$user_id', LastOperation='$sql_submit' WHERE rib_id=$rib_id";
+    mysqli_query($link, $sql_rib);
+}
+
+if ($submit == "edit") {
+?>
+    <script>
+        window.location.href = "rib01-check.php?id=<?php echo $rib_id ?>&state=<?= $state ?>&<?= $token_link ?>";
+    </script>
+
+<?php
+} else {
+?>
+    <script>
+        window.location.href = "rib02-create.php?BillNo=<?php echo $BillNo ?>&RowCode=1&CurrId=<?= $CurrId ?>&<?= $token_link ?>";
+    </script>
+<?php
+}
diff --git a/wms/rib02-business-create.php b/wms/rib02-business-create.php
index 784f64e2..c2d7618f 100644
--- a/wms/rib02-business-create.php
+++ b/wms/rib02-business-create.php
@@ -1,446 +1,446 @@
-<?php
-include "./header.php";
-
-$BillNo = $_GET['BillNo'];
-$RowCode = $_GET['RowCode'];
-
-//取得計量單位
-$sql_unit = "SELECT * FROM unit";
-$unit_query = mysqli_query($link, $sql_unit);
-$unit = mysqli_fetch_all($unit_query, MYSQLI_ASSOC);
-$sql_rib_biz = "SELECT * FROM rib_business WHERE BillNo = '$BillNo'";
-$rib = mysqli_query($link, $sql_rib_biz);
-foreach ($rib as $rib) {
-    $TaxId = $rib['TaxId'];
-    $CurrId = $rib['CurrId'];
-}
-
-// 連線T8MASADA 取得供應商、合約跟作番號
-
-$sql_Biz = "SELECT * FROM comBusinessPartner";
-$BizPartner = $conn->query($sql_Biz);
-$sql_Project = "SELECT * FROM comProject";
-$projects = $conn->query($sql_Project);
-$sql_Material = "SELECT * FROM comMaterialGroup";
-$materials = $conn->query($sql_Material);
-//取得人員名單與使用者的部門
-
-$sql_mydept =  "SELECT UserId, Username FROM capMembership";
-$deptmem = $conn->query($sql_mydept);
-foreach ($deptmem as $mem) {
-    $userid = $mem['UserId'];
-    $username = $mem['Username'];
-    $member["$userid"] = [$username];
-};
-$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
-$allpeople = $conn->query($sql_dept);
-foreach ($allpeople as $man) {
-    if ($man['PersonId'] == $user_id) {
-        $mydepart = $man['DeptId'];
-    }
-    $personid = $man['PersonId'];
-    $depart = $man['DeptId'];
-    if (isset($member["$personid"])) {
-        array_push($member["$personid"], "$depart");
-    }
-}
-
-//取得部門代碼
-$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
-$deptype = $conn->query($sql_department);
-$conn = null;
-
-
-?>
-<div style="width: 90%;">
-
-    <div style="padding-left: 2rem; padding-bottom: 1rem;">
-        <a href="rib-business-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
-            <span class="glyphicon glyphicon-home"></span>
-        </a>
-    </div>
-</div>
-
-<div class="container" id="ribsubadd">
-    <div class="text-center">
-        <h3>新增費用單據 (廠商)</h3>
-    </div>
-    <form class="form-horizontal" name="ribsubform" id="ribsubform" method="POST" action="rib02-business-submit.php?rib_id=<?= $rib_id ?>&submit=add&<?= $token_link ?>" enctype="multipart/form-data">
-
-
-        <div class="form-group">
-            <div class="col-md-3" style="display: none;">
-                <label for="RowCode" style="color: red;">序號</label>
-                <input class="form-control" type="int" name="RowCode" id="RowCode" value="<?= $RowCode ?>" disabled>
-
-            </div>
-
-            <?php if ($user_id == "M0056") { ?>
-                <div class="col-md-3">
-                    <label for="FeeTypeId" style="color: red;">費用項目代碼</label>
-                    <select name="FeeTypeId" class="form-control" required>
-                        <?php
-                        foreach ($feetype as $key => $value) { ?>
-                            <option value="<?php echo $value['FeeTypeId']; ?>"><?php echo $value['FeeTypeName']; ?></option>
-                        <?php };
-                        ?>
-                    </select>
-                </div>
-            <?php } else { ?>
-                <div class="col-md-3">
-                    <label for="FeeTypeGen" style="color: red;">費用類別</label>
-                    <select name="FeeTypeGen" id="FeeTypeGen" class="form-control" required>
-                        <option value="">請選擇費用類別</option>
-                        <option value=1>交通費</option>
-                        <option value=2>出差旅費</option>
-                        <option value=3>交際餐飲禮品</option>
-                        <option value=4>文具用品</option>
-                        <option value=5>郵資、電話/網路費、匯費</option>
-                        <option value=6>水費</option>
-                        <option value=7>電費</option>
-                        <option value=8>瓦斯費</option>
-                        <option value=9>運費/快遞</option>
-                        <option value=10>堆高機費用</option>
-                        <option value=11>五金材料工具</option>
-                        <option value=12>汽車維修</option>
-                        <option value=13>研發測試打樣</option>
-                        <option value=14>繳稅</option>
-                        <option value=15>其他費用</option>
-                    </select>
-                </div>
-                <div class="col-md-3">
-                    <label for="FeeTypeId" style="color: red;">費用項目代碼</label>
-                    <select name="FeeTypeId" id="FeeTypeId" class="form-control" required>
-
-                    </select>
-                </div>
-
-
-            <?php } ?>
-
-        </div>
-        <div class="form-group">
-
-            <div class="col-md-3">
-                <label for="FeeNoteShow" style="color: red;">費用說明</label>
-                <input class="form-control" type="text" name="FeeNoteShow" id="FeeNoteShow">
-            </div>
-            <div class="col-md-3">
-                <label for="ProjectId">合約號</label>
-                <select name="ProjectId" id="ProjectId">
-                    <option value=""></option>
-                    <?php
-                    foreach ($projects as $Project) {
-                    ?>
-                        <option value="<?= $Project['ProjectId'] ?>"><?= $Project['ProjectId'] . $Project['ProjectName'] ?></option>
-                    <?php
-                    }
-                    ?>
-                </select>
-            </div>
-            <div class="col-md-3">
-                <label for="CU_MaterialId">作番號</label>
-                <select name="CU_MaterialId" id="CU_MaterialId">
-                    <option value=""></option>
-                    <?php
-                    foreach ($materials as $material) {
-                    ?>
-                        <option value="<?= $material['MaterialId'] ?>"><?= $material['MaterialId'] . $material['MaterialName'] ?></option>
-                    <?php
-                    }
-                    ?>
-                </select>
-            </div>
-
-        </div>
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="UnitId" style="color: red;">計量單位</label>
-                <select name="UnitId" class="form-control" required>
-                    <?php
-                    foreach ($unit as $key => $value) { ?>
-                        <option value="<?php echo $value['UnitId']; ?>"><?php echo $value['UnitName']; ?></option>
-                    <?php };
-                    ?>
-                </select>
-            </div>
-            <div class="col-md-3">
-                <label for="Price" style="color: red;">單價 (原幣值含稅)</label>
-                <input class="form-control" type="number" step="any" name="Price" id="Price" required onchange="calOAmount(this.id)">
-            </div>
-            <div class="col-md-3">
-                <label for="Quantity" style="color: red;">數量</label>
-                <input class="form-control" type="number" step="any" name="Quantity" id="Quantity" value="1" required>
-            </div>
-            <div class="col-md-3">
-                <label for="OAmount" style="color: red;">報銷金額 (原幣值含稅)</label>
-                <input class="form-control" type="number" step="any" name="OAmount" id="OAmount" placeholder="單價x數量" required disabled>
-            </div>
-        </div>
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="TaxId">稅碼</label>
-                <select name="TaxId" class="form-control">
-                    <option value="ST005" selected>營業稅5%</option>
-                    <option value="ST101">零稅</option>
-                    <option value="ST102">免稅</option>
-                </select>
-            </div>
-            <div class="col-md-3">
-                <label for="IsCounteract">抵扣</label>
-                <select name="IsCounteract" class="form-control">
-                    <option value=1 selected>可抵扣</option>
-                    <option value=0>不可抵扣</option>
-                </select>
-            </div>
-
-        </div>
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="VoucherCount">憑單張數</label>
-                <input class="form-control" type="number" name="VoucherCount" id="VoucherCount" max=5 value=1>
-            </div>
-            <div class="col-md-3">
-                <label for="VoucherType">憑單類型</label>
-                <select name="VoucherType" id="VoucherType" class="form-control">
-                    <option value="0" selected>發票</option>
-                    <option value="1">收據 </option>
-                    <option value="2">支出證明</option>
-                    <option value="3">其他</option>
-                </select>
-            </div>
-            <div class="col-md-3" id="NotInvoice1">
-                <label for="InvoiceId">發票聯式
-                    <a onclick="ShowInvoice()">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-info-circle" viewBox="0 0 16 16">
-                            <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
-                            <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM9 4.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z" />
-                        </svg>
-                    </a>
-                </label>
-
-
-                <select name="InvoiceId" id="InvoiceId" class="form-control">
-                    <option value="">請選擇發票聯式</option>
-                    <option value="25">一般電子發票-> 進項三聯式收銀機統一發票及一般稅額計算之電子發票</option>
-                    <option value="21">三聯式手開發票-> 進項三聯式、電子計算機統一發票</option>
-                    <option value="22">二聯式收銀機發票 -> 進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
-                    <?php if ($user_id == "M0056") { ?>
-                        <option value="23">三聯式、電子計算機、三聯式收銀機統一發票及一般稅額計算之電子發票之進貨退出或折讓證明單</option>
-                        <option value="24">二聯式收銀機統一發票及載有稅額之其他憑證之進貨退出或折讓證明單</option>
-                        <option value="26">彙總登錄每張稅額伍佰元以下之進項三聯式、電子計算機統一發票</option>
-                        <option value="27">彙總登錄每張稅額伍佰元以下之進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
-                        <option value="28">進項海關代徵營業稅繳納證</option>
-                        <option value="29">進項海關退還溢繳營業稅申報單</option>
-                    <?php } ?>
-                </select>
-
-            </div>
-            <div class="col-md-3" id="NotInvoice2">
-                <label for="InvoiceNo">發票號碼</label>
-                <input class="form-control" type="text" name="InvoiceNo" id="InvoiceNo">
-            </div>
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="comSupplierName">供應商</label>
-                <select name="comSupplierName" id="comSupplierName">
-                    <option value=""></option>
-                    <option value="雜項請款用">V0001雜項請款用</option>
-                    <?php
-                    foreach ($BizPartner as $BizKey => $BizValue) { ?>
-                        <option value="<?= $BizValue['BizPartnerName'] ?>"><?= $BizValue['BizPartnerId'] . $BizValue['BizPartnerName'] ?></option>
-                    <?php } ?>
-                </select>
-            </div>
-            <div class="col-md-3" id="Tax">
-                <label for="TaxNo">統一編號 (供應商)</label>
-                <input type="text" name="TaxNo" id="TaxNo" class="form-control">
-            </div>
-        </div>
-        <div>
-
-            <input type="hidden" name="CurrId" value="<?= $CurrId ?>">
-        </div>
-
-</div>
-<div class="form-group">
-    <div class="col-md-7">
-
-    </div>
-    <div class="col-md-5" style="margin-top: 40px;">
-        <button onclick="senddata()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-bottom: 110px;">新增費用單據</button>
-    </div>
-</div>
-
-
-</form>
-</div>
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script>
-    var TempArr = [];
-    $(document).ready(function() {
-        $("#ProjectId").selectize();
-        $("#CU_MaterialId").selectize();
-        $("#comSupplierName").selectize();
-    })
-    $(function() {
-        $("#comSupplierName").change(function() {
-            if ($("#comSupplierName").val() == "雜項請款用") {
-                $("#Tax").show();
-            } else {
-                $("#Tax").hide();
-            }
-        })
-        $("#TaxNo").change(function() {
-            if ($("#TaxNo").val().length !== 8) {
-                alert("統一編號格式錯誤");
-            }
-        })
-        $("#VoucherType").change(function() {
-            if ($("#VoucherType").val() !== "0") {
-                $("#NotInvoice1").hide();
-                $("#NotInvoice2").hide();
-            } else {
-                $("#NotInvoice1").show();
-                $("#NotInvoice2").show();
-            }
-        })
-        $('#FeeTypeGen').change(function() {
-            console.log($('#FeeTypeGen').val());
-            var FeeTypeId = document.getElementById("FeeTypeId")
-            var FeeType = [{}, {
-                '400001': '交通費-捷利卡儲值',
-                '400002': '交通費-油資',
-                '400003': '交通費-ETC',
-                '400004': '交通費-停車費'
-            }, {
-                '130101': '差旅費-膳雜費',
-                '130102': '差旅費-住宿',
-                '130301': '差旅費-機票款',
-                '130302': '差旅費-高鐵車資',
-                '130303': '差旅費-台鐵車資',
-                '130304': '差旅費-客運車資',
-                '130305': '差旅費-捷運車資',
-                '130306': '差旅費-計程車車資',
-                '130307': '差旅費-國外交通費 ',
-                '130308': '差旅費-油資',
-                '130309': '差旅費-ETC',
-                '130310': '差旅費-停車費'
-            }, {
-                '200001': '交際便餐、飲品',
-                '200002': '交際禮品費',
-                '200003': '禮金'
-            }, {
-                '120001': '文具用品',
-                '120002': '影印紙',
-                '120003': '影印費',
-                '120004': '名片'
-            }, {
-                '150001': '郵資',
-                '150002': '電話費',
-                '150003': '匯款手續費'
-            }, {
-                '180101': '水費'
-            }, {
-                '180201': '電費'
-            }, {
-                '180301': '瓦斯費'
-            }, {
-                '140001': '運費/快遞'
-            }, {
-                '140002': '堆高機費用'
-            }, {
-                '390001': '材料費、五金用品'
-            }, {
-                '160002': '汽車維修'
-            }, {
-                '370004': '研發打樣費',
-                '370005': '研發測試費'
-            }, {
-                '220001': '牌照稅',
-                '220002': '燃料費',
-                '220005': '印花稅',
-            }, {
-                '880004': '其他雜項支出'
-            }];
-            for (var q = 0; q < (FeeType.length); q++) {
-                if ($('#FeeTypeGen').val() == (q)) {
-                    $("#FeeTypeId").empty();
-                    for (const key in FeeType[q]) {
-                        FeeTypeId.add(new Option(FeeType[q][key], key));
-                    }
-                }
-            }
-        })
-        $('#FeeDeptId').change(function() {
-            changeWriteOffId($('#FeeDeptId').val());
-        })
-        $("#Price").change(function() {
-            $("#OAmount").val($("#Quantity").val() * $("#Price").val());
-        });
-        $("#Quantity").change(function() {
-            $("#OAmount").val($("#Quantity").val() * $("#Price").val());
-        });
-        $("#FeeDate").change(function() {
-            if ($("#FeeDate").val().length != 8) {
-                alert("輸入格式錯誤");
-                $("#FeeDate").val('');
-            } else {
-                let year = $("#FeeDate").val().substr(0, 4);
-                let month = $("#FeeDate").val().substr(4, 2);
-                let day = $("#FeeDate").val().substr(6, 2);
-                let feedate = new Date(year, month, day);
-                feedate.setMonth(feedate.getMonth() - 1);
-                let now = new Date();
-                if (feedate > now) {
-                    alert("費用日期不可大於今天");
-                    $("#FeeDate").val('');
-                } else {
-                    now.setMonth(now.getMonth() - 2);
-                    now.setDate(1);
-                    now.setDate(now.getDate() - 1)
-                    if (feedate < now) {
-                        alert("超過兩個月的費用無法進行報銷");
-                        $("#FeeDate").val('');
-                    }
-                }
-            }
-        })
-
-    })
-
-    function ShowInvoice() {
-        window.open('rib02-invoice.php', '發票範例', config = 'height=600, width=600');
-
-    }
-
-    function changeWriteOffId(SelectedDept) {
-        var SelectDeptId = 'WriteOff' + SelectedDept + '-';
-        for (var i = 0; i < WriteOffId.options.length; i++) {
-            WriteOffId.options[i].selected = false;
-            let thisid = WriteOffId.options[i].id
-            if (thisid.search(SelectDeptId) === 0) {
-                WriteOffId.options[i].style['display'] = '';
-            } else {
-                WriteOffId.options[i].style['display'] = 'none';
-            };
-
-        };
-    };
-
-    function senddata() {
-        if ($("#FeeDate").val() == "" || $("#FeeNoteShow").val() == "" || $("#Price").val() == "" || $("#Quantity").val() == "") {
-            alert("請確認紅字部分皆有填寫");
-        } else if ($("#OAmount").val() <= 0) {
-            alert("金額必須大於零");
-
-        } else {
-            $("#OAmount").prop("disabled", false);
-            $('#ribsubform').submit();
-        }
-
-    }
+<?php
+include "./header.php";
+
+$BillNo = $_GET['BillNo'];
+$RowCode = $_GET['RowCode'];
+
+//取得計量單位
+$sql_unit = "SELECT * FROM unit";
+$unit_query = mysqli_query($link, $sql_unit);
+$unit = mysqli_fetch_all($unit_query, MYSQLI_ASSOC);
+$sql_rib_biz = "SELECT * FROM rib_business WHERE BillNo = '$BillNo'";
+$rib = mysqli_query($link, $sql_rib_biz);
+foreach ($rib as $rib) {
+    $TaxId = $rib['TaxId'];
+    $CurrId = $rib['CurrId'];
+}
+
+// 連線T8MASADA 取得供應商、合約跟作番號
+
+$sql_Biz = "SELECT * FROM comBusinessPartner";
+$BizPartner = $conn->query($sql_Biz);
+$sql_Project = "SELECT * FROM comProject";
+$projects = $conn->query($sql_Project);
+$sql_Material = "SELECT * FROM comMaterialGroup";
+$materials = $conn->query($sql_Material);
+//取得人員名單與使用者的部門
+
+$sql_mydept =  "SELECT UserId, Username FROM capMembership";
+$deptmem = $conn->query($sql_mydept);
+foreach ($deptmem as $mem) {
+    $userid = $mem['UserId'];
+    $username = $mem['Username'];
+    $member["$userid"] = [$username];
+};
+$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
+$allpeople = $conn->query($sql_dept);
+foreach ($allpeople as $man) {
+    if ($man['PersonId'] == $user_id) {
+        $mydepart = $man['DeptId'];
+    }
+    $personid = $man['PersonId'];
+    $depart = $man['DeptId'];
+    if (isset($member["$personid"])) {
+        array_push($member["$personid"], "$depart");
+    }
+}
+
+//取得部門代碼
+$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
+$deptype = $conn->query($sql_department);
+$conn = null;
+
+
+?>
+<div style="width: 90%;">
+
+    <div style="padding-left: 2rem; padding-bottom: 1rem;">
+        <a href="rib-business-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
+            <span class="glyphicon glyphicon-home"></span>
+        </a>
+    </div>
+</div>
+
+<div class="container" id="ribsubadd">
+    <div class="text-center">
+        <h3>新增費用單據 (廠商)</h3>
+    </div>
+    <form class="form-horizontal" name="ribsubform" id="ribsubform" method="POST" action="rib02-business-submit.php?rib_id=<?= $rib_id ?>&submit=add&<?= $token_link ?>" enctype="multipart/form-data">
+
+
+        <div class="form-group">
+            <div class="col-md-3" style="display: none;">
+                <label for="RowCode" style="color: red;">序號</label>
+                <input class="form-control" type="int" name="RowCode" id="RowCode" value="<?= $RowCode ?>" disabled>
+
+            </div>
+
+            <?php if ($user_id == "M0056") { ?>
+                <div class="col-md-3">
+                    <label for="FeeTypeId" style="color: red;">費用項目代碼</label>
+                    <select name="FeeTypeId" class="form-control" required>
+                        <?php
+                        foreach ($feetype as $key => $value) { ?>
+                            <option value="<?php echo $value['FeeTypeId']; ?>"><?php echo $value['FeeTypeName']; ?></option>
+                        <?php };
+                        ?>
+                    </select>
+                </div>
+            <?php } else { ?>
+                <div class="col-md-3">
+                    <label for="FeeTypeGen" style="color: red;">費用類別</label>
+                    <select name="FeeTypeGen" id="FeeTypeGen" class="form-control" required>
+                        <option value="">請選擇費用類別</option>
+                        <option value=1>交通費</option>
+                        <option value=2>出差旅費</option>
+                        <option value=3>交際餐飲禮品</option>
+                        <option value=4>文具用品</option>
+                        <option value=5>郵資、電話/網路費、匯費</option>
+                        <option value=6>水費</option>
+                        <option value=7>電費</option>
+                        <option value=8>瓦斯費</option>
+                        <option value=9>運費/快遞</option>
+                        <option value=10>堆高機費用</option>
+                        <option value=11>五金材料工具</option>
+                        <option value=12>汽車維修</option>
+                        <option value=13>研發測試打樣</option>
+                        <option value=14>繳稅</option>
+                        <option value=15>其他費用</option>
+                    </select>
+                </div>
+                <div class="col-md-3">
+                    <label for="FeeTypeId" style="color: red;">費用項目代碼</label>
+                    <select name="FeeTypeId" id="FeeTypeId" class="form-control" required>
+
+                    </select>
+                </div>
+
+
+            <?php } ?>
+
+        </div>
+        <div class="form-group">
+
+            <div class="col-md-3">
+                <label for="FeeNoteShow" style="color: red;">費用說明</label>
+                <input class="form-control" type="text" name="FeeNoteShow" id="FeeNoteShow">
+            </div>
+            <div class="col-md-3">
+                <label for="ProjectId">合約號</label>
+                <select name="ProjectId" id="ProjectId">
+                    <option value=""></option>
+                    <?php
+                    foreach ($projects as $Project) {
+                    ?>
+                        <option value="<?= $Project['ProjectId'] ?>"><?= $Project['ProjectId'] . $Project['ProjectName'] ?></option>
+                    <?php
+                    }
+                    ?>
+                </select>
+            </div>
+            <div class="col-md-3">
+                <label for="CU_MaterialId">作番號</label>
+                <select name="CU_MaterialId" id="CU_MaterialId">
+                    <option value=""></option>
+                    <?php
+                    foreach ($materials as $material) {
+                    ?>
+                        <option value="<?= $material['MaterialId'] ?>"><?= $material['MaterialId'] . $material['MaterialName'] ?></option>
+                    <?php
+                    }
+                    ?>
+                </select>
+            </div>
+
+        </div>
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="UnitId" style="color: red;">計量單位</label>
+                <select name="UnitId" class="form-control" required>
+                    <?php
+                    foreach ($unit as $key => $value) { ?>
+                        <option value="<?php echo $value['UnitId']; ?>"><?php echo $value['UnitName']; ?></option>
+                    <?php };
+                    ?>
+                </select>
+            </div>
+            <div class="col-md-3">
+                <label for="Price" style="color: red;">單價 (原幣值含稅)</label>
+                <input class="form-control" type="number" step="any" name="Price" id="Price" required onchange="calOAmount(this.id)">
+            </div>
+            <div class="col-md-3">
+                <label for="Quantity" style="color: red;">數量</label>
+                <input class="form-control" type="number" step="any" name="Quantity" id="Quantity" value="1" required>
+            </div>
+            <div class="col-md-3">
+                <label for="OAmount" style="color: red;">報銷金額 (原幣值含稅)</label>
+                <input class="form-control" type="number" step="any" name="OAmount" id="OAmount" placeholder="單價x數量" required disabled>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="TaxId">稅碼</label>
+                <select name="TaxId" class="form-control">
+                    <option value="ST005" selected>營業稅5%</option>
+                    <option value="ST101">零稅</option>
+                    <option value="ST102">免稅</option>
+                </select>
+            </div>
+            <div class="col-md-3">
+                <label for="IsCounteract">抵扣</label>
+                <select name="IsCounteract" class="form-control">
+                    <option value=1 selected>可抵扣</option>
+                    <option value=0>不可抵扣</option>
+                </select>
+            </div>
+
+        </div>
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="VoucherCount">憑單張數</label>
+                <input class="form-control" type="number" name="VoucherCount" id="VoucherCount" max=5 value=1>
+            </div>
+            <div class="col-md-3">
+                <label for="VoucherType">憑單類型</label>
+                <select name="VoucherType" id="VoucherType" class="form-control">
+                    <option value="0" selected>發票</option>
+                    <option value="1">收據 </option>
+                    <option value="2">支出證明</option>
+                    <option value="3">其他</option>
+                </select>
+            </div>
+            <div class="col-md-3" id="NotInvoice1">
+                <label for="InvoiceId">發票聯式
+                    <a onclick="ShowInvoice()">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-info-circle" viewBox="0 0 16 16">
+                            <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
+                            <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM9 4.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z" />
+                        </svg>
+                    </a>
+                </label>
+
+
+                <select name="InvoiceId" id="InvoiceId" class="form-control">
+                    <option value="">請選擇發票聯式</option>
+                    <option value="25">一般電子發票-> 進項三聯式收銀機統一發票及一般稅額計算之電子發票</option>
+                    <option value="21">三聯式手開發票-> 進項三聯式、電子計算機統一發票</option>
+                    <option value="22">二聯式收銀機發票 -> 進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
+                    <?php if ($user_id == "M0056") { ?>
+                        <option value="23">三聯式、電子計算機、三聯式收銀機統一發票及一般稅額計算之電子發票之進貨退出或折讓證明單</option>
+                        <option value="24">二聯式收銀機統一發票及載有稅額之其他憑證之進貨退出或折讓證明單</option>
+                        <option value="26">彙總登錄每張稅額伍佰元以下之進項三聯式、電子計算機統一發票</option>
+                        <option value="27">彙總登錄每張稅額伍佰元以下之進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
+                        <option value="28">進項海關代徵營業稅繳納證</option>
+                        <option value="29">進項海關退還溢繳營業稅申報單</option>
+                    <?php } ?>
+                </select>
+
+            </div>
+            <div class="col-md-3" id="NotInvoice2">
+                <label for="InvoiceNo">發票號碼</label>
+                <input class="form-control" type="text" name="InvoiceNo" id="InvoiceNo">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="comSupplierName">供應商</label>
+                <select name="comSupplierName" id="comSupplierName">
+                    <option value=""></option>
+                    <option value="雜項請款用">V0001雜項請款用</option>
+                    <?php
+                    foreach ($BizPartner as $BizKey => $BizValue) { ?>
+                        <option value="<?= $BizValue['BizPartnerName'] ?>"><?= $BizValue['BizPartnerId'] . $BizValue['BizPartnerName'] ?></option>
+                    <?php } ?>
+                </select>
+            </div>
+            <div class="col-md-3" id="Tax">
+                <label for="TaxNo">統一編號 (供應商)</label>
+                <input type="text" name="TaxNo" id="TaxNo" class="form-control">
+            </div>
+        </div>
+        <div>
+
+            <input type="hidden" name="CurrId" value="<?= $CurrId ?>">
+        </div>
+
+</div>
+<div class="form-group">
+    <div class="col-md-7">
+
+    </div>
+    <div class="col-md-5" style="margin-top: 40px;">
+        <button onclick="senddata()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-bottom: 110px;">新增費用單據</button>
+    </div>
+</div>
+
+
+</form>
+</div>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script>
+    var TempArr = [];
+    $(document).ready(function() {
+        $("#ProjectId").selectize();
+        $("#CU_MaterialId").selectize();
+        $("#comSupplierName").selectize();
+    })
+    $(function() {
+        $("#comSupplierName").change(function() {
+            if ($("#comSupplierName").val() == "雜項請款用") {
+                $("#Tax").show();
+            } else {
+                $("#Tax").hide();
+            }
+        })
+        $("#TaxNo").change(function() {
+            if ($("#TaxNo").val().length !== 8) {
+                alert("統一編號格式錯誤");
+            }
+        })
+        $("#VoucherType").change(function() {
+            if ($("#VoucherType").val() !== "0") {
+                $("#NotInvoice1").hide();
+                $("#NotInvoice2").hide();
+            } else {
+                $("#NotInvoice1").show();
+                $("#NotInvoice2").show();
+            }
+        })
+        $('#FeeTypeGen').change(function() {
+            console.log($('#FeeTypeGen').val());
+            var FeeTypeId = document.getElementById("FeeTypeId")
+            var FeeType = [{}, {
+                '400001': '交通費-捷利卡儲值',
+                '400002': '交通費-油資',
+                '400003': '交通費-ETC',
+                '400004': '交通費-停車費'
+            }, {
+                '130101': '差旅費-膳雜費',
+                '130102': '差旅費-住宿',
+                '130301': '差旅費-機票款',
+                '130302': '差旅費-高鐵車資',
+                '130303': '差旅費-台鐵車資',
+                '130304': '差旅費-客運車資',
+                '130305': '差旅費-捷運車資',
+                '130306': '差旅費-計程車車資',
+                '130307': '差旅費-國外交通費 ',
+                '130308': '差旅費-油資',
+                '130309': '差旅費-ETC',
+                '130310': '差旅費-停車費'
+            }, {
+                '200001': '交際便餐、飲品',
+                '200002': '交際禮品費',
+                '200003': '禮金'
+            }, {
+                '120001': '文具用品',
+                '120002': '影印紙',
+                '120003': '影印費',
+                '120004': '名片'
+            }, {
+                '150001': '郵資',
+                '150002': '電話費',
+                '150003': '匯款手續費'
+            }, {
+                '180101': '水費'
+            }, {
+                '180201': '電費'
+            }, {
+                '180301': '瓦斯費'
+            }, {
+                '140001': '運費/快遞'
+            }, {
+                '140002': '堆高機費用'
+            }, {
+                '390001': '材料費、五金用品'
+            }, {
+                '160002': '汽車維修'
+            }, {
+                '370004': '研發打樣費',
+                '370005': '研發測試費'
+            }, {
+                '220001': '牌照稅',
+                '220002': '燃料費',
+                '220005': '印花稅',
+            }, {
+                '880004': '其他雜項支出'
+            }];
+            for (var q = 0; q < (FeeType.length); q++) {
+                if ($('#FeeTypeGen').val() == (q)) {
+                    $("#FeeTypeId").empty();
+                    for (const key in FeeType[q]) {
+                        FeeTypeId.add(new Option(FeeType[q][key], key));
+                    }
+                }
+            }
+        })
+        $('#FeeDeptId').change(function() {
+            changeWriteOffId($('#FeeDeptId').val());
+        })
+        $("#Price").change(function() {
+            $("#OAmount").val($("#Quantity").val() * $("#Price").val());
+        });
+        $("#Quantity").change(function() {
+            $("#OAmount").val($("#Quantity").val() * $("#Price").val());
+        });
+        $("#FeeDate").change(function() {
+            if ($("#FeeDate").val().length != 8) {
+                alert("輸入格式錯誤");
+                $("#FeeDate").val('');
+            } else {
+                let year = $("#FeeDate").val().substr(0, 4);
+                let month = $("#FeeDate").val().substr(4, 2);
+                let day = $("#FeeDate").val().substr(6, 2);
+                let feedate = new Date(year, month, day);
+                feedate.setMonth(feedate.getMonth() - 1);
+                let now = new Date();
+                if (feedate > now) {
+                    alert("費用日期不可大於今天");
+                    $("#FeeDate").val('');
+                } else {
+                    now.setMonth(now.getMonth() - 2);
+                    now.setDate(1);
+                    now.setDate(now.getDate() - 1)
+                    if (feedate < now) {
+                        alert("超過兩個月的費用無法進行報銷");
+                        $("#FeeDate").val('');
+                    }
+                }
+            }
+        })
+
+    })
+
+    function ShowInvoice() {
+        window.open('rib02-invoice.php', '發票範例', config = 'height=600, width=600');
+
+    }
+
+    function changeWriteOffId(SelectedDept) {
+        var SelectDeptId = 'WriteOff' + SelectedDept + '-';
+        for (var i = 0; i < WriteOffId.options.length; i++) {
+            WriteOffId.options[i].selected = false;
+            let thisid = WriteOffId.options[i].id
+            if (thisid.search(SelectDeptId) === 0) {
+                WriteOffId.options[i].style['display'] = '';
+            } else {
+                WriteOffId.options[i].style['display'] = 'none';
+            };
+
+        };
+    };
+
+    function senddata() {
+        if ($("#FeeDate").val() == "" || $("#FeeNoteShow").val() == "" || $("#Price").val() == "" || $("#Quantity").val() == "") {
+            alert("請確認紅字部分皆有填寫");
+        } else if ($("#OAmount").val() <= 0) {
+            alert("金額必須大於零");
+
+        } else {
+            $("#OAmount").prop("disabled", false);
+            $('#ribsubform').submit();
+        }
+
+    }
 </script>
\ No newline at end of file
diff --git a/wms/rib02-check.php b/wms/rib02-check.php
index 7d02688b..25af4e64 100644
--- a/wms/rib02-check.php
+++ b/wms/rib02-check.php
@@ -1,295 +1,295 @@
-<?php
-include "./header.php";
-
-$ribsub_id = $_GET['id'];
-$sql_ribsub = "SELECT * FROM rib_sub WHERE ribsub_id = $ribsub_id";
-$rib_query = mysqli_query($link, $sql_ribsub);
-$ribsub = mysqli_fetch_assoc($rib_query);
-
-//取得費用項目代碼
-$sql_feetype = "SELECT FeeTypeId, FeeTypeName FROM comFeeType WHERE (FeeTypeId NOT LIKE 'A%') AND(FeeTypeId NOT LIKE 'Z%')";
-$feetype_query = mysqli_query($link, $sql_feetype);
-$feetype = mysqli_fetch_all($feetype_query, MYSQLI_ASSOC);
-
-// 找出使用者的部門
-$mydepart_sql = "SELECT department_id from account Where accountid = '$user_id'";
-$mydepart = mysqli_query($link, $mydepart_sql);
-foreach ($mydepart as $dep) {
-    $mydepart = $dep['department_id'];
-}
-
-// 取得部門代碼
-$sql_depid = "SELECT DISTINCT department_id, name from department";
-$dept_query = mysqli_query($link, $sql_depid);
-$deptype = mysqli_fetch_all($dept_query, MYSQLI_ASSOC);
-
-// 取得人員名單
-$sql_deptmem = "select * from account WHERE accounttype NOT IN ('A','X')";
-$deptmem = mysqli_query($link, $sql_deptmem);
-$deptmem = mysqli_fetch_all($deptmem, MYSQLI_ASSOC);
-
-//取得計量單位
-$sql_unit = "SELECT * FROM unit";
-$unit_query = mysqli_query($link, $sql_unit);
-$unit = mysqli_fetch_all($unit_query, MYSQLI_ASSOC);
-
-
-?>
-<div style="width: 90%;">
-
-    <div style="padding-left: 2rem; padding-bottom: 1rem;">
-        <a href="rib01-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
-            <span class="glyphicon glyphicon-home"></span>
-        </a>
-    </div>
-</div>
-
-<div class="container" id="ribsubadd">
-    <div class="text-center">
-        <h3>費用單據</h3>
-    </div>
-    <form class="form-horizontal" name="ribsubadd" method="POST" action="rib02-submit.php?ribsub_id=<?= $ribsub_id ?>&submit=edit&<?= $token_link ?>" enctype="multipart/form-data">
-
-
-        <div class="form-group" style="display: none;">
-            <div class="col-md-3">
-                <label for="RowCode" style="color: red;">序號</label>
-                <input class="form-control" type="int" name="RowCode" id="RowCode" value="<?= $ribsub['RowCode'] ?>" disabled>
-
-            </div>
-            <div class="col-md-3">
-                <label for="FeeDate" style="color: red;">發票日期</label>
-                <input class="form-control" type="int" name="FeeDate" id="FeeDate" value="<?= $ribsub['FeeDate'] ?>" disabled>
-
-            </div>
-            <div class="col-md-3">
-                <label for="FeeTypeId" style="color: red;">費用項目代碼</label>
-                <select name="FeeTypeId" class="form-control" disabled>
-                    <?php
-                    foreach ($feetype as $key => $value) { ?>
-                        <option value="<?php echo $value['FeeTypeId']; ?>" <?php if ($value['FeeTypeId'] == $ribsub['FeeTypeId']) {
-                                                                                echo "selected";
-                                                                            } ?>><?php echo $value['FeeTypeName']; ?></option>
-                    <?php };
-                    ?>
-                </select>
-            </div>
-            <div class="col-md-3">
-                <label for="FeeDeptId" style="color: red;">歸屬部門</label>
-                <select name="FeeDeptId" class="form-control" disabled>
-                    <?php
-                    foreach ($deptype as $key => $value) { ?>
-                        <option value="<?php echo $value['department_id']; ?>" <?php
-                                                                                if ($value['department_id'] == $ribsub['FeeDeptId']) {
-                                                                                    echo "selected";
-                                                                                } ?>><?php echo $value['name']; ?></option>
-                    <?php };
-                    ?>
-                </select>
-
-            </div>
-
-        </div>
-        <div class="form-group">
-
-            <div class="col-md-3">
-                <label for="WriteOffId" style="color: red;">報銷人</label>
-                <select name="WriteOffId" class="form-control" disabled>
-                    <?php
-                    foreach ($deptmem as $key => $value) { ?>
-                        <option value="<?php echo $value['accountid']; ?>" <?php if ($value['accountid'] == $ribsub['WriteOffId']) {
-                                                                                echo "selected";
-                                                                            } ?>> <?php echo $value['name']; ?> </option>
-                    <?php }; ?>
-                </select>
-            </div>
-
-            <div class="col-md-3">
-                <label for="FeeNoteShow" style="color: red;">費用說明</label>
-                <input class="form-control" type="text" name="FeeNoteShow" id="FeeNoteShow" value="<?= $ribsub['FeeNoteShow'] ?>" disabled>
-            </div>
-            <div class="col-md-3">
-                <label for="ProjectId">合約號</label>
-                <input class="form-control" type="text" name="ProjectId" id="ProjectId" value="<?= $ribsub['ProjectId'] ?>" disabled>
-            </div>
-            <div class="col-md-3">
-                <label for="CU_MaterialId">作番號</label>
-                <input class="form-control" type="text" name="CU_MaterialId" id="CU_MaterialId" value="<?= $ribsub['CU_MaterialId'] ?>" disabled>
-            </div>
-        </div>
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="TaxId">稅碼</label>
-                <select name="TaxId" class="form-control" disabled>
-                    <option value="ST005" <?php if ($ribsub['TaxId'] == "ST005") {
-                                                echo "selected";
-                                            } ?>>營業稅5%</option>
-                    <option value="ST101" <?php if ($ribsub['TaxId'] == "ST101") {
-                                                echo "selected";
-                                            } ?>>零稅</option>
-                    <option value="ST102" <?php if ($ribsub['TaxId'] == "ST102") {
-                                                echo "selected";
-                                            } ?>>免稅</option>
-                </select>
-            </div>
-            <div class="col-md-3">
-                <label for="IsCounteract">抵扣</label>
-                <select name="IsCounteract" class="form-control" disabled>
-                    <option value=1 <?php if ($ribsub['IsCounteract'] == 1) {
-                                        echo "selected";
-                                    } ?>>可抵扣</option>
-                    <option value=0 <?php if ($ribsub['IsCounteract'] == 0) {
-                                        echo "selected";
-                                    } ?>>不可抵扣</option>
-                </select>
-            </div>
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="UnitId" style="color: red;">計量單位</label>
-                <select name="UnitId" class="form-control" disabled>
-                    <?php
-                    foreach ($unit as $key => $value) { ?>
-                        <option value="<?php echo $value['UnitId']; ?>" <?php if ($value['UnitId'] == $ribsub['UnitId']) {
-                                                                            echo "selected";
-                                                                        } ?>><?php echo $value['UnitName']; ?></option>
-                    <?php };
-                    ?>
-                </select>
-            </div>
-            <div class="col-md-3">
-                <label for="Price" style="color: red;">單價 (原幣值含稅)</label>
-                <input class="form-control" type="number" step="any" name="Price" id="Price" value="<?= $ribsub['Price'] ?>" disabled>
-            </div>
-            <div class="col-md-3">
-                <label for="Quantity" style="color: red;">數量</label>
-                <input class="form-control" type="number" step="any" name="Quantity" id="Quantity" value="<?= $ribsub['Quantity'] ?>" disabled>
-            </div>
-            <div class="col-md-3">
-                <label for="OAmount" style="color: red;">報銷金額 (原幣值含稅)</label>
-                <input class="form-control" type="number" step="any" name="OAmount" id="OAmount" placeholder="單價x數量" value="<?= round($ribsub['OAmount']) ?>" disabled>
-            </div>
-        </div>
-        <?php
-        if ($user_id == "M0056" || $user_id == "M0209") {
-        ?>
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="CurrId">幣別</label>
-                    <input class="form-control" type="text" name="CurrId" id="CurrId" value="<?php if ($ribsub['CurrId'] == "TWD") {
-                                                                                                    echo "台幣";
-                                                                                                } elseif ($ribsub['CurrId'] == "CNY") {
-                                                                                                    echo "人民幣";
-                                                                                                } elseif ($ribsub['CurrId'] == "EUR") {
-                                                                                                    echo "歐元";
-                                                                                                } elseif ($ribsub['CurrId'] == "HKD") {
-                                                                                                    echo "港幣";
-                                                                                                } else {
-                                                                                                    echo "美元";
-                                                                                                } ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="CurrLAmount">匯率</label>
-                    <input class="form-control" type="number" name="CurrLAmount" id="CurrLAmount" value="<?= $ribsub['CurrentLAmount'] ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="OTax">稅金 (原幣值)</label>
-                    <input class="form-control" type="number" name="OTax" id="OTax" value="<?= round($ribsub['OTax']) ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="LTax">本幣稅金</label>
-                    <input class="form-control" type="number" step="any" name="LTax" id="LTax" value="<?= round($ribsub['LTax']) ?>" disabled>
-                </div>
-            </div>
-
-
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="OAmountUnWithTax">未稅報銷金額 (原幣值)</label>
-                    <input class="form-control" type="number" name="OAmountUnWithTax" id="OAmountUnWithTax" value="<?= round($ribsub['OAmountUnWithTax']) ?>" disabled>
-                </div>
-
-                <div class="col-md-3">
-                    <label for="LAmountUnWithTax">本幣未稅報銷金額</label>
-                    <input class="form-control" type="number" step="any" name="LAmountUnWithTax" id="LAmountUnWithTax" value="<?= round($ribsub['LAmountUnWithTax']) ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="LAmount">本幣報銷金額</label>
-                    <input class="form-control" type="number" step="any" name="LAmount" id="LAmount" value="<?= round($ribsub['LAmount']) ?>" disabled>
-                </div>
-            </div>
-        <?php
-        } ?>
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="VoucherCount">憑單張數</label>
-                <input class="form-control" type="number" name="VoucherCount" id="VoucherCount" max=5 value="<?= $ribsub['VoucherCount'] ?>" disabled>
-            </div>
-            <div class="col-md-3">
-                <label for="VoucherType">憑單類型</label>
-                <select name="VoucherType" class="form-control" disabled>
-                    <option value=0 <?php if ($ribsub['VoucherType'] == 0) {
-                                        echo "selected";
-                                    } ?>>發票</option>
-                    <option value=1 <?php if ($ribsub['VoucherType'] == 1) {
-                                        echo "selected";
-                                    } ?>>收據 </option>
-                    <option value=2 <?php if ($ribsub['VoucherType'] == 2) {
-                                        echo "selected";
-                                    } ?>>支出證明</option>
-                    <option value=3 <?php if ($ribsub['VoucherType'] == 3) {
-                                        echo "selected";
-                                    } ?>>其他</option>
-                </select>
-            </div>
-            <div class="col-md-3">
-                <label for="InvoiceId">發票聯式</label>
-                <select name="InvoiceId" class="form-control" disabled>
-                    <option value="">請選擇發票聯式</option>
-                    <option value="21" <?php if ($ribsub['InvoiceId'] == "21") {
-                                            echo "selected";
-                                        } ?>>進項三聯式、電子計算機統一發票</option>
-                    <option value="22" <?php if ($ribsub['InvoiceId'] == "22") {
-                                            echo "selected";
-                                        } ?>>進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
-                    <option value="23 <?php if ($ribsub['InvoiceId'] == "23") {
-                                            echo "selected";
-                                        } ?>">三聯式、電子計算機、三聯式收銀機統一發票及一般稅額計算之電子發票之進貨退出或折讓證明單</option>
-                    <option value="24 <?php if ($ribsub['InvoiceId'] == "24") {
-                                            echo "selected";
-                                        } ?>">二聯式收銀機統一發票及載有稅額之其他憑證之進貨退出或折讓證明單</option>
-                    <option value="25 <?php if ($ribsub['InvoiceId'] == "25") {
-                                            echo "selected";
-                                        } ?>">進項三聯式收銀機統一發票及一般稅額計算之電子發票</option>
-                    <option value="26 <?php if ($ribsub['InvoiceId'] == "26") {
-                                            echo "selected";
-                                        } ?>">彙總登錄每張稅額伍佰元以下之進項三聯式、電子計算機統一發票</option>
-                    <option value="27 <?php if ($ribsub['InvoiceId'] == "27") {
-                                            echo "selected";
-                                        } ?>">彙總登錄每張稅額伍佰元以下之進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
-                    <option value="28 <?php if ($ribsub['InvoiceId'] == "28") {
-                                            echo "selected";
-                                        } ?>">進項海關代徵營業稅繳納證</option>
-                    <option value="29 <?php if ($ribsub['InvoiceId'] == "29") {
-                                            echo "selected";
-                                        } ?>">進項海關退還溢繳營業稅申報單</option>
-                </select>
-            </div>
-            <div class="col-md-3">
-                <label for="InvoiceNo">發票號碼</label>
-                <input class="form-control" type="text" name="InvoiceNo" id="InvoiceNo" value="<?= $ribsub['InvoiceNo'] ?>" disabled>
-            </div>
-        </div>
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="TaxNo">供應商統一編號</label>
-                <input type="text" name="TaxNo" id="TaxNo" class="form-control" value="<?= $ribsub['TaxNo'] ?>" disabled />
-            </div>
-        </div>
-        <div>
-            <input type="hidden" name="rib_id" id="rib_id" value="<?= $ribsub['rib_id'] ?>">
-        </div>
-
-    </form>
+<?php
+include "./header.php";
+
+$ribsub_id = $_GET['id'];
+$sql_ribsub = "SELECT * FROM rib_sub WHERE ribsub_id = $ribsub_id";
+$rib_query = mysqli_query($link, $sql_ribsub);
+$ribsub = mysqli_fetch_assoc($rib_query);
+
+//取得費用項目代碼
+$sql_feetype = "SELECT FeeTypeId, FeeTypeName FROM comFeeType WHERE (FeeTypeId NOT LIKE 'A%') AND(FeeTypeId NOT LIKE 'Z%')";
+$feetype_query = mysqli_query($link, $sql_feetype);
+$feetype = mysqli_fetch_all($feetype_query, MYSQLI_ASSOC);
+
+// 找出使用者的部門
+$mydepart_sql = "SELECT department_id from account Where accountid = '$user_id'";
+$mydepart = mysqli_query($link, $mydepart_sql);
+foreach ($mydepart as $dep) {
+    $mydepart = $dep['department_id'];
+}
+
+// 取得部門代碼
+$sql_depid = "SELECT DISTINCT department_id, name from department";
+$dept_query = mysqli_query($link, $sql_depid);
+$deptype = mysqli_fetch_all($dept_query, MYSQLI_ASSOC);
+
+// 取得人員名單
+$sql_deptmem = "select * from account WHERE accounttype NOT IN ('A','X')";
+$deptmem = mysqli_query($link, $sql_deptmem);
+$deptmem = mysqli_fetch_all($deptmem, MYSQLI_ASSOC);
+
+//取得計量單位
+$sql_unit = "SELECT * FROM unit";
+$unit_query = mysqli_query($link, $sql_unit);
+$unit = mysqli_fetch_all($unit_query, MYSQLI_ASSOC);
+
+
+?>
+<div style="width: 90%;">
+
+    <div style="padding-left: 2rem; padding-bottom: 1rem;">
+        <a href="rib01-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
+            <span class="glyphicon glyphicon-home"></span>
+        </a>
+    </div>
+</div>
+
+<div class="container" id="ribsubadd">
+    <div class="text-center">
+        <h3>費用單據</h3>
+    </div>
+    <form class="form-horizontal" name="ribsubadd" method="POST" action="rib02-submit.php?ribsub_id=<?= $ribsub_id ?>&submit=edit&<?= $token_link ?>" enctype="multipart/form-data">
+
+
+        <div class="form-group" style="display: none;">
+            <div class="col-md-3">
+                <label for="RowCode" style="color: red;">序號</label>
+                <input class="form-control" type="int" name="RowCode" id="RowCode" value="<?= $ribsub['RowCode'] ?>" disabled>
+
+            </div>
+            <div class="col-md-3">
+                <label for="FeeDate" style="color: red;">發票日期</label>
+                <input class="form-control" type="int" name="FeeDate" id="FeeDate" value="<?= $ribsub['FeeDate'] ?>" disabled>
+
+            </div>
+            <div class="col-md-3">
+                <label for="FeeTypeId" style="color: red;">費用項目代碼</label>
+                <select name="FeeTypeId" class="form-control" disabled>
+                    <?php
+                    foreach ($feetype as $key => $value) { ?>
+                        <option value="<?php echo $value['FeeTypeId']; ?>" <?php if ($value['FeeTypeId'] == $ribsub['FeeTypeId']) {
+                                                                                echo "selected";
+                                                                            } ?>><?php echo $value['FeeTypeName']; ?></option>
+                    <?php };
+                    ?>
+                </select>
+            </div>
+            <div class="col-md-3">
+                <label for="FeeDeptId" style="color: red;">歸屬部門</label>
+                <select name="FeeDeptId" class="form-control" disabled>
+                    <?php
+                    foreach ($deptype as $key => $value) { ?>
+                        <option value="<?php echo $value['department_id']; ?>" <?php
+                                                                                if ($value['department_id'] == $ribsub['FeeDeptId']) {
+                                                                                    echo "selected";
+                                                                                } ?>><?php echo $value['name']; ?></option>
+                    <?php };
+                    ?>
+                </select>
+
+            </div>
+
+        </div>
+        <div class="form-group">
+
+            <div class="col-md-3">
+                <label for="WriteOffId" style="color: red;">報銷人</label>
+                <select name="WriteOffId" class="form-control" disabled>
+                    <?php
+                    foreach ($deptmem as $key => $value) { ?>
+                        <option value="<?php echo $value['accountid']; ?>" <?php if ($value['accountid'] == $ribsub['WriteOffId']) {
+                                                                                echo "selected";
+                                                                            } ?>> <?php echo $value['name']; ?> </option>
+                    <?php }; ?>
+                </select>
+            </div>
+
+            <div class="col-md-3">
+                <label for="FeeNoteShow" style="color: red;">費用說明</label>
+                <input class="form-control" type="text" name="FeeNoteShow" id="FeeNoteShow" value="<?= $ribsub['FeeNoteShow'] ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="ProjectId">合約號</label>
+                <input class="form-control" type="text" name="ProjectId" id="ProjectId" value="<?= $ribsub['ProjectId'] ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="CU_MaterialId">作番號</label>
+                <input class="form-control" type="text" name="CU_MaterialId" id="CU_MaterialId" value="<?= $ribsub['CU_MaterialId'] ?>" disabled>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="TaxId">稅碼</label>
+                <select name="TaxId" class="form-control" disabled>
+                    <option value="ST005" <?php if ($ribsub['TaxId'] == "ST005") {
+                                                echo "selected";
+                                            } ?>>營業稅5%</option>
+                    <option value="ST101" <?php if ($ribsub['TaxId'] == "ST101") {
+                                                echo "selected";
+                                            } ?>>零稅</option>
+                    <option value="ST102" <?php if ($ribsub['TaxId'] == "ST102") {
+                                                echo "selected";
+                                            } ?>>免稅</option>
+                </select>
+            </div>
+            <div class="col-md-3">
+                <label for="IsCounteract">抵扣</label>
+                <select name="IsCounteract" class="form-control" disabled>
+                    <option value=1 <?php if ($ribsub['IsCounteract'] == 1) {
+                                        echo "selected";
+                                    } ?>>可抵扣</option>
+                    <option value=0 <?php if ($ribsub['IsCounteract'] == 0) {
+                                        echo "selected";
+                                    } ?>>不可抵扣</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="UnitId" style="color: red;">計量單位</label>
+                <select name="UnitId" class="form-control" disabled>
+                    <?php
+                    foreach ($unit as $key => $value) { ?>
+                        <option value="<?php echo $value['UnitId']; ?>" <?php if ($value['UnitId'] == $ribsub['UnitId']) {
+                                                                            echo "selected";
+                                                                        } ?>><?php echo $value['UnitName']; ?></option>
+                    <?php };
+                    ?>
+                </select>
+            </div>
+            <div class="col-md-3">
+                <label for="Price" style="color: red;">單價 (原幣值含稅)</label>
+                <input class="form-control" type="number" step="any" name="Price" id="Price" value="<?= $ribsub['Price'] ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="Quantity" style="color: red;">數量</label>
+                <input class="form-control" type="number" step="any" name="Quantity" id="Quantity" value="<?= $ribsub['Quantity'] ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="OAmount" style="color: red;">報銷金額 (原幣值含稅)</label>
+                <input class="form-control" type="number" step="any" name="OAmount" id="OAmount" placeholder="單價x數量" value="<?= round($ribsub['OAmount']) ?>" disabled>
+            </div>
+        </div>
+        <?php
+        if ($user_id == "M0056" || $user_id == "M0209") {
+        ?>
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="CurrId">幣別</label>
+                    <input class="form-control" type="text" name="CurrId" id="CurrId" value="<?php if ($ribsub['CurrId'] == "TWD") {
+                                                                                                    echo "台幣";
+                                                                                                } elseif ($ribsub['CurrId'] == "CNY") {
+                                                                                                    echo "人民幣";
+                                                                                                } elseif ($ribsub['CurrId'] == "EUR") {
+                                                                                                    echo "歐元";
+                                                                                                } elseif ($ribsub['CurrId'] == "HKD") {
+                                                                                                    echo "港幣";
+                                                                                                } else {
+                                                                                                    echo "美元";
+                                                                                                } ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="CurrLAmount">匯率</label>
+                    <input class="form-control" type="number" name="CurrLAmount" id="CurrLAmount" value="<?= $ribsub['CurrentLAmount'] ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="OTax">稅金 (原幣值)</label>
+                    <input class="form-control" type="number" name="OTax" id="OTax" value="<?= round($ribsub['OTax']) ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="LTax">本幣稅金</label>
+                    <input class="form-control" type="number" step="any" name="LTax" id="LTax" value="<?= round($ribsub['LTax']) ?>" disabled>
+                </div>
+            </div>
+
+
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="OAmountUnWithTax">未稅報銷金額 (原幣值)</label>
+                    <input class="form-control" type="number" name="OAmountUnWithTax" id="OAmountUnWithTax" value="<?= round($ribsub['OAmountUnWithTax']) ?>" disabled>
+                </div>
+
+                <div class="col-md-3">
+                    <label for="LAmountUnWithTax">本幣未稅報銷金額</label>
+                    <input class="form-control" type="number" step="any" name="LAmountUnWithTax" id="LAmountUnWithTax" value="<?= round($ribsub['LAmountUnWithTax']) ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="LAmount">本幣報銷金額</label>
+                    <input class="form-control" type="number" step="any" name="LAmount" id="LAmount" value="<?= round($ribsub['LAmount']) ?>" disabled>
+                </div>
+            </div>
+        <?php
+        } ?>
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="VoucherCount">憑單張數</label>
+                <input class="form-control" type="number" name="VoucherCount" id="VoucherCount" max=5 value="<?= $ribsub['VoucherCount'] ?>" disabled>
+            </div>
+            <div class="col-md-3">
+                <label for="VoucherType">憑單類型</label>
+                <select name="VoucherType" class="form-control" disabled>
+                    <option value=0 <?php if ($ribsub['VoucherType'] == 0) {
+                                        echo "selected";
+                                    } ?>>發票</option>
+                    <option value=1 <?php if ($ribsub['VoucherType'] == 1) {
+                                        echo "selected";
+                                    } ?>>收據 </option>
+                    <option value=2 <?php if ($ribsub['VoucherType'] == 2) {
+                                        echo "selected";
+                                    } ?>>支出證明</option>
+                    <option value=3 <?php if ($ribsub['VoucherType'] == 3) {
+                                        echo "selected";
+                                    } ?>>其他</option>
+                </select>
+            </div>
+            <div class="col-md-3">
+                <label for="InvoiceId">發票聯式</label>
+                <select name="InvoiceId" class="form-control" disabled>
+                    <option value="">請選擇發票聯式</option>
+                    <option value="21" <?php if ($ribsub['InvoiceId'] == "21") {
+                                            echo "selected";
+                                        } ?>>進項三聯式、電子計算機統一發票</option>
+                    <option value="22" <?php if ($ribsub['InvoiceId'] == "22") {
+                                            echo "selected";
+                                        } ?>>進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
+                    <option value="23 <?php if ($ribsub['InvoiceId'] == "23") {
+                                            echo "selected";
+                                        } ?>">三聯式、電子計算機、三聯式收銀機統一發票及一般稅額計算之電子發票之進貨退出或折讓證明單</option>
+                    <option value="24 <?php if ($ribsub['InvoiceId'] == "24") {
+                                            echo "selected";
+                                        } ?>">二聯式收銀機統一發票及載有稅額之其他憑證之進貨退出或折讓證明單</option>
+                    <option value="25 <?php if ($ribsub['InvoiceId'] == "25") {
+                                            echo "selected";
+                                        } ?>">進項三聯式收銀機統一發票及一般稅額計算之電子發票</option>
+                    <option value="26 <?php if ($ribsub['InvoiceId'] == "26") {
+                                            echo "selected";
+                                        } ?>">彙總登錄每張稅額伍佰元以下之進項三聯式、電子計算機統一發票</option>
+                    <option value="27 <?php if ($ribsub['InvoiceId'] == "27") {
+                                            echo "selected";
+                                        } ?>">彙總登錄每張稅額伍佰元以下之進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
+                    <option value="28 <?php if ($ribsub['InvoiceId'] == "28") {
+                                            echo "selected";
+                                        } ?>">進項海關代徵營業稅繳納證</option>
+                    <option value="29 <?php if ($ribsub['InvoiceId'] == "29") {
+                                            echo "selected";
+                                        } ?>">進項海關退還溢繳營業稅申報單</option>
+                </select>
+            </div>
+            <div class="col-md-3">
+                <label for="InvoiceNo">發票號碼</label>
+                <input class="form-control" type="text" name="InvoiceNo" id="InvoiceNo" value="<?= $ribsub['InvoiceNo'] ?>" disabled>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="TaxNo">供應商統一編號</label>
+                <input type="text" name="TaxNo" id="TaxNo" class="form-control" value="<?= $ribsub['TaxNo'] ?>" disabled />
+            </div>
+        </div>
+        <div>
+            <input type="hidden" name="rib_id" id="rib_id" value="<?= $ribsub['rib_id'] ?>">
+        </div>
+
+    </form>
 </div>
\ No newline at end of file
diff --git a/wms/rib02-create.php b/wms/rib02-create.php
index ee2dbad2..109b266d 100644
--- a/wms/rib02-create.php
+++ b/wms/rib02-create.php
@@ -1,705 +1,705 @@
-<?php
-include "./header.php";
-
-$rib_id = isset($_GET['id']) ? $_GET['id'] : null;
-$BillNo = isset($_GET['BillNo']) ? $_GET['BillNo'] : null;
-$CurrId = isset($_GET['CurrId']) ? $_GET['CurrId'] : null;
-$sql_rib = "";
-if (empty($rib_id)) {
-    $sql_rib = "SELECT * FROM rib WHERE BillNo = '$BillNo' && CurrentState=0";
-} else {
-    $sql_rib = "SELECT * FROM rib WHERE rib_id = $rib_id";
-}
-$rib_query = mysqli_query($link, $sql_rib);
-if (mysqli_num_rows($rib_query) > 0) {
-    while ($rib = mysqli_fetch_assoc($rib_query)) {
-        $rib_id = $rib['rib_id'];
-        $WrtieOffId = $rib['WriteOffId'];
-        $FeeDeptId = $rib['DeptId'];
-        $CurrId = $rib['CurrId'];
-        if ($rib['CurrentState'] == 1) {
-            // 爬蟲--匯率
-            function htmlContentGet($url)
-            {
-                $opts = [
-                    "http" => [
-                        "method" => "GET",
-                        "header" => "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36\r\n"
-                    ]
-                ];
-
-                return file_get_contents($url, false, stream_context_create($opts));
-            }
-
-            $week = date("w");
-            $currency_day = date("Y-m-d", strtotime("-1 day"));
-            if ($week == 1) {
-                $currency_day = date("Y-m-d", strtotime("-3 day"));
-            } elseif ($week == 0) {
-                $currency_day = date("Y-m-d", strtotime("-2 day"));
-            }
-            $X = htmlContentGet('https://rate.bot.com.tw/xrt/all/' . $currency_day);
-            $string = strip_tags($X); // 先清掉 html tag, 以免 html tag 被破壞
-            //美金 
-            $USD = explode(' ', stristr($string, '美金'))[298];
-            //人民幣 
-            $RMB = explode(' ', stristr($string, '人民幣'))[298];
-            //歐元
-            $EUR = explode(' ', stristr($string, '歐元'))[298];
-            //港幣
-            $HKD = explode(' ', stristr($string, '港幣'))[298];
-
-            //整理要變更的數據 -表身
-            $CurrLAmount = 1;
-            if ($rib['CurrId'] == "CNY") {
-                $CurrLAmount = $RMB;
-            } elseif ($rib['CurrId'] == "EUR") {
-                $CurrLAmount = $EUR;
-            } elseif ($rib['CurrId'] == "HKD") {
-                $CurrLAmount = $HKD;
-            } elseif ($rib['CurrId'] == "USD") {
-                $CurrLAmount = $USD;
-            }
-        }
-    }
-}
-
-$RowCode = $_GET['RowCode'];
-
-//取得費用項目代碼
-
-$sql_feetype = "SELECT FeeTypeId, FeeTypeName FROM comFeeType WHERE (FeeTypeId NOT LIKE 'A%') AND(FeeTypeId NOT LIKE 'Z%')";
-$feetype = $conn->query($sql_feetype);
-$member = array();
-//取得人員名單與使用者的部門
-
-$sql_mydept =  "SELECT UserId, Username FROM capMembership";
-$deptmem = $conn->query($sql_mydept);
-foreach ($deptmem as $mem) {
-    $userid = $mem['UserId'];
-    $username = $mem['Username'];
-    $member["$userid"] = [$username];
-};
-$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
-$allpeople = $conn->query($sql_dept);
-foreach ($allpeople as $man) {
-    if ($man['PersonId'] == $user_id) {
-        $mydepart = $man['DeptId'];
-    }
-    $personid = $man['PersonId'];
-    $depart = $man['DeptId'];
-    if (isset($member["$personid"])) {
-        array_push($member["$personid"], "$depart");
-    }
-}
-
-//取得部門代碼
-$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
-$deptype = $conn->query($sql_department);
-
-
-//取得計量單位
-$sql_unit = "SELECT * FROM unit";
-$unit_query = mysqli_query($link, $sql_unit);
-$unit = mysqli_fetch_all($unit_query, MYSQLI_ASSOC);
-
-// 取得供應商、合約跟作番號
-$BusinessPartner = array();
-$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
-$BizPartner = $conn->query($sql_Biz);
-$bizcount = 0;
-foreach ($BizPartner as $biz) {
-    $bizKey = $biz['BizPartnerId'];
-    $bizValue = $biz['BizPartnerName'];
-    array_push($BusinessPartner, $bizKey);
-    $bizcount += 1;
-}
-$BizJSON = json_encode($BusinessPartner);
-$sql_Project = "SELECT * FROM comProject";
-$projects = $conn->query($sql_Project);
-$sql_Material = "SELECT * FROM comMaterialGroup";
-$materials = $conn->query($sql_Material);
-
-?>
-<div style="width: 90%;">
-
-    <div style="padding-left: 2rem; padding-bottom: 1rem;">
-        <a href="rib01-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
-            <span class="glyphicon glyphicon-home"></span>
-        </a>
-    </div>
-</div>
-
-<div class="container" id="ribsubadd">
-    <div class="text-center">
-        <h3>新增費用單據</h3>
-    </div>
-    <form class="form-horizontal" name="ribsubform" id="ribsubform" method="POST" action="rib02-submit.php?rib_id=<?= $rib_id ?>&submit=add&<?= $token_link ?>" enctype="multipart/form-data">
-
-
-        <div class="form-group">
-            <div class="col-md-3" style="display: none;">
-                <label for="RowCode" style="color: red;">序號</label>
-                <input class="form-control" type="int" name="RowCode" id="RowCode" value="<?= $RowCode ?>" required>
-
-            </div>
-            <div class="col-md-3">
-                <label for="FeeDate" style="color: red;">發票日期</label>
-                <input class="form-control" type="int" name="FeeDate" id="FeeDate" placeholder="西元年(4碼)+月(2碼)+日(2碼)" required>
-
-            </div>
-            <?php if ($user_id == "M0056" || $user_id == "M0209") { ?>
-                <div class="col-md-3">
-                    <label for="FeeTypeId" style="color: red;">費用項目代碼</label>
-                    <select name="FeeTypeId" class="form-control" required>
-                        <?php
-                        foreach ($feetype as $key => $value) { ?>
-                            <option value="<?php echo $value['FeeTypeId']; ?>"><?php echo $value['FeeTypeName']; ?></option>
-                        <?php };
-                        ?>
-                    </select>
-                </div>
-            <?php } else { ?>
-                <div class="col-md-3">
-                    <label for="FeeTypeGen" style="color: red;">費用類別</label>
-                    <select name="FeeTypeGen" id="FeeTypeGen" class="form-control" required>
-                        <option value="">請選擇費用類別</option>
-                        <option value=1>交通費</option>
-                        <option value=2>出差旅費</option>
-                        <option value=3>交際餐飲禮品</option>
-                        <option value=4>文具用品</option>
-                        <option value=5>郵資、電話/網路費、匯費</option>
-                        <option value=6>水費</option>
-                        <option value=7>電費</option>
-                        <option value=8>瓦斯費</option>
-                        <option value=9>運費/快遞</option>
-                        <option value=10>堆高機費用</option>
-                        <option value=11>五金材料工具</option>
-                        <option value=12>汽車維修</option>
-                        <option value=13>研發測試打樣</option>
-                        <option value=14>繳稅</option>
-                        <option value=15>其他費用</option>
-                    </select>
-                </div>
-                <div class="col-md-3">
-                    <label for="FeeTypeId" style="color: red;">費用項目代碼</label>
-                    <select name="FeeTypeId" id="FeeTypeId" class="form-control" required>
-
-                    </select>
-                </div>
-
-
-            <?php } ?>
-            <div class="col-md-3">
-                <label for="FeeDeptId" style="color: red;">歸屬部門</label>
-                <select name="FeeDeptId" id="FeeDeptId" class="form-control" required>
-                    <?php
-                    foreach ($deptype as $dept) { ?>
-                        <option value="<?php echo $dept['DeptId']; ?>" <?php
-                                                                        if ($dept['DeptId'] == $FeeDeptId) {
-                                                                            echo "selected";
-                                                                        } ?>><?php echo $dept['DeptName']; ?></option>
-                    <?php };
-                    ?>
-                </select>
-
-            </div>
-
-        </div>
-        <div class="form-group">
-
-            <div class="col-md-3">
-                <label for="WriteOffId" style="color: red;">報銷人</label>
-                <select name="WriteOffId" id="WriteOffId" class="form-control" required>
-                    <option value="">請選擇報銷人</option>
-                    <?php
-                    foreach ($member as $key => $value) { ?>
-                        <option value="<?php echo $key; ?>" style="display:none" id="<?= 'WriteOff' . $value[1] . '-' . $value[0] ?>" <?php if ($key == $WrtieOffId) {
-                                                                                                                                            echo "selected";
-                                                                                                                                        } ?>> <?php echo $value[0]; ?> </option>
-                    <?php }; ?>
-                </select>
-            </div>
-
-            <div class="col-md-3">
-                <label for="FeeNoteShow" style="color: red;">費用說明</label>
-                <input class="form-control" type="text" name="FeeNoteShow" id="FeeNoteShow">
-            </div>
-            <div class="col-md-3">
-                <label for="ProjectId">合約號</label>
-                <select name="ProjectId" id="ProjectId">
-                    <option value=""></option>
-                    <?php
-                    foreach ($projects as $Project) {
-                    ?>
-                        <option value="<?= $Project['ProjectId'] ?>"><?= $Project['ProjectId'] . $Project['ProjectName'] ?></option>
-                    <?php
-                    }
-                    ?>
-                </select>
-            </div>
-            <div class="col-md-3">
-                <label for="CU_MaterialId">作番號</label>
-                <select name="CU_MaterialId" id="CU_MaterialId">
-                    <option value=""></option>
-                    <?php
-                    foreach ($materials as $material) {
-                    ?>
-                        <option value="<?= $material['MaterialId'] ?>"><?= $material['MaterialId'] . $material['MaterialName'] ?></option>
-                    <?php
-                    }
-                    ?>
-                </select>
-            </div>
-
-        </div>
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="TaxId">稅碼</label>
-                <select name="TaxId" id="TaxId" class="form-control">
-                    <option value="ST005" selected>營業稅5%</option>
-                    <option value="ST101">零稅</option>
-                    <option value="ST102">免稅</option>
-                </select>
-            </div>
-            <div class="col-md-3">
-                <label for="IsCounteract">抵扣</label>
-                <select name="IsCounteract" id="IsCounteract" class="form-control">
-                    <option value=1 selected>可抵扣</option>
-                    <option value=0>不可抵扣</option>
-                </select>
-            </div>
-
-        </div>
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="UnitId" style="color: red;">計量單位</label>
-                <select name="UnitId" id="UnitId" class="form-control" required>
-                    <?php
-                    foreach ($unit as $key => $value) { ?>
-                        <option value="<?php echo $value['UnitId']; ?>"><?php echo $value['UnitName']; ?></option>
-                    <?php };
-                    ?>
-                </select>
-            </div>
-            <div class="col-md-3">
-                <label for="Price" style="color: red;">單價 (原幣值含稅)</label>
-                <input class="form-control" type="number" step="any" name="Price" id="Price" required>
-            </div>
-            <div class="col-md-3">
-                <label for="Quantity" style="color: red;">數量</label>
-                <input class="form-control" type="number" step="any" name="Quantity" id="Quantity" value="1" required>
-            </div>
-            <div class="col-md-3">
-                <label for="OAmount" style="color: red;">報銷金額 (原幣值含稅)</label>
-                <input class="form-control" type="number" step="any" name="OAmount" id="OAmount" placeholder="單價x數量" required disabled>
-            </div>
-        </div>
-        <?php
-        if ($user_id == "M0056" || $user_id == "M0209") {
-        ?>
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="CurrId">幣別</label>
-                    <input class="form-control" type="text" name="CurrId" id="CurrId" value="<?php if ($CurrId == "TWD") {
-                                                                                                    echo "台幣";
-                                                                                                } elseif ($CurrId == "CNY") {
-                                                                                                    echo "人民幣";
-                                                                                                } elseif ($CurrId == "EUR") {
-                                                                                                    echo "歐元";
-                                                                                                } elseif ($CurrId == "HKD") {
-                                                                                                    echo "港幣";
-                                                                                                } else {
-                                                                                                    echo "美元";
-                                                                                                } ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="CurrLAmount">匯率</label>
-                    <input class="form-control" type="number" name="CurrLAmount" id="CurrLAmount" value="<?= $CurrLAmount ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="OTax">稅金 (原幣值)</label>
-                    <input class="form-control" type="number" name="OTax" id="OTax" value="<?= $ribsub['OTax'] ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="LTax">本幣稅金</label>
-                    <input class="form-control" type="number" step="any" name="LTax" id="LTax" value="<?= $ribsub['LTax'] ?>" disabled>
-                </div>
-            </div>
-
-
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="OAmountUnWithTax">未稅報銷金額 (原幣值)</label>
-                    <input class="form-control" type="number" name="OAmountUnWithTax" id="OAmountUnWithTax" value="<?= $ribsub['OAmountUnWithTax'] ?>" disabled>
-                </div>
-
-                <div class="col-md-3">
-                    <label for="LAmountUnWithTax">本幣未稅報銷金額</label>
-                    <input class="form-control" type="number" step="any" name="LAmountUnWithTax" id="LAmountUnWithTax" value="<?= $ribsub['LAmountUnWithTax'] ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="LAmount">本幣報銷金額</label>
-                    <input class="form-control" type="number" step="any" name="LAmount" id="LAmount" value="<?= $ribsub['LAmount'] ?>" disabled>
-                </div>
-            </div>
-        <?php
-        } ?>
-
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="VoucherCount">憑單張數</label>
-                <input class="form-control" type="number" name="VoucherCount" id="VoucherCount" max=5 value=1>
-            </div>
-            <div class="col-md-3">
-                <label for="VoucherType">憑單類型</label>
-                <select name="VoucherType" id="VoucherType" class="form-control">
-                    <option value="0" selected>發票</option>
-                    <option value="1">收據 </option>
-                    <option value="2">支出證明</option>
-                    <option value="3">其他</option>
-                </select>
-            </div>
-            <div class="col-md-3" id="NotInvoice1">
-                <label for="InvoiceId">發票聯式
-                    <a onclick="ShowInvoice()">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-info-circle" viewBox="0 0 16 16">
-                            <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
-                            <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM9 4.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z" />
-                        </svg>
-                    </a>
-                </label>
-
-
-                <select name="InvoiceId" id="InvoiceId" class="form-control">
-                    <option value="">請選擇發票聯式</option>
-                    <option value="25">一般電子發票-> 進項三聯式收銀機統一發票及一般稅額計算之電子發票</option>
-                    <option value="21">三聯式手開發票-> 進項三聯式、電子計算機統一發票</option>
-                    <option value="22">二聯式收銀機發票 -> 進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
-                    <?php if ($user_id == "M0056" || $user_id == "M0209") { ?>
-                        <option value="23">三聯式、電子計算機、三聯式收銀機統一發票及一般稅額計算之電子發票之進貨退出或折讓證明單</option>
-                        <option value="24">二聯式收銀機統一發票及載有稅額之其他憑證之進貨退出或折讓證明單</option>
-                        <option value="26">彙總登錄每張稅額伍佰元以下之進項三聯式、電子計算機統一發票</option>
-                        <option value="27">彙總登錄每張稅額伍佰元以下之進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
-                        <option value="28">進項海關代徵營業稅繳納證</option>
-                        <option value="29">進項海關退還溢繳營業稅申報單</option>
-                    <?php } ?>
-                </select>
-
-            </div>
-            <div class="col-md-3" id="NotInvoice2">
-                <label for="InvoiceNo">發票號碼</label>
-                <input class="form-control" type="text" name="InvoiceNo" id="InvoiceNo">
-            </div>
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-3" id="Tax">
-                <label for="TaxNo">供應商統一編號</label>
-                <input type="text" name="TaxNo" id="TaxNo" class="form-control" onblur="checkBiz()">
-            </div>
-        </div>
-        <div>
-
-            <input type="hidden" name="CurrId" value="<?= $CurrId ?>">
-        </div>
-
-</div>
-<div class="form-group">
-    <div class="col-md-7">
-
-    </div>
-    <div class="col-md-5" style="margin-top: 40px;">
-        <button onclick="senddata()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-bottom: 110px;">新增費用單據</button>
-    </div>
-</div>
-
-
-</form>
-</div>
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script>
-    var TempArr = [];
-    var CurrId = "<?= $CurrId ?>";
-    $(document).ready(function() {
-        $("#ProjectId").selectize();
-        $("#CU_MaterialId").selectize();
-    })
-
-    function checkBiz() {
-        if ($("#TaxNo").val().length !== 8) {
-            alert("統一編號格式錯誤");
-        } else {
-            var biz = $("#TaxNo").val();
-            var BizArray = <?php echo $BizJSON; ?>;
-            var answer = 0;
-            for (var partner = 0; partner < <?= $bizcount ?>; partner++) {
-                var value = BizArray[partner];
-                if (biz == value) {
-                    answer += 1
-                }
-            }
-            if (answer == 1) {
-                alert("供應商認證成功")
-            } else {
-                alert("T8內無此供應商")
-            }
-        }
-
-    }
-    $(function() {
-        $("#VoucherType").change(function() {
-            if ($("#VoucherType").val() !== "0") {
-                $("#NotInvoice1").hide();
-                $("#NotInvoice2").hide();
-            } else {
-                $("#NotInvoice1").show();
-                $("#NotInvoice2").show();
-            }
-        })
-        $('#FeeTypeGen').change(function() {
-            console.log($('#FeeTypeGen').val());
-            var FeeTypeId = document.getElementById("FeeTypeId")
-            var FeeType = [{}, {
-                '400001': '交通費-捷利卡儲值',
-                '400002': '交通費-油資',
-                '400003': '交通費-ETC',
-                '400004': '交通費-停車費'
-            }, {
-                '130101': '差旅費-膳雜費',
-                '130102': '差旅費-住宿',
-                '130301': '差旅費-機票款',
-                '130302': '差旅費-高鐵車資',
-                '130303': '差旅費-台鐵車資',
-                '130304': '差旅費-客運車資',
-                '130305': '差旅費-捷運車資',
-                '130306': '差旅費-計程車車資',
-                '130307': '差旅費-國外交通費 ',
-                '130308': '差旅費-油資',
-                '130309': '差旅費-ETC',
-                '130310': '差旅費-停車費'
-            }, {
-                '200001': '交際便餐、飲品',
-                '200002': '交際禮品費',
-                '200003': '禮金'
-            }, {
-                '120001': '文具用品',
-                '120002': '影印紙',
-                '120003': '影印費',
-                '120004': '名片'
-            }, {
-                '150001': '郵資',
-                '150002': '電話費',
-                '150003': '匯款手續費'
-            }, {
-                '180101': '水費'
-            }, {
-                '180201': '電費'
-            }, {
-                '180301': '瓦斯費'
-            }, {
-                '140001': '運費/快遞'
-            }, {
-                '140002': '堆高機費用'
-            }, {
-                '390001': '材料費、五金用品'
-            }, {
-                '160002': '汽車維修'
-            }, {
-                '370004': '研發打樣費',
-                '370005': '研發測試費'
-            }, {
-                '220001': '牌照稅',
-                '220002': '燃料費',
-                '220005': '印花稅',
-            }, {
-                '880004': '其他雜項支出'
-            }];
-            for (var q = 0; q < (FeeType.length); q++) {
-                if ($('#FeeTypeGen').val() == (q)) {
-                    $("#FeeTypeId").empty();
-                    for (const key in FeeType[q]) {
-                        FeeTypeId.add(new Option(FeeType[q][key], key));
-                    }
-                }
-            }
-        })
-        $('#FeeDeptId').change(function() {
-            changeWriteOffId($('#FeeDeptId').val());
-        })
-        $("#Price").change(function() {
-            if (CurrId === "TWD") {
-                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
-                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
-                if ($("#TaxId").val() === "ST005") {
-                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
-                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
-                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
-                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
-
-                } else {
-                    $("#OTax").val(0);
-                    $("#LTax").val(0);
-                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
-                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
-                }
-            } else {
-                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
-                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
-                if ($("#TaxId").val() === "ST005") {
-                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
-                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
-                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
-                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
-
-                } else {
-                    $("#OTax").val(0);
-                    $("#LTax").val(0);
-                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
-                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
-                }
-            }
-
-        });
-        $("#Quantity").change(function() {
-            if (CurrId === "TWD") {
-                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
-                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
-                if ($("#TaxId").val() === "ST005") {
-                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
-                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
-                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
-                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
-
-                } else {
-                    $("#OTax").val(0);
-                    $("#LTax").val(0);
-                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
-                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
-                }
-            } else {
-                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
-                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
-                if ($("#TaxId").val() === "ST005") {
-                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
-                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
-                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
-                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
-
-                } else {
-                    $("#OTax").val(0);
-                    $("#LTax").val(0);
-                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
-                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
-                }
-            }
-
-        });
-        $("#TaxId").change(function() {
-            if (CurrId === "TWD") {
-                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
-                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
-                if ($("#TaxId").val() === "ST005") {
-                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
-                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
-                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
-                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
-
-                } else {
-                    $("#OTax").val(0);
-                    $("#LTax").val(0);
-                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
-                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
-                }
-            } else {
-                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
-                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
-                if ($("#TaxId").val() === "ST005") {
-                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
-                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
-                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
-                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
-
-                } else {
-                    $("#OTax").val(0);
-                    $("#LTax").val(0);
-                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
-                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
-                }
-            }
-
-        })
-        $("#FeeDate").change(function() {
-            if ($("#FeeDate").val().length != 8) {
-                alert("輸入格式錯誤");
-                $("#FeeDate").val('');
-            } else {
-                let year = $("#FeeDate").val().substr(0, 4);
-                let month = parseInt($("#FeeDate").val().substr(4, 2)) - 1;
-                let day = $("#FeeDate").val().substr(6, 2);
-                let feedate = new Date(year, month, day);
-                let now = new Date();
-                if (feedate.getMonth() != month) {
-                    alert("請輸入正確格式的日期");
-                } else {
-                    if (feedate > now) {
-                        alert("費用日期不可大於今天");
-                        $("#FeeDate").val('');
-                    } else {
-                        now.setMonth(now.getMonth() - 2);
-                        now.setDate(1);
-                        now.setDate(now.getDate() - 1);
-                        if (feedate <= now) {
-                            alert("超過兩個月的費用無法進行報銷");
-                            $("#FeeDate").val('');
-                        }
-                    }
-                }
-            }
-        })
-
-    })
-
-    function ShowInvoice() {
-        window.open('rib02-invoice.php', '發票範例', config = 'height=600, width=600');
-
-    }
-
-    function changeWriteOffId(SelectedDept) {
-        var SelectDeptId = 'WriteOff' + SelectedDept + '-';
-        for (var i = 0; i < WriteOffId.options.length; i++) {
-            WriteOffId.options[i].selected = false;
-            let thisid = WriteOffId.options[i].id
-            if (thisid.search(SelectDeptId) === 0) {
-                WriteOffId.options[i].style['display'] = '';
-            } else {
-                WriteOffId.options[i].style['display'] = 'none';
-            };
-
-        };
-    };
-
-    function senddata() {
-        if ($("#FeeDate").val() == "" || $("#FeeNoteShow").val() == "" || $("#Price").val() == "" || $("#Quantity").val() == "" || $("#WriteOffId").val() == "") {
-            alert("請確認紅字部分皆有填寫");
-        } else if ($("#OAmount").val() <= 0) {
-            alert("金額必須大於零");
-
-        } else {
-            $("#OAmount").prop("disabled", false);
-            <?php
-            if ($user_id == "M0056" || $user_id == "M0209") { ?>
-                $("#OTax").prop("disabled", false);
-                $("#LTax").prop("disabled", false);
-                $("#CurrLAmount").prop("disabled", false);
-                $("#OAmountUnWithTax").prop("disabled", false);
-                $("#LAmountUnWithTax").prop("disabled", false);
-                $("#LAmount").prop("disabled", false);
-                $("#OAmount").prop("disabled", false);
-            <?php } ?>
-            $('#ribsubform').submit();
-        }
-
-    }
+<?php
+include "./header.php";
+
+$rib_id = isset($_GET['id']) ? $_GET['id'] : null;
+$BillNo = isset($_GET['BillNo']) ? $_GET['BillNo'] : null;
+$CurrId = isset($_GET['CurrId']) ? $_GET['CurrId'] : null;
+$sql_rib = "";
+if (empty($rib_id)) {
+    $sql_rib = "SELECT * FROM rib WHERE BillNo = '$BillNo' && CurrentState=0";
+} else {
+    $sql_rib = "SELECT * FROM rib WHERE rib_id = $rib_id";
+}
+$rib_query = mysqli_query($link, $sql_rib);
+if (mysqli_num_rows($rib_query) > 0) {
+    while ($rib = mysqli_fetch_assoc($rib_query)) {
+        $rib_id = $rib['rib_id'];
+        $WrtieOffId = $rib['WriteOffId'];
+        $FeeDeptId = $rib['DeptId'];
+        $CurrId = $rib['CurrId'];
+        if ($rib['CurrentState'] == 1) {
+            // 爬蟲--匯率
+            function htmlContentGet($url)
+            {
+                $opts = [
+                    "http" => [
+                        "method" => "GET",
+                        "header" => "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36\r\n"
+                    ]
+                ];
+
+                return file_get_contents($url, false, stream_context_create($opts));
+            }
+
+            $week = date("w");
+            $currency_day = date("Y-m-d", strtotime("-1 day"));
+            if ($week == 1) {
+                $currency_day = date("Y-m-d", strtotime("-3 day"));
+            } elseif ($week == 0) {
+                $currency_day = date("Y-m-d", strtotime("-2 day"));
+            }
+            $X = htmlContentGet('https://rate.bot.com.tw/xrt/all/' . $currency_day);
+            $string = strip_tags($X); // 先清掉 html tag, 以免 html tag 被破壞
+            //美金 
+            $USD = explode(' ', stristr($string, '美金'))[298];
+            //人民幣 
+            $RMB = explode(' ', stristr($string, '人民幣'))[298];
+            //歐元
+            $EUR = explode(' ', stristr($string, '歐元'))[298];
+            //港幣
+            $HKD = explode(' ', stristr($string, '港幣'))[298];
+
+            //整理要變更的數據 -表身
+            $CurrLAmount = 1;
+            if ($rib['CurrId'] == "CNY") {
+                $CurrLAmount = $RMB;
+            } elseif ($rib['CurrId'] == "EUR") {
+                $CurrLAmount = $EUR;
+            } elseif ($rib['CurrId'] == "HKD") {
+                $CurrLAmount = $HKD;
+            } elseif ($rib['CurrId'] == "USD") {
+                $CurrLAmount = $USD;
+            }
+        }
+    }
+}
+
+$RowCode = $_GET['RowCode'];
+
+//取得費用項目代碼
+
+$sql_feetype = "SELECT FeeTypeId, FeeTypeName FROM comFeeType WHERE (FeeTypeId NOT LIKE 'A%') AND(FeeTypeId NOT LIKE 'Z%')";
+$feetype = $conn->query($sql_feetype);
+$member = array();
+//取得人員名單與使用者的部門
+
+$sql_mydept =  "SELECT UserId, Username FROM capMembership";
+$deptmem = $conn->query($sql_mydept);
+foreach ($deptmem as $mem) {
+    $userid = $mem['UserId'];
+    $username = $mem['Username'];
+    $member["$userid"] = [$username];
+};
+$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
+$allpeople = $conn->query($sql_dept);
+foreach ($allpeople as $man) {
+    if ($man['PersonId'] == $user_id) {
+        $mydepart = $man['DeptId'];
+    }
+    $personid = $man['PersonId'];
+    $depart = $man['DeptId'];
+    if (isset($member["$personid"])) {
+        array_push($member["$personid"], "$depart");
+    }
+}
+
+//取得部門代碼
+$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
+$deptype = $conn->query($sql_department);
+
+
+//取得計量單位
+$sql_unit = "SELECT * FROM unit";
+$unit_query = mysqli_query($link, $sql_unit);
+$unit = mysqli_fetch_all($unit_query, MYSQLI_ASSOC);
+
+// 取得供應商、合約跟作番號
+$BusinessPartner = array();
+$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
+$BizPartner = $conn->query($sql_Biz);
+$bizcount = 0;
+foreach ($BizPartner as $biz) {
+    $bizKey = $biz['BizPartnerId'];
+    $bizValue = $biz['BizPartnerName'];
+    array_push($BusinessPartner, $bizKey);
+    $bizcount += 1;
+}
+$BizJSON = json_encode($BusinessPartner);
+$sql_Project = "SELECT * FROM comProject";
+$projects = $conn->query($sql_Project);
+$sql_Material = "SELECT * FROM comMaterialGroup";
+$materials = $conn->query($sql_Material);
+
+?>
+<div style="width: 90%;">
+
+    <div style="padding-left: 2rem; padding-bottom: 1rem;">
+        <a href="rib01-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
+            <span class="glyphicon glyphicon-home"></span>
+        </a>
+    </div>
+</div>
+
+<div class="container" id="ribsubadd">
+    <div class="text-center">
+        <h3>新增費用單據</h3>
+    </div>
+    <form class="form-horizontal" name="ribsubform" id="ribsubform" method="POST" action="rib02-submit.php?rib_id=<?= $rib_id ?>&submit=add&<?= $token_link ?>" enctype="multipart/form-data">
+
+
+        <div class="form-group">
+            <div class="col-md-3" style="display: none;">
+                <label for="RowCode" style="color: red;">序號</label>
+                <input class="form-control" type="int" name="RowCode" id="RowCode" value="<?= $RowCode ?>" required>
+
+            </div>
+            <div class="col-md-3">
+                <label for="FeeDate" style="color: red;">發票日期</label>
+                <input class="form-control" type="int" name="FeeDate" id="FeeDate" placeholder="西元年(4碼)+月(2碼)+日(2碼)" required>
+
+            </div>
+            <?php if ($user_id == "M0056" || $user_id == "M0209") { ?>
+                <div class="col-md-3">
+                    <label for="FeeTypeId" style="color: red;">費用項目代碼</label>
+                    <select name="FeeTypeId" class="form-control" required>
+                        <?php
+                        foreach ($feetype as $key => $value) { ?>
+                            <option value="<?php echo $value['FeeTypeId']; ?>"><?php echo $value['FeeTypeName']; ?></option>
+                        <?php };
+                        ?>
+                    </select>
+                </div>
+            <?php } else { ?>
+                <div class="col-md-3">
+                    <label for="FeeTypeGen" style="color: red;">費用類別</label>
+                    <select name="FeeTypeGen" id="FeeTypeGen" class="form-control" required>
+                        <option value="">請選擇費用類別</option>
+                        <option value=1>交通費</option>
+                        <option value=2>出差旅費</option>
+                        <option value=3>交際餐飲禮品</option>
+                        <option value=4>文具用品</option>
+                        <option value=5>郵資、電話/網路費、匯費</option>
+                        <option value=6>水費</option>
+                        <option value=7>電費</option>
+                        <option value=8>瓦斯費</option>
+                        <option value=9>運費/快遞</option>
+                        <option value=10>堆高機費用</option>
+                        <option value=11>五金材料工具</option>
+                        <option value=12>汽車維修</option>
+                        <option value=13>研發測試打樣</option>
+                        <option value=14>繳稅</option>
+                        <option value=15>其他費用</option>
+                    </select>
+                </div>
+                <div class="col-md-3">
+                    <label for="FeeTypeId" style="color: red;">費用項目代碼</label>
+                    <select name="FeeTypeId" id="FeeTypeId" class="form-control" required>
+
+                    </select>
+                </div>
+
+
+            <?php } ?>
+            <div class="col-md-3">
+                <label for="FeeDeptId" style="color: red;">歸屬部門</label>
+                <select name="FeeDeptId" id="FeeDeptId" class="form-control" required>
+                    <?php
+                    foreach ($deptype as $dept) { ?>
+                        <option value="<?php echo $dept['DeptId']; ?>" <?php
+                                                                        if ($dept['DeptId'] == $FeeDeptId) {
+                                                                            echo "selected";
+                                                                        } ?>><?php echo $dept['DeptName']; ?></option>
+                    <?php };
+                    ?>
+                </select>
+
+            </div>
+
+        </div>
+        <div class="form-group">
+
+            <div class="col-md-3">
+                <label for="WriteOffId" style="color: red;">報銷人</label>
+                <select name="WriteOffId" id="WriteOffId" class="form-control" required>
+                    <option value="">請選擇報銷人</option>
+                    <?php
+                    foreach ($member as $key => $value) { ?>
+                        <option value="<?php echo $key; ?>" style="display:none" id="<?= 'WriteOff' . $value[1] . '-' . $value[0] ?>" <?php if ($key == $WrtieOffId) {
+                                                                                                                                            echo "selected";
+                                                                                                                                        } ?>> <?php echo $value[0]; ?> </option>
+                    <?php }; ?>
+                </select>
+            </div>
+
+            <div class="col-md-3">
+                <label for="FeeNoteShow" style="color: red;">費用說明</label>
+                <input class="form-control" type="text" name="FeeNoteShow" id="FeeNoteShow">
+            </div>
+            <div class="col-md-3">
+                <label for="ProjectId">合約號</label>
+                <select name="ProjectId" id="ProjectId">
+                    <option value=""></option>
+                    <?php
+                    foreach ($projects as $Project) {
+                    ?>
+                        <option value="<?= $Project['ProjectId'] ?>"><?= $Project['ProjectId'] . $Project['ProjectName'] ?></option>
+                    <?php
+                    }
+                    ?>
+                </select>
+            </div>
+            <div class="col-md-3">
+                <label for="CU_MaterialId">作番號</label>
+                <select name="CU_MaterialId" id="CU_MaterialId">
+                    <option value=""></option>
+                    <?php
+                    foreach ($materials as $material) {
+                    ?>
+                        <option value="<?= $material['MaterialId'] ?>"><?= $material['MaterialId'] . $material['MaterialName'] ?></option>
+                    <?php
+                    }
+                    ?>
+                </select>
+            </div>
+
+        </div>
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="TaxId">稅碼</label>
+                <select name="TaxId" id="TaxId" class="form-control">
+                    <option value="ST005" selected>營業稅5%</option>
+                    <option value="ST101">零稅</option>
+                    <option value="ST102">免稅</option>
+                </select>
+            </div>
+            <div class="col-md-3">
+                <label for="IsCounteract">抵扣</label>
+                <select name="IsCounteract" id="IsCounteract" class="form-control">
+                    <option value=1 selected>可抵扣</option>
+                    <option value=0>不可抵扣</option>
+                </select>
+            </div>
+
+        </div>
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="UnitId" style="color: red;">計量單位</label>
+                <select name="UnitId" id="UnitId" class="form-control" required>
+                    <?php
+                    foreach ($unit as $key => $value) { ?>
+                        <option value="<?php echo $value['UnitId']; ?>"><?php echo $value['UnitName']; ?></option>
+                    <?php };
+                    ?>
+                </select>
+            </div>
+            <div class="col-md-3">
+                <label for="Price" style="color: red;">單價 (原幣值含稅)</label>
+                <input class="form-control" type="number" step="any" name="Price" id="Price" required>
+            </div>
+            <div class="col-md-3">
+                <label for="Quantity" style="color: red;">數量</label>
+                <input class="form-control" type="number" step="any" name="Quantity" id="Quantity" value="1" required>
+            </div>
+            <div class="col-md-3">
+                <label for="OAmount" style="color: red;">報銷金額 (原幣值含稅)</label>
+                <input class="form-control" type="number" step="any" name="OAmount" id="OAmount" placeholder="單價x數量" required disabled>
+            </div>
+        </div>
+        <?php
+        if ($user_id == "M0056" || $user_id == "M0209") {
+        ?>
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="CurrId">幣別</label>
+                    <input class="form-control" type="text" name="CurrId" id="CurrId" value="<?php if ($CurrId == "TWD") {
+                                                                                                    echo "台幣";
+                                                                                                } elseif ($CurrId == "CNY") {
+                                                                                                    echo "人民幣";
+                                                                                                } elseif ($CurrId == "EUR") {
+                                                                                                    echo "歐元";
+                                                                                                } elseif ($CurrId == "HKD") {
+                                                                                                    echo "港幣";
+                                                                                                } else {
+                                                                                                    echo "美元";
+                                                                                                } ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="CurrLAmount">匯率</label>
+                    <input class="form-control" type="number" name="CurrLAmount" id="CurrLAmount" value="<?= $CurrLAmount ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="OTax">稅金 (原幣值)</label>
+                    <input class="form-control" type="number" name="OTax" id="OTax" value="<?= $ribsub['OTax'] ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="LTax">本幣稅金</label>
+                    <input class="form-control" type="number" step="any" name="LTax" id="LTax" value="<?= $ribsub['LTax'] ?>" disabled>
+                </div>
+            </div>
+
+
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="OAmountUnWithTax">未稅報銷金額 (原幣值)</label>
+                    <input class="form-control" type="number" name="OAmountUnWithTax" id="OAmountUnWithTax" value="<?= $ribsub['OAmountUnWithTax'] ?>" disabled>
+                </div>
+
+                <div class="col-md-3">
+                    <label for="LAmountUnWithTax">本幣未稅報銷金額</label>
+                    <input class="form-control" type="number" step="any" name="LAmountUnWithTax" id="LAmountUnWithTax" value="<?= $ribsub['LAmountUnWithTax'] ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="LAmount">本幣報銷金額</label>
+                    <input class="form-control" type="number" step="any" name="LAmount" id="LAmount" value="<?= $ribsub['LAmount'] ?>" disabled>
+                </div>
+            </div>
+        <?php
+        } ?>
+
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="VoucherCount">憑單張數</label>
+                <input class="form-control" type="number" name="VoucherCount" id="VoucherCount" max=5 value=1>
+            </div>
+            <div class="col-md-3">
+                <label for="VoucherType">憑單類型</label>
+                <select name="VoucherType" id="VoucherType" class="form-control">
+                    <option value="0" selected>發票</option>
+                    <option value="1">收據 </option>
+                    <option value="2">支出證明</option>
+                    <option value="3">其他</option>
+                </select>
+            </div>
+            <div class="col-md-3" id="NotInvoice1">
+                <label for="InvoiceId">發票聯式
+                    <a onclick="ShowInvoice()">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-info-circle" viewBox="0 0 16 16">
+                            <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
+                            <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM9 4.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z" />
+                        </svg>
+                    </a>
+                </label>
+
+
+                <select name="InvoiceId" id="InvoiceId" class="form-control">
+                    <option value="">請選擇發票聯式</option>
+                    <option value="25">一般電子發票-> 進項三聯式收銀機統一發票及一般稅額計算之電子發票</option>
+                    <option value="21">三聯式手開發票-> 進項三聯式、電子計算機統一發票</option>
+                    <option value="22">二聯式收銀機發票 -> 進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
+                    <?php if ($user_id == "M0056" || $user_id == "M0209") { ?>
+                        <option value="23">三聯式、電子計算機、三聯式收銀機統一發票及一般稅額計算之電子發票之進貨退出或折讓證明單</option>
+                        <option value="24">二聯式收銀機統一發票及載有稅額之其他憑證之進貨退出或折讓證明單</option>
+                        <option value="26">彙總登錄每張稅額伍佰元以下之進項三聯式、電子計算機統一發票</option>
+                        <option value="27">彙總登錄每張稅額伍佰元以下之進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
+                        <option value="28">進項海關代徵營業稅繳納證</option>
+                        <option value="29">進項海關退還溢繳營業稅申報單</option>
+                    <?php } ?>
+                </select>
+
+            </div>
+            <div class="col-md-3" id="NotInvoice2">
+                <label for="InvoiceNo">發票號碼</label>
+                <input class="form-control" type="text" name="InvoiceNo" id="InvoiceNo">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-3" id="Tax">
+                <label for="TaxNo">供應商統一編號</label>
+                <input type="text" name="TaxNo" id="TaxNo" class="form-control" onblur="checkBiz()">
+            </div>
+        </div>
+        <div>
+
+            <input type="hidden" name="CurrId" value="<?= $CurrId ?>">
+        </div>
+
+</div>
+<div class="form-group">
+    <div class="col-md-7">
+
+    </div>
+    <div class="col-md-5" style="margin-top: 40px;">
+        <button onclick="senddata()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-bottom: 110px;">新增費用單據</button>
+    </div>
+</div>
+
+
+</form>
+</div>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script>
+    var TempArr = [];
+    var CurrId = "<?= $CurrId ?>";
+    $(document).ready(function() {
+        $("#ProjectId").selectize();
+        $("#CU_MaterialId").selectize();
+    })
+
+    function checkBiz() {
+        if ($("#TaxNo").val().length !== 8) {
+            alert("統一編號格式錯誤");
+        } else {
+            var biz = $("#TaxNo").val();
+            var BizArray = <?php echo $BizJSON; ?>;
+            var answer = 0;
+            for (var partner = 0; partner < <?= $bizcount ?>; partner++) {
+                var value = BizArray[partner];
+                if (biz == value) {
+                    answer += 1
+                }
+            }
+            if (answer == 1) {
+                alert("供應商認證成功")
+            } else {
+                alert("T8內無此供應商")
+            }
+        }
+
+    }
+    $(function() {
+        $("#VoucherType").change(function() {
+            if ($("#VoucherType").val() !== "0") {
+                $("#NotInvoice1").hide();
+                $("#NotInvoice2").hide();
+            } else {
+                $("#NotInvoice1").show();
+                $("#NotInvoice2").show();
+            }
+        })
+        $('#FeeTypeGen').change(function() {
+            console.log($('#FeeTypeGen').val());
+            var FeeTypeId = document.getElementById("FeeTypeId")
+            var FeeType = [{}, {
+                '400001': '交通費-捷利卡儲值',
+                '400002': '交通費-油資',
+                '400003': '交通費-ETC',
+                '400004': '交通費-停車費'
+            }, {
+                '130101': '差旅費-膳雜費',
+                '130102': '差旅費-住宿',
+                '130301': '差旅費-機票款',
+                '130302': '差旅費-高鐵車資',
+                '130303': '差旅費-台鐵車資',
+                '130304': '差旅費-客運車資',
+                '130305': '差旅費-捷運車資',
+                '130306': '差旅費-計程車車資',
+                '130307': '差旅費-國外交通費 ',
+                '130308': '差旅費-油資',
+                '130309': '差旅費-ETC',
+                '130310': '差旅費-停車費'
+            }, {
+                '200001': '交際便餐、飲品',
+                '200002': '交際禮品費',
+                '200003': '禮金'
+            }, {
+                '120001': '文具用品',
+                '120002': '影印紙',
+                '120003': '影印費',
+                '120004': '名片'
+            }, {
+                '150001': '郵資',
+                '150002': '電話費',
+                '150003': '匯款手續費'
+            }, {
+                '180101': '水費'
+            }, {
+                '180201': '電費'
+            }, {
+                '180301': '瓦斯費'
+            }, {
+                '140001': '運費/快遞'
+            }, {
+                '140002': '堆高機費用'
+            }, {
+                '390001': '材料費、五金用品'
+            }, {
+                '160002': '汽車維修'
+            }, {
+                '370004': '研發打樣費',
+                '370005': '研發測試費'
+            }, {
+                '220001': '牌照稅',
+                '220002': '燃料費',
+                '220005': '印花稅',
+            }, {
+                '880004': '其他雜項支出'
+            }];
+            for (var q = 0; q < (FeeType.length); q++) {
+                if ($('#FeeTypeGen').val() == (q)) {
+                    $("#FeeTypeId").empty();
+                    for (const key in FeeType[q]) {
+                        FeeTypeId.add(new Option(FeeType[q][key], key));
+                    }
+                }
+            }
+        })
+        $('#FeeDeptId').change(function() {
+            changeWriteOffId($('#FeeDeptId').val());
+        })
+        $("#Price").change(function() {
+            if (CurrId === "TWD") {
+                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
+                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
+                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                }
+            } else {
+                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
+                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
+                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
+                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                }
+            }
+
+        });
+        $("#Quantity").change(function() {
+            if (CurrId === "TWD") {
+                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
+                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
+                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                }
+            } else {
+                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
+                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
+                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
+                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                }
+            }
+
+        });
+        $("#TaxId").change(function() {
+            if (CurrId === "TWD") {
+                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
+                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
+                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                }
+            } else {
+                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
+                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
+                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
+                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                }
+            }
+
+        })
+        $("#FeeDate").change(function() {
+            if ($("#FeeDate").val().length != 8) {
+                alert("輸入格式錯誤");
+                $("#FeeDate").val('');
+            } else {
+                let year = $("#FeeDate").val().substr(0, 4);
+                let month = parseInt($("#FeeDate").val().substr(4, 2)) - 1;
+                let day = $("#FeeDate").val().substr(6, 2);
+                let feedate = new Date(year, month, day);
+                let now = new Date();
+                if (feedate.getMonth() != month) {
+                    alert("請輸入正確格式的日期");
+                } else {
+                    if (feedate > now) {
+                        alert("費用日期不可大於今天");
+                        $("#FeeDate").val('');
+                    } else {
+                        now.setMonth(now.getMonth() - 2);
+                        now.setDate(1);
+                        now.setDate(now.getDate() - 1);
+                        if (feedate <= now) {
+                            alert("超過兩個月的費用無法進行報銷");
+                            $("#FeeDate").val('');
+                        }
+                    }
+                }
+            }
+        })
+
+    })
+
+    function ShowInvoice() {
+        window.open('rib02-invoice.php', '發票範例', config = 'height=600, width=600');
+
+    }
+
+    function changeWriteOffId(SelectedDept) {
+        var SelectDeptId = 'WriteOff' + SelectedDept + '-';
+        for (var i = 0; i < WriteOffId.options.length; i++) {
+            WriteOffId.options[i].selected = false;
+            let thisid = WriteOffId.options[i].id
+            if (thisid.search(SelectDeptId) === 0) {
+                WriteOffId.options[i].style['display'] = '';
+            } else {
+                WriteOffId.options[i].style['display'] = 'none';
+            };
+
+        };
+    };
+
+    function senddata() {
+        if ($("#FeeDate").val() == "" || $("#FeeNoteShow").val() == "" || $("#Price").val() == "" || $("#Quantity").val() == "" || $("#WriteOffId").val() == "") {
+            alert("請確認紅字部分皆有填寫");
+        } else if ($("#OAmount").val() <= 0) {
+            alert("金額必須大於零");
+
+        } else {
+            $("#OAmount").prop("disabled", false);
+            <?php
+            if ($user_id == "M0056" || $user_id == "M0209") { ?>
+                $("#OTax").prop("disabled", false);
+                $("#LTax").prop("disabled", false);
+                $("#CurrLAmount").prop("disabled", false);
+                $("#OAmountUnWithTax").prop("disabled", false);
+                $("#LAmountUnWithTax").prop("disabled", false);
+                $("#LAmount").prop("disabled", false);
+                $("#OAmount").prop("disabled", false);
+            <?php } ?>
+            $('#ribsubform').submit();
+        }
+
+    }
 </script>
\ No newline at end of file
diff --git a/wms/rib02-delete.php b/wms/rib02-delete.php
index 258982d1..3d0cb1e4 100644
--- a/wms/rib02-delete.php
+++ b/wms/rib02-delete.php
@@ -1,38 +1,38 @@
-<?php
-include "./header.php";
-$ribsub_id = isset($_GET['ribsub_id']) ? $_GET['ribsub_id'] : die('ERROR:Ribsub_id is not found.');
-$rib_id = isset($_GET['rib_id']) ? $_GET['rib_id'] : die('ERROR:Ribsub_id is not found.');
-?>
-<script type="text/javascript">
-    var check = confirm("確定要刪除此費用單據?")
-    if (check == true) {
-        <?php
-        $sql = "DELETE FROM rib_sub WHERE ribsub_id= $ribsub_id";
-        $data = mysqli_query($link, $sql);
-
-
-        $TotalOAmount = 0;
-        $sql_rib = "SELECT OAmount FROM rib_sub WHERE rib_id = $rib_id";
-        $OAmoount_query = mysqli_query($link, $sql_rib);
-        foreach ($OAmoount_query as $oaq) {
-            $TotalOAmount += $oaq['OAmount'];
-        }
-        echo $TotalOAmount;
-        echo "</br>";
-        $sql_update = "UPDATE rib SET OAmount = $TotalOAmount WHERE rib_id = $rib_id";
-
-        mysqli_query($link, $sql_update);
-
-        if ($data) {
-            echo "alert('成功刪除費用單據')";
-        } else {
-            echo "alert('費用單據未更改')";
-        }
-        ?>
-    } else {
-        alert('取消操作')
-    }
-</script>
-<script>
-    window.location.href = "rib01-check.php?id=<?php echo $rib_id ?>&state=0&<?= $token_link ?>";
+<?php
+include "./header.php";
+$ribsub_id = isset($_GET['ribsub_id']) ? $_GET['ribsub_id'] : die('ERROR:Ribsub_id is not found.');
+$rib_id = isset($_GET['rib_id']) ? $_GET['rib_id'] : die('ERROR:Ribsub_id is not found.');
+?>
+<script type="text/javascript">
+    var check = confirm("確定要刪除此費用單據?")
+    if (check == true) {
+        <?php
+        $sql = "DELETE FROM rib_sub WHERE ribsub_id= $ribsub_id";
+        $data = mysqli_query($link, $sql);
+
+
+        $TotalOAmount = 0;
+        $sql_rib = "SELECT OAmount FROM rib_sub WHERE rib_id = $rib_id";
+        $OAmoount_query = mysqli_query($link, $sql_rib);
+        foreach ($OAmoount_query as $oaq) {
+            $TotalOAmount += $oaq['OAmount'];
+        }
+        echo $TotalOAmount;
+        echo "</br>";
+        $sql_update = "UPDATE rib SET OAmount = $TotalOAmount WHERE rib_id = $rib_id";
+
+        mysqli_query($link, $sql_update);
+
+        if ($data) {
+            echo "alert('成功刪除費用單據')";
+        } else {
+            echo "alert('費用單據未更改')";
+        }
+        ?>
+    } else {
+        alert('取消操作')
+    }
+</script>
+<script>
+    window.location.href = "rib01-check.php?id=<?php echo $rib_id ?>&state=0&<?= $token_link ?>";
 </script>
\ No newline at end of file
diff --git a/wms/rib02-edit.php b/wms/rib02-edit.php
index f1ea8ccc..647ca65a 100644
--- a/wms/rib02-edit.php
+++ b/wms/rib02-edit.php
@@ -1,722 +1,722 @@
-<?php
-include "./header.php";
-
-$ribsub_id = $_GET['id'];
-$state = isset($_GET['state']) ? $_GET['state'] : 0;
-$sql_ribsub = "SELECT * FROM rib_sub WHERE ribsub_id = $ribsub_id";
-$rib_query = mysqli_query($link, $sql_ribsub);
-$ribsub = mysqli_fetch_assoc($rib_query);
-
-
-//取得費用項目代碼
-
-$sql_feetype = "SELECT FeeTypeId, FeeTypeName FROM comFeeType WHERE (FeeTypeId NOT LIKE 'A%') AND(FeeTypeId NOT LIKE 'Z%')";
-$feetype = $conn->query($sql_feetype);
-$member = array();
-//取得人員名單與使用者的部門
-
-$sql_mydept =  "SELECT UserId, Username FROM capMembership";
-$deptmem = $conn->query($sql_mydept);
-foreach ($deptmem as $mem) {
-    $userid = $mem['UserId'];
-    $username = $mem['Username'];
-    $member["$userid"] = [$username];
-};
-$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
-$allpeople = $conn->query($sql_dept);
-foreach ($allpeople as $man) {
-    if ($man['PersonId'] == $user_id) {
-        $mydepart = $man['DeptId'];
-    }
-    $personid = $man['PersonId'];
-    $depart = $man['DeptId'];
-    if (isset($member["$personid"])) {
-        array_push($member["$personid"], "$depart");
-    }
-}
-
-//取得部門代碼
-$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
-$deptype = $conn->query($sql_department);
-
-//取得計量單位
-$sql_unit = "SELECT * FROM unit";
-$unit_query = mysqli_query($link, $sql_unit);
-$unit = mysqli_fetch_all($unit_query, MYSQLI_ASSOC);
-
-// 取得供應商、合約跟作番號
-$BusinessPartner = array();
-$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
-$BizPartner = $conn->query($sql_Biz);
-$bizcount = 0;
-foreach ($BizPartner as $biz) {
-    $bizKey = $biz['BizPartnerId'];
-    $bizValue = $biz['BizPartnerName'];
-    array_push($BusinessPartner, $bizKey);
-    $bizcount += 1;
-}
-$BizJSON = json_encode($BusinessPartner);
-$sql_Project = "SELECT * FROM comProject";
-$projects = $conn->query($sql_Project);
-$sql_Material = "SELECT * FROM comMaterialGroup";
-$materials = $conn->query($sql_Material);
-
-?>
-<div style="width: 90%;">
-
-    <div style="padding-left: 2rem; padding-bottom: 1rem;">
-        <a href="rib01-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
-            <span class="glyphicon glyphicon-home"></span>
-        </a>
-    </div>
-</div>
-
-<div class="container" id="ribsubeit">
-    <div class="text-center">
-        <h3>費用單據</h3>
-    </div>
-    <form class="form-horizontal" name="ribsubeditform" id="ribsubeditform" method="POST" action="rib02-submit.php?ribsub_id=<?= $ribsub_id ?>&state=<?= $state ?>&submit=edit&<?= $token_link ?>" enctype="multipart/form-data">
-
-
-        <div class="form-group">
-            <div class="col-md-3" style="display: none;">
-                <label for="RowCode" style="color: red;">序號</label>
-                <input class="form-control" type="int" name="RowCode" id="RowCode" value="<?= $ribsub['RowCode'] ?>" required>
-
-            </div>
-            <div class="col-md-3">
-                <label for="FeeDate" style="color: red;">發票日期</label>
-                <input class="form-control" type="int" name="FeeDate" id="FeeDate" placeholder="西元年(4碼)+月(2碼)+日(2碼)" value="<?= $ribsub['FeeDate'] ?>" required>
-
-            </div>
-            <?php if ($user_id == "M0056" || $user_id == "M0209") { ?>
-                <div class="col-md-3">
-                    <label for="FeeTypeId" style="color: red;">費用項目代碼</label>
-                    <select name="FeeTypeId" class="form-control" required>
-                        <?php
-                        foreach ($feetype as $key => $value) { ?>
-                            <option value="<?php echo $value['FeeTypeId']; ?>" <?php if ($value['FeeTypeId'] == $ribsub['FeeTypeId']) {
-                                                                                    echo "selected";
-                                                                                } ?>><?php echo $value['FeeTypeName']; ?></option>
-                        <?php };
-                        ?>
-                    </select>
-                </div>
-            <?php } else { ?>
-                <div class="col-md-3">
-                    <label for="FeeTypeGen" style="color: red;">費用類別</label>
-                    <select name="FeeTypeGen" id="FeeTypeGen" class="form-control" required>
-                        <option value="" <?php if ($ribsub['FeeTypeGen'] == "") {
-                                                echo "selected";
-                                            } ?>>請選擇費用類別</option>
-                        <option value=1 <?php if ($ribsub['FeeTypeGen'] == 1) {
-                                            echo "selected";
-                                        } ?>>交通費</option>
-                        <option value=2 <?php if ($ribsub['FeeTypeGen'] == 2) {
-                                            echo "selected";
-                                        } ?>>出差旅費</option>
-                        <option value=3 <?php if ($ribsub['FeeTypeGen'] == 3) {
-                                            echo "selected";
-                                        } ?>>交際餐飲禮品</option>
-                        <option value=4 <?php if ($ribsub['FeeTypeGen'] == 4) {
-                                            echo "selected";
-                                        } ?>>文具用品</option>
-                        <option value=5 <?php if ($ribsub['FeeTypeGen'] == 5) {
-                                            echo "selected";
-                                        } ?>>郵資、電話/網路費、匯費</option>
-                        <option value=6 <?php if ($ribsub['FeeTypeGen'] == 6) {
-                                            echo "selected";
-                                        } ?>>水費</option>
-                        <option value=7 <?php if ($ribsub['FeeTypeGen'] == 7) {
-                                            echo "selected";
-                                        } ?>>電費</option>
-                        <option value=8 <?php if ($ribsub['FeeTypeGen'] == 8) {
-                                            echo "selected";
-                                        } ?>>瓦斯費</option>
-                        <option value=9 <?php if ($ribsub['FeeTypeGen'] == 9) {
-                                            echo "selected";
-                                        } ?>>運費/快遞</option>
-                        <option value=10 <?php if ($ribsub['FeeTypeGen'] == 10) {
-                                                echo "selected";
-                                            } ?>>堆高機費用</option>
-                        <option value=11 <?php if ($ribsub['FeeTypeGen'] == 11) {
-                                                echo "selected";
-                                            } ?>>五金材料工具</option>
-                        <option value=12 <?php if ($ribsub['FeeTypeGen'] == 12) {
-                                                echo "selected";
-                                            } ?>>汽車維修</option>
-                        <option value=13 <?php if ($ribsub['FeeTypeGen'] == 13) {
-                                                echo "selected";
-                                            } ?>>研發測試打樣</option>
-                        <option value=14 <?php if ($ribsub['FeeTypeGen'] == 14) {
-                                                echo "selected";
-                                            } ?>>繳稅</option>
-                        <option value=15 <?php if ($ribsub['FeeTypeGen'] == 15) {
-                                                echo "selected";
-                                            } ?>>其他費用</option>
-                    </select>
-                </div>
-                <div class="col-md-3">
-                    <label for="FeeTypeId" style="color: red;">費用項目代碼</label>
-                    <select name="FeeTypeId" id="FeeTypeId" class="form-control" required>
-                        <?php
-                        foreach ($feetype as $key => $value) { ?>
-                            <option value="<?php echo $value['FeeTypeId']; ?>" <?php if ($value['FeeTypeId'] == $ribsub['FeeTypeId']) {
-                                                                                    echo "selected";
-                                                                                } ?>><?php echo $value['FeeTypeName']; ?></option>
-                        <?php };
-                        ?>
-                    </select>
-                </div>
-
-
-
-
-            <?php } ?>
-            <div class="col-md-3">
-                <label for="FeeDeptId" style="color: red;">歸屬部門</label>
-                <select name="FeeDeptId" id="FeeDeptId" class="form-control" required>
-                    <?php
-                    foreach ($deptype as $dept) { ?>
-                        <option value="<?php echo $dept['DeptId']; ?>" <?php
-                                                                        if ($dept['DeptId'] == $ribsub['FeeDeptId']) {
-                                                                            echo "selected";
-                                                                        } ?>><?php echo $dept['DeptName']; ?></option>
-                    <?php };
-                    ?>
-                </select>
-
-            </div>
-
-        </div>
-        <div class="form-group">
-
-            <div class="col-md-3">
-                <label for="WriteOffId" style="color: red;">報銷人</label>
-                <select name="WriteOffId" id="WriteOffId" class="form-control">
-                    <option value="" id="WriteOddOption"> </option>
-                    <?php
-                    foreach ($member as $key => $value) { ?>
-                        <option value="<?php echo $key; ?>" style="display:none" id="<?= 'WriteOff' . $value[1] . '-' . $value[0] ?>" <?php if ($key == $ribsub['WriteOffId']) {
-                                                                                                                                            echo "selected";
-                                                                                                                                        } ?>> <?php echo $value[0]; ?> </option>
-                    <?php }; ?>
-                </select>
-            </div>
-
-            <div class="col-md-3">
-                <label for="FeeNoteShow" style="color: red;">費用說明</label>
-                <input class="form-control" type="text" name="FeeNoteShow" id="FeeNoteShow" value="<?= $ribsub['FeeNoteShow'] ?>">
-            </div>
-            <div class="col-md-3">
-                <label for="ProjectId">合約號</label>
-                <select name="ProjectId" id="ProjectId">
-                    <option value=""></option>
-                    <?php
-                    foreach ($projects as $Project) {
-                    ?>
-                        <option value="<?= $Project['ProjectId'] ?>" <?php if ($Project['ProjectId'] == $ribsub['ProjectId']) {
-                                                                            echo "selected";
-                                                                        } ?>><?= $Project['ProjectId'] . $Project['ProjectName'] ?></option>
-                    <?php
-                    }
-                    ?>
-                </select>
-
-            </div>
-            <div class="col-md-3">
-                <label for="CU_MaterialId">作番號</label>
-                <select name="CU_MaterialId" id="CU_MaterialId">
-                    <option value=""></option>
-                    <?php
-                    foreach ($materials as $material) {
-                    ?>
-                        <option value="<?= $material['MaterialId'] ?>" <?php if ($material['MaterialId'] == $ribsub['CU_MaterialId']) {
-                                                                            echo "selected";
-                                                                        } ?>><?= $material['MaterialId'] . $material['MaterialName'] ?></option>
-                    <?php
-                    }
-                    ?>
-                </select>
-            </div>
-        </div>
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="TaxId">稅碼</label>
-                <select name="TaxId" id="TaxId" class="form-control" required>
-                    <option value="ST005" <?php if ($ribsub['TaxId'] == "ST005") {
-                                                echo "selected";
-                                            } ?>>營業稅5%</option>
-                    <option value="ST101" <?php if ($ribsub['TaxId'] == "ST101") {
-                                                echo "selected";
-                                            } ?>>零稅</option>
-                    <option value="ST102" <?php if ($ribsub['TaxId'] == "ST102") {
-                                                echo "selected";
-                                            } ?>>免稅</option>
-                </select>
-            </div>
-            <div class="col-md-3">
-                <label for="IsCounteract">抵扣</label>
-                <select name="IsCounteract" class="form-control" required>
-                    <option value=1 <?php if ($ribsub['IsCounteract'] == 1) {
-                                        echo "selected";
-                                    } ?>>可抵扣</option>
-                    <option value=0 <?php if ($ribsub['IsCounteract'] == 0) {
-                                        echo "selected";
-                                    } ?>>不可抵扣</option>
-                </select>
-            </div>
-
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="UnitId" style="color: red;">計量單位</label>
-                <select name="UnitId" class="form-control" required>
-                    <?php
-                    foreach ($unit as $key => $value) { ?>
-                        <option value="<?php echo $value['UnitId']; ?>" <?php if ($value['UnitId'] == $ribsub['UnitId']) {
-                                                                            echo "selected";
-                                                                        } ?>><?php echo $value['UnitName']; ?></option>
-                    <?php };
-                    ?>
-                </select>
-            </div>
-            <div class="col-md-3">
-                <label for="Price" style="color: red;">單價 (原幣值含稅)</label>
-                <input class="form-control" type="number" step="any" name="Price" id="Price" value="<?= $ribsub['Price'] ?>" required>
-            </div>
-            <div class="col-md-3">
-                <label for="Quantity" style="color: red;">數量</label>
-                <input class="form-control" type="number" step="any" name="Quantity" id="Quantity" value="<?= $ribsub['Quantity'] ?>" required>
-            </div>
-            <div class="col-md-3">
-                <label for="OAmount" style="color: red;">報銷金額 (原幣值含稅)</label>
-                <input class="form-control" type="number" step="any" name="OAmount" id="OAmount" placeholder="單價x數量" value="<?= $ribsub['OAmount'] ?>" required disabled>
-            </div>
-        </div>
-        <?php
-        if (($user_id == "M0056" || $user_id == "M0209") && $state == 1) {
-        ?>
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="CurrId">幣別</label>
-                    <input class="form-control" type="text" name="CurrId" id="CurrId" value="<?php if ($ribsub['CurrId'] == "TWD") {
-                                                                                                    echo "台幣";
-                                                                                                } elseif ($ribsub['CurrId'] == "CNY") {
-                                                                                                    echo "人民幣";
-                                                                                                } elseif ($ribsub['CurrId'] == "EUR") {
-                                                                                                    echo "歐元";
-                                                                                                } elseif ($ribsub['CurrId'] == "HKD") {
-                                                                                                    echo "港幣";
-                                                                                                } else {
-                                                                                                    echo "美元";
-                                                                                                } ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="CurrLAmount">匯率</label>
-                    <input class="form-control" type="number" name="CurrLAmount" id="CurrLAmount" value="<?= $ribsub['CurrentLAmount'] ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="OTax">稅金 (原幣值)</label>
-                    <input class="form-control" type="number" name="OTax" id="OTax" value="<?= $ribsub['OTax'] ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="LTax">本幣稅金</label>
-                    <input class="form-control" type="number" step="any" name="LTax" id="LTax" value="<?= $ribsub['LTax'] ?>" disabled>
-                </div>
-            </div>
-
-
-            <div class="form-group">
-                <div class="col-md-3">
-                    <label for="OAmountUnWithTax">未稅報銷金額 (原幣值)</label>
-                    <input class="form-control" type="number" name="OAmountUnWithTax" id="OAmountUnWithTax" value="<?= $ribsub['OAmountUnWithTax'] ?>" disabled>
-                </div>
-
-                <div class="col-md-3">
-                    <label for="LAmountUnWithTax">本幣未稅報銷金額</label>
-                    <input class="form-control" type="number" step="any" name="LAmountUnWithTax" id="LAmountUnWithTax" value="<?= $ribsub['LAmountUnWithTax'] ?>" disabled>
-                </div>
-                <div class="col-md-3">
-                    <label for="LAmount">本幣報銷金額</label>
-                    <input class="form-control" type="number" step="any" name="LAmount" id="LAmount" value="<?= $ribsub['LAmount'] ?>" disabled>
-                </div>
-            </div>
-        <?php
-        } ?>
-        <div class="form-group">
-            <div class="col-md-3">
-                <label for="VoucherCount">憑單張數</label>
-                <input class="form-control" type="number" name="VoucherCount" id="VoucherCount" max=5 value="<?= $ribsub['VoucherCount'] ?>">
-            </div>
-            <div class="col-md-3">
-                <label for="VoucherType">憑單類型</label>
-                <select name="VoucherType" id="VoucherType" class="form-control">
-                    <option value=0 <?php if ($ribsub['VoucherType'] == 0) {
-                                        echo "selected";
-                                    } ?>>發票</option>
-                    <option value=1 <?php if ($ribsub['VoucherType'] == 1) {
-                                        echo "selected";
-                                    } ?>>收據 </option>
-                    <option value=2 <?php if ($ribsub['VoucherType'] == 2) {
-                                        echo "selected";
-                                    } ?>>支出證明</option>
-                    <option value=3 <?php if ($ribsub['VoucherType'] == 3) {
-                                        echo "selected";
-                                    } ?>>其他</option>
-                </select>
-            </div>
-            <div class="col-md-3" id="NotInvoice1">
-                <label for="InvoiceId">發票聯式 <a onclick="ShowInvoice()">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-info-circle" viewBox="0 0 16 16">
-                            <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
-                            <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM9 4.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z" />
-                        </svg>
-                    </a></label>
-                <select name="InvoiceId" class="form-control">
-                    <option value="">請選擇發票聯式</option>
-                    <option value="25" <?php if ($ribsub['InvoiceId'] == "25") {
-                                            echo "selected";
-                                        } ?>>一般電子發票-> 進項三聯式收銀機統一發票及一般稅額計算之電子發票</option>
-                    <option value="21" <?php if ($ribsub['InvoiceId'] == "21") {
-                                            echo "selected";
-                                        } ?>>三聯式手開發票-> 進項三聯式、電子計算機統一發票</option>
-                    <option value="22" <?php if ($ribsub['InvoiceId'] == "22") {
-                                            echo "selected";
-                                        } ?>>二聯式收銀機發票 -> 進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
-                    <?php if ($user_id == "M0056" || $user_id == "M0209") { ?>
-                        <option value="23" <?php if ($ribsub['InvoiceId'] == "23") {
-                                                echo "selected";
-                                            } ?>>三聯式、電子計算機、三聯式收銀機統一發票及一般稅額計算之電子發票之進貨退出或折讓證明單</option>
-                        <option value="24" <?php if ($ribsub['InvoiceId'] == "24") {
-                                                echo "selected";
-                                            } ?>>二聯式收銀機統一發票及載有稅額之其他憑證之進貨退出或折讓證明單</option>
-
-                        <option value="26" <?php if ($ribsub['InvoiceId'] == "26") {
-                                                echo "selected";
-                                            } ?>>彙總登錄每張稅額伍佰元以下之進項三聯式、電子計算機統一發票</option>
-                        <option value="27" <?php if ($ribsub['InvoiceId'] == "27") {
-                                                echo "selected";
-                                            } ?>>彙總登錄每張稅額伍佰元以下之進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
-                        <option value="28" <?php if ($ribsub['InvoiceId'] == "28") {
-                                                echo "selected";
-                                            } ?>>進項海關代徵營業稅繳納證</option>
-                        <option value="29" <?php if ($ribsub['InvoiceId'] == "29") {
-                                                echo "selected";
-                                            } ?>>進項海關退還溢繳營業稅申報單</option>
-                    <?php } ?>
-                </select>
-            </div>
-            <div class="col-md-3" id="NotInvoice2">
-                <label for="InvoiceNo">發票號碼</label>
-                <input class="form-control" type="text" name="InvoiceNo" id="InvoiceNo" value="<?= $ribsub['InvoiceNo'] ?>">
-            </div>
-        </div>
-        <div>
-            <input type="hidden" name="rib_id" id="rib_id" value="<?= $ribsub['rib_id'] ?>">
-        </div>
-        <div class="form-group">
-            <div class="col-md-3" id="Tax">
-                <label for="TaxNo">供應商統一編號</label>
-                <input type="text" name="TaxNo" id="TaxNo" class="form-control" onblur="checkBiz()" value="<?= $ribsub['TaxNo'] ?>">
-            </div>
-        </div>
-
-        <div class="form-group">
-            <div class="col-md-7">
-
-            </div>
-            <div class="col-md-5">
-                <button onclick="senddata()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-bottom: 100px;margin-top:40px">修改費用單據</button>
-            </div>
-        </div>
-
-    </form>
-</div>
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script>
-    var CurrId = "<?= $ribsub['CurrId'] ?>";
-    $(document).ready(function() {
-        $("#ProjectId").selectize();
-        $("#CU_MaterialId").selectize();
-    })
-
-    function checkBiz() {
-        if ($("#TaxNo").val().length !== 8) {
-            alert("統一編號格式錯誤");
-        } else {
-            var biz = $("#TaxNo").val();
-            var BizArray = <?php echo $BizJSON; ?>;
-            var answer = 0;
-            for (var partner = 0; partner < <?= $bizcount ?>; partner++) {
-                var value = BizArray[partner];
-                if (biz == value) {
-                    answer += 1
-                }
-            }
-            if (answer == 1) {
-                alert("供應商認證成功")
-            } else {
-                alert("T8內無此供應商")
-            }
-        }
-
-    }
-    var TempArr = [];
-    $(function() {
-        $("#VoucherType").change(function() {
-            if ($("#VoucherType").val() !== "0") {
-                $("#NotInvoice1").hide();
-                $("#NotInvoice2").hide();
-            } else {
-                $("#NotInvoice1").show();
-                $("#NotInvoice2").show();
-            }
-        })
-        $('#FeeTypeGen').change(function() {
-            var FeeTypeId = document.getElementById("FeeTypeId")
-            var FeeType = [{}, {
-                '400001': '交通費-捷利卡儲值',
-                '400002': '交通費-油資',
-                '400003': '交通費-ETC',
-                '400004': '交通費-停車費'
-            }, {
-                '130101': '差旅費-膳雜費',
-                '130102': '差旅費-住宿',
-                '130301': '差旅費-機票款',
-                '130302': '差旅費-高鐵車資',
-                '130303': '差旅費-台鐵車資',
-                '130304': '差旅費-客運車資',
-                '130305': '差旅費-捷運車資',
-                '130306': '差旅費-計程車車資',
-                '130307': '差旅費-國外交通費 ',
-                '130308': '差旅費-油資',
-                '130309': '差旅費-ETC',
-                '130310': '差旅費-停車費'
-            }, {
-                '200001': '交際便餐、飲品',
-                '200002': '交際禮品費',
-                '200003': '禮金'
-            }, {
-                '120001': '文具用品',
-                '120002': '影印紙',
-                '120003': '影印費',
-                '120004': '名片'
-            }, {
-                '150001': '郵資',
-                '150002': '電話費',
-                '150003': '匯款手續費'
-            }, {
-                '180101': '水費'
-            }, {
-                '180201': '電費'
-            }, {
-                '180301': '瓦斯費'
-            }, {
-                '140001': '運費/快遞'
-            }, {
-                '140002': '堆高機費用'
-            }, {
-                '390001': '材料費、五金用品'
-            }, {
-                '160002': '汽車維修'
-            }, {
-                '370004': '研發打樣費',
-                '370005': '研發測試費'
-            }, {
-                '220001': '牌照稅',
-                '220002': '燃料費',
-                '220005': '印花稅',
-            }, {
-                '880004': '其他雜項支出'
-            }];
-            for (var q = 0; q < (FeeType.length); q++) {
-                if ($('#FeeTypeGen').val() == (q)) {
-                    $("#FeeTypeId").empty();
-                    for (const key in FeeType[q]) {
-                        FeeTypeId.add(new Option(FeeType[q][key], key));
-                    }
-                }
-            }
-        })
-        $('#FeeDeptId').change(function() {
-            changeWriteOffId($('#FeeDeptId').val());
-        })
-        $("#FeeDate").change(function() {
-            if ($("#FeeDate").val().length != 8) {
-                alert("輸入格式錯誤");
-                $("#FeeDate").val('');
-            } else {
-                let year = $("#FeeDate").val().substr(0, 4);
-                let month = parseInt($("#FeeDate").val().substr(4, 2)) - 1;
-                let day = $("#FeeDate").val().substr(6, 2);
-                let feedate = new Date(year, month, day);
-                let now = new Date();
-                if (feedate.getMonth() != month) {
-                    alert("請輸入正確格式的日期");
-                } else {
-                    if (feedate > now) {
-                        alert("費用日期不可大於今天");
-                        $("#FeeDate").val('');
-                    } else {
-                        now.setMonth(now.getMonth() - 2);
-                        now.setDate(1);
-                        now.setDate(now.getDate() - 1);
-                        if (feedate <= now) {
-                            alert("超過兩個月的費用無法進行報銷");
-                            $("#FeeDate").val('');
-                        }
-                    }
-                }
-            }
-        })
-
-        $("#Price").change(function() {
-            if (CurrId === "TWD") {
-                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
-                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
-                if ($("#TaxId").val() === "ST005") {
-                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
-                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
-                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
-                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
-
-                } else {
-                    $("#OTax").val(0);
-                    $("#LTax").val(0);
-                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
-                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
-                }
-            } else {
-                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
-                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
-                if ($("#TaxId").val() === "ST005") {
-                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
-                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
-                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
-                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
-
-                } else {
-                    $("#OTax").val(0);
-                    $("#LTax").val(0);
-                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
-                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
-                }
-            }
-
-        });
-        $("#Quantity").change(function() {
-            if (CurrId === "TWD") {
-                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
-                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
-                if ($("#TaxId").val() === "ST005") {
-                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
-                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
-                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
-                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
-
-                } else {
-                    $("#OTax").val(0);
-                    $("#LTax").val(0);
-                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
-                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
-                }
-            } else {
-                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
-                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
-                if ($("#TaxId").val() === "ST005") {
-                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
-                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
-                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
-                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
-
-                } else {
-                    $("#OTax").val(0);
-                    $("#LTax").val(0);
-                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
-                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
-                }
-            }
-
-        });
-        $("#TaxId").change(function() {
-            if (CurrId === "TWD") {
-                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
-                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
-                if ($("#TaxId").val() === "ST005") {
-                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
-                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
-                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
-                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
-
-                } else {
-                    $("#OTax").val(0);
-                    $("#LTax").val(0);
-                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
-                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
-                }
-            } else {
-                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
-                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
-                if ($("#TaxId").val() === "ST005") {
-                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
-                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
-                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
-                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
-
-                } else {
-                    $("#OTax").val(0);
-                    $("#LTax").val(0);
-                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
-                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
-                }
-            }
-
-        })
-
-
-    })
-
-    function ShowInvoice() {
-        window.open('rib02-invoice.php', '新視窗的名稱', config = 'height=600, width=600');
-
-    }
-
-    function changeWriteOffId(SelectedDept) {
-        var SelectDeptId = 'WriteOff' + SelectedDept + '-';
-        for (var i = 0; i < WriteOffId.options.length; i++) {
-            WriteOffId.options[i].selected = false;
-            let thisid = WriteOffId.options[i].id
-            if (thisid.search(SelectDeptId) === 0) {
-                WriteOffId.options[i].style['display'] = '';
-            } else {
-                WriteOffId.options[i].style['display'] = 'none';
-            };
-
-        };
-    };
-
-
-    function senddata() {
-        if ($("#FeeDate").val() == "" || $("#FeeNoteShow").val() == "" || $("#Price").val() == "" || $("#Quantity").val() == "") {
-            alert("請確認紅字部分皆有填寫");
-        } else if ($("#OAmount").val() <= 0) {
-            alert("金額必須大於零");
-
-        } else {
-            $("#OAmount").prop("disabled", false);
-            <?php
-            if (($user_id == "M0056" || $user_id == "M0209") && $state == 1) { ?>
-                $("#OTax").prop("disabled", false);
-                $("#LTax").prop("disabled", false);
-                $("#OAmountUnWithTax").prop("disabled", false);
-                $("#LAmountUnWithTax").prop("disabled", false);
-                $("#LAmount").prop("disabled", false);
-                $("#OAmount").prop("disabled", false);
-            <?php } ?>
-            $('#ribsubeditform').submit();
-        }
-    }
+<?php
+include "./header.php";
+
+$ribsub_id = $_GET['id'];
+$state = isset($_GET['state']) ? $_GET['state'] : 0;
+$sql_ribsub = "SELECT * FROM rib_sub WHERE ribsub_id = $ribsub_id";
+$rib_query = mysqli_query($link, $sql_ribsub);
+$ribsub = mysqli_fetch_assoc($rib_query);
+
+
+//取得費用項目代碼
+
+$sql_feetype = "SELECT FeeTypeId, FeeTypeName FROM comFeeType WHERE (FeeTypeId NOT LIKE 'A%') AND(FeeTypeId NOT LIKE 'Z%')";
+$feetype = $conn->query($sql_feetype);
+$member = array();
+//取得人員名單與使用者的部門
+
+$sql_mydept =  "SELECT UserId, Username FROM capMembership";
+$deptmem = $conn->query($sql_mydept);
+foreach ($deptmem as $mem) {
+    $userid = $mem['UserId'];
+    $username = $mem['Username'];
+    $member["$userid"] = [$username];
+};
+$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
+$allpeople = $conn->query($sql_dept);
+foreach ($allpeople as $man) {
+    if ($man['PersonId'] == $user_id) {
+        $mydepart = $man['DeptId'];
+    }
+    $personid = $man['PersonId'];
+    $depart = $man['DeptId'];
+    if (isset($member["$personid"])) {
+        array_push($member["$personid"], "$depart");
+    }
+}
+
+//取得部門代碼
+$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
+$deptype = $conn->query($sql_department);
+
+//取得計量單位
+$sql_unit = "SELECT * FROM unit";
+$unit_query = mysqli_query($link, $sql_unit);
+$unit = mysqli_fetch_all($unit_query, MYSQLI_ASSOC);
+
+// 取得供應商、合約跟作番號
+$BusinessPartner = array();
+$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
+$BizPartner = $conn->query($sql_Biz);
+$bizcount = 0;
+foreach ($BizPartner as $biz) {
+    $bizKey = $biz['BizPartnerId'];
+    $bizValue = $biz['BizPartnerName'];
+    array_push($BusinessPartner, $bizKey);
+    $bizcount += 1;
+}
+$BizJSON = json_encode($BusinessPartner);
+$sql_Project = "SELECT * FROM comProject";
+$projects = $conn->query($sql_Project);
+$sql_Material = "SELECT * FROM comMaterialGroup";
+$materials = $conn->query($sql_Material);
+
+?>
+<div style="width: 90%;">
+
+    <div style="padding-left: 2rem; padding-bottom: 1rem;">
+        <a href="rib01-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
+            <span class="glyphicon glyphicon-home"></span>
+        </a>
+    </div>
+</div>
+
+<div class="container" id="ribsubeit">
+    <div class="text-center">
+        <h3>費用單據</h3>
+    </div>
+    <form class="form-horizontal" name="ribsubeditform" id="ribsubeditform" method="POST" action="rib02-submit.php?ribsub_id=<?= $ribsub_id ?>&state=<?= $state ?>&submit=edit&<?= $token_link ?>" enctype="multipart/form-data">
+
+
+        <div class="form-group">
+            <div class="col-md-3" style="display: none;">
+                <label for="RowCode" style="color: red;">序號</label>
+                <input class="form-control" type="int" name="RowCode" id="RowCode" value="<?= $ribsub['RowCode'] ?>" required>
+
+            </div>
+            <div class="col-md-3">
+                <label for="FeeDate" style="color: red;">發票日期</label>
+                <input class="form-control" type="int" name="FeeDate" id="FeeDate" placeholder="西元年(4碼)+月(2碼)+日(2碼)" value="<?= $ribsub['FeeDate'] ?>" required>
+
+            </div>
+            <?php if ($user_id == "M0056" || $user_id == "M0209") { ?>
+                <div class="col-md-3">
+                    <label for="FeeTypeId" style="color: red;">費用項目代碼</label>
+                    <select name="FeeTypeId" class="form-control" required>
+                        <?php
+                        foreach ($feetype as $key => $value) { ?>
+                            <option value="<?php echo $value['FeeTypeId']; ?>" <?php if ($value['FeeTypeId'] == $ribsub['FeeTypeId']) {
+                                                                                    echo "selected";
+                                                                                } ?>><?php echo $value['FeeTypeName']; ?></option>
+                        <?php };
+                        ?>
+                    </select>
+                </div>
+            <?php } else { ?>
+                <div class="col-md-3">
+                    <label for="FeeTypeGen" style="color: red;">費用類別</label>
+                    <select name="FeeTypeGen" id="FeeTypeGen" class="form-control" required>
+                        <option value="" <?php if ($ribsub['FeeTypeGen'] == "") {
+                                                echo "selected";
+                                            } ?>>請選擇費用類別</option>
+                        <option value=1 <?php if ($ribsub['FeeTypeGen'] == 1) {
+                                            echo "selected";
+                                        } ?>>交通費</option>
+                        <option value=2 <?php if ($ribsub['FeeTypeGen'] == 2) {
+                                            echo "selected";
+                                        } ?>>出差旅費</option>
+                        <option value=3 <?php if ($ribsub['FeeTypeGen'] == 3) {
+                                            echo "selected";
+                                        } ?>>交際餐飲禮品</option>
+                        <option value=4 <?php if ($ribsub['FeeTypeGen'] == 4) {
+                                            echo "selected";
+                                        } ?>>文具用品</option>
+                        <option value=5 <?php if ($ribsub['FeeTypeGen'] == 5) {
+                                            echo "selected";
+                                        } ?>>郵資、電話/網路費、匯費</option>
+                        <option value=6 <?php if ($ribsub['FeeTypeGen'] == 6) {
+                                            echo "selected";
+                                        } ?>>水費</option>
+                        <option value=7 <?php if ($ribsub['FeeTypeGen'] == 7) {
+                                            echo "selected";
+                                        } ?>>電費</option>
+                        <option value=8 <?php if ($ribsub['FeeTypeGen'] == 8) {
+                                            echo "selected";
+                                        } ?>>瓦斯費</option>
+                        <option value=9 <?php if ($ribsub['FeeTypeGen'] == 9) {
+                                            echo "selected";
+                                        } ?>>運費/快遞</option>
+                        <option value=10 <?php if ($ribsub['FeeTypeGen'] == 10) {
+                                                echo "selected";
+                                            } ?>>堆高機費用</option>
+                        <option value=11 <?php if ($ribsub['FeeTypeGen'] == 11) {
+                                                echo "selected";
+                                            } ?>>五金材料工具</option>
+                        <option value=12 <?php if ($ribsub['FeeTypeGen'] == 12) {
+                                                echo "selected";
+                                            } ?>>汽車維修</option>
+                        <option value=13 <?php if ($ribsub['FeeTypeGen'] == 13) {
+                                                echo "selected";
+                                            } ?>>研發測試打樣</option>
+                        <option value=14 <?php if ($ribsub['FeeTypeGen'] == 14) {
+                                                echo "selected";
+                                            } ?>>繳稅</option>
+                        <option value=15 <?php if ($ribsub['FeeTypeGen'] == 15) {
+                                                echo "selected";
+                                            } ?>>其他費用</option>
+                    </select>
+                </div>
+                <div class="col-md-3">
+                    <label for="FeeTypeId" style="color: red;">費用項目代碼</label>
+                    <select name="FeeTypeId" id="FeeTypeId" class="form-control" required>
+                        <?php
+                        foreach ($feetype as $key => $value) { ?>
+                            <option value="<?php echo $value['FeeTypeId']; ?>" <?php if ($value['FeeTypeId'] == $ribsub['FeeTypeId']) {
+                                                                                    echo "selected";
+                                                                                } ?>><?php echo $value['FeeTypeName']; ?></option>
+                        <?php };
+                        ?>
+                    </select>
+                </div>
+
+
+
+
+            <?php } ?>
+            <div class="col-md-3">
+                <label for="FeeDeptId" style="color: red;">歸屬部門</label>
+                <select name="FeeDeptId" id="FeeDeptId" class="form-control" required>
+                    <?php
+                    foreach ($deptype as $dept) { ?>
+                        <option value="<?php echo $dept['DeptId']; ?>" <?php
+                                                                        if ($dept['DeptId'] == $ribsub['FeeDeptId']) {
+                                                                            echo "selected";
+                                                                        } ?>><?php echo $dept['DeptName']; ?></option>
+                    <?php };
+                    ?>
+                </select>
+
+            </div>
+
+        </div>
+        <div class="form-group">
+
+            <div class="col-md-3">
+                <label for="WriteOffId" style="color: red;">報銷人</label>
+                <select name="WriteOffId" id="WriteOffId" class="form-control">
+                    <option value="" id="WriteOddOption"> </option>
+                    <?php
+                    foreach ($member as $key => $value) { ?>
+                        <option value="<?php echo $key; ?>" style="display:none" id="<?= 'WriteOff' . $value[1] . '-' . $value[0] ?>" <?php if ($key == $ribsub['WriteOffId']) {
+                                                                                                                                            echo "selected";
+                                                                                                                                        } ?>> <?php echo $value[0]; ?> </option>
+                    <?php }; ?>
+                </select>
+            </div>
+
+            <div class="col-md-3">
+                <label for="FeeNoteShow" style="color: red;">費用說明</label>
+                <input class="form-control" type="text" name="FeeNoteShow" id="FeeNoteShow" value="<?= $ribsub['FeeNoteShow'] ?>">
+            </div>
+            <div class="col-md-3">
+                <label for="ProjectId">合約號</label>
+                <select name="ProjectId" id="ProjectId">
+                    <option value=""></option>
+                    <?php
+                    foreach ($projects as $Project) {
+                    ?>
+                        <option value="<?= $Project['ProjectId'] ?>" <?php if ($Project['ProjectId'] == $ribsub['ProjectId']) {
+                                                                            echo "selected";
+                                                                        } ?>><?= $Project['ProjectId'] . $Project['ProjectName'] ?></option>
+                    <?php
+                    }
+                    ?>
+                </select>
+
+            </div>
+            <div class="col-md-3">
+                <label for="CU_MaterialId">作番號</label>
+                <select name="CU_MaterialId" id="CU_MaterialId">
+                    <option value=""></option>
+                    <?php
+                    foreach ($materials as $material) {
+                    ?>
+                        <option value="<?= $material['MaterialId'] ?>" <?php if ($material['MaterialId'] == $ribsub['CU_MaterialId']) {
+                                                                            echo "selected";
+                                                                        } ?>><?= $material['MaterialId'] . $material['MaterialName'] ?></option>
+                    <?php
+                    }
+                    ?>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="TaxId">稅碼</label>
+                <select name="TaxId" id="TaxId" class="form-control" required>
+                    <option value="ST005" <?php if ($ribsub['TaxId'] == "ST005") {
+                                                echo "selected";
+                                            } ?>>營業稅5%</option>
+                    <option value="ST101" <?php if ($ribsub['TaxId'] == "ST101") {
+                                                echo "selected";
+                                            } ?>>零稅</option>
+                    <option value="ST102" <?php if ($ribsub['TaxId'] == "ST102") {
+                                                echo "selected";
+                                            } ?>>免稅</option>
+                </select>
+            </div>
+            <div class="col-md-3">
+                <label for="IsCounteract">抵扣</label>
+                <select name="IsCounteract" class="form-control" required>
+                    <option value=1 <?php if ($ribsub['IsCounteract'] == 1) {
+                                        echo "selected";
+                                    } ?>>可抵扣</option>
+                    <option value=0 <?php if ($ribsub['IsCounteract'] == 0) {
+                                        echo "selected";
+                                    } ?>>不可抵扣</option>
+                </select>
+            </div>
+
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="UnitId" style="color: red;">計量單位</label>
+                <select name="UnitId" class="form-control" required>
+                    <?php
+                    foreach ($unit as $key => $value) { ?>
+                        <option value="<?php echo $value['UnitId']; ?>" <?php if ($value['UnitId'] == $ribsub['UnitId']) {
+                                                                            echo "selected";
+                                                                        } ?>><?php echo $value['UnitName']; ?></option>
+                    <?php };
+                    ?>
+                </select>
+            </div>
+            <div class="col-md-3">
+                <label for="Price" style="color: red;">單價 (原幣值含稅)</label>
+                <input class="form-control" type="number" step="any" name="Price" id="Price" value="<?= $ribsub['Price'] ?>" required>
+            </div>
+            <div class="col-md-3">
+                <label for="Quantity" style="color: red;">數量</label>
+                <input class="form-control" type="number" step="any" name="Quantity" id="Quantity" value="<?= $ribsub['Quantity'] ?>" required>
+            </div>
+            <div class="col-md-3">
+                <label for="OAmount" style="color: red;">報銷金額 (原幣值含稅)</label>
+                <input class="form-control" type="number" step="any" name="OAmount" id="OAmount" placeholder="單價x數量" value="<?= $ribsub['OAmount'] ?>" required disabled>
+            </div>
+        </div>
+        <?php
+        if (($user_id == "M0056" || $user_id == "M0209") && $state == 1) {
+        ?>
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="CurrId">幣別</label>
+                    <input class="form-control" type="text" name="CurrId" id="CurrId" value="<?php if ($ribsub['CurrId'] == "TWD") {
+                                                                                                    echo "台幣";
+                                                                                                } elseif ($ribsub['CurrId'] == "CNY") {
+                                                                                                    echo "人民幣";
+                                                                                                } elseif ($ribsub['CurrId'] == "EUR") {
+                                                                                                    echo "歐元";
+                                                                                                } elseif ($ribsub['CurrId'] == "HKD") {
+                                                                                                    echo "港幣";
+                                                                                                } else {
+                                                                                                    echo "美元";
+                                                                                                } ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="CurrLAmount">匯率</label>
+                    <input class="form-control" type="number" name="CurrLAmount" id="CurrLAmount" value="<?= $ribsub['CurrentLAmount'] ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="OTax">稅金 (原幣值)</label>
+                    <input class="form-control" type="number" name="OTax" id="OTax" value="<?= $ribsub['OTax'] ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="LTax">本幣稅金</label>
+                    <input class="form-control" type="number" step="any" name="LTax" id="LTax" value="<?= $ribsub['LTax'] ?>" disabled>
+                </div>
+            </div>
+
+
+            <div class="form-group">
+                <div class="col-md-3">
+                    <label for="OAmountUnWithTax">未稅報銷金額 (原幣值)</label>
+                    <input class="form-control" type="number" name="OAmountUnWithTax" id="OAmountUnWithTax" value="<?= $ribsub['OAmountUnWithTax'] ?>" disabled>
+                </div>
+
+                <div class="col-md-3">
+                    <label for="LAmountUnWithTax">本幣未稅報銷金額</label>
+                    <input class="form-control" type="number" step="any" name="LAmountUnWithTax" id="LAmountUnWithTax" value="<?= $ribsub['LAmountUnWithTax'] ?>" disabled>
+                </div>
+                <div class="col-md-3">
+                    <label for="LAmount">本幣報銷金額</label>
+                    <input class="form-control" type="number" step="any" name="LAmount" id="LAmount" value="<?= $ribsub['LAmount'] ?>" disabled>
+                </div>
+            </div>
+        <?php
+        } ?>
+        <div class="form-group">
+            <div class="col-md-3">
+                <label for="VoucherCount">憑單張數</label>
+                <input class="form-control" type="number" name="VoucherCount" id="VoucherCount" max=5 value="<?= $ribsub['VoucherCount'] ?>">
+            </div>
+            <div class="col-md-3">
+                <label for="VoucherType">憑單類型</label>
+                <select name="VoucherType" id="VoucherType" class="form-control">
+                    <option value=0 <?php if ($ribsub['VoucherType'] == 0) {
+                                        echo "selected";
+                                    } ?>>發票</option>
+                    <option value=1 <?php if ($ribsub['VoucherType'] == 1) {
+                                        echo "selected";
+                                    } ?>>收據 </option>
+                    <option value=2 <?php if ($ribsub['VoucherType'] == 2) {
+                                        echo "selected";
+                                    } ?>>支出證明</option>
+                    <option value=3 <?php if ($ribsub['VoucherType'] == 3) {
+                                        echo "selected";
+                                    } ?>>其他</option>
+                </select>
+            </div>
+            <div class="col-md-3" id="NotInvoice1">
+                <label for="InvoiceId">發票聯式 <a onclick="ShowInvoice()">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-info-circle" viewBox="0 0 16 16">
+                            <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
+                            <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM9 4.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z" />
+                        </svg>
+                    </a></label>
+                <select name="InvoiceId" class="form-control">
+                    <option value="">請選擇發票聯式</option>
+                    <option value="25" <?php if ($ribsub['InvoiceId'] == "25") {
+                                            echo "selected";
+                                        } ?>>一般電子發票-> 進項三聯式收銀機統一發票及一般稅額計算之電子發票</option>
+                    <option value="21" <?php if ($ribsub['InvoiceId'] == "21") {
+                                            echo "selected";
+                                        } ?>>三聯式手開發票-> 進項三聯式、電子計算機統一發票</option>
+                    <option value="22" <?php if ($ribsub['InvoiceId'] == "22") {
+                                            echo "selected";
+                                        } ?>>二聯式收銀機發票 -> 進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
+                    <?php if ($user_id == "M0056" || $user_id == "M0209") { ?>
+                        <option value="23" <?php if ($ribsub['InvoiceId'] == "23") {
+                                                echo "selected";
+                                            } ?>>三聯式、電子計算機、三聯式收銀機統一發票及一般稅額計算之電子發票之進貨退出或折讓證明單</option>
+                        <option value="24" <?php if ($ribsub['InvoiceId'] == "24") {
+                                                echo "selected";
+                                            } ?>>二聯式收銀機統一發票及載有稅額之其他憑證之進貨退出或折讓證明單</option>
+
+                        <option value="26" <?php if ($ribsub['InvoiceId'] == "26") {
+                                                echo "selected";
+                                            } ?>>彙總登錄每張稅額伍佰元以下之進項三聯式、電子計算機統一發票</option>
+                        <option value="27" <?php if ($ribsub['InvoiceId'] == "27") {
+                                                echo "selected";
+                                            } ?>>彙總登錄每張稅額伍佰元以下之進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
+                        <option value="28" <?php if ($ribsub['InvoiceId'] == "28") {
+                                                echo "selected";
+                                            } ?>>進項海關代徵營業稅繳納證</option>
+                        <option value="29" <?php if ($ribsub['InvoiceId'] == "29") {
+                                                echo "selected";
+                                            } ?>>進項海關退還溢繳營業稅申報單</option>
+                    <?php } ?>
+                </select>
+            </div>
+            <div class="col-md-3" id="NotInvoice2">
+                <label for="InvoiceNo">發票號碼</label>
+                <input class="form-control" type="text" name="InvoiceNo" id="InvoiceNo" value="<?= $ribsub['InvoiceNo'] ?>">
+            </div>
+        </div>
+        <div>
+            <input type="hidden" name="rib_id" id="rib_id" value="<?= $ribsub['rib_id'] ?>">
+        </div>
+        <div class="form-group">
+            <div class="col-md-3" id="Tax">
+                <label for="TaxNo">供應商統一編號</label>
+                <input type="text" name="TaxNo" id="TaxNo" class="form-control" onblur="checkBiz()" value="<?= $ribsub['TaxNo'] ?>">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-7">
+
+            </div>
+            <div class="col-md-5">
+                <button onclick="senddata()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-bottom: 100px;margin-top:40px">修改費用單據</button>
+            </div>
+        </div>
+
+    </form>
+</div>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script>
+    var CurrId = "<?= $ribsub['CurrId'] ?>";
+    $(document).ready(function() {
+        $("#ProjectId").selectize();
+        $("#CU_MaterialId").selectize();
+    })
+
+    function checkBiz() {
+        if ($("#TaxNo").val().length !== 8) {
+            alert("統一編號格式錯誤");
+        } else {
+            var biz = $("#TaxNo").val();
+            var BizArray = <?php echo $BizJSON; ?>;
+            var answer = 0;
+            for (var partner = 0; partner < <?= $bizcount ?>; partner++) {
+                var value = BizArray[partner];
+                if (biz == value) {
+                    answer += 1
+                }
+            }
+            if (answer == 1) {
+                alert("供應商認證成功")
+            } else {
+                alert("T8內無此供應商")
+            }
+        }
+
+    }
+    var TempArr = [];
+    $(function() {
+        $("#VoucherType").change(function() {
+            if ($("#VoucherType").val() !== "0") {
+                $("#NotInvoice1").hide();
+                $("#NotInvoice2").hide();
+            } else {
+                $("#NotInvoice1").show();
+                $("#NotInvoice2").show();
+            }
+        })
+        $('#FeeTypeGen').change(function() {
+            var FeeTypeId = document.getElementById("FeeTypeId")
+            var FeeType = [{}, {
+                '400001': '交通費-捷利卡儲值',
+                '400002': '交通費-油資',
+                '400003': '交通費-ETC',
+                '400004': '交通費-停車費'
+            }, {
+                '130101': '差旅費-膳雜費',
+                '130102': '差旅費-住宿',
+                '130301': '差旅費-機票款',
+                '130302': '差旅費-高鐵車資',
+                '130303': '差旅費-台鐵車資',
+                '130304': '差旅費-客運車資',
+                '130305': '差旅費-捷運車資',
+                '130306': '差旅費-計程車車資',
+                '130307': '差旅費-國外交通費 ',
+                '130308': '差旅費-油資',
+                '130309': '差旅費-ETC',
+                '130310': '差旅費-停車費'
+            }, {
+                '200001': '交際便餐、飲品',
+                '200002': '交際禮品費',
+                '200003': '禮金'
+            }, {
+                '120001': '文具用品',
+                '120002': '影印紙',
+                '120003': '影印費',
+                '120004': '名片'
+            }, {
+                '150001': '郵資',
+                '150002': '電話費',
+                '150003': '匯款手續費'
+            }, {
+                '180101': '水費'
+            }, {
+                '180201': '電費'
+            }, {
+                '180301': '瓦斯費'
+            }, {
+                '140001': '運費/快遞'
+            }, {
+                '140002': '堆高機費用'
+            }, {
+                '390001': '材料費、五金用品'
+            }, {
+                '160002': '汽車維修'
+            }, {
+                '370004': '研發打樣費',
+                '370005': '研發測試費'
+            }, {
+                '220001': '牌照稅',
+                '220002': '燃料費',
+                '220005': '印花稅',
+            }, {
+                '880004': '其他雜項支出'
+            }];
+            for (var q = 0; q < (FeeType.length); q++) {
+                if ($('#FeeTypeGen').val() == (q)) {
+                    $("#FeeTypeId").empty();
+                    for (const key in FeeType[q]) {
+                        FeeTypeId.add(new Option(FeeType[q][key], key));
+                    }
+                }
+            }
+        })
+        $('#FeeDeptId').change(function() {
+            changeWriteOffId($('#FeeDeptId').val());
+        })
+        $("#FeeDate").change(function() {
+            if ($("#FeeDate").val().length != 8) {
+                alert("輸入格式錯誤");
+                $("#FeeDate").val('');
+            } else {
+                let year = $("#FeeDate").val().substr(0, 4);
+                let month = parseInt($("#FeeDate").val().substr(4, 2)) - 1;
+                let day = $("#FeeDate").val().substr(6, 2);
+                let feedate = new Date(year, month, day);
+                let now = new Date();
+                if (feedate.getMonth() != month) {
+                    alert("請輸入正確格式的日期");
+                } else {
+                    if (feedate > now) {
+                        alert("費用日期不可大於今天");
+                        $("#FeeDate").val('');
+                    } else {
+                        now.setMonth(now.getMonth() - 2);
+                        now.setDate(1);
+                        now.setDate(now.getDate() - 1);
+                        if (feedate <= now) {
+                            alert("超過兩個月的費用無法進行報銷");
+                            $("#FeeDate").val('');
+                        }
+                    }
+                }
+            }
+        })
+
+        $("#Price").change(function() {
+            if (CurrId === "TWD") {
+                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
+                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
+                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                }
+            } else {
+                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
+                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
+                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
+                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                }
+            }
+
+        });
+        $("#Quantity").change(function() {
+            if (CurrId === "TWD") {
+                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
+                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
+                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                }
+            } else {
+                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
+                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
+                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
+                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                }
+            }
+
+        });
+        $("#TaxId").change(function() {
+            if (CurrId === "TWD") {
+                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
+                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
+                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                }
+            } else {
+                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
+                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
+                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
+                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                }
+            }
+
+        })
+
+
+    })
+
+    function ShowInvoice() {
+        window.open('rib02-invoice.php', '新視窗的名稱', config = 'height=600, width=600');
+
+    }
+
+    function changeWriteOffId(SelectedDept) {
+        var SelectDeptId = 'WriteOff' + SelectedDept + '-';
+        for (var i = 0; i < WriteOffId.options.length; i++) {
+            WriteOffId.options[i].selected = false;
+            let thisid = WriteOffId.options[i].id
+            if (thisid.search(SelectDeptId) === 0) {
+                WriteOffId.options[i].style['display'] = '';
+            } else {
+                WriteOffId.options[i].style['display'] = 'none';
+            };
+
+        };
+    };
+
+
+    function senddata() {
+        if ($("#FeeDate").val() == "" || $("#FeeNoteShow").val() == "" || $("#Price").val() == "" || $("#Quantity").val() == "") {
+            alert("請確認紅字部分皆有填寫");
+        } else if ($("#OAmount").val() <= 0) {
+            alert("金額必須大於零");
+
+        } else {
+            $("#OAmount").prop("disabled", false);
+            <?php
+            if (($user_id == "M0056" || $user_id == "M0209") && $state == 1) { ?>
+                $("#OTax").prop("disabled", false);
+                $("#LTax").prop("disabled", false);
+                $("#OAmountUnWithTax").prop("disabled", false);
+                $("#LAmountUnWithTax").prop("disabled", false);
+                $("#LAmount").prop("disabled", false);
+                $("#OAmount").prop("disabled", false);
+            <?php } ?>
+            $('#ribsubeditform').submit();
+        }
+    }
 </script>
\ No newline at end of file
diff --git a/wms/rib02-invoice.php b/wms/rib02-invoice.php
index 0d299d59..496bd8d0 100644
--- a/wms/rib02-invoice.php
+++ b/wms/rib02-invoice.php
@@ -1,19 +1,19 @@
-<div style="border: 1px black solid;margin:1rem; padding:1rem; border-radius: 1rem;">
-    <h3 style="color:brown">一般電子發票</h3>
-    <div style="display:inline-block"><img src="./img/Invoice25-1.jpg" alt="..." width="250 px" ></div>
-    <div style="display:inline-block"><img src="./img/invoice25-6.jpg" alt="..." height="350 px"></div>
-    <div style="display:inline-block"><img src="./img/Invoice25-3.jpg" alt="..." width="350 px" ></div>
-    <div style="display:inline-block"><img src="./img/Invoice25-4.jpg" alt="..." width="350 px" ></div>
-</div>
-<div style="border: 1px gray solid;margin:1rem; padding:1rem; border-radius: 1rem;">
-    <h3 style="color:brown">三聯式手開發票</h3>
-    <div style="display:inline-block"><img src="./img/Invoice21.jpg" alt="..." width="250 px" ></div>
-</div>
-<div style="border: 1px gray solid;margin:1rem; padding:1rem; border-radius: 1rem;">
-    <h3 style="color:brown">二聯式收銀機發票</h3>
-    <div style="display:inline-block"><img src="./img/Invoice22.jpg" alt="..." width="250 px" ></div>
-    <div style="display:inline-block"><img src="./img/Invoice22-2.jpg" alt="..." width="250 px" ></div>
-</div>
-
-
-
+<div style="border: 1px black solid;margin:1rem; padding:1rem; border-radius: 1rem;">
+    <h3 style="color:brown">一般電子發票</h3>
+    <div style="display:inline-block"><img src="./img/Invoice25-1.jpg" alt="..." width="250 px" ></div>
+    <div style="display:inline-block"><img src="./img/invoice25-6.jpg" alt="..." height="350 px"></div>
+    <div style="display:inline-block"><img src="./img/Invoice25-3.jpg" alt="..." width="350 px" ></div>
+    <div style="display:inline-block"><img src="./img/Invoice25-4.jpg" alt="..." width="350 px" ></div>
+</div>
+<div style="border: 1px gray solid;margin:1rem; padding:1rem; border-radius: 1rem;">
+    <h3 style="color:brown">三聯式手開發票</h3>
+    <div style="display:inline-block"><img src="./img/Invoice21.jpg" alt="..." width="250 px" ></div>
+</div>
+<div style="border: 1px gray solid;margin:1rem; padding:1rem; border-radius: 1rem;">
+    <h3 style="color:brown">二聯式收銀機發票</h3>
+    <div style="display:inline-block"><img src="./img/Invoice22.jpg" alt="..." width="250 px" ></div>
+    <div style="display:inline-block"><img src="./img/Invoice22-2.jpg" alt="..." width="250 px" ></div>
+</div>
+
+
+
diff --git a/wms/rib02-purReceive-submit.php b/wms/rib02-purReceive-submit.php
index 27b73cc2..46f77fdd 100644
--- a/wms/rib02-purReceive-submit.php
+++ b/wms/rib02-purReceive-submit.php
@@ -1,89 +1,89 @@
-<?php
-include "T8_Authorization.php";
-echo "收貨申請單////有問題，要問俊佑";
-
-?>
-<script>
-    console.log(<?= $now ?>);
-    get_Auth();
-    window.addEventListener('message', function(event) {
-        if (event.origin === "http://localhost:3000" && (typeof event.data === "string")) {
-            var validation = event.data;
-            console.log("event");
-            console.log(validation);
-
-            // var corsurl = 'http://cors-anywhere.herokuapp.com/';
-            var apiurl = 'http://60.244.87.101:880//twWebAPI/V1/PURRECEIVINGORDER/PostERPData';
-            headerParam = {
-                CHI_Authorization: `${validation}`,
-            };
-            var body = [
-  {
-    "name": "purReceivingOrderMaster",
-    "rows": [
-      {
-        "BillNo": "Z003",
-        "BillDate": 20210420,
-        "ReceiveOrgId": "1000",
-        "OrgId": "1000",
-        "DemandOrgId": "1000",
-        "TypeId": "MA",
-        "FromSourceTag":"PO",
-        "FromTransId":"Z003",
-        // "BizPartnerId": "16547907",
-        // "PersonId": "M0122",
-        // "CurrId": "TWD",
-        // "CurrOAmount": 1,
-        // "CurrLAmount": 1,
-        // "ReciveDate": 20210420,
-        // "DueToId": "Z001",
-        // "TaxId": "ST005",
-        // "DebtorOrgId": "1000",
-        // "DebtorCurrOAmount": 1,
-        // "DebtorCurrLAmount": 1,
-        // "ReceiveCompId": "1000",
-        // "DebtorCompId": "1000",
-        // "DemandCompId": "1000",
-        "InStoreState":2,
-        "CurrentState":2
-      }
-    ]
-  },
-  {
-    "name": "purReceivingOrderDetail",
-    "rows": [
-      {
-        // "TaxId": "ST005",
-        "FromSourceTag":"PO",
-        "FromBillNo":"Z003",
-        "BillNo": "Z002",
-        "RowCode": "1",
-        "ItemType": 0,
-        "MaterialId": "MX01030018",
-        "ReceivingSQty": 1,
-        // "SUnitId": "SET",
-        "SPrice": "100"
-      }
-    ]
-  }
-]
-;
-            var json = JSON.stringify(body);
-            obj = {
-                type: 'POST',
-                // url: `${corsurl}${apiurl}`,
-                url: `${apiurl}`,
-                // dataType: 'json',
-                headers: headerParam,
-                data: json,
-                dataType: "json",
-                success: function(res) {
-                    console.log(res.Status);
-                    console.log(res.ErrorMsg);
-                    console.log(res.Data);
-                }
-            };
-            jQuery.ajax(obj);
-        }
-    })
+<?php
+include "T8_Authorization.php";
+echo "收貨申請單////有問題，要問俊佑";
+
+?>
+<script>
+    console.log(<?= $now ?>);
+    get_Auth();
+    window.addEventListener('message', function(event) {
+        if (event.origin === "http://localhost:3000" && (typeof event.data === "string")) {
+            var validation = event.data;
+            console.log("event");
+            console.log(validation);
+
+            // var corsurl = 'http://cors-anywhere.herokuapp.com/';
+            var apiurl = 'http://60.244.87.101:880//twWebAPI/V1/PURRECEIVINGORDER/PostERPData';
+            headerParam = {
+                CHI_Authorization: `${validation}`,
+            };
+            var body = [
+  {
+    "name": "purReceivingOrderMaster",
+    "rows": [
+      {
+        "BillNo": "Z003",
+        "BillDate": 20210420,
+        "ReceiveOrgId": "1000",
+        "OrgId": "1000",
+        "DemandOrgId": "1000",
+        "TypeId": "MA",
+        "FromSourceTag":"PO",
+        "FromTransId":"Z003",
+        // "BizPartnerId": "16547907",
+        // "PersonId": "M0122",
+        // "CurrId": "TWD",
+        // "CurrOAmount": 1,
+        // "CurrLAmount": 1,
+        // "ReciveDate": 20210420,
+        // "DueToId": "Z001",
+        // "TaxId": "ST005",
+        // "DebtorOrgId": "1000",
+        // "DebtorCurrOAmount": 1,
+        // "DebtorCurrLAmount": 1,
+        // "ReceiveCompId": "1000",
+        // "DebtorCompId": "1000",
+        // "DemandCompId": "1000",
+        "InStoreState":2,
+        "CurrentState":2
+      }
+    ]
+  },
+  {
+    "name": "purReceivingOrderDetail",
+    "rows": [
+      {
+        // "TaxId": "ST005",
+        "FromSourceTag":"PO",
+        "FromBillNo":"Z003",
+        "BillNo": "Z002",
+        "RowCode": "1",
+        "ItemType": 0,
+        "MaterialId": "MX01030018",
+        "ReceivingSQty": 1,
+        // "SUnitId": "SET",
+        "SPrice": "100"
+      }
+    ]
+  }
+]
+;
+            var json = JSON.stringify(body);
+            obj = {
+                type: 'POST',
+                // url: `${corsurl}${apiurl}`,
+                url: `${apiurl}`,
+                // dataType: 'json',
+                headers: headerParam,
+                data: json,
+                dataType: "json",
+                success: function(res) {
+                    console.log(res.Status);
+                    console.log(res.ErrorMsg);
+                    console.log(res.Data);
+                }
+            };
+            jQuery.ajax(obj);
+        }
+    })
 </script>
\ No newline at end of file
diff --git a/wms/rib02-purchase-submit.php b/wms/rib02-purchase-submit.php
index 216b4906..13f042fa 100644
--- a/wms/rib02-purchase-submit.php
+++ b/wms/rib02-purchase-submit.php
@@ -1,89 +1,89 @@
-<?php
-include "T8_Authorization.php";
-echo "採購單";
-echo "111";
-?>
-<script>
-    console.log(<?= $now ?>);
-    get_Auth();
-    window.addEventListener('message', function(event) {
-        if (event.origin === "http://localhost:3000" && (typeof event.data === "string")) {
-            var validation = event.data;
-            console.log("event");
-            console.log(validation);
-
-            // var corsurl = 'http://cors-anywhere.herokuapp.com/';
-            var apiurl = 'http://60.244.87.101:880//twWebAPI/V1/PURPURCHASEORDER/PostERPData';
-            headerParam = {
-                CHI_Authorization: `${validation}`,
-            };
-            var body = [{
-                    "name": "purBillOrderMaster",
-                    "rows": [{
-                        "BillNo": "Z004",
-                        "BillDate": 20210420,
-                        "TypeId": "PO",
-                        "OrgId": "1000",
-                        "FOrgId": "1000",
-                        "BizPartnerId": "33709933",
-                        "CurrId": "TWD",
-                        "CurrOAmount": 1.00000,
-                        "CurrLAmount": 1.00000,
-                        "PersonId": "M0122",
-                        "DueToId": "33709933",
-                        "TaxId": "ST005",
-                        // "DebtorOrgId": "1000",
-                        // "DebitorCurrId": "TWD",
-                        // "DebtorCurrOAmount": 1.00000,
-                        // "DebtorCurrLAmount": 1.00000,
-                        "CompId": "1001",
-                        // "DebtorCompId": "1001",
-                        "CurrentState": 2,
-                        "FlowState": 2,
-                        "PermitState": 2,
-                        "Remark":"testtest",
-                        "CreatorId": "M0122",
-                        "IsPriceWithTax":1
-
-                    }]
-                },
-                {
-                    "name": "purBillOrderDetail",
-                    "rows": [{
-                        "DemandOrgId": "1000",
-                        "TaxId": "ST005",
-                        "DeliveryDate": 20210420,
-                        "ReceiveOrgId": "1000",
-                        "DebtorOrgId": "1000",
-                        "ReceiveCompId": "1001",
-                        "DemandCompId": "1001",
-                        "BillNo": "Z004",
-                        "RowCode": 1,
-                        "ItemType": 0,
-                        "MaterialId": "MX23010003",
-                        // "MaterialSpec": "LY-08/紅光/1",
-                        "SQuantity": 1.00000,
-                        "PresentSQty":1,
-                        "SPrice": 100
-                    }]
-                }
-            ];
-            var json = JSON.stringify(body);
-            obj = {
-                type: 'POST',
-                // url: `${corsurl}${apiurl}`,
-                url: `${apiurl}`,
-                // dataType: 'json',
-                headers: headerParam,
-                data: json,
-                dataType: "json",
-                success: function(res) {
-                    console.log(res.Status);
-                    console.log(res.ErrorMsg);
-                    console.log(res.Data);
-                }
-            };
-            jQuery.ajax(obj);
-        }
-    })
+<?php
+include "T8_Authorization.php";
+echo "採購單";
+echo "111";
+?>
+<script>
+    console.log(<?= $now ?>);
+    get_Auth();
+    window.addEventListener('message', function(event) {
+        if (event.origin === "http://localhost:3000" && (typeof event.data === "string")) {
+            var validation = event.data;
+            console.log("event");
+            console.log(validation);
+
+            // var corsurl = 'http://cors-anywhere.herokuapp.com/';
+            var apiurl = 'http://60.244.87.101:880//twWebAPI/V1/PURPURCHASEORDER/PostERPData';
+            headerParam = {
+                CHI_Authorization: `${validation}`,
+            };
+            var body = [{
+                    "name": "purBillOrderMaster",
+                    "rows": [{
+                        "BillNo": "Z004",
+                        "BillDate": 20210420,
+                        "TypeId": "PO",
+                        "OrgId": "1000",
+                        "FOrgId": "1000",
+                        "BizPartnerId": "33709933",
+                        "CurrId": "TWD",
+                        "CurrOAmount": 1.00000,
+                        "CurrLAmount": 1.00000,
+                        "PersonId": "M0122",
+                        "DueToId": "33709933",
+                        "TaxId": "ST005",
+                        // "DebtorOrgId": "1000",
+                        // "DebitorCurrId": "TWD",
+                        // "DebtorCurrOAmount": 1.00000,
+                        // "DebtorCurrLAmount": 1.00000,
+                        "CompId": "1001",
+                        // "DebtorCompId": "1001",
+                        "CurrentState": 2,
+                        "FlowState": 2,
+                        "PermitState": 2,
+                        "Remark":"testtest",
+                        "CreatorId": "M0122",
+                        "IsPriceWithTax":1
+
+                    }]
+                },
+                {
+                    "name": "purBillOrderDetail",
+                    "rows": [{
+                        "DemandOrgId": "1000",
+                        "TaxId": "ST005",
+                        "DeliveryDate": 20210420,
+                        "ReceiveOrgId": "1000",
+                        "DebtorOrgId": "1000",
+                        "ReceiveCompId": "1001",
+                        "DemandCompId": "1001",
+                        "BillNo": "Z004",
+                        "RowCode": 1,
+                        "ItemType": 0,
+                        "MaterialId": "MX23010003",
+                        // "MaterialSpec": "LY-08/紅光/1",
+                        "SQuantity": 1.00000,
+                        "PresentSQty":1,
+                        "SPrice": 100
+                    }]
+                }
+            ];
+            var json = JSON.stringify(body);
+            obj = {
+                type: 'POST',
+                // url: `${corsurl}${apiurl}`,
+                url: `${apiurl}`,
+                // dataType: 'json',
+                headers: headerParam,
+                data: json,
+                dataType: "json",
+                success: function(res) {
+                    console.log(res.Status);
+                    console.log(res.ErrorMsg);
+                    console.log(res.Data);
+                }
+            };
+            jQuery.ajax(obj);
+        }
+    })
 </script>
\ No newline at end of file
diff --git a/wms/rib02-submit.php b/wms/rib02-submit.php
index 46a3871b..1dc331a1 100644
--- a/wms/rib02-submit.php
+++ b/wms/rib02-submit.php
@@ -1,234 +1,234 @@
-<?php
-include "./header.php";
-$rib_id = isset($_GET['rib_id']) ? $_GET['rib_id'] : $_POST['rib_id'];
-$ribsub_id = isset($_GET['ribsub_id']) ? $_GET['ribsub_id'] : Null;
-$submit = $_GET['submit'];
-$state = empty($_GET['state']) ? 0 : $_GET['state'];
-
-// 取得供應商
-$BusinessPartner = array();
-$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName 
-FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
-$BizPartner = $conn->query($sql_Biz);
-foreach ($BizPartner as $biz) {
-    $bizKey = $biz['BizPartnerId'];
-    $bizValue = $biz['BizPartnerName'];
-    $BusinessPartner[$bizKey] = $bizValue;
-}
-
-$RowCode = $_POST['RowCode'];
-$FeeDate = $_POST['FeeDate'];
-$FeeTypeGen = isset($_POST['FeeTypeGen']) ? $_POST['FeeTypeGen'] : null;
-$FeeTypeId = $_POST['FeeTypeId'];
-$FeeDeptId = $_POST['FeeDeptId'];
-$CurrId = empty($_POST['CurrId']) ? null : $_POST['CurrId'];
-$WriteOffId = $_POST['WriteOffId'];
-$FeeNoteShow = $_POST['FeeNoteShow'];
-$ProjectId = empty($_POST['ProjectId']) ? Null : $_POST['ProjectId'];
-$CU_MaterialId = empty($_POST['CU_MaterialId']) ? null : $_POST['CU_MaterialId'];
-$UnitId = $_POST['UnitId'];
-$Price = $CurrId == "TWD" ? round($_POST['Price']) : round($_POST['Price'], 2);
-$Quantity = $_POST['Quantity'];
-$OAmount = $CurrId == "TWD" ? round($_POST['OAmount']) : round($_POST['OAmount'], 2);
-$TaxId = $_POST['TaxId'];
-$IsCounteract = $_POST['IsCounteract'];
-$InvoiceId = $_POST['InvoiceId'];
-$VoucherCount = empty($_POST['VoucherCount']) ? 1 : $_POST['VoucherCount'];
-$VoucherType = isset($_POST['VoucherType']) ? $_POST['VoucherType'] : 0;
-$InvoiceNo = empty($_POST['InvoiceNo']) ? NULL : $_POST['InvoiceNo'];
-
-$CurrLAmount = empty($_POST['CurrLAmount']) ? null : $_POST['CurrLAmount'];
-// $comSupplierName = empty($_POST['comSupplierName']) ? null : $_POST['comSupplierName'];
-$FromSourceTag = 0;
-$TaxRate = ($TaxId == "ST005") ? 0.05 : 0;
-if ($CurrId == "TWD") {
-    $OTax = isset($_POST['OTax']) ? round($_POST['OTax']) : NULL;
-    $LTax = isset($_POST['LTax']) ? round($_POST['LTax']) : NULL;
-    $OAmountUnWithTax = isset($_POST['OAmountUnWithTax']) ? round($_POST['OAmountUnWithTax']) : null;
-    $LAmountUnWithTax = isset($_POST['LAmountUnWithTax']) ? round($_POST['LAmountUnWithTax']) : null;
-    $LAmount = isset($_POST['LAmount']) ? round($_POST['LAmount']) : null;
-}else{
-    $OTax = isset($_POST['OTax']) ? round($_POST['OTax'], 2) : NULL;
-    $LTax = isset($_POST['LTax']) ? round($_POST['LTax'], 2) : NULL;
-    $OAmountUnWithTax = isset($_POST['OAmountUnWithTax']) ? round($_POST['OAmountUnWithTax'], 2) : null;
-    $LAmountUnWithTax = isset($_POST['LAmountUnWithTax']) ? round($_POST['LAmountUnWithTax'], 2) : null;
-    $LAmount = isset($_POST['LAmount']) ? round($_POST['LAmount'], 2) : null;
-}
-
-$TaxNo = empty($_POST['TaxNo']) ? '' : $_POST['TaxNo'];
-if (empty($TaxNo)) {
-    $comSupplierName = "雜項請款用";
-} else {
-    if (isset($BusinessPartner[$TaxNo])) {
-        $comSupplierName = $BusinessPartner[$TaxNo];
-    } else {
-        $comSupplierName = "雜項請款用";
-    }
-}
-
-if (isset($comSupplierName) && ($comSupplierName != "雜項請款用")) {
-
-    $sql = "SELECT * FROM comBusinessPartner";
-    $BizPartner = $conn->query($sql);
-    foreach ($BizPartner as $company) {
-        if ($company['BizPartnerName'] == $comSupplierName) {
-            $TaxNo = $company['TaxNo'];
-            $comSupplierId = $company['BizPartnerId'];
-        }
-    }
-} else {
-    $comSupplierId = "V0001";
-}
-
-$SQL1 = "";
-if ($submit == "add") {
-    if (($user_id == "M0056") || ($user_id == "M0209")) {
-        $SQL1 = "INSERT INTO rib_sub (`RowCode`,`rib_id`,`RowNo`,`FeeDate`,`FeeTypeId`,`WriteOffType`,
-    `BizOrgId`,`WriteOffId`,`FeeOrgId`,`FeeDeptId`,`FeeCompanyId`,`UnitId`,`Quantity`,
-    `Price`,`OAmount`,`FeeNoteShow`,`CurrId`,`SupplyOrgId`,`CurrOAmount`,`FromSourceTag`,`TaxId`,`IsCounteract`,`InvoiceId`,`TaxRate`,`CreatorId`,`TaxNo`,`CurrentLAmount`,`OTax`,`LTax`,
-    `OAmountUnWithTax`,`LAmountUnWithTax`,`LAmount`";
-        $SQL1 .= empty($ProjectId) ? "" : ",`ProjectId`";
-        $SQL1 .= isset($FeeTypeGen) ? ",`FeeTypeGen`" : "";
-        $SQL1 .= empty($CU_MaterialId) ? "" : ",`CU_MaterialId`";
-        $SQL1 .= empty($VoucherCount) ? "" : ",`VoucherCount`";
-        $SQL1 .= isset($VoucherType) ? ",`VoucherType`" : "";
-        $SQL1 .= empty($InvoiceNo) ? "" : ",`InvoiceNo`";
-        $SQL1 .= empty($comSupplierName) ? "" : ",`comSupplierName`";
-        $SQL1 .= empty($comSupplierId) ? ",`comSupplierId`" : ",`comSupplierId`";
-
-        $SQL2 = ") VALUES ($RowCode, $rib_id, $RowCode,$FeeDate,'$FeeTypeId',2,
-    '1000','$WriteOffId','1000','$FeeDeptId','1000','$UnitId',$Quantity,
-    $Price,$OAmount,'$FeeNoteShow','$CurrId','1000',1,0,'$TaxId',$IsCounteract,'$InvoiceId',$TaxRate,'$user_id','$TaxNo',$CurrLAmount,$OTax,$LTax,
-    $OAmountUnWithTax,$LAmountUnWithTax,$LAmount";
-        $SQL2 .= empty($ProjectId) ? "" : ",'" . $ProjectId . "'";
-        $SQL2 .= isset($FeeTypeGen) ?  "," . $FeeTypeGen : "";
-        $SQL2 .= empty($CU_MaterialId) ? "" : ",'" . $CU_MaterialId . "'";
-        $SQL2 .= empty($VoucherCount) ? "" : "," . $VoucherCount;
-        $SQL2 .= isset($VoucherType) ? "," . $VoucherType : "";
-        $SQL2 .= empty($InvoiceNo) ? "" : ",'" . $InvoiceNo . "'";
-        $SQL2 .= empty($comSupplierName) ? "" : ",'" . $comSupplierName . "'";
-        $SQL2 .= empty($comSupplierId) ? ",' '" : ",'" . $comSupplierId . "'";
-        $SQL2 .= ")";
-    } else {
-        $SQL1 = "INSERT INTO rib_sub (`RowCode`,`rib_id`,`RowNo`,`FeeDate`,`FeeTypeId`,`WriteOffType`,
-    `BizOrgId`,`WriteOffId`,`FeeOrgId`,`FeeDeptId`,`FeeCompanyId`,`UnitId`,`Quantity`,
-    `Price`,`OAmount`,`FeeNoteShow`,`CurrId`,`SupplyOrgId`,`CurrOAmount`,`FromSourceTag`,`TaxId`,`IsCounteract`,`InvoiceId`,`TaxRate`,`CreatorId`,`TaxNo`";
-        $SQL1 .= empty($ProjectId) ? "" : ",`ProjectId`";
-        $SQL1 .= isset($FeeTypeGen) ? ",`FeeTypeGen`" : "";
-        $SQL1 .= empty($CU_MaterialId) ? "" : ",`CU_MaterialId`";
-        $SQL1 .= empty($VoucherCount) ? "" : ",`VoucherCount`";
-        $SQL1 .= isset($VoucherType) ? ",`VoucherType`" : "";
-        $SQL1 .= empty($InvoiceNo) ? "" : ",`InvoiceNo`";
-        $SQL1 .= empty($comSupplierName) ? "" : ",`comSupplierName`";
-        $SQL1 .= empty($comSupplierId) ? ",`comSupplierId`" : ",`comSupplierId`";
-
-        $SQL2 = ") VALUES ($RowCode, $rib_id, $RowCode,$FeeDate,'$FeeTypeId',2,
-    '1000','$WriteOffId','1000','$FeeDeptId','1000','$UnitId',$Quantity,
-    $Price,$OAmount,'$FeeNoteShow','$CurrId','1000',1,0,'$TaxId',$IsCounteract,'$InvoiceId',$TaxRate,'$user_id','$TaxNo'";
-        $SQL2 .= empty($ProjectId) ? "" : ",'" . $ProjectId . "'";
-        $SQL2 .= isset($FeeTypeGen) ?  "," . $FeeTypeGen : "";
-        $SQL2 .= empty($CU_MaterialId) ? "" : ",'" . $CU_MaterialId . "'";
-        $SQL2 .= empty($VoucherCount) ? "" : "," . $VoucherCount;
-        $SQL2 .= isset($VoucherType) ? "," . $VoucherType : "";
-        $SQL2 .= empty($InvoiceNo) ? "" : ",'" . $InvoiceNo . "'";
-        $SQL2 .= empty($comSupplierName) ? "" : ",'" . $comSupplierName . "'";
-        $SQL2 .= empty($comSupplierId) ? ",' '" : ",'" . $comSupplierId . "'";
-        $SQL2 .= ")";
-    }
-    $SQL1 .= $SQL2;
-    //上傳資料庫
-    mysqli_query($link, $SQL1);
-    if (mysqli_affected_rows($link)) {
-        echo '<script>alert("新增/更新 成功")</script>';
-    } else {
-        echo '<script>alert("新增/更新 失敗")</script>';
-    }
-    //更新表頭
-    $SQL1 = str_replace("'", '', $SQL1);
-    $sql_rib = "UPDATE rib SET LastOperatorId = '$user_id', LastOperation='$SQL1' WHERE rib_id=$rib_id";
-    mysqli_query($link, $sql_rib);
-
-?>
-    <script>
-        window.location.href = "rib01-check.php?id=<?php echo $rib_id ?>&state=<?= $state ?>&<?= $token_link ?>";
-    </script>
-    <?php
-} elseif ($submit == "edit") {
-    $SQL1 = "UPDATE rib_sub SET RowCode=$RowCode, RowNo=$RowCode,FeeDate=$FeeDate,FeeTypeId=$FeeTypeId,FeeDeptId=$FeeDeptId,WriteOffId='$WriteOffId',FeeNoteShow='$FeeNoteShow',
-    UnitId='$UnitId', Price=$Price,Quantity=$Quantity, OAmount=$OAmount, TaxId='$TaxId', IsCounteract=$IsCounteract,InvoiceId= '$InvoiceId', TaxRate=$TaxRate,LastOperatorId='$user_id',TaxNo='$TaxNo',LastOperatorId='$user_id'";
-    $SQL1 .= empty($ProjectId) ? "" : ",ProjectId='$ProjectId'";
-    $SQL1 .= isset($FeeTypeGen) ? ",FeeTypeGen=$FeeTypeGen" : "";
-    $SQL1 .= empty($CU_MaterialId) ? "" : ",CU_MaterialId='$CU_MaterialId'";
-    $SQL1 .= empty($VoucherCount) ? "" : ",VoucherCount=$VoucherCount";
-    $SQL1 .= isset($VoucherType) ? ",VoucherType=$VoucherType" : "";
-    $SQL1 .= empty($InvoiceNo) ? "" : ",InvoiceNo='$InvoiceNo'";
-    $SQL1 .= empty($comSupplierName) ? ",comSupplierName=' '" : ",comSupplierName='$comSupplierName'";
-    $SQL1 .= empty($comSupplierId) ? ",comSupplierId=' '" : ",comSupplierId='$comSupplierId'";
-    $SQL1 .= isset($OTax) ? ",OTax=$OTax" : "";
-    $SQL1 .= isset($LTax) ? ",LTax=$LTax" : "";
-    $SQL1 .= isset($OAmountUnWithTax) ? ",OAmountUnWithTax=$OAmountUnWithTax" : "";
-    $SQL1 .= isset($LAmountUnWithTax) ? ",LAmountUnWithTax=$LAmountUnWithTax" : "";
-    $SQL1 .= isset($LAmount) ? ",LAmount=$LAmount" : "";
-    if (($user_id == "M0056" || $user_id == "M0209") && $state == 1) {
-        $SQL1 .= ",FeeBalance=$LAmountUnWithTax";
-        $SQL1 .= ",WriteOffAmount=$OAmount";
-    }
-    $SQL1 .= " WHERE ribsub_id = $ribsub_id";
-
-    //上傳資料庫--表身
-    mysqli_query($link, $SQL1);
-    if (mysqli_affected_rows($link)) {
-        echo '<script>alert("新增/更新 成功")</script>';
-    } else {
-        echo '<script>alert("新增/更新 失敗")</script>';
-    };
-    if ($state == 1) {
-        //取得所有表身資料以更新表頭資料
-        $ribsub_query = "SELECT * FROM rib_sub WHERE rib_id = $rib_id";
-        $ribsub_data = mysqli_query($link, $ribsub_query);
-        $OAmountWithTax = 0;
-        $OTax = 0;
-        $LTax = 0;
-        $OAmount = 0;
-        $WriteOffAmount = 0;
-        $LAmount = 0;
-        $totalVoucher = 0;
-        while ($ribsub = mysqli_fetch_assoc($ribsub_data)) {
-            $OAmountWithTax += $ribsub['OAmount'];
-            $LAmount += $ribsub['LAmountUnWithTax'];
-            $OTax += $ribsub['OTax'];
-            $LTax += $ribsub['LTax'];
-            $WriteOffAmount += $ribsub['OAmount'];
-            $OAmount += $ribsub['OAmountUnWithTax'];
-            $totalVoucher += $ribsub['VoucherCount'];
-            $CurrLAmount = $ribsub['CurrentLAmount'];
-        }
-        $UnPayOAmount = $WriteOffAmount;
-        $UnPayLAmount = $UnPayOAmount * $CurrLAmount;
-        $LAmountWithTax = $OAmountWithTax * $CurrLAmount;
-        // 更新表頭資料
-        $SQL1 = str_replace("'", '', $SQL1);
-        $sql_rib = "UPDATE rib SET OAmountWithTax=$OAmountWithTax, LAmountWithTax= $LAmountWithTax, LAmount=$LAmount,OAmount =$OAmount, UnPayOAmount=$OAmountWithTax, Balance = $OAmountWithTax, LBalance= $UnPayLAmount ,UnPaymentLAmt=$UnPayLAmount, UnPayLAmount=$UnPayLAmount,OTax=$OTax, LTax=$LTax, WriteOffAmount=$WriteOffAmount, LastOperatorId='$user_id' WHERE rib_id = $rib_id";
-        mysqli_query($link, $sql_rib);
-    ?>
-        <script>
-            window.location.href = "rib01-check.php?id=<?php echo $rib_id ?>&state=<?= $state ?>&<?= $token_link ?>";
-        </script>
-    <?php
-
-
-    } else {
-        $SQL1 = str_replace("'", '', $SQL1);
-        $sql_rib = "UPDATE rib SET LastOperatorId = '$user_id', LastOperation='$SQL1' WHERE rib_id=$rib_id";
-        mysqli_query($link, $sql_rib);
-
-    ?>
-        <script>
-            window.location.href = "rib01-check.php?id=<?php echo $rib_id ?>&state=<?= $state ?>&<?= $token_link ?>";
-        </script>
-<?php
-
-    }
-}
-
+<?php
+include "./header.php";
+$rib_id = isset($_GET['rib_id']) ? $_GET['rib_id'] : $_POST['rib_id'];
+$ribsub_id = isset($_GET['ribsub_id']) ? $_GET['ribsub_id'] : Null;
+$submit = $_GET['submit'];
+$state = empty($_GET['state']) ? 0 : $_GET['state'];
+
+// 取得供應商
+$BusinessPartner = array();
+$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName 
+FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
+$BizPartner = $conn->query($sql_Biz);
+foreach ($BizPartner as $biz) {
+    $bizKey = $biz['BizPartnerId'];
+    $bizValue = $biz['BizPartnerName'];
+    $BusinessPartner[$bizKey] = $bizValue;
+}
+
+$RowCode = $_POST['RowCode'];
+$FeeDate = $_POST['FeeDate'];
+$FeeTypeGen = isset($_POST['FeeTypeGen']) ? $_POST['FeeTypeGen'] : null;
+$FeeTypeId = $_POST['FeeTypeId'];
+$FeeDeptId = $_POST['FeeDeptId'];
+$CurrId = empty($_POST['CurrId']) ? null : $_POST['CurrId'];
+$WriteOffId = $_POST['WriteOffId'];
+$FeeNoteShow = $_POST['FeeNoteShow'];
+$ProjectId = empty($_POST['ProjectId']) ? Null : $_POST['ProjectId'];
+$CU_MaterialId = empty($_POST['CU_MaterialId']) ? null : $_POST['CU_MaterialId'];
+$UnitId = $_POST['UnitId'];
+$Price = $CurrId == "TWD" ? round($_POST['Price']) : round($_POST['Price'], 2);
+$Quantity = $_POST['Quantity'];
+$OAmount = $CurrId == "TWD" ? round($_POST['OAmount']) : round($_POST['OAmount'], 2);
+$TaxId = $_POST['TaxId'];
+$IsCounteract = $_POST['IsCounteract'];
+$InvoiceId = $_POST['InvoiceId'];
+$VoucherCount = empty($_POST['VoucherCount']) ? 1 : $_POST['VoucherCount'];
+$VoucherType = isset($_POST['VoucherType']) ? $_POST['VoucherType'] : 0;
+$InvoiceNo = empty($_POST['InvoiceNo']) ? NULL : $_POST['InvoiceNo'];
+
+$CurrLAmount = empty($_POST['CurrLAmount']) ? null : $_POST['CurrLAmount'];
+// $comSupplierName = empty($_POST['comSupplierName']) ? null : $_POST['comSupplierName'];
+$FromSourceTag = 0;
+$TaxRate = ($TaxId == "ST005") ? 0.05 : 0;
+if ($CurrId == "TWD") {
+    $OTax = isset($_POST['OTax']) ? round($_POST['OTax']) : NULL;
+    $LTax = isset($_POST['LTax']) ? round($_POST['LTax']) : NULL;
+    $OAmountUnWithTax = isset($_POST['OAmountUnWithTax']) ? round($_POST['OAmountUnWithTax']) : null;
+    $LAmountUnWithTax = isset($_POST['LAmountUnWithTax']) ? round($_POST['LAmountUnWithTax']) : null;
+    $LAmount = isset($_POST['LAmount']) ? round($_POST['LAmount']) : null;
+}else{
+    $OTax = isset($_POST['OTax']) ? round($_POST['OTax'], 2) : NULL;
+    $LTax = isset($_POST['LTax']) ? round($_POST['LTax'], 2) : NULL;
+    $OAmountUnWithTax = isset($_POST['OAmountUnWithTax']) ? round($_POST['OAmountUnWithTax'], 2) : null;
+    $LAmountUnWithTax = isset($_POST['LAmountUnWithTax']) ? round($_POST['LAmountUnWithTax'], 2) : null;
+    $LAmount = isset($_POST['LAmount']) ? round($_POST['LAmount'], 2) : null;
+}
+
+$TaxNo = empty($_POST['TaxNo']) ? '' : $_POST['TaxNo'];
+if (empty($TaxNo)) {
+    $comSupplierName = "雜項請款用";
+} else {
+    if (isset($BusinessPartner[$TaxNo])) {
+        $comSupplierName = $BusinessPartner[$TaxNo];
+    } else {
+        $comSupplierName = "雜項請款用";
+    }
+}
+
+if (isset($comSupplierName) && ($comSupplierName != "雜項請款用")) {
+
+    $sql = "SELECT * FROM comBusinessPartner";
+    $BizPartner = $conn->query($sql);
+    foreach ($BizPartner as $company) {
+        if ($company['BizPartnerName'] == $comSupplierName) {
+            $TaxNo = $company['TaxNo'];
+            $comSupplierId = $company['BizPartnerId'];
+        }
+    }
+} else {
+    $comSupplierId = "V0001";
+}
+
+$SQL1 = "";
+if ($submit == "add") {
+    if (($user_id == "M0056") || ($user_id == "M0209")) {
+        $SQL1 = "INSERT INTO rib_sub (`RowCode`,`rib_id`,`RowNo`,`FeeDate`,`FeeTypeId`,`WriteOffType`,
+    `BizOrgId`,`WriteOffId`,`FeeOrgId`,`FeeDeptId`,`FeeCompanyId`,`UnitId`,`Quantity`,
+    `Price`,`OAmount`,`FeeNoteShow`,`CurrId`,`SupplyOrgId`,`CurrOAmount`,`FromSourceTag`,`TaxId`,`IsCounteract`,`InvoiceId`,`TaxRate`,`CreatorId`,`TaxNo`,`CurrentLAmount`,`OTax`,`LTax`,
+    `OAmountUnWithTax`,`LAmountUnWithTax`,`LAmount`";
+        $SQL1 .= empty($ProjectId) ? "" : ",`ProjectId`";
+        $SQL1 .= isset($FeeTypeGen) ? ",`FeeTypeGen`" : "";
+        $SQL1 .= empty($CU_MaterialId) ? "" : ",`CU_MaterialId`";
+        $SQL1 .= empty($VoucherCount) ? "" : ",`VoucherCount`";
+        $SQL1 .= isset($VoucherType) ? ",`VoucherType`" : "";
+        $SQL1 .= empty($InvoiceNo) ? "" : ",`InvoiceNo`";
+        $SQL1 .= empty($comSupplierName) ? "" : ",`comSupplierName`";
+        $SQL1 .= empty($comSupplierId) ? ",`comSupplierId`" : ",`comSupplierId`";
+
+        $SQL2 = ") VALUES ($RowCode, $rib_id, $RowCode,$FeeDate,'$FeeTypeId',2,
+    '1000','$WriteOffId','1000','$FeeDeptId','1000','$UnitId',$Quantity,
+    $Price,$OAmount,'$FeeNoteShow','$CurrId','1000',1,0,'$TaxId',$IsCounteract,'$InvoiceId',$TaxRate,'$user_id','$TaxNo',$CurrLAmount,$OTax,$LTax,
+    $OAmountUnWithTax,$LAmountUnWithTax,$LAmount";
+        $SQL2 .= empty($ProjectId) ? "" : ",'" . $ProjectId . "'";
+        $SQL2 .= isset($FeeTypeGen) ?  "," . $FeeTypeGen : "";
+        $SQL2 .= empty($CU_MaterialId) ? "" : ",'" . $CU_MaterialId . "'";
+        $SQL2 .= empty($VoucherCount) ? "" : "," . $VoucherCount;
+        $SQL2 .= isset($VoucherType) ? "," . $VoucherType : "";
+        $SQL2 .= empty($InvoiceNo) ? "" : ",'" . $InvoiceNo . "'";
+        $SQL2 .= empty($comSupplierName) ? "" : ",'" . $comSupplierName . "'";
+        $SQL2 .= empty($comSupplierId) ? ",' '" : ",'" . $comSupplierId . "'";
+        $SQL2 .= ")";
+    } else {
+        $SQL1 = "INSERT INTO rib_sub (`RowCode`,`rib_id`,`RowNo`,`FeeDate`,`FeeTypeId`,`WriteOffType`,
+    `BizOrgId`,`WriteOffId`,`FeeOrgId`,`FeeDeptId`,`FeeCompanyId`,`UnitId`,`Quantity`,
+    `Price`,`OAmount`,`FeeNoteShow`,`CurrId`,`SupplyOrgId`,`CurrOAmount`,`FromSourceTag`,`TaxId`,`IsCounteract`,`InvoiceId`,`TaxRate`,`CreatorId`,`TaxNo`";
+        $SQL1 .= empty($ProjectId) ? "" : ",`ProjectId`";
+        $SQL1 .= isset($FeeTypeGen) ? ",`FeeTypeGen`" : "";
+        $SQL1 .= empty($CU_MaterialId) ? "" : ",`CU_MaterialId`";
+        $SQL1 .= empty($VoucherCount) ? "" : ",`VoucherCount`";
+        $SQL1 .= isset($VoucherType) ? ",`VoucherType`" : "";
+        $SQL1 .= empty($InvoiceNo) ? "" : ",`InvoiceNo`";
+        $SQL1 .= empty($comSupplierName) ? "" : ",`comSupplierName`";
+        $SQL1 .= empty($comSupplierId) ? ",`comSupplierId`" : ",`comSupplierId`";
+
+        $SQL2 = ") VALUES ($RowCode, $rib_id, $RowCode,$FeeDate,'$FeeTypeId',2,
+    '1000','$WriteOffId','1000','$FeeDeptId','1000','$UnitId',$Quantity,
+    $Price,$OAmount,'$FeeNoteShow','$CurrId','1000',1,0,'$TaxId',$IsCounteract,'$InvoiceId',$TaxRate,'$user_id','$TaxNo'";
+        $SQL2 .= empty($ProjectId) ? "" : ",'" . $ProjectId . "'";
+        $SQL2 .= isset($FeeTypeGen) ?  "," . $FeeTypeGen : "";
+        $SQL2 .= empty($CU_MaterialId) ? "" : ",'" . $CU_MaterialId . "'";
+        $SQL2 .= empty($VoucherCount) ? "" : "," . $VoucherCount;
+        $SQL2 .= isset($VoucherType) ? "," . $VoucherType : "";
+        $SQL2 .= empty($InvoiceNo) ? "" : ",'" . $InvoiceNo . "'";
+        $SQL2 .= empty($comSupplierName) ? "" : ",'" . $comSupplierName . "'";
+        $SQL2 .= empty($comSupplierId) ? ",' '" : ",'" . $comSupplierId . "'";
+        $SQL2 .= ")";
+    }
+    $SQL1 .= $SQL2;
+    //上傳資料庫
+    mysqli_query($link, $SQL1);
+    if (mysqli_affected_rows($link)) {
+        echo '<script>alert("新增/更新 成功")</script>';
+    } else {
+        echo '<script>alert("新增/更新 失敗")</script>';
+    }
+    //更新表頭
+    $SQL1 = str_replace("'", '', $SQL1);
+    $sql_rib = "UPDATE rib SET LastOperatorId = '$user_id', LastOperation='$SQL1' WHERE rib_id=$rib_id";
+    mysqli_query($link, $sql_rib);
+
+?>
+    <script>
+        window.location.href = "rib01-check.php?id=<?php echo $rib_id ?>&state=<?= $state ?>&<?= $token_link ?>";
+    </script>
+    <?php
+} elseif ($submit == "edit") {
+    $SQL1 = "UPDATE rib_sub SET RowCode=$RowCode, RowNo=$RowCode,FeeDate=$FeeDate,FeeTypeId=$FeeTypeId,FeeDeptId=$FeeDeptId,WriteOffId='$WriteOffId',FeeNoteShow='$FeeNoteShow',
+    UnitId='$UnitId', Price=$Price,Quantity=$Quantity, OAmount=$OAmount, TaxId='$TaxId', IsCounteract=$IsCounteract,InvoiceId= '$InvoiceId', TaxRate=$TaxRate,LastOperatorId='$user_id',TaxNo='$TaxNo',LastOperatorId='$user_id'";
+    $SQL1 .= empty($ProjectId) ? "" : ",ProjectId='$ProjectId'";
+    $SQL1 .= isset($FeeTypeGen) ? ",FeeTypeGen=$FeeTypeGen" : "";
+    $SQL1 .= empty($CU_MaterialId) ? "" : ",CU_MaterialId='$CU_MaterialId'";
+    $SQL1 .= empty($VoucherCount) ? "" : ",VoucherCount=$VoucherCount";
+    $SQL1 .= isset($VoucherType) ? ",VoucherType=$VoucherType" : "";
+    $SQL1 .= empty($InvoiceNo) ? "" : ",InvoiceNo='$InvoiceNo'";
+    $SQL1 .= empty($comSupplierName) ? ",comSupplierName=' '" : ",comSupplierName='$comSupplierName'";
+    $SQL1 .= empty($comSupplierId) ? ",comSupplierId=' '" : ",comSupplierId='$comSupplierId'";
+    $SQL1 .= isset($OTax) ? ",OTax=$OTax" : "";
+    $SQL1 .= isset($LTax) ? ",LTax=$LTax" : "";
+    $SQL1 .= isset($OAmountUnWithTax) ? ",OAmountUnWithTax=$OAmountUnWithTax" : "";
+    $SQL1 .= isset($LAmountUnWithTax) ? ",LAmountUnWithTax=$LAmountUnWithTax" : "";
+    $SQL1 .= isset($LAmount) ? ",LAmount=$LAmount" : "";
+    if (($user_id == "M0056" || $user_id == "M0209") && $state == 1) {
+        $SQL1 .= ",FeeBalance=$LAmountUnWithTax";
+        $SQL1 .= ",WriteOffAmount=$OAmount";
+    }
+    $SQL1 .= " WHERE ribsub_id = $ribsub_id";
+
+    //上傳資料庫--表身
+    mysqli_query($link, $SQL1);
+    if (mysqli_affected_rows($link)) {
+        echo '<script>alert("新增/更新 成功")</script>';
+    } else {
+        echo '<script>alert("新增/更新 失敗")</script>';
+    };
+    if ($state == 1) {
+        //取得所有表身資料以更新表頭資料
+        $ribsub_query = "SELECT * FROM rib_sub WHERE rib_id = $rib_id";
+        $ribsub_data = mysqli_query($link, $ribsub_query);
+        $OAmountWithTax = 0;
+        $OTax = 0;
+        $LTax = 0;
+        $OAmount = 0;
+        $WriteOffAmount = 0;
+        $LAmount = 0;
+        $totalVoucher = 0;
+        while ($ribsub = mysqli_fetch_assoc($ribsub_data)) {
+            $OAmountWithTax += $ribsub['OAmount'];
+            $LAmount += $ribsub['LAmountUnWithTax'];
+            $OTax += $ribsub['OTax'];
+            $LTax += $ribsub['LTax'];
+            $WriteOffAmount += $ribsub['OAmount'];
+            $OAmount += $ribsub['OAmountUnWithTax'];
+            $totalVoucher += $ribsub['VoucherCount'];
+            $CurrLAmount = $ribsub['CurrentLAmount'];
+        }
+        $UnPayOAmount = $WriteOffAmount;
+        $UnPayLAmount = $UnPayOAmount * $CurrLAmount;
+        $LAmountWithTax = $OAmountWithTax * $CurrLAmount;
+        // 更新表頭資料
+        $SQL1 = str_replace("'", '', $SQL1);
+        $sql_rib = "UPDATE rib SET OAmountWithTax=$OAmountWithTax, LAmountWithTax= $LAmountWithTax, LAmount=$LAmount,OAmount =$OAmount, UnPayOAmount=$OAmountWithTax, Balance = $OAmountWithTax, LBalance= $UnPayLAmount ,UnPaymentLAmt=$UnPayLAmount, UnPayLAmount=$UnPayLAmount,OTax=$OTax, LTax=$LTax, WriteOffAmount=$WriteOffAmount, LastOperatorId='$user_id' WHERE rib_id = $rib_id";
+        mysqli_query($link, $sql_rib);
+    ?>
+        <script>
+            window.location.href = "rib01-check.php?id=<?php echo $rib_id ?>&state=<?= $state ?>&<?= $token_link ?>";
+        </script>
+    <?php
+
+
+    } else {
+        $SQL1 = str_replace("'", '', $SQL1);
+        $sql_rib = "UPDATE rib SET LastOperatorId = '$user_id', LastOperation='$SQL1' WHERE rib_id=$rib_id";
+        mysqli_query($link, $sql_rib);
+
+    ?>
+        <script>
+            window.location.href = "rib01-check.php?id=<?php echo $rib_id ?>&state=<?= $state ?>&<?= $token_link ?>";
+        </script>
+<?php
+
+    }
+}
+
 ?>
\ No newline at end of file
diff --git a/wms/rib03-download.php b/wms/rib03-download.php
index 371773ab..69b9e73c 100644
--- a/wms/rib03-download.php
+++ b/wms/rib03-download.php
@@ -1,94 +1,94 @@
-<?php
-include "./header.php";
-// Load Composer's autoloader
-// require_once 'C:\xampp\htdocs\wms\excel\vendor\autoload.php';
-require_once dirname(__DIR__) . '/common/composer/vendor/autoload.php';
-
-// use PhpOffice\PhpSpreadsheet\IOFactory;
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx as xls;
-//use PhpOffice\PhpSpreadsheet\Reader\Xls;
-use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
-// use PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf;
-
-$rib_id = $_GET['ribid'];
-$sql = "SELECT * FROM rib WHERE rib_id=$rib_id";
-$rib = mysqli_query($link, $sql);
-$rib = mysqli_fetch_assoc($rib);
-$today = "列印日期：" . date('Y-m-d');
-
-//取得部門代碼
-$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
-$deptype = $conn->query($sql_department);
-foreach ($deptype as $department) {
-    if ($department['DeptId'] == $rib['DeptId']) {
-        $dept = $department['DeptName'];
-    }
-}
-
-
-
-//取得暫存的表身資料
-$ribsub_query = "SELECT * FROM rib_sub WHERE rib_id = $rib_id";
-$ribsub_data = mysqli_query($link, $ribsub_query);
-$FeeNotes = "";
-$totalVoucher = 0;
-$count = 0;
-while ($ribsub = mysqli_fetch_assoc($ribsub_data)) {
-    $count += 1;
-    $FeeNotes .= "\n" . $count . ". ";
-    if (isset($ribsub['ProjectId']) && (isset($ribsub['CU_MaterialId']))) {
-        $FeeNotes .= "合約號：" . $ribsub['ProjectId'] . "\n    作番號：" . $ribsub['CU_MaterialId'] . "\n    ";
-    } elseif (isset($ribsub['ProjectId']) && (!isset($ribsub['CU_MaterialId']))) {
-        $FeeNotes .= "合約號：" . $ribsub['ProjectId'] . "\n    ";
-    } elseif (!isset($ribsub['ProjectId']) && (isset($ribsub['CU_MaterialId']))) {
-        $FeeNotes .= "作番號：" . $ribsub['CU_MaterialId'] . "\n    ";
-    }
-    $FeeNotes .= "費用說明：" . $ribsub['FeeNoteShow'] . "\n";
-    $totalVoucher += $ribsub['VoucherCount'];
-}
-
-//產生費用報銷單excel
-$reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
-$spreadsheet = $reader->load("reimburse-sample.xlsx");
-$sheet = $spreadsheet->getActiveSheet();
-$sheet->setCellValue('H3', $rib['BillNo']);
-$sheet->setCellValue('H5', $rib['BillDate']);
-$sheet->setCellValue('H6', $dept);
-$sheet->setCellValue('G2', $today);
-if ($rib['WriteOffType'] == 1) {
-    $sheet->setCellValue('H8', '■ 廠商   □ 員工');
-} elseif ($rib['WriteOffType'] == 2) {
-    $sheet->setCellValue('H8', '■ 員工   □ 廠商');
-}
-
-if ($rib['pay_type'] == 0) {
-    $sheet->setCellValue('H9', '  ■ 現金 
-□ 銀行轉帳 
-□ 沖帳及金額 
-（                     ） 
-預付款申請單號 
-NO.');
-} elseif ($rib['pay_type'] == 1) {
-    $sheet->setCellValue('H9', '□ 現金 
-■ 銀行轉帳 
-□ 沖帳及金額 
-（                     ） 
-預付款申請單號 
-NO.');
-}
-$WriteOffAmount = $rib['WriteOffAmount'];
-
-
-$sheet->setCellValue('H10', $WriteOffAmount);
-$sheet->setCellValue('H11', $totalVoucher);
-$sheet->setCellValue('G13', $FeeNotes);
-
-$writer = new Xls($spreadsheet);
-$file_path = dirname(__DIR__) . '/wms/WriteOff.xlsx';
-$writer->save('WriteOff.xlsx');
-// $file_path = 'C:/xampp/htdocs/wms/WriteOff.xlsx';
-// $spreadsheet= IOFactory::load('WriteOff.xlsx');
-// $pdfWriter = new Mpdf($spreadsheet);
-// $pdfWriter->save('WriteOff2.pdf');
-echo $file_path;
+<?php
+include "./header.php";
+// Load Composer's autoloader
+// require_once 'C:\xampp\htdocs\wms\excel\vendor\autoload.php';
+require_once dirname(__DIR__) . '/common/composer/vendor/autoload.php';
+
+// use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx as xls;
+//use PhpOffice\PhpSpreadsheet\Reader\Xls;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+// use PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf;
+
+$rib_id = $_GET['ribid'];
+$sql = "SELECT * FROM rib WHERE rib_id=$rib_id";
+$rib = mysqli_query($link, $sql);
+$rib = mysqli_fetch_assoc($rib);
+$today = "列印日期：" . date('Y-m-d');
+
+//取得部門代碼
+$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
+$deptype = $conn->query($sql_department);
+foreach ($deptype as $department) {
+    if ($department['DeptId'] == $rib['DeptId']) {
+        $dept = $department['DeptName'];
+    }
+}
+
+
+
+//取得暫存的表身資料
+$ribsub_query = "SELECT * FROM rib_sub WHERE rib_id = $rib_id";
+$ribsub_data = mysqli_query($link, $ribsub_query);
+$FeeNotes = "";
+$totalVoucher = 0;
+$count = 0;
+while ($ribsub = mysqli_fetch_assoc($ribsub_data)) {
+    $count += 1;
+    $FeeNotes .= "\n" . $count . ". ";
+    if (isset($ribsub['ProjectId']) && (isset($ribsub['CU_MaterialId']))) {
+        $FeeNotes .= "合約號：" . $ribsub['ProjectId'] . "\n    作番號：" . $ribsub['CU_MaterialId'] . "\n    ";
+    } elseif (isset($ribsub['ProjectId']) && (!isset($ribsub['CU_MaterialId']))) {
+        $FeeNotes .= "合約號：" . $ribsub['ProjectId'] . "\n    ";
+    } elseif (!isset($ribsub['ProjectId']) && (isset($ribsub['CU_MaterialId']))) {
+        $FeeNotes .= "作番號：" . $ribsub['CU_MaterialId'] . "\n    ";
+    }
+    $FeeNotes .= "費用說明：" . $ribsub['FeeNoteShow'] . "\n";
+    $totalVoucher += $ribsub['VoucherCount'];
+}
+
+//產生費用報銷單excel
+$reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
+$spreadsheet = $reader->load("reimburse-sample.xlsx");
+$sheet = $spreadsheet->getActiveSheet();
+$sheet->setCellValue('H3', $rib['BillNo']);
+$sheet->setCellValue('H5', $rib['BillDate']);
+$sheet->setCellValue('H6', $dept);
+$sheet->setCellValue('G2', $today);
+if ($rib['WriteOffType'] == 1) {
+    $sheet->setCellValue('H8', '■ 廠商   □ 員工');
+} elseif ($rib['WriteOffType'] == 2) {
+    $sheet->setCellValue('H8', '■ 員工   □ 廠商');
+}
+
+if ($rib['pay_type'] == 0) {
+    $sheet->setCellValue('H9', '  ■ 現金 
+□ 銀行轉帳 
+□ 沖帳及金額 
+（                     ） 
+預付款申請單號 
+NO.');
+} elseif ($rib['pay_type'] == 1) {
+    $sheet->setCellValue('H9', '□ 現金 
+■ 銀行轉帳 
+□ 沖帳及金額 
+（                     ） 
+預付款申請單號 
+NO.');
+}
+$WriteOffAmount = $rib['WriteOffAmount'];
+
+
+$sheet->setCellValue('H10', $WriteOffAmount);
+$sheet->setCellValue('H11', $totalVoucher);
+$sheet->setCellValue('G13', $FeeNotes);
+
+$writer = new Xls($spreadsheet);
+$file_path = dirname(__DIR__) . '/wms/WriteOff.xlsx';
+$writer->save('WriteOff.xlsx');
+// $file_path = 'C:/xampp/htdocs/wms/WriteOff.xlsx';
+// $spreadsheet= IOFactory::load('WriteOff.xlsx');
+// $pdfWriter = new Mpdf($spreadsheet);
+// $pdfWriter->save('WriteOff2.pdf');
+echo $file_path;
diff --git a/wms/rib03-submit.php b/wms/rib03-submit.php
index bbc05b82..a2ead34a 100644
--- a/wms/rib03-submit.php
+++ b/wms/rib03-submit.php
@@ -1,399 +1,399 @@
-<?php
-include "./header.php";
-// Load Composer's autoloader
-// require_once 'C:\xampp\htdocs\wms\excel\vendor\autoload.php';
-require_once dirname(__DIR__) . '/common/composer/vendor/autoload.php';
-
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx as xls;
-//use PhpOffice\PhpSpreadsheet\Reader\Xls;
-use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
-
-$rib_id = isset($_GET['id']) ? $_GET['id'] : die('ERROR:Rib_id is not found.');
-$state = isset($_GET['state']) ? $_GET['state'] : die('ERROR: state is not found');
-if ($state == 1) {
-    // 要寫到費用報銷單的資料
-    $totalVoucher = 0;
-    $FeeNotes = "";
-
-    //取得暫存的表頭資料
-    $rib_query = "SELECT * FROM rib WHERE rib_id = $rib_id";
-    $rib = mysqli_query($link, $rib_query);
-    $rib = mysqli_fetch_assoc($rib);
-    $OAmountWithTax = 0;
-    //取得部門代碼
-    $sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
-    $deptype = $conn->query($sql_department);
-    foreach ($deptype as $department) {
-        if ($department['DeptId'] == $rib['DeptId']) {
-            $dept = $department['DeptName'];
-        }
-    }
-
-
-
-    // 爬蟲--匯率
-    function htmlContentGet($url)
-    {
-        $opts = [
-            "http" => [
-                "method" => "GET",
-                "header" => "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36\r\n"
-            ]
-        ];
-
-        return file_get_contents($url, false, stream_context_create($opts));
-    }
-
-    $week = date("w");
-    $currency_day = date("Y-m-d", strtotime("-1 day"));
-    if ($week == 1) {
-        $currency_day = date("Y-m-d", strtotime("-3 day"));
-    } elseif ($week == 0) {
-        $currency_day = date("Y-m-d", strtotime("-2 day"));
-    }
-    $X = htmlContentGet('https://rate.bot.com.tw/xrt/all/' . $currency_day);
-    $string = strip_tags($X); // 先清掉 html tag, 以免 html tag 被破壞
-    //美金 
-    $USD = explode(' ', stristr($string, '美金'))[298];
-    //人民幣 
-    $RMB = explode(' ', stristr($string, '人民幣'))[298];
-    //歐元
-    $EUR = explode(' ', stristr($string, '歐元'))[298];
-    //港幣
-    $HKD = explode(' ', stristr($string, '港幣'))[298];
-
-    //整理要變更的數據 -表身
-    $CurrLAmount = 1;
-    if ($rib['CurrId'] == "CNY") {
-        $CurrLAmount = $RMB;
-    } elseif ($rib['CurrId'] == "EUR") {
-        $CurrLAmount = $EUR;
-    } elseif ($rib['CurrId'] == "HKD") {
-        $CurrLAmount = $HKD;
-    } elseif ($rib['CurrId'] == "USD") {
-        $CurrLAmount = $USD;
-    }
-
-    //取得暫存的表身資料
-    $ribsub_query = "SELECT * FROM rib_sub WHERE rib_id = $rib_id";
-    $ribsub_data = mysqli_query($link, $ribsub_query);
-    $OTax = 0;
-    $LTax = 0;
-    $OAmount = 0;
-    $IsCounteract = 0;
-    $WriteOffAmount = 0;
-    $count = 0;
-    while ($ribsub = mysqli_fetch_assoc($ribsub_data)) {
-        $count += 1;
-        $OAmountWithTax += $ribsub['OAmount'];
-        $LAmount = $rib['CurrId']=="TWD"? round($ribsub['OAmount'] * $CurrLAmount):round($ribsub['OAmount'] * $CurrLAmount,2);
-        $OAmountUnWithTax = $rib['CurrId']=="TWD"? round($ribsub['OAmount'] / (1 + $ribsub['TaxRate'])):round($ribsub['OAmount'] / (1 + $ribsub['TaxRate']),2);
-        $LAmountUnWithTax = $rib['CurrId']=="TWD"?round($OAmountUnWithTax * $CurrLAmount):round($OAmountUnWithTax * $CurrLAmount,2);
-        $sub_WriteOffAmount = $rib['CurrId']=="TWD"? round($ribsub['OAmount']):round($ribsub['OAmount'],2);
-        $sub_OTax = $rib['CurrId']=="TWD"? round(($ribsub['OAmount'] - $OAmountUnWithTax)):round(($ribsub['OAmount'] - $OAmountUnWithTax),2);
-        $OTax += $sub_OTax;
-        $sub_LTax = $rib['CurrId']=="TWD"? round(($LAmount - $LAmountUnWithTax)):round(($LAmount - $LAmountUnWithTax),2);
-        $LTax += $sub_LTax;
-        $WriteOffAmount += $ribsub['OAmount'];
-        $OAmount += $OAmountUnWithTax;
-        $ribsub_id = $ribsub['ribsub_id'];
-        $FeeNotes .= "\n" . $count . ". ";
-        if (isset($ribsub['ProjectId']) && (isset($ribsub['CU_MaterialId']))) {
-            $FeeNotes .= "合約號：" . $ribsub['ProjectId'] . "\n    作番號：" . $ribsub['CU_MaterialId'] . "\n    ";
-        } elseif (isset($ribsub['ProjectId']) && (!isset($ribsub['CU_MaterialId']))) {
-            $FeeNotes .= "合約號：" . $ribsub['ProjectId'] . "\n    ";
-        } elseif (!isset($ribsub['ProjectId']) && (isset($ribsub['CU_MaterialId']))) {
-            $FeeNotes .= "作番號：" . $ribsub['CU_MaterialId'] . "\n    ";
-        }
-        $FeeNotes .= "費用說明：" . $ribsub['FeeNoteShow'] . "\n";
-        if ($ribsub['TaxId'] == "ST005" || $ribsub['TaxId'] == "ST101") {
-            $IsCounteract = 1;
-        }
-        $totalVoucher += $ribsub['VoucherCount'];
-
-        $sql_sub = "UPDATE rib_sub SET CurrentLAmount=$CurrLAmount,OAmountUnWithTax=$OAmountUnWithTax,
-     LAmountUnWithTax=$LAmountUnWithTax, FeeBalance=$LAmountUnWithTax,LAmount=$LAmount, OTax=$sub_OTax, 
-     LTax=$sub_LTax, WriteOffAmount=$sub_WriteOffAmount   WHERE ribsub_id = $ribsub_id";
-        // 上傳資料庫__表身
-        mysqli_query($link, $sql_sub);
-    }
-    $UnPayOAmount = $WriteOffAmount;
-    $UnPayLAmount = $UnPayOAmount * $CurrLAmount;
-    $LAmountWithTax = $OAmountWithTax * $CurrLAmount;
-    $LAmount = $OAmount * $CurrLAmount;
-
-    // 更新表頭資料
-    $BillDate = intval(date('Ymd'));
-    $sql_rib = "UPDATE rib SET BillDate=$BillDate,CurrentState=1,PermitState=0, OAmountWithTax=$OAmountWithTax, LAmountWithTax= $LAmountWithTax, LAmount=$LAmount,
-OAmount =$OAmount, UnPayOAmount=$UnPayOAmount, Balance = $OAmountWithTax, LBalance= $UnPayLAmount ,UnPaymentLAmt=$UnPayLAmount,
- UnPayLAmount=$UnPayLAmount, OTax=$OTax, LTax=$LTax, WriteOffAmount=$WriteOffAmount, CreatorId='$user_id' WHERE rib_id = $rib_id";
-
-    mysqli_query($link, $sql_rib);
-    if (mysqli_affected_rows($link) > 0) {
-        echo '<script>alert("已進入審核流程")</script>';
-    } else {
-        echo $sql_rib;
-        echo '<script>alert("操作失敗")</script>';
-    }
-    //紀錄繳交資料
-    $SQL1 = str_replace("'", '', $sql_rib);
-    $sql_submit = "UPDATE rib SET UserSubmit='$SQL1' WHERE rib_id=$rib_id";
-    mysqli_query($link, $sql_submit);
-
-
-    //產生費用報銷單excel
-    $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
-    $spreadsheet = $reader->load("reimburse-sample.xlsx");
-    $printday = date("Y-m-d");
-    $print = "列印日期：" . $printday;
-    $sheet = $spreadsheet->getActiveSheet();
-    $sheet->setCellValue('H3', $rib['BillNo']);
-    $sheet->setCellValue('H5', $rib['BillDate']);
-    $sheet->setCellValue('H6', $dept);
-    $sheet->setCellValue('G2', $print);
-    if ($rib['WriteOffType'] == 1) {
-        $sheet->setCellValue('H8', '■ 廠商   □ 員工');
-    } elseif ($rib['WriteOffType'] == 2) {
-        $sheet->setCellValue('H8', '■ 員工   □ 廠商');
-    }
-
-    if ($rib['pay_type'] == 0) {
-        $sheet->setCellValue('H9', '  ■ 現金 
-    □ 銀行轉帳 
-    □ 沖帳及金額 
-    （                     ） 
-    預付款申請單號 
-    NO.');
-    } elseif ($rib['pay_type'] == 1) {
-        $sheet->setCellValue('H9', '□ 現金 
-    ■ 銀行轉帳 
-    □ 沖帳及金額 
-    （                     ） 
-    預付款申請單號 
-    NO.');
-    }
-    $sheet->setCellValue('H10', $WriteOffAmount);
-    $sheet->setCellValue('H11', $totalVoucher);
-    $sheet->setCellValue('G13', $FeeNotes);
-
-    $writer = new Xls($spreadsheet);
-    $writer->save('WriteOff.xlsx');
-?>
-    <script>
-        var link = document.createElement('a');
-        console.log(window.location.origin + "/wms/WriteOff.xlsx");
-        link.setAttribute('href', window.location.origin + "/wms/WriteOff.xlsx");
-        link.setAttribute('download', '費用報銷單.xlsx');
-        link.style.display = 'none';
-        document.body.appendChild(link);
-        link.click();
-        document.body.removeChild(link);
-    </script>
-<?php
-    $content = "需要審核的費用報銷單為：";
-    $notice_rib_sql = "SELECT BillNo FROM rib WHERE CurrentState = 1";
-    $notice_rib = mysqli_query($link, $notice_rib_sql);
-    foreach ($notice_rib as $notice_content) {
-        $name = $notice_content['BillNo'];
-        $content .= "$name" . "、";
-    }
-    $notice_rib_num = mysqli_num_rows($notice_rib);
-    $notice_rib = mysqli_fetch_row($notice_rib);
-    $title = "有" . $notice_rib_num . "個費用報銷單待審核";
-    $insert_notice_sql = "UPDATE notice SET title= '$title', content='$content',haveread=NULL WHERE id=1654";
-    mysqli_query($link, $insert_notice_sql);
-    $insert_notice_sql = "UPDATE notice SET title= '$title', content='$content',haveread=NULL WHERE id=1959";
-    mysqli_query($link, $insert_notice_sql);
-} elseif ($state == 2) {
-    //取得表頭資料
-    $rib_query = "SELECT * FROM rib WHERE rib_id = $rib_id";
-    $rib = mysqli_query($link, $rib_query);
-    $rib = mysqli_fetch_assoc($rib);
-
-    $BillNo = $rib['BillNo'];
-    //連線T8資料庫 
-
-    // // 表頭
-    $BillDate = $rib['BillDate'];
-    $TypeId = $rib['TypeId'];
-    $CurrId = ($rib['CurrId'] == "CNY") ? "RMB" : $rib['CurrId'];
-    $TransactId = $rib['TransactId'];
-    $WriteOffType = $rib['WriteOffType'];
-    $WriteOffId = $rib['WriteOffId'];
-    $WriteOffDescribe = empty($rib['WriteOffDescribe']) ? null : $rib['WriteOffDescribe'];
-    $DeptId = $rib['DeptId'];
-    $CostCenterId = empty($rib['CostCenterId']) ? Null : $rib['CostCenterId'];
-    $HadPayOAmount = $CurrId=="TWD"? round($rib['HadPayOAmount']):round($rib['HadPayOAmount'],2);
-    $HadPayLAmount = $CurrId=="TWD"? round($rib['HadPayLAmount']):round($rib['HadPayLAmount'],2);
-    $UnPayOAmount = $CurrId=="TWD"? round($rib['UnPayOAmount']):round($rib['UnPayOAmount'],2);
-    $UnPayLAmount = $CurrId=="TWD"? round($rib['UnPayLAmount']):round($rib['UnPayLAmount'],2);
-    $PaymentState = $rib['PaymentState'];
-    $Balance = $CurrId=="TWD"? round($rib['Balance']):round($rib['Balance'],2);
-    $LBalance = $CurrId=="TWD"? round($rib['LBalance']):round($rib['LBalance'],2);
-    $GatheringPersonId = $rib['GatheringPersonId'];
-    $GatheringPersonDescribe = empty($rib['GatheringPersonDescribe']) ? Null : $rib['GatheringPersonDescribe'];
-    $BankId = empty($rib['BankId']) ? Null : $rib['BankId'];
-    $BankName = empty($rib['BankName']) ? Null : $rib['BankName'];
-    if (isset($BankId) && isset($BankName)) {
-        $totalBankName = $BankId . $BankName;
-    }
-    $BankAccount = empty($rib['BankAccount']) ? Null : $rib['BankAccount'];
-    $BankAccountName = empty($rib['BankAccountName']) ? Null : $rib['BankAccountName'];
-    $IsTaxBill = $rib['IsTaxBill'];
-    $OAmount = $CurrId=="TWD"? round($rib['OAmount']):round($rib['OAmount'],2);
-    $LAmount = $CurrId=="TWD"? round($rib['LAmount']):round($rib['LAmount'],2);
-    $OTax = $CurrId=="TWD"? round($rib['OTax']):round($rib['OTax'],2);
-    $LTax = $CurrId=="TWD"? round($rib['LTax']):round($rib['LTax'],2);
-    $LAmountWithTax = $CurrId=="TWD"? round($rib['LAmountWithTax']):round($rib['LAmountWithTax'],2);
-    $OAmountWithTax = $CurrId=="TWD"? round($rib['OAmountWithTax']):round($rib['OAmountWithTax'],2);
-    $IsContainTax = $rib['IsContainTax'];
-    $AdvanceOAmount = $CurrId=="TWD"? round($rib['AdvanceOAmount']):round($rib['AdvanceOAmount'],2);
-    $AdvanceLAmount = $CurrId=="TWD"? round($rib['AdvanceLAmount']):round($rib['AdvanceLAmount'],2);
-    $PrePayWriteOffAmount = $rib['PrePayWriteOffAmount'];
-    $WriteOffAmount = $CurrId=="TWD"? round($rib['WriteOffAmount']):round($rib['WriteOffAmount'],2);
-    $TelNo = empty($rib['TelNo']) ? Null : $rib['TelNo'];
-    $UnPaymentLAmt = empty($rib['UnPaymentLAmt']) ? null : ($CurrId=="TWD"? round($rib['UnPaymentLAmt']):round($rib['UnPaymentLAmt'],2));
-    $CreatorId = $rib['CreatorId'];
-
-
-    $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-    $sql = "INSERT INTO glFeeWriteOff(BillNo, BillDate, OrgId,FOrgId,TypeId,PayOrgId,
-            CurrId,TransactId,WriteOffType,BizOrgId,WriteOffId,DeptId,
-            HadPayOAmount,HadPayLAmount,UnPayOAmount,UnPayLAmount,PaymentState,Balance,LBalance,
-            FillUp,GatheringBizOrgId, GatheringPersonId, IsTaxBill, OAmount,LAmount,OTax,LTax,LAmountWithTax,OAmountWithTax,
-            IsContainTax,AdvanceOAmount,AdvanceLAmount,PrePayWriteOffAmount,WriteOffAmount,
-            CompId,UnPaymentOAmt,UnPaymentLAmt,IsPayment, CurrentState,PermitState,CreatorId";
-
-    $sql2 = ") VALUES ('$BillNo',$BillDate,'1000','1000','$TypeId','1000',
-            '$CurrId','$TransactId',$WriteOffType,'1000','$WriteOffId','$DeptId',
-            $HadPayOAmount,$HadPayLAmount,$UnPayOAmount,$UnPayLAmount,$PaymentState,$Balance,$LBalance,
-            0,'1000','$GatheringPersonId',$IsTaxBill,$OAmount,$LAmount,$OTax,$LTax,$LAmountWithTax,$OAmountWithTax,
-            $IsContainTax,$AdvanceOAmount,$AdvanceLAmount,$PrePayWriteOffAmount,$WriteOffAmount,
-            '1001',$WriteOffAmount,$UnPaymentLAmt,0,2,0,'$CreatorId'";
-
-    $sql .= empty($CostCenterId) ? "" : ",CostCenterId";
-    $sql2 .= empty($CostCenterId) ? "" : ",'" . $CostCenterId . "'";
-    $sql .= empty($WriteOffDescribe) ? "" : ",WriteOffDescribe";
-    $sql2 .= empty($WriteOffDescribe) ? "" : ",'" . $WriteOffDescribe . "'";
-    $sql .= empty($GatheringPersonDescribe) ? "" : ",GatheringPersonDescribe";
-    $sql2 .= empty($GatheringPersonDescribe) ? "" : ",'" . $GatheringPersonDescribe . "'";
-    $sql .= empty($totalBankName) ? "" : ",BankName";
-    $sql2 .= empty($totalBankName) ? "" : ",'" . $totalBankName . "'";
-    $sql .= empty($BankAccount) ? "" : ",BankAccount";
-    $sql2 .= empty($BankAccount) ? "" : ",'" . $BankAccount . "'";
-    $sql .= empty($BankAccountName) ? "" : ",BankAccountName";
-    $sql2 .= empty($BankAccountName) ? "" : ",'" . $BankAccountName . "'";
-    $sql .= empty($TelNo) ? "" : ",TelNo";
-    $sql2 .= empty($TelNo) ? "" : ",'" . $TelNo . "'";
-
-    $sql .= $sql2;
-    $sql .= ")";
-    $result = $conn->query($sql);
-    // 更改WMS RIB狀態
-    $rib_sql = "UPDATE rib SET BillNo='$BillNo',CurrentState=2, PermitState=0 WHERE rib_id =$rib_id";
-    mysqli_query($link, $rib_sql);
-
-    //取得表身資料
-    $ribsub_query = "SELECT * FROM rib_sub WHERE rib_id = $rib_id";
-    $ribsub_data = mysqli_query($link, $ribsub_query);
-    $RowCode = 0;
-    while ($ribsub = mysqli_fetch_assoc($ribsub_data)) {
-        $RowCode += 1;
-        $RowNo = $ribsub['RowNo'];
-        $FeeDate = $ribsub['FeeDate'];
-        $FeeTypeId = $ribsub['FeeTypeId'];
-        $WriteOffType = $ribsub['WriteOffType'];
-        $WriteOffId = $ribsub['WriteOffId'];
-        $WriteOffDescribe = empty($ribsub['WriteOffDescribe']) ? Null : $ribsub['WriteOffDescribe'];
-        $FeeDeptId = $ribsub['FeeDeptId'];
-        $CostCenterId = empty($ribsub['CostCenterId']) ? Null : $ribsub['CostCenterId'];
-        $UnitId = $ribsub['UnitId'];
-        $Quantity = $ribsub['Quantity'];
-        $Price = $CurrId=="TWD"? round($ribsub['Price']) : round($ribsub['Price'],2);
-        $CurrOAmount = $CurrId=="TWD"? round($ribsub['CurrOAmount']) : round($ribsub['CurrOAmount'],2);
-        $CurrLAmount = $CurrId=="TWD"? round($ribsub['CurrentLAmount']): round($ribsub['CurrentLAmount'],2);
-        $TaxId = $ribsub['TaxId'];
-        $TaxRate = $ribsub['TaxRate'];
-        $OTax = $CurrId=="TWD"? round($ribsub['OTax']): round($ribsub['OTax'],2);
-        $LTax = $CurrId=="TWD"? round($ribsub['LTax']): round($ribsub['LTax'],2);
-        $LAmountUnWithTax = $CurrId=="TWD"? round($ribsub['LAmountUnWithTax']): round($ribsub['LAmountUnWithTax'],2);
-        $OAmountUnWithTax = $CurrId=="TWD"? round($ribsub['OAmountUnWithTax']): round($ribsub['OAmountUnWithTax'],2);
-        $OAmount = $CurrId=="TWD"? round($ribsub['OAmount']): round($ribsub['OAmount'],2);
-        $LAmount = $CurrId=="TWD"? round($ribsub['LAmount']): round($ribsub['LAmount'],2);
-        $FeeBalance = $CurrId=="TWD"? round($ribsub['FeeBalance']): round($ribsub['FeeBalance'],2);
-        $VoucherCount = $ribsub['VoucherCount'];
-
-        $FeeNoteShow = empty($ribsub['FeeNoteShow']) ? Null : $ribsub['FeeNoteShow'];
-        $ProjectId = empty($ribsub['ProjectId']) ? null : $ribsub['ProjectId'];
-        $InvoiceNo = empty($ribsub['InvoiceNo']) ? null : $ribsub['InvoiceNo'];
-        $InvoiceNo = trim($InvoiceNo);
-        $InvoiceNo = str_replace('-', '', $InvoiceNo);
-        $comSupplierId = empty($ribsub['comSupplierId']) ? null : $ribsub['comSupplierId'];
-        $VoucherType = empty($ribsub['VoucherType']) ? null : $ribsub['VoucherType'];
-        $InvoiceId = empty($ribsub['InvoiceId']) ? null : $ribsub['InvoiceId'];
-        $CurrId = ($ribsub['CurrId'] == "CNY") ? "RMB" : $rib['CurrId'];
-        $WriteOffAmount = $ribsub['WriteOffAmount'];
-        $IsCounteract = $ribsub['IsCounteract'];
-        $CU_MaterialId = empty($ribsub['CU_MaterialId']) ? null : $ribsub['CU_MaterialId'];
-        $TaxNo = empty($ribsub['TaxNo']) ? null : $ribsub['TaxNo'];
-        $CreatorId = $ribsub['CreatorId'];
-
-        $sqlsub = "INSERT INTO glFeeWriteOffSub (BillNo, RowCode,RowNo,FeeDate,FeeTypeId, WriteOffType,
-            BizOrgId, WriteOffId, FeeOrgId, FeeDeptId, FeeCompanyId, UnitId ,
-             Quantity, Price, CurrOAmount,CurrLAmount,TaxId,TaxRate,OTax,LTax,LAmountUnWithTax
-             ,OAmountUnWithTax,OAmount,LAmount,FeeBalance,VoucherCount,CurrId,WriteOffAmount,SupplyOrgId,IsCounteract,IsKeyByFeeInfo
-             ";
-
-        $sqlsub2 = ") VALUES ('$BillNo',$RowCode, $RowNo,$FeeDate,'$FeeTypeId',$WriteOffType,
-            '1000','$WriteOffId','1000','$FeeDeptId','1000','$UnitId',
-            $Quantity, $Price, $CurrOAmount, $CurrLAmount,'$TaxId',$TaxRate,$OTax,$LTax,$LAmountUnWithTax
-            ,$OAmountUnWithTax,$OAmount,$LAmount,$FeeBalance,$VoucherCount,'$CurrId',$WriteOffAmount,'1000',$IsCounteract,0
-            ";
-
-        $sqlsub .= empty($WriteOffDescribe) ? "" : ",WriteOffDescribe";
-        $sqlsub2 .= empty($WriteOffDescribe) ? "" : ",'" . $WriteOffDescribe . "'";
-        $sqlsub .= empty($CostCenterId) ? "" : ",CostCenterId";
-        $sqlsub2 .= empty($CostCenterId) ? "" : ",'" . $CostCenterId . "'";
-        $sqlsub .= empty($FeeNoteShow) ? "" : ",FeeNoteShow";
-        $sqlsub2 .= empty($FeeNoteShow) ? "" : ",'" . $FeeNoteShow . "'";
-        $sqlsub .= empty($ProjectId) ? "" : ",ProjectId";
-        $sqlsub2 .= empty($ProjectId) ? "" : ",'" . $ProjectId . "'";
-        $sqlsub .= empty($InvoiceNo) ? "" : ",InvoiceNo";
-        $sqlsub2 .= empty($InvoiceNo) ? "" : ",'" . $InvoiceNo . "'";
-        $sqlsub .= empty($CU_MaterialId) ? "" : ",CU_MaterialId";
-        $sqlsub2 .= empty($CU_MaterialId) ? "" : ",'" . $CU_MaterialId . "'";
-        $sqlsub .= empty($comSupplierId) ? "" : ",comSupplierId";
-        $sqlsub2 .= empty($comSupplierId) ? "" : ",'" . $comSupplierId . "'";
-        $sqlsub .= empty($VoucherType) ? "" : ",VoucherType";
-        $sqlsub2 .= empty($VoucherType) ? "" : ",'" . $VoucherType . "'";
-        $sqlsub .= empty($InvoiceId) ? "" : ",InvoiceId";
-        $sqlsub2 .= empty($InvoiceId) ? "" : ",'" . $InvoiceId . "'";
-        $sqlsub .= empty($TaxNo) ? "" : ",TaxNo";
-        $sqlsub2 .= empty($TaxNo) ? "" : ",'" . $TaxNo . "'";
-
-
-        $sqlsub .= $sqlsub2;
-        $sqlsub .= ")";
-        $result2 = $conn->query($sqlsub);
-    }
-
-    $content = "需要審核的費用報銷單為：";
-    $notice_rib_sql = "SELECT BillNo FROM rib WHERE CurrentState = 1";
-    $notice_rib = mysqli_query($link, $notice_rib_sql);
-    foreach ($notice_rib as $notice_content) {
-        $name = $notice_content['BillNo'];
-        $content .= "$name" . "、";
-    }
-    $notice_rib_num = mysqli_num_rows($notice_rib);
-    $notice_rib = mysqli_fetch_row($notice_rib);
-    $title = "有" . $notice_rib_num . "個費用報銷單待審核";
-    $insert_notice_sql = "UPDATE notice SET title= '$title', content='$content',haveread=NULL WHERE id=1654";
-    mysqli_query($link, $insert_notice_sql);
-    $insert_notice_sql = "UPDATE notice SET title= '$title', content='$content',haveread=NULL WHERE id=1959";
-    mysqli_query($link, $insert_notice_sql);
-}
-?>
-<script>
-    window.location.href = "rib01-index.php?<?= $token_link ?>";
+<?php
+include "./header.php";
+// Load Composer's autoloader
+// require_once 'C:\xampp\htdocs\wms\excel\vendor\autoload.php';
+require_once dirname(__DIR__) . '/common/composer/vendor/autoload.php';
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx as xls;
+//use PhpOffice\PhpSpreadsheet\Reader\Xls;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+$rib_id = isset($_GET['id']) ? $_GET['id'] : die('ERROR:Rib_id is not found.');
+$state = isset($_GET['state']) ? $_GET['state'] : die('ERROR: state is not found');
+if ($state == 1) {
+    // 要寫到費用報銷單的資料
+    $totalVoucher = 0;
+    $FeeNotes = "";
+
+    //取得暫存的表頭資料
+    $rib_query = "SELECT * FROM rib WHERE rib_id = $rib_id";
+    $rib = mysqli_query($link, $rib_query);
+    $rib = mysqli_fetch_assoc($rib);
+    $OAmountWithTax = 0;
+    //取得部門代碼
+    $sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
+    $deptype = $conn->query($sql_department);
+    foreach ($deptype as $department) {
+        if ($department['DeptId'] == $rib['DeptId']) {
+            $dept = $department['DeptName'];
+        }
+    }
+
+
+
+    // 爬蟲--匯率
+    function htmlContentGet($url)
+    {
+        $opts = [
+            "http" => [
+                "method" => "GET",
+                "header" => "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36\r\n"
+            ]
+        ];
+
+        return file_get_contents($url, false, stream_context_create($opts));
+    }
+
+    $week = date("w");
+    $currency_day = date("Y-m-d", strtotime("-1 day"));
+    if ($week == 1) {
+        $currency_day = date("Y-m-d", strtotime("-3 day"));
+    } elseif ($week == 0) {
+        $currency_day = date("Y-m-d", strtotime("-2 day"));
+    }
+    $X = htmlContentGet('https://rate.bot.com.tw/xrt/all/' . $currency_day);
+    $string = strip_tags($X); // 先清掉 html tag, 以免 html tag 被破壞
+    //美金 
+    $USD = explode(' ', stristr($string, '美金'))[298];
+    //人民幣 
+    $RMB = explode(' ', stristr($string, '人民幣'))[298];
+    //歐元
+    $EUR = explode(' ', stristr($string, '歐元'))[298];
+    //港幣
+    $HKD = explode(' ', stristr($string, '港幣'))[298];
+
+    //整理要變更的數據 -表身
+    $CurrLAmount = 1;
+    if ($rib['CurrId'] == "CNY") {
+        $CurrLAmount = $RMB;
+    } elseif ($rib['CurrId'] == "EUR") {
+        $CurrLAmount = $EUR;
+    } elseif ($rib['CurrId'] == "HKD") {
+        $CurrLAmount = $HKD;
+    } elseif ($rib['CurrId'] == "USD") {
+        $CurrLAmount = $USD;
+    }
+
+    //取得暫存的表身資料
+    $ribsub_query = "SELECT * FROM rib_sub WHERE rib_id = $rib_id";
+    $ribsub_data = mysqli_query($link, $ribsub_query);
+    $OTax = 0;
+    $LTax = 0;
+    $OAmount = 0;
+    $IsCounteract = 0;
+    $WriteOffAmount = 0;
+    $count = 0;
+    while ($ribsub = mysqli_fetch_assoc($ribsub_data)) {
+        $count += 1;
+        $OAmountWithTax += $ribsub['OAmount'];
+        $LAmount = $rib['CurrId']=="TWD"? round($ribsub['OAmount'] * $CurrLAmount):round($ribsub['OAmount'] * $CurrLAmount,2);
+        $OAmountUnWithTax = $rib['CurrId']=="TWD"? round($ribsub['OAmount'] / (1 + $ribsub['TaxRate'])):round($ribsub['OAmount'] / (1 + $ribsub['TaxRate']),2);
+        $LAmountUnWithTax = $rib['CurrId']=="TWD"?round($OAmountUnWithTax * $CurrLAmount):round($OAmountUnWithTax * $CurrLAmount,2);
+        $sub_WriteOffAmount = $rib['CurrId']=="TWD"? round($ribsub['OAmount']):round($ribsub['OAmount'],2);
+        $sub_OTax = $rib['CurrId']=="TWD"? round(($ribsub['OAmount'] - $OAmountUnWithTax)):round(($ribsub['OAmount'] - $OAmountUnWithTax),2);
+        $OTax += $sub_OTax;
+        $sub_LTax = $rib['CurrId']=="TWD"? round(($LAmount - $LAmountUnWithTax)):round(($LAmount - $LAmountUnWithTax),2);
+        $LTax += $sub_LTax;
+        $WriteOffAmount += $ribsub['OAmount'];
+        $OAmount += $OAmountUnWithTax;
+        $ribsub_id = $ribsub['ribsub_id'];
+        $FeeNotes .= "\n" . $count . ". ";
+        if (isset($ribsub['ProjectId']) && (isset($ribsub['CU_MaterialId']))) {
+            $FeeNotes .= "合約號：" . $ribsub['ProjectId'] . "\n    作番號：" . $ribsub['CU_MaterialId'] . "\n    ";
+        } elseif (isset($ribsub['ProjectId']) && (!isset($ribsub['CU_MaterialId']))) {
+            $FeeNotes .= "合約號：" . $ribsub['ProjectId'] . "\n    ";
+        } elseif (!isset($ribsub['ProjectId']) && (isset($ribsub['CU_MaterialId']))) {
+            $FeeNotes .= "作番號：" . $ribsub['CU_MaterialId'] . "\n    ";
+        }
+        $FeeNotes .= "費用說明：" . $ribsub['FeeNoteShow'] . "\n";
+        if ($ribsub['TaxId'] == "ST005" || $ribsub['TaxId'] == "ST101") {
+            $IsCounteract = 1;
+        }
+        $totalVoucher += $ribsub['VoucherCount'];
+
+        $sql_sub = "UPDATE rib_sub SET CurrentLAmount=$CurrLAmount,OAmountUnWithTax=$OAmountUnWithTax,
+     LAmountUnWithTax=$LAmountUnWithTax, FeeBalance=$LAmountUnWithTax,LAmount=$LAmount, OTax=$sub_OTax, 
+     LTax=$sub_LTax, WriteOffAmount=$sub_WriteOffAmount   WHERE ribsub_id = $ribsub_id";
+        // 上傳資料庫__表身
+        mysqli_query($link, $sql_sub);
+    }
+    $UnPayOAmount = $WriteOffAmount;
+    $UnPayLAmount = $UnPayOAmount * $CurrLAmount;
+    $LAmountWithTax = $OAmountWithTax * $CurrLAmount;
+    $LAmount = $OAmount * $CurrLAmount;
+
+    // 更新表頭資料
+    $BillDate = intval(date('Ymd'));
+    $sql_rib = "UPDATE rib SET BillDate=$BillDate,CurrentState=1,PermitState=0, OAmountWithTax=$OAmountWithTax, LAmountWithTax= $LAmountWithTax, LAmount=$LAmount,
+OAmount =$OAmount, UnPayOAmount=$UnPayOAmount, Balance = $OAmountWithTax, LBalance= $UnPayLAmount ,UnPaymentLAmt=$UnPayLAmount,
+ UnPayLAmount=$UnPayLAmount, OTax=$OTax, LTax=$LTax, WriteOffAmount=$WriteOffAmount, CreatorId='$user_id' WHERE rib_id = $rib_id";
+
+    mysqli_query($link, $sql_rib);
+    if (mysqli_affected_rows($link) > 0) {
+        echo '<script>alert("已進入審核流程")</script>';
+    } else {
+        echo $sql_rib;
+        echo '<script>alert("操作失敗")</script>';
+    }
+    //紀錄繳交資料
+    $SQL1 = str_replace("'", '', $sql_rib);
+    $sql_submit = "UPDATE rib SET UserSubmit='$SQL1' WHERE rib_id=$rib_id";
+    mysqli_query($link, $sql_submit);
+
+
+    //產生費用報銷單excel
+    $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
+    $spreadsheet = $reader->load("reimburse-sample.xlsx");
+    $printday = date("Y-m-d");
+    $print = "列印日期：" . $printday;
+    $sheet = $spreadsheet->getActiveSheet();
+    $sheet->setCellValue('H3', $rib['BillNo']);
+    $sheet->setCellValue('H5', $rib['BillDate']);
+    $sheet->setCellValue('H6', $dept);
+    $sheet->setCellValue('G2', $print);
+    if ($rib['WriteOffType'] == 1) {
+        $sheet->setCellValue('H8', '■ 廠商   □ 員工');
+    } elseif ($rib['WriteOffType'] == 2) {
+        $sheet->setCellValue('H8', '■ 員工   □ 廠商');
+    }
+
+    if ($rib['pay_type'] == 0) {
+        $sheet->setCellValue('H9', '  ■ 現金 
+    □ 銀行轉帳 
+    □ 沖帳及金額 
+    （                     ） 
+    預付款申請單號 
+    NO.');
+    } elseif ($rib['pay_type'] == 1) {
+        $sheet->setCellValue('H9', '□ 現金 
+    ■ 銀行轉帳 
+    □ 沖帳及金額 
+    （                     ） 
+    預付款申請單號 
+    NO.');
+    }
+    $sheet->setCellValue('H10', $WriteOffAmount);
+    $sheet->setCellValue('H11', $totalVoucher);
+    $sheet->setCellValue('G13', $FeeNotes);
+
+    $writer = new Xls($spreadsheet);
+    $writer->save('WriteOff.xlsx');
+?>
+    <script>
+        var link = document.createElement('a');
+        console.log(window.location.origin + "/wms/WriteOff.xlsx");
+        link.setAttribute('href', window.location.origin + "/wms/WriteOff.xlsx");
+        link.setAttribute('download', '費用報銷單.xlsx');
+        link.style.display = 'none';
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+    </script>
+<?php
+    $content = "需要審核的費用報銷單為：";
+    $notice_rib_sql = "SELECT BillNo FROM rib WHERE CurrentState = 1";
+    $notice_rib = mysqli_query($link, $notice_rib_sql);
+    foreach ($notice_rib as $notice_content) {
+        $name = $notice_content['BillNo'];
+        $content .= "$name" . "、";
+    }
+    $notice_rib_num = mysqli_num_rows($notice_rib);
+    $notice_rib = mysqli_fetch_row($notice_rib);
+    $title = "有" . $notice_rib_num . "個費用報銷單待審核";
+    $insert_notice_sql = "UPDATE notice SET title= '$title', content='$content',haveread=NULL WHERE id=1654";
+    mysqli_query($link, $insert_notice_sql);
+    $insert_notice_sql = "UPDATE notice SET title= '$title', content='$content',haveread=NULL WHERE id=1959";
+    mysqli_query($link, $insert_notice_sql);
+} elseif ($state == 2) {
+    //取得表頭資料
+    $rib_query = "SELECT * FROM rib WHERE rib_id = $rib_id";
+    $rib = mysqli_query($link, $rib_query);
+    $rib = mysqli_fetch_assoc($rib);
+
+    $BillNo = $rib['BillNo'];
+    //連線T8資料庫 
+
+    // // 表頭
+    $BillDate = $rib['BillDate'];
+    $TypeId = $rib['TypeId'];
+    $CurrId = ($rib['CurrId'] == "CNY") ? "RMB" : $rib['CurrId'];
+    $TransactId = $rib['TransactId'];
+    $WriteOffType = $rib['WriteOffType'];
+    $WriteOffId = $rib['WriteOffId'];
+    $WriteOffDescribe = empty($rib['WriteOffDescribe']) ? null : $rib['WriteOffDescribe'];
+    $DeptId = $rib['DeptId'];
+    $CostCenterId = empty($rib['CostCenterId']) ? Null : $rib['CostCenterId'];
+    $HadPayOAmount = $CurrId=="TWD"? round($rib['HadPayOAmount']):round($rib['HadPayOAmount'],2);
+    $HadPayLAmount = $CurrId=="TWD"? round($rib['HadPayLAmount']):round($rib['HadPayLAmount'],2);
+    $UnPayOAmount = $CurrId=="TWD"? round($rib['UnPayOAmount']):round($rib['UnPayOAmount'],2);
+    $UnPayLAmount = $CurrId=="TWD"? round($rib['UnPayLAmount']):round($rib['UnPayLAmount'],2);
+    $PaymentState = $rib['PaymentState'];
+    $Balance = $CurrId=="TWD"? round($rib['Balance']):round($rib['Balance'],2);
+    $LBalance = $CurrId=="TWD"? round($rib['LBalance']):round($rib['LBalance'],2);
+    $GatheringPersonId = $rib['GatheringPersonId'];
+    $GatheringPersonDescribe = empty($rib['GatheringPersonDescribe']) ? Null : $rib['GatheringPersonDescribe'];
+    $BankId = empty($rib['BankId']) ? Null : $rib['BankId'];
+    $BankName = empty($rib['BankName']) ? Null : $rib['BankName'];
+    if (isset($BankId) && isset($BankName)) {
+        $totalBankName = $BankId . $BankName;
+    }
+    $BankAccount = empty($rib['BankAccount']) ? Null : $rib['BankAccount'];
+    $BankAccountName = empty($rib['BankAccountName']) ? Null : $rib['BankAccountName'];
+    $IsTaxBill = $rib['IsTaxBill'];
+    $OAmount = $CurrId=="TWD"? round($rib['OAmount']):round($rib['OAmount'],2);
+    $LAmount = $CurrId=="TWD"? round($rib['LAmount']):round($rib['LAmount'],2);
+    $OTax = $CurrId=="TWD"? round($rib['OTax']):round($rib['OTax'],2);
+    $LTax = $CurrId=="TWD"? round($rib['LTax']):round($rib['LTax'],2);
+    $LAmountWithTax = $CurrId=="TWD"? round($rib['LAmountWithTax']):round($rib['LAmountWithTax'],2);
+    $OAmountWithTax = $CurrId=="TWD"? round($rib['OAmountWithTax']):round($rib['OAmountWithTax'],2);
+    $IsContainTax = $rib['IsContainTax'];
+    $AdvanceOAmount = $CurrId=="TWD"? round($rib['AdvanceOAmount']):round($rib['AdvanceOAmount'],2);
+    $AdvanceLAmount = $CurrId=="TWD"? round($rib['AdvanceLAmount']):round($rib['AdvanceLAmount'],2);
+    $PrePayWriteOffAmount = $rib['PrePayWriteOffAmount'];
+    $WriteOffAmount = $CurrId=="TWD"? round($rib['WriteOffAmount']):round($rib['WriteOffAmount'],2);
+    $TelNo = empty($rib['TelNo']) ? Null : $rib['TelNo'];
+    $UnPaymentLAmt = empty($rib['UnPaymentLAmt']) ? null : ($CurrId=="TWD"? round($rib['UnPaymentLAmt']):round($rib['UnPaymentLAmt'],2));
+    $CreatorId = $rib['CreatorId'];
+
+
+    $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+    $sql = "INSERT INTO glFeeWriteOff(BillNo, BillDate, OrgId,FOrgId,TypeId,PayOrgId,
+            CurrId,TransactId,WriteOffType,BizOrgId,WriteOffId,DeptId,
+            HadPayOAmount,HadPayLAmount,UnPayOAmount,UnPayLAmount,PaymentState,Balance,LBalance,
+            FillUp,GatheringBizOrgId, GatheringPersonId, IsTaxBill, OAmount,LAmount,OTax,LTax,LAmountWithTax,OAmountWithTax,
+            IsContainTax,AdvanceOAmount,AdvanceLAmount,PrePayWriteOffAmount,WriteOffAmount,
+            CompId,UnPaymentOAmt,UnPaymentLAmt,IsPayment, CurrentState,PermitState,CreatorId";
+
+    $sql2 = ") VALUES ('$BillNo',$BillDate,'1000','1000','$TypeId','1000',
+            '$CurrId','$TransactId',$WriteOffType,'1000','$WriteOffId','$DeptId',
+            $HadPayOAmount,$HadPayLAmount,$UnPayOAmount,$UnPayLAmount,$PaymentState,$Balance,$LBalance,
+            0,'1000','$GatheringPersonId',$IsTaxBill,$OAmount,$LAmount,$OTax,$LTax,$LAmountWithTax,$OAmountWithTax,
+            $IsContainTax,$AdvanceOAmount,$AdvanceLAmount,$PrePayWriteOffAmount,$WriteOffAmount,
+            '1001',$WriteOffAmount,$UnPaymentLAmt,0,2,0,'$CreatorId'";
+
+    $sql .= empty($CostCenterId) ? "" : ",CostCenterId";
+    $sql2 .= empty($CostCenterId) ? "" : ",'" . $CostCenterId . "'";
+    $sql .= empty($WriteOffDescribe) ? "" : ",WriteOffDescribe";
+    $sql2 .= empty($WriteOffDescribe) ? "" : ",'" . $WriteOffDescribe . "'";
+    $sql .= empty($GatheringPersonDescribe) ? "" : ",GatheringPersonDescribe";
+    $sql2 .= empty($GatheringPersonDescribe) ? "" : ",'" . $GatheringPersonDescribe . "'";
+    $sql .= empty($totalBankName) ? "" : ",BankName";
+    $sql2 .= empty($totalBankName) ? "" : ",'" . $totalBankName . "'";
+    $sql .= empty($BankAccount) ? "" : ",BankAccount";
+    $sql2 .= empty($BankAccount) ? "" : ",'" . $BankAccount . "'";
+    $sql .= empty($BankAccountName) ? "" : ",BankAccountName";
+    $sql2 .= empty($BankAccountName) ? "" : ",'" . $BankAccountName . "'";
+    $sql .= empty($TelNo) ? "" : ",TelNo";
+    $sql2 .= empty($TelNo) ? "" : ",'" . $TelNo . "'";
+
+    $sql .= $sql2;
+    $sql .= ")";
+    $result = $conn->query($sql);
+    // 更改WMS RIB狀態
+    $rib_sql = "UPDATE rib SET BillNo='$BillNo',CurrentState=2, PermitState=0 WHERE rib_id =$rib_id";
+    mysqli_query($link, $rib_sql);
+
+    //取得表身資料
+    $ribsub_query = "SELECT * FROM rib_sub WHERE rib_id = $rib_id";
+    $ribsub_data = mysqli_query($link, $ribsub_query);
+    $RowCode = 0;
+    while ($ribsub = mysqli_fetch_assoc($ribsub_data)) {
+        $RowCode += 1;
+        $RowNo = $ribsub['RowNo'];
+        $FeeDate = $ribsub['FeeDate'];
+        $FeeTypeId = $ribsub['FeeTypeId'];
+        $WriteOffType = $ribsub['WriteOffType'];
+        $WriteOffId = $ribsub['WriteOffId'];
+        $WriteOffDescribe = empty($ribsub['WriteOffDescribe']) ? Null : $ribsub['WriteOffDescribe'];
+        $FeeDeptId = $ribsub['FeeDeptId'];
+        $CostCenterId = empty($ribsub['CostCenterId']) ? Null : $ribsub['CostCenterId'];
+        $UnitId = $ribsub['UnitId'];
+        $Quantity = $ribsub['Quantity'];
+        $Price = $CurrId=="TWD"? round($ribsub['Price']) : round($ribsub['Price'],2);
+        $CurrOAmount = $CurrId=="TWD"? round($ribsub['CurrOAmount']) : round($ribsub['CurrOAmount'],2);
+        $CurrLAmount = $CurrId=="TWD"? round($ribsub['CurrentLAmount']): round($ribsub['CurrentLAmount'],2);
+        $TaxId = $ribsub['TaxId'];
+        $TaxRate = $ribsub['TaxRate'];
+        $OTax = $CurrId=="TWD"? round($ribsub['OTax']): round($ribsub['OTax'],2);
+        $LTax = $CurrId=="TWD"? round($ribsub['LTax']): round($ribsub['LTax'],2);
+        $LAmountUnWithTax = $CurrId=="TWD"? round($ribsub['LAmountUnWithTax']): round($ribsub['LAmountUnWithTax'],2);
+        $OAmountUnWithTax = $CurrId=="TWD"? round($ribsub['OAmountUnWithTax']): round($ribsub['OAmountUnWithTax'],2);
+        $OAmount = $CurrId=="TWD"? round($ribsub['OAmount']): round($ribsub['OAmount'],2);
+        $LAmount = $CurrId=="TWD"? round($ribsub['LAmount']): round($ribsub['LAmount'],2);
+        $FeeBalance = $CurrId=="TWD"? round($ribsub['FeeBalance']): round($ribsub['FeeBalance'],2);
+        $VoucherCount = $ribsub['VoucherCount'];
+
+        $FeeNoteShow = empty($ribsub['FeeNoteShow']) ? Null : $ribsub['FeeNoteShow'];
+        $ProjectId = empty($ribsub['ProjectId']) ? null : $ribsub['ProjectId'];
+        $InvoiceNo = empty($ribsub['InvoiceNo']) ? null : $ribsub['InvoiceNo'];
+        $InvoiceNo = trim($InvoiceNo);
+        $InvoiceNo = str_replace('-', '', $InvoiceNo);
+        $comSupplierId = empty($ribsub['comSupplierId']) ? null : $ribsub['comSupplierId'];
+        $VoucherType = empty($ribsub['VoucherType']) ? null : $ribsub['VoucherType'];
+        $InvoiceId = empty($ribsub['InvoiceId']) ? null : $ribsub['InvoiceId'];
+        $CurrId = ($ribsub['CurrId'] == "CNY") ? "RMB" : $rib['CurrId'];
+        $WriteOffAmount = $ribsub['WriteOffAmount'];
+        $IsCounteract = $ribsub['IsCounteract'];
+        $CU_MaterialId = empty($ribsub['CU_MaterialId']) ? null : $ribsub['CU_MaterialId'];
+        $TaxNo = empty($ribsub['TaxNo']) ? null : $ribsub['TaxNo'];
+        $CreatorId = $ribsub['CreatorId'];
+
+        $sqlsub = "INSERT INTO glFeeWriteOffSub (BillNo, RowCode,RowNo,FeeDate,FeeTypeId, WriteOffType,
+            BizOrgId, WriteOffId, FeeOrgId, FeeDeptId, FeeCompanyId, UnitId ,
+             Quantity, Price, CurrOAmount,CurrLAmount,TaxId,TaxRate,OTax,LTax,LAmountUnWithTax
+             ,OAmountUnWithTax,OAmount,LAmount,FeeBalance,VoucherCount,CurrId,WriteOffAmount,SupplyOrgId,IsCounteract,IsKeyByFeeInfo
+             ";
+
+        $sqlsub2 = ") VALUES ('$BillNo',$RowCode, $RowNo,$FeeDate,'$FeeTypeId',$WriteOffType,
+            '1000','$WriteOffId','1000','$FeeDeptId','1000','$UnitId',
+            $Quantity, $Price, $CurrOAmount, $CurrLAmount,'$TaxId',$TaxRate,$OTax,$LTax,$LAmountUnWithTax
+            ,$OAmountUnWithTax,$OAmount,$LAmount,$FeeBalance,$VoucherCount,'$CurrId',$WriteOffAmount,'1000',$IsCounteract,0
+            ";
+
+        $sqlsub .= empty($WriteOffDescribe) ? "" : ",WriteOffDescribe";
+        $sqlsub2 .= empty($WriteOffDescribe) ? "" : ",'" . $WriteOffDescribe . "'";
+        $sqlsub .= empty($CostCenterId) ? "" : ",CostCenterId";
+        $sqlsub2 .= empty($CostCenterId) ? "" : ",'" . $CostCenterId . "'";
+        $sqlsub .= empty($FeeNoteShow) ? "" : ",FeeNoteShow";
+        $sqlsub2 .= empty($FeeNoteShow) ? "" : ",'" . $FeeNoteShow . "'";
+        $sqlsub .= empty($ProjectId) ? "" : ",ProjectId";
+        $sqlsub2 .= empty($ProjectId) ? "" : ",'" . $ProjectId . "'";
+        $sqlsub .= empty($InvoiceNo) ? "" : ",InvoiceNo";
+        $sqlsub2 .= empty($InvoiceNo) ? "" : ",'" . $InvoiceNo . "'";
+        $sqlsub .= empty($CU_MaterialId) ? "" : ",CU_MaterialId";
+        $sqlsub2 .= empty($CU_MaterialId) ? "" : ",'" . $CU_MaterialId . "'";
+        $sqlsub .= empty($comSupplierId) ? "" : ",comSupplierId";
+        $sqlsub2 .= empty($comSupplierId) ? "" : ",'" . $comSupplierId . "'";
+        $sqlsub .= empty($VoucherType) ? "" : ",VoucherType";
+        $sqlsub2 .= empty($VoucherType) ? "" : ",'" . $VoucherType . "'";
+        $sqlsub .= empty($InvoiceId) ? "" : ",InvoiceId";
+        $sqlsub2 .= empty($InvoiceId) ? "" : ",'" . $InvoiceId . "'";
+        $sqlsub .= empty($TaxNo) ? "" : ",TaxNo";
+        $sqlsub2 .= empty($TaxNo) ? "" : ",'" . $TaxNo . "'";
+
+
+        $sqlsub .= $sqlsub2;
+        $sqlsub .= ")";
+        $result2 = $conn->query($sqlsub);
+    }
+
+    $content = "需要審核的費用報銷單為：";
+    $notice_rib_sql = "SELECT BillNo FROM rib WHERE CurrentState = 1";
+    $notice_rib = mysqli_query($link, $notice_rib_sql);
+    foreach ($notice_rib as $notice_content) {
+        $name = $notice_content['BillNo'];
+        $content .= "$name" . "、";
+    }
+    $notice_rib_num = mysqli_num_rows($notice_rib);
+    $notice_rib = mysqli_fetch_row($notice_rib);
+    $title = "有" . $notice_rib_num . "個費用報銷單待審核";
+    $insert_notice_sql = "UPDATE notice SET title= '$title', content='$content',haveread=NULL WHERE id=1654";
+    mysqli_query($link, $insert_notice_sql);
+    $insert_notice_sql = "UPDATE notice SET title= '$title', content='$content',haveread=NULL WHERE id=1959";
+    mysqli_query($link, $insert_notice_sql);
+}
+?>
+<script>
+    window.location.href = "rib01-index.php?<?= $token_link ?>";
 </script>
\ No newline at end of file
diff --git a/wms/schedule-create.php b/wms/schedule-create.php
index 53cf0fb8..ec950cf4 100644
--- a/wms/schedule-create.php
+++ b/wms/schedule-create.php
@@ -1,136 +1,136 @@
-<?php
-include "header.php";
-?>
-
-<div class="container">
-
-    <?php
-    
-        include "schedule-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        
-    
-    <div>
-            <label for="contractno">合約號(必填)</label>
-            <input type="text" name="contractno" id="contractno" required>
-        </div>	
-
-        <div>
-            <label for="facilityno">作番號(必填)</label>
-            <input type="text" name="facilityno" id="facilityno" required>
-        </div>	
-		
-        <div>
-            <label for="combono">保養套餐編號(必填)</label>
-            <input type="text" name="combono" id="combono" required>
-        </div>	
-				
-        <div>
-            <label for="repairerid">保養人員工號(必填)</label>
-            <input type="text" name="repairerid" id="repairerid" required>
-        </div>	
-
-        <div>
-            <label for="repairername">保養人員姓名(必填)</label>
-            <input type="text" name="repairername" id="repairername" required>
-        </div>	
-		
-        <div>
-            <label for="duedate">應保養日期(必填)</label>
-            <input type="text" name="duedate" id="duedate" data-date-format="yyyy-mm-dd" value="<?php echo date('Y/m/d H:i:s'); ?>" required>
-        </div>
-		
-<!--
-        <div>
-            <label for="actualdate">實際保養日期</label>
-            <input type="text" name="actualdate" id="actualdate" data-date-format="yyyy-mm-dd" value="">
-        </div>
-
-        <div>
-            <label for="item">保養項目編號</label>
-            <input type="text" name="item" id="item" >
-        </div>	
-
-        <div>
-            <label for="item_detail">保養項目內容</label>
-            <input type="text" name="item_detail" id="item_detail" >
-        </div>	
-
-        <div>
-            <label for="result">保養結果</label>
-            <input type="text" name="result" id="result" >
-        </div>	
--->		
-
-<!--
-        <div>
-            <label for="evidences">上傳照片</label>
-            <input type="text" name="evidences" id="evidences" >
-        </div>
--->	
-
-<!--
-        <div>
-            <label for="descriptons">說明</label>
-            <input type="text" name="descriptons" id="descriptons" >
-        </div>		
-
-        <div>
-            <label for="customer_login_id">客戶評價登入帳號</label>
-            <input type="text" name="customer_login_id" id="customer_login_id" >
-        </div>
-		
-        <div>
-            <label for="customer_login_name">客戶姓名</label>
-            <input type="text" name="customer_login_name" id="customer_login_name" >
-        </div>	
-
-        <div>
-            <label for="stars">評價等級(1-5星)</label>
-            <input type="text" name="stars" id="stars" onkeyup="if(value<0)value=0;if(value>5)value=5;value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')">
-        </div>	
-
-        <div>
-            <label for="details">內容</label>
-            <input type="text" name="details" id="details" >
-        </div>	
-
-        <div>
-            <label for="customer_signature">簽名檔</label>
-            <input type="text" name="customer_signature" id="customer_signature" >
-        </div>			
--->
-		
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
-            <p class="error"><?php echo $creater_error; ?></p>
-        </div>
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-
-        <div>
-            <button type="submit" name="submit">確認</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
+<?php
+include "header.php";
+?>
+
+<div class="container">
+
+    <?php
+    
+        include "schedule-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        
+    
+    <div>
+            <label for="contractno">合約號(必填)</label>
+            <input type="text" name="contractno" id="contractno" required>
+        </div>	
+
+        <div>
+            <label for="facilityno">作番號(必填)</label>
+            <input type="text" name="facilityno" id="facilityno" required>
+        </div>	
+		
+        <div>
+            <label for="combono">保養套餐編號(必填)</label>
+            <input type="text" name="combono" id="combono" required>
+        </div>	
+				
+        <div>
+            <label for="repairerid">保養人員工號(必填)</label>
+            <input type="text" name="repairerid" id="repairerid" required>
+        </div>	
+
+        <div>
+            <label for="repairername">保養人員姓名(必填)</label>
+            <input type="text" name="repairername" id="repairername" required>
+        </div>	
+		
+        <div>
+            <label for="duedate">應保養日期(必填)</label>
+            <input type="text" name="duedate" id="duedate" data-date-format="yyyy-mm-dd" value="<?php echo date('Y/m/d H:i:s'); ?>" required>
+        </div>
+		
+<!--
+        <div>
+            <label for="actualdate">實際保養日期</label>
+            <input type="text" name="actualdate" id="actualdate" data-date-format="yyyy-mm-dd" value="">
+        </div>
+
+        <div>
+            <label for="item">保養項目編號</label>
+            <input type="text" name="item" id="item" >
+        </div>	
+
+        <div>
+            <label for="item_detail">保養項目內容</label>
+            <input type="text" name="item_detail" id="item_detail" >
+        </div>	
+
+        <div>
+            <label for="result">保養結果</label>
+            <input type="text" name="result" id="result" >
+        </div>	
+-->		
+
+<!--
+        <div>
+            <label for="evidences">上傳照片</label>
+            <input type="text" name="evidences" id="evidences" >
+        </div>
+-->	
+
+<!--
+        <div>
+            <label for="descriptons">說明</label>
+            <input type="text" name="descriptons" id="descriptons" >
+        </div>		
+
+        <div>
+            <label for="customer_login_id">客戶評價登入帳號</label>
+            <input type="text" name="customer_login_id" id="customer_login_id" >
+        </div>
+		
+        <div>
+            <label for="customer_login_name">客戶姓名</label>
+            <input type="text" name="customer_login_name" id="customer_login_name" >
+        </div>	
+
+        <div>
+            <label for="stars">評價等級(1-5星)</label>
+            <input type="text" name="stars" id="stars" onkeyup="if(value<0)value=0;if(value>5)value=5;value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')">
+        </div>	
+
+        <div>
+            <label for="details">內容</label>
+            <input type="text" name="details" id="details" >
+        </div>	
+
+        <div>
+            <label for="customer_signature">簽名檔</label>
+            <input type="text" name="customer_signature" id="customer_signature" >
+        </div>			
+-->
+		
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
+            <p class="error"><?php echo $creater_error; ?></p>
+        </div>
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at" value="<?php date('Y/m/d H:i:s'); ?>">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+
+        <div>
+            <button type="submit" name="submit">確認</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
diff --git a/wms/schedule-delete.php b/wms/schedule-delete.php
index c6650327..48b9d948 100644
--- a/wms/schedule-delete.php
+++ b/wms/schedule-delete.php
@@ -1,12 +1,12 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "DELETE FROM schedule WHERE id='$id'";
-mysqli_query($link, $db_query);	
-
-header("Refresh:0; url=schedule-index.php?function_name=schedule&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "DELETE FROM schedule WHERE id='$id'";
+mysqli_query($link, $db_query);	
+
+header("Refresh:0; url=schedule-index.php?function_name=schedule&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/schedule-edit.php b/wms/schedule-edit.php
index 84c5c0e8..cfdf443f 100644
--- a/wms/schedule-edit.php
+++ b/wms/schedule-edit.php
@@ -1,145 +1,145 @@
-<?php
-    include "header.php";
-
-    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-	
-	$data = array();
-	// sql語法存在變數中
-	$db_query = "SELECT * FROM schedule WHERE id=$id";
-
-	// 用mysqli_query方法執行(sql語法)將結果存在變數中
-	$data = mysqli_query($link,$db_query);	
-/*
-    include "inc/record_update.php";
-    
-    try {	
-		// 設置一個空陣列來放資料
-		$data = array();
-		// sql語法存在變數中
-		$db_query = "SELECT * FROM expert WHERE id=$id";
-
-		// 用mysqli_query方法執行(sql語法)將結果存在變數中
-		$data = mysqli_query($link,$db_query);
-	}catch (Exception $e) {
-    echo 'Caught exception: ',  $e->getMessage(), "\n";
-	}
-*/	
-    foreach($data as $data) :
-?>
-
-<div class="container">
-    <form class="form-inline" method="post" action="schedule-record-update.php" enctype="multipart/form-data">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-		
-        <div>
-            <label for="contractno">合約號</label>
-            <input type="text" name="contractno" id="contractno" value="<?php echo $data['contractno']; ?>">
-        </div>	
-
-        <div>
-            <label for="facilityno">作番號</label>
-            <input type="text" name="facilityno" id="facilityno" value="<?php echo $data['facilityno']; ?>">
-        </div>	
-		
-        <div>
-            <label for="combono">保養套餐編號</label>
-            <input type="text" name="combono" id="combono" value="<?php echo $data['combono']; ?>">
-        </div>	
-				
-        <div>
-            <label for="repairerid">保養人員工號</label>
-            <input type="text" name="repairerid" id="repairerid" value="<?php echo $data['repairerid']; ?>">
-        </div>	
-
-        <div>
-            <label for="repairername">保養人員姓名</label>
-            <input type="text" name="repairername" id="repairername" value="<?php echo $data['repairername']; ?>">
-        </div>	
-
-        <div>
-            <label for="duedate">應保養日期</label>
-            <input type="text" name="duedate" id="duedate" value="<?php echo $data['duedate']; ?>">
-        </div>
-		
-        <div>
-            <label for="actualdate">實際保養日期</label>
-            <input type="text" name="actualdate" id="actualdate" data-date-format="yyyy-mm-dd" value="<?php echo $data['actualdate']; ?>">
-        </div>	
-
-        <div>
-            <label for="item">保養項目編號</label>
-            <input type="text" name="item" id="item" value="<?php echo $data['item']; ?>">
-        </div>	
-
-        <div>
-            <label for="item_detail">保養項目內容</label>
-            <input type="text" name="item_detail" id="item_detail" value="<?php echo $data['item_detail']; ?>">
-        </div>	
-
-        <div>
-            <label for="result">保養結果</label>
-            <input type="text" name="result" id="result" value="<?php echo $data['result']; ?>">
-        </div>			
-
-<!--
-        <div>
-            <label for="evidences">上傳照片</label>
-            <input type="text" name="evidences" id="evidences" >
-        </div>
--->	
-
-        <div>
-            <label for="descriptons">說明</label>
-            <input type="text" name="descriptons" id="descriptons" value="<?php echo $data['descriptons']; ?>">
-        </div>	
-		
-        <div>
-            <label for="customer_login_id">客戶評價登入帳號</label>
-            <input type="text" name="customer_login_id" id="customer_login_id" value="<?php echo $data['customer_login_id']; ?>">
-        </div>	
-
-        <div>
-            <label for="customer_login_name">客戶姓名</label>
-            <input type="text" name="customer_login_name" id="customer_login_name" value="<?php echo $data['customer_login_name']; ?>">
-        </div>	
-
-        <div>
-            <label for="stars">保養品質/評價等級(1-5星)</label>
-            <input type="text" name="stars" id="stars" onkeyup="if(value<0)value=0;if(value>5)value=5;value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" value="<?php echo $data['stars_c1']; ?>">
-        </div>
-        <div>
-            <label for="stars2">服務態度/評價等級(1-5星)</label>
-            <input type="text" name="stars2" id="stars2" onkeyup="if(value<0)value=0;if(value>5)value=5;value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" value="<?php echo $data['stars_c2']; ?>">
-        </div>
-
-        <div>
-            <label for="details">內容</label>
-            <input type="text" name="details" id="details" value="<?php echo $data['details']; ?>">
-        </div>	
-<!--
-        <div>
-            <label for="customer_signature">簽名檔</label>
-            <input type="text" name="customer_signature" id="customer_signature" value="<?php echo $data['customer_signature']; ?>">
-        </div>			
--->
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
-        </div>
-		
-		
-        <div>
-			<br>
-            <button type="submit" name="update">確認</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
-?>
+<?php
+    include "header.php";
+
+    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+	
+	$data = array();
+	// sql語法存在變數中
+	$db_query = "SELECT * FROM schedule WHERE id=$id";
+
+	// 用mysqli_query方法執行(sql語法)將結果存在變數中
+	$data = mysqli_query($link,$db_query);	
+/*
+    include "inc/record_update.php";
+    
+    try {	
+		// 設置一個空陣列來放資料
+		$data = array();
+		// sql語法存在變數中
+		$db_query = "SELECT * FROM expert WHERE id=$id";
+
+		// 用mysqli_query方法執行(sql語法)將結果存在變數中
+		$data = mysqli_query($link,$db_query);
+	}catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+	}
+*/	
+    foreach($data as $data) :
+?>
+
+<div class="container">
+    <form class="form-inline" method="post" action="schedule-record-update.php" enctype="multipart/form-data">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+		
+        <div>
+            <label for="contractno">合約號</label>
+            <input type="text" name="contractno" id="contractno" value="<?php echo $data['contractno']; ?>">
+        </div>	
+
+        <div>
+            <label for="facilityno">作番號</label>
+            <input type="text" name="facilityno" id="facilityno" value="<?php echo $data['facilityno']; ?>">
+        </div>	
+		
+        <div>
+            <label for="combono">保養套餐編號</label>
+            <input type="text" name="combono" id="combono" value="<?php echo $data['combono']; ?>">
+        </div>	
+				
+        <div>
+            <label for="repairerid">保養人員工號</label>
+            <input type="text" name="repairerid" id="repairerid" value="<?php echo $data['repairerid']; ?>">
+        </div>	
+
+        <div>
+            <label for="repairername">保養人員姓名</label>
+            <input type="text" name="repairername" id="repairername" value="<?php echo $data['repairername']; ?>">
+        </div>	
+
+        <div>
+            <label for="duedate">應保養日期</label>
+            <input type="text" name="duedate" id="duedate" value="<?php echo $data['duedate']; ?>">
+        </div>
+		
+        <div>
+            <label for="actualdate">實際保養日期</label>
+            <input type="text" name="actualdate" id="actualdate" data-date-format="yyyy-mm-dd" value="<?php echo $data['actualdate']; ?>">
+        </div>	
+
+        <div>
+            <label for="item">保養項目編號</label>
+            <input type="text" name="item" id="item" value="<?php echo $data['item']; ?>">
+        </div>	
+
+        <div>
+            <label for="item_detail">保養項目內容</label>
+            <input type="text" name="item_detail" id="item_detail" value="<?php echo $data['item_detail']; ?>">
+        </div>	
+
+        <div>
+            <label for="result">保養結果</label>
+            <input type="text" name="result" id="result" value="<?php echo $data['result']; ?>">
+        </div>			
+
+<!--
+        <div>
+            <label for="evidences">上傳照片</label>
+            <input type="text" name="evidences" id="evidences" >
+        </div>
+-->	
+
+        <div>
+            <label for="descriptons">說明</label>
+            <input type="text" name="descriptons" id="descriptons" value="<?php echo $data['descriptons']; ?>">
+        </div>	
+		
+        <div>
+            <label for="customer_login_id">客戶評價登入帳號</label>
+            <input type="text" name="customer_login_id" id="customer_login_id" value="<?php echo $data['customer_login_id']; ?>">
+        </div>	
+
+        <div>
+            <label for="customer_login_name">客戶姓名</label>
+            <input type="text" name="customer_login_name" id="customer_login_name" value="<?php echo $data['customer_login_name']; ?>">
+        </div>	
+
+        <div>
+            <label for="stars">保養品質/評價等級(1-5星)</label>
+            <input type="text" name="stars" id="stars" onkeyup="if(value<0)value=0;if(value>5)value=5;value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" value="<?php echo $data['stars_c1']; ?>">
+        </div>
+        <div>
+            <label for="stars2">服務態度/評價等級(1-5星)</label>
+            <input type="text" name="stars2" id="stars2" onkeyup="if(value<0)value=0;if(value>5)value=5;value=value.replace(/^\D*(\d*(?:\.\d)?).*$/g, '$1')" value="<?php echo $data['stars_c2']; ?>">
+        </div>
+
+        <div>
+            <label for="details">內容</label>
+            <input type="text" name="details" id="details" value="<?php echo $data['details']; ?>">
+        </div>	
+<!--
+        <div>
+            <label for="customer_signature">簽名檔</label>
+            <input type="text" name="customer_signature" id="customer_signature" value="<?php echo $data['customer_signature']; ?>">
+        </div>			
+-->
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
+        </div>
+		
+		
+        <div>
+			<br>
+            <button type="submit" name="update">確認</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php
+
+    endforeach;
+    
+    include "footer.php";
+
+?>
diff --git a/wms/schedule-index.php b/wms/schedule-index.php
index f6d07a00..09b3660a 100644
--- a/wms/schedule-index.php
+++ b/wms/schedule-index.php
@@ -1,282 +1,282 @@
-<?php
-include "header.php";
-
-$tourl = $_SERVER["SCRIPT_NAME"]."?function_name=schedule&token=".$token;
-
-// 工務總處可瀏覽全部資料
-$sql = "select department_id, role_id from account where accountid = '$user_id'";
-$res = mysqli_query($link, $sql);
-$row = mysqli_fetch_row($res);
-$user_department_id = $row[0];
-$user_role_id = $row[1];
-mysqli_free_result($res);
-
-// 各區工務助理專員可瀏覽全部
-$dr_arr = ['3114', '3133', '3144', '3152'];
-
-if (!isset($_GET["p"]) || $_GET["p"] <= 0) $p = 1;
-else $p = $_GET["p"];
-$page_each = 50;
-$page_from = ($p-1)*$page_each;
-
-// 設置一個空陣列來放資料
-$data = array();
-// sql語法存在變數中
-$page_close = 0;
-$sql_cmd2 = "";
-$sql_cmd = sql_myself($user_id);
-if ($user_department_id == "501" || $user_department_id == "322" || $user_id == "M0012" || $user_id == "M0105") $sql_cmd = "";
-if (in_array($user_department_id.$user_role_id, $dr_arr)) $sql_cmd = "";
-//if (empty($sql_cmd)) $sql_cmd = "where ";
-if (!empty($_GET["contractno"])) $sql_cmd2 .= "and contractno = '".$_GET["contractno"]."' ";
-if (!empty($_GET["facilityno"])) $sql_cmd2 .= "and facilityno = '".$_GET["facilityno"]."' ";
-//if (!empty($_GET["repairername"])) $sql_cmd2 .= "and repairername = '".$_GET["repairername"]."' ";
-if (!empty($sql_cmd2)) {
-    if ($sql_cmd == "") $sql_cmd = "where ".ltrim($sql_cmd2, "and");
-    else $sql_cmd .= $sql_cmd2;
-    $page_close = 1;    // 不分頁
-}
-
-//$sql = "SELECT * FROM schedule $sql_cmd ORDER BY id";
-$sql = "SELECT * FROM schedule $sql_cmd ORDER BY id asc";
-if (!$page_close) $sql .= " limit $page_from, $page_each";
-//echo $sql;
-
-// 用mysqli_query方法執行(sql語法)將結果存在變數中
-$data = mysqli_query($link,$sql);
-$total_nums = mysqli_affected_rows($link);
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="schedule-create.php?function_name=schedule&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-
-<?php
-}
-
-
-
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:schedule-index.php");
-        }
-    }
-
-?>
-
-<style>
-table {
-    table-layout:fixed;
-    width: 100%;
-}
-
-td {
-    word-wrap:break-word;
-}
-
-img {
-    width:125px;
-}
-
-.width_style_1 {
-	width:125px;
-}
-
-table{
-    width:100%;
-}
-#table_index2_filter{
-    float:right;
-}
-#table_index2_paginate{
-    float:right;
-}
-label {
-    display: inline-flex;
-    margin-bottom: .5rem;
-    margin-top: .5rem;
-   
-}
-
-#preloader {/*   這是整個會蓋住畫面的底色色塊  */
-  position: fixed;
-  width: 100%;
-  height: 100%;
-  left: 0%;
-  top: 10%;
-  background-color: #fff;
-  z-index: 9999;
-}
-#status {/*   這是中間loading的gif坐標css,我們盡量讓他畫面置中  */
-  position: fixed;
-  width: 218px;
-  height: 419px;
-  margin-left: -140px;
-  margin-top: -160px;
-  left: 50%;
-  top: 50%;
-}
-
-</style>
-<script>
-$(function(){
-    $('#table_index2').DataTable({
-        "pageLength": 50,
-        "searching": false,
-        "paging": false,
-    });
-    $('.dataTables_length').hide();
-    //$('.pagination').eq(0).hide();
-    <?php if (!$page_close) { ?>
-    $('.dataTables_info').hide();
-    <?php } ?>
-});
-</script>
-
-    <div style="overflow-x:auto;">
-        <form method='get' action='<?php echo $tourl;?>'>
-            <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><input type="text" class="form-control" name="contractno" value="<?php if (isset($_GET["contractno"])) echo $_GET["contractno"]; ?>"></td>
-                        <th style="text-align:center;vertical-align:middle;">作番號</th>
-                        <td><input type="text" class="form-control" name="facilityno" value="<?php if (isset($_GET["facilityno"])) echo $_GET["facilityno"]; ?>"></td>
-                        <!--<th>保養員姓名</th>
-                        <td><input type="text" class="form-control" name="repairername" value="<?php if (isset($_GET["repairername"])) echo $_GET["repairername"]; ?>"></td>
-                        -->
-                        <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><br>
-        <table id="table_index2" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-            <tr>
-                <th>項次</th>
-                <th>合約號</th>
-                <th>作番號</th>
-                <th>保養套餐編號</th>
-                <th>保養人員工號</th>
-                <th>保養人員姓名</th>
-                <th>應保養日期</th>
-                <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 ($user_auth&2) { ?>
-                <th>修改</th>
-                <th>刪除</th>
-                <?php } ?>
-            </tr>
-		</thead>
-		<tbody>			
-
-            <?php foreach($data as $data) : ?>    
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td style="width:100pd;word-break: break-all;"><?php echo $data['contractno']; ?></td>
-                    <td><a href="/app/app-maintenance-uploadsuccess-photo-review.php?id_schedule=<?php echo $data['id']; ?>&<?php echo $token_link; ?>"><?php echo $data['facilityno']; ?></a></td>
-                    <td><?php echo $data['combono']; ?></td>
-                    <td><?php echo $data['repairerid']; ?></td>
-                    <td><?php echo $data['repairername']; ?></td>
-                    <td><?php echo $data['duedate']; ?></td>
-                    <td><?php echo $data['actualdate']; ?></td>
-                    <td style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;"><?php echo $data['item']; ?></td>
-                    <td style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;"><?php echo $data['item_detail']; ?></td>
-                    <td style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;"><?php echo $data['result']; ?></td>	
-                    <td><?php if ($data['evidences']) { echo "<a href=\"/app/".$data['evidences']."\">瀏覽</a>"; } ?></td>
-                    <td><?php echo $data['descriptons']; ?></td>
-                    <td><?php echo $data['customer_login_id']; ?></td>
-                    <td><?php echo $data['customer_login_name']; ?></td>
-                    <td>
-                        <?php
-                        $stars_1 = ($data['stars_c1']) ? $data['stars_c1'] : $data['stars'];
-                        echo $stars_1;
-                        ?>
-                    </td>
-                    <td>
-                        <?php
-                        $stars_2 = ($data['stars_c2']) ? $data['stars_c2'] : $data['stars_b2'];
-                        echo $stars_2;
-                        ?>
-                    </td>
-                    <td><?php echo $data['details']; ?></td>
-                    <td style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;"><?php echo $data['customer_signature']; ?></td>					
-                    <td><?php echo $data['creater']; ?></td>
-                    <td><?php echo $data['create_at']; ?></td>
-                    <?php if ($user_auth&2) { ?>
-                    <td>
-						<p>
-							<a href="schedule-edit.php?id=<?php echo $data['id']; ?>&function_name=schedule&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-								<span class="glyphicon glyphicon-pencil"></span>
-							</a>
-						</p> 
-					</td>
-                    <td>
-						<p>
-							<a href="schedule-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-								<span class="glyphicon glyphicon-remove"></span>
-							</a>
-						</p> 
-					</td>
-                    <?php } ?>
-                </tr>
-            <?php endforeach; ?>
-			</tbody>			
-        </table>
-    </div>
-
-    <?php
-    if (!$page_close) {
-        if (isset($_GET["contractno"])) $tourl .= "&contractno=".$_GET["contractno"];
-        if (isset($_GET["facilityno"])) $tourl .= "&facilityno=".$_GET["facilityno"];
-    ?>
-    <nav aria-label="Page navigation example">
-    <ul class="pagination">
-        <li class="page-item"><a class="page-link" href="<?php echo $tourl; ?>&p=<?php echo $p-1; ?>">Previous</a></li>
-        <?php if ($p > 2) { ?>
-        <li class="page-item<?php if ($_GET["p"]==($p-2)) echo " active"; ?>"><a class="page-link" href="<?php echo $tourl; ?>&p=<?php echo $p-2; ?>"><?php echo $p-2; ?></a></li>
-        <li class="page-item<?php if ($_GET["p"]==($p-1)) echo " active"; ?>"><a class="page-link" href="<?php echo $tourl; ?>&p=<?php echo $p-1; ?>"><?php echo $p-1; ?></a></li>
-        <?php } ?>
-        <li class="page-item<?php if (empty($_GET["p"]) || $_GET["p"]==$p) echo " active"; ?>"><a class="page-link" href="<?php echo $tourl; ?>&p=<?php echo $p; ?>"><?php echo $p; ?></a></li>
-        <li class="page-item<?php if ($_GET["p"]==($p+1)) echo " active"; ?>"><a class="page-link" href="<?php echo $tourl; ?>&p=<?php echo $p+1; ?>"><?php echo $p+1; ?></a></li>
-        <li class="page-item<?php if ($_GET["p"]==($p+2)) echo " active"; ?>"><a class="page-link" href="<?php echo $tourl; ?>&p=<?php echo $p+2; ?>"><?php echo $p+2; ?></a></li>
-        <li class="page-item"><a class="page-link" href="<?php echo $tourl; ?>&p=<?php echo $p+1; ?>">Next</a></li>
-    </ul>
-    </nav>
-    <?php
-    }
-    ?>
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-
-?>
+<?php
+include "header.php";
+
+$tourl = $_SERVER["SCRIPT_NAME"]."?function_name=schedule&token=".$token;
+
+// 工務總處可瀏覽全部資料
+$sql = "select department_id, role_id from account where accountid = '$user_id'";
+$res = mysqli_query($link, $sql);
+$row = mysqli_fetch_row($res);
+$user_department_id = $row[0];
+$user_role_id = $row[1];
+mysqli_free_result($res);
+
+// 各區工務助理專員可瀏覽全部
+$dr_arr = ['3114', '3133', '3144', '3152'];
+
+if (!isset($_GET["p"]) || $_GET["p"] <= 0) $p = 1;
+else $p = $_GET["p"];
+$page_each = 50;
+$page_from = ($p-1)*$page_each;
+
+// 設置一個空陣列來放資料
+$data = array();
+// sql語法存在變數中
+$page_close = 0;
+$sql_cmd2 = "";
+$sql_cmd = sql_myself($user_id);
+if ($user_department_id == "501" || $user_department_id == "322" || $user_id == "M0012" || $user_id == "M0105") $sql_cmd = "";
+if (in_array($user_department_id.$user_role_id, $dr_arr)) $sql_cmd = "";
+//if (empty($sql_cmd)) $sql_cmd = "where ";
+if (!empty($_GET["contractno"])) $sql_cmd2 .= "and contractno = '".$_GET["contractno"]."' ";
+if (!empty($_GET["facilityno"])) $sql_cmd2 .= "and facilityno = '".$_GET["facilityno"]."' ";
+//if (!empty($_GET["repairername"])) $sql_cmd2 .= "and repairername = '".$_GET["repairername"]."' ";
+if (!empty($sql_cmd2)) {
+    if ($sql_cmd == "") $sql_cmd = "where ".ltrim($sql_cmd2, "and");
+    else $sql_cmd .= $sql_cmd2;
+    $page_close = 1;    // 不分頁
+}
+
+//$sql = "SELECT * FROM schedule $sql_cmd ORDER BY id";
+$sql = "SELECT * FROM schedule $sql_cmd ORDER BY id asc";
+if (!$page_close) $sql .= " limit $page_from, $page_each";
+//echo $sql;
+
+// 用mysqli_query方法執行(sql語法)將結果存在變數中
+$data = mysqli_query($link,$sql);
+$total_nums = mysqli_affected_rows($link);
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth&2) { ?>
+<p>
+<a href="schedule-create.php?function_name=schedule&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+
+<?php
+}
+
+
+
+if($data):
+    
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:schedule-index.php");
+        }
+    }
+
+?>
+
+<style>
+table {
+    table-layout:fixed;
+    width: 100%;
+}
+
+td {
+    word-wrap:break-word;
+}
+
+img {
+    width:125px;
+}
+
+.width_style_1 {
+	width:125px;
+}
+
+table{
+    width:100%;
+}
+#table_index2_filter{
+    float:right;
+}
+#table_index2_paginate{
+    float:right;
+}
+label {
+    display: inline-flex;
+    margin-bottom: .5rem;
+    margin-top: .5rem;
+   
+}
+
+#preloader {/*   這是整個會蓋住畫面的底色色塊  */
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  left: 0%;
+  top: 10%;
+  background-color: #fff;
+  z-index: 9999;
+}
+#status {/*   這是中間loading的gif坐標css,我們盡量讓他畫面置中  */
+  position: fixed;
+  width: 218px;
+  height: 419px;
+  margin-left: -140px;
+  margin-top: -160px;
+  left: 50%;
+  top: 50%;
+}
+
+</style>
+<script>
+$(function(){
+    $('#table_index2').DataTable({
+        "pageLength": 50,
+        "searching": false,
+        "paging": false,
+    });
+    $('.dataTables_length').hide();
+    //$('.pagination').eq(0).hide();
+    <?php if (!$page_close) { ?>
+    $('.dataTables_info').hide();
+    <?php } ?>
+});
+</script>
+
+    <div style="overflow-x:auto;">
+        <form method='get' action='<?php echo $tourl;?>'>
+            <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><input type="text" class="form-control" name="contractno" value="<?php if (isset($_GET["contractno"])) echo $_GET["contractno"]; ?>"></td>
+                        <th style="text-align:center;vertical-align:middle;">作番號</th>
+                        <td><input type="text" class="form-control" name="facilityno" value="<?php if (isset($_GET["facilityno"])) echo $_GET["facilityno"]; ?>"></td>
+                        <!--<th>保養員姓名</th>
+                        <td><input type="text" class="form-control" name="repairername" value="<?php if (isset($_GET["repairername"])) echo $_GET["repairername"]; ?>"></td>
+                        -->
+                        <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><br>
+        <table id="table_index2" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+            <tr>
+                <th>項次</th>
+                <th>合約號</th>
+                <th>作番號</th>
+                <th>保養套餐編號</th>
+                <th>保養人員工號</th>
+                <th>保養人員姓名</th>
+                <th>應保養日期</th>
+                <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 ($user_auth&2) { ?>
+                <th>修改</th>
+                <th>刪除</th>
+                <?php } ?>
+            </tr>
+		</thead>
+		<tbody>			
+
+            <?php foreach($data as $data) : ?>    
+                <tr>
+                    <td><?php echo $data['id']; ?></td>
+                    <td style="width:100pd;word-break: break-all;"><?php echo $data['contractno']; ?></td>
+                    <td><a href="/app/app-maintenance-uploadsuccess-photo-review.php?id_schedule=<?php echo $data['id']; ?>&<?php echo $token_link; ?>"><?php echo $data['facilityno']; ?></a></td>
+                    <td><?php echo $data['combono']; ?></td>
+                    <td><?php echo $data['repairerid']; ?></td>
+                    <td><?php echo $data['repairername']; ?></td>
+                    <td><?php echo $data['duedate']; ?></td>
+                    <td><?php echo $data['actualdate']; ?></td>
+                    <td style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;"><?php echo $data['item']; ?></td>
+                    <td style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;"><?php echo $data['item_detail']; ?></td>
+                    <td style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;"><?php echo $data['result']; ?></td>	
+                    <td><?php if ($data['evidences']) { echo "<a href=\"/app/".$data['evidences']."\">瀏覽</a>"; } ?></td>
+                    <td><?php echo $data['descriptons']; ?></td>
+                    <td><?php echo $data['customer_login_id']; ?></td>
+                    <td><?php echo $data['customer_login_name']; ?></td>
+                    <td>
+                        <?php
+                        $stars_1 = ($data['stars_c1']) ? $data['stars_c1'] : $data['stars'];
+                        echo $stars_1;
+                        ?>
+                    </td>
+                    <td>
+                        <?php
+                        $stars_2 = ($data['stars_c2']) ? $data['stars_c2'] : $data['stars_b2'];
+                        echo $stars_2;
+                        ?>
+                    </td>
+                    <td><?php echo $data['details']; ?></td>
+                    <td style="white-space:nowrap;overflow:hidden;text-overflow: ellipsis;"><?php echo $data['customer_signature']; ?></td>					
+                    <td><?php echo $data['creater']; ?></td>
+                    <td><?php echo $data['create_at']; ?></td>
+                    <?php if ($user_auth&2) { ?>
+                    <td>
+						<p>
+							<a href="schedule-edit.php?id=<?php echo $data['id']; ?>&function_name=schedule&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+								<span class="glyphicon glyphicon-pencil"></span>
+							</a>
+						</p> 
+					</td>
+                    <td>
+						<p>
+							<a href="schedule-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+						</p> 
+					</td>
+                    <?php } ?>
+                </tr>
+            <?php endforeach; ?>
+			</tbody>			
+        </table>
+    </div>
+
+    <?php
+    if (!$page_close) {
+        if (isset($_GET["contractno"])) $tourl .= "&contractno=".$_GET["contractno"];
+        if (isset($_GET["facilityno"])) $tourl .= "&facilityno=".$_GET["facilityno"];
+    ?>
+    <nav aria-label="Page navigation example">
+    <ul class="pagination">
+        <li class="page-item"><a class="page-link" href="<?php echo $tourl; ?>&p=<?php echo $p-1; ?>">Previous</a></li>
+        <?php if ($p > 2) { ?>
+        <li class="page-item<?php if ($_GET["p"]==($p-2)) echo " active"; ?>"><a class="page-link" href="<?php echo $tourl; ?>&p=<?php echo $p-2; ?>"><?php echo $p-2; ?></a></li>
+        <li class="page-item<?php if ($_GET["p"]==($p-1)) echo " active"; ?>"><a class="page-link" href="<?php echo $tourl; ?>&p=<?php echo $p-1; ?>"><?php echo $p-1; ?></a></li>
+        <?php } ?>
+        <li class="page-item<?php if (empty($_GET["p"]) || $_GET["p"]==$p) echo " active"; ?>"><a class="page-link" href="<?php echo $tourl; ?>&p=<?php echo $p; ?>"><?php echo $p; ?></a></li>
+        <li class="page-item<?php if ($_GET["p"]==($p+1)) echo " active"; ?>"><a class="page-link" href="<?php echo $tourl; ?>&p=<?php echo $p+1; ?>"><?php echo $p+1; ?></a></li>
+        <li class="page-item<?php if ($_GET["p"]==($p+2)) echo " active"; ?>"><a class="page-link" href="<?php echo $tourl; ?>&p=<?php echo $p+2; ?>"><?php echo $p+2; ?></a></li>
+        <li class="page-item"><a class="page-link" href="<?php echo $tourl; ?>&p=<?php echo $p+1; ?>">Next</a></li>
+    </ul>
+    </nav>
+    <?php
+    }
+    ?>
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+
+?>
diff --git a/wms/schedule-record-submit.php b/wms/schedule-record-submit.php
index 78b92adb..ca574a9d 100644
--- a/wms/schedule-record-submit.php
+++ b/wms/schedule-record-submit.php
@@ -1,69 +1,69 @@
-<?php
-$contractno= "";
-$facilityno= "";
-$combono= "";
-$repairerid= "";
-$repairername= "";
-$duedate= "";
-/*
-$actualdate= "";
-$item= "";
-$item_detai= "";
-$result= "";
-#$evidences= "";
-$descriptons= "";
-$customer_login_id= "";
-$customer_login_name= "";
-$stars= "";
-$details= "";
-$customer_signature= "";
-*/
-$creater= "";
-$create_at= "";
-
-$contractno_error= "";
-$facilityno_error= "";
-$combono_error= "";
-$repairerid_error= "";
-$repairername_error= "";
-$duedate_error= "";
-/*
-$actualdate_error= "";
-$item_error= "";
-$item_detai_error= "";
-$result_error= "";
-#$evidences_error= "";
-$descriptons_error= "";
-$customer_login_id_error= "";
-$customer_login_name_error= "";
-$stars_error= "";
-$details_error= "";
-$customer_signature_error= "";
-*/
-$creater_error = "";
-$create_at_error = "";
-
-
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    include "schedule-user-input.php";
-
-    #$db_query = "INSERT INTO schedule(contractno, facilityno, combono, repairerid, repairername, duedate, actualdate, item, item_detail, result, descriptons, customer_login_id, customer_login_name, stars, details, customer_signature, creater, create_at) VALUES ('$contractno', '$facilityno', '$combono', '$repairerid', '$repairername', '$duedate', '$actualdate', '$item', '$item_detail', '$result', '$descriptons', '$customer_login_id', '$customer_login_name', '$stars', '$details', '$customer_signature', '$creater', '$create_at')";    	                        
-    $db_query = "INSERT INTO schedule(contractno, facilityno, combono, repairerid, repairername, duedate, creater, create_at) VALUES ('$contractno', '$facilityno', '$combono', '$repairerid', '$repairername', '$duedate', '$creater', '$create_at')";    		
-    $result = mysqli_query($link,$db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='schedule-index.php?function_name=schedule&".$token_link."';";
-        echo "</script>";  
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='schedule-index.php?function_name=schedule&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
-?>
+<?php
+$contractno= "";
+$facilityno= "";
+$combono= "";
+$repairerid= "";
+$repairername= "";
+$duedate= "";
+/*
+$actualdate= "";
+$item= "";
+$item_detai= "";
+$result= "";
+#$evidences= "";
+$descriptons= "";
+$customer_login_id= "";
+$customer_login_name= "";
+$stars= "";
+$details= "";
+$customer_signature= "";
+*/
+$creater= "";
+$create_at= "";
+
+$contractno_error= "";
+$facilityno_error= "";
+$combono_error= "";
+$repairerid_error= "";
+$repairername_error= "";
+$duedate_error= "";
+/*
+$actualdate_error= "";
+$item_error= "";
+$item_detai_error= "";
+$result_error= "";
+#$evidences_error= "";
+$descriptons_error= "";
+$customer_login_id_error= "";
+$customer_login_name_error= "";
+$stars_error= "";
+$details_error= "";
+$customer_signature_error= "";
+*/
+$creater_error = "";
+$create_at_error = "";
+
+
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    include "schedule-user-input.php";
+
+    #$db_query = "INSERT INTO schedule(contractno, facilityno, combono, repairerid, repairername, duedate, actualdate, item, item_detail, result, descriptons, customer_login_id, customer_login_name, stars, details, customer_signature, creater, create_at) VALUES ('$contractno', '$facilityno', '$combono', '$repairerid', '$repairername', '$duedate', '$actualdate', '$item', '$item_detail', '$result', '$descriptons', '$customer_login_id', '$customer_login_name', '$stars', '$details', '$customer_signature', '$creater', '$create_at')";    	                        
+    $db_query = "INSERT INTO schedule(contractno, facilityno, combono, repairerid, repairername, duedate, creater, create_at) VALUES ('$contractno', '$facilityno', '$combono', '$repairerid', '$repairername', '$duedate', '$creater', '$create_at')";    		
+    $result = mysqli_query($link,$db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='schedule-index.php?function_name=schedule&".$token_link."';";
+        echo "</script>";  
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='schedule-index.php?function_name=schedule&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
+?>
diff --git a/wms/schedule-record-update.php b/wms/schedule-record-update.php
index 6e9a3dde..77e9b9a8 100644
--- a/wms/schedule-record-update.php
+++ b/wms/schedule-record-update.php
@@ -1,62 +1,62 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-    function user_input( $data ) {
-        $data1 = trim($data);
-        $data2 = stripslashes($data1);
-        $data3 = htmlspecialchars($data2);
-        return $data3;
-    }
-
-    $id           = $_POST['id'];
-    $contractno    = user_input($_POST["contractno"]);
-    $facilityno   = user_input($_POST["facilityno"]);
-    $combono        = user_input($_POST["combono"]);
-    $repairerid       = user_input($_POST["repairerid"]);
-    $repairername       = user_input($_POST["repairername"]);
-    $duedate        = user_input($_POST["duedate"]);
-
-    $actualdate     = user_input($_POST["actualdate"]);
-    $item       = user_input($_POST["item"]);
-    $item_detail   = user_input($_POST["item_detail"]);
-    $result    = user_input($_POST["result"]);
-    #$evidences   = user_input($_POST["evidences"]);
-    $descriptons   = user_input($_POST["descriptons"]);
-    $customer_login_id   = user_input($_POST["customer_login_id"]);
-    $customer_login_name   = user_input($_POST["customer_login_name"]);
-    $stars   = user_input($_POST["stars"]);
-    $stars2   = user_input($_POST["stars2"]);
-    $details   = user_input($_POST["details"]);
-    //$customer_signature   = user_input($_POST["customer_signature"]);
-
-    $creater      = user_input($_POST["creater"]);
-    $create_at    = date('Y/m/d H:i:s');
-
-    $db_query = "UPDATE schedule set contractno = '$contractno',
-                        facilityno = '$facilityno', combono = '$combono',
-                        repairerid = '$repairerid', repairername = '$repairername',
-                        duedate = '$duedate', actualdate = '$actualdate',
-                        item = '$item', item_detail = '$item_detail',
-                        result = '$result', descriptons = '$descriptons',
-                        customer_login_id = '$customer_login_id', customer_login_name = '$customer_login_name',
-                        stars_c1 = '$stars', stars_c2 = '$stars2', details = '$details',
-                        create_at = '$create_at' WHERE id='$id'";
-    mysqli_query($link, $db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='schedule-index.php?function_name=schedule&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='schedule-index.php?function_name=schedule&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if(isset($_POST['update'])) {
+    function user_input( $data ) {
+        $data1 = trim($data);
+        $data2 = stripslashes($data1);
+        $data3 = htmlspecialchars($data2);
+        return $data3;
+    }
+
+    $id           = $_POST['id'];
+    $contractno    = user_input($_POST["contractno"]);
+    $facilityno   = user_input($_POST["facilityno"]);
+    $combono        = user_input($_POST["combono"]);
+    $repairerid       = user_input($_POST["repairerid"]);
+    $repairername       = user_input($_POST["repairername"]);
+    $duedate        = user_input($_POST["duedate"]);
+
+    $actualdate     = user_input($_POST["actualdate"]);
+    $item       = user_input($_POST["item"]);
+    $item_detail   = user_input($_POST["item_detail"]);
+    $result    = user_input($_POST["result"]);
+    #$evidences   = user_input($_POST["evidences"]);
+    $descriptons   = user_input($_POST["descriptons"]);
+    $customer_login_id   = user_input($_POST["customer_login_id"]);
+    $customer_login_name   = user_input($_POST["customer_login_name"]);
+    $stars   = user_input($_POST["stars"]);
+    $stars2   = user_input($_POST["stars2"]);
+    $details   = user_input($_POST["details"]);
+    //$customer_signature   = user_input($_POST["customer_signature"]);
+
+    $creater      = user_input($_POST["creater"]);
+    $create_at    = date('Y/m/d H:i:s');
+
+    $db_query = "UPDATE schedule set contractno = '$contractno',
+                        facilityno = '$facilityno', combono = '$combono',
+                        repairerid = '$repairerid', repairername = '$repairername',
+                        duedate = '$duedate', actualdate = '$actualdate',
+                        item = '$item', item_detail = '$item_detail',
+                        result = '$result', descriptons = '$descriptons',
+                        customer_login_id = '$customer_login_id', customer_login_name = '$customer_login_name',
+                        stars_c1 = '$stars', stars_c2 = '$stars2', details = '$details',
+                        create_at = '$create_at' WHERE id='$id'";
+    mysqli_query($link, $db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='schedule-index.php?function_name=schedule&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='schedule-index.php?function_name=schedule&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/schedule-user-input.php b/wms/schedule-user-input.php
index 5f1d4e61..13a267f2 100644
--- a/wms/schedule-user-input.php
+++ b/wms/schedule-user-input.php
@@ -1,70 +1,70 @@
-<?php
-
-//Function to filter the form input
-function user_input( $data ) {
-    $data1 = trim($data);
-    $data2 = stripslashes($data1);
-    $data3 = htmlspecialchars($data2);
-    return $data3;
-}
-
-
-$contractno    = user_input($_POST["contractno"]);
-$facilityno   = user_input($_POST["facilityno"]);
-$combono        = user_input($_POST["combono"]);
-$repairerid       = user_input($_POST["repairerid"]);
-$repairername       = user_input($_POST["repairername"]);
-$duedate        = user_input($_POST["duedate"]);
-
-/*
-$actualdate     = user_input($_POST["actualdate"]);
-$item       = user_input($_POST["item"]);
-$item_detail   = user_input($_POST["item_detail"]);
-$result    = user_input($_POST["result"]);
-# $evidences   = user_input($_POST["evidences"]);
-$descriptons   = user_input($_POST["descriptons"]);
-$customer_login_id   = user_input($_POST["customer_login_id"]);
-$customer_login_name   = user_input($_POST["customer_login_name"]);
-$stars   = user_input($_POST["stars"]);
-$details   = user_input($_POST["details"]);
-$customer_signature   = user_input($_POST["customer_signature"]);
-*/
-
-$creater      = user_input($_POST["creater"]);
-$create_at    = date('Y/m/d H:i:s');
-
-
-
-
-
-/*
-
-if(empty($_POST["name"])) {
-    $name_error = "Name is required";
-} else {
-    $name = user_input($_POST["name"]);
-    
-    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
-        $name_error = "Only letter and white space are allowed";
-    }
-}
-
-
-/*
-if(empty($_POST["website"])) {
-    $website_error = "Website address is required";
-} else {
-    $website = user_input($_POST["website"]);
-
-    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
-        $website_error = "Invalid website URL";
-    }
-}
-
-if(empty($_POST["comment"])) {
-    $comment = "";
-} else {
-    $comment = user_input($_POST["comment"]);
-}
-*/
-?>
+<?php
+
+//Function to filter the form input
+function user_input( $data ) {
+    $data1 = trim($data);
+    $data2 = stripslashes($data1);
+    $data3 = htmlspecialchars($data2);
+    return $data3;
+}
+
+
+$contractno    = user_input($_POST["contractno"]);
+$facilityno   = user_input($_POST["facilityno"]);
+$combono        = user_input($_POST["combono"]);
+$repairerid       = user_input($_POST["repairerid"]);
+$repairername       = user_input($_POST["repairername"]);
+$duedate        = user_input($_POST["duedate"]);
+
+/*
+$actualdate     = user_input($_POST["actualdate"]);
+$item       = user_input($_POST["item"]);
+$item_detail   = user_input($_POST["item_detail"]);
+$result    = user_input($_POST["result"]);
+# $evidences   = user_input($_POST["evidences"]);
+$descriptons   = user_input($_POST["descriptons"]);
+$customer_login_id   = user_input($_POST["customer_login_id"]);
+$customer_login_name   = user_input($_POST["customer_login_name"]);
+$stars   = user_input($_POST["stars"]);
+$details   = user_input($_POST["details"]);
+$customer_signature   = user_input($_POST["customer_signature"]);
+*/
+
+$creater      = user_input($_POST["creater"]);
+$create_at    = date('Y/m/d H:i:s');
+
+
+
+
+
+/*
+
+if(empty($_POST["name"])) {
+    $name_error = "Name is required";
+} else {
+    $name = user_input($_POST["name"]);
+    
+    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
+        $name_error = "Only letter and white space are allowed";
+    }
+}
+
+
+/*
+if(empty($_POST["website"])) {
+    $website_error = "Website address is required";
+} else {
+    $website = user_input($_POST["website"]);
+
+    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
+        $website_error = "Invalid website URL";
+    }
+}
+
+if(empty($_POST["comment"])) {
+    $comment = "";
+} else {
+    $comment = user_input($_POST["comment"]);
+}
+*/
+?>
diff --git a/wms/schedule_check-create.php b/wms/schedule_check-create.php
index 0605fb44..02655944 100644
--- a/wms/schedule_check-create.php
+++ b/wms/schedule_check-create.php
@@ -1,189 +1,189 @@
-<?php
-require_once "database.php";
-include "header.php";
-
-$item_arr = $account_arr = [];
-$kind_arr = ["A" => "機房", "B" => "車廂", "C" => "井道層場", "D" => "運行", "E" => "其它"];
-
-$db_query = "select * from schedule_check_item where status = 'Y' order by item_no";
-$res = mysqli_query($link, $db_query);
-while ($row = mysqli_fetch_array($res)) {
-    $key1 = $row["item_no"][0];
-    $key2 = str_replace("0", "", substr($row["item_no"], -2));
-    $item_arr[$key1][$key2]["title"] = $row["item_title"];
-    $item_arr[$key1][$key2]["option"] = $row["item_option"];
-    $item_arr[$key1][$key2]["score"] = $row["top_score"];
-}
-mysqli_free_result($res);
-
-$db_query = "select accountid, name from account where accounttype = 'B' order by id";
-$res = mysqli_query($link, $db_query);
-while ($row = mysqli_fetch_array($res)) {
-    $account_arr[$row["accountid"]] = $row["name"];
-}
-mysqli_free_result($res);
-?>
-<style>
-#tb1 th,td:not(.desc){
-    text-align: center;
-}
-</style>
-<script>
-$(function() {
-    $('#facilityno').keyup(function(){
-        if ($(this).val().length >=8) {
-            var formdata = new FormData();
-            formdata.append('fno', $(this).val());
-            var xhr = new XMLHttpRequest();
-            xhr.onreadystatechange = function(){
-                if(this.readyState == 4 && this.status == 200){
-                    data = JSON.parse(this.responseText);
-                    $('.form-inline input[name=address]').val(data.addr);
-                    $('.form-inline select[name=repairerid]').val(data.rid);
-                    $('.form-inline select[name=facility_kind]').val(data.kind);
-                }
-            }
-            xhr.open('POST', '/wms/schedule_check-facility.php', true);
-            xhr.send(formdata);
-        } else {
-            $('.form-inline input[name=address]').val('');
-            $('.form-inline select[name=repairerid]').val('');
-            $('.form-inline select[name=facility_kind]').val('');
-        }
-    });
-    $('select[name=sel_option]').change(function(){
-        var totalScore = 0;
-        var valArr = $(this).val().split("-");
-        $(this).parent().parent().find('td[name=td_score]').html(valArr[2]);
-        $('td[name=td_score]').each(function(){
-            totalScore += Number($(this).html());
-            $(this).parent().parent().find('td[name=total_score]').html(totalScore);
-        });
-    });
-    $('#submit').click(function(){
-        var selOptionArr = [];
-        $("select[name='sel_option']").each(function(){ selOptionArr.push($(this).val()); })
-        $('#sel_option_all').val(selOptionArr);
-        $('#db_total_score').val($('td[name=total_score]').html());
-    });
-});
-</script>
-<div class="container">
-<?php
-include "schedule_check-record-submit.php";
-?>
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-    <div>
-        <label for="facilityno">電梯ID</label>
-        <input type="text" name="facilityno" id="facilityno" required>
-    </div>
-    <div>
-        <label for="check_date">抽查日期</label><br>
-        <input type="date" name="check_date" id="check_date" required>
-    </div>
-    <div>
-        <label for="address">現場名稱</label>
-        <input type="text" name="address" id="address">
-    </div>
-    <div>
-        <label for="combo_type">保養別</label>
-        <select name="combo_type" id="combo_type">
-            <option value="">請選擇</option>
-            <option value="1">全責</option>
-            <option value="2">半責</option>
-            <option value="3">清包</option>
-            <option value="9">其它</option>
-        </select>
-    </div>
-    <div>
-        <label for="facility_kind">機型</label>
-        <select name="facility_kind" id="facility_kind">
-            <option value="">請選擇</option>
-            <option value="MAE100">MAE100小機房</option>
-            <option value="MAM200">MAM200無機房</option>
-            <option value="MAH100">MAH100小電梯</option>
-            <option value="MAQ100">MAQ100強驅家用</option>
-            <option value="MAF100">MAF100貨梯</option>
-            <option value="MAZ100">MAZ100雜物梯</option>
-        </select>
-    </div>
-    <div>
-        <label for="facilitok_date">交車日期</label><br>
-        <input type="date" name="facilitok_date" id="facilitok_date">
-    </div>
-    <div>
-        <label for="repairerid">保養人員</label>
-        <select name="repairerid" id="repairerid">
-            <option value="">請選擇</option>
-            <?php
-            foreach ($account_arr as $k => $v) {
-                echo "<option value=\"".$k."\">".$v."</option>";
-            }
-            ?>
-        </select>
-    </div>
-
-    <div class="table-responsive" style="width:100%;margin-top:10px;">
-        <table id="tb1" class="table table-bordered">
-            <thead>
-                <tr>
-                    <th colspan="6">抽查項目明细與記錄</th>
-                </tr>
-                <tr>
-                    <th>部位</th>
-                    <th>NO.</th>
-                    <th>抽查項目</th>
-                    <th>滿分</th>
-                    <th>記錄</th>
-                    <th>得分</th>
-                </tr>
-            </thead>
-            <tbody>
-                <?php
-                foreach ($item_arr as $k => $v) {
-                    $cnt = count($v);
-                    $key_first = array_key_first($v);
-                    foreach ($v as $kk => $vv) {
-                ?>
-                <tr>
-                    <?php
-                    if ($key_first == $kk) echo "<td rowspan=\"".$cnt."\">".$kind_arr[$k]."</td>";
-                    ?>
-                    <td><?php echo $kk; ?></td>
-                    <td class="desc"><?php echo $vv["title"]; ?></td>
-                    <td><?php echo $vv["score"]; ?></td>
-                    <td>
-                        <select name="sel_option">
-                        <?php
-                        $opt_arr = json_decode($vv["option"], true);
-                        $okey_first = array_key_first($opt_arr);
-                        foreach ($opt_arr as $key => $val) {
-                            echo "<option value=\"".$k."-".$kk."-".$key."\"";
-                            if ($okey_first == $key) echo " selected";
-                            echo ">".$val."</option>";
-                        }
-                        ?>
-                    </td>
-                    <td name="td_score"><?php echo $okey_first; ?></td>
-                </tr>
-                <?php
-                    }
-                }
-                ?>
-                <tr>
-                    <td><label for="memo">備註</label></td>
-                    <td colspan="3"><textarea name="memo" id="memo" rows="8" style="min-width: 100%"></textarea></td>
-                    <td>合計</td>
-                    <td name="total_score">100</td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
-    <div>
-        <button type="submit" name="submit" id="submit">確定</button>
-    </div>
-    <input type="hidden" name="sel_option_all" id="sel_option_all">
-    <input type="hidden" name="db_total_score" id="db_total_score">
-    </form>
-</div>
+<?php
+require_once "database.php";
+include "header.php";
+
+$item_arr = $account_arr = [];
+$kind_arr = ["A" => "機房", "B" => "車廂", "C" => "井道層場", "D" => "運行", "E" => "其它"];
+
+$db_query = "select * from schedule_check_item where status = 'Y' order by item_no";
+$res = mysqli_query($link, $db_query);
+while ($row = mysqli_fetch_array($res)) {
+    $key1 = $row["item_no"][0];
+    $key2 = str_replace("0", "", substr($row["item_no"], -2));
+    $item_arr[$key1][$key2]["title"] = $row["item_title"];
+    $item_arr[$key1][$key2]["option"] = $row["item_option"];
+    $item_arr[$key1][$key2]["score"] = $row["top_score"];
+}
+mysqli_free_result($res);
+
+$db_query = "select accountid, name from account where accounttype = 'B' order by id";
+$res = mysqli_query($link, $db_query);
+while ($row = mysqli_fetch_array($res)) {
+    $account_arr[$row["accountid"]] = $row["name"];
+}
+mysqli_free_result($res);
+?>
+<style>
+#tb1 th,td:not(.desc){
+    text-align: center;
+}
+</style>
+<script>
+$(function() {
+    $('#facilityno').keyup(function(){
+        if ($(this).val().length >=8) {
+            var formdata = new FormData();
+            formdata.append('fno', $(this).val());
+            var xhr = new XMLHttpRequest();
+            xhr.onreadystatechange = function(){
+                if(this.readyState == 4 && this.status == 200){
+                    data = JSON.parse(this.responseText);
+                    $('.form-inline input[name=address]').val(data.addr);
+                    $('.form-inline select[name=repairerid]').val(data.rid);
+                    $('.form-inline select[name=facility_kind]').val(data.kind);
+                }
+            }
+            xhr.open('POST', '/wms/schedule_check-facility.php', true);
+            xhr.send(formdata);
+        } else {
+            $('.form-inline input[name=address]').val('');
+            $('.form-inline select[name=repairerid]').val('');
+            $('.form-inline select[name=facility_kind]').val('');
+        }
+    });
+    $('select[name=sel_option]').change(function(){
+        var totalScore = 0;
+        var valArr = $(this).val().split("-");
+        $(this).parent().parent().find('td[name=td_score]').html(valArr[2]);
+        $('td[name=td_score]').each(function(){
+            totalScore += Number($(this).html());
+            $(this).parent().parent().find('td[name=total_score]').html(totalScore);
+        });
+    });
+    $('#submit').click(function(){
+        var selOptionArr = [];
+        $("select[name='sel_option']").each(function(){ selOptionArr.push($(this).val()); })
+        $('#sel_option_all').val(selOptionArr);
+        $('#db_total_score').val($('td[name=total_score]').html());
+    });
+});
+</script>
+<div class="container">
+<?php
+include "schedule_check-record-submit.php";
+?>
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+    <div>
+        <label for="facilityno">電梯ID</label>
+        <input type="text" name="facilityno" id="facilityno" required>
+    </div>
+    <div>
+        <label for="check_date">抽查日期</label><br>
+        <input type="date" name="check_date" id="check_date" required>
+    </div>
+    <div>
+        <label for="address">現場名稱</label>
+        <input type="text" name="address" id="address">
+    </div>
+    <div>
+        <label for="combo_type">保養別</label>
+        <select name="combo_type" id="combo_type">
+            <option value="">請選擇</option>
+            <option value="1">全責</option>
+            <option value="2">半責</option>
+            <option value="3">清包</option>
+            <option value="9">其它</option>
+        </select>
+    </div>
+    <div>
+        <label for="facility_kind">機型</label>
+        <select name="facility_kind" id="facility_kind">
+            <option value="">請選擇</option>
+            <option value="MAE100">MAE100小機房</option>
+            <option value="MAM200">MAM200無機房</option>
+            <option value="MAH100">MAH100小電梯</option>
+            <option value="MAQ100">MAQ100強驅家用</option>
+            <option value="MAF100">MAF100貨梯</option>
+            <option value="MAZ100">MAZ100雜物梯</option>
+        </select>
+    </div>
+    <div>
+        <label for="facilitok_date">交車日期</label><br>
+        <input type="date" name="facilitok_date" id="facilitok_date">
+    </div>
+    <div>
+        <label for="repairerid">保養人員</label>
+        <select name="repairerid" id="repairerid">
+            <option value="">請選擇</option>
+            <?php
+            foreach ($account_arr as $k => $v) {
+                echo "<option value=\"".$k."\">".$v."</option>";
+            }
+            ?>
+        </select>
+    </div>
+
+    <div class="table-responsive" style="width:100%;margin-top:10px;">
+        <table id="tb1" class="table table-bordered">
+            <thead>
+                <tr>
+                    <th colspan="6">抽查項目明细與記錄</th>
+                </tr>
+                <tr>
+                    <th>部位</th>
+                    <th>NO.</th>
+                    <th>抽查項目</th>
+                    <th>滿分</th>
+                    <th>記錄</th>
+                    <th>得分</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php
+                foreach ($item_arr as $k => $v) {
+                    $cnt = count($v);
+                    $key_first = array_key_first($v);
+                    foreach ($v as $kk => $vv) {
+                ?>
+                <tr>
+                    <?php
+                    if ($key_first == $kk) echo "<td rowspan=\"".$cnt."\">".$kind_arr[$k]."</td>";
+                    ?>
+                    <td><?php echo $kk; ?></td>
+                    <td class="desc"><?php echo $vv["title"]; ?></td>
+                    <td><?php echo $vv["score"]; ?></td>
+                    <td>
+                        <select name="sel_option">
+                        <?php
+                        $opt_arr = json_decode($vv["option"], true);
+                        $okey_first = array_key_first($opt_arr);
+                        foreach ($opt_arr as $key => $val) {
+                            echo "<option value=\"".$k."-".$kk."-".$key."\"";
+                            if ($okey_first == $key) echo " selected";
+                            echo ">".$val."</option>";
+                        }
+                        ?>
+                    </td>
+                    <td name="td_score"><?php echo $okey_first; ?></td>
+                </tr>
+                <?php
+                    }
+                }
+                ?>
+                <tr>
+                    <td><label for="memo">備註</label></td>
+                    <td colspan="3"><textarea name="memo" id="memo" rows="8" style="min-width: 100%"></textarea></td>
+                    <td>合計</td>
+                    <td name="total_score">100</td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+    <div>
+        <button type="submit" name="submit" id="submit">確定</button>
+    </div>
+    <input type="hidden" name="sel_option_all" id="sel_option_all">
+    <input type="hidden" name="db_total_score" id="db_total_score">
+    </form>
+</div>
 <?php include "footer.php"; ?>
\ No newline at end of file
diff --git a/wms/schedule_check-delete.php b/wms/schedule_check-delete.php
index 0f0431a8..c516bc22 100644
--- a/wms/schedule_check-delete.php
+++ b/wms/schedule_check-delete.php
@@ -1,11 +1,11 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-$db_query = "delete from schedule_check where id = '$id'";
-mysqli_query($link, $db_query);
-
-header("Refresh:0; url=schedule_check-index.php?function_name=schedule_check&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+$db_query = "delete from schedule_check where id = '$id'";
+mysqli_query($link, $db_query);
+
+header("Refresh:0; url=schedule_check-index.php?function_name=schedule_check&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/schedule_check-edit.php b/wms/schedule_check-edit.php
index db6fd026..1137bebe 100644
--- a/wms/schedule_check-edit.php
+++ b/wms/schedule_check-edit.php
@@ -1,171 +1,171 @@
-<?php
-include "header.php";
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$data = $item_arr = $account_arr = [];
-$kind_arr = ["A" => "機房", "B" => "車廂", "C" => "井道層場", "D" => "運行", "E" => "其它"];
-$maintainance_arr = ["A" => "全包", "B" => "半包",  "C" => "清包", "D" => "2個月保養一次"];
-
-$db_query = "select * from schedule_check c where id = $id";
-$data = mysqli_query($link, $db_query);
-
-$db_query = "select * from schedule_check_item order by item_no";
-$res = mysqli_query($link, $db_query);
-while ($row = mysqli_fetch_array($res)) {
-    $key1 = $row["item_no"][0];
-    $key2 = str_replace("0", "", substr($row["item_no"], -2));
-    $item_arr[$key1][$key2]["title"] = $row["item_title"];
-    $item_arr[$key1][$key2]["option"] = $row["item_option"];
-    $item_arr[$key1][$key2]["score"] = $row["top_score"];
-}
-mysqli_free_result($res);
-
-$db_query = "select accountid, name from account where accounttype = 'B' order by id";
-$res = mysqli_query($link, $db_query);
-while ($row = mysqli_fetch_array($res)) {
-    $account_arr[$row["accountid"]] = $row["name"];
-}
-mysqli_free_result($res);
-
-foreach($data as $data) :
-    $record_arr = json_decode($data["record"], true);
-    $sql = "select c.company, f.maintainance, f.facility_kind, f.takecertificatedate, f.repairerid from facility f, contract c where f.facilityno = '".$data["facilityno"]."' and f.contractno = c.contractno";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($res);
-    mysqli_free_result($res);
-?>
-<style>
-#tb1 th,td:not(.desc){
-    text-align: center;
-}
-</style>
-<script>
-$(function() {
-    if ($('td[name=total_score]').html() == '' || $('td[name=total_score]').html() == 0) $('td[name=total_score]').html('100');  // default
-
-    $('select[name=sel_option]').change(function(){
-        var totalScore = 0;
-        var valArr = $(this).val().split("-");
-        $(this).parent().parent().find('td[name=td_score]').html(valArr[2]);
-        $('td[name=td_score]').each(function(){
-            totalScore += Number($(this).html());
-            $(this).parent().parent().find('td[name=total_score]').html(totalScore);
-        });
-    });
-    $('#update').click(function(){
-        var selOptionArr = [];
-        $("select[name='sel_option']").each(function(){ selOptionArr.push($(this).val()); })
-        $('#sel_option_all').val(selOptionArr);
-        $('#db_total_score').val($('td[name=total_score]').html());
-    });
-});
-</script>
-<div class="container">
-    <form class="form-inline" method="post" action="schedule_check-record-update.php" enctype="multipart/form-data">
-    <input type="hidden" name="id" value="<?php echo $id; ?>">
-    <div>
-        <label for="facilityno">電梯ID</label>
-        <input type="text" name="facilityno" id="facilityno" value="<?php echo $data["facilityno"]; ?>" readonly>
-    </div>
-    <div>
-        <label for="check_date">抽查日期</label><br>
-        <input type="text" name="check_date" id="check_date" value="<?php echo $data["check_date"]; ?>" readonly>
-    </div>
-    <div>
-        <label for="address">現場名稱</label>
-        <input type="text" name="address" id="address" value="<?php echo $row["company"]; ?>" readonly>
-    </div>
-    <div>
-        <label for="combo_type">保養別</label>
-        <input type="text" name="combo_type" id="combo_type" value="<?php echo $maintainance_arr[$row["maintainance"]]; ?>" readonly>
-    </div>
-    <div>
-        <label for="facility_kind">機型</label>
-        <input type="text" name="facility_kind" id="facility_kind" value="<?php echo $row["facility_kind"]; ?>" readonly>
-    </div>
-    <div>
-        <label for="takecertificatedate">交車日期</label><br>
-        <input type="text" name="takecertificatedate" id="takecertificatedate" value="<?php echo $row["takecertificatedate"]; ?>" readonly>
-    </div>
-    <div>
-        <label for="repairerid">保養人員</label>
-        <input type="text" name="repairerid" id="repairerid" value="<?php echo $account_arr[$row["repairerid"]]; ?>" readonly>
-    </div>
-
-    <div class="table-responsive" style="width:100%;margin-top:10px;">
-        <table id="tb1" class="table table-bordered">
-            <thead>
-                <tr>
-                    <th colspan="6">抽查項目明细與記錄</th>
-                </tr>
-                <tr>
-                    <th>部位</th>
-                    <th>NO.</th>
-                    <th>抽查項目</th>
-                    <th>滿分</th>
-                    <th>記錄</th>
-                    <th>得分</th>
-                </tr>
-            </thead>
-            <tbody>
-                <?php
-                foreach ($item_arr as $k => $v) {
-                    $cnt = count($v);
-                    $key_first = array_key_first($v);
-                    foreach ($v as $kk => $vv) {
-                ?>
-                <tr>
-                    <?php
-                    if ($key_first == $kk) echo "<td rowspan=\"".$cnt."\">".$kind_arr[$k]."</td>";
-                    ?>
-                    <td><?php echo $kk; ?></td>
-                    <td class="desc"><?php echo $vv["title"]; ?></td>
-                    <td><?php echo $vv["score"]; ?></td>
-                    <td>
-                        <select name="sel_option">
-                        <?php
-                        $opt_arr = json_decode($vv["option"], true);
-                        if (!$record_arr) {
-                            $okey_first = array_key_first($opt_arr);
-                            foreach ($opt_arr as $key => $val) {
-                                echo "<option value=\"".$k."-".$kk."-".$key."\"";
-                                if ($okey_first == $key) echo " selected";
-                                echo ">".$val."</option>";
-                            }
-                        } else {
-                            foreach ($opt_arr as $key => $val) {
-                                echo "<option value=\"".$k."-".$kk."-".$key."\"";
-                                $no = str_pad($kk, 2, "0", STR_PAD_LEFT);
-                                if ($record_arr[$k][$no] == $key) echo " selected";
-                                echo ">".$val."</option>";
-                            }
-                        }
-                        ?>
-                    </td>
-                    <td name="td_score"><?php if (!$record_arr) echo $okey_first; else echo $record_arr[$k][$no]; ?></td>
-                </tr>
-                <?php
-                    }
-                }
-                ?>
-                <tr>
-                    <td><label for="memo">備註</label></td>
-                    <td colspan="3"><textarea name="memo" id="memo" rows="8" style="min-width: 100%"><?php echo $data["memo"]; ?></textarea></td>
-                    <td>合計</td>
-                    <td name="total_score"><?php echo $data["score"]; ?></td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
-    <div>
-        <button type="submit" name="update" id="update">確定</button>
-    </div>
-    <input type="hidden" name="sel_option_all" id="sel_option_all">
-    <input type="hidden" name="db_total_score" id="db_total_score">
-    <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-<?php
-endforeach;
-include "footer.php";
+<?php
+include "header.php";
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$data = $item_arr = $account_arr = [];
+$kind_arr = ["A" => "機房", "B" => "車廂", "C" => "井道層場", "D" => "運行", "E" => "其它"];
+$maintainance_arr = ["A" => "全包", "B" => "半包",  "C" => "清包", "D" => "2個月保養一次"];
+
+$db_query = "select * from schedule_check c where id = $id";
+$data = mysqli_query($link, $db_query);
+
+$db_query = "select * from schedule_check_item order by item_no";
+$res = mysqli_query($link, $db_query);
+while ($row = mysqli_fetch_array($res)) {
+    $key1 = $row["item_no"][0];
+    $key2 = str_replace("0", "", substr($row["item_no"], -2));
+    $item_arr[$key1][$key2]["title"] = $row["item_title"];
+    $item_arr[$key1][$key2]["option"] = $row["item_option"];
+    $item_arr[$key1][$key2]["score"] = $row["top_score"];
+}
+mysqli_free_result($res);
+
+$db_query = "select accountid, name from account where accounttype = 'B' order by id";
+$res = mysqli_query($link, $db_query);
+while ($row = mysqli_fetch_array($res)) {
+    $account_arr[$row["accountid"]] = $row["name"];
+}
+mysqli_free_result($res);
+
+foreach($data as $data) :
+    $record_arr = json_decode($data["record"], true);
+    $sql = "select c.company, f.maintainance, f.facility_kind, f.takecertificatedate, f.repairerid from facility f, contract c where f.facilityno = '".$data["facilityno"]."' and f.contractno = c.contractno";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($res);
+    mysqli_free_result($res);
+?>
+<style>
+#tb1 th,td:not(.desc){
+    text-align: center;
+}
+</style>
+<script>
+$(function() {
+    if ($('td[name=total_score]').html() == '' || $('td[name=total_score]').html() == 0) $('td[name=total_score]').html('100');  // default
+
+    $('select[name=sel_option]').change(function(){
+        var totalScore = 0;
+        var valArr = $(this).val().split("-");
+        $(this).parent().parent().find('td[name=td_score]').html(valArr[2]);
+        $('td[name=td_score]').each(function(){
+            totalScore += Number($(this).html());
+            $(this).parent().parent().find('td[name=total_score]').html(totalScore);
+        });
+    });
+    $('#update').click(function(){
+        var selOptionArr = [];
+        $("select[name='sel_option']").each(function(){ selOptionArr.push($(this).val()); })
+        $('#sel_option_all').val(selOptionArr);
+        $('#db_total_score').val($('td[name=total_score]').html());
+    });
+});
+</script>
+<div class="container">
+    <form class="form-inline" method="post" action="schedule_check-record-update.php" enctype="multipart/form-data">
+    <input type="hidden" name="id" value="<?php echo $id; ?>">
+    <div>
+        <label for="facilityno">電梯ID</label>
+        <input type="text" name="facilityno" id="facilityno" value="<?php echo $data["facilityno"]; ?>" readonly>
+    </div>
+    <div>
+        <label for="check_date">抽查日期</label><br>
+        <input type="text" name="check_date" id="check_date" value="<?php echo $data["check_date"]; ?>" readonly>
+    </div>
+    <div>
+        <label for="address">現場名稱</label>
+        <input type="text" name="address" id="address" value="<?php echo $row["company"]; ?>" readonly>
+    </div>
+    <div>
+        <label for="combo_type">保養別</label>
+        <input type="text" name="combo_type" id="combo_type" value="<?php echo $maintainance_arr[$row["maintainance"]]; ?>" readonly>
+    </div>
+    <div>
+        <label for="facility_kind">機型</label>
+        <input type="text" name="facility_kind" id="facility_kind" value="<?php echo $row["facility_kind"]; ?>" readonly>
+    </div>
+    <div>
+        <label for="takecertificatedate">交車日期</label><br>
+        <input type="text" name="takecertificatedate" id="takecertificatedate" value="<?php echo $row["takecertificatedate"]; ?>" readonly>
+    </div>
+    <div>
+        <label for="repairerid">保養人員</label>
+        <input type="text" name="repairerid" id="repairerid" value="<?php echo $account_arr[$row["repairerid"]]; ?>" readonly>
+    </div>
+
+    <div class="table-responsive" style="width:100%;margin-top:10px;">
+        <table id="tb1" class="table table-bordered">
+            <thead>
+                <tr>
+                    <th colspan="6">抽查項目明细與記錄</th>
+                </tr>
+                <tr>
+                    <th>部位</th>
+                    <th>NO.</th>
+                    <th>抽查項目</th>
+                    <th>滿分</th>
+                    <th>記錄</th>
+                    <th>得分</th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php
+                foreach ($item_arr as $k => $v) {
+                    $cnt = count($v);
+                    $key_first = array_key_first($v);
+                    foreach ($v as $kk => $vv) {
+                ?>
+                <tr>
+                    <?php
+                    if ($key_first == $kk) echo "<td rowspan=\"".$cnt."\">".$kind_arr[$k]."</td>";
+                    ?>
+                    <td><?php echo $kk; ?></td>
+                    <td class="desc"><?php echo $vv["title"]; ?></td>
+                    <td><?php echo $vv["score"]; ?></td>
+                    <td>
+                        <select name="sel_option">
+                        <?php
+                        $opt_arr = json_decode($vv["option"], true);
+                        if (!$record_arr) {
+                            $okey_first = array_key_first($opt_arr);
+                            foreach ($opt_arr as $key => $val) {
+                                echo "<option value=\"".$k."-".$kk."-".$key."\"";
+                                if ($okey_first == $key) echo " selected";
+                                echo ">".$val."</option>";
+                            }
+                        } else {
+                            foreach ($opt_arr as $key => $val) {
+                                echo "<option value=\"".$k."-".$kk."-".$key."\"";
+                                $no = str_pad($kk, 2, "0", STR_PAD_LEFT);
+                                if ($record_arr[$k][$no] == $key) echo " selected";
+                                echo ">".$val."</option>";
+                            }
+                        }
+                        ?>
+                    </td>
+                    <td name="td_score"><?php if (!$record_arr) echo $okey_first; else echo $record_arr[$k][$no]; ?></td>
+                </tr>
+                <?php
+                    }
+                }
+                ?>
+                <tr>
+                    <td><label for="memo">備註</label></td>
+                    <td colspan="3"><textarea name="memo" id="memo" rows="8" style="min-width: 100%"><?php echo $data["memo"]; ?></textarea></td>
+                    <td>合計</td>
+                    <td name="total_score"><?php echo $data["score"]; ?></td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+    <div>
+        <button type="submit" name="update" id="update">確定</button>
+    </div>
+    <input type="hidden" name="sel_option_all" id="sel_option_all">
+    <input type="hidden" name="db_total_score" id="db_total_score">
+    <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+<?php
+endforeach;
+include "footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/schedule_check-facility.php b/wms/schedule_check-facility.php
index fc7bd4f3..5c5ff769 100644
--- a/wms/schedule_check-facility.php
+++ b/wms/schedule_check-facility.php
@@ -1,65 +1,65 @@
-<?php
-exit;
-/**
- * 取得電梯內容
- * @url /schedule_check-facility.php
- * @method POST
- * @return JSON
- * 
- * request
- * {
- *  "fno"
- * }
- * fno : facilityno
- * respons json
- * {
- *  "st" : "ok",
- *  "err" : ""
- * }
- **/
-
-$rarr = array('st' => 'ok', 'err' => '');
-
-try {
-    if (empty($_POST) || empty($_POST["fno"])) throw new \Exception("parameter empty");
-
-    foreach ($_POST as $k => $v) {
-        $$k = htmlspecialchars(stripslashes(trim($v)));
-    }
-    if (!$fno) throw new \Exception("parameter empty[2]");
-
-    switch ($fno) {
-        case (preg_match('/TX/', $fno) ? true : false):
-            $kind = "MAE100";
-            break;
-        case (preg_match('/TW/', $fno) ? true : false):
-            $kind = "MAM200";
-            break;
-        case (preg_match('/TJ/', $fno) ? true : false):
-            $kind = "MAH100";
-            break;
-        case (preg_match('/TZ/', $fno) ? true : false):
-            $kind = "MAZ100";
-            break;
-        default:
-            $kind = "";
-    }
-    require_once "database.php";
-    $db_query = "select c.company, f.repairerid from contract c, facility f where c.contractno = f.contractno and f.facilityno = '$fno'";
-    $res = mysqli_query($link, $db_query);
-    if ($row = mysqli_fetch_row($res)) {
-        $rarr["addr"] = $row[0]; 
-        $rarr["rid"] = $row[1];
-        $rarr["kind"] = $kind;
-        mysqli_free_result($res);
-    } else {
-        $rarr["addr"] = $rarr["rid"] = "";
-    }
-    
-}catch(\Exception $e) {
-    $rarr['st'] = 'err';
-    $rarr['err'] = $e->getMessage();
-}
-
-echo json_encode($rarr, JSON_UNESCAPED_UNICODE);
+<?php
+exit;
+/**
+ * 取得電梯內容
+ * @url /schedule_check-facility.php
+ * @method POST
+ * @return JSON
+ * 
+ * request
+ * {
+ *  "fno"
+ * }
+ * fno : facilityno
+ * respons json
+ * {
+ *  "st" : "ok",
+ *  "err" : ""
+ * }
+ **/
+
+$rarr = array('st' => 'ok', 'err' => '');
+
+try {
+    if (empty($_POST) || empty($_POST["fno"])) throw new \Exception("parameter empty");
+
+    foreach ($_POST as $k => $v) {
+        $$k = htmlspecialchars(stripslashes(trim($v)));
+    }
+    if (!$fno) throw new \Exception("parameter empty[2]");
+
+    switch ($fno) {
+        case (preg_match('/TX/', $fno) ? true : false):
+            $kind = "MAE100";
+            break;
+        case (preg_match('/TW/', $fno) ? true : false):
+            $kind = "MAM200";
+            break;
+        case (preg_match('/TJ/', $fno) ? true : false):
+            $kind = "MAH100";
+            break;
+        case (preg_match('/TZ/', $fno) ? true : false):
+            $kind = "MAZ100";
+            break;
+        default:
+            $kind = "";
+    }
+    require_once "database.php";
+    $db_query = "select c.company, f.repairerid from contract c, facility f where c.contractno = f.contractno and f.facilityno = '$fno'";
+    $res = mysqli_query($link, $db_query);
+    if ($row = mysqli_fetch_row($res)) {
+        $rarr["addr"] = $row[0]; 
+        $rarr["rid"] = $row[1];
+        $rarr["kind"] = $kind;
+        mysqli_free_result($res);
+    } else {
+        $rarr["addr"] = $rarr["rid"] = "";
+    }
+    
+}catch(\Exception $e) {
+    $rarr['st'] = 'err';
+    $rarr['err'] = $e->getMessage();
+}
+
+echo json_encode($rarr, JSON_UNESCAPED_UNICODE);
 ?>
\ No newline at end of file
diff --git a/wms/schedule_check-import.php b/wms/schedule_check-import.php
index 1cf4d805..d6d1de15 100644
--- a/wms/schedule_check-import.php
+++ b/wms/schedule_check-import.php
@@ -1,133 +1,133 @@
-<?php
-/**
- * 產生安檢排程
- * @url /schedule_check-import.php
- * @method GET
- * @return JSON
- * 
- * respons json
- * {
- *  "st" : "ok",
- *  "err" : ""
- * }
- **/
-
-ob_start();
-include "header.php";
-ob_end_clean();
-$rarr = array('st' => 'ok', 'err' => '');
-
-try {
-    //require_once "database.php";
-    $data = [];
-    $tds = date("Y-m-d");
-    $tds_y = date("Y");
-    $base_date = date("Y-m-01", strtotime("-1 month")); // 今天算起前一個月起
-    $age_up = 15;
-
-    function get_facility_kind($fno="") {
-        switch ($fno) {
-            case (preg_match('/TX/', $fno) ? true : false):
-            case (preg_match('/MX/', $fno) ? true : false):
-                $kind = "MAE100";
-                break;
-            case (preg_match('/TW/', $fno) ? true : false):
-                $kind = "MAM200";
-                break;
-            case (preg_match('/TH/', $fno) ? true : false):
-                $kind = "MAH100";
-                break;
-            case (preg_match('/TZ/', $fno) ? true : false):
-                $kind = "MAZ100";
-                break;
-            default:
-                $kind = "";
-        }
-        return $kind;
-    }
-
-    function date_verify($date, $format = "Y-m-d") {
-        return date($format, strtotime($date)) == $date;
-    }
-
-    function get_check_date($ldate="", $month="") {
-        global $tds_y, $base_date;
-
-        $carr = [];
-        $lastday = substr($ldate, -2);
-        $cdate = date("Y-m-", strtotime(substr($ldate, 0, 7)." $month months")).$lastday;
-        if (!date_verify($cdate)) $cdate = date("Y-m-t", strtotime(substr($cdate, 0, 7)));
-        if ($cdate >= $base_date) $carr[] = $cdate;
-        $lastmd = substr($cdate, 4);
-        $lastyear = substr($cdate, 0, 4);
-        for ($i=$tds_y; $i<$lastyear; $i++) {
-            if ($i.$lastmd >= $base_date) $carr[] = $i.$lastmd;
-        }
-        return $carr;
-    }
-
-    // 許可證有效日在今天以後的
-    $db_query  = "select f.contractno, f.facilityno, f.takecertificatedate, f.licensedate from facility f ";
-    $db_query .= "where f.licensedate >= '$tds'";
-    $res = mysqli_query($link, $db_query);
-    while ($row = mysqli_fetch_array($res)) {
-        $data[$row["contractno"]]["facilityno"][] = $row["facilityno"];
-        $data[$row["contractno"]]["cdate"] = $row["takecertificatedate"];
-        $data[$row["contractno"]]["ldate"] = $row["licensedate"];
-        $data[$row["contractno"]]["age"] = (strtotime($tds) - strtotime($row["takecertificatedate"]))/(86400*365);  // 梯齡
-    }
-    mysqli_free_result($res);
-    //print_r($data);
-    foreach ($data as $contractno => $val) {
-        $check_date =[];
-       
-        if ($val["age"] <= $age_up) {
-            $check_date = get_check_date($val["ldate"], "-2");
-            /*
-            $cdate = date("Y-m-", strtotime(substr($val["ldate"], 0, 7)." -2 months")).$lastday;
-            if (!date_verify($cdate)) $cdate = date("Y-m-t", strtotime(substr($cdate, 0, 7)));
-            $check_date[] = $cdate;
-            $lastmd = substr($cdate, 4);
-            $lastyear = substr($cdate, 0, 4) - 1;
-            for ($i=$lastyear; $i>=$tds_y; $i--) {
-                $check_date[] = $i.$lastmd;
-            }
-            */
-        } else {
-            $check_date = array_merge(get_check_date($val["ldate"], "-7"), get_check_date($val["ldate"], "-1"));
-            /*
-            $cdate = date("Y-m-", strtotime(substr($val["ldate"], 0, 7)." -7 months")).$lastday;
-            if (!date_verify($cdate)) $cdate = date("Y-m-t", strtotime(substr($cdate, 0, 7)));
-            $check_date[] = $cdate;
-            $cdate = date("Y-m-", strtotime(substr($val["ldate"], 0, 7)." -1 months")).$lastday;
-            if (!date_verify($cdate)) $cdate = date("Y-m-t", strtotime(substr($cdate, 0, 7)));
-            $check_date[] = $cdate;
-            */
-        }
-        sort($check_date);
-        foreach ($check_date as $cval) {
-            //if ($cval >= $base_date) {
-                foreach ($val["facilityno"] as $fno) {
-                    $sql = "select count(*) from schedule_check where facilityno = '$fno' and check_date = '$cval'";
-                    $res = mysqli_query($link, $sql);
-                    $row = mysqli_fetch_row($res);
-                    if ($row[0] == 0) {
-                        $db_query  = "insert into schedule_check (facilityno, check_date, creater, updater) values ";
-                        $db_query .= "('$fno', '$cval', '$user_id', '$user_id')";
-                        //echo $db_query."\n";
-                        $result = mysqli_query($link, $db_query);
-                    }
-                }
-            //}
-        }
-    }
-    
-}catch(\Exception $e) {
-    $rarr['st'] = 'err';
-    $rarr['err'] = $e->getMessage();
-}
-
-
-echo json_encode($rarr, JSON_UNESCAPED_UNICODE);
-exit;
+<?php
+/**
+ * 產生安檢排程
+ * @url /schedule_check-import.php
+ * @method GET
+ * @return JSON
+ * 
+ * respons json
+ * {
+ *  "st" : "ok",
+ *  "err" : ""
+ * }
+ **/
+
+ob_start();
+include "header.php";
+ob_end_clean();
+$rarr = array('st' => 'ok', 'err' => '');
+
+try {
+    //require_once "database.php";
+    $data = [];
+    $tds = date("Y-m-d");
+    $tds_y = date("Y");
+    $base_date = date("Y-m-01", strtotime("-1 month")); // 今天算起前一個月起
+    $age_up = 15;
+
+    function get_facility_kind($fno="") {
+        switch ($fno) {
+            case (preg_match('/TX/', $fno) ? true : false):
+            case (preg_match('/MX/', $fno) ? true : false):
+                $kind = "MAE100";
+                break;
+            case (preg_match('/TW/', $fno) ? true : false):
+                $kind = "MAM200";
+                break;
+            case (preg_match('/TH/', $fno) ? true : false):
+                $kind = "MAH100";
+                break;
+            case (preg_match('/TZ/', $fno) ? true : false):
+                $kind = "MAZ100";
+                break;
+            default:
+                $kind = "";
+        }
+        return $kind;
+    }
+
+    function date_verify($date, $format = "Y-m-d") {
+        return date($format, strtotime($date)) == $date;
+    }
+
+    function get_check_date($ldate="", $month="") {
+        global $tds_y, $base_date;
+
+        $carr = [];
+        $lastday = substr($ldate, -2);
+        $cdate = date("Y-m-", strtotime(substr($ldate, 0, 7)." $month months")).$lastday;
+        if (!date_verify($cdate)) $cdate = date("Y-m-t", strtotime(substr($cdate, 0, 7)));
+        if ($cdate >= $base_date) $carr[] = $cdate;
+        $lastmd = substr($cdate, 4);
+        $lastyear = substr($cdate, 0, 4);
+        for ($i=$tds_y; $i<$lastyear; $i++) {
+            if ($i.$lastmd >= $base_date) $carr[] = $i.$lastmd;
+        }
+        return $carr;
+    }
+
+    // 許可證有效日在今天以後的
+    $db_query  = "select f.contractno, f.facilityno, f.takecertificatedate, f.licensedate from facility f ";
+    $db_query .= "where f.licensedate >= '$tds'";
+    $res = mysqli_query($link, $db_query);
+    while ($row = mysqli_fetch_array($res)) {
+        $data[$row["contractno"]]["facilityno"][] = $row["facilityno"];
+        $data[$row["contractno"]]["cdate"] = $row["takecertificatedate"];
+        $data[$row["contractno"]]["ldate"] = $row["licensedate"];
+        $data[$row["contractno"]]["age"] = (strtotime($tds) - strtotime($row["takecertificatedate"]))/(86400*365);  // 梯齡
+    }
+    mysqli_free_result($res);
+    //print_r($data);
+    foreach ($data as $contractno => $val) {
+        $check_date =[];
+       
+        if ($val["age"] <= $age_up) {
+            $check_date = get_check_date($val["ldate"], "-2");
+            /*
+            $cdate = date("Y-m-", strtotime(substr($val["ldate"], 0, 7)." -2 months")).$lastday;
+            if (!date_verify($cdate)) $cdate = date("Y-m-t", strtotime(substr($cdate, 0, 7)));
+            $check_date[] = $cdate;
+            $lastmd = substr($cdate, 4);
+            $lastyear = substr($cdate, 0, 4) - 1;
+            for ($i=$lastyear; $i>=$tds_y; $i--) {
+                $check_date[] = $i.$lastmd;
+            }
+            */
+        } else {
+            $check_date = array_merge(get_check_date($val["ldate"], "-7"), get_check_date($val["ldate"], "-1"));
+            /*
+            $cdate = date("Y-m-", strtotime(substr($val["ldate"], 0, 7)." -7 months")).$lastday;
+            if (!date_verify($cdate)) $cdate = date("Y-m-t", strtotime(substr($cdate, 0, 7)));
+            $check_date[] = $cdate;
+            $cdate = date("Y-m-", strtotime(substr($val["ldate"], 0, 7)." -1 months")).$lastday;
+            if (!date_verify($cdate)) $cdate = date("Y-m-t", strtotime(substr($cdate, 0, 7)));
+            $check_date[] = $cdate;
+            */
+        }
+        sort($check_date);
+        foreach ($check_date as $cval) {
+            //if ($cval >= $base_date) {
+                foreach ($val["facilityno"] as $fno) {
+                    $sql = "select count(*) from schedule_check where facilityno = '$fno' and check_date = '$cval'";
+                    $res = mysqli_query($link, $sql);
+                    $row = mysqli_fetch_row($res);
+                    if ($row[0] == 0) {
+                        $db_query  = "insert into schedule_check (facilityno, check_date, creater, updater) values ";
+                        $db_query .= "('$fno', '$cval', '$user_id', '$user_id')";
+                        //echo $db_query."\n";
+                        $result = mysqli_query($link, $db_query);
+                    }
+                }
+            //}
+        }
+    }
+    
+}catch(\Exception $e) {
+    $rarr['st'] = 'err';
+    $rarr['err'] = $e->getMessage();
+}
+
+
+echo json_encode($rarr, JSON_UNESCAPED_UNICODE);
+exit;
 ?>
\ No newline at end of file
diff --git a/wms/schedule_check-index.php b/wms/schedule_check-index.php
index 0a51890d..777d4a1d 100644
--- a/wms/schedule_check-index.php
+++ b/wms/schedule_check-index.php
@@ -1,162 +1,162 @@
-<?php
-include "header.php";
-
-$maintainance_arr = ["A" => "全包", "B" => "半包", "C" => "清包", "D" => "2個月保養一次"];
-// 設置一個空陣列來放資料
-$data = $account_arr = array();
-
-$db_query = "select accountid, name from account where accounttype = 'B' order by id";
-$res = mysqli_query($link, $db_query);
-while ($row = mysqli_fetch_array($res)) {
-    $account_arr[$row["accountid"]] = $row["name"];
-}
-mysqli_free_result($res);
-
-// sql語法存在變數中
-$sql = "select * from schedule_check order by id";
-// 用mysqli_query方法執行(sql語法)將結果存在變數中
-$data = mysqli_query($link, $sql);
-
-if ($user_auth&2) {
-?>
-<p>
-<a href="#" id="btn_import" class="btn btn-info btn-sm">
-    <span class="glyphicon glyphicon-refresh"></span>
-</a>
-</p>
-<?php
-}
-if ($data) {
-?>
-<style>
-table {
-    table-layout:fixed;
-    width: 100%;
-}
-td {
-    word-wrap:break-word;
-}
-img {
-    width:125px;
-}
-.width_style_1 {
-    width:125px;
-}
-table {
-    width:100%;
-}
-th, td {
-    text-align: center;
-}
-#table_index_filter {
-    float:right;
-}
-#table_index_paginate {
-    float:right;
-}
-label {
-    display: inline-flex;
-    margin-bottom: .5rem;
-    margin-top: .5rem;
-}
-</style>
-<script>
-$(function() {
-    $('#btn_import').click(function(){
-        var formdata = new FormData();
-        var xhr = new XMLHttpRequest();
-        xhr.onreadystatechange = function(){
-            if(this.readyState == 4 && this.status == 200){
-                data = JSON.parse(this.responseText);
-                if (data.st == 'ok') {
-                    alert("資料已匯入！");
-                    location.reload();
-                    return;
-                } else {
-                    alert("系統忙碌，請重新操作！");
-                    return;
-                }
-            }
-        }
-        xhr.open('GET','schedule_check-import.php?<?php echo $token_link; ?>',true);
-        xhr.send(formdata);
-    });
-});
-</script>
-<div style="overflow-x:auto;">
-    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-        <thead>
-            <tr>
-                <th>項次</th>
-                <th>電梯ID</th>
-                <th class="text-danger">預排抽查日</th>
-                <th>實際抽查日</th>
-                <th>抽查分數</th>
-                <th>交車日期</th>
-                <th>許可證到期日</th>
-                <th>現場名稱</th>
-                <th>保養別</th>
-                <th>機型</th>
-                <th>保養人員</th>
-                <!--<th>建檔人</th>-->
-                <th>建檔時間</th>
-                <?php if ($user_auth&2) { ?>
-                <th>修改</th>
-                <th>刪除</th>
-                <?php } ?>
-            </tr>
-        </thead>
-        <tbody>
-        <?php
-        foreach($data as $data) :
-            $sql = "select f.maintainance, f.facility_kind, f.repairerid, f.takecertificatedate, f.licensedate, c.company from facility f, contract c where f.contractno = c.contractno and f.facilityno = '".$data['facilityno']."'";
-            $res = mysqli_query($link, $sql);
-            $row = mysqli_fetch_row($res);
-            list($maintainance, $facility_kind, $repairerid, $takecertificatedate, $licensedate, $company) = $row;
-            mysqli_free_result($res);
-        ?>
-            <tr>
-                <td><?php echo $data['id']; ?></td>
-                <td><?php echo $data['facilityno']; ?></td>
-                <td><?php echo $data['check_date']; ?></td>
-                <td><?php echo $data['actual_date']; ?></td>
-                <td><?php if ($data['score']) echo $data['score']."/100"; ?></td>
-                <td><?php echo $takecertificatedate; ?></td>
-                <td><?php echo $licensedate; ?></td>
-                <td><?php echo $company; ?></td>
-                <td><?php echo $maintainance_arr[$maintainance]; ?></td>
-                <td><?php echo $facility_kind; ?></td>
-                <td><?php echo $account_arr[$repairerid]; ?></td>
-                <!--<td><?php echo $data['creater']; ?></td>-->
-                <td><?php echo $data['create_at']; ?></td>
-                <?php if ($user_auth&2) { ?>
-                <td>
-                    <p>
-                        <a href="schedule_check-edit.php?id=<?php echo $data['id']; ?>&function_name=schedule_check&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-                            <span class="glyphicon glyphicon-pencil"></span>
-                        </a>
-                    </p> 
-                </td>
-                <td>
-                    <p>
-                        <a href="schedule_check-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-                            <span class="glyphicon glyphicon-remove"></span>
-                        </a>
-                    </p> 
-                </td>
-                <?php } ?>
-            </tr>
-        <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
-<?php
-} else {
-    echo "<h2>There is no record!</h2>";
-}
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
+<?php
+include "header.php";
+
+$maintainance_arr = ["A" => "全包", "B" => "半包", "C" => "清包", "D" => "2個月保養一次"];
+// 設置一個空陣列來放資料
+$data = $account_arr = array();
+
+$db_query = "select accountid, name from account where accounttype = 'B' order by id";
+$res = mysqli_query($link, $db_query);
+while ($row = mysqli_fetch_array($res)) {
+    $account_arr[$row["accountid"]] = $row["name"];
+}
+mysqli_free_result($res);
+
+// sql語法存在變數中
+$sql = "select * from schedule_check order by id";
+// 用mysqli_query方法執行(sql語法)將結果存在變數中
+$data = mysqli_query($link, $sql);
+
+if ($user_auth&2) {
+?>
+<p>
+<a href="#" id="btn_import" class="btn btn-info btn-sm">
+    <span class="glyphicon glyphicon-refresh"></span>
+</a>
+</p>
+<?php
+}
+if ($data) {
+?>
+<style>
+table {
+    table-layout:fixed;
+    width: 100%;
+}
+td {
+    word-wrap:break-word;
+}
+img {
+    width:125px;
+}
+.width_style_1 {
+    width:125px;
+}
+table {
+    width:100%;
+}
+th, td {
+    text-align: center;
+}
+#table_index_filter {
+    float:right;
+}
+#table_index_paginate {
+    float:right;
+}
+label {
+    display: inline-flex;
+    margin-bottom: .5rem;
+    margin-top: .5rem;
+}
+</style>
+<script>
+$(function() {
+    $('#btn_import').click(function(){
+        var formdata = new FormData();
+        var xhr = new XMLHttpRequest();
+        xhr.onreadystatechange = function(){
+            if(this.readyState == 4 && this.status == 200){
+                data = JSON.parse(this.responseText);
+                if (data.st == 'ok') {
+                    alert("資料已匯入！");
+                    location.reload();
+                    return;
+                } else {
+                    alert("系統忙碌，請重新操作！");
+                    return;
+                }
+            }
+        }
+        xhr.open('GET','schedule_check-import.php?<?php echo $token_link; ?>',true);
+        xhr.send(formdata);
+    });
+});
+</script>
+<div style="overflow-x:auto;">
+    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+        <thead>
+            <tr>
+                <th>項次</th>
+                <th>電梯ID</th>
+                <th class="text-danger">預排抽查日</th>
+                <th>實際抽查日</th>
+                <th>抽查分數</th>
+                <th>交車日期</th>
+                <th>許可證到期日</th>
+                <th>現場名稱</th>
+                <th>保養別</th>
+                <th>機型</th>
+                <th>保養人員</th>
+                <!--<th>建檔人</th>-->
+                <th>建檔時間</th>
+                <?php if ($user_auth&2) { ?>
+                <th>修改</th>
+                <th>刪除</th>
+                <?php } ?>
+            </tr>
+        </thead>
+        <tbody>
+        <?php
+        foreach($data as $data) :
+            $sql = "select f.maintainance, f.facility_kind, f.repairerid, f.takecertificatedate, f.licensedate, c.company from facility f, contract c where f.contractno = c.contractno and f.facilityno = '".$data['facilityno']."'";
+            $res = mysqli_query($link, $sql);
+            $row = mysqli_fetch_row($res);
+            list($maintainance, $facility_kind, $repairerid, $takecertificatedate, $licensedate, $company) = $row;
+            mysqli_free_result($res);
+        ?>
+            <tr>
+                <td><?php echo $data['id']; ?></td>
+                <td><?php echo $data['facilityno']; ?></td>
+                <td><?php echo $data['check_date']; ?></td>
+                <td><?php echo $data['actual_date']; ?></td>
+                <td><?php if ($data['score']) echo $data['score']."/100"; ?></td>
+                <td><?php echo $takecertificatedate; ?></td>
+                <td><?php echo $licensedate; ?></td>
+                <td><?php echo $company; ?></td>
+                <td><?php echo $maintainance_arr[$maintainance]; ?></td>
+                <td><?php echo $facility_kind; ?></td>
+                <td><?php echo $account_arr[$repairerid]; ?></td>
+                <!--<td><?php echo $data['creater']; ?></td>-->
+                <td><?php echo $data['create_at']; ?></td>
+                <?php if ($user_auth&2) { ?>
+                <td>
+                    <p>
+                        <a href="schedule_check-edit.php?id=<?php echo $data['id']; ?>&function_name=schedule_check&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+                            <span class="glyphicon glyphicon-pencil"></span>
+                        </a>
+                    </p> 
+                </td>
+                <td>
+                    <p>
+                        <a href="schedule_check-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+                            <span class="glyphicon glyphicon-remove"></span>
+                        </a>
+                    </p> 
+                </td>
+                <?php } ?>
+            </tr>
+        <?php endforeach; ?>
+        </tbody>
+    </table>
+</div>
+<?php
+} else {
+    echo "<h2>There is no record!</h2>";
+}
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/schedule_check-record-submit.php b/wms/schedule_check-record-submit.php
index 0421b176..4f7372eb 100644
--- a/wms/schedule_check-record-submit.php
+++ b/wms/schedule_check-record-submit.php
@@ -1,43 +1,43 @@
-<?php
-require_once "database.php";
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    //print_r($_POST);exit;
-    foreach ($_POST as $k => $v) {
-        $$k = htmlspecialchars(stripslashes(trim($v)));
-    }
-    $arr = [];
-    $sel_option_arr = explode(",", $sel_option_all);
-    foreach ($sel_option_arr as $val) {
-         list($kind, $no, $score) = explode("-", $val);
-         $item_no = str_pad($no, 2, "0", STR_PAD_LEFT);
-         $arr[$kind][$item_no] = $score;
-    }
-    $record = json_encode($arr, JSON_UNESCAPED_UNICODE);
-    $creater = $updater = substr($_COOKIE["token"], 0, strpos($_COOKIE["token"],"."));
-
-    $db_query  = "insert into schedule_check (facilityno, check_date, address, combo_type, facility_kind, facilitok_date, ";
-    $db_query .= "repairerid, record, score, memo, creater, updater) values ";
-    $db_query .= "('$facilityno', '$check_date', '$address', '$combo_type', '$facility_kind', '$facilitok_date', ";
-    $db_query .= "'$repairerid', '$record', '$db_total_score', '$memo', '$creater', '$updater')";
-    $result = mysqli_query($link,$db_query);
-    if (mysqli_affected_rows($link)>0) {
-    // 如果有一筆以上代表有更新
-    // mysqli_insert_id可以抓到第一筆的id
-        $new_id= mysqli_insert_id ($link);
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功')";
-        echo "</script>";  
-    }
-    elseif(mysqli_affected_rows($link)==0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料')";
-        echo "</script>"; 
-    }
-    else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-
-    mysqli_close($link);
-}
+<?php
+require_once "database.php";
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    //print_r($_POST);exit;
+    foreach ($_POST as $k => $v) {
+        $$k = htmlspecialchars(stripslashes(trim($v)));
+    }
+    $arr = [];
+    $sel_option_arr = explode(",", $sel_option_all);
+    foreach ($sel_option_arr as $val) {
+         list($kind, $no, $score) = explode("-", $val);
+         $item_no = str_pad($no, 2, "0", STR_PAD_LEFT);
+         $arr[$kind][$item_no] = $score;
+    }
+    $record = json_encode($arr, JSON_UNESCAPED_UNICODE);
+    $creater = $updater = substr($_COOKIE["token"], 0, strpos($_COOKIE["token"],"."));
+
+    $db_query  = "insert into schedule_check (facilityno, check_date, address, combo_type, facility_kind, facilitok_date, ";
+    $db_query .= "repairerid, record, score, memo, creater, updater) values ";
+    $db_query .= "('$facilityno', '$check_date', '$address', '$combo_type', '$facility_kind', '$facilitok_date', ";
+    $db_query .= "'$repairerid', '$record', '$db_total_score', '$memo', '$creater', '$updater')";
+    $result = mysqli_query($link,$db_query);
+    if (mysqli_affected_rows($link)>0) {
+    // 如果有一筆以上代表有更新
+    // mysqli_insert_id可以抓到第一筆的id
+        $new_id= mysqli_insert_id ($link);
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功')";
+        echo "</script>";  
+    }
+    elseif(mysqli_affected_rows($link)==0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料')";
+        echo "</script>"; 
+    }
+    else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+
+    mysqli_close($link);
+}
 ?>
\ No newline at end of file
diff --git a/wms/schedule_check-record-update.php b/wms/schedule_check-record-update.php
index 10c815ea..5aaefd4d 100644
--- a/wms/schedule_check-record-update.php
+++ b/wms/schedule_check-record-update.php
@@ -1,39 +1,39 @@
-<?php
-include "header.php";
-//print_r($_POST);exit;
-if (isset($_POST['update'])) {
-    foreach ($_POST as $k => $v) {
-        $$k = htmlspecialchars(stripslashes(trim($v)));
-    }
-    $arr = [];
-    $sel_option_arr = explode(",", $sel_option_all);
-    foreach ($sel_option_arr as $val) {
-         list($kind, $no, $score) = explode("-", $val);
-         $item_no = str_pad($no, 2, "0", STR_PAD_LEFT);
-         $arr[$kind][$item_no] = $score;
-    }
-    $record = json_encode($arr, JSON_UNESCAPED_UNICODE);
-
-    $db_query  = "update schedule_check set actual_date = '".date("Y-m-d")."', record = '$record', score = '$db_total_score', memo = '$memo', updater = '$user_id' where id = '$id'";
-    mysqli_query($link, $db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-}
-    if ($affected > 0) {
-    // 如果有一筆以上代表有更新
-    // mysqli_insert_id可以抓到第一筆的id
-        //$new_id= mysqli_insert_id ($link);
-        echo "<script type = 'text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='schedule_check-index.php?function_name=schedule_check&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type = 'text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='schedule_check-index.php?function_name=schedule_check&".$token_link."';";
-        echo "</script>"; 
-    }
-    else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
+<?php
+include "header.php";
+//print_r($_POST);exit;
+if (isset($_POST['update'])) {
+    foreach ($_POST as $k => $v) {
+        $$k = htmlspecialchars(stripslashes(trim($v)));
+    }
+    $arr = [];
+    $sel_option_arr = explode(",", $sel_option_all);
+    foreach ($sel_option_arr as $val) {
+         list($kind, $no, $score) = explode("-", $val);
+         $item_no = str_pad($no, 2, "0", STR_PAD_LEFT);
+         $arr[$kind][$item_no] = $score;
+    }
+    $record = json_encode($arr, JSON_UNESCAPED_UNICODE);
+
+    $db_query  = "update schedule_check set actual_date = '".date("Y-m-d")."', record = '$record', score = '$db_total_score', memo = '$memo', updater = '$user_id' where id = '$id'";
+    mysqli_query($link, $db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+}
+    if ($affected > 0) {
+    // 如果有一筆以上代表有更新
+    // mysqli_insert_id可以抓到第一筆的id
+        //$new_id= mysqli_insert_id ($link);
+        echo "<script type = 'text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='schedule_check-index.php?function_name=schedule_check&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type = 'text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='schedule_check-index.php?function_name=schedule_check&".$token_link."';";
+        echo "</script>"; 
+    }
+    else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
 ?>
\ No newline at end of file
diff --git a/wms/schedule_star-index.php b/wms/schedule_star-index.php
index 2f9e7749..0b6aec55 100644
--- a/wms/schedule_star-index.php
+++ b/wms/schedule_star-index.php
@@ -1,223 +1,223 @@
-<?php
-include "header.php";
-
-// 設置一個空陣列來放資料
-$data = $contractno_arr = $company_arr = array();
-$test_arr = ["B000000001", "Sky", "Aaron"];
-
-$tds = date("Y-m-d");
-$sdate = ($_REQUEST["sdate"]) ? $_REQUEST["sdate"] : "2022-01-01";  // default
-$edate = ($_REQUEST["edate"]) ? $_REQUEST["edate"] : $tds;
-if ($edate < $sdate) {
-    $st_date = $edate;
-    $ed_date = $sdate;
-} else {
-    $st_date = $sdate;
-    $ed_date = $edate;
-}
-
-// stars   |stars_b2|customer_signature     :面評
-// stars_c1|stars_c2|customer_self_signature:事後評
-$db_query  = "select id, contractno, repairerid, repairername, stars, stars_b2, stars_c1, stars_c2 from schedule ";
-$db_query .= "where actualdate >= '$st_date 00:00:00' and actualdate <= '$ed_date 23:59:59'";
-//echo $db_query;
-$res = mysqli_query($link, $db_query);
-while ($row = mysqli_fetch_array($res)) {
-    if (in_array($row["repairerid"], $test_arr)) continue;
-    $data[$row["repairerid"]]["id"][] = $row["id"];
-    $contractno_arr[$row["contractno"]] = 1;
-    $data[$row["repairerid"]]["contractno"][$row["contractno"]] = 1;
-    $data[$row["repairerid"]]["repairername"] = $row["repairername"];
-    //if (!$row["evidences"]) $data[$row["repairerid"]]["no_evidences"]++;                // 未上傳照片
-    //if (!$row["customer_self_signature"]) $data[$row["repairerid"]]["no_signature"]++;  // 客戶未簽名
-    
-    $stars1 = ($row["stars_c1"]) ? $row["stars_c1"] : $row["stars"];        // 保養品質
-    $stars2 = ($row["stars_c2"]) ? $row["stars_c2"] : $row["stars_b2"];     // 服務態度
-    //$signature = ($row["customer_self_signature"]) ? $row["customer_self_signature"] : $row["customer_signature"];  // 客戶簽名
-    $data[$row["repairerid"]]["s1_eval_total"]++;
-    if ($stars1 > 0) {
-        $data[$row["repairerid"]]["s1_score"] += $stars1;
-        $data[$row["repairerid"]]["s1_eval_real"]++;
-        $data[$row["repairerid"]]["s1_eval_yet"] = 0 + $data[$row["repairerid"]]["s1_eval_yet"];
-    } else {
-        $data[$row["repairerid"]]["s1_score"] += 0 + $stars1;
-        $data[$row["repairerid"]]["s1_eval_yet"]++;
-        $data[$row["repairerid"]]["s1_eval_real"] = 0 + $data[$row["repairerid"]]["s1_eval_real"];
-    }
-    $data[$row["repairerid"]]["s2_eval_total"]++;
-    if ($stars2 > 0) {
-        $data[$row["repairerid"]]["s2_score"] += $stars2;
-        $data[$row["repairerid"]]["s2_eval_real"]++;
-        $data[$row["repairerid"]]["s2_eval_yet"] = 0 + $data[$row["repairerid"]]["s2_eval_yet"];
-    } else {
-        $data[$row["repairerid"]]["s2_score"] += 0 + $stars2;
-        $data[$row["repairerid"]]["s2_eval_yet"]++;
-        $data[$row["repairerid"]]["s2_eval_real"] = 0 + $data[$row["repairerid"]]["s2_eval_real"];
-    }
-}
-mysqli_free_result($res);
-
-if ($data) {
-    // 查詢保養照片
-    $sidraw_arr = $sid_arr = [];
-    $image_directory = "../app/maintenance_uploads/";
-    //$photo_arr = glob($image_directory."*.*");
-    //print_r($photo_arr);
-    $handle = opendir($image_directory);
-    while (false!==($file = readdir($handle))) {
-        if (preg_match("/^\d+-[after|before]{1}/", $file, $matches)) {
-            $sidraw_arr[] = substr($matches[0], 0, strpos($matches[0], "-"));
-        }
-    }
-    closedir($handle);
-    $sid_arr = array_unique($sidraw_arr);
-
-    // 統計保養上傳照片狀況
-    foreach ($data as $k => $v) {
-        foreach ($v["id"] as $val) {
-            if (in_array($val, $sid_arr)) $photo_arr[$k]["upload"]++;
-        }
-        $photo_arr[$k]["total"] = count($v["id"]);
-    }
-
-    // 查詢登入過的客戶帳號;日後再改成撈DB
-    $account_path_arr = glob("../app/account_log/M*.ini");
-    foreach ($account_path_arr as $filename) {
-        if (preg_match("/M[0-9]{6}/", $filename, $matches)) {
-            $login_arr[$matches[0]] = 1;
-        }
-    }
-
-    $sql = "select contractno, company from contract where contractno in ('".implode("','", array_keys($contractno_arr))."')";
-    $res = mysqli_query($link, $sql);
-    while ($row = mysqli_fetch_array($res)) {
-        $company_arr[$row["contractno"]] = $row["company"];
-    }
-    mysqli_free_result($res);
-?>
-<style>
-table {
-    table-layout:fixed;
-    width: 100%;
-}
-td {
-    word-wrap:break-word;
-}
-img {
-    width:125px;
-}
-.width_style_1 {
-    width:125px;
-}
-table {
-    width:100%;
-}
-th, td {
-    text-align: center;
-}
-#table_index_filter {
-    float:right;
-}
-#table_index_paginate {
-    float:right;
-}
-label {
-    display: inline-flex;
-    margin-bottom: .5rem;
-    margin-top: .5rem;
-}
-</style>
-<script>
-$(document).ready(function() {
-    // 隱藏分頁
-    $("select[name=table_index_length]").val(100).trigger("change");
-    $(".dataTables_length").hide();
-    $(".dataTables_info").hide();
-    $("#table_index_paginate").hide();
-} );
-</script>
-<div class="container" style="float:left;">
-<form method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>">
-實際保養日期：
-<input type="date" name="sdate" id="sdate" value="<?php echo $st_date; ?>">～<input type="date" name="edate" id="edate" value="<?php echo $ed_date; ?>">
-<button type="submit" name="btn_srh">搜尋</button>　
-<small>* 平均分數 = 實評分數總和 / 應評件數</small>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
-</form>
-</div>
-<div style="overflow-x:auto;float:right">
-    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-        <thead>
-            <tr>
-                <th rowspan="2">項次</th>
-                <th rowspan="2">人員<br>代號</th>
-                <th rowspan="2">人員<br>名稱</th>
-                <th colspan="5">保養品質</th>
-                <th colspan="5">服務態度</th>
-                <th style="width:34%" colspan="2">備註</th>
-            </tr>
-            <tr>
-                <th>應評</th>
-                <th>未評</th>
-                <th>實評</th>
-                <th>實評比例</th>
-                <th>平均分數</th>
-                <th>應評</th>
-                <th>未評</th>
-                <th>實評</th>
-                <th>實評比例</th>
-                <th>平均分數</th>
-                <th>未上傳照片</th>
-                <!--<th>客戶<br>未簽名</th>-->
-                <th>客戶未登入(註冊)</th>
-            </tr>
-        </thead>
-        <tbody>
-        <?php
-        $i = 0;
-        foreach($data as $rid => $val) :
-            $i++;
-            $customer_nologin = 0;
-            $customer_nologin_list = "";
-            foreach ($val["contractno"] as $ckey => $cval) {
-                if (!array_key_exists($ckey, $login_arr)) {
-                    $customer_nologin++;
-                    $customer_nologin_list .= $ckey." ".$company_arr[$ckey]."<br>";
-                }
-            }
-        ?>
-            <tr>
-                <td><?php echo $i; ?></td>
-                <td class="text-nowrap"><?php echo $rid; ?></td>
-                <td class="text-nowrap"><?php echo $val['repairername']; ?></td>
-                <td><?php echo $val['s1_eval_total']; ?></td>
-                <td><?php echo $val['s1_eval_yet']; ?></td>
-                <td><?php echo $val['s1_eval_real']; ?></td>
-                <td><?php echo number_format(($val['s1_eval_real']/$val['s1_eval_total'])*100,1); ?>%</td>
-                <td><?php echo ($val['s1_eval_real']) ? number_format($val['s1_score']/$val['s1_eval_total'], 1) : 0; ?></td>
-                <td><?php echo $val['s2_eval_total']; ?></td>
-                <td><?php echo $val['s2_eval_yet']; ?></td>
-                <td><?php echo $val['s2_eval_real']; ?></td>
-                <td><?php echo number_format(($val['s2_eval_real']/$val['s2_eval_total'])*100,1); ?>%</td>
-                <td><?php echo ($val['s2_eval_real']) ? number_format($val['s2_score']/$val['s2_eval_total'], 1) : 0; ?></td>
-                <!--<td><?php echo ($val['no_evidences']) ? $val['no_evidences'] : 0; ?></td>
-                <td><?php echo ($val['no_signature']) ? $val['no_signature'] : 0; ?></td>-->
-                <td><?php echo $photo_arr[$rid]["total"] - $photo_arr[$rid]["upload"]; ?></td>
-                <td><a data-toggle="collapse" data-target="#cust<?php echo $i; ?>" role="button"><?php echo $customer_nologin; ?></a>
-                    <div id="cust<?php echo $i; ?>" class="collapse small text-left"><?php echo $customer_nologin_list; ?></div>
-                </td>
-            </tr>
-        <?php endforeach; ?>
-        </tbody>
-    </table>
-</div>
-<?php
-} else {
-    echo "<h2>There is no record!</h2>";
-}
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
+<?php
+include "header.php";
+
+// 設置一個空陣列來放資料
+$data = $contractno_arr = $company_arr = array();
+$test_arr = ["B000000001", "Sky", "Aaron"];
+
+$tds = date("Y-m-d");
+$sdate = ($_REQUEST["sdate"]) ? $_REQUEST["sdate"] : "2022-01-01";  // default
+$edate = ($_REQUEST["edate"]) ? $_REQUEST["edate"] : $tds;
+if ($edate < $sdate) {
+    $st_date = $edate;
+    $ed_date = $sdate;
+} else {
+    $st_date = $sdate;
+    $ed_date = $edate;
+}
+
+// stars   |stars_b2|customer_signature     :面評
+// stars_c1|stars_c2|customer_self_signature:事後評
+$db_query  = "select id, contractno, repairerid, repairername, stars, stars_b2, stars_c1, stars_c2 from schedule ";
+$db_query .= "where actualdate >= '$st_date 00:00:00' and actualdate <= '$ed_date 23:59:59'";
+//echo $db_query;
+$res = mysqli_query($link, $db_query);
+while ($row = mysqli_fetch_array($res)) {
+    if (in_array($row["repairerid"], $test_arr)) continue;
+    $data[$row["repairerid"]]["id"][] = $row["id"];
+    $contractno_arr[$row["contractno"]] = 1;
+    $data[$row["repairerid"]]["contractno"][$row["contractno"]] = 1;
+    $data[$row["repairerid"]]["repairername"] = $row["repairername"];
+    //if (!$row["evidences"]) $data[$row["repairerid"]]["no_evidences"]++;                // 未上傳照片
+    //if (!$row["customer_self_signature"]) $data[$row["repairerid"]]["no_signature"]++;  // 客戶未簽名
+    
+    $stars1 = ($row["stars_c1"]) ? $row["stars_c1"] : $row["stars"];        // 保養品質
+    $stars2 = ($row["stars_c2"]) ? $row["stars_c2"] : $row["stars_b2"];     // 服務態度
+    //$signature = ($row["customer_self_signature"]) ? $row["customer_self_signature"] : $row["customer_signature"];  // 客戶簽名
+    $data[$row["repairerid"]]["s1_eval_total"]++;
+    if ($stars1 > 0) {
+        $data[$row["repairerid"]]["s1_score"] += $stars1;
+        $data[$row["repairerid"]]["s1_eval_real"]++;
+        $data[$row["repairerid"]]["s1_eval_yet"] = 0 + $data[$row["repairerid"]]["s1_eval_yet"];
+    } else {
+        $data[$row["repairerid"]]["s1_score"] += 0 + $stars1;
+        $data[$row["repairerid"]]["s1_eval_yet"]++;
+        $data[$row["repairerid"]]["s1_eval_real"] = 0 + $data[$row["repairerid"]]["s1_eval_real"];
+    }
+    $data[$row["repairerid"]]["s2_eval_total"]++;
+    if ($stars2 > 0) {
+        $data[$row["repairerid"]]["s2_score"] += $stars2;
+        $data[$row["repairerid"]]["s2_eval_real"]++;
+        $data[$row["repairerid"]]["s2_eval_yet"] = 0 + $data[$row["repairerid"]]["s2_eval_yet"];
+    } else {
+        $data[$row["repairerid"]]["s2_score"] += 0 + $stars2;
+        $data[$row["repairerid"]]["s2_eval_yet"]++;
+        $data[$row["repairerid"]]["s2_eval_real"] = 0 + $data[$row["repairerid"]]["s2_eval_real"];
+    }
+}
+mysqli_free_result($res);
+
+if ($data) {
+    // 查詢保養照片
+    $sidraw_arr = $sid_arr = [];
+    $image_directory = "../app/maintenance_uploads/";
+    //$photo_arr = glob($image_directory."*.*");
+    //print_r($photo_arr);
+    $handle = opendir($image_directory);
+    while (false!==($file = readdir($handle))) {
+        if (preg_match("/^\d+-[after|before]{1}/", $file, $matches)) {
+            $sidraw_arr[] = substr($matches[0], 0, strpos($matches[0], "-"));
+        }
+    }
+    closedir($handle);
+    $sid_arr = array_unique($sidraw_arr);
+
+    // 統計保養上傳照片狀況
+    foreach ($data as $k => $v) {
+        foreach ($v["id"] as $val) {
+            if (in_array($val, $sid_arr)) $photo_arr[$k]["upload"]++;
+        }
+        $photo_arr[$k]["total"] = count($v["id"]);
+    }
+
+    // 查詢登入過的客戶帳號;日後再改成撈DB
+    $account_path_arr = glob("../app/account_log/M*.ini");
+    foreach ($account_path_arr as $filename) {
+        if (preg_match("/M[0-9]{6}/", $filename, $matches)) {
+            $login_arr[$matches[0]] = 1;
+        }
+    }
+
+    $sql = "select contractno, company from contract where contractno in ('".implode("','", array_keys($contractno_arr))."')";
+    $res = mysqli_query($link, $sql);
+    while ($row = mysqli_fetch_array($res)) {
+        $company_arr[$row["contractno"]] = $row["company"];
+    }
+    mysqli_free_result($res);
+?>
+<style>
+table {
+    table-layout:fixed;
+    width: 100%;
+}
+td {
+    word-wrap:break-word;
+}
+img {
+    width:125px;
+}
+.width_style_1 {
+    width:125px;
+}
+table {
+    width:100%;
+}
+th, td {
+    text-align: center;
+}
+#table_index_filter {
+    float:right;
+}
+#table_index_paginate {
+    float:right;
+}
+label {
+    display: inline-flex;
+    margin-bottom: .5rem;
+    margin-top: .5rem;
+}
+</style>
+<script>
+$(document).ready(function() {
+    // 隱藏分頁
+    $("select[name=table_index_length]").val(100).trigger("change");
+    $(".dataTables_length").hide();
+    $(".dataTables_info").hide();
+    $("#table_index_paginate").hide();
+} );
+</script>
+<div class="container" style="float:left;">
+<form method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>">
+實際保養日期：
+<input type="date" name="sdate" id="sdate" value="<?php echo $st_date; ?>">～<input type="date" name="edate" id="edate" value="<?php echo $ed_date; ?>">
+<button type="submit" name="btn_srh">搜尋</button>　
+<small>* 平均分數 = 實評分數總和 / 應評件數</small>
+<input type="hidden" name="token" value="<?php echo $token; ?>">
+</form>
+</div>
+<div style="overflow-x:auto;float:right">
+    <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+        <thead>
+            <tr>
+                <th rowspan="2">項次</th>
+                <th rowspan="2">人員<br>代號</th>
+                <th rowspan="2">人員<br>名稱</th>
+                <th colspan="5">保養品質</th>
+                <th colspan="5">服務態度</th>
+                <th style="width:34%" colspan="2">備註</th>
+            </tr>
+            <tr>
+                <th>應評</th>
+                <th>未評</th>
+                <th>實評</th>
+                <th>實評比例</th>
+                <th>平均分數</th>
+                <th>應評</th>
+                <th>未評</th>
+                <th>實評</th>
+                <th>實評比例</th>
+                <th>平均分數</th>
+                <th>未上傳照片</th>
+                <!--<th>客戶<br>未簽名</th>-->
+                <th>客戶未登入(註冊)</th>
+            </tr>
+        </thead>
+        <tbody>
+        <?php
+        $i = 0;
+        foreach($data as $rid => $val) :
+            $i++;
+            $customer_nologin = 0;
+            $customer_nologin_list = "";
+            foreach ($val["contractno"] as $ckey => $cval) {
+                if (!array_key_exists($ckey, $login_arr)) {
+                    $customer_nologin++;
+                    $customer_nologin_list .= $ckey." ".$company_arr[$ckey]."<br>";
+                }
+            }
+        ?>
+            <tr>
+                <td><?php echo $i; ?></td>
+                <td class="text-nowrap"><?php echo $rid; ?></td>
+                <td class="text-nowrap"><?php echo $val['repairername']; ?></td>
+                <td><?php echo $val['s1_eval_total']; ?></td>
+                <td><?php echo $val['s1_eval_yet']; ?></td>
+                <td><?php echo $val['s1_eval_real']; ?></td>
+                <td><?php echo number_format(($val['s1_eval_real']/$val['s1_eval_total'])*100,1); ?>%</td>
+                <td><?php echo ($val['s1_eval_real']) ? number_format($val['s1_score']/$val['s1_eval_total'], 1) : 0; ?></td>
+                <td><?php echo $val['s2_eval_total']; ?></td>
+                <td><?php echo $val['s2_eval_yet']; ?></td>
+                <td><?php echo $val['s2_eval_real']; ?></td>
+                <td><?php echo number_format(($val['s2_eval_real']/$val['s2_eval_total'])*100,1); ?>%</td>
+                <td><?php echo ($val['s2_eval_real']) ? number_format($val['s2_score']/$val['s2_eval_total'], 1) : 0; ?></td>
+                <!--<td><?php echo ($val['no_evidences']) ? $val['no_evidences'] : 0; ?></td>
+                <td><?php echo ($val['no_signature']) ? $val['no_signature'] : 0; ?></td>-->
+                <td><?php echo $photo_arr[$rid]["total"] - $photo_arr[$rid]["upload"]; ?></td>
+                <td><a data-toggle="collapse" data-target="#cust<?php echo $i; ?>" role="button"><?php echo $customer_nologin; ?></a>
+                    <div id="cust<?php echo $i; ?>" class="collapse small text-left"><?php echo $customer_nologin_list; ?></div>
+                </td>
+            </tr>
+        <?php endforeach; ?>
+        </tbody>
+    </table>
+</div>
+<?php
+} else {
+    echo "<h2>There is no record!</h2>";
+}
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
 ?>
\ No newline at end of file
diff --git a/wms/scheduleapi.php b/wms/scheduleapi.php
index 4a4ad581..73edd6ed 100644
--- a/wms/scheduleapi.php
+++ b/wms/scheduleapi.php
@@ -1,55 +1,55 @@
-
-<?php
-// 载入db.php来连结资料库
-require_once "database.php";
-
-$accountid=$_REQUEST['accountid'];
-$contractno=$_REQUEST['contractno'];
-$facilitydata=[];//初始化
-
-if($_POST['type']=='schedule'){
-
-	$contractno   = $_POST["contractno"];//合同号
-	$creater      = $_POST["creater"];//建档人
-	$create_at     = date('Y/m/d H:i:s');//创建时间
-	$facilitynos=json_decode($_POST['facilitynos'], true);
-	$combonos=json_decode($_POST['combonos'], true);
-	$duedates=json_decode($_POST['duedates'], true);
-	$repairerids=json_decode($_POST['repairerids'], true);
-	$repairernames=json_decode($_POST['repairernames'], true);
-    $num=0;
-	for ($i = 0; $i<sizeof($facilitynos); $i++) {
-	    //判断套餐是否已经添加
-       $schedulesql = "SELECT * FROM schedule where facilityno='$facilitynos[$i]' and duedate='$duedates[$i]'";
-        $schedule_nums_rows=mysqli_num_rows(mysqli_query($link,$schedulesql));
-        if($schedule_nums_rows==0){
-            $db_query = "INSERT INTO schedule(contractno, facilityno, combono, repairerid, repairername, duedate, creater, create_at) VALUES ('$contractno', '$facilitynos[$i]', '$combonos[$i]', '$repairerids[$i]', '$repairernames[$i]', '$duedates[$i]', '$creater', '$create_at')";
-            $result = mysqli_query($link,$db_query);
-            if (mysqli_affected_rows($link)>0) {
-                $num++;
-            }
-        }
-	}
-    if ($num>0) {
-        $jsonres['code']='200';
-        $jsonres['num']=$num;
-        echo json_encode($jsonres);
-    }else{
-        $jsonres['code']='1';
-        $jsonres['num']=0;
-        echo json_encode($jsonres);
-
-    }
-
-}
-
-
-?>
-
-
-
-
-
-
-
-
+
+<?php
+// 载入db.php来连结资料库
+require_once "database.php";
+
+$accountid=$_REQUEST['accountid'];
+$contractno=$_REQUEST['contractno'];
+$facilitydata=[];//初始化
+
+if($_POST['type']=='schedule'){
+
+	$contractno   = $_POST["contractno"];//合同号
+	$creater      = $_POST["creater"];//建档人
+	$create_at     = date('Y/m/d H:i:s');//创建时间
+	$facilitynos=json_decode($_POST['facilitynos'], true);
+	$combonos=json_decode($_POST['combonos'], true);
+	$duedates=json_decode($_POST['duedates'], true);
+	$repairerids=json_decode($_POST['repairerids'], true);
+	$repairernames=json_decode($_POST['repairernames'], true);
+    $num=0;
+	for ($i = 0; $i<sizeof($facilitynos); $i++) {
+	    //判断套餐是否已经添加
+       $schedulesql = "SELECT * FROM schedule where facilityno='$facilitynos[$i]' and duedate='$duedates[$i]'";
+        $schedule_nums_rows=mysqli_num_rows(mysqli_query($link,$schedulesql));
+        if($schedule_nums_rows==0){
+            $db_query = "INSERT INTO schedule(contractno, facilityno, combono, repairerid, repairername, duedate, creater, create_at) VALUES ('$contractno', '$facilitynos[$i]', '$combonos[$i]', '$repairerids[$i]', '$repairernames[$i]', '$duedates[$i]', '$creater', '$create_at')";
+            $result = mysqli_query($link,$db_query);
+            if (mysqli_affected_rows($link)>0) {
+                $num++;
+            }
+        }
+	}
+    if ($num>0) {
+        $jsonres['code']='200';
+        $jsonres['num']=$num;
+        echo json_encode($jsonres);
+    }else{
+        $jsonres['code']='1';
+        $jsonres['num']=0;
+        echo json_encode($jsonres);
+
+    }
+
+}
+
+
+?>
+
+
+
+
+
+
+
+
diff --git a/wms/wipinstallation-create.php b/wms/wipinstallation-create.php
index 8fefbdba..381c83aa 100644
--- a/wms/wipinstallation-create.php
+++ b/wms/wipinstallation-create.php
@@ -1,77 +1,77 @@
-<?php
-include "header.php";
-?>
-<script>
-$(function () {
-    $('#accountid').keyup(function(){ $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); })
-    $('#facilityno').keyup(function(){ $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); })
-});
-</script>
-<div class="container">
-
-    <?php
-    
-        include "wipinstallation-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        
-    
-        <div>
-            <label for="accountid">客戶帳號</label>
-            <input type="text" name="accountid" id="accountid" maxlength="10" required>
-        </div>	
-		
-        <div>
-            <label for="facilityno">電梯編號</label>
-            <input type="text" name="facilityno" id="facilityno" required>
-        </div>			
-
-        <div>
-            <label for="issue_time">時間</label><br>
-            <input type="date" name="issue_time" id="issue_time" value="" required>
-        </div>	
-		
-        <div>
-            <label for="process">階段</label>
-            <select name="process" id="process" required>
-                <option value="">請選擇</option>
-                <option value="進場施工">進場施工</option>
-                <option value="安裝">安裝</option>
-                <option value="試車">試車</option>
-                <option value="交車">交車</option>
-            </select>
-        </div>	
-
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
-            <p class="error"><?php echo $creater_error; ?></p>
-        </div>
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-
-        <div>
-			<br>
-            <button type="submit" name="submit">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
+<?php
+include "header.php";
+?>
+<script>
+$(function () {
+    $('#accountid').keyup(function(){ $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); })
+    $('#facilityno').keyup(function(){ $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); })
+});
+</script>
+<div class="container">
+
+    <?php
+    
+        include "wipinstallation-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        
+    
+        <div>
+            <label for="accountid">客戶帳號</label>
+            <input type="text" name="accountid" id="accountid" maxlength="10" required>
+        </div>	
+		
+        <div>
+            <label for="facilityno">電梯編號</label>
+            <input type="text" name="facilityno" id="facilityno" required>
+        </div>			
+
+        <div>
+            <label for="issue_time">時間</label><br>
+            <input type="date" name="issue_time" id="issue_time" value="" required>
+        </div>	
+		
+        <div>
+            <label for="process">階段</label>
+            <select name="process" id="process" required>
+                <option value="">請選擇</option>
+                <option value="進場施工">進場施工</option>
+                <option value="安裝">安裝</option>
+                <option value="試車">試車</option>
+                <option value="交車">交車</option>
+            </select>
+        </div>	
+
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
+            <p class="error"><?php echo $creater_error; ?></p>
+        </div>
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+
+        <div>
+			<br>
+            <button type="submit" name="submit">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
diff --git a/wms/wipinstallation-delete.php b/wms/wipinstallation-delete.php
index f1baa93c..7cc2b5f4 100644
--- a/wms/wipinstallation-delete.php
+++ b/wms/wipinstallation-delete.php
@@ -1,12 +1,12 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "DELETE FROM wipinstallation WHERE id='$id'";
-mysqli_query($link, $db_query);	
-
-header("Refresh:0; url=wipinstallation-index.php?function_name=wipinstallation&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "DELETE FROM wipinstallation WHERE id='$id'";
+mysqli_query($link, $db_query);	
+
+header("Refresh:0; url=wipinstallation-index.php?function_name=wipinstallation&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/wipinstallation-edit.php b/wms/wipinstallation-edit.php
index 3d2673a1..ad2942e1 100644
--- a/wms/wipinstallation-edit.php
+++ b/wms/wipinstallation-edit.php
@@ -1,86 +1,86 @@
-<?php
-    include "header.php";
-
-    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-	
-	$data = array();
-	// sql语法存在变数中
-	$db_query = "SELECT * FROM wipinstallation WHERE id=$id";
-
-	// 用mysqli_query方法执行(sql语法)将结果存在变数中
-	$data = mysqli_query($link,$db_query);	
-/*
-    include "inc/record_update.php";
-    
-    try {	
-		// 设置一个空阵列来放资料
-		$data = array();
-		// sql语法存在变数中
-		$db_query = "SELECT * FROM expert WHERE id=$id";
-
-		// 用mysqli_query方法执行(sql语法)将结果存在变数中
-		$data = mysqli_query($link,$db_query);
-	}catch (Exception $e) {
-    echo 'Caught exception: ',  $e->getMessage(), "\n";
-	}
-*/	
-    foreach($data as $data) :
-?>
-<script>
-$(function () {
-    $('#accountid').keyup(function(){ $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); })
-    $('#facilityno').keyup(function(){ $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); })
-});
-</script>
-<div class="container">
-    <form class="form-inline" method="post" action="wipinstallation-record-update.php" enctype="multipart/form-data">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-		
-        <div>
-            <label for="accountid">客戶帳號</label>
-            <input type="text" name="accountid" id="accountid" value="<?php echo $data['accountid']; ?>" maxlength="10" required>
-        </div>	
-		
-        <div>
-            <label for="facilityno">電梯編號</label>
-            <input type="text" name="facilityno" id="facilityno" value="<?php echo $data['facilityno']; ?>" required>
-        </div>		
-
-        <div>
-            <label for="issue_time">時間</label><br>
-            <input type="date" name="issue_time" id="issue_time" value="<?php echo substr($data['issue_time'],0,10); ?>" required>
-        </div>	
-		
-        <div>
-            <label for="process">階段</label>
-            <select name="process" id="process" required>
-                <option value="">請選擇</option>
-                <option value="進場施工"<?php if ($data['process']=="進場施工") echo " selected"; ?>>進場施工</option>
-                <option value="安裝"<?php if ($data['process']=="安裝") echo " selected"; ?>>安裝</option>
-                <option value="試車"<?php if ($data['process']=="試車") echo " selected"; ?>>試車</option>
-                <option value="交車"<?php if ($data['process']=="交車") echo " selected"; ?>>交車</option>
-            </select>
-        </div>	
-
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
-        </div>
-		
-		
-        <div>
-			<br>
-            <button type="submit" name="update">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
-?>
-
+<?php
+    include "header.php";
+
+    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+	
+	$data = array();
+	// sql语法存在变数中
+	$db_query = "SELECT * FROM wipinstallation WHERE id=$id";
+
+	// 用mysqli_query方法执行(sql语法)将结果存在变数中
+	$data = mysqli_query($link,$db_query);	
+/*
+    include "inc/record_update.php";
+    
+    try {	
+		// 设置一个空阵列来放资料
+		$data = array();
+		// sql语法存在变数中
+		$db_query = "SELECT * FROM expert WHERE id=$id";
+
+		// 用mysqli_query方法执行(sql语法)将结果存在变数中
+		$data = mysqli_query($link,$db_query);
+	}catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+	}
+*/	
+    foreach($data as $data) :
+?>
+<script>
+$(function () {
+    $('#accountid').keyup(function(){ $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); })
+    $('#facilityno').keyup(function(){ $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); })
+});
+</script>
+<div class="container">
+    <form class="form-inline" method="post" action="wipinstallation-record-update.php" enctype="multipart/form-data">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+		
+        <div>
+            <label for="accountid">客戶帳號</label>
+            <input type="text" name="accountid" id="accountid" value="<?php echo $data['accountid']; ?>" maxlength="10" required>
+        </div>	
+		
+        <div>
+            <label for="facilityno">電梯編號</label>
+            <input type="text" name="facilityno" id="facilityno" value="<?php echo $data['facilityno']; ?>" required>
+        </div>		
+
+        <div>
+            <label for="issue_time">時間</label><br>
+            <input type="date" name="issue_time" id="issue_time" value="<?php echo substr($data['issue_time'],0,10); ?>" required>
+        </div>	
+		
+        <div>
+            <label for="process">階段</label>
+            <select name="process" id="process" required>
+                <option value="">請選擇</option>
+                <option value="進場施工"<?php if ($data['process']=="進場施工") echo " selected"; ?>>進場施工</option>
+                <option value="安裝"<?php if ($data['process']=="安裝") echo " selected"; ?>>安裝</option>
+                <option value="試車"<?php if ($data['process']=="試車") echo " selected"; ?>>試車</option>
+                <option value="交車"<?php if ($data['process']=="交車") echo " selected"; ?>>交車</option>
+            </select>
+        </div>	
+
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
+        </div>
+		
+		
+        <div>
+			<br>
+            <button type="submit" name="update">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php
+
+    endforeach;
+    
+    include "footer.php";
+
+?>
+
diff --git a/wms/wipinstallation-index.php b/wms/wipinstallation-index.php
index dbe01d62..7369c7c9 100644
--- a/wms/wipinstallation-index.php
+++ b/wms/wipinstallation-index.php
@@ -1,141 +1,141 @@
-<?php
-/**
- * 北=張潘榮(M0041) 中=林瑋隆(M0113) 南=韋宗榮(M0039)
- */
-include "header.php";
-
-// 設置一個空陣列來放資料
-$data = array();
-$inst_arr = ["M0041" => "北", "M0113" => "中", "M0039" => "南"];
-
-$sql_cmd = sql_myself($user_id);
-$sql2 = (empty($sql_cmd)) ? "" : "and a.region = '$inst_arr[$user_id]'";
-$sql = "select a.id, a.accountid, a.facilityno, a.issue_time, a.process, a.creater, a.create_at, b.custom from wipinstallation a, wipwholestatus b where a.accountid = b.contractno and a.facilityno = b.facilityno $sql2";
-$data = mysqli_query($link,$sql);
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="wipinstallation-create.php?function_name=wipinstallation&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-
-<?php
-}
-
-
-
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:wipinstallation-index.php");
-        }
-    }
-
-?>
-
-<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;
-   
-}
-
-</style>
-
-    <div style="overflow-x:auto;">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-            <tr>
-                <th>項次</th>
-                <th>客戶帳號</th>
-				<th>電梯編號</th>
-                <th>客戶名稱</th>
-                <th>時間</th>
-                <th>階段</th>
-                <th>建檔人</th>
-                <th>建檔時間</th>				
-                <?php if ($user_auth&2) { ?>
-                <th>修改</th>
-                <!--<th>刪除</th>-->
-                <?php } ?>
-            </tr>
-		</thead>
-		<tbody>			
-
-            <?php foreach($data as $data) : ?>    
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td><?php echo $data['accountid']; ?></td>
-                    <td><?php echo $data['facilityno']; ?></td>
-                    <td><?php echo $data['custom']; ?></td>
-                    <td><?php echo substr($data['issue_time'], 0, 10); ?></td>
-                    <td><?php echo $data['process']; ?></td>
-                    <td><?php echo $data['creater']; ?></td>
-                    <td><?php echo $data['create_at']; ?></td>
-                    <?php if ($user_auth&2) { ?>
-                    <td>
-						<p>
-							<a href="wipinstallation-edit.php?id=<?php echo $data['id']; ?>&function_name=wipinstallation&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-								<span class="glyphicon glyphicon-pencil"></span>
-							</a>
-						</p> 
-					</td>
-                    <!--<td>
-						<p>
-							<a href="wipinstallation-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-								<span class="glyphicon glyphicon-remove"></span>
-							</a>
-						</p> 
-					</td>-->
-                    <?php } ?>
-                </tr>
-            <?php endforeach; ?>
-			</tbody>			
-        </table>
-    </div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-
+<?php
+/**
+ * 北=張潘榮(M0041) 中=林瑋隆(M0113) 南=韋宗榮(M0039)
+ */
+include "header.php";
+
+// 設置一個空陣列來放資料
+$data = array();
+$inst_arr = ["M0041" => "北", "M0113" => "中", "M0039" => "南"];
+
+$sql_cmd = sql_myself($user_id);
+$sql2 = (empty($sql_cmd)) ? "" : "and a.region = '$inst_arr[$user_id]'";
+$sql = "select a.id, a.accountid, a.facilityno, a.issue_time, a.process, a.creater, a.create_at, b.custom from wipinstallation a, wipwholestatus b where a.accountid = b.contractno and a.facilityno = b.facilityno $sql2";
+$data = mysqli_query($link,$sql);
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth&2) { ?>
+<p>
+<a href="wipinstallation-create.php?function_name=wipinstallation&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+
+<?php
+}
+
+
+
+if($data):
+    
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:wipinstallation-index.php");
+        }
+    }
+
+?>
+
+<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;
+   
+}
+
+</style>
+
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+            <tr>
+                <th>項次</th>
+                <th>客戶帳號</th>
+				<th>電梯編號</th>
+                <th>客戶名稱</th>
+                <th>時間</th>
+                <th>階段</th>
+                <th>建檔人</th>
+                <th>建檔時間</th>				
+                <?php if ($user_auth&2) { ?>
+                <th>修改</th>
+                <!--<th>刪除</th>-->
+                <?php } ?>
+            </tr>
+		</thead>
+		<tbody>			
+
+            <?php foreach($data as $data) : ?>    
+                <tr>
+                    <td><?php echo $data['id']; ?></td>
+                    <td><?php echo $data['accountid']; ?></td>
+                    <td><?php echo $data['facilityno']; ?></td>
+                    <td><?php echo $data['custom']; ?></td>
+                    <td><?php echo substr($data['issue_time'], 0, 10); ?></td>
+                    <td><?php echo $data['process']; ?></td>
+                    <td><?php echo $data['creater']; ?></td>
+                    <td><?php echo $data['create_at']; ?></td>
+                    <?php if ($user_auth&2) { ?>
+                    <td>
+						<p>
+							<a href="wipinstallation-edit.php?id=<?php echo $data['id']; ?>&function_name=wipinstallation&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+								<span class="glyphicon glyphicon-pencil"></span>
+							</a>
+						</p> 
+					</td>
+                    <!--<td>
+						<p>
+							<a href="wipinstallation-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+						</p> 
+					</td>-->
+                    <?php } ?>
+                </tr>
+            <?php endforeach; ?>
+			</tbody>			
+        </table>
+    </div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+
 ?>
\ No newline at end of file
diff --git a/wms/wipinstallation-record-submit.php b/wms/wipinstallation-record-submit.php
index 1f3b684b..b6aa9ca8 100644
--- a/wms/wipinstallation-record-submit.php
+++ b/wms/wipinstallation-record-submit.php
@@ -1,42 +1,42 @@
-<?php
-$accountid= "";
-$facilityno= "";
-$issue_time= "";
-$process= "";
-$memo= "";
-$creater= "";
-$create_at= "";
-
-$accountid_error= "";
-$facilityno_error= "";
-$issue_time_error= "";
-$process_error= "";
-$memo_error= "";
-$creater_error= "";
-$create_at_error= "";
-
-
-
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    include "wipinstallation-user-input.php";
-
-    $db_query = "INSERT INTO wipinstallation(accountid, facilityno, issue_time, process,creater,create_at) VALUES ('$accountid', '$facilityno', '$issue_time', '$process', '$creater', '$create_at')";    	                      
-    $result = mysqli_query($link,$db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='wipinstallation-index.php?function_name=wipinstallation&".$token_link."';";
-        echo "</script>";  
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='wipinstallation-index.php?function_name=wipinstallation&".$token_link."';";
-        echo "</script>";
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
-?>
+<?php
+$accountid= "";
+$facilityno= "";
+$issue_time= "";
+$process= "";
+$memo= "";
+$creater= "";
+$create_at= "";
+
+$accountid_error= "";
+$facilityno_error= "";
+$issue_time_error= "";
+$process_error= "";
+$memo_error= "";
+$creater_error= "";
+$create_at_error= "";
+
+
+
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    include "wipinstallation-user-input.php";
+
+    $db_query = "INSERT INTO wipinstallation(accountid, facilityno, issue_time, process,creater,create_at) VALUES ('$accountid', '$facilityno', '$issue_time', '$process', '$creater', '$create_at')";    	                      
+    $result = mysqli_query($link,$db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='wipinstallation-index.php?function_name=wipinstallation&".$token_link."';";
+        echo "</script>";  
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='wipinstallation-index.php?function_name=wipinstallation&".$token_link."';";
+        echo "</script>";
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
+?>
diff --git a/wms/wipinstallation-record-update.php b/wms/wipinstallation-record-update.php
index 48cbbdb8..710daeb1 100644
--- a/wms/wipinstallation-record-update.php
+++ b/wms/wipinstallation-record-update.php
@@ -1,39 +1,39 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-    function user_input( $data ) {
-        $data1 = trim($data);
-        $data2 = stripslashes($data1);
-        $data3 = htmlspecialchars($data2);
-        return $data3;
-    }
-
-    $id     = $_POST['id'];
-    $accountid   = user_input($_POST["accountid"]);	
-    $facilityno   = user_input($_POST["facilityno"]);	
-    $issue_time	   = user_input($_POST["issue_time"]);	
-    $process       = user_input($_POST["process"]);	
-    $memo       = user_input($_POST["memo"]);	
-    $creater      = user_input($_POST["creater"]);	
-    $create_at     = date('Y/m/d H:i:s');
-
-    $db_query = "UPDATE wipinstallation set accountid = '$accountid', facilityno = '$facilityno', issue_time = '$issue_time', process = '$process', create_at = '$create_at' WHERE id='$id'";
-    mysqli_query($link, $db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='wipinstallation-index.php?function_name=wipinstallation&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='wipinstallation-index.php?function_name=wipinstallation&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if(isset($_POST['update'])) {
+    function user_input( $data ) {
+        $data1 = trim($data);
+        $data2 = stripslashes($data1);
+        $data3 = htmlspecialchars($data2);
+        return $data3;
+    }
+
+    $id     = $_POST['id'];
+    $accountid   = user_input($_POST["accountid"]);	
+    $facilityno   = user_input($_POST["facilityno"]);	
+    $issue_time	   = user_input($_POST["issue_time"]);	
+    $process       = user_input($_POST["process"]);	
+    $memo       = user_input($_POST["memo"]);	
+    $creater      = user_input($_POST["creater"]);	
+    $create_at     = date('Y/m/d H:i:s');
+
+    $db_query = "UPDATE wipinstallation set accountid = '$accountid', facilityno = '$facilityno', issue_time = '$issue_time', process = '$process', create_at = '$create_at' WHERE id='$id'";
+    mysqli_query($link, $db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='wipinstallation-index.php?function_name=wipinstallation&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='wipinstallation-index.php?function_name=wipinstallation&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/wipinstallation-user-input.php b/wms/wipinstallation-user-input.php
index b7889ead..835f61ea 100644
--- a/wms/wipinstallation-user-input.php
+++ b/wms/wipinstallation-user-input.php
@@ -1,54 +1,54 @@
-<?php
-
-//Function to filter the form input
-function user_input( $data ) {
-    $data1 = trim($data);
-    $data2 = stripslashes($data1);
-    $data3 = htmlspecialchars($data2);
-    return $data3;
-}
-
-
-$accountid   = user_input($_POST["accountid"]);	
-$facilityno   = user_input($_POST["facilityno"]);	
-$issue_time	   = user_input($_POST["issue_time"]);	
-$process       = user_input($_POST["process"]);	
-$memo       = user_input($_POST["memo"]);	
-$creater      = user_input($_POST["creater"]);	
-$create_at     = date('Y/m/d H:i:s');
-
-
-
-
-/*
-
-if(empty($_POST["name"])) {
-    $name_error = "Name is required";
-} else {
-    $name = user_input($_POST["name"]);
-    
-    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
-        $name_error = "Only letter and white space are allowed";
-    }
-}
-
-
-/*
-if(empty($_POST["website"])) {
-    $website_error = "Website address is required";
-} else {
-    $website = user_input($_POST["website"]);
-
-    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
-        $website_error = "Invalid website URL";
-    }
-}
-
-if(empty($_POST["comment"])) {
-    $comment = "";
-} else {
-    $comment = user_input($_POST["comment"]);
-}
-*/
-?>
-
+<?php
+
+//Function to filter the form input
+function user_input( $data ) {
+    $data1 = trim($data);
+    $data2 = stripslashes($data1);
+    $data3 = htmlspecialchars($data2);
+    return $data3;
+}
+
+
+$accountid   = user_input($_POST["accountid"]);	
+$facilityno   = user_input($_POST["facilityno"]);	
+$issue_time	   = user_input($_POST["issue_time"]);	
+$process       = user_input($_POST["process"]);	
+$memo       = user_input($_POST["memo"]);	
+$creater      = user_input($_POST["creater"]);	
+$create_at     = date('Y/m/d H:i:s');
+
+
+
+
+/*
+
+if(empty($_POST["name"])) {
+    $name_error = "Name is required";
+} else {
+    $name = user_input($_POST["name"]);
+    
+    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
+        $name_error = "Only letter and white space are allowed";
+    }
+}
+
+
+/*
+if(empty($_POST["website"])) {
+    $website_error = "Website address is required";
+} else {
+    $website = user_input($_POST["website"]);
+
+    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
+        $website_error = "Invalid website URL";
+    }
+}
+
+if(empty($_POST["comment"])) {
+    $comment = "";
+} else {
+    $comment = user_input($_POST["comment"]);
+}
+*/
+?>
+
diff --git a/wms/wipproduction-create.php b/wms/wipproduction-create.php
index 9539b355..fcc1fcfb 100644
--- a/wms/wipproduction-create.php
+++ b/wms/wipproduction-create.php
@@ -1,83 +1,83 @@
-<?php
-include "header.php";
-?>
-<script>
-$(function () {
-    $('#accountid').keyup(function(){ $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); })
-    $('#facilityno').keyup(function(){ $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); })
-});
-</script>
-<div class="container">
-
-    <?php
-    
-        include "wipproduction-record-submit.php";
-        /*
-        if($_SERVER["REQUEST_METHOD"] == "POST"){
-            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
-                echo "<p class='error'>Please fill up the required field!</p>";
-            } else {
-                echo "<p class='success'>Record has added successfully</p>";
-            }
-        }
-		*/
-    ?>
-
-    
-  
-    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
-        
-    
-        <div>
-            <label for="accountid">客戶帳號</label>
-            <input type="text" name="accountid" id="accountid" maxlength="10" required>
-        </div>	
-		
-        <div>
-            <label for="facilityno">電梯編號</label>
-            <input type="text" name="facilityno" id="facilityno" required>
-        </div>			
-
-        <div>
-            <label for="issue_time">時間</label><br>
-            <input type="date" name="issue_time" id="issue_time" value="" required>
-        </div>	
-		
-        <div>
-            <label for="process">階段</label>
-            <select name="process" id="process" required>
-                <option value="">請選擇</option>
-                <option value="投料生產">投料生產</option>
-                <option value="出貨">出貨</option>
-            </select>
-        </div>
-        <div>
-            <label for="region">區域</label>
-            <select name="region" id="region" required>
-                <option value="">請選擇</option>
-                <option value="北">北</option>
-                <option value="中">中</option>
-                <option value="南">南</option>
-            </select>
-        </div>
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
-            <p class="error"><?php echo $creater_error; ?></p>
-        </div>
-
-        <div>
-            <!-- <label for="create_at">create_at</label> -->
-            <input type="hidden" name="create_at" id="create_at">
-            <p class="error"><?php echo $create_at_error; ?></p>
-        </div>
-
-        <div>
-			<br>
-            <button type="submit" name="submit">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php include "footer.php"; ?>
+<?php
+include "header.php";
+?>
+<script>
+$(function () {
+    $('#accountid').keyup(function(){ $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); })
+    $('#facilityno').keyup(function(){ $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); })
+});
+</script>
+<div class="container">
+
+    <?php
+    
+        include "wipproduction-record-submit.php";
+        /*
+        if($_SERVER["REQUEST_METHOD"] == "POST"){
+            if(empty($_POST["id"]) && empty($_POST["expert_id"]) && empty($_POST["personal_id"])){
+                echo "<p class='error'>Please fill up the required field!</p>";
+            } else {
+                echo "<p class='success'>Record has added successfully</p>";
+            }
+        }
+		*/
+    ?>
+
+    
+  
+    <form class="form-inline" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>" enctype="multipart/form-data">
+        
+    
+        <div>
+            <label for="accountid">客戶帳號</label>
+            <input type="text" name="accountid" id="accountid" maxlength="10" required>
+        </div>	
+		
+        <div>
+            <label for="facilityno">電梯編號</label>
+            <input type="text" name="facilityno" id="facilityno" required>
+        </div>			
+
+        <div>
+            <label for="issue_time">時間</label><br>
+            <input type="date" name="issue_time" id="issue_time" value="" required>
+        </div>	
+		
+        <div>
+            <label for="process">階段</label>
+            <select name="process" id="process" required>
+                <option value="">請選擇</option>
+                <option value="投料生產">投料生產</option>
+                <option value="出貨">出貨</option>
+            </select>
+        </div>
+        <div>
+            <label for="region">區域</label>
+            <select name="region" id="region" required>
+                <option value="">請選擇</option>
+                <option value="北">北</option>
+                <option value="中">中</option>
+                <option value="南">南</option>
+            </select>
+        </div>
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $user_id; ?>" readonly>
+            <p class="error"><?php echo $creater_error; ?></p>
+        </div>
+
+        <div>
+            <!-- <label for="create_at">create_at</label> -->
+            <input type="hidden" name="create_at" id="create_at">
+            <p class="error"><?php echo $create_at_error; ?></p>
+        </div>
+
+        <div>
+			<br>
+            <button type="submit" name="submit">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php include "footer.php"; ?>
diff --git a/wms/wipproduction-delete.php b/wms/wipproduction-delete.php
index d52c33e7..57190b9e 100644
--- a/wms/wipproduction-delete.php
+++ b/wms/wipproduction-delete.php
@@ -1,12 +1,12 @@
-<?php
-ob_start();
-include "header.php";
-
-$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-
-$db_query = "DELETE FROM wipproduction WHERE id='$id'";
-mysqli_query($link, $db_query);	
-
-header("Refresh:0; url=wipproduction-index.php?function_name=wipproduction&".$token_link);
-ob_end_flush();
+<?php
+ob_start();
+include "header.php";
+
+$id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+
+$db_query = "DELETE FROM wipproduction WHERE id='$id'";
+mysqli_query($link, $db_query);	
+
+header("Refresh:0; url=wipproduction-index.php?function_name=wipproduction&".$token_link);
+ob_end_flush();
 ?>
\ No newline at end of file
diff --git a/wms/wipproduction-edit.php b/wms/wipproduction-edit.php
index ea2a822d..e818aee8 100644
--- a/wms/wipproduction-edit.php
+++ b/wms/wipproduction-edit.php
@@ -1,93 +1,93 @@
-<?php
-    include "header.php";
-
-    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
-	
-	$data = array();
-	// sql语法存在变数中
-	$db_query = "SELECT * FROM wipproduction WHERE id=$id";
-
-	// 用mysqli_query方法执行(sql语法)将结果存在变数中
-	$data = mysqli_query($link,$db_query);	
-/*
-    include "inc/record_update.php";
-    
-    try {	
-		// 设置一个空阵列来放资料
-		$data = array();
-		// sql语法存在变数中
-		$db_query = "SELECT * FROM expert WHERE id=$id";
-
-		// 用mysqli_query方法执行(sql语法)将结果存在变数中
-		$data = mysqli_query($link,$db_query);
-	}catch (Exception $e) {
-    echo 'Caught exception: ',  $e->getMessage(), "\n";
-	}
-*/	
-    foreach($data as $data) :
-?>
-<script>
-$(function () {
-    $('#accountid').keyup(function(){ $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); })
-    $('#facilityno').keyup(function(){ $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); })
-});
-</script>
-<div class="container">
-    <form class="form-inline" method="post" action="wipproduction-record-update.php" enctype="multipart/form-data">
-        <input type="hidden" name="id" value="<?php echo $id; ?>">
-		
-        <div>
-            <label for="accountid">客戶帳號</label>
-            <input type="text" name="accountid" id="accountid" value="<?php echo $data['accountid']; ?>" maxlength="10" required>
-        </div>	
-		
-        <div>
-            <label for="facilityno">電梯編號</label>
-            <input type="text" name="facilityno" id="facilityno" value="<?php echo $data['facilityno']; ?>" required>
-        </div>		
-
-        <div>
-            <label for="issue_time">時間</label><br>
-            <input type="date" name="issue_time" id="issue_time" value="<?php echo substr($data['issue_time'],0,10); ?>" required>
-        </div>	
-		
-        <div>
-            <label for="process">階段</label>
-            <select name="process" id="process" required>
-                <option value="">請選擇</option>
-                <option value="投料生產"<?php if ($data['process']=="投料生產") echo " selected"; ?>>投料生產</option>
-                <option value="出貨"<?php if ($data['process']=="出貨") echo " selected"; ?>>出貨</option>
-            </select>
-        </div>
-        <div>
-            <label for="region">區域</label>
-            <select name="region" id="region" required>
-                <option value="">請選擇</option>
-                <option value="北"<?php if ($data['region']=="北") echo " selected"; ?>>北</option>
-                <option value="中"<?php if ($data['region']=="中") echo " selected"; ?>>中</option>
-                <option value="南"<?php if ($data['region']=="南") echo " selected"; ?>>南</option>
-            </select>
-        </div>
-				
-        <div>
-            <label for="creater">建檔人</label>
-            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
-        </div>
-		
-		
-        <div>
-			<br>
-            <button type="submit" name="update">確定</button>
-        </div>
-        <input type="hidden" name="token" value="<?php echo $token; ?>">
-    </form>
-</div>
-
-<?php
-
-    endforeach;
-    
-    include "footer.php";
-
-?>
-
+<?php
+    include "header.php";
+
+    $id = isset($_GET['id']) ? $_GET['id'] : die('ERROR: Record ID not found.');
+	
+	$data = array();
+	// sql语法存在变数中
+	$db_query = "SELECT * FROM wipproduction WHERE id=$id";
+
+	// 用mysqli_query方法执行(sql语法)将结果存在变数中
+	$data = mysqli_query($link,$db_query);	
+/*
+    include "inc/record_update.php";
+    
+    try {	
+		// 设置一个空阵列来放资料
+		$data = array();
+		// sql语法存在变数中
+		$db_query = "SELECT * FROM expert WHERE id=$id";
+
+		// 用mysqli_query方法执行(sql语法)将结果存在变数中
+		$data = mysqli_query($link,$db_query);
+	}catch (Exception $e) {
+    echo 'Caught exception: ',  $e->getMessage(), "\n";
+	}
+*/	
+    foreach($data as $data) :
+?>
+<script>
+$(function () {
+    $('#accountid').keyup(function(){ $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); })
+    $('#facilityno').keyup(function(){ $(this).val($(this).val().replace(/[^\w\.\/]/ig,'')); })
+});
+</script>
+<div class="container">
+    <form class="form-inline" method="post" action="wipproduction-record-update.php" enctype="multipart/form-data">
+        <input type="hidden" name="id" value="<?php echo $id; ?>">
+		
+        <div>
+            <label for="accountid">客戶帳號</label>
+            <input type="text" name="accountid" id="accountid" value="<?php echo $data['accountid']; ?>" maxlength="10" required>
+        </div>	
+		
+        <div>
+            <label for="facilityno">電梯編號</label>
+            <input type="text" name="facilityno" id="facilityno" value="<?php echo $data['facilityno']; ?>" required>
+        </div>		
+
+        <div>
+            <label for="issue_time">時間</label><br>
+            <input type="date" name="issue_time" id="issue_time" value="<?php echo substr($data['issue_time'],0,10); ?>" required>
+        </div>	
+		
+        <div>
+            <label for="process">階段</label>
+            <select name="process" id="process" required>
+                <option value="">請選擇</option>
+                <option value="投料生產"<?php if ($data['process']=="投料生產") echo " selected"; ?>>投料生產</option>
+                <option value="出貨"<?php if ($data['process']=="出貨") echo " selected"; ?>>出貨</option>
+            </select>
+        </div>
+        <div>
+            <label for="region">區域</label>
+            <select name="region" id="region" required>
+                <option value="">請選擇</option>
+                <option value="北"<?php if ($data['region']=="北") echo " selected"; ?>>北</option>
+                <option value="中"<?php if ($data['region']=="中") echo " selected"; ?>>中</option>
+                <option value="南"<?php if ($data['region']=="南") echo " selected"; ?>>南</option>
+            </select>
+        </div>
+				
+        <div>
+            <label for="creater">建檔人</label>
+            <input type="text" name="creater" id="creater" value="<?php echo $data['creater']; ?>" readonly>
+        </div>
+		
+		
+        <div>
+			<br>
+            <button type="submit" name="update">確定</button>
+        </div>
+        <input type="hidden" name="token" value="<?php echo $token; ?>">
+    </form>
+</div>
+
+<?php
+
+    endforeach;
+    
+    include "footer.php";
+
+?>
+
diff --git a/wms/wipproduction-index.php b/wms/wipproduction-index.php
index d7c364ae..3d3ba5ca 100644
--- a/wms/wipproduction-index.php
+++ b/wms/wipproduction-index.php
@@ -1,152 +1,152 @@
-<?php
-/**
- * 開放權限：業務部(助理)專員
- */
-include "header.php";
-
-$data = array();
-$sql = "";
-
-$db_query = "select department_id, role_id from account where accountid = '$user_id'";
-$res = mysqli_query($link, $db_query);
-if ($row = mysqli_fetch_assoc($res)) {
-    if ($row["department_id"] == "321") {
-        if ($row["role_id"] == "1" || $row["role_id"] == "4") {
-            $sql = "select * from wipproduction order by id";
-        }
-    }
-}
-mysqli_free_result($res);
-
-if (empty($sql)) {
-    $sql_cmd = sql_myself($user_id);
-    $sql = "select * from wipproduction $sql_cmd order by id";
-}
-$data = mysqli_query($link, $sql);
-?>
-
-<!-- <a href="create.php"><h2>新增</h2></a> -->
-<?php if ($user_auth&2) { ?>
-<p>
-<a href="wipproduction-create.php?function_name=wipproduction&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-	<span class="glyphicon glyphicon-plus"></span>
-</a>
-</p>
-
-<?php
-}
-
-
-
-if($data):
-    
-    if($_SERVER["REQUEST_METHOD"] == "POST"){
-        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
-            echo "<p class='error'>Please fill up the required field!</p>";
-        } else {
-            header("Location:wipproduction-index.php");
-        }
-    }
-
-?>
-
-<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;
-   
-}
-
-</style>
-
-    <div style="overflow-x:auto;">
-        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
-		<thead>
-            <tr>
-                <th>項次</th>
-                <th>用戶帳號</th>
-				<th>電梯編號</th>
-                <th>時間</th>
-                <th>階段</th>
-                <th>區域</th>
-                <th>建檔人</th>
-                <th>建檔時間</th>
-                <?php if ($user_auth&2) { ?>
-                <th>修改</th>
-                <!--<th>刪除</th>-->
-                <?php } ?>
-            </tr>
-		</thead>
-		<tbody>			
-
-            <?php foreach($data as $data) : ?>    
-                <tr>
-                    <td><?php echo $data['id']; ?></td>
-                    <td><?php echo $data['accountid']; ?></td>
-                    <td><?php echo $data['facilityno']; ?></td>					
-                    <td><?php echo substr($data['issue_time'],0,10); ?></td>
-                    <td><?php echo $data['process']; ?></td>
-                    <td><?php echo $data['region']; ?></td>
-                    <td><?php echo $data['creater']; ?></td>
-                    <td><?php echo $data['create_at']; ?></td>
-                    <?php if ($user_auth&2) { ?>
-                    <td>
-						<p>
-							<a href="wipproduction-edit.php?id=<?php echo $data['id']; ?>&function_name=wipproduction&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
-								<span class="glyphicon glyphicon-pencil"></span>
-							</a>
-						</p> 
-					</td>
-                    <!--<td>
-						<p>
-							<a href="wipproduction-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
-								<span class="glyphicon glyphicon-remove"></span>
-							</a>
-						</p> 
-					</td>-->
-                    <?php } ?>
-                </tr>
-            <?php endforeach; ?>
-			</tbody>			
-        </table>
-    </div>
-
-<?php
-
-else:
-    echo "<h2>There is no record!</h2>";
-endif;
-
-#代表結束連線
-mysqli_close($link);
-
-include "footer.php";
-
+<?php
+/**
+ * 開放權限：業務部(助理)專員
+ */
+include "header.php";
+
+$data = array();
+$sql = "";
+
+$db_query = "select department_id, role_id from account where accountid = '$user_id'";
+$res = mysqli_query($link, $db_query);
+if ($row = mysqli_fetch_assoc($res)) {
+    if ($row["department_id"] == "321") {
+        if ($row["role_id"] == "1" || $row["role_id"] == "4") {
+            $sql = "select * from wipproduction order by id";
+        }
+    }
+}
+mysqli_free_result($res);
+
+if (empty($sql)) {
+    $sql_cmd = sql_myself($user_id);
+    $sql = "select * from wipproduction $sql_cmd order by id";
+}
+$data = mysqli_query($link, $sql);
+?>
+
+<!-- <a href="create.php"><h2>新增</h2></a> -->
+<?php if ($user_auth&2) { ?>
+<p>
+<a href="wipproduction-create.php?function_name=wipproduction&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+	<span class="glyphicon glyphicon-plus"></span>
+</a>
+</p>
+
+<?php
+}
+
+
+
+if($data):
+    
+    if($_SERVER["REQUEST_METHOD"] == "POST"){
+        if(empty($_POST["name"]) && empty($_POST["email"]) && empty($_POST["website"])){
+            echo "<p class='error'>Please fill up the required field!</p>";
+        } else {
+            header("Location:wipproduction-index.php");
+        }
+    }
+
+?>
+
+<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;
+   
+}
+
+</style>
+
+    <div style="overflow-x:auto;">
+        <table id="table_index" class="table table-striped table-bordered" style="width:100%">
+		<thead>
+            <tr>
+                <th>項次</th>
+                <th>用戶帳號</th>
+				<th>電梯編號</th>
+                <th>時間</th>
+                <th>階段</th>
+                <th>區域</th>
+                <th>建檔人</th>
+                <th>建檔時間</th>
+                <?php if ($user_auth&2) { ?>
+                <th>修改</th>
+                <!--<th>刪除</th>-->
+                <?php } ?>
+            </tr>
+		</thead>
+		<tbody>			
+
+            <?php foreach($data as $data) : ?>    
+                <tr>
+                    <td><?php echo $data['id']; ?></td>
+                    <td><?php echo $data['accountid']; ?></td>
+                    <td><?php echo $data['facilityno']; ?></td>					
+                    <td><?php echo substr($data['issue_time'],0,10); ?></td>
+                    <td><?php echo $data['process']; ?></td>
+                    <td><?php echo $data['region']; ?></td>
+                    <td><?php echo $data['creater']; ?></td>
+                    <td><?php echo $data['create_at']; ?></td>
+                    <?php if ($user_auth&2) { ?>
+                    <td>
+						<p>
+							<a href="wipproduction-edit.php?id=<?php echo $data['id']; ?>&function_name=wipproduction&<?php echo $token_link; ?>" class="btn btn-info btn-sm">
+								<span class="glyphicon glyphicon-pencil"></span>
+							</a>
+						</p> 
+					</td>
+                    <!--<td>
+						<p>
+							<a href="wipproduction-delete.php?id=<?php echo $data['id']; ?>&<?php echo $token_link; ?>" class="btn btn-info btn-sm" onClick="return confirm('Are you sure you want to delete?')">
+								<span class="glyphicon glyphicon-remove"></span>
+							</a>
+						</p> 
+					</td>-->
+                    <?php } ?>
+                </tr>
+            <?php endforeach; ?>
+			</tbody>			
+        </table>
+    </div>
+
+<?php
+
+else:
+    echo "<h2>There is no record!</h2>";
+endif;
+
+#代表結束連線
+mysqli_close($link);
+
+include "footer.php";
+
 ?>
\ No newline at end of file
diff --git a/wms/wipproduction-record-submit.php b/wms/wipproduction-record-submit.php
index 7750adbf..a6d346dc 100644
--- a/wms/wipproduction-record-submit.php
+++ b/wms/wipproduction-record-submit.php
@@ -1,44 +1,44 @@
-<?php
-$accountid= "";
-$facilityno= "";
-$issue_time= "";
-$process= "";
-$memo= "";
-$creater= "";
-$create_at= "";
-
-$accountid_error= "";
-$facilityno_error= "";
-$issue_time_error= "";
-$process_error= "";
-$memo_error= "";
-$creater_error= "";
-$create_at_error= "";
-
-
-
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    include "wipproduction-user-input.php";
-
-    $db_query = "INSERT INTO wipproduction(accountid, facilityno, region, issue_time, process, creater,create_at) VALUES ('$accountid', '$facilityno', '$region', '$issue_time', '$process', '$creater', '$create_at')";
-    $result = mysqli_query($link,$db_query);
-    $db_query = "INSERT INTO wipinstallation(accountid, facilityno, region, issue_time, process, creater,create_at) VALUES ('$accountid', '$facilityno', '$region', '$issue_time', '$process', '$creater', '$create_at')";
-    $result = mysqli_query($link,$db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('新增成功');";
-        echo "location.href='wipproduction-index.php?function_name=wipproduction&".$token_link."';";
-        echo "</script>";  
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='wipproduction-index.php?function_name=wipproduction&".$token_link."';";
-        echo "</script>";  
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
-?>
+<?php
+$accountid= "";
+$facilityno= "";
+$issue_time= "";
+$process= "";
+$memo= "";
+$creater= "";
+$create_at= "";
+
+$accountid_error= "";
+$facilityno_error= "";
+$issue_time_error= "";
+$process_error= "";
+$memo_error= "";
+$creater_error= "";
+$create_at_error= "";
+
+
+
+if($_SERVER["REQUEST_METHOD"] == "POST"){
+    include "wipproduction-user-input.php";
+
+    $db_query = "INSERT INTO wipproduction(accountid, facilityno, region, issue_time, process, creater,create_at) VALUES ('$accountid', '$facilityno', '$region', '$issue_time', '$process', '$creater', '$create_at')";
+    $result = mysqli_query($link,$db_query);
+    $db_query = "INSERT INTO wipinstallation(accountid, facilityno, region, issue_time, process, creater,create_at) VALUES ('$accountid', '$facilityno', '$region', '$issue_time', '$process', '$creater', '$create_at')";
+    $result = mysqli_query($link,$db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('新增成功');";
+        echo "location.href='wipproduction-index.php?function_name=wipproduction&".$token_link."';";
+        echo "</script>";  
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='wipproduction-index.php?function_name=wipproduction&".$token_link."';";
+        echo "</script>";  
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
+?>
diff --git a/wms/wipproduction-record-update.php b/wms/wipproduction-record-update.php
index 3a824395..225ec7b2 100644
--- a/wms/wipproduction-record-update.php
+++ b/wms/wipproduction-record-update.php
@@ -1,40 +1,40 @@
-<?php
-include "header.php";
-
-if(isset($_POST['update'])) {
-    function user_input( $data ) {
-        $data1 = trim($data);
-        $data2 = stripslashes($data1);
-        $data3 = htmlspecialchars($data2);
-        return $data3;
-    }
-
-    $id     = $_POST['id'];
-    $accountid   = user_input($_POST["accountid"]);	
-    $facilityno   = user_input($_POST["facilityno"]);	
-    $issue_time	   = user_input($_POST["issue_time"]);	
-    $process       = user_input($_POST["process"]);	
-    $region       = user_input($_POST["region"]);	
-    $memo       = user_input($_POST["memo"]);	
-    $creater      = user_input($_POST["creater"]);	
-    $create_at     = date('Y/m/d H:i:s');
-
-    $db_query = "UPDATE wipproduction set accountid = '$accountid', facilityno = '$facilityno', region = '$region', issue_time = '$issue_time', process = '$process', create_at = '$create_at' WHERE id='$id'";
-    mysqli_query($link, $db_query);
-    $affected = mysqli_affected_rows($link);
-    mysqli_close($link);
-    if ($affected > 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('update成功');";
-        echo "location.href='wipproduction-index.php?function_name=wipproduction&".$token_link."';";
-        echo "</script>";
-    } elseif ($affected == 0) {
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('無新增資料');";
-        echo "location.href='wipproduction-index.php?function_name=wipproduction&".$token_link."';";
-        echo "</script>"; 
-    } else {
-        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
-    }
-}
+<?php
+include "header.php";
+
+if(isset($_POST['update'])) {
+    function user_input( $data ) {
+        $data1 = trim($data);
+        $data2 = stripslashes($data1);
+        $data3 = htmlspecialchars($data2);
+        return $data3;
+    }
+
+    $id     = $_POST['id'];
+    $accountid   = user_input($_POST["accountid"]);	
+    $facilityno   = user_input($_POST["facilityno"]);	
+    $issue_time	   = user_input($_POST["issue_time"]);	
+    $process       = user_input($_POST["process"]);	
+    $region       = user_input($_POST["region"]);	
+    $memo       = user_input($_POST["memo"]);	
+    $creater      = user_input($_POST["creater"]);	
+    $create_at     = date('Y/m/d H:i:s');
+
+    $db_query = "UPDATE wipproduction set accountid = '$accountid', facilityno = '$facilityno', region = '$region', issue_time = '$issue_time', process = '$process', create_at = '$create_at' WHERE id='$id'";
+    mysqli_query($link, $db_query);
+    $affected = mysqli_affected_rows($link);
+    mysqli_close($link);
+    if ($affected > 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('update成功');";
+        echo "location.href='wipproduction-index.php?function_name=wipproduction&".$token_link."';";
+        echo "</script>";
+    } elseif ($affected == 0) {
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('無新增資料');";
+        echo "location.href='wipproduction-index.php?function_name=wipproduction&".$token_link."';";
+        echo "</script>"; 
+    } else {
+        echo "{$db_query} 語法執行失敗，錯誤訊息SSS: " . mysqli_error($link);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/wms/wipproduction-user-input.php b/wms/wipproduction-user-input.php
index b94d0146..b3c3dc08 100644
--- a/wms/wipproduction-user-input.php
+++ b/wms/wipproduction-user-input.php
@@ -1,55 +1,55 @@
-<?php
-
-//Function to filter the form input
-function user_input( $data ) {
-    $data1 = trim($data);
-    $data2 = stripslashes($data1);
-    $data3 = htmlspecialchars($data2);
-    return $data3;
-}
-
-
-$accountid   = user_input($_POST["accountid"]);	
-$facilityno   = user_input($_POST["facilityno"]);	
-$issue_time	   = user_input($_POST["issue_time"]);	
-$process       = user_input($_POST["process"]);	
-$region       = user_input($_POST["region"]);	
-$memo       = user_input($_POST["memo"]);	
-$creater      = user_input($_POST["creater"]);	
-$create_at     = date('Y/m/d H:i:s');
-
-
-
-
-/*
-
-if(empty($_POST["name"])) {
-    $name_error = "Name is required";
-} else {
-    $name = user_input($_POST["name"]);
-    
-    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
-        $name_error = "Only letter and white space are allowed";
-    }
-}
-
-
-/*
-if(empty($_POST["website"])) {
-    $website_error = "Website address is required";
-} else {
-    $website = user_input($_POST["website"]);
-
-    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
-        $website_error = "Invalid website URL";
-    }
-}
-
-if(empty($_POST["comment"])) {
-    $comment = "";
-} else {
-    $comment = user_input($_POST["comment"]);
-}
-*/
-?>
-
+<?php
+
+//Function to filter the form input
+function user_input( $data ) {
+    $data1 = trim($data);
+    $data2 = stripslashes($data1);
+    $data3 = htmlspecialchars($data2);
+    return $data3;
+}
+
+
+$accountid   = user_input($_POST["accountid"]);	
+$facilityno   = user_input($_POST["facilityno"]);	
+$issue_time	   = user_input($_POST["issue_time"]);	
+$process       = user_input($_POST["process"]);	
+$region       = user_input($_POST["region"]);	
+$memo       = user_input($_POST["memo"]);	
+$creater      = user_input($_POST["creater"]);	
+$create_at     = date('Y/m/d H:i:s');
+
+
+
+
+/*
+
+if(empty($_POST["name"])) {
+    $name_error = "Name is required";
+} else {
+    $name = user_input($_POST["name"]);
+    
+    if(!preg_match("/^[a-zA-Z ]*$/", $name)) {
+        $name_error = "Only letter and white space are allowed";
+    }
+}
+
+
+/*
+if(empty($_POST["website"])) {
+    $website_error = "Website address is required";
+} else {
+    $website = user_input($_POST["website"]);
+
+    if(!preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $website)) {
+        $website_error = "Invalid website URL";
+    }
+}
+
+if(empty($_POST["comment"])) {
+    $comment = "";
+} else {
+    $comment = user_input($_POST["comment"]);
+}
+*/
+?>
+
diff --git a/wms/wipwhole-change-contractdate-function.php b/wms/wipwhole-change-contractdate-function.php
index a839e669..b14c818d 100644
--- a/wms/wipwhole-change-contractdate-function.php
+++ b/wms/wipwhole-change-contractdate-function.php
@@ -1,674 +1,676 @@
-<?php
-
-/**
- * 檢查是否為非相關人員進入當前頁面
- * @param string $user_id:使用者代碼(員工編號)
- * @return bollean true:合法 false:非法
- */
-function checkPageUserStatus($user_id)
-{
-    $user_department_id = accountidToDepartId($user_id);
-    $allow_arr = [
-        '311', '312', '313', '314', '315',
-        '501', '511', '512', '513', '514',
-        '541', '542', '543', '544', '545',
-        '521', '531',
-        '250',
-        '220'
-    ];
-    if (in_array($user_department_id, $allow_arr))
-        return true;
-    return false;
-}
-/** 
- * 寫入 `wipwhole_change_contractdate_details`
- *  - $data:
- *  - 'id' => 作番大日程 id  
- *  - 'all_contractno_change' => 是否更改全部合約號
- *  - 'real_contract_arrival_date'  => 原日期
- *  - 'contract_arrival_date'  => 新日期
- *  - 'real_address'  => 原工地地址
- *  - 'old_real_address' => 新工地地址
- *  - 'contractno' => 合約號
- *  - 'tds' => 資料時間戳記
- *  - 'form_key' => 本表單 form_key
- *  - 'user_id' => 申請者 id (員工編號)
- *  - 'change_status' => 寫入簽核狀態代碼
- * 
- * @param object $link: 資料庫連線
- * @param string $data: 新增資料
- */
-function addWipwholeChangeContractdateDetails($link, $data)
-{
-    $user_id = $data['user_id'];
-    $tds = $data['tds'];
-    $id = $data['id'];
-    $real_contract_arrival_date = $data['real_contract_arrival_date'];
-    $contract_arrival_date = $data['contract_arrival_date'];
-    $old_real_address = $data['old_real_address'];
-    $real_address = $data['real_address'];
-    $change_status = $data['change_status'];
-    $sql2 = "
-        INSERT INTO `wipwhole_change_contractdate_details` (
-            `creater`, 
-            `create_at`, 
-            `wipwholestatus_id`, 
-            `old_change_date`, 
-            `change_date` ,
-            `old_real_address`, 
-            `real_address` ,
-            `change_status` 
-        ) VALUES (
-            '$user_id', 
-            '$tds', 
-            '$id', 
-            '$real_contract_arrival_date', 
-            '$contract_arrival_date', 
-            '$old_real_address', 
-            '$real_address', 
-            '$change_status'
-        )
-    ";
-    mysqli_query($link, $sql2);
-}
-
-function addFlow($link, $data)
-{
-    $last_id = $data['last_id'];
-    $form_key = $data['form_key'];
-    $flow_code = $data['change_status'];
-    $sql2 = "
-        INSERT into flow (
-            system_id, 
-            flow_id, 
-            form_id, 
-            form_key, 
-            flow_code
-        ) VALUES (
-            'wws', 
-            'wws03', 
-            '$last_id', 
-            '$form_key', 
-            '$flow_code'
-        )
-    ";
-    mysqli_query($link, $sql2);
-}
-
-function addSubflow($link, $data)
-{
-    $form_key = $data['form_key'];
-    $current_assigner = $data['current_assigner'];
-    $tds = $data['tds'];
-    $seq = $data['seq'];
-    $sql2 = "
-        INSERT INTO subflow (
-            form_key, 
-            seq, 
-            current_assigner, 
-            create_date
-        ) values (
-            '$form_key', 
-            '$seq', 
-            '$current_assigner', 
-            '$tds'
-        )
-    ";
-    mysqli_query($link, $sql2);
-}
-
-/**
- * 用大日程的合約號取得大日程表單唯一值 (id)
- * @param object $link:資料庫連線
- * @param string $contractno:合約編號
- * @return object 回傳 mysqli_fetch_all
- */
-function getWipwholestatusIdByConstractNo($link, $contractno)
-{
-    $sql = "
-        SELECT
-            id
-        FROM wipwholestatus
-        WHERE contractno = '$contractno'
-    ";
-    $result = mysqli_query($link, $sql);
-    $data = mysqli_fetch_all($result);
-    mysqli_free_result($result);
-    return $data;
-}
-
-/**
- * 取得新申請簽核的 formk_key 用於新增
- * @param object $link 資料庫連線 
- * @return string $formk_key
- */
-function getFomkeySeq($link)
-{
-    $sql = "SELECT appwms.nextval('form_key') form_key";
-    $res = mysqli_query($link, $sql);
-    if ($row = mysqli_fetch_row($res))
-        return $row[0];
-    return null;
-}
-
-/**
- * 新增通知
- * @param object $link 資料庫連線 
- * @param array $data kind:通知類型 related_id:關聯序號 title:通知標題 content:通知內容 permission:觀看者 creater:建立者 create_at:建立時間
- * @return string 簽核單 cid
- */
-function addNotice($link, $data)
-{
-    $kind = empty($data['kind']) ? "1" : $data['kind'];
-    $related_id = empty($data['related_id']) ? "" : $data['related_id'];
-    $title = empty($data['title']) ? "" : $data['title'];
-    $content = empty($data['content']) ? "" : $data['content'];
-    $permission = empty($data['permission']) ? "" : $data['permission'];
-    $creater = empty($data['creater']) ? "system" : $data['creater'];
-    $create_at = empty($data['create_at']) ? date("Y-m-d H:i:s") : $data['create_at'];
-
-    $sql = "
-        INSERT INTO notice (
-            kind, 
-            related_id,
-            title,
-            content,
-            permission,
-            creater,
-            create_at
-        ) VALUES(
-            '$kind', 
-            '$related_id',
-            '$title',
-            '$content',
-            '$permission',
-            '$creater',
-            '$create_at'
-        )
-    ";
-    mysqli_query($link, $sql);
-}
-
-/**
- * 取得本次簽核的表單 cid 值
- * @param object $link 資料庫連線 
- * @param string $form_key 簽核單唯一值
- * @return string 簽核單 cid
- */
-function getCid($link, $form_key)
-{
-    $sql = "
-        SELECT form_id AS id FROM flow
-        WHERE form_key = '$form_key'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row['id'];
-}
-
-/**
- * 取得此單據的大日程id值
- * @param object $link 資料庫連線 
- * @param string $cid 簽核單 cid
- * @return string 簽核單 form_key
- */
-function getId($link, $cid)
-{
-    $sql = "
-        SELECT wipwholestatus_id AS id 
-        FROM wipwhole_change_contractdate_details
-        WHERE id = '$cid'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row['id'];
-}
-
-/**
- * 取得本次簽核的表單form_key值 
- * @param object $link 資料庫連線 
- * @param string $form_id 簽核單 cid
- * @return string 簽核單 form_key
- */
-function getForm_key($link, $form_id)
-{
-    $sql = "
-        SELECT 
-            f.form_key
-        FROM flow AS f
-        LEFT JOIN subflow AS s
-        ON f.form_key = s.form_key
-        WHERE 1=1
-        AND f.system_id = 'wws'
-        AND f.flow_id = 'wws03' 
-        AND f.form_id = '$form_id' 
-        AND f.flow_code IN ('A','B','D','C','Z')
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return empty($row['form_key']) ? null : $row['form_key'];
-}
-
-/**
- * 確認目前簽核狀態
- * @param object $link 資料庫連線 
- * @return string 工務部主管accountid
- */
-function checkNowFormStatus($link)
-{
-    if (isset($_GET['cid']) || isset($_GET['form_key'])) {
-        $cid = isset($_GET['cid']) ? $_GET['cid'] : getCid($link, $_GET['form_key']);
-        $form_key = getForm_key($link, $cid);
-        $sql = "
-            SELECT
-                flow_code
-            FROM flow
-            WHERE 1=1
-            AND form_id = '$cid'
-            AND form_key = '$form_key'
-        ";
-        $result = mysqli_query($link, $sql);
-        $row = mysqli_fetch_array($result);
-        return empty($row['0']) ? null : $row['0'];
-    }
-    return null;
-}
-
-/**
- * 取得工務部主管編號
- * @param object $link 資料庫連線 
- * @param string $contract_type A:新梯 B:汰改
- * @return string 工務部主管accountid
- */
-function getGongWuokNo($link, $contract_type)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key']))
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, getCid($link, $_GET['form_key']));
-    $sql = "
-        SELECT DISTINCT 
-            SUBSTR(address,1,2)
-        FROM `wipwholestatus`
-        WHERE id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    // 新梯
-    // 宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
-    // 汰改
-    // 宜蘭=高培軒(M0087) 北=吳宗紘(M0040) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
-    $arr = array(
-        "宜蘭" => "M0087",
-        "北" => "M0041",
-        "台北" => "M0041",
-        "基隆" => "M0041",
-        "新北" => "M0041",
-        "新竹" => "M0041",
-        "桃園" => "M0041",
-        "苗栗" => "M0113",
-        "中" => "M0113",
-        "南投" => "M0113",
-        "台中" => "M0113",
-        "彰化" => "M0113",
-        "雲林" => "M0113",
-        "南" => "M0102",
-        "台南" => "M0102",
-        "嘉義" => "M0102",
-        "屏東" => "M0102",
-        "高雄" => "M0102"
-    );
-    $arr2 = array(
-        "宜蘭" => "M0087",
-        "北" => "M0040",
-        "台北" => "M0040",
-        "基隆" => "M0040",
-        "新北" => "M0040",
-        "新竹" => "M0040",
-        "桃園" => "M0040",
-        "苗栗" => "M0113",
-        "中" => "M0113",
-        "南投" => "M0113",
-        "台中" => "M0113",
-        "彰化" => "M0113",
-        "雲林" => "M0113",
-        "南" => "M0102",
-        "台南" => "M0102",
-        "嘉義" => "M0102",
-        "屏東" => "M0102",
-        "高雄" => "M0102"
-    );
-    if ($contract_type == 'A') {
-        return empty($arr[$row[0]]) ? "" : $arr[$row[0]];
-    } else {
-        return empty($arr2[$row[0]]) ? "" : $arr2[$row[0]];
-    }
-}
-
-/**
- * 取得簽核者 user_id
- * @param object $link 資料庫連線 
- * @param string $form_key 本簽核單唯一值
- * @param string $seq 簽核者順序
- * @return string 簽核者accountid
- */
-function getCurrentAssigner($link, $form_key, $seq)
-{
-    $sql = "
-        SELECT
-            * 
-        FROM subflow
-        WHERE form_key = '$form_key'
-        AND seq = '$seq'
-    ";
-    $subflow_data = mysqli_query($link, $sql);
-    $subflow = mysqli_fetch_array($subflow_data, MYSQLI_ASSOC);
-    return empty($subflow['current_assigner']) ? null : $subflow['current_assigner'];
-}
-
-/**
- * 取得本表單狀態代碼
- * @param object $link 資料庫連線 
- * @param string $cid 本簽核單 id
- * @return string 表單狀態代碼
- */
-function getChangeStatus($link, $cid)
-{
-    $sql = "
-        SELECT
-            change_status 
-        FROM wipwhole_change_contractdate_details
-        WHERE id = '$cid'
-    ";
-    $subflow_data = mysqli_query($link, $sql);
-    $subflow = mysqli_fetch_array($subflow_data, MYSQLI_ASSOC);
-    return empty($subflow['change_status']) ? null : $subflow['change_status'];
-}
-
-/**
- * 取得本表單狀態名稱
- * @param object $link 資料庫連線 
- * @param string $cid 本簽核單 id
- * @return string 本單據狀態名稱
- */
-function getChangeStatusName($link, $cid)
-{
-    $dataArr = array(
-        'A' => '申請中',
-        'B' => '申請中',
-        'C' => '已取消',
-        'D' => '工務已通過',
-        'Z' => '已通過',
-    );
-    $sql = "
-        SELECT
-            change_status 
-        FROM wipwhole_change_contractdate_details
-        WHERE id = '$cid'
-    ";
-    $subflow_data = mysqli_query($link, $sql);
-    $subflow = mysqli_fetch_array($subflow_data, MYSQLI_ASSOC);
-    return empty($subflow['change_status']) ? "" : $dataArr[$subflow['change_status']];
-}
-
-function getNowFormStatus($link, $cid)
-{
-    $sql = "
-        SELECT
-            change_status 
-        FROM wipwhole_change_contractdate_details
-        WHERE id = '$cid'
-    ";
-    $subflow_data = mysqli_query($link, $sql);
-    $subflow = mysqli_fetch_array($subflow_data, MYSQLI_ASSOC);
-    return empty($subflow['change_status']) ? "" : $subflow['change_status'];
-}
-
-/**
- * 取得生管主管 options
- * @param object $link:資料庫連線
- * @return object 回傳 mysqli_query
- */
-function getShengguanokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('250')
-        AND `role_id` IN ('1','4')
-    ";
-    return mysqli_query($link, $sql);
-}
-
-/**
- * 取得工務部門所有員工 options
- * @param object $link:資料庫連線
- * @return object 回傳 mysqli_query
- */
-function getGongwuokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('521')
-        AND `accountid` IN ('M0040','M0041','M0113')
-        UNION
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('531')
-        AND `accountid` IN ('M0087')
-    ";
-    return mysqli_query($link, $sql);
-}
-
-/**
- * 用 user_id(員工編號) 取得部門代碼 id
- * @param object $link:資料庫連線
- * @param string $user_id:使用者 id (員工編號)
- * @return string 回傳 $department_id:部門代碼
- */
-function getDepartmentId($link, $user_id)
-{
-    $sql = "
-        SELECT 
-            department_id
-        FROM account 
-        WHERE accountid = '$user_id'
-    ";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_row($res);
-    mysqli_free_result($res);
-    return $row[0];
-}
-
-/**
- * 取得生管主管 options
- * @param object $link:資料庫連線
- * @param string $id:作番大日程唯一值
- * @return object 回傳 mysqli_query
- */
-function getWipwholestatusDetail($link, $id)
-{
-    $db_query = "
-        SELECT * FROM 
-        wipwholestatus WHERE id = '$id'
-    ";
-    $receivabledata = mysqli_query($link, $db_query);
-    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
-}
-
-/**
- * 取得 wipwhole_change_contractdate_details 所有資料並放入陣列
- * @param object $link:資料庫連線
- * @param string $cid:表單唯一值
- * @return object 回傳 mysqli_fetch_array
- */
-function getWipwholeChangeContractdateDetails($link, $cid)
-{
-    $db_query = "
-        SELECT * FROM wipwhole_change_contractdate_details 
-        WHERE id = '$cid'
-    ";
-    $receivabledata = mysqli_query($link, $db_query);
-    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
-}
-
-/**
- * 取得生管主管 options
- * @param object $link:資料庫連線
- * @param string $user_id:使用者 id (員工編號)
- * @param string $id:大日程唯一值
- * @return object 回傳 mysqli_query
- */
-function getDateOptions($link, $user_id, $id)
-{
-    if (accountidToDepartId($user_id) == "250" && in_array(accountidToRoleId($user_id), ["1", "4"])) {
-        $sql = "
-            SELECT 
-                * 
-            FROM `wipwhole_change_contractdate_details`
-            WHERE 1=1
-            AND wipwholestatus_id = '$id'
-            AND change_status in ('A','C','D','Z')
-        ";
-    } else if (in_array(accountidToDepartId($user_id), ['521', '531', '541', '542', '543', '544', '545'])) {
-        $sql = "
-            SELECT 
-                * 
-            FROM `wipwhole_change_contractdate_details`
-            WHERE 1=1
-            AND wipwholestatus_id = '$id'
-        ";
-    } else {
-        $sql = "
-            SELECT 
-                * 
-            FROM `wipwhole_change_contractdate_details`
-            WHERE 1=1
-            AND creater = '$user_id'
-            AND wipwholestatus_id = '$id'
-        ";
-    }
-    return mysqli_query($link, $sql);
-}
-
-/**
- * 取得提交表單後的回傳訊息
- * @param string $assign_status:簽核狀態代碼
- * @return string 回傳訊息
- */
-function getAssignStatusMessage($data, $checkStatus)
-{
-
-    if ($_POST['assign_status'] !== 'C' && empty($_POST['real_address'])) {
-        if (strtotime($data['contract_arrival_date']) < strtotime($data['estimated_shipping_schedule_date'])) {
-            return "<p class='text-danger'>調整出貨日不可以比預計到貨日早！</p>";
-        }
-    }
-
-    if ($data['assign_status'] == 'A' || $data['assign_status'] == 'B')
-        if (empty($_POST['contract_arrival_date']) && empty($_POST['real_address']))
-            return "<p class='text-danger'>請填寫 調整出貨日 或 工地地址 ！</p>";
-    if ($data['assign_status'] == 'C')
-        return "<p class='text-danger'>申請已取消</p>";
-    if ($data['assign_status'] == 'Z')
-        return "<p class='text-danger'>申請已通過</p>";
-    if (!$checkStatus)
-        return "<p class='text-danger'>請勿重複申請！</p>";
-    return "<p class='text-danger'>已提交申請！</p>";
-}
-
-/**
- * 依照此表單狀態給予 select 選項
- * @param object $link:資料庫連線檔
- * @param string $user_id:使用者id (員工編號)
- * @param string $nowFormStatus:此表單目前狀態代碼
- * @return string 回傳select字串
- */
-function getAssignStatusSelect($link, $user_id, $nowFormStatus)
-{
-    $options_str = "<select name='assign_status' id='assign_status'>";
-    if (empty($nowFormStatus)) {
-        if (in_array(getDepartmentId($link, $user_id), ['521', '531', '541', '542', '543', '544', '545'])) {
-            $options_str .= "<option value='A'>提出申請</option>";
-        } else {
-            $options_str .= "<option value='B'>提出申請</option>";
-        }
-    }
-    if (in_array(checkNowFormStatus($link), ['A', 'D'])) {
-        if (accountidToDepartId($user_id) == "250" && in_array(accountidToRoleId($user_id), ["1", "4"]))
-            $options_str .= "<option value='Z'>通過</option>";
-        $options_str .= "<option value='C'>取消</option>";
-    }
-    if (checkNowFormStatus($link) == 'B') {
-        if (in_array(getDepartmentId($link, $user_id), ['521', '531', '541', '542', '543', '544', '545']))
-            $options_str .= "<option value='D'>通過</option>";
-        $options_str .= "<option value='C'>取消</option>";
-    }
-    $options_str .= "</select>";
-    return $options_str;
-}
-
-/**
- * 取得此簽核單所有人簽核狀況
- * @param object $link:資料庫連線檔
- * @param string $form_key:此簽核單唯一值
- * @return object 回傳 mysqli_query
- */
-function getCurrentAssigners($link, $form_key)
-{
-    $sql = "
-        SELECT
-            nowData.*,
-            nextData.next_current_assigner
-        FROM(
-            SELECT
-                f.flow_code,
-                s.seq,
-                (s.seq + 1) AS next_seq ,
-                s.current_assigner,
-                wccd.change_status
-            FROM
-                flow AS f
-                LEFT JOIN subflow AS s ON f.form_key = s.form_key
-                LEFT JOIN wipwhole_change_contractdate_details AS wccd ON wccd.id = f.form_id
-            WHERE
-                f.form_key = '$form_key'
-                AND f.system_id = 'wws'
-                AND f.flow_id = 'wws03'
-        ) AS nowData
-        LEFT JOIN(
-            SELECT
-                s.seq,
-                s.current_assigner AS next_current_assigner
-            FROM
-                flow AS f
-                LEFT JOIN subflow AS s ON f.form_key = s.form_key
-                LEFT JOIN wipwhole_change_contractdate_details AS wccd ON wccd.id = f.form_id
-            WHERE
-                f.form_key = '$form_key'
-                AND f.system_id = 'wws'
-                AND f.flow_id = 'wws03'
-        ) AS nextData
-        ON nowData.next_seq = nextData.seq
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function checkStatus($link, $cid, $user_id)
-{
-    $sql = "
-        SELECT 
-            change_status
-        FROM wipwhole_change_contractdate_details 
-        WHERE creater = '$user_id'
-        AND wipwholestatus_id = '$cid'
-        AND change_status NOT IN ('C','Z')
-    ";
-    $res = mysqli_query($link, $sql);
-    return $res->num_rows > 0 ? false : true;
-}
+<?php
+
+/**
+ * 檢查是否為非相關人員進入當前頁面
+ * @param string $user_id:使用者代碼(員工編號)
+ * @return bollean true:合法 false:非法
+ */
+function checkPageUserStatus($user_id)
+{
+    $user_department_id = accountidToDepartId($user_id);
+    $allow_arr = [
+        '311', '312', '313', '314', '315',
+        '501', '511', '512', '513', '514',
+        '541', '542', '543', '544', '545',
+        '521', '531',
+        '250',
+        '220'
+    ];
+    if (in_array($user_department_id, $allow_arr))
+        return true;
+    return false;
+}
+/** 
+ * 寫入 `wipwhole_change_contractdate_details`
+ *  - $data:
+ *  - 'id' => 作番大日程 id  
+ *  - 'all_contractno_change' => 是否更改全部合約號
+ *  - 'real_contract_arrival_date'  => 原日期
+ *  - 'contract_arrival_date'  => 新日期
+ *  - 'real_address'  => 原工地地址
+ *  - 'old_real_address' => 新工地地址
+ *  - 'contractno' => 合約號
+ *  - 'tds' => 資料時間戳記
+ *  - 'form_key' => 本表單 form_key
+ *  - 'user_id' => 申請者 id (員工編號)
+ *  - 'change_status' => 寫入簽核狀態代碼
+ * 
+ * @param object $link: 資料庫連線
+ * @param string $data: 新增資料
+ */
+function addWipwholeChangeContractdateDetails($link, $data)
+{
+    $user_id = $data['user_id'];
+    $tds = $data['tds'];
+    $id = $data['id'];
+    $real_contract_arrival_date = $data['real_contract_arrival_date'];
+    $contract_arrival_date = $data['contract_arrival_date'];
+    $old_real_address = $data['old_real_address'];
+    $real_address = $data['real_address'];
+    $change_status = $data['change_status'];
+    $sql2 = "
+        INSERT INTO `wipwhole_change_contractdate_details` (
+            `creater`, 
+            `create_at`, 
+            `wipwholestatus_id`, 
+            `old_change_date`, 
+            `change_date` ,
+            `old_real_address`, 
+            `real_address` ,
+            `change_status` 
+        ) VALUES (
+            '$user_id', 
+            '$tds', 
+            '$id', 
+            '$real_contract_arrival_date', 
+            '$contract_arrival_date', 
+            '$old_real_address', 
+            '$real_address', 
+            '$change_status'
+        )
+    ";
+    mysqli_query($link, $sql2);
+}
+
+function addFlow($link, $data)
+{
+    $last_id = $data['last_id'];
+    $form_key = $data['form_key'];
+    $flow_code = $data['change_status'];
+    $sql2 = "
+        INSERT into flow (
+            system_id, 
+            flow_id, 
+            form_id, 
+            form_key, 
+            flow_code
+        ) VALUES (
+            'wws', 
+            'wws03', 
+            '$last_id', 
+            '$form_key', 
+            '$flow_code'
+        )
+    ";
+    mysqli_query($link, $sql2);
+}
+
+function addSubflow($link, $data)
+{
+    $form_key = $data['form_key'];
+    $current_assigner = $data['current_assigner'];
+    $tds = $data['tds'];
+    $seq = $data['seq'];
+    $sql2 = "
+        INSERT INTO subflow (
+            form_key, 
+            seq, 
+            current_assigner, 
+            create_date
+        ) values (
+            '$form_key', 
+            '$seq', 
+            '$current_assigner', 
+            '$tds'
+        )
+    ";
+    mysqli_query($link, $sql2);
+}
+
+/**
+ * 用大日程的合約號取得大日程表單唯一值 (id)
+ * @param object $link:資料庫連線
+ * @param string $contractno:合約編號
+ * @return object 回傳 mysqli_fetch_all
+ */
+function getWipwholestatusIdByConstractNo($link, $contractno)
+{
+    $sql = "
+        SELECT
+            id
+        FROM wipwholestatus
+        WHERE contractno = '$contractno'
+    ";
+    $result = mysqli_query($link, $sql);
+    $data = mysqli_fetch_all($result);
+    mysqli_free_result($result);
+    return $data;
+}
+
+/**
+ * 取得新申請簽核的 formk_key 用於新增
+ * @param object $link 資料庫連線 
+ * @return string $formk_key
+ */
+function getFomkeySeq($link)
+{
+    $sql = "SELECT appwms.nextval('form_key') form_key";
+    $res = mysqli_query($link, $sql);
+    if ($row = mysqli_fetch_row($res))
+        return $row[0];
+    return null;
+}
+
+/**
+ * 新增通知
+ * @param object $link 資料庫連線 
+ * @param array $data kind:通知類型 related_id:關聯序號 title:通知標題 content:通知內容 permission:觀看者 creater:建立者 create_at:建立時間
+ * @return string 簽核單 cid
+ */
+function addNotice($link, $data)
+{
+    $kind = empty($data['kind']) ? "1" : $data['kind'];
+    $related_id = empty($data['related_id']) ? "" : $data['related_id'];
+    $title = empty($data['title']) ? "" : $data['title'];
+    $content = empty($data['content']) ? "" : $data['content'];
+    $permission = empty($data['permission']) ? "" : $data['permission'];
+    $creater = empty($data['creater']) ? "system" : $data['creater'];
+    $create_at = empty($data['create_at']) ? date("Y-m-d H:i:s") : $data['create_at'];
+
+    $sql = "
+        INSERT INTO notice (
+            kind, 
+            related_id,
+            title,
+            content,
+            permission,
+            creater,
+            create_at
+        ) VALUES(
+            '$kind', 
+            '$related_id',
+            '$title',
+            '$content',
+            '$permission',
+            '$creater',
+            '$create_at'
+        )
+    ";
+    mysqli_query($link, $sql);
+}
+
+/**
+ * 取得本次簽核的表單 cid 值
+ * @param object $link 資料庫連線 
+ * @param string $form_key 簽核單唯一值
+ * @return string 簽核單 cid
+ */
+function getCid($link, $form_key)
+{
+    $sql = "
+        SELECT form_id AS id FROM flow
+        WHERE form_key = '$form_key'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row['id'];
+}
+
+/**
+ * 取得此單據的大日程id值
+ * @param object $link 資料庫連線 
+ * @param string $cid 簽核單 cid
+ * @return string 簽核單 form_key
+ */
+function getId($link, $cid)
+{
+    $sql = "
+        SELECT wipwholestatus_id AS id 
+        FROM wipwhole_change_contractdate_details
+        WHERE id = '$cid'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row['id'];
+}
+
+/**
+ * 取得本次簽核的表單form_key值 
+ * @param object $link 資料庫連線 
+ * @param string $form_id 簽核單 cid
+ * @return string 簽核單 form_key
+ */
+function getForm_key($link, $form_id)
+{
+    $sql = "
+        SELECT 
+            f.form_key
+        FROM flow AS f
+        LEFT JOIN subflow AS s
+        ON f.form_key = s.form_key
+        WHERE 1=1
+        AND f.system_id = 'wws'
+        AND f.flow_id = 'wws03' 
+        AND f.form_id = '$form_id' 
+        AND f.flow_code IN ('A','B','D','C','Z')
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return empty($row['form_key']) ? null : $row['form_key'];
+}
+
+/**
+ * 確認目前簽核狀態
+ * @param object $link 資料庫連線 
+ * @return string 工務部主管accountid
+ */
+function checkNowFormStatus($link)
+{
+    if (isset($_GET['cid']) || isset($_GET['form_key'])) {
+        $cid = isset($_GET['cid']) ? $_GET['cid'] : getCid($link, $_GET['form_key']);
+        $form_key = getForm_key($link, $cid);
+        $sql = "
+            SELECT
+                flow_code
+            FROM flow
+            WHERE 1=1
+            AND form_id = '$cid'
+            AND form_key = '$form_key'
+        ";
+        $result = mysqli_query($link, $sql);
+        $row = mysqli_fetch_array($result);
+        return empty($row['0']) ? null : $row['0'];
+    }
+    return null;
+}
+
+/**
+ * 取得工務部主管編號
+ * @param object $link 資料庫連線 
+ * @param string $contract_type A:新梯 B:汰改
+ * @return string 工務部主管accountid
+ */
+function getGongWuokNo($link, $contract_type)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key']))
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, getCid($link, $_GET['form_key']));
+    $sql = "
+        SELECT DISTINCT 
+            SUBSTR(address,1,2)
+        FROM `wipwholestatus`
+        WHERE id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    // 新梯
+    // 宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
+    // 汰改
+    // 宜蘭=高培軒(M0087) 北=吳宗紘(M0040) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
+    $arr = array(
+        "宜蘭" => "M0087",
+        "北" => "M0041",
+        "台北" => "M0041",
+        "基隆" => "M0041",
+        "新北" => "M0041",
+        "新竹" => "M0041",
+        "桃園" => "M0041",
+        "苗栗" => "M0113",
+        "中" => "M0113",
+        "南投" => "M0113",
+        "台中" => "M0113",
+        "彰化" => "M0113",
+        "雲林" => "M0113",
+        "南" => "M0102",
+        "台南" => "M0102",
+        "嘉義" => "M0102",
+        "屏東" => "M0102",
+        "高雄" => "M0102"
+    );
+    $arr2 = array(
+        "宜蘭" => "M0087",
+        "北" => "M0040",
+        "台北" => "M0040",
+        "基隆" => "M0040",
+        "新北" => "M0040",
+        "新竹" => "M0040",
+        "桃園" => "M0040",
+        "苗栗" => "M0113",
+        "中" => "M0113",
+        "南投" => "M0113",
+        "台中" => "M0113",
+        "彰化" => "M0113",
+        "雲林" => "M0113",
+        "南" => "M0102",
+        "台南" => "M0102",
+        "嘉義" => "M0102",
+        "屏東" => "M0102",
+        "高雄" => "M0102"
+    );
+    if ($contract_type == 'A') {
+        return empty($arr[$row[0]]) ? "" : $arr[$row[0]];
+    } else {
+        return empty($arr2[$row[0]]) ? "" : $arr2[$row[0]];
+    }
+}
+
+/**
+ * 取得簽核者 user_id
+ * @param object $link 資料庫連線 
+ * @param string $form_key 本簽核單唯一值
+ * @param string $seq 簽核者順序
+ * @return string 簽核者accountid
+ */
+function getCurrentAssigner($link, $form_key, $seq)
+{
+    $sql = "
+        SELECT
+            * 
+        FROM subflow
+        WHERE form_key = '$form_key'
+        AND seq = '$seq'
+    ";
+    $subflow_data = mysqli_query($link, $sql);
+    $subflow = mysqli_fetch_array($subflow_data, MYSQLI_ASSOC);
+    return empty($subflow['current_assigner']) ? null : $subflow['current_assigner'];
+}
+
+/**
+ * 取得本表單狀態代碼
+ * @param object $link 資料庫連線 
+ * @param string $cid 本簽核單 id
+ * @return string 表單狀態代碼
+ */
+function getChangeStatus($link, $cid)
+{
+    $sql = "
+        SELECT
+            change_status 
+        FROM wipwhole_change_contractdate_details
+        WHERE id = '$cid'
+    ";
+    $subflow_data = mysqli_query($link, $sql);
+    $subflow = mysqli_fetch_array($subflow_data, MYSQLI_ASSOC);
+    return empty($subflow['change_status']) ? null : $subflow['change_status'];
+}
+
+/**
+ * 取得本表單狀態名稱
+ * @param object $link 資料庫連線 
+ * @param string $cid 本簽核單 id
+ * @return string 本單據狀態名稱
+ */
+function getChangeStatusName($link, $cid)
+{
+    $dataArr = array(
+        'A' => '申請中',
+        'B' => '申請中',
+        'C' => '已取消',
+        'D' => '工務已通過',
+        'Z' => '已通過',
+    );
+    $sql = "
+        SELECT
+            change_status 
+        FROM wipwhole_change_contractdate_details
+        WHERE id = '$cid'
+    ";
+    $subflow_data = mysqli_query($link, $sql);
+    $subflow = mysqli_fetch_array($subflow_data, MYSQLI_ASSOC);
+    return empty($subflow['change_status']) ? "" : $dataArr[$subflow['change_status']];
+}
+
+function getNowFormStatus($link, $cid)
+{
+    $sql = "
+        SELECT
+            change_status 
+        FROM wipwhole_change_contractdate_details
+        WHERE id = '$cid'
+    ";
+    $subflow_data = mysqli_query($link, $sql);
+    $subflow = mysqli_fetch_array($subflow_data, MYSQLI_ASSOC);
+    return empty($subflow['change_status']) ? "" : $subflow['change_status'];
+}
+
+/**
+ * 取得生管主管 options
+ * @param object $link:資料庫連線
+ * @return object 回傳 mysqli_query
+ */
+function getShengguanokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('250')
+        AND `role_id` IN ('1','4')
+        ORDER BY accountid DESC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+/**
+ * 取得工務部門所有員工 options
+ * @param object $link:資料庫連線
+ * @return object 回傳 mysqli_query
+ */
+function getGongwuokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('521')
+        AND `accountid` IN ('M0040','M0041','M0113')
+        UNION
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('531')
+        AND `accountid` IN ('M0087')
+    ";
+    return mysqli_query($link, $sql);
+}
+
+/**
+ * 用 user_id(員工編號) 取得部門代碼 id
+ * @param object $link:資料庫連線
+ * @param string $user_id:使用者 id (員工編號)
+ * @return string 回傳 $department_id:部門代碼
+ */
+function getDepartmentId($link, $user_id)
+{
+    $sql = "
+        SELECT 
+            department_id
+        FROM account 
+        WHERE accountid = '$user_id'
+    ";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_row($res);
+    mysqli_free_result($res);
+    return $row[0];
+}
+
+/**
+ * 取得生管主管 options
+ * @param object $link:資料庫連線
+ * @param string $id:作番大日程唯一值
+ * @return object 回傳 mysqli_query
+ */
+function getWipwholestatusDetail($link, $id)
+{
+    $db_query = "
+        SELECT * FROM 
+        wipwholestatus WHERE id = '$id'
+    ";
+    $receivabledata = mysqli_query($link, $db_query);
+    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
+}
+
+/**
+ * 取得 wipwhole_change_contractdate_details 所有資料並放入陣列
+ * @param object $link:資料庫連線
+ * @param string $cid:表單唯一值
+ * @return object 回傳 mysqli_fetch_array
+ */
+function getWipwholeChangeContractdateDetails($link, $cid)
+{
+    $db_query = "
+        SELECT * FROM wipwhole_change_contractdate_details 
+        WHERE id = '$cid'
+    ";
+    $receivabledata = mysqli_query($link, $db_query);
+    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
+}
+
+/**
+ * 取得生管主管 options
+ * @param object $link:資料庫連線
+ * @param string $user_id:使用者 id (員工編號)
+ * @param string $id:大日程唯一值
+ * @return object 回傳 mysqli_query
+ */
+function getDateOptions($link, $user_id, $id)
+{
+    if (accountidToDepartId($user_id) == "250" && in_array(accountidToRoleId($user_id), ["1", "4"])) {
+        $sql = "
+            SELECT 
+                * 
+            FROM `wipwhole_change_contractdate_details`
+            WHERE 1=1
+            AND wipwholestatus_id = '$id'
+            AND change_status in ('A','C','D','Z')
+        ";
+    } else if (in_array(accountidToDepartId($user_id), ['521', '531', '541', '542', '543', '544', '545'])) {
+        $sql = "
+            SELECT 
+                * 
+            FROM `wipwhole_change_contractdate_details`
+            WHERE 1=1
+            AND wipwholestatus_id = '$id'
+        ";
+    } else {
+        $sql = "
+            SELECT 
+                * 
+            FROM `wipwhole_change_contractdate_details`
+            WHERE 1=1
+            AND creater = '$user_id'
+            AND wipwholestatus_id = '$id'
+        ";
+    }
+    return mysqli_query($link, $sql);
+}
+
+/**
+ * 取得提交表單後的回傳訊息
+ * @param string $assign_status:簽核狀態代碼
+ * @return string 回傳訊息
+ */
+function getAssignStatusMessage($data, $checkStatus)
+{
+
+    if ($_POST['assign_status'] !== 'C' && empty($_POST['real_address'])) {
+        if (strtotime($data['contract_arrival_date']) < strtotime($data['estimated_shipping_schedule_date'])) {
+            return "<p class='text-danger'>調整出貨日不可以比預計到貨日早！</p>";
+        }
+    }
+
+    if ($data['assign_status'] == 'A' || $data['assign_status'] == 'B')
+        if (empty($_POST['contract_arrival_date']) && empty($_POST['real_address']))
+            return "<p class='text-danger'>請填寫 調整出貨日 或 工地地址 ！</p>";
+    if ($data['assign_status'] == 'C')
+        return "<p class='text-danger'>申請已取消</p>";
+    if ($data['assign_status'] == 'Z')
+        return "<p class='text-danger'>申請已通過</p>";
+    if (!$checkStatus)
+        return "<p class='text-danger'>請勿重複申請！</p>";
+    return "<p class='text-danger'>已提交申請！</p>";
+}
+
+/**
+ * 依照此表單狀態給予 select 選項
+ * @param object $link:資料庫連線檔
+ * @param string $user_id:使用者id (員工編號)
+ * @param string $nowFormStatus:此表單目前狀態代碼
+ * @return string 回傳select字串
+ */
+function getAssignStatusSelect($link, $user_id, $nowFormStatus)
+{
+    $options_str = "<select name='assign_status' id='assign_status'>";
+    if (empty($nowFormStatus)) {
+        if (in_array(getDepartmentId($link, $user_id), ['521', '531', '541', '542', '543', '544', '545'])) {
+            $options_str .= "<option value='A'>提出申請</option>";
+        } else {
+            $options_str .= "<option value='B'>提出申請</option>";
+        }
+    }else{
+        if (in_array(checkNowFormStatus($link), ['A', 'D'])) {
+            if (accountidToDepartId($user_id) == "250" && in_array(accountidToRoleId($user_id), ["1", "4"]))
+                $options_str .= "<option value='Z'>通過</option>";
+            $options_str .= "<option value='C'>取消</option>";
+        }
+        if (checkNowFormStatus($link) == 'B') {
+            if (in_array(getDepartmentId($link, $user_id), ['521', '531', '541', '542', '543', '544', '545']))
+                $options_str .= "<option value='D'>通過</option>";
+            $options_str .= "<option value='C'>取消</option>";
+        }
+    }
+    $options_str .= "</select>";
+    return $options_str;
+}
+
+/**
+ * 取得此簽核單所有人簽核狀況
+ * @param object $link:資料庫連線檔
+ * @param string $form_key:此簽核單唯一值
+ * @return object 回傳 mysqli_query
+ */
+function getCurrentAssigners($link, $form_key)
+{
+    $sql = "
+        SELECT
+            nowData.*,
+            nextData.next_current_assigner
+        FROM(
+            SELECT
+                f.flow_code,
+                s.seq,
+                (s.seq + 1) AS next_seq ,
+                s.current_assigner,
+                wccd.change_status
+            FROM
+                flow AS f
+                LEFT JOIN subflow AS s ON f.form_key = s.form_key
+                LEFT JOIN wipwhole_change_contractdate_details AS wccd ON wccd.id = f.form_id
+            WHERE
+                f.form_key = '$form_key'
+                AND f.system_id = 'wws'
+                AND f.flow_id = 'wws03'
+        ) AS nowData
+        LEFT JOIN(
+            SELECT
+                s.seq,
+                s.current_assigner AS next_current_assigner
+            FROM
+                flow AS f
+                LEFT JOIN subflow AS s ON f.form_key = s.form_key
+                LEFT JOIN wipwhole_change_contractdate_details AS wccd ON wccd.id = f.form_id
+            WHERE
+                f.form_key = '$form_key'
+                AND f.system_id = 'wws'
+                AND f.flow_id = 'wws03'
+        ) AS nextData
+        ON nowData.next_seq = nextData.seq
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function checkStatus($link, $cid, $user_id)
+{
+    $sql = "
+        SELECT 
+            change_status
+        FROM wipwhole_change_contractdate_details 
+        WHERE creater = '$user_id'
+        AND wipwholestatus_id = '$cid'
+        AND change_status NOT IN ('C','Z')
+    ";
+    $res = mysqli_query($link, $sql);
+    return $res->num_rows > 0 ? false : true;
+}
diff --git a/wms/wipwhole-change-contractdate-submit.php b/wms/wipwhole-change-contractdate-submit.php
index ce2f56d2..862e8d47 100644
--- a/wms/wipwhole-change-contractdate-submit.php
+++ b/wms/wipwhole-change-contractdate-submit.php
@@ -1,303 +1,303 @@
-<?php
-// echo $_POST['assign_status'];exit;
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    $checkStatus = checkStatus($link, $id, $user_id);
-    if (!empty($_POST['contract_arrival_date']) || !empty($_POST['real_address'])) {
-        if ($checkStatus) {
-
-            $all_contractno_change = empty($_POST['all_contractno_change']) ? null : $_POST['all_contractno_change'];
-            $real_contract_arrival_date  = $_POST['real_contract_arrival_date'];
-            $contract_arrival_date  = $_POST['contract_arrival_date'];
-            $real_address  = $_POST['real_address'];
-            $old_real_address  = $_POST['old_real_address'];
-            $estimated_shipping_schedule_date  = $_POST['estimated_shipping_schedule_date'];
-            $contractno = $_POST['contractno'];
-            $next_users = $_POST['next_users'];
-            $tds = date("Y-m-d H:i:s");
-
-            // 檢查日期是否正確
-            if ($_POST['assign_status'] !== 'C' && empty($real_address)) {
-                if (strtotime($contract_arrival_date) < strtotime($estimated_shipping_schedule_date)) {
-                    return;
-                }
-            }
-
-            // 單次申請 
-            if (($_POST['assign_status'] == 'A' || $_POST['assign_status'] == 'B') && empty($all_contractno_change)) {
-                $data_arr = array(
-                    'id' => $id,
-                    'all_contractno_change' => $all_contractno_change,
-                    'real_contract_arrival_date'  => $real_contract_arrival_date,
-                    'contract_arrival_date'  => $contract_arrival_date,
-                    'real_address'  => $real_address,
-                    'old_real_address' => $old_real_address,
-                    'contractno' => $contractno,
-                    'tds' => $tds,
-                    'form_key' => getFomkeySeq($link),
-                    'user_id' => $user_id,
-                    'change_status' => $_POST['assign_status']
-                );
-                // 寫入表單主檔
-                addWipwholeChangeContractdateDetails($link, $data_arr);
-                // 取得寫入後表單seq
-                $data_arr['last_id'] = $link->insert_id;
-                // 寫入待簽
-                addFlow($link, $data_arr);
-                $data_arr['seq'] = '0';
-                $data_arr['current_assigner'] = $user_id;
-                addSubflow($link, $data_arr);
-                $data_arr['seq'] = '1';
-                $data_arr['current_assigner'] = $next_users;
-                addSubflow($link, $data_arr);
-            }
-
-            // 批次申請
-            if (($_POST['assign_status'] == 'A' || $_POST['assign_status'] == 'B') && !empty($all_contractno_change)) {
-                $wipwholestatus_id_arr = getWipwholestatusIdByConstractNo($link, $contractno);
-                $assign_status = $_POST['assign_status'];
-                foreach ($wipwholestatus_id_arr as $wipwholestatus_id) {
-                    $data_arr = array(
-                        'id' => $wipwholestatus_id[0],
-                        'all_contractno_change' => $all_contractno_change,
-                        'real_contract_arrival_date'  => $real_contract_arrival_date,
-                        'contract_arrival_date'  => $contract_arrival_date,
-                        'real_address'  => $real_address,
-                        'old_real_address' => $old_real_address,
-                        'contractno' => $contractno,
-                        'tds' => $tds,
-                        'form_key' => getFomkeySeq($link),
-                        'user_id' => $user_id,
-                        'change_status' => $assign_status
-                    );
-                    // 寫入表單主檔
-                    addWipwholeChangeContractdateDetails($link, $data_arr);
-                    // 取得寫入後表單seq
-                    $data_arr['last_id'] = $link->insert_id;
-                    // 寫入待簽
-                    addFlow($link, $data_arr);
-                    $data_arr['seq'] = '0';
-                    $data_arr['current_assigner'] = $user_id;
-                    addSubflow($link, $data_arr);
-                    $data_arr['seq'] = '1';
-                    $data_arr['current_assigner'] = $next_users;
-                    addSubflow($link, $data_arr);
-                }
-            }
-        }
-    }
-
-    // 單次申請 營業
-    if ($_POST['assign_status'] == 'D') {
-        $tds = date("Y-m-d H:i:s");
-        $next_users = $_POST['next_users'];
-        $seq = $_POST['seq'];
-        $sql = "
-                UPDATE wipwhole_change_contractdate_details 
-                SET change_status = 'D'
-                WHERE id = '$cid'
-            ";
-        mysqli_query($link, $sql);
-        $sql = "
-                UPDATE flow 
-                SET flow_code = 'D'
-                WHERE form_key = '$form_key'
-            ";
-        mysqli_query($link, $sql);
-        $sql = "
-                INSERT into subflow (
-                    form_key, 
-                    seq, 
-                    current_assigner, 
-                    create_date
-                ) VALUES (
-                    '$form_key',
-                    '2', 
-                    '$next_users', 
-                    '$tds'
-                )
-            ";
-        mysqli_query($link, $sql);
-    }
-    // 取消
-    if ($_POST['assign_status'] == 'C') {
-        $tds = date("Y-m-d H:i:s");
-        $next_users = "00000";
-        if (accountidToDepartId($user_id) == "250" && in_array(accountidToRoleId($user_id), ["1", "4"])) {
-            if (getChangeStatus($link, $cid) == 'D' || getChangeStatus($link, $cid) == 'A') {
-                $seq = $_POST['seq'];
-            }
-            $sql = "
-                INSERT into subflow (
-                    form_key, 
-                    seq, 
-                    current_assigner, 
-                    create_date
-                ) VALUES (
-                    '$form_key',
-                    '$seq', 
-                    '$next_users', 
-                    '$tds'
-                )
-            ";
-            mysqli_query($link, $sql);
-        } else if (accountidToDepartId($user_id) == "521" || accountidToDepartId($user_id) == "531") {
-            if (getChangeStatus($link, $cid) == 'D') {
-                $sql = "
-                    UPDATE subflow 
-                    SET current_assigner = '$next_users',
-                        create_date = '$tds'
-                    WHERE form_key = '$form_key'
-                    AND seq = '$seq'
-                ";
-                mysqli_query($link, $sql);
-            } else if (getChangeStatus($link, $cid) == 'A') {
-                $seq = $_POST['seq'];
-                $sql = "
-                    UPDATE subflow 
-                    SET current_assigner = '$next_users',
-                        create_date = '$tds'
-                    WHERE form_key = '$form_key'
-                    AND seq = '$seq'
-                ";
-                mysqli_query($link, $sql);
-            } else {
-                $seq = $_POST['seq'];
-                $sql = "
-                    INSERT into subflow (
-                        form_key, 
-                        seq, 
-                        current_assigner, 
-                        create_date
-                    ) VALUES (
-                        '$form_key',
-                        '$seq', 
-                        '$next_users', 
-                        '$tds'
-                    )
-                ";
-                mysqli_query($link, $sql);
-            }
-        } else {
-            $seq = $_POST['seq'];
-            $sql = "
-                UPDATE subflow 
-                SET current_assigner = '$next_users',
-                    create_date = '$tds'
-                WHERE form_key = '$form_key'
-                AND seq = '$seq'
-            ";
-            mysqli_query($link, $sql);
-        }
-        $sql = "
-            UPDATE wipwhole_change_contractdate_details 
-            SET change_status = 'C'
-            WHERE id = '$cid'
-        ";
-        mysqli_query($link, $sql);
-        $sql = "
-            UPDATE flow 
-            SET flow_code = 'Z'
-            WHERE form_key = '$form_key'
-        ";
-        mysqli_query($link, $sql);
-    }
-
-    // 通過
-    if ($_POST['assign_status'] == 'Z') {
-
-        $contract_arrival_date_tmp = empty($contract_arrival_date) ? $real_contract_arrival_date : $contract_arrival_date;
-        $real_address_tmp = empty($real_address) ? $old_real_address : $real_address;
-
-        if (accountidToDepartId($user_id) == "250" && in_array(accountidToRoleId($user_id), ["1", "4"])) {
-            $tds = date("Y-m-d H:i:s");
-            $next_users = $_POST['next_users'];
-            $seq = $_POST['seq'] + 1;
-            $sql = "
-                UPDATE wipwhole_change_contractdate_details 
-                SET change_status = 'Z'
-                WHERE id = '$cid'
-            ";
-            mysqli_query($link, $sql);
-            $sql = "
-                UPDATE flow 
-                SET flow_code = 'Z'
-                WHERE form_key = '$form_key'
-            ";
-            mysqli_query($link, $sql);
-            $sql = "
-                INSERT into subflow (
-                    form_key, 
-                    seq, 
-                    current_assigner, 
-                    create_date
-                ) VALUES (
-                    '$form_key',
-                    '$seq', 
-                    '$next_users', 
-                    '$tds'
-                )
-            ";
-            mysqli_query($link, $sql);
-            $sql = "
-                UPDATE wipwholestatus
-                SET real_contract_arrival_date = '$contract_arrival_date_tmp',
-                    real_address = '$real_address_tmp'
-                WHERE id = '$id'
-            ";
-            mysqli_query($link, $sql);
-
-            // 發送系統通知
-            $contractno = $_POST['contractno'];
-            $facilityno = $_POST['facilityno'];
-            $real_contract_arrival_date = $_POST['real_contract_arrival_date'];
-            $salesid = $_POST['salesid'];
-            $gongWuokid = $_POST['gongWuokid'];
-            $old_real_address = $_POST['old_real_address'];
-            $real_address = $_POST['real_address'];
-            $content = "合約號 : $contractno
-作番號 : $facilityno
-出貨日期微調: " . substr($real_contract_arrival_date, 0, 10) . "  =>  " . substr($contract_arrival_date_tmp, 0, 10) . "
-工地地址微調: " . $old_real_address . "  =>  " . $real_address_tmp;
-
-            // 大日程出貨日調整 通知營業人員
-            $noticeData = array(
-                'related_id' => $cid,
-                'title' => '作番大日程(新梯)出貨日調整通知 > ' . $facilityno,
-                'content' => $content,
-                'permission' => $salesid,
-            );
-            addNotice($link, $noticeData);
-            // 大日程出貨日調整 通知工務人員
-            $noticeData = array(
-                'related_id' => $cid,
-                'title' => '作番大日程(新梯)出貨日調整通知 > ' . $facilityno,
-                'content' => $content,
-                'permission' => $gongWuokid,
-            );
-            addNotice($link, $noticeData);
-
-            $shengguano_arr = getShengguanokOptions($link);
-            foreach ($shengguano_arr as $row) :
-                $contractno = $_POST['contractno'];
-                $facilityno = $_POST['facilityno'];
-                $real_contract_arrival_date = $_POST['real_contract_arrival_date'];
-                $gongWuokid = $_POST['gongWuokid'];
-                $old_real_address = $_POST['old_real_address'];
-                $real_address = $_POST['real_address'];
-                $content = "合約號 : $contractno
-作番號 : $facilityno
-出貨日期微調: " . substr($real_contract_arrival_date, 0, 10) . "  =>  " . substr($contract_arrival_date_tmp, 0, 10) . "
-工地地址微調: " . $old_real_address . "  =>  " . $real_address_tmp;
-
-                // 大日程出貨日調整 通知營業人員
-                $noticeData = array(
-                    'related_id' => $cid,
-                    'title' => '作番大日程(新梯)出貨日調整通知 > ' . $facilityno,
-                    'content' => $content,
-                    'permission' => $row['val'],
-                );
-                addNotice($link, $noticeData);
-            endforeach;
-        }
-    }
-}
+<?php
+// echo $_POST['assign_status'];exit;
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    $checkStatus = checkStatus($link, $id, $user_id);
+    if (!empty($_POST['contract_arrival_date']) || !empty($_POST['real_address'])) {
+        if ($checkStatus) {
+
+            $all_contractno_change = empty($_POST['all_contractno_change']) ? null : $_POST['all_contractno_change'];
+            $real_contract_arrival_date  = $_POST['real_contract_arrival_date'];
+            $contract_arrival_date  = $_POST['contract_arrival_date'];
+            $real_address  = $_POST['real_address'];
+            $old_real_address  = $_POST['old_real_address'];
+            $estimated_shipping_schedule_date  = $_POST['estimated_shipping_schedule_date'];
+            $contractno = $_POST['contractno'];
+            $next_users = $_POST['next_users'];
+            $tds = date("Y-m-d H:i:s");
+
+            // 檢查日期是否正確
+            if ($_POST['assign_status'] !== 'C' && empty($real_address)) {
+                if (strtotime($contract_arrival_date) < strtotime($estimated_shipping_schedule_date)) {
+                    return;
+                }
+            }
+
+            // 單次申請 
+            if (($_POST['assign_status'] == 'A' || $_POST['assign_status'] == 'B') && empty($all_contractno_change)) {
+                $data_arr = array(
+                    'id' => $id,
+                    'all_contractno_change' => $all_contractno_change,
+                    'real_contract_arrival_date'  => $real_contract_arrival_date,
+                    'contract_arrival_date'  => $contract_arrival_date,
+                    'real_address'  => $real_address,
+                    'old_real_address' => $old_real_address,
+                    'contractno' => $contractno,
+                    'tds' => $tds,
+                    'form_key' => getFomkeySeq($link),
+                    'user_id' => $user_id,
+                    'change_status' => $_POST['assign_status']
+                );
+                // 寫入表單主檔
+                addWipwholeChangeContractdateDetails($link, $data_arr);
+                // 取得寫入後表單seq
+                $data_arr['last_id'] = $link->insert_id;
+                // 寫入待簽
+                addFlow($link, $data_arr);
+                $data_arr['seq'] = '0';
+                $data_arr['current_assigner'] = $user_id;
+                addSubflow($link, $data_arr);
+                $data_arr['seq'] = '1';
+                $data_arr['current_assigner'] = $next_users;
+                addSubflow($link, $data_arr);
+            }
+
+            // 批次申請
+            if (($_POST['assign_status'] == 'A' || $_POST['assign_status'] == 'B') && !empty($all_contractno_change)) {
+                $wipwholestatus_id_arr = getWipwholestatusIdByConstractNo($link, $contractno);
+                $assign_status = $_POST['assign_status'];
+                foreach ($wipwholestatus_id_arr as $wipwholestatus_id) {
+                    $data_arr = array(
+                        'id' => $wipwholestatus_id[0],
+                        'all_contractno_change' => $all_contractno_change,
+                        'real_contract_arrival_date'  => $real_contract_arrival_date,
+                        'contract_arrival_date'  => $contract_arrival_date,
+                        'real_address'  => $real_address,
+                        'old_real_address' => $old_real_address,
+                        'contractno' => $contractno,
+                        'tds' => $tds,
+                        'form_key' => getFomkeySeq($link),
+                        'user_id' => $user_id,
+                        'change_status' => $assign_status
+                    );
+                    // 寫入表單主檔
+                    addWipwholeChangeContractdateDetails($link, $data_arr);
+                    // 取得寫入後表單seq
+                    $data_arr['last_id'] = $link->insert_id;
+                    // 寫入待簽
+                    addFlow($link, $data_arr);
+                    $data_arr['seq'] = '0';
+                    $data_arr['current_assigner'] = $user_id;
+                    addSubflow($link, $data_arr);
+                    $data_arr['seq'] = '1';
+                    $data_arr['current_assigner'] = $next_users;
+                    addSubflow($link, $data_arr);
+                }
+            }
+        }
+    }
+
+    // 單次申請 營業
+    if ($_POST['assign_status'] == 'D') {
+        $tds = date("Y-m-d H:i:s");
+        $next_users = $_POST['next_users'];
+        $seq = $_POST['seq'];
+        $sql = "
+                UPDATE wipwhole_change_contractdate_details 
+                SET change_status = 'D'
+                WHERE id = '$cid'
+            ";
+        mysqli_query($link, $sql);
+        $sql = "
+                UPDATE flow 
+                SET flow_code = 'D'
+                WHERE form_key = '$form_key'
+            ";
+        mysqli_query($link, $sql);
+        $sql = "
+                INSERT into subflow (
+                    form_key, 
+                    seq, 
+                    current_assigner, 
+                    create_date
+                ) VALUES (
+                    '$form_key',
+                    '2', 
+                    '$next_users', 
+                    '$tds'
+                )
+            ";
+        mysqli_query($link, $sql);
+    }
+    // 取消
+    if ($_POST['assign_status'] == 'C') {
+        $tds = date("Y-m-d H:i:s");
+        $next_users = "00000";
+        if (accountidToDepartId($user_id) == "250" && in_array(accountidToRoleId($user_id), ["1", "4"])) {
+            if (getChangeStatus($link, $cid) == 'D' || getChangeStatus($link, $cid) == 'A') {
+                $seq = $_POST['seq'];
+            }
+            $sql = "
+                INSERT into subflow (
+                    form_key, 
+                    seq, 
+                    current_assigner, 
+                    create_date
+                ) VALUES (
+                    '$form_key',
+                    '$seq', 
+                    '$next_users', 
+                    '$tds'
+                )
+            ";
+            mysqli_query($link, $sql);
+        } else if (accountidToDepartId($user_id) == "521" || accountidToDepartId($user_id) == "531") {
+            if (getChangeStatus($link, $cid) == 'D') {
+                $sql = "
+                    UPDATE subflow 
+                    SET current_assigner = '$next_users',
+                        create_date = '$tds'
+                    WHERE form_key = '$form_key'
+                    AND seq = '$seq'
+                ";
+                mysqli_query($link, $sql);
+            } else if (getChangeStatus($link, $cid) == 'A') {
+                $seq = $_POST['seq'];
+                $sql = "
+                    UPDATE subflow 
+                    SET current_assigner = '$next_users',
+                        create_date = '$tds'
+                    WHERE form_key = '$form_key'
+                    AND seq = '$seq'
+                ";
+                mysqli_query($link, $sql);
+            } else {
+                $seq = $_POST['seq'];
+                $sql = "
+                    INSERT into subflow (
+                        form_key, 
+                        seq, 
+                        current_assigner, 
+                        create_date
+                    ) VALUES (
+                        '$form_key',
+                        '$seq', 
+                        '$next_users', 
+                        '$tds'
+                    )
+                ";
+                mysqli_query($link, $sql);
+            }
+        } else {
+            $seq = $_POST['seq'];
+            $sql = "
+                UPDATE subflow 
+                SET current_assigner = '$next_users',
+                    create_date = '$tds'
+                WHERE form_key = '$form_key'
+                AND seq = '$seq'
+            ";
+            mysqli_query($link, $sql);
+        }
+        $sql = "
+            UPDATE wipwhole_change_contractdate_details 
+            SET change_status = 'C'
+            WHERE id = '$cid'
+        ";
+        mysqli_query($link, $sql);
+        $sql = "
+            UPDATE flow 
+            SET flow_code = 'Z'
+            WHERE form_key = '$form_key'
+        ";
+        mysqli_query($link, $sql);
+    }
+
+    // 通過
+    if ($_POST['assign_status'] == 'Z') {
+
+        $contract_arrival_date_tmp = empty($contract_arrival_date) ? $real_contract_arrival_date : $contract_arrival_date;
+        $real_address_tmp = empty($real_address) ? $old_real_address : $real_address;
+
+        if (accountidToDepartId($user_id) == "250" && in_array(accountidToRoleId($user_id), ["1", "4"])) {
+            $tds = date("Y-m-d H:i:s");
+            $next_users = $_POST['next_users'];
+            $seq = $_POST['seq'] + 1;
+            $sql = "
+                UPDATE wipwhole_change_contractdate_details 
+                SET change_status = 'Z'
+                WHERE id = '$cid'
+            ";
+            mysqli_query($link, $sql);
+            $sql = "
+                UPDATE flow 
+                SET flow_code = 'Z'
+                WHERE form_key = '$form_key'
+            ";
+            mysqli_query($link, $sql);
+            $sql = "
+                INSERT into subflow (
+                    form_key, 
+                    seq, 
+                    current_assigner, 
+                    create_date
+                ) VALUES (
+                    '$form_key',
+                    '$seq', 
+                    '$next_users', 
+                    '$tds'
+                )
+            ";
+            mysqli_query($link, $sql);
+            $sql = "
+                UPDATE wipwholestatus
+                SET real_contract_arrival_date = '$contract_arrival_date_tmp',
+                    real_address = '$real_address_tmp'
+                WHERE id = '$id'
+            ";
+            mysqli_query($link, $sql);
+
+            // 發送系統通知
+            $contractno = $_POST['contractno'];
+            $facilityno = $_POST['facilityno'];
+            $real_contract_arrival_date = $_POST['real_contract_arrival_date'];
+            $salesid = $_POST['salesid'];
+            $gongWuokid = $_POST['gongWuokid'];
+            $old_real_address = $_POST['old_real_address'];
+            $real_address = $_POST['real_address'];
+            $content = "合約號 : $contractno
+作番號 : $facilityno
+出貨日期微調: " . substr($real_contract_arrival_date, 0, 10) . "  =>  " . substr($contract_arrival_date_tmp, 0, 10) . "
+工地地址微調: " . $old_real_address . "  =>  " . $real_address_tmp;
+
+            // 大日程出貨日調整 通知營業人員
+            $noticeData = array(
+                'related_id' => $cid,
+                'title' => '作番大日程(新梯)出貨日調整通知 > ' . $facilityno,
+                'content' => $content,
+                'permission' => $salesid,
+            );
+            addNotice($link, $noticeData);
+            // 大日程出貨日調整 通知工務人員
+            $noticeData = array(
+                'related_id' => $cid,
+                'title' => '作番大日程(新梯)出貨日調整通知 > ' . $facilityno,
+                'content' => $content,
+                'permission' => $gongWuokid,
+            );
+            addNotice($link, $noticeData);
+
+            $shengguano_arr = getShengguanokOptions($link);
+            foreach ($shengguano_arr as $row) :
+                $contractno = $_POST['contractno'];
+                $facilityno = $_POST['facilityno'];
+                $real_contract_arrival_date = $_POST['real_contract_arrival_date'];
+                $gongWuokid = $_POST['gongWuokid'];
+                $old_real_address = $_POST['old_real_address'];
+                $real_address = $_POST['real_address'];
+                $content = "合約號 : $contractno
+作番號 : $facilityno
+出貨日期微調: " . substr($real_contract_arrival_date, 0, 10) . "  =>  " . substr($contract_arrival_date_tmp, 0, 10) . "
+工地地址微調: " . $old_real_address . "  =>  " . $real_address_tmp;
+
+                // 大日程出貨日調整 通知營業人員
+                $noticeData = array(
+                    'related_id' => $cid,
+                    'title' => '作番大日程(新梯)出貨日調整通知 > ' . $facilityno,
+                    'content' => $content,
+                    'permission' => $row['val'],
+                );
+                addNotice($link, $noticeData);
+            endforeach;
+        }
+    }
+}
diff --git a/wms/wipwhole-change-contractdate.php b/wms/wipwhole-change-contractdate.php
index ee6ff0f3..6e3ff3c5 100644
--- a/wms/wipwhole-change-contractdate.php
+++ b/wms/wipwhole-change-contractdate.php
@@ -1,536 +1,509 @@
-<?php
-// ini_set('display_errors', 'on');
-
-function getAccounttype($link,$user_id){
-    $sql = "SELECT * FROM account where accountid = '$user_id'"; 
-    $data = mysqli_query($link, $sql); 
-    $row = mysqli_fetch_array($data, MYSQLI_ASSOC);
-    return $row['accounttype'];
-}
-
-include 'IncludeCommon.php';
-require_once "database.php";
-
-$includecommon = new IncludeCommon();
-$token = empty($token) ? $_REQUEST["token"] : $token;
-$token_link = "token=" . $token;
-list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
-$user_name = urldecode(base64_decode($enc_user_name));
-$accounttype = getAccounttype($link,$user_id);
-
-$data = array(); 
-$login_json = null;
-if (strlen($accounttype) != 0) {
-    $jsonres['menu']=$includecommon->menu_v3($user_id, $accounttype); 
-    $login_json =  json_encode($jsonres, JSON_UNESCAPED_UNICODE);
-}
-
-?>
-<script>
-    res=eval("("+JSON.stringify(<?php echo $login_json; ?>)+")");
-    window.localStorage.setItem("menu_<?php echo $user_id; ?>",res.menu);
-</script>
-<?php
-/*
-    1. 有 cid 是已申請過的單
-    2. 沒有 cid 是新申請單
-    3. 若是從待簽過來 cid 從 form_key 取得
-    4. 大日程的 id 已申請過的從 cid 取得
-    5. 大日程的 id 新申請過的直接取得
-*/
-
-// ini_set('display_errors', 'on');
-
-include "header.php";
-include "css/view/wipwhole-change-contractdate.php";
-include "wipwhole-change-contractdate-function.php";
-
-if (!checkPageUserStatus($user_id)) {
-    echo "此帳號無權限使用任何相關功能";
-    exit;
-}
-
-// 查詢數據
-if (!empty($_GET['form_key'])) {
-    $cid = isset($_GET['cid']) ? $_GET['cid'] : getCid($link, $_GET['form_key']);
-} else {
-    $cid = isset($_GET['cid']) ? $_GET['cid'] : null;
-}
-$form_key = isset($_GET['form_key']) ? $_GET['form_key'] : getForm_key($link, $cid);
-$id = isset($_GET['id']) ? $_GET['id'] : getId($link, $cid);
-
-include "wipwhole-change-contractdate-submit.php";
-
-//  select => options
-$shengguanok_options = getShengguanokOptions($link);
-$gongwuok_options = getGongwuokOptions($link);
-
-// 帶入大日程資料
-$row = getWipwholestatusDetail($link, $id);
-// 帶入所有人歷史單據
-$date_options = getDateOptions($link, $user_id, $id);
-// 檢查此單據狀態非新申請則帶入申請資料
-if (!empty(checkNowFormStatus($link)))
-    $row2 = getWipwholeChangeContractdateDetails($link, $cid);
-
-?>
-
-<div style="overflow-x:auto;">
-    <form method="post">
-        <div class="tab-pane active" class="assign_content" role="mainpanel" id="tabassign">
-            <!-- hidden域 -->
-            <input type="hidden" name="form_key" value='' />
-            <input type="hidden" value="" name="sheet_no" />
-            <table id='basic_info' class="form-content-table">
-                <thead>
-                    <tr>
-                        <td colspan="8" style="text-align:right;">
-                            <button type="button" id="btn_close" class="btn btn-default" onclick="window.close();">關閉分頁</button>
-                        </td>
-                    </tr>
-                    <tr class="no-border">
-                        <th colspan="8">
-                            <h4>預計出貨日(到工地)調整申請表</h4>
-                        </th>
-                    </tr>
-                    <tr>
-                        <td>　</td>
-                    </tr>
-                    <tr class="no-border">
-                        <th colspan="8">
-                            <?php
-                            if ($_SERVER["REQUEST_METHOD"] == "POST") {
-                                // 檢查日期是否正確
-                                echo getAssignStatusMessage($_POST, $checkStatus);
-                            }
-                            ?>
-                        </th>
-                    </tr>
-                    <tr class="no-border">
-                        <th style="text-align:left;">
-                            <b> 申請紀錄:</b>
-                        </th>
-                        <th colspan="3" style="text-align:left;">
-                            <select class="select2" id="date_select" onchange="dateSelect()">
-                                <option value="new">填寫新申請</option>
-                                <?php
-                                $change_status_name = array(
-                                    "A" => "新申請",
-                                    "B" => "新申請",
-                                    "D" => "新申請",
-                                    "Z" => "通過",
-                                    "C" => "取消",
-                                );
-                                while ($date_option = mysqli_fetch_assoc($date_options)) {
-                                    if ($cid == $date_option['id']) {
-                                        echo "<option selected value='" . $date_option['id'] . "'>" . $change_status_name[$date_option['change_status']] . "_" . $date_option['create_at'] . "</option>";
-                                    } else {
-                                        echo "<option value='" . $date_option['id'] . "'>" . $change_status_name[$date_option['change_status']] . "_" . $date_option['create_at'] . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </th>
-                        <th colspan="4">
-                            <span style="float: right;text-align:right;">
-                                <b>申請日期:
-                                    <?php
-                                    echo empty(checkNowFormStatus($link)) ? date("Y-m-d") : $row2['create_at'];
-                                    ?>
-                                </b>
-                            </span>
-                        </th>
-                    </tr>
-                    <tr>
-                        <td style="background-color:#ffffff;">　</td>
-                    </tr>
-                    <tr>
-                        <th colspan="8">基本信息</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <th>申請人員編</th>
-                        <td>
-                            <?php
-                            echo empty(checkNowFormStatus($link))
-                                ? $user_id : $row2['creater'];
-                            ?>
-                        </td>
-                        <th>申請人</th>
-                        <td>
-                            <?php
-                            echo empty(checkNowFormStatus($link))
-                                ? accountidToName($user_id)
-                                : accountidToName($row2['creater']);
-                            ?>
-                        </td>
-                        <th>申請人部門</th>
-                        <td>
-                            <?php
-                            echo empty(checkNowFormStatus($link))
-                                ? departIdToDepartName(accountidToDepartId($user_id))
-                                : departIdToDepartName(accountidToDepartId($row2['creater']));
-                            ?>
-                        </td>
-                        <th>申請人職稱</th>
-                        <td>
-                            <?php
-                            echo empty(checkNowFormStatus($link))
-                                ? accountidToRoleName($user_id)
-                                : accountidToRoleName($row2['creater']);
-                            ?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>合約號</th>
-                        <td>
-                            <?php
-                            echo $row["contractno"];
-                            echo "<input type='hidden' name='contractno' value='" . $row["contractno"] . "' />";
-                            ?>
-                            <br />
-                            <?php
-                            if (accountidToDepartId($user_id) !== '250')
-                                if (empty(checkNowFormStatus($link)))
-                                    echo "
-                                        <input type='checkbox' name='all_contractno_change' value='1' />
-                                        變更此合約所有作番
-                                    ";
-                            ?>
-                        </td>
-                        <th>作番號</th>
-                        <td>
-                            <?php
-                            echo $row["facilityno"];
-                            echo "<input type='hidden' name='facilityno' value='" . $row["facilityno"] . "' />";
-                            ?>
-                        </td>
-                        <th>客戶名稱</th>
-                        <td>
-                            <?php
-                            echo $row["custom"];
-                            echo "<input type='hidden' name='custom' value='" . $row["custom"] . "' />";
-                            ?>
-                        </td>
-                        <th>作番大日程</th>
-                        <td>
-                            <?php
-                            $wipwhole_url = "wipwhole-rec-invoice-edit.php?function_name=wipwholerenstatus&$token_link&id=$id";
-                            if ($row["contract_type"] === 'B')
-                                $wipwhole_url = "wipwhole-renovate-rec-invoice-edit.php?function_name=wipwholerenstatus&$token_link&id=$id";
-                            ?>
-                            <a target='_blank' href="<?php echo $wipwhole_url; ?>" class="btn btn-info btn-sm">
-                                開啟
-                            </a>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>營業/契約<br />人員員編</th>
-                        <td>
-                            <?php echo $row['salesid']; ?>
-                            <?php echo "<input type='hidden' name='salesid' value='" . $row["salesid"] . "' />"; ?>
-                        </td>
-                        <th>營業/契約<br />人員</th>
-                        <td>
-                            <?php echo accountidToName($row['salesid']); ?>
-                        </td>
-                        <th>工務人員員編</th>
-                        <td>
-                            <?php echo getGongWuokNo($link, $row['contract_type']); ?>
-                            <?php echo "<input type='hidden' name='gongWuokid' value='" . getGongWuokNo($link, $row['contract_type']) . "' />"; ?>
-                        </td>
-                        <th>工務人員</th>
-                        <td>
-                            <?php echo accountidToName(getGongWuokNo($link, $row['contract_type'])); ?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>下單日<br />(下單普來特富)</th>
-                        <td>
-                            <?php echo substr($row["prattford_order_date"], 0, 10); ?>
-                        </td>
-                        <th>預計發貨日<br />(出港日)</th>
-                        <td>
-                            <?php echo substr($row["estimated_shipping_date"], 0, 10); ?>
-                        </td>
-                        <th>預計到貨日<br />(到觀音廠日)</th>
-                        <td>
-                            <?php echo substr($row["estimated_shipping_schedule_date"], 0, 10); ?>
-                            <input type='hidden' name='estimated_shipping_schedule_date' value='<?php echo $row['estimated_shipping_schedule_date']; ?>' />
-                        </td>
-                        <th>實際到貨日<br />(到觀音廠日)</th>
-                        <td>
-                            <?php echo substr($row["actual_tofactory_date"], 0, 10); ?>
-                            <input type='hidden' name='actual_tofactory_date' value='<?php echo $row['estimated_shipping_schedule_date']; ?>' />
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>合約交期</th>
-                        <td>
-                            <?php echo substr($row["contract_arrival_date"], 0, 10); ?>
-                        </td>
-                        <th>原出貨日</th>
-                        <td>
-                            <?php
-                            echo empty(checkNowFormStatus($link))
-                                ? substr($row['real_contract_arrival_date'], 0, 10)
-                                : substr($row2["old_change_date"], 0, 10);
-                            echo "<input type='hidden' name='real_contract_arrival_date' value='" . $row['real_contract_arrival_date'] . "' />";
-                            ?>
-                        </td>
-                        <th>調整出貨日</th>
-                        <td colspan="3">
-                            <?php
-                            if (empty(checkNowFormStatus($link))) {
-                            ?>
-                                <input type="date" name="contract_arrival_date" />
-                            <?php
-                            } else {
-                                echo substr($row2["change_date"], 0, 10);
-                                echo "<input type='hidden' name='contract_arrival_date' value='" . $row2["change_date"] . "' />";
-                            }
-                            ?>
-
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>地址</th>
-                        <td>
-                            <?php echo $row["address"]; ?>
-                        </td>
-                        <th>原工地地址</th>
-                        <td>
-                            <?php
-                            echo empty(checkNowFormStatus($link)) ? $row['real_address'] : $row2["old_real_address"];
-                            echo "<input type='hidden' name='old_real_address' value='" . $row['real_address'] . "' />";
-                            ?>
-                        </td>
-                        <th>調整工地地址</th>
-                        <td colspan="3">
-                            <?php
-                            if (empty(checkNowFormStatus($link))) {
-                                echo "<input type='text' name='real_address' />";
-                            } else {
-                                echo $row2["real_address"];
-                                echo "<input type='hidden' name='real_address' value='" . $row2["real_address"] . "' />";
-                            }
-                            ?>
-
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-
-            <table id="assign_area" class="form-content-table ">
-                <thead>
-                    <tr>
-                        <th colspan="8"><b>簽核操作 </b></th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <th> 簽核狀態</th>
-                        <td colspan="2">
-                            <?php
-                            if (checkNowFormStatus($link) == 'Z') {
-                                echo getChangeStatusName($link, $cid);
-                            } else {
-                                $nowFormStatus = getNowFormStatus($link, $cid);
-                                echo getAssignStatusSelect($link, $user_id, $nowFormStatus);
-                            }
-                            ?>
-                        </td>
-                        <th class="td_title"> 下位簽核者</th>
-                        <td colspan="2">
-                            <?php
-                            if (empty(checkNowFormStatus($link))) {
-                                if (in_array(getDepartmentId($link, $user_id), ['521', '531', '541', '542', '543', '544', '545'])) {
-                                    echo "<select name='next_users' id='next_users'>";
-                                    foreach ($shengguanok_options as $shengguanok_option) :
-                                        echo "
-                                            <option value='" . $shengguanok_option['val'] . "'>" . $shengguanok_option['val'] . $shengguanok_option['label'] . "</option>
-                                        ";
-                                    endforeach;
-                                    echo "</select>";
-                                } else {
-                                    echo "
-                                    <select name='next_users' id='next_users'>
-                                        <option value='" . getGongWuokNo($link, $row['contract_type']) . "'>" . accountidToName(getGongWuokNo($link, $row['contract_type'])) . getGongWuokNo($link, $row['contract_type']) . "</option>
-                                    </select>
-                                    ";
-                                }
-                            } else if (checkNowFormStatus($link) == 'A' || checkNowFormStatus($link) == 'D') {
-                                echo "
-                                    <select name='next_users' id='next_users'>
-                                        <option value='00000'>00000</option>
-                                    </select>
-                                ";
-                            } else if (checkNowFormStatus($link) == 'B') {
-                                if (getDepartmentId($link, $user_id) == '521' || getDepartmentId($link, $user_id) == '531') {
-                                    echo "<select name='next_users' id='next_users'>";
-                                    foreach ($shengguanok_options as $shengguanok_option) :
-                                        echo "
-                                            <option value='" . $shengguanok_option['val'] . "'>" . $shengguanok_option['val'] . $shengguanok_option['label'] . "</option>
-                                        ";
-                                    endforeach;
-                                    echo "</select>";
-                                } else {
-                                    echo "
-                                        <select name='next_users' id='next_users'>
-                                            <option value='00000'>00000</option>
-                                        </select>
-                                    ";
-                                }
-                            }
-                            ?>
-                        </td>
-                        <td colspan="2">
-                            <?php
-                            // 誰通過或取消簽核位子
-                            if (empty(checkNowFormStatus($link))) {
-                                echo "<input type='hidden' name='seq' value = '0' />";
-                                echo "<button class='btn btn-primary'>提交</button>";
-                            } else if (checkNowFormStatus($link) == 'A') {
-                                if (accountidToDepartId($user_id) == "250" && in_array(accountidToRoleId($user_id), ["1", "4"])) {
-                                    echo "<input type='hidden' name='seq' value = '2' />";
-                                } else if (in_array(accountidToDepartId($user_id), ["521", "531"])) {
-                                    echo "<input type='hidden' name='seq' value = '1' />";
-                                } else {
-                                    echo "<input type='hidden' name='seq' value = '0' />";
-                                }
-                                echo "<button class='btn btn-primary'>提交</button>";
-                            } else if (checkNowFormStatus($link) == 'B') {
-                                if (in_array(accountidToDepartId($user_id), ["521", "531"])) {
-                                    echo "<input type='hidden' name='seq' value = '1' />";
-                                } else if (accountidToDepartId($user_id) == "250" && in_array(accountidToRoleId($user_id), ["1", "4"])) {
-                                    echo "<input type='hidden' name='seq' value = '2' />";
-                                } else {
-                                    echo "<input type='hidden' name='seq' value = '0' />";
-                                }
-                                echo "<button class='btn btn-primary'>提交</button>";
-                            } else if (checkNowFormStatus($link) == 'D') {
-                                if (in_array(accountidToDepartId($user_id), ["521", "531"])) {
-                                    echo "<input type='hidden' name='seq' value = '1' />";
-                                } else if (accountidToDepartId($user_id) == "250" && in_array(accountidToRoleId($user_id), ["1", "4"])) {
-                                    echo "<input type='hidden' name='seq' value = '2' />";
-                                } else {
-                                    echo "<input type='hidden' name='seq' value = '0' />";
-                                }
-                                echo "<button class='btn btn-primary'>提交</button>";
-                            }
-                            ?>
-                        </td>
-                    </tr>
-                    <?php
-                    if (!empty(checkNowFormStatus($link))) {
-                        $current_assigners = getCurrentAssigners($link, $form_key);
-                        foreach ($current_assigners as $current_assigner) :
-                            if ($current_assigner['current_assigner'] != '00000') {
-                    ?>
-                                <tr>
-                                    <td colspan="1">
-                                        <?php
-                                        if ($current_assigner['seq'] == '0') {
-                                            echo "申請者";
-                                        } else {
-                                            echo departIdToDepartName(accountidToDepartId($current_assigner['current_assigner']));
-                                        }
-                                        ?>
-                                    </td>
-                                    <td colspan="1">
-                                        <?php
-                                        if ($current_assigner['current_assigner'] !== '00000')
-                                            echo $current_assigner['current_assigner'] . "_" . accountidToName($current_assigner['current_assigner']);
-                                        ?>
-                                    </td>
-                                    <td colspan="1">
-                                        <?php
-                                        if ($current_assigner['seq'] == '0') {
-                                            if ($current_assigner['next_current_assigner'] == '00000') {
-                                                if ($current_assigner['change_status'] == 'C') {
-                                                    echo "已取消";
-                                                } else {
-                                                    echo "已申請";
-                                                }
-                                            } else {
-                                                echo "已申請";
-                                            }
-                                        }
-                                        if ($current_assigner['seq'] == '1') {
-                                            if (isset($current_assigner['next_current_assigner'])) {
-                                                if ($current_assigner['next_current_assigner'] !== '00000') {
-                                                    echo "已通過";
-                                                } else {
-                                                    if ($current_assigner['change_status'] == 'C')
-                                                        echo "已取消";
-                                                    if ($current_assigner['change_status'] == 'Z')
-                                                        echo "已通過";
-                                                }
-                                            } else {
-                                                if (!isset($current_assigner['next_current_assigner'])) {
-                                                    if ($current_assigner['change_status'] == 'C') {
-                                                        echo "已取消";
-                                                    } else if ($current_assigner['change_status'] == 'Z') {
-                                                        echo "已通過";
-                                                    } else {
-                                                        echo "審核中";
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        if ($current_assigner['seq'] == '2') {
-                                            if (isset($current_assigner['next_current_assigner'])) {
-                                                if ($current_assigner['next_current_assigner'] !== '00000') {
-                                                    echo "已通過";
-                                                } else {
-                                                    if ($current_assigner['change_status'] == 'C')
-                                                        echo "已取消";
-                                                    if ($current_assigner['change_status'] == 'Z')
-                                                        echo "已通過";
-                                                }
-                                            } else {
-                                                if (!isset($current_assigner['next_current_assigner'])) {
-                                                    if ($current_assigner['change_status'] == 'C') {
-                                                        echo "已取消";
-                                                    } else if ($current_assigner['change_status'] == 'Z') {
-                                                        echo "已通過";
-                                                    } else {
-                                                        echo "審核中";
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        ?>
-                                    </td>
-                                </tr>
-                    <?php
-                            }
-                        endforeach;
-                    }
-                    ?>
-                </tbody>
-            </table>
-    </form>
-</div>
-
-<div>
-
-    <div style="overflow-x:auto;">
-
-    </div>
-
-    <script type="text/javascript">
-        $(function() {
-            $("title").text("<?php echo $row["contractno"]; ?>預計出貨日(到工地)調整申請表");
-        })
-
-        function dateSelect() {
-            if ($("#date_select").val() == 'new') {
-                window.location.href = "<?php echo "wipwhole-change-contractdate.php?function_name=wipwholerenstatus&$token_link&id=$id"; ?>";
-            } else {
-                window.location.href = "<?php echo "wipwhole-change-contractdate.php?function_name=wipwholerenstatus&$token_link&id=$id&cid="; ?>" + $("#date_select").val();
-            }
-        }
-    </script>
+<?php
+// ini_set('display_errors', 'on');
+
+/*
+    1. 有 cid 是已申請過的單
+    2. 沒有 cid 是新申請單
+    3. 若是從待簽過來 cid 從 form_key 取得
+    4. 大日程的 id 已申請過的從 cid 取得
+    5. 大日程的 id 新申請過的直接取得
+*/
+
+// ini_set('display_errors', 'on');
+
+// include 'IncludeCommon.php';
+require_once "database.php";
+// $includecommon = new IncludeCommon();
+include "header.php";
+include "css/view/wipwhole-change-contractdate.php";
+include "wipwhole-change-contractdate-function.php";
+
+if (!checkPageUserStatus($user_id)) {
+    echo "此帳號無權限使用任何相關功能";
+    exit;
+}
+
+// 查詢數據
+if (!empty($_GET['form_key'])) {
+    $cid = isset($_GET['cid']) ? $_GET['cid'] : getCid($link, $_GET['form_key']);
+} else {
+    $cid = isset($_GET['cid']) ? $_GET['cid'] : null;
+}
+$form_key = isset($_GET['form_key']) ? $_GET['form_key'] : getForm_key($link, $cid);
+$id = isset($_GET['id']) ? $_GET['id'] : getId($link, $cid);
+
+include "wipwhole-change-contractdate-submit.php";
+
+//  select => options
+$shengguanok_options = getShengguanokOptions($link);
+$gongwuok_options = getGongwuokOptions($link);
+
+// 帶入大日程資料
+$row = getWipwholestatusDetail($link, $id);
+// 帶入所有人歷史單據
+$date_options = getDateOptions($link, $user_id, $id);
+// 檢查此單據狀態非新申請則帶入申請資料
+if (!empty(checkNowFormStatus($link)))
+    $row2 = getWipwholeChangeContractdateDetails($link, $cid);
+
+?>
+
+<div style="overflow-x:auto;">
+    <form method="post">
+        <div class="tab-pane active" class="assign_content" role="mainpanel" id="tabassign">
+            <!-- hidden域 -->
+            <input type="hidden" name="form_key" value='' />
+            <input type="hidden" value="" name="sheet_no" />
+            <table id='basic_info' class="form-content-table">
+                <thead>
+                    <tr>
+                        <td colspan="8" style="text-align:right;">
+                            <button type="button" id="btn_close" class="btn btn-default" onclick="window.close();">關閉分頁</button>
+                        </td>
+                    </tr>
+                    <tr class="no-border">
+                        <th colspan="8">
+                            <h4>預計出貨日(到工地)調整申請表</h4>
+                        </th>
+                    </tr>
+                    <tr>
+                        <td>　</td>
+                    </tr>
+                    <tr class="no-border">
+                        <th colspan="8">
+                            <?php
+                            if ($_SERVER["REQUEST_METHOD"] == "POST") {
+                                // 檢查日期是否正確
+                                echo getAssignStatusMessage($_POST, $checkStatus);
+                            }
+                            ?>
+                        </th>
+                    </tr>
+                    <tr class="no-border">
+                        <th style="text-align:left;">
+                            <b> 申請紀錄:</b>
+                        </th>
+                        <th colspan="3" style="text-align:left;">
+                            <select class="select2" id="date_select" onchange="dateSelect()">
+                                <option value="new">填寫新申請</option>
+                                <?php
+                                $change_status_name = array(
+                                    "A" => "新申請",
+                                    "B" => "新申請",
+                                    "D" => "新申請",
+                                    "Z" => "通過",
+                                    "C" => "取消",
+                                );
+                                while ($date_option = mysqli_fetch_assoc($date_options)) {
+                                    if ($cid == $date_option['id']) {
+                                        echo "<option selected value='" . $date_option['id'] . "'>" . $change_status_name[$date_option['change_status']] . "_" . $date_option['create_at'] . "</option>";
+                                    } else {
+                                        echo "<option value='" . $date_option['id'] . "'>" . $change_status_name[$date_option['change_status']] . "_" . $date_option['create_at'] . "</option>";
+                                    }
+                                }
+                                ?>
+                            </select>
+                        </th>
+                        <th colspan="4">
+                            <span style="float: right;text-align:right;">
+                                <b>申請日期:
+                                    <?php
+                                    echo empty(checkNowFormStatus($link)) ? date("Y-m-d") : $row2['create_at'];
+                                    ?>
+                                </b>
+                            </span>
+                        </th>
+                    </tr>
+                    <tr>
+                        <td style="background-color:#ffffff;">　</td>
+                    </tr>
+                    <tr>
+                        <th colspan="8">基本信息</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <th>申請人員編</th>
+                        <td>
+                            <?php
+                            echo empty(checkNowFormStatus($link))
+                                ? $user_id : $row2['creater'];
+                            ?>
+                        </td>
+                        <th>申請人</th>
+                        <td>
+                            <?php
+                            echo empty(checkNowFormStatus($link))
+                                ? accountidToName($user_id)
+                                : accountidToName($row2['creater']);
+                            ?>
+                        </td>
+                        <th>申請人部門</th>
+                        <td>
+                            <?php
+                            echo empty(checkNowFormStatus($link))
+                                ? departIdToDepartName(accountidToDepartId($user_id))
+                                : departIdToDepartName(accountidToDepartId($row2['creater']));
+                            ?>
+                        </td>
+                        <th>申請人職稱</th>
+                        <td>
+                            <?php
+                            echo empty(checkNowFormStatus($link))
+                                ? accountidToRoleName($user_id)
+                                : accountidToRoleName($row2['creater']);
+                            ?>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>合約號</th>
+                        <td>
+                            <?php
+                            echo $row["contractno"];
+                            echo "<input type='hidden' name='contractno' value='" . $row["contractno"] . "' />";
+                            ?>
+                            <br />
+                            <?php
+                            if (accountidToDepartId($user_id) !== '250')
+                                if (empty(checkNowFormStatus($link)))
+                                    echo "
+                                        <input type='checkbox' name='all_contractno_change' value='1' />
+                                        變更此合約所有作番
+                                    ";
+                            ?>
+                        </td>
+                        <th>作番號</th>
+                        <td>
+                            <?php
+                            echo $row["facilityno"];
+                            echo "<input type='hidden' name='facilityno' value='" . $row["facilityno"] . "' />";
+                            ?>
+                        </td>
+                        <th>客戶名稱</th>
+                        <td>
+                            <?php
+                            echo $row["custom"];
+                            echo "<input type='hidden' name='custom' value='" . $row["custom"] . "' />";
+                            ?>
+                        </td>
+                        <th>作番大日程</th>
+                        <td>
+                            <?php
+                            $wipwhole_url = "wipwhole-rec-invoice-edit.php?function_name=wipwholerenstatus&$token_link&id=$id";
+                            if ($row["contract_type"] === 'B')
+                                $wipwhole_url = "wipwhole-renovate-rec-invoice-edit.php?function_name=wipwholerenstatus&$token_link&id=$id";
+                            ?>
+                            <a target='_blank' href="<?php echo $wipwhole_url; ?>" class="btn btn-info btn-sm">
+                                開啟
+                            </a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>營業/契約<br />人員員編</th>
+                        <td>
+                            <?php echo $row['salesid']; ?>
+                            <?php echo "<input type='hidden' name='salesid' value='" . $row["salesid"] . "' />"; ?>
+                        </td>
+                        <th>營業/契約<br />人員</th>
+                        <td>
+                            <?php echo accountidToName($row['salesid']); ?>
+                        </td>
+                        <th>工務人員員編</th>
+                        <td>
+                            <?php echo getGongWuokNo($link, $row['contract_type']); ?>
+                            <?php echo "<input type='hidden' name='gongWuokid' value='" . getGongWuokNo($link, $row['contract_type']) . "' />"; ?>
+                        </td>
+                        <th>工務人員</th>
+                        <td>
+                            <?php echo accountidToName(getGongWuokNo($link, $row['contract_type'])); ?>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>下單日<br />(下單普來特富)</th>
+                        <td>
+                            <?php echo substr($row["prattford_order_date"], 0, 10); ?>
+                        </td>
+                        <th>預計發貨日<br />(出港日)</th>
+                        <td>
+                            <?php echo substr($row["estimated_shipping_date"], 0, 10); ?>
+                        </td>
+                        <th>預計到貨日<br />(到觀音廠日)</th>
+                        <td>
+                            <?php echo substr($row["estimated_shipping_schedule_date"], 0, 10); ?>
+                            <input type='hidden' name='estimated_shipping_schedule_date' value='<?php echo $row['estimated_shipping_schedule_date']; ?>' />
+                        </td>
+                        <th>實際到貨日<br />(到觀音廠日)</th>
+                        <td>
+                            <?php echo substr($row["actual_tofactory_date"], 0, 10); ?>
+                            <input type='hidden' name='actual_tofactory_date' value='<?php echo $row['estimated_shipping_schedule_date']; ?>' />
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>合約交期</th>
+                        <td>
+                            <?php echo substr($row["contract_arrival_date"], 0, 10); ?>
+                        </td>
+                        <th>原出貨日</th>
+                        <td>
+                            <?php
+                            echo empty(checkNowFormStatus($link))
+                                ? substr($row['real_contract_arrival_date'], 0, 10)
+                                : substr($row2["old_change_date"], 0, 10);
+                            echo "<input type='hidden' name='real_contract_arrival_date' value='" . $row['real_contract_arrival_date'] . "' />";
+                            ?>
+                        </td>
+                        <th>調整出貨日</th>
+                        <td colspan="3">
+                            <?php
+                            if (empty(checkNowFormStatus($link))) {
+                            ?>
+                                <input type="date" name="contract_arrival_date" />
+                            <?php
+                            } else {
+                                echo substr($row2["change_date"], 0, 10);
+                                echo "<input type='hidden' name='contract_arrival_date' value='" . $row2["change_date"] . "' />";
+                            }
+                            ?>
+
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>地址</th>
+                        <td>
+                            <?php echo $row["address"]; ?>
+                        </td>
+                        <th>原工地地址</th>
+                        <td>
+                            <?php
+                            echo empty(checkNowFormStatus($link)) ? $row['real_address'] : $row2["old_real_address"];
+                            echo "<input type='hidden' name='old_real_address' value='" . $row['real_address'] . "' />";
+                            ?>
+                        </td>
+                        <th>調整工地地址</th>
+                        <td colspan="3">
+                            <?php
+                            if (empty(checkNowFormStatus($link))) {
+                                echo "<input type='text' name='real_address' />";
+                            } else {
+                                echo $row2["real_address"];
+                                echo "<input type='hidden' name='real_address' value='" . $row2["real_address"] . "' />";
+                            }
+                            ?>
+
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+
+            <table id="assign_area" class="form-content-table ">
+                <thead>
+                    <tr>
+                        <th colspan="8"><b>簽核操作 </b></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <th> 簽核狀態</th>
+                        <td colspan="2">
+                            <?php
+                            if (checkNowFormStatus($link) == 'Z') {
+                                echo getChangeStatusName($link, $cid);
+                            } else {
+                                $nowFormStatus = getNowFormStatus($link, $cid);
+                                echo getAssignStatusSelect($link, $user_id, $nowFormStatus);
+                            }
+                            ?>
+                        </td>
+                        <th class="td_title"> 下位簽核者</th>
+                        <td colspan="2">
+                            <?php
+                            if (empty(checkNowFormStatus($link))) {
+                                if (in_array(getDepartmentId($link, $user_id), ['521', '531', '541', '542', '543', '544', '545'])) {
+                                    echo "<select name='next_users' id='next_users'>";
+                                    foreach ($shengguanok_options as $shengguanok_option) :
+                                        echo "
+                                            <option value='" . $shengguanok_option['val'] . "'>" . $shengguanok_option['val'] . $shengguanok_option['label'] . "</option>
+                                        ";
+                                    endforeach;
+                                    echo "</select>";
+                                } else {
+                                    echo "
+                                    <select name='next_users' id='next_users'>
+                                        <option value='" . getGongWuokNo($link, $row['contract_type']) . "'>" . accountidToName(getGongWuokNo($link, $row['contract_type'])) . getGongWuokNo($link, $row['contract_type']) . "</option>
+                                    </select>
+                                    ";
+                                }
+                            } else if (checkNowFormStatus($link) == 'A' || checkNowFormStatus($link) == 'D') {
+                                echo "
+                                    <select name='next_users' id='next_users'>
+                                        <option value='00000'>00000</option>
+                                    </select>
+                                ";
+                            } else if (checkNowFormStatus($link) == 'B') {
+                                if (in_array(getDepartmentId($link, $user_id), ['521', '531', '541', '542', '543', '544', '545'])){
+                                    echo "<select name='next_users' id='next_users'>";
+                                    foreach ($shengguanok_options as $shengguanok_option) :
+                                        echo "
+                                            <option value='" . $shengguanok_option['val'] . "'>" . $shengguanok_option['val'] . $shengguanok_option['label'] . "</option>
+                                        ";
+                                    endforeach;
+                                    echo "</select>";
+                                } else {
+                                    echo "
+                                        <select name='next_users' id='next_users'>
+                                            <option value='00000'>00000</option>
+                                        </select>
+                                    ";
+                                }
+                            }
+                            ?>
+                        </td>
+                        <td colspan="2">
+                            <?php
+                            // 誰通過或取消簽核位子
+                            if (empty(checkNowFormStatus($link))) {
+                                echo "<input type='hidden' name='seq' value = '0' />";
+                                echo "<button class='btn btn-primary'>提交</button>";
+                            } else if (checkNowFormStatus($link) == 'A') {
+                                if (accountidToDepartId($user_id) == "250" && in_array(accountidToRoleId($user_id), ["1", "4"])) {
+                                    echo "<input type='hidden' name='seq' value = '2' />";
+                                } else if (in_array(accountidToDepartId($user_id), ["521", "531"])) {
+                                    echo "<input type='hidden' name='seq' value = '1' />";
+                                } else {
+                                    echo "<input type='hidden' name='seq' value = '0' />";
+                                }
+                                echo "<button class='btn btn-primary'>提交</button>";
+                            } else if (checkNowFormStatus($link) == 'B') {
+                                if (in_array(accountidToDepartId($user_id), ["521", "531"])) {
+                                    echo "<input type='hidden' name='seq' value = '1' />";
+                                } else if (accountidToDepartId($user_id) == "250" && in_array(accountidToRoleId($user_id), ["1", "4"])) {
+                                    echo "<input type='hidden' name='seq' value = '2' />";
+                                } else {
+                                    echo "<input type='hidden' name='seq' value = '0' />";
+                                }
+                                echo "<button class='btn btn-primary'>提交</button>";
+                            } else if (checkNowFormStatus($link) == 'D') {
+                                if (in_array(accountidToDepartId($user_id), ["521", "531"])) {
+                                    echo "<input type='hidden' name='seq' value = '1' />";
+                                } else if (accountidToDepartId($user_id) == "250" && in_array(accountidToRoleId($user_id), ["1", "4"])) {
+                                    echo "<input type='hidden' name='seq' value = '2' />";
+                                } else {
+                                    echo "<input type='hidden' name='seq' value = '0' />";
+                                }
+                                echo "<button class='btn btn-primary'>提交</button>";
+                            }
+                            ?>
+                        </td>
+                    </tr>
+                    <?php
+                    if (!empty(checkNowFormStatus($link))) {
+                        $current_assigners = getCurrentAssigners($link, $form_key);
+                        foreach ($current_assigners as $current_assigner) :
+                            if ($current_assigner['current_assigner'] != '00000') {
+                    ?>
+                                <tr>
+                                    <td colspan="1">
+                                        <?php
+                                        if ($current_assigner['seq'] == '0') {
+                                            echo "申請者";
+                                        } else {
+                                            echo departIdToDepartName(accountidToDepartId($current_assigner['current_assigner']));
+                                        }
+                                        ?>
+                                    </td>
+                                    <td colspan="1">
+                                        <?php
+                                        if ($current_assigner['current_assigner'] !== '00000')
+                                            echo $current_assigner['current_assigner'] . "_" . accountidToName($current_assigner['current_assigner']);
+                                        ?>
+                                    </td>
+                                    <td colspan="1">
+                                        <?php
+                                        if ($current_assigner['seq'] == '0') {
+                                            if ($current_assigner['next_current_assigner'] == '00000') {
+                                                if ($current_assigner['change_status'] == 'C') {
+                                                    echo "已取消";
+                                                } else {
+                                                    echo "已申請";
+                                                }
+                                            } else {
+                                                echo "已申請";
+                                            }
+                                        }
+                                        if ($current_assigner['seq'] == '1') {
+                                            if (isset($current_assigner['next_current_assigner'])) {
+                                                if ($current_assigner['next_current_assigner'] !== '00000') {
+                                                    echo "已通過";
+                                                } else {
+                                                    if ($current_assigner['change_status'] == 'C')
+                                                        echo "已取消";
+                                                    if ($current_assigner['change_status'] == 'Z')
+                                                        echo "已通過";
+                                                }
+                                            } else {
+                                                if (!isset($current_assigner['next_current_assigner'])) {
+                                                    if ($current_assigner['change_status'] == 'C') {
+                                                        echo "已取消";
+                                                    } else if ($current_assigner['change_status'] == 'Z') {
+                                                        echo "已通過";
+                                                    } else {
+                                                        echo "審核中";
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        if ($current_assigner['seq'] == '2') {
+                                            if (isset($current_assigner['next_current_assigner'])) {
+                                                if ($current_assigner['next_current_assigner'] !== '00000') {
+                                                    echo "已通過";
+                                                } else {
+                                                    if ($current_assigner['change_status'] == 'C')
+                                                        echo "已取消";
+                                                    if ($current_assigner['change_status'] == 'Z')
+                                                        echo "已通過";
+                                                }
+                                            } else {
+                                                if (!isset($current_assigner['next_current_assigner'])) {
+                                                    if ($current_assigner['change_status'] == 'C') {
+                                                        echo "已取消";
+                                                    } else if ($current_assigner['change_status'] == 'Z') {
+                                                        echo "已通過";
+                                                    } else {
+                                                        echo "審核中";
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        ?>
+                                    </td>
+                                </tr>
+                    <?php
+                            }
+                        endforeach;
+                    }
+                    ?>
+                </tbody>
+            </table>
+    </form>
+</div>
+
+<div>
+
+    <div style="overflow-x:auto;">
+
+    </div>
+
+    <script type="text/javascript">
+        $(function() {
+            $("title").text("<?php echo $row["contractno"]; ?>預計出貨日(到工地)調整申請表");
+        })
+
+        function dateSelect() {
+            if ($("#date_select").val() == 'new') {
+                window.location.href = "<?php echo "wipwhole-change-contractdate.php?function_name=wipwholerenstatus&$token_link&id=$id"; ?>";
+            } else {
+                window.location.href = "<?php echo "wipwhole-change-contractdate.php?function_name=wipwholerenstatus&$token_link&id=$id&cid="; ?>" + $("#date_select").val();
+            }
+        }
+    </script>
     </body>
\ No newline at end of file
diff --git a/wms/wipwhole-change-planning-customer-name-function.php b/wms/wipwhole-change-planning-customer-name-function.php
index a5ae80ad..43193c79 100644
--- a/wms/wipwhole-change-planning-customer-name-function.php
+++ b/wms/wipwhole-change-planning-customer-name-function.php
@@ -1,703 +1,703 @@
-<?php
-
-function fileIUpload($post_name)
-{
-    if ($_FILES[$post_name]["error"] == 0) {
-        $datetime = date("YmdHis");
-        $file_name = str_replace("#", "", $_FILES[$post_name]["name"]);
-        $temp_file_name = $_FILES[$post_name]["tmp_name"];
-        $target_dir = empty($file_name) ? "" : "public-wipwhole/";
-        $sales_spec_verify_file = strtolower($target_dir . basename($datetime . $file_name));
-        if (file_exists($sales_spec_verify_file))
-            unlink($sales_spec_verify_file);
-        move_uploaded_file($temp_file_name, $sales_spec_verify_file);
-        if (!empty($file_name)) {
-            return strtolower($target_dir . basename($datetime . $file_name));
-        } else {
-            return "";
-        }
-    } else {
-        return "";
-    }
-}
-
-function isLeader($link, $user_id)
-{
-    if (getDepartmentId($link, $user_id) == '314' && getRoleId($link, $user_id) == '1')
-        return true;
-    if (getDepartmentId($link, $user_id) == '313' && getRoleId($link, $user_id) == '1')
-        return true;
-    if (getDepartmentId($link, $user_id) == '312' && getRoleId($link, $user_id) == '2')
-        return true;
-    if (getDepartmentId($link, $user_id) == '311' && getRoleId($link, $user_id) == '3')
-        return true;
-    if (getDepartmentId($link, $user_id) == '315' && getRoleId($link, $user_id) == '1')
-        return true;
-    if (getDepartmentId($link, $user_id) == '220' && getRoleId($link, $user_id) == '1')
-        return true;
-    return false;
-}
-
-/**
- * 檢查是否為非相關人員進入當前頁面
- * @param string $user_id:使用者代碼(員工編號)
- * @return bollean true:合法 false:非法
- */
-function checkPageUserStatus($user_id)
-{
-    $user_department_id = accountidToDepartId($user_id);
-    $allow_arr = [
-        '311', '312', '313', '314', '315',
-        '501', '511', '512', '513', '514',
-        '541', '542', '543', '544', '545',
-        '521', '531',
-        '250',
-        '220'
-    ];
-    if ($user_id == 'M0060')
-        return true;
-    if (in_array($user_department_id, $allow_arr))
-        return true;
-    return false;
-}
-/** 
- * 寫入 `wipwhole_change_planning_customer_details`
- *  - $data:
- *  - 'id' => 作番大日程 id  
- *  - 'all_contractno_change' => 是否更改全部合約號
- *  - 'real_contract_arrival_date'  => 原日期
- *  - 'contract_arrival_date'  => 新日期
- *  - 'real_address'  => 原工地地址
- *  - 'old_real_address' => 新工地地址
- *  - 'contractno' => 合約號
- *  - 'tds' => 資料時間戳記
- *  - 'form_key' => 本表單 form_key
- *  - 'user_id' => 申請者 id (員工編號)
- *  - 'change_status' => 寫入簽核狀態代碼
- * 
- * @param object $link: 資料庫連線
- * @param string $data: 新增資料
- */
-function addWipwholeChangeContractdateDetails($link, $data)
-{
-    $customer_planning_verify_file = $data['user_id'];
-    $user_id = $data['user_id'];
-    $tds = $data['tds'];
-    $id = $data['id'];
-    $custom_name = $data['custom_name'];
-    $change_status = $data['change_status'];
-    $customer_planning_verify_file = $data['customer_planning_verify_file'];
-
-    $sql2 = "
-        INSERT INTO `wipwhole_change_planning_customer_details` (
-            `creater`, 
-            `create_at`, 
-            `wipwholestatus_id`, 
-            `custom_name`, 
-            `customer_planning_verify_file`, 
-            `change_status` 
-        ) VALUES (
-            '$user_id', 
-            '$tds', 
-            '$id', 
-            '$custom_name', 
-            '$customer_planning_verify_file', 
-            '$change_status'
-        )
-    ";
-    mysqli_query($link, $sql2);
-}
-
-function addFlow($link, $data)
-{
-    $last_id = $data['last_id'];
-    $form_key = $data['form_key'];
-    $flow_code = $data['change_status'];
-    $sql2 = "
-        INSERT into flow (
-            system_id, 
-            flow_id, 
-            form_id, 
-            form_key, 
-            flow_code
-        ) VALUES (
-            'wws', 
-            'wws04', 
-            '$last_id', 
-            '$form_key', 
-            '$flow_code'
-        )
-    ";
-    mysqli_query($link, $sql2);
-}
-
-function addSubflow($link, $data)
-{
-    $form_key = $data['form_key'];
-    $current_assigner = $data['current_assigner'];
-    $tds = $data['tds'];
-    $seq = $data['seq'];
-    $sql2 = "
-        INSERT INTO subflow (
-            form_key, 
-            seq, 
-            current_assigner, 
-            create_date
-        ) values (
-            '$form_key', 
-            '$seq', 
-            '$current_assigner', 
-            '$tds'
-        )
-    ";
-    mysqli_query($link, $sql2);
-}
-
-/**
- * 用大日程的合約號取得大日程表單唯一值 (id)
- * @param object $link:資料庫連線
- * @param string $contractno:合約編號
- * @return object 回傳 mysqli_fetch_all
- */
-function getWipwholestatusIdByConstractNo($link, $contractno)
-{
-    $sql = "
-        SELECT
-            id
-        FROM wipwholestatus
-        WHERE contractno = '$contractno'
-    ";
-    $result = mysqli_query($link, $sql);
-    $data = mysqli_fetch_all($result);
-    mysqli_free_result($result);
-    return $data;
-}
-
-/**
- * 取得新申請簽核的 formk_key 用於新增
- * @param object $link 資料庫連線 
- * @return string $formk_key
- */
-function getFomkeySeq($link)
-{
-    $sql = "SELECT appwms.nextval('form_key') form_key";
-    $res = mysqli_query($link, $sql);
-    if ($row = mysqli_fetch_row($res))
-        return $row[0];
-    return null;
-}
-
-/**
- * 新增通知
- * @param object $link 資料庫連線 
- * @param array $data kind:通知類型 related_id:關聯序號 title:通知標題 content:通知內容 permission:觀看者 creater:建立者 create_at:建立時間
- * @return string 簽核單 cid
- */
-function addNotice($link, $data)
-{
-    $kind = empty($data['kind']) ? "1" : $data['kind'];
-    $related_id = empty($data['related_id']) ? "" : $data['related_id'];
-    $title = empty($data['title']) ? "" : $data['title'];
-    $content = empty($data['content']) ? "" : $data['content'];
-    $permission = empty($data['permission']) ? "" : $data['permission'];
-    $creater = empty($data['creater']) ? "system" : $data['creater'];
-    $create_at = empty($data['create_at']) ? date("Y-m-d H:i:s") : $data['create_at'];
-
-    $sql = "
-        INSERT INTO notice (
-            kind, 
-            related_id,
-            title,
-            content,
-            permission,
-            creater,
-            create_at
-        ) VALUES(
-            '$kind', 
-            '$related_id',
-            '$title',
-            '$content',
-            '$permission',
-            '$creater',
-            '$create_at'
-        )
-    ";
-    mysqli_query($link, $sql);
-}
-
-/**
- * 取得本次簽核的表單 cid 值
- * @param object $link 資料庫連線 
- * @param string $form_key 簽核單唯一值
- * @return string 簽核單 cid
- */
-function getCid($link, $form_key)
-{
-    $sql = "
-        SELECT form_id AS id FROM flow
-        WHERE form_key = '$form_key'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row['id'];
-}
-
-/**
- * 取得此單據的大日程id值
- * @param object $link 資料庫連線 
- * @param string $cid 簽核單 cid
- * @return string 簽核單 form_key
- */
-function getId($link, $cid)
-{
-    $sql = "
-        SELECT wipwholestatus_id AS id 
-        FROM wipwhole_change_planning_customer_details
-        WHERE id = '$cid'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row['id'];
-}
-
-/**
- * 取得本次簽核的表單form_key值 
- * @param object $link 資料庫連線 
- * @param string $form_id 簽核單 cid
- * @return string 簽核單 form_key
- */
-function getForm_key($link, $form_id)
-{
-    $sql = "
-        SELECT 
-            f.form_key
-        FROM flow AS f
-        LEFT JOIN subflow AS s
-        ON f.form_key = s.form_key
-        WHERE 1=1
-        AND f.system_id = 'wws'
-        AND f.flow_id = 'wws04' 
-        AND f.form_id = '$form_id' 
-        AND f.flow_code IN ('A','B','D','C','Z')
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return empty($row['form_key']) ? null : $row['form_key'];
-}
-
-/**
- * 確認目前簽核狀態
- * @param object $link 資料庫連線 
- * @return string 工務部主管accountid
- */
-function checkNowFormStatus($link)
-{
-    if (isset($_GET['cid']) || isset($_GET['form_key'])) {
-        $cid = isset($_GET['cid']) ? $_GET['cid'] : getCid($link, $_GET['form_key']);
-        $form_key = getForm_key($link, $cid);
-        $sql = "
-            SELECT
-                flow_code
-            FROM flow
-            WHERE 1=1
-            AND form_id = '$cid'
-            AND form_key = '$form_key'
-        ";
-        $result = mysqli_query($link, $sql);
-        $row = mysqli_fetch_array($result);
-        return empty($row['0']) ? null : $row['0'];
-    }
-    return null;
-}
-
-/**
- * 取得工務部主管編號
- * @param object $link 資料庫連線 
- * @param string $contract_type A:新梯 B:汰改
- * @return string 工務部主管accountid
- */
-function getGongWuokNo($link, $contract_type)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key']))
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, getCid($link, $_GET['form_key']));
-    $sql = "
-        SELECT DISTINCT 
-            SUBSTR(address,1,2)
-        FROM `wipwholestatus`
-        WHERE id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    // 新梯
-    // 宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
-    // 汰改
-    // 宜蘭=高培軒(M0087) 北=吳宗紘(M0040) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
-    $arr = array(
-        "宜蘭" => "M0087",
-        "北" => "M0041",
-        "台北" => "M0041",
-        "基隆" => "M0041",
-        "新北" => "M0041",
-        "新竹" => "M0041",
-        "桃園" => "M0041",
-        "苗栗" => "M0113",
-        "中" => "M0113",
-        "南投" => "M0113",
-        "台中" => "M0113",
-        "彰化" => "M0113",
-        "雲林" => "M0113",
-        "南" => "M0102",
-        "台南" => "M0102",
-        "嘉義" => "M0102",
-        "屏東" => "M0102",
-        "高雄" => "M0102"
-    );
-    $arr2 = array(
-        "宜蘭" => "M0087",
-        "北" => "M0040",
-        "台北" => "M0040",
-        "基隆" => "M0040",
-        "新北" => "M0040",
-        "新竹" => "M0040",
-        "桃園" => "M0040",
-        "苗栗" => "M0113",
-        "中" => "M0113",
-        "南投" => "M0113",
-        "台中" => "M0113",
-        "彰化" => "M0113",
-        "雲林" => "M0113",
-        "南" => "M0102",
-        "台南" => "M0102",
-        "嘉義" => "M0102",
-        "屏東" => "M0102",
-        "高雄" => "M0102"
-    );
-    if ($contract_type == 'A') {
-        return empty($arr[$row[0]]) ? "" : $arr[$row[0]];
-    } else {
-        return empty($arr2[$row[0]]) ? "" : $arr2[$row[0]];
-    }
-}
-
-/**
- * 取得簽核者 user_id
- * @param object $link 資料庫連線 
- * @param string $form_key 本簽核單唯一值
- * @param string $seq 簽核者順序
- * @return string 簽核者accountid
- */
-function getCurrentAssigner($link, $form_key, $seq)
-{
-    $sql = "
-        SELECT
-            * 
-        FROM subflow
-        WHERE form_key = '$form_key'
-        AND seq = '$seq'
-    ";
-    $subflow_data = mysqli_query($link, $sql);
-    $subflow = mysqli_fetch_array($subflow_data, MYSQLI_ASSOC);
-    return empty($subflow['current_assigner']) ? null : $subflow['current_assigner'];
-}
-
-/**
- * 取得本表單狀態代碼
- * @param object $link 資料庫連線 
- * @param string $cid 本簽核單 id
- * @return string 表單狀態代碼
- */
-function getChangeStatus($link, $cid)
-{
-    $sql = "
-        SELECT
-            change_status 
-        FROM wipwhole_change_planning_customer_details
-        WHERE id = '$cid'
-    ";
-    $subflow_data = mysqli_query($link, $sql);
-    $subflow = mysqli_fetch_array($subflow_data, MYSQLI_ASSOC);
-    return empty($subflow['change_status']) ? null : $subflow['change_status'];
-}
-
-/**
- * 取得本表單狀態名稱
- * @param object $link 資料庫連線 
- * @param string $cid 本簽核單 id
- * @return string 本單據狀態名稱
- */
-function getChangeStatusName($link, $cid)
-{
-    $dataArr = array(
-        'B' => '申請中',
-        'C' => '已取消',
-        'Z' => '已通過',
-    );
-    $sql = "
-        SELECT
-            change_status 
-        FROM wipwhole_change_planning_customer_details
-        WHERE id = '$cid'
-    ";
-    $subflow_data = mysqli_query($link, $sql);
-    $subflow = mysqli_fetch_array($subflow_data, MYSQLI_ASSOC);
-    return empty($subflow['change_status']) ? "" : $dataArr[$subflow['change_status']];
-}
-
-function getNowFormStatus($link, $cid)
-{
-    $sql = "
-        SELECT
-            change_status 
-        FROM wipwhole_change_planning_customer_details
-        WHERE id = '$cid'
-    ";
-    $subflow_data = mysqli_query($link, $sql);
-    $subflow = mysqli_fetch_array($subflow_data, MYSQLI_ASSOC);
-    return empty($subflow['change_status']) ? "" : $subflow['change_status'];
-}
-
-/**
- * 取得許MAX options
- * @param object $link:資料庫連線
- * @return object 回傳 mysqli_query
- */
-function getShengguanokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('320')
-        AND `role_id` IN ('1')
-    ";
-    return mysqli_query($link, $sql);
-}
-
-/**
- * 取得工務部門所有員工 options
- * @param object $link:資料庫連線
- * @return object 回傳 mysqli_query
- */
-function getGongwuokOptions($link, $user_id)
-{
-    $sql = "
-        SELECT 
-            a1.manager AS val ,
-            a2.name AS label 
-        FROM account AS a1
-        LEFT JOIN account AS a2
-        ON a1.manager = a2.accountid
-        WHERE a1.accountid = '$user_id'
-    ";
-    return mysqli_query($link, $sql);
-}
-
-/**
- * 用 user_id(員工編號) 取得部門代碼 id
- * @param object $link:資料庫連線
- * @param string $user_id:使用者 id (員工編號)
- * @return string 回傳 $department_id:部門代碼
- */
-function getDepartmentId($link, $user_id)
-{
-    $sql = "
-        SELECT 
-            department_id
-        FROM account 
-        WHERE accountid = '$user_id'
-    ";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_row($res);
-    mysqli_free_result($res);
-    return $row[0];
-}
-function getRoleId($link, $user_id)
-{
-    $sql = "
-        SELECT 
-            role_id 
-        FROM account 
-        WHERE accountid = '$user_id'
-    ";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_row($res);
-    mysqli_free_result($res);
-    return $row[0];
-}
-/**
- * 取得生管主管 options
- * @param object $link:資料庫連線
- * @param string $id:作番大日程唯一值
- * @return object 回傳 mysqli_query
- */
-function getWipwholestatusDetail($link, $id)
-{
-    $db_query = "
-        SELECT * FROM 
-        wipwholestatus WHERE id = '$id'
-    ";
-    $receivabledata = mysqli_query($link, $db_query);
-    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
-}
-
-/**
- * 取得 wipwhole_change_planning_customer_details 所有資料並放入陣列
- * @param object $link:資料庫連線
- * @param string $cid:表單唯一值
- * @return object 回傳 mysqli_fetch_array
- */
-function getWipwholeChangeContractdateDetails($link, $cid)
-{
-    $db_query = "
-        SELECT * FROM wipwhole_change_planning_customer_details 
-        WHERE id = '$cid'
-    ";
-    $receivabledata = mysqli_query($link, $db_query);
-    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
-}
-
-/**
- * 取得生管主管 options
- * @param object $link:資料庫連線
- * @param string $user_id:使用者 id (員工編號)
- * @param string $id:大日程唯一值
- * @return object 回傳 mysqli_query
- */
-function getDateOptions($link, $user_id, $id)
-{
-    if ($user_id == 'M0060') {
-        $sql = "
-            SELECT 
-                * 
-            FROM `wipwhole_change_planning_customer_details`
-            WHERE 1=1
-            AND wipwholestatus_id = '$id'
-            AND change_status in ('A','C','D','Z')
-        ";
-    } else if (isLeader($link, $user_id)) {
-        $sql = "
-            SELECT 
-                * 
-            FROM `wipwhole_change_planning_customer_details`
-            WHERE 1=1
-            AND wipwholestatus_id = '$id'
-        ";
-    } else {
-        $sql = "
-            SELECT 
-                * 
-            FROM `wipwhole_change_planning_customer_details`
-            WHERE 1=1
-            AND creater = '$user_id'
-            AND wipwholestatus_id = '$id'
-        ";
-    }
-    return mysqli_query($link, $sql);
-}
-
-/**
- * 取得提交表單後的回傳訊息
- * @param string $assign_status:簽核狀態代碼
- * @return string 回傳訊息
- */
-function getAssignStatusMessage($data, $checkStatus)
-{
-
-    if ($data['assign_status'] == 'A' || $data['assign_status'] == 'B')
-        if (empty($_POST['custom_name']))
-            return "<p class='text-danger'>請填寫 客戶姓名 ！</p>";
-    if ($data['assign_status'] == 'C')
-        return "<p class='text-danger'>申請已取消</p>";
-    if ($data['assign_status'] == 'Z')
-        return "<p class='text-danger'>申請已通過</p>";
-    if (!$checkStatus)
-        return "<p class='text-danger'>請勿重複申請！</p>";
-    return "<p class='text-danger'>已提交申請！</p>";
-}
-
-/**
- * 依照此表單狀態給予 select 選項
- * @param object $link:資料庫連線檔
- * @param string $user_id:使用者id (員工編號)
- * @param string $nowFormStatus:此表單目前狀態代碼
- * @return string 回傳select字串
- */
-function getAssignStatusSelect($link, $user_id, $nowFormStatus)
-{
-    $options_str = "<select name='assign_status' id='assign_status'>";
-    if (empty($nowFormStatus)) {
-        if (isLeader($link, $user_id)) {
-            $options_str .= "<option value='Z'>提出申請</option>";
-        } else {
-            $options_str .= "<option value='B'>提出申請</option>";
-        }
-    }
-    if (checkNowFormStatus($link) == 'B') {
-        if (isLeader($link, $user_id))
-            $options_str .= "<option value='Z'>通過</option>";
-        $options_str .= "<option value='C'>取消</option>";
-    }
-    $options_str .= "</select>";
-    return $options_str;
-}
-
-/**
- * 取得此簽核單所有人簽核狀況
- * @param object $link:資料庫連線檔
- * @param string $form_key:此簽核單唯一值
- * @return object 回傳 mysqli_query
- */
-function getCurrentAssigners($link, $form_key)
-{
-    $sql = "
-        SELECT
-            nowData.*,
-            nextData.next_current_assigner
-        FROM(
-            SELECT
-                f.flow_code,
-                s.seq,
-                (s.seq + 1) AS next_seq ,
-                s.current_assigner,
-                wccd.change_status
-            FROM
-                flow AS f
-                LEFT JOIN subflow AS s ON f.form_key = s.form_key
-                LEFT JOIN wipwhole_change_planning_customer_details AS wccd ON wccd.id = f.form_id
-            WHERE
-                f.form_key = '$form_key'
-                AND f.system_id = 'wws'
-                AND f.flow_id = 'wws04'
-        ) AS nowData
-        LEFT JOIN(
-            SELECT
-                s.seq,
-                s.current_assigner AS next_current_assigner
-            FROM
-                flow AS f
-                LEFT JOIN subflow AS s ON f.form_key = s.form_key
-                LEFT JOIN wipwhole_change_planning_customer_details AS wccd ON wccd.id = f.form_id
-            WHERE
-                f.form_key = '$form_key'
-                AND f.system_id = 'wws'
-                AND f.flow_id = 'wws04'
-        ) AS nextData
-        ON nowData.next_seq = nextData.seq
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function checkStatus($link, $cid, $user_id)
-{
-    $sql = "
-        SELECT 
-            change_status
-        FROM wipwhole_change_planning_customer_details 
-        WHERE creater = '$user_id'
-        AND wipwholestatus_id = '$cid'
-        AND change_status NOT IN ('C','Z')
-    ";
-    $res = mysqli_query($link, $sql);
-    return $res->num_rows > 0 ? false : true;
-}
+<?php
+
+function fileIUpload($post_name)
+{
+    if ($_FILES[$post_name]["error"] == 0) {
+        $datetime = date("YmdHis");
+        $file_name = str_replace("#", "", $_FILES[$post_name]["name"]);
+        $temp_file_name = $_FILES[$post_name]["tmp_name"];
+        $target_dir = empty($file_name) ? "" : "public-wipwhole/";
+        $sales_spec_verify_file = strtolower($target_dir . basename($datetime . $file_name));
+        if (file_exists($sales_spec_verify_file))
+            unlink($sales_spec_verify_file);
+        move_uploaded_file($temp_file_name, $sales_spec_verify_file);
+        if (!empty($file_name)) {
+            return strtolower($target_dir . basename($datetime . $file_name));
+        } else {
+            return "";
+        }
+    } else {
+        return "";
+    }
+}
+
+function isLeader($link, $user_id)
+{
+    if (getDepartmentId($link, $user_id) == '314' && getRoleId($link, $user_id) == '1')
+        return true;
+    if (getDepartmentId($link, $user_id) == '313' && getRoleId($link, $user_id) == '1')
+        return true;
+    if (getDepartmentId($link, $user_id) == '312' && getRoleId($link, $user_id) == '2')
+        return true;
+    if (getDepartmentId($link, $user_id) == '311' && getRoleId($link, $user_id) == '3')
+        return true;
+    if (getDepartmentId($link, $user_id) == '315' && getRoleId($link, $user_id) == '1')
+        return true;
+    if (getDepartmentId($link, $user_id) == '220' && getRoleId($link, $user_id) == '1')
+        return true;
+    return false;
+}
+
+/**
+ * 檢查是否為非相關人員進入當前頁面
+ * @param string $user_id:使用者代碼(員工編號)
+ * @return bollean true:合法 false:非法
+ */
+function checkPageUserStatus($user_id)
+{
+    $user_department_id = accountidToDepartId($user_id);
+    $allow_arr = [
+        '311', '312', '313', '314', '315',
+        '501', '511', '512', '513', '514',
+        '541', '542', '543', '544', '545',
+        '521', '531',
+        '250',
+        '220'
+    ];
+    if ($user_id == 'M0060')
+        return true;
+    if (in_array($user_department_id, $allow_arr))
+        return true;
+    return false;
+}
+/** 
+ * 寫入 `wipwhole_change_planning_customer_details`
+ *  - $data:
+ *  - 'id' => 作番大日程 id  
+ *  - 'all_contractno_change' => 是否更改全部合約號
+ *  - 'real_contract_arrival_date'  => 原日期
+ *  - 'contract_arrival_date'  => 新日期
+ *  - 'real_address'  => 原工地地址
+ *  - 'old_real_address' => 新工地地址
+ *  - 'contractno' => 合約號
+ *  - 'tds' => 資料時間戳記
+ *  - 'form_key' => 本表單 form_key
+ *  - 'user_id' => 申請者 id (員工編號)
+ *  - 'change_status' => 寫入簽核狀態代碼
+ * 
+ * @param object $link: 資料庫連線
+ * @param string $data: 新增資料
+ */
+function addWipwholeChangeContractdateDetails($link, $data)
+{
+    $customer_planning_verify_file = $data['user_id'];
+    $user_id = $data['user_id'];
+    $tds = $data['tds'];
+    $id = $data['id'];
+    $custom_name = $data['custom_name'];
+    $change_status = $data['change_status'];
+    $customer_planning_verify_file = $data['customer_planning_verify_file'];
+
+    $sql2 = "
+        INSERT INTO `wipwhole_change_planning_customer_details` (
+            `creater`, 
+            `create_at`, 
+            `wipwholestatus_id`, 
+            `custom_name`, 
+            `customer_planning_verify_file`, 
+            `change_status` 
+        ) VALUES (
+            '$user_id', 
+            '$tds', 
+            '$id', 
+            '$custom_name', 
+            '$customer_planning_verify_file', 
+            '$change_status'
+        )
+    ";
+    mysqli_query($link, $sql2);
+}
+
+function addFlow($link, $data)
+{
+    $last_id = $data['last_id'];
+    $form_key = $data['form_key'];
+    $flow_code = $data['change_status'];
+    $sql2 = "
+        INSERT into flow (
+            system_id, 
+            flow_id, 
+            form_id, 
+            form_key, 
+            flow_code
+        ) VALUES (
+            'wws', 
+            'wws04', 
+            '$last_id', 
+            '$form_key', 
+            '$flow_code'
+        )
+    ";
+    mysqli_query($link, $sql2);
+}
+
+function addSubflow($link, $data)
+{
+    $form_key = $data['form_key'];
+    $current_assigner = $data['current_assigner'];
+    $tds = $data['tds'];
+    $seq = $data['seq'];
+    $sql2 = "
+        INSERT INTO subflow (
+            form_key, 
+            seq, 
+            current_assigner, 
+            create_date
+        ) values (
+            '$form_key', 
+            '$seq', 
+            '$current_assigner', 
+            '$tds'
+        )
+    ";
+    mysqli_query($link, $sql2);
+}
+
+/**
+ * 用大日程的合約號取得大日程表單唯一值 (id)
+ * @param object $link:資料庫連線
+ * @param string $contractno:合約編號
+ * @return object 回傳 mysqli_fetch_all
+ */
+function getWipwholestatusIdByConstractNo($link, $contractno)
+{
+    $sql = "
+        SELECT
+            id
+        FROM wipwholestatus
+        WHERE contractno = '$contractno'
+    ";
+    $result = mysqli_query($link, $sql);
+    $data = mysqli_fetch_all($result);
+    mysqli_free_result($result);
+    return $data;
+}
+
+/**
+ * 取得新申請簽核的 formk_key 用於新增
+ * @param object $link 資料庫連線 
+ * @return string $formk_key
+ */
+function getFomkeySeq($link)
+{
+    $sql = "SELECT appwms.nextval('form_key') form_key";
+    $res = mysqli_query($link, $sql);
+    if ($row = mysqli_fetch_row($res))
+        return $row[0];
+    return null;
+}
+
+/**
+ * 新增通知
+ * @param object $link 資料庫連線 
+ * @param array $data kind:通知類型 related_id:關聯序號 title:通知標題 content:通知內容 permission:觀看者 creater:建立者 create_at:建立時間
+ * @return string 簽核單 cid
+ */
+function addNotice($link, $data)
+{
+    $kind = empty($data['kind']) ? "1" : $data['kind'];
+    $related_id = empty($data['related_id']) ? "" : $data['related_id'];
+    $title = empty($data['title']) ? "" : $data['title'];
+    $content = empty($data['content']) ? "" : $data['content'];
+    $permission = empty($data['permission']) ? "" : $data['permission'];
+    $creater = empty($data['creater']) ? "system" : $data['creater'];
+    $create_at = empty($data['create_at']) ? date("Y-m-d H:i:s") : $data['create_at'];
+
+    $sql = "
+        INSERT INTO notice (
+            kind, 
+            related_id,
+            title,
+            content,
+            permission,
+            creater,
+            create_at
+        ) VALUES(
+            '$kind', 
+            '$related_id',
+            '$title',
+            '$content',
+            '$permission',
+            '$creater',
+            '$create_at'
+        )
+    ";
+    mysqli_query($link, $sql);
+}
+
+/**
+ * 取得本次簽核的表單 cid 值
+ * @param object $link 資料庫連線 
+ * @param string $form_key 簽核單唯一值
+ * @return string 簽核單 cid
+ */
+function getCid($link, $form_key)
+{
+    $sql = "
+        SELECT form_id AS id FROM flow
+        WHERE form_key = '$form_key'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row['id'];
+}
+
+/**
+ * 取得此單據的大日程id值
+ * @param object $link 資料庫連線 
+ * @param string $cid 簽核單 cid
+ * @return string 簽核單 form_key
+ */
+function getId($link, $cid)
+{
+    $sql = "
+        SELECT wipwholestatus_id AS id 
+        FROM wipwhole_change_planning_customer_details
+        WHERE id = '$cid'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row['id'];
+}
+
+/**
+ * 取得本次簽核的表單form_key值 
+ * @param object $link 資料庫連線 
+ * @param string $form_id 簽核單 cid
+ * @return string 簽核單 form_key
+ */
+function getForm_key($link, $form_id)
+{
+    $sql = "
+        SELECT 
+            f.form_key
+        FROM flow AS f
+        LEFT JOIN subflow AS s
+        ON f.form_key = s.form_key
+        WHERE 1=1
+        AND f.system_id = 'wws'
+        AND f.flow_id = 'wws04' 
+        AND f.form_id = '$form_id' 
+        AND f.flow_code IN ('A','B','D','C','Z')
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return empty($row['form_key']) ? null : $row['form_key'];
+}
+
+/**
+ * 確認目前簽核狀態
+ * @param object $link 資料庫連線 
+ * @return string 工務部主管accountid
+ */
+function checkNowFormStatus($link)
+{
+    if (isset($_GET['cid']) || isset($_GET['form_key'])) {
+        $cid = isset($_GET['cid']) ? $_GET['cid'] : getCid($link, $_GET['form_key']);
+        $form_key = getForm_key($link, $cid);
+        $sql = "
+            SELECT
+                flow_code
+            FROM flow
+            WHERE 1=1
+            AND form_id = '$cid'
+            AND form_key = '$form_key'
+        ";
+        $result = mysqli_query($link, $sql);
+        $row = mysqli_fetch_array($result);
+        return empty($row['0']) ? null : $row['0'];
+    }
+    return null;
+}
+
+/**
+ * 取得工務部主管編號
+ * @param object $link 資料庫連線 
+ * @param string $contract_type A:新梯 B:汰改
+ * @return string 工務部主管accountid
+ */
+function getGongWuokNo($link, $contract_type)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key']))
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, getCid($link, $_GET['form_key']));
+    $sql = "
+        SELECT DISTINCT 
+            SUBSTR(address,1,2)
+        FROM `wipwholestatus`
+        WHERE id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    // 新梯
+    // 宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
+    // 汰改
+    // 宜蘭=高培軒(M0087) 北=吳宗紘(M0040) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
+    $arr = array(
+        "宜蘭" => "M0087",
+        "北" => "M0041",
+        "台北" => "M0041",
+        "基隆" => "M0041",
+        "新北" => "M0041",
+        "新竹" => "M0041",
+        "桃園" => "M0041",
+        "苗栗" => "M0113",
+        "中" => "M0113",
+        "南投" => "M0113",
+        "台中" => "M0113",
+        "彰化" => "M0113",
+        "雲林" => "M0113",
+        "南" => "M0102",
+        "台南" => "M0102",
+        "嘉義" => "M0102",
+        "屏東" => "M0102",
+        "高雄" => "M0102"
+    );
+    $arr2 = array(
+        "宜蘭" => "M0087",
+        "北" => "M0040",
+        "台北" => "M0040",
+        "基隆" => "M0040",
+        "新北" => "M0040",
+        "新竹" => "M0040",
+        "桃園" => "M0040",
+        "苗栗" => "M0113",
+        "中" => "M0113",
+        "南投" => "M0113",
+        "台中" => "M0113",
+        "彰化" => "M0113",
+        "雲林" => "M0113",
+        "南" => "M0102",
+        "台南" => "M0102",
+        "嘉義" => "M0102",
+        "屏東" => "M0102",
+        "高雄" => "M0102"
+    );
+    if ($contract_type == 'A') {
+        return empty($arr[$row[0]]) ? "" : $arr[$row[0]];
+    } else {
+        return empty($arr2[$row[0]]) ? "" : $arr2[$row[0]];
+    }
+}
+
+/**
+ * 取得簽核者 user_id
+ * @param object $link 資料庫連線 
+ * @param string $form_key 本簽核單唯一值
+ * @param string $seq 簽核者順序
+ * @return string 簽核者accountid
+ */
+function getCurrentAssigner($link, $form_key, $seq)
+{
+    $sql = "
+        SELECT
+            * 
+        FROM subflow
+        WHERE form_key = '$form_key'
+        AND seq = '$seq'
+    ";
+    $subflow_data = mysqli_query($link, $sql);
+    $subflow = mysqli_fetch_array($subflow_data, MYSQLI_ASSOC);
+    return empty($subflow['current_assigner']) ? null : $subflow['current_assigner'];
+}
+
+/**
+ * 取得本表單狀態代碼
+ * @param object $link 資料庫連線 
+ * @param string $cid 本簽核單 id
+ * @return string 表單狀態代碼
+ */
+function getChangeStatus($link, $cid)
+{
+    $sql = "
+        SELECT
+            change_status 
+        FROM wipwhole_change_planning_customer_details
+        WHERE id = '$cid'
+    ";
+    $subflow_data = mysqli_query($link, $sql);
+    $subflow = mysqli_fetch_array($subflow_data, MYSQLI_ASSOC);
+    return empty($subflow['change_status']) ? null : $subflow['change_status'];
+}
+
+/**
+ * 取得本表單狀態名稱
+ * @param object $link 資料庫連線 
+ * @param string $cid 本簽核單 id
+ * @return string 本單據狀態名稱
+ */
+function getChangeStatusName($link, $cid)
+{
+    $dataArr = array(
+        'B' => '申請中',
+        'C' => '已取消',
+        'Z' => '已通過',
+    );
+    $sql = "
+        SELECT
+            change_status 
+        FROM wipwhole_change_planning_customer_details
+        WHERE id = '$cid'
+    ";
+    $subflow_data = mysqli_query($link, $sql);
+    $subflow = mysqli_fetch_array($subflow_data, MYSQLI_ASSOC);
+    return empty($subflow['change_status']) ? "" : $dataArr[$subflow['change_status']];
+}
+
+function getNowFormStatus($link, $cid)
+{
+    $sql = "
+        SELECT
+            change_status 
+        FROM wipwhole_change_planning_customer_details
+        WHERE id = '$cid'
+    ";
+    $subflow_data = mysqli_query($link, $sql);
+    $subflow = mysqli_fetch_array($subflow_data, MYSQLI_ASSOC);
+    return empty($subflow['change_status']) ? "" : $subflow['change_status'];
+}
+
+/**
+ * 取得許MAX options
+ * @param object $link:資料庫連線
+ * @return object 回傳 mysqli_query
+ */
+function getShengguanokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('320')
+        AND `role_id` IN ('1')
+    ";
+    return mysqli_query($link, $sql);
+}
+
+/**
+ * 取得工務部門所有員工 options
+ * @param object $link:資料庫連線
+ * @return object 回傳 mysqli_query
+ */
+function getGongwuokOptions($link, $user_id)
+{
+    $sql = "
+        SELECT 
+            a1.manager AS val ,
+            a2.name AS label 
+        FROM account AS a1
+        LEFT JOIN account AS a2
+        ON a1.manager = a2.accountid
+        WHERE a1.accountid = '$user_id'
+    ";
+    return mysqli_query($link, $sql);
+}
+
+/**
+ * 用 user_id(員工編號) 取得部門代碼 id
+ * @param object $link:資料庫連線
+ * @param string $user_id:使用者 id (員工編號)
+ * @return string 回傳 $department_id:部門代碼
+ */
+function getDepartmentId($link, $user_id)
+{
+    $sql = "
+        SELECT 
+            department_id
+        FROM account 
+        WHERE accountid = '$user_id'
+    ";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_row($res);
+    mysqli_free_result($res);
+    return $row[0];
+}
+function getRoleId($link, $user_id)
+{
+    $sql = "
+        SELECT 
+            role_id 
+        FROM account 
+        WHERE accountid = '$user_id'
+    ";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_row($res);
+    mysqli_free_result($res);
+    return $row[0];
+}
+/**
+ * 取得生管主管 options
+ * @param object $link:資料庫連線
+ * @param string $id:作番大日程唯一值
+ * @return object 回傳 mysqli_query
+ */
+function getWipwholestatusDetail($link, $id)
+{
+    $db_query = "
+        SELECT * FROM 
+        wipwholestatus WHERE id = '$id'
+    ";
+    $receivabledata = mysqli_query($link, $db_query);
+    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
+}
+
+/**
+ * 取得 wipwhole_change_planning_customer_details 所有資料並放入陣列
+ * @param object $link:資料庫連線
+ * @param string $cid:表單唯一值
+ * @return object 回傳 mysqli_fetch_array
+ */
+function getWipwholeChangeContractdateDetails($link, $cid)
+{
+    $db_query = "
+        SELECT * FROM wipwhole_change_planning_customer_details 
+        WHERE id = '$cid'
+    ";
+    $receivabledata = mysqli_query($link, $db_query);
+    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
+}
+
+/**
+ * 取得生管主管 options
+ * @param object $link:資料庫連線
+ * @param string $user_id:使用者 id (員工編號)
+ * @param string $id:大日程唯一值
+ * @return object 回傳 mysqli_query
+ */
+function getDateOptions($link, $user_id, $id)
+{
+    if ($user_id == 'M0060') {
+        $sql = "
+            SELECT 
+                * 
+            FROM `wipwhole_change_planning_customer_details`
+            WHERE 1=1
+            AND wipwholestatus_id = '$id'
+            AND change_status in ('A','C','D','Z')
+        ";
+    } else if (isLeader($link, $user_id)) {
+        $sql = "
+            SELECT 
+                * 
+            FROM `wipwhole_change_planning_customer_details`
+            WHERE 1=1
+            AND wipwholestatus_id = '$id'
+        ";
+    } else {
+        $sql = "
+            SELECT 
+                * 
+            FROM `wipwhole_change_planning_customer_details`
+            WHERE 1=1
+            AND creater = '$user_id'
+            AND wipwholestatus_id = '$id'
+        ";
+    }
+    return mysqli_query($link, $sql);
+}
+
+/**
+ * 取得提交表單後的回傳訊息
+ * @param string $assign_status:簽核狀態代碼
+ * @return string 回傳訊息
+ */
+function getAssignStatusMessage($data, $checkStatus)
+{
+
+    if ($data['assign_status'] == 'A' || $data['assign_status'] == 'B')
+        if (empty($_POST['custom_name']))
+            return "<p class='text-danger'>請填寫 客戶姓名 ！</p>";
+    if ($data['assign_status'] == 'C')
+        return "<p class='text-danger'>申請已取消</p>";
+    if ($data['assign_status'] == 'Z')
+        return "<p class='text-danger'>申請已通過</p>";
+    if (!$checkStatus)
+        return "<p class='text-danger'>請勿重複申請！</p>";
+    return "<p class='text-danger'>已提交申請！</p>";
+}
+
+/**
+ * 依照此表單狀態給予 select 選項
+ * @param object $link:資料庫連線檔
+ * @param string $user_id:使用者id (員工編號)
+ * @param string $nowFormStatus:此表單目前狀態代碼
+ * @return string 回傳select字串
+ */
+function getAssignStatusSelect($link, $user_id, $nowFormStatus)
+{
+    $options_str = "<select name='assign_status' id='assign_status'>";
+    if (empty($nowFormStatus)) {
+        if (isLeader($link, $user_id)) {
+            $options_str .= "<option value='Z'>提出申請</option>";
+        } else {
+            $options_str .= "<option value='B'>提出申請</option>";
+        }
+    }
+    if (checkNowFormStatus($link) == 'B') {
+        if (isLeader($link, $user_id))
+            $options_str .= "<option value='Z'>通過</option>";
+        $options_str .= "<option value='C'>取消</option>";
+    }
+    $options_str .= "</select>";
+    return $options_str;
+}
+
+/**
+ * 取得此簽核單所有人簽核狀況
+ * @param object $link:資料庫連線檔
+ * @param string $form_key:此簽核單唯一值
+ * @return object 回傳 mysqli_query
+ */
+function getCurrentAssigners($link, $form_key)
+{
+    $sql = "
+        SELECT
+            nowData.*,
+            nextData.next_current_assigner
+        FROM(
+            SELECT
+                f.flow_code,
+                s.seq,
+                (s.seq + 1) AS next_seq ,
+                s.current_assigner,
+                wccd.change_status
+            FROM
+                flow AS f
+                LEFT JOIN subflow AS s ON f.form_key = s.form_key
+                LEFT JOIN wipwhole_change_planning_customer_details AS wccd ON wccd.id = f.form_id
+            WHERE
+                f.form_key = '$form_key'
+                AND f.system_id = 'wws'
+                AND f.flow_id = 'wws04'
+        ) AS nowData
+        LEFT JOIN(
+            SELECT
+                s.seq,
+                s.current_assigner AS next_current_assigner
+            FROM
+                flow AS f
+                LEFT JOIN subflow AS s ON f.form_key = s.form_key
+                LEFT JOIN wipwhole_change_planning_customer_details AS wccd ON wccd.id = f.form_id
+            WHERE
+                f.form_key = '$form_key'
+                AND f.system_id = 'wws'
+                AND f.flow_id = 'wws04'
+        ) AS nextData
+        ON nowData.next_seq = nextData.seq
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function checkStatus($link, $cid, $user_id)
+{
+    $sql = "
+        SELECT 
+            change_status
+        FROM wipwhole_change_planning_customer_details 
+        WHERE creater = '$user_id'
+        AND wipwholestatus_id = '$cid'
+        AND change_status NOT IN ('C','Z')
+    ";
+    $res = mysqli_query($link, $sql);
+    return $res->num_rows > 0 ? false : true;
+}
diff --git a/wms/wipwhole-change-planning-customer-name-submit.php b/wms/wipwhole-change-planning-customer-name-submit.php
index 91c312a9..b5d80f7b 100644
--- a/wms/wipwhole-change-planning-customer-name-submit.php
+++ b/wms/wipwhole-change-planning-customer-name-submit.php
@@ -1,231 +1,231 @@
-<?php
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    $checkStatus = checkStatus($link, $id, $user_id);
-    if (!empty($_POST['custom_name'] && $_POST['assign_status'] !== 'Z')) {
-        if ($checkStatus) {
-
-            $customer_planning_verify_file = fileIUpload("customer_planning_verify_file");
-            $all_contractno_change = empty($_POST['all_contractno_change']) ? null : $_POST['all_contractno_change'];
-            $custom_name  = $_POST['custom_name'];
-            $contractno = $_POST['contractno'];
-            $next_users = $_POST['next_users'];
-            $tds = date("Y-m-d H:i:s");
-
-            // 單次申請 
-            if (($_POST['assign_status'] == 'B') && empty($all_contractno_change)) {
-                $data_arr = array(
-                    'id' => $id,
-                    'all_contractno_change' => $all_contractno_change,
-                    'custom_name'  => $custom_name,
-                    'contractno' => $contractno,
-                    'tds' => $tds,
-                    'form_key' => getFomkeySeq($link),
-                    'user_id' => $user_id,
-                    'customer_planning_verify_file' => $customer_planning_verify_file,
-                    'change_status' => $_POST['assign_status']
-                );
-                // 寫入表單主檔
-                addWipwholeChangeContractdateDetails($link, $data_arr);
-                // 取得寫入後表單seq
-                $data_arr['last_id'] = $link->insert_id;
-                // 寫入待簽
-                addFlow($link, $data_arr);
-                $data_arr['seq'] = '0';
-                $data_arr['current_assigner'] = $user_id;
-                addSubflow($link, $data_arr);
-                $data_arr['seq'] = '1';
-                $data_arr['current_assigner'] = $next_users;
-                addSubflow($link, $data_arr);
-            }
-
-            // 批次申請
-            if (($_POST['assign_status'] == 'B') && !empty($all_contractno_change)) {
-
-                $wipwholestatus_id_arr = getWipwholestatusIdByConstractNo($link, $contractno);
-                $customer_planning_verify_file = fileIUpload("customer_planning_verify_file");
-                $assign_status = $_POST['assign_status'];
-                foreach ($wipwholestatus_id_arr as $wipwholestatus_id) {
-                    $data_arr = array(
-                        'id' => $wipwholestatus_id[0],
-                        'all_contractno_change' => $all_contractno_change,
-                        'custom_name'  => $custom_name,
-                        'contractno' => $contractno,
-                        'tds' => $tds,
-                        'form_key' => getFomkeySeq($link),
-                        'customer_planning_verify_file' => $customer_planning_verify_file,
-                        'user_id' => $user_id,
-                        'change_status' => $assign_status
-                    );
-                    // 寫入表單主檔
-                    addWipwholeChangeContractdateDetails($link, $data_arr);
-                    // 取得寫入後表單seq
-                    $data_arr['last_id'] = $link->insert_id;
-                    // 寫入待簽
-                    addFlow($link, $data_arr);
-                    $data_arr['seq'] = '0';
-                    $data_arr['current_assigner'] = $user_id;
-                    addSubflow($link, $data_arr);
-                    $data_arr['seq'] = '1';
-                    $data_arr['current_assigner'] = $next_users;
-                    addSubflow($link, $data_arr);
-                }
-            }
-        }
-    }
-
-    // // 單次申請 營業
-    // if ($_POST['assign_status'] == 'B') {
-    //     $tds = date("Y-m-d H:i:s");
-    //     $next_users = $_POST['next_users'];
-    //     $seq = $_POST['seq'];
-    //     $sql = "
-    //             UPDATE wipwhole_change_planning_customer_details 
-    //             SET change_status = 'D'
-    //             WHERE id = '$cid'
-    //         ";
-    //     mysqli_query($link, $sql);
-    //     $sql = "
-    //             UPDATE flow 
-    //             SET flow_code = 'D'
-    //             WHERE form_key = '$form_key'
-    //         ";
-    //     mysqli_query($link, $sql);
-    //     $sql = "
-    //             INSERT into subflow (
-    //                 form_key, 
-    //                 seq, 
-    //                 current_assigner, 
-    //                 create_date
-    //             ) VALUES (
-    //                 '$form_key',
-    //                 '2', 
-    //                 '$next_users', 
-    //                 '$tds'
-    //             )
-    //         ";
-    //     mysqli_query($link, $sql);
-    // }
-
-    // 取消
-    if ($_POST['assign_status'] == 'C') {
-        $tds = date("Y-m-d H:i:s");
-        $next_users = "00000";
-        if (isLeader($link, $user_id)) {
-            if (getChangeStatus($link, $cid) == 'B') {
-                $seq = $_POST['seq'];
-                $sql = "
-                    UPDATE subflow 
-                    SET current_assigner = '$next_users',
-                        create_date = '$tds'
-                    WHERE form_key = '$form_key'
-                    AND seq = '$seq'
-                ";
-                mysqli_query($link, $sql);
-            } else {
-                $seq = $_POST['seq'];
-                $sql = "
-                    INSERT into subflow (
-                        form_key, 
-                        seq, 
-                        current_assigner, 
-                        create_date
-                    ) VALUES (
-                        '$form_key',
-                        '$seq', 
-                        '$next_users', 
-                        '$tds'
-                    )
-                ";
-                mysqli_query($link, $sql);
-            }
-        } else {
-            $seq = $_POST['seq'];
-            $sql = "
-                UPDATE subflow 
-                SET current_assigner = '$next_users',
-                    create_date = '$tds'
-                WHERE form_key = '$form_key'
-                AND seq = '$seq'
-            ";
-            mysqli_query($link, $sql);
-        }
-        $sql = "
-            UPDATE wipwhole_change_planning_customer_details 
-            SET change_status = 'C'
-            WHERE id = '$cid'
-        ";
-        mysqli_query($link, $sql);
-        $sql = "
-            UPDATE flow 
-            SET flow_code = 'Z'
-            WHERE form_key = '$form_key'
-        ";
-        mysqli_query($link, $sql);
-    }
-
-    // 通過
-    if ($_POST['assign_status'] == 'Z') {
-
-        $tds = date("Y-m-d H:i:s");
-        $next_users = $_POST['next_users'];
-        $seq = $_POST['seq'] + 1;
-        $customer_planning_verify_file = fileIUpload("customer_planning_verify_file");
-        $all_contractno_change = empty($_POST['all_contractno_change']) ? null : $_POST['all_contractno_change'];
-        $custom_name  = $_POST['custom_name'];
-        $contractno = $_POST['contractno'];
-
-        if (isLeader($link, $user_id)){
-            $data_arr = array(
-                'id' => $id,
-                'all_contractno_change' => $all_contractno_change,
-                'custom_name'  => $custom_name,
-                'contractno' => $contractno,
-                'tds' => $tds,
-                'form_key' => getFomkeySeq($link),
-                'user_id' => $user_id,
-                'customer_planning_verify_file' => $customer_planning_verify_file,
-                'change_status' => $_POST['assign_status']
-            );
-            addWipwholeChangeContractdateDetails($link, $data_arr);
-            // 取得寫入後表單seq
-            $data_arr['last_id'] = $link->insert_id;
-            // 寫入待簽
-            addFlow($link, $data_arr);
-            $data_arr['seq'] = '0';
-            $data_arr['current_assigner'] = $user_id;
-            addSubflow($link, $data_arr);
-            $data_arr['seq'] = '1';
-            $data_arr['current_assigner'] = $next_users;
-            addSubflow($link, $data_arr);
-        }
-
-        $form_key = getFomkeySeq($link);
-        $sql = "
-            UPDATE wipwhole_change_planning_customer_details 
-            SET change_status = 'Z'
-            WHERE id = '$cid'
-        ";
-        mysqli_query($link, $sql);
-        $sql = "
-            UPDATE flow 
-            SET flow_code = 'Z'
-            WHERE form_key = '$form_key'
-        ";
-        mysqli_query($link, $sql);
-        $sql = "
-            INSERT into subflow (
-                form_key, 
-                seq, 
-                current_assigner, 
-                create_date
-            ) VALUES (
-                '$form_key',
-                '$seq', 
-                '$next_users', 
-                '$tds'
-            )
-        ";
-        mysqli_query($link, $sql);
-    }
-}
+<?php
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    $checkStatus = checkStatus($link, $id, $user_id);
+    if (!empty($_POST['custom_name'] && $_POST['assign_status'] !== 'Z')) {
+        if ($checkStatus) {
+
+            $customer_planning_verify_file = fileIUpload("customer_planning_verify_file");
+            $all_contractno_change = empty($_POST['all_contractno_change']) ? null : $_POST['all_contractno_change'];
+            $custom_name  = $_POST['custom_name'];
+            $contractno = $_POST['contractno'];
+            $next_users = $_POST['next_users'];
+            $tds = date("Y-m-d H:i:s");
+
+            // 單次申請 
+            if (($_POST['assign_status'] == 'B') && empty($all_contractno_change)) {
+                $data_arr = array(
+                    'id' => $id,
+                    'all_contractno_change' => $all_contractno_change,
+                    'custom_name'  => $custom_name,
+                    'contractno' => $contractno,
+                    'tds' => $tds,
+                    'form_key' => getFomkeySeq($link),
+                    'user_id' => $user_id,
+                    'customer_planning_verify_file' => $customer_planning_verify_file,
+                    'change_status' => $_POST['assign_status']
+                );
+                // 寫入表單主檔
+                addWipwholeChangeContractdateDetails($link, $data_arr);
+                // 取得寫入後表單seq
+                $data_arr['last_id'] = $link->insert_id;
+                // 寫入待簽
+                addFlow($link, $data_arr);
+                $data_arr['seq'] = '0';
+                $data_arr['current_assigner'] = $user_id;
+                addSubflow($link, $data_arr);
+                $data_arr['seq'] = '1';
+                $data_arr['current_assigner'] = $next_users;
+                addSubflow($link, $data_arr);
+            }
+
+            // 批次申請
+            if (($_POST['assign_status'] == 'B') && !empty($all_contractno_change)) {
+
+                $wipwholestatus_id_arr = getWipwholestatusIdByConstractNo($link, $contractno);
+                $customer_planning_verify_file = fileIUpload("customer_planning_verify_file");
+                $assign_status = $_POST['assign_status'];
+                foreach ($wipwholestatus_id_arr as $wipwholestatus_id) {
+                    $data_arr = array(
+                        'id' => $wipwholestatus_id[0],
+                        'all_contractno_change' => $all_contractno_change,
+                        'custom_name'  => $custom_name,
+                        'contractno' => $contractno,
+                        'tds' => $tds,
+                        'form_key' => getFomkeySeq($link),
+                        'customer_planning_verify_file' => $customer_planning_verify_file,
+                        'user_id' => $user_id,
+                        'change_status' => $assign_status
+                    );
+                    // 寫入表單主檔
+                    addWipwholeChangeContractdateDetails($link, $data_arr);
+                    // 取得寫入後表單seq
+                    $data_arr['last_id'] = $link->insert_id;
+                    // 寫入待簽
+                    addFlow($link, $data_arr);
+                    $data_arr['seq'] = '0';
+                    $data_arr['current_assigner'] = $user_id;
+                    addSubflow($link, $data_arr);
+                    $data_arr['seq'] = '1';
+                    $data_arr['current_assigner'] = $next_users;
+                    addSubflow($link, $data_arr);
+                }
+            }
+        }
+    }
+
+    // // 單次申請 營業
+    // if ($_POST['assign_status'] == 'B') {
+    //     $tds = date("Y-m-d H:i:s");
+    //     $next_users = $_POST['next_users'];
+    //     $seq = $_POST['seq'];
+    //     $sql = "
+    //             UPDATE wipwhole_change_planning_customer_details 
+    //             SET change_status = 'D'
+    //             WHERE id = '$cid'
+    //         ";
+    //     mysqli_query($link, $sql);
+    //     $sql = "
+    //             UPDATE flow 
+    //             SET flow_code = 'D'
+    //             WHERE form_key = '$form_key'
+    //         ";
+    //     mysqli_query($link, $sql);
+    //     $sql = "
+    //             INSERT into subflow (
+    //                 form_key, 
+    //                 seq, 
+    //                 current_assigner, 
+    //                 create_date
+    //             ) VALUES (
+    //                 '$form_key',
+    //                 '2', 
+    //                 '$next_users', 
+    //                 '$tds'
+    //             )
+    //         ";
+    //     mysqli_query($link, $sql);
+    // }
+
+    // 取消
+    if ($_POST['assign_status'] == 'C') {
+        $tds = date("Y-m-d H:i:s");
+        $next_users = "00000";
+        if (isLeader($link, $user_id)) {
+            if (getChangeStatus($link, $cid) == 'B') {
+                $seq = $_POST['seq'];
+                $sql = "
+                    UPDATE subflow 
+                    SET current_assigner = '$next_users',
+                        create_date = '$tds'
+                    WHERE form_key = '$form_key'
+                    AND seq = '$seq'
+                ";
+                mysqli_query($link, $sql);
+            } else {
+                $seq = $_POST['seq'];
+                $sql = "
+                    INSERT into subflow (
+                        form_key, 
+                        seq, 
+                        current_assigner, 
+                        create_date
+                    ) VALUES (
+                        '$form_key',
+                        '$seq', 
+                        '$next_users', 
+                        '$tds'
+                    )
+                ";
+                mysqli_query($link, $sql);
+            }
+        } else {
+            $seq = $_POST['seq'];
+            $sql = "
+                UPDATE subflow 
+                SET current_assigner = '$next_users',
+                    create_date = '$tds'
+                WHERE form_key = '$form_key'
+                AND seq = '$seq'
+            ";
+            mysqli_query($link, $sql);
+        }
+        $sql = "
+            UPDATE wipwhole_change_planning_customer_details 
+            SET change_status = 'C'
+            WHERE id = '$cid'
+        ";
+        mysqli_query($link, $sql);
+        $sql = "
+            UPDATE flow 
+            SET flow_code = 'Z'
+            WHERE form_key = '$form_key'
+        ";
+        mysqli_query($link, $sql);
+    }
+
+    // 通過
+    if ($_POST['assign_status'] == 'Z') {
+
+        $tds = date("Y-m-d H:i:s");
+        $next_users = $_POST['next_users'];
+        $seq = $_POST['seq'] + 1;
+        $customer_planning_verify_file = fileIUpload("customer_planning_verify_file");
+        $all_contractno_change = empty($_POST['all_contractno_change']) ? null : $_POST['all_contractno_change'];
+        $custom_name  = $_POST['custom_name'];
+        $contractno = $_POST['contractno'];
+
+        if (isLeader($link, $user_id)){
+            $data_arr = array(
+                'id' => $id,
+                'all_contractno_change' => $all_contractno_change,
+                'custom_name'  => $custom_name,
+                'contractno' => $contractno,
+                'tds' => $tds,
+                'form_key' => getFomkeySeq($link),
+                'user_id' => $user_id,
+                'customer_planning_verify_file' => $customer_planning_verify_file,
+                'change_status' => $_POST['assign_status']
+            );
+            addWipwholeChangeContractdateDetails($link, $data_arr);
+            // 取得寫入後表單seq
+            $data_arr['last_id'] = $link->insert_id;
+            // 寫入待簽
+            addFlow($link, $data_arr);
+            $data_arr['seq'] = '0';
+            $data_arr['current_assigner'] = $user_id;
+            addSubflow($link, $data_arr);
+            $data_arr['seq'] = '1';
+            $data_arr['current_assigner'] = $next_users;
+            addSubflow($link, $data_arr);
+        }
+
+        $form_key = getFomkeySeq($link);
+        $sql = "
+            UPDATE wipwhole_change_planning_customer_details 
+            SET change_status = 'Z'
+            WHERE id = '$cid'
+        ";
+        mysqli_query($link, $sql);
+        $sql = "
+            UPDATE flow 
+            SET flow_code = 'Z'
+            WHERE form_key = '$form_key'
+        ";
+        mysqli_query($link, $sql);
+        $sql = "
+            INSERT into subflow (
+                form_key, 
+                seq, 
+                current_assigner, 
+                create_date
+            ) VALUES (
+                '$form_key',
+                '$seq', 
+                '$next_users', 
+                '$tds'
+            )
+        ";
+        mysqli_query($link, $sql);
+    }
+}
diff --git a/wms/wipwhole-change-planning-customer-name.php b/wms/wipwhole-change-planning-customer-name.php
index 24a9e5cc..a35bdf25 100644
--- a/wms/wipwhole-change-planning-customer-name.php
+++ b/wms/wipwhole-change-planning-customer-name.php
@@ -1,486 +1,486 @@
-<?php
-// ini_set('display_errors', 'on');
-
-function getAccounttype($link, $user_id)
-{
-    $sql = "SELECT * FROM account where accountid = '$user_id'";
-    $data = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($data, MYSQLI_ASSOC);
-    return $row['accounttype'];
-}
-
-include 'IncludeCommon.php';
-require_once "database.php";
-
-$includecommon = new IncludeCommon();
-$token = empty($token) ? $_REQUEST["token"] : $token;
-$token_link = "token=" . $token;
-list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
-$user_name = urldecode(base64_decode($enc_user_name));
-$accounttype = getAccounttype($link, $user_id);
-
-$data = array();
-$login_json = null;
-if (strlen($accounttype) != 0) {
-    $jsonres['menu'] = $includecommon->menu_v3($user_id, $accounttype);
-    $login_json =  json_encode($jsonres, JSON_UNESCAPED_UNICODE);
-}
-
-?>
-<script>
-    res = eval("(" + JSON.stringify(<?php echo $login_json; ?>) + ")");
-    window.localStorage.setItem("menu_<?php echo $user_id; ?>", res.menu);
-</script>
-<?php
-/*
-    1. 有 cid 是已申請過的單
-    2. 沒有 cid 是新申請單
-    3. 若是從待簽過來 cid 從 form_key 取得
-    4. 大日程的 id 已申請過的從 cid 取得
-    5. 大日程的 id 新申請過的直接取得
-*/
-
-include "header.php";
-include "css/view/wipwhole-change-contractdate.php";
-include "wipwhole-change-planning-customer-name-function.php";
-
-if (!checkPageUserStatus($user_id)) {
-    echo "此帳號無權限使用任何相關功能";
-    exit;
-}
-
-// 查詢數據
-if (!empty($_GET['form_key'])) {
-    $cid = isset($_GET['cid']) ? $_GET['cid'] : getCid($link, $_GET['form_key']);
-} else {
-    $cid = isset($_GET['cid']) ? $_GET['cid'] : null;
-}
-$form_key = isset($_GET['form_key']) ? $_GET['form_key'] : getForm_key($link, $cid);
-$id = isset($_GET['id']) ? $_GET['id'] : getId($link, $cid);
-
-include "wipwhole-change-planning-customer-name-submit.php";
-
-//  select => options
-$max_options = getShengguanokOptions($link);
-$self_leader_options = getGongwuokOptions($link, $user_id);
-
-// 帶入大日程資料
-$row = getWipwholestatusDetail($link, $id);
-// 帶入所有人歷史單據
-$date_options = getDateOptions($link, $user_id, $id);
-// 檢查此單據狀態非新申請則帶入申請資料
-if (!empty(checkNowFormStatus($link)))
-    $row2 = getWipwholeChangeContractdateDetails($link, $cid);
-
-?>
-
-<div style="overflow-x:auto;">
-    <form method="post" enctype="multipart/form-data">
-        <div class="tab-pane active" class="assign_content" role="mainpanel" id="tabassign">
-            <!-- hidden域 -->
-            <input type="hidden" name="form_key" value='' />
-            <input type="hidden" value="" name="sheet_no" />
-            <table id='basic_info' class="form-content-table">
-                <thead>
-                    <tr>
-                        <td colspan="8" style="text-align:right;">
-                            <button type="button" id="btn_close" class="btn btn-default" onclick="window.close();">關閉分頁</button>
-                        </td>
-                    </tr>
-                    <tr class="no-border">
-                        <th colspan="8">
-                            <h4>計劃圖上傳申請表</h4>
-                        </th>
-                    </tr>
-                    <tr>
-                        <td>　</td>
-                    </tr>
-                    <tr class="no-border">
-                        <th colspan="8">
-                            <?php
-                            if ($_SERVER["REQUEST_METHOD"] == "POST") {
-                                // 檢查日期是否正確
-                                echo getAssignStatusMessage($_POST, $checkStatus);
-                            }
-                            ?>
-                        </th>
-                    </tr>
-                    <tr class="no-border">
-                        <th style="text-align:left;">
-                            <b> 申請紀錄:</b>
-                        </th>
-                        <th colspan="3" style="text-align:left;">
-                            <select class="select2" id="date_select" onchange="dateSelect()">
-                                <option value="new">填寫新申請</option>
-                                <?php
-                                $change_status_name = array(
-                                    "A" => "新申請",
-                                    "B" => "新申請",
-                                    "D" => "新申請",
-                                    "Z" => "通過",
-                                    "C" => "取消",
-                                );
-                                while ($date_option = mysqli_fetch_assoc($date_options)) {
-                                    if ($cid == $date_option['id']) {
-                                        echo "<option selected value='" . $date_option['id'] . "'>" . $change_status_name[$date_option['change_status']] . "_" . $date_option['create_at'] . "</option>";
-                                    } else {
-                                        echo "<option value='" . $date_option['id'] . "'>" . $change_status_name[$date_option['change_status']] . "_" . $date_option['create_at'] . "</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                        </th>
-                        <th colspan="4">
-                            <span style="float: right;text-align:right;">
-                                <b>申請日期:
-                                    <?php
-                                    echo empty(checkNowFormStatus($link)) ? date("Y-m-d") : $row2['create_at'];
-                                    ?>
-                                </b>
-                            </span>
-                        </th>
-                    </tr>
-                    <tr>
-                        <td style="background-color:#ffffff;">　</td>
-                    </tr>
-                    <tr>
-                        <th colspan="8">基本信息</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <th>申請人員編</th>
-                        <td>
-                            <?php
-                            echo empty(checkNowFormStatus($link))
-                                ? $user_id : $row2['creater'];
-                            ?>
-                        </td>
-                        <th>申請人</th>
-                        <td>
-                            <?php
-                            echo empty(checkNowFormStatus($link))
-                                ? accountidToName($user_id)
-                                : accountidToName($row2['creater']);
-                            ?>
-                        </td>
-                        <th>申請人部門</th>
-                        <td>
-                            <?php
-                            echo empty(checkNowFormStatus($link))
-                                ? departIdToDepartName(accountidToDepartId($user_id))
-                                : departIdToDepartName(accountidToDepartId($row2['creater']));
-                            ?>
-                        </td>
-                        <th>申請人職稱</th>
-                        <td>
-                            <?php
-                            echo empty(checkNowFormStatus($link))
-                                ? accountidToRoleName($user_id)
-                                : accountidToRoleName($row2['creater']);
-                            ?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>合約號</th>
-                        <td>
-                            <?php
-                            echo $row["contractno"];
-                            echo "<input type='hidden' name='contractno' value='" . $row["contractno"] . "' />";
-                            ?>
-                            <br />
-                            <?php
-                            if (accountidToDepartId($user_id) !== '250')
-                                if (empty(checkNowFormStatus($link)))
-                                    echo "
-                                        <input type='checkbox' name='all_contractno_change' value='1' />
-                                        變更此合約所有作番
-                                    ";
-                            ?>
-                        </td>
-                        <th>作番號</th>
-                        <td>
-                            <?php
-                            echo $row["facilityno"];
-                            echo "<input type='hidden' name='facilityno' value='" . $row["facilityno"] . "' />";
-                            ?>
-                        </td>
-                        <th>客戶名稱</th>
-                        <td>
-                            <?php
-                            echo $row["custom"];
-                            echo "<input type='hidden' name='custom' value='" . $row["custom"] . "' />";
-                            ?>
-                        </td>
-                        <th>作番大日程</th>
-                        <td>
-                            <?php
-                            $wipwhole_url = "wipwhole-rec-invoice-edit.php?function_name=wipwholerenstatus&$token_link&id=$id";
-                            if ($row["contract_type"] === 'B')
-                                $wipwhole_url = "wipwhole-renovate-rec-invoice-edit.php?function_name=wipwholerenstatus&$token_link&id=$id";
-                            ?>
-                            <a target='_blank' href="<?php echo $wipwhole_url; ?>" class="btn btn-info btn-sm">
-                                開啟
-                            </a>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>營業/契約<br />人員員編</th>
-                        <td>
-                            <?php echo $row['salesid']; ?>
-                            <?php echo "<input type='hidden' name='salesid' value='" . $row["salesid"] . "' />"; ?>
-                        </td>
-                        <th>營業/契約<br />人員</th>
-                        <td>
-                            <?php echo accountidToName($row['salesid']); ?>
-                        </td>
-                        <th>工務人員員編</th>
-                        <td>
-                            <?php echo getGongWuokNo($link, $row['contract_type']); ?>
-                            <?php echo "<input type='hidden' name='gongWuokid' value='" . getGongWuokNo($link, $row['contract_type']) . "' />"; ?>
-                        </td>
-                        <th>工務人員</th>
-                        <td>
-                            <?php echo accountidToName(getGongWuokNo($link, $row['contract_type'])); ?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>下單日<br />(下單普來特富)</th>
-                        <td>
-                            <?php echo substr($row["prattford_order_date"], 0, 10); ?>
-                        </td>
-                        <th>預計發貨日<br />(出港日)</th>
-                        <td>
-                            <?php echo substr($row["estimated_shipping_date"], 0, 10); ?>
-                        </td>
-                        <th>預計到貨日<br />(到觀音廠日)</th>
-                        <td>
-                            <?php echo substr($row["estimated_shipping_schedule_date"], 0, 10); ?>
-                            <input type='hidden' name='estimated_shipping_schedule_date' value='<?php echo $row['estimated_shipping_schedule_date']; ?>' />
-                        </td>
-                        <th></th>
-                        <td>
-
-                        </td>
-                    </tr>
-                    <tr>
-                        <th>地址</th>
-                        <td>
-                            <?php echo $row["address"]; ?>
-                        </td>
-                        <th>填寫客戶姓名</th>
-                        <td>
-                            <?php
-                            if (empty(checkNowFormStatus($link))) {
-                                echo "<input type='text' name='custom_name' />";
-                            } else {
-                                echo $row2["custom_name"];
-                                echo "<input type='hidden' name='custom_name' value='" . $row2["custom_name"] . "' />";
-                            }
-                            ?>
-                        </td>
-                        <th>上傳計劃圖</th>
-                        <td colspan="3">
-                            <input type='file' name='customer_planning_verify_file' id='customer_planning_verify_file' style='width:190px;' />
-                            <?php
-                            echo !empty($row2['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row2['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                            ?>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-
-            <table id="assign_area" class="form-content-table ">
-                <thead>
-                    <tr>
-                        <th colspan="8"><b>簽核操作 </b></th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <th> 簽核狀態</th>
-                        <td colspan="2">
-                            <?php
-                            if (checkNowFormStatus($link) == 'Z') {
-                                echo getChangeStatusName($link, $cid);
-                            } else {
-                                $nowFormStatus = getNowFormStatus($link, $cid);
-                                echo getAssignStatusSelect($link, $user_id, $nowFormStatus);
-                            }
-                            ?>
-                        </td>
-                        <th class="td_title"> 下位簽核者</th>
-                        <td colspan="2">
-                            <?php
-
-                            function echoMaxSelect($max_options)
-                            {
-                                echo "<select name='next_users' id='next_users'>";
-                                foreach ($max_options as $max_option) :
-                                    echo "
-                                        <option value='" . $max_option['val'] . "'>" . $max_option['val'] . $max_option['label'] . "</option>
-                                    ";
-                                endforeach;
-                                echo "</select>";
-                            }
-
-                            if (empty(checkNowFormStatus($link))) {
-                                if (isLeader($link, $user_id)) {
-                                    echo "
-                                        <select name='next_users' id='next_users'>
-                                            <option value='00000'>00000</option>
-                                        </select>
-                                    ";
-                                } else if (in_array(getDepartmentId($link, $user_id), [
-                                    '311', '312', '313', '314', '315',
-                                    '501', '511', '512', '513', '514',
-                                    '220'
-                                ])) {
-                                    echo "<select name='next_users' id='next_users'>";
-                                    foreach ($self_leader_options as $option) :
-                                        echo "
-                                            <option value='" . $option['val'] . "'>" . $option['val'] . $option['label'] . "</option>
-                                        ";
-                                    endforeach;
-                                    echo "</select>";
-                                }
-                            } else if (checkNowFormStatus($link) == 'B') {
-                                if (isLeader($link, $user_id)) {
-                                    echo "
-                                        <select name='next_users' id='next_users'>
-                                            <option value='00000'>00000</option>
-                                        </select>
-                                    ";
-                                }
-                            }
-                            ?>
-                        </td>
-                        <td colspan="2">
-                            <?php
-                            // 誰通過或取消簽核位子
-                            if (empty(checkNowFormStatus($link))) {
-                                echo "<input type='hidden' name='seq' value = '0' />";
-                                echo "<button class='btn btn-primary'>提交</button>";
-                            } else if (checkNowFormStatus($link) == 'B') {
-                                if (isLeader($link, $user_id)) {
-                                    echo "<input type='hidden' name='seq' value = '1' />";
-                                } else {
-                                    echo "<input type='hidden' name='seq' value = '0' />";
-                                }
-                                echo "<button class='btn btn-primary'>提交</button>";
-                            } 
-                            ?>
-                        </td>
-                    </tr>
-                    <?php
-                    if (!empty(checkNowFormStatus($link))) {
-                        $current_assigners = getCurrentAssigners($link, $form_key);
-                        foreach ($current_assigners as $current_assigner) :
-                            if ($current_assigner['current_assigner'] != '00000') {
-                    ?>
-                                <tr>
-                                    <td colspan="1">
-                                        <?php
-                                        if ($current_assigner['seq'] == '0') {
-                                            echo "申請者";
-                                        } else {
-                                            echo departIdToDepartName(accountidToDepartId($current_assigner['current_assigner']));
-                                        }
-                                        ?>
-                                    </td>
-                                    <td colspan="1">
-                                        <?php
-                                        if ($current_assigner['current_assigner'] !== '00000')
-                                            echo $current_assigner['current_assigner'] . "_" . accountidToName($current_assigner['current_assigner']);
-                                        ?>
-                                    </td>
-                                    <td colspan="1">
-                                        <?php
-                                        if ($current_assigner['seq'] == '0') {
-                                            if ($current_assigner['next_current_assigner'] == '00000') {
-                                                if ($current_assigner['change_status'] == 'C') {
-                                                    echo "已取消";
-                                                } else {
-                                                    echo "已申請";
-                                                }
-                                            } else {
-                                                echo "已申請";
-                                            }
-                                        }
-                                        if ($current_assigner['seq'] == '1') {
-                                            if (isset($current_assigner['next_current_assigner'])) {
-                                                if ($current_assigner['next_current_assigner'] !== '00000') {
-                                                    echo "已通過";
-                                                } else {
-                                                    if ($current_assigner['change_status'] == 'C')
-                                                        echo "已取消";
-                                                    if ($current_assigner['change_status'] == 'Z')
-                                                        echo "已通過";
-                                                }
-                                            } else {
-                                                if (!isset($current_assigner['next_current_assigner'])) {
-                                                    if ($current_assigner['change_status'] == 'C') {
-                                                        echo "已取消";
-                                                    } else if ($current_assigner['change_status'] == 'Z') {
-                                                        echo "已通過";
-                                                    } else {
-                                                        echo "審核中";
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        if ($current_assigner['seq'] == '2') {
-                                            if (isset($current_assigner['next_current_assigner'])) {
-                                                if ($current_assigner['next_current_assigner'] !== '00000') {
-                                                    echo "已通過";
-                                                } else {
-                                                    if ($current_assigner['change_status'] == 'C')
-                                                        echo "已取消";
-                                                    if ($current_assigner['change_status'] == 'Z')
-                                                        echo "已通過";
-                                                }
-                                            } else {
-                                                if (!isset($current_assigner['next_current_assigner'])) {
-                                                    if ($current_assigner['change_status'] == 'C') {
-                                                        echo "已取消";
-                                                    } else if ($current_assigner['change_status'] == 'Z') {
-                                                        echo "已通過";
-                                                    } else {
-                                                        echo "審核中";
-                                                    }
-                                                }
-                                            }
-                                        }
-                                        ?>
-                                    </td>
-                                </tr>
-                    <?php
-                            }
-                        endforeach;
-                    }
-                    ?>
-                </tbody>
-            </table>
-    </form>
-</div>
-
-<div>
-
-    <div style="overflow-x:auto;">
-
-    </div>
-
-    <script type="text/javascript">
-        $(function() {
-            $("title").text("<?php echo $row["contractno"]; ?>計劃圖上傳申請表");
-        })
-
-        function dateSelect() {
-            if ($("#date_select").val() == 'new') {
-                window.location.href = "<?php echo "wipwhole-change-planning-customer-name.php?function_name=wipwholerenstatus&$token_link&id=$id"; ?>";
-            } else {
-                window.location.href = "<?php echo "wipwhole-change-planning-customer-name.php?function_name=wipwholerenstatus&$token_link&id=$id&cid="; ?>" + $("#date_select").val();
-            }
-        }
-    </script>
+<?php
+// ini_set('display_errors', 'on');
+
+// function getAccounttype($link, $user_id)
+// {
+//     $sql = "SELECT * FROM account where accountid = '$user_id'";
+//     $data = mysqli_query($link, $sql);
+//     $row = mysqli_fetch_array($data, MYSQLI_ASSOC);
+//     return $row['accounttype'];
+// }
+
+// include 'IncludeCommon.php';
+require_once "database.php";
+// $includecommon = new IncludeCommon();
+include "header.php";
+$token = empty($token) ? $_REQUEST["token"] : $token;
+$token_link = "token=" . $token;
+list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
+$user_name = urldecode(base64_decode($enc_user_name));
+$accounttype = getAccounttype($link, $user_id);
+
+$data = array();
+$login_json = null;
+if (strlen($accounttype) != 0) {
+    $jsonres['menu'] = $includecommon->menu_v3($user_id, $accounttype);
+    $login_json =  json_encode($jsonres, JSON_UNESCAPED_UNICODE);
+}
+
+?>
+<script>
+    res = eval("(" + JSON.stringify(<?php echo $login_json; ?>) + ")");
+    window.localStorage.setItem("menu_<?php echo $user_id; ?>", res.menu);
+</script>
+<?php
+/*
+    1. 有 cid 是已申請過的單
+    2. 沒有 cid 是新申請單
+    3. 若是從待簽過來 cid 從 form_key 取得
+    4. 大日程的 id 已申請過的從 cid 取得
+    5. 大日程的 id 新申請過的直接取得
+*/
+
+
+include "css/view/wipwhole-change-contractdate.php";
+include "wipwhole-change-planning-customer-name-function.php";
+
+if (!checkPageUserStatus($user_id)) {
+    echo "此帳號無權限使用任何相關功能";
+    exit;
+}
+
+// 查詢數據
+if (!empty($_GET['form_key'])) {
+    $cid = isset($_GET['cid']) ? $_GET['cid'] : getCid($link, $_GET['form_key']);
+} else {
+    $cid = isset($_GET['cid']) ? $_GET['cid'] : null;
+}
+$form_key = isset($_GET['form_key']) ? $_GET['form_key'] : getForm_key($link, $cid);
+$id = isset($_GET['id']) ? $_GET['id'] : getId($link, $cid);
+
+include "wipwhole-change-planning-customer-name-submit.php";
+
+//  select => options
+$max_options = getShengguanokOptions($link);
+$self_leader_options = getGongwuokOptions($link, $user_id);
+
+// 帶入大日程資料
+$row = getWipwholestatusDetail($link, $id);
+// 帶入所有人歷史單據
+$date_options = getDateOptions($link, $user_id, $id);
+// 檢查此單據狀態非新申請則帶入申請資料
+if (!empty(checkNowFormStatus($link)))
+    $row2 = getWipwholeChangeContractdateDetails($link, $cid);
+
+?>
+
+<div style="overflow-x:auto;">
+    <form method="post" enctype="multipart/form-data">
+        <div class="tab-pane active" class="assign_content" role="mainpanel" id="tabassign">
+            <!-- hidden域 -->
+            <input type="hidden" name="form_key" value='' />
+            <input type="hidden" value="" name="sheet_no" />
+            <table id='basic_info' class="form-content-table">
+                <thead>
+                    <tr>
+                        <td colspan="8" style="text-align:right;">
+                            <button type="button" id="btn_close" class="btn btn-default" onclick="window.close();">關閉分頁</button>
+                        </td>
+                    </tr>
+                    <tr class="no-border">
+                        <th colspan="8">
+                            <h4>計劃圖上傳申請表</h4>
+                        </th>
+                    </tr>
+                    <tr>
+                        <td>　</td>
+                    </tr>
+                    <tr class="no-border">
+                        <th colspan="8">
+                            <?php
+                            if ($_SERVER["REQUEST_METHOD"] == "POST") {
+                                // 檢查日期是否正確
+                                echo getAssignStatusMessage($_POST, $checkStatus);
+                            }
+                            ?>
+                        </th>
+                    </tr>
+                    <tr class="no-border">
+                        <th style="text-align:left;">
+                            <b> 申請紀錄:</b>
+                        </th>
+                        <th colspan="3" style="text-align:left;">
+                            <select class="select2" id="date_select" onchange="dateSelect()">
+                                <option value="new">填寫新申請</option>
+                                <?php
+                                $change_status_name = array(
+                                    "A" => "新申請",
+                                    "B" => "新申請",
+                                    "D" => "新申請",
+                                    "Z" => "通過",
+                                    "C" => "取消",
+                                );
+                                while ($date_option = mysqli_fetch_assoc($date_options)) {
+                                    if ($cid == $date_option['id']) {
+                                        echo "<option selected value='" . $date_option['id'] . "'>" . $change_status_name[$date_option['change_status']] . "_" . $date_option['create_at'] . "</option>";
+                                    } else {
+                                        echo "<option value='" . $date_option['id'] . "'>" . $change_status_name[$date_option['change_status']] . "_" . $date_option['create_at'] . "</option>";
+                                    }
+                                }
+                                ?>
+                            </select>
+                        </th>
+                        <th colspan="4">
+                            <span style="float: right;text-align:right;">
+                                <b>申請日期:
+                                    <?php
+                                    echo empty(checkNowFormStatus($link)) ? date("Y-m-d") : $row2['create_at'];
+                                    ?>
+                                </b>
+                            </span>
+                        </th>
+                    </tr>
+                    <tr>
+                        <td style="background-color:#ffffff;">　</td>
+                    </tr>
+                    <tr>
+                        <th colspan="8">基本信息</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <th>申請人員編</th>
+                        <td>
+                            <?php
+                            echo empty(checkNowFormStatus($link))
+                                ? $user_id : $row2['creater'];
+                            ?>
+                        </td>
+                        <th>申請人</th>
+                        <td>
+                            <?php
+                            echo empty(checkNowFormStatus($link))
+                                ? accountidToName($user_id)
+                                : accountidToName($row2['creater']);
+                            ?>
+                        </td>
+                        <th>申請人部門</th>
+                        <td>
+                            <?php
+                            echo empty(checkNowFormStatus($link))
+                                ? departIdToDepartName(accountidToDepartId($user_id))
+                                : departIdToDepartName(accountidToDepartId($row2['creater']));
+                            ?>
+                        </td>
+                        <th>申請人職稱</th>
+                        <td>
+                            <?php
+                            echo empty(checkNowFormStatus($link))
+                                ? accountidToRoleName($user_id)
+                                : accountidToRoleName($row2['creater']);
+                            ?>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>合約號</th>
+                        <td>
+                            <?php
+                            echo $row["contractno"];
+                            echo "<input type='hidden' name='contractno' value='" . $row["contractno"] . "' />";
+                            ?>
+                            <br />
+                            <?php
+                            if (accountidToDepartId($user_id) !== '250')
+                                if (empty(checkNowFormStatus($link)))
+                                    echo "
+                                        <input type='checkbox' name='all_contractno_change' value='1' />
+                                        變更此合約所有作番
+                                    ";
+                            ?>
+                        </td>
+                        <th>作番號</th>
+                        <td>
+                            <?php
+                            echo $row["facilityno"];
+                            echo "<input type='hidden' name='facilityno' value='" . $row["facilityno"] . "' />";
+                            ?>
+                        </td>
+                        <th>客戶名稱</th>
+                        <td>
+                            <?php
+                            echo $row["custom"];
+                            echo "<input type='hidden' name='custom' value='" . $row["custom"] . "' />";
+                            ?>
+                        </td>
+                        <th>作番大日程</th>
+                        <td>
+                            <?php
+                            $wipwhole_url = "wipwhole-rec-invoice-edit.php?function_name=wipwholerenstatus&$token_link&id=$id";
+                            if ($row["contract_type"] === 'B')
+                                $wipwhole_url = "wipwhole-renovate-rec-invoice-edit.php?function_name=wipwholerenstatus&$token_link&id=$id";
+                            ?>
+                            <a target='_blank' href="<?php echo $wipwhole_url; ?>" class="btn btn-info btn-sm">
+                                開啟
+                            </a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>營業/契約<br />人員員編</th>
+                        <td>
+                            <?php echo $row['salesid']; ?>
+                            <?php echo "<input type='hidden' name='salesid' value='" . $row["salesid"] . "' />"; ?>
+                        </td>
+                        <th>營業/契約<br />人員</th>
+                        <td>
+                            <?php echo accountidToName($row['salesid']); ?>
+                        </td>
+                        <th>工務人員員編</th>
+                        <td>
+                            <?php echo getGongWuokNo($link, $row['contract_type']); ?>
+                            <?php echo "<input type='hidden' name='gongWuokid' value='" . getGongWuokNo($link, $row['contract_type']) . "' />"; ?>
+                        </td>
+                        <th>工務人員</th>
+                        <td>
+                            <?php echo accountidToName(getGongWuokNo($link, $row['contract_type'])); ?>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>下單日<br />(下單普來特富)</th>
+                        <td>
+                            <?php echo substr($row["prattford_order_date"], 0, 10); ?>
+                        </td>
+                        <th>預計發貨日<br />(出港日)</th>
+                        <td>
+                            <?php echo substr($row["estimated_shipping_date"], 0, 10); ?>
+                        </td>
+                        <th>預計到貨日<br />(到觀音廠日)</th>
+                        <td>
+                            <?php echo substr($row["estimated_shipping_schedule_date"], 0, 10); ?>
+                            <input type='hidden' name='estimated_shipping_schedule_date' value='<?php echo $row['estimated_shipping_schedule_date']; ?>' />
+                        </td>
+                        <th></th>
+                        <td>
+
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>地址</th>
+                        <td>
+                            <?php echo $row["address"]; ?>
+                        </td>
+                        <th>填寫客戶姓名</th>
+                        <td>
+                            <?php
+                            if (empty(checkNowFormStatus($link))) {
+                                echo "<input type='text' name='custom_name' />";
+                            } else {
+                                echo $row2["custom_name"];
+                                echo "<input type='hidden' name='custom_name' value='" . $row2["custom_name"] . "' />";
+                            }
+                            ?>
+                        </td>
+                        <th>上傳計劃圖</th>
+                        <td colspan="3">
+                            <input type='file' name='customer_planning_verify_file' id='customer_planning_verify_file' style='width:190px;' />
+                            <?php
+                            echo !empty($row2['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row2['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
+                            ?>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+
+            <table id="assign_area" class="form-content-table ">
+                <thead>
+                    <tr>
+                        <th colspan="8"><b>簽核操作 </b></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <th> 簽核狀態</th>
+                        <td colspan="2">
+                            <?php
+                            if (checkNowFormStatus($link) == 'Z') {
+                                echo getChangeStatusName($link, $cid);
+                            } else {
+                                $nowFormStatus = getNowFormStatus($link, $cid);
+                                echo getAssignStatusSelect($link, $user_id, $nowFormStatus);
+                            }
+                            ?>
+                        </td>
+                        <th class="td_title"> 下位簽核者</th>
+                        <td colspan="2">
+                            <?php
+
+                            function echoMaxSelect($max_options)
+                            {
+                                echo "<select name='next_users' id='next_users'>";
+                                foreach ($max_options as $max_option) :
+                                    echo "
+                                        <option value='" . $max_option['val'] . "'>" . $max_option['val'] . $max_option['label'] . "</option>
+                                    ";
+                                endforeach;
+                                echo "</select>";
+                            }
+
+                            if (empty(checkNowFormStatus($link))) {
+                                if (isLeader($link, $user_id)) {
+                                    echo "
+                                        <select name='next_users' id='next_users'>
+                                            <option value='00000'>00000</option>
+                                        </select>
+                                    ";
+                                } else if (in_array(getDepartmentId($link, $user_id), [
+                                    '311', '312', '313', '314', '315',
+                                    '501', '511', '512', '513', '514',
+                                    '220'
+                                ])) {
+                                    echo "<select name='next_users' id='next_users'>";
+                                    foreach ($self_leader_options as $option) :
+                                        echo "
+                                            <option value='" . $option['val'] . "'>" . $option['val'] . $option['label'] . "</option>
+                                        ";
+                                    endforeach;
+                                    echo "</select>";
+                                }
+                            } else if (checkNowFormStatus($link) == 'B') {
+                                if (isLeader($link, $user_id)) {
+                                    echo "
+                                        <select name='next_users' id='next_users'>
+                                            <option value='00000'>00000</option>
+                                        </select>
+                                    ";
+                                }
+                            }
+                            ?>
+                        </td>
+                        <td colspan="2">
+                            <?php
+                            // 誰通過或取消簽核位子
+                            if (empty(checkNowFormStatus($link))) {
+                                echo "<input type='hidden' name='seq' value = '0' />";
+                                echo "<button class='btn btn-primary'>提交</button>";
+                            } else if (checkNowFormStatus($link) == 'B') {
+                                if (isLeader($link, $user_id)) {
+                                    echo "<input type='hidden' name='seq' value = '1' />";
+                                } else {
+                                    echo "<input type='hidden' name='seq' value = '0' />";
+                                }
+                                echo "<button class='btn btn-primary'>提交</button>";
+                            } 
+                            ?>
+                        </td>
+                    </tr>
+                    <?php
+                    if (!empty(checkNowFormStatus($link))) {
+                        $current_assigners = getCurrentAssigners($link, $form_key);
+                        foreach ($current_assigners as $current_assigner) :
+                            if ($current_assigner['current_assigner'] != '00000') {
+                    ?>
+                                <tr>
+                                    <td colspan="1">
+                                        <?php
+                                        if ($current_assigner['seq'] == '0') {
+                                            echo "申請者";
+                                        } else {
+                                            echo departIdToDepartName(accountidToDepartId($current_assigner['current_assigner']));
+                                        }
+                                        ?>
+                                    </td>
+                                    <td colspan="1">
+                                        <?php
+                                        if ($current_assigner['current_assigner'] !== '00000')
+                                            echo $current_assigner['current_assigner'] . "_" . accountidToName($current_assigner['current_assigner']);
+                                        ?>
+                                    </td>
+                                    <td colspan="1">
+                                        <?php
+                                        if ($current_assigner['seq'] == '0') {
+                                            if ($current_assigner['next_current_assigner'] == '00000') {
+                                                if ($current_assigner['change_status'] == 'C') {
+                                                    echo "已取消";
+                                                } else {
+                                                    echo "已申請";
+                                                }
+                                            } else {
+                                                echo "已申請";
+                                            }
+                                        }
+                                        if ($current_assigner['seq'] == '1') {
+                                            if (isset($current_assigner['next_current_assigner'])) {
+                                                if ($current_assigner['next_current_assigner'] !== '00000') {
+                                                    echo "已通過";
+                                                } else {
+                                                    if ($current_assigner['change_status'] == 'C')
+                                                        echo "已取消";
+                                                    if ($current_assigner['change_status'] == 'Z')
+                                                        echo "已通過";
+                                                }
+                                            } else {
+                                                if (!isset($current_assigner['next_current_assigner'])) {
+                                                    if ($current_assigner['change_status'] == 'C') {
+                                                        echo "已取消";
+                                                    } else if ($current_assigner['change_status'] == 'Z') {
+                                                        echo "已通過";
+                                                    } else {
+                                                        echo "審核中";
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        if ($current_assigner['seq'] == '2') {
+                                            if (isset($current_assigner['next_current_assigner'])) {
+                                                if ($current_assigner['next_current_assigner'] !== '00000') {
+                                                    echo "已通過";
+                                                } else {
+                                                    if ($current_assigner['change_status'] == 'C')
+                                                        echo "已取消";
+                                                    if ($current_assigner['change_status'] == 'Z')
+                                                        echo "已通過";
+                                                }
+                                            } else {
+                                                if (!isset($current_assigner['next_current_assigner'])) {
+                                                    if ($current_assigner['change_status'] == 'C') {
+                                                        echo "已取消";
+                                                    } else if ($current_assigner['change_status'] == 'Z') {
+                                                        echo "已通過";
+                                                    } else {
+                                                        echo "審核中";
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        ?>
+                                    </td>
+                                </tr>
+                    <?php
+                            }
+                        endforeach;
+                    }
+                    ?>
+                </tbody>
+            </table>
+    </form>
+</div>
+
+<div>
+
+    <div style="overflow-x:auto;">
+
+    </div>
+
+    <script type="text/javascript">
+        $(function() {
+            $("title").text("<?php echo $row["contractno"]; ?>計劃圖上傳申請表");
+        })
+
+        function dateSelect() {
+            if ($("#date_select").val() == 'new') {
+                window.location.href = "<?php echo "wipwhole-change-planning-customer-name.php?function_name=wipwholerenstatus&$token_link&id=$id"; ?>";
+            } else {
+                window.location.href = "<?php echo "wipwhole-change-planning-customer-name.php?function_name=wipwholerenstatus&$token_link&id=$id&cid="; ?>" + $("#date_select").val();
+            }
+        }
+    </script>
     </body>
\ No newline at end of file
diff --git a/wms/wipwhole-index-export-excel.php b/wms/wipwhole-index-export-excel.php
index b583c4cf..18995853 100644
--- a/wms/wipwhole-index-export-excel.php
+++ b/wms/wipwhole-index-export-excel.php
@@ -1,402 +1,402 @@
-<?php
-
-include "database.php";
-include "fun_global.php";
-$token = $_REQUEST["token"];
-$token_link = "token=" . $_REQUEST["token"];
-list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
-$user_name = urldecode(base64_decode($enc_user_name));
-include "wipwhole-index-function.php";
-
-// require dirname(__DIR__) . '/wms/excel/vendor/autoload.php';
-require dirname(__DIR__) . '/common/composer/vendor/autoload.php';
-
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-use PhpOffice\PhpSpreadsheet\Style\Fill;
-
-function getArea($address)
-{
-    $address = mb_substr($address, 0, 2);
-    if (in_array($address, ['宜蘭', '花蓮', '台東']))
-        return '宜花東';
-    if (in_array($address, ['臺北', '台北', '基隆', '新北']))
-        return '北區';
-    if (in_array($address, ['桃園', '新竹']))
-        return '桃竹';
-    if (in_array($address, ['南投', '臺中', '台中', '彰化', '雲林', '苗栗']))
-        return '中區';
-    if (in_array($address, ['台南', '臺南', '嘉義', '屏東', '高雄']))
-        return '南區';
-}
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-
-    $contractno = empty($_POST['contractno']) ? null : $_POST['contractno'];
-    $facilityno = empty($_POST['facilityno']) ? null : $_POST['facilityno'];
-    $custom = empty($_POST['custom']) ? null : $_POST['custom'];
-    $site_survey_contact_verify = !isset($_POST['site_survey_contact_verify']) ? '' : $_POST['site_survey_contact_verify'];
-    $real_contract_arrival_date_start = empty($_POST['real_contract_arrival_date_start']) ? null : $_POST['real_contract_arrival_date_start'];
-    $real_contract_arrival_date_end = empty($_POST['real_contract_arrival_date_end']) ? null : $_POST['real_contract_arrival_date_end'];
-    $area_no = !isset($_POST['area_no']) ? '' : $_POST['area_no'];
-
-    // 取得當前使用者所屬部門
-    $department_id = getDepartmentId($link, $user_id);
-    // 取得當前使用者所屬職位
-    $role_id = getRoleId($link, $user_id);
-
-    $sql = getDataSql($department_id, $role_id, $user_id);
-
-    $result = mysqli_query($link, $sql);
-    if ($result) {
-        $data = array();
-        while ($row = $result->fetch_assoc()) {
-            $data[] = $row;
-        }
-        $result->close();
-    } else {
-        echo "Query failed: " . $connection->error;
-    }
-
-    // 建立一個新的 Spreadsheet 物件
-    $spreadsheet = new Spreadsheet();
-    $sheet = $spreadsheet->getActiveSheet();
-
-    $colArr = [
-        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
-        'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-        'AA', 'AB', 'AC', 'AD', 'AE', 'AF', 'AG', 'AH', 'AI', 'AJ', 'AK',
-        'AL', 'AM', 'AN', 'AO', 'AP', 'AQ', 'AR', 'AS', 'AT', 'AU', 'AV',
-        'AW', 'AX', 'AY', 'AZ', 'BA', 'BB', 'BC', 'BD', 'BE', 'BF', 'BG',
-        'BH', 'BI', 'BJ', 'BK', 'BL', 'BM', 'BN', 'BO'
-    ];
-    $colTitleArr = [
-        '區域',
-        '合約號',
-        '作番號',
-        '客戶名稱',
-        '地址',
-        '工地地址',
-        '規格',
-        '依合約客戶需求日',
-        '下單日(普來特富)',
-        '預計發貨日(普來特富)',
-        '預計到廠日(觀音廠)',
-        '實際到廠日(觀音廠)',
-        '預計出貨日(到工地)',
-        '營業/契約確認',
-        '營業/契約規格',
-        '營業/契約規格日期',
-        '客戶計劃圖(意匠圖)',
-        '客戶計劃圖(意匠圖)日期',
-        '客戶顏色',
-        '客戶顏色日期',
-        '客戶樣式',
-        '客戶樣式日期',
-        '工勘聯絡表',
-        '工勘聯絡表日期',
-        '設計確認',
-        '設計規格',
-        '設計規格日期',
-        '設計計劃圖',
-        '設計計劃圖日期',
-        '設計顏色',
-        '設計顏色日期',
-        '設計樣式',
-        '設計樣式日期',
-        '設計主管確認',
-        '設計主管確認日期',
-        '工務確認',
-        '樓高通報',
-        '樓高通報日期',
-        '工勘確認',
-        '工勘確認日期',
-        '生管確認',
-        '是否齊備',
-        '是否齊備日期',
-        '下單日(下單普來特富)',
-        '下單日(下單普來特富)日期',
-        '預計發貨日(出港日)',
-        '預計發貨日(出港日)日期',
-        '預計實際到貨日(到觀音廠日)',
-        '預計實際到貨日(到觀音廠日)日期',
-        '普來特富(發貨類別)',
-        '普來特富(發貨類別)日期',
-        '台灣自理項目(發貨類別)',
-        '台灣自理項目(發貨類別)日期',
-        '實際到貨日(到觀音廠日)',
-        '實際到貨日(到觀音廠日)日期'
-    ];
-    $sheet->setTitle('作番大日程(新梯)');
-    for ($i = 0; $i < count($colArr); $i++)
-        $sheet->setCellValue($colArr[$i] . '1', $colTitleArr[$i]);
-
-
-    $i = 2;
-    foreach ($data as $row) {
-
-        //規格
-        $Specification = $row['facility_kind'];
-        $Specification .= !empty($row['numberofpassenger']) ? "-" . $row['numberofpassenger'] : "";
-        $Specification .= !empty($row['weight']) ? "-" . $row['weight'] : "";
-        $Specification .= !empty($row['numberofstop']) ? "-" . $row['numberofstop'] : "";
-        $Specification .= !empty($row['numberoffloor']) ? "/" . $row['numberoffloor'] : "";
-        $Specification .= !empty($row['opentype']) ? "-" . $row['opentype'] : "";
-        $Specification .= !empty($row['speed']) ? $row['speed'] : "";
-
-        //工務
-        $gongwuok = 0;
-        // 營業
-        $yingyeok = 0;
-        // 設計
-        $shejiok = 0;
-        // 生管
-        $shengguanok = 0;
-        // 財務
-        // $caiwuok = 0;
-
-        // 工務統計已確認
-        if ($row['building_heigh_verify'] == 0)
-            $gongwuok += 1;
-        // if ($row['site_survey_contact_verify'] == 0)
-        if (!in_array($row['site_survey_contact_verify'], ['1', 'A']))
-            $gongwuok += 1;
-
-        // 營業統計已確認
-        if ($row['sales_spec_verify'] == 0)
-            $yingyeok += 1;
-        if ($row['customer_planning_verify'] == 0)
-            $yingyeok += 1;
-        if ($row['customer_color_verify'] == 0)
-            $yingyeok += 1;
-        if ($row['customer_style_verify'] == 0)
-            $yingyeok += 1;
-        if ($row['site_survey_contact_form_verify'] == 0)
-            $yingyeok += 1;
-
-        // 設計統計已確認
-        if ($row['desin_spec_verify'] == 0)
-            $shejiok += 1;
-        if ($row['desin_planning_verify'] == 0)
-            $shejiok += 1;
-        if ($row['desin_color_verify'] == 0)
-            $shejiok += 1;
-        if ($row['desin_style_verify'] == 0)
-            $shejiok += 1;
-        if ($row['desin_leader_verify'] == 0)
-            $shejiok += 1;
-
-        // 生管統計已確認
-        if ($row['shengguanok_status'] == 0)
-            $shengguanok += 1;
-        if ($row['prattford_order_date_verify'] == 0)
-            $shengguanok += 1;
-        if ($row['estimated_shipping_date_verify'] == 0)
-            $shengguanok += 1;
-        if ($row['estimated_shipping_schedule_date_verify'] == 0)
-            $shengguanok += 1;
-        if ($row['goods_type'] == 'A' || $row['goods_type'] == 'C')
-            $shengguanok += 1;
-        if ($row['taiwan_goods_type'] == 'A' || $row['taiwan_goods_type'] == 'C')
-            $shengguanok += 1;
-        if ($row['arrival_date_verify']  == 'A')
-            $shengguanok += 1;
-
-
-        // 工勘狀態
-        $site_survey_contact_verify = $row['site_survey_contact_verify'] == 1 ? "未確認" : "已確認";
-
-        $status_arr = array(
-            '0' => '已完成',
-            '1' => '進行中',
-            '2' => '無需求'
-        );
-
-        $status2_arr = array(
-            '1' => '未確認',
-            'A' => 'A:全級發貨',
-            'B' => 'B:欠件發貨',
-            'C' => 'C:無發貨需求'
-        );
-
-        $status3_arr = array(
-            '1' => '未確認',
-            'A' => 'A:皆到貨',
-            'B' => 'B:皆欠件',
-            'C' => 'C:普來特富欠件',
-            'D' => 'D:台灣欠件',
-        );
-
-        $site_survey_status = array(
-            "0" => "已確認",
-            "1" => "未確認",
-            "2" => "無工勘需求",
-            "A" => "未動工",
-            "B" => "地下室施工",
-            "C" => "打樁",
-            "D" => "地基",
-            "E" => "挖土",
-            "G" => "機房",
-            "H" => "機械式淨高",
-            "M" => "樓中樓",
-            "OH" => "最高層(頂樓高度)",
-            "P" => "PIT(機坑深度)",
-            "R" => "R 樓",
-            "S" => "停工",
-            "T" => "TOP",
-            "TC" => "頂部間隙",
-            "TS" => "行程",
-            "TH" => "全高",
-            "Y" => "已搭、已出",
-            "YB" => "退購結案",
-            "YF" => "既有建物",
-            "YN" => "已搭、未出"
-        );
-        for ($j = 1; $j < 200; $j++) {
-            $site_survey_status[$j . "F"] = $j . "F";
-        }
-
-        // 營業 營業/契約確認規格
-        $sales_spec_verify_status = !empty($status_arr[$row['sales_spec_verify']]) ? $status_arr[$row['sales_spec_verify']] : "";
-        // 營業 客戶計劃圖(意匠圖)
-        $customer_planning_verify_status = !empty($status_arr[$row['customer_planning_verify']]) ? $status_arr[$row['customer_planning_verify']] : "";
-        // 營業 客戶顏色
-        $customer_color_verify_status = !empty($status_arr[$row['customer_color_verify']]) ? $status_arr[$row['customer_color_verify']] : "";
-        // 營業 客戶樣式
-        $customer_style_verify_status = !empty($status_arr[$row['customer_style_verify']]) ? $status_arr[$row['customer_style_verify']] : "";
-        // 營業 工勘聯絡表
-        $site_survey_contact_form_verify_status = !empty($status_arr[$row['site_survey_contact_form_verify']]) ? $status_arr[$row['site_survey_contact_form_verify']] : "";
-
-        // 設計 規格確認
-        $desin_spec_verify_status = !empty($status_arr[$row['desin_spec_verify']]) ? $status_arr[$row['desin_spec_verify']] : "";
-        // 設計 設計計劃圖確認
-        $desin_planning_verify_status = !empty($status_arr[$row['desin_planning_verify']]) ? $status_arr[$row['desin_planning_verify']] : "";
-        // 設計 設計顏色確認
-        $desin_color_verify_status = !empty($status_arr[$row['desin_color_verify']]) ? $status_arr[$row['desin_color_verify']] : "";
-        // 設計 設計樣式確認
-        $desin_style_verify_status = !empty($status_arr[$row['desin_style_verify']]) ? $status_arr[$row['desin_style_verify']] : "";
-
-        // 設計 設計主管確認
-        $desin_leader_verify_status = !empty($status_arr[$row['desin_leader_verify']]) ? $status_arr[$row['desin_leader_verify']] : "";
-
-        // 工務 樓高通報確認
-        $dbuilding_heigh_verify_status = !empty($status_arr[$row['building_heigh_verify']]) ? $status_arr[$row['building_heigh_verify']] : "";
-        // 工務 工勘確認
-        $site_survey_contact_verify_status = !empty($site_survey_status[$row['site_survey_contact_verify']]) ? $site_survey_status[$row['site_survey_contact_verify']] : "";
-
-        // 生管 是否齊備確認
-        $shengguanok_status = !empty($status_arr[$row['shengguanok_status']]) ? $status_arr[$row['shengguanok_status']] : "";
-        $prattford_order_date_verify_status = !empty($status_arr[$row['prattford_order_date_verify']]) ? $status_arr[$row['prattford_order_date_verify']] : "";
-        $estimated_shipping_date_verify_status = !empty($status_arr[$row['estimated_shipping_date_verify']]) ? $status_arr[$row['estimated_shipping_date_verify']] : "";
-        $estimated_shipping_schedule_date_verify_status = !empty($status_arr[$row['estimated_shipping_schedule_date_verify']]) ? $status_arr[$row['estimated_shipping_schedule_date_verify']] : "";
-        $goods_type_status = !empty($status2_arr[$row['goods_type']]) ? $status2_arr[$row['goods_type']] : "";
-        $taiwan_goods_type_status = !empty($status2_arr[$row['taiwan_goods_type']]) ? $status2_arr[$row['taiwan_goods_type']] : "";
-        $arrival_date_verify_status = !empty($status3_arr[$row['arrival_date_verify']]) ? $status3_arr[$row['arrival_date_verify']] : "";
-
-        $colContentArr = [
-            getArea($row['address']),
-            $row['contractno'],
-            $row['facilityno'],
-            $row['custom'],
-            $row['address'],
-            $row['real_address'],
-            $Specification,
-            substr($row['contract_arrival_date'], 0, 10),
-            substr($row['prattford_order_date'], 0, 10),
-            substr($row['estimated_shipping_date'], 0, 10),
-            substr($row['estimated_shipping_schedule_date'], 0, 10),
-            substr($row['actual_tofactory_date'], 0, 10),
-            substr($row['real_contract_arrival_date'], 0, 10),
-            accountidToName($row['salesid']) . " " . $yingyeok . "/5",
-            $sales_spec_verify_status,
-            substr($row['sales_spec_verify_at'], 0, 10),
-            $customer_planning_verify_status,
-            substr($row['customer_planning_verify_at'], 0, 10),
-            $customer_color_verify_status,
-            substr($row['customer_color_verify_at'], 0, 10),
-            $customer_style_verify_status,
-            substr($row['customer_style_verify_at'], 0, 10),
-            $site_survey_contact_form_verify_status,
-            substr($row['site_survey_contact_form_verify_at'], 0, 10),
-            '郭承瑋 ' . $shejiok . "/5",
-            $desin_spec_verify_status,
-            substr($row['desin_spec_verify_at'], 0, 10),
-            $desin_planning_verify_status,
-            substr($row['desin_planning_verify_at'], 0, 10),
-            $desin_color_verify_status,
-            substr($row['desin_color_verify_at'], 0, 10),
-            $desin_style_verify_status,
-            substr($row['desin_style_verify_at'], 0, 10),
-            $desin_leader_verify_status,
-            substr($row['desin_leader_verify_at'], 0, 10),
-            getGunwuName($row['address']) . $gongwuok . "/2",
-            $dbuilding_heigh_verify_status,
-            substr($row['building_heigh_verify_at'], 0, 10),
-            $site_survey_contact_verify_status,
-            substr($row['site_survey_contact_verify_at'], 0, 10),
-            '許伃廷 ' . $shengguanok . "/7",
-            $shengguanok_status,
-            substr($row['shengguanok_status_at'], 0, 10),
-            $prattford_order_date_verify_status,
-            substr($row['prattford_order_date'], 0, 10),
-            $estimated_shipping_date_verify_status,
-            substr($row['estimated_shipping_date'], 0, 10),
-            $estimated_shipping_schedule_date_verify_status,
-            substr($row['estimated_shipping_schedule_date'], 0, 10),
-            $goods_type_status,
-            substr($row['goods_type_date'], 0, 10),
-            $taiwan_goods_type_status,
-            substr($row['taiwan_goods_type_date'], 0, 10),
-            $arrival_date_verify_status,
-            substr($row['actual_tofactory_date'], 0, 10),
-        ];
-        for ($j = 0; $j < count($colContentArr); $j++)
-            $sheet->setCellValue($colArr[$j] . $i, $colContentArr[$j]);
-        $i++;
-    }
-
-    // 調整欄位大小
-    foreach ($sheet->getColumnIterator() as $column) {
-        $sheet->getColumnDimension($column->getColumnIndex())->setAutoSize(true);
-    }
-
-    // 背景顏色為藍色
-    $styleA1toC1 = $sheet->getStyle('A1:M1');
-    $fillA1toC1 = $styleA1toC1->getFill();
-    $fillA1toC1->setFillType(Fill::FILL_SOLID)
-        ->getStartColor()->setRGB('8EA9DB');
-
-    // 背景顏色為藍色
-    $styleA1toC1 = $sheet->getStyle('N1:X1');
-    $fillA1toC1 = $styleA1toC1->getFill();
-    $fillA1toC1->setFillType(Fill::FILL_SOLID)
-        ->getStartColor()->setRGB('BBFFEE');
-
-    // 背景顏色為橘色
-    $styleA1toC1 = $sheet->getStyle('Y1:AI1');
-    $fillA1toC1 = $styleA1toC1->getFill();
-    $fillA1toC1->setFillType(Fill::FILL_SOLID)
-        ->getStartColor()->setRGB('FFBB66');
-
-    // 背景顏色為綠色
-    $styleA1toC1 = $sheet->getStyle('AJ1:AN1');
-    $fillA1toC1 = $styleA1toC1->getFill();
-    $fillA1toC1->setFillType(Fill::FILL_SOLID)
-        ->getStartColor()->setRGB('DDFF77');
-
-    // 背景顏色為橘色
-    $styleA1toC1 = $sheet->getStyle('AO1:BC1');
-    $fillA1toC1 = $styleA1toC1->getFill();
-    $fillA1toC1->setFillType(Fill::FILL_SOLID)
-        ->getStartColor()->setRGB('FFCCCC');
-
-    $writer = new Xlsx($spreadsheet);
-    $file_path = dirname(__DIR__) . '/wms/excel/' . 'gary_test.xlsx';
-    try {
-        $writer->save($file_path);
-        // 回傳檔案路徑給 JavaScript
-        echo $file_path;
-    } catch (Exception $e) {
-        echo 'Error: ' . $e->getMessage();
-    }
-    exit();
-}
+<?php
+
+include "database.php";
+include "fun_global.php";
+$token = $_REQUEST["token"];
+$token_link = "token=" . $_REQUEST["token"];
+list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
+$user_name = urldecode(base64_decode($enc_user_name));
+include "wipwhole-index-function.php";
+
+// require dirname(__DIR__) . '/wms/excel/vendor/autoload.php';
+require dirname(__DIR__) . '/common/composer/vendor/autoload.php';
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+
+function getArea($address)
+{
+    $address = mb_substr($address, 0, 2);
+    if (in_array($address, ['宜蘭', '花蓮', '台東']))
+        return '宜花東';
+    if (in_array($address, ['臺北', '台北', '基隆', '新北']))
+        return '北區';
+    if (in_array($address, ['桃園', '新竹']))
+        return '桃竹';
+    if (in_array($address, ['南投', '臺中', '台中', '彰化', '雲林', '苗栗']))
+        return '中區';
+    if (in_array($address, ['台南', '臺南', '嘉義', '屏東', '高雄']))
+        return '南區';
+}
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+
+    $contractno = empty($_POST['contractno']) ? null : $_POST['contractno'];
+    $facilityno = empty($_POST['facilityno']) ? null : $_POST['facilityno'];
+    $custom = empty($_POST['custom']) ? null : $_POST['custom'];
+    $site_survey_contact_verify = !isset($_POST['site_survey_contact_verify']) ? '' : $_POST['site_survey_contact_verify'];
+    $real_contract_arrival_date_start = empty($_POST['real_contract_arrival_date_start']) ? null : $_POST['real_contract_arrival_date_start'];
+    $real_contract_arrival_date_end = empty($_POST['real_contract_arrival_date_end']) ? null : $_POST['real_contract_arrival_date_end'];
+    $area_no = !isset($_POST['area_no']) ? '' : $_POST['area_no'];
+
+    // 取得當前使用者所屬部門
+    $department_id = getDepartmentId($link, $user_id);
+    // 取得當前使用者所屬職位
+    $role_id = getRoleId($link, $user_id);
+
+    $sql = getDataSql($department_id, $role_id, $user_id);
+
+    $result = mysqli_query($link, $sql);
+    if ($result) {
+        $data = array();
+        while ($row = $result->fetch_assoc()) {
+            $data[] = $row;
+        }
+        $result->close();
+    } else {
+        echo "Query failed: " . $connection->error;
+    }
+
+    // 建立一個新的 Spreadsheet 物件
+    $spreadsheet = new Spreadsheet();
+    $sheet = $spreadsheet->getActiveSheet();
+
+    $colArr = [
+        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+        'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+        'AA', 'AB', 'AC', 'AD', 'AE', 'AF', 'AG', 'AH', 'AI', 'AJ', 'AK',
+        'AL', 'AM', 'AN', 'AO', 'AP', 'AQ', 'AR', 'AS', 'AT', 'AU', 'AV',
+        'AW', 'AX', 'AY', 'AZ', 'BA', 'BB', 'BC', 'BD', 'BE', 'BF', 'BG',
+        'BH', 'BI', 'BJ', 'BK', 'BL', 'BM', 'BN', 'BO'
+    ];
+    $colTitleArr = [
+        '區域',
+        '合約號',
+        '作番號',
+        '客戶名稱',
+        '地址',
+        '工地地址',
+        '規格',
+        '依合約客戶需求日',
+        '下單日(普來特富)',
+        '預計發貨日(普來特富)',
+        '預計到廠日(觀音廠)',
+        '實際到廠日(觀音廠)',
+        '預計出貨日(到工地)',
+        '營業/契約確認',
+        '營業/契約規格',
+        '營業/契約規格日期',
+        '客戶計劃圖(意匠圖)',
+        '客戶計劃圖(意匠圖)日期',
+        '客戶顏色',
+        '客戶顏色日期',
+        '客戶樣式',
+        '客戶樣式日期',
+        '工勘聯絡表',
+        '工勘聯絡表日期',
+        '設計確認',
+        '設計規格',
+        '設計規格日期',
+        '設計計劃圖',
+        '設計計劃圖日期',
+        '設計顏色',
+        '設計顏色日期',
+        '設計樣式',
+        '設計樣式日期',
+        '設計主管確認',
+        '設計主管確認日期',
+        '工務確認',
+        '樓高通報',
+        '樓高通報日期',
+        '工勘確認',
+        '工勘確認日期',
+        '生管確認',
+        '是否齊備',
+        '是否齊備日期',
+        '下單日(下單普來特富)',
+        '下單日(下單普來特富)日期',
+        '預計發貨日(出港日)',
+        '預計發貨日(出港日)日期',
+        '預計實際到貨日(到觀音廠日)',
+        '預計實際到貨日(到觀音廠日)日期',
+        '普來特富(發貨類別)',
+        '普來特富(發貨類別)日期',
+        '台灣自理項目(發貨類別)',
+        '台灣自理項目(發貨類別)日期',
+        '實際到貨日(到觀音廠日)',
+        '實際到貨日(到觀音廠日)日期'
+    ];
+    $sheet->setTitle('作番大日程(新梯)');
+    for ($i = 0; $i < count($colArr); $i++)
+        $sheet->setCellValue($colArr[$i] . '1', $colTitleArr[$i]);
+
+
+    $i = 2;
+    foreach ($data as $row) {
+
+        //規格
+        $Specification = $row['facility_kind'];
+        $Specification .= !empty($row['numberofpassenger']) ? "-" . $row['numberofpassenger'] : "";
+        $Specification .= !empty($row['weight']) ? "-" . $row['weight'] : "";
+        $Specification .= !empty($row['numberofstop']) ? "-" . $row['numberofstop'] : "";
+        $Specification .= !empty($row['numberoffloor']) ? "/" . $row['numberoffloor'] : "";
+        $Specification .= !empty($row['opentype']) ? "-" . $row['opentype'] : "";
+        $Specification .= !empty($row['speed']) ? $row['speed'] : "";
+
+        //工務
+        $gongwuok = 0;
+        // 營業
+        $yingyeok = 0;
+        // 設計
+        $shejiok = 0;
+        // 生管
+        $shengguanok = 0;
+        // 財務
+        // $caiwuok = 0;
+
+        // 工務統計已確認
+        if ($row['building_heigh_verify'] == 0)
+            $gongwuok += 1;
+        // if ($row['site_survey_contact_verify'] == 0)
+        if (!in_array($row['site_survey_contact_verify'], ['1', 'A']))
+            $gongwuok += 1;
+
+        // 營業統計已確認
+        if ($row['sales_spec_verify'] == 0)
+            $yingyeok += 1;
+        if ($row['customer_planning_verify'] == 0)
+            $yingyeok += 1;
+        if ($row['customer_color_verify'] == 0)
+            $yingyeok += 1;
+        if ($row['customer_style_verify'] == 0)
+            $yingyeok += 1;
+        if ($row['site_survey_contact_form_verify'] == 0)
+            $yingyeok += 1;
+
+        // 設計統計已確認
+        if ($row['desin_spec_verify'] == 0)
+            $shejiok += 1;
+        if ($row['desin_planning_verify'] == 0)
+            $shejiok += 1;
+        if ($row['desin_color_verify'] == 0)
+            $shejiok += 1;
+        if ($row['desin_style_verify'] == 0)
+            $shejiok += 1;
+        if ($row['desin_leader_verify'] == 0)
+            $shejiok += 1;
+
+        // 生管統計已確認
+        if ($row['shengguanok_status'] == 0)
+            $shengguanok += 1;
+        if ($row['prattford_order_date_verify'] == 0)
+            $shengguanok += 1;
+        if ($row['estimated_shipping_date_verify'] == 0)
+            $shengguanok += 1;
+        if ($row['estimated_shipping_schedule_date_verify'] == 0)
+            $shengguanok += 1;
+        if ($row['goods_type'] == 'A' || $row['goods_type'] == 'C')
+            $shengguanok += 1;
+        if ($row['taiwan_goods_type'] == 'A' || $row['taiwan_goods_type'] == 'C')
+            $shengguanok += 1;
+        if ($row['arrival_date_verify']  == 'A')
+            $shengguanok += 1;
+
+
+        // 工勘狀態
+        $site_survey_contact_verify = $row['site_survey_contact_verify'] == 1 ? "未確認" : "已確認";
+
+        $status_arr = array(
+            '0' => '已完成',
+            '1' => '進行中',
+            '2' => '無需求'
+        );
+
+        $status2_arr = array(
+            '1' => '未確認',
+            'A' => 'A:全級發貨',
+            'B' => 'B:欠件發貨',
+            'C' => 'C:無發貨需求'
+        );
+
+        $status3_arr = array(
+            '1' => '未確認',
+            'A' => 'A:皆到貨',
+            'B' => 'B:皆欠件',
+            'C' => 'C:普來特富欠件',
+            'D' => 'D:台灣欠件',
+        );
+
+        $site_survey_status = array(
+            "0" => "已確認",
+            "1" => "未確認",
+            "2" => "無工勘需求",
+            "A" => "未動工",
+            "B" => "地下室施工",
+            "C" => "打樁",
+            "D" => "地基",
+            "E" => "挖土",
+            "G" => "機房",
+            "H" => "機械式淨高",
+            "M" => "樓中樓",
+            "OH" => "最高層(頂樓高度)",
+            "P" => "PIT(機坑深度)",
+            "R" => "R 樓",
+            "S" => "停工",
+            "T" => "TOP",
+            "TC" => "頂部間隙",
+            "TS" => "行程",
+            "TH" => "全高",
+            "Y" => "已搭、已出",
+            "YB" => "退購結案",
+            "YF" => "既有建物",
+            "YN" => "已搭、未出"
+        );
+        for ($j = 1; $j < 200; $j++) {
+            $site_survey_status[$j . "F"] = $j . "F";
+        }
+
+        // 營業 營業/契約確認規格
+        $sales_spec_verify_status = !empty($status_arr[$row['sales_spec_verify']]) ? $status_arr[$row['sales_spec_verify']] : "";
+        // 營業 客戶計劃圖(意匠圖)
+        $customer_planning_verify_status = !empty($status_arr[$row['customer_planning_verify']]) ? $status_arr[$row['customer_planning_verify']] : "";
+        // 營業 客戶顏色
+        $customer_color_verify_status = !empty($status_arr[$row['customer_color_verify']]) ? $status_arr[$row['customer_color_verify']] : "";
+        // 營業 客戶樣式
+        $customer_style_verify_status = !empty($status_arr[$row['customer_style_verify']]) ? $status_arr[$row['customer_style_verify']] : "";
+        // 營業 工勘聯絡表
+        $site_survey_contact_form_verify_status = !empty($status_arr[$row['site_survey_contact_form_verify']]) ? $status_arr[$row['site_survey_contact_form_verify']] : "";
+
+        // 設計 規格確認
+        $desin_spec_verify_status = !empty($status_arr[$row['desin_spec_verify']]) ? $status_arr[$row['desin_spec_verify']] : "";
+        // 設計 設計計劃圖確認
+        $desin_planning_verify_status = !empty($status_arr[$row['desin_planning_verify']]) ? $status_arr[$row['desin_planning_verify']] : "";
+        // 設計 設計顏色確認
+        $desin_color_verify_status = !empty($status_arr[$row['desin_color_verify']]) ? $status_arr[$row['desin_color_verify']] : "";
+        // 設計 設計樣式確認
+        $desin_style_verify_status = !empty($status_arr[$row['desin_style_verify']]) ? $status_arr[$row['desin_style_verify']] : "";
+
+        // 設計 設計主管確認
+        $desin_leader_verify_status = !empty($status_arr[$row['desin_leader_verify']]) ? $status_arr[$row['desin_leader_verify']] : "";
+
+        // 工務 樓高通報確認
+        $dbuilding_heigh_verify_status = !empty($status_arr[$row['building_heigh_verify']]) ? $status_arr[$row['building_heigh_verify']] : "";
+        // 工務 工勘確認
+        $site_survey_contact_verify_status = !empty($site_survey_status[$row['site_survey_contact_verify']]) ? $site_survey_status[$row['site_survey_contact_verify']] : "";
+
+        // 生管 是否齊備確認
+        $shengguanok_status = !empty($status_arr[$row['shengguanok_status']]) ? $status_arr[$row['shengguanok_status']] : "";
+        $prattford_order_date_verify_status = !empty($status_arr[$row['prattford_order_date_verify']]) ? $status_arr[$row['prattford_order_date_verify']] : "";
+        $estimated_shipping_date_verify_status = !empty($status_arr[$row['estimated_shipping_date_verify']]) ? $status_arr[$row['estimated_shipping_date_verify']] : "";
+        $estimated_shipping_schedule_date_verify_status = !empty($status_arr[$row['estimated_shipping_schedule_date_verify']]) ? $status_arr[$row['estimated_shipping_schedule_date_verify']] : "";
+        $goods_type_status = !empty($status2_arr[$row['goods_type']]) ? $status2_arr[$row['goods_type']] : "";
+        $taiwan_goods_type_status = !empty($status2_arr[$row['taiwan_goods_type']]) ? $status2_arr[$row['taiwan_goods_type']] : "";
+        $arrival_date_verify_status = !empty($status3_arr[$row['arrival_date_verify']]) ? $status3_arr[$row['arrival_date_verify']] : "";
+
+        $colContentArr = [
+            getArea($row['address']),
+            $row['contractno'],
+            $row['facilityno'],
+            $row['custom'],
+            $row['address'],
+            $row['real_address'],
+            $Specification,
+            substr($row['contract_arrival_date'], 0, 10),
+            substr($row['prattford_order_date'], 0, 10),
+            substr($row['estimated_shipping_date'], 0, 10),
+            substr($row['estimated_shipping_schedule_date'], 0, 10),
+            substr($row['actual_tofactory_date'], 0, 10),
+            substr($row['real_contract_arrival_date'], 0, 10),
+            accountidToName($row['salesid']) . " " . $yingyeok . "/5",
+            $sales_spec_verify_status,
+            substr($row['sales_spec_verify_at'], 0, 10),
+            $customer_planning_verify_status,
+            substr($row['customer_planning_verify_at'], 0, 10),
+            $customer_color_verify_status,
+            substr($row['customer_color_verify_at'], 0, 10),
+            $customer_style_verify_status,
+            substr($row['customer_style_verify_at'], 0, 10),
+            $site_survey_contact_form_verify_status,
+            substr($row['site_survey_contact_form_verify_at'], 0, 10),
+            '郭承瑋 ' . $shejiok . "/5",
+            $desin_spec_verify_status,
+            substr($row['desin_spec_verify_at'], 0, 10),
+            $desin_planning_verify_status,
+            substr($row['desin_planning_verify_at'], 0, 10),
+            $desin_color_verify_status,
+            substr($row['desin_color_verify_at'], 0, 10),
+            $desin_style_verify_status,
+            substr($row['desin_style_verify_at'], 0, 10),
+            $desin_leader_verify_status,
+            substr($row['desin_leader_verify_at'], 0, 10),
+            getGunwuName($row['address']) . $gongwuok . "/2",
+            $dbuilding_heigh_verify_status,
+            substr($row['building_heigh_verify_at'], 0, 10),
+            $site_survey_contact_verify_status,
+            substr($row['site_survey_contact_verify_at'], 0, 10),
+            '許伃廷 ' . $shengguanok . "/7",
+            $shengguanok_status,
+            substr($row['shengguanok_status_at'], 0, 10),
+            $prattford_order_date_verify_status,
+            substr($row['prattford_order_date'], 0, 10),
+            $estimated_shipping_date_verify_status,
+            substr($row['estimated_shipping_date'], 0, 10),
+            $estimated_shipping_schedule_date_verify_status,
+            substr($row['estimated_shipping_schedule_date'], 0, 10),
+            $goods_type_status,
+            substr($row['goods_type_date'], 0, 10),
+            $taiwan_goods_type_status,
+            substr($row['taiwan_goods_type_date'], 0, 10),
+            $arrival_date_verify_status,
+            substr($row['actual_tofactory_date'], 0, 10),
+        ];
+        for ($j = 0; $j < count($colContentArr); $j++)
+            $sheet->setCellValue($colArr[$j] . $i, $colContentArr[$j]);
+        $i++;
+    }
+
+    // 調整欄位大小
+    foreach ($sheet->getColumnIterator() as $column) {
+        $sheet->getColumnDimension($column->getColumnIndex())->setAutoSize(true);
+    }
+
+    // 背景顏色為藍色
+    $styleA1toC1 = $sheet->getStyle('A1:M1');
+    $fillA1toC1 = $styleA1toC1->getFill();
+    $fillA1toC1->setFillType(Fill::FILL_SOLID)
+        ->getStartColor()->setRGB('8EA9DB');
+
+    // 背景顏色為藍色
+    $styleA1toC1 = $sheet->getStyle('N1:X1');
+    $fillA1toC1 = $styleA1toC1->getFill();
+    $fillA1toC1->setFillType(Fill::FILL_SOLID)
+        ->getStartColor()->setRGB('BBFFEE');
+
+    // 背景顏色為橘色
+    $styleA1toC1 = $sheet->getStyle('Y1:AI1');
+    $fillA1toC1 = $styleA1toC1->getFill();
+    $fillA1toC1->setFillType(Fill::FILL_SOLID)
+        ->getStartColor()->setRGB('FFBB66');
+
+    // 背景顏色為綠色
+    $styleA1toC1 = $sheet->getStyle('AJ1:AN1');
+    $fillA1toC1 = $styleA1toC1->getFill();
+    $fillA1toC1->setFillType(Fill::FILL_SOLID)
+        ->getStartColor()->setRGB('DDFF77');
+
+    // 背景顏色為橘色
+    $styleA1toC1 = $sheet->getStyle('AO1:BC1');
+    $fillA1toC1 = $styleA1toC1->getFill();
+    $fillA1toC1->setFillType(Fill::FILL_SOLID)
+        ->getStartColor()->setRGB('FFCCCC');
+
+    $writer = new Xlsx($spreadsheet);
+    $file_path = dirname(__DIR__) . '/wms/excel/' . 'gary_test.xlsx';
+    try {
+        $writer->save($file_path);
+        // 回傳檔案路徑給 JavaScript
+        echo $file_path;
+    } catch (Exception $e) {
+        echo 'Error: ' . $e->getMessage();
+    }
+    exit();
+}
diff --git a/wms/wipwhole-index-first-insert.php b/wms/wipwhole-index-first-insert.php
index 7573c7b4..8739c5bb 100644
--- a/wms/wipwhole-index-first-insert.php
+++ b/wms/wipwhole-index-first-insert.php
@@ -1,644 +1,644 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title>上传CSV文件</title>
-</head>
-
-<body>
-    <h2>上传CSV文件</h2>
-    <form action="" method="post" enctype="multipart/form-data">
-        已簽回合約總表:
-        <input type="file" name="csv_file" accept=".csv"><br />
-        作番編列-新梯:
-        <input type="file" name="csv_file2" accept=".csv"><br />
-        合約書管理-舊改:
-        <input type="file" name="csv_file3" accept=".csv"><br />
-        舊改合約:
-        <input type="file" name="csv_file4" accept=".csv"><br />
-        <input type="submit" value="上传">
-    </form>
-</body>
-
-</html>
-
-<?php
-include "fun_global.php";
-include "database.php";
-
-function findSaleMan($sale_name, $link)
-{
-
-    $sql = "
-        SELECT employee_no AS saleman_no FROM `employee` where name = '$sale_name'
-        UNION 
-        SELECT accountid AS saleman_no FROM `account` where name = '$sale_name'; 
-    ";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_row($res);
-    return  empty($row[0]) ? "" : $row[0];
-}
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-
-    if (isset($_FILES['csv_file']) && $_FILES['csv_file']['error'] === UPLOAD_ERR_OK) {
-
-        $file = $_FILES['csv_file']['tmp_name'];
-        $data = [];
-        if (($handle = fopen($file, 'r')) !== false) {
-            while (($row = fgetcsv($handle, 1000, ',')) !== false) {
-                $data[] = $row;
-            }
-            fclose($handle);
-        }
-        for ($i = 0; $i < count($data); $i++) {
-            for ($j = 0; $j < count($data[$i]); $j++) {
-                $data[$i][$j] = empty($data[$i][$j]) ? "" : mb_convert_kana($data[$i][$j], "a");
-            }
-        }
-        array_shift($data);
-
-        $elevator_type = array(
-            "4PCO",
-            "6PCO",
-            "CO",
-            "2S",
-            "3S",
-            "2U",
-        );
-
-        $fix_arrs = [];
-        for ($i = 0; $i < count($data); $i++) {
-            $fix_arr = [];
-            for ($j = 0; $j < count($data[$i]); $j++) {
-                array_push($fix_arr, $data[$i][$j]);
-            }
-            array_push($fix_arrs, $fix_arr);
-        }
-
-        for ($i = 0; $i < count($fix_arrs); $i++) {
-            for ($j = 0; $j < count($fix_arrs[$i]); $j++) {
-                echo $j . ":" . $fix_arrs[$i][$j] . " ,";
-            }
-            echo "<br/>";
-        }
-
-        foreach ($fix_arrs as $row) {
-
-            $contract_arrival_date = $row[9];
-            $prattford_order_date = $row[10];
-            $estimated_shipping_date = $row[11];
-            $estimated_shipping_schedule_date = $row[12];
-            $real_contract_arrival_date = $row[14];
-            $facilityno = $row[1];
-
-            $sql = "
-                SELECT COUNT(*) FROM `wipwholestatus` 
-                WHERE facilityno = '$facilityno'
-            ";
-            $res = mysqli_query($link, $sql);
-            $row = mysqli_fetch_row($res);
-            $count = $row[0];
-            mysqli_free_result($res);
-            if ($count > 0) {
-                $sql = "
-                    UPDATE wipwholestatus SET
-                ";
-                $sql2 = "";
-                $sql2 .= !empty($prattford_order_date) ? " prattford_order_date= '$prattford_order_date' ," : "";
-                $sql2 .= !empty($estimated_shipping_date) ? " estimated_shipping_date= '$estimated_shipping_date' ," : "";
-                $sql2 .= !empty($estimated_shipping_schedule_date) ? " estimated_shipping_schedule_date= '$estimated_shipping_schedule_date' ," : "";
-                $sql2 .= !empty($contract_arrival_date) ? " contract_arrival_date= '$contract_arrival_date' ," : "";
-                $sql2 .= !empty($real_contract_arrival_date) ? " real_contract_arrival_date= '$real_contract_arrival_date' ," : "";
-                // $sql2 .= !empty($weight) ? " weight= '$weight' ," : "";
-                // $sql2 .= !empty($numberofpassenger) ? " numberofpassenger= '$numberofpassenger' ," : "";
-                // $sql2 .= !empty($numberofstop) ? " numberofstop= '$numberofstop' ," : "";
-                // $sql2 .= !empty($numberoffloor) ? " numberoffloor= '$numberoffloor' ," : "";
-                // $sql2 .= !empty($opentype) ? " opentype= '$opentype' ," : "";
-                // $sql2 .= !empty($speed) ? " speed= '$speed' ," : "";
-                // $sql2 .= !empty($facility_kind) ? " facility_kind= '$facility_kind' ," : "";
-                // $sql2 .= !empty($address) ? " address= '$address' ," : "";
-                $sql .= substr($sql2, 0, -1);
-                $sql .= "
-                    WHERE facilityno = '$facilityno';
-                ";
-            }
-            mysqli_query($link, $sql);
-        }
-    } else {
-        echo '文件上传错误';
-        echo "<br/>";
-    }
-
-    // 作番編列
-
-    if (isset($_FILES['csv_file2']) && $_FILES['csv_file2']['error'] === UPLOAD_ERR_OK) {
-        $file = $_FILES['csv_file2']['tmp_name'];
-        $data = [];
-        if (($handle = fopen($file, 'r')) !== false) {
-            while (($row = fgetcsv($handle, 1000, ',')) !== false) {
-                $data[] = $row;
-            }
-            fclose($handle);
-        }
-        // $data_tmp = [];
-        // for ($i = 0; $i < count($data); $i++) {
-        //     for ($j = 0; $j < count($data[$i]); $j++) {
-        //         $data[$i][$j] = empty($data[$i][$j]) ? mb_convert_kana($data_tmp[$j], "a") : mb_convert_kana($data[$i][$j], "a");
-        //     }
-        //     $data_tmp = $data[$i];
-        // }
-        array_shift($data);
-
-        $elevator_type = array(
-            "4PCO",
-            "6PCO",
-            "2S",
-            "3S",
-            "2U",
-            "CO"
-        );
-
-        $fix_arrs = [];
-
-        for ($i = 0; $i < count($data); $i++) {
-            $fix_arr = [];
-            for ($j = 0; $j < count($data[$i]); $j++) {
-                if ($j == 6) {
-                    if (!empty($data[$i][$j])) {
-                        // $data[$i][$j] = str_replace('*', '-', substr($data[$i][$j], 1));
-                        $elevator_arr = explode("-", $data[$i][$j]);
-                        array_push($fix_arr, $elevator_arr[1]);
-                        array_push($fix_arr, $elevator_arr[2]);
-                        $elevator_arr[4] = str_replace($elevator_type, "", $elevator_arr[3]);
-                        $elevator_arr[3] = str_replace($elevator_arr[4], "", $elevator_arr[3]);
-                        array_push($fix_arr, $elevator_arr[3]);
-                        array_push($fix_arr, $elevator_arr[4]);
-                    } else {
-                        array_push($fix_arr, "");
-                        array_push($fix_arr, "");
-                        array_push($fix_arr, "");
-                        array_push($fix_arr, "");
-                    }
-                } else {
-                    array_push($fix_arr, $data[$i][$j]);
-                }
-            }
-            array_push($fix_arrs, $fix_arr);
-        }
-
-        for ($i = 0; $i < count($fix_arrs); $i++) {
-            echo $i . ": ";
-            for ($j = 0; $j < count($fix_arrs[$i]); $j++) {
-                echo $j . ":" . $fix_arrs[$i][$j] . " ,";
-            }
-            echo "<br/>";
-        }
-
-        foreach ($fix_arrs as $row) {
-
-            $contractno = $row[2];
-            $custom = $row[3];
-            $salesid = findSaleMan($row[4], $link);
-            $facilityno = $row[1];
-            $facility_kind = $row[5];
-            $weight = $row[6] >= 100 ? $row[6] : null;
-            $numberofpassenger = $row[6] < 100 ? $row[6] : null;
-            $numberofstop = $row[7];
-            $opentype = $row[8];
-            $speed = $row[9];
-            $address = $row[11];
-            $contract_arrival_date = $row[12];
-            $numberoffloor = null;
-            // $address2 = $row[13];
-            $contract_type = 'A';
-
-            $prattford_order_date = $row[13];
-            $estimated_shipping_date = $row[14];
-            $estimated_shipping_schedule_date = $row[15];
-            $real_contract_arrival_date = $row[16];
-
-            $sales_spec_verify = '1';
-            $customer_planning_verify = '1';
-            $customer_color_verify = '1';
-            $customer_style_verify = '1';
-            $desin_spec_verify = '1';
-            $desin_planning_verify = '1';
-            $desin_color_verify = '1';
-            $desin_style_verify = '1';
-            $desin_leader_verify = '1';
-            $building_heigh_verify = '1';
-            $electrical_design_publish = '1';
-            $mechanical_design_publish = '1';
-            $electrical_shipping_date_publish = '1';
-            $mechanical_shipping_date_publish = '1';
-
-            $site_survey_contact_verify = '1';
-            $site_survey_contact_form_verify = '1';
-            $shengguanok_status = '1';
-            $prattford_order_date_verify = '1';
-            $estimated_shipping_date_verify = '1';
-            $estimated_shipping_schedule_date_verify = '1';
-            $goods_type = '1';
-            $taiwan_goods_type = '1';
-            $arrival_date_verify = '1';
-
-
-
-            $sql = "
-                SELECT COUNT(*) FROM `wipwholestatus` 
-                WHERE facilityno = '$facilityno'
-            ";
-            $res = mysqli_query($link, $sql);
-            $row = mysqli_fetch_row($res);
-            $count = $row[0];
-            mysqli_free_result($res);
-
-
-            if ($count > 0) {
-                // update
-                // $sql = "
-                //     UPDATE wipwholestatus SET
-                // ";
-                // $sql2 = "";
-                // $sql2 .= !empty($contractno) ? " contractno= '$contractno' ," : "";
-                // $sql2 .= !empty($weight) ? " weight= '$weight' ," : "";
-                // $sql2 .= !empty($numberofpassenger) ? " numberofpassenger= '$numberofpassenger' ," : "";
-                // $sql2 .= !empty($numberofstop) ? " numberofstop= '$numberofstop' ," : "";
-                // $sql2 .= !empty($numberoffloor) ? " numberoffloor= '$numberoffloor' ," : "";
-                // $sql2 .= !empty($opentype) ? " opentype= '$opentype' ," : "";
-                // $sql2 .= !empty($speed) ? " speed= '$speed' ," : "";
-                // $sql2 .= !empty($facility_kind) ? " facility_kind= '$facility_kind' ," : "";
-                // $sql2 .= !empty($address) ? " address= '$address' ," : "";
-                // $sql2 .= !empty($contract_arrival_date) ? " contract_arrival_date= '$contract_arrival_date' ," : "";
-                // $sql2 .= !empty($salesid) ? " salesid= '$salesid' ," : "";
-                // $sql2 .= !empty($contract_type) ? " contract_type= '$contract_type' ," : "";
-                // $sql .= substr($sql2, 0, -1);
-                // $sql .= "
-                //     WHERE facilityno = '$facilityno';
-                // ";
-            } else {
-                // insert
-                $sql = " 
-                    INSERT INTO wipwholestatus (
-                        sales_spec_verify,
-                        customer_planning_verify,
-                        customer_color_verify,
-                        customer_style_verify,
-                        desin_spec_verify,
-                        desin_planning_verify,
-                        desin_color_verify,
-                        desin_style_verify,
-                        desin_leader_verify,
-                        building_heigh_verify,
-                        electrical_design_publish,
-                        mechanical_design_publish,
-                        electrical_shipping_date_publish,
-                        mechanical_shipping_date_publish,
-                        contractno,
-                        salesid,
-                        custom,
-                        facilityno,
-                        weight,
-                        numberofpassenger,
-                        numberofstop,
-                        opentype,
-                        speed,
-                        facility_kind,
-                        address,
-                        contract_arrival_date,
-                        real_contract_arrival_date,
-                        prattford_order_date,
-                        estimated_shipping_date,
-                        estimated_shipping_schedule_date,
-                        contract_type,
-                        site_survey_contact_verify,
-                        site_survey_contact_form_verify,
-                        shengguanok_status,
-                        prattford_order_date_verify,
-                        estimated_shipping_date_verify,
-                        estimated_shipping_schedule_date_verify,
-                        goods_type,
-                        taiwan_goods_type,
-                        arrival_date_verify
-                    ) VALUES (
-                        '$sales_spec_verify',
-                        '$customer_planning_verify',
-                        '$customer_color_verify',
-                        '$customer_style_verify',
-                        '$desin_spec_verify',
-                        '$desin_planning_verify',
-                        '$desin_color_verify',
-                        '$desin_style_verify',
-                        '$desin_leader_verify',
-                        '$building_heigh_verify',
-                        '$electrical_design_publish',
-                        '$mechanical_design_publish',
-                        '$electrical_shipping_date_publish',
-                        '$mechanical_shipping_date_publish',
-                        '$contractno',
-                        '$salesid',
-                        '$custom',
-                        '$facilityno',
-                        '$weight',
-                        '$numberofpassenger',
-                        '$numberofstop',
-                        '$opentype',
-                        '$speed',
-                        '$facility_kind',
-                        '$address',
-                        '$contract_arrival_date',
-                        '$real_contract_arrival_date',
-                        '$prattford_order_date',
-                        '$estimated_shipping_date',
-                        '$estimated_shipping_schedule_date',
-                        '$contract_type',
-                        '$site_survey_contact_verify',
-                        '$site_survey_contact_form_verify',
-                        '$shengguanok_status',
-                        '$prattford_order_date_verify',
-                        '$estimated_shipping_date_verify',
-                        '$estimated_shipping_schedule_date_verify',
-                        '$goods_type',
-                        '$taiwan_goods_type',
-                        '$arrival_date_verify'
-                    )
-                ";
-            }
-            mysqli_query($link, $sql);
-            // 取得此筆 form_id
-            $last_form_id = mysqli_insert_id($link);
-            // 寫入營業員待簽程狀態 A
-            do_wws_assign($salesid, $last_form_id, 'A');
-            // 寫入工務員工簽程狀態 G
-            $north_arr = array('台北', '基隆', '宜蘭', '新北', '桃園', '苗栗', '新竹');
-            $north_arr2 = array('宜蘭');
-            $center_arr = array('南投', '彰化', '雲林', '台中');
-            $south_arr = array('台南', '嘉義', '屏東', '高雄');
-
-            foreach ($north_arr as $key => $value) {
-                if (mb_strpos($value, $address2, 0, "UTF-8") !== false) {
-                    do_wws_assign('M0041', $last_form_id, 'G');
-                    break;
-                }
-            }
-
-            foreach ($north_arr as $key => $value) {
-                if (mb_strpos($value, $address2, 0, "UTF-8") !== false) {
-                    do_wws_assign('M0087', $last_form_id, 'G');
-                    break;
-                }
-            }
-
-            foreach ($center_arr as $key => $value) {
-                if (mb_strpos($value, $address2, 0, "UTF-8") !== false) {
-                    do_wws_assign('M0113', $last_form_id, 'G');
-                    break;
-                }
-            }
-
-            foreach ($south_arr as $key => $value) {
-                if (mb_strpos($value, $address2, 0, "UTF-8") !== false) {
-                    do_wws_assign('M0039', $last_form_id, 'G');
-                    break;
-                }
-            }
-
-            echo $last_form_id . ":" . $address2 . "<br/>";
-        }
-    }
-
-
-    // 舊改
-
-    if (isset($_FILES['csv_file3']) && $_FILES['csv_file3']['error'] === UPLOAD_ERR_OK) {
-        $file = $_FILES['csv_file3']['tmp_name'];
-        $data = [];
-        if (($handle = fopen($file, 'r')) !== false) {
-            while (($row = fgetcsv($handle, 1000, ',')) !== false) {
-                $data[] = $row;
-            }
-            fclose($handle);
-        }
-
-        for ($i = 0; $i < count($data); $i++) {
-            for ($j = 0; $j < count($data[$i]); $j++) {
-                $data[$i][$j] = mb_convert_kana($data[$i][$j], "a");
-            }
-        }
-        array_shift($data);
-
-        $elevator_type = array(
-            "4PCO",
-            "6PCO",
-            "2S",
-            "3S",
-            "2U",
-            "CO"
-        );
-
-        $fix_arrs = [];
-
-        for ($i = 0; $i < count($data); $i++) {
-            $fix_arr = [];
-            for ($j = 0; $j < count($data[$i]); $j++) {
-                if ($j == 4) {
-                    if (!empty($data[$i][$j])) {
-                        // array_push($fix_arr, $data[$i][$j]);
-                        // $data[$i][$j] = str_replace('*', '-', substr($data[$i][$j], 1));
-                        $elevator_arr = explode("-", $data[$i][$j]);
-                        array_push($fix_arr, $elevator_arr[0]);
-                        array_push($fix_arr, $elevator_arr[1]);
-                        array_push($fix_arr, $elevator_arr[2]);
-                        $elevator_arr[4] = str_replace($elevator_type, "", $elevator_arr[3]);
-                        $elevator_arr[3] = str_replace($elevator_arr[4], "", $elevator_arr[3]);
-                        array_push($fix_arr, $elevator_arr[3]);
-                        array_push($fix_arr, $elevator_arr[4]);
-                    } else {
-                        array_push($fix_arr, "");
-                        array_push($fix_arr, "");
-                        array_push($fix_arr, "");
-                        array_push($fix_arr, "");
-                        array_push($fix_arr, "");
-                    }
-                } else {
-                    array_push($fix_arr, $data[$i][$j]);
-                }
-            }
-            array_push($fix_arrs, $fix_arr);
-        }
-
-        for ($i = 0; $i < count($fix_arrs); $i++) {
-            for ($j = 0; $j < count($fix_arrs[$i]); $j++) {
-                echo $j . ":" . $fix_arrs[$i][$j] . " ,";
-            }
-            echo "<br/>";
-        }
-
-        foreach ($fix_arrs as $row) {
-
-            $custom = $row[2];
-            $salesid = findSaleMan($row[3], $link);
-            $facilityno = $row[1];
-            $facility_kind = $row[4];
-            $weight = $row[5] >= 100 ? $row[5] : null;
-            $numberofpassenger = $row[5] < 100 ? $row[5] : null;
-            $numberofstop = $row[6];
-            $opentype = $row[7];
-            $speed = $row[8];
-            $address = $row[10];
-            $contract_arrival_date = $row[11];
-            $prattford_order_date = $row[12];
-            $estimated_shipping_date = $row[13];
-            $estimated_shipping_schedule_date = $row[14];
-            $real_contract_arrival_date = $row[15];
-            $renovate_type = $row[16];
-            $contractno = $row[17];
-            $contract_type = 'B';
-
-            $sales_spec_verify = '1';
-            $customer_planning_verify = '1';
-            $customer_color_verify = '1';
-            $customer_style_verify = '1';
-            $desin_spec_verify = '1';
-            $desin_planning_verify = '1';
-            $desin_color_verify = '1';
-            $desin_style_verify = '1';
-            $desin_leader_verify = '1';
-            $building_heigh_verify = '1';
-            $electrical_design_publish = '1';
-            $mechanical_design_publish = '1';
-            $electrical_shipping_date_publish = '1';
-            $mechanical_shipping_date_publish = '1';
-
-            $sql = "
-                SELECT COUNT(*) FROM `wipwholestatus` 
-                WHERE facilityno = '$facilityno'
-            ";
-            $res = mysqli_query($link, $sql);
-            $row = mysqli_fetch_row($res);
-            $count = $row[0];
-            mysqli_free_result($res);
-            if ($count > 0) {
-
-                // update
-                $sql = "
-                    UPDATE wipwholestatus SET
-                ";
-                $sql2 = "";
-                $sql2 .= !empty($contractno) ? " contractno= '$contractno' ," : "";
-                $sql2 .= !empty($custom) ? " custom= '$custom' ," : "";
-                $sql2 .= !empty($weight) ? " weight= '$weight' ," : "";
-                $sql2 .= !empty($numberofpassenger) ? " numberofpassenger= '$numberofpassenger' ," : "";
-                $sql2 .= !empty($numberofstop) ? " numberofstop= '$numberofstop' ," : "";
-                $sql2 .= !empty($numberoffloor) ? " numberoffloor= '$numberoffloor' ," : "";
-                $sql2 .= !empty($opentype) ? " opentype= '$opentype' ," : "";
-                $sql2 .= !empty($speed) ? " speed= '$speed' ," : "";
-                $sql2 .= !empty($facility_kind) ? " facility_kind= '$facility_kind' ," : "";
-                $sql2 .= !empty($address) ? " address= '$address' ," : "";
-                $sql2 .= !empty($contract_arrival_date) ? " contract_arrival_date= '$contract_arrival_date' ," : "";
-                $sql2 .= !empty($salesid) ? " salesid= '$salesid' ," : "";
-                $sql2 .= !empty($contract_type) ? " contract_type= '$contract_type' ," : "";
-                $sql2 .= !empty($renovate_type) ? " renovate_type= '$renovate_type' ," : "";
-                $sql2 .= !empty($prattford_order_date) ? " prattford_order_date= '$prattford_order_date' ," : "";
-                $sql2 .= !empty($estimated_shipping_date) ? " estimated_shipping_date= '$estimated_shipping_date' ," : "";
-                $sql2 .= !empty($estimated_shipping_schedule_date) ? " estimated_shipping_schedule_date= '$estimated_shipping_schedule_date' ," : "";
-                $sql2 .= !empty($real_contract_arrival_date) ? " real_contract_arrival_date= '$real_contract_arrival_date' ," : "";
-                $sql .= substr($sql2, 0, -1);
-                $sql .= "
-                    WHERE facilityno = '$facilityno';
-                ";
-            } else {
-                // insert
-                $sql = " 
-                    INSERT INTO wipwholestatus (
-                        contractno,
-                        prattford_order_date,
-                        estimated_shipping_date,
-                        estimated_shipping_schedule_date,
-                        real_contract_arrival_date,
-                        sales_spec_verify,
-                        customer_planning_verify,
-                        customer_color_verify,
-                        customer_style_verify,
-                        desin_spec_verify,
-                        desin_planning_verify,
-                        desin_color_verify,
-                        desin_style_verify,
-                        desin_leader_verify,
-                        building_heigh_verify,
-                        electrical_design_publish,
-                        mechanical_design_publish,
-                        electrical_shipping_date_publish,
-                        mechanical_shipping_date_publish,
-                        salesid,
-                        custom,
-                        facilityno,
-                        weight,
-                        numberofpassenger,
-                        numberofstop,
-                        opentype,
-                        speed,
-                        facility_kind,
-                        address,
-                        contract_arrival_date,
-                        contract_type,
-                        renovate_type
-                    ) VALUES (
-                        '$contractno',
-                        '$prattford_order_date',
-                        '$estimated_shipping_date',
-                        '$estimated_shipping_schedule_date',
-                        '$real_contract_arrival_date',
-                        '$sales_spec_verify',
-                        '$customer_planning_verify',
-                        '$customer_color_verify',
-                        '$customer_style_verify',
-                        '$desin_spec_verify',
-                        '$desin_planning_verify',
-                        '$desin_color_verify',
-                        '$desin_style_verify',
-                        '$desin_leader_verify',
-                        '$building_heigh_verify',
-                        '$electrical_design_publish',
-                        '$mechanical_design_publish',
-                        '$electrical_shipping_date_publish',
-                        '$mechanical_shipping_date_publish',
-                        '$salesid',
-                        '$custom',
-                        '$facilityno',
-                        '$weight',
-                        '$numberofpassenger',
-                        '$numberofstop',
-                        '$opentype',
-                        '$speed',
-                        '$facility_kind',
-                        '$address',
-                        '$contract_arrival_date',
-                        '$contract_type',
-                        '$renovate_type'
-                    )
-                ";
-            }
-            // echo $sql."<br/>";exit;
-            mysqli_query($link, $sql);
-            // 取得此筆 form_id
-            $last_form_id = mysqli_insert_id($link);
-            // 寫入待簽程狀態 G (工務)
-            $yelang = array('宜蘭');
-            $north_arr = array('台北', '基隆', '新北', '桃園', '苗栗', '新竹');
-            $center_arr = array('南投', '台中', '彰化', '雲林');
-            $south_arr = array('台南', '嘉義', '屏東', '高雄');
-
-            if (in_array($address, $yelang)) {
-                do_wws2_assign('M0087', $last_form_id, 'A');
-            } else if (in_array($address, $north_arr)) {
-                do_wws2_assign('M0040', $last_form_id, 'A');
-            } else if (in_array($address, $center_arr)) {
-                do_wws2_assign('M0113', $last_form_id, 'A');
-            } else if (in_array($address, $south_arr)) {
-                do_wws2_assign('M0039', $last_form_id, 'A');
-            }
-        }
-    }
-}
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>上传CSV文件</title>
+</head>
+
+<body>
+    <h2>上传CSV文件</h2>
+    <form action="" method="post" enctype="multipart/form-data">
+        已簽回合約總表:
+        <input type="file" name="csv_file" accept=".csv"><br />
+        作番編列-新梯:
+        <input type="file" name="csv_file2" accept=".csv"><br />
+        合約書管理-舊改:
+        <input type="file" name="csv_file3" accept=".csv"><br />
+        舊改合約:
+        <input type="file" name="csv_file4" accept=".csv"><br />
+        <input type="submit" value="上传">
+    </form>
+</body>
+
+</html>
+
+<?php
+include "fun_global.php";
+include "database.php";
+
+function findSaleMan($sale_name, $link)
+{
+
+    $sql = "
+        SELECT employee_no AS saleman_no FROM `employee` where name = '$sale_name'
+        UNION 
+        SELECT accountid AS saleman_no FROM `account` where name = '$sale_name'; 
+    ";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_row($res);
+    return  empty($row[0]) ? "" : $row[0];
+}
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+
+    if (isset($_FILES['csv_file']) && $_FILES['csv_file']['error'] === UPLOAD_ERR_OK) {
+
+        $file = $_FILES['csv_file']['tmp_name'];
+        $data = [];
+        if (($handle = fopen($file, 'r')) !== false) {
+            while (($row = fgetcsv($handle, 1000, ',')) !== false) {
+                $data[] = $row;
+            }
+            fclose($handle);
+        }
+        for ($i = 0; $i < count($data); $i++) {
+            for ($j = 0; $j < count($data[$i]); $j++) {
+                $data[$i][$j] = empty($data[$i][$j]) ? "" : mb_convert_kana($data[$i][$j], "a");
+            }
+        }
+        array_shift($data);
+
+        $elevator_type = array(
+            "4PCO",
+            "6PCO",
+            "CO",
+            "2S",
+            "3S",
+            "2U",
+        );
+
+        $fix_arrs = [];
+        for ($i = 0; $i < count($data); $i++) {
+            $fix_arr = [];
+            for ($j = 0; $j < count($data[$i]); $j++) {
+                array_push($fix_arr, $data[$i][$j]);
+            }
+            array_push($fix_arrs, $fix_arr);
+        }
+
+        for ($i = 0; $i < count($fix_arrs); $i++) {
+            for ($j = 0; $j < count($fix_arrs[$i]); $j++) {
+                echo $j . ":" . $fix_arrs[$i][$j] . " ,";
+            }
+            echo "<br/>";
+        }
+
+        foreach ($fix_arrs as $row) {
+
+            $contract_arrival_date = $row[9];
+            $prattford_order_date = $row[10];
+            $estimated_shipping_date = $row[11];
+            $estimated_shipping_schedule_date = $row[12];
+            $real_contract_arrival_date = $row[14];
+            $facilityno = $row[1];
+
+            $sql = "
+                SELECT COUNT(*) FROM `wipwholestatus` 
+                WHERE facilityno = '$facilityno'
+            ";
+            $res = mysqli_query($link, $sql);
+            $row = mysqli_fetch_row($res);
+            $count = $row[0];
+            mysqli_free_result($res);
+            if ($count > 0) {
+                $sql = "
+                    UPDATE wipwholestatus SET
+                ";
+                $sql2 = "";
+                $sql2 .= !empty($prattford_order_date) ? " prattford_order_date= '$prattford_order_date' ," : "";
+                $sql2 .= !empty($estimated_shipping_date) ? " estimated_shipping_date= '$estimated_shipping_date' ," : "";
+                $sql2 .= !empty($estimated_shipping_schedule_date) ? " estimated_shipping_schedule_date= '$estimated_shipping_schedule_date' ," : "";
+                $sql2 .= !empty($contract_arrival_date) ? " contract_arrival_date= '$contract_arrival_date' ," : "";
+                $sql2 .= !empty($real_contract_arrival_date) ? " real_contract_arrival_date= '$real_contract_arrival_date' ," : "";
+                // $sql2 .= !empty($weight) ? " weight= '$weight' ," : "";
+                // $sql2 .= !empty($numberofpassenger) ? " numberofpassenger= '$numberofpassenger' ," : "";
+                // $sql2 .= !empty($numberofstop) ? " numberofstop= '$numberofstop' ," : "";
+                // $sql2 .= !empty($numberoffloor) ? " numberoffloor= '$numberoffloor' ," : "";
+                // $sql2 .= !empty($opentype) ? " opentype= '$opentype' ," : "";
+                // $sql2 .= !empty($speed) ? " speed= '$speed' ," : "";
+                // $sql2 .= !empty($facility_kind) ? " facility_kind= '$facility_kind' ," : "";
+                // $sql2 .= !empty($address) ? " address= '$address' ," : "";
+                $sql .= substr($sql2, 0, -1);
+                $sql .= "
+                    WHERE facilityno = '$facilityno';
+                ";
+            }
+            mysqli_query($link, $sql);
+        }
+    } else {
+        echo '文件上传错误';
+        echo "<br/>";
+    }
+
+    // 作番編列
+
+    if (isset($_FILES['csv_file2']) && $_FILES['csv_file2']['error'] === UPLOAD_ERR_OK) {
+        $file = $_FILES['csv_file2']['tmp_name'];
+        $data = [];
+        if (($handle = fopen($file, 'r')) !== false) {
+            while (($row = fgetcsv($handle, 1000, ',')) !== false) {
+                $data[] = $row;
+            }
+            fclose($handle);
+        }
+        // $data_tmp = [];
+        // for ($i = 0; $i < count($data); $i++) {
+        //     for ($j = 0; $j < count($data[$i]); $j++) {
+        //         $data[$i][$j] = empty($data[$i][$j]) ? mb_convert_kana($data_tmp[$j], "a") : mb_convert_kana($data[$i][$j], "a");
+        //     }
+        //     $data_tmp = $data[$i];
+        // }
+        array_shift($data);
+
+        $elevator_type = array(
+            "4PCO",
+            "6PCO",
+            "2S",
+            "3S",
+            "2U",
+            "CO"
+        );
+
+        $fix_arrs = [];
+
+        for ($i = 0; $i < count($data); $i++) {
+            $fix_arr = [];
+            for ($j = 0; $j < count($data[$i]); $j++) {
+                if ($j == 6) {
+                    if (!empty($data[$i][$j])) {
+                        // $data[$i][$j] = str_replace('*', '-', substr($data[$i][$j], 1));
+                        $elevator_arr = explode("-", $data[$i][$j]);
+                        array_push($fix_arr, $elevator_arr[1]);
+                        array_push($fix_arr, $elevator_arr[2]);
+                        $elevator_arr[4] = str_replace($elevator_type, "", $elevator_arr[3]);
+                        $elevator_arr[3] = str_replace($elevator_arr[4], "", $elevator_arr[3]);
+                        array_push($fix_arr, $elevator_arr[3]);
+                        array_push($fix_arr, $elevator_arr[4]);
+                    } else {
+                        array_push($fix_arr, "");
+                        array_push($fix_arr, "");
+                        array_push($fix_arr, "");
+                        array_push($fix_arr, "");
+                    }
+                } else {
+                    array_push($fix_arr, $data[$i][$j]);
+                }
+            }
+            array_push($fix_arrs, $fix_arr);
+        }
+
+        for ($i = 0; $i < count($fix_arrs); $i++) {
+            echo $i . ": ";
+            for ($j = 0; $j < count($fix_arrs[$i]); $j++) {
+                echo $j . ":" . $fix_arrs[$i][$j] . " ,";
+            }
+            echo "<br/>";
+        }
+
+        foreach ($fix_arrs as $row) {
+
+            $contractno = $row[2];
+            $custom = $row[3];
+            $salesid = findSaleMan($row[4], $link);
+            $facilityno = $row[1];
+            $facility_kind = $row[5];
+            $weight = $row[6] >= 100 ? $row[6] : null;
+            $numberofpassenger = $row[6] < 100 ? $row[6] : null;
+            $numberofstop = $row[7];
+            $opentype = $row[8];
+            $speed = $row[9];
+            $address = $row[11];
+            $contract_arrival_date = $row[12];
+            $numberoffloor = null;
+            // $address2 = $row[13];
+            $contract_type = 'A';
+
+            $prattford_order_date = $row[13];
+            $estimated_shipping_date = $row[14];
+            $estimated_shipping_schedule_date = $row[15];
+            $real_contract_arrival_date = $row[16];
+
+            $sales_spec_verify = '1';
+            $customer_planning_verify = '1';
+            $customer_color_verify = '1';
+            $customer_style_verify = '1';
+            $desin_spec_verify = '1';
+            $desin_planning_verify = '1';
+            $desin_color_verify = '1';
+            $desin_style_verify = '1';
+            $desin_leader_verify = '1';
+            $building_heigh_verify = '1';
+            $electrical_design_publish = '1';
+            $mechanical_design_publish = '1';
+            $electrical_shipping_date_publish = '1';
+            $mechanical_shipping_date_publish = '1';
+
+            $site_survey_contact_verify = '1';
+            $site_survey_contact_form_verify = '1';
+            $shengguanok_status = '1';
+            $prattford_order_date_verify = '1';
+            $estimated_shipping_date_verify = '1';
+            $estimated_shipping_schedule_date_verify = '1';
+            $goods_type = '1';
+            $taiwan_goods_type = '1';
+            $arrival_date_verify = '1';
+
+
+
+            $sql = "
+                SELECT COUNT(*) FROM `wipwholestatus` 
+                WHERE facilityno = '$facilityno'
+            ";
+            $res = mysqli_query($link, $sql);
+            $row = mysqli_fetch_row($res);
+            $count = $row[0];
+            mysqli_free_result($res);
+
+
+            if ($count > 0) {
+                // update
+                // $sql = "
+                //     UPDATE wipwholestatus SET
+                // ";
+                // $sql2 = "";
+                // $sql2 .= !empty($contractno) ? " contractno= '$contractno' ," : "";
+                // $sql2 .= !empty($weight) ? " weight= '$weight' ," : "";
+                // $sql2 .= !empty($numberofpassenger) ? " numberofpassenger= '$numberofpassenger' ," : "";
+                // $sql2 .= !empty($numberofstop) ? " numberofstop= '$numberofstop' ," : "";
+                // $sql2 .= !empty($numberoffloor) ? " numberoffloor= '$numberoffloor' ," : "";
+                // $sql2 .= !empty($opentype) ? " opentype= '$opentype' ," : "";
+                // $sql2 .= !empty($speed) ? " speed= '$speed' ," : "";
+                // $sql2 .= !empty($facility_kind) ? " facility_kind= '$facility_kind' ," : "";
+                // $sql2 .= !empty($address) ? " address= '$address' ," : "";
+                // $sql2 .= !empty($contract_arrival_date) ? " contract_arrival_date= '$contract_arrival_date' ," : "";
+                // $sql2 .= !empty($salesid) ? " salesid= '$salesid' ," : "";
+                // $sql2 .= !empty($contract_type) ? " contract_type= '$contract_type' ," : "";
+                // $sql .= substr($sql2, 0, -1);
+                // $sql .= "
+                //     WHERE facilityno = '$facilityno';
+                // ";
+            } else {
+                // insert
+                $sql = " 
+                    INSERT INTO wipwholestatus (
+                        sales_spec_verify,
+                        customer_planning_verify,
+                        customer_color_verify,
+                        customer_style_verify,
+                        desin_spec_verify,
+                        desin_planning_verify,
+                        desin_color_verify,
+                        desin_style_verify,
+                        desin_leader_verify,
+                        building_heigh_verify,
+                        electrical_design_publish,
+                        mechanical_design_publish,
+                        electrical_shipping_date_publish,
+                        mechanical_shipping_date_publish,
+                        contractno,
+                        salesid,
+                        custom,
+                        facilityno,
+                        weight,
+                        numberofpassenger,
+                        numberofstop,
+                        opentype,
+                        speed,
+                        facility_kind,
+                        address,
+                        contract_arrival_date,
+                        real_contract_arrival_date,
+                        prattford_order_date,
+                        estimated_shipping_date,
+                        estimated_shipping_schedule_date,
+                        contract_type,
+                        site_survey_contact_verify,
+                        site_survey_contact_form_verify,
+                        shengguanok_status,
+                        prattford_order_date_verify,
+                        estimated_shipping_date_verify,
+                        estimated_shipping_schedule_date_verify,
+                        goods_type,
+                        taiwan_goods_type,
+                        arrival_date_verify
+                    ) VALUES (
+                        '$sales_spec_verify',
+                        '$customer_planning_verify',
+                        '$customer_color_verify',
+                        '$customer_style_verify',
+                        '$desin_spec_verify',
+                        '$desin_planning_verify',
+                        '$desin_color_verify',
+                        '$desin_style_verify',
+                        '$desin_leader_verify',
+                        '$building_heigh_verify',
+                        '$electrical_design_publish',
+                        '$mechanical_design_publish',
+                        '$electrical_shipping_date_publish',
+                        '$mechanical_shipping_date_publish',
+                        '$contractno',
+                        '$salesid',
+                        '$custom',
+                        '$facilityno',
+                        '$weight',
+                        '$numberofpassenger',
+                        '$numberofstop',
+                        '$opentype',
+                        '$speed',
+                        '$facility_kind',
+                        '$address',
+                        '$contract_arrival_date',
+                        '$real_contract_arrival_date',
+                        '$prattford_order_date',
+                        '$estimated_shipping_date',
+                        '$estimated_shipping_schedule_date',
+                        '$contract_type',
+                        '$site_survey_contact_verify',
+                        '$site_survey_contact_form_verify',
+                        '$shengguanok_status',
+                        '$prattford_order_date_verify',
+                        '$estimated_shipping_date_verify',
+                        '$estimated_shipping_schedule_date_verify',
+                        '$goods_type',
+                        '$taiwan_goods_type',
+                        '$arrival_date_verify'
+                    )
+                ";
+            }
+            mysqli_query($link, $sql);
+            // 取得此筆 form_id
+            $last_form_id = mysqli_insert_id($link);
+            // 寫入營業員待簽程狀態 A
+            do_wws_assign($salesid, $last_form_id, 'A');
+            // 寫入工務員工簽程狀態 G
+            $north_arr = array('台北', '基隆', '宜蘭', '新北', '桃園', '苗栗', '新竹');
+            $north_arr2 = array('宜蘭');
+            $center_arr = array('南投', '彰化', '雲林', '台中');
+            $south_arr = array('台南', '嘉義', '屏東', '高雄');
+
+            foreach ($north_arr as $key => $value) {
+                if (mb_strpos($value, $address2, 0, "UTF-8") !== false) {
+                    do_wws_assign('M0041', $last_form_id, 'G');
+                    break;
+                }
+            }
+
+            foreach ($north_arr as $key => $value) {
+                if (mb_strpos($value, $address2, 0, "UTF-8") !== false) {
+                    do_wws_assign('M0087', $last_form_id, 'G');
+                    break;
+                }
+            }
+
+            foreach ($center_arr as $key => $value) {
+                if (mb_strpos($value, $address2, 0, "UTF-8") !== false) {
+                    do_wws_assign('M0113', $last_form_id, 'G');
+                    break;
+                }
+            }
+
+            foreach ($south_arr as $key => $value) {
+                if (mb_strpos($value, $address2, 0, "UTF-8") !== false) {
+                    do_wws_assign('M0039', $last_form_id, 'G');
+                    break;
+                }
+            }
+
+            echo $last_form_id . ":" . $address2 . "<br/>";
+        }
+    }
+
+
+    // 舊改
+
+    if (isset($_FILES['csv_file3']) && $_FILES['csv_file3']['error'] === UPLOAD_ERR_OK) {
+        $file = $_FILES['csv_file3']['tmp_name'];
+        $data = [];
+        if (($handle = fopen($file, 'r')) !== false) {
+            while (($row = fgetcsv($handle, 1000, ',')) !== false) {
+                $data[] = $row;
+            }
+            fclose($handle);
+        }
+
+        for ($i = 0; $i < count($data); $i++) {
+            for ($j = 0; $j < count($data[$i]); $j++) {
+                $data[$i][$j] = mb_convert_kana($data[$i][$j], "a");
+            }
+        }
+        array_shift($data);
+
+        $elevator_type = array(
+            "4PCO",
+            "6PCO",
+            "2S",
+            "3S",
+            "2U",
+            "CO"
+        );
+
+        $fix_arrs = [];
+
+        for ($i = 0; $i < count($data); $i++) {
+            $fix_arr = [];
+            for ($j = 0; $j < count($data[$i]); $j++) {
+                if ($j == 4) {
+                    if (!empty($data[$i][$j])) {
+                        // array_push($fix_arr, $data[$i][$j]);
+                        // $data[$i][$j] = str_replace('*', '-', substr($data[$i][$j], 1));
+                        $elevator_arr = explode("-", $data[$i][$j]);
+                        array_push($fix_arr, $elevator_arr[0]);
+                        array_push($fix_arr, $elevator_arr[1]);
+                        array_push($fix_arr, $elevator_arr[2]);
+                        $elevator_arr[4] = str_replace($elevator_type, "", $elevator_arr[3]);
+                        $elevator_arr[3] = str_replace($elevator_arr[4], "", $elevator_arr[3]);
+                        array_push($fix_arr, $elevator_arr[3]);
+                        array_push($fix_arr, $elevator_arr[4]);
+                    } else {
+                        array_push($fix_arr, "");
+                        array_push($fix_arr, "");
+                        array_push($fix_arr, "");
+                        array_push($fix_arr, "");
+                        array_push($fix_arr, "");
+                    }
+                } else {
+                    array_push($fix_arr, $data[$i][$j]);
+                }
+            }
+            array_push($fix_arrs, $fix_arr);
+        }
+
+        for ($i = 0; $i < count($fix_arrs); $i++) {
+            for ($j = 0; $j < count($fix_arrs[$i]); $j++) {
+                echo $j . ":" . $fix_arrs[$i][$j] . " ,";
+            }
+            echo "<br/>";
+        }
+
+        foreach ($fix_arrs as $row) {
+
+            $custom = $row[2];
+            $salesid = findSaleMan($row[3], $link);
+            $facilityno = $row[1];
+            $facility_kind = $row[4];
+            $weight = $row[5] >= 100 ? $row[5] : null;
+            $numberofpassenger = $row[5] < 100 ? $row[5] : null;
+            $numberofstop = $row[6];
+            $opentype = $row[7];
+            $speed = $row[8];
+            $address = $row[10];
+            $contract_arrival_date = $row[11];
+            $prattford_order_date = $row[12];
+            $estimated_shipping_date = $row[13];
+            $estimated_shipping_schedule_date = $row[14];
+            $real_contract_arrival_date = $row[15];
+            $renovate_type = $row[16];
+            $contractno = $row[17];
+            $contract_type = 'B';
+
+            $sales_spec_verify = '1';
+            $customer_planning_verify = '1';
+            $customer_color_verify = '1';
+            $customer_style_verify = '1';
+            $desin_spec_verify = '1';
+            $desin_planning_verify = '1';
+            $desin_color_verify = '1';
+            $desin_style_verify = '1';
+            $desin_leader_verify = '1';
+            $building_heigh_verify = '1';
+            $electrical_design_publish = '1';
+            $mechanical_design_publish = '1';
+            $electrical_shipping_date_publish = '1';
+            $mechanical_shipping_date_publish = '1';
+
+            $sql = "
+                SELECT COUNT(*) FROM `wipwholestatus` 
+                WHERE facilityno = '$facilityno'
+            ";
+            $res = mysqli_query($link, $sql);
+            $row = mysqli_fetch_row($res);
+            $count = $row[0];
+            mysqli_free_result($res);
+            if ($count > 0) {
+
+                // update
+                $sql = "
+                    UPDATE wipwholestatus SET
+                ";
+                $sql2 = "";
+                $sql2 .= !empty($contractno) ? " contractno= '$contractno' ," : "";
+                $sql2 .= !empty($custom) ? " custom= '$custom' ," : "";
+                $sql2 .= !empty($weight) ? " weight= '$weight' ," : "";
+                $sql2 .= !empty($numberofpassenger) ? " numberofpassenger= '$numberofpassenger' ," : "";
+                $sql2 .= !empty($numberofstop) ? " numberofstop= '$numberofstop' ," : "";
+                $sql2 .= !empty($numberoffloor) ? " numberoffloor= '$numberoffloor' ," : "";
+                $sql2 .= !empty($opentype) ? " opentype= '$opentype' ," : "";
+                $sql2 .= !empty($speed) ? " speed= '$speed' ," : "";
+                $sql2 .= !empty($facility_kind) ? " facility_kind= '$facility_kind' ," : "";
+                $sql2 .= !empty($address) ? " address= '$address' ," : "";
+                $sql2 .= !empty($contract_arrival_date) ? " contract_arrival_date= '$contract_arrival_date' ," : "";
+                $sql2 .= !empty($salesid) ? " salesid= '$salesid' ," : "";
+                $sql2 .= !empty($contract_type) ? " contract_type= '$contract_type' ," : "";
+                $sql2 .= !empty($renovate_type) ? " renovate_type= '$renovate_type' ," : "";
+                $sql2 .= !empty($prattford_order_date) ? " prattford_order_date= '$prattford_order_date' ," : "";
+                $sql2 .= !empty($estimated_shipping_date) ? " estimated_shipping_date= '$estimated_shipping_date' ," : "";
+                $sql2 .= !empty($estimated_shipping_schedule_date) ? " estimated_shipping_schedule_date= '$estimated_shipping_schedule_date' ," : "";
+                $sql2 .= !empty($real_contract_arrival_date) ? " real_contract_arrival_date= '$real_contract_arrival_date' ," : "";
+                $sql .= substr($sql2, 0, -1);
+                $sql .= "
+                    WHERE facilityno = '$facilityno';
+                ";
+            } else {
+                // insert
+                $sql = " 
+                    INSERT INTO wipwholestatus (
+                        contractno,
+                        prattford_order_date,
+                        estimated_shipping_date,
+                        estimated_shipping_schedule_date,
+                        real_contract_arrival_date,
+                        sales_spec_verify,
+                        customer_planning_verify,
+                        customer_color_verify,
+                        customer_style_verify,
+                        desin_spec_verify,
+                        desin_planning_verify,
+                        desin_color_verify,
+                        desin_style_verify,
+                        desin_leader_verify,
+                        building_heigh_verify,
+                        electrical_design_publish,
+                        mechanical_design_publish,
+                        electrical_shipping_date_publish,
+                        mechanical_shipping_date_publish,
+                        salesid,
+                        custom,
+                        facilityno,
+                        weight,
+                        numberofpassenger,
+                        numberofstop,
+                        opentype,
+                        speed,
+                        facility_kind,
+                        address,
+                        contract_arrival_date,
+                        contract_type,
+                        renovate_type
+                    ) VALUES (
+                        '$contractno',
+                        '$prattford_order_date',
+                        '$estimated_shipping_date',
+                        '$estimated_shipping_schedule_date',
+                        '$real_contract_arrival_date',
+                        '$sales_spec_verify',
+                        '$customer_planning_verify',
+                        '$customer_color_verify',
+                        '$customer_style_verify',
+                        '$desin_spec_verify',
+                        '$desin_planning_verify',
+                        '$desin_color_verify',
+                        '$desin_style_verify',
+                        '$desin_leader_verify',
+                        '$building_heigh_verify',
+                        '$electrical_design_publish',
+                        '$mechanical_design_publish',
+                        '$electrical_shipping_date_publish',
+                        '$mechanical_shipping_date_publish',
+                        '$salesid',
+                        '$custom',
+                        '$facilityno',
+                        '$weight',
+                        '$numberofpassenger',
+                        '$numberofstop',
+                        '$opentype',
+                        '$speed',
+                        '$facility_kind',
+                        '$address',
+                        '$contract_arrival_date',
+                        '$contract_type',
+                        '$renovate_type'
+                    )
+                ";
+            }
+            // echo $sql."<br/>";exit;
+            mysqli_query($link, $sql);
+            // 取得此筆 form_id
+            $last_form_id = mysqli_insert_id($link);
+            // 寫入待簽程狀態 G (工務)
+            $yelang = array('宜蘭');
+            $north_arr = array('台北', '基隆', '新北', '桃園', '苗栗', '新竹');
+            $center_arr = array('南投', '台中', '彰化', '雲林');
+            $south_arr = array('台南', '嘉義', '屏東', '高雄');
+
+            if (in_array($address, $yelang)) {
+                do_wws2_assign('M0087', $last_form_id, 'A');
+            } else if (in_array($address, $north_arr)) {
+                do_wws2_assign('M0040', $last_form_id, 'A');
+            } else if (in_array($address, $center_arr)) {
+                do_wws2_assign('M0113', $last_form_id, 'A');
+            } else if (in_array($address, $south_arr)) {
+                do_wws2_assign('M0039', $last_form_id, 'A');
+            }
+        }
+    }
+}
diff --git a/wms/wipwhole-index-function.php b/wms/wipwhole-index-function.php
index 66d0e67b..79e41be7 100644
--- a/wms/wipwhole-index-function.php
+++ b/wms/wipwhole-index-function.php
@@ -1,1197 +1,1223 @@
-<?php
-
-function getWipwholestatusData($link, $id)
-{
-    $db_query = "
-        SELECT * FROM wipwholestatus 
-        WHERE id='$id'
-        AND status = '1'
-    ";
-    $receivabledata = mysqli_query($link, $db_query);
-    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
-}
-
-function getWipwholeSearchSql()
-{
-
-    $area = [
-        'Y' => " '宜蘭','花蓮','台東' ",
-        'N' => " '臺北', '台北', '基隆', '新北' ",
-        'T' => " '桃園', '新竹' ",
-        'C' => " '南投', '臺中', '台中', '彰化', '雲林', '苗栗' ",
-        'K' => " '台南', '臺南', '嘉義', '屏東', '高雄' "
-    ];
-
-    $contractno = empty($_REQUEST['contractno']) ? null : trim($_REQUEST['contractno']);
-    $facilityno = empty($_REQUEST['facilityno']) ? null : trim($_REQUEST['facilityno']);
-    $custom = empty($_REQUEST['custom']) ? null : trim($_REQUEST['custom']);
-    $site_survey_contact_verify = !isset($_REQUEST['site_survey_contact_verify']) ? null : trim($_REQUEST['site_survey_contact_verify']);
-    $real_contract_arrival_date_start = empty($_REQUEST['real_contract_arrival_date_start']) ? null : trim($_REQUEST['real_contract_arrival_date_start']);
-    $real_contract_arrival_date_end = empty($_REQUEST['real_contract_arrival_date_end']) ? null : trim($_REQUEST['real_contract_arrival_date_end']);
-    $area_no = empty($_REQUEST['area_no']) ? null : trim($_REQUEST['area_no']);
-
-    $sql = "";
-    $sql .= empty($area_no) ? "" : " AND SUBSTR(address,1,2) IN (" . $area[$area_no] . ") ";
-    $sql .= empty($contractno) ? "" : " AND contractno LIKE '%$contractno%' ";
-    $sql .= empty($facilityno) ? "" : " AND facilityno LIKE '%$facilityno%' ";
-    $sql .= empty($custom) ? "" : " AND custom LIKE '%$custom%' ";
-    $sql .= empty($site_survey_contact_verify) ? "" : " AND site_survey_contact_verify = '" . $site_survey_contact_verify . "' ";
-    $sql .= empty($real_contract_arrival_date_start) ? "" : " AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') >= '$real_contract_arrival_date_start' ";
-    $sql .= empty($real_contract_arrival_date_end) ? "" : " AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') <= '$real_contract_arrival_date_end' ";
-
-    return $sql;
-}
-
-function getDepartmentId($link, $user_id)
-{
-    $sql = "
-        SELECT 
-            department_id
-        FROM account 
-        WHERE accountid = '$user_id'
-    ";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_row($res);
-    mysqli_free_result($res);
-    return $row[0];
-}
-
-function getRoleId($link, $user_id)
-{
-    $sql = "
-        SELECT 
-            role_id 
-        FROM account 
-        WHERE accountid = '$user_id'
-    ";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_row($res);
-    mysqli_free_result($res);
-    return $row[0];
-}
-
-function getEditFlag($department_id, $role_id, $user_id)
-{
-    // 業務部門
-    if ($department_id == "321")
-        return 8;
-    // 鍾哥(生管) 部門代碼:250 職位大小:1 4
-    if ($department_id == "250" && in_array($role_id, ["1", "4"]))
-        return  8;
-    // 許協理 部門代碼:320 職位大小:1
-    if ($department_id == "320" && $role_id == "1")
-        return  8;
-    // 詹總 部門代碼:50 職位大小:1
-    if ($department_id == "50" && $role_id == "1")
-        return 8;
-    // 許總 部門代碼:20 職位大小:1
-    if ($department_id == "20" && $role_id == "1")
-        return 8;
-    // 設計
-    if ($department_id == "911")
-        return 2;
-    // 宜蘭工務
-    if ($user_id == 'M0087')
-        return  4;
-    // 北區工務組長 
-    if ($user_id == 'M0041' || $user_id == 'M0176')
-        return 4;
-    // 中區工務組長
-    if ($user_id == 'M0113' || $user_id == 'M0158')
-        return  4;
-    // 南區工務組長    
-    if ($user_id == 'M0039' || $user_id == 'M0078')
-        return  4;
-    // 工務部門
-    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545]))
-        return  4;
-    // 品証部門
-    if ($department_id == '912')
-        return  4;
-    $sql_cmd = sql_myself($user_id, "salesid");
-    // 營業員主管或營業員
-    if (!empty($sql_cmd))
-        return 1;
-    return 15;
-}
-
-function getDataSql($department_id, $role_id, $user_id)
-{
-    // 合約類型
-    $contract_type = 'A';
-
-    // 營業員主管或營業員
-    $department_arr = [
-        '310', '311', '312', '313', '314', '315',
-        '511', '512', '513', '514'
-    ];
-
-    // 補丁 黃孟澤 & 葉博澄 權限 = 李烘銘
-    if (in_array($user_id, ['M0166', 'M0091'])) {
-        $user_id = 'M0086';
-    }
-
-    $sql_cmd = sql_myself($user_id, "salesid");
-    $sql = "
-        SELECT * FROM wipwholestatus $sql_cmd 
-    ";
-    $sql .= empty($sql_cmd) ? " WHERE 1=1 AND status = '1' AND contract_type = '$contract_type' " : " AND status = '1' AND contract_type = '$contract_type'";
-    $sql .= getWipwholeSearchSql();
-    $sql .= "ORDER BY real_contract_arrival_date DESC ";
-
-    if (in_array($department_id, $department_arr)) {
-        // 北區營銷部 營銷專案經理 311 1
-        //           新梯營銷經理 311 3
-        // 桃竹營銷部 銷售專案經理 312 1
-        // 中區營銷部 新梯營銷經理 313 1
-        // 南區營銷部 銷售專案經理 314 2
-        // 花東區營銷部 銷售專案經理 315 1
-
-        if ($department_id == '311' && (in_array($role_id, ['1', '3']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '312' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '313' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '314' && (in_array($role_id, ['2']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '315' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-    }
-    // 鍾哥 部門代碼:250 職位大小:1 4
-    // 許協理 部門代碼:320 職位大小:1
-    // 張主任 部門代碼:322 職位大小:1
-    // 詹總 部門代碼:50 職位大小:1
-    // 許總 部門代碼:20 職位大小:1
-    // 業務部門 部門代碼:321
-    // 服務支援部門 部門代碼:501
-    // 財會部門 部門代碼:210
-    // 品証部門 部門代碼:912
-    $department_arr = ['911', '250', '320', '50', '20', '321', '322', '220', '501', '210', '912'];
-    if (in_array($department_id, $department_arr)) {
-        $sql = "
-            SELECT * FROM wipwholestatus
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date ASC
-        ";
-        return $sql;
-    }
-    // (宜蘭)工務組長
-    if ($user_id == 'M0087') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('宜蘭')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 北區工務組長
-    if ($user_id == 'M0041' || $user_id == 'M0176') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 中區工務組長
-    if ($user_id == 'M0113' || $user_id == 'M0158') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 南區工務組長
-    if ($user_id == 'M0039' || $user_id == 'M0078') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 工務
-    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545])) {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    return $sql;
-}
-
-function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code)
-{
-
-    // 補丁 黃孟澤 & 葉博澄 權限 = 李烘銘
-    if (in_array($user_id, ['M0166', 'M0091'])) {
-        $user_id = 'M0086';
-    }
-
-
-    $flow_code_tmp = explode(',', $flow_code);
-    $flow_code = implode("','", $flow_code_tmp);
-    // 合約類型
-    $contract_type = 'A';
-    // 營業員主管或營業員
-    $department_arr = ['310', '311', '312', '313', '314', '315'];
-    if (in_array($department_id, $department_arr)) {
-        // 北區營銷部 營銷專案經理 311 1
-        //           新梯營銷經理 311 3
-        // 桃竹營銷部 銷售專案經理 312 1
-        // 中區營銷部 新梯營銷經理 313 1
-        // 南區營銷部 銷售專案經理 314 2
-        // 花東區營銷部 銷售專案經理 315 1
-        if ($department_id == '311' && (in_array($role_id, ['1', '3']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '312' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '313' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '314' && (in_array($role_id, ['2']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '315' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        $sql_cmd = sql_myself($user_id, "salesid");
-        $sql = "
-            SELECT * FROM wipwholestatus $sql_cmd 
-        ";
-        $sql .= empty($sql_cmd) ? " WHERE 1=1 AND contract_type = '$contract_type' " : " AND contract_type = '$contract_type'";
-        $sql .= "
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')        
-            )
-        ";
-        $sql .= getWipwholeSearchSql();
-        $sql .= "ORDER BY real_contract_arrival_date DESC ";
-    }
-
-    // 鍾哥 部門代碼:250 職位大小:1 4
-    // 許協理 部門代碼:320 職位大小:1
-    // 張主任 部門代碼:322 職位大小:1
-    // 詹總 部門代碼:50 職位大小:1
-    // 許總 部門代碼:20 職位大小:1
-    // 業務部門 部門代碼:321
-    // 服務支援部 部門代碼:501
-    // 財會部門 部門代碼:210
-    // 品証部門 部門代碼:912
-    $department_arr = ['911', '250', '320', '50', '20', '321', '220', '322', '501', '210', '912'];
-    if (in_array($department_id, $department_arr)) {
-        $sql = "
-            SELECT * FROM wipwholestatus
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')           
-            )
-        " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date ASC
-        ";
-        return $sql;
-    }
-
-    // (宜蘭)工務組長
-    if ($user_id == 'M0087') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')             
-            )
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('宜蘭')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 北區工務組長
-    if ($user_id == 'M0041' || $user_id == 'M0176') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')             
-            )
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 中區工務組長
-    if ($user_id == 'M0113' || $user_id == 'M0158') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')           
-            )
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 南區工務組長
-    if ($user_id == 'M0039' || $user_id == 'M0078') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')            
-            )
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 工務
-    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545])) {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')           
-            )
-            AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-
-    return $sql;
-}
-
-// 取得本次簽核的表單id值
-function getId($link, $form_key)
-{
-    $sql = "
-        SELECT form_id AS id FROM flow
-        WHERE form_key = '$form_key'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row['id'];
-}
-
-// 取得本次簽核的表單form_key值 (營業與設計流程)
-function getYDForm_key($link, $form_id)
-{
-    $sql = "
-        SELECT 
-            f.form_key
-        FROM flow AS f
-        LEFT JOIN subflow AS s
-        ON f.form_key = s.form_key
-        WHERE 1=1
-        AND f.form_id = '$form_id' 
-        AND f.flow_code IN ('A','B','C','D')
-        AND f.system_id = 'wws'
-        AND f.flow_id = 'wws01'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return empty($row['form_key']) ? 0 : $row['form_key'];
-}
-
-// 取得本次簽核的表單form_key值 (工務流程))
-function getGForm_key($link, $form_id)
-{
-    $sql = "
-        SELECT 
-            f.form_key
-        FROM flow AS f
-        LEFT JOIN subflow AS s
-        ON f.form_key = s.form_key
-        WHERE 1=1
-        AND f.form_id = '$form_id' 
-        AND f.flow_code IN ('G','H')
-        AND f.system_id = 'wws'
-        AND f.flow_id = 'wws01'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return empty($row['form_key']) ? 0 : $row['form_key'];
-}
-
-// 修正時間欄位
-function fixTime($time)
-{
-    return empty($time) ? '0000T00:00:00' : date('Y-m-d', strtotime($time)) . "T" . date('H:i:s', strtotime($time));
-}
-
-// 修正時間欄位 若是空值則帶入現在時間戳記
-function fixTimeToNow($time)
-{
-    return empty($time) ? date("Y-m-d") . "T" . date("H:i:s") : date('Y-m-d', strtotime($time)) . "T" . date('H:i:s', strtotime($time));
-}
-
-// 檢查營業階段
-function checkYingYeok($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(sales_spec_verify != '2',sales_spec_verify,'0') AS SIGNED) +
-                CAST(IF(customer_planning_verify != '2',customer_planning_verify,'0') AS SIGNED) +
-                CAST(IF(customer_color_verify != '2',customer_color_verify,'0') AS SIGNED) +
-                CAST(IF(customer_style_verify != '2',customer_style_verify,'0') AS SIGNED) +
-                CAST(IF(site_survey_contact_form_verify != '2',site_survey_contact_form_verify,'0') AS SIGNED) 
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND status = '1'
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 檢查設計階段
-function checkSheJiok($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(desin_spec_verify != '2' ,desin_spec_verify,'0') AS SIGNED) +
-                CAST(IF(desin_planning_verify != '2' ,desin_planning_verify,'0') AS SIGNED) +
-                CAST(IF(desin_color_verify != '2' ,desin_color_verify,'0') AS SIGNED) +
-                CAST(IF(desin_style_verify != '2' ,desin_style_verify,'0') AS SIGNED) 
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND status = '1'
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 檢查設計主管階段
-function checkSheJiokLeader($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(desin_leader_verify != '2',desin_leader_verify,'0') AS SIGNED) 
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND status = '1'
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 檢查工務階段
-function checkGongWuok($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(building_heigh_verify != '2',building_heigh_verify,'0') AS SIGNED)
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND status = '1'
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 檢查生管階段
-function checkShengGuanok($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(shengguanok_status != '2',shengguanok_status,'0') AS SIGNED)+
-                CAST(IF(prattford_order_date_verify != '2' ,prattford_order_date_verify,'0') AS SIGNED) +
-                CAST(IF(estimated_shipping_date_verify != '2' ,estimated_shipping_date_verify,'0') AS SIGNED) +
-                CAST(IF(estimated_shipping_schedule_date_verify != '2' ,estimated_shipping_schedule_date_verify,'0') AS SIGNED) +
-                CAST(IF(goods_type = 'A' || goods_type = 'C' ,'0','1') AS SIGNED) +
-                CAST(IF(taiwan_goods_type = 'A' || taiwan_goods_type = 'C' ,'0','1') AS SIGNED) +
-                CAST(IF(arrival_date_verify = 'A' ,'0','1') AS SIGNED) 
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND status = '1'
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 取得設計部主管編號
-function getSheJiokLeaderNo($link)
-{
-    $sql = "
-        SELECT accountid 
-        FROM `account` 
-        WHERE `department_id` = '911'
-        AND `role_id` = '1';    
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 取得工務部主管編號
-function getGongWuokNo($link)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key']))
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-    $sql = "
-        SELECT DISTINCT 
-            SUBSTR(address,1,2)
-        FROM `wipwholestatus`
-        WHERE id = '$id'
-        AND status = '1'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    // 宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
-    $arr = array(
-        "宜蘭" => "M0087",
-        "北" => "M0041",
-        "台北" => "M0041",
-        "基隆" => "M0041",
-        "新北" => "M0041",
-        "新竹" => "M0041",
-        "桃園" => "M0041",
-        "苗栗" => "M0113",
-        "中" => "M0113",
-        "南投" => "M0113",
-        "台中" => "M0113",
-        "彰化" => "M0113",
-        "雲林" => "M0113",
-        "南" => "M0102",
-        "台南" => "M0102",
-        "嘉義" => "M0102",
-        "屏東" => "M0102",
-        "高雄" => "M0102"
-    );
-    return empty($arr[$row[0]]) ? "" : $arr[$row[0]];
-}
-
-// 取得生管部主管編號
-function getShengGuanokLeaderNo($link)
-{
-    $sql = "
-        SELECT accountid 
-        FROM `account` 
-        WHERE `department_id` = '321'
-        AND `role_id` = '1';    
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 確認目前狀態 (營業設計)
-function checkNowFormYDStatus($link)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key'])) {
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-    }
-    $sql = "
-        SELECT
-            flow_code
-        FROM flow
-        WHERE form_id = '$id'
-        AND flow_code IN ('A','B','C','D')
-        AND system_id = 'wws'
-        AND flow_id = 'wws01'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return empty($row['0']) ? 'Z' : $row['0'];
-}
-
-// 確認目前狀態 (工務)
-function checkNowFormGStatus($link)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key'])) {
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-    }
-    $sql = "
-        SELECT
-            flow_code
-        FROM flow
-        WHERE form_id = '$id'
-        AND flow_code IN ('G','H')
-        AND system_id = 'wws'
-        AND flow_id = 'wws01'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return empty($row['0']) ? 'Z' : $row['0'];
-}
-
-// 取得資訊的欄位權限
-function getInformationStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    return "disabled";
-}
-
-// 取得業務的欄位權限
-function getYewuStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 321)
-        return "";
-    return "disabled";
-}
-
-// 取得工務的欄位權限
-function getWarehouseStatus($link, $user_department_id, $role_id, $status)
-{
-    if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545, 50, 501, 311, 313, 314, 521, 315, 912])) {
-        if ($status == 1) {
-            return checkNowFormGStatus($link) == 'G' ? "" : "disabled";
-        } else {
-            return "";
-        }
-    }
-    return "disabled";
-}
-
-// 取得營業或契約的欄位權限
-function getMarketingStatus($link, $user_department_id, $role_id, $status)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315) {
-        if ($status == 1) {
-            return checkNowFormStatus($link) == 'A' ? "" : "disabled";
-        } else {
-            return "";
-        }
-    }
-    if ($user_department_id == 501 || $user_department_id == 511 || $user_department_id == 512 || $user_department_id == 513 || $user_department_id == 514) {
-        if ($status == 1) {
-            return checkNowFormStatus($link) == 'A' ? "" : "disabled";
-        } else {
-            return "";
-        }
-    }
-    return "disabled";
-}
-
-// 確認目前狀態
-function checkNowFormStatus($link)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key'])) {
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-        $form_key = getForm_key($link, $id);
-    }
-    $sql = "
-        SELECT
-            flow_code
-        FROM flow
-        WHERE form_id = '$id'
-        AND form_key = '$form_key'
-        AND system_id = 'wws'
-        AND flow_id = 'wws01'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row['0'];
-}
-
-// 取得本次簽核的表單form_key值 
-function getForm_key($link, $form_id)
-{
-    $sql = "
-        SELECT 
-            f.form_key
-        FROM flow AS f
-        LEFT JOIN subflow AS s
-        ON f.form_key = s.form_key
-        WHERE 1=1
-        AND f.form_id = '$form_id' 
-        AND f.flow_code IN ('A','B','C','D','E')
-        AND f.system_id = 'wws'
-        AND f.flow_id = 'wws01'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row['form_key'];
-}
-
-// 取得設計的欄位權限
-function getDesinStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 911)
-        return checkNowFormYDStatus($link) == 'B' ? "" : "disabled";
-    return "disabled";
-}
-
-// 取得設計主管的欄位權限
-function getDesinLeaderStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 911)
-        return checkNowFormYDStatus($link) == 'C' && $role_id == 1 ? "" : "disabled";
-    return "disabled";
-}
-
-// 取得生管的欄位權限
-function getShengguanStatus($link, $user_department_id, $role_id, $status)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($status == '1') {
-        if ($user_department_id == 250 && in_array($role_id, [1, 4]))
-            return "";
-    } else {
-        if ($user_department_id == 250)
-            return "";
-    }
-    return "disabled";
-}
-
-// 取得品證部的欄位權限
-function getPinzhengStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 912)
-        return "";
-    return "disabled";
-}
-
-// 取得下方table分頁的預設分頁
-function getTabNo($user_department_id)
-{
-    if ($user_department_id == 220)
-        return 0;
-    if ($user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315)
-        return 0;
-    if ($user_department_id == 911)
-        return 1;
-    if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545]))
-        return 2;
-    if ($user_department_id == 321 || $user_department_id == 250)
-        return 3;
-    if ($user_department_id == 912)
-        return 4;
-    return 0;
-}
-
-// 由地址取得工務負責人
-function getGunwuName($address)
-{
-    $north_arr = array('台北', '基隆', '新北', '桃園', '新竹', '台東', '花蓮');
-    $north_arr2 = array('宜蘭');
-    $center_arr = array('南投', '彰化', '雲林', '台中', '苗栗');
-    $south_arr = array('台南', '嘉義', '屏東', '高雄');
-    foreach ($north_arr as $key => $value)
-        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
-            return "張潘榮";
-    foreach ($north_arr2 as $key => $value)
-        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
-            return "高培軒";
-    foreach ($center_arr as $key => $value)
-        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
-            return "林瑋隆";
-    foreach ($south_arr as $key => $value)
-        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
-            return "鄭存邑";
-    return "";
-}
-
-function getOpendoorOptions($link)
-{
-    $sql = "
-        SELECT 
-            code_name AS val ,
-            content AS label 
-        FROM code 
-        WHERE field_name='open_kind'
-        ORDER BY label ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getYingyeokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('311','312','313','314','315')
-        ORDER BY accountid ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getShejiokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('911')
-        AND `role_id` NOT IN ('1')
-        ORDER BY accountid ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getShejiokLeaderOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('911')
-        AND `role_id` IN ('1')
-        ORDER BY accountid ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getGongwuokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('521','531','501','541','542','543','544','545')
-        ORDER BY accountid ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getYewuOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('321')
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getShengguanokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('250')
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getPinzhengOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('912')
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getAllUsersOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `accounttype` NOT IN ('A','X')
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getSelectOptionHtml($options, $selected_val)
-{
-    $str = "";
-    foreach ($options as $option) :
-        if ($option['val'] == $selected_val) {
-            $str .= "<option selected value='" . $option['val'] . "'>" . $option['val'] . $option['label'] . "</option>";
-        } else {
-            $str .= "<option value='" . $option['val'] . "'>" . $option['val'] . $option['label'] . "</option>";
-        }
-    endforeach;
-    return $str;
-}
-
-function getSaveEstimateInstallData($user_department_id, $role_id)
-{
-    if (in_array($user_department_id, ['50', '501']) && $role_id == '2')
-        return true;
-    if ($user_department_id == '311' && $role_id == '4')
-        return true;
-    if ($user_department_id == '312' && $role_id == '3')
-        return true;
-    if ($user_department_id == '313' && $role_id == '3')
-        return true;
-    if ($user_department_id == '314' && $role_id == '4')
-        return true;
-    if ($user_department_id == '315' && in_array($role_id, ['1', '2']))
-        return true;
-    if (in_array($user_department_id, [220, 531]))
-        return true;
-    if ($user_department_id == '521' && in_array($role_id, ['11', '9', '12']))
-        return true;
-    if ($user_department_id == '542' && in_array($role_id, ['1', '5', '6']))
-        return true;
-    if ($user_department_id == '544' && in_array($role_id, ['3', '6']))
-        return true;
-    if ($user_department_id == '543' && $role_id == '2')
-        return true;
-    if ($user_department_id == '545' && in_array($role_id, ['3', '6']))
-        return true;
-    return false;
-}
-
-function saveInstallData($user_department_id, $role_id)
-{
-    if ($user_department_id == '315' && $role_id == '1')
-        return true;
-    if ($user_department_id == '521' && $role_id == '9')
-        return true;
-    if ($user_department_id == '542' && in_array($role_id, ['1', '5', '6']))
-        return true;
-    if ($user_department_id == '543' && $role_id == '2')
-        return true;
-    if ($user_department_id == '544' && in_array($role_id, ['3', '6']))
-        return true;
-    if ($user_department_id == '545' && in_array($role_id, ['3', '6']))
-        return true;
-    if ($user_department_id == '220')
-        return true;
-    return false;
-}
-
-
-function getWipwholeChangePlanningCustomerDetailsStatus($link, $id)
-{
-    $sql = "
-        SELECT
-            custom_name,
-            create_at,
-            change_status
-        FROM wipwhole_change_planning_customer_details
-        WHERE 1=1
-        AND wipwholestatus_id = '$id'
-        ORDER BY create_at DESC
-        LIMIT 1
-    ";
-    return mysqli_query($link, $sql);
-}
-
-
-function getAllCustomerPlanningVerify($link, $id)
-{
-    $sql = "
-        SELECT
-            custom AS custom_name,
-            customer_planning_verify_file,
-            create_at
-        FROM wipwholestatus
-        WHERE id = $id
-        AND customer_planning_verify_file != ''
-        AND customer_planning_verify_file IS NOT NULL
-        UNION
-        SELECT
-            custom_name,
-            customer_planning_verify_file,
-            create_at
-        FROM wipwhole_change_planning_customer_details
-        WHERE wipwholestatus_id = $id
-        AND customer_planning_verify_file != ''
-        AND customer_planning_verify_file IS NOT NULL
-    ";
-    return mysqli_query($link, $sql);
-}
\ No newline at end of file
+<?php
+
+/**
+ * 取得生管主管 options
+ * @param object $link:資料庫連線
+ * @param string $id:作番大日程唯一值
+ * @return object 回傳 mysqli_query
+ */
+function getWipwholestatusDetail($link, $id)
+{
+    $db_query = "
+        SELECT * FROM 
+        wipwholestatus WHERE id = '$id'
+        AND status = '1'
+    ";
+    $receivabledata = mysqli_query($link, $db_query);
+    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
+}
+
+function getWipwholestatusData($link, $id)
+{
+    $db_query = "
+        SELECT * FROM wipwholestatus 
+        WHERE id='$id'
+        AND status = '1'
+    ";
+    $receivabledata = mysqli_query($link, $db_query);
+    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
+}
+
+function getWipwholeSearchSql()
+{
+
+    $area = [
+        'Y' => " '宜蘭','花蓮','台東' ",
+        'N' => " '臺北', '台北', '基隆', '新北' ",
+        'T' => " '桃園', '新竹' ",
+        'C' => " '南投', '臺中', '台中', '彰化', '雲林', '苗栗' ",
+        'K' => " '台南', '臺南', '嘉義', '屏東', '高雄' "
+    ];
+
+    $contractno = empty($_REQUEST['contractno']) ? null : trim($_REQUEST['contractno']);
+    $facilityno = empty($_REQUEST['facilityno']) ? null : trim($_REQUEST['facilityno']);
+    $custom = empty($_REQUEST['custom']) ? null : trim($_REQUEST['custom']);
+    $site_survey_contact_verify = !isset($_REQUEST['site_survey_contact_verify']) ? null : trim($_REQUEST['site_survey_contact_verify']);
+    $real_contract_arrival_date_start = empty($_REQUEST['real_contract_arrival_date_start']) ? null : trim($_REQUEST['real_contract_arrival_date_start']);
+    $real_contract_arrival_date_end = empty($_REQUEST['real_contract_arrival_date_end']) ? null : trim($_REQUEST['real_contract_arrival_date_end']);
+    $area_no = empty($_REQUEST['area_no']) ? null : trim($_REQUEST['area_no']);
+
+    $sql = "";
+    $sql .= empty($area_no) ? "" : " AND SUBSTR(address,1,2) IN (" . $area[$area_no] . ") ";
+    $sql .= empty($contractno) ? "" : " AND contractno LIKE '%$contractno%' ";
+    $sql .= empty($facilityno) ? "" : " AND facilityno LIKE '%$facilityno%' ";
+    $sql .= empty($custom) ? "" : " AND custom LIKE '%$custom%' ";
+    $sql .= empty($site_survey_contact_verify) ? "" : " AND site_survey_contact_verify = '" . $site_survey_contact_verify . "' ";
+    $sql .= empty($real_contract_arrival_date_start) ? "" : " AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') >= '$real_contract_arrival_date_start' ";
+    $sql .= empty($real_contract_arrival_date_end) ? "" : " AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') <= '$real_contract_arrival_date_end' ";
+
+    return $sql;
+}
+
+function getDepartmentId($link, $user_id)
+{
+    $sql = "
+        SELECT 
+            department_id
+        FROM account 
+        WHERE accountid = '$user_id'
+    ";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_row($res);
+    mysqli_free_result($res);
+    return $row[0];
+}
+
+function getRoleId($link, $user_id)
+{
+    $sql = "
+        SELECT 
+            role_id 
+        FROM account 
+        WHERE accountid = '$user_id'
+    ";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_row($res);
+    mysqli_free_result($res);
+    return $row[0];
+}
+
+function getEditFlag($department_id, $role_id, $user_id)
+{
+    // 業務部門
+    if ($department_id == "321")
+        return 8;
+    // 鍾哥(生管) 部門代碼:250 職位大小:1 4
+    if ($department_id == "250")
+        return  8;
+    // 許協理 部門代碼:320 職位大小:1
+    if ($department_id == "320" && $role_id == "1")
+        return  8;
+    // 詹總 部門代碼:50 職位大小:1
+    if ($department_id == "50" && $role_id == "1")
+        return 8;
+    // 許總 部門代碼:20 職位大小:1
+    if ($department_id == "20" && $role_id == "1")
+        return 8;
+    // 設計
+    if ($department_id == "911")
+        return 2;
+    // 宜蘭工務
+    if ($user_id == 'M0087')
+        return  4;
+    // 北區工務組長 
+    if ($user_id == 'M0041' || $user_id == 'M0176')
+        return 4;
+    // 中區工務組長
+    if ($user_id == 'M0113' || $user_id == 'M0158')
+        return  4;
+    // 南區工務組長    
+    if ($user_id == 'M0039' || $user_id == 'M0078')
+        return  4;
+    // 工務部門
+    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545]))
+        return  4;
+    // 品証部門
+    if ($department_id == '912')
+        return  4;
+    $sql_cmd = sql_myself($user_id, "salesid");
+    // 營業員主管或營業員
+    if (!empty($sql_cmd))
+        return 1;
+    return 15;
+}
+
+function getDataSql($department_id, $role_id, $user_id)
+{
+    // 合約類型
+    $contract_type = 'A';
+
+    // 營業員主管或營業員
+    $department_arr = [
+        '310', '311', '312', '313', '314', '315',
+        '511', '512', '513', '514'
+    ];
+
+    // 補丁 黃孟澤 & 葉博澄 權限 = 李烘銘
+    if (in_array($user_id, ['M0166', 'M0091'])) {
+        $user_id = 'M0086';
+    }
+    // 補丁 孫仲凱 = 林瑋隆
+    if (in_array($user_id, ['M0159'])) {
+        $user_id = 'M0113';
+    }
+
+    $sql_cmd = sql_myself($user_id, "salesid");
+    $sql = "
+        SELECT * FROM wipwholestatus $sql_cmd 
+    ";
+    $sql .= empty($sql_cmd) ? " WHERE 1=1 AND status = '1' AND contract_type = '$contract_type' " : " AND status = '1' AND contract_type = '$contract_type'";
+    $sql .= getWipwholeSearchSql();
+    $sql .= "ORDER BY real_contract_arrival_date DESC ";
+
+    if (in_array($department_id, $department_arr)) {
+        // 北區營銷部 營銷專案經理 311 1
+        //           新梯營銷經理 311 3
+        // 桃竹營銷部 銷售專案經理 312 1
+        // 中區營銷部 新梯營銷經理 313 1
+        // 南區營銷部 銷售專案經理 314 2
+        // 花東區營銷部 銷售專案經理 315 1
+
+        if ($department_id == '311' && (in_array($role_id, ['1', '3']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '312' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '313' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '314' && (in_array($role_id, ['1', '2']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '315' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+    }
+    // 鍾哥 部門代碼:250 職位大小:1 4
+    // 許協理 部門代碼:320 職位大小:1
+    // 張主任 部門代碼:322 職位大小:1
+    // 詹總 部門代碼:50 職位大小:1
+    // 許總 部門代碼:20 職位大小:1
+    // 業務部門 部門代碼:321
+    // 服務支援部門 部門代碼:501
+    // 財會部門 部門代碼:210
+    // 品証部門 部門代碼:912
+    $department_arr = ['911', '250', '320', '50', '20', '321', '322', '220', '501', '210', '912'];
+    if (in_array($department_id, $department_arr)) {
+        $sql = "
+            SELECT * FROM wipwholestatus
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date ASC
+        ";
+        return $sql;
+    }
+    // (宜蘭)工務組長
+    if ($user_id == 'M0087') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('宜蘭')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 北區工務組長
+    if ($user_id == 'M0041' || $user_id == 'M0176') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 中區工務組長
+    if ($user_id == 'M0113' || $user_id == 'M0158') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 南區工務組長
+    if ($user_id == 'M0039' || $user_id == 'M0078') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 工務
+    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545])) {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    return $sql;
+}
+
+function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code)
+{
+
+    // 補丁 黃孟澤 & 葉博澄 權限 = 李烘銘
+    if (in_array($user_id, ['M0166', 'M0091'])) {
+        $user_id = 'M0086';
+    }
+    // 補丁 孫仲凱 = 林瑋隆
+    if (in_array($user_id, ['M0159'])) {
+        $user_id = 'M0113';
+    }
+
+    $flow_code_tmp = explode(',', $flow_code);
+    $flow_code = implode("','", $flow_code_tmp);
+    // 合約類型
+    $contract_type = 'A';
+    // 營業員主管或營業員
+    $department_arr = ['310', '311', '312', '313', '314', '315'];
+    if (in_array($department_id, $department_arr)) {
+        // 北區營銷部 營銷專案經理 311 1
+        //           新梯營銷經理 311 3
+        // 桃竹營銷部 銷售專案經理 312 1
+        // 中區營銷部 新梯營銷經理 313 1
+        // 南區營銷部 銷售專案經理 314 2
+        // 花東區營銷部 銷售專案經理 315 1
+        if ($department_id == '311' && (in_array($role_id, ['1', '3']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '312' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '313' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '314' && (in_array($role_id, ['2']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '315' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        $sql_cmd = sql_myself($user_id, "salesid");
+        $sql = "
+            SELECT * FROM wipwholestatus $sql_cmd 
+        ";
+        $sql .= empty($sql_cmd) ? " WHERE 1=1 AND contract_type = '$contract_type' " : " AND contract_type = '$contract_type'";
+        $sql .= "
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')        
+            )
+        ";
+        $sql .= getWipwholeSearchSql();
+        $sql .= "ORDER BY real_contract_arrival_date DESC ";
+    }
+
+    // 鍾哥 部門代碼:250 職位大小:1 4
+    // 許協理 部門代碼:320 職位大小:1
+    // 張主任 部門代碼:322 職位大小:1
+    // 詹總 部門代碼:50 職位大小:1
+    // 許總 部門代碼:20 職位大小:1
+    // 業務部門 部門代碼:321
+    // 服務支援部 部門代碼:501
+    // 財會部門 部門代碼:210
+    // 品証部門 部門代碼:912
+    $department_arr = ['911', '250', '320', '50', '20', '321', '220', '322', '501', '210', '912'];
+    if (in_array($department_id, $department_arr)) {
+        $sql = "
+            SELECT * FROM wipwholestatus
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')           
+            )
+        " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date ASC
+        ";
+        return $sql;
+    }
+
+    // (宜蘭)工務組長
+    if ($user_id == 'M0087') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')             
+            )
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('宜蘭')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 北區工務組長
+    if ($user_id == 'M0041' || $user_id == 'M0176') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')             
+            )
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 中區工務組長
+    if ($user_id == 'M0113' || $user_id == 'M0158') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')           
+            )
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 南區工務組長
+    if ($user_id == 'M0039' || $user_id == 'M0078') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')            
+            )
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 工務
+    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545])) {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')           
+            )
+            AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+
+    return $sql;
+}
+
+// 取得本次簽核的表單id值
+function getId($link, $form_key)
+{
+    $sql = "
+        SELECT form_id AS id FROM flow
+        WHERE form_key = '$form_key'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row['id'];
+}
+
+// 取得本次簽核的表單form_key值 (營業與設計流程)
+function getYDForm_key($link, $form_id)
+{
+    $sql = "
+        SELECT 
+            f.form_key
+        FROM flow AS f
+        LEFT JOIN subflow AS s
+        ON f.form_key = s.form_key
+        WHERE 1=1
+        AND f.form_id = '$form_id' 
+        AND f.flow_code IN ('A','B','C','D','I')
+        AND f.system_id = 'wws'
+        AND f.flow_id = 'wws01'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return empty($row['form_key']) ? 0 : $row['form_key'];
+}
+
+// 取得本次簽核的表單form_key值 (工務流程))
+function getGForm_key($link, $form_id)
+{
+    $sql = "
+        SELECT 
+            f.form_key
+        FROM flow AS f
+        LEFT JOIN subflow AS s
+        ON f.form_key = s.form_key
+        WHERE 1=1
+        AND f.form_id = '$form_id' 
+        AND f.flow_code IN ('G','H')
+        AND f.system_id = 'wws'
+        AND f.flow_id = 'wws01'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return empty($row['form_key']) ? 0 : $row['form_key'];
+}
+
+// 修正時間欄位
+function fixTime($time)
+{
+    return empty($time) ? '0000T00:00:00' : date('Y-m-d', strtotime($time)) . "T" . date('H:i:s', strtotime($time));
+}
+
+// 修正時間欄位 若是空值則帶入現在時間戳記
+function fixTimeToNow($time)
+{
+    return empty($time) ? date("Y-m-d") . "T" . date("H:i:s") : date('Y-m-d', strtotime($time)) . "T" . date('H:i:s', strtotime($time));
+}
+
+// 檢查營業階段
+function checkYingYeok($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(sales_spec_verify != '2',sales_spec_verify,'0') AS SIGNED) +
+                CAST(IF(customer_planning_verify != '2',customer_planning_verify,'0') AS SIGNED) +
+                CAST(IF(customer_color_verify != '2',customer_color_verify,'0') AS SIGNED) +
+                CAST(IF(customer_style_verify != '2',customer_style_verify,'0') AS SIGNED) +
+                CAST(IF(site_survey_contact_form_verify != '2',site_survey_contact_form_verify,'0') AS SIGNED) 
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND status = '1'
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 檢查設計階段
+function checkSheJiok($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(desin_spec_verify != '2' ,desin_spec_verify,'0') AS SIGNED) +
+                CAST(IF(desin_planning_verify != '2' ,desin_planning_verify,'0') AS SIGNED) +
+                CAST(IF(desin_color_verify != '2' ,desin_color_verify,'0') AS SIGNED) +
+                CAST(IF(desin_style_verify != '2' ,desin_style_verify,'0') AS SIGNED) 
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND status = '1'
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 檢查設計主管階段
+function checkSheJiokLeader($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(desin_leader_verify != '2',desin_leader_verify,'0') AS SIGNED) 
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND status = '1'
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 檢查工務階段
+function checkGongWuok($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(building_heigh_verify != '2',building_heigh_verify,'0') AS SIGNED)
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND status = '1'
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 檢查生管階段
+function checkShengGuanok($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(shengguanok_status != '2',shengguanok_status,'0') AS SIGNED)+
+                CAST(IF(prattford_order_date_verify != '2' ,prattford_order_date_verify,'0') AS SIGNED) +
+                CAST(IF(estimated_shipping_date_verify != '2' ,estimated_shipping_date_verify,'0') AS SIGNED) +
+                CAST(IF(estimated_shipping_schedule_date_verify != '2' ,estimated_shipping_schedule_date_verify,'0') AS SIGNED) +
+                CAST(IF(goods_type = 'A' || goods_type = 'C' ,'0','1') AS SIGNED) +
+                CAST(IF(taiwan_goods_type = 'A' || taiwan_goods_type = 'C' ,'0','1') AS SIGNED) +
+                CAST(IF(arrival_date_verify = 'A' ,'0','1') AS SIGNED) 
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND status = '1'
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 取得設計部主管編號
+function getSheJiokLeaderNo($link)
+{
+    $sql = "
+        SELECT accountid 
+        FROM `account` 
+        WHERE `department_id` = '911'
+        AND `role_id` = '1';    
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 取得工務部主管編號
+function getGongWuokNo($link)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key']))
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+    $sql = "
+        SELECT DISTINCT 
+            SUBSTR(address,1,2)
+        FROM `wipwholestatus`
+        WHERE id = '$id'
+        AND status = '1'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    // 宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
+    $arr = array(
+        "宜蘭" => "M0087",
+        "北" => "M0041",
+        "台北" => "M0041",
+        "基隆" => "M0041",
+        "新北" => "M0041",
+        "新竹" => "M0041",
+        "桃園" => "M0041",
+        "苗栗" => "M0113",
+        "中" => "M0113",
+        "南投" => "M0113",
+        "台中" => "M0113",
+        "彰化" => "M0113",
+        "雲林" => "M0113",
+        "南" => "M0102",
+        "台南" => "M0102",
+        "嘉義" => "M0102",
+        "屏東" => "M0102",
+        "高雄" => "M0102"
+    );
+    return empty($arr[$row[0]]) ? "" : $arr[$row[0]];
+}
+
+// 取得生管部主管編號
+function getShengGuanokLeaderNo($link)
+{
+    return "M0079";
+    $sql = "
+        SELECT accountid 
+        FROM `account` 
+        WHERE `department_id` = '250'
+        AND `role_id` = '4';    
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 確認目前狀態 (營業設計)
+function checkNowFormYDStatus($link)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key'])) {
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+    }
+    $sql = "
+        SELECT
+            flow_code
+        FROM flow
+        WHERE form_id = '$id'
+        AND flow_code IN ('A','B','C','D','I')
+        AND system_id = 'wws'
+        AND flow_id = 'wws01'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return empty($row['0']) ? 'Z' : $row['0'];
+}
+
+// 確認目前狀態 (工務)
+function checkNowFormGStatus($link)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key'])) {
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+    }
+    $sql = "
+        SELECT
+            flow_code
+        FROM flow
+        WHERE form_id = '$id'
+        AND flow_code IN ('G','H')
+        AND system_id = 'wws'
+        AND flow_id = 'wws01'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return empty($row['0']) ? 'Z' : $row['0'];
+}
+
+// 取得資訊的欄位權限
+function getInformationStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    return "disabled";
+}
+
+// 取得業務的欄位權限
+function getYewuStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 321)
+        return "";
+    return "disabled";
+}
+
+// 取得工務的欄位權限
+function getWarehouseStatus($link, $user_department_id, $role_id, $status)
+{
+    // if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545, 50, 501, 311, 313, 314, 521, 315, 912])) {
+    if(getSaveEstimateInstallData($user_department_id, $role_id)){
+        if ($status == 1) {
+            return checkNowFormGStatus($link) == 'G' ? "" : "disabled";
+        } else {
+            return "";
+        }
+    }
+    return "disabled";
+}
+
+// 取得營業或契約的欄位權限
+function getMarketingStatus($link, $user_department_id, $role_id, $status)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315) {
+        if ($status == 1) {
+            return checkNowFormStatus($link) == 'A' ? "" : "disabled";
+        } else {
+            return "";
+        }
+    }
+    if ($user_department_id == 501 || $user_department_id == 511 || $user_department_id == 512 || $user_department_id == 513 || $user_department_id == 514) {
+        if ($status == 1) {
+            return checkNowFormStatus($link) == 'A' ? "" : "disabled";
+        } else {
+            return "";
+        }
+    }
+    return "disabled";
+}
+
+// 確認目前狀態
+function checkNowFormStatus($link)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key'])) {
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+        $form_key = getForm_key($link, $id);
+    }
+    $sql = "
+        SELECT
+            flow_code
+        FROM flow
+        WHERE form_id = '$id'
+        AND form_key = '$form_key'
+        AND system_id = 'wws'
+        AND flow_id = 'wws01'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row['0'];
+}
+
+// 取得本次簽核的表單form_key值 
+function getForm_key($link, $form_id)
+{
+    $sql = "
+        SELECT 
+            f.form_key
+        FROM flow AS f
+        LEFT JOIN subflow AS s
+        ON f.form_key = s.form_key
+        WHERE 1=1
+        AND f.form_id = '$form_id' 
+        AND f.flow_code IN ('A','B','C','D','E','I')
+        AND f.system_id = 'wws'
+        AND f.flow_id = 'wws01'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row['form_key'];
+}
+
+// 取得設計的欄位權限
+function getDesinStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 911)
+        return checkNowFormYDStatus($link) == 'B' ? "" : "disabled";
+    return "disabled";
+}
+
+// 取得設計主管的欄位權限
+function getDesinLeaderStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 911)
+        return checkNowFormYDStatus($link) == 'C' && $role_id == 1 ? "" : "disabled";
+    return "disabled";
+}
+
+// 取得生管的欄位權限
+function getShengguanStatus($link, $user_department_id, $role_id, $status)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($status == '1') {
+        if ($user_department_id == 250 && in_array($role_id, [1, 4]))
+            return "";
+    } else {
+        if ($user_department_id == 250)
+            return "";
+    }
+    return "disabled";
+}
+
+// 取得品證部的欄位權限
+function getPinzhengStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 912)
+        return "";
+    return "disabled";
+}
+
+// 取得下方table分頁的預設分頁
+function getTabNo($user_department_id)
+{
+    if ($user_department_id == 220)
+        return 0;
+    if ($user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315)
+        return 1;
+    if ($user_department_id == 911)
+        return 2;
+    if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545]))
+        return 0;
+    if ($user_department_id == 321 || $user_department_id == 250)
+        return 3;
+    if ($user_department_id == 912)
+        return 4;
+    return 0;
+}
+
+// 由地址取得工務負責人
+function getGunwuName($address)
+{
+    $north_arr = array('台北', '基隆', '新北', '桃園', '新竹', '台東', '花蓮');
+    $north_arr2 = array('宜蘭');
+    $center_arr = array('南投', '彰化', '雲林', '台中', '苗栗');
+    $south_arr = array('台南', '嘉義', '屏東', '高雄');
+    foreach ($north_arr as $key => $value)
+        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
+            return "張潘榮";
+    foreach ($north_arr2 as $key => $value)
+        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
+            return "高培軒";
+    foreach ($center_arr as $key => $value)
+        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
+            return "林瑋隆";
+    foreach ($south_arr as $key => $value)
+        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
+            return "鄭存邑";
+    return "";
+}
+
+function getOpendoorOptions($link)
+{
+    $sql = "
+        SELECT 
+            code_name AS val ,
+            content AS label 
+        FROM code 
+        WHERE field_name='open_kind'
+        ORDER BY label ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getYingyeokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('311','312','313','314','315')
+        ORDER BY accountid ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getShejiokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('911')
+        AND `role_id` NOT IN ('1')
+        ORDER BY accountid ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getShejiokLeaderOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('911')
+        AND `role_id` IN ('1')
+        ORDER BY accountid ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getGongwuokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('521','531','501','541','542','543','544','545')
+        ORDER BY accountid ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getYewuOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('321')
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getShengguanokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('250')
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getPinzhengOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('912')
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getAllUsersOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `accounttype` NOT IN ('A','X')
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getSelectOptionHtml($options, $selected_val)
+{
+    $str = "";
+    foreach ($options as $option) :
+        if ($option['val'] == $selected_val) {
+            $str .= "<option selected value='" . $option['val'] . "'>" . $option['val'] . $option['label'] . "</option>";
+        } else {
+            $str .= "<option value='" . $option['val'] . "'>" . $option['val'] . $option['label'] . "</option>";
+        }
+    endforeach;
+    return $str;
+}
+
+function getSaveEstimateInstallData($user_department_id, $role_id)
+{
+    if (in_array($user_department_id, ['50', '501']) && $role_id == '2')
+        return true;
+    if ($user_department_id == '311' && $role_id == '4')
+        return true;
+    if ($user_department_id == '312' && $role_id == '3')
+        return true;
+    if ($user_department_id == '313' && $role_id == '3')
+        return true;
+    if ($user_department_id == '314' && $role_id == '4')
+        return true;
+    if ($user_department_id == '315' && in_array($role_id, ['1', '2']))
+        return true;
+    if (in_array($user_department_id, [220, 531]))
+        return true;
+    if ($user_department_id == '521' && in_array($role_id, ['11', '9', '12']))
+        return true;
+    if ($user_department_id == '542' && in_array($role_id, ['1', '5', '6', '8']))
+        return true;
+    if ($user_department_id == '544' && in_array($role_id, ['3', '6']))
+        return true;
+    if ($user_department_id == '543' && $role_id == '2')
+        return true;
+    if ($user_department_id == '545' && in_array($role_id, ['3', '6']))
+        return true;
+    return false;
+}
+
+function saveInstallData($user_department_id, $role_id)
+{
+    if ($user_department_id == '315' && $role_id == '1')
+        return true;
+    if ($user_department_id == '521' && $role_id == '9')
+        return true;
+    if ($user_department_id == '542' && in_array($role_id, ['1', '5', '6', '8']))
+        return true;
+    if ($user_department_id == '543' && $role_id == '2')
+        return true;
+    if ($user_department_id == '544' && in_array($role_id, ['3', '4', '6']))
+        return true;
+    if ($user_department_id == '545' && in_array($role_id, ['3', '6']))
+        return true;
+    if ($user_department_id == '220')
+        return true;
+    return false;
+}
+
+
+function getWipwholeChangePlanningCustomerDetailsStatus($link, $id)
+{
+    $sql = "
+        SELECT
+            custom_name,
+            create_at,
+            change_status
+        FROM wipwhole_change_planning_customer_details
+        WHERE 1=1
+        AND wipwholestatus_id = '$id'
+        ORDER BY create_at DESC
+        LIMIT 1
+    ";
+    return mysqli_query($link, $sql);
+}
+
+
+function getAllCustomerPlanningVerify($link, $id)
+{
+    $sql = "
+        SELECT
+            real_custom_name AS custom_name,
+            customer_planning_verify_file,
+            date_format(customer_planning_verify_at, '%Y-%m-%d %H:%i:%s') AS create_at
+        FROM wipwholestatus
+        WHERE id = $id
+        AND customer_planning_verify_file != ''
+        AND customer_planning_verify_file IS NOT NULL
+        UNION
+        SELECT
+            custom_name,
+            customer_planning_verify_file,
+            create_at
+        FROM wipwhole_change_planning_customer_details
+        WHERE wipwholestatus_id = $id
+        AND customer_planning_verify_file != ''
+        AND customer_planning_verify_file IS NOT NULL
+    ";
+    return mysqli_query($link, $sql);
+}
diff --git a/wms/wipwhole-index-table-html.php b/wms/wipwhole-index-table-html.php
index 04f873a1..4572b2cc 100644
--- a/wms/wipwhole-index-table-html.php
+++ b/wms/wipwhole-index-table-html.php
@@ -1,13 +1,4 @@
 <?php
-$tableArr = array(
-    "All" => "table_index2",
-    "A" => "table_index3",
-    "B" => "table_index4",
-    "G" => "table_index5",
-    "CH" => "table_index6",
-    "Z" => "table_index7"
-);
-
 // 暫時可編輯及刪除權限
 $update_delete_status = false;
 if (in_array($user_id, ['M0175', 'M0079'])) {
@@ -15,7 +6,7 @@ if (in_array($user_id, ['M0175', 'M0079'])) {
 }
 
 ?>
-<table id="<?php echo $tableArr[$key]; ?>" class="table table-striped table-bordered " style="width:100%;table-layout:fixed;">
+<table id="table_index2" class="table table-striped table-bordered " style="width:100%;table-layout:fixed;">
     <thead>
         <tr>
             <?php
@@ -42,7 +33,7 @@ if (in_array($user_id, ['M0175', 'M0079'])) {
     <tbody>
         <?php
 
-        foreach ($dataDetailsArr as $key => $data) :
+        foreach ($data as $key => $data) :
 
             //規格
             $Specification = $data['facility_kind'];
@@ -139,7 +130,7 @@ if (in_array($user_id, ['M0175', 'M0079'])) {
                 <td><?php echo $data['facilityno']; ?></td>
                 <td><?php echo $data['custom']; ?></td>
                 <td><?php echo $Specification; ?></td>
-                <td><?php echo $data['address']; ?></td>
+                <td><?php echo empty($data['real_address']) ? $data['address'] : $data['real_address']; ?></td>
                 <?php
                 foreach ($site_survey_status as $key => $val) {
                     if ((string)$data['site_survey_contact_verify'] == (string)$key) {
diff --git a/wms/wipwhole-index.php b/wms/wipwhole-index.php
index de732513..07137c0d 100644
--- a/wms/wipwhole-index.php
+++ b/wms/wipwhole-index.php
@@ -1,509 +1,575 @@
-<?php
-// ini_set('display_errors', 'on');
-/**
- * 權限規則:
- * 1.營業經理查看全部 部門代碼:311 312 313 314 315
- * 2.營業員瀏覽自己合約資料 部門代碼:311 312 313 314 315
- * 3.設計部門代碼:911
- * 4.工務:宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113)  南=韋宗榮(M0039)改鄭存邑(M0102)
- * 5.生管:伃廷(M0024)
- * 6.鍾哥(生管) 部門代碼:250 職位大小:1 4
- * 7.許協理 部門代碼:320 職位大小:1
- * 8.詹總 部門代碼:50 職位大小:1
- * 9.許總 部門代碼:20 職位大小:1
- * 
- *  新梯        543 筆  (已匯入)
- *  舊改        141 筆  (已匯入)
- *  已簽回      684 筆 (共計)
- */
-include "header.php";
-
-// 設定警告出貨到期的天數
-$numberOfDaysToAdd = 45;
-$futureDate = date("Y/m/d", strtotime(date("Y-m-d") . " +{$numberOfDaysToAdd} days"));
-
-include "wipwhole-index-function.php";
-include "css/view/wipwhole-index.php";
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    if ($_POST['form_name'] == 'del_form') {
-        $del_seq = $_POST['del_seq'];
-        $sql = "UPDATE wipwholestatus SET status = '0' WHERE id = '$del_seq' ";
-        mysqli_query($link, $sql);
-    }
-}
-
-// 宣告主資料空陣列
-$data = array();
-
-// 取得當前使用者所屬部門
-$department_id = getDepartmentId($link, $user_id);
-// 取得當前使用者所屬職位
-$role_id = getRoleId($link, $user_id);
-
-// 下方編輯按鈕權限
-// 1=營叢 2=設計 4=工務 8=生管 15=其他
-
-$edit_flag = getEditFlag($department_id, $role_id, $user_id);
-
-
-// 接受搜尋 post 後觸發
-$contractno = empty($_REQUEST['contractno']) ? null : $_REQUEST['contractno'];
-$facilityno = empty($_REQUEST['facilityno']) ? null : $_REQUEST['facilityno'];
-$custom = empty($_REQUEST['custom']) ? null : $_REQUEST['custom'];
-$site_survey_contact_verify = !isset($_REQUEST['site_survey_contact_verify']) ? '' : $_REQUEST['site_survey_contact_verify'];
-$real_contract_arrival_date_start = empty($_REQUEST['real_contract_arrival_date_start']) ? null : $_REQUEST['real_contract_arrival_date_start'];
-$real_contract_arrival_date_end = empty($_REQUEST['real_contract_arrival_date_end']) ? null : $_REQUEST['real_contract_arrival_date_end'];
-$area_no = !isset($_REQUEST['area_no']) ? '' : $_REQUEST['area_no'];
-
-// 取得資料 sql
-$sql = getDataSql($department_id, $role_id, $user_id);
-$data = mysqli_query($link, $sql);
-
-// 取得資料(營業部門階段) sql
-$sql = getDataSqlByFlowCode($department_id, $role_id, $user_id, "A");
-$dataA = mysqli_query($link, $sql);
-
-// 取得資料(設計部門階段) sql
-$sql = getDataSqlByFlowCode($department_id, $role_id, $user_id, "B");
-$dataB = mysqli_query($link, $sql);
-
-// 取得資料(工勘部門階段) sql
-$sql = getDataSqlByFlowCode($department_id, $role_id, $user_id, "G");
-$dataG = mysqli_query($link, $sql);
-
-// 取得資料(生管階段) sql
-$sql = getDataSqlByFlowCode($department_id, $role_id, $user_id, "C,H");
-$dataCH = mysqli_query($link, $sql);
-
-// 取得資料(結案階段) sql
-$sql = getDataSqlByFlowCode($department_id, $role_id, $user_id, "Z");
-$dataZ = mysqli_query($link, $sql);
-?>
-
-<div style="overflow-x:auto;">
-    <form id='myForm' method='post' action='wipwhole-index.php?<?= $token_link ?>'>
-        <table class='table query-table table-striped table-bordered display compact' style='width:98%;text-align:center;margin:0 auto'>
-            <thead>
-                <tr>
-                    <td colspan="9">
-                        <h3 style='text-align:center'>作番大日程(新梯)</h3>
-                    </td>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <th>合約號</th>
-                    <td><input type="text" class='form-control' id='contractno' name='contractno' value="<?php echo $contractno; ?>"></td>
-                    <th>電梯編號</th>
-                    <td><input type="text" class='form-control' id='facilityno' name='facilityno' value="<?php echo $facilityno; ?>"></td>
-                    <th>客戶姓名</th>
-                    <td><input type="text" class='form-control' id='custom' name='custom' value="<?php echo $custom; ?>"></td>
-                    <th>預計出貨日</th>
-                    <td colspan="2">
-                        <input type="date" class='form-control' id='real_contract_arrival_date_start' name='real_contract_arrival_date_start' value="<?php echo $real_contract_arrival_date_start; ?>" style='width:40%;display:inline;'>
-                        ～
-                        <input type="date" class='form-control' id='real_contract_arrival_date_end' name='real_contract_arrival_date_end' value="<?php echo $real_contract_arrival_date_end; ?>" style='width:40%;display:inline;'>
-                    </td>
-                </tr>
-                <tr>
-                    <th>
-                        區域
-                    </th>
-                    <td>
-                        <?php
-                        $area_status = array(
-                            "" => "全部",
-                            "N" => "N：北區",
-                            "Y" => "Y：宜蘭",
-                            "T" => "T：桃區",
-                            "C" => "C：中區",
-                            "K" => "K：南區"
-                        );
-                        ?>
-                        <select name="area_no" id="area_no">
-                            <?php
-                            foreach ($area_status as $key => $val) {
-                                if ((string)$area_no == (string)$key) {
-                                    echo "<option value='$key' selected>$val</option>";
-                                } else {
-                                    echo "<option value='$key'>$val</option>";
-                                }
-                            }
-                            ?>
-                        </select>
-                    </td>
-                    <th>
-                        工勘狀態
-                    </th>
-                    <td>
-                        <?php
-                        $site_survey_status = array(
-                            "0" => "已確認",
-                            "1" => "未確認",
-                            "2" => "無工勘需求",
-                            "A" => "未動工",
-                            "B" => "地下室施工",
-                            "C" => "打樁",
-                            "D" => "地基",
-                            "E" => "挖土",
-                            "G" => "機房",
-                            "H" => "機械式淨高",
-                            "M" => "樓中樓",
-                            "OH" => "最高層(頂樓高度)",
-                            "P" => "PIT(機坑深度)",
-                            "R" => "R 樓",
-                            "S" => "停工",
-                            "T" => "TOP",
-                            "TC" => "頂部間隙",
-                            "TS" => "行程",
-                            "TH" => "全高",
-                            "Y" => "已搭、已出",
-                            "YB" => "退購結案",
-                            "YF" => "既有建物",
-                            "YN" => "已搭、未出"
-                        );
-                        for ($i = 1; $i < 200; $i++) {
-                            $site_survey_status[$i . "F"] = $i . "F";
-                        }
-                        ?>
-                        <select style="width:100%;" name="site_survey_contact_verify" id="site_survey_contact_verify">
-                            <?php
-                            echo "<option value=''>全部</option>";
-                            foreach ($site_survey_status as $key => $val) {
-                                if ((string)$site_survey_contact_verify == (string)$key) {
-                                    echo "<option value='$key' selected>$val</option>";
-                                } else {
-                                    echo "<option value='$key'>$val</option>";
-                                }
-                            }
-                            ?>
-                        </select>
-                    </td>
-                    <td colspan="5" style='text-align:left'>
-                        <button type="submit" style='text-align:center; margin:0 auto' class="btn  btn-primary btn-sm">查詢</button>
-                        <?php
-                        if ($department_id == '321' || $department_id == '220') {
-                        ?>
-                            <a href="wipwhole-rec-invoice.php?function_name=wipwholestatus&<?php echo $token_link; ?>" class="btn btn-primary btn-sm">新增</a>
-                        <?php
-                        }
-                        ?>
-                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='day_before_input()'><?php echo $numberOfDaysToAdd; ?>天內資料</button>
-                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='day_before_all_input()'><?php echo $numberOfDaysToAdd; ?>天內資料(含今天以前)</button>
-                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='clean_all_input()'>清除</button>
-                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='generateButton()'>匯出excel</button>
-                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='estimatedShippingDateReportButton()'>出貨地區預定明細</button>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </form>
-</div>
-<nav class="navbar navbar-tabs" style="margin:0;margin-top:5px;">
-    <div class="container-fluid">
-        <ul class="nav nav-pills">
-            <li class="active">
-                <a href="#" onclick="showAllTable()">全部資料</a>
-            </li>
-            <li>
-                <a href="#" onclick="showATable()">營業確認中</a>
-            </li>
-            <li>
-                <a href="#" onclick="showBTable()">設計確認中</a>
-            </li>
-            <li>
-                <a href="#" onclick="showGTable()">廠務確認中</a>
-            </li>
-            <li>
-                <a href="#" onclick="showCHTable()">生管理確認中</a>
-            </li>
-            <li>
-                <a href="#" onclick="showZTable()">已結案</a>
-            </li>
-        </ul>
-    </div>
-</nav>
-<?php
-$dataArr = array(
-    "All" => $data,
-    "A" => $dataA,
-    "B" => $dataB,
-    "G" => $dataG,
-    "CH" => $dataCH,
-    "Z" => $dataZ
-);
-foreach ($dataArr as $key => $val) {
-    if ($val) :
-        $dataDetailsArr = $val;
-        echo "<div id='data_" . $key . "_table_div' class='data_table_div' style='overflow-x:auto;'>";
-        include "wipwhole-index-table-html.php";
-        echo "</div>";
-    endif;
-}
-
-
-// 結束連線
-mysqli_close($link);
-?>
-<link href="/wms/css/select2.min.css" rel="stylesheet" />
-<script src="/wms/css/select2.min.js"></script>
-<script src="/wms/css/dataTables.fixedColumns.min.js"></script>
-<style>
-    .dataTables_scrollHead .dataTable {
-        margin-bottom: -2px;
-    }
-
-    .dataTables_scrollBody .dataTable {
-        margin-bottom: 0;
-    }
-
-    table {
-        margin-left: 0px;
-    }
-</style>
-<script>
-    var sheetNum = "<?php echo empty($_GET['sheetNum']) ? 'All' : $_GET['sheetNum']; ?>";
-
-    $(document).ready(function() {
-        $('#site_survey_contact_verify').select2();
-    });
-
-    $(function() {
-        $(".data_table_div").hide();
-        showTable(sheetNum);
-    })
-
-    const formData = new FormData();
-    formData.append("contractno", "<?php echo empty($_POST['contractno']) ? null : $_POST['contractno']; ?>");
-    formData.append("facilityno", "<?php echo empty($_POST['facilityno']) ? null : $_POST['facilityno']; ?>");
-    formData.append("custom", "<?php echo empty($_POST['custom']) ? null : $_POST['custom']; ?>");
-    formData.append("site_survey_contact_verify", "<?php echo empty($_POST['site_survey_contact_verify']) ? '' : $_POST['site_survey_contact_verify']; ?>");
-    formData.append("real_contract_arrival_date_start", "<?php echo empty($_POST['real_contract_arrival_date_start']) ? null : $_POST['real_contract_arrival_date_start']; ?>");
-    formData.append("real_contract_arrival_date_end", "<?php echo empty($_POST['real_contract_arrival_date_end']) ? null : $_POST['real_contract_arrival_date_end']; ?>");
-    formData.append("area_no", "<?php echo empty($_POST['area_no']) ? null : $_POST['area_no']; ?>");
-
-    // 使用 JavaScript 監聽按鈕點擊事件
-    function generateButton() {
-        // 使用 XMLHttpRequest 來呼叫 PHP 檔案，生成 Excel
-        var xhr = new XMLHttpRequest();
-        xhr.open('POST', window.location.origin + "/wms/wipwhole-index-export-excel.php?<?= $token_link ?>", true);
-        xhr.responseType = 'text';
-        xhr.onload = function() {
-            if (xhr.status === 200) {
-                // 取得 PHP 回傳的檔案路徑
-                var response = xhr.responseText;
-                console.log(xhr.responseText);
-                var file_path = xhr.responseText;
-                // 創建下載連結
-                var link = document.createElement('a');
-                link.setAttribute('href', window.location.origin + "/wms/excel/gary_test.xlsx");
-                // 設定下載的檔案名稱
-                link.setAttribute('download', '作番大日程報表(新梯).xlsx');
-                link.style.display = 'none';
-                document.body.appendChild(link);
-                link.click();
-                document.body.removeChild(link);
-            }
-        };
-        xhr.send(formData);
-    }
-
-    function clean_all_input() {
-        document.getElementById("site_survey_contact_verify").value = "";
-        document.getElementById("contractno").value = "";
-        document.getElementById("facilityno").value = "";
-        document.getElementById("custom").value = "";
-        document.getElementById("real_contract_arrival_date_start").value = "";
-        document.getElementById("real_contract_arrival_date_end").value = "";
-        document.getElementById("myForm").submit();
-    }
-
-    function day_before_input() {
-        document.getElementById("contractno").value = "";
-        document.getElementById("facilityno").value = "";
-        document.getElementById("custom").value = "";
-        document.getElementById("real_contract_arrival_date_start").value = "<?php echo date("Y-m-d"); ?>";
-        document.getElementById("real_contract_arrival_date_end").value = "<?php echo date("Y-m-d", strtotime("+" . $numberOfDaysToAdd . " days")) ?>";
-        document.getElementById("myForm").submit();
-    }
-
-    function day_before_all_input() {
-        document.getElementById("contractno").value = "";
-        document.getElementById("facilityno").value = "";
-        document.getElementById("custom").value = "";
-        document.getElementById("real_contract_arrival_date_start").value = "";
-        document.getElementById("real_contract_arrival_date_end").value = "<?php echo date("Y-m-d", strtotime("+" . $numberOfDaysToAdd . " days")) ?>";
-        document.getElementById("myForm").submit();
-    }
-
-    function showAllTable() {
-        sheetNum = "All";
-        window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
-    }
-
-    function showATable() {
-        sheetNum = "A";
-        window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
-    }
-
-    function showBTable() {
-        sheetNum = "B";
-        window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
-    }
-
-    function showGTable() {
-        sheetNum = "G";
-        window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
-    }
-
-    function showCHTable() {
-        sheetNum = "CH";
-        window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
-    }
-
-    function showZTable() {
-        sheetNum = "Z";
-        window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
-    }
-
-    function showTable(code) {
-        var tmp_arr = {
-            "All": "1",
-            "A": "2",
-            "B": "3",
-            "G": "4",
-            "CH": "5",
-            "Z": "6",
-        }
-        $("body > nav.navbar.navbar-tabs > div > ul > li").attr("class", "");
-        $("body > nav.navbar.navbar-tabs > div > ul > li:nth-child(" + tmp_arr[code] + ")").attr("class", "active");
-        $(".data_table_div").hide();
-        $("#data_" + code + "_table_div").show();
-    }
-
-    function estimatedShippingDateReportButton() {
-        window.location.href = '<?php echo "/wms/estimated_shipping_date_report.php?$token_link" ?>';
-    }
-
-    $('#table_index2,#table_index3,#table_index4,#table_index5,#table_index6,#table_index7').DataTable({
-            scrollX: true,
-            fixedHeader: true,
-            scrollY: 500,
-            "language": {
-                "emptyTable": "無資料...",
-                "processing": "處理中...",
-                "loadingRecords": "載入中...",
-                "lengthMenu": "顯示_MENU_　筆",
-                "zeroRecords": "沒有符合的結果",
-                "info": "第 _START_ 至 _END_ 項，共 _TOTAL_ 項",
-                "infoEmpty": "第 0 至 0 項，共 0 項",
-                "infoFiltered": "(從 _MAX_ 項結果中過濾)",
-                "infoPostFix": "",
-                "search": "",
-                "paginate": {
-                    "first": "第一頁",
-                    "previous": "上一頁",
-                    "next": "下一頁",
-                    "last": "最後一頁"
-                },
-                "aria": {
-                    "sortAscending": ": 升冪排列",
-                    "sortDescending": ": 降冪排列"
-                }
-            }
-        }, {
-            "order": [
-                [4, "desc"],
-                [8, "asc"]
-            ]
-        }
-
-    );
-    document.querySelector("#table_index2_filter > label > input").placeholder = "快速搜尋";
-    document.querySelector("#table_index3_filter > label > input").placeholder = "快速搜尋";
-    document.querySelector("#table_index4_filter > label > input").placeholder = "快速搜尋";
-    document.querySelector("#table_index5_filter > label > input").placeholder = "快速搜尋";
-    document.querySelector("#table_index6_filter > label > input").placeholder = "快速搜尋";
-    document.querySelector("#table_index7_filter > label > input").placeholder = "快速搜尋";
-
-    // datatable 畫面重整後保留資料
-
-    var contractno = $("#contractno").val();
-    var facilityno = $("#facilityno").val();
-    var custom = $("#custom").val();
-    var site_survey_contact_verify = $("#site_survey_contact_verify").val();
-    var real_contract_arrival_date_start = $("#real_contract_arrival_date_start").val();
-    var real_contract_arrival_date_end = $("#real_contract_arrival_date_end").val();
-    var area_no = $("#area_no").val();
-
-    var showNum = <?php echo empty($_GET['showNum']) ? '10' : $_GET['showNum']; ?>;
-    var nowPage = <?php echo empty($_GET['nowPage']) ? '1' : $_GET['nowPage']; ?>;
-    var searchContent = "<?php echo empty($_GET['searchContent']) ? '' : $_GET['searchContent']; ?>";
-    var orderColumn = "<?php echo empty($_GET['orderColumn']) ? '' : $_GET['orderColumn']; ?>";
-    var orderDirection = "<?php echo empty($_GET['orderDirection']) ? '' : $_GET['orderDirection']; ?>";
-
-    var dataArr2 = {
-        "All": "table_index2",
-        "A": "table_index3",
-        "B": "table_index4",
-        "G": "table_index5",
-        "CH": "table_index6",
-        "Z": "table_index7",
-    }
-
-    var table = $('#' + dataArr2[sheetNum]).DataTable();
-
-    // 设置排序信息
-    if (orderColumn !== '' && orderDirection !== '') {
-        table.order([orderColumn, orderDirection]).draw();
-    }
-
-    table.search(searchContent).draw();
-    table.page.len(showNum).draw();
-    table.page((nowPage) - 1).draw('page');
-
-    // 監聽排序
-    table.on('order.dt', function() {
-        var order = table.order();
-        orderColumn = order[0][0];
-        orderDirection = order[0][1];
-    });
-
-    // 監聽頁碼
-    table.on('page.dt', function() {
-        searchDatatable(table);
-    });
-
-    // 監聽資料筆數
-    table.on('length.dt', function(e, settings, len) {
-        searchDatatable(table);
-    });
-
-    // 監聽搜尋事件
-    $("#" + dataArr2[sheetNum] + "_filter > label > input").change(function() {
-        searchDatatable(table);
-    });
-
-    function searchDatatable(table) {
-        showNum = table.page.len();
-        nowPage = table.page.info().page + 1;
-        searchContent = table.search();
-        window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" +
-            "&showNum=" + showNum + "&nowPage=" + nowPage + "&searchContent=" + searchContent + "&sheetNum=" + sheetNum +
-            "&orderColumn=" + orderColumn + "&orderDirection=" + orderDirection +
-            "&contractno=" + contractno + "&facilityno=" + facilityno + "&custom=" + custom +
-            "&site_survey_contact_verify=" + site_survey_contact_verify + "&real_contract_arrival_date_start=" + real_contract_arrival_date_start +
-            "&real_contract_arrival_date_end=" + real_contract_arrival_date_end + "&area_no=" + area_no;
-    }
-
-    function delete_wipwholestatus(id) {
-        $("#del_seq").val(id);
-        alert(id)
-        $("#del_form").submit();
-    }
-</script>
-<form id='del_form' method='post'>
-    <input type='hidden' id='del_seq' name='del_seq' value='' />
-    <input type='hidden' id='form_name' name='form_name' value='del_form' />
+<div id="loadingOverlay" class="hidden">
+    <div class="loading-icon"></div>
+</div>
+<script>
+    document.getElementById('loadingOverlay').classList.remove('hidden');
+</script>
+<?php
+// ini_set('display_errors', 'on');
+/**
+ * 權限規則:
+ * 1.營業經理查看全部 部門代碼:311 312 313 314 315
+ * 2.營業員瀏覽自己合約資料 部門代碼:311 312 313 314 315
+ * 3.設計部門代碼:911
+ * 4.工務:宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113)  南=韋宗榮(M0039)改鄭存邑(M0102)
+ * 5.生管:伃廷(M0024)
+ * 6.鍾哥(生管) 部門代碼:250 職位大小:1 4
+ * 7.許協理 部門代碼:320 職位大小:1
+ * 8.詹總 部門代碼:50 職位大小:1
+ * 9.許總 部門代碼:20 職位大小:1
+ * 
+ *  新梯        543 筆  (已匯入)
+ *  舊改        141 筆  (已匯入)
+ *  已簽回      684 筆 (共計)
+ */
+include "header.php";
+
+// 設定警告出貨到期的天數
+$numberOfDaysToAdd = 45;
+$futureDate = date("Y/m/d", strtotime(date("Y-m-d") . " +{$numberOfDaysToAdd} days"));
+
+include "wipwhole-index-function.php";
+include "css/view/wipwhole-index.php";
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    $form_name = empty($_REQUEST['form_name']) ? null : $_REQUEST['form_name'];
+    $del_seq = empty($_REQUEST['del_seq']) ? null : $_REQUEST['del_seq'];
+    if ($form_name == 'del_form') {
+        $sql = "UPDATE wipwholestatus SET status = '0' WHERE id = '$del_seq' ";
+        mysqli_query($link, $sql);
+    }
+}
+
+// 取得當前使用者所屬部門
+$department_id = getDepartmentId($link, $user_id);
+// 取得當前使用者所屬職位
+$role_id = getRoleId($link, $user_id);
+
+// 下方編輯按鈕權限
+// 1=營叢 2=設計 4=工務 8=生管 15=其他
+
+$edit_flag = getEditFlag($department_id, $role_id, $user_id);
+
+
+// 接受搜尋 post 後觸發
+$contractno = empty($_REQUEST['contractno']) ? null : $_REQUEST['contractno'];
+$facilityno = empty($_REQUEST['facilityno']) ? null : $_REQUEST['facilityno'];
+$custom = empty($_REQUEST['custom']) ? null : $_REQUEST['custom'];
+$site_survey_contact_verify = !isset($_REQUEST['site_survey_contact_verify']) ? '' : $_REQUEST['site_survey_contact_verify'];
+$real_contract_arrival_date_start = empty($_REQUEST['real_contract_arrival_date_start']) ? null : $_REQUEST['real_contract_arrival_date_start'];
+$real_contract_arrival_date_end = empty($_REQUEST['real_contract_arrival_date_end']) ? null : $_REQUEST['real_contract_arrival_date_end'];
+$area_no = !isset($_REQUEST['area_no']) ? '' : $_REQUEST['area_no'];
+$sheetNum = empty($_GET['sheetNum']) ? 'All' : $_GET['sheetNum'];
+
+$tableArr = array(
+    "All" => "",
+    "A" => "A",
+    "B" => "B",
+    "G" => "G",
+    "CH" => "C,H",
+    "Z" => "Z"
+);
+
+if (empty($sheetNum) || $sheetNum == "All") {
+    $sql = getDataSql($department_id, $role_id, $user_id);
+} else {
+    $sql = getDataSqlByFlowCode($department_id, $role_id, $user_id, $tableArr[$sheetNum]);
+}
+// 取得資料 sql
+$data = mysqli_query($link, $sql);
+
+
+
+?>
+
+<div style="overflow-x:auto;">
+    <form id='myForm' method='post' action='wipwhole-index.php?<?= $token_link ?>'>
+        <table class='table query-table table-striped table-bordered display compact' style='width:98%;text-align:center;margin:0 auto'>
+            <thead>
+                <tr>
+                    <td colspan="9">
+                        <h3 style='text-align:center'>作番大日程(新梯)</h3>
+                    </td>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <th>合約號</th>
+                    <td><input type="text" class='form-control' id='contractno' name='contractno' value="<?php echo $contractno; ?>"></td>
+                    <th>電梯編號</th>
+                    <td><input type="text" class='form-control' id='facilityno' name='facilityno' value="<?php echo $facilityno; ?>"></td>
+                    <th>客戶姓名</th>
+                    <td><input type="text" class='form-control' id='custom' name='custom' value="<?php echo $custom; ?>"></td>
+                    <th>預計出貨日</th>
+                    <td colspan="2">
+                        <input type="date" class='form-control' id='real_contract_arrival_date_start' name='real_contract_arrival_date_start' value="<?php echo $real_contract_arrival_date_start; ?>" style='width:40%;display:inline;'>
+                        ～
+                        <input type="date" class='form-control' id='real_contract_arrival_date_end' name='real_contract_arrival_date_end' value="<?php echo $real_contract_arrival_date_end; ?>" style='width:40%;display:inline;'>
+                    </td>
+                </tr>
+                <tr>
+                    <th>
+                        區域
+                    </th>
+                    <td>
+                        <?php
+                        $area_status = array(
+                            "" => "全部",
+                            "N" => "N：北區",
+                            "Y" => "Y：宜蘭",
+                            "T" => "T：桃區",
+                            "C" => "C：中區",
+                            "K" => "K：南區"
+                        );
+                        ?>
+                        <select name="area_no" id="area_no">
+                            <?php
+                            foreach ($area_status as $key => $val) {
+                                if ((string)$area_no == (string)$key) {
+                                    echo "<option value='$key' selected>$val</option>";
+                                } else {
+                                    echo "<option value='$key'>$val</option>";
+                                }
+                            }
+                            ?>
+                        </select>
+                    </td>
+                    <th>
+                        工勘狀態
+                    </th>
+                    <td>
+                        <?php
+                        $site_survey_status = array(
+                            "0" => "已確認",
+                            "1" => "未確認",
+                            "2" => "無工勘需求",
+                            "A" => "未動工",
+                            "B" => "地下室施工",
+                            "C" => "打樁",
+                            "D" => "地基",
+                            "E" => "挖土",
+                            "G" => "機房",
+                            "H" => "機械式淨高",
+                            "M" => "樓中樓",
+                            "OH" => "最高層(頂樓高度)",
+                            "P" => "PIT(機坑深度)",
+                            "R" => "R 樓",
+                            "S" => "停工",
+                            "T" => "TOP",
+                            "TC" => "頂部間隙",
+                            "TS" => "行程",
+                            "TH" => "全高",
+                            "Y" => "已搭、已出",
+                            "YB" => "退購結案",
+                            "YF" => "既有建物",
+                            "YN" => "已搭、未出"
+                        );
+                        for ($i = 1; $i < 200; $i++) {
+                            $site_survey_status[$i . "F"] = $i . "F";
+                        }
+                        ?>
+                        <select style="width:100%;" name="site_survey_contact_verify" id="site_survey_contact_verify">
+                            <?php
+                            echo "<option value=''>全部</option>";
+                            foreach ($site_survey_status as $key => $val) {
+                                if ((string)$site_survey_contact_verify == (string)$key) {
+                                    echo "<option value='$key' selected>$val</option>";
+                                } else {
+                                    echo "<option value='$key'>$val</option>";
+                                }
+                            }
+                            ?>
+                        </select>
+                    </td>
+                    <td colspan="5" style='text-align:left'>
+                        <button type="submit" style='text-align:center; margin:0 auto' class="btn  btn-primary btn-sm">查詢</button>
+                        <?php
+                        if ($department_id == '321' || $department_id == '220') {
+                        ?>
+                            <a href="wipwhole-rec-invoice.php?function_name=wipwholestatus&<?php echo $token_link; ?>" class="btn btn-primary btn-sm">新增</a>
+                        <?php
+                        }
+                        ?>
+                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='day_before_input()'><?php echo $numberOfDaysToAdd; ?>天內資料</button>
+                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='day_before_all_input()'><?php echo $numberOfDaysToAdd; ?>天內資料(含今天以前)</button>
+                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='clean_all_input()'>清除</button>
+                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='generateButton()'>匯出excel</button>
+                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='estimatedShippingDateReportButton()'>出貨地區預定明細</button>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </form>
+</div>
+<nav class="navbar navbar-tabs" style="margin:0;margin-top:5px;">
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-9 col-12">
+                <ul class="nav nav-pills">
+                    <li class="active">
+                        <a href="#" onclick="showAllTable()">全部資料</a>
+                    </li>
+                    <li>
+                        <a href="#" onclick="showATable()">營業確認中</a>
+                    </li>
+                    <li>
+                        <a href="#" onclick="showBTable()">設計確認中</a>
+                    </li>
+                    <li>
+                        <a href="#" onclick="showGTable()">廠務確認中</a>
+                    </li>
+                    <li>
+                        <a href="#" onclick="showCHTable()">生管理確認中</a>
+                    </li>
+                    <li>
+                        <a href="#" onclick="showZTable()">已結案</a>
+                    </li>
+                </ul>
+            </div>
+            <div class="col-md-3 col-12 text-right" id="myBtn">
+                <button class="btn btn-primary " type="button">欄位維護權限</button>
+            </div>
+        </div>
+    </div>
+</nav>
+
+<div id="myModal" class="modal">
+    <div class="back"></div>
+    <div class="modal-content">
+        <button type="button" class="close" id="myCloseBtn">X</button>
+        <div class='col-12' style='text-align:center'>
+            <h3>欄位維護權限</h3>
+            <hr>
+            <div class='row'>
+                <div class='col-12'>
+                    <table class="table table-bordered" style="width:50%; margin:0 auto;">
+                        <tr>
+                            <th style="text-align:right;">欄位</th>
+                            <th style="text-align:left;">維護單位</th>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">合約號</td>
+                            <td style="text-align:left;">業務部</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">電梯編號</td>
+                            <td style="text-align:left;">業務部</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">客戶姓名</td>
+                            <td style="text-align:left;">業務部</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">規格</td>
+                            <td style="text-align:left;">業務部</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">地址</td>
+                            <td style="text-align:left;">業務部(營業人員 or 工勘人員透過申請單)</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">工勘狀態</td>
+                            <td style="text-align:left;">工勘人員</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">合約交期(到工地)</td>
+                            <td style="text-align:left;">業務部</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">下單日(普來特富)</td>
+                            <td style="text-align:left;">業務部</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">預計到廠日(觀音廠)</td>
+                            <td style="text-align:left;">生管部門</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">實際到廠日(觀音廠)</td>
+                            <td style="text-align:left;">生管部門</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">預計出貨日(到工地)</td>
+                            <td style="text-align:left;">業務部(營業人員 or 工勘人員透過申請單)</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">實際出貨日(到工地)</td>
+                            <td style="text-align:left;">生管部門</td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<?php
+
+echo "<div id='data_table_div' class='data_table_div' style='overflow-x:auto;'>";
+include "wipwhole-index-table-html.php";
+echo "</div>";
+
+
+
+// 結束連線
+mysqli_close($link);
+?>
+<link href="/wms/css/select2.min.css" rel="stylesheet" />
+<script src="/wms/css/select2.min.js"></script>
+<script src="/wms/css/dataTables.fixedColumns.min.js"></script>
+<style>
+    .dataTables_scrollHead .dataTable {
+        margin-bottom: -2px;
+    }
+
+    .dataTables_scrollBody .dataTable {
+        margin-bottom: 0;
+    }
+
+    table {
+        margin-left: 0px;
+    }
+</style>
+<script>
+    var sheetNum = "<?php echo $sheetNum; ?>";
+
+    $(document).ready(function() {
+        $('#site_survey_contact_verify').select2();
+    });
+
+    $(function() {
+        showTable(sheetNum);
+        document.getElementById('loadingOverlay').classList.add('hidden');
+    })
+
+    const formData = new FormData();
+    formData.append("contractno", "<?php echo empty($_POST['contractno']) ? null : $_POST['contractno']; ?>");
+    formData.append("facilityno", "<?php echo empty($_POST['facilityno']) ? null : $_POST['facilityno']; ?>");
+    formData.append("custom", "<?php echo empty($_POST['custom']) ? null : $_POST['custom']; ?>");
+    formData.append("site_survey_contact_verify", "<?php echo empty($_POST['site_survey_contact_verify']) ? '' : $_POST['site_survey_contact_verify']; ?>");
+    formData.append("real_contract_arrival_date_start", "<?php echo empty($_POST['real_contract_arrival_date_start']) ? null : $_POST['real_contract_arrival_date_start']; ?>");
+    formData.append("real_contract_arrival_date_end", "<?php echo empty($_POST['real_contract_arrival_date_end']) ? null : $_POST['real_contract_arrival_date_end']; ?>");
+    formData.append("area_no", "<?php echo empty($_POST['area_no']) ? null : $_POST['area_no']; ?>");
+
+    // 使用 JavaScript 監聽按鈕點擊事件
+    function generateButton() {
+        // 使用 XMLHttpRequest 來呼叫 PHP 檔案，生成 Excel
+        var xhr = new XMLHttpRequest();
+        xhr.open('POST', window.location.origin + "/wms/wipwhole-index-export-excel.php?<?= $token_link ?>", true);
+        xhr.responseType = 'text';
+        xhr.onload = function() {
+            if (xhr.status === 200) {
+                // 取得 PHP 回傳的檔案路徑
+                var response = xhr.responseText;
+                console.log(xhr.responseText);
+                var file_path = xhr.responseText;
+                // 創建下載連結
+                var link = document.createElement('a');
+                link.setAttribute('href', window.location.origin + "/wms/excel/gary_test.xlsx");
+                // 設定下載的檔案名稱
+                link.setAttribute('download', '作番大日程報表(新梯).xlsx');
+                link.style.display = 'none';
+                document.body.appendChild(link);
+                link.click();
+                document.body.removeChild(link);
+            }
+        };
+        xhr.send(formData);
+    }
+
+    function clean_all_input() {
+        document.getElementById("site_survey_contact_verify").value = "";
+        document.getElementById("contractno").value = "";
+        document.getElementById("facilityno").value = "";
+        document.getElementById("custom").value = "";
+        document.getElementById("real_contract_arrival_date_start").value = "";
+        document.getElementById("real_contract_arrival_date_end").value = "";
+        document.getElementById("myForm").submit();
+    }
+
+    function day_before_input() {
+        document.getElementById("contractno").value = "";
+        document.getElementById("facilityno").value = "";
+        document.getElementById("custom").value = "";
+        document.getElementById("real_contract_arrival_date_start").value = "<?php echo date("Y-m-d"); ?>";
+        document.getElementById("real_contract_arrival_date_end").value = "<?php echo date("Y-m-d", strtotime("+" . $numberOfDaysToAdd . " days")) ?>";
+        document.getElementById("myForm").submit();
+    }
+
+    function day_before_all_input() {
+        document.getElementById("contractno").value = "";
+        document.getElementById("facilityno").value = "";
+        document.getElementById("custom").value = "";
+        document.getElementById("real_contract_arrival_date_start").value = "";
+        document.getElementById("real_contract_arrival_date_end").value = "<?php echo date("Y-m-d", strtotime("+" . $numberOfDaysToAdd . " days")) ?>";
+        document.getElementById("myForm").submit();
+    }
+
+    function showAllTable() {
+        sheetNum = "All";
+        window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
+    }
+
+    function showATable() {
+        sheetNum = "A";
+        window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
+    }
+
+    function showBTable() {
+        sheetNum = "B";
+        window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
+    }
+
+    function showGTable() {
+        sheetNum = "G";
+        window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
+    }
+
+    function showCHTable() {
+        sheetNum = "CH";
+        window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
+    }
+
+    function showZTable() {
+        sheetNum = "Z";
+        window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" + "&sheetNum=" + sheetNum;
+    }
+
+    function showTable(code) {
+        var tmp_arr = {
+            "All": "1",
+            "A": "2",
+            "B": "3",
+            "G": "4",
+            "CH": "5",
+            "Z": "6",
+        }
+        $("nav.navbar.navbar-tabs  div > ul > li").attr("class", "");
+        $("nav.navbar.navbar-tabs  div > ul > li:nth-child(" + tmp_arr[code] + ")").attr("class", "active");
+    }
+
+    function estimatedShippingDateReportButton() {
+        window.location.href = '<?php echo "/wms/estimated_shipping_date_report.php?$token_link" ?>';
+    }
+
+    $('#table_index2').DataTable({
+            scrollX: true,
+            fixedHeader: true,
+            scrollY: 500,
+            "language": {
+                "emptyTable": "無資料...",
+                "processing": "處理中...",
+                "loadingRecords": "載入中...",
+                "lengthMenu": "顯示_MENU_　筆",
+                "zeroRecords": "沒有符合的結果",
+                "info": "第 _START_ 至 _END_ 項，共 _TOTAL_ 項",
+                "infoEmpty": "第 0 至 0 項，共 0 項",
+                "infoFiltered": "(從 _MAX_ 項結果中過濾)",
+                "infoPostFix": "",
+                "search": "",
+                "paginate": {
+                    "first": "第一頁",
+                    "previous": "上一頁",
+                    "next": "下一頁",
+                    "last": "最後一頁"
+                },
+                "aria": {
+                    "sortAscending": ": 升冪排列",
+                    "sortDescending": ": 降冪排列"
+                }
+            }
+        }, {
+            "order": [
+                [4, "desc"],
+                [8, "asc"]
+            ]
+        }
+
+    );
+    document.querySelector("#table_index2_filter > label > input").placeholder = "快速搜尋";
+
+    // datatable 畫面重整後保留資料
+
+    var contractno = $("#contractno").val();
+    var facilityno = $("#facilityno").val();
+    var custom = $("#custom").val();
+    var site_survey_contact_verify = $("#site_survey_contact_verify").val();
+    var real_contract_arrival_date_start = $("#real_contract_arrival_date_start").val();
+    var real_contract_arrival_date_end = $("#real_contract_arrival_date_end").val();
+    var area_no = $("#area_no").val();
+
+    var showNum = <?php echo empty($_GET['showNum']) ? '10' : $_GET['showNum']; ?>;
+    var nowPage = <?php echo empty($_GET['nowPage']) ? '1' : $_GET['nowPage']; ?>;
+    var searchContent = "<?php echo empty($_GET['searchContent']) ? '' : $_GET['searchContent']; ?>";
+    var orderColumn = "<?php echo empty($_GET['orderColumn']) ? '' : $_GET['orderColumn']; ?>";
+    var orderDirection = "<?php echo empty($_GET['orderDirection']) ? '' : $_GET['orderDirection']; ?>";
+
+    var table = $('#table_index2').DataTable();
+
+    // 设置排序信息
+    if (orderColumn !== '' && orderDirection !== '') {
+        table.order([orderColumn, orderDirection]).draw();
+    }
+
+    table.search(searchContent).draw();
+    table.page.len(showNum).draw();
+    table.page((nowPage) - 1).draw('page');
+
+    // 監聽排序
+    table.on('order.dt', function() {
+        var order = table.order();
+        orderColumn = order[0][0];
+        orderDirection = order[0][1];
+    });
+
+    // 監聽頁碼
+    table.on('page.dt', function() {
+        searchDatatable(table);
+    });
+
+    // 監聽資料筆數
+    table.on('length.dt', function(e, settings, len) {
+        searchDatatable(table);
+    });
+
+    // 監聽搜尋事件
+    $("#table_index2_filter > label > input").change(function() {
+        searchDatatable(table);
+    });
+
+    function searchDatatable(table) {
+        showNum = table.page.len();
+        nowPage = table.page.info().page + 1;
+        searchContent = table.search();
+        window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" +
+            "&showNum=" + showNum + "&nowPage=" + nowPage + "&searchContent=" + searchContent + "&sheetNum=" + sheetNum +
+            "&orderColumn=" + orderColumn + "&orderDirection=" + orderDirection +
+            "&contractno=" + contractno + "&facilityno=" + facilityno + "&custom=" + custom +
+            "&site_survey_contact_verify=" + site_survey_contact_verify + "&real_contract_arrival_date_start=" + real_contract_arrival_date_start +
+            "&real_contract_arrival_date_end=" + real_contract_arrival_date_end + "&area_no=" + area_no;
+    }
+
+    function delete_wipwholestatus(id) {
+        $("#del_seq").val(id);
+        alert(id)
+        $("#del_form").submit();
+    }
+</script>
+
+<script>
+    var modal = document.getElementById("myModal");
+    $("#myBtn").click(function() {
+        $("#myModal").show();
+    });
+    $("#myCloseBtn").click(function(e) {
+        console.log(e.target);
+        $("#myModal").hide();
+        // modal.style.display = "none"
+    });
+    $(".back").click(function(e) {
+        $("#myModal").hide();
+        // modal.style.display = "none"
+    });
+</script>
+<form id='del_form' method='post'>
+    <input type='hidden' id='del_seq' name='del_seq' value='' />
+    <input type='hidden' id='form_name' name='form_name' value='del_form' />
 </form>
\ No newline at end of file
diff --git a/wms/wipwhole-rec-invoice-edit-fileupload.php b/wms/wipwhole-rec-invoice-edit-fileupload.php
index 98acc091..3f7ce8ac 100644
--- a/wms/wipwhole-rec-invoice-edit-fileupload.php
+++ b/wms/wipwhole-rec-invoice-edit-fileupload.php
@@ -1,69 +1,71 @@
-<?php
-
-function fileIUpload($post_name)
-{
-    if ($_FILES[$post_name]["error"] == 0) {
-        $datetime = date("YmdHis");
-        $file_name = str_replace("#", "", $_FILES[$post_name]["name"]);
-        $temp_file_name = $_FILES[$post_name]["tmp_name"];
-        $target_dir = empty($file_name) ? "" : "public-wipwhole/";
-        $sales_spec_verify_file = strtolower($target_dir . basename($datetime . $file_name));
-        if (file_exists($sales_spec_verify_file))
-            unlink($sales_spec_verify_file);
-        move_uploaded_file($temp_file_name, $sales_spec_verify_file);
-        if (!empty($file_name)) {
-            return strtolower($target_dir . basename($datetime . $file_name));
-        } else {
-            return "";
-        }
-    } else {
-        return "";
-    }
-}
-
-function fileIUploads($post_name)
-{
-    $file_arr = [];
-    if (isset($_FILES[$post_name])) {
-        foreach ($_FILES[$post_name]['tmp_name'] as $key => $tmp_name) {
-            $file_name = $_FILES[$post_name]['name'][$key];
-            $temp_file_name = $_FILES[$post_name]['tmp_name'][$key];
-            $target_dir = empty($file_name) ? "" : "public-wipwhole/";
-            $datetime = date("YmdHis");
-            $sales_spec_verify_file = strtolower($target_dir . basename($datetime . $file_name));
-            if (file_exists($sales_spec_verify_file))
-                unlink($sales_spec_verify_file);
-            move_uploaded_file($temp_file_name, $sales_spec_verify_file);
-            if (!empty($file_name)) {
-                array_push($file_arr, strtolower($target_dir . basename($datetime . $file_name)));
-            }
-        }
-    }
-    if (count($file_arr) !== 0)
-        return json_encode($file_arr, JSON_UNESCAPED_UNICODE);
-    return "";
-}
-
-// 營業
-$sales_spec_verify_file = fileIUpload("sales_spec_verify_file");
-$customer_planning_verify_file = fileIUpload("customer_planning_verify_file");
-$customer_color_verify_file = fileIUpload("customer_color_verify_file");
-$customer_style_verify_file = fileIUpload("customer_style_verify_file");
-$site_survey_contact_form_verify_file = fileIUpload("site_survey_contact_form_verify_file");
-// 設計
-$desin_spec_verify_file = fileIUpload("desin_spec_verify_file");
-$desin_planning_verify_file = fileIUpload("desin_planning_verify_file");
-$desin_color_verify_file = fileIUpload("desin_color_verify_file");
-$desin_style_verify_file = fileIUpload("desin_style_verify_file");
-$desin_documents_verify_file = fileIUpload("desin_documents_verify_file");
-// 設計主管
-$desin_leader_verify_file = fileIUpload("desin_leader_verify_file");
-// 工務
-$building_heigh_verify_file = fileIUpload("building_heigh_verify_file");
-$site_survey_contact_verify_file = fileIUpload("site_survey_contact_verify_file");
-$plan_diagram_file = fileIUpload("plan_diagram_file");
-$completion_acceptance_file = fileIUpload("completion_acceptance_file");
-// 生管
-$shengguanok_status_file = fileIUpload("shengguanok_status_file");
-// 工務助理
-$outsourcer_contract_file = fileIUploads("outsourcer_contract_file");
+<?php
+
+function fileIUpload($post_name)
+{
+    if ($_FILES[$post_name]["error"] == 0) {
+        $datetime = date("YmdHis");
+        $file_name = str_replace("#", "", $_FILES[$post_name]["name"]);
+        $temp_file_name = $_FILES[$post_name]["tmp_name"];
+        $target_dir = empty($file_name) ? "" : "public-wipwhole/";
+        $sales_spec_verify_file = strtolower($target_dir . basename($datetime . $file_name));
+        if (file_exists($sales_spec_verify_file))
+            unlink($sales_spec_verify_file);
+        move_uploaded_file($temp_file_name, $sales_spec_verify_file);
+        if (!empty($file_name)) {
+            return strtolower($target_dir . basename($datetime . $file_name));
+        } else {
+            return "";
+        }
+    } else {
+        return "";
+    }
+}
+
+function fileIUploads($post_name)
+{
+    $file_arr = [];
+    if (isset($_FILES[$post_name])) {
+        foreach ($_FILES[$post_name]['tmp_name'] as $key => $tmp_name) {
+            $file_name = $_FILES[$post_name]['name'][$key];
+            $temp_file_name = $_FILES[$post_name]['tmp_name'][$key];
+            $target_dir = empty($file_name) ? "" : "public-wipwhole/";
+            $datetime = date("YmdHis");
+            $sales_spec_verify_file = strtolower($target_dir . basename($datetime . $file_name));
+            if (file_exists($sales_spec_verify_file))
+                unlink($sales_spec_verify_file);
+            move_uploaded_file($temp_file_name, $sales_spec_verify_file);
+            if (!empty($file_name)) {
+                array_push($file_arr, strtolower($target_dir . basename($datetime . $file_name)));
+            }
+        }
+    }
+    if (count($file_arr) !== 0)
+        return json_encode($file_arr, JSON_UNESCAPED_UNICODE);
+    return "";
+}
+
+// 營業
+$sales_spec_verify_file = fileIUpload("sales_spec_verify_file");
+$customer_planning_verify_file = fileIUpload("customer_planning_verify_file");
+$customer_color_verify_file = fileIUpload("customer_color_verify_file");
+$customer_style_verify_file = fileIUpload("customer_style_verify_file");
+$site_survey_contact_form_verify_file = fileIUpload("site_survey_contact_form_verify_file");
+// 設計
+$desin_spec_verify_file = fileIUpload("desin_spec_verify_file");
+$desin_planning_verify_file = fileIUpload("desin_planning_verify_file");
+$desin_color_verify_file = fileIUpload("desin_color_verify_file");
+$desin_style_verify_file = fileIUpload("desin_style_verify_file");
+$desin_documents_verify_file = fileIUpload("desin_documents_verify_file");
+// 設計主管
+$desin_leader_verify_file = fileIUpload("desin_leader_verify_file");
+// 工務
+$building_heigh_verify_file = fileIUpload("building_heigh_verify_file");
+$site_survey_contact_verify_file = fileIUpload("site_survey_contact_verify_file");
+$plan_diagram_file = fileIUpload("plan_diagram_file");
+$completion_acceptance_file = fileIUpload("completion_acceptance_file");
+// 生管
+$shengguanok_status_file = fileIUpload("shengguanok_status_file");
+// 工務助理
+$outsourcer_contract_file = fileIUploads("outsourcer_contract_file");
+// 品證
+$official_check_file = fileIUpload("official_check_file");
\ No newline at end of file
diff --git a/wms/wipwhole-rec-invoice-edit-submit.php b/wms/wipwhole-rec-invoice-edit-submit.php
index 0412cc22..cb94c7f0 100644
--- a/wms/wipwhole-rec-invoice-edit-submit.php
+++ b/wms/wipwhole-rec-invoice-edit-submit.php
@@ -1,996 +1,1263 @@
-<?php
-// ini_set('display_errors', 'on');
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    if ($_POST['form_name'] == 'main_form') {
-
-        foreach ($_POST as $k => $v) {
-            if ($k !== 'desin_taiwan_items_no' && $k !== 'desin_taiwan_items_name')
-                $$k = htmlspecialchars(stripslashes(trim($v)));
-        }
-
-        // 時間戳記
-        $datetime = date("Y-m-d H:i:s");
-
-        // 合約號
-        $contractno = $_POST['contractno'];
-        // 號機
-        $facility_temp_no = $_POST['facility_temp_no'];
-        // 作番號
-        $facilityno =  $_POST['facilityno'];
-        // 客戶名稱
-        $custom = $_POST['custom'];
-        // 工地負責人
-        $site_manager = $_POST['site_manager'];
-        // 緯度
-        $latitude = $_POST['latitude'];
-        // 經度
-        $longitude = $_POST['longitude'];
-        $weight = $_POST['weight'];
-        // 人乘
-        $numberofpassenger = $_POST['numberofpassenger'];
-        // 樓停
-        $numberofstop = $_POST['numberofstop'];
-        // 樓層
-        $numberoffloor = $_POST['numberoffloor'];
-        // 開門方式
-        $opentype = $_POST['opentype'];
-        // 速度
-        $speed = $_POST['speed'];
-        // 機型
-        $facility_kind = $_POST['facility_kind'];
-        // 地址
-        $address = $_POST['address'];
-        // 工地地址
-        $real_address = $_POST['real_address'];
-        //合約到貨日
-        $contract_arrival_date = $_POST['contract_arrival_date'];
-        //合約到貨日
-        $real_contract_arrival_date = $_POST['real_contract_arrival_date'];
-
-        //营业规格确认
-        $sales_spec_verify = $_POST['sales_spec_verify'];
-        $sales_spec_verify_at = $_POST['sales_spec_verify_at'] ?: $row['sales_spec_verify_at'];
-        $sales_spec_verify_owner = $_POST['sales_spec_verify_owner'] ?: $row['sales_spec_verify_owner'];
-        //客户计划图确认
-        $customer_planning_verify = $_POST['customer_planning_verify'];
-        $customer_planning_verify_at = $_POST['customer_planning_verify_at'] ?: $row['customer_planning_verify_at'];
-        $customer_planning_verify_owner = $_POST['customer_planning_verify_owner'] ?: $row['customer_planning_verify_owner'];
-        //客户颜色确认
-        $customer_color_verify = $_POST['customer_color_verify'];
-        $customer_color_verify_at = $_POST['customer_color_verify_at'] ?: $row['customer_color_verify_at'];
-        $customer_color_verify_owner = $_POST['customer_color_verify_owner'] ?: $row['customer_color_verify_owner'];
-        //客户颜色确认
-        $customer_style_verify = $_POST['customer_style_verify'];
-        $customer_style_verify_at = $_POST['customer_style_verify_at'] ?: $row['customer_style_verify_at'];
-        $customer_style_verify_owner = $_POST['customer_style_verify_owner'] ?: $row['customer_style_verify_owner'];
-        //工勘聯絡表	
-        $site_survey_contact_form_verify = $_POST['site_survey_contact_form_verify'];
-        $site_survey_contact_form_verify_at = $_POST['site_survey_contact_form_verify_at'] ?: $row['site_survey_contact_form_verify_at'];
-        $site_survey_contact_form_verify_owner = $_POST['site_survey_contact_form_verify_owner'] ?: $row['site_survey_contact_form_verify_owner'];
-
-        //设计规格确认
-        $desin_spec_verify = $_POST['desin_spec_verify'];
-        $desin_spec_verify_at = $_POST['desin_spec_verify_at'] ?: $row['desin_spec_verify_at'];
-        $desin_spec_verify_owner = $_POST['desin_spec_verify_owner'] ?: $row['desin_spec_verify_owner'];
-        //设计计划图确认
-        $desin_planning_verify = $_POST['desin_planning_verify'];
-        $desin_planning_verify_at = $_POST['desin_planning_verify_at'] ?: $row['desin_planning_verify_at'];
-        $desin_planning_verify_owner = $_POST['desin_planning_verify_owner'] ?: $row['desin_planning_verify_owner'];
-        //设计颜色确认
-        $desin_color_verify = $_POST['desin_color_verify'];
-        $desin_color_verify_at = $_POST['desin_color_verify_at'] ?: $row['desin_color_verify_at'];
-        $desin_color_verify_owner = $_POST['desin_color_verify_owner'] ?: $row['desin_color_verify_owner'];
-        //设计仕样确认
-        $desin_style_verify = $_POST['desin_style_verify'];
-        $desin_style_verify_at = $_POST['desin_style_verify_at'] ?: $row['desin_style_verify_at'];
-        $desin_style_verify_owner = $_POST['desin_style_verify_owner'] ?: $row['desin_style_verify_owner'];
-        //设计主管確認
-        $desin_leader_verify = $_POST['desin_leader_verify'];
-        $desin_leader_verify_at = $_POST['desin_leader_verify_at'] ?: $row['desin_leader_verify_at'];
-        $desin_leader_verify_owner = $_POST['desin_leader_verify_owner'] ?: $row['desin_leader_verify_owner'];
-        //楼高通报
-        $building_heigh_verify = $_POST['building_heigh_verify'];
-        $building_heigh_verify_at = $_POST['building_heigh_verify_at'] ?: $row['building_heigh_verify_at'];
-        $building_heigh_verify_owner = $_POST['building_heigh_verify_owner'] ?: $row['building_heigh_verify_owner'];
-        //工勘
-        $site_survey_contact_verify = $_POST['site_survey_contact_verify'];
-        $site_survey_contact_verify_at = $_POST['site_survey_contact_verify_at'] ?: $row['site_survey_contact_verify_at'];
-        $site_survey_contact_verify_owner = $_POST['site_survey_contact_verify_owner'] ?: $row['site_survey_contact_verify_owner'];
-        $old_site_survey_contact_verify = $_POST['old_site_survey_contact_verify'];
-
-        //是否齊備
-        $shengguanok_status = $_POST['shengguanok_status'];
-        $shengguanok_status_at = $_POST['shengguanok_status_at'];
-        $shengguanok_status_owner = $_POST['shengguanok_status_owner'] ?: $row['shengguanok_status_owner'];
-        //下單日(普萊特富)
-        $prattford_order_date_verify = $_POST['prattford_order_date_verify'];
-        $prattford_order_date = $_POST['prattford_order_date'];
-        $prattford_order_date_owner = $_POST['prattford_order_date_owner'] ?: $row['prattford_order_date_owner'];
-        // 預計發貨日(到港日)
-        $estimated_shipping_date_verify = $_POST['estimated_shipping_date_verify'];
-        $estimated_shipping_date = $_POST['estimated_shipping_date'];
-        $estimated_shipping_date_owner = $_POST['estimated_shipping_date_owner'] ?: $row['estimated_shipping_date_owner'];
-        // 預計船期(改成預計到廠日)
-        $estimated_shipping_schedule_date_verify = $_POST['estimated_shipping_schedule_date_verify'];
-        $estimated_shipping_schedule_date = $_POST['estimated_shipping_schedule_date'];
-        $estimated_shipping_schedule_date_owner = $_POST['estimated_shipping_schedule_date_owner'] ?: $row['estimated_shipping_schedule_date_owner'];
-        // 普來特富發貨類別
-        $goods_type = $_POST['goods_type'] ?: $row['goods_type'];
-        $goods_type_date = $_POST['goods_type_date'] ?: $row['goods_type_date'];
-        $goods_type_owner = $_POST['goods_type_owner'] ?: $row['goods_type_owner'];
-        // 台灣自理發貨類別
-        $taiwan_goods_type = $_POST['taiwan_goods_type'] ?: $row['taiwan_goods_type'];
-        $taiwan_goods_type_date = $_POST['taiwan_goods_type_date'];
-        $taiwan_goods_type_owner = $_POST['taiwan_goods_type_owner'] ?: $row['taiwan_goods_type_owner'];
-        // 實際到貨日
-        $arrival_date_verify = $_POST['arrival_date_verify'] ?: $row['arrival_date_verify'];
-        $actual_tofactory_date = $_POST['actual_tofactory_date'];
-        $arrival_date_owner = $_POST['arrival_date_owner'] ?: $row['arrival_da
-        te_owner'];
-
-        // 各部門備註
-        $marketing_remark = $_POST['marketing_remark'] ?: $row['marketing_remark'];
-        $desin_remark = $_POST['desin_remark'] ?: $row['desin_remark'];
-        $desin_leader_remark = $_POST['desin_leader_remark'] ?: $row['desin_leader_remark'];
-        $warehouse_remark = $_POST['warehouse_remark'] ?: $row['warehouse_remark'];
-        $yewu_remark = $_POST['yewu_remark'] ?: $row['yewu_remark'];
-        $shengguan_remark = $_POST['shengguan_remark'] ?: $row['shengguan_remark'];
-
-        // 台製件
-        $desin_taiwan_items_no = json_encode($_POST['desin_taiwan_items_no'], JSON_UNESCAPED_UNICODE);
-        $desin_taiwan_items_name = json_encode($_POST['desin_taiwan_items_name'], JSON_UNESCAPED_UNICODE);
-        $desin_taiwan_items_no = $desin_taiwan_items_no == 'null' ? null : $desin_taiwan_items_no;
-        $desin_taiwan_items_name = $desin_taiwan_items_name == 'null' ? null : $desin_taiwan_items_name;
-
-        // 品証部
-        $qc_date = $_POST['qc_date'] ?: $row['qc_date'];
-        $qc_date_owner = $_POST['qc_date_owner'] ?: $row['qc_date_owner'];
-        $end_qc_date = $_POST['end_qc_date'] ?: $row['end_qc_date'];
-        $end_qc_date_owner = $_POST['end_qc_date_owner'] ?: $row['end_qc_date_owner'];
-        $official_check_date = $_POST['official_check_date'] ?: $row['official_check_date'];
-        $old_official_check_date = $_POST['old_official_check_date'] ?: $row['old_official_check_date'];
-        $official_check_date_owner = $_POST['official_check_date_owner'] ?: $row['official_check_date_owner'];
-        $delivery_date = $_POST['delivery_date'] ?: $row['delivery_date'];
-        $delivery_date_owner = $_POST['delivery_date_owner'] ?: $row['delivery_date_owner'];
-
-        // 工務助理
-        $outsourcer_type = $_POST['outsourcer_type'];
-        $install_outsourcer = $_POST['install_outsourcer'];
-        $install_outsourcer_owner = $_POST['install_outsourcer_owner'];
-        $install_outsourcer_date = $_POST['install_outsourcer_date'];
-        $install_outsourcer_date_owner = $_POST['install_outsourcer_date_owner'];
-        $estimate_install_start_date = $_POST['estimate_install_start_date'];
-        $estimate_install_start_date_owner = $_POST['estimate_install_start_date_owner'];
-        $estimate_install_end_date = $_POST['estimate_install_end_date'];
-        $estimate_install_end_date_owner = $_POST['estimate_install_end_date_owner'];
-        $tryrun_outsourcer = $_POST['tryrun_outsourcer'];
-        $tryrun_outsourcer_owner = $_POST['tryrun_outsourcer_owner'];
-        $tryrun_outsourcer_date = $_POST['tryrun_outsourcer_date'];
-        $tryrun_outsourcer_date_owner = $_POST['tryrun_outsourcer_date_owner'];
-        $estimate_tryrun_start_date = $_POST['estimate_tryrun_start_date'];
-        $estimate_tryrun_start_date_owner = $_POST['estimate_tryrun_start_date_owner'];
-        $estimate_tryrun_end_date = $_POST['estimate_tryrun_end_date'];
-        $estimate_tryrun_end_date_owner = $_POST['estimate_tryrun_end_date_owner'];
-        $warehouse_assistant_remark = $_POST['warehouse_assistant_remark'];
-
-        $creater = $_POST['creater'];
-        $create_at = $_POST['create_at'];
-
-        // 上傳附件
-        include "wipwhole-rec-invoice-edit-fileupload.php";
-
-        // 工勘變更通知繪圖人員
-        if ($official_check_date !== $old_official_check_date) {
-            $sql = "
-                SELECT accountid 
-                FROM account
-                WHERE department_id = '250'
-                AND role_id IN ('1','2','3','4');
-            ";
-            $result = mysqli_query($link, $sql);
-            foreach ($result as $row) {
-                $permission = $row["accountid"];
-                $title = "客戶:$custom 作番:$facilityno 官檢日變更";
-                $content = "客戶:$custom 
-作番:$facilityno 
-官檢日 $old_official_check_date => $official_check_date";
-
-                $sql = "
-                INSERT INTO notice(
-                    kind,
-                    related_id,
-                    title,
-                    content,
-                    haveread,
-                    permission,
-                    creater,
-                    create_at
-                )VALUES(
-                    '1',
-                    '$id',
-                    '$title',
-                    '$content',
-                    null,
-                    '$permission',
-                    '$creater',
-                    '" . date("Y-m-d H:i:s") . "'
-                );
-            ";
-                mysqli_query($link, $sql);
-            }
-        }
-
-
-        // 工勘變更通知繪圖人員
-        if ($site_survey_contact_verify !== $old_site_survey_contact_verify) {
-            $site_survey_status = array(
-                "1" => "請選擇",
-                "0" => "已確認",
-                "2" => "無工勘需求",
-                "A" => "未動工",
-                "B" => "地下室施工",
-                "C" => "打樁",
-                "D" => "地基",
-                "E" => "挖土",
-                "G" => "機房",
-                "H" => "機械式淨高",
-                "M" => "樓中樓",
-                "OH" => "最高層(頂樓高度)",
-                "P" => "PIT(機坑深度)",
-                "R" => "R 樓",
-                "S" => "停工",
-                "T" => "TOP",
-                "TC" => "頂部間隙",
-                "TS" => "行程",
-                "TH" => "全高",
-                "Y" => "已搭、已出",
-                "YB" => "退購結案",
-                "YF" => "既有建物",
-                "YN" => "已搭、未出"
-            );
-            $sql = "
-                SELECT accountid 
-                FROM account
-                WHERE department_id = '321'
-                AND role_id IN ('2','3','5');
-            ";
-            $result = mysqli_query($link, $sql);
-            foreach ($result as $row) {
-                $permission = $row["accountid"];
-                $title = "客戶:$custom 作番:$facilityno 工勘狀態更改";
-                $content = "客戶:$custom 
-作番:$facilityno 
-工勘狀態 $site_survey_status[$old_site_survey_contact_verify] => $site_survey_status[$site_survey_contact_verify]";
-
-                $sql = "
-                    INSERT INTO notice(
-                        kind,
-                        related_id,
-                        title,
-                        content,
-                        haveread,
-                        permission,
-                        creater,
-                        create_at
-                    )VALUES(
-                        '1',
-                        '$id',
-                        '$title',
-                        '$content',
-                        null,
-                        '$permission',
-                        '$creater',
-                        '$create_at'
-                    );
-                ";
-                mysqli_query($link, $sql);
-            }
-        }
-
-
-        $updatesql = "
-            UPDATE wipwholestatus 
-            SET 
-        ";
-        if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545])) {
-            // 工務更新;
-            $updatesql .= "
-                building_heigh_verify = '$building_heigh_verify',
-                building_heigh_verify_at = '$building_heigh_verify_at', 
-                building_heigh_verify_owner = '$building_heigh_verify_owner', 
-                site_survey_contact_verify = '$site_survey_contact_verify', 
-                site_survey_contact_verify_at = '$site_survey_contact_verify_at', 
-                site_survey_contact_verify_owner = '$site_survey_contact_verify_owner', 
-                warehouse_remark = '', 
-            ";
-            if (!empty(trim($warehouse_remark))) {
-                $updatesql .= "
-                    all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>" . $warehouse_remark . "<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
-                ";
-            }
-            if (!empty($building_heigh_verify_file))
-                $updatesql .= "building_heigh_verify_file = '$building_heigh_verify_file', ";
-            if (!empty($site_survey_contact_verify_file))
-                $updatesql .= "site_survey_contact_verify_file = '$site_survey_contact_verify_file', ";
-        } else if ($user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315) {
-            // 營業更新;
-            $updatesql .= "
-                sales_spec_verify = '$sales_spec_verify', 
-                sales_spec_verify_at = '$sales_spec_verify_at', 
-                sales_spec_verify_owner = '$sales_spec_verify_owner', 
-                customer_planning_verify = '$customer_planning_verify', 
-                customer_planning_verify_at = '$customer_planning_verify_at', 
-                customer_planning_verify_owner = '$customer_planning_verify_owner', 
-                customer_color_verify = '$customer_color_verify', 
-                customer_color_verify_at = '$customer_color_verify_at', 
-                customer_color_verify_owner = '$customer_color_verify_owner', 
-                customer_style_verify = '$customer_style_verify', 
-                customer_style_verify_at = '$customer_style_verify_at', 
-                customer_style_verify_owner = '$customer_style_verify_owner', 
-                site_survey_contact_form_verify = '$site_survey_contact_form_verify', 
-                site_survey_contact_form_verify_at = '$site_survey_contact_form_verify_at', 
-                site_survey_contact_form_verify_owner = '$site_survey_contact_form_verify_owner', 
-                delivery_date = '$delivery_date',
-                delivery_date_owner = '$delivery_date_owner',
-                marketing_remark = '',
-            ";
-            if (!empty(trim($marketing_remark))) {
-                $updatesql .= "
-                    marketing_remark = '',
-                    all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>" . $marketing_remark . "<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
-                ";
-            }
-            if (!empty($sales_spec_verify_file))
-                $updatesql .= "sales_spec_verify_file = '$sales_spec_verify_file', ";
-            if (!empty($customer_planning_verify_file))
-                $updatesql .= "customer_planning_verify_file = '$customer_planning_verify_file', ";
-            if (!empty($customer_color_verify_file))
-                $updatesql .= "customer_color_verify_file = '$customer_color_verify_file', ";
-            if (!empty($customer_style_verify_file))
-                $updatesql .= "customer_style_verify_file = '$customer_style_verify_file', ";
-            if (!empty($site_survey_contact_form_verify_file))
-                $updatesql .= "site_survey_contact_form_verify_file = '$site_survey_contact_form_verify_file', ";
-        } else if ($user_department_id == 911) {
-            // 設計主管
-            if ($role_id == 1) {
-                $updatesql .= "
-                    desin_leader_verify = '$desin_leader_verify', 
-                    desin_leader_verify_at = '$desin_leader_verify_at', 
-                    desin_leader_verify_owner = '$desin_leader_verify_owner', 
-                    desin_leader_remark = '', 
-                ";
-                if (!empty(trim($desin_leader_remark))) {
-                    $updatesql .= "
-                        all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>" . $desin_leader_remark . "<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
-                    ";
-                }
-                if (!empty($desin_leader_verify_file))
-                    $updatesql .= "desin_leader_verify_file = '$desin_leader_verify_file', ";
-            } else {
-                // 設計更新
-                $updatesql .= "
-                    desin_spec_verify = '$desin_spec_verify', 
-                    desin_spec_verify_at = '$desin_spec_verify_at', 
-                    desin_spec_verify_owner = '$desin_spec_verify_owner', 
-                    desin_planning_verify = '$desin_planning_verify', 
-                    desin_planning_verify_at = '$desin_planning_verify_at', 
-                    desin_planning_verify_owner = '$desin_planning_verify_owner',
-                    desin_color_verify = '$desin_color_verify', 
-                    desin_color_verify_at = '$desin_color_verify_at', 
-                    desin_color_verify_owner = '$desin_color_verify_owner', 
-                    desin_style_verify = '$desin_style_verify', 
-                    desin_style_verify_at = '$desin_style_verify_at', 
-                    desin_style_verify_owner = '$desin_style_verify_owner', 
-                    desin_taiwan_items_no = '$desin_taiwan_items_no', 
-                    desin_taiwan_items_name = '$desin_taiwan_items_name', 
-                    desin_remark = '', 
-                ";
-                if (!empty(trim($desin_remark))) {
-                    $updatesql .= "
-                        all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>" . $desin_remark . "<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
-                    ";
-                }
-                if (!empty($desin_spec_verify_file))
-                    $updatesql .= "desin_spec_verify_file = '$desin_spec_verify_file', ";
-                if (!empty($desin_planning_verify_file))
-                    $updatesql .= "desin_planning_verify_file = '$desin_planning_verify_file', ";
-                if (!empty($desin_color_verify_file))
-                    $updatesql .= "desin_color_verify_file = '$desin_color_verify_file', ";
-                if (!empty($desin_style_verify_file))
-                    $updatesql .= "desin_style_verify_file = '$desin_style_verify_file', ";
-                if (!empty($desin_documents_verify_file))
-                    $updatesql .= "desin_documents_verify_file = '$desin_documents_verify_file', ";
-            }
-        } else if ($user_department_id == 321) {
-            // 共用更新 
-            // $updatesql .= "
-            //     contractno = '$contractno', 
-            //     facility_temp_no = '$facility_temp_no', 
-            //     facilityno = '$facilityno',
-            //     custom='$custom' ,
-            //     latitude = '$latitude', 
-            //     longitude = '$longitude',
-            //     weight = '$weight', 
-            //     numberofpassenger = '$numberofpassenger', 
-            //     numberofstop = '$numberofstop', 
-            //     numberoffloor = '$numberoffloor', 
-            //     opentype = '$opentype', 
-            //     speed = '$speed', 
-            //     site_manager = '$site_manager',
-            //     address = '$address',
-            //     real_address = '$real_address', 
-            //     contract_arrival_date = '$contract_arrival_date', 
-            //     facility_kind = '$facility_kind',
-            // ";
-            // 業務更新
-            $updatesql .= "
-                prattford_order_date_verify = '$prattford_order_date_verify' ,
-                prattford_order_date = '$prattford_order_date',
-                prattford_order_date_owner = '$prattford_order_date_owner', 
-                estimated_shipping_date_verify = '$estimated_shipping_date_verify', 
-                estimated_shipping_date = '$estimated_shipping_date',
-                estimated_shipping_date_owner = '$estimated_shipping_date_owner', 
-                estimated_shipping_schedule_date_verify = '$estimated_shipping_schedule_date_verify', 
-                estimated_shipping_schedule_date = '$estimated_shipping_schedule_date', 
-                estimated_shipping_schedule_date_owner = '$estimated_shipping_schedule_date_owner', 
-                goods_type = '$goods_type',
-                goods_type_date = '$goods_type_date',
-                goods_type_owner = '$goods_type_owner',
-                taiwan_goods_type = '$taiwan_goods_type',
-                taiwan_goods_type_date = '$taiwan_goods_type_date',
-                taiwan_goods_type_owner = '$taiwan_goods_type_owner',
-                shengguanok_status = '$shengguanok_status', 
-                shengguanok_status_at = '$shengguanok_status_at', 
-                shengguanok_status_owner = '$shengguanok_status_owner', 
-                yewu_remark = '', 
-            ";
-            if (!empty(trim($yewu_remark))) {
-                $updatesql .= "
-                    all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>" . $yewu_remark . "<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
-                ";
-            }
-            if (!empty($shengguanok_status_file))
-                $updatesql .= "shengguanok_status_file = '$shengguanok_status_file', ";
-        } else if ($user_department_id == 220) {
-            // 共用更新 
-            $updatesql .= "
-                contractno = '$contractno', 
-                facility_temp_no = '$facility_temp_no', 
-                facilityno = '$facilityno',
-                custom='$custom' ,
-                latitude = '$latitude', 
-                longitude = '$longitude',
-                weight = '$weight', 
-                numberofpassenger = '$numberofpassenger', 
-                numberofstop = '$numberofstop', 
-                numberoffloor = '$numberoffloor', 
-                opentype = '$opentype', 
-                speed = '$speed', 
-                site_manager = '$site_manager',
-                address = '$address',
-                real_address = '$real_address', 
-                contract_arrival_date = '$contract_arrival_date', 
-                facility_kind = '$facility_kind',
-            ";
-        } else if ($user_department_id == 912) {
-            // 品證部
-            $updatesql .= " 
-                qc_date = '$qc_date',
-                qc_date_owner = '$qc_date_owner',
-                end_qc_date = '$end_qc_date',
-                end_qc_date_owner = '$end_qc_date_owner',
-                official_check_date = '$official_check_date',
-                official_check_date_owner = '$official_check_date_owner',
-            ";
-            if (!empty($official_check_file))
-                $updatesql .= "official_check_file = '$official_check_file', ";
-        }
-
-        // 暫時可編輯及刪除權限
-        if (in_array($user_id, ['M0175', 'M0079', 'M0060'])) {
-            $updatesql .= "
-                contractno = '$contractno', 
-                facility_temp_no = '$facility_temp_no', 
-                renovate_type = '$renovate_type', 
-                facilityno = '$facilityno',
-                custom='$custom' ,
-                latitude = '$latitude', 
-                longitude = '$longitude',
-                weight = '$weight', 
-                numberofpassenger = '$numberofpassenger', 
-                numberofstop = '$numberofstop', 
-                numberoffloor = '$numberoffloor', 
-                opentype = '$opentype', 
-                speed = '$speed', 
-                site_manager = '$site_manager',
-                address = '$address',
-                contract_arrival_date = '$contract_arrival_date', 
-                facility_kind = '$facility_kind',
-            ";
-        }
-
-        // 工務助理
-        if (in_array($user_id, ['M0164', 'M0165', 'M0127', 'M0193', 'M0170', 'M0188','M0117'])) {
-            $updatesql .= "
-                outsourcer_type = '$outsourcer_type',
-                install_outsourcer = '$install_outsourcer',
-                install_outsourcer_owner = '$install_outsourcer_owner',
-                install_outsourcer_date = '$install_outsourcer_date',
-                install_outsourcer_date_owner = '$install_outsourcer_date_owner',
-                estimate_install_start_date = '$estimate_install_start_date',
-                estimate_install_start_date_owner = '$estimate_install_start_date_owner',
-                estimate_install_end_date = '$estimate_install_end_date',
-                estimate_install_end_date_owner = '$estimate_install_end_date_owner',
-                tryrun_outsourcer = '$tryrun_outsourcer',
-                tryrun_outsourcer_owner = '$tryrun_outsourcer_owner',
-                tryrun_outsourcer_date = '$tryrun_outsourcer_date',
-                tryrun_outsourcer_date_owner = '$tryrun_outsourcer_date_owner',
-                estimate_tryrun_start_date = '$estimate_tryrun_start_date',
-                estimate_tryrun_start_date_owner = '$estimate_tryrun_start_date_owner',
-                estimate_tryrun_end_date = '$estimate_tryrun_end_date',
-                estimate_tryrun_end_date_owner = '$estimate_tryrun_end_date_owner',
-                warehouse_assistant_remark = '$warehouse_assistant_remark',
-            ";
-
-            if (!empty($plan_diagram_file)) {
-                $updatesql .= "plan_diagram_file = '$plan_diagram_file', ";
-                $updatesql .= "
-                    all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>上傳了安裝圖附件<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
-                ";
-            }
-            if (!empty($completion_acceptance_file)) {
-                $updatesql .= "completion_acceptance_file = '$completion_acceptance_file', ";
-                $updatesql .= "
-                    all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>上傳了完工驗收單附件<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
-                ";
-            }
-            if (!empty($outsourcer_contract_file)) {
-                echo $updatesql .= "outsourcer_contract_file = '$outsourcer_contract_file', ";
-            }
-        }
-
-        // 許協更新業務確認項目權限
-        if ($user_id == 'M0060') {
-            $updatesql .= "
-                prattford_order_date_verify = '$prattford_order_date_verify' ,
-                prattford_order_date = '$prattford_order_date',
-                prattford_order_date_owner = '$prattford_order_date_owner', 
-                estimated_shipping_date_verify = '$estimated_shipping_date_verify', 
-                estimated_shipping_date = '$estimated_shipping_date',
-                estimated_shipping_date_owner = '$estimated_shipping_date_owner', 
-                estimated_shipping_schedule_date_verify = '$estimated_shipping_schedule_date_verify', 
-                estimated_shipping_schedule_date = '$estimated_shipping_schedule_date', 
-                estimated_shipping_schedule_date_owner = '$estimated_shipping_schedule_date_owner', 
-                goods_type = '$goods_type',
-                goods_type_date = '$goods_type_date',
-                goods_type_owner = '$goods_type_owner',
-                taiwan_goods_type = '$taiwan_goods_type',
-                taiwan_goods_type_date = '$taiwan_goods_type_date',
-                taiwan_goods_type_owner = '$taiwan_goods_type_owner',
-                shengguanok_status = '$shengguanok_status', 
-                shengguanok_status_at = '$shengguanok_status_at', 
-                shengguanok_status_owner = '$shengguanok_status_owner', 
-                yewu_remark = '', 
-            ";
-        }
-
-        // 生管 小雯 預計到貨日(到觀音廠日)權限
-        if ($user_id == 'M0168') {
-            $updatesql .= "
-                estimated_shipping_schedule_date_verify = '$estimated_shipping_schedule_date_verify', 
-                estimated_shipping_schedule_date = '$estimated_shipping_schedule_date', 
-                estimated_shipping_schedule_date_owner = '$estimated_shipping_schedule_date_owner', 
-            ";
-        }
-
-        $updatesql .= " 
-            creater = '$creater', 
-            create_at = '$create_at'  
-            WHERE id = '$id'
-        ";
-        // echo $updatesql;
-        // exit;
-        mysqli_query($link, $updatesql);
-        echo "
-            <script type ='text/JavaScript'>
-                alert('資料更新成功');
-                location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';
-            </script>
-        ";
-    }
-}
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    if ($_POST['form_name'] == 'assign_form') {
-        foreach ($_POST as $k => $v) {
-            $$k = htmlspecialchars(stripslashes(trim($v)));
-        }
-        // 檢查簽核狀態
-        if (checkWwsAssianStatus($link, $user_id)) {
-            echo "<script type ='text/JavaScript'>";
-            echo "alert('此表單已進入下個階段');";
-            echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
-            echo "</script>";
-        } else {
-            echo "<script type ='text/JavaScript'>";
-            echo "alert('此表單某些確認項未確認');";
-            echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
-            echo "</script>";
-        }
-    }
-}
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    if ($_POST['form_name'] == 'back_marketing_assign_form') {
-        foreach ($_POST as $k => $v) {
-            $$k = htmlspecialchars(stripslashes(trim($v)));
-        }
-        // 檢查簽核狀態
-        backMarketingSssign($link, $salesid, $user_id);
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('此表單已退回至營業階段');";
-        echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
-        echo "</script>";
-    }
-}
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    if ($_POST['form_name'] == 'back_design_assign_form') {
-        foreach ($_POST as $k => $v) {
-            $$k = htmlspecialchars(stripslashes(trim($v)));
-        }
-        // 檢查簽核狀態
-        backDesignssign($link, $user_id);
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('此表單已退回至設計階段');";
-        echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
-        echo "</script>";
-    }
-}
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    if ($_POST['form_name'] == 'warehouse_assign_form') {
-        foreach ($_POST as $k => $v) {
-            $$k = htmlspecialchars(stripslashes(trim($v)));
-        }
-        // 檢查簽核狀態
-        backWarehouse($link, $user_id);
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('此表單已退回至工務階段');";
-        echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
-        echo "</script>";
-    }
-}
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    if ($_POST['form_name'] == 'update_contract_date_form') {
-        foreach ($_POST as $k => $v)
-            $$k = htmlspecialchars(stripslashes(trim($v)));
-
-        $contractno = $_POST['contractno'];
-        $facilityno = $_POST['facilityno'];
-        $custom = $_POST['custom'];
-        $creater = $_POST['creater'];
-        $create_at = $_POST['create_at'];
-        $old_real_contract_arrival_date = $_POST['old_real_contract_arrival_date'];
-        $real_contract_arrival_date = $_POST['real_contract_arrival_date'];
-        $salesid = $_POST['salesid'];
-        $gongWuokid = $_POST['gongWuokid'];
-        $updatesql = "
-            UPDATE wipwholestatus 
-            SET 
-                real_contract_arrival_date = '$real_contract_arrival_date',
-                creater = '$creater', 
-                create_at = '$create_at'
-            WHERE id = '$id'
-        ";
-        mysqli_query($link, $updatesql);
-
-        $content = "合約號 : $contractno
-作番號 : $facilityno
-出貨日期微調: " . substr($old_real_contract_arrival_date, 0, 10) . "  =>  " . substr($real_contract_arrival_date, 0, 10);
-
-        $sql = "
-            INSERT INTO notice (
-                kind, 
-                related_id,
-                title,
-                content,
-                haveread,
-                permission,
-                creater,
-                create_at
-            ) VALUES(
-                '1', 
-                '$id', 
-                '作番大日程(新梯)出貨日調整通知 > " . $facilityno . "', 
-                '$content', 
-                NULL,
-                '$salesid', 
-                'system', 
-                '" . date("Y-m-d H:i:s") . "'
-            )
-        ";
-        mysqli_query($link, $sql);
-        $sql = "
-            INSERT INTO notice (
-                kind, 
-                related_id,
-                title,
-                content,
-                haveread,
-                permission,
-                creater,
-                create_at
-            ) VALUES(
-                '1', 
-                '$id', 
-                '作番大日程(新梯)出貨日調整通知 > " . $facilityno . "', 
-                '$content', 
-                NULL,
-                '$gongWuokid', 
-                'system', 
-                '" . date("Y-m-d H:i:s") . "'
-            )
-        ";
-        mysqli_query($link, $sql);
-
-        $sql = "
-            INSERT INTO wipwhole_change_contractdate_details (
-                creater, 
-                create_at,
-                wipwholestatus_id,
-                change_status,
-                old_change_date,
-                change_date
-            ) VALUES(
-                '$creater', 
-                '$create_at',
-                '$id',
-                'Z',
-                '$old_real_contract_arrival_date',
-                '$real_contract_arrival_date'
-            )
-        ";
-        mysqli_query($link, $sql);
-
-        // 檢查簽核狀態
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('已更新日期且通知營業人員及工務人員');";
-        echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
-        echo "</script>";
-    }
-}
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    if ($_POST['form_name'] == 'update_date_form') {
-
-        $creater = $user_id;
-
-        foreach ($_POST as $k => $v)
-            $$k = htmlspecialchars(stripslashes(trim($v)));
-
-        $real_arrival_date = $_POST['real_arrival_date'];
-        $updatesql = "
-            UPDATE wipwholestatus 
-            SET 
-                real_arrival_date = '$real_arrival_date'
-            WHERE id = '$id'
-        ";
-        mysqli_query($link, $updatesql);
-
-
-        $sql = "
-            SELECT 
-                `custom`,
-                `facilityno`,
-                `salesid`
-            FROM `wipwholestatus`
-            where `id` = '$id'
-        ";
-        $result = mysqli_query($link, $sql);
-        foreach ($result as $row) {
-            $permission = $row["salesid"];
-            $custom = $row["custom"];
-            $facilityno = $row["facilityno"];
-            $title = "客戶:$custom 作番:$facilityno 實際出貨日變更";
-            $content = "客戶:$custom 
-作番:$facilityno
-實際出貨日(到工地):$real_arrival_date";
-
-            $sql = "
-                INSERT INTO notice(
-                    kind,
-                    related_id,
-                    title,
-                    content,
-                    haveread,
-                    permission,
-                    creater,
-                    create_at
-                )VALUES(
-                    '1',
-                    '$id',
-                    '$title',
-                    '$content',
-                    null,
-                    '$permission',
-                    '$creater',
-                    '" . date("Y-m-d H:i:s") . "'
-                );
-            ";
-            mysqli_query($link, $sql);
-        }
-
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('已更新日期');";
-        echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
-        echo "</script>";
-    }
-}
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    if ($_POST['form_name'] == 'update_install_date_form') {
-        foreach ($_POST as $k => $v)
-            $$k = htmlspecialchars(stripslashes(trim($v)));
-
-        $change_all_contractno = $_POST['change_all_contractno'];
-        $contractno = $_POST['contractno2'];
-        $install_start_date = $_POST['install_start_date'];
-        $install_start_date_owner = $_POST['install_start_date_owner'];
-        $install_end_date = $_POST['install_end_date'];
-        $install_end_date_owner = $_POST['install_end_date_owner'];
-        $tryrun_start_date = $_POST['tryrun_start_date'];
-        $tryrun_start_date_owner = $_POST['tryrun_start_date_owner'];
-        $tryrun_end_date = $_POST['tryrun_end_date'];
-        $tryrun_end_date_owner = $_POST['tryrun_end_date_owner'];
-
-        $updatesql = "
-            UPDATE wipwholestatus 
-            SET 
-                install_start_date = '$install_start_date',
-                install_start_date_owner = '$install_start_date_owner',
-                install_end_date = '$install_end_date',
-                install_end_date_owner = '$install_end_date_owner',
-                tryrun_start_date = '$tryrun_start_date',
-                tryrun_start_date_owner = '$tryrun_start_date_owner',
-                tryrun_end_date = '$tryrun_end_date',
-                tryrun_end_date_owner = '$tryrun_end_date_owner'
-        ";
-        if (empty($change_all_contractno)) {
-            $updatesql .= "WHERE id = '$id' ";
-        } else {
-            $updatesql .= "WHERE contractno = '$contractno' ";
-        }
-        // echo $updatesql;
-        // exit;
-        mysqli_query($link, $updatesql);
-
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('已更新日期');";
-        echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
-        echo "</script>";
-    }
-}
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    if ($_POST['form_name'] == 'update_shengguan_form') {
-        foreach ($_POST as $k => $v)
-            $$k = htmlspecialchars(stripslashes(trim($v)));
-
-        $creater = $_POST['creater'];
-        $datetime = date("Y-m-d H:i:s");
-        $shengguan_remark = $_POST['shengguan_remark'];
-        $updatesql = "
-            UPDATE wipwholestatus 
-            SET shengguan_remark = '$shengguan_remark',
-                arrival_date_verify = '$arrival_date_verify',
-                actual_tofactory_date = '$actual_tofactory_date',
-                arrival_date_owner = '$arrival_date_owner',
-        ";
-        if (!empty(trim($shengguan_remark))) {
-            $updatesql .= "
-                all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>" . $shengguan_remark . "<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
-            ";
-        }
-        $updatesql .= " 
-            creater = '$creater', 
-            create_at = '$datetime'  
-            WHERE id = '$id'
-        ";
-        mysqli_query($link, $updatesql);
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('已存檔');";
-        echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
-        echo "</script>";
-    }
-}
-
-
-function write_note($link, $id, $user_id, $content)
-{
-    $datetime = date("Y-m-d H:i:s");
-    $updatesql = "
-        UPDATE wipwholestatus 
-        SET 
-            all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>" . $content . "<br/><br/>', IF(all_remark IS NULL,'',all_remark))
-        WHERE id = '$id'
-    ";
-    mysqli_query($link, $updatesql);
-}
-
-// 表單簽核狀態檢查主程式
-function checkWwsAssianStatus($link, $user_id)
-{
-
-    if (isset($_GET['id']) || isset($_GET['form_key'])) {
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-        $form_YD_key = isset($_GET['form_key']) ? $_GET['form_key'] : getYDForm_key($link, $id);
-        $form_G_key = isset($_GET['form_key']) ? $_GET['form_key'] : getGForm_key($link, $id);
-    }
-
-    // 確認營業階段 進入設計人員(新梯:郭承瑋 M0023)階段
-    if (checkNowFormYDStatus($link) == 'A' && checkYingYeok($link, $id) == '0') {
-        write_note($link, $id, $user_id, "<em>營業提交至設計階段</em>");
-        do_wws_next_assign("M0023", $form_YD_key, 'B');
-        return true;
-    }
-    // 確認設計人員(新梯:郭承瑋 M0023)階段 進入設計主管階段
-    if (checkNowFormYDStatus($link) == 'B' && checkSheJiok($link, $id) == '0') {
-        write_note($link, $id, $user_id, "<em>設計提交至設計主管階段</em>");
-        do_wws_next_assign(getSheJiokLeaderNo($link), $form_YD_key, 'C');
-        return true;
-    }
-    // 確認設計主管階段 進入生管階段
-    if (checkNowFormYDStatus($link) == 'C' && checkSheJiokLeader($link, $id) == '0') {
-        write_note($link, $id, $user_id, "<em>設計主管提交至生管階段</em>");
-        do_wws_next_assign(getShengGuanokLeaderNo($link), $form_YD_key, 'D');
-        return true;
-    }
-    // 確認工務階段 進入生管階段
-    if (checkNowFormGStatus($link) == 'G' && checkGongWuok($link, $id) == '0') {
-        write_note($link, $id, $user_id, "<em>工務提交至生管階段</em>");
-        do_wws_next_assign(getShengGuanokLeaderNo($link), $form_G_key, 'H');
-        return true;
-    }
-    // 確認生管階段(營業部及設計部) 結束簽核流程
-    if (checkNowFormYDStatus($link) == 'D' && checkNowFormGStatus($link) == 'H' && checkShengGuanok($link, $id) == '0') {
-        write_note($link, $id, $user_id, "<em>進入結案階段</em>");
-        do_wws_next_assign('00000', $form_YD_key, 'Z');
-        do_wws_next_assign('00000', $form_G_key, 'Z');
-        return true;
-    }
-    return false;
-}
-
-
-// 退回至營業階段
-function backMarketingSssign($link, $salesid, $user_id)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key'])) {
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-        $form_YD_key = isset($_GET['form_key']) ? $_GET['form_key'] : getYDForm_key($link, $id);
-        write_note($link, $id, $user_id, "<em>退回營業階段</em>");
-        do_wws_next_assign($salesid, $form_YD_key, 'A');
-    }
-}
-// 退回至設計階段
-function backDesignssign($link, $user_id)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key'])) {
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-        $form_YD_key = isset($_GET['form_key']) ? $_GET['form_key'] : getYDForm_key($link, $id);
-    }
-    write_note($link, $id, $user_id, "<em>退回設計階段</em>");
-    do_wws_next_assign("M0023", $form_YD_key, 'B');
-}
-// 退回至工務階段
-function backWarehouse($link, $user_id)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key'])) {
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-        $form_YD_key = isset($_GET['form_key']) ? $_GET['form_key'] : getYDForm_key($link, $id);
-    }
-    write_note($link, $id, $user_id, "<em>退回工務階段</em>");
-    do_wws_next_assign(getGongWuokNo($link), $form_YD_key, 'G');
-}
+<?php
+ini_set('display_errors', 'on');
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    if ($_POST['form_name'] == 'main_form') {
+
+        foreach ($_POST as $k => $v) {
+            if ($k !== 'desin_taiwan_items_no' && $k !== 'desin_taiwan_items_name')
+                $$k = htmlspecialchars(stripslashes(trim($v)));
+        }
+
+        // 時間戳記
+        $datetime = date("Y-m-d H:i:s");
+
+        // 合約號
+        $contractno = $_POST['contractno'];
+        // 號機
+        $facility_temp_no = $_POST['facility_temp_no'];
+        // 作番號
+        $facilityno =  $_POST['facilityno'];
+        // 客戶名稱
+        $custom = $_POST['custom'];
+        // 工地負責人
+        $site_manager = $_POST['site_manager'];
+        // 緯度
+        $latitude = $_POST['latitude'];
+        // 經度
+        $longitude = $_POST['longitude'];
+        $weight = $_POST['weight'];
+        // 人乘
+        $numberofpassenger = $_POST['numberofpassenger'];
+        // 樓停
+        $numberofstop = $_POST['numberofstop'];
+        // 樓層
+        $numberoffloor = $_POST['numberoffloor'];
+        // 開門方式
+        $opentype = $_POST['opentype'];
+        // 速度
+        $speed = $_POST['speed'];
+        // 機型
+        $facility_kind = $_POST['facility_kind'];
+        // 地址
+        $address = $_POST['address'];
+        // 工地地址
+        $real_address = $_POST['real_address'];
+        //合約到貨日
+        $contract_arrival_date = $_POST['contract_arrival_date'];
+        //合約到貨日
+        $real_contract_arrival_date = $_POST['real_contract_arrival_date'];
+
+        //营业规格确认
+        $sales_spec_verify = $_POST['sales_spec_verify'];
+        $sales_spec_verify_at = $_POST['sales_spec_verify_at'] ?: $row['sales_spec_verify_at'];
+        $sales_spec_verify_owner = $_POST['sales_spec_verify_owner'] ?: $row['sales_spec_verify_owner'];
+        //客户计划图确认
+        $real_custom_name = $_POST['real_custom_name'] ?: $row['real_custom_name'];
+        $customer_planning_verify = $_POST['customer_planning_verify'];
+        $customer_planning_verify_at = $_POST['customer_planning_verify_at'] ?: $row['customer_planning_verify_at'];
+        $customer_planning_verify_owner = $_POST['customer_planning_verify_owner'] ?: $row['customer_planning_verify_owner'];
+        //客户颜色确认
+        $customer_color_verify = $_POST['customer_color_verify'];
+        $customer_color_verify_at = $_POST['customer_color_verify_at'] ?: $row['customer_color_verify_at'];
+        $customer_color_verify_owner = $_POST['customer_color_verify_owner'] ?: $row['customer_color_verify_owner'];
+        //客户颜色确认
+        $customer_style_verify = $_POST['customer_style_verify'];
+        $customer_style_verify_at = $_POST['customer_style_verify_at'] ?: $row['customer_style_verify_at'];
+        $customer_style_verify_owner = $_POST['customer_style_verify_owner'] ?: $row['customer_style_verify_owner'];
+        //工勘聯絡表	
+        $site_survey_contact_form_verify = $_POST['site_survey_contact_form_verify'];
+        $site_survey_contact_form_verify_at = $_POST['site_survey_contact_form_verify_at'] ?: $row['site_survey_contact_form_verify_at'];
+        $site_survey_contact_form_verify_owner = $_POST['site_survey_contact_form_verify_owner'] ?: $row['site_survey_contact_form_verify_owner'];
+
+        //设计规格确认
+        $desin_spec_verify = $_POST['desin_spec_verify'];
+        $desin_spec_verify_at = $_POST['desin_spec_verify_at'] ?: $row['desin_spec_verify_at'];
+        $desin_spec_verify_owner = $_POST['desin_spec_verify_owner'] ?: $row['desin_spec_verify_owner'];
+        //设计计划图确认
+        $desin_planning_verify = $_POST['desin_planning_verify'];
+        $desin_planning_verify_at = $_POST['desin_planning_verify_at'] ?: $row['desin_planning_verify_at'];
+        $desin_planning_verify_owner = $_POST['desin_planning_verify_owner'] ?: $row['desin_planning_verify_owner'];
+        //设计颜色确认
+        $desin_color_verify = $_POST['desin_color_verify'];
+        $desin_color_verify_at = $_POST['desin_color_verify_at'] ?: $row['desin_color_verify_at'];
+        $desin_color_verify_owner = $_POST['desin_color_verify_owner'] ?: $row['desin_color_verify_owner'];
+        //设计仕样确认
+        $desin_style_verify = $_POST['desin_style_verify'];
+        $desin_style_verify_at = $_POST['desin_style_verify_at'] ?: $row['desin_style_verify_at'];
+        $desin_style_verify_owner = $_POST['desin_style_verify_owner'] ?: $row['desin_style_verify_owner'];
+        //设计主管確認
+        $desin_leader_verify = $_POST['desin_leader_verify'];
+        $desin_leader_verify_at = $_POST['desin_leader_verify_at'] ?: $row['desin_leader_verify_at'];
+        $desin_leader_verify_owner = $_POST['desin_leader_verify_owner'] ?: $row['desin_leader_verify_owner'];
+        //楼高通报
+        $building_heigh_verify = $_POST['building_heigh_verify'];
+        $building_heigh_verify_at = $_POST['building_heigh_verify_at'] ?: $row['building_heigh_verify_at'];
+        $building_heigh_verify_owner = $_POST['building_heigh_verify_owner'] ?: $row['building_heigh_verify_owner'];
+        //工勘
+        $site_survey_contact_verify = $_POST['site_survey_contact_verify'];
+        $site_survey_contact_verify_at = $_POST['site_survey_contact_verify_at'] ?: $row['site_survey_contact_verify_at'];
+        $site_survey_contact_verify_owner = $_POST['site_survey_contact_verify_owner'] ?: $row['site_survey_contact_verify_owner'];
+        $old_site_survey_contact_verify = $_POST['old_site_survey_contact_verify'];
+
+        //是否齊備
+        $shengguanok_status = $_POST['shengguanok_status'];
+        $shengguanok_status_at = $_POST['shengguanok_status_at'];
+        $shengguanok_status_owner = $_POST['shengguanok_status_owner'] ?: $row['shengguanok_status_owner'];
+        //下單日(普萊特富)
+        $prattford_order_date_verify = $_POST['prattford_order_date_verify'];
+        $prattford_order_date = $_POST['prattford_order_date'];
+        $prattford_order_date_owner = $_POST['prattford_order_date_owner'] ?: $row['prattford_order_date_owner'];
+        // 預計發貨日(到港日)
+        $estimated_shipping_date_verify = $_POST['estimated_shipping_date_verify'];
+        $estimated_shipping_date = $_POST['estimated_shipping_date'];
+        $estimated_shipping_date_owner = $_POST['estimated_shipping_date_owner'] ?: $row['estimated_shipping_date_owner'];
+        // 預計船期(改成預計到廠日)
+        $estimated_shipping_schedule_date_verify = $_POST['estimated_shipping_schedule_date_verify'];
+        $estimated_shipping_schedule_date = $_POST['estimated_shipping_schedule_date'];
+        $estimated_shipping_schedule_date_owner = $_POST['estimated_shipping_schedule_date_owner'] ?: $row['estimated_shipping_schedule_date_owner'];
+        // 普來特富發貨類別
+        $goods_type = $_POST['goods_type'] ?: $row['goods_type'];
+        $goods_type_date = $_POST['goods_type_date'] ?: $row['goods_type_date'];
+        $goods_type_owner = $_POST['goods_type_owner'] ?: $row['goods_type_owner'];
+        // 台灣自理發貨類別
+        $taiwan_goods_type = $_POST['taiwan_goods_type'] ?: $row['taiwan_goods_type'];
+        $taiwan_goods_type_date = $_POST['taiwan_goods_type_date'];
+        $taiwan_goods_type_owner = $_POST['taiwan_goods_type_owner'] ?: $row['taiwan_goods_type_owner'];
+        // 實際到貨日
+        $arrival_date_verify = $_POST['arrival_date_verify'] ?: $row['arrival_date_verify'];
+        $actual_tofactory_date = $_POST['actual_tofactory_date'];
+        $arrival_date_owner = $_POST['arrival_date_owner'] ?: $row['arrival_da
+        te_owner'];
+
+        // 各部門備註
+        $marketing_remark = $_POST['marketing_remark'] ?: $row['marketing_remark'];
+        $desin_remark = $_POST['desin_remark'] ?: $row['desin_remark'];
+        $desin_leader_remark = $_POST['desin_leader_remark'] ?: $row['desin_leader_remark'];
+        $warehouse_remark = $_POST['warehouse_remark'] ?: $row['warehouse_remark'];
+        $yewu_remark = $_POST['yewu_remark'] ?: $row['yewu_remark'];
+        $shengguan_remark = $_POST['shengguan_remark'] ?: $row['shengguan_remark'];
+
+        // 台製件
+        $desin_taiwan_items_no = json_encode($_POST['desin_taiwan_items_no'], JSON_UNESCAPED_UNICODE);
+        $desin_taiwan_items_name = json_encode($_POST['desin_taiwan_items_name'], JSON_UNESCAPED_UNICODE);
+        $desin_taiwan_items_no = $desin_taiwan_items_no == 'null' ? null : $desin_taiwan_items_no;
+        $desin_taiwan_items_name = $desin_taiwan_items_name == 'null' ? null : $desin_taiwan_items_name;
+
+        // 品証部
+        $qc_date = $_POST['qc_date'] ?: $row['qc_date'];
+        $qc_date_owner = $_POST['qc_date_owner'] ?: $row['qc_date_owner'];
+        $end_qc_date = $_POST['end_qc_date'] ?: $row['end_qc_date'];
+        $end_qc_date_owner = $_POST['end_qc_date_owner'] ?: $row['end_qc_date_owner'];
+        $official_check_date = $_POST['official_check_date'] ?: $row['official_check_date'];
+        $old_official_check_date = $_POST['old_official_check_date'] ?: $row['old_official_check_date'];
+        $official_check_date_owner = $_POST['official_check_date_owner'] ?: $row['official_check_date_owner'];
+        $delivery_date = $_POST['delivery_date'] ?: $row['delivery_date'];
+        $delivery_date_owner = $_POST['delivery_date_owner'] ?: $row['delivery_date_owner'];
+        $qc_official_type = $_POST['qc_official_type'] ?: $row['qc_official_type'];
+
+        // 工務助理
+        $outsourcer_type = $_POST['outsourcer_type'];
+        $install_outsourcer = $_POST['install_outsourcer'];
+        $install_outsourcer_owner = $_POST['install_outsourcer_owner'];
+        $install_outsourcer_date = $_POST['install_outsourcer_date'];
+        $install_outsourcer_date_owner = $_POST['install_outsourcer_date_owner'];
+        $estimate_install_start_date = $_POST['estimate_install_start_date'];
+        $estimate_install_start_date_owner = $_POST['estimate_install_start_date_owner'];
+        $estimate_install_end_date = $_POST['estimate_install_end_date'];
+        $estimate_install_end_date_owner = $_POST['estimate_install_end_date_owner'];
+        $tryrun_outsourcer = $_POST['tryrun_outsourcer'];
+        $tryrun_outsourcer_owner = $_POST['tryrun_outsourcer_owner'];
+        $tryrun_outsourcer_date = $_POST['tryrun_outsourcer_date'];
+        $tryrun_outsourcer_date_owner = $_POST['tryrun_outsourcer_date_owner'];
+        $estimate_tryrun_start_date = $_POST['estimate_tryrun_start_date'];
+        $estimate_tryrun_start_date_owner = $_POST['estimate_tryrun_start_date_owner'];
+        $estimate_tryrun_end_date = $_POST['estimate_tryrun_end_date'];
+        $estimate_tryrun_end_date_owner = $_POST['estimate_tryrun_end_date_owner'];
+        $warehouse_assistant_remark = $_POST['warehouse_assistant_remark'];
+
+        $creater = $_POST['creater'];
+        $create_at = date("Y-m-fd H:i:s");
+
+        // 上傳附件
+        include "wipwhole-rec-invoice-edit-fileupload.php";
+
+        // 工勘變更通知繪圖人員
+        if (!empty($official_check_date)) {
+            if ($official_check_date !== $old_official_check_date) {
+                $sql = "
+                    SELECT accountid 
+                    FROM account
+                    WHERE department_id = '250'
+                    AND role_id IN ('1','2','3','4');
+                ";
+                $result = mysqli_query($link, $sql);
+                foreach ($result as $row) {
+                    $permission = $row["accountid"];
+                    $title = "客戶:$custom 作番:$facilityno 官檢日變更";
+                    $content = "客戶:$custom 
+    作番:$facilityno 
+    官檢日 $old_official_check_date => $official_check_date";
+
+                    $sql = "
+                        INSERT INTO notice(
+                            kind,
+                            related_id,
+                            title,
+                            content,
+                            haveread,
+                            permission,
+                            creater,
+                            create_at
+                        )VALUES(
+                            '1',
+                            '$id',
+                            '$title',
+                            '$content',
+                            null,
+                            '$permission',
+                            '$creater',
+                            '" . date("Y-m-d H:i:s") . "'
+                        );
+                    ";
+                    mysqli_query($link, $sql);
+                }
+            }
+        }
+
+        // 工勘變更通知繪圖人員
+        if ($site_survey_contact_verify !== $old_site_survey_contact_verify) {
+            $site_survey_status = array(
+                "1" => "請選擇",
+                "0" => "已確認",
+                "2" => "無工勘需求",
+                "A" => "未動工",
+                "B" => "地下室施工",
+                "C" => "打樁",
+                "D" => "地基",
+                "E" => "挖土",
+                "G" => "機房",
+                "H" => "機械式淨高",
+                "M" => "樓中樓",
+                "OH" => "最高層(頂樓高度)",
+                "P" => "PIT(機坑深度)",
+                "R" => "R 樓",
+                "S" => "停工",
+                "T" => "TOP",
+                "TC" => "頂部間隙",
+                "TS" => "行程",
+                "TH" => "全高",
+                "Y" => "已搭、已出",
+                "YB" => "退購結案",
+                "YF" => "既有建物",
+                "YN" => "已搭、未出"
+            );
+            $sql = "
+                SELECT accountid 
+                FROM account
+                WHERE department_id = '321'
+                AND role_id IN ('2','3','5');
+            ";
+            $result = mysqli_query($link, $sql);
+            foreach ($result as $row) {
+                $permission = $row["accountid"];
+                $title = "客戶:$custom 作番:$facilityno 工勘狀態更改";
+                $content = "客戶:$custom 
+作番:$facilityno 
+工勘狀態 $site_survey_status[$old_site_survey_contact_verify] => $site_survey_status[$site_survey_contact_verify]";
+
+                $sql = "
+                    INSERT INTO notice(
+                        kind,
+                        related_id,
+                        title,
+                        content,
+                        haveread,
+                        permission,
+                        creater,
+                        create_at
+                    )VALUES(
+                        '1',
+                        '$id',
+                        '$title',
+                        '$content',
+                        null,
+                        '$permission',
+                        '$creater',
+                        '$create_at'
+                    );
+                ";
+                mysqli_query($link, $sql);
+            }
+        }
+
+        if (!empty($desin_documents_verify_file)) {
+            echo $sql = "
+                INSERT INTO notice(
+                    kind,
+                    related_id,
+                    title,
+                    content,
+                    haveread,
+                    permission,
+                    creater,
+                    create_at
+                )VALUES(
+                    '1',
+                    '$id',
+                    '合約號:$contract_no 作番號:$facilityno 設計上傳追加技術文件',
+                    '合約號:$contract_no 作番號:$facilityno 設計上傳追加技術文件',
+                    null,
+                    'M0168',
+                    '$creater',
+                    '$create_at'
+                );
+            ";
+            mysqli_query($link, $sql);
+        }
+
+        $updatesql = "
+            UPDATE wipwholestatus 
+            SET 
+        ";
+        if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545])) {
+            // 工務更新;
+            $updatesql .= "
+                building_heigh_verify = '$building_heigh_verify',
+                building_heigh_verify_at = '$building_heigh_verify_at', 
+                building_heigh_verify_owner = '$building_heigh_verify_owner', 
+                site_survey_contact_verify = '$site_survey_contact_verify', 
+                site_survey_contact_verify_at = '$site_survey_contact_verify_at', 
+                site_survey_contact_verify_owner = '$site_survey_contact_verify_owner', 
+                warehouse_remark = '', 
+            ";
+            if (!empty(trim($warehouse_remark))) {
+                $updatesql .= "
+                    all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>" . $warehouse_remark . "<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
+                ";
+            }
+            if (!empty($building_heigh_verify_file))
+                $updatesql .= "building_heigh_verify_file = '$building_heigh_verify_file', ";
+            if (!empty($site_survey_contact_verify_file))
+                $updatesql .= "site_survey_contact_verify_file = '$site_survey_contact_verify_file', ";
+        } else if ($user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315) {
+            // 營業更新;
+            $updatesql .= "
+                sales_spec_verify = '$sales_spec_verify', 
+                sales_spec_verify_at = '$sales_spec_verify_at', 
+                sales_spec_verify_owner = '$sales_spec_verify_owner', 
+                customer_planning_verify = '$customer_planning_verify', 
+                customer_planning_verify_at = '$customer_planning_verify_at', 
+                customer_planning_verify_owner = '$customer_planning_verify_owner', 
+                customer_color_verify = '$customer_color_verify', 
+                customer_color_verify_at = '$customer_color_verify_at', 
+                customer_color_verify_owner = '$customer_color_verify_owner', 
+                customer_style_verify = '$customer_style_verify', 
+                customer_style_verify_at = '$customer_style_verify_at', 
+                customer_style_verify_owner = '$customer_style_verify_owner', 
+                site_survey_contact_form_verify = '$site_survey_contact_form_verify', 
+                site_survey_contact_form_verify_at = '$site_survey_contact_form_verify_at', 
+                site_survey_contact_form_verify_owner = '$site_survey_contact_form_verify_owner', 
+                delivery_date = '$delivery_date',
+                delivery_date_owner = '$delivery_date_owner',
+                marketing_remark = '',
+                real_custom_name = '$real_custom_name',
+            ";
+            if (!empty(trim($marketing_remark))) {
+                $updatesql .= "
+                    marketing_remark = '',
+                    all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>" . $marketing_remark . "<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
+                ";
+            }
+            if (!empty($sales_spec_verify_file))
+                $updatesql .= "sales_spec_verify_file = '$sales_spec_verify_file', ";
+            if (!empty($customer_planning_verify_file))
+                $updatesql .= "customer_planning_verify_file = '$customer_planning_verify_file', ";
+            if (!empty($customer_color_verify_file))
+                $updatesql .= "customer_color_verify_file = '$customer_color_verify_file', ";
+            if (!empty($customer_style_verify_file))
+                $updatesql .= "customer_style_verify_file = '$customer_style_verify_file', ";
+            if (!empty($site_survey_contact_form_verify_file))
+                $updatesql .= "site_survey_contact_form_verify_file = '$site_survey_contact_form_verify_file', ";
+        } else if ($user_department_id == 911) {
+            // 設計主管
+            if ($role_id == 1) {
+                $updatesql .= "
+                    desin_leader_verify = '$desin_leader_verify', 
+                    desin_leader_verify_at = '$desin_leader_verify_at', 
+                    desin_leader_verify_owner = '$desin_leader_verify_owner', 
+                    desin_leader_remark = '', 
+                ";
+                if (!empty(trim($desin_leader_remark))) {
+                    $updatesql .= "
+                        all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>" . $desin_leader_remark . "<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
+                    ";
+                }
+                if (!empty($desin_leader_verify_file))
+                    $updatesql .= "desin_leader_verify_file = '$desin_leader_verify_file', ";
+            } else {
+                // 設計更新
+                $updatesql .= "
+                    desin_spec_verify = '$desin_spec_verify', 
+                    desin_spec_verify_at = '$desin_spec_verify_at', 
+                    desin_spec_verify_owner = '$desin_spec_verify_owner', 
+                    desin_planning_verify = '$desin_planning_verify', 
+                    desin_planning_verify_at = '$desin_planning_verify_at', 
+                    desin_planning_verify_owner = '$desin_planning_verify_owner',
+                    desin_color_verify = '$desin_color_verify', 
+                    desin_color_verify_at = '$desin_color_verify_at', 
+                    desin_color_verify_owner = '$desin_color_verify_owner', 
+                    desin_style_verify = '$desin_style_verify', 
+                    desin_style_verify_at = '$desin_style_verify_at', 
+                    desin_style_verify_owner = '$desin_style_verify_owner', 
+                    desin_taiwan_items_no = '$desin_taiwan_items_no', 
+                    desin_taiwan_items_name = '$desin_taiwan_items_name', 
+                    desin_remark = '', 
+                ";
+                if (!empty(trim($desin_remark))) {
+                    $updatesql .= "
+                        all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>" . $desin_remark . "<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
+                    ";
+                }
+                if (!empty($desin_spec_verify_file))
+                    $updatesql .= "desin_spec_verify_file = '$desin_spec_verify_file', ";
+                if (!empty($desin_planning_verify_file))
+                    $updatesql .= "desin_planning_verify_file = '$desin_planning_verify_file', ";
+                if (!empty($desin_color_verify_file))
+                    $updatesql .= "desin_color_verify_file = '$desin_color_verify_file', ";
+                if (!empty($desin_style_verify_file))
+                    $updatesql .= "desin_style_verify_file = '$desin_style_verify_file', ";
+                if (!empty($desin_documents_verify_file))
+                    $updatesql .= "desin_documents_verify_file = '$desin_documents_verify_file', ";
+            }
+        } else if ($user_department_id == 321) {
+            // 共用更新 
+            // $updatesql .= "
+            //     contractno = '$contractno', 
+            //     facility_temp_no = '$facility_temp_no', 
+            //     facilityno = '$facilityno',
+            //     custom='$custom' ,
+            //     latitude = '$latitude', 
+            //     longitude = '$longitude',
+            //     weight = '$weight', 
+            //     numberofpassenger = '$numberofpassenger', 
+            //     numberofstop = '$numberofstop', 
+            //     numberoffloor = '$numberoffloor', 
+            //     opentype = '$opentype', 
+            //     speed = '$speed', 
+            //     site_manager = '$site_manager',
+            //     address = '$address',
+            //     real_address = '$real_address', 
+            //     contract_arrival_date = '$contract_arrival_date', 
+            //     facility_kind = '$facility_kind',
+            // ";
+            // 業務更新
+            $updatesql .= "
+                prattford_order_date_verify = '$prattford_order_date_verify' ,
+                prattford_order_date = '$prattford_order_date',
+                prattford_order_date_owner = '$prattford_order_date_owner', 
+                estimated_shipping_date_verify = '$estimated_shipping_date_verify', 
+                estimated_shipping_date = '$estimated_shipping_date',
+                estimated_shipping_date_owner = '$estimated_shipping_date_owner', 
+                estimated_shipping_schedule_date_verify = '$estimated_shipping_schedule_date_verify', 
+                estimated_shipping_schedule_date = '$estimated_shipping_schedule_date', 
+                estimated_shipping_schedule_date_owner = '$estimated_shipping_schedule_date_owner', 
+                goods_type = '$goods_type',
+                goods_type_date = '$goods_type_date',
+                goods_type_owner = '$goods_type_owner',
+                taiwan_goods_type = '$taiwan_goods_type',
+                taiwan_goods_type_date = '$taiwan_goods_type_date',
+                taiwan_goods_type_owner = '$taiwan_goods_type_owner',
+                shengguanok_status = '$shengguanok_status', 
+                shengguanok_status_at = '$shengguanok_status_at', 
+                shengguanok_status_owner = '$shengguanok_status_owner', 
+                yewu_remark = '', 
+            ";
+            if (!empty(trim($yewu_remark))) {
+                $updatesql .= "
+                    all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>" . $yewu_remark . "<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
+                ";
+            }
+            if (!empty($shengguanok_status_file))
+                $updatesql .= "shengguanok_status_file = '$shengguanok_status_file', ";
+        } else if ($user_department_id == 220) {
+            // 共用更新 
+            $updatesql .= "
+                contractno = '$contractno', 
+                facility_temp_no = '$facility_temp_no', 
+                facilityno = '$facilityno',
+                custom='$custom' ,
+                latitude = '$latitude', 
+                longitude = '$longitude',
+                weight = '$weight', 
+                numberofpassenger = '$numberofpassenger', 
+                numberofstop = '$numberofstop', 
+                numberoffloor = '$numberoffloor', 
+                opentype = '$opentype', 
+                speed = '$speed', 
+                site_manager = '$site_manager',
+                address = '$address',
+                real_address = '$real_address', 
+                contract_arrival_date = '$contract_arrival_date', 
+                facility_kind = '$facility_kind',
+            ";
+        } else if ($user_department_id == 912) {
+            // 品證部
+            $updatesql .= " 
+                qc_official_type = '$qc_official_type',
+                qc_date = '$qc_date',
+                qc_date_owner = '$qc_date_owner',
+                end_qc_date = '$end_qc_date',
+                end_qc_date_owner = '$end_qc_date_owner',
+                official_check_date = '$official_check_date',
+                official_check_date_owner = '$official_check_date_owner',
+            ";
+            if (!empty($official_check_file))
+                $updatesql .= "official_check_file = '$official_check_file', ";
+        }
+
+        // 暫時可編輯及刪除權限
+        if (in_array($user_id, ['M0175', 'M0079', 'M0060'])) {
+            $updatesql .= "
+                contractno = '$contractno', 
+                facility_temp_no = '$facility_temp_no', 
+                renovate_type = '$renovate_type', 
+                facilityno = '$facilityno',
+                custom='$custom' ,
+                latitude = '$latitude', 
+                longitude = '$longitude',
+                weight = '$weight', 
+                numberofpassenger = '$numberofpassenger', 
+                numberofstop = '$numberofstop', 
+                numberoffloor = '$numberoffloor', 
+                opentype = '$opentype', 
+                speed = '$speed', 
+                site_manager = '$site_manager',
+                address = '$address',
+                contract_arrival_date = '$contract_arrival_date', 
+                facility_kind = '$facility_kind',
+            ";
+        }
+
+        // 工務助理
+        if (
+            in_array($user_id, ['M0164', 'M0165', 'M0127', 'M0193', 'M0170', 'M0188', 'M0117'])
+            || in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545])
+            || $user_id == 'M0054'
+        ) {
+
+            $qc_official_type = $_POST['qc_official_type2'] ?: $row['qc_official_type'];
+            $outsourcer_type = $_POST['outsourcer_type'];
+            $qc_date = $_POST['qc_date2'] ?: $row['qc_date'];
+            $qc_date_owner = $_POST['qc_date2_owner'] ?: $row['qc_date_owner'];
+            $end_qc_date = $_POST['end_qc_date2'] ?: $row['end_qc_date'];
+            $end_qc_date_owner = $_POST['end_qc_date2_owner'] ?: $row['end_qc_date_owner'];
+            $official_check_date = $_POST['official_check_date2'] ?: $row['official_check_date'];
+            $old_official_check_date = $_POST['old_official_check_date2'] ?: $row['old_official_check_date'];
+            $official_check_date_owner = $_POST['official_check_date2_owner'] ?: $row['official_check_date_owner'];
+            $delivery_date = $_POST['delivery_date2'] ?: $row['delivery_date'];
+            $delivery_date_owner = $_POST['delivery_date2_owner'] ?: $row['delivery_date_owner'];
+            $install_start_date = $_POST['install_start_date2'] ?: $row['install_start_date'];
+            $install_start_date_owner = $_POST['install_start_date2_owner'] ?: $row['install_start_date_owner'];
+            $install_end_date = $_POST['install_end_date2'] ?: $row['install_end_date'];
+            $install_end_date_owner = $_POST['install_end_date2_owner'] ?: $row['install_end_date_owner'];
+            $tryrun_start_date = $_POST['tryrun_start_date2'] ?: $row['tryrun_start_date'];
+            $tryrun_start_date_owner = $_POST['tryrun_start_date2_owner'] ?: $row['tryrun_start_date_owner'];
+            $tryrun_end_date = $_POST['tryrun_end_date2'] ?: $row['tryrun_end_date'];
+            $tryrun_end_date_owner = $_POST['tryrun_end_date2_owner'] ?: $row['tryrun_end_date_owner'];
+
+            $updatesql .= "
+
+                qc_official_type = '$qc_official_type',
+
+                install_start_date = '$install_start_date',
+                install_start_date_owner = '$install_start_date_owner',
+                install_end_date = '$install_end_date',
+                install_end_date_owner = '$install_end_date_owner',
+                tryrun_start_date = '$tryrun_start_date',
+                tryrun_start_date_owner = '$tryrun_start_date_owner',
+                tryrun_end_date = '$tryrun_end_date',
+                tryrun_end_date_owner = '$tryrun_end_date_owner',
+
+                delivery_date = '$delivery_date',
+                delivery_date_owner = '$delivery_date_owner',
+                qc_date = '$qc_date',
+                qc_date_owner = '$qc_date_owner',
+                end_qc_date = '$end_qc_date',
+                end_qc_date_owner = '$end_qc_date_owner',
+                official_check_date = '$official_check_date',
+                official_check_date_owner = '$official_check_date_owner',
+
+                outsourcer_type = '$outsourcer_type',
+                install_outsourcer = '$install_outsourcer',
+                install_outsourcer_owner = '$install_outsourcer_owner',
+                install_outsourcer_date = '$install_outsourcer_date',
+                install_outsourcer_date_owner = '$install_outsourcer_date_owner',
+                estimate_install_start_date = '$estimate_install_start_date',
+                estimate_install_start_date_owner = '$estimate_install_start_date_owner',
+                estimate_install_end_date = '$estimate_install_end_date',
+                estimate_install_end_date_owner = '$estimate_install_end_date_owner',
+                tryrun_outsourcer = '$tryrun_outsourcer',
+                tryrun_outsourcer_owner = '$tryrun_outsourcer_owner',
+                tryrun_outsourcer_date = '$tryrun_outsourcer_date',
+                tryrun_outsourcer_date_owner = '$tryrun_outsourcer_date_owner',
+                estimate_tryrun_start_date = '$estimate_tryrun_start_date',
+                estimate_tryrun_start_date_owner = '$estimate_tryrun_start_date_owner',
+                estimate_tryrun_end_date = '$estimate_tryrun_end_date',
+                estimate_tryrun_end_date_owner = '$estimate_tryrun_end_date_owner',
+                warehouse_assistant_remark = '$warehouse_assistant_remark',
+            ";
+
+            if (!empty($plan_diagram_file)) {
+                $updatesql .= "plan_diagram_file = '$plan_diagram_file', ";
+                $updatesql .= "
+                    all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>上傳了安裝圖附件<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
+                ";
+            }
+            if (!empty($completion_acceptance_file)) {
+                $updatesql .= "completion_acceptance_file = '$completion_acceptance_file', ";
+                $updatesql .= "
+                    all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>上傳了完工驗收單附件<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
+                ";
+            }
+            if (!empty($outsourcer_contract_file)) {
+                echo $updatesql .= "outsourcer_contract_file = '$outsourcer_contract_file', ";
+            }
+        }
+
+        // 許協更新業務確認項目權限
+        if ($user_id == 'M0060') {
+            $updatesql .= "
+                prattford_order_date_verify = '$prattford_order_date_verify' ,
+                prattford_order_date = '$prattford_order_date',
+                prattford_order_date_owner = '$prattford_order_date_owner', 
+                estimated_shipping_date_verify = '$estimated_shipping_date_verify', 
+                estimated_shipping_date = '$estimated_shipping_date',
+                estimated_shipping_date_owner = '$estimated_shipping_date_owner', 
+                estimated_shipping_schedule_date_verify = '$estimated_shipping_schedule_date_verify', 
+                estimated_shipping_schedule_date = '$estimated_shipping_schedule_date', 
+                estimated_shipping_schedule_date_owner = '$estimated_shipping_schedule_date_owner', 
+                goods_type = '$goods_type',
+                goods_type_date = '$goods_type_date',
+                goods_type_owner = '$goods_type_owner',
+                taiwan_goods_type = '$taiwan_goods_type',
+                taiwan_goods_type_date = '$taiwan_goods_type_date',
+                taiwan_goods_type_owner = '$taiwan_goods_type_owner',
+                shengguanok_status = '$shengguanok_status', 
+                shengguanok_status_at = '$shengguanok_status_at', 
+                shengguanok_status_owner = '$shengguanok_status_owner', 
+                yewu_remark = '', 
+            ";
+        }
+
+        // 生管 小雯 預計到貨日(到觀音廠日)權限
+        if ($user_id == 'M0168') {
+            $updatesql .= "
+                estimated_shipping_schedule_date_verify = '$estimated_shipping_schedule_date_verify', 
+                estimated_shipping_schedule_date = '$estimated_shipping_schedule_date', 
+                estimated_shipping_schedule_date_owner = '$estimated_shipping_schedule_date_owner', 
+            ";
+        }
+
+        $updatesql .= " 
+            creater = '$creater', 
+            create_at = '$create_at'  
+            WHERE id = '$id'
+        ";
+        // echo $updatesql;
+        // exit;
+        mysqli_query($link, $updatesql);
+        echo "
+            <script type ='text/JavaScript'>
+                alert('資料更新成功');
+                location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';
+            </script>
+        ";
+    }
+}
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    if ($_POST['form_name'] == 'assign_form') {
+        foreach ($_POST as $k => $v) {
+            $$k = htmlspecialchars(stripslashes(trim($v)));
+        }
+        $id = empty($_POST['id']) ? null : $_POST['id'];
+        // // 檢查簽核狀態
+        if (checkWwsAssianStatus($link, $user_id, $id)) {
+            echo "<script type ='text/JavaScript'>";
+            echo "alert('此表單已進入下個階段');";
+            echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
+            echo "</script>";
+        } else {
+            echo "<script type ='text/JavaScript'>";
+            echo "alert('此表單某些確認項未確認');";
+            echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
+            echo "</script>";
+        }
+    }
+}
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    if ($_POST['form_name'] == 'back_marketing_assign_form') {
+        foreach ($_POST as $k => $v) {
+            $$k = htmlspecialchars(stripslashes(trim($v)));
+        }
+        // 檢查簽核狀態
+        backMarketingSssign($link, $salesid, $user_id);
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('此表單已退回至營業階段');";
+        echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
+        echo "</script>";
+    }
+}
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    if ($_POST['form_name'] == 'back_design_assign_form') {
+        foreach ($_POST as $k => $v) {
+            $$k = htmlspecialchars(stripslashes(trim($v)));
+        }
+        // 檢查簽核狀態
+        backDesignssign($link, $user_id);
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('此表單已退回至設計階段');";
+        echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
+        echo "</script>";
+    }
+}
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    if ($_POST['form_name'] == 'warehouse_assign_form') {
+        foreach ($_POST as $k => $v) {
+            $$k = htmlspecialchars(stripslashes(trim($v)));
+        }
+        // 檢查簽核狀態
+        backWarehouse($link, $user_id);
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('此表單已退回至工務階段');";
+        echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
+        echo "</script>";
+    }
+}
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    if ($_POST['form_name'] == 'update_contract_date_form') {
+        foreach ($_POST as $k => $v)
+            $$k = htmlspecialchars(stripslashes(trim($v)));
+
+        $contractno = $_POST['contractno'];
+        $facilityno = $_POST['facilityno'];
+        $custom = $_POST['custom'];
+        $creater = $_POST['creater'];
+        $create_at = $_POST['create_at'];
+        $old_real_contract_arrival_date = $_POST['old_real_contract_arrival_date'];
+        $real_contract_arrival_date = $_POST['real_contract_arrival_date'];
+        $salesid = $_POST['salesid'];
+        $gongWuokid = $_POST['gongWuokid'];
+        $updatesql = "
+            UPDATE wipwholestatus 
+            SET 
+                real_contract_arrival_date = '$real_contract_arrival_date',
+                creater = '$creater', 
+                create_at = '$create_at'
+            WHERE id = '$id'
+        ";
+        mysqli_query($link, $updatesql);
+
+        $content = "合約號 : $contractno
+作番號 : $facilityno
+出貨日期微調: " . substr($old_real_contract_arrival_date, 0, 10) . "  =>  " . substr($real_contract_arrival_date, 0, 10);
+
+        $sql = "
+            INSERT INTO notice (
+                kind, 
+                related_id,
+                title,
+                content,
+                haveread,
+                permission,
+                creater,
+                create_at
+            ) VALUES(
+                '1', 
+                '$id', 
+                '作番大日程(新梯)出貨日調整通知 > " . $facilityno . "', 
+                '$content', 
+                NULL,
+                '$salesid', 
+                'system', 
+                '" . date("Y-m-d H:i:s") . "'
+            )
+        ";
+        mysqli_query($link, $sql);
+        $sql = "
+            INSERT INTO notice (
+                kind, 
+                related_id,
+                title,
+                content,
+                haveread,
+                permission,
+                creater,
+                create_at
+            ) VALUES(
+                '1', 
+                '$id', 
+                '作番大日程(新梯)出貨日調整通知 > " . $facilityno . "', 
+                '$content', 
+                NULL,
+                '$gongWuokid', 
+                'system', 
+                '" . date("Y-m-d H:i:s") . "'
+            )
+        ";
+        mysqli_query($link, $sql);
+
+        $sql = "
+            INSERT INTO wipwhole_change_contractdate_details (
+                creater, 
+                create_at,
+                wipwholestatus_id,
+                change_status,
+                old_change_date,
+                change_date
+            ) VALUES(
+                '$creater', 
+                '$create_at',
+                '$id',
+                'Z',
+                '$old_real_contract_arrival_date',
+                '$real_contract_arrival_date'
+            )
+        ";
+        mysqli_query($link, $sql);
+
+        // 檢查簽核狀態
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('已更新日期且通知營業人員及工務人員');";
+        echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
+        echo "</script>";
+    }
+}
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    if ($_POST['form_name'] == 'update_date_form') {
+
+        $creater = $user_id;
+
+        foreach ($_POST as $k => $v)
+            $$k = htmlspecialchars(stripslashes(trim($v)));
+
+        $real_arrival_date = $_POST['real_arrival_date'];
+        $updatesql = "
+            UPDATE wipwholestatus 
+            SET 
+                real_arrival_date = '$real_arrival_date'
+            WHERE id = '$id'
+        ";
+        mysqli_query($link, $updatesql);
+
+
+        $sql = "
+            SELECT 
+                `custom`,
+                `facilityno`,
+                `salesid`
+            FROM `wipwholestatus`
+            where `id` = '$id'
+        ";
+        $result = mysqli_query($link, $sql);
+        foreach ($result as $row) {
+            $permission = $row["salesid"];
+            $custom = $row["custom"];
+            $facilityno = $row["facilityno"];
+            $title = "客戶:$custom 作番:$facilityno 實際出貨日變更";
+            $content = "客戶:$custom 
+作番:$facilityno
+實際出貨日(到工地):$real_arrival_date";
+
+            $sql = "
+                INSERT INTO notice(
+                    kind,
+                    related_id,
+                    title,
+                    content,
+                    haveread,
+                    permission,
+                    creater,
+                    create_at
+                )VALUES(
+                    '1',
+                    '$id',
+                    '$title',
+                    '$content',
+                    null,
+                    '$permission',
+                    '$creater',
+                    '" . date("Y-m-d H:i:s") . "'
+                );
+            ";
+            mysqli_query($link, $sql);
+        }
+
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('已更新日期');";
+        echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
+        echo "</script>";
+    }
+}
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    if ($_POST['form_name'] == 'update_install_date_form') {
+        foreach ($_POST as $k => $v)
+            $$k = htmlspecialchars(stripslashes(trim($v)));
+
+        $change_all_contractno = $_POST['change_all_contractno'];
+        $contractno = $_POST['contractno2'];
+        $install_start_date = $_POST['install_start_date'];
+        $install_start_date_owner = $_POST['install_start_date_owner'];
+        $install_end_date = $_POST['install_end_date'];
+        $install_end_date_owner = $_POST['install_end_date_owner'];
+        $tryrun_start_date = $_POST['tryrun_start_date'];
+        $tryrun_start_date_owner = $_POST['tryrun_start_date_owner'];
+        $tryrun_end_date = $_POST['tryrun_end_date'];
+        $tryrun_end_date_owner = $_POST['tryrun_end_date_owner'];
+
+        $updatesql = "
+            UPDATE wipwholestatus 
+            SET 
+                install_start_date = '$install_start_date',
+                install_start_date_owner = '$install_start_date_owner',
+                install_end_date = '$install_end_date',
+                install_end_date_owner = '$install_end_date_owner',
+                tryrun_start_date = '$tryrun_start_date',
+                tryrun_start_date_owner = '$tryrun_start_date_owner',
+                tryrun_end_date = '$tryrun_end_date',
+                tryrun_end_date_owner = '$tryrun_end_date_owner'
+        ";
+        if (empty($change_all_contractno)) {
+            $updatesql .= "WHERE id = '$id' ";
+        } else {
+            $updatesql .= "WHERE contractno = '$contractno' ";
+        }
+        // echo $updatesql;
+        // exit;
+        mysqli_query($link, $updatesql);
+
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('已更新日期');";
+        echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
+        echo "</script>";
+    }
+}
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    if ($_POST['form_name'] == 'update_shengguan_form') {
+        foreach ($_POST as $k => $v)
+            $$k = htmlspecialchars(stripslashes(trim($v)));
+
+        $creater = $_POST['creater'];
+        $datetime = date("Y-m-d H:i:s");
+        $shengguan_remark = $_POST['shengguan_remark'];
+        $updatesql = "
+            UPDATE wipwholestatus 
+            SET shengguan_remark = '$shengguan_remark',
+                arrival_date_verify = '$arrival_date_verify',
+                actual_tofactory_date = '$actual_tofactory_date',
+                arrival_date_owner = '$arrival_date_owner',
+        ";
+        if (!empty(trim($shengguan_remark))) {
+            $updatesql .= "
+                all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>" . $shengguan_remark . "<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
+            ";
+        }
+        $updatesql .= " 
+            creater = '$creater', 
+            create_at = '$datetime'  
+            WHERE id = '$id'
+        ";
+        mysqli_query($link, $updatesql);
+        echo "<script type ='text/JavaScript'>";
+        echo "alert('已存檔');";
+        echo "location.href='wipwhole-rec-invoice-edit.php?function_name=pricereview&id=$id&" . $token_link . "';";
+        echo "</script>";
+    }
+}
+
+
+function write_note($link, $id, $user_id, $content)
+{
+    $datetime = date("Y-m-d H:i:s");
+    $updatesql = "
+        UPDATE wipwholestatus 
+        SET 
+            all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>" . $content . "<br/><br/>', IF(all_remark IS NULL,'',all_remark))
+        WHERE id = '$id'
+    ";
+    mysqli_query($link, $updatesql);
+}
+
+// function getWipwholestatusDetail($link, $id)
+// {
+//     $sql = "
+//         SELECT *
+//         FROM wipwholestatus
+//         WHERE 1=1
+//         AND id = '$id'
+//         AND status = '1'
+//     ";
+//     $result = mysqli_query($link, $sql);
+//     $row = mysqli_fetch_assoc($result);
+//     return $row;
+// }
+
+// 各區營銷(契約)經理判斷程式
+function checkUseridIsManager($user_id)
+{
+    // 北區 劉永德
+    if (in_array($user_id, ['M0137']))
+        return true;
+    // 中區 李烘銘	
+    if (in_array($user_id, ['M0086']))
+        return true;
+    // 桃竹 張莉凱	
+    if (in_array($user_id, ['M0026']))
+        return true;
+    // 宜花東 陳志文
+    if (in_array($user_id, ['M0054']))
+        return true;
+    // 南區 吳育宗
+    if (in_array($user_id, ['M0033']))
+        return true;
+    return false;
+}
+
+// 表單簽核狀態檢查主程式
+function checkWwsAssianStatus($link, $user_id, $id = null)
+{
+
+    if (isset($_GET['id']) || isset($_GET['form_key'])) {
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+        $form_YD_key = isset($_GET['form_key']) ? $_GET['form_key'] : getYDForm_key($link, $id);
+        $form_G_key = isset($_GET['form_key']) ? $_GET['form_key'] : getGForm_key($link, $id);
+    }
+
+    include "./class/Cmail.php";
+    $cmail = new Cmail();
+    $data = getWipwholestatusDetail($link, $id);
+    $data['salesname'] = accountid2name($data['salesid'])[$data['salesid']];
+    $data['salesmail'] = accountid2email([$data['salesid']])[$data['salesid']];
+
+    $data['salesmanagername'] = accountid2name(manage_class($data['salesid'])[0])[manage_class($data['salesid'])[0]];
+    $data['salesmanagermail'] = accountid2email([manage_class($data['salesid'])[0]])[manage_class($data['salesid'])[0]];
+    $data['designname'] = accountid2name("M0023")["M0023"];
+    $data['designmail'] = accountid2email(["M0023"])["M0023"];
+    $data['designleadername'] = accountid2name(getSheJiokLeaderNo($link))[getSheJiokLeaderNo($link)];
+    $data['designleadermail'] = accountid2email([getSheJiokLeaderNo($link)])[getSheJiokLeaderNo($link)];
+    $data['gongwokname'] = accountid2name(getGongWuokNo($link))[getGongWuokNo($link)];
+    $data['gongwokmail'] = accountid2email([getGongWuokNo($link)])[getGongWuokNo($link)];
+    $data['shengguanname'] = accountid2name(getShengGuanokLeaderNo($link))[getShengGuanokLeaderNo($link)];
+    $data['shengguanmail'] = accountid2email([getShengGuanokLeaderNo($link)])[getShengGuanokLeaderNo($link)];
+
+    // 確認營業階段 
+    // 非主管進入主管階段
+    // 主管進入設計人員(新梯:郭承瑋 M0023)階段
+    if (checkNowFormYDStatus($link) == 'A' && checkYingYeok($link, $id) == '0') {
+        if (checkUseridIsManager($user_id)) {
+            write_note($link, $id, $user_id, "<em>營業經理提交至設計階段</em>");
+            $mail_title = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業經理提交至設計階段";
+            $mail_content = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業經理提交至設計階段";
+            $cmail->sendx(
+                $mail_title,
+                $mail_content,
+                [
+                    [$data['salesname'], $data['salesmail']],
+                    [$data['designname'], $data['designmail']]
+                ],
+                "永佳捷科技"
+            );
+            do_wws_next_assign("M0023", $form_YD_key, 'B');
+            return true;
+        } else {
+            write_note($link, $id, $user_id, "<em>營業提交至營業經理階段</em>");
+            $mail_title = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業提交至營業經理階段";
+            $mail_content = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業提交至營業經理階段";
+            $cmail->sendx(
+                $mail_title,
+                $mail_content,
+                [
+                    [$data['salesname'], $data['salesmail']],
+                    [$data['salesmanagername'], $data['salesmanagermail']]
+                ],
+                "永佳捷科技"
+            );
+            do_wws_next_assign(manage_class($data['salesid'])[0], $form_YD_key, 'I');
+            return true;
+        }
+    }
+
+    // 確認營業主管階段 進入設計人員(新梯:郭承瑋 M0023)階段
+    if (checkNowFormYDStatus($link) == 'I' && checkYingYeok($link, $id) == '0') {
+        if (checkUseridIsManager($user_id)) {
+            write_note($link, $id, $user_id, "<em>營業經理提交至設計階段</em>");
+            $mail_title = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業經理提交至設計階段";
+            $mail_content = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-營業經理提交至設計階段";
+            $cmail->sendx(
+                $mail_title,
+                $mail_content,
+                [
+                    [$data['salesname'], $data['salesmail']],
+                    [$data['designname'], $data['designmail']]
+                ],
+                "永佳捷科技"
+            );
+            do_wws_next_assign("M0023", $form_YD_key, 'B');
+            return true;
+        }
+    }
+
+    // 確認設計人員(新梯:郭承瑋 M0023)階段 進入設計主管階段
+    if (in_array(checkNowFormYDStatus($link), ['B', 'I']) && checkSheJiok($link, $id) == '0') {
+        write_note($link, $id, $user_id, "<em>設計提交至設計主管階段</em>");
+        $mail_title = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-設計提交至設計主管階段";
+        $mail_content = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-設計提交至設計主管階段";
+        $cmail->sendx(
+            $mail_title,
+            $mail_content,
+            [
+                [$data['designleadername'], $data['designleadermail']],
+                [$data['designname'], $data['designmail']]
+            ],
+            "永佳捷科技"
+        );
+        do_wws_next_assign(getSheJiokLeaderNo($link), $form_YD_key, 'C');
+        return true;
+    }
+    // 確認設計主管階段 進入生管階段
+    if (checkNowFormYDStatus($link) == 'C' && checkSheJiokLeader($link, $id) == '0') {
+        write_note($link, $id, $user_id, "<em>設計主管提交至生管階段</em>");
+        $mail_title = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-設計主管提交至生管階段";
+        $mail_content = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-設計主管提交至生管階段";
+        $cmail->sendx(
+            $mail_title,
+            $mail_content,
+            [
+                [$data['designleadername'], $data['designleadermail']],
+                [$data['shengguanname'], $data['shengguanmail']]
+            ],
+            "永佳捷科技"
+        );
+        do_wws_next_assign(getShengGuanokLeaderNo($link), $form_YD_key, 'D');
+        return true;
+    }
+    // 確認工務階段 進入生管階段
+    if (checkNowFormGStatus($link) == 'G' && checkGongWuok($link, $id) == '0') {
+        write_note($link, $id, $user_id, "<em>工務提交至生管階段</em>");
+        $mail_title = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-工務提交至生管階段";
+        $mail_content = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-工務提交至生管階段";
+        $cmail->sendx(
+            $mail_title,
+            $mail_content,
+            [
+                [$data['gongwuname'], $data['gongwumail']],
+                [$data['shengguanname'], $data['shengguanmail']]
+            ],
+            "永佳捷科技"
+        );
+        do_wws_next_assign(getShengGuanokLeaderNo($link), $form_G_key, 'H');
+        return true;
+    }
+    // 確認生管階段(營業部及設計部) 結束簽核流程
+    if (checkNowFormYDStatus($link) == 'D' && checkNowFormGStatus($link) == 'H' && checkShengGuanok($link, $id) == '0') {
+        write_note($link, $id, $user_id, "<em>進入生產結案階段</em>");
+        $mail_title = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-進入生產結案階段";
+        $mail_content = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-進入生產結案階段";
+        $cmail->sendx(
+            $mail_title,
+            $mail_content,
+            [
+                [$data['shengguanname'], $data['shengguanmail']]
+            ],
+            "永佳捷科技"
+        );
+        do_wws_next_assign('00000', $form_YD_key, 'Z');
+        do_wws_next_assign('00000', $form_G_key, 'Z');
+        return true;
+    }
+    return false;
+}
+
+
+// 退回至營業階段
+function backMarketingSssign($link, $salesid, $user_id)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key'])) {
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+        $form_YD_key = isset($_GET['form_key']) ? $_GET['form_key'] : getYDForm_key($link, $id);
+        include "./class/Cmail.php";
+        $cmail = new Cmail();
+        $data = getWipwholestatusDetail($link, $id);
+        $data['salesname'] = accountid2name($data['salesid'])[$data['salesid']];
+        $data['salesmail'] = accountid2email([$data['salesid']])[$data['salesid']];
+        write_note($link, $id, $user_id, "<em>退回營業階段</em>");
+        $mail_title = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-退回營業階段";
+        $mail_content = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-退回營業階段";
+        $cmail->sendx(
+            $mail_title,
+            $mail_content,
+            [
+                [$data['salesname'], $data['salesmail']],
+            ],
+            "永佳捷科技"
+        );
+        do_wws_next_assign($salesid, $form_YD_key, 'A');
+    }
+}
+// 退回至設計階段
+function backDesignssign($link, $user_id)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key'])) {
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+        $form_YD_key = isset($_GET['form_key']) ? $_GET['form_key'] : getYDForm_key($link, $id);
+    }
+    include "./class/Cmail.php";
+    $cmail = new Cmail();
+    $data = getWipwholestatusDetail($link, $id);
+    $data['designname'] = accountid2name("M0023")["M0023"];
+    $data['designmail'] = accountid2email(["M0023"])["M0023"];
+    write_note($link, $id, $user_id, "<em>退回設計階段</em>");
+    $mail_title = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-退回設計階段";
+    $mail_content = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-退回設計階段";
+    $cmail->sendx(
+        $mail_title,
+        $mail_content,
+        [
+            [$data['designname'], $data['designmail']],
+        ],
+        "永佳捷科技"
+    );
+    do_wws_next_assign("M0023", $form_YD_key, 'B');
+}
+// 退回至工務階段
+function backWarehouse($link, $user_id)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key'])) {
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+        $form_YD_key = isset($_GET['form_key']) ? $_GET['form_key'] : getYDForm_key($link, $id);
+    }
+    include "./class/Cmail.php";
+    $cmail = new Cmail();
+    $data = getWipwholestatusDetail($link, $id);
+    $data['gongwokname'] = accountid2name(getGongWuokNo($link))[getGongWuokNo($link)];
+    $data['gongwokmail'] = accountid2email([getGongWuokNo($link)])[getGongWuokNo($link)];
+    write_note($link, $id, $user_id, "<em>退回工務階段</em>");
+    $mail_title = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-退回至工務階段";
+    $mail_content = "作番大日程(新梯)合約號:" . $data['contractno'] . "作番號:" . $data['facilityno'] . "-退回至工務階段";
+    $cmail->sendx(
+        $mail_title,
+        $mail_content,
+        [
+            [$data['gongwokname'], $data['gongwokmail']],
+        ],
+        "永佳捷科技"
+    );
+    do_wws_next_assign(getGongWuokNo($link), $form_YD_key, 'G');
+}
diff --git a/wms/wipwhole-rec-invoice-edit.php b/wms/wipwhole-rec-invoice-edit.php
index 1f4b2236..684ac592 100644
--- a/wms/wipwhole-rec-invoice-edit.php
+++ b/wms/wipwhole-rec-invoice-edit.php
@@ -1,2111 +1,2335 @@
-<?php
-// ini_set('display_errors', 'on');
-/**
- * (新梯)流程規則:
- * 1. A:營業員確認中 生管建立大日程 (或是系統洗入)
- * 2. B:設計部門確認中 (郭承瑋)
- * 3. C:設計部門主管確認中 (N0019江京鴻)
- * 4. D:生管確認中 (M0024伃廷)
- * 5. Z:本單結案 (00000)
- * 
- * 1. G:工務組長確認中 生管建立大日程 (或是系統洗入) 工務:宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
- * 2. H:生管確認中 (M0024伃廷)
- * 3. Z:本單結案 (00000)
- * 
- */
-
-// error_reporting(0);
-include "header.php";
-require_once "database.php";
-include "wipwhole-index-function.php";
-include "css/view/wipwhole-rec-invoice-edit.php";
-
-// 查詢數據
-if (isset($_GET['id']) || isset($_GET['form_key'])) {
-    $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-} else {
-    die('ERROR: Record ID not found.');
-}
-
-// 取得大日程此 id 資料
-$row = getWipwholestatusData($link, $id);
-
-// 使用者部門
-$user_department_id = getDepartmentId($link, $user_id);
-// 使用者職位
-$role_id = getRoleId($link, $user_id);
-
-// input disaled status
-// 資訊 業務 工務 營業 設計 設計主管 生管 
-$information = getInformationStatus($link, $user_department_id, $role_id);
-$yewu = getYewuStatus($link, $user_department_id, $role_id);
-$warehouse = getWarehouseStatus($link, $user_department_id, $role_id, 1);
-$marketing = getMarketingStatus($link, $user_department_id, $role_id, 1);
-$marketing2 = getMarketingStatus($link, $user_department_id, $role_id, 2);
-$desin = getDesinStatus($link, $user_department_id, $role_id);
-$desin_leader = getDesinLeaderStatus($link, $user_department_id, $role_id);
-$shengguan = getShengguanStatus($link, $user_department_id, $role_id, 1);
-$warehouse2 = getWarehouseStatus($link, $user_department_id, $role_id, 2);
-$shengguan2 = getShengguanStatus($link, $user_department_id, $role_id, 2);
-$pinzheng = getPinzhengStatus($link, $user_department_id, $role_id);
-
-// 取得分頁頁碼
-$tab = getTabNo($user_department_id);
-
-// 工務助理
-if (in_array($user_id, ['M0164', 'M0165', 'M0127', 'M0193', 'M0170', 'M0188', 'M0117'])) {
-    $warehouse2 = "";
-    $tab = 5;
-}
-
-// 暫時可編輯及刪除權限
-$update_delete_status = "disabled";
-if (in_array($user_id, ['M0175', 'M0079', 'M0060'])) {
-    $update_delete_status = "";
-}
-
-// 許協業務項編輯權限
-if (in_array($user_id, ['M0060'])) {
-    $yewu = "";
-}
-
-// select => options 開門方式 
-$opendoor_options = getOpendoorOptions($link);
-// select => options 確認人
-$all_users_options = getAllUsersOptions($link);
-
-// 更新數據 接收 post 命令
-include "wipwhole-rec-invoice-edit-submit.php";
-
-?>
-
-<form method="post" id="form" enctype="multipart/form-data">
-    <input type="hidden" name='form_name' value="main_form" />
-    <div style="overflow-x:auto;">
-        <table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%">
-            <thead>
-                <tr>
-                    <td colspan="9">
-                        <h3 style='text-align:center'>作番大日程(新梯)</h3>
-                    </td>
-                </tr>
-            </thead>
-            <tbody style="font-weight: bolder;margin-bottom: 20px">
-                <tr>
-                    <td colspan="7" style='vertical-align: middle;border-right:0px;'>
-                        <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>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle">合約號</td>
-                    <td>
-                        <input class="form-control " type="text" id="contractno" name="contractno" value="<?= $row["contractno"]; ?>" <?php echo $update_delete_status; ?>>
-                        <?php
-                        if (in_array($user_department_id, [311, 312, 313, 314, 315, 501, 511, 512, 513, 514, 220, 911, 50, 320, 250])) {
-                            $sql = "
-                                    SELECT
-                                        mid,
-                                        pr_item_id,
-                                        version
-                                    FROM specsurvey_main
-                                    WHERE contractno = '" . $row["contractno"] . "'
-                                ";
-                            $result = mysqli_query($link, $sql);
-                            $row2 = mysqli_fetch_array($result);
-                            if (!empty($row2['mid'])) {
-                                echo "<a target='_blank' href='/wms/mkt/specsurvey_renovate-view.php?pa=" . $row2['mid'] . "," . $row2['pr_item_id'] . "," . $row2['version'] . "&$token_link'>規調:" . $row["contractno"] . "</a>";
-                            }
-                        }
-                        ?>
-                    </td>
-                    <td style="vertical-align: middle">作番號</td>
-                    <td>
-                        <input class="form-control disabled_select" type="text" name="facilityno" value="<?= $row["facilityno"]; ?>" <?php echo $update_delete_status; ?>>
-                    </td>
-                    <td style="vertical-align: middle">客戶名稱</td>
-                    <td>
-                        <input class="form-control disabled_select" type="text" name="custom" value="<?= $row["custom"]; ?>" <?php echo $update_delete_status; ?>>
-                    </td>
-                    <td style="vertical-align: middle">號機</td>
-                    <td>
-                        <input class="form-control disabled_select" type="text" name="facility_temp_no" value="<?= $row["facility_temp_no"]; ?>" <?php echo $update_delete_status; ?>>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle">經度</td>
-                    <td style="vertical-align: middle">
-                        <input class="form-control disabled_select" type="text" name="longitude" value="<?= $row["longitude"]; ?>" <?php echo $update_delete_status; ?>>
-                    </td>
-                    <td style="vertical-align: middle">緯度</td>
-                    <td>
-                        <input class="form-control disabled_select" type="text" name="latitude" value="<?= $row["latitude"]; ?>" <?php echo $update_delete_status; ?>>
-                    </td>
-                    <td style="vertical-align: middle">地址</td>
-                    <td>
-                        <input class="form-control disabled_select" type="text" name="address" value="<?= $row["address"]; ?>" <?php echo $update_delete_status; ?>>
-                    </td>
-                    <td style="vertical-align: middle">工地地址<br />
-                        <?php
-                        $show_tmp_arr = [
-                            311, 312, 313, 314, 315,
-                            501, 511, 512, 513, 514,
-                            521, 531, 220, 250,
-                            541, 542, 543, 544, 545
-                        ];
-                        if (in_array($user_department_id, $show_tmp_arr))
-                            echo "<a target='_blank' href='wipwhole-change-contractdate.php?function_name=wipwholerenstatus&$token_link&id=$id'>工地地址調整</a>";
-                        ?>
-                    </td>
-                    <td>
-                        <input class="form-control " type="text" name="real_address" value="<?= $row["real_address"]; ?>" disabled>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle">機型</td>
-                    <td>
-                        <input class="form-control disabled_select" type="text" name="facility_kind" value="<?= $row["facility_kind"]; ?>" <?php echo $update_delete_status; ?>>
-                    </td>
-                    <td style="vertical-align: middle">開門方式</td>
-                    <td style="vertical-align: middle">
-                        <select class="form-control disabled_select" name="opentype" <?php echo $update_delete_status; ?>>
-                            <option value=""></option>
-                            <?php
-                            foreach ($opendoor_options as $opendoor_option) :
-                                if ($row["opentype"] == $opendoor_option['label']) {
-                                    echo "<option selected='selected' value='" . $opendoor_option['label'] . "'>" . $opendoor_option['label'] . "</option>";
-                                } else {
-                                    echo "<option value='" . $opendoor_option['label'] . "'>" . $opendoor_option['label'] . "</option>";
-                                }
-                            endforeach
-                            ?>
-                        </select>
-                    </td>
-                    <td style="vertical-align: middle">速度</td>
-                    <td style="vertical-align: middle" <?php echo $information; ?>>
-                        <input class="form-control disabled_select" type="number" name="speed" min="0" value="<?= $row["speed"]; ?>" <?php echo $update_delete_status; ?>>
-                    </td>
-                    <td style="vertical-align: middle">工地負責人</td>
-                    <td>
-                        <input class="form-control disabled_select" type="text" name="site_manager" value="<?= $row["site_manager"]; ?>" <?php echo $update_delete_status; ?>>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle">載重</td>
-                    <td style="vertical-align: middle">
-                        <input class="form-control disabled_select" type="number" name="weight" min="0" value="<?= $row["weight"]; ?>" <?php echo $update_delete_status; ?>>
-                    </td>
-                    <td style="vertical-align: middle">人乘</td>
-                    <td style="vertical-align: middle">
-                        <input class="form-control disabled_select" type="number" name="numberofpassenger" min="0" value="<?= $row["numberofpassenger"]; ?>" <?php echo $update_delete_status; ?>>
-                    </td>
-                    <td style="vertical-align: middle">樓停</td>
-                    <td>
-                        <input class="form-control disabled_select" type="number" name="numberofstop" id="numberofstop" min="0" value="<?= $row["numberofstop"]; ?>" <?php echo $update_delete_status; ?>>
-                    </td>
-                    <td style="vertical-align: middle">樓層</td>
-                    <td>
-                        <input class="form-control disabled_select" type="number" name="numberoffloor" min="0" value="<?= $row["numberoffloor"]; ?>" <?php echo $update_delete_status; ?>>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle">合約交期<br />(到工地)</td>
-                    <td>
-                        <input class="form-control disabled_select" type="date" name="contract_arrival_date" value="<?= $row['contract_arrival_date']; ?>" <?php echo $update_delete_status; ?>>
-                    </td>
-                    <td style="vertical-align: middle">預計交期(到工地)
-                        <br />
-                        <?php
-                        $show_tmp_arr = [
-                            311, 312, 313, 314, 315,
-                            501, 511, 512, 513, 514,
-                            521, 531, 220, 250,
-                            541, 542, 543, 544, 545
-                        ];
-                        if (in_array($user_department_id, $show_tmp_arr))
-                            echo "<a target='_blank' href='wipwhole-change-contractdate.php?function_name=wipwholerenstatus&$token_link&id=$id'>出貨日調整</a>";
-                        ?>
-                    </td>
-                    <td style="vertical-align: middle">
-                        <input class="form-control disabled_select" type="date" value="<?= $row['real_contract_arrival_date']; ?>" disabled>
-                    </td>
-                    <td></td>
-                    <td></td>
-                    <td style="vertical-align: middle">簽核狀況</td>
-                    <td style="vertical-align: middle">
-                        <?php
-                        $assign_status_YD = array(
-                            'A' => '營業員確認中',
-                            'B' => '營業部門已確認<br/>設計部門確認中',
-                            'C' => '營業部門已確認<br/>設計部門主管確認中',
-                            'D' => '營業部門已確認<br/>設計部門主管已確認',
-                            'Z' => '',
-                        );
-
-                        $assign_status_G = array(
-                            'G' => '工務部門確認中',
-                            'H' => '工務部門已確認',
-                            'Z' => '',
-                        );
-                        if (checkNowFormYDStatus($link) == 'Z' && checkNowFormGStatus($link) == 'Z') {
-                            echo "此作番大日程已結案";
-                        } else {
-                            echo $assign_status_YD[checkNowFormYDStatus($link)] . "<br/>" . $assign_status_G[checkNowFormGStatus($link)];
-                        }
-                        ?>
-                    </td>
-                </tr>
-                <tr>
-                    <td>作番備註</td>
-                    <td colspan="7">
-                        <div style="max-height:250px;overflow-y:auto;">
-                            <?= nl2br($row["all_remark"]); ?>
-                        </div>
-                    </td>
-                </tr>
-                <?php
-                if (in_array($user_id, ['M0175', 'M0079', 'M0060'])) {
-                ?>
-                    <tr>
-                        <td colspan="8">
-                            <button onclick="savedata()" type="button" class="btn btn-primary pull-right" style="margin-left:3px;" <?php echo $update_delete_status; ?>>存檔</button>
-                        </td>
-                    </tr>
-                <?php
-                }
-                ?>
-            </tbody>
-        </table>
-    </div>
-    <div id="tabs">
-        <input class="form-control " type="hidden" name="tab" id='tab' value="<?= $tab; ?>">
-        <ul>
-            <li><a href="#tabs-1">營業確認項</a></li>
-            <li><a href="#tabs-2">設計確認項</a></li>
-            <li><a href="#tabs-3">工務確認項</a></li>
-            <li><a href="#tabs-4">生管確認項</a></li>
-            <li><a href="#tabs-5">品證確認項</a></li>
-            <li><a href="#tabs-6">工務助理確認項</a></li>
-        </ul>
-        <div id="tabs-1">
-            <table class="table  table-bordered" style="width:100%">
-                <tbody style="font-weight: bolder;margin-bottom: 20px">
-                    <tr>
-                        <td style="vertical-align: middle;width:auto;">營業/契約確認規格</td>
-                        <td style="width:150px;">
-                            <select class="disabled_select" name="sales_spec_verify" id="sales_spec_verify" <?= $marketing; ?>>
-                                <option <?php if ($row["sales_spec_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
-                                <option <?php if ($row["sales_spec_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
-                                <option <?php if ($row["sales_spec_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
-                                <option <?php if ($row["sales_spec_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
-                            </select>
-                        </td>
-                        <td style="vertical-align: middle;width:auto;">附件</td>
-                        <td style="vertical-align: middle;width:300px;">
-                            <input style="width:70%;display:inline;" type="file" id="sales_spec_verify_file" name="sales_spec_verify_file" <?= $marketing; ?>>
-                            <?php
-                            echo !empty($row['sales_spec_verify_file']) ? "<a id='sales_spec_verify_file_a' style='color:#00F;' href='" . $row['sales_spec_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                            ?>
-                        </td>
-                        <td style="vertical-align: middle">確認時間</td>
-                        <td>
-                            <input class="form-control disabled_select" type="datetime-local" id="sales_spec_verify_at" name="sales_spec_verify_at" value="<?= $row['sales_spec_verify_at']; ?>" readonly>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select name="sales_spec_verify_owner" class="disabled_select" id="sales_spec_verify_owner" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['sales_spec_verify_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">
-                            客戶計劃圖
-                            <br />
-                            (意匠圖)
-                            <?php
-                            $result2 = getWipwholeChangePlanningCustomerDetailsStatus($link, $id);
-                            $row2 = mysqli_fetch_assoc($result2);
-                            if (empty($row2['change_status'])) {
-                                $show_tmp_arr = [
-                                    '311', '312', '313', '314', '315',
-                                    '501', '511', '512', '513', '514',
-                                    '220', '320'
-                                ];
-                                if (in_array($user_department_id, $show_tmp_arr))
-                                    echo "<br/>";
-                                echo "<a target='_blank' style='color:#00F;' href='wipwhole-change-planning-customer-name.php?function_name=wipwholerenstatus&$token_link&id=$id'>申請上傳</a>";
-                            } else {
-                                if (in_array($row2['change_status'], ['A', 'B', 'D'])) {
-                                    echo "<br/>";
-                                    echo "<a target='_blank' style='color:#00F;' href='wipwhole-change-planning-customer-name.php?function_name=wipwholerenstatus&$token_link&id=$id'>客戶姓名：" . $row2['custom_name'] . "<br/>狀態：審核中</a>";
-                                }
-                                if ($row2['change_status'] == 'C') {
-                                    echo "<br/>";
-                                    echo "<a target='_blank' style='color:#00F;' href='wipwhole-change-planning-customer-name.php?function_name=wipwholerenstatus&$token_link&id=$id'>客戶姓名：" . $row2['custom_name'] . "<br/>狀態：已取消</a>";
-                                }
-                                if ($row2['change_status'] == 'Z') {
-                                    echo "<br/>";
-                                    echo "<a target='_blank' style='color:#00F;' href='wipwhole-change-planning-customer-name.php?function_name=wipwholerenstatus&$token_link&id=$id'>客戶姓名：" . $row2['custom_name'] . "<br/>狀態：審核通過</a>";
-                                }
-                            }
-                            ?>
-                        </td>
-                        <td>
-                            <select class="disabled_select" name="customer_planning_verify" id="customer_planning_verify" <?= $marketing; ?>>
-                                <option <?php if ($row["customer_planning_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
-                                <option <?php if ($row["customer_planning_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
-                                <option <?php if ($row["customer_planning_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
-                                <option <?php if ($row["customer_planning_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
-                            </select>
-                        </td>
-                        <td style="vertical-align: middle;">附件</td>
-                        <td style="vertical-align: middle;">
-                            <input style="width:70%;display:inline;" type="file" id="customer_planning_verify_file" name="customer_planning_verify_file" <?php
-                                                                                                                                                            if (isset($row2['change_status'])) {
-                                                                                                                                                                echo $row2['change_status'] === 'Z' ? "" : "disabled";
-                                                                                                                                                            } else {
-                                                                                                                                                                echo "disabled";
-                                                                                                                                                            }
-                                                                                                                                                            ?>>
-                            <?php
-                            // echo !empty($row['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                            ?>
-                            <br />
-                            <?php
-                            $customer_planning_verify_files = getAllCustomerPlanningVerify($link, $id);
-                            foreach ($customer_planning_verify_files as $row2) :
-                                echo "<a id='customer_planning_verify_file_a' style='color:#00F;' 
-                                    href='" . $row2['customer_planning_verify_file'] . "' target='_blank'>下載附件_" . $row2['custom_name'] . "_" . $row2['create_at'] . "</a><br/>";
-                            endforeach;
-                            ?>
-                        </td>
-                        <td style="vertical-align: middle">確認時間</td>
-                        <td><input class="form-control disabled_select" type="datetime-local" id="customer_planning_verify_at" name="customer_planning_verify_at" value="<?= $row['customer_planning_verify_at']; ?>" readonly></td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select name="customer_planning_verify_owner" class="disabled_select" id="customer_planning_verify_owner" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['customer_planning_verify_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-
-                    <tr>
-                        <td style="vertical-align: middle">客戶顏色</td>
-                        <td>
-                            <select class="disabled_select" name="customer_color_verify" id="customer_color_verify" <?= $marketing; ?>>
-                                <option <?php if ($row["customer_color_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
-                                <option <?php if ($row["customer_color_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
-                                <option <?php if ($row["customer_color_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
-                                <option <?php if ($row["customer_color_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
-                            </select>
-                        </td>
-                        <td style="vertical-align: middle;">附件</td>
-                        <td style="vertical-align: middle;">
-                            <input style="width:70%;display:inline;" type="file" id="customer_color_verify_file" name="customer_color_verify_file" <?= $marketing; ?>>
-                            <?php
-                            echo !empty($row['customer_color_verify_file']) ? "<a id='customer_color_verify_file_a' style='color:#00F;' href='" . $row['customer_color_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                            ?>
-                        </td>
-                        <td style="vertical-align: middle">確認時間</td>
-                        <td><input class="form-control disabled_select" type="datetime-local" id="customer_color_verify_at" name="customer_color_verify_at" value="<?= $row['customer_color_verify_at']; ?>" readonly></td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select name="customer_color_verify_owner" class="disabled_select" id="customer_color_verify_owner" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['customer_color_verify_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">客戶樣式</td>
-                        <td>
-                            <select class="disabled_select" name="customer_style_verify" id="customer_style_verify" <?= $marketing; ?>>
-                                <option <?php if ($row["customer_style_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
-                                <option <?php if ($row["customer_style_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
-                                <option <?php if ($row["customer_style_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
-                                <option <?php if ($row["customer_style_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
-                            </select>
-                        </td>
-                        <td style="vertical-align: middle;">附件</td>
-                        <td style="vertical-align: middle;">
-                            <input style="width:70%;display:inline;" type="file" id="customer_style_verify_file" name="customer_style_verify_file" <?= $marketing; ?>>
-                            <?php
-                            echo !empty($row['customer_style_verify_file']) ? "<a id='customer_style_verify_file_a' style='color:#00F;' href='" . $row['customer_style_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                            ?>
-                        </td>
-                        <td style="vertical-align: middle">確認時間</td>
-                        <td><input class="form-control disabled_select" type="datetime-local" id="customer_style_verify_at" name="customer_style_verify_at" value="<?= $row['customer_style_verify_at']; ?>" readonly></td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select name="customer_style_verify_owner" class="disabled_select" id="customer_style_verify_owner" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['customer_style_verify_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">工勘聯絡表</td>
-                        <td>
-                            <select class="disabled_select" name="site_survey_contact_form_verify" id="site_survey_contact_form_verify" <?= $marketing; ?>>
-                                <option <?php if ($row["site_survey_contact_form_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
-                                <option <?php if ($row["site_survey_contact_form_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
-                                <option <?php if ($row["site_survey_contact_form_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
-                                <option <?php if ($row["site_survey_contact_form_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
-                            </select>
-                        </td>
-                        <td style="vertical-align: middle;">附件</td>
-                        <td style="vertical-align: middle;">
-                            <input style="width:70%;display:inline;" type="file" id="site_survey_contact_form_verify_file" name="site_survey_contact_form_verify_file" <?= $marketing; ?>>
-                            <?php
-                            echo !empty($row['site_survey_contact_form_verify_file']) ? "<a id='site_survey_contact_form_verify_file_a' style='color:#00F;' href='" . $row['site_survey_contact_form_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                            ?>
-                        </td>
-                        <td style="vertical-align: middle">確認時間</td>
-                        <td style="vertical-align: middle"><input class="form-control disabled_select" type="datetime-local" id="site_survey_contact_form_verify_at" name="site_survey_contact_form_verify_at" value="<?= $row['site_survey_contact_form_verify_at']; ?>" readonly></td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select name="site_survey_contact_form_verify_owner" class="disabled_select" id="site_survey_contact_form_verify_owner" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['site_survey_contact_form_verify_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>備註</td>
-                        <td colspan="7">
-                            <textarea class="form-control disabled_select" name="marketing_remark" <?= $marketing; ?>><?php echo $row['marketing_remark']; ?></textarea>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">移交日</td>
-                        <td style="vertical-align: middle">
-                            <div class="input-group">
-                                <input class="form-control disabled_select" type="date" id="delivery_date" name="delivery_date" value="<?= $row['delivery_date']; ?>" <?= $marketing2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#delivery_date").val("");' <?= $marketing2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="delivery_date_owner" name="delivery_date_owner" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['delivery_date_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="8">
-                            <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>">
-                            <input class="form-control " type="hidden" name="create_at" value="<?= $row["create_at"]; ?>">
-                            <?php
-                            if (checkNowFormYDStatus($link) == 'A' && ($user_department_id == 220 || $user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315)) {
-                            ?>
-                                <button onclick="doMarketingAssign()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">提交至設計部門</button>
-                            <?php
-                            }
-                            ?>
-                            <button onclick="savedata()" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;" <?= $marketing2; ?>>存檔</button>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-        <div id="tabs-2">
-            <table class="table  table-bordered" style="width:100%">
-                <tbody style="font-weight: bolder;margin-bottom: 20px">
-                    <tr>
-                        <th colspan="8">下訂普來特富確認項</th>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">設計規格</td>
-                        <td>
-                            <select class="disabled_select" name="desin_spec_verify" id="desin_spec_verify" <?= $desin; ?>>
-                                <option <?php if ($row["desin_spec_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
-                                <option <?php if ($row["desin_spec_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
-                                <option <?php if ($row["desin_spec_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
-                                <option <?php if ($row["desin_spec_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
-                            </select>
-                        </td>
-                        <td style="vertical-align: middle;">附件</td>
-                        <td style="vertical-align: middle;">
-                            <?php
-                            echo !empty($row['sales_spec_verify_file']) ? "<a id='sales_spec_verify_file_a' style='color:#00F;' href='" . $row['sales_spec_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                            ?>
-                        </td>
-                        <td style="vertical-align: middle">確認時間</td>
-                        <td style="vertical-align: middle"><input class="form-control " type="datetime-local" id="desin_spec_verify_at" name="desin_spec_verify_at" value="<?= $row['desin_spec_verify_at']; ?>" readonly></td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select name="desin_spec_verify_owner" class="disabled_select" id="desin_spec_verify_owner" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['desin_spec_verify_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">設計計劃圖</td>
-                        <td>
-                            <select name="desin_planning_verify" id="desin_planning_verify" <?= $desin; ?>>
-                                <option <?php if ($row["desin_planning_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
-                                <option <?php if ($row["desin_planning_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
-                                <option <?php if ($row["desin_planning_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
-                                <option <?php if ($row["desin_planning_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
-                            </select>
-                        </td>
-                        <td style="vertical-align: middle;">附件</td>
-                        <td style="vertical-align: middle;">
-                            <?php
-                            // echo !empty($row['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                            foreach ($customer_planning_verify_files as $row2) :
-                                echo "<a id='customer_planning_verify_file_a' style='color:#00F;' 
-                                    href='" . $row2['customer_planning_verify_file'] . "' target='_blank'>下載附件_" . $row2['create_at'] . "</a><br/>";
-                            endforeach;
-                            ?>
-                        </td>
-                        <td style="vertical-align: middle"> 確認時間</td>
-                        <td style="vertical-align: middle"><input class="form-control " type="datetime-local" id="desin_planning_verify_at" name="desin_planning_verify_at" value="<?= $row['desin_planning_verify_at']; ?>" readonly></td>
-                        <td style="vertical-align: middle"> 確認人</td>
-                        <td>
-                            <select name="desin_planning_verify_owner" class="disabled_select" id="desin_planning_verify_owner" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['desin_planning_verify_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">設計顏色</td>
-                        <td>
-                            <select name="desin_color_verify" id="desin_color_verify" <?= $desin; ?>>
-                                <option <?php if ($row["desin_color_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
-                                <option <?php if ($row["desin_color_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
-                                <option <?php if ($row["desin_color_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
-                                <option <?php if ($row["desin_color_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
-                            </select>
-                        </td>
-                        <td style="vertical-align: middle;">附件</td>
-                        <td style="vertical-align: middle;">
-                            <?php
-                            echo !empty($row['customer_color_verify_file']) ? "<a id='customer_color_verify_file_a' style='color:#00F;' href='" . $row['customer_color_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                            ?>
-                        </td>
-                        <td style="vertical-align: middle">確認時間</td>
-                        <td style="vertical-align: middle"><input class="form-control " type="datetime-local" id="desin_color_verify_at" name="desin_color_verify_at" value="<?= $row['desin_color_verify_at']; ?>" readonly></td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select name="desin_color_verify_owner" class="disabled_select" id="desin_color_verify_owner" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['desin_color_verify_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">設計樣式</td>
-                        <td>
-                            <select name="desin_style_verify" id="desin_style_verify" <?= $desin; ?>>
-                                <option <?php if ($row["desin_style_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
-                                <option <?php if ($row["desin_style_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
-                                <option <?php if ($row["desin_style_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
-                                <option <?php if ($row["desin_style_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
-                            </select>
-                        </td>
-                        <td style="vertical-align: middle;">附件</td>
-                        <td style="vertical-align: middle;">
-                            <?php
-                            echo !empty($row['customer_style_verify_file']) ? "<a id='customer_style_verify_file_a' style='color:#00F;' href='" . $row['customer_style_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                            ?>
-                        </td>
-                        <td style="vertical-align: middle">確認時間</td>
-                        <td style="vertical-align: middle"><input class="form-control " type="datetime-local" id="desin_style_verify_at" name="desin_style_verify_at" value="<?= $row['desin_style_verify_at']; ?>" readonly></td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td style="vertical-align: middle">
-                            <select name="desin_style_verify_owner" class="disabled_select" id="desin_style_verify_owner" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['desin_style_verify_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">備註</td>
-                        <td style="vertical-align: middle" colspan="8">
-                            <textarea class="form-control " name="desin_remark" <?= $desin; ?>><?php echo $row['desin_remark']; ?></textarea>
-                        </td>
-                    <tr>
-                    <tr>
-                        <td style='width:180px;'>追加技術文件</td>
-                        <td>
-                            <input style="width:70%;display:inline;" type="file" id="desin_documents_verify_file" name="desin_documents_verify_file" <?= $desin; ?>>
-                            <?php
-                            echo !empty($row['desin_documents_verify_file']) ? "<a id='desin_documents_verify_file' style='color:#00F;' href='" . $row['desin_documents_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                            ?>
-                        </td>
-                        <td colspan='6'></td>
-                    </tr>
-                    <tr>
-                        <td colspan="8">
-                            <i>如有複數檔案請放置同個壓縮檔後再上傳</i>
-                        </td>
-                    </tr>
-                    <tr id='taiwan_item_tr'>
-                        <th colspan="7">下訂台灣自製項目</th>
-                        <td>
-                            <button type="button" onclick="addTaiwanItem()" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">+</button>
-                        </td>
-                    </tr>
-                    <?php
-                    if (
-                        !empty($row['desin_taiwan_items_no']) && !empty($row['desin_taiwan_items_name'])
-                        && $row['desin_taiwan_items_no'] !== 'null' && $row['desin_taiwan_items_name'] !== 'null'
-                    ) {
-
-                        $desin_taiwan_items_no_arr = json_decode($row['desin_taiwan_items_no']);
-                        $desin_taiwan_items_name_arr = json_decode($row['desin_taiwan_items_name']);
-                        $taiwan_item_id = count($desin_taiwan_items_no_arr);
-
-                        for ($i = 0; $i < count($desin_taiwan_items_no_arr); $i++) {
-                    ?>
-                            <tr id='taiwan_item_tr_<?php echo $i; ?>'>
-                                <td style='vertical-align: middle;'>
-                                    <label>品目編號</label>
-                                </td>
-                                <td style='vertical-align: middle;'>
-                                    <input type='text' name='desin_taiwan_items_no[]' value='<?php echo $desin_taiwan_items_no_arr[$i] ?>' />
-                                </td>
-                                <td style='vertical-align: middle;'>
-                                    <label>部品名稱</label>
-                                </td>
-                                <td style='vertical-align: middle;'>
-                                    <input type='text' name='desin_taiwan_items_name[]' value='<?php echo $desin_taiwan_items_name_arr[$i] ?>' />
-                                </td>
-                                <td style='vertical-align: middle;'>
-                                    <button class='btn btn-danger' type='button' onclick='removeTaiwanItemTr(<?php echo $i; ?>)'>x</button>
-                                </td>
-                            <tr>
-                        <?php
-                        }
-                    } else {
-                        $taiwan_item_id = 0;
-                    }
-                        ?>
-                            <tr>
-                                <td colspan="8">
-                                </td>
-                            </tr>
-                            <tr>
-                                <td style="vertical-align: middle">設計主管</td>
-                                <td>
-                                    <select name="desin_leader_verify" id="desin_leader_verify" <?= $desin_leader; ?>>
-                                        <option <?php if ($row["desin_leader_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
-                                        <option <?php if ($row["desin_leader_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
-                                        <option <?php if ($row["desin_leader_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
-                                    </select>
-                                </td>
-                                <td style="vertical-align: middle;">附件</td>
-                                <td style="vertical-align: middle;">
-                                    <input style="width:70%;display:inline;" type="file" id="desin_leader_verify_file" name="desin_leader_verify_file" <?= $desin_leader; ?>>
-                                    <?php
-                                    echo !empty($row['desin_leader_verify_file']) ? "<a id='desin_leader_verify_file_a' style='color:#00F;' href='" . $row['desin_leader_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                                    ?>
-                                </td>
-                                <td style="vertical-align: middle">確認時間</td>
-                                <td style="vertical-align: middle"><input class="form-control " type="datetime-local" id="desin_leader_verify_at" name="desin_leader_verify_at" value="<?= $row['desin_leader_verify_at']; ?>" readonly></td>
-                                <td style="vertical-align: middle">確認人</td>
-                                <td>
-                                    <select name="desin_leader_verify_owner" class="disabled_select" id="desin_leader_verify_owner" disabled>
-                                        <option value="">請選擇</option>
-                                        <?php echo getSelectOptionHtml($all_users_options, $row['desin_leader_verify_owner']); ?>
-                                    </select>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="8">
-                                    <i>如有複數檔案請放置同個壓縮檔後再上傳</i>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>備註</td>
-                                <td colspan="7">
-                                    <textarea class="form-control " name="desin_leader_remark" <?= $desin_leader; ?>><?php echo $row['desin_leader_remark']; ?></textarea>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="8">
-                                    <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>" readonly>
-                                    <input class="form-control " type="hidden" name="create_at" value="<?= $row["create_at"]; ?>" readonly>
-                                    <?php
-                                    if (checkNowFormYDStatus($link) == 'B' && ($user_department_id == 220 || $user_department_id == 911)) {
-                                    ?>
-                                        <button onclick="savedata()" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">存檔</button>
-                                        <button onclick="doDesignLeaderAssign()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">提交至設計主管</button>
-                                        <button onclick="doBackMarketingAssign()" type="button" class="btn btn-danger btn-lg pull-right" style="margin-left:3px;">退回營業</button>
-                                    <?php
-                                    } else if (checkNowFormYDStatus($link) == 'C' && ($user_department_id == 220 || ($user_department_id == 911 && $role_id == 1))) {
-                                    ?>
-                                        <button onclick="savedata()" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">存檔</button>
-                                        <button onclick="doDesignAssign()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">提交至生管</button>
-                                        <button onclick="doBackMarketingAssign()" type="button" class="btn btn-danger btn-lg pull-right" style="margin-left:3px;">退回營業</button>
-                                        <button onclick="doBackDesignAssign()" type="button" class="btn btn-danger btn-lg pull-right" style="margin-left:3px;">退回設計部門</button>
-                                    <?php
-                                    }
-                                    ?>
-                                </td>
-                            </tr>
-                </tbody>
-            </table>
-        </div>
-        <div id="tabs-3">
-            <table class="table  table-bordered" style="width:100%">
-                <tbody style="font-weight: bolder;margin-bottom: 20px">
-                    <tr>
-                        <td style="vertical-align: middle">樓高通報</td>
-                        <td>
-                            <select class="disabled_select" name="building_heigh_verify" id="building_heigh_verify" <?= $warehouse2; ?>>
-                                <option <?php if ($row["building_heigh_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
-                                <option <?php if ($row["building_heigh_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
-                                <option <?php if ($row["building_heigh_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
-                                <option <?php if ($row["building_heigh_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
-                            </select>
-                        </td>
-                        <td style="vertical-align: middle;">附件</td>
-                        <td style="vertical-align: middle;">
-                            <input style="width:70%;display:inline;" type="file" id="building_heigh_verify_file" name="building_heigh_verify_file" <?= $warehouse2; ?>>
-                            <?php
-                            echo !empty($row['building_heigh_verify_file']) ? "<a id='building_heigh_verify_file_a' style='color:#00F;' href='" . $row['building_heigh_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                            ?>
-                        </td>
-                        <td style="vertical-align: middle">確認時間</td>
-                        <td style="vertical-align: middle"><input class="form-control disabled_select" type="datetime-local" id="building_heigh_verify_at" name="building_heigh_verify_at" value="<?= $row['building_heigh_verify_at']; ?>" readonly></td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select name="building_heigh_verify_owner" class="disabled_select" id="building_heigh_verify_owner" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['building_heigh_verify_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">工勘確認</td>
-                        <td>
-                            <?php
-                            $site_survey_status = array(
-                                "1" => "請選擇",
-                                "0" => "已確認",
-                                "2" => "無工勘需求",
-                                "A" => "未動工",
-                                "B" => "地下室施工",
-                                "C" => "打樁",
-                                "D" => "地基",
-                                "E" => "挖土",
-                                "G" => "機房",
-                                "H" => "機械式淨高",
-                                "M" => "樓中樓",
-                                "OH" => "最高層(頂樓高度)",
-                                "P" => "PIT(機坑深度)",
-                                "R" => "R 樓",
-                                "S" => "停工",
-                                "T" => "TOP",
-                                "TC" => "頂部間隙",
-                                "TS" => "行程",
-                                "TH" => "全高",
-                                "Y" => "已搭、已出",
-                                "YB" => "退購結案",
-                                "YF" => "既有建物",
-                                "YN" => "已搭、未出"
-                            );
-                            for ($i = 1; $i < 200; $i++) {
-                                $site_survey_status[$i . "F"] = $i . "F";
-                            }
-                            ?>
-                            <select class="disabled_select" name="site_survey_contact_verify" id="site_survey_contact_verify" <?= $warehouse2; ?>>
-                                <?php
-                                foreach ($site_survey_status as $key => $val) {
-                                    if ($row["site_survey_contact_verify"] == $key) {
-                                        echo "<option value='$key' selected>$val</option>";
-                                    } else {
-                                        echo "<option value='$key'>$val</option>";
-                                    }
-                                }
-                                ?>
-                            </select>
-                            <input type="hidden" name="old_site_survey_contact_verify" value="<?php echo $row["site_survey_contact_verify"] ?>" <?= $warehouse2; ?> />
-                        </td>
-                        <td style="vertical-align: middle;">附件</td>
-                        <td style="vertical-align: middle;">
-                            <input style="width:70%;display:inline;" type="file" id="site_survey_contact_verify_file" name="site_survey_contact_verify_file" <?= $warehouse2; ?>>
-                            <?php
-                            echo !empty($row['site_survey_contact_verify_file']) ? "<a id='site_survey_contact_verify_file_a' style='color:#00F;' href='" . $row['site_survey_contact_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                            ?>
-                        </td>
-                        <td style="vertical-align: middle">確認時間</td>
-                        <td style="vertical-align: middle"><input class="form-control disabled_select" type="datetime-local" id="site_survey_contact_verify_at" name="site_survey_contact_verify_at" value="<?= $row['site_survey_contact_verify_at']; ?>" readonly></td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select name="site_survey_contact_verify_owner" class="disabled_select" id="site_survey_contact_verify_owner" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['site_survey_contact_verify_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>備註</td>
-                        <td colspan="7">
-                            <textarea class="form-control" name="warehouse_remark" <?= $warehouse2; ?>><?php echo $row['warehouse_remark']; ?></textarea>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="8">
-                            <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>" readonly>
-                            <input class="form-control " type="hidden" name="create_at" value="<?= $row["create_at"]; ?>" readonly>
-                            <?php
-                            if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545, 220])) {
-                                echo "<button onclick='savedata()' class='btn btn-primary btn-lg pull-right' style='margin-left:3px;'>存檔</button>";
-                                if (checkNowFormGStatus($link) == 'G')
-                                    echo "<button onclick='doWarhouseAssign()' type='button' class='btn btn-primary btn-lg pull-right' style='margin-left:3px;'>提交至生管</button>";
-                            }
-                            ?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="4">
-                            實際安裝及試車日程
-                            <br />
-                            (項目經理項目)
-                        </td>
-                    </tr>
-
-                    <tr>
-                        <td style="vertical-align: middle">實際安裝開工日</td>
-                        <td style="vertical-align: middle">
-                            <div class="input-group">
-                                <input class="form-control" type="date" id="install_start_date_tmp" value="<?= $row['install_start_date']; ?>" <?= $warehouse2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#install_start_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="install_start_date_owner_tmp" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['install_start_date_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">實際安裝完工日</td>
-                        <td style="vertical-align: middle">
-                            <div class="input-group">
-                                <input class="form-control" type="date" id="install_end_date_tmp" value="<?= $row['install_end_date']; ?>" <?= $warehouse2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#install_end_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="install_end_date_owner_tmp" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['install_end_date_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">實際試車開工日</td>
-                        <td style="vertical-align: middle">
-                            <div class="input-group">
-                                <input class="form-control" type="date" id="tryrun_start_date_tmp" value="<?= $row['tryrun_start_date']; ?>" <?= $warehouse2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#tryrun_start_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="tryrun_start_date_owner_tmp" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['tryrun_start_date_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">實際試車完工日</td>
-                        <td style="vertical-align: middle">
-                            <div class="input-group">
-                                <input class="form-control" type="date" id="tryrun_end_date_tmp" value="<?= $row['tryrun_end_date']; ?>" <?= $warehouse2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#tryrun_end_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="tryrun_end_date_owner_tmp" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['tryrun_end_date_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="4">
-                            <?php
-                            if (saveInstallData($user_department_id, $role_id)) {
-                                echo "<button onclick='saveInstallData()' type='button' class='btn btn-primary btn-lg pull-right' style='margin-left:3px;'>存檔</button>";
-                                echo "<label class='pull-right' for='change_all_contractno_tmp'> 變更此合約全部日期</label>";
-                                echo "<input class='pull-right' type='checkbox' id='change_all_contractno_tmp' value='1' />";
-                            }
-                            ?>
-                        </td>
-                    </tr>
-
-
-                </tbody>
-            </table>
-        </div>
-        <div id="tabs-4">
-            <table class="table  table-bordered" style="width:100%">
-                <tbody style="font-weight: bolder;margin-bottom: 20px">
-                    <th colspan="6">業務部門確認項</th>
-                    <tr>
-                        <td style="vertical-align: middle">已備齊時間 </td>
-                        <td>
-                            <select name="shengguanok_status" id="shengguanok_status" <?= $yewu; ?>>
-                                <option <?php if ($row["shengguanok_status"] == "0") echo " selected"; ?> value="0">已完成</option>
-                                <option <?php if ($row["shengguanok_status"] == "1") echo " selected"; ?> value="1">進行中</option>
-                            </select>
-                        </td>
-                        <td><input class="form-control " type="datetime-local" id="shengguanok_status_at" name="shengguanok_status_at" value="<?= $row['shengguanok_status_at']; ?>" readonly></td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td colspan="2">
-                            <select name="shengguanok_status_owner" class="disabled_select" id="shengguanok_status_owner" class="disabled_select" disabled="disabled">
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['shengguanok_status_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">下單日<br />(下單普來特富)</td>
-                        <td>
-                            <select name="prattford_order_date_verify" id="prattford_order_date_verify" <?= $yewu; ?>>
-                                <option <?php if ($row["prattford_order_date_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
-                                <option <?php if ($row["prattford_order_date_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
-                                <option <?php if ($row["prattford_order_date_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
-                                <option <?php if ($row["prattford_order_date_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
-                            </select>
-                        </td>
-                        <td>
-                            <div class="input-group">
-                                <input class="form-control" type="date" id="prattford_order_date" name="prattford_order_date" value="<?= $row['prattford_order_date']; ?>" <?= $yewu; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#prattford_order_date").val("");' <?= $yewu; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td colspan="2">
-                            <select name="prattford_order_date_owner" class="disabled_select" id="prattford_order_date_owner" class="disabled_select" disabled="disabled">
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['prattford_order_date_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">預計發貨日<br />(出港日)</td>
-                        <td>
-                            <select name="estimated_shipping_date_verify" id="estimated_shipping_date_verify" <?= $yewu; ?>>
-                                <option <?php if ($row["estimated_shipping_date_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
-                                <option <?php if ($row["estimated_shipping_date_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
-                                <option <?php if ($row["estimated_shipping_date_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
-                                <option <?php if ($row["estimated_shipping_date_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
-                            </select>
-                        </td>
-                        <td>
-                            <div class="input-group">
-                                <input class="form-control" type="date" id="estimated_shipping_date" name="estimated_shipping_date" value="<?= $row['estimated_shipping_date']; ?>" <?= $yewu; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#estimated_shipping_date").val("");' <?= $yewu; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td colspan="2">
-                            <select name="estimated_shipping_date_owner" id="estimated_shipping_date_owner" class="disabled_select" disabled="disabled">
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['estimated_shipping_date_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">預計到貨日<br />(到觀音廠日)</td>
-                        <td>
-                            <select name="estimated_shipping_schedule_date_verify" id="estimated_shipping_schedule_date_verify" <?= $user_id == 'M0168' ? "" : $yewu; ?>>
-                                <option <?php if ($row["estimated_shipping_schedule_date_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
-                                <option <?php if ($row["estimated_shipping_schedule_date_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
-                                <option <?php if ($row["estimated_shipping_schedule_date_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
-                                <option <?php if ($row["estimated_shipping_schedule_date_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
-                            </select>
-                        </td>
-                        <td>
-                            <div class="input-group">
-                                <input class="form-control" type="date" id="estimated_shipping_schedule_date" name="estimated_shipping_schedule_date" value="<?= $row['estimated_shipping_schedule_date']; ?>" <?= $user_id == 'M0168' ? "" : $yewu; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#estimated_shipping_schedule_date").val("");' <?= $user_id == 'M0168' ? "" : $yewu; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td colspan="2">
-                            <select name="estimated_shipping_schedule_date_owner" id="estimated_shipping_schedule_date_owner" class="disabled_select" disabled="disabled">
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['estimated_shipping_schedule_date_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">普來特富<br />(發貨類別)</td>
-                        <td>
-                            <select name="goods_type" id="goods_type" <?= $yewu; ?>>
-                                <option <?php if ($row["goods_type"] == "1") echo " selected"; ?> value="1">請選擇</option>
-                                <option <?php if ($row["goods_type"] == "A") echo " selected"; ?> value="A">A:全級發貨</option>
-                                <option <?php if ($row["goods_type"] == "B") echo " selected"; ?> value="B">B:欠件發貨</option>
-                                <option <?php if ($row["goods_type"] == "C") echo " selected"; ?> value="C">C:無發貨需求</option>
-                            </select>
-                        </td>
-                        <td>
-                            <div class="input-group">
-                                <input class="form-control" type="date" id="goods_type_date" name="goods_type_date" value="<?= $row['goods_type_date']; ?>" <?= $yewu; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#goods_type_date").val("");' <?= $yewu; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td colspan="2">
-                            <select name="goods_type_owner" id="goods_type_owner" class="disabled_select" disabled="disabled">
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['goods_type_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">台灣自理項目<br />(發貨類別)</td>
-                        <td>
-                            <select name="taiwan_goods_type" id="taiwan_goods_type" <?= $yewu; ?>>
-                                <option <?php if ($row["taiwan_goods_type"] == "1") echo " selected"; ?> value="1">請選擇</option>
-                                <option <?php if ($row["taiwan_goods_type"] == "A") echo " selected"; ?> value="A">A:全級發貨</option>
-                                <option <?php if ($row["taiwan_goods_type"] == "B") echo " selected"; ?> value="B">B:欠件發貨</option>
-                                <option <?php if ($row["taiwan_goods_type"] == "C") echo " selected"; ?> value="C">C:無發貨需求</option>
-                            </select>
-                        </td>
-                        <td>
-                            <div class="input-group">
-                                <input class="form-control" type="date" id="taiwan_goods_type_date" name="taiwan_goods_type_date" value="<?= $row['taiwan_goods_type_date']; ?>" <?= $yewu; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#taiwan_goods_type_date").val("");' <?= $yewu; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td colspan="2">
-                            <select name="taiwan_goods_type_owner" id="taiwan_goods_type_owner" class="disabled_select" disabled="disabled">
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['taiwan_goods_type_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>備註</td>
-                        <td colspan="5">
-                            <textarea class="form-control " name="yewu_remark" <?= $yewu; ?>><?php echo $row['yewu_remark']; ?></textarea>
-                        </td>
-                    <tr>
-                    <tr>
-                        <td style="vertical-align: middle;">附件</td>
-                        <td colspan="5" style="vertical-align: middle;">
-                            <input style="width:70%;display:inline;" type="file" name="shengguanok_status_file" <?= $yewu; ?>>
-                            <?php
-                            echo !empty($row['shengguanok_status_file']) ? "<a id='shengguanok_status_file_a' style='color:#00F;' href='" . $row['shengguanok_status_file'] . "' target='_blank'>下載附件</a>" : "";
-                            ?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="5">
-                            <i>如有複數檔案請放置同個壓縮檔後再上傳</i>
-                        </td>
-                        <td colspan="3">
-                            <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>" readonly>
-                            <input class="form-control " type="hidden" name="create_at" value="<?= $row["create_at"]; ?>" readonly>
-                            <?php
-                            if (checkNowFormGStatus($link) == 'Z' && checkNowFormYDStatus($link) == 'Z' && ($user_department_id == 220 || $user_department_id == 321)) {
-                            ?>
-                                <button class="btn btn-primary btn-lg pull-right" type="button" style="margin-left:3px;" disabled>日程已結案</button>
-                                <?php
-                            } else {
-                                // 生管 小雯 預計到貨日(到觀音廠日)權限
-                                if ($user_id == 'M0168') {
-                                ?>
-                                    <button onclick="savedata()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">存檔</button>
-                                <?php
-                                }
-                                if (($user_department_id == 220 || ($user_department_id == 321 && $role_id !== '5') || $user_id == 'M0060')) {
-                                ?>
-                                    <button onclick="savedata()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">存檔</button>
-                                    <?php
-                                    if (checkNowFormGStatus($link) == 'H' && checkNowFormYDStatus($link) == 'D') {
-                                    ?>
-                                        <button onclick="doShengguanAssign()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">結案</button>
-                                <?php
-                                    }
-                                }
-                            }
-                            if (checkNowFormGStatus($link) == 'H' && ($user_department_id == 220 || ($user_department_id == 321 && $role_id !== '5'))) {
-                                ?>
-                                <button onclick="doBackWarhouseAssign()" type="button" class="btn btn-danger btn-lg pull-right" style="margin-left:3px;">退回工務部門</button>
-                            <?php
-                            }
-                            if (checkNowFormYDStatus($link) == 'D' && ($user_department_id == 220 || ($user_department_id == 321 && $ro !== '5'))) {
-                            ?>
-                                <button onclick="doBackMarketingAssign()" type="button" class="btn btn-danger btn-lg pull-right" style="margin-left:3px;">退回營業</button>
-                                <button onclick="doBackDesignAssign()" type="button" class="btn btn-danger btn-lg pull-right" style="margin-left:3px;">退回設計部門</button>
-                            <?php
-                            }
-                            ?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <th colspan="7">生管部門確認項</th>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">實際到貨日<br />(到觀音廠日)</td>
-                        <td>
-                            <select id="arrival_date_verify_tmp" <?= $shengguan2; ?>>
-                                <option <?php if ($row["arrival_date_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
-                                <option <?php if ($row["arrival_date_verify"] == "A") echo " selected"; ?> value="A">A:皆到貨</option>
-                                <option <?php if ($row["arrival_date_verify"] == "B") echo " selected"; ?> value="B">B:皆欠件</option>
-                                <option <?php if ($row["arrival_date_verify"] == "C") echo " selected"; ?> value="C">C:普來特富欠件</option>
-                                <option <?php if ($row["arrival_date_verify"] == "D") echo " selected"; ?> value="D">D:台灣欠件</option>
-                            </select>
-                        </td>
-                        <td>
-                            <div class="input-group">
-                                <input class="form-control" type="date" id="actual_tofactory_date_tmp" value="<?= $row['actual_tofactory_date']; ?>" <?= $shengguan2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#actual_tofactory_date_tmp").val("");' <?= $shengguan2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td colspan="2">
-                            <select id="arrival_date_owner_tmp" class="disabled_select" disabled="disabled">
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['arrival_date_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>備註</td>
-                        <td colspan="5">
-                            <textarea class="form-control" id="shengguan_remark_tmp" <?= $shengguan2; ?>><?php echo $row['shengguan_remark']; ?></textarea>
-                        </td>
-                    <tr>
-                    <tr>
-                        <td colspan="6">
-                            <button onclick="updateShengguan()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;" <?php echo $shengguan2; ?>>存檔</button>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">預計交期(到工地)</td>
-                        <td>
-                            <input class="form-control" type="date" id="real_contract_arrival_date_tmp" value="<?= $row['real_contract_arrival_date']; ?>" <?php echo in_array($user_id, ['M0013', 'M0060']) ? "" : $shengguan; ?>>
-                        </td>
-                        <td colspan="4">
-                            <?php
-                            if (in_array($user_id, ['M0013', 'M0060'])) {
-                            ?>
-                                <button onclick="updateContractDate()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">出貨日調整</button>
-                            <?php
-                            } else {
-                            ?>
-                                <button onclick="updateContractDate()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;" <?php echo $shengguan; ?>>出貨日調整</button>
-                            <?php
-                            }
-                            ?>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">實際出貨日(到工地)</td>
-                        <td>
-                            <input class="form-control" type="date" id="real_arrival_date_tmp" value="<?= SUBSTR($row['real_arrival_date'], 0, 10); ?>" <?php echo $shengguan2; ?>>
-                        </td>
-                        <td colspan="4">
-                            <button onclick="updateRealArrivalDate()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;" <?php echo $shengguan2; ?>>出貨日調整</button>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-        <div id="tabs-5">
-            <table class="table  table-bordered" style="width:100%">
-                <tbody style="font-weight: bolder;margin-bottom: 20px">
-                    <tr>
-                        <td style="vertical-align: middle">QC及官檢類型</td>
-                        <td>
-                            <input type='radio' disabled <?php echo $row['qc_official_type'] == 'Q' ? "checked" : ""; ?> />
-                            <label for='outsourcer_type_I'>只需QC</label>
-                            <input type='radio' disabled <?php echo $row['qc_official_type'] == 'O' ? "checked" : ""; ?> />
-                            <label for='outsourcer_type_T'>只需官檢</label>
-                            <input type='radio' disabled <?php echo $row['qc_official_type'] == 'QO' ? "checked" : ""; ?> />
-                            <label for='outsourcer_type_IT'>QC+官檢</label>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">內部QC日</td>
-                        <td style="vertical-align: middle">
-                            <div class="input-group">
-                                <input class="form-control" type="date" id="qc_date" name="qc_date" value="<?= $row['qc_date']; ?>" <?= $pinzheng; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#qc_date").val("");' <?= $pinzheng; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="qc_date_owner" name="qc_date_owner" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['qc_date_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">QC合格日</td>
-                        <td style="vertical-align: middle">
-                            <div class="input-group">
-                                <input class="form-control" type="date" id="end_qc_date" name="end_qc_date" value="<?= $row['end_qc_date']; ?>" <?= $pinzheng; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#end_qc_date").val("");' <?= $pinzheng; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="end_qc_date_owner" name="end_qc_date_owner" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['end_qc_date_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">官檢日</td>
-                        <td style="vertical-align: middle">
-                            <div class="input-group">
-                                <input class="form-control" type="date" id="official_check_date" name="official_check_date" value="<?= $row['official_check_date']; ?>" <?= $pinzheng; ?>>
-                                <input type="hidden" id="old_official_check_date" name="old_official_check_date" value="<?= $row['official_check_date']; ?>" <?= $pinzheng; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#official_check_date").val("");' <?= $pinzheng; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="official_check_date_owner" name="official_check_date_owner" disabled>
-                                <option value="">請選擇</option>
-                                <?php echo getSelectOptionHtml($all_users_options, $row['official_check_date_owner']); ?>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style='width:180px;'>官檢附件</td>
-                        <td>
-                            <input style="width:70%;display:inline;" type="file" id="official_check_file" name="official_check_file" <?= $pinzheng; ?>>
-                            <?php
-                            echo !empty($row['official_check_file']) ? "<a id='official_check_file' style='color:#00F;' href='" . $row['official_check_file'] . "' target='_blank'>下載附件</a>" : "";
-                            ?>
-                        </td>
-                        <td colspan='6'></td>
-                    </tr>
-                    <tr>
-                        <td colspan="8">
-                            <?php
-                            if (in_array($user_department_id, [220, 912]) || $user_id == 'M0164') {
-                                echo "<button onclick='savedata()' type='button' class='btn btn-primary btn-lg pull-right' style='margin-left:3px;'>存檔</button>";
-                            }
-                            ?>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-        <div id="tabs-6">
-            <table class="table table-bordered" style="width:100%">
-                <tr>
-                    <td colspan="4">
-                        預計安裝及試車日程
-                        <br />
-                        (工務助理項目)
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle">發包類型</td>
-                    <td>
-                        <input type='radio' class="disabled_select" name='outsourcer_type' id='outsourcer_type_I' value='I' <?php echo $row['outsourcer_type'] == 'I' ? 'checked' : '';
-                                                                                                                            echo $warehouse2; ?> />
-                        <label for='outsourcer_type_I'>安裝</label>
-                        <input type='radio' class="disabled_select" name='outsourcer_type' id='outsourcer_type_T' value='T' <?php echo $row['outsourcer_type'] == 'T' ? 'checked' : '';
-                                                                                                                            echo $warehouse2; ?> />
-                        <label for='outsourcer_type_T'>試車</label>
-                        <input type='radio' class="disabled_select" name='outsourcer_type' id='outsourcer_type_IT' value='IT' <?php echo $row['outsourcer_type'] == 'IT' ? 'checked' : '';
-                                                                                                                                echo $warehouse2; ?> />
-                        <label for='outsourcer_type_IT'>安裝+試車</label>
-                        <?php
-                        if (getSaveEstimateInstallData($user_department_id, $role_id)) {
-                        ?>
-                            <button type='button' class='btn btn-default disabled_select' onclick='setOutSourcerDate();' <?php echo $warehouse2; ?>>帶入日期</button>
-                            <button type='button' class='btn btn-default disabled_select' onclick='resetAllOutSourcerDate();' <?php echo $warehouse2; ?>>清除日期</button>
-                        <?php
-                        }
-                        ?>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle;">合約上傳</td>
-                    <td id="ocfi_td" style="vertical-align: middle;">
-                        <button type="button" onclick="addOutsourcerContractFileItem()" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">+</button>
-                        <input style="width:70%;display:inline;" type="file" id="outsourcer_contract_file_0" name="outsourcer_contract_file[]" multiple>
-                        <button type="button" class="btn btn-danger" id="outsourcer_contract_file_del_0" onclick="delOutsourcerContractFileItem(0)">x</button>
-                        <?php
-                        if (!empty($row['outsourcer_contract_file'])) {
-                            $outsourcer_contract_file_tmp = json_decode($row['outsourcer_contract_file']);
-                            foreach ($outsourcer_contract_file_tmp as $val) {
-                                echo "<br/><a style='color:#00F;' target='_blank' href='" . $val . "'>" . str_replace("public-wipwhole/", "", $val) . "</a>";
-                            }
-                            echo "</br>";
-                        }
-                        ?>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle">安裝發包廠商</td>
-                    <td>
-                        <input name="install_outsourcer" id="install_outsourcer" class="form-control disabled_select" type="text" value="<?php echo $row['install_outsourcer']; ?>" <?= $warehouse2; ?> />
-                    </td>
-                    <td style="vertical-align: middle;">確認人</td>
-                    <td>
-                        <select class="disabled_select" id="install_outsourcer_owner" name="install_outsourcer_owner" disabled>
-                            <option value="">請選擇</option>
-                            <?php echo getSelectOptionHtml($all_users_options, $row['install_outsourcer_owner']); ?>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle">安裝發包日</td>
-                    <td style="vertical-align: middle">
-                        <div class="input-group">
-                            <input class="form-control disabled_select" type="date" name="install_outsourcer_date" id="install_outsourcer_date" value="<?= $row['install_outsourcer_date']; ?>" <?= $warehouse2; ?>>
-                            <span class="input-group-btn">
-                                <button class="btn btn-default" type='button' onclick='$("#install_outsourcer_date").val("");' <?= $warehouse2; ?>>清除</button>
-                            </span>
-                        </div>
-                    </td>
-                    <td style="vertical-align: middle">確認人</td>
-                    <td>
-                        <select class="disabled_select" id="install_outsourcer_date_owner" name="install_outsourcer_date_owner" disabled>
-                            <option value="">請選擇</option>
-                            <?php echo getSelectOptionHtml($all_users_options, $row['install_outsourcer_date_owner']); ?>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle">預計安裝開工日</td>
-                    <td style="vertical-align: middle">
-                        <div class="input-group">
-                            <input class="form-control disabled_select" type="date" name="estimate_install_start_date" id="estimate_install_start_date" value="<?= $row['estimate_install_start_date']; ?>" <?= $warehouse2; ?>>
-                            <span class="input-group-btn">
-                                <button class="btn btn-default" type='button' onclick='$("#estimate_install_start_date").val("");' <?= $warehouse2; ?>>清除</button>
-                            </span>
-                        </div>
-                    </td>
-                    <td style="vertical-align: middle">確認人</td>
-                    <td>
-                        <select class="disabled_select" id="estimate_install_start_date_owner" name="estimate_install_start_date_owner" disabled>
-                            <option value="">請選擇</option>
-                            <?php echo getSelectOptionHtml($all_users_options, $row['estimate_install_start_date_owner']); ?>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle">預計安裝完工日</td>
-                    <td style="vertical-align: middle">
-                        <div class="input-group">
-                            <input class="form-control disabled_select" type="date" name="estimate_install_end_date" id="estimate_install_end_date" value="<?= $row['estimate_install_end_date']; ?>" <?= $warehouse2; ?>>
-                            <span class="input-group-btn">
-                                <button class="btn btn-default" type='button' onclick='$("#estimate_install_end_date").val("");' <?= $warehouse2; ?>>清除</button>
-                            </span>
-                        </div>
-                    </td>
-                    <td style="vertical-align: middle">確認人</td>
-                    <td>
-                        <select class="disabled_select" id="estimate_install_end_date_owner" name="estimate_install_end_date_owner" disabled>
-                            <option value="">請選擇</option>
-                            <?php echo getSelectOptionHtml($all_users_options, $row['estimate_install_end_date_owner']); ?>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle">試車發包廠商</td>
-                    <td>
-                        <input name="tryrun_outsourcer" id="tryrun_outsourcer" class="form-control disabled_select" type="text" value="<?php echo $row['tryrun_outsourcer']; ?>" <?= $warehouse2; ?> />
-                    </td>
-                    <td style="vertical-align: middle;">確認人</td>
-                    <td>
-                        <select class="disabled_select" id="tryrun_outsourcer_owner" name="tryrun_outsourcer_owner" disabled>
-                            <option value="">請選擇</option>
-                            <?php echo getSelectOptionHtml($all_users_options, $row['tryrun_outsourcer_owner']); ?>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle">試車發包日</td>
-                    <td style="vertical-align: middle">
-                        <div class="input-group">
-                            <input class="form-control disabled_select" type="date" name="tryrun_outsourcer_date" id="tryrun_outsourcer_date" value="<?= $row['tryrun_outsourcer_date']; ?>" <?= $warehouse2; ?>>
-                            <span class="input-group-btn">
-                                <button class="btn btn-default" type='button' onclick='$("#tryrun_outsourcer_date").val("");' <?= $warehouse2; ?>>清除</button>
-                            </span>
-                        </div>
-                    </td>
-                    <td style="vertical-align: middle">確認人</td>
-                    <td>
-                        <select class="disabled_select" name="tryrun_outsourcer_date_owner" id="tryrun_outsourcer_date_owner" disabled>
-                            <option value="">請選擇</option>
-                            <?php echo getSelectOptionHtml($all_users_options, $row['tryrun_outsourcer_date_owner']); ?>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle">預計試車開工日</td>
-                    <td style="vertical-align: middle">
-                        <div class="input-group">
-                            <input class="form-control disabled_select" type="date" name="estimate_tryrun_start_date" id="estimate_tryrun_start_date" value="<?= $row['estimate_tryrun_start_date']; ?>" <?= $warehouse2; ?>>
-                            <span class="input-group-btn">
-                                <button class="btn btn-default" type='button' onclick='$("#estimate_tryrun_start_date").val("");' <?= $warehouse2; ?>>清除</button>
-                            </span>
-                        </div>
-                    </td>
-                    <td style="vertical-align: middle">確認人</td>
-                    <td>
-                        <select class="disabled_select" id="estimate_tryrun_start_date_owner" name="estimate_tryrun_start_date_owner" disabled>
-                            <option value="">請選擇</option>
-                            <?php echo getSelectOptionHtml($all_users_options, $row['estimate_tryrun_start_date_owner']); ?>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle">預計試車完工日</td>
-                    <td style="vertical-align: middle">
-                        <div class="input-group">
-                            <input class="form-control disabled_select" type="date" name="estimate_tryrun_end_date" id="estimate_tryrun_end_date" value="<?= $row['estimate_tryrun_end_date']; ?>" <?= $warehouse2; ?>>
-                            <span class="input-group-btn">
-                                <button class="btn btn-default" type='button' onclick='$("#estimate_tryrun_end_date").val("");' <?= $warehouse2; ?>>清除</button>
-                            </span>
-                        </div>
-                    </td>
-                    <td style="vertical-align: middle">確認人</td>
-                    <td>
-                        <select class="disabled_select" name="estimate_tryrun_end_date_owner" id="estimate_tryrun_end_date_owner" disabled>
-                            <option value="">請選擇</option>
-                            <?php echo getSelectOptionHtml($all_users_options, $row['estimate_tryrun_end_date_owner']); ?>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>備註</td>
-                    <td colspan="3">
-                        <textarea class="form-control disabled_select" name="warehouse_assistant_remark" id="warehouse_assistant_remark" <?= $warehouse2; ?>><?php echo $row['warehouse_assistant_remark']; ?></textarea>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle;">安裝圖附件</td>
-                    <td colspan="5" style="vertical-align: middle;">
-                        <input style="width:70%;display:inline;" type="file" name="plan_diagram_file" <?= $warehouse2; ?>>
-                        <?php
-                        echo !empty($row['plan_diagram_file']) ? "<a id='plan_diagram_file_a' style='color:#00F;' href='" . $row['plan_diagram_file'] . "' target='_blank'>下載附件</a>" : "";
-                        ?>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="vertical-align: middle;">完工驗收單附件</td>
-                    <td colspan="5" style="vertical-align: middle;">
-                        <input style="width:70%;display:inline;" type="file" name="completion_acceptance_file" <?= $warehouse2; ?>>
-                        <?php
-                        echo !empty($row['completion_acceptance_file']) ? "<a id='plan_diagram_file_a' style='color:#00F;' href='" . $row['completion_acceptance_file'] . "' target='_blank'>下載附件</a>" : "";
-                        ?>
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="4">
-                        <?php
-                        if (getSaveEstimateInstallData($user_department_id, $role_id))
-                            echo "<button type='button' onclick='savedata()' class='btn btn-primary btn-lg pull-right' style='margin-left:3px;'>存檔</button>";
-                        ?>
-                    </td>
-                </tr>
-            </table>
-        </div>
-    </div>
-</form>
-<form method="post" id="assign_form" enctype="multipart/form-data">
-    <input type="hidden" name='form_name' value="assign_form" />
-</form>
-<form method="post" id="back_marketing_assign_form" enctype="multipart/form-data">
-    <input type="hidden" name='salesid' value="<?php echo $row['salesid']; ?>" />
-    <input type="hidden" name='form_name' value="back_marketing_assign_form" />
-</form>
-<form method="post" id="back_design_assign_form" enctype="multipart/form-data">
-    <input type="hidden" name='form_name' value="back_design_assign_form" />
-</form>
-<form method="post" id="warehouse_assign_form" enctype="multipart/form-data">
-    <input type="hidden" name='form_name' value="warehouse_assign_form" />
-</form>
-<form method="post" id="update_contract_date_form" enctype="multipart/form-data">
-    <input type="hidden" name="contract_type" value="<?= $row["contract_type"]; ?>">
-    <input type="hidden" name="contractno" value="<?= $row["contractno"]; ?>">
-    <input type="hidden" name="facilityno" value="<?= $row["facilityno"]; ?>">
-    <input type="hidden" name="custom" value="<?= $row["custom"]; ?>">
-    <input type="hidden" name="creater" value="<?= $user_id; ?>">
-    <input type="hidden" name="create_at" value="<?= $row["create_at"]; ?>">
-    <input type="hidden" name='salesid' value="<?php echo $row['salesid']; ?>" />
-    <input type="hidden" name='gongWuokid' value="<?php echo getGongWuokNo($link); ?>" />
-    <input type="hidden" id='old_real_contract_arrival_date' name='old_real_contract_arrival_date' value="<?= $row['real_contract_arrival_date']; ?>" />
-    <input type="hidden" id='real_contract_arrival_date' name='real_contract_arrival_date' value="<?= $row['real_contract_arrival_date']; ?>" />
-    <input type="hidden" name='form_name' value="update_contract_date_form" />
-</form>
-<form method="post" id="update_date_form" enctype="multipart/form-data">
-    <input type="hidden" id="real_arrival_date" name='real_arrival_date' value="<?php echo $row['real_arrival_date']; ?>" />
-    <input type="hidden" name='form_name' value="update_date_form" />
-</form>
-
-<form method="post" id="update_install_date_form" enctype="multipart/form-data">
-    <input type="hidden" id="change_all_contractno" name='change_all_contractno' value="0" />
-    <input type="hidden" id="contractno2" name='contractno2' value="<?php echo $row['contractno']; ?>" />
-    <input type="hidden" id="install_start_date" name='install_start_date' value="<?php echo $row['install_start_date']; ?>" />
-    <input type="hidden" id="install_start_date_owner" name='install_start_date_owner' value="<?php echo $row['install_start_date_owner']; ?>" />
-    <input type="hidden" id="install_end_date" name='install_end_date' value="<?php echo $row['install_end_date']; ?>" />
-    <input type="hidden" id="install_end_date_owner" name='install_end_date_owner' value="<?php echo $row['install_end_date_owner']; ?>" />
-    <input type="hidden" id="tryrun_start_date" name='tryrun_start_date' value="<?php echo $row['tryrun_start_date']; ?>" />
-    <input type="hidden" id="tryrun_start_date_owner" name='tryrun_start_date_owner' value="<?php echo $row['tryrun_start_date_owner']; ?>" />
-    <input type="hidden" id="tryrun_end_date" name='tryrun_end_date' value="<?php echo $row['tryrun_end_date']; ?>" />
-    <input type="hidden" id="tryrun_end_date_owner" name='tryrun_end_date_owner' value="<?php echo $row['tryrun_end_date_owner']; ?>" />
-    <input type="hidden" name='form_name' value="update_install_date_form" />
-</form>
-<form method="post" id="update_shengguan_form" enctype="multipart/form-data">
-    <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>">
-    <input type="hidden" id="arrival_date_verify" name='arrival_date_verify' value="<?php echo $row['arrival_date_verify']; ?>" />
-    <input type="hidden" id="actual_tofactory_date" name='actual_tofactory_date' value="<?php echo $row['actual_tofactory_date']; ?>" />
-    <input type="hidden" id="arrival_date_owner" name='arrival_date_owner' value="<?php echo $row['arrival_date_owner']; ?>" />
-    <input type="hidden" id="shengguan_remark" name='shengguan_remark' value="<?php echo $row['shengguan_remark']; ?>" />
-    <input type="hidden" name='form_name' value="update_shengguan_form" />
-</form>
-
-<link rel="stylesheet" href="css\jquery-ui.css">
-<script src="js\jquery-1.9.1.js"></script>
-<script src="js\jquery-ui.js"></script>
-<link href="css\select2.min.css" rel="stylesheet" />
-<script src="js\select2.min.js"></script>
-
-<!-- <link rel="stylesheet" href="//code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css"> -->
-<!-- <script src="//code.jquery.com/jquery-1.9.1.js"></script> -->
-<!-- <script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script> -->
-<!-- <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /> -->
-<!-- <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script> -->
-
-<script type="text/javascript">
-    // 台灣自製件id
-    var taiwan_item_id = <?php echo empty($taiwan_item_id) ? 0 : $taiwan_item_id; ?>;
-    $(document).ready(function() {
-        $('#site_survey_contact_verify').select2();
-    });
-    $(function() {
-        $("title").text("合約號:<?php echo $row["contractno"]; ?>作番號:<?php echo $row["facilityno"]; ?>");
-        var tab = $('#tab').val();
-        $("#tabs").tabs({
-            active: tab
-        });
-
-        var catchTime_input_arr = [
-            "sales_spec_verify",
-            "customer_planning_verify",
-            "customer_color_verify",
-            "customer_style_verify",
-            "site_survey_contact_form_verify",
-            "desin_spec_verify",
-            "desin_planning_verify",
-            "desin_color_verify",
-            "desin_style_verify",
-            "desin_leader_verify",
-            "building_heigh_verify",
-            "site_survey_contact_verify",
-            "shengguanok_status",
-            'qc_date',
-            'end_qc_date',
-            'official_check_date',
-            'delivery_date'
-        ]
-        for (var i = 0; i < catchTime_input_arr.length; i++) {
-            inputChangeCatchTime(catchTime_input_arr[i]);
-        }
-
-        $("#prattford_order_date_verify,#prattford_order_date").on("change", function() {
-            $("#prattford_order_date_owner").val("<?php echo $user_id; ?>");
-        });
-        $("#estimated_shipping_date_verify,#estimated_shipping_date").on("change", function() {
-            $("#estimated_shipping_date_owner").val("<?php echo $user_id; ?>");
-        });
-        $("#estimated_shipping_schedule_date_verify,#estimated_shipping_schedule_date").on("change", function() {
-            $("#estimated_shipping_schedule_date_owner").val("<?php echo $user_id; ?>");
-        });
-        $("#goods_type,#goods_type_date").on("change", function() {
-            $("#goods_type_owner").val("<?php echo $user_id; ?>");
-        });
-        $("#taiwan_goods_type,#taiwan_goods_type_date").on("change", function() {
-            $("#taiwan_goods_type_owner").val("<?php echo $user_id; ?>");
-        });
-        $("#arrival_date_verify_tmp,#actual_tofactory_date_tmp").on("change", function() {
-            $("#arrival_date_owner_tmp").val("<?php echo $user_id; ?>");
-        });
-
-        var oursourcer_input_arr = [
-            'install_start_date',
-            'install_end_date',
-            'tryrun_start_date',
-            'tryrun_end_date',
-        ]
-        for (var i = 0; i < oursourcer_input_arr.length; i++) {
-            inputChangeOutsourcer(oursourcer_input_arr[i]);
-        }
-
-        var oursourcer_input_arr = [
-            'install_outsourcer',
-            'install_outsourcer_date',
-            'tryrun_outsourcer',
-            'tryrun_outsourcer_date',
-            'estimate_install_outsourcer',
-            'estimate_install_start_date',
-            'estimate_install_end_date',
-            'estimate_tryrun_outsourcer',
-            'estimate_tryrun_start_date',
-            'estimate_tryrun_end_date',
-        ]
-        for (var i = 0; i < oursourcer_input_arr.length; i++) {
-            inputChangeOutsourcer2(oursourcer_input_arr[i]);
-        }
-
-    });
-
-    function inputChangeCatchTime(input_name) {
-        $("#" + input_name + ",#" + input_name + "_file").on("change", function() {
-            $("#" + input_name + "_at").val(formatDate());
-            $("#" + input_name + "_owner").val("<?php echo $user_id; ?>");
-        });
-    }
-
-    function inputChangeOutsourcer(input_name) {
-        $("#" + input_name + "_tmp").on("change", function() {
-            $("#" + input_name + "_owner_tmp").val("<?php echo $user_id; ?>");
-        });
-    }
-
-    function inputChangeOutsourcer2(input_name) {
-        $("#" + input_name).on("change", function() {
-            $("#" + input_name + "_owner").val("<?php echo $user_id; ?>");
-        });
-    }
-
-    function formatDate() {
-        var timestamp = Date.now();
-        var date = new Date(timestamp);
-        var year = date.getFullYear().toString().padStart(4, '0');
-        var month = (date.getMonth() + 1).toString().padStart(2, '0');
-        var day = date.getDate().toString().padStart(2, '0');
-        var hours = date.getHours().toString().padStart(2, '0');
-        var minutes = date.getMinutes().toString().padStart(2, '0');
-        var seconds = date.getSeconds().toString().padStart(2, '0');
-        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-    }
-
-    function savedata() {
-        $(".disabled_select").prop("disabled", false);
-        $('#form').submit();
-    }
-
-    function doMarketingAssign() {
-        if (confirm('確定要送出表單嗎?表單送出後即會進入下一階段') == true) {
-            if (getDoMarketingAssignStatus() == 2) {
-                alert("部分確認欄位還未選擇 `已完成` 或 `無需求`");
-            } else if (getDoMarketingAssignStatus() == 3) {
-                alert("部分確認欄位未上傳相關檔案");
-            } else {
-                $('#assign_form').submit();
-            }
-        }
-    }
-
-    function getDoMarketingAssignStatus() {
-        if ($("#sales_spec_verify").val() == '1')
-            return 2;
-        if ($("#customer_planning_verify").val() == '1')
-            return 2;
-        if ($("#customer_style_verify").val() == '1')
-            return 2;
-        if ($("#customer_color_verify").val() == '1')
-            return 2;
-        if ($("#site_survey_contact_form_verify").val() == '1')
-            return 2;
-        if ($("#sales_spec_verify").val() == '0' && !$('#sales_spec_verify_file_a').length)
-            return 3;
-        if ($("#customer_planning_verify").val() == '0' && !$('#customer_planning_verify_file_a').length)
-            return 3;
-        if ($("#customer_style_verify").val() == '0' && !$('#customer_style_verify_file_a').length)
-            return 3;
-        if ($("#customer_color_verify").val() == '0' && !$('#customer_color_verify_file_a').length)
-            return 3;
-        if ($("#site_survey_contact_form_verify").val() == '0' && !$('#site_survey_contact_form_verify_file_a').length)
-            return 3;
-        return 1;
-    }
-
-    function doDesignAssign() {
-        if (confirm('確定要送出表單嗎?表單送出後即會進入下一階段') == true) {
-            if (!getDoDesignAssignStatus()) {
-                alert("部分確認欄位還未選擇 `已完成` 或 `無需求`");
-            } else {
-                $('#assign_form').submit();
-            }
-        }
-    }
-
-    function getDoDesignAssignStatus() {
-        if ($("#desin_leader_verify").val() == '0')
-            return true;
-        if ($("#desin_leader_verify").val() == '2')
-            return true;
-        return false;
-    }
-
-    function doDesignLeaderAssign() {
-        if (confirm('確定要送出表單嗎?表單送出後即會進入下一階段') == true) {
-            if (!getDoDesignLeaderAssignStatus()) {
-                alert("部分確認欄位還未選擇 `已完成` 或 `無需求`");
-            } else {
-                $('#assign_form').submit();
-            }
-        }
-    }
-
-    function getDoDesignLeaderAssignStatus() {
-        if ($("#desin_spec_verify").val() == '1')
-            return false;
-        if ($("#desin_planning_verify").val() == '1')
-            return false;
-        if ($("#desin_color_verify").val() == '1')
-            return false;
-        if ($("#desin_style_verify").val() == '1')
-            return false;
-        return true;
-    }
-
-    function doWarhouseAssign() {
-        if (confirm('確定要送出表單嗎?表單送出後即會進入下一階段') == true) {
-            if (!getdoWarhouseAssignStatus()) {
-                alert("部分確認欄位還未選擇 `已完成` 或 `無需求`");
-            } else {
-                $('#assign_form').submit();
-            }
-        }
-    }
-
-    function getdoWarhouseAssignStatus() {
-        if ($("#building_heigh_verify").val() == '1')
-            return false;
-        if ($("#site_survey_contact_verify").val() == '1')
-            return false;
-        return true;
-    }
-
-    function doShengguanAssign() {
-        var doShengguanAssignStatus = {
-            '2': '已備齊時間還在進行中',
-            '3': '下單日未選擇或還在進行中',
-            '4': '預計發貨日未選擇或還在進行中',
-            '5': '預計船期未選擇或還在進行中',
-            '6': '普來特富(發貨類別)並非全級發貨',
-            '7': '台灣自理項目(發貨類別)並非全級發貨',
-            '8': '實際到貨日並非皆到貨'
-        }
-        if (confirm('確定要送出表單嗎?表單送出後此作番大日程會進入結案狀態')) {
-            if (getdoShengguanAssignStatus() == '1') {
-                $('#assign_form').submit();
-            } else {
-                alert(doShengguanAssignStatus[getdoShengguanAssignStatus()]);
-            }
-        }
-    }
-
-
-    function getdoShengguanAssignStatus() {
-        if ($("#goods_type").val() !== 'A' && $("#goods_type").val() !== 'C')
-            return '6';
-        if ($("#taiwan_goods_type").val() !== 'A' && $("#taiwan_goods_type").val() !== 'C')
-            return '7';
-        // if ($("#arrival_date_verify").val() !== 'A')
-        //     return '8';
-        if ($("#shengguanok_status").val() == '1')
-            return '2';
-        if ($("#prattford_order_date_verify").val() == '1')
-            return '3';
-        if ($("#estimated_shipping_date_verify").val() == '1')
-            return '4';
-        if ($("#estimated_shipping_schedule_date_verify").val() == '1')
-            return '5';
-        return '1';
-    }
-
-    function doBackMarketingAssign() {
-        $('#back_marketing_assign_form').submit();
-    }
-
-    function doBackDesignAssign() {
-        $('#back_design_assign_form').submit();
-    }
-
-    function doBackWarhouseAssign() {
-        $('#warehouse_assign_form').submit();
-    }
-
-    function addTaiwanItem() {
-        var str = "<tr id='taiwan_item_tr_" + taiwan_item_id + "'>";
-        str += "<td style='vertical-align: middle;'>";
-        str += "    <label>品目編號</label>";
-        str += "</td>";
-        str += "<td style='vertical-align: middle;'>";
-        str += "    <input type='text' name='desin_taiwan_items_no[]' />";
-        str += "</td>";
-        str += "<td style='vertical-align: middle;'>";
-        str += "    <label>部品名稱</label>";
-        str += "</td>";
-        str += "<td style='vertical-align: middle;'>";
-        str += "    <input type='text' name='desin_taiwan_items_name[]' />";
-        str += "</td>";
-        str += "<td style='vertical-align: middle;'>";
-        str += "    <button class='btn btn-danger' type='button' onclick='removeTaiwanItemTr(" + taiwan_item_id + ")'>x</button>";
-        str += "</td>";
-        str += "<tr>";
-        $("#taiwan_item_tr").after(str);
-    }
-
-    function removeTaiwanItemTr(taiwan_item_id) {
-        $("#taiwan_item_tr_" + taiwan_item_id).remove();
-    }
-
-    function updateContractDate() {
-        if (confirm('確定要更改日期嗎?') == true) {
-            var estimated_shipping_schedule_date = $("#estimated_shipping_schedule_date").val();
-            var real_contract_arrival_date = $("#real_contract_arrival_date_tmp").val();
-            if (real_contract_arrival_date < estimated_shipping_schedule_date) {
-                alert("日期不可以比預計到貨日(到觀音日)早");
-            } else {
-                $("#real_contract_arrival_date").val($("#real_contract_arrival_date_tmp").val());
-                $('#update_contract_date_form').submit();
-            }
-        }
-    }
-
-    function updateRealArrivalDate() {
-        if (confirm('確定要更改實際出貨日嗎?') == true) {
-            $("#real_arrival_date").val($("#real_arrival_date_tmp").val());
-            $('#update_date_form').submit();
-        }
-    }
-
-    function updateShengguan() {
-        if (confirm('確定要存檔嗎?') == true) {
-            $("#arrival_date_verify").val($("#arrival_date_verify_tmp").val());
-            $("#actual_tofactory_date").val($("#actual_tofactory_date_tmp").val());
-            $("#arrival_date_owner").val($("#arrival_date_owner_tmp").val());
-            $("#shengguan_remark").val($("#shengguan_remark_tmp").val());
-            $('#update_shengguan_form').submit();
-        }
-    }
-
-    function saveInstallData() {
-        if (confirm('確定要更改實際安裝日程嗎?') == true) {
-            if ($("#change_all_contractno_tmp").prop('checked')) {
-                if ($("#contractno").val() == '' || $("#contractno").val() == null) {
-                    alert("合約號空白");
-                } else {
-                    $("#change_all_contractno").val($("#change_all_contractno_tmp").prop('checked'));
-                    $("#contractno2").val($("#contractno").val());
-                    $("#install_start_date").val($("#install_start_date_tmp").val());
-                    $("#install_start_date_owner").val($("#install_start_date_owner_tmp").val());
-                    $("#install_end_date").val($("#install_end_date_tmp").val());
-                    $("#install_end_date_owner").val($("#install_end_date_owner_tmp").val());
-                    $("#tryrun_start_date").val($("#tryrun_start_date_tmp").val());
-                    $("#tryrun_start_date_owner").val($("#tryrun_start_date_owner_tmp").val());
-                    $("#tryrun_end_date").val($("#tryrun_end_date_tmp").val());
-                    $("#tryrun_end_date_owner").val($("#tryrun_end_date_owner_tmp").val());
-                    $('#update_install_date_form').submit();
-                }
-            } else {
-                $("#install_start_date").val($("#install_start_date_tmp").val());
-                $("#install_start_date_owner").val($("#install_start_date_owner_tmp").val());
-                $("#install_end_date").val($("#install_end_date_tmp").val());
-                $("#install_end_date_owner").val($("#install_end_date_owner_tmp").val());
-                $("#tryrun_start_date").val($("#tryrun_start_date_tmp").val());
-                $("#tryrun_start_date_owner").val($("#tryrun_start_date_owner_tmp").val());
-                $("#tryrun_end_date").val($("#tryrun_end_date_tmp").val());
-                $("#tryrun_end_date_owner").val($("#tryrun_end_date_owner_tmp").val());
-                $('#update_install_date_form').submit();
-            }
-        }
-    }
-
-    function setOutSourcerDate() {
-
-        // 發包類型
-        let outsourcer_type = $("input[name^='outsourcer_type']:checked").val();
-        // 預計出貨日(到工地)
-        let real_contract_arrival_date = $("#real_contract_arrival_date").val();
-        // 樓停
-        let numberofstop = $("#numberofstop").val();
-        // 目前操作者
-        let user_id = '<?php echo $user_id; ?>';
-
-        if (getSetOutSourcerDateStatus() == '1') {
-            if (outsourcer_type === 'I') {
-                resetTOutSourcerDate();
-                $("#estimate_install_start_date").val(dateAddDays(real_contract_arrival_date, 5));
-                $("#estimate_install_start_date_owner").val(user_id);
-                $("#estimate_install_end_date").val(
-                    dateAddDays($("#estimate_install_start_date").val(), specificationDayFormula(numberofstop))
-                );
-                $("#estimate_install_end_date_owner").val(user_id);
-            }
-            if (outsourcer_type === 'T') {
-                resetIOutSourcerDate();
-                $("#estimate_tryrun_start_date").val(dateAddDays(real_contract_arrival_date, 5));
-                $("#estimate_tryrun_start_date_owner").val(user_id);
-                $("#estimate_tryrun_end_date").val(
-                    dateAddDays($("#estimate_tryrun_start_date").val(), specificationDayFormula(numberofstop))
-                );
-                $("#estimate_tryrun_end_date_owner").val(user_id);
-            }
-            if (outsourcer_type === 'IT') {
-                $("#estimate_install_start_date").val(dateAddDays(real_contract_arrival_date, 5));
-                $("#estimate_install_start_date_owner").val(user_id);
-                $("#estimate_install_end_date").val(
-                    dateAddDays($("#estimate_install_start_date").val(), specificationDayFormula(numberofstop))
-                );
-                $("#estimate_install_end_date_owner").val(user_id);
-                $("#estimate_tryrun_start_date").val(dateAddDays($("#estimate_install_end_date").val(), 1));
-                $("#estimate_tryrun_start_date_owner").val(user_id);
-                $("#estimate_tryrun_end_date").val(
-                    dateAddDays($("#estimate_tryrun_start_date").val(), specificationDayFormula(numberofstop))
-                );
-                $("#estimate_tryrun_end_date_owner").val(user_id);
-            }
-        } else {
-            const errrMessage = {
-                '2': '請選擇發包種類',
-                '3': '樓停未填寫',
-                '4': '預計交期(到工地)未填寫'
-            }
-            if ((errrMessage[getSetOutSourcerDateStatus()] !== 'undefined')) {
-                alert(errrMessage[getSetOutSourcerDateStatus()]);
-            } else {
-                alert("不明錯誤");
-            }
-
-        }
-
-    }
-
-    function getSetOutSourcerDateStatus() {
-        let outsourcer_type = $("input[name^='outsourcer_type']:checked").val();
-        let real_contract_arrival_date = $("#real_contract_arrival_date").val();
-        let numberofstop = $("#numberofstop").val();
-        let user_id = '<?php echo $user_id; ?>';
-
-        if (typeof outsourcer_type == 'undefined')
-            return 2;
-        if (typeof numberofstop == 'undefined')
-            return 3;
-        if (numberofstop == 0 || numberofstop == '' || numberofstop == '0')
-            return 3;
-        if (typeof real_contract_arrival_date == 'undefined')
-            return 4;
-        if (real_contract_arrival_date == 0 || real_contract_arrival_date == '' || real_contract_arrival_date == '0')
-            return 4;
-        return 1;
-
-    }
-
-    function resetIOutSourcerDate() {
-        $("#estimate_install_start_date").val("");
-        $("#estimate_install_end_date").val("");
-    }
-
-    function resetTOutSourcerDate() {
-        $("#estimate_tryrun_start_date").val("");
-        $("#estimate_tryrun_end_date").val("");
-    }
-
-
-    function resetAllOutSourcerDate() {
-        resetIOutSourcerDate();
-        resetTOutSourcerDate();
-    }
-
-    function specificationDayFormula(numberofstop) {
-        if (numberofstop > 0 && numberofstop <= 7)
-            return 7;
-        if (numberofstop > 7 && numberofstop < 14)
-            return numberofstop;
-        if (numberofstop >= 14)
-            return 14;
-        return 0
-    }
-
-    function dateAddDays(dateString, daysToAdd = 0) {
-        daysToAdd = Number(daysToAdd);
-        // 將日期字串轉換為日期物件
-        var initialDate = new Date(dateString);
-        // 增加指定天數
-        initialDate.setDate(initialDate.getDate() + daysToAdd);
-
-        // 將結果轉換為所需的日期格式（例如：yyyy-mm-dd）
-        var year = initialDate.getFullYear();
-        var month = String(initialDate.getMonth() + 1).padStart(2, "0"); // 月份從0開始，需要加1
-        var day = String(initialDate.getDate()).padStart(2, "0");
-        var resultDateString = year + "-" + month + "-" + day;
-
-        return resultDateString;
-    }
-
-    var ocfi_id = 0;
-
-    function addOutsourcerContractFileItem() {
-        ocfi_id++;
-        let html = "<input style='width:70%;display:inline;' type='file' id='outsourcer_contract_file_" + ocfi_id + "' name='outsourcer_contract_file[]' multiple>";
-        html += "<button type='button' class='btn btn-danger' id='outsourcer_contract_file_del_" + ocfi_id + "' onclick='delOutsourcerContractFileItem(" + ocfi_id + ")'>x</button>";
-        $("#ocfi_td").append(html);
-    }
-
-    function delOutsourcerContractFileItem(id) {
-        $("#outsourcer_contract_file_del_" + id).remove();
-        $("#outsourcer_contract_file_" + id).remove();
-    }
+<?php
+// ini_set('display_errors', 'on');
+/**
+ * (新梯)流程規則:
+ * 1. A:營業員確認中 業務建立大日程 (或是系統洗入)
+ * 6. I:營業主管確認中 
+ * 2. B:設計部門確認中 (郭承瑋)
+ * 3. C:設計部門主管確認中 (N0019江京鴻)
+ * 4. D:生管確認中 (M0024伃廷)
+ * 5. Z:本單結案 (00000)
+ * 
+ * 1. G:工務組長確認中 生管建立大日程 (或是系統洗入) 工務:宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
+ * 2. H:生管確認中 (M0024伃廷)
+ * 3. Z:本單結案 (00000)
+ * 
+ */
+
+// error_reporting(0);
+include "header.php";
+require_once "database.php";
+include "wipwhole-index-function.php";
+include "css/view/wipwhole-rec-invoice-edit.php";
+
+// 查詢數據
+if (isset($_GET['id']) || isset($_GET['form_key'])) {
+    $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+} else {
+    die('ERROR: Record ID not found.');
+}
+
+// 取得大日程此 id 資料
+$row = getWipwholestatusData($link, $id);
+
+// 使用者部門
+$user_department_id = getDepartmentId($link, $user_id);
+// 使用者職位
+$role_id = getRoleId($link, $user_id);
+
+// input disaled status
+// 資訊 業務 工務 營業 設計 設計主管 生管 
+$information = getInformationStatus($link, $user_department_id, $role_id);
+$yewu = getYewuStatus($link, $user_department_id, $role_id);
+$warehouse = getWarehouseStatus($link, $user_department_id, $role_id, 1);
+$marketing = getMarketingStatus($link, $user_department_id, $role_id, 1);
+$marketing2 = getMarketingStatus($link, $user_department_id, $role_id, 2);
+$desin = getDesinStatus($link, $user_department_id, $role_id);
+$desin_leader = getDesinLeaderStatus($link, $user_department_id, $role_id);
+$shengguan = getShengguanStatus($link, $user_department_id, $role_id, 1);
+$warehouse2 = getWarehouseStatus($link, $user_department_id, $role_id, 2);
+$shengguan2 = getShengguanStatus($link, $user_department_id, $role_id, 2);
+$pinzheng = getPinzhengStatus($link, $user_department_id, $role_id);
+
+// 取得分頁頁碼
+$user_department_id;
+$tab = getTabNo($user_department_id);
+
+// 工務助理
+if (in_array($user_id, ['M0164', 'M0165', 'M0127', 'M0193', 'M0170', 'M0188', 'M0117'])) {
+    $warehouse2 = "";
+    $tab = 5;
+}
+
+// 暫時可編輯及刪除權限
+$update_delete_status = "disabled";
+if (in_array($user_id, ['M0175', 'M0079', 'M0060'])) {
+    $update_delete_status = "";
+}
+
+// 許協業務項編輯權限
+if (in_array($user_id, ['M0060'])) {
+    $yewu = "";
+}
+
+// select => options 開門方式 
+$opendoor_options = getOpendoorOptions($link);
+// select => options 確認人
+$all_users_options = getAllUsersOptions($link);
+
+// 更新數據 接收 post 命令
+include "wipwhole-rec-invoice-edit-submit.php";
+
+?>
+
+<form method="post" id="form" enctype="multipart/form-data">
+    <input type="hidden" name='form_name' value="main_form" />
+    <div style="overflow-x:auto;">
+        <table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%">
+            <thead>
+                <tr>
+                    <td colspan="9">
+                        <h3 style='text-align:center'>作番大日程(新梯)</h3>
+                    </td>
+                </tr>
+            </thead>
+            <tbody style="font-weight: bolder;margin-bottom: 20px">
+                <tr>
+                    <td colspan="7" style='vertical-align: middle;border-right:0px;'>
+                        <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>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">合約號</td>
+                    <td>
+                        <input class="form-control " type="text" id="contractno" name="contractno" value="<?= $row["contractno"]; ?>" <?php echo $update_delete_status; ?>>
+                        <?php
+                        if (in_array($user_department_id, [311, 312, 313, 314, 315, 501, 511, 512, 513, 514, 220, 911, 50, 320, 250])) {
+                            $sql = "
+                                    SELECT
+                                        mid,
+                                        pr_item_id,
+                                        version
+                                    FROM specsurvey_main
+                                    WHERE contractno = '" . $row["contractno"] . "'
+                                ";
+                            $result = mysqli_query($link, $sql);
+                            $row2 = mysqli_fetch_array($result);
+                            if (!empty($row2['mid'])) {
+                                echo "<a target='_blank' href='/wms/mkt/specsurvey_renovate-view.php?pa=" . $row2['mid'] . "," . $row2['pr_item_id'] . "," . $row2['version'] . "&$token_link'>規調:" . $row["contractno"] . "</a>";
+                            }
+                        }
+                        ?>
+                    </td>
+                    <td style="vertical-align: middle">作番號</td>
+                    <td>
+                        <input class="form-control disabled_select" type="text" name="facilityno" value="<?= $row["facilityno"]; ?>" <?php echo $update_delete_status; ?>>
+                    </td>
+                    <td style="vertical-align: middle">客戶名稱</td>
+                    <td>
+                        <input class="form-control disabled_select" type="text" name="custom" value="<?= $row["custom"]; ?>" <?php echo $update_delete_status; ?>>
+                    </td>
+                    <td style="vertical-align: middle">號機</td>
+                    <td>
+                        <input class="form-control disabled_select" type="text" name="facility_temp_no" value="<?= $row["facility_temp_no"]; ?>" <?php echo $update_delete_status; ?>>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">經度</td>
+                    <td style="vertical-align: middle">
+                        <input class="form-control disabled_select" type="text" name="longitude" value="<?= $row["longitude"]; ?>" <?php echo $update_delete_status; ?>>
+                    </td>
+                    <td style="vertical-align: middle">緯度</td>
+                    <td>
+                        <input class="form-control disabled_select" type="text" name="latitude" value="<?= $row["latitude"]; ?>" <?php echo $update_delete_status; ?>>
+                    </td>
+                    <td style="vertical-align: middle">地址</td>
+                    <td>
+                        <input class="form-control disabled_select" type="text" name="address" value="<?= $row["address"]; ?>" <?php echo $update_delete_status; ?>>
+                    </td>
+                    <td style="vertical-align: middle">工地地址<br />
+                        <?php
+                        $show_tmp_arr = [
+                            311, 312, 313, 314, 315,
+                            501, 511, 512, 513, 514,
+                            521, 531, 220, 250,
+                            541, 542, 543, 544, 545
+                        ];
+                        if (in_array($user_department_id, $show_tmp_arr))
+                            echo "<a target='_blank' href='wipwhole-change-contractdate.php?function_name=wipwholerenstatus&$token_link&id=$id'>工地地址調整</a>";
+                        ?>
+                    </td>
+                    <td>
+                        <input class="form-control " type="text" name="real_address" value="<?= $row["real_address"]; ?>" disabled>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">機型</td>
+                    <td>
+                        <input class="form-control disabled_select" type="text" name="facility_kind" value="<?= $row["facility_kind"]; ?>" <?php echo $update_delete_status; ?>>
+                    </td>
+                    <td style="vertical-align: middle">開門方式</td>
+                    <td style="vertical-align: middle">
+                        <select class="form-control disabled_select" name="opentype" <?php echo $update_delete_status; ?>>
+                            <option value=""></option>
+                            <?php
+                            foreach ($opendoor_options as $opendoor_option) :
+                                if ($row["opentype"] == $opendoor_option['label']) {
+                                    echo "<option selected='selected' value='" . $opendoor_option['label'] . "'>" . $opendoor_option['label'] . "</option>";
+                                } else {
+                                    echo "<option value='" . $opendoor_option['label'] . "'>" . $opendoor_option['label'] . "</option>";
+                                }
+                            endforeach
+                            ?>
+                        </select>
+                    </td>
+                    <td style="vertical-align: middle">速度</td>
+                    <td style="vertical-align: middle" <?php echo $information; ?>>
+                        <input class="form-control disabled_select" type="number" name="speed" min="0" value="<?= $row["speed"]; ?>" <?php echo $update_delete_status; ?>>
+                    </td>
+                    <td style="vertical-align: middle">工地負責人</td>
+                    <td>
+                        <input class="form-control disabled_select" type="text" name="site_manager" value="<?= $row["site_manager"]; ?>" <?php echo $update_delete_status; ?>>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">載重</td>
+                    <td style="vertical-align: middle">
+                        <input class="form-control disabled_select" type="number" name="weight" min="0" value="<?= $row["weight"]; ?>" <?php echo $update_delete_status; ?>>
+                    </td>
+                    <td style="vertical-align: middle">人乘</td>
+                    <td style="vertical-align: middle">
+                        <input class="form-control disabled_select" type="number" name="numberofpassenger" min="0" value="<?= $row["numberofpassenger"]; ?>" <?php echo $update_delete_status; ?>>
+                    </td>
+                    <td style="vertical-align: middle">樓停</td>
+                    <td>
+                        <input class="form-control disabled_select" type="number" name="numberofstop" id="numberofstop" min="0" value="<?= $row["numberofstop"]; ?>" <?php echo $update_delete_status; ?>>
+                    </td>
+                    <td style="vertical-align: middle">樓層</td>
+                    <td>
+                        <input class="form-control disabled_select" type="number" name="numberoffloor" min="0" value="<?= $row["numberoffloor"]; ?>" <?php echo $update_delete_status; ?>>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">合約交期<br />(到工地)</td>
+                    <td>
+                        <input class="form-control disabled_select" type="date" name="contract_arrival_date" value="<?= $row['contract_arrival_date']; ?>" <?php echo $update_delete_status; ?>>
+                    </td>
+                    <td style="vertical-align: middle">預計交期(到工地)
+                        <br />
+                        <?php
+                        $show_tmp_arr = [
+                            311, 312, 313, 314, 315,
+                            501, 511, 512, 513, 514,
+                            521, 531, 220, 250,
+                            541, 542, 543, 544, 545
+                        ];
+                        if (in_array($user_department_id, $show_tmp_arr))
+                            echo "<a target='_blank' href='wipwhole-change-contractdate.php?function_name=wipwholerenstatus&$token_link&id=$id'>出貨日調整</a>";
+                        ?>
+                    </td>
+                    <td style="vertical-align: middle">
+                        <input class="form-control disabled_select" type="date" value="<?= $row['real_contract_arrival_date']; ?>" disabled>
+                    </td>
+                    <td></td>
+                    <td></td>
+                    <td style="vertical-align: middle">簽核狀況</td>
+                    <td style="vertical-align: middle">
+                        <?php
+                        $assign_status_YD = array(
+                            'A' => '營業員確認中',
+                            'I' => '營業部門已確認<br/>營業部門主管確認中',
+                            'B' => '營業部門已確認<br/>設計部門確認中',
+                            'C' => '營業部門已確認<br/>設計部門主管確認中',
+                            'D' => '營業部門已確認<br/>設計部門主管已確認',
+                            'Z' => '',
+                        );
+
+                        $assign_status_G = array(
+                            'G' => '工務部門確認中',
+                            'H' => '工務部門已確認',
+                            'Z' => '',
+                        );
+                        if (checkNowFormYDStatus($link) == 'Z' && checkNowFormGStatus($link) == 'Z') {
+                            echo "此作番大日程已結案";
+                        } else {
+                            echo $assign_status_YD[checkNowFormYDStatus($link)] . "<br/>" . $assign_status_G[checkNowFormGStatus($link)];
+                        }
+                        ?>
+                    </td>
+                </tr>
+                <tr>
+                    <td>作番備註</td>
+                    <td colspan="7">
+                        <div style="max-height:250px;overflow-y:auto;">
+                            <?= nl2br($row["all_remark"]); ?>
+                        </div>
+                    </td>
+                </tr>
+                <?php
+                if (in_array($user_id, ['M0175', 'M0079', 'M0060'])) {
+                ?>
+                    <tr>
+                        <td colspan="8">
+                            <button onclick="savedata()" type="button" class="btn btn-primary pull-right" style="margin-left:3px;" <?php echo $update_delete_status; ?>>存檔</button>
+                        </td>
+                    </tr>
+                <?php
+                }
+                ?>
+            </tbody>
+        </table>
+    </div>
+    <div id="tabs">
+        <input class="form-control " type="hidden" name="tab" id='tab' value="<?= $tab; ?>">
+        <ul>
+            <li><a href="#tabs-3">工務確認項</a></li>
+            <li><a href="#tabs-1">營業確認項</a></li>
+            <li><a href="#tabs-2">設計確認項</a></li>
+            <li><a href="#tabs-4">生管確認項</a></li>
+            <li><a href="#tabs-5">品證確認項</a></li>
+            <li><a href="#tabs-6">工務助理確認項</a></li>
+        </ul>
+        <div id="tabs-1">
+            <table class="table  table-bordered" style="width:100%">
+                <tbody style="font-weight: bolder;margin-bottom: 20px">
+                    <tr>
+                        <td>營業人員確認項</td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle;width:auto;">營業/契約確認規格</td>
+                        <td style="width:150px;">
+                            <select class="disabled_select" name="sales_spec_verify" id="sales_spec_verify" <?= $marketing; ?>>
+                                <option <?php if ($row["sales_spec_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
+                                <option <?php if ($row["sales_spec_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
+                                <option <?php if ($row["sales_spec_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
+                                <option <?php if ($row["sales_spec_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
+                            </select>
+                        </td>
+                        <td style="vertical-align: middle;width:auto;">附件</td>
+                        <td style="vertical-align: middle;width:300px;">
+                            <input style="width:70%;display:inline;" type="file" id="sales_spec_verify_file" name="sales_spec_verify_file" <?= $marketing; ?>>
+                            <?php
+                            echo !empty($row['sales_spec_verify_file']) ? "<a id='sales_spec_verify_file_a' style='color:#00F;' href='" . $row['sales_spec_verify_file'] . "' target='_blank'>下載附件</a>" : "";
+                            ?>
+                        </td>
+                        <td style="vertical-align: middle">確認時間</td>
+                        <td>
+                            <input class="form-control disabled_select" type="datetime-local" id="sales_spec_verify_at" name="sales_spec_verify_at" value="<?= $row['sales_spec_verify_at']; ?>" readonly>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select name="sales_spec_verify_owner" class="disabled_select" id="sales_spec_verify_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['sales_spec_verify_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">
+                            客戶計劃圖
+                            <br />
+                            (意匠圖)
+                            <?php
+                            // $result2 = getWipwholeChangePlanningCustomerDetailsStatus($link, $id);
+                            // $row2 = mysqli_fetch_assoc($result2);
+                            // if (empty($row2['change_status'])) {
+                            //     $show_tmp_arr = [
+                            //         '311', '312', '313', '314', '315',
+                            //         '501', '511', '512', '513', '514',
+                            //         '220', '320'
+                            //     ];
+                            //     if (in_array($user_department_id, $show_tmp_arr))
+                            //         echo "<br/>";
+                            //     echo "<a target='_blank' style='color:#00F;' href='wipwhole-change-planning-customer-name.php?function_name=wipwholerenstatus&$token_link&id=$id'>申請上傳</a>";
+                            // } else {
+                            //     if (in_array($row2['change_status'], ['A', 'B', 'D'])) {
+                            //         echo "<br/>";
+                            //         echo "<a target='_blank' style='color:#00F;' href='wipwhole-change-planning-customer-name.php?function_name=wipwholerenstatus&$token_link&id=$id'>客戶姓名：" . $row2['custom_name'] . "<br/>狀態：審核中</a>";
+                            //     }
+                            //     if ($row2['change_status'] == 'C') {
+                            //         echo "<br/>";
+                            //         echo "<a target='_blank' style='color:#00F;' href='wipwhole-change-planning-customer-name.php?function_name=wipwholerenstatus&$token_link&id=$id'>客戶姓名：" . $row2['custom_name'] . "<br/>狀態：已取消</a>";
+                            //     }
+                            //     if ($row2['change_status'] == 'Z') {
+                            //         echo "<br/>";
+                            //         echo "<a target='_blank' style='color:#00F;' href='wipwhole-change-planning-customer-name.php?function_name=wipwholerenstatus&$token_link&id=$id'>客戶姓名：" . $row2['custom_name'] . "<br/>狀態：審核通過</a>";
+                            //     }
+                            // }
+                            ?>
+                        </td>
+                        <td>
+                            <select class="disabled_select" name="customer_planning_verify" id="customer_planning_verify" <?= $marketing; ?>>
+                                <option <?php if ($row["customer_planning_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
+                                <option <?php if ($row["customer_planning_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
+                                <option <?php if ($row["customer_planning_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
+                                <option <?php if ($row["customer_planning_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
+                            </select>
+                        </td>
+                        <td style="vertical-align: middle;">附件</td>
+                        <td style="vertical-align: middle;">
+                            客戶姓名:<input type="text" name="real_custom_name" id="real_custom_name" style="width:70%;display:inline;" value="<?= $row["real_custom_name"]; ?>" <?= $marketing; ?> placeholder="輸入後即可上傳附件" />
+                            <br />
+                            <input style="width:70%;display:inline;" type="file" id="customer_planning_verify_file" name="customer_planning_verify_file" disabled>
+                            <?php
+                            // echo !empty($row['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
+                            ?>
+                            <br />
+                            <?php
+                            $customer_planning_verify_files = getAllCustomerPlanningVerify($link, $id);
+                            foreach ($customer_planning_verify_files as $row2) :
+                                echo "<a id='customer_planning_verify_file_a' style='color:#00F;' 
+                                    href='" . $row2['customer_planning_verify_file'] . "' target='_blank'>下載附件_" . $row2['custom_name'] . "_" . $row2['create_at'] . "</a><br/>";
+                            endforeach;
+                            ?>
+                        </td>
+                        <td style="vertical-align: middle">確認時間</td>
+                        <td><input class="form-control disabled_select" type="datetime-local" id="customer_planning_verify_at" name="customer_planning_verify_at" value="<?= $row['customer_planning_verify_at']; ?>" readonly></td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select name="customer_planning_verify_owner" class="disabled_select" id="customer_planning_verify_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['customer_planning_verify_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <td style="vertical-align: middle">客戶顏色</td>
+                        <td>
+                            <select class="disabled_select" name="customer_color_verify" id="customer_color_verify" <?= $marketing; ?>>
+                                <option <?php if ($row["customer_color_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
+                                <option <?php if ($row["customer_color_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
+                                <option <?php if ($row["customer_color_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
+                                <option <?php if ($row["customer_color_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
+                            </select>
+                        </td>
+                        <td style="vertical-align: middle;">附件</td>
+                        <td style="vertical-align: middle;">
+                            <input style="width:70%;display:inline;" type="file" id="customer_color_verify_file" name="customer_color_verify_file" <?= $marketing; ?>>
+                            <?php
+                            echo !empty($row['customer_color_verify_file']) ? "<a id='customer_color_verify_file_a' style='color:#00F;' href='" . $row['customer_color_verify_file'] . "' target='_blank'>下載附件</a>" : "";
+                            ?>
+                        </td>
+                        <td style="vertical-align: middle">確認時間</td>
+                        <td><input class="form-control disabled_select" type="datetime-local" id="customer_color_verify_at" name="customer_color_verify_at" value="<?= $row['customer_color_verify_at']; ?>" readonly></td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select name="customer_color_verify_owner" class="disabled_select" id="customer_color_verify_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['customer_color_verify_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">客戶樣式</td>
+                        <td>
+                            <select class="disabled_select" name="customer_style_verify" id="customer_style_verify" <?= $marketing; ?>>
+                                <option <?php if ($row["customer_style_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
+                                <option <?php if ($row["customer_style_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
+                                <option <?php if ($row["customer_style_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
+                                <option <?php if ($row["customer_style_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
+                            </select>
+                        </td>
+                        <td style="vertical-align: middle;">附件</td>
+                        <td style="vertical-align: middle;">
+                            <input style="width:70%;display:inline;" type="file" id="customer_style_verify_file" name="customer_style_verify_file" <?= $marketing; ?>>
+                            <?php
+                            echo !empty($row['customer_style_verify_file']) ? "<a id='customer_style_verify_file_a' style='color:#00F;' href='" . $row['customer_style_verify_file'] . "' target='_blank'>下載附件</a>" : "";
+                            ?>
+                        </td>
+                        <td style="vertical-align: middle">確認時間</td>
+                        <td><input class="form-control disabled_select" type="datetime-local" id="customer_style_verify_at" name="customer_style_verify_at" value="<?= $row['customer_style_verify_at']; ?>" readonly></td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select name="customer_style_verify_owner" class="disabled_select" id="customer_style_verify_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['customer_style_verify_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">工勘聯絡表</td>
+                        <td>
+                            <select class="disabled_select" name="site_survey_contact_form_verify" id="site_survey_contact_form_verify" <?= $marketing; ?>>
+                                <option <?php if ($row["site_survey_contact_form_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
+                                <option <?php if ($row["site_survey_contact_form_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
+                                <option <?php if ($row["site_survey_contact_form_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
+                                <option <?php if ($row["site_survey_contact_form_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
+                            </select>
+                        </td>
+                        <td style="vertical-align: middle;">附件</td>
+                        <td style="vertical-align: middle;">
+                            <input style="width:70%;display:inline;" type="file" id="site_survey_contact_form_verify_file" name="site_survey_contact_form_verify_file" <?= $marketing; ?>>
+                            <?php
+                            echo !empty($row['site_survey_contact_form_verify_file']) ? "<a id='site_survey_contact_form_verify_file_a' style='color:#00F;' href='" . $row['site_survey_contact_form_verify_file'] . "' target='_blank'>下載附件</a>" : "";
+                            ?>
+                        </td>
+                        <td style="vertical-align: middle">確認時間</td>
+                        <td style="vertical-align: middle"><input class="form-control disabled_select" type="datetime-local" id="site_survey_contact_form_verify_at" name="site_survey_contact_form_verify_at" value="<?= $row['site_survey_contact_form_verify_at']; ?>" readonly></td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select name="site_survey_contact_form_verify_owner" class="disabled_select" id="site_survey_contact_form_verify_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['site_survey_contact_form_verify_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>備註</td>
+                        <td colspan="7">
+                            <textarea class="form-control disabled_select" name="marketing_remark" <?= $marketing; ?>><?php echo $row['marketing_remark']; ?></textarea>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">移交日</td>
+                        <td style="vertical-align: middle">
+                            <div class="input-group">
+                                <input class="form-control disabled_select" type="date" id="delivery_date" name="delivery_date" value="<?= $row['delivery_date']; ?>" <?= $marketing2; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#delivery_date").val("");' <?= $marketing2; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select class="disabled_select" id="delivery_date_owner" name="delivery_date_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['delivery_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="8">
+                            <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>">
+                            <input class="form-control " type="hidden" name="create_at" value="<?= $row["create_at"]; ?>">
+                            <?php
+                            if (checkNowFormYDStatus($link) == 'A' && in_array($user_department_id, [220, 311, 312, 313, 314, 315])) {
+                            ?>
+                                <button onclick="doMarketingAssign()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">
+                                    提交至<?php echo checkUseridIsManager($user_id) ? "設計部門" : "營業主管"; ?>
+                                </button>
+                            <?php
+                            } else if (checkNowFormYDStatus($link) == 'I' && checkUseridIsManager($user_id)) {
+                            ?>
+                                <button onclick="doBackMarketingAssign()" type="button" class="btn btn-danger btn-lg pull-right" style="margin-left:3px;">
+                                    退回營業
+                                </button>
+                                <button onclick="doMarketingAssign()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">
+                                    提交至設計部門
+                                </button>
+                            <?php
+                            }
+                            ?>
+                            <button onclick="savedata()" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;" <?= $marketing2; ?>>存檔</button>
+                            <span class="text-danger pull-right">若無工勘資料請勿移交至設計階段！</span>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        <div id="tabs-2">
+            <table class="table  table-bordered" style="width:100%">
+                <tbody style="font-weight: bolder;margin-bottom: 20px">
+                    <tr>
+                        <th colspan="8">下訂普來特富確認項</th>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">設計規格</td>
+                        <td>
+                            <select class="disabled_select" name="desin_spec_verify" id="desin_spec_verify" <?= $desin; ?>>
+                                <option <?php if ($row["desin_spec_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
+                                <option <?php if ($row["desin_spec_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
+                                <option <?php if ($row["desin_spec_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
+                                <option <?php if ($row["desin_spec_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
+                            </select>
+                        </td>
+                        <td style="vertical-align: middle;">附件</td>
+                        <td style="vertical-align: middle;">
+                            <?php
+                            echo !empty($row['sales_spec_verify_file']) ? "<a id='sales_spec_verify_file_a' style='color:#00F;' href='" . $row['sales_spec_verify_file'] . "' target='_blank'>下載附件</a>" : "";
+                            ?>
+                        </td>
+                        <td style="vertical-align: middle">確認時間</td>
+                        <td style="vertical-align: middle"><input class="form-control " type="datetime-local" id="desin_spec_verify_at" name="desin_spec_verify_at" value="<?= $row['desin_spec_verify_at']; ?>" readonly></td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select name="desin_spec_verify_owner" class="disabled_select" id="desin_spec_verify_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['desin_spec_verify_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">設計計劃圖</td>
+                        <td>
+                            <select name="desin_planning_verify" id="desin_planning_verify" <?= $desin; ?>>
+                                <option <?php if ($row["desin_planning_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
+                                <option <?php if ($row["desin_planning_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
+                                <option <?php if ($row["desin_planning_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
+                                <option <?php if ($row["desin_planning_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
+                            </select>
+                        </td>
+                        <td style="vertical-align: middle;">附件</td>
+                        <td style="vertical-align: middle;">
+                            <?php
+                            // echo !empty($row['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
+                            foreach ($customer_planning_verify_files as $row2) :
+                                echo "<a id='customer_planning_verify_file_a' style='color:#00F;' 
+                                    href='" . $row2['customer_planning_verify_file'] . "' target='_blank'>下載附件_" . $row2['create_at'] . "</a><br/>";
+                            endforeach;
+                            ?>
+                        </td>
+                        <td style="vertical-align: middle"> 確認時間</td>
+                        <td style="vertical-align: middle"><input class="form-control " type="datetime-local" id="desin_planning_verify_at" name="desin_planning_verify_at" value="<?= $row['desin_planning_verify_at']; ?>" readonly></td>
+                        <td style="vertical-align: middle"> 確認人</td>
+                        <td>
+                            <select name="desin_planning_verify_owner" class="disabled_select" id="desin_planning_verify_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['desin_planning_verify_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">設計顏色</td>
+                        <td>
+                            <select name="desin_color_verify" id="desin_color_verify" <?= $desin; ?>>
+                                <option <?php if ($row["desin_color_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
+                                <option <?php if ($row["desin_color_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
+                                <option <?php if ($row["desin_color_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
+                                <option <?php if ($row["desin_color_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
+                            </select>
+                        </td>
+                        <td style="vertical-align: middle;">附件</td>
+                        <td style="vertical-align: middle;">
+                            <?php
+                            echo !empty($row['customer_color_verify_file']) ? "<a id='customer_color_verify_file_a' style='color:#00F;' href='" . $row['customer_color_verify_file'] . "' target='_blank'>下載附件</a>" : "";
+                            ?>
+                        </td>
+                        <td style="vertical-align: middle">確認時間</td>
+                        <td style="vertical-align: middle"><input class="form-control " type="datetime-local" id="desin_color_verify_at" name="desin_color_verify_at" value="<?= $row['desin_color_verify_at']; ?>" readonly></td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select name="desin_color_verify_owner" class="disabled_select" id="desin_color_verify_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['desin_color_verify_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">設計樣式</td>
+                        <td>
+                            <select name="desin_style_verify" id="desin_style_verify" <?= $desin; ?>>
+                                <option <?php if ($row["desin_style_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
+                                <option <?php if ($row["desin_style_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
+                                <option <?php if ($row["desin_style_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
+                                <option <?php if ($row["desin_style_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
+                            </select>
+                        </td>
+                        <td style="vertical-align: middle;">附件</td>
+                        <td style="vertical-align: middle;">
+                            <?php
+                            echo !empty($row['customer_style_verify_file']) ? "<a id='customer_style_verify_file_a' style='color:#00F;' href='" . $row['customer_style_verify_file'] . "' target='_blank'>下載附件</a>" : "";
+                            ?>
+                        </td>
+                        <td style="vertical-align: middle">確認時間</td>
+                        <td style="vertical-align: middle"><input class="form-control " type="datetime-local" id="desin_style_verify_at" name="desin_style_verify_at" value="<?= $row['desin_style_verify_at']; ?>" readonly></td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td style="vertical-align: middle">
+                            <select name="desin_style_verify_owner" class="disabled_select" id="desin_style_verify_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['desin_style_verify_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">備註</td>
+                        <td style="vertical-align: middle" colspan="8">
+                            <textarea class="form-control " name="desin_remark" <?= $desin; ?>><?php echo $row['desin_remark']; ?></textarea>
+                        </td>
+                    <tr>
+                    <tr>
+                        <td style='width:180px;'>追加技術文件</td>
+                        <td>
+                            <input style="width:70%;display:inline;" type="file" id="desin_documents_verify_file" name="desin_documents_verify_file" <?= $desin; ?>>
+                            <?php
+                            echo !empty($row['desin_documents_verify_file']) ? "<a id='desin_documents_verify_file' style='color:#00F;' href='" . $row['desin_documents_verify_file'] . "' target='_blank'>下載附件</a>" : "";
+                            ?>
+                        </td>
+                        <td colspan='6'></td>
+                    </tr>
+                    <tr>
+                        <td colspan="8">
+                            <i>如有複數檔案請放置同個壓縮檔後再上傳</i>
+                        </td>
+                    </tr>
+                    <tr id='taiwan_item_tr'>
+                        <th colspan="7">下訂台灣自製項目</th>
+                        <td>
+                            <button type="button" onclick="addTaiwanItem()" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">+</button>
+                        </td>
+                    </tr>
+                    <?php
+                    if (
+                        !empty($row['desin_taiwan_items_no']) && !empty($row['desin_taiwan_items_name'])
+                        && $row['desin_taiwan_items_no'] !== 'null' && $row['desin_taiwan_items_name'] !== 'null'
+                    ) {
+
+                        $desin_taiwan_items_no_arr = json_decode($row['desin_taiwan_items_no']);
+                        $desin_taiwan_items_name_arr = json_decode($row['desin_taiwan_items_name']);
+                        $taiwan_item_id = count($desin_taiwan_items_no_arr);
+
+                        for ($i = 0; $i < count($desin_taiwan_items_no_arr); $i++) {
+                    ?>
+                            <tr id='taiwan_item_tr_<?php echo $i; ?>'>
+                                <td style='vertical-align: middle;'>
+                                    <label>品目編號</label>
+                                </td>
+                                <td style='vertical-align: middle;'>
+                                    <input type='text' name='desin_taiwan_items_no[]' value='<?php echo $desin_taiwan_items_no_arr[$i] ?>' />
+                                </td>
+                                <td style='vertical-align: middle;'>
+                                    <label>部品名稱</label>
+                                </td>
+                                <td style='vertical-align: middle;'>
+                                    <input type='text' name='desin_taiwan_items_name[]' value='<?php echo $desin_taiwan_items_name_arr[$i] ?>' />
+                                </td>
+                                <td style='vertical-align: middle;'>
+                                    <button class='btn btn-danger' type='button' onclick='removeTaiwanItemTr(<?php echo $i; ?>)'>x</button>
+                                </td>
+                            <tr>
+                        <?php
+                        }
+                    } else {
+                        $taiwan_item_id = 0;
+                    }
+                        ?>
+                            <tr>
+                                <td colspan="8">
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="vertical-align: middle">設計主管</td>
+                                <td>
+                                    <select name="desin_leader_verify" id="desin_leader_verify" <?= $desin_leader; ?>>
+                                        <option <?php if ($row["desin_leader_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
+                                        <option <?php if ($row["desin_leader_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
+                                        <option <?php if ($row["desin_leader_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
+                                    </select>
+                                </td>
+                                <td style="vertical-align: middle;">附件</td>
+                                <td style="vertical-align: middle;">
+                                    <input style="width:70%;display:inline;" type="file" id="desin_leader_verify_file" name="desin_leader_verify_file" <?= $desin_leader; ?>>
+                                    <?php
+                                    echo !empty($row['desin_leader_verify_file']) ? "<a id='desin_leader_verify_file_a' style='color:#00F;' href='" . $row['desin_leader_verify_file'] . "' target='_blank'>下載附件</a>" : "";
+                                    ?>
+                                </td>
+                                <td style="vertical-align: middle">確認時間</td>
+                                <td style="vertical-align: middle"><input class="form-control " type="datetime-local" id="desin_leader_verify_at" name="desin_leader_verify_at" value="<?= $row['desin_leader_verify_at']; ?>" readonly></td>
+                                <td style="vertical-align: middle">確認人</td>
+                                <td>
+                                    <select name="desin_leader_verify_owner" class="disabled_select" id="desin_leader_verify_owner" disabled>
+                                        <option value="">請選擇</option>
+                                        <?php echo getSelectOptionHtml($all_users_options, $row['desin_leader_verify_owner']); ?>
+                                    </select>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="8">
+                                    <i>如有複數檔案請放置同個壓縮檔後再上傳</i>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>備註</td>
+                                <td colspan="7">
+                                    <textarea class="form-control " name="desin_leader_remark" <?= $desin_leader; ?>><?php echo $row['desin_leader_remark']; ?></textarea>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td colspan="8">
+                                    <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>" readonly>
+                                    <input class="form-control " type="hidden" name="create_at" value="<?= $row["create_at"]; ?>" readonly>
+                                    <?php
+                                    if (checkNowFormYDStatus($link) == 'B' && ($user_department_id == 220 || $user_department_id == 911)) {
+                                    ?>
+                                        <button onclick="savedata()" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">存檔</button>
+                                        <button onclick="doDesignLeaderAssign()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">提交至設計主管</button>
+                                        <button onclick="doBackMarketingAssign()" type="button" class="btn btn-danger btn-lg pull-right" style="margin-left:3px;">退回營業</button>
+                                    <?php
+                                    } else if (checkNowFormYDStatus($link) == 'C' && ($user_department_id == 220 || ($user_department_id == 911 && $role_id == 1))) {
+                                    ?>
+                                        <button onclick="savedata()" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">存檔</button>
+                                        <button onclick="doDesignAssign()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">提交至生管</button>
+                                        <button onclick="doBackMarketingAssign()" type="button" class="btn btn-danger btn-lg pull-right" style="margin-left:3px;">退回營業</button>
+                                        <button onclick="doBackDesignAssign()" type="button" class="btn btn-danger btn-lg pull-right" style="margin-left:3px;">退回設計部門</button>
+                                    <?php
+                                    }
+                                    ?>
+                                </td>
+                            </tr>
+                </tbody>
+            </table>
+        </div>
+        <div id="tabs-3">
+            <table class="table  table-bordered" style="width:100%">
+                <tbody style="font-weight: bolder;margin-bottom: 20px">
+                    <tr>
+                        <td style="vertical-align: middle">樓高通報</td>
+                        <td>
+                            <select class="disabled_select" name="building_heigh_verify" id="building_heigh_verify" <?= $warehouse2; ?>>
+                                <option <?php if ($row["building_heigh_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
+                                <option <?php if ($row["building_heigh_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
+                                <option <?php if ($row["building_heigh_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
+                                <option <?php if ($row["building_heigh_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
+                            </select>
+                        </td>
+                        <td style="vertical-align: middle;">附件</td>
+                        <td style="vertical-align: middle;">
+                            <input style="width:70%;display:inline;" type="file" id="building_heigh_verify_file" name="building_heigh_verify_file" <?= $warehouse2; ?>>
+                            <?php
+                            echo !empty($row['building_heigh_verify_file']) ? "<a id='building_heigh_verify_file_a' style='color:#00F;' href='" . $row['building_heigh_verify_file'] . "' target='_blank'>下載附件</a>" : "";
+                            ?>
+                        </td>
+                        <td style="vertical-align: middle">確認時間</td>
+                        <td style="vertical-align: middle"><input class="form-control disabled_select" type="datetime-local" id="building_heigh_verify_at" name="building_heigh_verify_at" value="<?= $row['building_heigh_verify_at']; ?>" readonly></td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select name="building_heigh_verify_owner" class="disabled_select" id="building_heigh_verify_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['building_heigh_verify_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">工勘確認</td>
+                        <td>
+                            <?php
+                            $site_survey_status = array(
+                                "1" => "請選擇",
+                                "0" => "已確認",
+                                "2" => "無工勘需求",
+                                "A" => "未動工",
+                                "B" => "地下室施工",
+                                "C" => "打樁",
+                                "D" => "地基",
+                                "E" => "挖土",
+                                "G" => "機房",
+                                "H" => "機械式淨高",
+                                "M" => "樓中樓",
+                                "OH" => "最高層(頂樓高度)",
+                                "P" => "PIT(機坑深度)",
+                                "R" => "R 樓",
+                                "S" => "停工",
+                                "T" => "TOP",
+                                "TC" => "頂部間隙",
+                                "TS" => "行程",
+                                "TH" => "全高",
+                                "Y" => "已搭、已出",
+                                "YB" => "退購結案",
+                                "YF" => "既有建物",
+                                "YN" => "已搭、未出"
+                            );
+                            for ($i = 1; $i < 200; $i++) {
+                                $site_survey_status[$i . "F"] = $i . "F";
+                            }
+                            ?>
+                            <select class="disabled_select" name="site_survey_contact_verify" id="site_survey_contact_verify" <?= $warehouse2; ?>>
+                                <?php
+                                foreach ($site_survey_status as $key => $val) {
+                                    if ($row["site_survey_contact_verify"] == $key) {
+                                        echo "<option value='$key' selected>$val</option>";
+                                    } else {
+                                        echo "<option value='$key'>$val</option>";
+                                    }
+                                }
+                                ?>
+                            </select>
+                            <input type="hidden" name="old_site_survey_contact_verify" value="<?php echo $row["site_survey_contact_verify"] ?>" <?= $warehouse2; ?> />
+                        </td>
+                        <td style="vertical-align: middle;">附件</td>
+                        <td style="vertical-align: middle;">
+                            <input style="width:70%;display:inline;" type="file" id="site_survey_contact_verify_file" name="site_survey_contact_verify_file" <?= $warehouse2; ?>>
+                            <?php
+                            echo !empty($row['site_survey_contact_verify_file']) ? "<a id='site_survey_contact_verify_file_a' style='color:#00F;' href='" . $row['site_survey_contact_verify_file'] . "' target='_blank'>下載附件</a>" : "";
+                            ?>
+                        </td>
+                        <td style="vertical-align: middle">確認時間</td>
+                        <td style="vertical-align: middle"><input class="form-control disabled_select" type="datetime-local" id="site_survey_contact_verify_at" name="site_survey_contact_verify_at" value="<?= $row['site_survey_contact_verify_at']; ?>" readonly></td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select name="site_survey_contact_verify_owner" class="disabled_select" id="site_survey_contact_verify_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['site_survey_contact_verify_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>備註</td>
+                        <td colspan="7">
+                            <textarea class="form-control" name="warehouse_remark" <?= $warehouse2; ?>><?php echo $row['warehouse_remark']; ?></textarea>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="8">
+                            <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>" readonly>
+                            <input class="form-control " type="hidden" name="create_at" value="<?= $row["create_at"]; ?>" readonly>
+                            <?php
+                            if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545, 220])) {
+                                echo "<button onclick='savedata()' class='btn btn-primary btn-lg pull-right' style='margin-left:3px;'>存檔</button>";
+                                if (checkNowFormGStatus($link) == 'G')
+                                    echo "<button onclick='doWarhouseAssign()' type='button' class='btn btn-primary btn-lg pull-right' style='margin-left:3px;'>提交至生管</button>";
+                            }
+                            ?>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="4">
+                            實際安裝及試車日程
+                            <br />
+                            (項目經理項目)
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <td style="vertical-align: middle">實際安裝開工日</td>
+                        <td style="vertical-align: middle">
+                            <div class="input-group">
+                                <input class="form-control" type="date" id="install_start_date_tmp" value="<?= $row['install_start_date']; ?>" <?= $warehouse2; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#install_start_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select class="disabled_select" id="install_start_date_owner_tmp" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['install_start_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">實際安裝完工日</td>
+                        <td style="vertical-align: middle">
+                            <div class="input-group">
+                                <input class="form-control" type="date" id="install_end_date_tmp" value="<?= $row['install_end_date']; ?>" <?= $warehouse2; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#install_end_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select class="disabled_select" id="install_end_date_owner_tmp" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['install_end_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">實際試車開工日</td>
+                        <td style="vertical-align: middle">
+                            <div class="input-group">
+                                <input class="form-control" type="date" id="tryrun_start_date_tmp" value="<?= $row['tryrun_start_date']; ?>" <?= $warehouse2; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#tryrun_start_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select class="disabled_select" id="tryrun_start_date_owner_tmp" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['tryrun_start_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">實際試車完工日</td>
+                        <td style="vertical-align: middle">
+                            <div class="input-group">
+                                <input class="form-control" type="date" id="tryrun_end_date_tmp" value="<?= $row['tryrun_end_date']; ?>" <?= $warehouse2; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#tryrun_end_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select class="disabled_select" id="tryrun_end_date_owner_tmp" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['tryrun_end_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="4">
+                            <?php
+                            if (saveInstallData($user_department_id, $role_id)) {
+                                echo "<button onclick='saveInstallData()' type='button' class='btn btn-primary btn-lg pull-right' style='margin-left:3px;'>存檔</button>";
+                                echo "<label class='pull-right' for='change_all_contractno_tmp'> 變更此合約全部日期</label>";
+                                echo "<input class='pull-right' type='checkbox' id='change_all_contractno_tmp' value='1' />";
+                            }
+                            ?>
+                        </td>
+                    </tr>
+
+
+                </tbody>
+            </table>
+        </div>
+        <div id="tabs-4">
+            <table class="table  table-bordered" style="width:100%">
+                <tbody style="font-weight: bolder;margin-bottom: 20px">
+                    <th colspan="6">業務部門確認項</th>
+                    <tr>
+                        <td style="vertical-align: middle">已備齊時間 </td>
+                        <td>
+                            <select name="shengguanok_status" id="shengguanok_status" <?= $yewu; ?>>
+                                <option <?php if ($row["shengguanok_status"] == "0") echo " selected"; ?> value="0">已完成</option>
+                                <option <?php if ($row["shengguanok_status"] == "1") echo " selected"; ?> value="1">進行中</option>
+                            </select>
+                        </td>
+                        <td><input class="form-control " type="datetime-local" id="shengguanok_status_at" name="shengguanok_status_at" value="<?= $row['shengguanok_status_at']; ?>" readonly></td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td colspan="2">
+                            <select name="shengguanok_status_owner" class="disabled_select" id="shengguanok_status_owner" class="disabled_select" disabled="disabled">
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['shengguanok_status_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">下單日<br />(下單普來特富)</td>
+                        <td>
+                            <select name="prattford_order_date_verify" id="prattford_order_date_verify" <?= $yewu; ?>>
+                                <option <?php if ($row["prattford_order_date_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
+                                <option <?php if ($row["prattford_order_date_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
+                                <option <?php if ($row["prattford_order_date_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
+                                <option <?php if ($row["prattford_order_date_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
+                            </select>
+                        </td>
+                        <td>
+                            <div class="input-group">
+                                <input class="form-control" type="date" id="prattford_order_date" name="prattford_order_date" value="<?= $row['prattford_order_date']; ?>" <?= $yewu; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#prattford_order_date").val("");' <?= $yewu; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td colspan="2">
+                            <select name="prattford_order_date_owner" class="disabled_select" id="prattford_order_date_owner" class="disabled_select" disabled="disabled">
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['prattford_order_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">預計發貨日<br />(出港日)</td>
+                        <td>
+                            <select name="estimated_shipping_date_verify" id="estimated_shipping_date_verify" <?= $yewu; ?>>
+                                <option <?php if ($row["estimated_shipping_date_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
+                                <option <?php if ($row["estimated_shipping_date_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
+                                <option <?php if ($row["estimated_shipping_date_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
+                                <option <?php if ($row["estimated_shipping_date_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
+                            </select>
+                        </td>
+                        <td>
+                            <div class="input-group">
+                                <input class="form-control" type="date" id="estimated_shipping_date" name="estimated_shipping_date" value="<?= $row['estimated_shipping_date']; ?>" <?= $yewu; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#estimated_shipping_date").val("");' <?= $yewu; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td colspan="2">
+                            <select name="estimated_shipping_date_owner" id="estimated_shipping_date_owner" class="disabled_select" disabled="disabled">
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['estimated_shipping_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">預計到貨日<br />(到觀音廠日)</td>
+                        <td>
+                            <select name="estimated_shipping_schedule_date_verify" id="estimated_shipping_schedule_date_verify" <?= $user_id == 'M0168' ? "" : $yewu; ?>>
+                                <option <?php if ($row["estimated_shipping_schedule_date_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
+                                <option <?php if ($row["estimated_shipping_schedule_date_verify"] == "0") echo " selected"; ?> value="0">已完成</option>
+                                <option <?php if ($row["estimated_shipping_schedule_date_verify"] == "1") echo " selected"; ?> value="1">進行中</option>
+                                <option <?php if ($row["estimated_shipping_schedule_date_verify"] == "2") echo " selected"; ?> value="2">無需求</option>
+                            </select>
+                        </td>
+                        <td>
+                            <div class="input-group">
+                                <input class="form-control" type="date" id="estimated_shipping_schedule_date" name="estimated_shipping_schedule_date" value="<?= $row['estimated_shipping_schedule_date']; ?>" <?= $user_id == 'M0168' ? "" : $yewu; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#estimated_shipping_schedule_date").val("");' <?= $user_id == 'M0168' ? "" : $yewu; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td colspan="2">
+                            <select name="estimated_shipping_schedule_date_owner" id="estimated_shipping_schedule_date_owner" class="disabled_select" disabled="disabled">
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['estimated_shipping_schedule_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">普來特富<br />(發貨類別)</td>
+                        <td>
+                            <select name="goods_type" id="goods_type" <?= $yewu; ?>>
+                                <option <?php if ($row["goods_type"] == "1") echo " selected"; ?> value="1">請選擇</option>
+                                <option <?php if ($row["goods_type"] == "A") echo " selected"; ?> value="A">A:全級發貨</option>
+                                <option <?php if ($row["goods_type"] == "B") echo " selected"; ?> value="B">B:欠件發貨</option>
+                                <option <?php if ($row["goods_type"] == "C") echo " selected"; ?> value="C">C:無發貨需求</option>
+                            </select>
+                        </td>
+                        <td>
+                            <div class="input-group">
+                                <input class="form-control" type="date" id="goods_type_date" name="goods_type_date" value="<?= $row['goods_type_date']; ?>" <?= $yewu; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#goods_type_date").val("");' <?= $yewu; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td colspan="2">
+                            <select name="goods_type_owner" id="goods_type_owner" class="disabled_select" disabled="disabled">
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['goods_type_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">台灣自理項目<br />(發貨類別)</td>
+                        <td>
+                            <select name="taiwan_goods_type" id="taiwan_goods_type" <?= $yewu; ?>>
+                                <option <?php if ($row["taiwan_goods_type"] == "1") echo " selected"; ?> value="1">請選擇</option>
+                                <option <?php if ($row["taiwan_goods_type"] == "A") echo " selected"; ?> value="A">A:全級發貨</option>
+                                <option <?php if ($row["taiwan_goods_type"] == "B") echo " selected"; ?> value="B">B:欠件發貨</option>
+                                <option <?php if ($row["taiwan_goods_type"] == "C") echo " selected"; ?> value="C">C:無發貨需求</option>
+                            </select>
+                        </td>
+                        <td>
+                            <div class="input-group">
+                                <input class="form-control" type="date" id="taiwan_goods_type_date" name="taiwan_goods_type_date" value="<?= $row['taiwan_goods_type_date']; ?>" <?= $yewu; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#taiwan_goods_type_date").val("");' <?= $yewu; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td colspan="2">
+                            <select name="taiwan_goods_type_owner" id="taiwan_goods_type_owner" class="disabled_select" disabled="disabled">
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['taiwan_goods_type_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>備註</td>
+                        <td colspan="5">
+                            <textarea class="form-control " name="yewu_remark" <?= $yewu; ?>><?php echo $row['yewu_remark']; ?></textarea>
+                        </td>
+                    <tr>
+                    <tr>
+                        <td style="vertical-align: middle;">附件</td>
+                        <td colspan="5" style="vertical-align: middle;">
+                            <input style="width:70%;display:inline;" type="file" name="shengguanok_status_file" <?= $yewu; ?>>
+                            <?php
+                            echo !empty($row['shengguanok_status_file']) ? "<a id='shengguanok_status_file_a' style='color:#00F;' href='" . $row['shengguanok_status_file'] . "' target='_blank'>下載附件</a>" : "";
+                            ?>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="5">
+                            <i>如有複數檔案請放置同個壓縮檔後再上傳</i>
+                        </td>
+                        <td colspan="3">
+                            <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>" readonly>
+                            <input class="form-control " type="hidden" name="create_at" value="<?= $row["create_at"]; ?>" readonly>
+                            <?php
+                            if (checkNowFormGStatus($link) == 'Z' && checkNowFormYDStatus($link) == 'Z' && ($user_department_id == 220 || $user_department_id == 321)) {
+                            ?>
+                                <button class="btn btn-primary btn-lg pull-right" type="button" style="margin-left:3px;" disabled>日程已結案</button>
+                            <?php
+                            } else {
+
+                                // 生管 小雯 預計到貨日(到觀音廠日)權限
+                                // if ($user_id == 'M0168') {
+                            ?>
+                                <!-- <button onclick="savedata()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">存檔</button> -->
+                                <?php
+                                // }
+
+
+                                if (($user_department_id == 220 || ($user_department_id == 321 && $role_id !== '5') || $user_id == 'M0060' || $user_id == 'M0168')) {
+                                ?>
+                                    <button onclick="savedata()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">存檔</button>
+                                    <?php
+                                    if (checkNowFormGStatus($link) == 'H' && checkNowFormYDStatus($link) == 'D') {
+                                    ?>
+                                        <button onclick="doShengguanAssign()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">結案</button>
+                                <?php
+                                    }
+                                }
+                            }
+                            if (checkNowFormGStatus($link) == 'H' && ($user_department_id == 220 || ($user_department_id == 321 && $role_id !== '5') || $user_id == 'M0168')) {
+                                ?>
+                                <button onclick="doBackWarhouseAssign()" type="button" class="btn btn-danger btn-lg pull-right" style="margin-left:3px;">退回工務部門</button>
+                            <?php
+                            }
+                            if (checkNowFormYDStatus($link) == 'D' && ($user_department_id == 220 || ($user_department_id == 321 && $role_id !== '5') || $user_id == 'M0168')) {
+                            ?>
+                                <button onclick="doBackMarketingAssign()" type="button" class="btn btn-danger btn-lg pull-right" style="margin-left:3px;">退回營業</button>
+                                <button onclick="doBackDesignAssign()" type="button" class="btn btn-danger btn-lg pull-right" style="margin-left:3px;">退回設計部門</button>
+                            <?php
+                            }
+                            ?>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th colspan="7">生管部門確認項</th>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">實際到貨日<br />(到觀音廠日)</td>
+                        <td>
+                            <select id="arrival_date_verify_tmp" <?= $shengguan2; ?>>
+                                <option <?php if ($row["arrival_date_verify"] == "1") echo " selected"; ?> value="1">請選擇</option>
+                                <option <?php if ($row["arrival_date_verify"] == "A") echo " selected"; ?> value="A">A:皆到貨</option>
+                                <option <?php if ($row["arrival_date_verify"] == "B") echo " selected"; ?> value="B">B:皆欠件</option>
+                                <option <?php if ($row["arrival_date_verify"] == "C") echo " selected"; ?> value="C">C:普來特富欠件</option>
+                                <option <?php if ($row["arrival_date_verify"] == "D") echo " selected"; ?> value="D">D:台灣欠件</option>
+                            </select>
+                        </td>
+                        <td>
+                            <div class="input-group">
+                                <input class="form-control" type="date" id="actual_tofactory_date_tmp" value="<?= $row['actual_tofactory_date']; ?>" <?= $shengguan2; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#actual_tofactory_date_tmp").val("");' <?= $shengguan2; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td colspan="2">
+                            <select id="arrival_date_owner_tmp" class="disabled_select" disabled="disabled">
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['arrival_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>備註</td>
+                        <td colspan="5">
+                            <textarea class="form-control" id="shengguan_remark_tmp" <?= $shengguan2; ?>><?php echo $row['shengguan_remark']; ?></textarea>
+                        </td>
+                    <tr>
+                    <tr>
+                        <td colspan="6">
+                            <button onclick="updateShengguan()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;" <?php echo $shengguan2; ?>>存檔</button>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">預計交期(到工地)</td>
+                        <td>
+                            <input class="form-control" type="date" id="real_contract_arrival_date_tmp" value="<?= $row['real_contract_arrival_date']; ?>" <?php echo in_array($user_id, ['M0013', 'M0060']) ? "" : $shengguan; ?>>
+                        </td>
+                        <td colspan="4">
+                            <?php
+                            if (in_array($user_id, ['M0013', 'M0060'])) {
+                            ?>
+                                <button onclick="updateContractDate()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">出貨日調整</button>
+                            <?php
+                            } else {
+                            ?>
+                                <button onclick="updateContractDate()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;" <?php echo $shengguan; ?>>出貨日調整</button>
+                            <?php
+                            }
+                            ?>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">實際出貨日(到工地)</td>
+                        <td>
+                            <input class="form-control" type="date" id="real_arrival_date_tmp" value="<?= SUBSTR($row['real_arrival_date'], 0, 10); ?>" <?php echo $shengguan2; ?>>
+                        </td>
+                        <td colspan="4">
+                            <button onclick="updateRealArrivalDate()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;" <?php echo $shengguan2; ?>>出貨日調整</button>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        <div id="tabs-5">
+            <table class="table  table-bordered" style="width:100%">
+                <tbody style="font-weight: bolder;margin-bottom: 20px">
+                    <tr>
+                        <td style="vertical-align: middle">QC及官檢類型</td>
+                        <td>
+                            <input type='radio' id="qc_official_type_Q" name='qc_official_type' value='Q' <?= $pinzheng; ?> <?php echo $row['qc_official_type'] == 'Q' ? "checked" : ""; ?> />
+                            <label for='qc_official_type_Q'>只需QC</label>
+                            <input type='radio' id="qc_official_type_O" name='qc_official_type' value='O' <?= $pinzheng; ?> <?php echo $row['qc_official_type'] == 'O' ? "checked" : ""; ?> />
+                            <label for='qc_official_type_O'>只需官檢</label>
+                            <input type='radio' id="qc_official_type_QO" name='qc_official_type' value='QO' <?= $pinzheng; ?> <?php echo $row['qc_official_type'] == 'QO' ? "checked" : ""; ?> />
+                            <label for='qc_official_type_QO'>QC+官檢</label>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">內部QC日</td>
+                        <td style="vertical-align: middle">
+                            <div class="input-group">
+                                <input class="form-control" type="date" id="qc_date" name="qc_date" value="<?= $row['qc_date']; ?>" <?= $pinzheng; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#qc_date").val("");' <?= $pinzheng; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select class="disabled_select" id="qc_date_owner" name="qc_date_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['qc_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">QC合格日</td>
+                        <td style="vertical-align: middle">
+                            <div class="input-group">
+                                <input class="form-control" type="date" id="end_qc_date" name="end_qc_date" value="<?= $row['end_qc_date']; ?>" <?= $pinzheng; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#end_qc_date").val("");' <?= $pinzheng; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select class="disabled_select" id="end_qc_date_owner" name="end_qc_date_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['end_qc_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">官檢日</td>
+                        <td style="vertical-align: middle">
+                            <div class="input-group">
+                                <input class="form-control" type="date" id="official_check_date" name="official_check_date" value="<?= $row['official_check_date']; ?>" <?= $pinzheng; ?>>
+                                <input type="hidden" id="old_official_check_date" name="old_official_check_date" value="<?= $row['official_check_date']; ?>" <?= $pinzheng; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#official_check_date").val("");' <?= $pinzheng; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select class="disabled_select" id="official_check_date_owner" name="official_check_date_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['official_check_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style='width:180px;'>官檢附件</td>
+                        <td>
+                            <input style="width:70%;display:inline;" type="file" id="official_check_file" name="official_check_file" <?= $pinzheng; ?>>
+                            <?php
+                            echo !empty($row['official_check_file']) ? "<a id='official_check_file' style='color:#00F;' href='" . $row['official_check_file'] . "' target='_blank'>下載附件</a>" : "";
+                            ?>
+                        </td>
+                        <td colspan='6'></td>
+                    </tr>
+                    <tr>
+                        <td colspan="8">
+                            <?php
+                            if (in_array($user_department_id, [220, 912]) || $user_id == 'M0164') {
+                                echo "<button onclick='savedata()' type='button' class='btn btn-primary btn-lg pull-right' style='margin-left:3px;'>存檔</button>";
+                            }
+                            ?>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        <div id="tabs-6">
+            <table class="table table-bordered" style="width:100%">
+                <tr>
+                    <td colspan="4">
+                        預計安裝及試車日程
+                        <br />
+                        (工務助理項目)
+                    </td>
+                </tr>
+                <?php
+                if ($user_id == 'M0193') {
+                ?>
+                    <tr>
+                        <td style="vertical-align: middle">QC及官檢類型</td>
+                        <td>
+                            <input type='radio' id="qc_official_type_Q2" name='qc_official_type2' value='Q' <?= $warehouse2; ?> <?php echo $row['qc_official_type'] == 'Q' ? "checked" : ""; ?> />
+                            <label for='qc_official_type_Q2'>只需QC</label>
+                            <input type='radio' id="qc_official_type_O2" name='qc_official_type2' value='O' <?= $warehouse2; ?> <?php echo $row['qc_official_type'] == 'O' ? "checked" : ""; ?> />
+                            <label for='qc_official_type_O2'>只需官檢</label>
+                            <input type='radio' id="qc_official_type_QO2" name='qc_official_type2' value='QO' <?= $warehouse2; ?> <?php echo $row['qc_official_type'] == 'QO' ? "checked" : ""; ?> />
+                            <label for='qc_official_type_QO2'>QC+官檢</label>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">內部QC日</td>
+                        <td style="vertical-align: middle">
+                            <div class="input-group">
+                                <input class="form-control" type="date" id="qc_date2" name="qc_date2" value="<?= $row['qc_date']; ?>" <?= $warehouse2; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#qc_date2").val("");' <?= $warehouse2; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select class="disabled_select" id="qc_date2_owner" name="qc_date2_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['qc_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">QC合格日</td>
+                        <td style="vertical-align: middle">
+                            <div class="input-group">
+                                <input class="form-control" type="date" id="end_qc_date2" name="end_qc_date2" value="<?= $row['end_qc_date']; ?>" <?= $warehouse2; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#end_qc_date2").val("");' <?= $warehouse2; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select class="disabled_select" id="end_qc_date2_owner" name="end_qc_date2_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['end_qc_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">官檢日</td>
+                        <td style="vertical-align: middle">
+                            <div class="input-group">
+                                <input class="form-control" type="date" id="official_check_date2" name="official_check_date2" value="<?= $row['official_check_date']; ?>" <?= $warehouse2; ?>>
+                                <input type="hidden" id="old_official_check_date2" name="old_official_check_date2" value="<?= $row['official_check_date']; ?>" <?= $warehouse2; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#official_check_date2").val("");' <?= $warehouse2; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select class="disabled_select" id="official_check_date2_owner" name="official_check_date2_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['official_check_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">移交日</td>
+                        <td style="vertical-align: middle">
+                            <div class="input-group">
+                                <input class="form-control disabled_select" type="date" id="delivery_date2" name="delivery_date2" value="<?= $row['delivery_date']; ?>" <?= $warehouse2; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#delivery_date2").val("");' <?= $warehouse2; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select class="disabled_select" id="delivery_date2_owner" name="delivery_date2_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['delivery_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                <?php
+                }
+                ?>
+                <tr>
+                    <td style="vertical-align: middle">發包類型</td>
+                    <td>
+                        <input type='radio' class="disabled_select" name='outsourcer_type' id='outsourcer_type_I' value='I' <?php echo $row['outsourcer_type'] == 'I' ? 'checked' : '';
+                                                                                                                            echo $warehouse2; ?> />
+                        <label for='outsourcer_type_I'>安裝</label>
+                        <input type='radio' class="disabled_select" name='outsourcer_type' id='outsourcer_type_T' value='T' <?php echo $row['outsourcer_type'] == 'T' ? 'checked' : '';
+                                                                                                                            echo $warehouse2; ?> />
+                        <label for='outsourcer_type_T'>試車</label>
+                        <input type='radio' class="disabled_select" name='outsourcer_type' id='outsourcer_type_IT' value='IT' <?php echo $row['outsourcer_type'] == 'IT' ? 'checked' : '';
+                                                                                                                                echo $warehouse2; ?> />
+                        <label for='outsourcer_type_IT'>安裝+試車</label>
+                        <?php
+                        if (getSaveEstimateInstallData($user_department_id, $role_id)) {
+                        ?>
+                            <button type='button' class='btn btn-default disabled_select' onclick='setOutSourcerDate();' <?php echo $warehouse2; ?>>帶入日期</button>
+                            <button type='button' class='btn btn-default disabled_select' onclick='resetAllOutSourcerDate();' <?php echo $warehouse2; ?>>清除日期</button>
+                        <?php
+                        }
+                        ?>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle;">合約上傳</td>
+                    <td id="ocfi_td" style="vertical-align: middle;">
+                        <button type="button" onclick="addOutsourcerContractFileItem()" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">+</button>
+                        <input style="width:70%;display:inline;" type="file" id="outsourcer_contract_file_0" name="outsourcer_contract_file[]" multiple>
+                        <button type="button" class="btn btn-danger" id="outsourcer_contract_file_del_0" onclick="delOutsourcerContractFileItem(0)">x</button>
+                        <?php
+                        if (!empty($row['outsourcer_contract_file'])) {
+                            $outsourcer_contract_file_tmp = json_decode($row['outsourcer_contract_file']);
+                            foreach ($outsourcer_contract_file_tmp as $val) {
+                                echo "<br/><a style='color:#00F;' target='_blank' href='" . $val . "'>" . str_replace("public-wipwhole/", "", $val) . "</a>";
+                            }
+                            echo "</br>";
+                        }
+                        ?>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">安裝發包廠商</td>
+                    <td>
+                        <input name="install_outsourcer" id="install_outsourcer" class="form-control disabled_select" type="text" value="<?php echo $row['install_outsourcer']; ?>" <?= $warehouse2; ?> />
+                    </td>
+                    <td style="vertical-align: middle;">確認人</td>
+                    <td>
+                        <select class="disabled_select" id="install_outsourcer_owner" name="install_outsourcer_owner" disabled>
+                            <option value="">請選擇</option>
+                            <?php echo getSelectOptionHtml($all_users_options, $row['install_outsourcer_owner']); ?>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">安裝發包日</td>
+                    <td style="vertical-align: middle">
+                        <div class="input-group">
+                            <input class="form-control disabled_select" type="date" name="install_outsourcer_date" id="install_outsourcer_date" value="<?= $row['install_outsourcer_date']; ?>" <?= $warehouse2; ?>>
+                            <span class="input-group-btn">
+                                <button class="btn btn-default" type='button' onclick='$("#install_outsourcer_date").val("");' <?= $warehouse2; ?>>清除</button>
+                            </span>
+                        </div>
+                    </td>
+                    <td style="vertical-align: middle">確認人</td>
+                    <td>
+                        <select class="disabled_select" id="install_outsourcer_date_owner" name="install_outsourcer_date_owner" disabled>
+                            <option value="">請選擇</option>
+                            <?php echo getSelectOptionHtml($all_users_options, $row['install_outsourcer_date_owner']); ?>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">預計安裝開工日</td>
+                    <td style="vertical-align: middle">
+                        <div class="input-group">
+                            <input class="form-control disabled_select" type="date" name="estimate_install_start_date" id="estimate_install_start_date" value="<?= $row['estimate_install_start_date']; ?>" <?= $warehouse2; ?>>
+                            <span class="input-group-btn">
+                                <button class="btn btn-default" type='button' onclick='$("#estimate_install_start_date").val("");' <?= $warehouse2; ?>>清除</button>
+                            </span>
+                        </div>
+                    </td>
+                    <td style="vertical-align: middle">確認人</td>
+                    <td>
+                        <select class="disabled_select" id="estimate_install_start_date_owner" name="estimate_install_start_date_owner" disabled>
+                            <option value="">請選擇</option>
+                            <?php echo getSelectOptionHtml($all_users_options, $row['estimate_install_start_date_owner']); ?>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">預計安裝完工日</td>
+                    <td style="vertical-align: middle">
+                        <div class="input-group">
+                            <input class="form-control disabled_select" type="date" name="estimate_install_end_date" id="estimate_install_end_date" value="<?= $row['estimate_install_end_date']; ?>" <?= $warehouse2; ?>>
+                            <span class="input-group-btn">
+                                <button class="btn btn-default" type='button' onclick='$("#estimate_install_end_date").val("");' <?= $warehouse2; ?>>清除</button>
+                            </span>
+                        </div>
+                    </td>
+                    <td style="vertical-align: middle">確認人</td>
+                    <td>
+                        <select class="disabled_select" id="estimate_install_end_date_owner" name="estimate_install_end_date_owner" disabled>
+                            <option value="">請選擇</option>
+                            <?php echo getSelectOptionHtml($all_users_options, $row['estimate_install_end_date_owner']); ?>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">試車發包廠商</td>
+                    <td>
+                        <input name="tryrun_outsourcer" id="tryrun_outsourcer" class="form-control disabled_select" type="text" value="<?php echo $row['tryrun_outsourcer']; ?>" <?= $warehouse2; ?> />
+                    </td>
+                    <td style="vertical-align: middle;">確認人</td>
+                    <td>
+                        <select class="disabled_select" id="tryrun_outsourcer_owner" name="tryrun_outsourcer_owner" disabled>
+                            <option value="">請選擇</option>
+                            <?php echo getSelectOptionHtml($all_users_options, $row['tryrun_outsourcer_owner']); ?>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">試車發包日</td>
+                    <td style="vertical-align: middle">
+                        <div class="input-group">
+                            <input class="form-control disabled_select" type="date" name="tryrun_outsourcer_date" id="tryrun_outsourcer_date" value="<?= $row['tryrun_outsourcer_date']; ?>" <?= $warehouse2; ?>>
+                            <span class="input-group-btn">
+                                <button class="btn btn-default" type='button' onclick='$("#tryrun_outsourcer_date").val("");' <?= $warehouse2; ?>>清除</button>
+                            </span>
+                        </div>
+                    </td>
+                    <td style="vertical-align: middle">確認人</td>
+                    <td>
+                        <select class="disabled_select" name="tryrun_outsourcer_date_owner" id="tryrun_outsourcer_date_owner" disabled>
+                            <option value="">請選擇</option>
+                            <?php echo getSelectOptionHtml($all_users_options, $row['tryrun_outsourcer_date_owner']); ?>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">預計試車開工日</td>
+                    <td style="vertical-align: middle">
+                        <div class="input-group">
+                            <input class="form-control disabled_select" type="date" name="estimate_tryrun_start_date" id="estimate_tryrun_start_date" value="<?= $row['estimate_tryrun_start_date']; ?>" <?= $warehouse2; ?>>
+                            <span class="input-group-btn">
+                                <button class="btn btn-default" type='button' onclick='$("#estimate_tryrun_start_date").val("");' <?= $warehouse2; ?>>清除</button>
+                            </span>
+                        </div>
+                    </td>
+                    <td style="vertical-align: middle">確認人</td>
+                    <td>
+                        <select class="disabled_select" id="estimate_tryrun_start_date_owner" name="estimate_tryrun_start_date_owner" disabled>
+                            <option value="">請選擇</option>
+                            <?php echo getSelectOptionHtml($all_users_options, $row['estimate_tryrun_start_date_owner']); ?>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle">預計試車完工日</td>
+                    <td style="vertical-align: middle">
+                        <div class="input-group">
+                            <input class="form-control disabled_select" type="date" name="estimate_tryrun_end_date" id="estimate_tryrun_end_date" value="<?= $row['estimate_tryrun_end_date']; ?>" <?= $warehouse2; ?>>
+                            <span class="input-group-btn">
+                                <button class="btn btn-default" type='button' onclick='$("#estimate_tryrun_end_date").val("");' <?= $warehouse2; ?>>清除</button>
+                            </span>
+                        </div>
+                    </td>
+                    <td style="vertical-align: middle">確認人</td>
+                    <td>
+                        <select class="disabled_select" name="estimate_tryrun_end_date_owner" id="estimate_tryrun_end_date_owner" disabled>
+                            <option value="">請選擇</option>
+                            <?php echo getSelectOptionHtml($all_users_options, $row['estimate_tryrun_end_date_owner']); ?>
+                        </select>
+                    </td>
+                </tr>
+                <?php
+                if ($user_id == 'M0193') {
+                ?>
+                    <tr>
+                        <td style="vertical-align: middle">實際安裝開工日</td>
+                        <td style="vertical-align: middle">
+                            <div class="input-group">
+                                <input class="form-control" type="date" name="install_start_date2" id="install_start_date2" value="<?= $row['install_start_date']; ?>" <?= $warehouse2; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#install_start_date2").val("");' <?= $warehouse2; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select class="disabled_select" name="install_start_date2_owner" id="install_start_date2_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['install_start_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">實際安裝完工日</td>
+                        <td style="vertical-align: middle">
+                            <div class="input-group">
+                                <input class="form-control" type="date" name="install_end_date2" id="install_end_date2" value="<?= $row['install_end_date']; ?>" <?= $warehouse2; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#install_end_date2").val("");' <?= $warehouse2; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select class="disabled_select" name="install_end_date2_owner" id="install_end_date2_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['install_end_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">實際試車開工日</td>
+                        <td style="vertical-align: middle">
+                            <div class="input-group">
+                                <input class="form-control" type="date" name="tryrun_start_date2" id="tryrun_start_date2" value="<?= $row['tryrun_start_date']; ?>" <?= $warehouse2; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#tryrun_start_date2").val("");' <?= $warehouse2; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select class="disabled_select" name="tryrun_start_date2_owner" id="tryrun_start_date2_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['tryrun_start_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">實際試車完工日</td>
+                        <td style="vertical-align: middle">
+                            <div class="input-group">
+                                <input class="form-control" type="date" name="tryrun_end_date2" id="tryrun_end_date2" value="<?= $row['tryrun_end_date']; ?>" <?= $warehouse2; ?>>
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type='button' onclick='$("#tryrun_end_date2").val("");' <?= $warehouse2; ?>>清除</button>
+                                </span>
+                            </div>
+                        </td>
+                        <td style="vertical-align: middle">確認人</td>
+                        <td>
+                            <select class="disabled_select" name="tryrun_end_date2_owner" id="tryrun_end_date2_owner" disabled>
+                                <option value="">請選擇</option>
+                                <?php echo getSelectOptionHtml($all_users_options, $row['tryrun_end_date_owner']); ?>
+                            </select>
+                        </td>
+                    </tr>
+                <?php
+                }
+                ?>
+                <tr>
+                    <td>備註</td>
+                    <td colspan="3">
+                        <textarea class="form-control disabled_select" name="warehouse_assistant_remark" id="warehouse_assistant_remark" <?= $warehouse2; ?>><?php echo $row['warehouse_assistant_remark']; ?></textarea>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle;">安裝圖附件</td>
+                    <td colspan="5" style="vertical-align: middle;">
+                        <input style="width:70%;display:inline;" type="file" name="plan_diagram_file" <?= $warehouse2; ?>>
+                        <?php
+                        echo !empty($row['plan_diagram_file']) ? "<a id='plan_diagram_file_a' style='color:#00F;' href='" . $row['plan_diagram_file'] . "' target='_blank'>下載附件</a>" : "";
+                        ?>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="vertical-align: middle;">完工驗收單附件</td>
+                    <td colspan="5" style="vertical-align: middle;">
+                        <input style="width:70%;display:inline;" type="file" name="completion_acceptance_file" <?= $warehouse2; ?>>
+                        <?php
+                        echo !empty($row['completion_acceptance_file']) ? "<a id='plan_diagram_file_a' style='color:#00F;' href='" . $row['completion_acceptance_file'] . "' target='_blank'>下載附件</a>" : "";
+                        ?>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="4">
+                        <?php
+                        if (getSaveEstimateInstallData($user_department_id, $role_id))
+                            echo "<button type='button' onclick='savedata()' class='btn btn-primary btn-lg pull-right' style='margin-left:3px;'>存檔</button>";
+                        ?>
+                    </td>
+                </tr>
+            </table>
+        </div>
+    </div>
+</form>
+<form method="post" id="assign_form" enctype="multipart/form-data">
+    <input type="hidden" name='form_name' value="assign_form" />
+    <input type="hidden" name='id' value="<?php echo $id; ?>" />
+</form>
+<form method="post" id="back_marketing_assign_form" enctype="multipart/form-data">
+    <input type="hidden" name='salesid' value="<?php echo $row['salesid']; ?>" />
+    <input type="hidden" name='form_name' value="back_marketing_assign_form" />
+    <input type="hidden" name='id' value="<?php echo $id; ?>" />
+</form>
+<form method="post" id="back_design_assign_form" enctype="multipart/form-data">
+    <input type="hidden" name='form_name' value="back_design_assign_form" />
+    <input type="hidden" name='id' value="<?php echo $id; ?>" />
+</form>
+<form method="post" id="warehouse_assign_form" enctype="multipart/form-data">
+    <input type="hidden" name='form_name' value="warehouse_assign_form" />
+    <input type="hidden" name='id' value="<?php echo $id; ?>" />
+</form>
+<form method="post" id="update_contract_date_form" enctype="multipart/form-data">
+    <input type="hidden" name="contract_type" value="<?= $row["contract_type"]; ?>">
+    <input type="hidden" name="contractno" value="<?= $row["contractno"]; ?>">
+    <input type="hidden" name="facilityno" value="<?= $row["facilityno"]; ?>">
+    <input type="hidden" name="custom" value="<?= $row["custom"]; ?>">
+    <input type="hidden" name="creater" value="<?= $user_id; ?>">
+    <input type="hidden" name="create_at" value="<?= $row["create_at"]; ?>">
+    <input type="hidden" name='salesid' value="<?php echo $row['salesid']; ?>" />
+    <input type="hidden" name='gongWuokid' value="<?php echo getGongWuokNo($link); ?>" />
+    <input type="hidden" id='old_real_contract_arrival_date' name='old_real_contract_arrival_date' value="<?= $row['real_contract_arrival_date']; ?>" />
+    <input type="hidden" id='real_contract_arrival_date' name='real_contract_arrival_date' value="<?= $row['real_contract_arrival_date']; ?>" />
+    <input type="hidden" name='form_name' value="update_contract_date_form" />
+</form>
+<form method="post" id="update_date_form" enctype="multipart/form-data">
+    <input type="hidden" id="real_arrival_date" name='real_arrival_date' value="<?php echo $row['real_arrival_date']; ?>" />
+    <input type="hidden" name='form_name' value="update_date_form" />
+</form>
+
+<form method="post" id="update_install_date_form" enctype="multipart/form-data">
+    <input type="hidden" id="change_all_contractno" name='change_all_contractno' value="0" />
+    <input type="hidden" id="contractno2" name='contractno2' value="<?php echo $row['contractno']; ?>" />
+    <input type="hidden" id="install_start_date" name='install_start_date' value="<?php echo $row['install_start_date']; ?>" />
+    <input type="hidden" id="install_start_date_owner" name='install_start_date_owner' value="<?php echo $row['install_start_date_owner']; ?>" />
+    <input type="hidden" id="install_end_date" name='install_end_date' value="<?php echo $row['install_end_date']; ?>" />
+    <input type="hidden" id="install_end_date_owner" name='install_end_date_owner' value="<?php echo $row['install_end_date_owner']; ?>" />
+    <input type="hidden" id="tryrun_start_date" name='tryrun_start_date' value="<?php echo $row['tryrun_start_date']; ?>" />
+    <input type="hidden" id="tryrun_start_date_owner" name='tryrun_start_date_owner' value="<?php echo $row['tryrun_start_date_owner']; ?>" />
+    <input type="hidden" id="tryrun_end_date" name='tryrun_end_date' value="<?php echo $row['tryrun_end_date']; ?>" />
+    <input type="hidden" id="tryrun_end_date_owner" name='tryrun_end_date_owner' value="<?php echo $row['tryrun_end_date_owner']; ?>" />
+    <input type="hidden" name='form_name' value="update_install_date_form" />
+</form>
+<form method="post" id="update_shengguan_form" enctype="multipart/form-data">
+    <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>">
+    <input type="hidden" id="arrival_date_verify" name='arrival_date_verify' value="<?php echo $row['arrival_date_verify']; ?>" />
+    <input type="hidden" id="actual_tofactory_date" name='actual_tofactory_date' value="<?php echo $row['actual_tofactory_date']; ?>" />
+    <input type="hidden" id="arrival_date_owner" name='arrival_date_owner' value="<?php echo $row['arrival_date_owner']; ?>" />
+    <input type="hidden" id="shengguan_remark" name='shengguan_remark' value="<?php echo $row['shengguan_remark']; ?>" />
+    <input type="hidden" name='form_name' value="update_shengguan_form" />
+</form>
+
+<link rel="stylesheet" href="css\jquery-ui.css">
+<script src="js\jquery-1.9.1.js"></script>
+<script src="js\jquery-ui.js"></script>
+<link href="css\select2.min.css" rel="stylesheet" />
+<script src="js\select2.min.js"></script>
+
+<!-- <link rel="stylesheet" href="//code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css"> -->
+<!-- <script src="//code.jquery.com/jquery-1.9.1.js"></script> -->
+<!-- <script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script> -->
+<!-- <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /> -->
+<!-- <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script> -->
+
+<script type="text/javascript">
+    // 台灣自製件id
+    var taiwan_item_id = <?php echo empty($taiwan_item_id) ? 0 : $taiwan_item_id; ?>;
+    $(document).ready(function() {
+        $('#site_survey_contact_verify').select2();
+        checkCustomerPlanningVerifyFileKeyinStatus();
+        checkDeliveryDateKeyinStatus();
+    });
+
+    function checkCustomerPlanningVerifyFileKeyinStatus() {
+        checkCustomerPlanningVerifyFileDisabled();
+        $("#real_custom_name").keyup(function() {
+            checkCustomerPlanningVerifyFileDisabled();
+        });
+    }
+
+    function checkCustomerPlanningVerifyFileDisabled() {
+        if ($("#real_custom_name").val() !== "") {
+            $("#customer_planning_verify_file").prop("disabled", false);
+        } else {
+            $("#customer_planning_verify_file").prop("disabled", true);
+        }
+    }
+
+    function checkDeliveryDateKeyinStatus() {
+        $("#delivery_date").prop("disabled", true);
+        if ($("#end_qc_date").val() !== "") {
+            $("#delivery_date").prop("disabled", false);
+        }
+        if ($("#official_check_date").val() !== "") {
+            $("#delivery_date").prop("disabled", false);
+        }
+    }
+    $(function() {
+        $("title").text("合約號:<?php echo $row["contractno"]; ?>作番號:<?php echo $row["facilityno"]; ?>");
+        var tab = $('#tab').val();
+        $("#tabs").tabs({
+            active: tab
+        });
+
+        var catchTime_input_arr = [
+            "sales_spec_verify",
+            "customer_planning_verify",
+            "customer_color_verify",
+            "customer_style_verify",
+            "site_survey_contact_form_verify",
+            "desin_spec_verify",
+            "desin_planning_verify",
+            "desin_color_verify",
+            "desin_style_verify",
+            "desin_leader_verify",
+            "building_heigh_verify",
+            "site_survey_contact_verify",
+            "shengguanok_status",
+            'qc_date',
+            'end_qc_date',
+            'official_check_date',
+            'qc_date2',
+            'end_qc_date2',
+            'official_check_date2',
+            'delivery_date',
+            'delivery_date2',
+            'install_start_date2',
+            'install_end_date2',
+            'tryrun_start_date2',
+            'tryrun_end_date2',
+        ]
+        for (var i = 0; i < catchTime_input_arr.length; i++) {
+            inputChangeCatchTime(catchTime_input_arr[i]);
+        }
+
+        $("#prattford_order_date_verify,#prattford_order_date").on("change", function() {
+            $("#prattford_order_date_owner").val("<?php echo $user_id; ?>");
+        });
+        $("#estimated_shipping_date_verify,#estimated_shipping_date").on("change", function() {
+            $("#estimated_shipping_date_owner").val("<?php echo $user_id; ?>");
+        });
+        $("#estimated_shipping_schedule_date_verify,#estimated_shipping_schedule_date").on("change", function() {
+            $("#estimated_shipping_schedule_date_owner").val("<?php echo $user_id; ?>");
+        });
+        $("#goods_type,#goods_type_date").on("change", function() {
+            $("#goods_type_owner").val("<?php echo $user_id; ?>");
+        });
+        $("#taiwan_goods_type,#taiwan_goods_type_date").on("change", function() {
+            $("#taiwan_goods_type_owner").val("<?php echo $user_id; ?>");
+        });
+        $("#arrival_date_verify_tmp,#actual_tofactory_date_tmp").on("change", function() {
+            $("#arrival_date_owner_tmp").val("<?php echo $user_id; ?>");
+        });
+
+        var oursourcer_input_arr = [
+            'install_start_date',
+            'install_end_date',
+            'tryrun_start_date',
+            'tryrun_end_date',
+        ]
+        for (var i = 0; i < oursourcer_input_arr.length; i++) {
+            inputChangeOutsourcer(oursourcer_input_arr[i]);
+        }
+
+        var oursourcer_input_arr = [
+            'install_outsourcer',
+            'install_outsourcer_date',
+            'tryrun_outsourcer',
+            'tryrun_outsourcer_date',
+            'estimate_install_outsourcer',
+            'estimate_install_start_date',
+            'estimate_install_end_date',
+            'estimate_tryrun_outsourcer',
+            'estimate_tryrun_start_date',
+            'estimate_tryrun_end_date',
+        ]
+        for (var i = 0; i < oursourcer_input_arr.length; i++) {
+            inputChangeOutsourcer2(oursourcer_input_arr[i]);
+        }
+
+    });
+
+    function inputChangeCatchTime(input_name) {
+        $("#" + input_name + ",#" + input_name + "_file").on("change", function() {
+            $("#" + input_name + "_at").val(formatDate());
+            $("#" + input_name + "_owner").val("<?php echo $user_id; ?>");
+        });
+    }
+
+    function inputChangeOutsourcer(input_name) {
+        $("#" + input_name + "_tmp").on("change", function() {
+            $("#" + input_name + "_owner_tmp").val("<?php echo $user_id; ?>");
+        });
+    }
+
+    function inputChangeOutsourcer2(input_name) {
+        $("#" + input_name).on("change", function() {
+            $("#" + input_name + "_owner").val("<?php echo $user_id; ?>");
+        });
+    }
+
+    function formatDate() {
+        var timestamp = Date.now();
+        var date = new Date(timestamp);
+        var year = date.getFullYear().toString().padStart(4, '0');
+        var month = (date.getMonth() + 1).toString().padStart(2, '0');
+        var day = date.getDate().toString().padStart(2, '0');
+        var hours = date.getHours().toString().padStart(2, '0');
+        var minutes = date.getMinutes().toString().padStart(2, '0');
+        var seconds = date.getSeconds().toString().padStart(2, '0');
+        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    }
+
+    function savedata() {
+        $(".disabled_select").prop("disabled", false);
+        $('#form').submit();
+    }
+
+    function doMarketingAssign() {
+        if (confirm('確定要送出表單嗎?表單送出後即會進入下一階段') == true) {
+            if (getDoMarketingAssignStatus() == 2) {
+                alert("部分確認欄位還未選擇 `已完成` 或 `無需求`");
+            } else if (getDoMarketingAssignStatus() == 3) {
+                alert("部分確認欄位未上傳相關檔案");
+            } else {
+                $('#assign_form').submit();
+            }
+        }
+    }
+
+    function getDoMarketingAssignStatus() {
+        if ($("#sales_spec_verify").val() == '1')
+            return 2;
+        if ($("#customer_planning_verify").val() == '1')
+            return 2;
+        if ($("#customer_style_verify").val() == '1')
+            return 2;
+        if ($("#customer_color_verify").val() == '1')
+            return 2;
+        if ($("#site_survey_contact_form_verify").val() == '1')
+            return 2;
+        if ($("#sales_spec_verify").val() == '0' && !$('#sales_spec_verify_file_a').length)
+            return 3;
+        if ($("#customer_planning_verify").val() == '0' && !$('#customer_planning_verify_file_a').length)
+            return 3;
+        if ($("#customer_style_verify").val() == '0' && !$('#customer_style_verify_file_a').length)
+            return 3;
+        if ($("#customer_color_verify").val() == '0' && !$('#customer_color_verify_file_a').length)
+            return 3;
+        if ($("#site_survey_contact_form_verify").val() == '0' && !$('#site_survey_contact_form_verify_file_a').length)
+            return 3;
+        return 1;
+    }
+
+    function doDesignAssign() {
+        if (confirm('確定要送出表單嗎?表單送出後即會進入下一階段') == true) {
+            if (!getDoDesignAssignStatus()) {
+                alert("部分確認欄位還未選擇 `已完成` 或 `無需求`");
+            } else {
+                $('#assign_form').submit();
+            }
+        }
+    }
+
+    function getDoDesignAssignStatus() {
+        if ($("#desin_leader_verify").val() == '0')
+            return true;
+        if ($("#desin_leader_verify").val() == '2')
+            return true;
+        return false;
+    }
+
+    function doDesignLeaderAssign() {
+        if (confirm('確定要送出表單嗎?表單送出後即會進入下一階段') == true) {
+            if (!getDoDesignLeaderAssignStatus()) {
+                alert("部分確認欄位還未選擇 `已完成` 或 `無需求`");
+            } else {
+                $('#assign_form').submit();
+            }
+        }
+    }
+
+    function getDoDesignLeaderAssignStatus() {
+        if ($("#desin_spec_verify").val() == '1')
+            return false;
+        if ($("#desin_planning_verify").val() == '1')
+            return false;
+        if ($("#desin_color_verify").val() == '1')
+            return false;
+        if ($("#desin_style_verify").val() == '1')
+            return false;
+        return true;
+    }
+
+    function doWarhouseAssign() {
+        if (confirm('確定要送出表單嗎?表單送出後即會進入下一階段') == true) {
+            if (!getdoWarhouseAssignStatus()) {
+                alert("部分確認欄位還未選擇 `已完成` 或 `無需求`");
+            } else {
+                $('#assign_form').submit();
+            }
+        }
+    }
+
+    function getdoWarhouseAssignStatus() {
+        if ($("#building_heigh_verify").val() == '1')
+            return false;
+        if ($("#site_survey_contact_verify").val() == '1')
+            return false;
+        return true;
+    }
+
+    function doShengguanAssign() {
+        var doShengguanAssignStatus = {
+            '2': '已備齊時間還在進行中',
+            '3': '下單日未選擇或還在進行中',
+            '4': '預計發貨日未選擇或還在進行中',
+            '5': '預計船期未選擇或還在進行中',
+            '6': '普來特富(發貨類別)並非全級發貨',
+            '7': '台灣自理項目(發貨類別)並非全級發貨',
+            '8': '實際到貨日並非皆到貨'
+        }
+        if (confirm('確定要送出表單嗎?表單送出後此作番大日程會進入結案狀態')) {
+            if (getdoShengguanAssignStatus() == '1') {
+                $('#assign_form').submit();
+            } else {
+                alert(doShengguanAssignStatus[getdoShengguanAssignStatus()]);
+            }
+        }
+    }
+
+
+    function getdoShengguanAssignStatus() {
+        if ($("#goods_type").val() !== 'A' && $("#goods_type").val() !== 'C')
+            return '6';
+        if ($("#taiwan_goods_type").val() !== 'A' && $("#taiwan_goods_type").val() !== 'C')
+            return '7';
+        // if ($("#arrival_date_verify").val() !== 'A')
+        //     return '8';
+        if ($("#shengguanok_status").val() == '1')
+            return '2';
+        if ($("#prattford_order_date_verify").val() == '1')
+            return '3';
+        if ($("#estimated_shipping_date_verify").val() == '1')
+            return '4';
+        if ($("#estimated_shipping_schedule_date_verify").val() == '1')
+            return '5';
+        return '1';
+    }
+
+    function doBackMarketingAssign() {
+        $('#back_marketing_assign_form').submit();
+    }
+
+    function doBackDesignAssign() {
+        $('#back_design_assign_form').submit();
+    }
+
+    function doBackWarhouseAssign() {
+        $('#warehouse_assign_form').submit();
+    }
+
+    function addTaiwanItem() {
+        var str = "<tr id='taiwan_item_tr_" + taiwan_item_id + "'>";
+        str += "<td style='vertical-align: middle;'>";
+        str += "    <label>品目編號</label>";
+        str += "</td>";
+        str += "<td style='vertical-align: middle;'>";
+        str += "    <input type='text' name='desin_taiwan_items_no[]' />";
+        str += "</td>";
+        str += "<td style='vertical-align: middle;'>";
+        str += "    <label>部品名稱</label>";
+        str += "</td>";
+        str += "<td style='vertical-align: middle;'>";
+        str += "    <input type='text' name='desin_taiwan_items_name[]' />";
+        str += "</td>";
+        str += "<td style='vertical-align: middle;'>";
+        str += "    <button class='btn btn-danger' type='button' onclick='removeTaiwanItemTr(" + taiwan_item_id + ")'>x</button>";
+        str += "</td>";
+        str += "<tr>";
+        $("#taiwan_item_tr").after(str);
+    }
+
+    function removeTaiwanItemTr(taiwan_item_id) {
+        $("#taiwan_item_tr_" + taiwan_item_id).remove();
+    }
+
+    function updateContractDate() {
+        if (confirm('確定要更改日期嗎?') == true) {
+            var estimated_shipping_schedule_date = $("#estimated_shipping_schedule_date").val();
+            var real_contract_arrival_date = $("#real_contract_arrival_date_tmp").val();
+            if (real_contract_arrival_date < estimated_shipping_schedule_date) {
+                alert("日期不可以比預計到貨日(到觀音日)早");
+            } else {
+                $("#real_contract_arrival_date").val($("#real_contract_arrival_date_tmp").val());
+                $('#update_contract_date_form').submit();
+            }
+        }
+    }
+
+    function updateRealArrivalDate() {
+        if (confirm('確定要更改實際出貨日嗎?') == true) {
+            $("#real_arrival_date").val($("#real_arrival_date_tmp").val());
+            $('#update_date_form').submit();
+        }
+    }
+
+    function updateShengguan() {
+        if (confirm('確定要存檔嗎?') == true) {
+            $("#arrival_date_verify").val($("#arrival_date_verify_tmp").val());
+            $("#actual_tofactory_date").val($("#actual_tofactory_date_tmp").val());
+            $("#arrival_date_owner").val($("#arrival_date_owner_tmp").val());
+            $("#shengguan_remark").val($("#shengguan_remark_tmp").val());
+            $('#update_shengguan_form').submit();
+        }
+    }
+
+    function saveInstallData() {
+        if (confirm('確定要更改實際安裝日程嗎?') == true) {
+            if ($("#change_all_contractno_tmp").prop('checked')) {
+                if ($("#contractno").val() == '' || $("#contractno").val() == null) {
+                    alert("合約號空白");
+                } else {
+                    $("#change_all_contractno").val($("#change_all_contractno_tmp").prop('checked'));
+                    $("#contractno2").val($("#contractno").val());
+                    $("#install_start_date").val($("#install_start_date_tmp").val());
+                    $("#install_start_date_owner").val($("#install_start_date_owner_tmp").val());
+                    $("#install_end_date").val($("#install_end_date_tmp").val());
+                    $("#install_end_date_owner").val($("#install_end_date_owner_tmp").val());
+                    $("#tryrun_start_date").val($("#tryrun_start_date_tmp").val());
+                    $("#tryrun_start_date_owner").val($("#tryrun_start_date_owner_tmp").val());
+                    $("#tryrun_end_date").val($("#tryrun_end_date_tmp").val());
+                    $("#tryrun_end_date_owner").val($("#tryrun_end_date_owner_tmp").val());
+                    $('#update_install_date_form').submit();
+                }
+            } else {
+                $("#install_start_date").val($("#install_start_date_tmp").val());
+                $("#install_start_date_owner").val($("#install_start_date_owner_tmp").val());
+                $("#install_end_date").val($("#install_end_date_tmp").val());
+                $("#install_end_date_owner").val($("#install_end_date_owner_tmp").val());
+                $("#tryrun_start_date").val($("#tryrun_start_date_tmp").val());
+                $("#tryrun_start_date_owner").val($("#tryrun_start_date_owner_tmp").val());
+                $("#tryrun_end_date").val($("#tryrun_end_date_tmp").val());
+                $("#tryrun_end_date_owner").val($("#tryrun_end_date_owner_tmp").val());
+                $('#update_install_date_form').submit();
+            }
+        }
+    }
+
+    function setOutSourcerDate() {
+
+        // 發包類型
+        let outsourcer_type = $("input[name^='outsourcer_type']:checked").val();
+        // 預計出貨日(到工地)
+        let real_contract_arrival_date = $("#real_contract_arrival_date").val();
+        // 樓停
+        let numberofstop = $("#numberofstop").val();
+        // 目前操作者
+        let user_id = '<?php echo $user_id; ?>';
+
+        if (getSetOutSourcerDateStatus() == '1') {
+            if (outsourcer_type === 'I') {
+                resetTOutSourcerDate();
+                $("#estimate_install_start_date").val(dateAddDays(real_contract_arrival_date, 5));
+                $("#estimate_install_start_date_owner").val(user_id);
+                $("#estimate_install_end_date").val(
+                    dateAddDays($("#estimate_install_start_date").val(), specificationDayFormula(numberofstop))
+                );
+                $("#estimate_install_end_date_owner").val(user_id);
+            }
+            if (outsourcer_type === 'T') {
+                resetIOutSourcerDate();
+                $("#estimate_tryrun_start_date").val(dateAddDays(real_contract_arrival_date, 5));
+                $("#estimate_tryrun_start_date_owner").val(user_id);
+                $("#estimate_tryrun_end_date").val(
+                    dateAddDays($("#estimate_tryrun_start_date").val(), specificationDayFormula(numberofstop))
+                );
+                $("#estimate_tryrun_end_date_owner").val(user_id);
+            }
+            if (outsourcer_type === 'IT') {
+                $("#estimate_install_start_date").val(dateAddDays(real_contract_arrival_date, 5));
+                $("#estimate_install_start_date_owner").val(user_id);
+                $("#estimate_install_end_date").val(
+                    dateAddDays($("#estimate_install_start_date").val(), specificationDayFormula(numberofstop))
+                );
+                $("#estimate_install_end_date_owner").val(user_id);
+                $("#estimate_tryrun_start_date").val(dateAddDays($("#estimate_install_end_date").val(), 1));
+                $("#estimate_tryrun_start_date_owner").val(user_id);
+                $("#estimate_tryrun_end_date").val(
+                    dateAddDays($("#estimate_tryrun_start_date").val(), specificationDayFormula(numberofstop))
+                );
+                $("#estimate_tryrun_end_date_owner").val(user_id);
+            }
+        } else {
+            const errrMessage = {
+                '2': '請選擇發包種類',
+                '3': '樓停未填寫',
+                '4': '預計交期(到工地)未填寫'
+            }
+            if ((errrMessage[getSetOutSourcerDateStatus()] !== 'undefined')) {
+                alert(errrMessage[getSetOutSourcerDateStatus()]);
+            } else {
+                alert("不明錯誤");
+            }
+
+        }
+
+    }
+
+    function getSetOutSourcerDateStatus() {
+        let outsourcer_type = $("input[name^='outsourcer_type']:checked").val();
+        let real_contract_arrival_date = $("#real_contract_arrival_date").val();
+        let numberofstop = $("#numberofstop").val();
+        let user_id = '<?php echo $user_id; ?>';
+
+        if (typeof outsourcer_type == 'undefined')
+            return 2;
+        if (typeof numberofstop == 'undefined')
+            return 3;
+        if (numberofstop == 0 || numberofstop == '' || numberofstop == '0')
+            return 3;
+        if (typeof real_contract_arrival_date == 'undefined')
+            return 4;
+        if (real_contract_arrival_date == 0 || real_contract_arrival_date == '' || real_contract_arrival_date == '0')
+            return 4;
+        return 1;
+
+    }
+
+    function resetIOutSourcerDate() {
+        $("#estimate_install_start_date").val("");
+        $("#estimate_install_end_date").val("");
+    }
+
+    function resetTOutSourcerDate() {
+        $("#estimate_tryrun_start_date").val("");
+        $("#estimate_tryrun_end_date").val("");
+    }
+
+
+    function resetAllOutSourcerDate() {
+        resetIOutSourcerDate();
+        resetTOutSourcerDate();
+    }
+
+    function specificationDayFormula(numberofstop) {
+        if (numberofstop > 0 && numberofstop <= 7)
+            return 7;
+        if (numberofstop > 7 && numberofstop < 14)
+            return numberofstop;
+        if (numberofstop >= 14)
+            return 14;
+        return 0
+    }
+
+    function dateAddDays(dateString, daysToAdd = 0) {
+        daysToAdd = Number(daysToAdd);
+        // 將日期字串轉換為日期物件
+        var initialDate = new Date(dateString);
+        // 增加指定天數
+        initialDate.setDate(initialDate.getDate() + daysToAdd);
+
+        // 將結果轉換為所需的日期格式（例如：yyyy-mm-dd）
+        var year = initialDate.getFullYear();
+        var month = String(initialDate.getMonth() + 1).padStart(2, "0"); // 月份從0開始，需要加1
+        var day = String(initialDate.getDate()).padStart(2, "0");
+        var resultDateString = year + "-" + month + "-" + day;
+
+        return resultDateString;
+    }
+
+    var ocfi_id = 0;
+
+    function addOutsourcerContractFileItem() {
+        ocfi_id++;
+        let html = "<input style='width:70%;display:inline;' type='file' id='outsourcer_contract_file_" + ocfi_id + "' name='outsourcer_contract_file[]' multiple>";
+        html += "<button type='button' class='btn btn-danger' id='outsourcer_contract_file_del_" + ocfi_id + "' onclick='delOutsourcerContractFileItem(" + ocfi_id + ")'>x</button>";
+        $("#ocfi_td").append(html);
+    }
+
+    function delOutsourcerContractFileItem(id) {
+        $("#outsourcer_contract_file_del_" + id).remove();
+        $("#outsourcer_contract_file_" + id).remove();
+    }
 </script>
\ No newline at end of file
diff --git a/wms/wipwhole-rec-invoice.php b/wms/wipwhole-rec-invoice.php
index b2a4c852..ad265504 100644
--- a/wms/wipwhole-rec-invoice.php
+++ b/wms/wipwhole-rec-invoice.php
@@ -1,877 +1,878 @@
-<?php
-
-/**
- * 流程規則:(新梯)
- * 1.A:營業員確認中  B:設計部門人員確認中 C:生管主管確認中 Z:生管確認完成        
- * 2.G:工務主管確認中 H:生管主管確認中 Z:工務主管確認完成        
- * 
- *  新梯        543 筆  (已匯入)
- *  舊改        141 筆  (資料未洗入)
- *  已簽回      684 筆 (共計)
- */
-
-
-// error_reporting(0);
-include "header.php";
-
-// 載入db.php來連結資料庫
-require_once "database.php";
-
-
-// 所屬部門
-$sql = "select department_id from account where accountid = '$user_id'";
-$res = mysqli_query($link, $sql);
-$row = mysqli_fetch_row($res);
-$department_id = $row[0];
-mysqli_free_result($res);
-// 生管及資訊才可以訪問
-if ($department_id == "321" || $department_id == "220") {
-
-    /**
-     * 檢查作番是否重複 true:重複 false:沒重複
-     * @param mysqli $link 資料庫連線檔
-     * @param string $facilityno 檢查的作番號
-     */
-    function checkFacilitynoRepeat($link, $facilityno)
-    {
-        $sql = "
-            SELECT 
-                COUNT(*) 
-            FROM wipwholestatus
-            WHERE facilityno = '$facilityno'
-        ";
-        $result = mysqli_query($link, $sql);
-        $row = mysqli_fetch_array($result);
-        return $row['0'] > 0 ? true : false;
-    }
-
-    // 預設新梯代碼 A
-    $contract_type = '';
-    // 合約號
-    $contractno = '';
-    // 營業員ID
-    $salesid = '';
-    // 工務人員ID
-    $warehouseid = '';
-    // 客戶姓名
-    $custom = '';
-    // 工地負責人
-    $site_manager = '';
-    // 客戶id
-    $accountid = '';
-    // 作番號
-    $facilityno = '';
-    // 號機
-    $facility_temp_no = '';
-    // 緯度
-    $latitude = '';
-    // 經度
-    $longitude = '';
-    // 載重
-    $weight = '';
-    // 人乘
-    $numberofpassenger = '';
-    // 樓停
-    $numberofstop = '';
-    // 樓層
-    $numberoffloor = '';
-    // 開門方式
-    $opentype = '';
-    // 速度
-    $speed = '';
-    // 機型
-    $facility_kind = '';
-    // 地址
-    $address = '';
-    // 合約到貨日
-    $contract_arrival_date = '';
-    // 實際到貨日
-    $real_contract_arrival_date = '';
-
-    // 營業規格確認
-    $sales_spec_verify = '';
-    // 營業規格附件
-    $sales_spec_verify_file = '';
-    // 營業規格確認時間	
-    $sales_spec_verify_at = '';
-    // 營業規格確認人
-    $sales_spec_verify_owner = '';
-
-    // 客戶計劃圖確認
-    $customer_planning_verify = '';
-    // 客戶計劃圖附件	
-    $customer_planning_verify_file = '';
-    // 客戶計劃圖確認時間
-    $customer_planning_verify_at = '';
-    // 客戶計劃圖確認人
-    $customer_planning_verify_owner = '';
-
-    // 客戶顏色確認
-    $customer_color_verify = '';
-    // 客戶顏色附件	
-    $customer_color_verify_file = '';
-    // 客戶顏色確認時間    
-    $customer_color_verify_at = '';
-    // 客戶顏色確認人
-    $customer_color_verify_owner = '';
-
-    // 工勘聯絡表
-    $site_survey_contact_form_verify = '';
-    // 工勘聯絡表附件
-    $site_survey_contact_form_verify_file = '';
-    // 工勘聯絡表確認時間
-    $site_survey_contact_form_verify_at = '';
-    // 工勘聯絡表確認人	
-    $site_survey_contact_form_verify_owner = '';
-
-    // 設計規格確認
-    $desin_spec_verify = '';
-    // 設計規格確認附件    
-    $desin_spec_verify_file = '';
-    // 設計規格確認時間
-    $desin_spec_verify_at = '';
-    // 設計規格確認確認人
-    $desin_spec_verify_owner = '';
-
-    // 設計計劃圖確認
-    $desin_planning_verify = '';
-    // 設計計劃圖確認附件	    
-    $desin_planning_verify_file = '';
-    // 設計計劃圖確認時間	     
-    $desin_planning_verify_at = '';
-    // 設計計劃圖確認人	
-    $desin_planning_verify_owner = '';
-
-    // 設計顏色確認
-    $desin_color_verify = '';
-    // 設計顏色確認附件	  
-    $desin_color_verify_file = '';
-    // 設計顏色確認時間	
-    $desin_color_verify_at = '';
-    // 設計顏色確認人	
-    $desin_color_verify_owner = '';
-
-    // 設計仕樣確認
-    $desin_style_verify = '';
-    // 設計仕樣確認附件	
-    $desin_style_verify_file = '';
-    // 設計仕樣確認時間
-    $desin_style_verify_at = '';
-    // 設計仕樣確認人
-    $desin_style_verify_owner = '';
-
-    // 設計主管確認
-    $desin_leader_verify = '';
-    // 設計主管確認附件	
-    $desin_leader_verify_file = '';
-    // 設計主管確認時間
-    $desin_leader_verify_at = '';
-    // 設計主管確認人
-    $desin_leader_verify_owner = '';
-
-    // 樓高通報
-    $building_heigh_verify = '';
-    // 樓高通報附件	
-    $building_heigh_verify_file = '';
-    // 樓高通報時間	     
-    $building_heigh_verify_at = '';
-    // 樓高通報確認人	
-    $building_heigh_verify_owner = '';
-
-    // 電氣發貨明細
-    $electrical_design_publish = '';
-    // 電氣資料發行時間	
-    $electrical_design_publish_at = '';
-    // 電氣資料發行人	
-    $electrical_design_publish_owner = '';
-
-    // 機械資料發行
-    $mechanical_design_publish = '';
-    // 機械資料發行時間	
-    $mechanical_design_publish_at = '';
-    // 機械資料發行人
-    $mechanical_design_publish_owner = '';
-
-    // 電氣發貨明細	
-    $electrical_shipping_date_publish = '';
-    // 電氣發貨明細時間	
-    $electrical_shipping_date_publish_at = '';
-    // 電氣發貨明細發行人
-    $electrical_shipping_date_publish_owner = '';
-
-    // 機械發貨明細
-    $mechanical_shipping_date_publish = '';
-    // 機械發貨明細時間
-    $mechanical_shipping_date_publish_at = '';
-    // 機械發貨明細發行人
-    $mechanical_shipping_date_publish_owner = '';
-
-    // 下單日(普來特富)	
-    $prattford_order_date = '';
-    // 預計發貨日(到港日)	
-    $estimated_shipping_date = '';
-    // 發貨類別(A.全級發貨、G.欠件發貨)
-    $goods_type = '';
-    // 實際到貨日(到觀音廠日)
-    $actual_tofactory_date = '';
-    // 發貨確認人	
-    $shipping_date_owner = '';
-    // 預計船期	
-    $estimated_shipping_schedule_date = '';
-    // 實際到貨日(到港日)
-    $actual_arrival_date = '';
-    // 到貨確認人
-    $arrival_date_owner = '';
-
-    // 是否齊備	
-    $shengguanok_status = '';
-    // 生管確認附件	
-    $shengguanok_status_file = '';
-    // 已備齊時間	
-    $shengguanok_status_at = '';
-    // 已備齊檢查人
-    $shengguanok_status_owner = '';
-
-    // 建立人
-    $creater = '';
-    // 建立時間	
-    $create_at = '';
-
-
-    if ($_SERVER["REQUEST_METHOD"] == "POST") {
-
-        // 預設新梯代碼 A
-        $contract_type = postCheck('contract_type', 'A');
-        // 合約號
-        $contractno  = postCheck('contractno');
-        // 營業員ID
-        $salesid = postCheck('salesid');
-        // 工務人員ID
-        $warehouseid = postCheck('warehouseid');
-        // 客戶姓名
-        $custom = postCheck('custom');
-        // 工地負責人
-        $site_manager = postCheck('site_manager');
-        // 客戶id
-        $accountid = postCheck('accountid');
-        // 作番號
-        $facilityno =  postCheck('facilityno');
-        // 作番號
-        $facility_temp_no =  postCheck('facility_temp_no');
-        // 緯度
-        $latitude = postCheck('latitude');
-        // 經度
-        $longitude = postCheck('longitude');
-        // 載重
-        $weight = postCheck('weight');
-        // 人乘
-        $numberofpassenger = postCheck('numberofpassenger');
-        // 樓停
-        $numberofstop = postCheck('numberofstop');
-        // 樓層
-        $numberoffloor = postCheck('numberoffloor');
-        // 開門方式
-        $opentype = postCheck('opentype');
-        // 速度
-        $speed = postCheck('speed');
-        // 機型
-        $facility_kind = postCheck('facility_kind');
-        // 地址
-        $address = postCheck('address');
-        // 合約到貨日
-        $contract_arrival_date = postCheck('contract_arrival_date');
-        // 實際到貨日
-        $real_contract_arrival_date = postCheck('real_contract_arrival_date');
-
-        // 營業規格確認
-        $sales_spec_verify = postCheck('sales_spec_verify');
-        // 營業規格附件
-        $sales_spec_verify_file = postCheck('sales_spec_verify_file');
-        // 營業規格確認時間	
-        $sales_spec_verify_at = postCheck('sales_spec_verify_at');
-        // 營業規格確認人
-        $sales_spec_verify_owner = postCheck('sales_spec_verify_owner');
-
-        // 客戶計劃圖確認
-        $customer_planning_verify = postCheck('customer_planning_verify');
-        // 客戶計劃圖附件	
-        $customer_planning_verify_file = postCheck('customer_planning_verify_file');
-        // 客戶計劃圖確認時間
-        $customer_planning_verify_at = postCheck('customer_planning_verify_at');
-        // 客戶計劃圖確認人
-        $customer_planning_verify_owner = postCheck('customer_planning_verify_owner');
-
-        // 客戶顏色確認
-        $customer_color_verify = postCheck('customer_color_verify');
-        // 客戶顏色附件	
-        $customer_color_verify_file = postCheck('customer_color_verify_file');
-        // 客戶顏色確認時間    
-        $customer_color_verify_at = postCheck('customer_color_verify_at');
-        // 客戶顏色確認人
-        $customer_color_verify_owner = postCheck('customer_color_verify_owner');
-
-        // 工勘聯絡表
-        $site_survey_contact_form_verify = postCheck('site_survey_contact_form_verify');
-        // 工勘聯絡表附件
-        $site_survey_contact_form_verify_file = postCheck('site_survey_contact_form_verify_file');
-        // 工勘聯絡表確認時間
-        $site_survey_contact_form_verify_at = postCheck('site_survey_contact_form_verify_at');
-        // 工勘聯絡表確認人	
-        $site_survey_contact_form_verify_owner = postCheck('site_survey_contact_form_verify_owner');
-
-        // 設計規格確認
-        $desin_spec_verify = postCheck('desin_spec_verify');
-        // 設計規格確認附件    
-        $desin_spec_verify_file = postCheck('desin_spec_verify_file');
-        // 設計規格確認時間
-        $desin_spec_verify_at = postCheck('desin_spec_verify_at');
-        // 設計規格確認確認人
-        $desin_spec_verify_owner = postCheck('desin_spec_verify_owner');
-
-        // 設計計劃圖確認
-        $desin_planning_verify = postCheck('desin_planning_verify');
-        // 設計計劃圖確認附件	    
-        $desin_planning_verify_file = postCheck('desin_planning_verify_file');
-        // 設計計劃圖確認時間	     
-        $desin_planning_verify_at = postCheck('desin_planning_verify_at');
-        // 設計計劃圖確認人	
-        $desin_planning_verify_owner = postCheck('desin_planning_verify_owner');
-
-        // 設計顏色確認
-        $desin_color_verify = postCheck('desin_color_verify');
-        // 設計顏色確認附件	  
-        $desin_color_verify_file = postCheck('desin_color_verify_file');
-        // 設計顏色確認時間	
-        $desin_color_verify_at = postCheck('desin_color_verify_at');
-        // 設計顏色確認人	
-        $desin_color_verify_owner = postCheck('desin_color_verify_owner');
-
-        // 設計仕樣確認
-        $desin_style_verify = postCheck('desin_style_verify');
-        // 設計仕樣確認附件	
-        $desin_style_verify_file = postCheck('desin_style_verify_file');
-        // 設計仕樣確認時間
-        $desin_style_verify_at = postCheck('desin_style_verify_at');
-        // 設計仕樣確認人
-        $desin_style_verify_owner = postCheck('desin_style_verify_owner');
-
-        // 設計主管確認
-        $desin_leader_verify = postCheck('desin_leader_verify');
-        // 設計主管確認附件	
-        $desin_leader_verify_file = postCheck('desin_leader_verify_file');
-        // 設計主管確認時間
-        $desin_leader_verify_at = postCheck('desin_leader_verify_at');
-        // 設計主管確認人
-        $desin_leader_verify_owner = postCheck('desin_leader_verify_owner');
-
-        // 樓高通報
-        $building_heigh_verify = postCheck('building_heigh_verify');
-        // 樓高通報附件	
-        $building_heigh_verify_file = postCheck('building_heigh_verify_file');
-        // 樓高通報時間	     
-        $building_heigh_verify_at = postCheck('building_heigh_verify_at');
-        // 樓高通報確認人	
-        $building_heigh_verify_owner = postCheck('building_heigh_verify_owner');
-
-        // 電氣發貨明細
-        $electrical_design_publish = postCheck('electrical_design_publish');
-        // 電氣資料發行時間	
-        $electrical_design_publish_at = postCheck('electrical_design_publish_at');
-        // 電氣資料發行人	
-        $electrical_design_publish_owner = postCheck('electrical_design_publish_owner');
-
-        // 機械資料發行
-        $mechanical_design_publish = postCheck('mechanical_design_publish');
-        // 機械資料發行時間	
-        $mechanical_design_publish_at = postCheck('mechanical_design_publish_at');
-        // 機械資料發行人
-        $mechanical_design_publish_owner = postCheck('mechanical_design_publish_owner');
-
-        // 電氣發貨明細	
-        $electrical_shipping_date_publish = postCheck('electrical_shipping_date_publish');
-        // 電氣發貨明細時間	
-        $electrical_shipping_date_publish_at = postCheck('electrical_shipping_date_publish_at');
-        // 電氣發貨明細發行人
-        $electrical_shipping_date_publish_owner = postCheck('electrical_shipping_date_publish_owner');
-
-        // 機械發貨明細
-        $mechanical_shipping_date_publish = postCheck('mechanical_shipping_date_publish');
-        // 機械發貨明細時間
-        $mechanical_shipping_date_publish_at = postCheck('mechanical_shipping_date_publish_at');
-        // 機械發貨明細發行人
-        $mechanical_shipping_date_publish_owner = postCheck('mechanical_shipping_date_publish_owner');
-
-        // 普來特富(下單日)	
-        $prattford_order_date = postCheck('prattford_order_date');
-        // 預計發貨日(到港日)	
-        $estimated_shipping_date = postCheck('estimated_shipping_date');
-        // 發貨類別(A.全級發貨、G.欠件發貨)
-        $goods_type = postCheck('goods_type');
-        // 實際到貨日(到觀音廠日)
-        $actual_tofactory_date = postCheck('actual_tofactory_date');
-        // 發貨確認人	
-        $shipping_date_owner = postCheck('shipping_date_owner');
-        // 預計船期
-        $estimated_shipping_schedule_date = postCheck('estimated_shipping_schedule_date');
-        // 實際到貨日(到港日)
-        $actual_arrival_date = postCheck('actual_arrival_date');
-        // 到貨確認人
-        $arrival_date_owner = postCheck('arrival_date_owner');
-
-        // 是否齊備	
-        $shengguanok_status = postCheck('shengguanok_status');
-        // 生管確認附件	
-        $shengguanok_status_file = postCheck('shengguanok_status_file');
-        // 已備齊時間	
-        $shengguanok_status_at = postCheck('shengguanok_status_at');
-        // 已備齊檢查人
-        $shengguanok_status_owner = postCheck('shengguanok_status_owner');
-
-        // QC與官檢種類
-        $qc_official_type = postCheck('qc_official_type');
-
-        // 建立人
-        $creater = postCheck('creater');
-        // 建立時間	
-        $create_at = postCheck('create_at');
-
-
-        //插入數據庫數據  gary_version
-        $insertsql = "
-            INSERT INTO wipwholestatus (
-                contract_type, 
-                contractno, 
-                salesid, 
-                custom, 
-                site_manager,
-                accountid, 
-                facilityno, 
-                facility_temp_no,
-                latitude, 
-                longitude,
-                weight, 
-                numberofpassenger, 
-                numberofstop, 
-                numberoffloor, 
-                opentype, 
-                speed, 
-                facility_kind,
-                address, 
-                contract_arrival_date, 
-                real_contract_arrival_date, 
-                sales_spec_verify, 
-                sales_spec_verify_file,
-                sales_spec_verify_at, 
-                sales_spec_verify_owner, 
-                customer_planning_verify, 
-                customer_planning_verify_file,
-                customer_planning_verify_at, 
-                customer_planning_verify_owner, 
-                customer_color_verify, 
-                customer_color_verify_file,
-                customer_color_verify_at, 
-                customer_color_verify_owner, 
-                site_survey_contact_form_verify, 
-                site_survey_contact_form_verify_file,
-                site_survey_contact_form_verify_at, 
-                site_survey_contact_form_verify_owner, 
-                desin_spec_verify, 
-                desin_spec_verify_file,
-                desin_spec_verify_at, 
-                desin_spec_verify_owner, 
-                desin_planning_verify, 
-                desin_planning_verify_file, 
-                desin_planning_verify_at,
-                desin_planning_verify_owner, 
-                desin_color_verify, 
-                desin_color_verify_file, 
-                desin_color_verify_at, 
-                desin_color_verify_owner,
-                desin_style_verify, 
-                desin_style_verify_file, 
-                desin_style_verify_at, 
-                desin_style_verify_owner, 
-                desin_leader_verify,
-                desin_leader_verify_file, 
-                desin_leader_verify_at, 
-                desin_leader_verify_owner, 
-                building_heigh_verify,
-                building_heigh_verify_file, 
-                building_heigh_verify_at, 
-                building_heigh_verify_owner, 
-                electrical_design_publish,
-                electrical_design_publish_at, 
-                electrical_design_publish_owner, 
-                mechanical_design_publish, 
-                mechanical_design_publish_at,
-                mechanical_design_publish_owner, 
-                electrical_shipping_date_publish, 
-                electrical_shipping_date_publish_at,
-                electrical_shipping_date_publish_owner, 
-                mechanical_shipping_date_publish, 
-                mechanical_shipping_date_publish_at,
-                mechanical_shipping_date_publish_owner, 
-                prattford_order_date,
-                estimated_shipping_date, 
-                goods_type, 
-                actual_tofactory_date, 
-                shipping_date_owner,
-                estimated_shipping_schedule_date, 
-                actual_arrival_date, 
-                arrival_date_owner, 
-                shengguanok_status, 
-                shengguanok_status_file,
-                shengguanok_status_at, 
-                shengguanok_status_owner, 
-                qc_official_type,
-                creater, 
-                create_at
-            ) VALUES (
-                '$contract_type', 
-                '$contractno', 
-                '$salesid', 
-                '$custom', 
-                '$site_manager', 
-                '$accountid', 
-                '$facilityno', 
-                '$facility_temp_no',
-                '$latitude', 
-                '$longitude',
-                '$weight', 
-                '$numberofpassenger', 
-                '$numberofstop', 
-                '$numberoffloor', 
-                '$opentype', 
-                '$speed', 
-                '$facility_kind',
-                '$address', 
-                '$contract_arrival_date', 
-                '$contract_arrival_date', 
-                '$sales_spec_verify', 
-                '$sales_spec_verify_file',
-                '$sales_spec_verify_at', 
-                '$sales_spec_verify_owner', 
-                '$customer_planning_verify', 
-                '$customer_planning_verify_file',
-                '$customer_planning_verify_at', 
-                '$customer_planning_verify_owner', 
-                '$customer_color_verify', 
-                '$customer_color_verify_file',
-                '$customer_color_verify_at', 
-                '$customer_color_verify_owner', 
-                '$site_survey_contact_form_verify', 
-                '$site_survey_contact_form_verify_file',
-                '$site_survey_contact_form_verify_at', 
-                '$site_survey_contact_form_verify_owner', 
-                '$desin_spec_verify', 
-                '$desin_spec_verify_file',
-                '$desin_spec_verify_at', 
-                '$desin_spec_verify_owner', 
-                '$desin_planning_verify', 
-                '$desin_planning_verify_file', 
-                '$desin_planning_verify_at',
-                '$desin_planning_verify_owner', 
-                '$desin_color_verify', 
-                '$desin_color_verify_file', 
-                '$desin_color_verify_at', 
-                '$desin_color_verify_owner',
-                '$desin_style_verify', 
-                '$desin_style_verify_file', 
-                '$desin_style_verify_at', 
-                '$desin_style_verify_owner', 
-                '$desin_leader_verify',
-                '$desin_leader_verify_file', 
-                '$desin_leader_verify_at', 
-                '$desin_leader_verify_owner', 
-                '$building_heigh_verify',
-                '$building_heigh_verify_file', 
-                '$building_heigh_verify_at', 
-                '$building_heigh_verify_owner', 
-                '$electrical_design_publish',
-                '$electrical_design_publish_at', 
-                '$electrical_design_publish_owner', 
-                '$mechanical_design_publish', 
-                '$mechanical_design_publish_at',
-                '$mechanical_design_publish_owner', 
-                '$electrical_shipping_date_publish', 
-                '$electrical_shipping_date_publish_at',
-                '$electrical_shipping_date_publish_owner', 
-                '$mechanical_shipping_date_publish', 
-                '$mechanical_shipping_date_publish_at',
-                '$mechanical_shipping_date_publish_owner', 
-                '$prattford_order_date', 
-                '$estimated_shipping_date', 
-                '$goods_type', 
-                '$actual_tofactory_date', 
-                '$shipping_date_owner',
-                '$estimated_shipping_schedule_date', 
-                '$actual_arrival_date', 
-                '$arrival_date_owner', 
-                '$shengguanok_status', 
-                '$shengguanok_status_file',
-                '$shengguanok_status_at', 
-                '$shengguanok_status_owner', 
-                '$qc_official_type',
-                '$creater', 
-                '$create_at'
-            )
-        ";
-
-        // 檢查作番號是否重複 
-        if (checkFacilitynoRepeat($link, $facilityno)) {
-            echo "
-            <script>
-                alert('此作番號重複');
-            </script>
-        ";
-        } else {
-            mysqli_query($link, $insertsql);
-            $last_form_id = mysqli_insert_id($link);
-            // 寫入待簽程狀態 A (營業)
-            do_wws_assign($salesid, $last_form_id, 'A');
-            // 寫入待簽程狀態 G (工務)
-            do_wws_assign($warehouseid, $last_form_id, 'G');
-            echo "
-                <script>
-                    alert('新增完成');
-                </script>
-            ";
-        }
-    }
-
-    // 開門方式 select => options
-    $sql = "
-        SELECT 
-            code_name AS val ,
-            content AS label 
-        FROM code F
-        WHERE field_name='open_kind'
-        ORDER BY label ASC
-    ";
-    $opendoor_options = mysqli_query($link, $sql);
-
-    // 所有營業員 select => options
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM account
-        WHERE department_id IN ('311','312','313','314','315')
-        ORDER BY label ASC
-    ";
-    $sales_options = mysqli_query($link, $sql);
-
-    // 所有工務人員 select => options
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM account
-        WHERE department_id IN ('521','531','541','542','543','544','545')
-        ORDER BY label ASC
-    ";
-    $warehouse_options = mysqli_query($link, $sql);
-
-?>
-    <form method="post" id="form" enctype="multipart/form-data">
-        <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>">
-        <input class="form-control " type="hidden" name="sales_spec_verify" value="1">
-        <input class="form-control " type="hidden" name="customer_planning_verify" value="1">
-        <input class="form-control " type="hidden" name="customer_color_verify" value="1">
-        <input class="form-control " type="hidden" name="customer_style_verify" value="1">
-        <input class="form-control " type="hidden" name="site_survey_contact_form_verify" value="1">
-        <input class="form-control " type="hidden" name="desin_spec_verify" value="1">
-        <input class="form-control " type="hidden" name="desin_planning_verify" value="1">
-        <input class="form-control " type="hidden" name="desin_color_verify" value="1">
-        <input class="form-control " type="hidden" name="desin_style_verify" value="1">
-        <input class="form-control " type="hidden" name="desin_leader_verify" value="1">
-        <input class="form-control " type="hidden" name="building_heigh_verify" value="1">
-        <input class="form-control " type="hidden" name="electrical_design_publish" value="1">
-        <input class="form-control " type="hidden" name="mechanical_design_publish" value="1">
-        <input class="form-control " type="hidden" name="electrical_shipping_date_publish" value="1">
-        <input class="form-control " type="hidden" name="mechanical_shipping_date_publish" value="1">
-        <input class="form-control " type="hidden" name="shengguanok_status" value="1">
-        <input class="form-control " type="hidden" name="create_at" value="<?= date('Y/m/d H:i:s'); ?>">
-        <div class="container-fluid" id="accountadd">
-            <div class="text-center">
-                <h3>作番大日程</h3>
-            </div>
-            <div class="form-horizontal">
-                <table class="table" style="width:100%">
-                    <thead style="margin-bottom: 20px">
-                        <tr>
-                            <td style="vertical-align: middle">合約號</td>
-                            <td>
-                                <input class="form-control " type="text" id="contractno" name="contractno" value="<?php echo $contractno; ?>">
-                            </td>
-                            <td style="vertical-align: middle">作番號</td>
-                            <td>
-                                <input class="form-control " type="text" id="facilityno" name="facilityno" value="<?php echo $facilityno; ?>">
-                            </td>
-                            <td style="vertical-align: middle">客戶名稱</td>
-                            <td>
-                                <input class="form-control " type="text" name="custom" value="<?php echo $custom; ?>">
-                            </td>
-                            <td style="vertical-align: middle">號機</td>
-                            <td>
-                                <input class="form-control " type="text" name="facility_temp_no" value="<?php echo $facility_temp_no; ?>">
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="vertical-align: middle">緯度</td>
-                            <td>
-                                <input class="form-control " type="text" name="latitude" value="<?php echo $latitude; ?>">
-                            </td>
-                            <td style="vertical-align: middle">經度</td>
-                            <td>
-                                <input class="form-control " type="text" name="longitude" value="<?php echo $longitude; ?>">
-                            </td>
-                            <td style="vertical-align: middle">地址</td>
-                            <td>
-                                <input class="form-control " type="text" name="address" value="<?php echo $address; ?>">
-                            </td>
-                            <td style="vertical-align: middle">機型</td>
-                            <td>
-                                <input class="form-control " type="text" name="facility_kind" value="<?php echo $facility_kind; ?>">
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="vertical-align: middle">載重</td>
-                            <td>
-                                <input class="form-control " type="number" min="0" name="weight" value="<?php echo $weight; ?>">
-                            </td>
-                            <td style="vertical-align: middle">人乘</td>
-                            <td>
-                                <input class="form-control " type="number" min="0" name="numberofpassenger" value="<?php echo $numberofpassenger; ?>">
-                            </td>
-                            <td style="vertical-align: middle">樓停</td>
-                            <td>
-                                <input class="form-control " type="number" min="0" name="numberofstop" value="<?php echo $numberofstop; ?>">
-                            </td>
-                            <td style="vertical-align: middle">樓層</td>
-                            <td>
-                                <input class="form-control " type="number" min="0" name="numberoffloor" value="<?php echo $numberoffloor; ?>">
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="vertical-align: middle">開門方式</td>
-                            <td style="vertical-align: middle">
-                                <select class="form-control " name="opentype">
-                                    <option value="">未選擇</option>
-                                    <?php
-                                    foreach ($opendoor_options as $opendoor_option) :
-                                        if ($opendoor_option['label'] == $opentype) {
-                                            echo "<option selected value='" . $opendoor_option['label'] . "'>" . $opendoor_option['label'] . "</option>";
-                                        } else {
-                                            echo "<option value='" . $opendoor_option['label'] . "'>" . $opendoor_option['label'] . "</option>";
-                                        }
-                                    endforeach
-                                    ?>
-                                </select>
-                            </td>
-                            <td style="vertical-align: middle">速度</td>
-                            <td>
-                                <input class="form-control " type="number" name="speed" gt="0" min="0" value="<?php echo $speed; ?>">
-                            </td>
-                            <td style="vertical-align: middle">合約交期<br />(到工地)</td>
-                            <td>
-                                <input class="form-control " type="date" id="contract_arrival_date" name="contract_arrival_date" value="<?php echo $contract_arrival_date; ?>">
-                            </td>
-                            <!-- <td style="vertical-align: middle">預計交期<br />(到工地)</td>
-                            <td>
-                                <input class="form-control " type="date" include_once="real_contract_arrival_date" name="real_contract_arrival_date" value="<?php echo $real_contract_arrival_date; ?>">
-                            </td> -->
-                            <td>
-                                <input type="radio" name="qc_official_type" id='qc_official_type_QO' value='QO' checked/>
-                                <label for="qc_official_type_QO">QC + 官檢</label>
-                                <input type="radio" name="qc_official_type" id='qc_official_type_Q' value='Q'  />
-                                <label for="qc_official_type_Q">只需QC</label>
-                                <input type="radio" name="qc_official_type" id='qc_official_type_O' value='O' ?> 
-                                <label for="qc_official_type_O">只需官檢</label>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="vertical-align: middle">工地負責人</td>
-                            <td>
-                                <input class="form-control " type="text" name="site_manager" value="<?php echo $site_manager; ?>">
-                            </td>
-                            <td style="vertical-align: middle">營業員</td>
-                            <td style="vertical-align: middle">
-                                <select class="form-control " id="salesid" name="salesid">
-                                    <option value="">未選擇</option>
-                                    <?php
-                                    foreach ($sales_options as $sales_option) :
-                                        if ($sales_option['val'] == $salesid) {
-                                            echo "<option selected value='" . $sales_option['val'] . "'>" . $sales_option['val'] . $sales_option['label'] . "</option>";
-                                        } else {
-                                            echo "<option value='" . $sales_option['val'] . "'>" . $sales_option['val'] . $sales_option['label'] . "</option>";
-                                        }
-                                    endforeach
-                                    ?>
-                                </select>
-                            </td>
-                            <td style="vertical-align: middle">工務部門負責人</td>
-                            <td style="vertical-align: middle">
-                                <select class="form-control " id="warehouseid" name="warehouseid">
-                                    <option value="">未選擇</option>
-                                    <?php
-                                    foreach ($warehouse_options as $warehouse_option) :
-                                        if ($warehouse_option['val'] == $warehouseid) {
-                                            echo "<option selected value='" . $warehouse_option['val'] . "'>" . $warehouse_option['val'] . $warehouse_option['label'] . "</option>";
-                                        } else {
-                                            echo "<option value='" . $warehouse_option['val'] . "'>" . $warehouse_option['val'] . $warehouse_option['label'] . "</option>";
-                                        }
-                                    endforeach
-                                    ?>
-                                </select>
-                            </td>
-                        </tr>
-                    </thead>
-                </table>
-            </div>
-            <div class="col-md-12" style="margin-bottom:15px;">
-                <button onclick="savedata()" type="button" class="btn btn-primary btn-lg pull-right">確認後保存</button>
-            </div>
-        </div>
-    </form>
-    <script type="text/javascript">
-        function savedata() {
-            var savedataMessage = {
-                "0": "不明錯誤",
-                "1": "",
-                "2": "未選擇營業員",
-                "3": "合約編號未填寫",
-                "4": "作番號未填寫",
-                "5": "未選擇工務人員",
-                "6": "合約日未填寫"
-            }
-            if (getSavedataStatus() == '1') {
-                $('#form').submit();
-            } else {
-                typeof savedataMessage[getSavedataStatus()] == 'string' ? alert(savedataMessage[getSavedataStatus()]) : alert("不明錯誤");
-            }
-        }
-
-        function getSavedataStatus() {
-            if ($("#salesid").val() == '')
-                return '2'
-            if ($("#contractno").val() == '')
-                return '3'
-            if ($("#facilityno").val() == '')
-                return '4'
-            if ($("#warehouseid").val() == '')
-                return '5'
-            if ($("#contract_arrival_date").val() == '')
-                return '6'
-            if ($("#real_contract_arrival_date").val() == '')
-                return '6'
-            return '1'
-        }
-    </script>
-
-<?php
-} else {
-    echo "錯誤的訪問";
-}
-
+<?php
+
+/**
+ * 流程規則:(新梯)
+ * 1.A:營業員確認中  B:設計部門人員確認中 C:生管主管確認中 Z:生管確認完成        
+ * 2.G:工務主管確認中 H:生管主管確認中 Z:工務主管確認完成        
+ * 
+ *  新梯        543 筆  (已匯入)
+ *  舊改        141 筆  (資料未洗入)
+ *  已簽回      684 筆 (共計)
+ */
+
+
+// error_reporting(0);
+include "header.php";
+
+// 載入db.php來連結資料庫
+require_once "database.php";
+
+
+// 所屬部門
+$sql = "select department_id from account where accountid = '$user_id'";
+$res = mysqli_query($link, $sql);
+$row = mysqli_fetch_row($res);
+$department_id = $row[0];
+mysqli_free_result($res);
+// 生管及資訊才可以訪問
+if ($department_id == "321" || $department_id == "220") {
+
+    /**
+     * 檢查作番是否重複 true:重複 false:沒重複
+     * @param mysqli $link 資料庫連線檔
+     * @param string $facilityno 檢查的作番號
+     */
+    function checkFacilitynoRepeat($link, $facilityno)
+    {
+        $sql = "
+            SELECT 
+                COUNT(*) 
+            FROM wipwholestatus
+            WHERE facilityno = '$facilityno'
+            AND status = '1'
+        ";
+        $result = mysqli_query($link, $sql);
+        $row = mysqli_fetch_array($result);
+        return $row['0'] > 0 ? true : false;
+    }
+
+    // 預設新梯代碼 A
+    $contract_type = '';
+    // 合約號
+    $contractno = '';
+    // 營業員ID
+    $salesid = '';
+    // 工務人員ID
+    $warehouseid = '';
+    // 客戶姓名
+    $custom = '';
+    // 工地負責人
+    $site_manager = '';
+    // 客戶id
+    $accountid = '';
+    // 作番號
+    $facilityno = '';
+    // 號機
+    $facility_temp_no = '';
+    // 緯度
+    $latitude = '';
+    // 經度
+    $longitude = '';
+    // 載重
+    $weight = '';
+    // 人乘
+    $numberofpassenger = '';
+    // 樓停
+    $numberofstop = '';
+    // 樓層
+    $numberoffloor = '';
+    // 開門方式
+    $opentype = '';
+    // 速度
+    $speed = '';
+    // 機型
+    $facility_kind = '';
+    // 地址
+    $address = '';
+    // 合約到貨日
+    $contract_arrival_date = '';
+    // 實際到貨日
+    $real_contract_arrival_date = '';
+
+    // 營業規格確認
+    $sales_spec_verify = '';
+    // 營業規格附件
+    $sales_spec_verify_file = '';
+    // 營業規格確認時間	
+    $sales_spec_verify_at = '';
+    // 營業規格確認人
+    $sales_spec_verify_owner = '';
+
+    // 客戶計劃圖確認
+    $customer_planning_verify = '';
+    // 客戶計劃圖附件	
+    $customer_planning_verify_file = '';
+    // 客戶計劃圖確認時間
+    $customer_planning_verify_at = '';
+    // 客戶計劃圖確認人
+    $customer_planning_verify_owner = '';
+
+    // 客戶顏色確認
+    $customer_color_verify = '';
+    // 客戶顏色附件	
+    $customer_color_verify_file = '';
+    // 客戶顏色確認時間    
+    $customer_color_verify_at = '';
+    // 客戶顏色確認人
+    $customer_color_verify_owner = '';
+
+    // 工勘聯絡表
+    $site_survey_contact_form_verify = '';
+    // 工勘聯絡表附件
+    $site_survey_contact_form_verify_file = '';
+    // 工勘聯絡表確認時間
+    $site_survey_contact_form_verify_at = '';
+    // 工勘聯絡表確認人	
+    $site_survey_contact_form_verify_owner = '';
+
+    // 設計規格確認
+    $desin_spec_verify = '';
+    // 設計規格確認附件    
+    $desin_spec_verify_file = '';
+    // 設計規格確認時間
+    $desin_spec_verify_at = '';
+    // 設計規格確認確認人
+    $desin_spec_verify_owner = '';
+
+    // 設計計劃圖確認
+    $desin_planning_verify = '';
+    // 設計計劃圖確認附件	    
+    $desin_planning_verify_file = '';
+    // 設計計劃圖確認時間	     
+    $desin_planning_verify_at = '';
+    // 設計計劃圖確認人	
+    $desin_planning_verify_owner = '';
+
+    // 設計顏色確認
+    $desin_color_verify = '';
+    // 設計顏色確認附件	  
+    $desin_color_verify_file = '';
+    // 設計顏色確認時間	
+    $desin_color_verify_at = '';
+    // 設計顏色確認人	
+    $desin_color_verify_owner = '';
+
+    // 設計仕樣確認
+    $desin_style_verify = '';
+    // 設計仕樣確認附件	
+    $desin_style_verify_file = '';
+    // 設計仕樣確認時間
+    $desin_style_verify_at = '';
+    // 設計仕樣確認人
+    $desin_style_verify_owner = '';
+
+    // 設計主管確認
+    $desin_leader_verify = '';
+    // 設計主管確認附件	
+    $desin_leader_verify_file = '';
+    // 設計主管確認時間
+    $desin_leader_verify_at = '';
+    // 設計主管確認人
+    $desin_leader_verify_owner = '';
+
+    // 樓高通報
+    $building_heigh_verify = '';
+    // 樓高通報附件	
+    $building_heigh_verify_file = '';
+    // 樓高通報時間	     
+    $building_heigh_verify_at = '';
+    // 樓高通報確認人	
+    $building_heigh_verify_owner = '';
+
+    // 電氣發貨明細
+    $electrical_design_publish = '';
+    // 電氣資料發行時間	
+    $electrical_design_publish_at = '';
+    // 電氣資料發行人	
+    $electrical_design_publish_owner = '';
+
+    // 機械資料發行
+    $mechanical_design_publish = '';
+    // 機械資料發行時間	
+    $mechanical_design_publish_at = '';
+    // 機械資料發行人
+    $mechanical_design_publish_owner = '';
+
+    // 電氣發貨明細	
+    $electrical_shipping_date_publish = '';
+    // 電氣發貨明細時間	
+    $electrical_shipping_date_publish_at = '';
+    // 電氣發貨明細發行人
+    $electrical_shipping_date_publish_owner = '';
+
+    // 機械發貨明細
+    $mechanical_shipping_date_publish = '';
+    // 機械發貨明細時間
+    $mechanical_shipping_date_publish_at = '';
+    // 機械發貨明細發行人
+    $mechanical_shipping_date_publish_owner = '';
+
+    // 下單日(普來特富)	
+    $prattford_order_date = '';
+    // 預計發貨日(到港日)	
+    $estimated_shipping_date = '';
+    // 發貨類別(A.全級發貨、G.欠件發貨)
+    $goods_type = '';
+    // 實際到貨日(到觀音廠日)
+    $actual_tofactory_date = '';
+    // 發貨確認人	
+    $shipping_date_owner = '';
+    // 預計船期	
+    $estimated_shipping_schedule_date = '';
+    // 實際到貨日(到港日)
+    $actual_arrival_date = '';
+    // 到貨確認人
+    $arrival_date_owner = '';
+
+    // 是否齊備	
+    $shengguanok_status = '';
+    // 生管確認附件	
+    $shengguanok_status_file = '';
+    // 已備齊時間	
+    $shengguanok_status_at = '';
+    // 已備齊檢查人
+    $shengguanok_status_owner = '';
+
+    // 建立人
+    $creater = '';
+    // 建立時間	
+    $create_at = '';
+
+
+    if ($_SERVER["REQUEST_METHOD"] == "POST") {
+
+        // 預設新梯代碼 A
+        $contract_type = postCheck('contract_type', 'A');
+        // 合約號
+        $contractno  = postCheck('contractno');
+        // 營業員ID
+        $salesid = postCheck('salesid');
+        // 工務人員ID
+        $warehouseid = postCheck('warehouseid');
+        // 客戶姓名
+        $custom = postCheck('custom');
+        // 工地負責人
+        $site_manager = postCheck('site_manager');
+        // 客戶id
+        $accountid = postCheck('accountid');
+        // 作番號
+        $facilityno =  postCheck('facilityno');
+        // 作番號
+        $facility_temp_no =  postCheck('facility_temp_no');
+        // 緯度
+        $latitude = postCheck('latitude');
+        // 經度
+        $longitude = postCheck('longitude');
+        // 載重
+        $weight = postCheck('weight');
+        // 人乘
+        $numberofpassenger = postCheck('numberofpassenger');
+        // 樓停
+        $numberofstop = postCheck('numberofstop');
+        // 樓層
+        $numberoffloor = postCheck('numberoffloor');
+        // 開門方式
+        $opentype = postCheck('opentype');
+        // 速度
+        $speed = postCheck('speed');
+        // 機型
+        $facility_kind = postCheck('facility_kind');
+        // 地址
+        $address = postCheck('address');
+        // 合約到貨日
+        $contract_arrival_date = postCheck('contract_arrival_date');
+        // 實際到貨日
+        $real_contract_arrival_date = postCheck('real_contract_arrival_date');
+
+        // 營業規格確認
+        $sales_spec_verify = postCheck('sales_spec_verify');
+        // 營業規格附件
+        $sales_spec_verify_file = postCheck('sales_spec_verify_file');
+        // 營業規格確認時間	
+        $sales_spec_verify_at = postCheck('sales_spec_verify_at');
+        // 營業規格確認人
+        $sales_spec_verify_owner = postCheck('sales_spec_verify_owner');
+
+        // 客戶計劃圖確認
+        $customer_planning_verify = postCheck('customer_planning_verify');
+        // 客戶計劃圖附件	
+        $customer_planning_verify_file = postCheck('customer_planning_verify_file');
+        // 客戶計劃圖確認時間
+        $customer_planning_verify_at = postCheck('customer_planning_verify_at');
+        // 客戶計劃圖確認人
+        $customer_planning_verify_owner = postCheck('customer_planning_verify_owner');
+
+        // 客戶顏色確認
+        $customer_color_verify = postCheck('customer_color_verify');
+        // 客戶顏色附件	
+        $customer_color_verify_file = postCheck('customer_color_verify_file');
+        // 客戶顏色確認時間    
+        $customer_color_verify_at = postCheck('customer_color_verify_at');
+        // 客戶顏色確認人
+        $customer_color_verify_owner = postCheck('customer_color_verify_owner');
+
+        // 工勘聯絡表
+        $site_survey_contact_form_verify = postCheck('site_survey_contact_form_verify');
+        // 工勘聯絡表附件
+        $site_survey_contact_form_verify_file = postCheck('site_survey_contact_form_verify_file');
+        // 工勘聯絡表確認時間
+        $site_survey_contact_form_verify_at = postCheck('site_survey_contact_form_verify_at');
+        // 工勘聯絡表確認人	
+        $site_survey_contact_form_verify_owner = postCheck('site_survey_contact_form_verify_owner');
+
+        // 設計規格確認
+        $desin_spec_verify = postCheck('desin_spec_verify');
+        // 設計規格確認附件    
+        $desin_spec_verify_file = postCheck('desin_spec_verify_file');
+        // 設計規格確認時間
+        $desin_spec_verify_at = postCheck('desin_spec_verify_at');
+        // 設計規格確認確認人
+        $desin_spec_verify_owner = postCheck('desin_spec_verify_owner');
+
+        // 設計計劃圖確認
+        $desin_planning_verify = postCheck('desin_planning_verify');
+        // 設計計劃圖確認附件	    
+        $desin_planning_verify_file = postCheck('desin_planning_verify_file');
+        // 設計計劃圖確認時間	     
+        $desin_planning_verify_at = postCheck('desin_planning_verify_at');
+        // 設計計劃圖確認人	
+        $desin_planning_verify_owner = postCheck('desin_planning_verify_owner');
+
+        // 設計顏色確認
+        $desin_color_verify = postCheck('desin_color_verify');
+        // 設計顏色確認附件	  
+        $desin_color_verify_file = postCheck('desin_color_verify_file');
+        // 設計顏色確認時間	
+        $desin_color_verify_at = postCheck('desin_color_verify_at');
+        // 設計顏色確認人	
+        $desin_color_verify_owner = postCheck('desin_color_verify_owner');
+
+        // 設計仕樣確認
+        $desin_style_verify = postCheck('desin_style_verify');
+        // 設計仕樣確認附件	
+        $desin_style_verify_file = postCheck('desin_style_verify_file');
+        // 設計仕樣確認時間
+        $desin_style_verify_at = postCheck('desin_style_verify_at');
+        // 設計仕樣確認人
+        $desin_style_verify_owner = postCheck('desin_style_verify_owner');
+
+        // 設計主管確認
+        $desin_leader_verify = postCheck('desin_leader_verify');
+        // 設計主管確認附件	
+        $desin_leader_verify_file = postCheck('desin_leader_verify_file');
+        // 設計主管確認時間
+        $desin_leader_verify_at = postCheck('desin_leader_verify_at');
+        // 設計主管確認人
+        $desin_leader_verify_owner = postCheck('desin_leader_verify_owner');
+
+        // 樓高通報
+        $building_heigh_verify = postCheck('building_heigh_verify');
+        // 樓高通報附件	
+        $building_heigh_verify_file = postCheck('building_heigh_verify_file');
+        // 樓高通報時間	     
+        $building_heigh_verify_at = postCheck('building_heigh_verify_at');
+        // 樓高通報確認人	
+        $building_heigh_verify_owner = postCheck('building_heigh_verify_owner');
+
+        // 電氣發貨明細
+        $electrical_design_publish = postCheck('electrical_design_publish');
+        // 電氣資料發行時間	
+        $electrical_design_publish_at = postCheck('electrical_design_publish_at');
+        // 電氣資料發行人	
+        $electrical_design_publish_owner = postCheck('electrical_design_publish_owner');
+
+        // 機械資料發行
+        $mechanical_design_publish = postCheck('mechanical_design_publish');
+        // 機械資料發行時間	
+        $mechanical_design_publish_at = postCheck('mechanical_design_publish_at');
+        // 機械資料發行人
+        $mechanical_design_publish_owner = postCheck('mechanical_design_publish_owner');
+
+        // 電氣發貨明細	
+        $electrical_shipping_date_publish = postCheck('electrical_shipping_date_publish');
+        // 電氣發貨明細時間	
+        $electrical_shipping_date_publish_at = postCheck('electrical_shipping_date_publish_at');
+        // 電氣發貨明細發行人
+        $electrical_shipping_date_publish_owner = postCheck('electrical_shipping_date_publish_owner');
+
+        // 機械發貨明細
+        $mechanical_shipping_date_publish = postCheck('mechanical_shipping_date_publish');
+        // 機械發貨明細時間
+        $mechanical_shipping_date_publish_at = postCheck('mechanical_shipping_date_publish_at');
+        // 機械發貨明細發行人
+        $mechanical_shipping_date_publish_owner = postCheck('mechanical_shipping_date_publish_owner');
+
+        // 普來特富(下單日)	
+        $prattford_order_date = postCheck('prattford_order_date');
+        // 預計發貨日(到港日)	
+        $estimated_shipping_date = postCheck('estimated_shipping_date');
+        // 發貨類別(A.全級發貨、G.欠件發貨)
+        $goods_type = postCheck('goods_type');
+        // 實際到貨日(到觀音廠日)
+        $actual_tofactory_date = postCheck('actual_tofactory_date');
+        // 發貨確認人	
+        $shipping_date_owner = postCheck('shipping_date_owner');
+        // 預計船期
+        $estimated_shipping_schedule_date = postCheck('estimated_shipping_schedule_date');
+        // 實際到貨日(到港日)
+        $actual_arrival_date = postCheck('actual_arrival_date');
+        // 到貨確認人
+        $arrival_date_owner = postCheck('arrival_date_owner');
+
+        // 是否齊備	
+        $shengguanok_status = postCheck('shengguanok_status');
+        // 生管確認附件	
+        $shengguanok_status_file = postCheck('shengguanok_status_file');
+        // 已備齊時間	
+        $shengguanok_status_at = postCheck('shengguanok_status_at');
+        // 已備齊檢查人
+        $shengguanok_status_owner = postCheck('shengguanok_status_owner');
+
+        // QC與官檢種類
+        $qc_official_type = postCheck('qc_official_type');
+
+        // 建立人
+        $creater = postCheck('creater');
+        // 建立時間	
+        $create_at = postCheck('create_at');
+
+
+        //插入數據庫數據  gary_version
+        $insertsql = "
+            INSERT INTO wipwholestatus (
+                contract_type, 
+                contractno, 
+                salesid, 
+                custom, 
+                site_manager,
+                accountid, 
+                facilityno, 
+                facility_temp_no,
+                latitude, 
+                longitude,
+                weight, 
+                numberofpassenger, 
+                numberofstop, 
+                numberoffloor, 
+                opentype, 
+                speed, 
+                facility_kind,
+                address, 
+                contract_arrival_date, 
+                real_contract_arrival_date, 
+                sales_spec_verify, 
+                sales_spec_verify_file,
+                sales_spec_verify_at, 
+                sales_spec_verify_owner, 
+                customer_planning_verify, 
+                customer_planning_verify_file,
+                customer_planning_verify_at, 
+                customer_planning_verify_owner, 
+                customer_color_verify, 
+                customer_color_verify_file,
+                customer_color_verify_at, 
+                customer_color_verify_owner, 
+                site_survey_contact_form_verify, 
+                site_survey_contact_form_verify_file,
+                site_survey_contact_form_verify_at, 
+                site_survey_contact_form_verify_owner, 
+                desin_spec_verify, 
+                desin_spec_verify_file,
+                desin_spec_verify_at, 
+                desin_spec_verify_owner, 
+                desin_planning_verify, 
+                desin_planning_verify_file, 
+                desin_planning_verify_at,
+                desin_planning_verify_owner, 
+                desin_color_verify, 
+                desin_color_verify_file, 
+                desin_color_verify_at, 
+                desin_color_verify_owner,
+                desin_style_verify, 
+                desin_style_verify_file, 
+                desin_style_verify_at, 
+                desin_style_verify_owner, 
+                desin_leader_verify,
+                desin_leader_verify_file, 
+                desin_leader_verify_at, 
+                desin_leader_verify_owner, 
+                building_heigh_verify,
+                building_heigh_verify_file, 
+                building_heigh_verify_at, 
+                building_heigh_verify_owner, 
+                electrical_design_publish,
+                electrical_design_publish_at, 
+                electrical_design_publish_owner, 
+                mechanical_design_publish, 
+                mechanical_design_publish_at,
+                mechanical_design_publish_owner, 
+                electrical_shipping_date_publish, 
+                electrical_shipping_date_publish_at,
+                electrical_shipping_date_publish_owner, 
+                mechanical_shipping_date_publish, 
+                mechanical_shipping_date_publish_at,
+                mechanical_shipping_date_publish_owner, 
+                prattford_order_date,
+                estimated_shipping_date, 
+                goods_type, 
+                actual_tofactory_date, 
+                shipping_date_owner,
+                estimated_shipping_schedule_date, 
+                actual_arrival_date, 
+                arrival_date_owner, 
+                shengguanok_status, 
+                shengguanok_status_file,
+                shengguanok_status_at, 
+                shengguanok_status_owner, 
+                qc_official_type,
+                creater, 
+                create_at
+            ) VALUES (
+                '$contract_type', 
+                '$contractno', 
+                '$salesid', 
+                '$custom', 
+                '$site_manager', 
+                '$accountid', 
+                '$facilityno', 
+                '$facility_temp_no',
+                '$latitude', 
+                '$longitude',
+                '$weight', 
+                '$numberofpassenger', 
+                '$numberofstop', 
+                '$numberoffloor', 
+                '$opentype', 
+                '$speed', 
+                '$facility_kind',
+                '$address', 
+                '$contract_arrival_date', 
+                '$contract_arrival_date', 
+                '$sales_spec_verify', 
+                '$sales_spec_verify_file',
+                '$sales_spec_verify_at', 
+                '$sales_spec_verify_owner', 
+                '$customer_planning_verify', 
+                '$customer_planning_verify_file',
+                '$customer_planning_verify_at', 
+                '$customer_planning_verify_owner', 
+                '$customer_color_verify', 
+                '$customer_color_verify_file',
+                '$customer_color_verify_at', 
+                '$customer_color_verify_owner', 
+                '$site_survey_contact_form_verify', 
+                '$site_survey_contact_form_verify_file',
+                '$site_survey_contact_form_verify_at', 
+                '$site_survey_contact_form_verify_owner', 
+                '$desin_spec_verify', 
+                '$desin_spec_verify_file',
+                '$desin_spec_verify_at', 
+                '$desin_spec_verify_owner', 
+                '$desin_planning_verify', 
+                '$desin_planning_verify_file', 
+                '$desin_planning_verify_at',
+                '$desin_planning_verify_owner', 
+                '$desin_color_verify', 
+                '$desin_color_verify_file', 
+                '$desin_color_verify_at', 
+                '$desin_color_verify_owner',
+                '$desin_style_verify', 
+                '$desin_style_verify_file', 
+                '$desin_style_verify_at', 
+                '$desin_style_verify_owner', 
+                '$desin_leader_verify',
+                '$desin_leader_verify_file', 
+                '$desin_leader_verify_at', 
+                '$desin_leader_verify_owner', 
+                '$building_heigh_verify',
+                '$building_heigh_verify_file', 
+                '$building_heigh_verify_at', 
+                '$building_heigh_verify_owner', 
+                '$electrical_design_publish',
+                '$electrical_design_publish_at', 
+                '$electrical_design_publish_owner', 
+                '$mechanical_design_publish', 
+                '$mechanical_design_publish_at',
+                '$mechanical_design_publish_owner', 
+                '$electrical_shipping_date_publish', 
+                '$electrical_shipping_date_publish_at',
+                '$electrical_shipping_date_publish_owner', 
+                '$mechanical_shipping_date_publish', 
+                '$mechanical_shipping_date_publish_at',
+                '$mechanical_shipping_date_publish_owner', 
+                '$prattford_order_date', 
+                '$estimated_shipping_date', 
+                '$goods_type', 
+                '$actual_tofactory_date', 
+                '$shipping_date_owner',
+                '$estimated_shipping_schedule_date', 
+                '$actual_arrival_date', 
+                '$arrival_date_owner', 
+                '$shengguanok_status', 
+                '$shengguanok_status_file',
+                '$shengguanok_status_at', 
+                '$shengguanok_status_owner', 
+                '$qc_official_type',
+                '$creater', 
+                '$create_at'
+            )
+        ";
+
+        // 檢查作番號是否重複 
+        if (checkFacilitynoRepeat($link, $facilityno)) {
+            echo "
+            <script>
+                alert('此作番號重複');
+            </script>
+        ";
+        } else {
+            mysqli_query($link, $insertsql);
+            $last_form_id = mysqli_insert_id($link);
+            // 寫入待簽程狀態 A (營業)
+            do_wws_assign($salesid, $last_form_id, 'A');
+            // 寫入待簽程狀態 G (工務)
+            do_wws_assign($warehouseid, $last_form_id, 'G');
+            echo "
+                <script>
+                    alert('新增完成');
+                </script>
+            ";
+        }
+    }
+
+    // 開門方式 select => options
+    $sql = "
+        SELECT 
+            code_name AS val ,
+            content AS label 
+        FROM code F
+        WHERE field_name='open_kind'
+        ORDER BY label ASC
+    ";
+    $opendoor_options = mysqli_query($link, $sql);
+
+    // 所有營業員 select => options
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM account
+        WHERE department_id IN ('311','312','313','314','315')
+        ORDER BY label ASC
+    ";
+    $sales_options = mysqli_query($link, $sql);
+
+    // 所有工務人員 select => options
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM account
+        WHERE department_id IN ('521','531','541','542','543','544','545')
+        ORDER BY label ASC
+    ";
+    $warehouse_options = mysqli_query($link, $sql);
+
+?>
+    <form method="post" id="form" enctype="multipart/form-data">
+        <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>">
+        <input class="form-control " type="hidden" name="sales_spec_verify" value="1">
+        <input class="form-control " type="hidden" name="customer_planning_verify" value="1">
+        <input class="form-control " type="hidden" name="customer_color_verify" value="1">
+        <input class="form-control " type="hidden" name="customer_style_verify" value="1">
+        <input class="form-control " type="hidden" name="site_survey_contact_form_verify" value="1">
+        <input class="form-control " type="hidden" name="desin_spec_verify" value="1">
+        <input class="form-control " type="hidden" name="desin_planning_verify" value="1">
+        <input class="form-control " type="hidden" name="desin_color_verify" value="1">
+        <input class="form-control " type="hidden" name="desin_style_verify" value="1">
+        <input class="form-control " type="hidden" name="desin_leader_verify" value="1">
+        <input class="form-control " type="hidden" name="building_heigh_verify" value="1">
+        <input class="form-control " type="hidden" name="electrical_design_publish" value="1">
+        <input class="form-control " type="hidden" name="mechanical_design_publish" value="1">
+        <input class="form-control " type="hidden" name="electrical_shipping_date_publish" value="1">
+        <input class="form-control " type="hidden" name="mechanical_shipping_date_publish" value="1">
+        <input class="form-control " type="hidden" name="shengguanok_status" value="1">
+        <input class="form-control " type="hidden" name="create_at" value="<?= date('Y/m/d H:i:s'); ?>">
+        <div class="container-fluid" id="accountadd">
+            <div class="text-center">
+                <h3>作番大日程</h3>
+            </div>
+            <div class="form-horizontal">
+                <table class="table" style="width:100%">
+                    <thead style="margin-bottom: 20px">
+                        <tr>
+                            <td style="vertical-align: middle">合約號</td>
+                            <td>
+                                <input class="form-control " type="text" id="contractno" name="contractno" value="<?php echo $contractno; ?>">
+                            </td>
+                            <td style="vertical-align: middle">作番號</td>
+                            <td>
+                                <input class="form-control " type="text" id="facilityno" name="facilityno" value="<?php echo $facilityno; ?>">
+                            </td>
+                            <td style="vertical-align: middle">客戶名稱</td>
+                            <td>
+                                <input class="form-control " type="text" name="custom" value="<?php echo $custom; ?>">
+                            </td>
+                            <td style="vertical-align: middle">號機</td>
+                            <td>
+                                <input class="form-control " type="text" name="facility_temp_no" value="<?php echo $facility_temp_no; ?>">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="vertical-align: middle">緯度</td>
+                            <td>
+                                <input class="form-control " type="text" name="latitude" value="<?php echo $latitude; ?>">
+                            </td>
+                            <td style="vertical-align: middle">經度</td>
+                            <td>
+                                <input class="form-control " type="text" name="longitude" value="<?php echo $longitude; ?>">
+                            </td>
+                            <td style="vertical-align: middle">地址</td>
+                            <td>
+                                <input class="form-control " type="text" name="address" value="<?php echo $address; ?>">
+                            </td>
+                            <td style="vertical-align: middle">機型</td>
+                            <td>
+                                <input class="form-control " type="text" name="facility_kind" value="<?php echo $facility_kind; ?>">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="vertical-align: middle">載重</td>
+                            <td>
+                                <input class="form-control " type="number" min="0" name="weight" value="<?php echo $weight; ?>">
+                            </td>
+                            <td style="vertical-align: middle">人乘</td>
+                            <td>
+                                <input class="form-control " type="number" min="0" name="numberofpassenger" value="<?php echo $numberofpassenger; ?>">
+                            </td>
+                            <td style="vertical-align: middle">樓停</td>
+                            <td>
+                                <input class="form-control " type="number" min="0" name="numberofstop" value="<?php echo $numberofstop; ?>">
+                            </td>
+                            <td style="vertical-align: middle">樓層</td>
+                            <td>
+                                <input class="form-control " type="number" min="0" name="numberoffloor" value="<?php echo $numberoffloor; ?>">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="vertical-align: middle">開門方式</td>
+                            <td style="vertical-align: middle">
+                                <select class="form-control " name="opentype">
+                                    <option value="">未選擇</option>
+                                    <?php
+                                    foreach ($opendoor_options as $opendoor_option) :
+                                        if ($opendoor_option['label'] == $opentype) {
+                                            echo "<option selected value='" . $opendoor_option['label'] . "'>" . $opendoor_option['label'] . "</option>";
+                                        } else {
+                                            echo "<option value='" . $opendoor_option['label'] . "'>" . $opendoor_option['label'] . "</option>";
+                                        }
+                                    endforeach
+                                    ?>
+                                </select>
+                            </td>
+                            <td style="vertical-align: middle">速度</td>
+                            <td>
+                                <input class="form-control " type="number" name="speed" gt="0" min="0" value="<?php echo $speed; ?>">
+                            </td>
+                            <td style="vertical-align: middle">合約交期<br />(到工地)</td>
+                            <td>
+                                <input class="form-control " type="date" id="contract_arrival_date" name="contract_arrival_date" value="<?php echo $contract_arrival_date; ?>">
+                            </td>
+                            <!-- <td style="vertical-align: middle">預計交期<br />(到工地)</td>
+                            <td>
+                                <input class="form-control " type="date" include_once="real_contract_arrival_date" name="real_contract_arrival_date" value="<?php echo $real_contract_arrival_date; ?>">
+                            </td> -->
+                            <td>
+                                <input type="radio" name="qc_official_type" id='qc_official_type_QO' value='QO' checked/>
+                                <label for="qc_official_type_QO">QC + 官檢</label>
+                                <input type="radio" name="qc_official_type" id='qc_official_type_Q' value='Q'  />
+                                <label for="qc_official_type_Q">只需QC</label>
+                                <input type="radio" name="qc_official_type" id='qc_official_type_O' value='O' ?> 
+                                <label for="qc_official_type_O">只需官檢</label>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="vertical-align: middle">工地負責人</td>
+                            <td>
+                                <input class="form-control " type="text" name="site_manager" value="<?php echo $site_manager; ?>">
+                            </td>
+                            <td style="vertical-align: middle">營業員</td>
+                            <td style="vertical-align: middle">
+                                <select class="form-control " id="salesid" name="salesid">
+                                    <option value="">未選擇</option>
+                                    <?php
+                                    foreach ($sales_options as $sales_option) :
+                                        if ($sales_option['val'] == $salesid) {
+                                            echo "<option selected value='" . $sales_option['val'] . "'>" . $sales_option['val'] . $sales_option['label'] . "</option>";
+                                        } else {
+                                            echo "<option value='" . $sales_option['val'] . "'>" . $sales_option['val'] . $sales_option['label'] . "</option>";
+                                        }
+                                    endforeach
+                                    ?>
+                                </select>
+                            </td>
+                            <td style="vertical-align: middle">工務部門負責人</td>
+                            <td style="vertical-align: middle">
+                                <select class="form-control " id="warehouseid" name="warehouseid">
+                                    <option value="">未選擇</option>
+                                    <?php
+                                    foreach ($warehouse_options as $warehouse_option) :
+                                        if ($warehouse_option['val'] == $warehouseid) {
+                                            echo "<option selected value='" . $warehouse_option['val'] . "'>" . $warehouse_option['val'] . $warehouse_option['label'] . "</option>";
+                                        } else {
+                                            echo "<option value='" . $warehouse_option['val'] . "'>" . $warehouse_option['val'] . $warehouse_option['label'] . "</option>";
+                                        }
+                                    endforeach
+                                    ?>
+                                </select>
+                            </td>
+                        </tr>
+                    </thead>
+                </table>
+            </div>
+            <div class="col-md-12" style="margin-bottom:15px;">
+                <button onclick="savedata()" type="button" class="btn btn-primary btn-lg pull-right">確認後保存</button>
+            </div>
+        </div>
+    </form>
+    <script type="text/javascript">
+        function savedata() {
+            var savedataMessage = {
+                "0": "不明錯誤",
+                "1": "",
+                "2": "未選擇營業員",
+                "3": "合約編號未填寫",
+                "4": "作番號未填寫",
+                "5": "未選擇工務人員",
+                "6": "合約日未填寫"
+            }
+            if (getSavedataStatus() == '1') {
+                $('#form').submit();
+            } else {
+                typeof savedataMessage[getSavedataStatus()] == 'string' ? alert(savedataMessage[getSavedataStatus()]) : alert("不明錯誤");
+            }
+        }
+
+        function getSavedataStatus() {
+            if ($("#salesid").val() == '')
+                return '2'
+            if ($("#contractno").val() == '')
+                return '3'
+            if ($("#facilityno").val() == '')
+                return '4'
+            if ($("#warehouseid").val() == '')
+                return '5'
+            if ($("#contract_arrival_date").val() == '')
+                return '6'
+            if ($("#real_contract_arrival_date").val() == '')
+                return '6'
+            return '1'
+        }
+    </script>
+
+<?php
+} else {
+    echo "錯誤的訪問";
+}
+
 ?>
\ No newline at end of file
diff --git a/wms/wipwhole-rec-renovate-invoice.php b/wms/wipwhole-rec-renovate-invoice.php
index 1550676d..1229e2b0 100644
--- a/wms/wipwhole-rec-renovate-invoice.php
+++ b/wms/wipwhole-rec-renovate-invoice.php
@@ -1,859 +1,859 @@
-<?php
-
-/**
- * 流程規則:(需更改)
- * 1.A:工務主管確認中  B:營業員確認中  C:設計部門人員確認中 D:生管主管確認中 Z:生管確認完成        
- * 
- *  新梯        543 筆  (已匯入)
- *  舊改        141 筆  (資料未洗入)
- *  已簽回      684 筆 (共計)
- */
-
-// error_reporting(0);
-include "header.php";
-
-// 載入db.php來連結資料庫
-require_once "database.php";
-
-
-// 所屬部門
-$sql = "select department_id from account where accountid = '$user_id'";
-$res = mysqli_query($link, $sql);
-$row = mysqli_fetch_row($res);
-$department_id = $row[0];
-mysqli_free_result($res);
-// 生管及資訊才可以訪問
-if ($department_id == "321" || $department_id == "220") {
-
-    /**
-     * 檢查作番是否重複 true:重複 false:沒重複
-     * @param mysqli $link 資料庫連線檔
-     * @param string $facilityno 檢查的作番號
-     */
-    function checkFacilitynoRepeat($link, $facilityno)
-    {
-        $sql = "
-            SELECT 
-                COUNT(*) 
-            FROM wipwholestatus
-            WHERE facilityno = '$facilityno'
-        ";
-        $result = mysqli_query($link, $sql);
-        $row = mysqli_fetch_array($result);
-        return $row['0'] > 0 ? true : false;
-    }
-
-    // 預設新梯代碼 A
-    $contract_type = '';
-    // 合約號
-    $contractno = '';
-    // 營業員ID
-    $salesid = '';
-    // 工務人員ID
-    $warehouseid = '';
-    // 客戶姓名
-    $custom = '';
-    // 工地負責人
-    $site_manager = '';
-    // 客戶id
-    $accountid = '';
-    // 作番號
-    $facilityno = '';
-    // 號機
-    $facility_temp_no = '';
-    // 緯度
-    $latitude = '';
-    // 經度
-    $longitude = '';
-    // 載重
-    $weight = '';
-    // 人乘
-    $numberofpassenger = '';
-    // 樓停
-    $numberofstop = '';
-    // 樓層
-    $numberoffloor = '';
-    // 開門方式
-    $opentype = '';
-    // 速度
-    $speed = '';
-    // 機型
-    $facility_kind = '';
-    // 地址
-    $address = '';
-    // 合約到貨日
-    $contract_arrival_date = '';
-    // 實際到貨日
-    $real_contract_arrival_date = '';
-
-    // 營業規格確認
-    $sales_spec_verify = '';
-    // 營業規格附件
-    $sales_spec_verify_file = '';
-    // 營業規格確認時間	
-    $sales_spec_verify_at = '';
-    // 營業規格確認人
-    $sales_spec_verify_owner = '';
-
-    // 客戶計劃圖確認
-    $customer_planning_verify = '';
-    // 客戶計劃圖附件	
-    $customer_planning_verify_file = '';
-    // 客戶計劃圖確認時間
-    $customer_planning_verify_at = '';
-    // 客戶計劃圖確認人
-    $customer_planning_verify_owner = '';
-
-    // 客戶顏色確認
-    $customer_color_verify = '';
-    // 客戶顏色附件	
-    $customer_color_verify_file = '';
-    // 客戶顏色確認時間    
-    $customer_color_verify_at = '';
-    // 客戶顏色確認人
-    $customer_color_verify_owner = '';
-
-    // 工勘聯絡表
-    $site_survey_contact_form_verify = '';
-    // 工勘聯絡表附件
-    $site_survey_contact_form_verify_file = '';
-    // 工勘聯絡表確認時間
-    $site_survey_contact_form_verify_at = '';
-    // 工勘聯絡表確認人	
-    $site_survey_contact_form_verify_owner = '';
-
-    // 設計規格確認
-    $desin_spec_verify = '';
-    // 設計規格確認附件    
-    $desin_spec_verify_file = '';
-    // 設計規格確認時間
-    $desin_spec_verify_at = '';
-    // 設計規格確認確認人
-    $desin_spec_verify_owner = '';
-
-    // 設計計劃圖確認
-    $desin_planning_verify = '';
-    // 設計計劃圖確認附件	    
-    $desin_planning_verify_file = '';
-    // 設計計劃圖確認時間	     
-    $desin_planning_verify_at = '';
-    // 設計計劃圖確認人	
-    $desin_planning_verify_owner = '';
-
-    // 設計顏色確認
-    $desin_color_verify = '';
-    // 設計顏色確認附件	  
-    $desin_color_verify_file = '';
-    // 設計顏色確認時間	
-    $desin_color_verify_at = '';
-    // 設計顏色確認人	
-    $desin_color_verify_owner = '';
-
-    // 設計仕樣確認
-    $desin_style_verify = '';
-    // 設計仕樣確認附件	
-    $desin_style_verify_file = '';
-    // 設計仕樣確認時間
-    $desin_style_verify_at = '';
-    // 設計仕樣確認人
-    $desin_style_verify_owner = '';
-
-    // 設計主管確認
-    $desin_leader_verify = '';
-    // 設計主管確認附件	
-    $desin_leader_verify_file = '';
-    // 設計主管確認時間
-    $desin_leader_verify_at = '';
-    // 設計主管確認人
-    $desin_leader_verify_owner = '';
-
-    // 樓高通報
-    $building_heigh_verify = '';
-    // 樓高通報附件	
-    $building_heigh_verify_file = '';
-    // 樓高通報時間	     
-    $building_heigh_verify_at = '';
-    // 樓高通報確認人	
-    $building_heigh_verify_owner = '';
-
-    // 電氣發貨明細
-    $electrical_design_publish = '';
-    // 電氣資料發行時間	
-    $electrical_design_publish_at = '';
-    // 電氣資料發行人	
-    $electrical_design_publish_owner = '';
-
-    // 機械資料發行
-    $mechanical_design_publish = '';
-    // 機械資料發行時間	
-    $mechanical_design_publish_at = '';
-    // 機械資料發行人
-    $mechanical_design_publish_owner = '';
-
-    // 電氣發貨明細	
-    $electrical_shipping_date_publish = '';
-    // 電氣發貨明細時間	
-    $electrical_shipping_date_publish_at = '';
-    // 電氣發貨明細發行人
-    $electrical_shipping_date_publish_owner = '';
-
-    // 機械發貨明細
-    $mechanical_shipping_date_publish = '';
-    // 機械發貨明細時間
-    $mechanical_shipping_date_publish_at = '';
-    // 機械發貨明細發行人
-    $mechanical_shipping_date_publish_owner = '';
-
-    // 下單日(普來特富)	
-    $prattford_order_date = '';
-    // 預計發貨日(到港日)	
-    $estimated_shipping_date = '';
-    // 發貨類別(A.全級發貨、G.欠件發貨)
-    $goods_type = '';
-    // 實際到貨日(到觀音廠日)
-    $actual_tofactory_date = '';
-    // 發貨確認人	
-    $shipping_date_owner = '';
-    // 預計船期	
-    $estimated_shipping_schedule_date = '';
-    // 實際到貨日(到港日)
-    $actual_arrival_date = '';
-    // 到貨確認人
-    $arrival_date_owner = '';
-
-    // 是否齊備	
-    $shengguanok_status = '';
-    // 生管確認附件	
-    $shengguanok_status_file = '';
-    // 已備齊時間	
-    $shengguanok_status_at = '';
-    // 已備齊檢查人
-    $shengguanok_status_owner = '';
-
-    // 建立人
-    $creater = '';
-    // 建立時間	
-    $create_at = '';
-
-
-    if ($_SERVER["REQUEST_METHOD"] == "POST") {
-
-        // 預設新梯代碼 A
-        $contract_type = postCheck('contract_type', 'A');
-        // 合約號
-        $contractno  = postCheck('contractno');
-        // 營業員ID
-        $salesid = postCheck('salesid');
-        // 工務人員ID
-        $warehouseid = postCheck('warehouseid');
-        // 客戶姓名
-        $custom = postCheck('custom');
-        // 工地負責人
-        $site_manager = postCheck('site_manager');
-        // 客戶id
-        $accountid = postCheck('accountid');
-        // 作番號
-        $facilityno =  postCheck('facilityno');
-        // 作番號
-        $facility_temp_no =  postCheck('facility_temp_no');
-        // 緯度
-        $latitude = postCheck('latitude');
-        // 經度
-        $longitude = postCheck('longitude');
-        // 載重
-        $weight = postCheck('weight');
-        // 人乘
-        $numberofpassenger = postCheck('numberofpassenger');
-        // 樓停
-        $numberofstop = postCheck('numberofstop');
-        // 樓層
-        $numberoffloor = postCheck('numberoffloor');
-        // 開門方式
-        $opentype = postCheck('opentype');
-        // 速度
-        $speed = postCheck('speed');
-        // 機型
-        $facility_kind = postCheck('facility_kind');
-        // 地址
-        $address = postCheck('address');
-        // 合約到貨日
-        $contract_arrival_date = postCheck('contract_arrival_date');
-        // 實際到貨日
-        $real_contract_arrival_date = postCheck('real_contract_arrival_date');
-
-        // 營業規格確認
-        $sales_spec_verify = postCheck('sales_spec_verify');
-        // 營業規格附件
-        $sales_spec_verify_file = postCheck('sales_spec_verify_file');
-        // 營業規格確認時間	
-        $sales_spec_verify_at = postCheck('sales_spec_verify_at');
-        // 營業規格確認人
-        $sales_spec_verify_owner = postCheck('sales_spec_verify_owner');
-
-        // 客戶計劃圖確認
-        $customer_planning_verify = postCheck('customer_planning_verify');
-        // 客戶計劃圖附件	
-        $customer_planning_verify_file = postCheck('customer_planning_verify_file');
-        // 客戶計劃圖確認時間
-        $customer_planning_verify_at = postCheck('customer_planning_verify_at');
-        // 客戶計劃圖確認人
-        $customer_planning_verify_owner = postCheck('customer_planning_verify_owner');
-
-        // 客戶顏色確認
-        $customer_color_verify = postCheck('customer_color_verify');
-        // 客戶顏色附件	
-        $customer_color_verify_file = postCheck('customer_color_verify_file');
-        // 客戶顏色確認時間    
-        $customer_color_verify_at = postCheck('customer_color_verify_at');
-        // 客戶顏色確認人
-        $customer_color_verify_owner = postCheck('customer_color_verify_owner');
-
-        // 工勘聯絡表
-        $site_survey_contact_form_verify = postCheck('site_survey_contact_form_verify');
-        // 工勘聯絡表附件
-        $site_survey_contact_form_verify_file = postCheck('site_survey_contact_form_verify_file');
-        // 工勘聯絡表確認時間
-        $site_survey_contact_form_verify_at = postCheck('site_survey_contact_form_verify_at');
-        // 工勘聯絡表確認人	
-        $site_survey_contact_form_verify_owner = postCheck('site_survey_contact_form_verify_owner');
-
-        // 設計規格確認
-        $desin_spec_verify = postCheck('desin_spec_verify');
-        // 設計規格確認附件    
-        $desin_spec_verify_file = postCheck('desin_spec_verify_file');
-        // 設計規格確認時間
-        $desin_spec_verify_at = postCheck('desin_spec_verify_at');
-        // 設計規格確認確認人
-        $desin_spec_verify_owner = postCheck('desin_spec_verify_owner');
-
-        // 設計計劃圖確認
-        $desin_planning_verify = postCheck('desin_planning_verify');
-        // 設計計劃圖確認附件	    
-        $desin_planning_verify_file = postCheck('desin_planning_verify_file');
-        // 設計計劃圖確認時間	     
-        $desin_planning_verify_at = postCheck('desin_planning_verify_at');
-        // 設計計劃圖確認人	
-        $desin_planning_verify_owner = postCheck('desin_planning_verify_owner');
-
-        // 設計顏色確認
-        $desin_color_verify = postCheck('desin_color_verify');
-        // 設計顏色確認附件	  
-        $desin_color_verify_file = postCheck('desin_color_verify_file');
-        // 設計顏色確認時間	
-        $desin_color_verify_at = postCheck('desin_color_verify_at');
-        // 設計顏色確認人	
-        $desin_color_verify_owner = postCheck('desin_color_verify_owner');
-
-        // 設計仕樣確認
-        $desin_style_verify = postCheck('desin_style_verify');
-        // 設計仕樣確認附件	
-        $desin_style_verify_file = postCheck('desin_style_verify_file');
-        // 設計仕樣確認時間
-        $desin_style_verify_at = postCheck('desin_style_verify_at');
-        // 設計仕樣確認人
-        $desin_style_verify_owner = postCheck('desin_style_verify_owner');
-
-        // 設計主管確認
-        $desin_leader_verify = postCheck('desin_leader_verify');
-        // 設計主管確認附件	
-        $desin_leader_verify_file = postCheck('desin_leader_verify_file');
-        // 設計主管確認時間
-        $desin_leader_verify_at = postCheck('desin_leader_verify_at');
-        // 設計主管確認人
-        $desin_leader_verify_owner = postCheck('desin_leader_verify_owner');
-
-        // 樓高通報
-        $building_heigh_verify = postCheck('building_heigh_verify');
-        // 樓高通報附件	
-        $building_heigh_verify_file = postCheck('building_heigh_verify_file');
-        // 樓高通報時間	     
-        $building_heigh_verify_at = postCheck('building_heigh_verify_at');
-        // 樓高通報確認人	
-        $building_heigh_verify_owner = postCheck('building_heigh_verify_owner');
-
-        // 電氣發貨明細
-        $electrical_design_publish = postCheck('electrical_design_publish');
-        // 電氣資料發行時間	
-        $electrical_design_publish_at = postCheck('electrical_design_publish_at');
-        // 電氣資料發行人	
-        $electrical_design_publish_owner = postCheck('electrical_design_publish_owner');
-
-        // 機械資料發行
-        $mechanical_design_publish = postCheck('mechanical_design_publish');
-        // 機械資料發行時間	
-        $mechanical_design_publish_at = postCheck('mechanical_design_publish_at');
-        // 機械資料發行人
-        $mechanical_design_publish_owner = postCheck('mechanical_design_publish_owner');
-
-        // 電氣發貨明細	
-        $electrical_shipping_date_publish = postCheck('electrical_shipping_date_publish');
-        // 電氣發貨明細時間	
-        $electrical_shipping_date_publish_at = postCheck('electrical_shipping_date_publish_at');
-        // 電氣發貨明細發行人
-        $electrical_shipping_date_publish_owner = postCheck('electrical_shipping_date_publish_owner');
-
-        // 機械發貨明細
-        $mechanical_shipping_date_publish = postCheck('mechanical_shipping_date_publish');
-        // 機械發貨明細時間
-        $mechanical_shipping_date_publish_at = postCheck('mechanical_shipping_date_publish_at');
-        // 機械發貨明細發行人
-        $mechanical_shipping_date_publish_owner = postCheck('mechanical_shipping_date_publish_owner');
-
-        // 普來特富(下單日)	
-        $prattford_order_date = postCheck('prattford_order_date');
-        // 預計發貨日(到港日)	
-        $estimated_shipping_date = postCheck('estimated_shipping_date');
-        // 發貨類別(A.全級發貨、G.欠件發貨)
-        $goods_type = postCheck('goods_type');
-        // 實際到貨日(到觀音廠日)
-        $actual_tofactory_date = postCheck('actual_tofactory_date');
-        // 發貨確認人	
-        $shipping_date_owner = postCheck('shipping_date_owner');
-        // 預計船期
-        $estimated_shipping_schedule_date = postCheck('estimated_shipping_schedule_date');
-        // 實際到貨日(到港日)
-        $actual_arrival_date = postCheck('actual_arrival_date');
-        // 到貨確認人
-        $arrival_date_owner = postCheck('arrival_date_owner');
-
-        // 是否齊備	
-        $shengguanok_status = postCheck('shengguanok_status');
-        // 生管確認附件	
-        $shengguanok_status_file = postCheck('shengguanok_status_file');
-        // 已備齊時間	
-        $shengguanok_status_at = postCheck('shengguanok_status_at');
-        // 已備齊檢查人
-        $shengguanok_status_owner = postCheck('shengguanok_status_owner');
-
-        // 建立人
-        $creater = postCheck('creater');
-        // 建立時間	
-        $create_at = postCheck('create_at');
-
-
-        //插入數據庫數據  gary_version
-        $insertsql = "
-            INSERT INTO wipwholestatus (
-                contract_type, 
-                contractno, 
-                salesid, 
-                custom, 
-                site_manager,
-                accountid, 
-                facilityno, 
-                facility_temp_no,
-                latitude, 
-                longitude,
-                weight, 
-                numberofpassenger, 
-                numberofstop, 
-                numberoffloor, 
-                opentype, 
-                speed, 
-                facility_kind,
-                address, 
-                contract_arrival_date, 
-                real_contract_arrival_date, 
-                sales_spec_verify, 
-                sales_spec_verify_file,
-                sales_spec_verify_at, 
-                sales_spec_verify_owner, 
-                customer_planning_verify, 
-                customer_planning_verify_file,
-                customer_planning_verify_at, 
-                customer_planning_verify_owner, 
-                customer_color_verify, 
-                customer_color_verify_file,
-                customer_color_verify_at, 
-                customer_color_verify_owner, 
-                site_survey_contact_form_verify, 
-                site_survey_contact_form_verify_file,
-                site_survey_contact_form_verify_at, 
-                site_survey_contact_form_verify_owner, 
-                desin_spec_verify, 
-                desin_spec_verify_file,
-                desin_spec_verify_at, 
-                desin_spec_verify_owner, 
-                desin_planning_verify, 
-                desin_planning_verify_file, 
-                desin_planning_verify_at,
-                desin_planning_verify_owner, 
-                desin_color_verify, 
-                desin_color_verify_file, 
-                desin_color_verify_at, 
-                desin_color_verify_owner,
-                desin_style_verify, 
-                desin_style_verify_file, 
-                desin_style_verify_at, 
-                desin_style_verify_owner, 
-                desin_leader_verify,
-                desin_leader_verify_file, 
-                desin_leader_verify_at, 
-                desin_leader_verify_owner, 
-                building_heigh_verify,
-                building_heigh_verify_file, 
-                building_heigh_verify_at, 
-                building_heigh_verify_owner, 
-                electrical_design_publish,
-                electrical_design_publish_at, 
-                electrical_design_publish_owner, 
-                mechanical_design_publish, 
-                mechanical_design_publish_at,
-                mechanical_design_publish_owner, 
-                electrical_shipping_date_publish, 
-                electrical_shipping_date_publish_at,
-                electrical_shipping_date_publish_owner, 
-                mechanical_shipping_date_publish, 
-                mechanical_shipping_date_publish_at,
-                mechanical_shipping_date_publish_owner, 
-                prattford_order_date,
-                estimated_shipping_date, 
-                goods_type, 
-                actual_tofactory_date, 
-                shipping_date_owner,
-                estimated_shipping_schedule_date, 
-                actual_arrival_date, 
-                arrival_date_owner, 
-                shengguanok_status, 
-                shengguanok_status_file,
-                shengguanok_status_at, 
-                shengguanok_status_owner, 
-                creater, 
-                create_at
-            ) VALUES (
-                '$contract_type', 
-                '$contractno', 
-                '$salesid', 
-                '$custom', 
-                '$site_manager', 
-                '$accountid', 
-                '$facilityno', 
-                '$facility_temp_no',
-                '$latitude', 
-                '$longitude',
-                '$weight', 
-                '$numberofpassenger', 
-                '$numberofstop', 
-                '$numberoffloor', 
-                '$opentype', 
-                '$speed', 
-                '$facility_kind',
-                '$address', 
-                '$contract_arrival_date', 
-                '$contract_arrival_date', 
-                '$sales_spec_verify', 
-                '$sales_spec_verify_file',
-                '$sales_spec_verify_at', 
-                '$sales_spec_verify_owner', 
-                '$customer_planning_verify', 
-                '$customer_planning_verify_file',
-                '$customer_planning_verify_at', 
-                '$customer_planning_verify_owner', 
-                '$customer_color_verify', 
-                '$customer_color_verify_file',
-                '$customer_color_verify_at', 
-                '$customer_color_verify_owner', 
-                '$site_survey_contact_form_verify', 
-                '$site_survey_contact_form_verify_file',
-                '$site_survey_contact_form_verify_at', 
-                '$site_survey_contact_form_verify_owner', 
-                '$desin_spec_verify', 
-                '$desin_spec_verify_file',
-                '$desin_spec_verify_at', 
-                '$desin_spec_verify_owner', 
-                '$desin_planning_verify', 
-                '$desin_planning_verify_file', 
-                '$desin_planning_verify_at',
-                '$desin_planning_verify_owner', 
-                '$desin_color_verify', 
-                '$desin_color_verify_file', 
-                '$desin_color_verify_at', 
-                '$desin_color_verify_owner',
-                '$desin_style_verify', 
-                '$desin_style_verify_file', 
-                '$desin_style_verify_at', 
-                '$desin_style_verify_owner', 
-                '$desin_leader_verify',
-                '$desin_leader_verify_file', 
-                '$desin_leader_verify_at', 
-                '$desin_leader_verify_owner', 
-                '$building_heigh_verify',
-                '$building_heigh_verify_file', 
-                '$building_heigh_verify_at', 
-                '$building_heigh_verify_owner', 
-                '$electrical_design_publish',
-                '$electrical_design_publish_at', 
-                '$electrical_design_publish_owner', 
-                '$mechanical_design_publish', 
-                '$mechanical_design_publish_at',
-                '$mechanical_design_publish_owner', 
-                '$electrical_shipping_date_publish', 
-                '$electrical_shipping_date_publish_at',
-                '$electrical_shipping_date_publish_owner', 
-                '$mechanical_shipping_date_publish', 
-                '$mechanical_shipping_date_publish_at',
-                '$mechanical_shipping_date_publish_owner', 
-                '$prattford_order_date', 
-                '$estimated_shipping_date', 
-                '$goods_type', 
-                '$actual_tofactory_date', 
-                '$shipping_date_owner',
-                '$estimated_shipping_schedule_date', 
-                '$actual_arrival_date', 
-                '$arrival_date_owner', 
-                '$shengguanok_status', 
-                '$shengguanok_status_file',
-                '$shengguanok_status_at', 
-                '$shengguanok_status_owner', 
-                '$creater', 
-                '$create_at'
-            )
-        ";
-
-        // 檢查作番號是否重複 
-        if (checkFacilitynoRepeat($link, $facilityno)) {
-            echo "
-            <script>
-                alert('此作番號重複');
-            </script>
-        ";
-        } else {
-            mysqli_query($link, $insertsql);
-            $last_form_id = mysqli_insert_id($link);
-            // 寫入待簽程狀態 A (營業)
-            do_wws_assign($salesid, $last_form_id, 'A');
-            // 寫入待簽程狀態 G (工務)
-            do_wws_assign($warehouseid, $last_form_id, 'G');
-            echo "
-                <script>
-                    alert('新增完成');
-                </script>
-            ";
-        }
-    }
-
-    // 開門方式 select => options
-    $sql = "
-        SELECT 
-            code_name AS val ,
-            content AS label 
-        FROM code F
-        WHERE field_name='open_kind'
-        ORDER BY label ASC
-    ";
-    $opendoor_options = mysqli_query($link, $sql);
-
-    // 所有營業員 select => options
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM account
-        WHERE department_id IN ('311','312','313','314','315')
-        ORDER BY label ASC
-    ";
-    $sales_options = mysqli_query($link, $sql);
-
-    // 所有工務人員 select => options
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM account
-        WHERE department_id IN ('521')
-        AND role_id IN ('3','4','5')
-        ORDER BY label ASC
-    ";
-    $warehouse_options = mysqli_query($link, $sql);
-
-?>
-    <form method="post" id="form" enctype="multipart/form-data">
-        <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>">
-        <input class="form-control " type="hidden" name="sales_spec_verify" value="1">
-        <input class="form-control " type="hidden" name="customer_planning_verify" value="1">
-        <input class="form-control " type="hidden" name="customer_color_verify" value="1">
-        <input class="form-control " type="hidden" name="customer_style_verify" value="1">
-        <input class="form-control " type="hidden" name="site_survey_contact_form_verify" value="1">
-        <input class="form-control " type="hidden" name="desin_spec_verify" value="1">
-        <input class="form-control " type="hidden" name="desin_planning_verify" value="1">
-        <input class="form-control " type="hidden" name="desin_color_verify" value="1">
-        <input class="form-control " type="hidden" name="desin_style_verify" value="1">
-        <input class="form-control " type="hidden" name="desin_leader_verify" value="1">
-        <input class="form-control " type="hidden" name="building_heigh_verify" value="1">
-        <input class="form-control " type="hidden" name="electrical_design_publish" value="1">
-        <input class="form-control " type="hidden" name="mechanical_design_publish" value="1">
-        <input class="form-control " type="hidden" name="electrical_shipping_date_publish" value="1">
-        <input class="form-control " type="hidden" name="mechanical_shipping_date_publish" value="1">
-        <input class="form-control " type="hidden" name="shengguanok_status" value="1">
-        <input class="form-control " type="hidden" name="create_at" value="<?= date('Y/m/d H:i:s'); ?>">
-        <div class="container-fluid" id="accountadd">
-            <div class="text-center">
-                <h3>作番大日程</h3>
-            </div>
-            <div class="form-horizontal">
-                <table class="table" style="width:100%">
-                    <thead style="margin-bottom: 20px">
-                        <tr>
-                            <td style="vertical-align: middle">合約號</td>
-                            <td>
-                                <input class="form-control " type="text" id="contractno" name="contractno" value="<?php echo $contractno; ?>">
-                            </td>
-                            <td style="vertical-align: middle">作番號</td>
-                            <td>
-                                <input class="form-control " type="text" id="facilityno" name="facilityno" value="<?php echo $facilityno; ?>">
-                            </td>
-                            <td style="vertical-align: middle">客戶名稱</td>
-                            <td>
-                                <input class="form-control " type="text" name="custom" value="<?php echo $custom; ?>">
-                            </td>
-                            <td style="vertical-align: middle">號機</td>
-                            <td>
-                                <input class="form-control " type="text" name="facility_temp_no" value="<?php echo $facility_temp_no; ?>">
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="vertical-align: middle">緯度</td>
-                            <td>
-                                <input class="form-control " type="text" name="latitude" value="<?php echo $latitude; ?>">
-                            </td>
-                            <td style="vertical-align: middle">經度</td>
-                            <td>
-                                <input class="form-control " type="text" name="longitude" value="<?php echo $longitude; ?>">
-                            </td>
-                            <td style="vertical-align: middle">地址</td>
-                            <td>
-                                <input class="form-control " type="text" name="address" value="<?php echo $address; ?>">
-                            </td>
-                            <td style="vertical-align: middle">機型</td>
-                            <td>
-                                <input class="form-control " type="text" name="facility_kind" value="<?php echo $facility_kind; ?>">
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="vertical-align: middle">載重</td>
-                            <td>
-                                <input class="form-control " type="number" min="0" name="weight" value="<?php echo $weight; ?>">
-                            </td>
-                            <td style="vertical-align: middle">人乘</td>
-                            <td>
-                                <input class="form-control " type="number" min="0" name="numberofpassenger" value="<?php echo $numberofpassenger; ?>">
-                            </td>
-                            <td style="vertical-align: middle">樓停</td>
-                            <td>
-                                <input class="form-control " type="number" min="0" name="numberofstop" value="<?php echo $numberofstop; ?>">
-                            </td>
-                            <td style="vertical-align: middle">樓層</td>
-                            <td>
-                                <input class="form-control " type="number" min="0" name="numberoffloor" value="<?php echo $numberoffloor; ?>">
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="vertical-align: middle">開門方式</td>
-                            <td style="vertical-align: middle">
-                                <select class="form-control " name="opentype">
-                                    <option value="">未選擇</option>
-                                    <?php
-                                    foreach ($opendoor_options as $opendoor_option) :
-                                        if ($opendoor_option['label'] == $opentype) {
-                                            echo "<option selected value='" . $opendoor_option['label'] . "'>" . $opendoor_option['label'] . "</option>";
-                                        } else {
-                                            echo "<option value='" . $opendoor_option['label'] . "'>" . $opendoor_option['label'] . "</option>";
-                                        }
-                                    endforeach
-                                    ?>
-                                </select>
-                            </td>
-                            <td style="vertical-align: middle">速度</td>
-                            <td>
-                                <input class="form-control " type="number" name="speed" gt="0" min="0" value="<?php echo $speed; ?>">
-                            </td>
-                            <td style="vertical-align: middle">合約交期<br />(到工地)</td>
-                            <td>
-                                <input class="form-control " type="datetime-local" name="contract_arrival_date" value="<?php echo $contract_arrival_date; ?>">
-                            </td>
-                            <!-- <td style="vertical-align: middle">預計交期<br />(到工地)</td>
-                            <td>
-                                <input class="form-control " type="datetime-local" name="real_contract_arrival_date" value="<?php echo $real_contract_arrival_date; ?>">
-                            </td> -->
-                        </tr>
-                        <tr>
-                            <td style="vertical-align: middle">工地負責人</td>
-                            <td>
-                                <input class="form-control " type="text" name="site_manager" value="<?php echo $site_manager; ?>">
-                            </td>
-                            <td style="vertical-align: middle">營業員</td>
-                            <td style="vertical-align: middle">
-                                <select class="form-control " id="salesid" name="salesid">
-                                    <option value="">未選擇</option>
-                                    <?php
-                                    foreach ($sales_options as $sales_option) :
-                                        if ($sales_option['val'] == $salesid) {
-                                            echo "<option selected value='" . $sales_option['val'] . "'>" . $sales_option['val'] . $sales_option['label'] . "</option>";
-                                        } else {
-                                            echo "<option value='" . $sales_option['val'] . "'>" . $sales_option['val'] . $sales_option['label'] . "</option>";
-                                        }
-                                    endforeach
-                                    ?>
-                                </select>
-                            </td>
-                            <td style="vertical-align: middle">工務部門負責人</td>
-                            <td style="vertical-align: middle">
-                                <select class="form-control " id="warehouseid" name="warehouseid">
-                                    <option value="">未選擇</option>
-                                    <?php
-                                    foreach ($warehouse_options as $warehouse_option) :
-                                        if ($warehouse_option['val'] == $warehouseid) {
-                                            echo "<option selected value='" . $warehouse_option['val'] . "'>" . $warehouse_option['val'] . $warehouse_option['label'] . "</option>";
-                                        } else {
-                                            echo "<option value='" . $warehouse_option['val'] . "'>" . $warehouse_option['val'] . $warehouse_option['label'] . "</option>";
-                                        }
-                                    endforeach
-                                    ?>
-                                </select>
-                            </td>
-                        </tr>
-                    </thead>
-                </table>
-            </div>
-            <div class="col-md-12" style="margin-bottom:15px;">
-                <button onclick="savedata()" type="button" class="btn btn-primary btn-lg pull-right">確認後保存</button>
-            </div>
-        </div>
-    </form>
-    <script type="text/javascript">
-        function savedata() {
-            var savedataMessage = {
-                "0": "不明錯誤",
-                "1": "",
-                "2": "未選擇營業員",
-                "3": "合約編號未填寫",
-                "4": "作番號未填寫",
-                "5": "未選擇工務人員"
-            }
-            if (getSavedataStatus() == '1') {
-                $('#form').submit();
-            } else {
-                typeof savedataMessage[getSavedataStatus()] == 'string' ? alert(savedataMessage[getSavedataStatus()]) : alert("不明錯誤");
-            }
-
-        }
-
-        function getSavedataStatus() {
-            if ($("#salesid").val() == '')
-                return '2'
-            if ($("#contractno").val() == '')
-                return '3'
-            if ($("#facilityno").val() == '')
-                return '4'
-            if ($("#warehouseid").val() == '')
-                return '5'
-            return '1'
-        }
-    </script>
-
-<?php
-} else {
-    echo "錯誤的訪問";
-}
-
+<?php
+
+/**
+ * 流程規則:(需更改)
+ * 1.A:工務主管確認中  B:營業員確認中  C:設計部門人員確認中 D:生管主管確認中 Z:生管確認完成        
+ * 
+ *  新梯        543 筆  (已匯入)
+ *  舊改        141 筆  (資料未洗入)
+ *  已簽回      684 筆 (共計)
+ */
+
+// error_reporting(0);
+include "header.php";
+
+// 載入db.php來連結資料庫
+require_once "database.php";
+
+
+// 所屬部門
+$sql = "select department_id from account where accountid = '$user_id'";
+$res = mysqli_query($link, $sql);
+$row = mysqli_fetch_row($res);
+$department_id = $row[0];
+mysqli_free_result($res);
+// 生管及資訊才可以訪問
+if ($department_id == "321" || $department_id == "220") {
+
+    /**
+     * 檢查作番是否重複 true:重複 false:沒重複
+     * @param mysqli $link 資料庫連線檔
+     * @param string $facilityno 檢查的作番號
+     */
+    function checkFacilitynoRepeat($link, $facilityno)
+    {
+        $sql = "
+            SELECT 
+                COUNT(*) 
+            FROM wipwholestatus
+            WHERE facilityno = '$facilityno'
+        ";
+        $result = mysqli_query($link, $sql);
+        $row = mysqli_fetch_array($result);
+        return $row['0'] > 0 ? true : false;
+    }
+
+    // 預設新梯代碼 A
+    $contract_type = '';
+    // 合約號
+    $contractno = '';
+    // 營業員ID
+    $salesid = '';
+    // 工務人員ID
+    $warehouseid = '';
+    // 客戶姓名
+    $custom = '';
+    // 工地負責人
+    $site_manager = '';
+    // 客戶id
+    $accountid = '';
+    // 作番號
+    $facilityno = '';
+    // 號機
+    $facility_temp_no = '';
+    // 緯度
+    $latitude = '';
+    // 經度
+    $longitude = '';
+    // 載重
+    $weight = '';
+    // 人乘
+    $numberofpassenger = '';
+    // 樓停
+    $numberofstop = '';
+    // 樓層
+    $numberoffloor = '';
+    // 開門方式
+    $opentype = '';
+    // 速度
+    $speed = '';
+    // 機型
+    $facility_kind = '';
+    // 地址
+    $address = '';
+    // 合約到貨日
+    $contract_arrival_date = '';
+    // 實際到貨日
+    $real_contract_arrival_date = '';
+
+    // 營業規格確認
+    $sales_spec_verify = '';
+    // 營業規格附件
+    $sales_spec_verify_file = '';
+    // 營業規格確認時間	
+    $sales_spec_verify_at = '';
+    // 營業規格確認人
+    $sales_spec_verify_owner = '';
+
+    // 客戶計劃圖確認
+    $customer_planning_verify = '';
+    // 客戶計劃圖附件	
+    $customer_planning_verify_file = '';
+    // 客戶計劃圖確認時間
+    $customer_planning_verify_at = '';
+    // 客戶計劃圖確認人
+    $customer_planning_verify_owner = '';
+
+    // 客戶顏色確認
+    $customer_color_verify = '';
+    // 客戶顏色附件	
+    $customer_color_verify_file = '';
+    // 客戶顏色確認時間    
+    $customer_color_verify_at = '';
+    // 客戶顏色確認人
+    $customer_color_verify_owner = '';
+
+    // 工勘聯絡表
+    $site_survey_contact_form_verify = '';
+    // 工勘聯絡表附件
+    $site_survey_contact_form_verify_file = '';
+    // 工勘聯絡表確認時間
+    $site_survey_contact_form_verify_at = '';
+    // 工勘聯絡表確認人	
+    $site_survey_contact_form_verify_owner = '';
+
+    // 設計規格確認
+    $desin_spec_verify = '';
+    // 設計規格確認附件    
+    $desin_spec_verify_file = '';
+    // 設計規格確認時間
+    $desin_spec_verify_at = '';
+    // 設計規格確認確認人
+    $desin_spec_verify_owner = '';
+
+    // 設計計劃圖確認
+    $desin_planning_verify = '';
+    // 設計計劃圖確認附件	    
+    $desin_planning_verify_file = '';
+    // 設計計劃圖確認時間	     
+    $desin_planning_verify_at = '';
+    // 設計計劃圖確認人	
+    $desin_planning_verify_owner = '';
+
+    // 設計顏色確認
+    $desin_color_verify = '';
+    // 設計顏色確認附件	  
+    $desin_color_verify_file = '';
+    // 設計顏色確認時間	
+    $desin_color_verify_at = '';
+    // 設計顏色確認人	
+    $desin_color_verify_owner = '';
+
+    // 設計仕樣確認
+    $desin_style_verify = '';
+    // 設計仕樣確認附件	
+    $desin_style_verify_file = '';
+    // 設計仕樣確認時間
+    $desin_style_verify_at = '';
+    // 設計仕樣確認人
+    $desin_style_verify_owner = '';
+
+    // 設計主管確認
+    $desin_leader_verify = '';
+    // 設計主管確認附件	
+    $desin_leader_verify_file = '';
+    // 設計主管確認時間
+    $desin_leader_verify_at = '';
+    // 設計主管確認人
+    $desin_leader_verify_owner = '';
+
+    // 樓高通報
+    $building_heigh_verify = '';
+    // 樓高通報附件	
+    $building_heigh_verify_file = '';
+    // 樓高通報時間	     
+    $building_heigh_verify_at = '';
+    // 樓高通報確認人	
+    $building_heigh_verify_owner = '';
+
+    // 電氣發貨明細
+    $electrical_design_publish = '';
+    // 電氣資料發行時間	
+    $electrical_design_publish_at = '';
+    // 電氣資料發行人	
+    $electrical_design_publish_owner = '';
+
+    // 機械資料發行
+    $mechanical_design_publish = '';
+    // 機械資料發行時間	
+    $mechanical_design_publish_at = '';
+    // 機械資料發行人
+    $mechanical_design_publish_owner = '';
+
+    // 電氣發貨明細	
+    $electrical_shipping_date_publish = '';
+    // 電氣發貨明細時間	
+    $electrical_shipping_date_publish_at = '';
+    // 電氣發貨明細發行人
+    $electrical_shipping_date_publish_owner = '';
+
+    // 機械發貨明細
+    $mechanical_shipping_date_publish = '';
+    // 機械發貨明細時間
+    $mechanical_shipping_date_publish_at = '';
+    // 機械發貨明細發行人
+    $mechanical_shipping_date_publish_owner = '';
+
+    // 下單日(普來特富)	
+    $prattford_order_date = '';
+    // 預計發貨日(到港日)	
+    $estimated_shipping_date = '';
+    // 發貨類別(A.全級發貨、G.欠件發貨)
+    $goods_type = '';
+    // 實際到貨日(到觀音廠日)
+    $actual_tofactory_date = '';
+    // 發貨確認人	
+    $shipping_date_owner = '';
+    // 預計船期	
+    $estimated_shipping_schedule_date = '';
+    // 實際到貨日(到港日)
+    $actual_arrival_date = '';
+    // 到貨確認人
+    $arrival_date_owner = '';
+
+    // 是否齊備	
+    $shengguanok_status = '';
+    // 生管確認附件	
+    $shengguanok_status_file = '';
+    // 已備齊時間	
+    $shengguanok_status_at = '';
+    // 已備齊檢查人
+    $shengguanok_status_owner = '';
+
+    // 建立人
+    $creater = '';
+    // 建立時間	
+    $create_at = '';
+
+
+    if ($_SERVER["REQUEST_METHOD"] == "POST") {
+
+        // 預設新梯代碼 A
+        $contract_type = postCheck('contract_type', 'A');
+        // 合約號
+        $contractno  = postCheck('contractno');
+        // 營業員ID
+        $salesid = postCheck('salesid');
+        // 工務人員ID
+        $warehouseid = postCheck('warehouseid');
+        // 客戶姓名
+        $custom = postCheck('custom');
+        // 工地負責人
+        $site_manager = postCheck('site_manager');
+        // 客戶id
+        $accountid = postCheck('accountid');
+        // 作番號
+        $facilityno =  postCheck('facilityno');
+        // 作番號
+        $facility_temp_no =  postCheck('facility_temp_no');
+        // 緯度
+        $latitude = postCheck('latitude');
+        // 經度
+        $longitude = postCheck('longitude');
+        // 載重
+        $weight = postCheck('weight');
+        // 人乘
+        $numberofpassenger = postCheck('numberofpassenger');
+        // 樓停
+        $numberofstop = postCheck('numberofstop');
+        // 樓層
+        $numberoffloor = postCheck('numberoffloor');
+        // 開門方式
+        $opentype = postCheck('opentype');
+        // 速度
+        $speed = postCheck('speed');
+        // 機型
+        $facility_kind = postCheck('facility_kind');
+        // 地址
+        $address = postCheck('address');
+        // 合約到貨日
+        $contract_arrival_date = postCheck('contract_arrival_date');
+        // 實際到貨日
+        $real_contract_arrival_date = postCheck('real_contract_arrival_date');
+
+        // 營業規格確認
+        $sales_spec_verify = postCheck('sales_spec_verify');
+        // 營業規格附件
+        $sales_spec_verify_file = postCheck('sales_spec_verify_file');
+        // 營業規格確認時間	
+        $sales_spec_verify_at = postCheck('sales_spec_verify_at');
+        // 營業規格確認人
+        $sales_spec_verify_owner = postCheck('sales_spec_verify_owner');
+
+        // 客戶計劃圖確認
+        $customer_planning_verify = postCheck('customer_planning_verify');
+        // 客戶計劃圖附件	
+        $customer_planning_verify_file = postCheck('customer_planning_verify_file');
+        // 客戶計劃圖確認時間
+        $customer_planning_verify_at = postCheck('customer_planning_verify_at');
+        // 客戶計劃圖確認人
+        $customer_planning_verify_owner = postCheck('customer_planning_verify_owner');
+
+        // 客戶顏色確認
+        $customer_color_verify = postCheck('customer_color_verify');
+        // 客戶顏色附件	
+        $customer_color_verify_file = postCheck('customer_color_verify_file');
+        // 客戶顏色確認時間    
+        $customer_color_verify_at = postCheck('customer_color_verify_at');
+        // 客戶顏色確認人
+        $customer_color_verify_owner = postCheck('customer_color_verify_owner');
+
+        // 工勘聯絡表
+        $site_survey_contact_form_verify = postCheck('site_survey_contact_form_verify');
+        // 工勘聯絡表附件
+        $site_survey_contact_form_verify_file = postCheck('site_survey_contact_form_verify_file');
+        // 工勘聯絡表確認時間
+        $site_survey_contact_form_verify_at = postCheck('site_survey_contact_form_verify_at');
+        // 工勘聯絡表確認人	
+        $site_survey_contact_form_verify_owner = postCheck('site_survey_contact_form_verify_owner');
+
+        // 設計規格確認
+        $desin_spec_verify = postCheck('desin_spec_verify');
+        // 設計規格確認附件    
+        $desin_spec_verify_file = postCheck('desin_spec_verify_file');
+        // 設計規格確認時間
+        $desin_spec_verify_at = postCheck('desin_spec_verify_at');
+        // 設計規格確認確認人
+        $desin_spec_verify_owner = postCheck('desin_spec_verify_owner');
+
+        // 設計計劃圖確認
+        $desin_planning_verify = postCheck('desin_planning_verify');
+        // 設計計劃圖確認附件	    
+        $desin_planning_verify_file = postCheck('desin_planning_verify_file');
+        // 設計計劃圖確認時間	     
+        $desin_planning_verify_at = postCheck('desin_planning_verify_at');
+        // 設計計劃圖確認人	
+        $desin_planning_verify_owner = postCheck('desin_planning_verify_owner');
+
+        // 設計顏色確認
+        $desin_color_verify = postCheck('desin_color_verify');
+        // 設計顏色確認附件	  
+        $desin_color_verify_file = postCheck('desin_color_verify_file');
+        // 設計顏色確認時間	
+        $desin_color_verify_at = postCheck('desin_color_verify_at');
+        // 設計顏色確認人	
+        $desin_color_verify_owner = postCheck('desin_color_verify_owner');
+
+        // 設計仕樣確認
+        $desin_style_verify = postCheck('desin_style_verify');
+        // 設計仕樣確認附件	
+        $desin_style_verify_file = postCheck('desin_style_verify_file');
+        // 設計仕樣確認時間
+        $desin_style_verify_at = postCheck('desin_style_verify_at');
+        // 設計仕樣確認人
+        $desin_style_verify_owner = postCheck('desin_style_verify_owner');
+
+        // 設計主管確認
+        $desin_leader_verify = postCheck('desin_leader_verify');
+        // 設計主管確認附件	
+        $desin_leader_verify_file = postCheck('desin_leader_verify_file');
+        // 設計主管確認時間
+        $desin_leader_verify_at = postCheck('desin_leader_verify_at');
+        // 設計主管確認人
+        $desin_leader_verify_owner = postCheck('desin_leader_verify_owner');
+
+        // 樓高通報
+        $building_heigh_verify = postCheck('building_heigh_verify');
+        // 樓高通報附件	
+        $building_heigh_verify_file = postCheck('building_heigh_verify_file');
+        // 樓高通報時間	     
+        $building_heigh_verify_at = postCheck('building_heigh_verify_at');
+        // 樓高通報確認人	
+        $building_heigh_verify_owner = postCheck('building_heigh_verify_owner');
+
+        // 電氣發貨明細
+        $electrical_design_publish = postCheck('electrical_design_publish');
+        // 電氣資料發行時間	
+        $electrical_design_publish_at = postCheck('electrical_design_publish_at');
+        // 電氣資料發行人	
+        $electrical_design_publish_owner = postCheck('electrical_design_publish_owner');
+
+        // 機械資料發行
+        $mechanical_design_publish = postCheck('mechanical_design_publish');
+        // 機械資料發行時間	
+        $mechanical_design_publish_at = postCheck('mechanical_design_publish_at');
+        // 機械資料發行人
+        $mechanical_design_publish_owner = postCheck('mechanical_design_publish_owner');
+
+        // 電氣發貨明細	
+        $electrical_shipping_date_publish = postCheck('electrical_shipping_date_publish');
+        // 電氣發貨明細時間	
+        $electrical_shipping_date_publish_at = postCheck('electrical_shipping_date_publish_at');
+        // 電氣發貨明細發行人
+        $electrical_shipping_date_publish_owner = postCheck('electrical_shipping_date_publish_owner');
+
+        // 機械發貨明細
+        $mechanical_shipping_date_publish = postCheck('mechanical_shipping_date_publish');
+        // 機械發貨明細時間
+        $mechanical_shipping_date_publish_at = postCheck('mechanical_shipping_date_publish_at');
+        // 機械發貨明細發行人
+        $mechanical_shipping_date_publish_owner = postCheck('mechanical_shipping_date_publish_owner');
+
+        // 普來特富(下單日)	
+        $prattford_order_date = postCheck('prattford_order_date');
+        // 預計發貨日(到港日)	
+        $estimated_shipping_date = postCheck('estimated_shipping_date');
+        // 發貨類別(A.全級發貨、G.欠件發貨)
+        $goods_type = postCheck('goods_type');
+        // 實際到貨日(到觀音廠日)
+        $actual_tofactory_date = postCheck('actual_tofactory_date');
+        // 發貨確認人	
+        $shipping_date_owner = postCheck('shipping_date_owner');
+        // 預計船期
+        $estimated_shipping_schedule_date = postCheck('estimated_shipping_schedule_date');
+        // 實際到貨日(到港日)
+        $actual_arrival_date = postCheck('actual_arrival_date');
+        // 到貨確認人
+        $arrival_date_owner = postCheck('arrival_date_owner');
+
+        // 是否齊備	
+        $shengguanok_status = postCheck('shengguanok_status');
+        // 生管確認附件	
+        $shengguanok_status_file = postCheck('shengguanok_status_file');
+        // 已備齊時間	
+        $shengguanok_status_at = postCheck('shengguanok_status_at');
+        // 已備齊檢查人
+        $shengguanok_status_owner = postCheck('shengguanok_status_owner');
+
+        // 建立人
+        $creater = postCheck('creater');
+        // 建立時間	
+        $create_at = postCheck('create_at');
+
+
+        //插入數據庫數據  gary_version
+        $insertsql = "
+            INSERT INTO wipwholestatus (
+                contract_type, 
+                contractno, 
+                salesid, 
+                custom, 
+                site_manager,
+                accountid, 
+                facilityno, 
+                facility_temp_no,
+                latitude, 
+                longitude,
+                weight, 
+                numberofpassenger, 
+                numberofstop, 
+                numberoffloor, 
+                opentype, 
+                speed, 
+                facility_kind,
+                address, 
+                contract_arrival_date, 
+                real_contract_arrival_date, 
+                sales_spec_verify, 
+                sales_spec_verify_file,
+                sales_spec_verify_at, 
+                sales_spec_verify_owner, 
+                customer_planning_verify, 
+                customer_planning_verify_file,
+                customer_planning_verify_at, 
+                customer_planning_verify_owner, 
+                customer_color_verify, 
+                customer_color_verify_file,
+                customer_color_verify_at, 
+                customer_color_verify_owner, 
+                site_survey_contact_form_verify, 
+                site_survey_contact_form_verify_file,
+                site_survey_contact_form_verify_at, 
+                site_survey_contact_form_verify_owner, 
+                desin_spec_verify, 
+                desin_spec_verify_file,
+                desin_spec_verify_at, 
+                desin_spec_verify_owner, 
+                desin_planning_verify, 
+                desin_planning_verify_file, 
+                desin_planning_verify_at,
+                desin_planning_verify_owner, 
+                desin_color_verify, 
+                desin_color_verify_file, 
+                desin_color_verify_at, 
+                desin_color_verify_owner,
+                desin_style_verify, 
+                desin_style_verify_file, 
+                desin_style_verify_at, 
+                desin_style_verify_owner, 
+                desin_leader_verify,
+                desin_leader_verify_file, 
+                desin_leader_verify_at, 
+                desin_leader_verify_owner, 
+                building_heigh_verify,
+                building_heigh_verify_file, 
+                building_heigh_verify_at, 
+                building_heigh_verify_owner, 
+                electrical_design_publish,
+                electrical_design_publish_at, 
+                electrical_design_publish_owner, 
+                mechanical_design_publish, 
+                mechanical_design_publish_at,
+                mechanical_design_publish_owner, 
+                electrical_shipping_date_publish, 
+                electrical_shipping_date_publish_at,
+                electrical_shipping_date_publish_owner, 
+                mechanical_shipping_date_publish, 
+                mechanical_shipping_date_publish_at,
+                mechanical_shipping_date_publish_owner, 
+                prattford_order_date,
+                estimated_shipping_date, 
+                goods_type, 
+                actual_tofactory_date, 
+                shipping_date_owner,
+                estimated_shipping_schedule_date, 
+                actual_arrival_date, 
+                arrival_date_owner, 
+                shengguanok_status, 
+                shengguanok_status_file,
+                shengguanok_status_at, 
+                shengguanok_status_owner, 
+                creater, 
+                create_at
+            ) VALUES (
+                '$contract_type', 
+                '$contractno', 
+                '$salesid', 
+                '$custom', 
+                '$site_manager', 
+                '$accountid', 
+                '$facilityno', 
+                '$facility_temp_no',
+                '$latitude', 
+                '$longitude',
+                '$weight', 
+                '$numberofpassenger', 
+                '$numberofstop', 
+                '$numberoffloor', 
+                '$opentype', 
+                '$speed', 
+                '$facility_kind',
+                '$address', 
+                '$contract_arrival_date', 
+                '$contract_arrival_date', 
+                '$sales_spec_verify', 
+                '$sales_spec_verify_file',
+                '$sales_spec_verify_at', 
+                '$sales_spec_verify_owner', 
+                '$customer_planning_verify', 
+                '$customer_planning_verify_file',
+                '$customer_planning_verify_at', 
+                '$customer_planning_verify_owner', 
+                '$customer_color_verify', 
+                '$customer_color_verify_file',
+                '$customer_color_verify_at', 
+                '$customer_color_verify_owner', 
+                '$site_survey_contact_form_verify', 
+                '$site_survey_contact_form_verify_file',
+                '$site_survey_contact_form_verify_at', 
+                '$site_survey_contact_form_verify_owner', 
+                '$desin_spec_verify', 
+                '$desin_spec_verify_file',
+                '$desin_spec_verify_at', 
+                '$desin_spec_verify_owner', 
+                '$desin_planning_verify', 
+                '$desin_planning_verify_file', 
+                '$desin_planning_verify_at',
+                '$desin_planning_verify_owner', 
+                '$desin_color_verify', 
+                '$desin_color_verify_file', 
+                '$desin_color_verify_at', 
+                '$desin_color_verify_owner',
+                '$desin_style_verify', 
+                '$desin_style_verify_file', 
+                '$desin_style_verify_at', 
+                '$desin_style_verify_owner', 
+                '$desin_leader_verify',
+                '$desin_leader_verify_file', 
+                '$desin_leader_verify_at', 
+                '$desin_leader_verify_owner', 
+                '$building_heigh_verify',
+                '$building_heigh_verify_file', 
+                '$building_heigh_verify_at', 
+                '$building_heigh_verify_owner', 
+                '$electrical_design_publish',
+                '$electrical_design_publish_at', 
+                '$electrical_design_publish_owner', 
+                '$mechanical_design_publish', 
+                '$mechanical_design_publish_at',
+                '$mechanical_design_publish_owner', 
+                '$electrical_shipping_date_publish', 
+                '$electrical_shipping_date_publish_at',
+                '$electrical_shipping_date_publish_owner', 
+                '$mechanical_shipping_date_publish', 
+                '$mechanical_shipping_date_publish_at',
+                '$mechanical_shipping_date_publish_owner', 
+                '$prattford_order_date', 
+                '$estimated_shipping_date', 
+                '$goods_type', 
+                '$actual_tofactory_date', 
+                '$shipping_date_owner',
+                '$estimated_shipping_schedule_date', 
+                '$actual_arrival_date', 
+                '$arrival_date_owner', 
+                '$shengguanok_status', 
+                '$shengguanok_status_file',
+                '$shengguanok_status_at', 
+                '$shengguanok_status_owner', 
+                '$creater', 
+                '$create_at'
+            )
+        ";
+
+        // 檢查作番號是否重複 
+        if (checkFacilitynoRepeat($link, $facilityno)) {
+            echo "
+            <script>
+                alert('此作番號重複');
+            </script>
+        ";
+        } else {
+            mysqli_query($link, $insertsql);
+            $last_form_id = mysqli_insert_id($link);
+            // 寫入待簽程狀態 A (營業)
+            do_wws_assign($salesid, $last_form_id, 'A');
+            // 寫入待簽程狀態 G (工務)
+            do_wws_assign($warehouseid, $last_form_id, 'G');
+            echo "
+                <script>
+                    alert('新增完成');
+                </script>
+            ";
+        }
+    }
+
+    // 開門方式 select => options
+    $sql = "
+        SELECT 
+            code_name AS val ,
+            content AS label 
+        FROM code F
+        WHERE field_name='open_kind'
+        ORDER BY label ASC
+    ";
+    $opendoor_options = mysqli_query($link, $sql);
+
+    // 所有營業員 select => options
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM account
+        WHERE department_id IN ('311','312','313','314','315')
+        ORDER BY label ASC
+    ";
+    $sales_options = mysqli_query($link, $sql);
+
+    // 所有工務人員 select => options
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM account
+        WHERE department_id IN ('521')
+        AND role_id IN ('3','4','5')
+        ORDER BY label ASC
+    ";
+    $warehouse_options = mysqli_query($link, $sql);
+
+?>
+    <form method="post" id="form" enctype="multipart/form-data">
+        <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>">
+        <input class="form-control " type="hidden" name="sales_spec_verify" value="1">
+        <input class="form-control " type="hidden" name="customer_planning_verify" value="1">
+        <input class="form-control " type="hidden" name="customer_color_verify" value="1">
+        <input class="form-control " type="hidden" name="customer_style_verify" value="1">
+        <input class="form-control " type="hidden" name="site_survey_contact_form_verify" value="1">
+        <input class="form-control " type="hidden" name="desin_spec_verify" value="1">
+        <input class="form-control " type="hidden" name="desin_planning_verify" value="1">
+        <input class="form-control " type="hidden" name="desin_color_verify" value="1">
+        <input class="form-control " type="hidden" name="desin_style_verify" value="1">
+        <input class="form-control " type="hidden" name="desin_leader_verify" value="1">
+        <input class="form-control " type="hidden" name="building_heigh_verify" value="1">
+        <input class="form-control " type="hidden" name="electrical_design_publish" value="1">
+        <input class="form-control " type="hidden" name="mechanical_design_publish" value="1">
+        <input class="form-control " type="hidden" name="electrical_shipping_date_publish" value="1">
+        <input class="form-control " type="hidden" name="mechanical_shipping_date_publish" value="1">
+        <input class="form-control " type="hidden" name="shengguanok_status" value="1">
+        <input class="form-control " type="hidden" name="create_at" value="<?= date('Y/m/d H:i:s'); ?>">
+        <div class="container-fluid" id="accountadd">
+            <div class="text-center">
+                <h3>作番大日程</h3>
+            </div>
+            <div class="form-horizontal">
+                <table class="table" style="width:100%">
+                    <thead style="margin-bottom: 20px">
+                        <tr>
+                            <td style="vertical-align: middle">合約號</td>
+                            <td>
+                                <input class="form-control " type="text" id="contractno" name="contractno" value="<?php echo $contractno; ?>">
+                            </td>
+                            <td style="vertical-align: middle">作番號</td>
+                            <td>
+                                <input class="form-control " type="text" id="facilityno" name="facilityno" value="<?php echo $facilityno; ?>">
+                            </td>
+                            <td style="vertical-align: middle">客戶名稱</td>
+                            <td>
+                                <input class="form-control " type="text" name="custom" value="<?php echo $custom; ?>">
+                            </td>
+                            <td style="vertical-align: middle">號機</td>
+                            <td>
+                                <input class="form-control " type="text" name="facility_temp_no" value="<?php echo $facility_temp_no; ?>">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="vertical-align: middle">緯度</td>
+                            <td>
+                                <input class="form-control " type="text" name="latitude" value="<?php echo $latitude; ?>">
+                            </td>
+                            <td style="vertical-align: middle">經度</td>
+                            <td>
+                                <input class="form-control " type="text" name="longitude" value="<?php echo $longitude; ?>">
+                            </td>
+                            <td style="vertical-align: middle">地址</td>
+                            <td>
+                                <input class="form-control " type="text" name="address" value="<?php echo $address; ?>">
+                            </td>
+                            <td style="vertical-align: middle">機型</td>
+                            <td>
+                                <input class="form-control " type="text" name="facility_kind" value="<?php echo $facility_kind; ?>">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="vertical-align: middle">載重</td>
+                            <td>
+                                <input class="form-control " type="number" min="0" name="weight" value="<?php echo $weight; ?>">
+                            </td>
+                            <td style="vertical-align: middle">人乘</td>
+                            <td>
+                                <input class="form-control " type="number" min="0" name="numberofpassenger" value="<?php echo $numberofpassenger; ?>">
+                            </td>
+                            <td style="vertical-align: middle">樓停</td>
+                            <td>
+                                <input class="form-control " type="number" min="0" name="numberofstop" value="<?php echo $numberofstop; ?>">
+                            </td>
+                            <td style="vertical-align: middle">樓層</td>
+                            <td>
+                                <input class="form-control " type="number" min="0" name="numberoffloor" value="<?php echo $numberoffloor; ?>">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="vertical-align: middle">開門方式</td>
+                            <td style="vertical-align: middle">
+                                <select class="form-control " name="opentype">
+                                    <option value="">未選擇</option>
+                                    <?php
+                                    foreach ($opendoor_options as $opendoor_option) :
+                                        if ($opendoor_option['label'] == $opentype) {
+                                            echo "<option selected value='" . $opendoor_option['label'] . "'>" . $opendoor_option['label'] . "</option>";
+                                        } else {
+                                            echo "<option value='" . $opendoor_option['label'] . "'>" . $opendoor_option['label'] . "</option>";
+                                        }
+                                    endforeach
+                                    ?>
+                                </select>
+                            </td>
+                            <td style="vertical-align: middle">速度</td>
+                            <td>
+                                <input class="form-control " type="number" name="speed" gt="0" min="0" value="<?php echo $speed; ?>">
+                            </td>
+                            <td style="vertical-align: middle">合約交期<br />(到工地)</td>
+                            <td>
+                                <input class="form-control " type="datetime-local" name="contract_arrival_date" value="<?php echo $contract_arrival_date; ?>">
+                            </td>
+                            <!-- <td style="vertical-align: middle">預計交期<br />(到工地)</td>
+                            <td>
+                                <input class="form-control " type="datetime-local" name="real_contract_arrival_date" value="<?php echo $real_contract_arrival_date; ?>">
+                            </td> -->
+                        </tr>
+                        <tr>
+                            <td style="vertical-align: middle">工地負責人</td>
+                            <td>
+                                <input class="form-control " type="text" name="site_manager" value="<?php echo $site_manager; ?>">
+                            </td>
+                            <td style="vertical-align: middle">營業員</td>
+                            <td style="vertical-align: middle">
+                                <select class="form-control " id="salesid" name="salesid">
+                                    <option value="">未選擇</option>
+                                    <?php
+                                    foreach ($sales_options as $sales_option) :
+                                        if ($sales_option['val'] == $salesid) {
+                                            echo "<option selected value='" . $sales_option['val'] . "'>" . $sales_option['val'] . $sales_option['label'] . "</option>";
+                                        } else {
+                                            echo "<option value='" . $sales_option['val'] . "'>" . $sales_option['val'] . $sales_option['label'] . "</option>";
+                                        }
+                                    endforeach
+                                    ?>
+                                </select>
+                            </td>
+                            <td style="vertical-align: middle">工務部門負責人</td>
+                            <td style="vertical-align: middle">
+                                <select class="form-control " id="warehouseid" name="warehouseid">
+                                    <option value="">未選擇</option>
+                                    <?php
+                                    foreach ($warehouse_options as $warehouse_option) :
+                                        if ($warehouse_option['val'] == $warehouseid) {
+                                            echo "<option selected value='" . $warehouse_option['val'] . "'>" . $warehouse_option['val'] . $warehouse_option['label'] . "</option>";
+                                        } else {
+                                            echo "<option value='" . $warehouse_option['val'] . "'>" . $warehouse_option['val'] . $warehouse_option['label'] . "</option>";
+                                        }
+                                    endforeach
+                                    ?>
+                                </select>
+                            </td>
+                        </tr>
+                    </thead>
+                </table>
+            </div>
+            <div class="col-md-12" style="margin-bottom:15px;">
+                <button onclick="savedata()" type="button" class="btn btn-primary btn-lg pull-right">確認後保存</button>
+            </div>
+        </div>
+    </form>
+    <script type="text/javascript">
+        function savedata() {
+            var savedataMessage = {
+                "0": "不明錯誤",
+                "1": "",
+                "2": "未選擇營業員",
+                "3": "合約編號未填寫",
+                "4": "作番號未填寫",
+                "5": "未選擇工務人員"
+            }
+            if (getSavedataStatus() == '1') {
+                $('#form').submit();
+            } else {
+                typeof savedataMessage[getSavedataStatus()] == 'string' ? alert(savedataMessage[getSavedataStatus()]) : alert("不明錯誤");
+            }
+
+        }
+
+        function getSavedataStatus() {
+            if ($("#salesid").val() == '')
+                return '2'
+            if ($("#contractno").val() == '')
+                return '3'
+            if ($("#facilityno").val() == '')
+                return '4'
+            if ($("#warehouseid").val() == '')
+                return '5'
+            return '1'
+        }
+    </script>
+
+<?php
+} else {
+    echo "錯誤的訪問";
+}
+
 ?>
\ No newline at end of file
diff --git a/wms/wipwhole-renovate-index-export-excel.php b/wms/wipwhole-renovate-index-export-excel.php
index fc06e8b6..dd4ec05d 100644
--- a/wms/wipwhole-renovate-index-export-excel.php
+++ b/wms/wipwhole-renovate-index-export-excel.php
@@ -1,414 +1,414 @@
-<?php
-// ini_set('display_errors', 'on');
-include "database.php";
-include "fun_global.php";
-$token = $_REQUEST["token"];
-$token_link = "token=" . $_REQUEST["token"];
-list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
-$user_name = urldecode(base64_decode($enc_user_name));
-include "wipwhole-renovate-index-function.php";
-
-require dirname(__DIR__) . '/common/composer/vendor/autoload.php';
-
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-use PhpOffice\PhpSpreadsheet\Style\Fill;
-
-function getArea($address)
-{
-    $address = mb_substr($address, 0, 2);
-    if (in_array($address, ['宜蘭', '花蓮', '台東']))
-        return '宜花東';
-    if (in_array($address, ['臺北', '台北', '基隆', '新北']))
-        return '北區';
-    if (in_array($address, ['桃園', '新竹']))
-        return '桃竹';
-    if (in_array($address, ['南投', '臺中', '台中', '彰化', '雲林', '苗栗']))
-        return '中區';
-    if (in_array($address, ['台南', '臺南', '嘉義', '屏東', '高雄']))
-        return '南區';
-}
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-
-    $contractno = empty($_POST['contractno']) ? null : $_POST['contractno'];
-    $facilityno = empty($_POST['facilityno']) ? null : $_POST['facilityno'];
-    $custom = empty($_POST['custom']) ? null : $_POST['custom'];
-    $site_survey_contact_verify = !isset($_POST['site_survey_contact_verify']) ? '' : $_POST['site_survey_contact_verify'];
-    $real_contract_arrival_date_start = empty($_POST['real_contract_arrival_date_start']) ? null : $_POST['real_contract_arrival_date_start'];
-    $real_contract_arrival_date_end = empty($_POST['real_contract_arrival_date_end']) ? null : $_POST['real_contract_arrival_date_end'];
-    $area_no = !isset($_POST['area_no']) ? '' : $_POST['area_no'];
-
-
-    // 取得當前使用者所屬部門
-    $department_id = getDepartmentId($link, $user_id);
-    // 取得當前使用者所屬職位
-    $role_id = getRoleId($link, $user_id);
-
-    $sql = getDataSql($department_id, $user_id, "B");
-    $result = mysqli_query($link, $sql);
-    if ($result) {
-        $data = array();
-        while ($row = $result->fetch_assoc())
-            $data[] = $row;
-        $result->close();
-    } else {
-        echo "Query failed: " . $connection->error;
-    }
-
-    // 建立一個新的 Spreadsheet 物件
-    $spreadsheet = new Spreadsheet();
-    $sheet = $spreadsheet->getActiveSheet();
-
-    $colArr = [
-        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
-        'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-        'AA', 'AB', 'AC', 'AD', 'AE', 'AF', 'AG', 'AH', 'AI', 'AJ', 'AK',
-        'AL', 'AM', 'AN', 'AO', 'AP', 'AQ', 'AR', 'AS', 'AT', 'AU', 'AV',
-        'AW', 'AX', 'AY', 'AZ', 'BA', 'BB', 'BC', 'BD', 'BE', 'BF', 'BG',
-        'BH', 'BI', 'BJ', 'BK', 'BL', 'BM', 'BN', 'BO'
-    ];
-    $colTitleArr = [
-        '區域',
-        '合約號',
-        '作番號',
-        '汰改方案',
-        '客戶名稱',
-        '地址',
-        '工地地址',
-        '規格',
-        '依合約客戶需求日',
-        '下單日(普來特富)',
-        '預計發貨日(普來特富)',
-        '預計到廠日(觀音廠)',
-        '實際到廠日(觀音廠)',
-        '預計出貨日(到工地)',
-        '工務確認',
-        '樓高通報',
-        '樓高通報日期',
-        '工勘確認',
-        '工勘確認日期',
-        '客戶計劃圖(意匠圖)',
-        '客戶計劃圖(意匠圖)日期',
-        '營業/契約確認',
-        '營業/契約規格',
-        '營業/契約規格日期',
-        '客戶顏色',
-        '客戶顏色日期',
-        '客戶樣式',
-        '客戶樣式日期',
-        '工勘聯絡表',
-        '工勘聯絡表日期',
-        '設計確認',
-        '設計規格',
-        '設計規格日期',
-        '設計計劃圖',
-        '設計計劃圖日期',
-        '設計顏色',
-        '設計顏色日期',
-        '設計樣式',
-        '設計樣式日期',
-        '設計主管',
-        '設計主管日期',
-        '生管確認',
-        '是否齊備',
-        '是否齊備日期',
-        '下單日(下單普來特富)',
-        '下單日(下單普來特富)日期',
-        '預計發貨日(出港日)',
-        '預計發貨日(出港日)日期',
-        '預計實際到貨日(到觀音廠日)',
-        '預計實際到貨日(到觀音廠日)日期',
-        '普來特富(發貨類別)',
-        '普來特富(發貨類別)日期',
-        '台灣自理項目(發貨類別)',
-        '台灣自理項目(發貨類別)日期',
-        '實際到貨日(到觀音廠日)',
-        '實際到貨日(到觀音廠日)日期'
-    ];
-    $sheet->setTitle('作番大日程(汰改)');
-    for ($i = 0; $i < count($colArr); $i++) {
-        $sheet->setCellValue($colArr[$i] . '1', $colTitleArr[$i]);
-    }
-
-    $i = 2;
-    foreach ($data as $row) {
-
-        //規格
-        $Specification = $row['facility_kind'];
-        $Specification .= !empty($row['numberofpassenger']) ? "-" . $row['numberofpassenger'] : "";
-        $Specification .= !empty($row['weight']) ? "-" . $row['weight'] : "";
-        $Specification .= !empty($row['numberofstop']) ? "-" . $row['numberofstop'] : "";
-        $Specification .= !empty($row['numberoffloor']) ? "/" . $row['numberoffloor'] : "";
-        $Specification .= !empty($row['opentype']) ? "-" . $row['opentype'] : "";
-        $Specification .= !empty($row['speed']) ? $row['speed'] : "";
-
-        //工務
-        $gongwuok = 0;
-        // 營業
-        $yingyeok = 0;
-        // 設計
-        $shejiok = 0;
-        // 生管
-        $shengguanok = 0;
-        // 財務
-        // $caiwuok = 0;
-
-        // 工務統計已確認
-        if ($row['building_heigh_verify'] == 0)
-            $gongwuok += 1;
-        if (!in_array($row['site_survey_contact_verify'], ['1', 'A']))
-            $gongwuok += 1;
-        if ($row['customer_planning_verify'] == 0)
-            $gongwuok += 1;
-
-        // 營業統計已確認
-        if ($row['sales_spec_verify'] == 0)
-            $yingyeok += 1;
-        if ($row['customer_color_verify'] == 0)
-            $yingyeok += 1;
-        if ($row['customer_style_verify'] == 0)
-            $yingyeok += 1;
-        if ($row['site_survey_contact_form_verify'] == 0)
-            $yingyeok += 1;
-
-        // 設計統計已確認
-        if ($row['desin_spec_verify'] == 0)
-            $shejiok += 1;
-        if ($row['desin_planning_verify'] == 0)
-            $shejiok += 1;
-        if ($row['desin_color_verify'] == 0)
-            $shejiok += 1;
-        if ($row['desin_style_verify'] == 0)
-            $shejiok += 1;
-        if ($row['desin_leader_verify'] == 0)
-            $shejiok += 1;
-
-        // 生管統計已確認
-        if ($row['shengguanok_status'] == 0)
-            $shengguanok += 1;
-        if ($row['prattford_order_date_verify'] == 0)
-            $shengguanok += 1;
-        if ($row['estimated_shipping_date_verify'] == 0)
-            $shengguanok += 1;
-        if ($row['estimated_shipping_schedule_date_verify'] == 0)
-            $shengguanok += 1;
-        if ($row['goods_type'] == 'A' || $row['goods_type'] == 'C')
-            $shengguanok += 1;
-        if ($row['taiwan_goods_type'] == 'A' || $row['taiwan_goods_type'] == 'C')
-            $shengguanok += 1;
-        if ($row['arrival_date_verify']  == 'A')
-            $shengguanok += 1;
-
-        // 工勘狀態
-        $site_survey_contact_verify = $row['site_survey_contact_verify'] == 1 ? "未確認" : "已確認";
-
-        $status_arr = array(
-            '0' => '已完成',
-            '1' => '進行中',
-            '2' => '無需求'
-        );
-
-        $status2_arr = array(
-            '1' => '未確認',
-            'A' => 'A:全級發貨',
-            'B' => 'B:欠件發貨',
-            'C' => 'C:無發貨需求'
-        );
-
-        $status3_arr = array(
-            '1' => '未確認',
-            'A' => 'A:皆到貨',
-            'B' => 'B:皆欠件',
-            'C' => 'C:普來特富欠件',
-            'D' => 'D:台灣欠件',
-        );
-
-        $site_survey_status = array(
-            "0" => "已確認",
-            "1" => "未確認",
-            "2" => "無工勘需求",
-            "A" => "未動工",
-            "B" => "地下室施工",
-            "C" => "打樁",
-            "D" => "地基",
-            "E" => "挖土",
-            "G" => "機房",
-            "H" => "機械式淨高",
-            "M" => "樓中樓",
-            "OH" => "最高層(頂樓高度)",
-            "P" => "PIT(機坑深度)",
-            "R" => "R 樓",
-            "S" => "停工",
-            "T" => "TOP",
-            "TC" => "頂部間隙",
-            "TS" => "行程",
-            "TH" => "全高",
-            "Y" => "已搭、已出",
-            "YB" => "退購結案",
-            "YF" => "既有建物",
-            "YN" => "已搭、未出"
-        );
-        for ($j = 1; $j < 200; $j++) {
-            $site_survey_status[$j . "F"] = $j . "F";
-        }
-
-
-        // 營業 營業/契約確認規格
-        $sales_spec_verify_status = !empty($status_arr[$row['sales_spec_verify']]) ? $status_arr[$row['sales_spec_verify']] : "";
-        // 營業 客戶計劃圖(意匠圖)
-        $customer_planning_verify_status = !empty($status_arr[$row['customer_planning_verify']]) ? $status_arr[$row['customer_planning_verify']] : "";
-        // 營業 客戶顏色
-        $customer_color_verify_status = !empty($status_arr[$row['customer_color_verify']]) ? $status_arr[$row['customer_color_verify']] : "";
-        // 營業 客戶樣式
-        $customer_style_verify_status  = !empty($status_arr[$row['customer_style_verify']]) ? $status_arr[$row['customer_style_verify']] : "";
-        // 營業 工勘聯絡表
-        $site_survey_contact_form_verify_status  = !empty($status_arr[$row['site_survey_contact_form_verify']]) ? $status_arr[$row['site_survey_contact_form_verify']] : "";
-
-        // 設計 規格確認
-        $desin_spec_verify_status = !empty($status_arr[$row['desin_spec_verify']]) ? $status_arr[$row['desin_spec_verify']] : "";
-        // 設計 設計計劃圖確認
-        $desin_planning_verify_status = !empty($status_arr[$row['desin_planning_verify']]) ? $status_arr[$row['desin_planning_verify']] : "";
-        // 設計 設計顏色確認
-        $desin_color_verify_status = !empty($status_arr[$row['desin_color_verify']]) ? $status_arr[$row['desin_color_verify']] : "";
-        // 設計 設計樣式確認
-        $desin_style_verify_status = !empty($status_arr[$row['desin_style_verify']]) ? $status_arr[$row['desin_style_verify']] : "";
-        // 設計 設計主管確認
-        $desin_leader_verify_status = !empty($status_arr[$row['desin_leader_verify']]) ? $status_arr[$row['desin_leader_verify']] : "";
-
-        // 工務 樓高通報確認
-        $dbuilding_heigh_verify_status = !empty($status_arr[$row['building_heigh_verify']]) ? $status_arr[$row['building_heigh_verify']] : "";
-        // 工務 工勘確認
-        $site_survey_contact_verify_status = !empty($site_survey_status[$row['site_survey_contact_verify']]) ? $site_survey_status[$row['site_survey_contact_verify']] : "";
-
-
-        // 生管 是否齊備確認
-        $shengguanok_status = !empty($status_arr[$row['shengguanok_status']]) ? $status_arr[$row['shengguanok_status']] : "";
-        $prattford_order_date_verify_status = !empty($status_arr[$row['prattford_order_date_verify']]) ? $status_arr[$row['prattford_order_date_verify']] : "";
-        $estimated_shipping_date_verify_status = !empty($status_arr[$row['estimated_shipping_date_verify']]) ? $status_arr[$row['estimated_shipping_date_verify']] : "";
-        $estimated_shipping_schedule_date_verify_status = !empty($status_arr[$row['estimated_shipping_schedule_date_verify']]) ? $status_arr[$row['estimated_shipping_schedule_date_verify']] : "";
-        $goods_type_status = !empty($status2_arr[$row['goods_type']]) ? $status2_arr[$row['goods_type']] : "";
-        $taiwan_goods_type_status = !empty($status2_arr[$row['taiwan_goods_type']]) ? $status2_arr[$row['taiwan_goods_type']] : "";
-        $arrival_date_verify_status = !empty($status3_arr[$row['arrival_date_verify']]) ? $status3_arr[$row['arrival_date_verify']] : "";
-
-        $colContentArr = [
-            getArea($row['address']),
-            $row['contractno'],
-            $row['facilityno'],
-            implode("+", json_decode($row['renovate_type'])),
-            $row['custom'],
-            $row['address'],
-            $row['real_address'],
-            $Specification,
-            substr($row['contract_arrival_date'], 0, 10),
-            substr($row['prattford_order_date'], 0, 10),
-            substr($row['estimated_shipping_date'], 0, 10),
-            substr($row['estimated_shipping_schedule_date'], 0, 10),
-            substr($row['actual_tofactory_date'], 0, 10),
-            substr($row['real_contract_arrival_date'], 0, 10),
-            getGunwuName($row['address']) . $gongwuok . "/3",
-            $dbuilding_heigh_verify_status,
-            substr($row['building_heigh_verify_at'], 0, 10),
-            $site_survey_contact_verify_status,
-            substr($row['site_survey_contact_verify_at'], 0, 10),
-            $customer_planning_verify_status,
-            substr($row['customer_planning_verify_at'], 0, 10),
-            accountidToName($row['salesid']) . " " . $yingyeok . "/4",
-            $sales_spec_verify_status,
-            substr($row['sales_spec_verify_at'], 0, 10),
-            $customer_color_verify_status,
-            substr($row['customer_color_verify_at'], 0, 10),
-            $customer_style_verify_status,
-            substr($row['customer_style_verify_at'], 0, 10),
-            $site_survey_contact_form_verify_status,
-            substr($row['site_survey_contact_form_verify_at'], 0, 10),
-            '林昭翰 ' . $shejiok . "/5",
-            $desin_spec_verify_status,
-            substr($row['desin_spec_verify_at'], 0, 10),
-            $desin_planning_verify_status,
-            substr($row['desin_planning_verify_at'], 0, 10),
-            $desin_color_verify_status,
-            substr($row['desin_color_verify_at'], 0, 10),
-            $desin_style_verify_status,
-            substr($row['desin_style_verify_at'], 0, 10),
-            $desin_leader_verify_status,
-            substr($row['desin_leader_verify_at'], 0, 10),
-            '許伃廷 ' . $shengguanok . "/7",
-            $shengguanok_status,
-            substr($row['shengguanok_status_at'], 0, 10),
-            $prattford_order_date_verify_status,
-            substr($row['prattford_order_date'], 0, 10),
-            $estimated_shipping_date_verify_status,
-            substr($row['estimated_shipping_date'], 0, 10),
-            $estimated_shipping_schedule_date_verify_status,
-            substr($row['estimated_shipping_schedule_date'], 0, 10),
-            $goods_type_status,
-            substr($row['goods_type_date'], 0, 10),
-            $taiwan_goods_type_status,
-            substr($row['taiwan_goods_type_date'], 0, 10),
-            $arrival_date_verify_status,
-            substr($row['actual_tofactory_date'], 0, 10),
-        ];
-        for ($j = 0; $j < count($colContentArr); $j++)
-            $sheet->setCellValue($colArr[$j] . $i, $colContentArr[$j]);
-        $i++;
-    }
-
-    // 調整欄位大小
-    foreach ($sheet->getColumnIterator() as $column)
-        $sheet->getColumnDimension($column->getColumnIndex())->setAutoSize(true);
-
-    // 背景顏色為藍色
-    $styleA1toC1 = $sheet->getStyle('A1:N1');
-    $fillA1toC1 = $styleA1toC1->getFill();
-    $fillA1toC1->setFillType(Fill::FILL_SOLID)
-        ->getStartColor()->setRGB('8EA9DB');
-
-    // 背景顏色為橘色
-    $styleA1toC1 = $sheet->getStyle('O1:U1');
-    $fillA1toC1 = $styleA1toC1->getFill();
-    $fillA1toC1->setFillType(Fill::FILL_SOLID)
-        ->getStartColor()->setRGB('FFBB66');
-
-    // 背景顏色為綠色
-    $styleA1toC1 = $sheet->getStyle('V1:AD1');
-    $fillA1toC1 = $styleA1toC1->getFill();
-    $fillA1toC1->setFillType(Fill::FILL_SOLID)
-        ->getStartColor()->setRGB('DDFF77');
-
-    // 背景顏色為藍色
-    $styleA1toC1 = $sheet->getStyle('AE1:AO1');
-    $fillA1toC1 = $styleA1toC1->getFill();
-    $fillA1toC1->setFillType(Fill::FILL_SOLID)
-        ->getStartColor()->setRGB('BBFFEE');
-
-    // 背景顏色為橘色
-    $styleA1toC1 = $sheet->getStyle('AP1:BE1');
-    $fillA1toC1 = $styleA1toC1->getFill();
-    $fillA1toC1->setFillType(Fill::FILL_SOLID)
-        ->getStartColor()->setRGB('FFCCCC');
-
-
-
-    // 第二個分頁
-    $worksheet2 = $spreadsheet->createSheet();
-    $spreadsheet->setActiveSheetIndex(1);
-
-    // 在第二個工作表寫入數據
-    $worksheet2->setCellValue('A1', '確認進度統計表');
-
-
-
-
-    // 設定活動工作表回到第一個工作表
-    $spreadsheet->setActiveSheetIndex(0);
-    $writer = new Xlsx($spreadsheet);
-    $file_path = dirname(__DIR__) . '/wms/excel/' . 'gary_test.xlsx';
-    try {
-        $writer->save($file_path);
-        // 回傳檔案路徑給 JavaScript
-        echo $file_path;
-    } catch (Exception $e) {
-        echo 'Error: ' . $e->getMessage();
-    }
-    exit();
-}
+<?php
+// ini_set('display_errors', 'on');
+include "database.php";
+include "fun_global.php";
+$token = $_REQUEST["token"];
+$token_link = "token=" . $_REQUEST["token"];
+list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
+$user_name = urldecode(base64_decode($enc_user_name));
+include "wipwhole-renovate-index-function.php";
+
+require dirname(__DIR__) . '/common/composer/vendor/autoload.php';
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+
+function getArea($address)
+{
+    $address = mb_substr($address, 0, 2);
+    if (in_array($address, ['宜蘭', '花蓮', '台東']))
+        return '宜花東';
+    if (in_array($address, ['臺北', '台北', '基隆', '新北']))
+        return '北區';
+    if (in_array($address, ['桃園', '新竹']))
+        return '桃竹';
+    if (in_array($address, ['南投', '臺中', '台中', '彰化', '雲林', '苗栗']))
+        return '中區';
+    if (in_array($address, ['台南', '臺南', '嘉義', '屏東', '高雄']))
+        return '南區';
+}
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+
+    $contractno = empty($_POST['contractno']) ? null : $_POST['contractno'];
+    $facilityno = empty($_POST['facilityno']) ? null : $_POST['facilityno'];
+    $custom = empty($_POST['custom']) ? null : $_POST['custom'];
+    $site_survey_contact_verify = !isset($_POST['site_survey_contact_verify']) ? '' : $_POST['site_survey_contact_verify'];
+    $real_contract_arrival_date_start = empty($_POST['real_contract_arrival_date_start']) ? null : $_POST['real_contract_arrival_date_start'];
+    $real_contract_arrival_date_end = empty($_POST['real_contract_arrival_date_end']) ? null : $_POST['real_contract_arrival_date_end'];
+    $area_no = !isset($_POST['area_no']) ? '' : $_POST['area_no'];
+
+
+    // 取得當前使用者所屬部門
+    $department_id = getDepartmentId($link, $user_id);
+    // 取得當前使用者所屬職位
+    $role_id = getRoleId($link, $user_id);
+
+    $sql = getDataSql($department_id, $user_id, "B");
+    $result = mysqli_query($link, $sql);
+    if ($result) {
+        $data = array();
+        while ($row = $result->fetch_assoc())
+            $data[] = $row;
+        $result->close();
+    } else {
+        echo "Query failed: " . $connection->error;
+    }
+
+    // 建立一個新的 Spreadsheet 物件
+    $spreadsheet = new Spreadsheet();
+    $sheet = $spreadsheet->getActiveSheet();
+
+    $colArr = [
+        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
+        'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+        'AA', 'AB', 'AC', 'AD', 'AE', 'AF', 'AG', 'AH', 'AI', 'AJ', 'AK',
+        'AL', 'AM', 'AN', 'AO', 'AP', 'AQ', 'AR', 'AS', 'AT', 'AU', 'AV',
+        'AW', 'AX', 'AY', 'AZ', 'BA', 'BB', 'BC', 'BD', 'BE', 'BF', 'BG',
+        'BH', 'BI', 'BJ', 'BK', 'BL', 'BM', 'BN', 'BO'
+    ];
+    $colTitleArr = [
+        '區域',
+        '合約號',
+        '作番號',
+        '汰改方案',
+        '客戶名稱',
+        '地址',
+        '工地地址',
+        '規格',
+        '依合約客戶需求日',
+        '下單日(普來特富)',
+        '預計發貨日(普來特富)',
+        '預計到廠日(觀音廠)',
+        '實際到廠日(觀音廠)',
+        '預計出貨日(到工地)',
+        '工務確認',
+        '樓高通報',
+        '樓高通報日期',
+        '工勘確認',
+        '工勘確認日期',
+        '客戶計劃圖(意匠圖)',
+        '客戶計劃圖(意匠圖)日期',
+        '營業/契約確認',
+        '營業/契約規格',
+        '營業/契約規格日期',
+        '客戶顏色',
+        '客戶顏色日期',
+        '客戶樣式',
+        '客戶樣式日期',
+        '工勘聯絡表',
+        '工勘聯絡表日期',
+        '設計確認',
+        '設計規格',
+        '設計規格日期',
+        '設計計劃圖',
+        '設計計劃圖日期',
+        '設計顏色',
+        '設計顏色日期',
+        '設計樣式',
+        '設計樣式日期',
+        '設計主管',
+        '設計主管日期',
+        '生管確認',
+        '是否齊備',
+        '是否齊備日期',
+        '下單日(下單普來特富)',
+        '下單日(下單普來特富)日期',
+        '預計發貨日(出港日)',
+        '預計發貨日(出港日)日期',
+        '預計實際到貨日(到觀音廠日)',
+        '預計實際到貨日(到觀音廠日)日期',
+        '普來特富(發貨類別)',
+        '普來特富(發貨類別)日期',
+        '台灣自理項目(發貨類別)',
+        '台灣自理項目(發貨類別)日期',
+        '實際到貨日(到觀音廠日)',
+        '實際到貨日(到觀音廠日)日期'
+    ];
+    $sheet->setTitle('作番大日程(汰改)');
+    for ($i = 0; $i < count($colArr); $i++) {
+        $sheet->setCellValue($colArr[$i] . '1', $colTitleArr[$i]);
+    }
+
+    $i = 2;
+    foreach ($data as $row) {
+
+        //規格
+        $Specification = $row['facility_kind'];
+        $Specification .= !empty($row['numberofpassenger']) ? "-" . $row['numberofpassenger'] : "";
+        $Specification .= !empty($row['weight']) ? "-" . $row['weight'] : "";
+        $Specification .= !empty($row['numberofstop']) ? "-" . $row['numberofstop'] : "";
+        $Specification .= !empty($row['numberoffloor']) ? "/" . $row['numberoffloor'] : "";
+        $Specification .= !empty($row['opentype']) ? "-" . $row['opentype'] : "";
+        $Specification .= !empty($row['speed']) ? $row['speed'] : "";
+
+        //工務
+        $gongwuok = 0;
+        // 營業
+        $yingyeok = 0;
+        // 設計
+        $shejiok = 0;
+        // 生管
+        $shengguanok = 0;
+        // 財務
+        // $caiwuok = 0;
+
+        // 工務統計已確認
+        if ($row['building_heigh_verify'] == 0)
+            $gongwuok += 1;
+        if (!in_array($row['site_survey_contact_verify'], ['1', 'A']))
+            $gongwuok += 1;
+        if ($row['customer_planning_verify'] == 0)
+            $gongwuok += 1;
+
+        // 營業統計已確認
+        if ($row['sales_spec_verify'] == 0)
+            $yingyeok += 1;
+        if ($row['customer_color_verify'] == 0)
+            $yingyeok += 1;
+        if ($row['customer_style_verify'] == 0)
+            $yingyeok += 1;
+        if ($row['site_survey_contact_form_verify'] == 0)
+            $yingyeok += 1;
+
+        // 設計統計已確認
+        if ($row['desin_spec_verify'] == 0)
+            $shejiok += 1;
+        if ($row['desin_planning_verify'] == 0)
+            $shejiok += 1;
+        if ($row['desin_color_verify'] == 0)
+            $shejiok += 1;
+        if ($row['desin_style_verify'] == 0)
+            $shejiok += 1;
+        if ($row['desin_leader_verify'] == 0)
+            $shejiok += 1;
+
+        // 生管統計已確認
+        if ($row['shengguanok_status'] == 0)
+            $shengguanok += 1;
+        if ($row['prattford_order_date_verify'] == 0)
+            $shengguanok += 1;
+        if ($row['estimated_shipping_date_verify'] == 0)
+            $shengguanok += 1;
+        if ($row['estimated_shipping_schedule_date_verify'] == 0)
+            $shengguanok += 1;
+        if ($row['goods_type'] == 'A' || $row['goods_type'] == 'C')
+            $shengguanok += 1;
+        if ($row['taiwan_goods_type'] == 'A' || $row['taiwan_goods_type'] == 'C')
+            $shengguanok += 1;
+        if ($row['arrival_date_verify']  == 'A')
+            $shengguanok += 1;
+
+        // 工勘狀態
+        $site_survey_contact_verify = $row['site_survey_contact_verify'] == 1 ? "未確認" : "已確認";
+
+        $status_arr = array(
+            '0' => '已完成',
+            '1' => '進行中',
+            '2' => '無需求'
+        );
+
+        $status2_arr = array(
+            '1' => '未確認',
+            'A' => 'A:全級發貨',
+            'B' => 'B:欠件發貨',
+            'C' => 'C:無發貨需求'
+        );
+
+        $status3_arr = array(
+            '1' => '未確認',
+            'A' => 'A:皆到貨',
+            'B' => 'B:皆欠件',
+            'C' => 'C:普來特富欠件',
+            'D' => 'D:台灣欠件',
+        );
+
+        $site_survey_status = array(
+            "0" => "已確認",
+            "1" => "未確認",
+            "2" => "無工勘需求",
+            "A" => "未動工",
+            "B" => "地下室施工",
+            "C" => "打樁",
+            "D" => "地基",
+            "E" => "挖土",
+            "G" => "機房",
+            "H" => "機械式淨高",
+            "M" => "樓中樓",
+            "OH" => "最高層(頂樓高度)",
+            "P" => "PIT(機坑深度)",
+            "R" => "R 樓",
+            "S" => "停工",
+            "T" => "TOP",
+            "TC" => "頂部間隙",
+            "TS" => "行程",
+            "TH" => "全高",
+            "Y" => "已搭、已出",
+            "YB" => "退購結案",
+            "YF" => "既有建物",
+            "YN" => "已搭、未出"
+        );
+        for ($j = 1; $j < 200; $j++) {
+            $site_survey_status[$j . "F"] = $j . "F";
+        }
+
+
+        // 營業 營業/契約確認規格
+        $sales_spec_verify_status = !empty($status_arr[$row['sales_spec_verify']]) ? $status_arr[$row['sales_spec_verify']] : "";
+        // 營業 客戶計劃圖(意匠圖)
+        $customer_planning_verify_status = !empty($status_arr[$row['customer_planning_verify']]) ? $status_arr[$row['customer_planning_verify']] : "";
+        // 營業 客戶顏色
+        $customer_color_verify_status = !empty($status_arr[$row['customer_color_verify']]) ? $status_arr[$row['customer_color_verify']] : "";
+        // 營業 客戶樣式
+        $customer_style_verify_status  = !empty($status_arr[$row['customer_style_verify']]) ? $status_arr[$row['customer_style_verify']] : "";
+        // 營業 工勘聯絡表
+        $site_survey_contact_form_verify_status  = !empty($status_arr[$row['site_survey_contact_form_verify']]) ? $status_arr[$row['site_survey_contact_form_verify']] : "";
+
+        // 設計 規格確認
+        $desin_spec_verify_status = !empty($status_arr[$row['desin_spec_verify']]) ? $status_arr[$row['desin_spec_verify']] : "";
+        // 設計 設計計劃圖確認
+        $desin_planning_verify_status = !empty($status_arr[$row['desin_planning_verify']]) ? $status_arr[$row['desin_planning_verify']] : "";
+        // 設計 設計顏色確認
+        $desin_color_verify_status = !empty($status_arr[$row['desin_color_verify']]) ? $status_arr[$row['desin_color_verify']] : "";
+        // 設計 設計樣式確認
+        $desin_style_verify_status = !empty($status_arr[$row['desin_style_verify']]) ? $status_arr[$row['desin_style_verify']] : "";
+        // 設計 設計主管確認
+        $desin_leader_verify_status = !empty($status_arr[$row['desin_leader_verify']]) ? $status_arr[$row['desin_leader_verify']] : "";
+
+        // 工務 樓高通報確認
+        $dbuilding_heigh_verify_status = !empty($status_arr[$row['building_heigh_verify']]) ? $status_arr[$row['building_heigh_verify']] : "";
+        // 工務 工勘確認
+        $site_survey_contact_verify_status = !empty($site_survey_status[$row['site_survey_contact_verify']]) ? $site_survey_status[$row['site_survey_contact_verify']] : "";
+
+
+        // 生管 是否齊備確認
+        $shengguanok_status = !empty($status_arr[$row['shengguanok_status']]) ? $status_arr[$row['shengguanok_status']] : "";
+        $prattford_order_date_verify_status = !empty($status_arr[$row['prattford_order_date_verify']]) ? $status_arr[$row['prattford_order_date_verify']] : "";
+        $estimated_shipping_date_verify_status = !empty($status_arr[$row['estimated_shipping_date_verify']]) ? $status_arr[$row['estimated_shipping_date_verify']] : "";
+        $estimated_shipping_schedule_date_verify_status = !empty($status_arr[$row['estimated_shipping_schedule_date_verify']]) ? $status_arr[$row['estimated_shipping_schedule_date_verify']] : "";
+        $goods_type_status = !empty($status2_arr[$row['goods_type']]) ? $status2_arr[$row['goods_type']] : "";
+        $taiwan_goods_type_status = !empty($status2_arr[$row['taiwan_goods_type']]) ? $status2_arr[$row['taiwan_goods_type']] : "";
+        $arrival_date_verify_status = !empty($status3_arr[$row['arrival_date_verify']]) ? $status3_arr[$row['arrival_date_verify']] : "";
+
+        $colContentArr = [
+            getArea($row['address']),
+            $row['contractno'],
+            $row['facilityno'],
+            implode("+", json_decode($row['renovate_type'])),
+            $row['custom'],
+            $row['address'],
+            $row['real_address'],
+            $Specification,
+            substr($row['contract_arrival_date'], 0, 10),
+            substr($row['prattford_order_date'], 0, 10),
+            substr($row['estimated_shipping_date'], 0, 10),
+            substr($row['estimated_shipping_schedule_date'], 0, 10),
+            substr($row['actual_tofactory_date'], 0, 10),
+            substr($row['real_contract_arrival_date'], 0, 10),
+            getGunwuName($row['address']) . $gongwuok . "/3",
+            $dbuilding_heigh_verify_status,
+            substr($row['building_heigh_verify_at'], 0, 10),
+            $site_survey_contact_verify_status,
+            substr($row['site_survey_contact_verify_at'], 0, 10),
+            $customer_planning_verify_status,
+            substr($row['customer_planning_verify_at'], 0, 10),
+            accountidToName($row['salesid']) . " " . $yingyeok . "/4",
+            $sales_spec_verify_status,
+            substr($row['sales_spec_verify_at'], 0, 10),
+            $customer_color_verify_status,
+            substr($row['customer_color_verify_at'], 0, 10),
+            $customer_style_verify_status,
+            substr($row['customer_style_verify_at'], 0, 10),
+            $site_survey_contact_form_verify_status,
+            substr($row['site_survey_contact_form_verify_at'], 0, 10),
+            '林昭翰 ' . $shejiok . "/5",
+            $desin_spec_verify_status,
+            substr($row['desin_spec_verify_at'], 0, 10),
+            $desin_planning_verify_status,
+            substr($row['desin_planning_verify_at'], 0, 10),
+            $desin_color_verify_status,
+            substr($row['desin_color_verify_at'], 0, 10),
+            $desin_style_verify_status,
+            substr($row['desin_style_verify_at'], 0, 10),
+            $desin_leader_verify_status,
+            substr($row['desin_leader_verify_at'], 0, 10),
+            '許伃廷 ' . $shengguanok . "/7",
+            $shengguanok_status,
+            substr($row['shengguanok_status_at'], 0, 10),
+            $prattford_order_date_verify_status,
+            substr($row['prattford_order_date'], 0, 10),
+            $estimated_shipping_date_verify_status,
+            substr($row['estimated_shipping_date'], 0, 10),
+            $estimated_shipping_schedule_date_verify_status,
+            substr($row['estimated_shipping_schedule_date'], 0, 10),
+            $goods_type_status,
+            substr($row['goods_type_date'], 0, 10),
+            $taiwan_goods_type_status,
+            substr($row['taiwan_goods_type_date'], 0, 10),
+            $arrival_date_verify_status,
+            substr($row['actual_tofactory_date'], 0, 10),
+        ];
+        for ($j = 0; $j < count($colContentArr); $j++)
+            $sheet->setCellValue($colArr[$j] . $i, $colContentArr[$j]);
+        $i++;
+    }
+
+    // 調整欄位大小
+    foreach ($sheet->getColumnIterator() as $column)
+        $sheet->getColumnDimension($column->getColumnIndex())->setAutoSize(true);
+
+    // 背景顏色為藍色
+    $styleA1toC1 = $sheet->getStyle('A1:N1');
+    $fillA1toC1 = $styleA1toC1->getFill();
+    $fillA1toC1->setFillType(Fill::FILL_SOLID)
+        ->getStartColor()->setRGB('8EA9DB');
+
+    // 背景顏色為橘色
+    $styleA1toC1 = $sheet->getStyle('O1:U1');
+    $fillA1toC1 = $styleA1toC1->getFill();
+    $fillA1toC1->setFillType(Fill::FILL_SOLID)
+        ->getStartColor()->setRGB('FFBB66');
+
+    // 背景顏色為綠色
+    $styleA1toC1 = $sheet->getStyle('V1:AD1');
+    $fillA1toC1 = $styleA1toC1->getFill();
+    $fillA1toC1->setFillType(Fill::FILL_SOLID)
+        ->getStartColor()->setRGB('DDFF77');
+
+    // 背景顏色為藍色
+    $styleA1toC1 = $sheet->getStyle('AE1:AO1');
+    $fillA1toC1 = $styleA1toC1->getFill();
+    $fillA1toC1->setFillType(Fill::FILL_SOLID)
+        ->getStartColor()->setRGB('BBFFEE');
+
+    // 背景顏色為橘色
+    $styleA1toC1 = $sheet->getStyle('AP1:BE1');
+    $fillA1toC1 = $styleA1toC1->getFill();
+    $fillA1toC1->setFillType(Fill::FILL_SOLID)
+        ->getStartColor()->setRGB('FFCCCC');
+
+
+
+    // 第二個分頁
+    $worksheet2 = $spreadsheet->createSheet();
+    $spreadsheet->setActiveSheetIndex(1);
+
+    // 在第二個工作表寫入數據
+    $worksheet2->setCellValue('A1', '確認進度統計表');
+
+
+
+
+    // 設定活動工作表回到第一個工作表
+    $spreadsheet->setActiveSheetIndex(0);
+    $writer = new Xlsx($spreadsheet);
+    $file_path = dirname(__DIR__) . '/wms/excel/' . 'gary_test.xlsx';
+    try {
+        $writer->save($file_path);
+        // 回傳檔案路徑給 JavaScript
+        echo $file_path;
+    } catch (Exception $e) {
+        echo 'Error: ' . $e->getMessage();
+    }
+    exit();
+}
diff --git a/wms/wipwhole-renovate-index-function.php b/wms/wipwhole-renovate-index-function.php
index 341b2d60..45b89061 100644
--- a/wms/wipwhole-renovate-index-function.php
+++ b/wms/wipwhole-renovate-index-function.php
@@ -1,1126 +1,1153 @@
-<?php
-
-// 取得本次簽核的表單id值
-function getId($link, $form_key)
-{
-    $sql = "
-        SELECT form_id AS id 
-        FROM flow
-        WHERE form_key = '$form_key'
-        AND system_id = 'wws'
-        AND flow_id = 'wws02'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row['id'];
-}
-
-// 取得本次簽核的表單form_key值 
-function getForm_key($link, $form_id)
-{
-    $sql = "
-        SELECT 
-            f.form_key
-        FROM flow AS f
-        LEFT JOIN subflow AS s
-        ON f.form_key = s.form_key
-        WHERE 1=1
-        AND f.form_id = '$form_id' 
-        AND f.flow_code IN ('A','B','C','D','E')
-        AND f.system_id = 'wws'
-        AND f.flow_id = 'wws02'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row['form_key'];
-}
-
-function getWipwholestatusData($link, $id)
-{
-    $db_query = "
-        SELECT * 
-        FROM wipwholestatus 
-        WHERE id = '$id'
-        AND status = '1'
-    ";
-    $receivabledata = mysqli_query($link, $db_query);
-    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
-}
-
-// 修正時間欄位
-function fixTime($time)
-{
-    return empty($time) ? '0000T00:00:00' : date('Y-m-d', strtotime($time)) . "T" . date('H:i:s', strtotime($time));
-}
-
-// 修正時間欄位 若是空值則帶入現在時間戳記
-function fixTimeToNow($time)
-{
-    return empty($time) ? date("Y-m-d") . "T" . date("H:i:s") : date('Y-m-d', strtotime($time)) . "T" . date('H:i:s', strtotime($time));
-}
-
-// 檢查營業階段
-function checkYingYeok($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(sales_spec_verify != '2',sales_spec_verify,'0') AS SIGNED) +
-                CAST(IF(customer_color_verify != '2',customer_color_verify,'0') AS SIGNED) +
-                CAST(IF(customer_style_verify != '2',customer_style_verify,'0') AS SIGNED) +
-                CAST(IF(site_survey_contact_form_verify != '2',site_survey_contact_form_verify,'0') AS SIGNED) 
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 檢查設計階段
-function checkSheJiok($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(desin_spec_verify != '2' ,desin_spec_verify,'0') AS SIGNED) +
-                CAST(IF(desin_planning_verify != '2' ,desin_planning_verify,'0') AS SIGNED) +
-                CAST(IF(desin_color_verify != '2' ,desin_color_verify,'0') AS SIGNED) +
-                CAST(IF(desin_style_verify != '2' ,desin_style_verify,'0') AS SIGNED) 
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 檢查設計主管階段
-function checkSheJiokLeader($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(desin_leader_verify != '2',desin_leader_verify,'0') AS SIGNED) 
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 檢查工務階段
-function checkGongWuok($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(building_heigh_verify != '2',building_heigh_verify,'0') AS SIGNED) +
-                CAST(IF(customer_planning_verify != '2',customer_planning_verify,'0') AS SIGNED) 
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 檢查生管階段
-function checkShengGuanok($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(shengguanok_status != '2',shengguanok_status,'0') AS SIGNED)+
-                CAST(IF(prattford_order_date_verify != '2',prattford_order_date_verify,'0') AS SIGNED)+
-                CAST(IF(estimated_shipping_date_verify != '2',estimated_shipping_date_verify,'0') AS SIGNED)+
-                CAST(IF(estimated_shipping_schedule_date_verify != '2',estimated_shipping_schedule_date_verify,'0') AS SIGNED)+
-                CAST(IF(goods_type = 'A' OR goods_type = 'C' ,'0','1') AS SIGNED)+
-                CAST(IF(taiwan_goods_type = 'A' OR taiwan_goods_type = 'C' ,'0','1') AS SIGNED)+
-                CAST(IF(arrival_date_verify = 'A' ,'0','1') AS SIGNED)
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 取得營業員編號
-function getYingYeokNo($link)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key'])) {
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-    }
-    $sql = "
-        SELECT
-            salesid
-        FROM wipwholestatus
-        WHERE id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 取得設計部主管編號
-function getSheJiokLeaderNo($link)
-{
-    $sql = "
-        SELECT accountid 
-        FROM `account` 
-        WHERE `department_id` = '911'
-        AND `role_id` = '1';    
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 取得工務部主管編號
-function getGongWuokNo($link)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key']))
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-    $sql = "
-        SELECT DISTINCT 
-            SUBSTR(address,1,2)
-        FROM `wipwholestatus`
-        WHERE id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    // 宜蘭=高培軒(M0087) 北=吳宗紘(M0040) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
-    $arr = array(
-        "宜蘭" => "M0087",
-        "北" => "M0040",
-        "台北" => "M0040",
-        "基隆" => "M0040",
-        "新北" => "M0040",
-        "新竹" => "M0040",
-        "桃園" => "M0040",
-        "苗栗" => "M0113",
-        "中" => "M0113",
-        "南投" => "M0113",
-        "台中" => "M0113",
-        "彰化" => "M0113",
-        "雲林" => "M0113",
-        "南" => "M0102",
-        "台南" => "M0102",
-        "嘉義" => "M0102",
-        "屏東" => "M0102",
-        "高雄" => "M0102"
-    );
-    return empty($arr[$row[0]]) ? "" : $arr[$row[0]];
-}
-
-// 取得生管部主管編號
-function getShengGuanokLeaderNo($link)
-{
-    $sql = "
-        SELECT accountid 
-        FROM `account` 
-        WHERE `department_id` = '321'
-        AND `role_id` = '1';    
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 確認目前狀態
-function checkNowFormStatus($link)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key'])) {
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-        $form_key = getForm_key($link, $id);
-    }
-    $sql = "
-        SELECT
-            flow_code
-        FROM flow
-        WHERE form_id = '$id'
-        AND form_key = '$form_key'
-        AND system_id = 'wws'
-        AND flow_id = 'wws02'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row['0'];
-}
-
-function getWipwholeSearchSql()
-{
-
-    $area = [
-        'Y' => " '宜蘭','花蓮','台東' ",
-        'N' => " '臺北', '台北', '基隆', '新北' ",
-        'T' => " '桃園', '新竹' ",
-        'C' => " '南投', '臺中', '台中', '彰化', '雲林', '苗栗' ",
-        'K' => " '台南', '臺南', '嘉義', '屏東', '高雄' "
-    ];
-
-    $contractno = empty($_REQUEST['contractno']) ? null : trim($_REQUEST['contractno']);
-    $facilityno = empty($_REQUEST['facilityno']) ? null : trim($_REQUEST['facilityno']);
-    $custom = empty($_REQUEST['custom']) ? null : trim($_REQUEST['custom']);
-    $site_survey_contact_verify = !isset($_REQUEST['site_survey_contact_verify']) ? null : trim($_REQUEST['site_survey_contact_verify']);
-    $real_contract_arrival_date_start = empty($_REQUEST['real_contract_arrival_date_start']) ? null : trim($_REQUEST['real_contract_arrival_date_start']);
-    $real_contract_arrival_date_end = empty($_REQUEST['real_contract_arrival_date_end']) ? null : trim($_REQUEST['real_contract_arrival_date_end']);
-    $area_no = empty($_REQUEST['area_no']) ? null : trim($_REQUEST['area_no']);
-
-    $sql = "";
-    $sql .= empty($area_no) ? "" : " AND SUBSTR(address,1,2) IN (" . $area[$area_no] . ") ";
-    $sql .= empty($contractno) ? "" : " AND contractno LIKE '%$contractno%' ";
-    $sql .= empty($facilityno) ? "" : " AND facilityno LIKE '%$facilityno%' ";
-    $sql .= empty($custom) ? "" : " AND custom LIKE '%$custom%' ";
-    $sql .= $site_survey_contact_verify == "" ? "" : " AND site_survey_contact_verify = '" . $site_survey_contact_verify . "' ";
-    $sql .= empty($real_contract_arrival_date_start) ? "" : " AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') >= '$real_contract_arrival_date_start' ";
-    $sql .= empty($real_contract_arrival_date_end) ? "" : " AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') <= '$real_contract_arrival_date_end' ";
-    return $sql;
-}
-
-function getDepartmentId($link, $user_id)
-{
-    $sql = "
-        SELECT 
-            department_id
-        FROM account 
-        WHERE accountid = '$user_id'
-    ";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_row($res);
-    mysqli_free_result($res);
-    return $row[0];
-}
-
-function getRoleId($link, $user_id)
-{
-    $sql = "
-        SELECT 
-            role_id 
-        FROM account 
-        WHERE accountid = '$user_id'
-    ";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_row($res);
-    mysqli_free_result($res);
-    return $row[0];
-}
-
-function getEditFlag($department_id, $role_id, $user_id)
-{
-    // 業務部門
-    // 鍾哥(生管) 部門代碼:250 職位大小:1 4
-    // 許協理 部門代碼:320 職位大小:1
-    // 詹總 部門代碼:50 職位大小:1
-    // 許總 部門代碼:20 職位大小:1
-    // 設計 部門代碼:911
-    // 宜蘭工務 user_id:M0087
-    // 北區工務組長 user_id:M0040
-    // 中區工務組長 user_id:M0113 M0158
-    // 南區工務組長 user_id:M0039 M0078
-    // 工務部門 部門代碼:521 531 541 542 543 544 545
-
-    if ($department_id == "321")
-        return 8;
-    if ($department_id == "250" && in_array($role_id, ["1", "4"]))
-        return  8;
-    if ($department_id == "320" && $role_id == "1")
-        return  8;
-    if ($department_id == "50" && $role_id == "1")
-        return 8;
-    if ($department_id == "20" && $role_id == "1")
-        return 8;
-    if ($department_id == "911")
-        return 2;
-    if ($user_id == 'M0087')
-        return  4;
-    if ($user_id == 'M0040' || $user_id == 'M0176')
-        return  4;
-    if ($user_id == 'M0113' || $user_id == 'M0158')
-        return  4;
-    if ($user_id == 'M0039' || $user_id == 'M0078')
-        return  4;
-    // 品証部門
-    if ($department_id == '912')
-        return  4;
-    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545]))
-        return  4;
-    $sql_cmd = sql_myself($user_id, "salesid");
-    if (!empty($sql_cmd))
-        return 1;
-    return 15;
-}
-
-function getDataSql($department_id, $role_id, $user_id)
-{
-
-    // 補丁 黃孟澤 & 葉博澄 權限 = 李烘銘
-    if (in_array($user_id, ['M0166', 'M0091'])) {
-        $user_id = 'M0086';
-    }
-
-    $contract_type = 'B';
-    // 營業員主管或營業員
-    $department_arr = [
-        '310', '311', '312', '313', '314', '315',
-        '511', '512', '513', '514'
-    ];
-
-    $sql_cmd = sql_myself($user_id, "salesid");
-    $sql = "
-        SELECT * FROM wipwholestatus $sql_cmd 
-    ";
-    $sql .= empty($sql_cmd) ? " WHERE 1=1 AND status = '1' AND contract_type = '$contract_type' " : " AND status = '1' AND contract_type = '$contract_type'";
-    $sql .= getWipwholeSearchSql();
-    $sql .= "ORDER BY real_contract_arrival_date DESC ";
-
-    if (in_array($department_id, $department_arr)) {
-        // 北區營銷部 營銷專案經理 311 1
-        //           新梯營銷經理 311 3
-        // 桃竹營銷部 銷售專案經理 312 1
-        // 中區營銷部 新梯營銷經理 313 1
-        // 南區營銷部 銷售專案經理 314 2
-        // 花東區營銷部 營銷專案經理 315 1
-
-        if ($department_id == '311' && (in_array($role_id, ['1', '3'])) || $user_id = "M0013") {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '312' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '313' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '314' && (in_array($role_id, ['2']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '315' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-    }
-    // 鍾哥 部門代碼:250 職位大小:1 4
-    // 許協理 部門代碼:320 職位大小:1
-    // 張主任 部門代碼:322 職位大小:1
-    // 詹總 部門代碼:50 職位大小:1
-    // 許總 部門代碼:20 職位大小:1
-    // 業務部門 部門代碼:321
-    // 資訊部門 部門代碼:220
-    // 服務支援部門 部門代碼:501
-    // 財會部門 部門代碼:210
-    $department_arr = ['911', '250', '320', '50', '20', '321', '220', '322', '501', '210', '912'];
-    if (in_array($department_id, $department_arr)) {
-        $sql = "
-            SELECT * FROM wipwholestatus
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date ASC
-        ";
-        return $sql;
-    }
-    // (宜蘭)工務組長
-    if ($user_id == 'M0087') {
-        $sql = "
-                SELECT * FROM wipwholestatus 
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                AND SUBSTR(address,1,2) in ('宜蘭')
-                ORDER BY real_contract_arrival_date DESC
-            ";
-        return $sql;
-    }
-    // 北區工務組長
-    if ($user_id == 'M0040' || $user_id == 'M0176') {
-        $sql = "
-            SELECT * FROM wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 中區工務組長
-    if ($user_id == 'M0113' || $user_id == 'M0158') {
-        $sql = "
-            SELECT * FROM wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 南區工務組長
-    if ($user_id == 'M0039' || $user_id == 'M0078') {
-        $sql = "
-            SELECT * FROM wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 工務
-    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545])) {
-        $sql = "
-            SELECT * FROM wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    return $sql;
-}
-
-function getDataSqlByflowCode($department_id, $role_id, $user_id, $flow_code)
-{
-
-    // 補丁 黃孟澤 & 葉博澄 權限 = 李烘銘
-    if (in_array($user_id, ['M0166', 'M0091'])) {
-        $user_id = 'M0086';
-    }
-
-    $contract_type = 'B';
-    // 營業員主管或營業員
-    $department_arr = ['501', '511', '512', '513', '514'];
-
-    $sql_cmd = sql_myself($user_id, "salesid");
-    $sql = "
-        SELECT * FROM wipwholestatus $sql_cmd 
-    ";
-    $sql .= empty($sql_cmd) ? " WHERE 1=1 AND contract_type = '$contract_type' " : " AND contract_type = '$contract_type'";
-    $sql .= "
-        AND status = '1'
-        AND id IN (
-            SELECT 
-                form_id AS id
-            FROM flow 
-            WHERE system_id = 'wws' 
-            AND flow_id = 'wws02' 
-            AND flow_code IN ('$flow_code')        
-        )
-    ";
-    $sql .= getWipwholeSearchSql();
-    $sql .= "ORDER BY real_contract_arrival_date DESC ";
-
-    if (in_array($department_id, $department_arr)) {
-        // 北區營銷部 營銷專案經理 311 1
-        //           新梯營銷經理 311 3
-        // 桃竹營銷部 銷售專案經理 312 1
-        // 中區營銷部 新梯營銷經理 313 1
-        // 南區營銷部 銷售專案經理 314 2
-        // 花東區營銷部 銷售專案經理 314 1
-        if ($department_id == '311' && (in_array($role_id, ['1', '3']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '312' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '313' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '314' && (in_array($role_id, ['2']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '315' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-    }
-
-    // 鍾哥 部門代碼:250 職位大小:1 4
-    // 許協理 部門代碼:320 職位大小:1
-    // 張主任 部門代碼:322 職位大小:1
-    // 詹總 部門代碼:50 職位大小:1
-    // 許總 部門代碼:20 職位大小:1
-    // 業務部門 部門代碼:321
-    // 資訊部門 部門代碼:220
-    // 服務支援部 部門代碼:501
-    // 財會部門 部門代碼:210
-    $department_arr = ['911', '250', '320', '50', '20', '321', '220', '322', '501', '210', '912'];
-    if (in_array($department_id, $department_arr)) {
-        $sql = "
-            SELECT * FROM wipwholestatus
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws02' 
-                AND flow_code IN ('$flow_code')        
-            )
-        " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date ASC
-        ";
-        return $sql;
-    }
-
-    // (宜蘭)工務組長
-    if ($user_id == 'M0087') {
-        $sql = "
-                SELECT * FROM wipwholestatus 
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-                AND id IN (
-                    SELECT 
-                        form_id AS id
-                    FROM flow 
-                    WHERE system_id = 'wws' 
-                    AND flow_id = 'wws02' 
-                    AND flow_code IN ('$flow_code')          
-                )
-            " . getWipwholeSearchSql() . "
-                AND SUBSTR(address,1,2) in ('宜蘭')
-                ORDER BY real_contract_arrival_date DESC
-            ";
-        return $sql;
-    }
-    // 北區工務組長
-    if ($user_id == 'M0040' || $user_id == 'M0176') {
-        $sql = "
-            SELECT * FROM wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws02' 
-                AND flow_code IN ('$flow_code')         
-            )
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 中區工務組長
-    if ($user_id == 'M0113' || $user_id == 'M0158') {
-        $sql = "
-            SELECT * FROM wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws02' 
-                AND flow_code IN ('$flow_code')         
-            )
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 南區工務組長
-    if ($user_id == 'M0039' || $user_id == 'M0078') {
-        $sql = "
-            SELECT * FROM wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws02' 
-                AND flow_code IN ('$flow_code')         
-            )
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 工務
-    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545])) {
-        $sql = "
-            SELECT * FROM wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws02' 
-                AND flow_code IN ('$flow_code')       
-            )
-            " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    return $sql;
-}
-
-function getGunwuName($address)
-{
-    $north_arr = array('台北', '基隆', '新北', '桃園', '新竹', '台東');
-    $north_arr2 = array('宜蘭');
-    $center_arr = array('南投', '彰化', '雲林', '台中', '苗栗');
-    $south_arr = array('台南', '嘉義', '屏東', '高雄');
-    foreach ($north_arr as $key => $value)
-        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
-            return "吳宗紘";
-    foreach ($north_arr2 as $key => $value)
-        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
-            return "高培軒";
-    foreach ($center_arr as $key => $value)
-        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
-            return "林瑋隆";
-    foreach ($south_arr as $key => $value)
-        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
-            return "鄭存邑";
-    return "";
-}
-
-function getInformationStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    return "disabled";
-}
-function getYewuStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 321)
-        return "";
-    return "disabled";
-}
-function getWarehouseStatus($link, $user_department_id, $role_id, $status)
-{
-    if ($user_department_id == 220)
-        return "";
-    if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545, 50, 501, 311, 313, 314, 521, 315, 912])) {
-        if ($status == 1) {
-            return checkNowFormStatus($link) == 'A' ? "" : "disabled";
-        } else {
-            return "";
-        }
-    }
-    return "disabled";
-}
-function getMarketingStatus($link, $user_department_id, $role_id, $status)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315) {
-        if ($status == 1) {
-            return checkNowFormStatus($link) == 'B' ? "" : "disabled";
-        } else {
-            return "";
-        }
-    }
-    if ($user_department_id == 501 || $user_department_id == 511 || $user_department_id == 512 || $user_department_id == 513 || $user_department_id == 514) {
-        if ($status == 1) {
-            return checkNowFormStatus($link) == 'B' ? "" : "disabled";
-        } else {
-            return "";
-        }
-    }
-    return "disabled";
-}
-function getDesinStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 911)
-        return checkNowFormStatus($link) == 'C' ? "" : "disabled";
-    return "disabled";
-}
-function getDesinLeaderStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 911)
-        return checkNowFormStatus($link) == 'D' && $role_id == 1 ? "" : "disabled";
-    return "disabled";
-}
-function getShengguanStatus($link, $user_department_id, $role_id, $status)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($status == '1') {
-        if ($user_department_id == 250 && in_array($role_id, [1, 4]))
-            return "";
-    } else {
-        if ($user_department_id == 250)
-            return "";
-    }
-    return "disabled";
-}
-function getPinzhengStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 912)
-        return "";
-    return "disabled";
-}
-
-function getTabNo($user_department_id)
-{
-    if ($user_department_id == 220)
-        return 0;
-    if (in_array($user_department_id, [311, 312, 313, 314, 315]))
-        return 1;
-    if (in_array($user_department_id, [501, 511, 512, 513]))
-        return 1;
-    if ($user_department_id == 911)
-        return 2;
-    if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545]))
-        return 0;
-    if ($user_department_id == 321 || $user_department_id == 250)
-        return 3;
-    if ($user_department_id == 912)
-        return 4;
-    return 0;
-}
-
-function getOpendoorOptions($link)
-{
-    $sql = "
-        SELECT 
-            code_name AS val ,
-            content AS label 
-        FROM code 
-        WHERE field_name='open_kind'
-        ORDER BY label ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getYingyeokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('311','312','313','314','315','511','512','513','514')
-        ORDER BY accountid ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getShejiokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('911')
-        AND `role_id` NOT IN ('1')
-        ORDER BY accountid ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getShejiokLeaderOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('911')
-        AND `role_id` IN ('1')
-        ORDER BY accountid ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getGongwuokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('521','531','501','541','542','543','544','545')
-        ORDER BY accountid ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getYewuOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('321')
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getShengguanokOptions($link)
-{
-    $sql = " 
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('250')
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getPinzhengOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('912')
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getAllUsersOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `accounttype` NOT IN ('A','X')
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getSelectOptionHtml($options, $selected_val)
-{
-    $str = "";
-    foreach ($options as $option) :
-        if ($option['val'] == $selected_val) {
-            $str .= "<option selected value='" . $option['val'] . "'>" . $option['val'] . $option['label'] . "</option>";
-        } else {
-            $str .= "<option value='" . $option['val'] . "'>" . $option['val'] . $option['label'] . "</option>";
-        }
-    endforeach;
-    return $str;
-}
-
-function getWipwholeChangeButtonStatus($user_department_id)
-{
-    if (in_array($user_department_id, [311, 312, 313, 314, 315]))
-        return true;
-    if (in_array($user_department_id, [501, 511, 512, 513, 514]))
-        return true;
-    if (in_array($user_department_id, [521, 531, 220, 250]))
-        return true;
-    if (in_array($user_department_id, [541, 542, 543, 544, 545]))
-        return true;
-    return false;
-}
-
-
-function getSaveEstimateInstallData($user_department_id, $role_id)
-{
-    if (in_array($user_department_id, ['50', '501']) && $role_id == '2')
-        return true;
-    if ($user_department_id == '311' && $role_id == '4')
-        return true;
-    if ($user_department_id == '312' && $role_id == '3')
-        return true;
-    if ($user_department_id == '313' && $role_id == '3')
-        return true;
-    if ($user_department_id == '314' && $role_id == '4')
-        return true;
-    if ($user_department_id == '315' && in_array($role_id, ['1', '2']))
-        return true;
-    if (in_array($user_department_id, [220, 531]))
-        return true;
-    if ($user_department_id == '521' && in_array($role_id, ['11', '9', '12']))
-        return true;
-    if ($user_department_id == '542' && in_array($role_id, ['1', '5', '6']))
-        return true;
-    if ($user_department_id == '544' && in_array($role_id, ['3', '6']))
-        return true;
-    if ($user_department_id == '543' && $role_id == '2')
-        return true;
-    if ($user_department_id == '545' && in_array($role_id, ['3', '6']))
-        return true;
-    return false;
-}
-
-function getSaveInstallDataButtonStatus($user_department_id, $role_id)
-{
-    if ($user_department_id == '315' && $role_id == '1')
-        return true;
-    if ($user_department_id == '521' && $role_id == '9')
-        return true;
-    if ($user_department_id == '542' && in_array($role_id, ['1', '5', '6']))
-        return true;
-    if ($user_department_id == '543' && $role_id == '2')
-        return true;
-    if ($user_department_id == '544' && in_array($role_id, ['3', '6']))
-        return true;
-    if ($user_department_id == '545' && in_array($role_id, ['3', '6']))
-        return true;
-    if ($user_department_id == '220')
-        return true;
-    return false;
-}
-
-function getWipwholeChangePlanningCustomerDetailsStatus($link, $id)
-{
-    $sql = "
-        SELECT
-            custom_name,
-            create_at,
-            change_status
-        FROM wipwhole_change_planning_customer_details
-        WHERE 1=1
-        AND wipwholestatus_id = '$id'
-        ORDER BY create_at DESC
-        LIMIT 1
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getAllCustomerPlanningVerify($link, $id)
-{
-    $sql = "
-        SELECT
-            custom AS custom_name,
-            customer_planning_verify_file,
-            create_at
-        FROM wipwholestatus
-        WHERE id = $id
-        AND customer_planning_verify_file != ''
-        AND customer_planning_verify_file IS NOT NULL
-        UNION
-        SELECT
-            custom_name,
-            customer_planning_verify_file,
-            create_at
-        FROM wipwhole_change_planning_customer_details
-        WHERE wipwholestatus_id = $id
-        AND customer_planning_verify_file != ''
-        AND customer_planning_verify_file IS NOT NULL
-    ";
-    return mysqli_query($link, $sql);
-}
\ No newline at end of file
+<?php
+
+/**
+ * 取得生管主管 options
+ * @param object $link:資料庫連線
+ * @param string $id:作番大日程唯一值
+ * @return object 回傳 mysqli_query
+ */
+function getWipwholestatusDetail($link, $id)
+{
+    $db_query = "
+        SELECT * FROM 
+        wipwholestatus WHERE id = '$id'
+    ";
+    $receivabledata = mysqli_query($link, $db_query);
+    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
+}
+
+// 取得本次簽核的表單id值
+function getId($link, $form_key)
+{
+    $sql = "
+        SELECT form_id AS id 
+        FROM flow
+        WHERE form_key = '$form_key'
+        AND system_id = 'wws'
+        AND flow_id = 'wws02'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row['id'];
+}
+
+// 取得本次簽核的表單form_key值 
+function getForm_key($link, $form_id)
+{
+    $sql = "
+        SELECT 
+            f.form_key
+        FROM flow AS f
+        LEFT JOIN subflow AS s
+        ON f.form_key = s.form_key
+        WHERE 1=1
+        AND f.form_id = '$form_id' 
+        AND f.flow_code IN ('A','B','C','D','E','F')
+        AND f.system_id = 'wws'
+        AND f.flow_id = 'wws02'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row['form_key'];
+}
+
+function getWipwholestatusData($link, $id)
+{
+    $db_query = "
+        SELECT * 
+        FROM wipwholestatus 
+        WHERE id = '$id'
+        AND status = '1'
+    ";
+    $receivabledata = mysqli_query($link, $db_query);
+    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
+}
+
+// 修正時間欄位
+function fixTime($time)
+{
+    return empty($time) ? '0000T00:00:00' : date('Y-m-d', strtotime($time)) . "T" . date('H:i:s', strtotime($time));
+}
+
+// 修正時間欄位 若是空值則帶入現在時間戳記
+function fixTimeToNow($time)
+{
+    return empty($time) ? date("Y-m-d") . "T" . date("H:i:s") : date('Y-m-d', strtotime($time)) . "T" . date('H:i:s', strtotime($time));
+}
+
+// 檢查營業階段
+function checkYingYeok($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(sales_spec_verify != '2',sales_spec_verify,'0') AS SIGNED) +
+                CAST(IF(customer_color_verify != '2',customer_color_verify,'0') AS SIGNED) +
+                CAST(IF(customer_style_verify != '2',customer_style_verify,'0') AS SIGNED) +
+                CAST(IF(site_survey_contact_form_verify != '2',site_survey_contact_form_verify,'0') AS SIGNED) 
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 檢查設計階段
+function checkSheJiok($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(desin_spec_verify != '2' ,desin_spec_verify,'0') AS SIGNED) +
+                CAST(IF(desin_planning_verify != '2' ,desin_planning_verify,'0') AS SIGNED) +
+                CAST(IF(desin_color_verify != '2' ,desin_color_verify,'0') AS SIGNED) +
+                CAST(IF(desin_style_verify != '2' ,desin_style_verify,'0') AS SIGNED) 
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 檢查設計主管階段
+function checkSheJiokLeader($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(desin_leader_verify != '2',desin_leader_verify,'0') AS SIGNED) 
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 檢查工務階段
+function checkGongWuok($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(building_heigh_verify != '2',building_heigh_verify,'0') AS SIGNED) +
+                CAST(IF(customer_planning_verify != '2',customer_planning_verify,'0') AS SIGNED) 
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 檢查生管階段
+function checkShengGuanok($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(shengguanok_status != '2',shengguanok_status,'0') AS SIGNED)+
+                CAST(IF(prattford_order_date_verify != '2',prattford_order_date_verify,'0') AS SIGNED)+
+                CAST(IF(estimated_shipping_date_verify != '2',estimated_shipping_date_verify,'0') AS SIGNED)+
+                CAST(IF(estimated_shipping_schedule_date_verify != '2',estimated_shipping_schedule_date_verify,'0') AS SIGNED)+
+                CAST(IF(goods_type = 'A' OR goods_type = 'C' ,'0','1') AS SIGNED)+
+                CAST(IF(taiwan_goods_type = 'A' OR taiwan_goods_type = 'C' ,'0','1') AS SIGNED)+
+                CAST(IF(arrival_date_verify = 'A' ,'0','1') AS SIGNED)
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 取得營業員編號
+function getYingYeokNo($link)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key'])) {
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+    }
+    $sql = "
+        SELECT
+            salesid
+        FROM wipwholestatus
+        WHERE id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 取得設計部主管編號
+function getSheJiokLeaderNo($link)
+{
+    $sql = "
+        SELECT accountid 
+        FROM `account` 
+        WHERE `department_id` = '911'
+        AND `role_id` = '1';    
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 取得工務部主管編號
+function getGongWuokNo($link)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key']))
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+    $sql = "
+        SELECT DISTINCT 
+            SUBSTR(address,1,2)
+        FROM `wipwholestatus`
+        WHERE id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    // 宜蘭=高培軒(M0087) 北=吳宗紘(M0040) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
+    $arr = array(
+        "宜蘭" => "M0087",
+        "北" => "M0040",
+        "台北" => "M0040",
+        "基隆" => "M0040",
+        "新北" => "M0040",
+        "新竹" => "M0040",
+        "桃園" => "M0040",
+        "苗栗" => "M0113",
+        "中" => "M0113",
+        "南投" => "M0113",
+        "台中" => "M0113",
+        "彰化" => "M0113",
+        "雲林" => "M0113",
+        "南" => "M0102",
+        "台南" => "M0102",
+        "嘉義" => "M0102",
+        "屏東" => "M0102",
+        "高雄" => "M0102"
+    );
+    return empty($arr[$row[0]]) ? "" : $arr[$row[0]];
+}
+
+// 取得生管部主管編號
+function getShengGuanokLeaderNo($link)
+{
+    return "M0079";
+    $sql = "
+        SELECT accountid 
+        FROM `account` 
+        WHERE `department_id` = '250'
+        AND `role_id` = '4';    
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 確認目前狀態
+function checkNowFormStatus($link)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key'])) {
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+        $form_key = getForm_key($link, $id);
+    }
+    $sql = "
+        SELECT
+            flow_code
+        FROM flow
+        WHERE form_id = '$id'
+        AND form_key = '$form_key'
+        AND system_id = 'wws'
+        AND flow_id = 'wws02'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row['0'];
+}
+
+function getWipwholeSearchSql()
+{
+
+    $area = [
+        'Y' => " '宜蘭','花蓮','台東' ",
+        'N' => " '臺北', '台北', '基隆', '新北' ",
+        'T' => " '桃園', '新竹' ",
+        'C' => " '南投', '臺中', '台中', '彰化', '雲林', '苗栗' ",
+        'K' => " '台南', '臺南', '嘉義', '屏東', '高雄' "
+    ];
+
+    $contractno = empty($_REQUEST['contractno']) ? null : trim($_REQUEST['contractno']);
+    $facilityno = empty($_REQUEST['facilityno']) ? null : trim($_REQUEST['facilityno']);
+    $custom = empty($_REQUEST['custom']) ? null : trim($_REQUEST['custom']);
+    $site_survey_contact_verify = !isset($_REQUEST['site_survey_contact_verify']) ? null : trim($_REQUEST['site_survey_contact_verify']);
+    $real_contract_arrival_date_start = empty($_REQUEST['real_contract_arrival_date_start']) ? null : trim($_REQUEST['real_contract_arrival_date_start']);
+    $real_contract_arrival_date_end = empty($_REQUEST['real_contract_arrival_date_end']) ? null : trim($_REQUEST['real_contract_arrival_date_end']);
+    $area_no = empty($_REQUEST['area_no']) ? null : trim($_REQUEST['area_no']);
+
+    $sql = "";
+    $sql .= empty($area_no) ? "" : " AND SUBSTR(address,1,2) IN (" . $area[$area_no] . ") ";
+    $sql .= empty($contractno) ? "" : " AND contractno LIKE '%$contractno%' ";
+    $sql .= empty($facilityno) ? "" : " AND facilityno LIKE '%$facilityno%' ";
+    $sql .= empty($custom) ? "" : " AND custom LIKE '%$custom%' ";
+    $sql .= $site_survey_contact_verify == "" ? "" : " AND site_survey_contact_verify = '" . $site_survey_contact_verify . "' ";
+    $sql .= empty($real_contract_arrival_date_start) ? "" : " AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') >= '$real_contract_arrival_date_start' ";
+    $sql .= empty($real_contract_arrival_date_end) ? "" : " AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') <= '$real_contract_arrival_date_end' ";
+    return $sql;
+}
+
+function getDepartmentId($link, $user_id)
+{
+    $sql = "
+        SELECT 
+            department_id
+        FROM account 
+        WHERE accountid = '$user_id'
+    ";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_row($res);
+    mysqli_free_result($res);
+    return $row[0];
+}
+
+function getRoleId($link, $user_id)
+{
+    $sql = "
+        SELECT 
+            role_id 
+        FROM account 
+        WHERE accountid = '$user_id'
+    ";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_row($res);
+    mysqli_free_result($res);
+    return $row[0];
+}
+
+function getEditFlag($department_id, $role_id, $user_id)
+{
+    // 業務部門
+    // 鍾哥(生管) 部門代碼:250 職位大小:1 4
+    // 許協理 部門代碼:320 職位大小:1
+    // 詹總 部門代碼:50 職位大小:1
+    // 許總 部門代碼:20 職位大小:1
+    // 設計 部門代碼:911
+    // 宜蘭工務 user_id:M0087
+    // 北區工務組長 user_id:M0040
+    // 中區工務組長 user_id:M0113 M0158
+    // 南區工務組長 user_id:M0039 M0078
+    // 工務部門 部門代碼:521 531 541 542 543 544 545
+
+    if ($department_id == "321")
+        return 8;
+    if ($department_id == "250")
+        return  8;
+    if ($department_id == "320" && $role_id == "1")
+        return  8;
+    if ($department_id == "50" && $role_id == "1")
+        return 8;
+    if ($department_id == "20" && $role_id == "1")
+        return 8;
+    if ($department_id == "911")
+        return 2;
+    if ($user_id == 'M0087')
+        return  4;
+    if ($user_id == 'M0040' || $user_id == 'M0176')
+        return  4;
+    if ($user_id == 'M0113' || $user_id == 'M0158')
+        return  4;
+    if ($user_id == 'M0039' || $user_id == 'M0078')
+        return  4;
+    // 品証部門
+    if ($department_id == '912')
+        return  4;
+    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545]))
+        return  4;
+    $sql_cmd = sql_myself($user_id, "salesid");
+    if (!empty($sql_cmd))
+        return 1;
+    return 15;
+}
+
+function getDataSql($department_id, $role_id, $user_id)
+{
+
+    // 補丁 黃孟澤 & 葉博澄 權限 = 李烘銘
+    if (in_array($user_id, ['M0166', 'M0091'])) {
+        $user_id = 'M0086';
+    }
+    // 補丁 孫仲凱 = 林瑋隆
+    if (in_array($user_id, ['M0159'])) {
+        $user_id = 'M0113';
+    }
+
+    $contract_type = 'B';
+    // 營業員主管或營業員
+    $department_arr = [
+        '310', '311', '312', '313', '314', '315',
+        '511', '512', '513', '514'
+    ];
+
+    $sql_cmd = sql_myself($user_id, "salesid");
+    $sql = "
+        SELECT * FROM wipwholestatus $sql_cmd 
+    ";
+    $sql .= empty($sql_cmd) ? " WHERE 1=1 AND status = '1' AND contract_type = '$contract_type' " : " AND status = '1' AND contract_type = '$contract_type'";
+    $sql .= getWipwholeSearchSql();
+    $sql .= "ORDER BY real_contract_arrival_date DESC ";
+
+    if (in_array($department_id, $department_arr)) {
+        // 北區營銷部 營銷專案經理 311 1
+        //           新梯營銷經理 311 3
+        // 桃竹營銷部 銷售專案經理 312 1
+        // 中區營銷部 新梯營銷經理 313 1
+        // 南區營銷部 銷售專案經理 314 2
+        // 花東區營銷部 營銷專案經理 315 1
+
+        if ($department_id == '311' && (in_array($role_id, ['1', '3'])) || $user_id = "M0013") {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '312' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '313' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '314' && (in_array($role_id, ['1', '2']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '315' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+    }
+    // 鍾哥 部門代碼:250 職位大小:1 4
+    // 許協理 部門代碼:320 職位大小:1
+    // 張主任 部門代碼:322 職位大小:1
+    // 詹總 部門代碼:50 職位大小:1
+    // 許總 部門代碼:20 職位大小:1
+    // 業務部門 部門代碼:321
+    // 資訊部門 部門代碼:220
+    // 服務支援部門 部門代碼:501
+    // 財會部門 部門代碼:210
+    $department_arr = ['911', '250', '320', '50', '20', '321', '220', '322', '501', '210', '912'];
+    if (in_array($department_id, $department_arr)) {
+        $sql = "
+            SELECT * FROM wipwholestatus
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date ASC
+        ";
+        return $sql;
+    }
+    // (宜蘭)工務組長
+    if ($user_id == 'M0087') {
+        $sql = "
+                SELECT * FROM wipwholestatus 
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                AND SUBSTR(address,1,2) in ('宜蘭')
+                ORDER BY real_contract_arrival_date DESC
+            ";
+        return $sql;
+    }
+    // 北區工務組長
+    if ($user_id == 'M0040' || $user_id == 'M0176') {
+        $sql = "
+            SELECT * FROM wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 中區工務組長
+    if ($user_id == 'M0113' || $user_id == 'M0158') {
+        $sql = "
+            SELECT * FROM wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 南區工務組長
+    if ($user_id == 'M0039' || $user_id == 'M0078') {
+        $sql = "
+            SELECT * FROM wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 工務
+    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545])) {
+        $sql = "
+            SELECT * FROM wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    return $sql;
+}
+
+function getDataSqlByflowCode($department_id, $role_id, $user_id, $flow_code)
+{
+
+    // 補丁 黃孟澤 & 葉博澄 權限 = 李烘銘
+    if (in_array($user_id, ['M0166', 'M0091'])) {
+        $user_id = 'M0086';
+    }
+    // 補丁 孫仲凱 = 林瑋隆
+    if (in_array($user_id, ['M0159'])) {
+        $user_id = 'M0113';
+    }
+
+    $contract_type = 'B';
+    // 營業員主管或營業員
+    $department_arr = ['501', '511', '512', '513', '514'];
+
+    $sql_cmd = sql_myself($user_id, "salesid");
+    $sql = "
+        SELECT * FROM wipwholestatus $sql_cmd 
+    ";
+    $sql .= empty($sql_cmd) ? " WHERE 1=1 AND contract_type = '$contract_type' " : " AND contract_type = '$contract_type'";
+    $sql .= "
+        AND status = '1'
+        AND id IN (
+            SELECT 
+                form_id AS id
+            FROM flow 
+            WHERE system_id = 'wws' 
+            AND flow_id = 'wws02' 
+            AND flow_code IN ('$flow_code')        
+        )
+    ";
+    $sql .= getWipwholeSearchSql();
+    $sql .= "ORDER BY real_contract_arrival_date DESC ";
+
+    if (in_array($department_id, $department_arr)) {
+        // 北區營銷部 營銷專案經理 311 1
+        //           新梯營銷經理 311 3
+        // 桃竹營銷部 銷售專案經理 312 1
+        // 中區營銷部 新梯營銷經理 313 1
+        // 南區營銷部 銷售專案經理 314 2
+        // 花東區營銷部 銷售專案經理 314 1
+        if ($department_id == '311' && (in_array($role_id, ['1', '3']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '312' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '313' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '314' && (in_array($role_id, ['2']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '315' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+    }
+
+    // 鍾哥 部門代碼:250 職位大小:1 4
+    // 許協理 部門代碼:320 職位大小:1
+    // 張主任 部門代碼:322 職位大小:1
+    // 詹總 部門代碼:50 職位大小:1
+    // 許總 部門代碼:20 職位大小:1
+    // 業務部門 部門代碼:321
+    // 資訊部門 部門代碼:220
+    // 服務支援部 部門代碼:501
+    // 財會部門 部門代碼:210
+    $department_arr = ['911', '250', '320', '50', '20', '321', '220', '322', '501', '210', '912'];
+    if (in_array($department_id, $department_arr)) {
+        $sql = "
+            SELECT * FROM wipwholestatus
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws02' 
+                AND flow_code IN ('$flow_code')        
+            )
+        " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date ASC
+        ";
+        return $sql;
+    }
+
+    // (宜蘭)工務組長
+    if ($user_id == 'M0087') {
+        $sql = "
+                SELECT * FROM wipwholestatus 
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+                AND id IN (
+                    SELECT 
+                        form_id AS id
+                    FROM flow 
+                    WHERE system_id = 'wws' 
+                    AND flow_id = 'wws02' 
+                    AND flow_code IN ('$flow_code')          
+                )
+            " . getWipwholeSearchSql() . "
+                AND SUBSTR(address,1,2) in ('宜蘭')
+                ORDER BY real_contract_arrival_date DESC
+            ";
+        return $sql;
+    }
+    // 北區工務組長
+    if ($user_id == 'M0040' || $user_id == 'M0176') {
+        $sql = "
+            SELECT * FROM wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws02' 
+                AND flow_code IN ('$flow_code')         
+            )
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 中區工務組長
+    if ($user_id == 'M0113' || $user_id == 'M0158') {
+        $sql = "
+            SELECT * FROM wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws02' 
+                AND flow_code IN ('$flow_code')         
+            )
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 南區工務組長
+    if ($user_id == 'M0039' || $user_id == 'M0078') {
+        $sql = "
+            SELECT * FROM wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws02' 
+                AND flow_code IN ('$flow_code')         
+            )
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 工務
+    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545])) {
+        $sql = "
+            SELECT * FROM wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws02' 
+                AND flow_code IN ('$flow_code')       
+            )
+            " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    return $sql;
+}
+
+function getGunwuName($address)
+{
+    $north_arr = array('台北', '基隆', '新北', '桃園', '新竹', '台東');
+    $north_arr2 = array('宜蘭');
+    $center_arr = array('南投', '彰化', '雲林', '台中', '苗栗');
+    $south_arr = array('台南', '嘉義', '屏東', '高雄');
+    foreach ($north_arr as $key => $value)
+        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
+            return "吳宗紘";
+    foreach ($north_arr2 as $key => $value)
+        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
+            return "高培軒";
+    foreach ($center_arr as $key => $value)
+        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
+            return "林瑋隆";
+    foreach ($south_arr as $key => $value)
+        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
+            return "鄭存邑";
+    return "";
+}
+
+function getInformationStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    return "disabled";
+}
+function getYewuStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 321)
+        return "";
+    return "disabled";
+}
+function getWarehouseStatus($link, $user_department_id, $role_id, $status)
+{
+    if ($user_department_id == 220)
+        return "";
+    // if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545, 50, 501, 311, 313, 314, 521, 315, 912])) {
+    if(getSaveEstimateInstallData($user_department_id, $role_id)){
+        if ($status == 1) {
+            return checkNowFormStatus($link) == 'A' ? "" : "disabled";
+        } else {
+            return "";
+        }
+    }
+    return "disabled";
+}
+
+function getMarketingStatus($link, $user_department_id, $role_id, $status)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315) {
+        if ($status == 1) {
+            return checkNowFormStatus($link) == 'B' ? "" : "disabled";
+        } else {
+            return "";
+        }
+    }
+    if ($user_department_id == 501 || $user_department_id == 511 || $user_department_id == 512 || $user_department_id == 513 || $user_department_id == 514) {
+        if ($status == 1) {
+            return checkNowFormStatus($link) == 'B' ? "" : "disabled";
+        } else {
+            return "";
+        }
+    }
+    return "disabled";
+}
+function getDesinStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 911)
+        return checkNowFormStatus($link) == 'C' ? "" : "disabled";
+    return "disabled";
+}
+function getDesinLeaderStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 911)
+        return checkNowFormStatus($link) == 'D' && $role_id == 1 ? "" : "disabled";
+    return "disabled";
+}
+function getShengguanStatus($link, $user_department_id, $role_id, $status)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($status == '1') {
+        if ($user_department_id == 250 && in_array($role_id, [1, 4]))
+            return "";
+    } else {
+        if ($user_department_id == 250)
+            return "";
+    }
+    return "disabled";
+}
+function getPinzhengStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 912)
+        return "";
+    return "disabled";
+}
+
+function getTabNo($user_department_id)
+{
+    if ($user_department_id == 220)
+        return 0;
+    if (in_array($user_department_id, [311, 312, 313, 314, 315]))
+        return 1;
+    if (in_array($user_department_id, [501, 511, 512, 513]))
+        return 1;
+    if ($user_department_id == 911)
+        return 2;
+    if (in_array($user_department_id, [521, 531, 541, 542, 543, 544, 545]))
+        return 0;
+    if ($user_department_id == 321 || $user_department_id == 250)
+        return 3;
+    if ($user_department_id == 912)
+        return 4;
+    return 0;
+}
+
+function getOpendoorOptions($link)
+{
+    $sql = "
+        SELECT 
+            code_name AS val ,
+            content AS label 
+        FROM code 
+        WHERE field_name='open_kind'
+        ORDER BY label ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getYingyeokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('311','312','313','314','315','511','512','513','514')
+        ORDER BY accountid ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getShejiokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('911')
+        AND `role_id` NOT IN ('1')
+        ORDER BY accountid ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getShejiokLeaderOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('911')
+        AND `role_id` IN ('1')
+        ORDER BY accountid ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getGongwuokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('521','531','501','541','542','543','544','545')
+        ORDER BY accountid ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getYewuOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('321')
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getShengguanokOptions($link)
+{
+    $sql = " 
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('250')
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getPinzhengOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('912')
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getAllUsersOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `accounttype` NOT IN ('A','X')
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getSelectOptionHtml($options, $selected_val)
+{
+    $str = "";
+    foreach ($options as $option) :
+        if ($option['val'] == $selected_val) {
+            $str .= "<option selected value='" . $option['val'] . "'>" . $option['val'] . $option['label'] . "</option>";
+        } else {
+            $str .= "<option value='" . $option['val'] . "'>" . $option['val'] . $option['label'] . "</option>";
+        }
+    endforeach;
+    return $str;
+}
+
+function getWipwholeChangeButtonStatus($user_department_id)
+{
+    if (in_array($user_department_id, [311, 312, 313, 314, 315]))
+        return true;
+    if (in_array($user_department_id, [501, 511, 512, 513, 514]))
+        return true;
+    if (in_array($user_department_id, [521, 531, 220, 250]))
+        return true;
+    if (in_array($user_department_id, [541, 542, 543, 544, 545]))
+        return true;
+    return false;
+}
+
+
+function getSaveEstimateInstallData($user_department_id, $role_id)
+{
+    if (in_array($user_department_id, ['50', '501']) && $role_id == '2')
+        return true;
+    if ($user_department_id == '311' && $role_id == '4')
+        return true;
+    if ($user_department_id == '312' && $role_id == '3')
+        return true;
+    if ($user_department_id == '313' && $role_id == '3')
+        return true;
+    if ($user_department_id == '314' && $role_id == '4')
+        return true;
+    if ($user_department_id == '315' && in_array($role_id, ['1', '2']))
+        return true;
+    if (in_array($user_department_id, [220, 531]))
+        return true;
+    if ($user_department_id == '521' && in_array($role_id, ['11', '9', '12']))
+        return true;
+    if ($user_department_id == '542' && in_array($role_id, ['1', '5', '6', '8']))
+        return true;
+    if ($user_department_id == '544' && in_array($role_id, ['3', '6']))
+        return true;
+    if ($user_department_id == '543' && $role_id == '2')
+        return true;
+    if ($user_department_id == '545' && in_array($role_id, ['3', '6']))
+        return true;
+    return false;
+}
+
+function getSaveInstallDataButtonStatus($user_department_id, $role_id)
+{
+    if ($user_department_id == '315' && $role_id == '1')
+        return true;
+    if ($user_department_id == '521' && $role_id == '9')
+        return true;
+    if ($user_department_id == '542' && in_array($role_id, ['1', '5', '6', '8']))
+        return true;
+    if ($user_department_id == '543' && $role_id == '2')
+        return true;
+    if ($user_department_id == '544' && in_array($role_id, ['3', '4', '6']))
+        return true;
+    if ($user_department_id == '545' && in_array($role_id, ['3', '6']))
+        return true;
+    if ($user_department_id == '220')
+        return true;
+    return false;
+}
+
+function getWipwholeChangePlanningCustomerDetailsStatus($link, $id)
+{
+    $sql = "
+        SELECT
+            custom_name,
+            create_at,
+            change_status
+        FROM wipwhole_change_planning_customer_details
+        WHERE 1=1
+        AND wipwholestatus_id = '$id'
+        ORDER BY create_at DESC
+        LIMIT 1
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getAllCustomerPlanningVerify($link, $id)
+{
+    $sql = "
+        SELECT
+            real_custom_name AS custom_name,
+            customer_planning_verify_file,
+            date_format(customer_planning_verify_at, '%Y-%m-%d %H:%i:%s') AS create_at
+        FROM wipwholestatus
+        WHERE id = $id
+        AND customer_planning_verify_file != ''
+        AND customer_planning_verify_file IS NOT NULL
+        UNION
+        SELECT
+            custom_name,
+            customer_planning_verify_file,
+            create_at
+        FROM wipwhole_change_planning_customer_details
+        WHERE wipwholestatus_id = $id
+        AND customer_planning_verify_file != ''
+        AND customer_planning_verify_file IS NOT NULL
+    ";
+    return mysqli_query($link, $sql);
+}
diff --git a/wms/wipwhole-renovate-index-table-html.php b/wms/wipwhole-renovate-index-table-html.php
index a851d304..78f863bc 100644
--- a/wms/wipwhole-renovate-index-table-html.php
+++ b/wms/wipwhole-renovate-index-table-html.php
@@ -1,13 +1,4 @@
 <?php
-$tableArr = array(
-    "All" => "table_index2",
-    "A" => "table_index3",
-    "B" => "table_index4",
-    "C" => "table_index5",
-    "D" => "table_index6",
-    "Z" => "table_index7"
-);
-
 // 暫時可編輯及刪除權限
 $update_delete_status = false;
 if (in_array($user_id, ['M0175', 'M0079'])) {
@@ -15,7 +6,7 @@ if (in_array($user_id, ['M0175', 'M0079'])) {
 }
 
 ?>
-<table id="<?php echo $tableArr[$key]; ?>" class="table table-striped table-bordered  dt-responsive nowrap" style="width:98.5%">
+<table id="table_index2" class="table table-striped table-bordered  dt-responsive nowrap" style="width:98.5%">
     <thead>
         <tr>
             <?php
@@ -42,7 +33,7 @@ if (in_array($user_id, ['M0175', 'M0079'])) {
     </thead>
     <tbody>
         <?php
-        foreach ($dataDetailsArr as $key => $data) :
+        foreach ($data as $key => $data) :
 
             //規格
             $Specification = $data['facility_kind'];
@@ -146,7 +137,7 @@ if (in_array($user_id, ['M0175', 'M0079'])) {
                 <td><?php echo $data['facilityno']; ?></td>
                 <td><?php echo $data['custom']; ?></td>
                 <td><?php echo $Specification; ?></td>
-                <td><?php echo $data['address']; ?></td>
+                <td><?php echo empty($data['real_address']) ? $data['address'] : $data['real_address']; ?></td>
                 <?php
                 foreach ($site_survey_status as $key => $val) {
                     if ((string)$data['site_survey_contact_verify'] == (string)$key) {
diff --git a/wms/wipwhole-renovate-index.php b/wms/wipwhole-renovate-index.php
index ce098a2a..6f22b60d 100644
--- a/wms/wipwhole-renovate-index.php
+++ b/wms/wipwhole-renovate-index.php
@@ -1,3 +1,9 @@
+<div id="loadingOverlay" class="hidden">
+    <div class="loading-icon"></div>
+</div>
+<script>
+    document.getElementById('loadingOverlay').classList.remove('hidden');
+</script>
 <?php
 // ini_set('display_errors', 'on');
 /**
@@ -22,8 +28,9 @@ include "wipwhole-renovate-index-function.php";
 include "css/view/wipwhole-renovate-index.php";
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    if ($_POST['form_name'] == 'del_form') {
-        $del_seq = $_POST['del_seq'];
+    $form_name = empty($_REQUEST['form_name']) ? null : $_REQUEST['form_name'];
+    $del_seq = empty($_REQUEST['del_seq']) ? null : $_REQUEST['del_seq'];
+    if ($form_name == 'del_form') {
         $sql = "UPDATE wipwholestatus SET status = '0' WHERE id = '$del_seq' ";
         mysqli_query($link, $sql);
     }
@@ -33,9 +40,6 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
 $numberOfDaysToAdd = 45;
 $futureDate = date("Y/m/d", strtotime(date("Y-m-d") . " +{$numberOfDaysToAdd} days"));
 
-// 主資料陣列
-$data = array();
-
 // 取得當前使用者所屬部門
 $department_id = getDepartmentId($link, $user_id);
 // 取得當前使用者所屬職位
@@ -53,31 +57,25 @@ $site_survey_contact_verify = !isset($_REQUEST['site_survey_contact_verify']) ?
 $real_contract_arrival_date_start = empty($_REQUEST['real_contract_arrival_date_start']) ? null : $_REQUEST['real_contract_arrival_date_start'];
 $real_contract_arrival_date_end = empty($_REQUEST['real_contract_arrival_date_end']) ? null : $_REQUEST['real_contract_arrival_date_end'];
 $area_no = !isset($_REQUEST['area_no']) ? '' : $_REQUEST['area_no'];
+$sheetNum = empty($_GET['sheetNum']) ? 'All' : $_GET['sheetNum'];
+
+$tableArr = array(
+    "All" => "",
+    "A" => "A",
+    "B" => "B",
+    "C" => "C",
+    "D" => "D",
+    "Z" => "Z"
+);
 
-
+if (empty($sheetNum) || $sheetNum == "All") {
+    $sql = getDataSql($department_id, $role_id, $user_id);
+} else {
+    $sql = getDataSqlByFlowCode($department_id, $role_id, $user_id, $tableArr[$sheetNum]);
+}
 // 取得資料 sql
-$sql = getDataSql($department_id, $role_id, $user_id);
 $data = mysqli_query($link, $sql);
 
-// 取得資料(工勘部門階段) sql
-$sql = getDataSqlByflowCode($department_id, $role_id, $user_id, "A");
-$dataA = mysqli_query($link, $sql);
-
-// 取得資料(營業部門階段) sql
-$sql = getDataSqlByflowCode($department_id, $role_id, $user_id, "B");
-$dataB = mysqli_query($link, $sql);
-
-// 取得資料(設計部門階段) sql
-$sql = getDataSqlByflowCode($department_id, $role_id, $user_id, "C");
-$dataC = mysqli_query($link, $sql);
-
-// 取得資料(生管階段) sql
-$sql = getDataSqlByflowCode($department_id, $role_id, $user_id, "D");
-$dataD = mysqli_query($link, $sql);
-
-// 取得資料(結案階段) sql
-$sql = getDataSqlByflowCode($department_id, $role_id, $user_id, "Z");
-$dataZ = mysqli_query($link, $sql);
 
 ?>
 <div style="overflow-x:auto;">
@@ -201,45 +199,107 @@ $dataZ = mysqli_query($link, $sql);
 </div>
 <nav class="navbar navbar-tabs" style="margin:0;margin-top:5px;">
     <div class="container-fluid">
-        <ul class="nav nav-pills">
-            <li class="active">
-                <a href="#" onclick="showAllTable()">全部資料</a>
-            </li>
-            <li>
-                <a href="#" onclick="showATable()">廠務確認中</a>
-            </li>
-            <li>
-                <a href="#" onclick="showBTable()">營業確認中</a>
-            </li>
-            <li>
-                <a href="#" onclick="showCTable()">設計確認中</a>
-            </li>
-            <li>
-                <a href="#" onclick="showDTable()">生管理確認中</a>
-            </li>
-            <li>
-                <a href="#" onclick="showZTable()">已結案</a>
-            </li>
-        </ul>
+        <div class="col-md-9 col-12">
+            <ul class="nav nav-pills">
+                <li class="active">
+                    <a href="#" onclick="showAllTable()">全部資料</a>
+                </li>
+                <li>
+                    <a href="#" onclick="showATable()">廠務確認中</a>
+                </li>
+                <li>
+                    <a href="#" onclick="showBTable()">營業確認中</a>
+                </li>
+                <li>
+                    <a href="#" onclick="showCTable()">設計確認中</a>
+                </li>
+                <li>
+                    <a href="#" onclick="showDTable()">生管理確認中</a>
+                </li>
+                <li>
+                    <a href="#" onclick="showZTable()">已結案</a>
+                </li>
+            </ul>
+        </div>
+        <div class="col-md-3 col-12 text-right" id="myBtn">
+            <button class="btn btn-primary " type="button">欄位維護權限</button>
+        </div>
     </div>
 </nav>
+<div id="myModal" class="modal">
+    <div class="back"></div>
+    <div class="modal-content">
+        <button type="button" class="close" id="myCloseBtn">X</button>
+        <div class='col-12' style='text-align:center'>
+            <h3>欄位維護權限</h3>
+            <hr>
+            <div class='row'>
+                <div class='col-12'>
+                    <table class="table table-bordered" style="width:50%; margin:0 auto;">
+                        <tr>
+                            <th style="text-align:right;">欄位</th>
+                            <th style="text-align:left;">維護單位</th>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">合約號</td>
+                            <td style="text-align:left;">業務部</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">電梯編號</td>
+                            <td style="text-align:left;">業務部</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">客戶姓名</td>
+                            <td style="text-align:left;">業務部</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">規格</td>
+                            <td style="text-align:left;">業務部</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">地址</td>
+                            <td style="text-align:left;">業務部(營業人員 or 工勘人員透過申請單)</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">工勘狀態</td>
+                            <td style="text-align:left;">工勘人員</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">合約交期(到工地)</td>
+                            <td style="text-align:left;">業務部</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">下單日(普來特富)</td>
+                            <td style="text-align:left;">業務部</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">預計到廠日(觀音廠)</td>
+                            <td style="text-align:left;">生管部門</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">實際到廠日(觀音廠)</td>
+                            <td style="text-align:left;">生管部門</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">預計出貨日(到工地)</td>
+                            <td style="text-align:left;">業務部(營業人員 or 工勘人員透過申請單)</td>
+                        </tr>
+                        <tr>
+                            <td style="text-align:right;">實際出貨日(到工地)</td>
+                            <td style="text-align:left;">生管部門</td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 <?php
-$dataArr = array(
-    "All" => $data,
-    "A" => $dataA,
-    "B" => $dataB,
-    "C" => $dataC,
-    "D" => $dataD,
-    "Z" => $dataZ
-);
-foreach ($dataArr as $key => $val) {
-    if ($val) :
-        $dataDetailsArr = $val;
-        echo "<div id='data_" . $key . "_table_div' class='data_table_div' style='overflow-x:auto;'>";
-        include "wipwhole-renovate-index-table-html.php";
-        echo "</div>";
-    endif;
-}
+
+    echo "<div id='data_detail_table_div' class='data_table_div' style='overflow-x:auto;'>";
+    include "wipwhole-renovate-index-table-html.php";
+    echo "</div>";
+
 
 #結束連線
 mysqli_close($link);
@@ -261,14 +321,14 @@ mysqli_close($link);
     }
 </style>
 <script>
-    var sheetNum = "<?php echo empty($_GET['sheetNum']) ? 'All' : $_GET['sheetNum']; ?>";
+    var sheetNum = "<?php echo $sheetNum; ?>";
 
     $(document).ready(function() {
         $('#site_survey_contact_verify').select2();
     });
     $(function() {
-        $(".data_table_div").hide();
         showTable(sheetNum);
+        document.getElementById('loadingOverlay').classList.add('hidden');
     })
 
     const formData = new FormData();
@@ -413,18 +473,11 @@ mysqli_close($link);
             "D": "5",
             "Z": "6",
         }
-        $("body > nav.navbar.navbar-tabs > div > ul > li").attr("class", "");
-        $("body > nav.navbar.navbar-tabs > div > ul > li:nth-child(" + tmp_arr[code] + ")").attr("class", "active");
-        $(".data_table_div").hide();
-        $("#data_" + code + "_table_div").show();
+        $("nav.navbar.navbar-tabs  div > ul > li").attr("class", "");
+        $("nav.navbar.navbar-tabs  div > ul > li:nth-child(" + tmp_arr[code] + ")").attr("class", "active");
     }
 
     document.querySelector("#table_index2_filter > label > input").placeholder = "快速搜尋";
-    document.querySelector("#table_index3_filter > label > input").placeholder = "快速搜尋";
-    document.querySelector("#table_index4_filter > label > input").placeholder = "快速搜尋";
-    document.querySelector("#table_index5_filter > label > input").placeholder = "快速搜尋";
-    document.querySelector("#table_index6_filter > label > input").placeholder = "快速搜尋";
-    document.querySelector("#table_index7_filter > label > input").placeholder = "快速搜尋";
 
 
     // datatable 畫面重整後保留資料
@@ -444,7 +497,7 @@ mysqli_close($link);
     var orderDirection = "<?php echo empty($_GET['orderDirection']) ? '' : $_GET['orderDirection']; ?>";
 
     var dataArr2 = {
-        "All": "table_index2",
+        "All": "",
         "A": "table_index3",
         "B": "table_index4",
         "C": "table_index5",
@@ -453,7 +506,7 @@ mysqli_close($link);
     }
 
 
-    var table = $('#' + dataArr2[sheetNum]).DataTable();
+    var table = $('#table_index2').DataTable();
 
     // 设置排序信息
     if (orderColumn !== '' && orderDirection !== '') {
@@ -482,7 +535,7 @@ mysqli_close($link);
     });
 
     // 監聽搜尋事件
-    $("#" + dataArr2[sheetNum] + "_filter > label > input").change(function() {
+    $("#table_index2_filter > label > input").change(function() {
         searchDatatable(table);
     });
 
@@ -504,6 +557,21 @@ mysqli_close($link);
         $("#del_form").submit();
     }
 </script>
+<script>
+    var modal = document.getElementById("myModal");
+    $("#myBtn").click(function() {
+        $("#myModal").show();
+    });
+    $("#myCloseBtn").click(function(e) {
+        console.log(e.target);
+        $("#myModal").hide();
+        // modal.style.display = "none"
+    });
+    $(".back").click(function(e) {
+        $("#myModal").hide();
+        // modal.style.display = "none"
+    });
+</script>
 <form id='del_form' method='post'>
     <input type='hidden' id='del_seq' name='del_seq' value='' />
     <input type='hidden' id='form_name' name='form_name' value='del_form' />
diff --git a/wms/wipwhole-renovate-rec-invoice.php b/wms/wipwhole-renovate-rec-invoice.php
index 601026c8..0ce31476 100644
--- a/wms/wipwhole-renovate-rec-invoice.php
+++ b/wms/wipwhole-renovate-rec-invoice.php
@@ -1,924 +1,925 @@
-<?php
-// ini_set('display_errors', 'on');
-/**
- * 流程規則:(汰改)
- * 1.A:工務主管確認中 B:營業員確認中  C:設計部門人員確認中 D:生管主管確認中 Z:生管確認完成        
- * 
- *  新梯        543 筆  (已匯入)
- *  舊改        141 筆  (資料未洗入)
- *  已簽回      684 筆 (共計)
- */
-
-
-// error_reporting(0);
-include "header.php";
-
-// 載入db.php來連結資料庫
-require_once "database.php";
-?>
-<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
-<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
-<?php
-
-// 所屬部門
-$sql = "select department_id from account where accountid = '$user_id'";
-$res = mysqli_query($link, $sql);
-$row = mysqli_fetch_row($res);
-$department_id = $row[0];
-mysqli_free_result($res);
-// 生管及資訊才可以訪問
-if ($department_id == "321" || $department_id == "220") {
-
-    /**
-     * 檢查作番是否重複 true:重複 false:沒重複
-     * @param mysqli $link 資料庫連線檔
-     * @param string $facilityno 檢查的作番號
-     */
-    function checkFacilitynoRepeat($link, $facilityno)
-    {
-        $sql = "
-            SELECT 
-                COUNT(*) 
-            FROM wipwholestatus
-            WHERE facilityno = '$facilityno'
-        ";
-        $result = mysqli_query($link, $sql);
-        $row = mysqli_fetch_array($result);
-        return $row['0'] > 0 ? true : false;
-    }
-
-    // 預設汰改代碼 A
-    $contract_type = 'B';
-    // 汰改方案
-    $renovate_type = '';
-    // 合約號
-    $contractno = '';
-    // 營業員ID
-    $salesid = '';
-    // 工務人員ID
-    $warehouseid = '';
-    // 客戶姓名
-    $custom = '';
-    // 工地負責人
-    $site_manager = '';
-    // 客戶id
-    $accountid = '';
-    // 作番號
-    $facilityno = '';
-    // 號機
-    $facility_temp_no = '';
-    // 緯度
-    $latitude = '';
-    // 經度
-    $longitude = '';
-    // 載重
-    $weight = '';
-    // 人乘
-    $numberofpassenger = '';
-    // 樓停
-    $numberofstop = '';
-    // 樓層
-    $numberoffloor = '';
-    // 開門方式
-    $opentype = '';
-    // 速度
-    $speed = '';
-    // 機型
-    $facility_kind = '';
-    // 地址
-    $address = '';
-    // 合約到貨日
-    $contract_arrival_date = '';
-    // 實際到貨日
-    $real_contract_arrival_date = '';
-
-    // 營業規格確認
-    $sales_spec_verify = '';
-    // 營業規格附件
-    $sales_spec_verify_file = '';
-    // 營業規格確認時間	
-    $sales_spec_verify_at = '';
-    // 營業規格確認人
-    $sales_spec_verify_owner = '';
-
-    // 客戶計劃圖確認
-    $customer_planning_verify = '';
-    // 客戶計劃圖附件	
-    $customer_planning_verify_file = '';
-    // 客戶計劃圖確認時間
-    $customer_planning_verify_at = '';
-    // 客戶計劃圖確認人
-    $customer_planning_verify_owner = '';
-
-    // 客戶顏色確認
-    $customer_color_verify = '';
-    // 客戶顏色附件	
-    $customer_color_verify_file = '';
-    // 客戶顏色確認時間    
-    $customer_color_verify_at = '';
-    // 客戶顏色確認人
-    $customer_color_verify_owner = '';
-
-    // 工勘聯絡表
-    $site_survey_contact_form_verify = '';
-    // 工勘聯絡表附件
-    $site_survey_contact_form_verify_file = '';
-    // 工勘聯絡表確認時間
-    $site_survey_contact_form_verify_at = '';
-    // 工勘聯絡表確認人	
-    $site_survey_contact_form_verify_owner = '';
-
-    // 設計規格確認
-    $desin_spec_verify = '';
-    // 設計規格確認附件    
-    $desin_spec_verify_file = '';
-    // 設計規格確認時間
-    $desin_spec_verify_at = '';
-    // 設計規格確認確認人
-    $desin_spec_verify_owner = '';
-
-    // 設計計劃圖確認
-    $desin_planning_verify = '';
-    // 設計計劃圖確認附件	    
-    $desin_planning_verify_file = '';
-    // 設計計劃圖確認時間	     
-    $desin_planning_verify_at = '';
-    // 設計計劃圖確認人	
-    $desin_planning_verify_owner = '';
-
-    // 設計顏色確認
-    $desin_color_verify = '';
-    // 設計顏色確認附件	  
-    $desin_color_verify_file = '';
-    // 設計顏色確認時間	
-    $desin_color_verify_at = '';
-    // 設計顏色確認人	
-    $desin_color_verify_owner = '';
-
-    // 設計仕樣確認
-    $desin_style_verify = '';
-    // 設計仕樣確認附件	
-    $desin_style_verify_file = '';
-    // 設計仕樣確認時間
-    $desin_style_verify_at = '';
-    // 設計仕樣確認人
-    $desin_style_verify_owner = '';
-
-    // 設計主管確認
-    $desin_leader_verify = '';
-    // 設計主管確認附件	
-    $desin_leader_verify_file = '';
-    // 設計主管確認時間
-    $desin_leader_verify_at = '';
-    // 設計主管確認人
-    $desin_leader_verify_owner = '';
-
-    // 樓高通報
-    $building_heigh_verify = '';
-    // 樓高通報附件	
-    $building_heigh_verify_file = '';
-    // 樓高通報時間	     
-    $building_heigh_verify_at = '';
-    // 樓高通報確認人	
-    $building_heigh_verify_owner = '';
-
-    // 電氣發貨明細
-    $electrical_design_publish = '';
-    // 電氣資料發行時間	
-    $electrical_design_publish_at = '';
-    // 電氣資料發行人	
-    $electrical_design_publish_owner = '';
-
-    // 機械資料發行
-    $mechanical_design_publish = '';
-    // 機械資料發行時間	
-    $mechanical_design_publish_at = '';
-    // 機械資料發行人
-    $mechanical_design_publish_owner = '';
-
-    // 電氣發貨明細	
-    $electrical_shipping_date_publish = '';
-    // 電氣發貨明細時間	
-    $electrical_shipping_date_publish_at = '';
-    // 電氣發貨明細發行人
-    $electrical_shipping_date_publish_owner = '';
-
-    // 機械發貨明細
-    $mechanical_shipping_date_publish = '';
-    // 機械發貨明細時間
-    $mechanical_shipping_date_publish_at = '';
-    // 機械發貨明細發行人
-    $mechanical_shipping_date_publish_owner = '';
-
-    // 下單日(普來特富)	
-    $prattford_order_date = '';
-    // 預計發貨日(到港日)	
-    $estimated_shipping_date = '';
-    // 發貨類別(A.全級發貨、G.欠件發貨)
-    $goods_type = '';
-    // 實際到貨日(到觀音廠日)
-    $actual_tofactory_date = '';
-    // 發貨確認人	
-    $shipping_date_owner = '';
-    // 預計船期	
-    $estimated_shipping_schedule_date = '';
-    // 實際到貨日(到港日)
-    $actual_arrival_date = '';
-    // 到貨確認人
-    $arrival_date_owner = '';
-
-    // 是否齊備	
-    $shengguanok_status = '';
-    // 生管確認附件	
-    $shengguanok_status_file = '';
-    // 已備齊時間	
-    $shengguanok_status_at = '';
-    // 已備齊檢查人
-    $shengguanok_status_owner = '';
-
-    // 建立人
-    $creater = '';
-    // 建立時間	
-    $create_at = '';
-
-
-    if ($_SERVER["REQUEST_METHOD"] == "POST") {
-
-        // 預設新梯代碼 A
-        $contract_type = postCheck('contract_type', 'B');
-        // 汰改方案 B
-        $renovate_type = json_encode($_POST['renovate_type'], JSON_UNESCAPED_UNICODE);
-        // 合約號
-        $contractno  = postCheck('contractno');
-        // 營業員ID
-        $salesid = postCheck('salesid');
-        // 工務人員ID
-        $warehouseid = postCheck('warehouseid');
-        // 客戶姓名
-        $custom = postCheck('custom');
-        // 工地負責人
-        $site_manager = postCheck('site_manager');
-        // 客戶id
-        $accountid = postCheck('accountid');
-        // 作番號
-        $facilityno =  postCheck('facilityno');
-        // 作番號
-        $facility_temp_no =  postCheck('facility_temp_no');
-        // 緯度
-        $latitude = postCheck('latitude');
-        // 經度
-        $longitude = postCheck('longitude');
-        // 載重
-        $weight = postCheck('weight');
-        // 人乘
-        $numberofpassenger = postCheck('numberofpassenger');
-        // 樓停
-        $numberofstop = postCheck('numberofstop');
-        // 樓層
-        $numberoffloor = postCheck('numberoffloor');
-        // 開門方式
-        $opentype = postCheck('opentype');
-        // 速度
-        $speed = postCheck('speed');
-        // 機型
-        $facility_kind = postCheck('facility_kind');
-        // 地址
-        $address = postCheck('address');
-        // 合約到貨日
-        $contract_arrival_date = postCheck('contract_arrival_date');
-        // 實際到貨日
-        $real_contract_arrival_date = postCheck('real_contract_arrival_date');
-
-        // 營業規格確認
-        $sales_spec_verify = postCheck('sales_spec_verify');
-        // 營業規格附件
-        $sales_spec_verify_file = postCheck('sales_spec_verify_file');
-        // 營業規格確認時間	
-        $sales_spec_verify_at = postCheck('sales_spec_verify_at');
-        // 營業規格確認人
-        $sales_spec_verify_owner = postCheck('sales_spec_verify_owner');
-
-        // 客戶計劃圖確認
-        $customer_planning_verify = postCheck('customer_planning_verify');
-        // 客戶計劃圖附件	
-        $customer_planning_verify_file = postCheck('customer_planning_verify_file');
-        // 客戶計劃圖確認時間
-        $customer_planning_verify_at = postCheck('customer_planning_verify_at');
-        // 客戶計劃圖確認人
-        $customer_planning_verify_owner = postCheck('customer_planning_verify_owner');
-
-        // 客戶顏色確認
-        $customer_color_verify = postCheck('customer_color_verify');
-        // 客戶顏色附件	
-        $customer_color_verify_file = postCheck('customer_color_verify_file');
-        // 客戶顏色確認時間    
-        $customer_color_verify_at = postCheck('customer_color_verify_at');
-        // 客戶顏色確認人
-        $customer_color_verify_owner = postCheck('customer_color_verify_owner');
-
-        // 工勘聯絡表
-        $site_survey_contact_form_verify = postCheck('site_survey_contact_form_verify');
-        // 工勘聯絡表附件
-        $site_survey_contact_form_verify_file = postCheck('site_survey_contact_form_verify_file');
-        // 工勘聯絡表確認時間
-        $site_survey_contact_form_verify_at = postCheck('site_survey_contact_form_verify_at');
-        // 工勘聯絡表確認人	
-        $site_survey_contact_form_verify_owner = postCheck('site_survey_contact_form_verify_owner');
-
-        // 設計規格確認
-        $desin_spec_verify = postCheck('desin_spec_verify');
-        // 設計規格確認附件    
-        $desin_spec_verify_file = postCheck('desin_spec_verify_file');
-        // 設計規格確認時間
-        $desin_spec_verify_at = postCheck('desin_spec_verify_at');
-        // 設計規格確認確認人
-        $desin_spec_verify_owner = postCheck('desin_spec_verify_owner');
-
-        // 設計計劃圖確認
-        $desin_planning_verify = postCheck('desin_planning_verify');
-        // 設計計劃圖確認附件	    
-        $desin_planning_verify_file = postCheck('desin_planning_verify_file');
-        // 設計計劃圖確認時間	     
-        $desin_planning_verify_at = postCheck('desin_planning_verify_at');
-        // 設計計劃圖確認人	
-        $desin_planning_verify_owner = postCheck('desin_planning_verify_owner');
-
-        // 設計顏色確認
-        $desin_color_verify = postCheck('desin_color_verify');
-        // 設計顏色確認附件	  
-        $desin_color_verify_file = postCheck('desin_color_verify_file');
-        // 設計顏色確認時間	
-        $desin_color_verify_at = postCheck('desin_color_verify_at');
-        // 設計顏色確認人	
-        $desin_color_verify_owner = postCheck('desin_color_verify_owner');
-
-        // 設計仕樣確認
-        $desin_style_verify = postCheck('desin_style_verify');
-        // 設計仕樣確認附件	
-        $desin_style_verify_file = postCheck('desin_style_verify_file');
-        // 設計仕樣確認時間
-        $desin_style_verify_at = postCheck('desin_style_verify_at');
-        // 設計仕樣確認人
-        $desin_style_verify_owner = postCheck('desin_style_verify_owner');
-
-        // 設計主管確認
-        $desin_leader_verify = postCheck('desin_leader_verify');
-        // 設計主管確認附件	
-        $desin_leader_verify_file = postCheck('desin_leader_verify_file');
-        // 設計主管確認時間
-        $desin_leader_verify_at = postCheck('desin_leader_verify_at');
-        // 設計主管確認人
-        $desin_leader_verify_owner = postCheck('desin_leader_verify_owner');
-
-        // 樓高通報
-        $building_heigh_verify = postCheck('building_heigh_verify');
-        // 樓高通報附件	
-        $building_heigh_verify_file = postCheck('building_heigh_verify_file');
-        // 樓高通報時間	     
-        $building_heigh_verify_at = postCheck('building_heigh_verify_at');
-        // 樓高通報確認人	
-        $building_heigh_verify_owner = postCheck('building_heigh_verify_owner');
-
-        // 電氣發貨明細
-        $electrical_design_publish = postCheck('electrical_design_publish');
-        // 電氣資料發行時間	
-        $electrical_design_publish_at = postCheck('electrical_design_publish_at');
-        // 電氣資料發行人	
-        $electrical_design_publish_owner = postCheck('electrical_design_publish_owner');
-
-        // 機械資料發行
-        $mechanical_design_publish = postCheck('mechanical_design_publish');
-        // 機械資料發行時間	
-        $mechanical_design_publish_at = postCheck('mechanical_design_publish_at');
-        // 機械資料發行人
-        $mechanical_design_publish_owner = postCheck('mechanical_design_publish_owner');
-
-        // 電氣發貨明細	
-        $electrical_shipping_date_publish = postCheck('electrical_shipping_date_publish');
-        // 電氣發貨明細時間	
-        $electrical_shipping_date_publish_at = postCheck('electrical_shipping_date_publish_at');
-        // 電氣發貨明細發行人
-        $electrical_shipping_date_publish_owner = postCheck('electrical_shipping_date_publish_owner');
-
-        // 機械發貨明細
-        $mechanical_shipping_date_publish = postCheck('mechanical_shipping_date_publish');
-        // 機械發貨明細時間
-        $mechanical_shipping_date_publish_at = postCheck('mechanical_shipping_date_publish_at');
-        // 機械發貨明細發行人
-        $mechanical_shipping_date_publish_owner = postCheck('mechanical_shipping_date_publish_owner');
-
-        // 普來特富(下單日)	
-        $prattford_order_date = postCheck('prattford_order_date');
-        // 預計發貨日(到港日)	
-        $estimated_shipping_date = postCheck('estimated_shipping_date');
-        // 發貨類別(A.全級發貨、G.欠件發貨)
-        $goods_type = postCheck('goods_type');
-        // 實際到貨日(到觀音廠日)
-        $actual_tofactory_date = postCheck('actual_tofactory_date');
-        // 發貨確認人	
-        $shipping_date_owner = postCheck('shipping_date_owner');
-        // 預計船期
-        $estimated_shipping_schedule_date = postCheck('estimated_shipping_schedule_date');
-        // 實際到貨日(到港日)
-        $actual_arrival_date = postCheck('actual_arrival_date');
-        // 到貨確認人
-        $arrival_date_owner = postCheck('arrival_date_owner');
-
-        // 是否齊備	
-        $shengguanok_status = postCheck('shengguanok_status');
-        // 生管確認附件	
-        $shengguanok_status_file = postCheck('shengguanok_status_file');
-        // 已備齊時間	
-        $shengguanok_status_at = postCheck('shengguanok_status_at');
-        // 已備齊檢查人
-        $shengguanok_status_owner = postCheck('shengguanok_status_owner');
-
-        // QC與官檢種類
-        $qc_official_type = postCheck('qc_official_type');
-
-        // 建立人
-        $creater = postCheck('creater');
-        // 建立時間	
-        $create_at = postCheck('create_at');
-
-        //插入數據庫數據  gary_version
-        $insertsql = "
-            INSERT INTO wipwholestatus (
-                contract_type, 
-                renovate_type,
-                contractno, 
-                salesid, 
-                custom, 
-                site_manager,
-                accountid, 
-                facilityno, 
-                facility_temp_no,
-                latitude, 
-                longitude,
-                weight, 
-                numberofpassenger, 
-                numberofstop, 
-                numberoffloor, 
-                opentype, 
-                speed, 
-                facility_kind,
-                address, 
-                contract_arrival_date, 
-                real_contract_arrival_date, 
-                sales_spec_verify, 
-                sales_spec_verify_file,
-                sales_spec_verify_at, 
-                sales_spec_verify_owner, 
-                customer_planning_verify, 
-                customer_planning_verify_file,
-                customer_planning_verify_at, 
-                customer_planning_verify_owner, 
-                customer_color_verify, 
-                customer_color_verify_file,
-                customer_color_verify_at, 
-                customer_color_verify_owner, 
-                site_survey_contact_form_verify, 
-                site_survey_contact_form_verify_file,
-                site_survey_contact_form_verify_at, 
-                site_survey_contact_form_verify_owner, 
-                desin_spec_verify, 
-                desin_spec_verify_file,
-                desin_spec_verify_at, 
-                desin_spec_verify_owner, 
-                desin_planning_verify, 
-                desin_planning_verify_file, 
-                desin_planning_verify_at,
-                desin_planning_verify_owner, 
-                desin_color_verify, 
-                desin_color_verify_file, 
-                desin_color_verify_at, 
-                desin_color_verify_owner,
-                desin_style_verify, 
-                desin_style_verify_file, 
-                desin_style_verify_at, 
-                desin_style_verify_owner, 
-                desin_leader_verify,
-                desin_leader_verify_file, 
-                desin_leader_verify_at, 
-                desin_leader_verify_owner, 
-                building_heigh_verify,
-                building_heigh_verify_file, 
-                building_heigh_verify_at, 
-                building_heigh_verify_owner, 
-                electrical_design_publish,
-                electrical_design_publish_at, 
-                electrical_design_publish_owner, 
-                mechanical_design_publish, 
-                mechanical_design_publish_at,
-                mechanical_design_publish_owner, 
-                electrical_shipping_date_publish, 
-                electrical_shipping_date_publish_at,
-                electrical_shipping_date_publish_owner, 
-                mechanical_shipping_date_publish, 
-                mechanical_shipping_date_publish_at,
-                mechanical_shipping_date_publish_owner, 
-                prattford_order_date,
-                estimated_shipping_date, 
-                goods_type, 
-                actual_tofactory_date, 
-                shipping_date_owner,
-                estimated_shipping_schedule_date, 
-                actual_arrival_date, 
-                arrival_date_owner, 
-                shengguanok_status, 
-                shengguanok_status_file,
-                shengguanok_status_at, 
-                shengguanok_status_owner, 
-                qc_official_type,
-                creater, 
-                create_at
-            ) VALUES (
-                '$contract_type', 
-                '$renovate_type',
-                '$contractno', 
-                '$salesid', 
-                '$custom', 
-                '$site_manager', 
-                '$accountid', 
-                '$facilityno', 
-                '$facility_temp_no',
-                '$latitude', 
-                '$longitude',
-                '$weight', 
-                '$numberofpassenger', 
-                '$numberofstop', 
-                '$numberoffloor', 
-                '$opentype', 
-                '$speed', 
-                '$facility_kind',
-                '$address', 
-                '$contract_arrival_date', 
-                '$real_contract_arrival_date', 
-                '$sales_spec_verify', 
-                '$sales_spec_verify_file',
-                '$sales_spec_verify_at', 
-                '$sales_spec_verify_owner', 
-                '$customer_planning_verify', 
-                '$customer_planning_verify_file',
-                '$customer_planning_verify_at', 
-                '$customer_planning_verify_owner', 
-                '$customer_color_verify', 
-                '$customer_color_verify_file',
-                '$customer_color_verify_at', 
-                '$customer_color_verify_owner', 
-                '$site_survey_contact_form_verify', 
-                '$site_survey_contact_form_verify_file',
-                '$site_survey_contact_form_verify_at', 
-                '$site_survey_contact_form_verify_owner', 
-                '$desin_spec_verify', 
-                '$desin_spec_verify_file',
-                '$desin_spec_verify_at', 
-                '$desin_spec_verify_owner', 
-                '$desin_planning_verify', 
-                '$desin_planning_verify_file', 
-                '$desin_planning_verify_at',
-                '$desin_planning_verify_owner', 
-                '$desin_color_verify', 
-                '$desin_color_verify_file', 
-                '$desin_color_verify_at', 
-                '$desin_color_verify_owner',
-                '$desin_style_verify', 
-                '$desin_style_verify_file', 
-                '$desin_style_verify_at', 
-                '$desin_style_verify_owner', 
-                '$desin_leader_verify',
-                '$desin_leader_verify_file', 
-                '$desin_leader_verify_at', 
-                '$desin_leader_verify_owner', 
-                '$building_heigh_verify',
-                '$building_heigh_verify_file', 
-                '$building_heigh_verify_at', 
-                '$building_heigh_verify_owner', 
-                '$electrical_design_publish',
-                '$electrical_design_publish_at', 
-                '$electrical_design_publish_owner', 
-                '$mechanical_design_publish', 
-                '$mechanical_design_publish_at',
-                '$mechanical_design_publish_owner', 
-                '$electrical_shipping_date_publish', 
-                '$electrical_shipping_date_publish_at',
-                '$electrical_shipping_date_publish_owner', 
-                '$mechanical_shipping_date_publish', 
-                '$mechanical_shipping_date_publish_at',
-                '$mechanical_shipping_date_publish_owner', 
-                '$prattford_order_date', 
-                '$estimated_shipping_date', 
-                '$goods_type', 
-                '$actual_tofactory_date', 
-                '$shipping_date_owner',
-                '$estimated_shipping_schedule_date', 
-                '$actual_arrival_date', 
-                '$arrival_date_owner', 
-                '$shengguanok_status', 
-                '$shengguanok_status_file',
-                '$shengguanok_status_at', 
-                '$shengguanok_status_owner', 
-                '$qc_official_type',
-                '$creater', 
-                '$create_at'
-            )
-        ";
-        // 檢查作番號是否重複 
-        if (checkFacilitynoRepeat($link, $facilityno)) {
-            echo "
-            <script>
-                alert('此作番號重複');
-            </script>
-        ";
-        } else {
-            mysqli_query($link, $insertsql);
-            $last_form_id = mysqli_insert_id($link);
-            // 寫入待簽程狀態 A (工務)
-            do_wws2_assign($warehouseid, $last_form_id, 'A');
-            echo "
-                <script>
-                    alert('新增完成');
-                </script>
-            ";
-        }
-    }
-
-    // 開門方式 select => options
-    $sql = "
-        SELECT 
-            code_name AS val ,
-            content AS label 
-        FROM code F
-        WHERE field_name='open_kind'
-        ORDER BY label ASC
-    ";
-    $opendoor_options = mysqli_query($link, $sql);
-
-    // 所有營業員 select => options
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM account
-        WHERE department_id IN ('311','312','313','314','315','511','512','513','514')
-        ORDER BY label ASC
-    ";
-    $sales_options = mysqli_query($link, $sql);
-
-    // 所有工務人員 select => options
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM account
-        WHERE department_id IN ('521')
-        AND role_id IN ('3','4','5')
-        UNION
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM account
-        WHERE department_id IN ('531')
-        AND role_id IN ('1')
-        UNION
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM account
-        WHERE department_id IN ('521','531','541','542','543','544','545')
-        ORDER BY label ASC
-    ";
-    $warehouse_options = mysqli_query($link, $sql);
-
-?>
-    <form method="post" id="form" enctype="multipart/form-data">
-        <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>">
-        <input class="form-control " type="hidden" name="sales_spec_verify" value="1">
-        <input class="form-control " type="hidden" name="customer_planning_verify" value="1">
-        <input class="form-control " type="hidden" name="customer_color_verify" value="1">
-        <input class="form-control " type="hidden" name="customer_style_verify" value="1">
-        <input class="form-control " type="hidden" name="site_survey_contact_form_verify" value="1">
-        <input class="form-control " type="hidden" name="desin_spec_verify" value="1">
-        <input class="form-control " type="hidden" name="desin_planning_verify" value="1">
-        <input class="form-control " type="hidden" name="desin_color_verify" value="1">
-        <input class="form-control " type="hidden" name="desin_style_verify" value="1">
-        <input class="form-control " type="hidden" name="desin_leader_verify" value="1">
-        <input class="form-control " type="hidden" name="building_heigh_verify" value="1">
-        <input class="form-control " type="hidden" name="electrical_design_publish" value="1">
-        <input class="form-control " type="hidden" name="mechanical_design_publish" value="1">
-        <input class="form-control " type="hidden" name="electrical_shipping_date_publish" value="1">
-        <input class="form-control " type="hidden" name="mechanical_shipping_date_publish" value="1">
-        <input class="form-control " type="hidden" name="shengguanok_status" value="1">
-        <input class="form-control " type="hidden" name="create_at" value="<?= date('Y/m/d H:i:s'); ?>">
-        <div class="container-fluid" id="accountadd">
-            <div class="text-center">
-                <h3>作番大日程</h3>
-            </div>
-            <div class="form-horizontal">
-                <table class="table" style="width:100%">
-                    <thead style="margin-bottom: 20px">
-                        <tr>
-                            <td style="vertical-align: middle">合約號</td>
-                            <td>
-                                <input class="form-control " type="text" id="contractno" name="contractno" value="<?php echo $contractno; ?>">
-                            </td>
-                            <td style="vertical-align: middle">作番號</td>
-                            <td>
-                                <input class="form-control " type="text" id="facilityno" name="facilityno" value="<?php echo $facilityno; ?>">
-                            </td>
-                            <td style="vertical-align: middle">汰改種類</td>
-                            <td style="vertical-align: middle">
-                                <!-- <input class="form-control " type="text" id="renovate_type" name="renovate_type" value="<?php echo $renovate_type; ?>"> -->
-                                <select class="form-control" multiple="multiple" id="renovate_type" name="renovate_type[]">
-                                    <option value="M1">M1</option>
-                                    <option value="M2">M2</option>
-                                    <option value="M3">M3</option>
-                                    <option value="M4">M4</option>
-                                    <option value="MA">MA</option>
-                                </select>
-                            </td>
-                            <td></td>
-                            <td></td>
-
-                        </tr>
-                        <tr>
-                            <td style="vertical-align: middle">客戶名稱</td>
-                            <td>
-                                <input class="form-control " type="text" name="custom" value="<?php echo $custom; ?>">
-                            </td>
-                            <td style="vertical-align: middle">號機</td>
-                            <td>
-                                <input class="form-control " type="text" name="facility_temp_no" value="<?php echo $facility_temp_no; ?>">
-                            </td>
-                            <td></td>
-                            <td></td>
-                            <td></td>
-                            <td></td>
-                        </tr>
-                        <tr>
-                            <td style="vertical-align: middle">緯度</td>
-                            <td>
-                                <input class="form-control " type="text" name="latitude" value="<?php echo $latitude; ?>">
-                            </td>
-                            <td style="vertical-align: middle">經度</td>
-                            <td>
-                                <input class="form-control " type="text" name="longitude" value="<?php echo $longitude; ?>">
-                            </td>
-                            <td style="vertical-align: middle">地址</td>
-                            <td>
-                                <input class="form-control " type="text" name="address" value="<?php echo $address; ?>">
-                            </td>
-                            <td style="vertical-align: middle">機型</td>
-                            <td>
-                                <input class="form-control " type="text" name="facility_kind" value="<?php echo $facility_kind; ?>">
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="vertical-align: middle">載重</td>
-                            <td>
-                                <input class="form-control " type="number" min="0" name="weight" value="<?php echo $weight; ?>">
-                            </td>
-                            <td style="vertical-align: middle">人乘</td>
-                            <td>
-                                <input class="form-control " type="number" min="0" name="numberofpassenger" value="<?php echo $numberofpassenger; ?>">
-                            </td>
-                            <td style="vertical-align: middle">樓停</td>
-                            <td>
-                                <input class="form-control " type="number" min="0" name="numberofstop" value="<?php echo $numberofstop; ?>">
-                            </td>
-                            <td style="vertical-align: middle">樓層</td>
-                            <td>
-                                <input class="form-control " type="number" min="0" name="numberoffloor" value="<?php echo $numberoffloor; ?>">
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="vertical-align: middle">開門方式</td>
-                            <td style="vertical-align: middle">
-                                <select class="form-control " name="opentype">
-                                    <option value="">未選擇</option>
-                                    <?php
-                                    foreach ($opendoor_options as $opendoor_option) :
-                                        if ($opendoor_option['label'] == $opentype) {
-                                            echo "<option selected value='" . $opendoor_option['label'] . "'>" . $opendoor_option['label'] . "</option>";
-                                        } else {
-                                            echo "<option value='" . $opendoor_option['label'] . "'>" . $opendoor_option['label'] . "</option>";
-                                        }
-                                    endforeach
-                                    ?>
-                                </select>
-                            </td>
-                            <td style="vertical-align: middle">速度</td>
-                            <td>
-                                <input class="form-control " type="number" name="speed" gt="0" min="0" value="<?php echo $speed; ?>">
-                            </td>
-                            <td style="vertical-align: middle">合約交期<br />(到工地)</td>
-                            <td>
-                                <input class="form-control " type="date" id="contract_arrival_date" name="contract_arrival_date" value="<?php echo $contract_arrival_date; ?>">
-                            </td>
-                            <td style="vertical-align: middle">預計交期<br />(到工地)</td>
-                            <td>
-                                <input class="form-control " type="date" id="real_contract_arrival_date" name="real_contract_arrival_date" value="<?php echo $real_contract_arrival_date; ?>">
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="vertical-align: middle">工地負責人</td>
-                            <td>
-                                <input class="form-control " type="text" name="site_manager" value="<?php echo $site_manager; ?>">
-                            </td>
-                            <td style="vertical-align: middle">營業員</td>
-                            <td style="vertical-align: middle">
-                                <select class="form-control " id="salesid" name="salesid">
-                                    <option value="">未選擇</option>
-                                    <?php
-                                    foreach ($sales_options as $sales_option) :
-                                        if ($sales_option['val'] == $salesid) {
-                                            echo "<option selected value='" . $sales_option['val'] . "'>" . $sales_option['val'] . $sales_option['label'] . "</option>";
-                                        } else {
-                                            echo "<option value='" . $sales_option['val'] . "'>" . $sales_option['val'] . $sales_option['label'] . "</option>";
-                                        }
-                                    endforeach
-                                    ?>
-                                </select>
-                            </td>
-                            <td style="vertical-align: middle">工務部門負責人</td>
-                            <td style="vertical-align: middle">
-                                <select class="form-control " id="warehouseid" name="warehouseid">
-                                    <option value="">未選擇</option>
-                                    <?php
-                                    foreach ($warehouse_options as $warehouse_option) :
-                                        if ($warehouse_option['val'] == $warehouseid) {
-                                            echo "<option selected value='" . $warehouse_option['val'] . "'>" . $warehouse_option['val'] . $warehouse_option['label'] . "</option>";
-                                        } else {
-                                            echo "<option value='" . $warehouse_option['val'] . "'>" . $warehouse_option['val'] . $warehouse_option['label'] . "</option>";
-                                        }
-                                    endforeach
-                                    ?>
-                                </select>
-                            </td>
-                            <td>
-                                <input type="radio" name="qc_official_type" id='qc_official_type_QO' value='QO' checked/>
-                                <label for="qc_official_type_QO">QC + 官檢</label>
-                                <input type="radio" name="qc_official_type" id='qc_official_type_Q' value='Q'  />
-                                <label for="qc_official_type_Q">只需QC</label>
-                                <input type="radio" name="qc_official_type" id='qc_official_type_O' value='O' ?> 
-                                <label for="qc_official_type_O">只需官檢</label>
-                            </td>
-                            <td></td>
-                        </tr>
-                    </thead>
-                </table>
-            </div>
-            <div class="col-md-12" style="margin-bottom:15px;">
-                <button onclick="savedata()" type="button" class="btn btn-primary btn-lg pull-right">確認後保存</button>
-            </div>
-        </div>
-    </form>
-    <script type="text/javascript">
-        $(document).ready(function() {
-            $('#renovate_type').select2();
-        });
-
-        function savedata() {
-            var savedataMessage = {
-                "0": "不明錯誤",
-                "1": "",
-                "2": "未選擇營業員",
-                "3": "合約編號未填寫",
-                "4": "作番號未填寫",
-                "5": "未選擇工務人員",
-                "6": "未輸入汰改種類",
-                "7": "合約日未填寫"
-            }
-            if (getSavedataStatus() == '1') {
-                $('#form').submit();
-            } else {
-                typeof savedataMessage[getSavedataStatus()] == 'string' ? alert(savedataMessage[getSavedataStatus()]) : alert("不明錯誤");
-            }
-
-        }
-
-        function getSavedataStatus() {
-            if ($("#salesid").val() == '')
-                return '2'
-            if ($("#contractno").val() == '')
-                return '3'
-            if ($("#facilityno").val() == '')
-                return '4'
-            if ($("#warehouseid").val() == '')
-                return '5'
-            if ($("#renovate_type").val() == '')
-                return '6'
-            if ($("#contract_arrival_date").val() == '')
-                return '7'
-            if ($("#real_contract_arrival_date").val() == '')
-                return '7'
-            return '1'
-        }
-    </script>
-
-<?php
-} else {
-    echo "錯誤的訪問";
-}
-
+<?php
+// ini_set('display_errors', 'on');
+/**
+ * 流程規則:(汰改)
+ * 1.A:工務主管確認中 B:營業員確認中  C:設計部門人員確認中 D:生管主管確認中 Z:生管確認完成        
+ * 
+ *  新梯        543 筆  (已匯入)
+ *  舊改        141 筆  (資料未洗入)
+ *  已簽回      684 筆 (共計)
+ */
+
+
+// error_reporting(0);
+include "header.php";
+
+// 載入db.php來連結資料庫
+require_once "database.php";
+?>
+<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
+<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
+<?php
+
+// 所屬部門
+$sql = "select department_id from account where accountid = '$user_id'";
+$res = mysqli_query($link, $sql);
+$row = mysqli_fetch_row($res);
+$department_id = $row[0];
+mysqli_free_result($res);
+// 生管及資訊才可以訪問
+if ($department_id == "321" || $department_id == "220") {
+
+    /**
+     * 檢查作番是否重複 true:重複 false:沒重複
+     * @param mysqli $link 資料庫連線檔
+     * @param string $facilityno 檢查的作番號
+     */
+    function checkFacilitynoRepeat($link, $facilityno)
+    {
+        $sql = "
+            SELECT 
+                COUNT(*) 
+            FROM wipwholestatus
+            WHERE facilityno = '$facilityno'
+            AND status = '1'
+        ";
+        $result = mysqli_query($link, $sql);
+        $row = mysqli_fetch_array($result);
+        return $row['0'] > 0 ? true : false;
+    }
+
+    // 預設汰改代碼 A
+    $contract_type = 'B';
+    // 汰改方案
+    $renovate_type = '';
+    // 合約號
+    $contractno = '';
+    // 營業員ID
+    $salesid = '';
+    // 工務人員ID
+    $warehouseid = '';
+    // 客戶姓名
+    $custom = '';
+    // 工地負責人
+    $site_manager = '';
+    // 客戶id
+    $accountid = '';
+    // 作番號
+    $facilityno = '';
+    // 號機
+    $facility_temp_no = '';
+    // 緯度
+    $latitude = '';
+    // 經度
+    $longitude = '';
+    // 載重
+    $weight = '';
+    // 人乘
+    $numberofpassenger = '';
+    // 樓停
+    $numberofstop = '';
+    // 樓層
+    $numberoffloor = '';
+    // 開門方式
+    $opentype = '';
+    // 速度
+    $speed = '';
+    // 機型
+    $facility_kind = '';
+    // 地址
+    $address = '';
+    // 合約到貨日
+    $contract_arrival_date = '';
+    // 實際到貨日
+    $real_contract_arrival_date = '';
+
+    // 營業規格確認
+    $sales_spec_verify = '';
+    // 營業規格附件
+    $sales_spec_verify_file = '';
+    // 營業規格確認時間	
+    $sales_spec_verify_at = '';
+    // 營業規格確認人
+    $sales_spec_verify_owner = '';
+
+    // 客戶計劃圖確認
+    $customer_planning_verify = '';
+    // 客戶計劃圖附件	
+    $customer_planning_verify_file = '';
+    // 客戶計劃圖確認時間
+    $customer_planning_verify_at = '';
+    // 客戶計劃圖確認人
+    $customer_planning_verify_owner = '';
+
+    // 客戶顏色確認
+    $customer_color_verify = '';
+    // 客戶顏色附件	
+    $customer_color_verify_file = '';
+    // 客戶顏色確認時間    
+    $customer_color_verify_at = '';
+    // 客戶顏色確認人
+    $customer_color_verify_owner = '';
+
+    // 工勘聯絡表
+    $site_survey_contact_form_verify = '';
+    // 工勘聯絡表附件
+    $site_survey_contact_form_verify_file = '';
+    // 工勘聯絡表確認時間
+    $site_survey_contact_form_verify_at = '';
+    // 工勘聯絡表確認人	
+    $site_survey_contact_form_verify_owner = '';
+
+    // 設計規格確認
+    $desin_spec_verify = '';
+    // 設計規格確認附件    
+    $desin_spec_verify_file = '';
+    // 設計規格確認時間
+    $desin_spec_verify_at = '';
+    // 設計規格確認確認人
+    $desin_spec_verify_owner = '';
+
+    // 設計計劃圖確認
+    $desin_planning_verify = '';
+    // 設計計劃圖確認附件	    
+    $desin_planning_verify_file = '';
+    // 設計計劃圖確認時間	     
+    $desin_planning_verify_at = '';
+    // 設計計劃圖確認人	
+    $desin_planning_verify_owner = '';
+
+    // 設計顏色確認
+    $desin_color_verify = '';
+    // 設計顏色確認附件	  
+    $desin_color_verify_file = '';
+    // 設計顏色確認時間	
+    $desin_color_verify_at = '';
+    // 設計顏色確認人	
+    $desin_color_verify_owner = '';
+
+    // 設計仕樣確認
+    $desin_style_verify = '';
+    // 設計仕樣確認附件	
+    $desin_style_verify_file = '';
+    // 設計仕樣確認時間
+    $desin_style_verify_at = '';
+    // 設計仕樣確認人
+    $desin_style_verify_owner = '';
+
+    // 設計主管確認
+    $desin_leader_verify = '';
+    // 設計主管確認附件	
+    $desin_leader_verify_file = '';
+    // 設計主管確認時間
+    $desin_leader_verify_at = '';
+    // 設計主管確認人
+    $desin_leader_verify_owner = '';
+
+    // 樓高通報
+    $building_heigh_verify = '';
+    // 樓高通報附件	
+    $building_heigh_verify_file = '';
+    // 樓高通報時間	     
+    $building_heigh_verify_at = '';
+    // 樓高通報確認人	
+    $building_heigh_verify_owner = '';
+
+    // 電氣發貨明細
+    $electrical_design_publish = '';
+    // 電氣資料發行時間	
+    $electrical_design_publish_at = '';
+    // 電氣資料發行人	
+    $electrical_design_publish_owner = '';
+
+    // 機械資料發行
+    $mechanical_design_publish = '';
+    // 機械資料發行時間	
+    $mechanical_design_publish_at = '';
+    // 機械資料發行人
+    $mechanical_design_publish_owner = '';
+
+    // 電氣發貨明細	
+    $electrical_shipping_date_publish = '';
+    // 電氣發貨明細時間	
+    $electrical_shipping_date_publish_at = '';
+    // 電氣發貨明細發行人
+    $electrical_shipping_date_publish_owner = '';
+
+    // 機械發貨明細
+    $mechanical_shipping_date_publish = '';
+    // 機械發貨明細時間
+    $mechanical_shipping_date_publish_at = '';
+    // 機械發貨明細發行人
+    $mechanical_shipping_date_publish_owner = '';
+
+    // 下單日(普來特富)	
+    $prattford_order_date = '';
+    // 預計發貨日(到港日)	
+    $estimated_shipping_date = '';
+    // 發貨類別(A.全級發貨、G.欠件發貨)
+    $goods_type = '';
+    // 實際到貨日(到觀音廠日)
+    $actual_tofactory_date = '';
+    // 發貨確認人	
+    $shipping_date_owner = '';
+    // 預計船期	
+    $estimated_shipping_schedule_date = '';
+    // 實際到貨日(到港日)
+    $actual_arrival_date = '';
+    // 到貨確認人
+    $arrival_date_owner = '';
+
+    // 是否齊備	
+    $shengguanok_status = '';
+    // 生管確認附件	
+    $shengguanok_status_file = '';
+    // 已備齊時間	
+    $shengguanok_status_at = '';
+    // 已備齊檢查人
+    $shengguanok_status_owner = '';
+
+    // 建立人
+    $creater = '';
+    // 建立時間	
+    $create_at = '';
+
+
+    if ($_SERVER["REQUEST_METHOD"] == "POST") {
+
+        // 預設新梯代碼 A
+        $contract_type = postCheck('contract_type', 'B');
+        // 汰改方案 B
+        $renovate_type = json_encode($_POST['renovate_type'], JSON_UNESCAPED_UNICODE);
+        // 合約號
+        $contractno  = postCheck('contractno');
+        // 營業員ID
+        $salesid = postCheck('salesid');
+        // 工務人員ID
+        $warehouseid = postCheck('warehouseid');
+        // 客戶姓名
+        $custom = postCheck('custom');
+        // 工地負責人
+        $site_manager = postCheck('site_manager');
+        // 客戶id
+        $accountid = postCheck('accountid');
+        // 作番號
+        $facilityno =  postCheck('facilityno');
+        // 作番號
+        $facility_temp_no =  postCheck('facility_temp_no');
+        // 緯度
+        $latitude = postCheck('latitude');
+        // 經度
+        $longitude = postCheck('longitude');
+        // 載重
+        $weight = postCheck('weight');
+        // 人乘
+        $numberofpassenger = postCheck('numberofpassenger');
+        // 樓停
+        $numberofstop = postCheck('numberofstop');
+        // 樓層
+        $numberoffloor = postCheck('numberoffloor');
+        // 開門方式
+        $opentype = postCheck('opentype');
+        // 速度
+        $speed = postCheck('speed');
+        // 機型
+        $facility_kind = postCheck('facility_kind');
+        // 地址
+        $address = postCheck('address');
+        // 合約到貨日
+        $contract_arrival_date = postCheck('contract_arrival_date');
+        // 實際到貨日
+        $real_contract_arrival_date = postCheck('real_contract_arrival_date');
+
+        // 營業規格確認
+        $sales_spec_verify = postCheck('sales_spec_verify');
+        // 營業規格附件
+        $sales_spec_verify_file = postCheck('sales_spec_verify_file');
+        // 營業規格確認時間	
+        $sales_spec_verify_at = postCheck('sales_spec_verify_at');
+        // 營業規格確認人
+        $sales_spec_verify_owner = postCheck('sales_spec_verify_owner');
+
+        // 客戶計劃圖確認
+        $customer_planning_verify = postCheck('customer_planning_verify');
+        // 客戶計劃圖附件	
+        $customer_planning_verify_file = postCheck('customer_planning_verify_file');
+        // 客戶計劃圖確認時間
+        $customer_planning_verify_at = postCheck('customer_planning_verify_at');
+        // 客戶計劃圖確認人
+        $customer_planning_verify_owner = postCheck('customer_planning_verify_owner');
+
+        // 客戶顏色確認
+        $customer_color_verify = postCheck('customer_color_verify');
+        // 客戶顏色附件	
+        $customer_color_verify_file = postCheck('customer_color_verify_file');
+        // 客戶顏色確認時間    
+        $customer_color_verify_at = postCheck('customer_color_verify_at');
+        // 客戶顏色確認人
+        $customer_color_verify_owner = postCheck('customer_color_verify_owner');
+
+        // 工勘聯絡表
+        $site_survey_contact_form_verify = postCheck('site_survey_contact_form_verify');
+        // 工勘聯絡表附件
+        $site_survey_contact_form_verify_file = postCheck('site_survey_contact_form_verify_file');
+        // 工勘聯絡表確認時間
+        $site_survey_contact_form_verify_at = postCheck('site_survey_contact_form_verify_at');
+        // 工勘聯絡表確認人	
+        $site_survey_contact_form_verify_owner = postCheck('site_survey_contact_form_verify_owner');
+
+        // 設計規格確認
+        $desin_spec_verify = postCheck('desin_spec_verify');
+        // 設計規格確認附件    
+        $desin_spec_verify_file = postCheck('desin_spec_verify_file');
+        // 設計規格確認時間
+        $desin_spec_verify_at = postCheck('desin_spec_verify_at');
+        // 設計規格確認確認人
+        $desin_spec_verify_owner = postCheck('desin_spec_verify_owner');
+
+        // 設計計劃圖確認
+        $desin_planning_verify = postCheck('desin_planning_verify');
+        // 設計計劃圖確認附件	    
+        $desin_planning_verify_file = postCheck('desin_planning_verify_file');
+        // 設計計劃圖確認時間	     
+        $desin_planning_verify_at = postCheck('desin_planning_verify_at');
+        // 設計計劃圖確認人	
+        $desin_planning_verify_owner = postCheck('desin_planning_verify_owner');
+
+        // 設計顏色確認
+        $desin_color_verify = postCheck('desin_color_verify');
+        // 設計顏色確認附件	  
+        $desin_color_verify_file = postCheck('desin_color_verify_file');
+        // 設計顏色確認時間	
+        $desin_color_verify_at = postCheck('desin_color_verify_at');
+        // 設計顏色確認人	
+        $desin_color_verify_owner = postCheck('desin_color_verify_owner');
+
+        // 設計仕樣確認
+        $desin_style_verify = postCheck('desin_style_verify');
+        // 設計仕樣確認附件	
+        $desin_style_verify_file = postCheck('desin_style_verify_file');
+        // 設計仕樣確認時間
+        $desin_style_verify_at = postCheck('desin_style_verify_at');
+        // 設計仕樣確認人
+        $desin_style_verify_owner = postCheck('desin_style_verify_owner');
+
+        // 設計主管確認
+        $desin_leader_verify = postCheck('desin_leader_verify');
+        // 設計主管確認附件	
+        $desin_leader_verify_file = postCheck('desin_leader_verify_file');
+        // 設計主管確認時間
+        $desin_leader_verify_at = postCheck('desin_leader_verify_at');
+        // 設計主管確認人
+        $desin_leader_verify_owner = postCheck('desin_leader_verify_owner');
+
+        // 樓高通報
+        $building_heigh_verify = postCheck('building_heigh_verify');
+        // 樓高通報附件	
+        $building_heigh_verify_file = postCheck('building_heigh_verify_file');
+        // 樓高通報時間	     
+        $building_heigh_verify_at = postCheck('building_heigh_verify_at');
+        // 樓高通報確認人	
+        $building_heigh_verify_owner = postCheck('building_heigh_verify_owner');
+
+        // 電氣發貨明細
+        $electrical_design_publish = postCheck('electrical_design_publish');
+        // 電氣資料發行時間	
+        $electrical_design_publish_at = postCheck('electrical_design_publish_at');
+        // 電氣資料發行人	
+        $electrical_design_publish_owner = postCheck('electrical_design_publish_owner');
+
+        // 機械資料發行
+        $mechanical_design_publish = postCheck('mechanical_design_publish');
+        // 機械資料發行時間	
+        $mechanical_design_publish_at = postCheck('mechanical_design_publish_at');
+        // 機械資料發行人
+        $mechanical_design_publish_owner = postCheck('mechanical_design_publish_owner');
+
+        // 電氣發貨明細	
+        $electrical_shipping_date_publish = postCheck('electrical_shipping_date_publish');
+        // 電氣發貨明細時間	
+        $electrical_shipping_date_publish_at = postCheck('electrical_shipping_date_publish_at');
+        // 電氣發貨明細發行人
+        $electrical_shipping_date_publish_owner = postCheck('electrical_shipping_date_publish_owner');
+
+        // 機械發貨明細
+        $mechanical_shipping_date_publish = postCheck('mechanical_shipping_date_publish');
+        // 機械發貨明細時間
+        $mechanical_shipping_date_publish_at = postCheck('mechanical_shipping_date_publish_at');
+        // 機械發貨明細發行人
+        $mechanical_shipping_date_publish_owner = postCheck('mechanical_shipping_date_publish_owner');
+
+        // 普來特富(下單日)	
+        $prattford_order_date = postCheck('prattford_order_date');
+        // 預計發貨日(到港日)	
+        $estimated_shipping_date = postCheck('estimated_shipping_date');
+        // 發貨類別(A.全級發貨、G.欠件發貨)
+        $goods_type = postCheck('goods_type');
+        // 實際到貨日(到觀音廠日)
+        $actual_tofactory_date = postCheck('actual_tofactory_date');
+        // 發貨確認人	
+        $shipping_date_owner = postCheck('shipping_date_owner');
+        // 預計船期
+        $estimated_shipping_schedule_date = postCheck('estimated_shipping_schedule_date');
+        // 實際到貨日(到港日)
+        $actual_arrival_date = postCheck('actual_arrival_date');
+        // 到貨確認人
+        $arrival_date_owner = postCheck('arrival_date_owner');
+
+        // 是否齊備	
+        $shengguanok_status = postCheck('shengguanok_status');
+        // 生管確認附件	
+        $shengguanok_status_file = postCheck('shengguanok_status_file');
+        // 已備齊時間	
+        $shengguanok_status_at = postCheck('shengguanok_status_at');
+        // 已備齊檢查人
+        $shengguanok_status_owner = postCheck('shengguanok_status_owner');
+
+        // QC與官檢種類
+        $qc_official_type = postCheck('qc_official_type');
+
+        // 建立人
+        $creater = postCheck('creater');
+        // 建立時間	
+        $create_at = postCheck('create_at');
+
+        //插入數據庫數據  gary_version
+        $insertsql = "
+            INSERT INTO wipwholestatus (
+                contract_type, 
+                renovate_type,
+                contractno, 
+                salesid, 
+                custom, 
+                site_manager,
+                accountid, 
+                facilityno, 
+                facility_temp_no,
+                latitude, 
+                longitude,
+                weight, 
+                numberofpassenger, 
+                numberofstop, 
+                numberoffloor, 
+                opentype, 
+                speed, 
+                facility_kind,
+                address, 
+                contract_arrival_date, 
+                real_contract_arrival_date, 
+                sales_spec_verify, 
+                sales_spec_verify_file,
+                sales_spec_verify_at, 
+                sales_spec_verify_owner, 
+                customer_planning_verify, 
+                customer_planning_verify_file,
+                customer_planning_verify_at, 
+                customer_planning_verify_owner, 
+                customer_color_verify, 
+                customer_color_verify_file,
+                customer_color_verify_at, 
+                customer_color_verify_owner, 
+                site_survey_contact_form_verify, 
+                site_survey_contact_form_verify_file,
+                site_survey_contact_form_verify_at, 
+                site_survey_contact_form_verify_owner, 
+                desin_spec_verify, 
+                desin_spec_verify_file,
+                desin_spec_verify_at, 
+                desin_spec_verify_owner, 
+                desin_planning_verify, 
+                desin_planning_verify_file, 
+                desin_planning_verify_at,
+                desin_planning_verify_owner, 
+                desin_color_verify, 
+                desin_color_verify_file, 
+                desin_color_verify_at, 
+                desin_color_verify_owner,
+                desin_style_verify, 
+                desin_style_verify_file, 
+                desin_style_verify_at, 
+                desin_style_verify_owner, 
+                desin_leader_verify,
+                desin_leader_verify_file, 
+                desin_leader_verify_at, 
+                desin_leader_verify_owner, 
+                building_heigh_verify,
+                building_heigh_verify_file, 
+                building_heigh_verify_at, 
+                building_heigh_verify_owner, 
+                electrical_design_publish,
+                electrical_design_publish_at, 
+                electrical_design_publish_owner, 
+                mechanical_design_publish, 
+                mechanical_design_publish_at,
+                mechanical_design_publish_owner, 
+                electrical_shipping_date_publish, 
+                electrical_shipping_date_publish_at,
+                electrical_shipping_date_publish_owner, 
+                mechanical_shipping_date_publish, 
+                mechanical_shipping_date_publish_at,
+                mechanical_shipping_date_publish_owner, 
+                prattford_order_date,
+                estimated_shipping_date, 
+                goods_type, 
+                actual_tofactory_date, 
+                shipping_date_owner,
+                estimated_shipping_schedule_date, 
+                actual_arrival_date, 
+                arrival_date_owner, 
+                shengguanok_status, 
+                shengguanok_status_file,
+                shengguanok_status_at, 
+                shengguanok_status_owner, 
+                qc_official_type,
+                creater, 
+                create_at
+            ) VALUES (
+                '$contract_type', 
+                '$renovate_type',
+                '$contractno', 
+                '$salesid', 
+                '$custom', 
+                '$site_manager', 
+                '$accountid', 
+                '$facilityno', 
+                '$facility_temp_no',
+                '$latitude', 
+                '$longitude',
+                '$weight', 
+                '$numberofpassenger', 
+                '$numberofstop', 
+                '$numberoffloor', 
+                '$opentype', 
+                '$speed', 
+                '$facility_kind',
+                '$address', 
+                '$contract_arrival_date', 
+                '$real_contract_arrival_date', 
+                '$sales_spec_verify', 
+                '$sales_spec_verify_file',
+                '$sales_spec_verify_at', 
+                '$sales_spec_verify_owner', 
+                '$customer_planning_verify', 
+                '$customer_planning_verify_file',
+                '$customer_planning_verify_at', 
+                '$customer_planning_verify_owner', 
+                '$customer_color_verify', 
+                '$customer_color_verify_file',
+                '$customer_color_verify_at', 
+                '$customer_color_verify_owner', 
+                '$site_survey_contact_form_verify', 
+                '$site_survey_contact_form_verify_file',
+                '$site_survey_contact_form_verify_at', 
+                '$site_survey_contact_form_verify_owner', 
+                '$desin_spec_verify', 
+                '$desin_spec_verify_file',
+                '$desin_spec_verify_at', 
+                '$desin_spec_verify_owner', 
+                '$desin_planning_verify', 
+                '$desin_planning_verify_file', 
+                '$desin_planning_verify_at',
+                '$desin_planning_verify_owner', 
+                '$desin_color_verify', 
+                '$desin_color_verify_file', 
+                '$desin_color_verify_at', 
+                '$desin_color_verify_owner',
+                '$desin_style_verify', 
+                '$desin_style_verify_file', 
+                '$desin_style_verify_at', 
+                '$desin_style_verify_owner', 
+                '$desin_leader_verify',
+                '$desin_leader_verify_file', 
+                '$desin_leader_verify_at', 
+                '$desin_leader_verify_owner', 
+                '$building_heigh_verify',
+                '$building_heigh_verify_file', 
+                '$building_heigh_verify_at', 
+                '$building_heigh_verify_owner', 
+                '$electrical_design_publish',
+                '$electrical_design_publish_at', 
+                '$electrical_design_publish_owner', 
+                '$mechanical_design_publish', 
+                '$mechanical_design_publish_at',
+                '$mechanical_design_publish_owner', 
+                '$electrical_shipping_date_publish', 
+                '$electrical_shipping_date_publish_at',
+                '$electrical_shipping_date_publish_owner', 
+                '$mechanical_shipping_date_publish', 
+                '$mechanical_shipping_date_publish_at',
+                '$mechanical_shipping_date_publish_owner', 
+                '$prattford_order_date', 
+                '$estimated_shipping_date', 
+                '$goods_type', 
+                '$actual_tofactory_date', 
+                '$shipping_date_owner',
+                '$estimated_shipping_schedule_date', 
+                '$actual_arrival_date', 
+                '$arrival_date_owner', 
+                '$shengguanok_status', 
+                '$shengguanok_status_file',
+                '$shengguanok_status_at', 
+                '$shengguanok_status_owner', 
+                '$qc_official_type',
+                '$creater', 
+                '$create_at'
+            )
+        ";
+        // 檢查作番號是否重複 
+        if (checkFacilitynoRepeat($link, $facilityno)) {
+            echo "
+            <script>
+                alert('此作番號重複');
+            </script>
+        ";
+        } else {
+            mysqli_query($link, $insertsql);
+            $last_form_id = mysqli_insert_id($link);
+            // 寫入待簽程狀態 A (工務)
+            do_wws2_assign($warehouseid, $last_form_id, 'A');
+            echo "
+                <script>
+                    alert('新增完成');
+                </script>
+            ";
+        }
+    }
+
+    // 開門方式 select => options
+    $sql = "
+        SELECT 
+            code_name AS val ,
+            content AS label 
+        FROM code F
+        WHERE field_name='open_kind'
+        ORDER BY label ASC
+    ";
+    $opendoor_options = mysqli_query($link, $sql);
+
+    // 所有營業員 select => options
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM account
+        WHERE department_id IN ('311','312','313','314','315','511','512','513','514')
+        ORDER BY label ASC
+    ";
+    $sales_options = mysqli_query($link, $sql);
+
+    // 所有工務人員 select => options
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM account
+        WHERE department_id IN ('521')
+        AND role_id IN ('3','4','5')
+        UNION
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM account
+        WHERE department_id IN ('531')
+        AND role_id IN ('1')
+        UNION
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM account
+        WHERE department_id IN ('521','531','541','542','543','544','545')
+        ORDER BY label ASC
+    ";
+    $warehouse_options = mysqli_query($link, $sql);
+
+?>
+    <form method="post" id="form" enctype="multipart/form-data">
+        <input class="form-control " type="hidden" name="creater" value="<?= $user_id; ?>">
+        <input class="form-control " type="hidden" name="sales_spec_verify" value="1">
+        <input class="form-control " type="hidden" name="customer_planning_verify" value="1">
+        <input class="form-control " type="hidden" name="customer_color_verify" value="1">
+        <input class="form-control " type="hidden" name="customer_style_verify" value="1">
+        <input class="form-control " type="hidden" name="site_survey_contact_form_verify" value="1">
+        <input class="form-control " type="hidden" name="desin_spec_verify" value="1">
+        <input class="form-control " type="hidden" name="desin_planning_verify" value="1">
+        <input class="form-control " type="hidden" name="desin_color_verify" value="1">
+        <input class="form-control " type="hidden" name="desin_style_verify" value="1">
+        <input class="form-control " type="hidden" name="desin_leader_verify" value="1">
+        <input class="form-control " type="hidden" name="building_heigh_verify" value="1">
+        <input class="form-control " type="hidden" name="electrical_design_publish" value="1">
+        <input class="form-control " type="hidden" name="mechanical_design_publish" value="1">
+        <input class="form-control " type="hidden" name="electrical_shipping_date_publish" value="1">
+        <input class="form-control " type="hidden" name="mechanical_shipping_date_publish" value="1">
+        <input class="form-control " type="hidden" name="shengguanok_status" value="1">
+        <input class="form-control " type="hidden" name="create_at" value="<?= date('Y/m/d H:i:s'); ?>">
+        <div class="container-fluid" id="accountadd">
+            <div class="text-center">
+                <h3>作番大日程</h3>
+            </div>
+            <div class="form-horizontal">
+                <table class="table" style="width:100%">
+                    <thead style="margin-bottom: 20px">
+                        <tr>
+                            <td style="vertical-align: middle">合約號</td>
+                            <td>
+                                <input class="form-control " type="text" id="contractno" name="contractno" value="<?php echo $contractno; ?>">
+                            </td>
+                            <td style="vertical-align: middle">作番號</td>
+                            <td>
+                                <input class="form-control " type="text" id="facilityno" name="facilityno" value="<?php echo $facilityno; ?>">
+                            </td>
+                            <td style="vertical-align: middle">汰改種類</td>
+                            <td style="vertical-align: middle">
+                                <!-- <input class="form-control " type="text" id="renovate_type" name="renovate_type" value="<?php echo $renovate_type; ?>"> -->
+                                <select class="form-control" multiple="multiple" id="renovate_type" name="renovate_type[]">
+                                    <option value="M1">M1</option>
+                                    <option value="M2">M2</option>
+                                    <option value="M3">M3</option>
+                                    <option value="M4">M4</option>
+                                    <option value="MA">MA</option>
+                                </select>
+                            </td>
+                            <td></td>
+                            <td></td>
+
+                        </tr>
+                        <tr>
+                            <td style="vertical-align: middle">客戶名稱</td>
+                            <td>
+                                <input class="form-control " type="text" name="custom" value="<?php echo $custom; ?>">
+                            </td>
+                            <td style="vertical-align: middle">號機</td>
+                            <td>
+                                <input class="form-control " type="text" name="facility_temp_no" value="<?php echo $facility_temp_no; ?>">
+                            </td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                        </tr>
+                        <tr>
+                            <td style="vertical-align: middle">緯度</td>
+                            <td>
+                                <input class="form-control " type="text" name="latitude" value="<?php echo $latitude; ?>">
+                            </td>
+                            <td style="vertical-align: middle">經度</td>
+                            <td>
+                                <input class="form-control " type="text" name="longitude" value="<?php echo $longitude; ?>">
+                            </td>
+                            <td style="vertical-align: middle">地址</td>
+                            <td>
+                                <input class="form-control " type="text" name="address" value="<?php echo $address; ?>">
+                            </td>
+                            <td style="vertical-align: middle">機型</td>
+                            <td>
+                                <input class="form-control " type="text" name="facility_kind" value="<?php echo $facility_kind; ?>">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="vertical-align: middle">載重</td>
+                            <td>
+                                <input class="form-control " type="number" min="0" name="weight" value="<?php echo $weight; ?>">
+                            </td>
+                            <td style="vertical-align: middle">人乘</td>
+                            <td>
+                                <input class="form-control " type="number" min="0" name="numberofpassenger" value="<?php echo $numberofpassenger; ?>">
+                            </td>
+                            <td style="vertical-align: middle">樓停</td>
+                            <td>
+                                <input class="form-control " type="number" min="0" name="numberofstop" value="<?php echo $numberofstop; ?>">
+                            </td>
+                            <td style="vertical-align: middle">樓層</td>
+                            <td>
+                                <input class="form-control " type="number" min="0" name="numberoffloor" value="<?php echo $numberoffloor; ?>">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="vertical-align: middle">開門方式</td>
+                            <td style="vertical-align: middle">
+                                <select class="form-control " name="opentype">
+                                    <option value="">未選擇</option>
+                                    <?php
+                                    foreach ($opendoor_options as $opendoor_option) :
+                                        if ($opendoor_option['label'] == $opentype) {
+                                            echo "<option selected value='" . $opendoor_option['label'] . "'>" . $opendoor_option['label'] . "</option>";
+                                        } else {
+                                            echo "<option value='" . $opendoor_option['label'] . "'>" . $opendoor_option['label'] . "</option>";
+                                        }
+                                    endforeach
+                                    ?>
+                                </select>
+                            </td>
+                            <td style="vertical-align: middle">速度</td>
+                            <td>
+                                <input class="form-control " type="number" name="speed" gt="0" min="0" value="<?php echo $speed; ?>">
+                            </td>
+                            <td style="vertical-align: middle">合約交期<br />(到工地)</td>
+                            <td>
+                                <input class="form-control " type="date" id="contract_arrival_date" name="contract_arrival_date" value="<?php echo $contract_arrival_date; ?>">
+                            </td>
+                            <td style="vertical-align: middle">預計交期<br />(到工地)</td>
+                            <td>
+                                <input class="form-control " type="date" id="real_contract_arrival_date" name="real_contract_arrival_date" value="<?php echo $real_contract_arrival_date; ?>">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="vertical-align: middle">工地負責人</td>
+                            <td>
+                                <input class="form-control " type="text" name="site_manager" value="<?php echo $site_manager; ?>">
+                            </td>
+                            <td style="vertical-align: middle">營業員</td>
+                            <td style="vertical-align: middle">
+                                <select class="form-control " id="salesid" name="salesid">
+                                    <option value="">未選擇</option>
+                                    <?php
+                                    foreach ($sales_options as $sales_option) :
+                                        if ($sales_option['val'] == $salesid) {
+                                            echo "<option selected value='" . $sales_option['val'] . "'>" . $sales_option['val'] . $sales_option['label'] . "</option>";
+                                        } else {
+                                            echo "<option value='" . $sales_option['val'] . "'>" . $sales_option['val'] . $sales_option['label'] . "</option>";
+                                        }
+                                    endforeach
+                                    ?>
+                                </select>
+                            </td>
+                            <td style="vertical-align: middle">工務部門負責人</td>
+                            <td style="vertical-align: middle">
+                                <select class="form-control " id="warehouseid" name="warehouseid">
+                                    <option value="">未選擇</option>
+                                    <?php
+                                    foreach ($warehouse_options as $warehouse_option) :
+                                        if ($warehouse_option['val'] == $warehouseid) {
+                                            echo "<option selected value='" . $warehouse_option['val'] . "'>" . $warehouse_option['val'] . $warehouse_option['label'] . "</option>";
+                                        } else {
+                                            echo "<option value='" . $warehouse_option['val'] . "'>" . $warehouse_option['val'] . $warehouse_option['label'] . "</option>";
+                                        }
+                                    endforeach
+                                    ?>
+                                </select>
+                            </td>
+                            <td>
+                                <input type="radio" name="qc_official_type" id='qc_official_type_QO' value='QO' checked/>
+                                <label for="qc_official_type_QO">QC + 官檢</label>
+                                <input type="radio" name="qc_official_type" id='qc_official_type_Q' value='Q'  />
+                                <label for="qc_official_type_Q">只需QC</label>
+                                <input type="radio" name="qc_official_type" id='qc_official_type_O' value='O' ?> 
+                                <label for="qc_official_type_O">只需官檢</label>
+                            </td>
+                            <td></td>
+                        </tr>
+                    </thead>
+                </table>
+            </div>
+            <div class="col-md-12" style="margin-bottom:15px;">
+                <button onclick="savedata()" type="button" class="btn btn-primary btn-lg pull-right">確認後保存</button>
+            </div>
+        </div>
+    </form>
+    <script type="text/javascript">
+        $(document).ready(function() {
+            $('#renovate_type').select2();
+        });
+
+        function savedata() {
+            var savedataMessage = {
+                "0": "不明錯誤",
+                "1": "",
+                "2": "未選擇營業員",
+                "3": "合約編號未填寫",
+                "4": "作番號未填寫",
+                "5": "未選擇工務人員",
+                "6": "未輸入汰改種類",
+                "7": "合約日未填寫"
+            }
+            if (getSavedataStatus() == '1') {
+                $('#form').submit();
+            } else {
+                typeof savedataMessage[getSavedataStatus()] == 'string' ? alert(savedataMessage[getSavedataStatus()]) : alert("不明錯誤");
+            }
+
+        }
+
+        function getSavedataStatus() {
+            if ($("#salesid").val() == '')
+                return '2'
+            if ($("#contractno").val() == '')
+                return '3'
+            if ($("#facilityno").val() == '')
+                return '4'
+            if ($("#warehouseid").val() == '')
+                return '5'
+            if ($("#renovate_type").val() == '')
+                return '6'
+            if ($("#contract_arrival_date").val() == '')
+                return '7'
+            if ($("#real_contract_arrival_date").val() == '')
+                return '7'
+            return '1'
+        }
+    </script>
+
+<?php
+} else {
+    echo "錯誤的訪問";
+}
+
 ?>
\ No newline at end of file
diff --git a/wms/wipwholeinstall-index-export-excel.php b/wms/wipwholeinstall-index-export-excel.php
index 1b030313..f47ffa72 100644
--- a/wms/wipwholeinstall-index-export-excel.php
+++ b/wms/wipwholeinstall-index-export-excel.php
@@ -1,219 +1,219 @@
-<?php
-// ini_set('display_errors', 'on');
-
-include "database.php";
-include "fun_global.php";
-$token = $_REQUEST["token"];
-$token_link = "token=" . $_REQUEST["token"];
-list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
-$user_name = urldecode(base64_decode($enc_user_name));
-include "wipwholeinstall-index-function.php";
-
-// require dirname(__DIR__) . '/wms/excel/vendor/autoload.php';
-require dirname(__DIR__) . '/common/composer/vendor/autoload.php';
-
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-use PhpOffice\PhpSpreadsheet\Style\Fill;
-
-//數字轉英文(0=>A、1=>B、26=>AA...以此類推)
-function num2alpha($n)
-{
-    for ($r = ""; $n >= 0; $n = intval($n / 26) - 1)
-        $r = chr($n % 26 + 0x41) . $r;
-    return $r;
-}
-
-//英文轉數字(A=>0、B=>1、AA=>26...以此類推)
-function alpha2num($a)
-{
-    $l = strlen($a);
-    $n = 0;
-    for ($i = 0; $i < $l; $i++)
-        $n = $n * 26 + ord($a[$i]) - 0x40;
-    return $n - 1;
-}
-
-function getArea($address)
-{
-    $address = mb_substr($address, 0, 2);
-    if (in_array($address, ['宜蘭', '花蓮', '台東']))
-        return '宜花東';
-    if (in_array($address, ['臺北', '台北', '基隆', '新北']))
-        return '北區';
-    if (in_array($address, ['桃園', '新竹']))
-        return '桃竹';
-    if (in_array($address, ['南投', '臺中', '台中', '彰化', '雲林', '苗栗']))
-        return '中區';
-    if (in_array($address, ['台南', '臺南', '嘉義', '屏東', '高雄']))
-        return '南區';
-}
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-
-    $contractno = empty($_POST['contractno']) ? null : $_POST['contractno'];
-    $facilityno = empty($_POST['facilityno']) ? null : $_POST['facilityno'];
-    $custom = empty($_POST['custom']) ? null : $_POST['custom'];
-    $site_survey_contact_verify = !isset($_POST['site_survey_contact_verify']) ? '' : $_POST['site_survey_contact_verify'];
-    $real_contract_arrival_date_start = empty($_POST['real_contract_arrival_date_start']) ? null : $_POST['real_contract_arrival_date_start'];
-    $real_contract_arrival_date_end = empty($_POST['real_contract_arrival_date_end']) ? null : $_POST['real_contract_arrival_date_end'];
-    $area_no = !isset($_POST['area_no']) ? '' : $_POST['area_no'];
-
-    // 取得當前使用者所屬部門
-    $department_id = getDepartmentId($link, $user_id);
-    // 取得當前使用者所屬職位
-    $role_id = getRoleId($link, $user_id);
-
-    $sql = getDataSql($department_id, $user_id, "A");
-
-    $result = mysqli_query($link, $sql);
-    if ($result) {
-        $data = array();
-        while ($row = $result->fetch_assoc()) {
-            $data[] = $row;
-        }
-        $result->close();
-    } else {
-        echo "Query failed: " . $connection->error;
-    }
-
-    // 建立一個新的 Spreadsheet 物件
-    $spreadsheet = new Spreadsheet();
-    $sheet = $spreadsheet->getActiveSheet();
-
-    $colTitleArr = [
-        '區域',
-        '合約號',
-        '作番號',
-        '客戶名稱',
-        '合約地址',
-        '工地地址',
-        '規格',
-        '依合約客戶需求日',
-        '實際到廠日(觀音廠)',
-        '預計出貨日(到工地)',
-        '實際出貨日(到工地)',
-        '工勘確認',
-        '工勘確認日',
-        '安裝廠商',
-        '實際發包日',
-        '預計開工日',
-        '實際開工日',
-        '預計完工日',
-        '實際完工日',
-        '試車廠商',
-        '實際發包日',
-        '預計開工日',
-        '實際開工日',
-        '預計完工日',
-        '實際完工日',
-        '內部QC日',
-        'QC合格日',
-        '官檢日',
-        '移交日',
-        '營業人員'
-    ];
-    $sheet->setTitle('新梯出貨預定表');
-    for ($i = 0; $i < count($colTitleArr); $i++)
-        $sheet->setCellValue(num2alpha($i) . '1', $colTitleArr[$i]);
-
-
-    $i = 2;
-    foreach ($data as $row) {
-
-        $two_row_status = false;
-        if (!empty($row['install_outsourcer']) && !empty($row['tryrun_outsourcer']))
-            $two_row_status = true;
-        if (!empty($row['install_outsourcer_date']) && !empty($row['tryrun_outsourcer_date']))
-            $two_row_status = true;
-        if (!empty($row['install_start_date']) && !empty($row['tryrun_start_date']))
-            $two_row_status = true;
-        if (!empty($row['estimate_install_end_date']) && !empty($row['estimate_tryrun_end_date']))
-            $two_row_status = true;
-
-        //規格
-        $Specification = $row['facility_kind'];
-        $Specification .= !empty($row['numberofpassenger']) ? "-" . $row['numberofpassenger'] : "";
-        $Specification .= !empty($row['weight']) ? "-" . $row['weight'] : "";
-        $Specification .= !empty($row['numberofstop']) ? "-" . $row['numberofstop'] : "";
-        $Specification .= !empty($row['numberoffloor']) ? "/" . $row['numberoffloor'] : "";
-        $Specification .= !empty($row['opentype']) ? "-" . $row['opentype'] : "";
-        $Specification .= !empty($row['speed']) ? $row['speed'] : "";
-
-        // 工務統計已確認
-        $gongwuok = 0;
-        if ($row['building_heigh_verify'] == 0)
-            $gongwuok += 1;
-        // if ($row['site_survey_contact_verify'] == 0)
-        if (!in_array($row['site_survey_contact_verify'], ['1', 'A']))
-            $gongwuok += 1;
-
-        $colContentArr = [
-            getArea($row['address']),
-            $row['contractno'],
-            $row['facilityno'],
-            $row['custom'],
-            $row['address'],
-            $row['real_address'],
-            $Specification,
-            substr($row['contract_arrival_date'], 0, 10),
-            substr($row['actual_tofactory_date'], 0, 10),
-            substr($row['real_contract_arrival_date'], 0, 10),
-            substr($row['real_arrival_date'], 0, 10),
-            getGunwuName($row['address']) . $gongwuok . "/2",
-            substr($row['site_survey_contact_verify_at'], 0, 10),
-            $row['install_outsourcer'],
-            substr($row['install_outsourcer_date'], 0, 10),
-            substr($row['estimate_install_start_date'], 0, 10),
-            substr($row['install_start_date'], 0, 10),
-            substr($row['estimate_install_end_date'], 0, 10),
-            substr($row['install_end_date'], 0, 10),
-            $row['tryrun_outsourcer'],
-            substr($row['tryrun_outsourcer_date'], 0, 10),
-            substr($row['estimate_tryrun_start_date'], 0, 10),
-            substr($row['tryrun_start_date'], 0, 10),
-            substr($row['estimate_tryrun_end_date'], 0, 10),
-            substr($row['tryrun_end_date'], 0, 10),
-            substr($row['qc_date'], 0, 10),
-            substr($row['end_qc_date'], 0, 10),
-            substr($row['official_check_date'], 0, 10),
-            substr($row['delivery_date'], 0, 10),
-            accountidToName($row['salesid'])
-        ];
-        // $colContentArr2 = [
-        //     !empty($row['tryrun_outsourcer']) ? "試車:" . $row['tryrun_outsourcer'] : "",
-        //     substr($row['estimate_tryrun_outsourcer_date'], 0, 10),
-        //     substr($row['tryrun_outsourcer_date'], 0, 10),
-        //     substr($row['estimate_tryrun_start_date'], 0, 10),
-        //     substr($row['tryrun_start_date'], 0, 10),
-        //     substr($row['estimate_tryrun_end_date'], 0, 10),
-        //     substr($row['tryrun_end_date'], 0, 10)
-        // ];
-        for ($j = 0; $j < count($colContentArr); $j++) {
-            $sheet->setCellValue(num2alpha($j) . $i, $colContentArr[$j]);
-            // if ($two_row_status) {
-            //     if ($j < 11 || $j > 17)
-            //         $sheet->mergeCells(num2alpha($j) . $i . ':' . num2alpha($j) . ($i + 1));
-            // }
-        }
-        // if ($two_row_status) {
-        //     for ($j = 0; $j < count($colContentArr2); $j++)
-        //         $sheet->setCellValue(num2alpha($j + 11) . ($i + 1), $colContentArr2[$j]);
-        // }
-        $i++;
-        // if ($two_row_status) {
-        //     $i++;
-        // }
-    }
-
-
-    $writer = new Xlsx($spreadsheet);
-    $file_path = dirname(__DIR__) . '/wms/excel/' . 'wipwholeintall.xlsx';
-    try {
-        $writer->save($file_path);
-        // 回傳檔案路徑給 JavaScript
-        echo $file_path;
-    } catch (Exception $e) {
-        echo 'Error: ' . $e->getMessage();
-    }
-    exit();
-}
+<?php
+// ini_set('display_errors', 'on');
+
+include "database.php";
+include "fun_global.php";
+$token = $_REQUEST["token"];
+$token_link = "token=" . $_REQUEST["token"];
+list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
+$user_name = urldecode(base64_decode($enc_user_name));
+include "wipwholeinstall-index-function.php";
+
+// require dirname(__DIR__) . '/wms/excel/vendor/autoload.php';
+require dirname(__DIR__) . '/common/composer/vendor/autoload.php';
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+
+//數字轉英文(0=>A、1=>B、26=>AA...以此類推)
+function num2alpha($n)
+{
+    for ($r = ""; $n >= 0; $n = intval($n / 26) - 1)
+        $r = chr($n % 26 + 0x41) . $r;
+    return $r;
+}
+
+//英文轉數字(A=>0、B=>1、AA=>26...以此類推)
+function alpha2num($a)
+{
+    $l = strlen($a);
+    $n = 0;
+    for ($i = 0; $i < $l; $i++)
+        $n = $n * 26 + ord($a[$i]) - 0x40;
+    return $n - 1;
+}
+
+function getArea($address)
+{
+    $address = mb_substr($address, 0, 2);
+    if (in_array($address, ['宜蘭', '花蓮', '台東']))
+        return '宜花東';
+    if (in_array($address, ['臺北', '台北', '基隆', '新北']))
+        return '北區';
+    if (in_array($address, ['桃園', '新竹']))
+        return '桃竹';
+    if (in_array($address, ['南投', '臺中', '台中', '彰化', '雲林', '苗栗']))
+        return '中區';
+    if (in_array($address, ['台南', '臺南', '嘉義', '屏東', '高雄']))
+        return '南區';
+}
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+
+    $contractno = empty($_POST['contractno']) ? null : $_POST['contractno'];
+    $facilityno = empty($_POST['facilityno']) ? null : $_POST['facilityno'];
+    $custom = empty($_POST['custom']) ? null : $_POST['custom'];
+    $site_survey_contact_verify = !isset($_POST['site_survey_contact_verify']) ? '' : $_POST['site_survey_contact_verify'];
+    $real_contract_arrival_date_start = empty($_POST['real_contract_arrival_date_start']) ? null : $_POST['real_contract_arrival_date_start'];
+    $real_contract_arrival_date_end = empty($_POST['real_contract_arrival_date_end']) ? null : $_POST['real_contract_arrival_date_end'];
+    $area_no = !isset($_POST['area_no']) ? '' : $_POST['area_no'];
+
+    // 取得當前使用者所屬部門
+    $department_id = getDepartmentId($link, $user_id);
+    // 取得當前使用者所屬職位
+    $role_id = getRoleId($link, $user_id);
+
+    $sql = getDataSql($department_id, $user_id, "A");
+
+    $result = mysqli_query($link, $sql);
+    if ($result) {
+        $data = array();
+        while ($row = $result->fetch_assoc()) {
+            $data[] = $row;
+        }
+        $result->close();
+    } else {
+        echo "Query failed: " . $connection->error;
+    }
+
+    // 建立一個新的 Spreadsheet 物件
+    $spreadsheet = new Spreadsheet();
+    $sheet = $spreadsheet->getActiveSheet();
+
+    $colTitleArr = [
+        '區域',
+        '合約號',
+        '作番號',
+        '客戶名稱',
+        '合約地址',
+        '工地地址',
+        '規格',
+        '依合約客戶需求日',
+        '實際到廠日(觀音廠)',
+        '預計出貨日(到工地)',
+        '實際出貨日(到工地)',
+        '工勘確認',
+        '工勘確認日',
+        '安裝廠商',
+        '實際發包日',
+        '預計開工日',
+        '實際開工日',
+        '預計完工日',
+        '實際完工日',
+        '試車廠商',
+        '實際發包日',
+        '預計開工日',
+        '實際開工日',
+        '預計完工日',
+        '實際完工日',
+        '內部QC日',
+        'QC合格日',
+        '官檢日',
+        '移交日',
+        '營業人員'
+    ];
+    $sheet->setTitle('新梯出貨預定表');
+    for ($i = 0; $i < count($colTitleArr); $i++)
+        $sheet->setCellValue(num2alpha($i) . '1', $colTitleArr[$i]);
+
+
+    $i = 2;
+    foreach ($data as $row) {
+
+        $two_row_status = false;
+        if (!empty($row['install_outsourcer']) && !empty($row['tryrun_outsourcer']))
+            $two_row_status = true;
+        if (!empty($row['install_outsourcer_date']) && !empty($row['tryrun_outsourcer_date']))
+            $two_row_status = true;
+        if (!empty($row['install_start_date']) && !empty($row['tryrun_start_date']))
+            $two_row_status = true;
+        if (!empty($row['estimate_install_end_date']) && !empty($row['estimate_tryrun_end_date']))
+            $two_row_status = true;
+
+        //規格
+        $Specification = $row['facility_kind'];
+        $Specification .= !empty($row['numberofpassenger']) ? "-" . $row['numberofpassenger'] : "";
+        $Specification .= !empty($row['weight']) ? "-" . $row['weight'] : "";
+        $Specification .= !empty($row['numberofstop']) ? "-" . $row['numberofstop'] : "";
+        $Specification .= !empty($row['numberoffloor']) ? "/" . $row['numberoffloor'] : "";
+        $Specification .= !empty($row['opentype']) ? "-" . $row['opentype'] : "";
+        $Specification .= !empty($row['speed']) ? $row['speed'] : "";
+
+        // 工務統計已確認
+        $gongwuok = 0;
+        if ($row['building_heigh_verify'] == 0)
+            $gongwuok += 1;
+        // if ($row['site_survey_contact_verify'] == 0)
+        if (!in_array($row['site_survey_contact_verify'], ['1', 'A']))
+            $gongwuok += 1;
+
+        $colContentArr = [
+            getArea($row['address']),
+            $row['contractno'],
+            $row['facilityno'],
+            $row['custom'],
+            $row['address'],
+            $row['real_address'],
+            $Specification,
+            substr($row['contract_arrival_date'], 0, 10),
+            substr($row['actual_tofactory_date'], 0, 10),
+            substr($row['real_contract_arrival_date'], 0, 10),
+            substr($row['real_arrival_date'], 0, 10),
+            getGunwuName($row['address']) . $gongwuok . "/2",
+            substr($row['site_survey_contact_verify_at'], 0, 10),
+            $row['install_outsourcer'],
+            substr($row['install_outsourcer_date'], 0, 10),
+            substr($row['estimate_install_start_date'], 0, 10),
+            substr($row['install_start_date'], 0, 10),
+            substr($row['estimate_install_end_date'], 0, 10),
+            substr($row['install_end_date'], 0, 10),
+            $row['tryrun_outsourcer'],
+            substr($row['tryrun_outsourcer_date'], 0, 10),
+            substr($row['estimate_tryrun_start_date'], 0, 10),
+            substr($row['tryrun_start_date'], 0, 10),
+            substr($row['estimate_tryrun_end_date'], 0, 10),
+            substr($row['tryrun_end_date'], 0, 10),
+            substr($row['qc_date'], 0, 10),
+            substr($row['end_qc_date'], 0, 10),
+            substr($row['official_check_date'], 0, 10),
+            substr($row['delivery_date'], 0, 10),
+            accountidToName($row['salesid'])
+        ];
+        // $colContentArr2 = [
+        //     !empty($row['tryrun_outsourcer']) ? "試車:" . $row['tryrun_outsourcer'] : "",
+        //     substr($row['estimate_tryrun_outsourcer_date'], 0, 10),
+        //     substr($row['tryrun_outsourcer_date'], 0, 10),
+        //     substr($row['estimate_tryrun_start_date'], 0, 10),
+        //     substr($row['tryrun_start_date'], 0, 10),
+        //     substr($row['estimate_tryrun_end_date'], 0, 10),
+        //     substr($row['tryrun_end_date'], 0, 10)
+        // ];
+        for ($j = 0; $j < count($colContentArr); $j++) {
+            $sheet->setCellValue(num2alpha($j) . $i, $colContentArr[$j]);
+            // if ($two_row_status) {
+            //     if ($j < 11 || $j > 17)
+            //         $sheet->mergeCells(num2alpha($j) . $i . ':' . num2alpha($j) . ($i + 1));
+            // }
+        }
+        // if ($two_row_status) {
+        //     for ($j = 0; $j < count($colContentArr2); $j++)
+        //         $sheet->setCellValue(num2alpha($j + 11) . ($i + 1), $colContentArr2[$j]);
+        // }
+        $i++;
+        // if ($two_row_status) {
+        //     $i++;
+        // }
+    }
+
+
+    $writer = new Xlsx($spreadsheet);
+    $file_path = dirname(__DIR__) . '/wms/excel/' . 'wipwholeintall.xlsx';
+    try {
+        $writer->save($file_path);
+        // 回傳檔案路徑給 JavaScript
+        echo $file_path;
+    } catch (Exception $e) {
+        echo 'Error: ' . $e->getMessage();
+    }
+    exit();
+}
diff --git a/wms/wipwholeinstall-index-first-insert.php b/wms/wipwholeinstall-index-first-insert.php
index 71f1bcec..4a699812 100644
--- a/wms/wipwholeinstall-index-first-insert.php
+++ b/wms/wipwholeinstall-index-first-insert.php
@@ -1,194 +1,194 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title>上传CSV文件</title>
-</head>
-
-<body>
-    <h2>上传CSV文件</h2>
-    <form action="" method="post" enctype="multipart/form-data">
-        <input type="file" name="csv_file" accept=".csv"><br />
-        <input type="submit" value="上传">
-    </form>
-</body>
-
-</html>
-
-<?php
-include "fun_global.php";
-include "database.php";
-
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-
-    if (isset($_FILES['csv_file']) && $_FILES['csv_file']['error'] === UPLOAD_ERR_OK) {
-
-        $file = $_FILES['csv_file']['tmp_name'];
-        $data = [];
-        if (($handle = fopen($file, 'r')) !== false) {
-            while (($row = fgetcsv($handle, 1000, ',')) !== false) {
-                $data[] = $row;
-            }
-            fclose($handle);
-        }
-        for ($i = 0; $i < count($data); $i++) {
-            for ($j = 0; $j < count($data[$i]); $j++) {
-                $data[$i][$j] = empty($data[$i][$j]) ? "" : mb_convert_kana($data[$i][$j], "a");
-            }
-        }
-        array_shift($data);
-
-        $fix_arrs = [];
-        for ($i = 0; $i < count($data); $i++) {
-            $fix_arr = [];
-            for ($j = 0; $j < count($data[$i]); $j++) {
-                array_push($fix_arr, $data[$i][$j]);
-            }
-            array_push($fix_arrs, $fix_arr);
-        }
-
-        for ($i = 0; $i < count($fix_arrs); $i++) {
-            for ($j = 0; $j < count($fix_arrs[$i]); $j++) {
-                echo $j . ":" . $fix_arrs[$i][$j] . " ,";
-            }
-            echo "<br/>";
-        }
-
-        foreach ($fix_arrs as $row) {
-
-            $facilityno = $row[0]; // 作番號	
-            $type = $row[1]; // 發包類型
-
-            $outsourcer = $row[2];  // 發包廠商
-            $outsourcer_date = $row[3]; // 發包日	
-            $estimate_install_start_date = $row[4];  // 預計安裝開工日
-            $estimate_install_end_date = $row[5]; // 預計安裝完工日
-            $estimate_tryrun_start_date = $row[6]; // 預計試車開工日
-            $estimate_tryrun_end_date = $row[7]; // 預計試車完工日
-            $install_start_date = $row[8]; // 實際安裝開工日
-            $install_end_date = $row[9]; // 實際安裝完工日
-            $tryrun_start_date = $row[10]; // 實際試車日	
-            $tryrun_end_date = $row[11]; // 實際試車完工日
-            $qc_date = $row[12]; // 內部QC日	
-            $end_qc_date = $row[13]; // QC合格日	
-            $office_date = $row[14]; // 官檢日
-            $delivery_date = $row[15]; // 移交日
-
-
-            // 清空資料
-            // $facilityno = $row[0]; // 作番號	
-            // $type = "A";
-            // $outsourcer  = "";
-            // $outsourcer_date  = "";
-            // $estimate_install_start_date  = "";
-            // $estimate_install_end_date  = "";
-            // $estimate_tryrun_start_date = "";
-            // $estimate_tryrun_end_date  = "";
-            // $install_start_date  = "";
-            // $install_end_date = "";
-            // $tryrun_start_date = "";
-            // $tryrun_end_date  = "";
-            // $qc_date  = "";
-            // $end_qc_date  = "";
-            // $office_date = "";
-            // $delivery_date = "";
-
-            $sql = "
-                    UPDATE wipwholestatus SET
-                ";
-            $sql2 = "";
-
-            if ($type == 'I') {
-                $sql2 .= !empty($outsourcer) ? "install_outsourcer = '$outsourcer' ," : "";
-                $sql2 .= !empty($outsourcer) ? "install_outsourcer_owner = 'M0164' ," : "";
-                $sql2 .= !empty($outsourcer_date) ? "install_outsourcer_date = '$outsourcer_date' ," : "";
-                $sql2 .= !empty($outsourcer_date) ? "install_outsourcer_date_owner = 'M0164' ," : "";
-            } else if ($type == 'T') {
-                $sql2 .= !empty($outsourcer) ? "tryrun_outsourcer = '$outsourcer' ," : "";
-                $sql2 .= !empty($outsourcer) ? "tryrun_outsourcer_owner = 'M0164' ," : "";
-                $sql2 .= !empty($outsourcer_date) ? "tryrun_outsourcer_date = '$outsourcer_date' ," : "";
-                $sql2 .= !empty($outsourcer_date) ? "tryrun_outsourcer_date_owner = 'M0164' ," : "";
-            } else {
-                $sql2 .= !empty($outsourcer) ? "install_outsourcer = '$outsourcer' ," : "";
-                $sql2 .= !empty($outsourcer) ? "install_outsourcer_owner = 'M0164' ," : "";
-                $sql2 .= !empty($outsourcer_date) ? "install_outsourcer_date = '$outsourcer_date' ," : "";
-                $sql2 .= !empty($outsourcer_date) ? "install_outsourcer_date_owner = 'M0164' ," : "";
-                $sql2 .= !empty($outsourcer) ? "tryrun_outsourcer = '$outsourcer' ," : "";
-                $sql2 .= !empty($outsourcer) ? "tryrun_outsourcer_owner = 'M0164' ," : "";
-                $sql2 .= !empty($outsourcer_date) ? "tryrun_outsourcer_date = '$outsourcer_date' ," : "";
-                $sql2 .= !empty($outsourcer_date) ? "tryrun_outsourcer_date_owner = 'M0164' ," : "";
-            }
-
-            $sql2 .= !empty($estimate_install_start_date) ? "estimate_install_start_date = '$estimate_install_start_date' ," : "";
-            $sql2 .= !empty($estimate_install_start_date) ? "estimate_install_start_date_owner = 'M0164' ," : "";
-            $sql2 .= !empty($estimate_install_end_date) ? "estimate_install_end_date = '$estimate_install_end_date' ," : "";
-            $sql2 .= !empty($estimate_install_end_date) ? "estimate_install_end_date_owner = 'M0164' ," : "";
-            $sql2 .= !empty($estimate_tryrun_start_date) ? "estimate_tryrun_start_date = '$estimate_tryrun_start_date' ," : "";
-            $sql2 .= !empty($estimate_tryrun_start_date) ? "estimate_tryrun_start_date_owner = 'M0164' ," : "";
-            $sql2 .= !empty($estimate_tryrun_end_date) ? "estimate_tryrun_end_date = '$estimate_tryrun_end_date' ," : "";
-            $sql2 .= !empty($estimate_tryrun_end_date) ? "estimate_tryrun_end_date_owner = 'M0164' ," : "";
-            $sql2 .= !empty($install_start_date) ? "install_start_date = '$install_start_date' ," : "";
-            $sql2 .= !empty($install_start_date) ? "install_start_date_owner = 'M0164' ," : "";
-            $sql2 .= !empty($install_end_date) ? "install_end_date = '$install_end_date' ," : "";
-            $sql2 .= !empty($install_end_date) ? "install_end_date_owner = 'M0164' ," : "";
-            $sql2 .= !empty($tryrun_start_date) ? "tryrun_start_date = '$tryrun_start_date' ," : "";
-            $sql2 .= !empty($tryrun_start_date) ? "tryrun_start_date_owner = 'M0164' ," : "";
-            $sql2 .= !empty($tryrun_end_date) ? "tryrun_end_date = '$tryrun_end_date' ," : "";
-            $sql2 .= !empty($tryrun_end_date) ? "tryrun_end_date_owner = 'M0164' ," : "";
-            $sql2 .= !empty($qc_date) ? "qc_date = '$qc_date' ," : "";
-            $sql2 .= !empty($qc_date) ? "qc_date_owner = 'M0164' ," : "";
-            $sql2 .= !empty($end_qc_date) ? "end_qc_date = '$end_qc_date' ," : "";
-            $sql2 .= !empty($end_qc_date) ? "end_qc_date_owner = 'M0164' ," : "";
-            $sql2 .= !empty($office_date) ? "official_check_date = '$office_date' ," : "";
-            $sql2 .= !empty($office_date) ? "official_check_date_owner = 'M0164' ," : "";
-            $sql2 .= !empty($delivery_date) ? "delivery_date = '$real_end_date' ," : "";
-            $sql2 .= !empty($delivery_date) ? "delivery_date_owner = 'M0164' ," : "";
-            
-            // $sql2 .= "install_outsourcer = '$outsourcer' ,";
-            // $sql2 .= "install_outsourcer_owner = '' ,";
-            // $sql2 .= "install_outsourcer_date = '$outsourcer_date' ,";
-            // $sql2 .= "install_outsourcer_date_owner = '' ,";
-            // $sql2 .= "tryrun_outsourcer = '$outsourcer' ,";
-            // $sql2 .= "tryrun_outsourcer_owner = '' ,";
-            // $sql2 .= "tryrun_outsourcer_date = '$outsourcer_date' ,";
-            // $sql2 .= "tryrun_outsourcer_date_owner = '' ,";
-            // $sql2 .= "estimate_install_start_date = '$estimate_install_start_date' ,";
-            // $sql2 .= "estimate_install_start_date_owner = '' ,";
-            // $sql2 .= "estimate_install_end_date = '$estimate_install_end_date' ,";
-            // $sql2 .= "estimate_install_end_date_owner = '' ,";
-            // $sql2 .= "estimate_tryrun_start_date = '$estimate_tryrun_start_date' ,";
-            // $sql2 .= "estimate_tryrun_start_date_owner = '' ,";
-            // $sql2 .= "estimate_tryrun_end_date = '$estimate_tryrun_end_date' ,";
-            // $sql2 .= "estimate_tryrun_end_date_owner = '' ,";
-            // $sql2 .= "install_start_date = '$install_start_date' ,";
-            // $sql2 .= "install_start_date_owner = '' ,";
-            // $sql2 .= "install_end_date = '$install_end_date' ,";
-            // $sql2 .= "install_end_date_owner = '' ,";
-            // $sql2 .= "tryrun_start_date = '$tryrun_start_date' ,";
-            // $sql2 .= "tryrun_start_date_owner = '' ,";
-            // $sql2 .= "tryrun_end_date = '$tryrun_end_date' ,";
-            // $sql2 .= "tryrun_end_date_owner = '' ,";
-            // $sql2 .= "qc_date = '$qc_date' ,";
-            // $sql2 .= "qc_date_owner = '' ,";
-            // $sql2 .= "end_qc_date = '$end_qc_date' ,";
-            // $sql2 .= "end_qc_date_owner = '' ,";
-            // $sql2 .= "official_check_date = '$office_date' ,";
-            // $sql2 .= "official_check_date_owner = '' ,";
-            // $sql2 .= "delivery_date = '$office_date' ,";
-            // $sql2 .= "delivery_date_owner = '' ,";
-
-
-
-
-            $sql .= substr($sql2, 0, -1);
-            $sql .= "
-                    WHERE facilityno = '$facilityno';
-                ";
-            echo $sql;
-            mysqli_query($link, $sql);
-        }
-    } else {
-        echo '文件上传错误';
-        echo "<br/>";
-    }
-}
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>上传CSV文件</title>
+</head>
+
+<body>
+    <h2>上传CSV文件</h2>
+    <form action="" method="post" enctype="multipart/form-data">
+        <input type="file" name="csv_file" accept=".csv"><br />
+        <input type="submit" value="上传">
+    </form>
+</body>
+
+</html>
+
+<?php
+include "fun_global.php";
+include "database.php";
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+
+    if (isset($_FILES['csv_file']) && $_FILES['csv_file']['error'] === UPLOAD_ERR_OK) {
+
+        $file = $_FILES['csv_file']['tmp_name'];
+        $data = [];
+        if (($handle = fopen($file, 'r')) !== false) {
+            while (($row = fgetcsv($handle, 1000, ',')) !== false) {
+                $data[] = $row;
+            }
+            fclose($handle);
+        }
+        for ($i = 0; $i < count($data); $i++) {
+            for ($j = 0; $j < count($data[$i]); $j++) {
+                $data[$i][$j] = empty($data[$i][$j]) ? "" : mb_convert_kana($data[$i][$j], "a");
+            }
+        }
+        array_shift($data);
+
+        $fix_arrs = [];
+        for ($i = 0; $i < count($data); $i++) {
+            $fix_arr = [];
+            for ($j = 0; $j < count($data[$i]); $j++) {
+                array_push($fix_arr, $data[$i][$j]);
+            }
+            array_push($fix_arrs, $fix_arr);
+        }
+
+        for ($i = 0; $i < count($fix_arrs); $i++) {
+            for ($j = 0; $j < count($fix_arrs[$i]); $j++) {
+                echo $j . ":" . $fix_arrs[$i][$j] . " ,";
+            }
+            echo "<br/>";
+        }
+
+        foreach ($fix_arrs as $row) {
+
+            $facilityno = $row[0]; // 作番號	
+            $type = $row[1]; // 發包類型
+
+            $outsourcer = $row[2];  // 發包廠商
+            $outsourcer_date = $row[3]; // 發包日	
+            $estimate_install_start_date = $row[4];  // 預計安裝開工日
+            $estimate_install_end_date = $row[5]; // 預計安裝完工日
+            $estimate_tryrun_start_date = $row[6]; // 預計試車開工日
+            $estimate_tryrun_end_date = $row[7]; // 預計試車完工日
+            $install_start_date = $row[8]; // 實際安裝開工日
+            $install_end_date = $row[9]; // 實際安裝完工日
+            $tryrun_start_date = $row[10]; // 實際試車日	
+            $tryrun_end_date = $row[11]; // 實際試車完工日
+            $qc_date = $row[12]; // 內部QC日	
+            $end_qc_date = $row[13]; // QC合格日	
+            $office_date = $row[14]; // 官檢日
+            $delivery_date = $row[15]; // 移交日
+
+
+            // 清空資料
+            // $facilityno = $row[0]; // 作番號	
+            // $type = "A";
+            // $outsourcer  = "";
+            // $outsourcer_date  = "";
+            // $estimate_install_start_date  = "";
+            // $estimate_install_end_date  = "";
+            // $estimate_tryrun_start_date = "";
+            // $estimate_tryrun_end_date  = "";
+            // $install_start_date  = "";
+            // $install_end_date = "";
+            // $tryrun_start_date = "";
+            // $tryrun_end_date  = "";
+            // $qc_date  = "";
+            // $end_qc_date  = "";
+            // $office_date = "";
+            // $delivery_date = "";
+
+            $sql = "
+                    UPDATE wipwholestatus SET
+                ";
+            $sql2 = "";
+
+            if ($type == 'I') {
+                $sql2 .= !empty($outsourcer) ? "install_outsourcer = '$outsourcer' ," : "";
+                $sql2 .= !empty($outsourcer) ? "install_outsourcer_owner = 'M0164' ," : "";
+                $sql2 .= !empty($outsourcer_date) ? "install_outsourcer_date = '$outsourcer_date' ," : "";
+                $sql2 .= !empty($outsourcer_date) ? "install_outsourcer_date_owner = 'M0164' ," : "";
+            } else if ($type == 'T') {
+                $sql2 .= !empty($outsourcer) ? "tryrun_outsourcer = '$outsourcer' ," : "";
+                $sql2 .= !empty($outsourcer) ? "tryrun_outsourcer_owner = 'M0164' ," : "";
+                $sql2 .= !empty($outsourcer_date) ? "tryrun_outsourcer_date = '$outsourcer_date' ," : "";
+                $sql2 .= !empty($outsourcer_date) ? "tryrun_outsourcer_date_owner = 'M0164' ," : "";
+            } else {
+                $sql2 .= !empty($outsourcer) ? "install_outsourcer = '$outsourcer' ," : "";
+                $sql2 .= !empty($outsourcer) ? "install_outsourcer_owner = 'M0164' ," : "";
+                $sql2 .= !empty($outsourcer_date) ? "install_outsourcer_date = '$outsourcer_date' ," : "";
+                $sql2 .= !empty($outsourcer_date) ? "install_outsourcer_date_owner = 'M0164' ," : "";
+                $sql2 .= !empty($outsourcer) ? "tryrun_outsourcer = '$outsourcer' ," : "";
+                $sql2 .= !empty($outsourcer) ? "tryrun_outsourcer_owner = 'M0164' ," : "";
+                $sql2 .= !empty($outsourcer_date) ? "tryrun_outsourcer_date = '$outsourcer_date' ," : "";
+                $sql2 .= !empty($outsourcer_date) ? "tryrun_outsourcer_date_owner = 'M0164' ," : "";
+            }
+
+            $sql2 .= !empty($estimate_install_start_date) ? "estimate_install_start_date = '$estimate_install_start_date' ," : "";
+            $sql2 .= !empty($estimate_install_start_date) ? "estimate_install_start_date_owner = 'M0164' ," : "";
+            $sql2 .= !empty($estimate_install_end_date) ? "estimate_install_end_date = '$estimate_install_end_date' ," : "";
+            $sql2 .= !empty($estimate_install_end_date) ? "estimate_install_end_date_owner = 'M0164' ," : "";
+            $sql2 .= !empty($estimate_tryrun_start_date) ? "estimate_tryrun_start_date = '$estimate_tryrun_start_date' ," : "";
+            $sql2 .= !empty($estimate_tryrun_start_date) ? "estimate_tryrun_start_date_owner = 'M0164' ," : "";
+            $sql2 .= !empty($estimate_tryrun_end_date) ? "estimate_tryrun_end_date = '$estimate_tryrun_end_date' ," : "";
+            $sql2 .= !empty($estimate_tryrun_end_date) ? "estimate_tryrun_end_date_owner = 'M0164' ," : "";
+            $sql2 .= !empty($install_start_date) ? "install_start_date = '$install_start_date' ," : "";
+            $sql2 .= !empty($install_start_date) ? "install_start_date_owner = 'M0164' ," : "";
+            $sql2 .= !empty($install_end_date) ? "install_end_date = '$install_end_date' ," : "";
+            $sql2 .= !empty($install_end_date) ? "install_end_date_owner = 'M0164' ," : "";
+            $sql2 .= !empty($tryrun_start_date) ? "tryrun_start_date = '$tryrun_start_date' ," : "";
+            $sql2 .= !empty($tryrun_start_date) ? "tryrun_start_date_owner = 'M0164' ," : "";
+            $sql2 .= !empty($tryrun_end_date) ? "tryrun_end_date = '$tryrun_end_date' ," : "";
+            $sql2 .= !empty($tryrun_end_date) ? "tryrun_end_date_owner = 'M0164' ," : "";
+            $sql2 .= !empty($qc_date) ? "qc_date = '$qc_date' ," : "";
+            $sql2 .= !empty($qc_date) ? "qc_date_owner = 'M0164' ," : "";
+            $sql2 .= !empty($end_qc_date) ? "end_qc_date = '$end_qc_date' ," : "";
+            $sql2 .= !empty($end_qc_date) ? "end_qc_date_owner = 'M0164' ," : "";
+            $sql2 .= !empty($office_date) ? "official_check_date = '$office_date' ," : "";
+            $sql2 .= !empty($office_date) ? "official_check_date_owner = 'M0164' ," : "";
+            $sql2 .= !empty($delivery_date) ? "delivery_date = '$real_end_date' ," : "";
+            $sql2 .= !empty($delivery_date) ? "delivery_date_owner = 'M0164' ," : "";
+            
+            // $sql2 .= "install_outsourcer = '$outsourcer' ,";
+            // $sql2 .= "install_outsourcer_owner = '' ,";
+            // $sql2 .= "install_outsourcer_date = '$outsourcer_date' ,";
+            // $sql2 .= "install_outsourcer_date_owner = '' ,";
+            // $sql2 .= "tryrun_outsourcer = '$outsourcer' ,";
+            // $sql2 .= "tryrun_outsourcer_owner = '' ,";
+            // $sql2 .= "tryrun_outsourcer_date = '$outsourcer_date' ,";
+            // $sql2 .= "tryrun_outsourcer_date_owner = '' ,";
+            // $sql2 .= "estimate_install_start_date = '$estimate_install_start_date' ,";
+            // $sql2 .= "estimate_install_start_date_owner = '' ,";
+            // $sql2 .= "estimate_install_end_date = '$estimate_install_end_date' ,";
+            // $sql2 .= "estimate_install_end_date_owner = '' ,";
+            // $sql2 .= "estimate_tryrun_start_date = '$estimate_tryrun_start_date' ,";
+            // $sql2 .= "estimate_tryrun_start_date_owner = '' ,";
+            // $sql2 .= "estimate_tryrun_end_date = '$estimate_tryrun_end_date' ,";
+            // $sql2 .= "estimate_tryrun_end_date_owner = '' ,";
+            // $sql2 .= "install_start_date = '$install_start_date' ,";
+            // $sql2 .= "install_start_date_owner = '' ,";
+            // $sql2 .= "install_end_date = '$install_end_date' ,";
+            // $sql2 .= "install_end_date_owner = '' ,";
+            // $sql2 .= "tryrun_start_date = '$tryrun_start_date' ,";
+            // $sql2 .= "tryrun_start_date_owner = '' ,";
+            // $sql2 .= "tryrun_end_date = '$tryrun_end_date' ,";
+            // $sql2 .= "tryrun_end_date_owner = '' ,";
+            // $sql2 .= "qc_date = '$qc_date' ,";
+            // $sql2 .= "qc_date_owner = '' ,";
+            // $sql2 .= "end_qc_date = '$end_qc_date' ,";
+            // $sql2 .= "end_qc_date_owner = '' ,";
+            // $sql2 .= "official_check_date = '$office_date' ,";
+            // $sql2 .= "official_check_date_owner = '' ,";
+            // $sql2 .= "delivery_date = '$office_date' ,";
+            // $sql2 .= "delivery_date_owner = '' ,";
+
+
+
+
+            $sql .= substr($sql2, 0, -1);
+            $sql .= "
+                    WHERE facilityno = '$facilityno';
+                ";
+            echo $sql;
+            mysqli_query($link, $sql);
+        }
+    } else {
+        echo '文件上传错误';
+        echo "<br/>";
+    }
+}
diff --git a/wms/wipwholeinstall-index-function.php b/wms/wipwholeinstall-index-function.php
index fea088b3..953d1a39 100644
--- a/wms/wipwholeinstall-index-function.php
+++ b/wms/wipwholeinstall-index-function.php
@@ -1,1150 +1,1150 @@
-<?php
-
-function getWipwholestatusData($link, $id)
-{
-    $db_query = "
-        SELECT * FROM wipwholestatus 
-        WHERE id='$id'
-        AND status = '1'
-    ";
-    $receivabledata = mysqli_query($link, $db_query);
-    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
-}
-
-function getWipwholeSearchSql()
-{
-
-    $area = [
-        'Y' => " '宜蘭','花蓮','台東' ",
-        'N' => " '臺北', '台北', '基隆', '新北' ",
-        'T' => " '桃園', '新竹' ",
-        'C' => " '南投', '臺中', '台中', '彰化', '雲林', '苗栗' ",
-        'K' => " '台南', '臺南', '嘉義', '屏東', '高雄' "
-    ];
-
-    $contractno = empty($_REQUEST['contractno']) ? null : trim($_REQUEST['contractno']);
-    $facilityno = empty($_REQUEST['facilityno']) ? null : trim($_REQUEST['facilityno']);
-    $custom = empty($_REQUEST['custom']) ? null : trim($_REQUEST['custom']);
-    $site_survey_contact_verify = !isset($_REQUEST['site_survey_contact_verify']) ? null : trim($_REQUEST['site_survey_contact_verify']);
-    $real_arrival_date_start = empty($_REQUEST['real_arrival_date_start']) ? null : trim($_REQUEST['real_arrival_date_start']);
-    $real_arrival_date_end = empty($_REQUEST['real_arrival_date_end']) ? null : trim($_REQUEST['real_arrival_date_end']);
-    $area_no = empty($_REQUEST['area_no']) ? null : trim($_REQUEST['area_no']);
-
-    $sql = "";
-    $sql .= empty($area_no) ? "" : " AND SUBSTR(address,1,2) IN (" . $area[$area_no] . ") ";
-    $sql .= empty($contractno) ? "" : " AND contractno LIKE '%$contractno%' ";
-    $sql .= empty($facilityno) ? "" : " AND facilityno LIKE '%$facilityno%' ";
-    $sql .= empty($custom) ? "" : " AND custom LIKE '%$custom%' ";
-    $sql .= $site_survey_contact_verify == "" ? "" : " AND site_survey_contact_verify = '" . $site_survey_contact_verify . "' ";
-    $sql .= empty($real_arrival_date_start) ? "" : " AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') >= '$real_arrival_date_start' ";
-    $sql .= empty($real_arrival_date_end) ? "" : " AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') <= '$real_arrival_date_end' ";
-
-    return $sql;
-}
-
-function getDepartmentId($link, $user_id)
-{
-    $sql = "
-        SELECT 
-            department_id
-        FROM account 
-        WHERE accountid = '$user_id'
-    ";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_row($res);
-    mysqli_free_result($res);
-    return $row[0];
-}
-
-function getRoleId($link, $user_id)
-{
-    $sql = "
-        SELECT 
-            role_id 
-        FROM account 
-        WHERE accountid = '$user_id'
-    ";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_row($res);
-    mysqli_free_result($res);
-    return $row[0];
-}
-
-function getEditFlag($department_id, $role_id, $user_id)
-{
-    // 業務部門
-    if ($department_id == "321")
-        return 8;
-    // 鍾哥(生管) 部門代碼:250 職位大小:1 4
-    if ($department_id == "250" && (in_array($role_id, ["1", "4"])))
-        return  8;
-    // 許協理 部門代碼:320 職位大小:1
-    if ($department_id == "320" && $role_id == "1")
-        return  8;
-    // 詹總 部門代碼:50 職位大小:1
-    if ($department_id == "50" && $role_id == "1")
-        return 8;
-    // 許總 部門代碼:20 職位大小:1
-    if ($department_id == "20" && $role_id == "1")
-        return 8;
-    // 安裝開發支援部
-    if ($department_id == "542")
-        return 4;
-    // 設計
-    if ($department_id == "911")
-        return 2;
-    // 宜蘭工務
-    if ($user_id == 'M0087')
-        return  4;
-    // 北區工務組長 
-    if ($user_id == 'M0041' || $user_id == 'M0176')
-        return  4;
-    // 中區工務組長
-    if ($user_id == 'M0113' || $user_id == 'M0158')
-        return  4;
-    // 南區工務組長    
-    if ($user_id == 'M0039' || $user_id == 'M0078')
-        return  4;
-    // 工務處 工務助理
-    if ($department_id == '50' && $role_id == '2')
-        return  4;
-    // 服務支援部 工務助理
-    if ($department_id == '501' && $role_id == '2')
-        return  4;
-    // 北區營銷部	工務助理
-    if ($department_id == '311' && $role_id == '4')
-        return  4;
-    // 中區營銷部 工務助理
-    if ($department_id == '313' && $role_id == '3')
-        return  4;
-    // 南區營銷部	工務助理
-    if ($department_id == '314' && $role_id == '4')
-        return  4;
-    // 宜花東營銷部	工務助理
-    if ($department_id == '315' && $role_id == '2')
-        return  4;
-    // 安裝開發支援部 工務助理
-    if ($department_id == '521' && $role_id == '11')
-        return  4;
-    // 宜花東營銷部 工務助理
-    if ($department_id == '315' && $role_id == '2')
-        return  4;
-    // 工務部門
-    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545]))
-        return  4;
-    // 品証部門
-    if ($department_id == '912')
-        return  4;
-    // 財會部門
-    if ($department_id == '210')
-        return  4;
-    $sql_cmd = sql_myself($user_id, "salesid");
-    // 營業員主管或營業員
-    if (!empty($sql_cmd))
-        return 1;
-    return 15;
-}
-
-function getDataSql($department_id, $role_id, $user_id)
-{
-    // 合約類型
-    $contract_type = 'A';
-
-    $department_arr = [
-        '310', '311', '312', '313', '314', '315',
-        '320', '501', '50',
-        '511', '512', '513', '514', '515',
-        '521', '541', '542', '543', '544', '545'
-    ];
-
-
-    // 工務助理專員
-    // 工務處 工務助理
-    if ($department_id == '50' && $role_id == '2') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 服務支援部 工務助理
-    if ($department_id == '501' && $role_id == '2') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 北區營銷部	工務助理
-    if ($department_id == '311' && $role_id == '4') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 中區營銷部 工務助理
-    if ($department_id == '313' && $role_id == '3') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 南區營銷部	工務助理
-    if ($department_id == '314' && $role_id == '4') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 宜花東營銷部	工務助理
-    if ($department_id == '314' && $role_id == '4') {
-        $sql = "
-                SELECT * FROM  wipwholestatus 
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                AND SUBSTR(address,1,2) in ('台東','宜蘭','花蓮')
-                ORDER BY real_contract_arrival_date DESC
-            ";
-        return $sql;
-    }
-    // 安裝開發支援部 工務助理
-    if ($department_id == '521' && $role_id == '11') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 宜花東營銷部 工務助理
-    if ($department_id == '315' && $role_id == '2') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('宜蘭','花蓮','台東')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-
-
-
-    if (in_array($department_id, $department_arr)) {
-        // 北區營銷部 營銷專案經理 311 1
-        //           新梯營銷經理 311 3
-        // 桃竹營銷部 銷售專案經理 312 1
-        // 中區營銷部 新梯營銷經理 313 1
-        // 南區營銷部 銷售專案經理 314 2
-        // 花東營銷部 新梯營銷經理 315 1
-        if ($department_id == '311' && (in_array($role_id, ['1', '3']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '312' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '313' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '314' && (in_array($role_id, ['2']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '315' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        $sql_cmd = sql_myself($user_id, "salesid");
-        $sql = "
-            SELECT * FROM wipwholestatus $sql_cmd 
-        ";
-        $sql .= empty($sql_cmd) ? " WHERE 1=1 AND status = '1' AND contract_type = '$contract_type' " : " AND status = '1' AND contract_type = '$contract_type'";
-        $sql .= getWipwholeSearchSql();
-        $sql .= "ORDER BY real_contract_arrival_date DESC ";
-    }
-    // 鍾哥 部門代碼:250 職位大小:1 4
-    // 許協理 部門代碼:320 職位大小:1
-    // 張主任 部門代碼:322 職位大小:1
-    // 詹總 部門代碼:50 職位大小:1
-    // 許總 部門代碼:20 職位大小:1
-    // 業務部門 部門代碼:321
-    // 服務支援部門 部門代碼:501
-    // 財會部門 部門代碼:210
-    // 品証部門 部門代碼:912
-    $department_arr = ['911', '250', '320', '50', '20', '321', '322', '220', '501', '210', '912'];
-    if (in_array($department_id, $department_arr)) {
-        $sql = "
-            SELECT * FROM wipwholestatus
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date ASC
-        ";
-        return $sql;
-    }
-    // (宜蘭)工務組長
-    if ($user_id == 'M0087') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('宜蘭')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 北區工務組長
-    if ($user_id == 'M0041' || $user_id == 'M0176') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 中區工務組長
-    if ($user_id == 'M0113' || $user_id == 'M0158') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 南區工務組長
-    if ($user_id == 'M0039' || $user_id == 'M0078') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 工務
-    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545])) {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    return $sql;
-}
-
-function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code)
-{
-    $flow_code_tmp = explode(',', $flow_code);
-    $flow_code = implode("','", $flow_code_tmp);
-    // 合約類型
-    $contract_type = 'A';
-    // 項目經理或是工務助理專員
-    $department_arr = [
-        '310', '311', '312', '313', '314', '315',
-        '320', '501', '50',
-        '511', '512', '513', '514', '515',
-        '521', '541', '542', '543', '544', '545'
-    ];
-    if (in_array($department_id, $department_arr)) {
-        $sql_cmd = sql_myself($user_id, "salesid");
-        $sql = "
-            SELECT * FROM wipwholestatus $sql_cmd 
-        ";
-        $sql .= empty($sql_cmd) ? " WHERE 1=1 AND contract_type = '$contract_type' " : " AND contract_type = '$contract_type'";
-        $sql .= "
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')        
-            )
-        ";
-        $sql .= getWipwholeSearchSql();
-        $sql .= "ORDER BY real_contract_arrival_date DESC ";
-    }
-
-    // 鍾哥 部門代碼:250 職位大小:1 4
-    // 許協理 部門代碼:320 職位大小:1
-    // 張主任 部門代碼:322 職位大小:1
-    // 詹總 部門代碼:50 職位大小:1
-    // 許總 部門代碼:20 職位大小:1
-    // 業務部門 部門代碼:321
-    // 服務支援部 部門代碼:501
-    // 財會部門 部門代碼:210
-    // 品証部門 部門代碼:912
-    $department_arr = ['911', '250', '320', '50', '20', '321', '220', '322', '501', '210', '912'];
-    if (in_array($department_id, $department_arr)) {
-        $sql = "
-            SELECT * FROM wipwholestatus
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')           
-            )
-        " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date ASC
-        ";
-        return $sql;
-    }
-
-    // (宜蘭)工務組長
-    if ($user_id == 'M0087') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')             
-            )
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('宜蘭')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 北區工務組長
-    if ($user_id == 'M0041' || $user_id == 'M0176') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')             
-            )
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 中區工務組長
-    if ($user_id == 'M0113' || $user_id == 'M0158') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')           
-            )
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 南區工務組長
-    if ($user_id == 'M0039' || $user_id == 'M0078') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')            
-            )
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 工務
-    if ($department_id == '521' || $department_id == '531') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')           
-            )
-            AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-
-    return $sql;
-}
-
-// 取得本次簽核的表單id值
-function getId($link, $form_key)
-{
-    $sql = "
-        SELECT form_id AS id FROM flow
-        WHERE form_key = '$form_key'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row['id'];
-}
-
-// 取得本次簽核的表單form_key值 (營業與設計流程)
-function getYDForm_key($link, $form_id)
-{
-    $sql = "
-        SELECT 
-            f.form_key
-        FROM flow AS f
-        LEFT JOIN subflow AS s
-        ON f.form_key = s.form_key
-        WHERE 1=1
-        AND f.form_id = '$form_id' 
-        AND f.flow_code IN ('A','B','C','D')
-        AND f.system_id = 'wws'
-        AND f.flow_id = 'wws01'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return empty($row['form_key']) ? 0 : $row['form_key'];
-}
-
-// 取得本次簽核的表單form_key值 (工務流程))
-function getGForm_key($link, $form_id)
-{
-    $sql = "
-        SELECT 
-            f.form_key
-        FROM flow AS f
-        LEFT JOIN subflow AS s
-        ON f.form_key = s.form_key
-        WHERE 1=1
-        AND f.form_id = '$form_id' 
-        AND f.flow_code IN ('G','H')
-        AND f.system_id = 'wws'
-        AND f.flow_id = 'wws01'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return empty($row['form_key']) ? 0 : $row['form_key'];
-}
-
-// 修正時間欄位
-function fixTime($time)
-{
-    return empty($time) ? '0000T00:00:00' : date('Y-m-d', strtotime($time)) . "T" . date('H:i:s', strtotime($time));
-}
-
-// 修正時間欄位 若是空值則帶入現在時間戳記
-function fixTimeToNow($time)
-{
-    return empty($time) ? date("Y-m-d") . "T" . date("H:i:s") : date('Y-m-d', strtotime($time)) . "T" . date('H:i:s', strtotime($time));
-}
-
-// 檢查營業階段
-function checkYingYeok($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(sales_spec_verify != '2',sales_spec_verify,'0') AS SIGNED) +
-                CAST(IF(customer_planning_verify != '2',customer_planning_verify,'0') AS SIGNED) +
-                CAST(IF(customer_color_verify != '2',customer_color_verify,'0') AS SIGNED) +
-                CAST(IF(customer_style_verify != '2',customer_style_verify,'0') AS SIGNED) +
-                CAST(IF(site_survey_contact_form_verify != '2',site_survey_contact_form_verify,'0') AS SIGNED) 
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND status = '1'
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 檢查設計階段
-function checkSheJiok($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(desin_spec_verify != '2' ,desin_spec_verify,'0') AS SIGNED) +
-                CAST(IF(desin_planning_verify != '2' ,desin_planning_verify,'0') AS SIGNED) +
-                CAST(IF(desin_color_verify != '2' ,desin_color_verify,'0') AS SIGNED) +
-                CAST(IF(desin_style_verify != '2' ,desin_style_verify,'0') AS SIGNED) 
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND status = '1'
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 檢查設計主管階段
-function checkSheJiokLeader($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(desin_leader_verify != '2',desin_leader_verify,'0') AS SIGNED) 
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND status = '1'
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 檢查工務階段
-function checkGongWuok($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(building_heigh_verify != '2',building_heigh_verify,'0') AS SIGNED)
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND status = '1'
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 檢查生管階段
-function checkShengGuanok($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(shengguanok_status != '2',shengguanok_status,'0') AS SIGNED)+
-                CAST(IF(prattford_order_date_verify != '2' ,prattford_order_date_verify,'0') AS SIGNED) +
-                CAST(IF(estimated_shipping_date_verify != '2' ,estimated_shipping_date_verify,'0') AS SIGNED) +
-                CAST(IF(estimated_shipping_schedule_date_verify != '2' ,estimated_shipping_schedule_date_verify,'0') AS SIGNED) +
-                CAST(IF(goods_type = 'A' || goods_type = 'C' ,'0','1') AS SIGNED) +
-                CAST(IF(taiwan_goods_type = 'A' || taiwan_goods_type = 'C' ,'0','1') AS SIGNED) +
-                CAST(IF(arrival_date_verify = 'A' ,'0','1') AS SIGNED) 
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND status = '1'
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 取得設計部主管編號
-function getSheJiokLeaderNo($link)
-{
-    $sql = "
-        SELECT accountid 
-        FROM `account` 
-        WHERE `department_id` = '911'
-        AND `role_id` = '1';    
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 取得工務部主管編號
-function getGongWuokNo($link)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key']))
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-    $sql = "
-        SELECT DISTINCT 
-            SUBSTR(address,1,2)
-        FROM `wipwholestatus`
-        WHERE id = '$id'
-        AND status = '1'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    // 宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
-    $arr = array(
-        "宜蘭" => "M0087",
-        "北" => "M0041",
-        "台北" => "M0041",
-        "基隆" => "M0041",
-        "新北" => "M0041",
-        "新竹" => "M0041",
-        "桃園" => "M0041",
-        "苗栗" => "M0113",
-        "中" => "M0113",
-        "南投" => "M0113",
-        "台中" => "M0113",
-        "彰化" => "M0113",
-        "雲林" => "M0113",
-        "南" => "M0102",
-        "台南" => "M0102",
-        "嘉義" => "M0102",
-        "屏東" => "M0102",
-        "高雄" => "M0102"
-    );
-    return empty($arr[$row[0]]) ? "" : $arr[$row[0]];
-}
-
-// 取得生管部主管編號
-function getShengGuanokLeaderNo($link)
-{
-    $sql = "
-        SELECT accountid 
-        FROM `account` 
-        WHERE `department_id` = '321'
-        AND `role_id` = '1';    
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 確認目前狀態 (營業設計)
-function checkNowFormYDStatus($link)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key'])) {
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-    }
-    $sql = "
-        SELECT
-            flow_code
-        FROM flow
-        WHERE form_id = '$id'
-        AND flow_code IN ('A','B','C','D')
-        AND system_id = 'wws'
-        AND flow_id = 'wws01'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return empty($row['0']) ? 'Z' : $row['0'];
-}
-
-// 確認目前狀態 (工務)
-function checkNowFormGStatus($link)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key'])) {
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-    }
-    $sql = "
-        SELECT
-            flow_code
-        FROM flow
-        WHERE form_id = '$id'
-        AND flow_code IN ('G','H')
-        AND system_id = 'wws'
-        AND flow_id = 'wws01'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return empty($row['0']) ? 'Z' : $row['0'];
-}
-
-// 取得資訊的欄位權限
-function getInformationStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    return "disabled";
-}
-
-// 取得業務的欄位權限
-function getYewuStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 321)
-        return "";
-    return "disabled";
-}
-
-// 取得工務的欄位權限
-function getWarehouseStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 521 || $user_department_id == 531)
-        return checkNowFormGStatus($link) == 'G' ? "" : "disabled";
-    return "disabled";
-}
-
-// 取得營業或契約的欄位權限
-function getMarketingStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315)
-        return checkNowFormYDStatus($link) == 'A' ? "" : "disabled";
-    if ($user_department_id == 501 || $user_department_id == 511 || $user_department_id == 512 || $user_department_id == 513 || $user_department_id == 514)
-        return checkNowFormYDStatus($link) == 'A' ? "" : "disabled";
-
-    return "disabled";
-}
-
-// 取得設計的欄位權限
-function getDesinStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 911)
-        return checkNowFormYDStatus($link) == 'B' ? "" : "disabled";
-    return "disabled";
-}
-
-// 取得設計主管的欄位權限
-function getDesinLeaderStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 911)
-        return checkNowFormYDStatus($link) == 'C' && $role_id == 1 ? "" : "disabled";
-    return "disabled";
-}
-
-// 取得生管的欄位權限
-function getShengguanStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 250 && (in_array($role_id, [1, 4])))
-        return "";
-    return "disabled";
-}
-
-// 取得下方table分頁的預設分頁
-function getTabNo($user_department_id)
-{
-    if (in_array($user_department_id, [220, 311, 312, 313, 314, 315]))
-        return 0;
-    if ($user_department_id == 911)
-        return 1;
-    if ($user_department_id == 521 || $user_department_id == 531)
-        return 2;
-    if ($user_department_id == 321 || $user_department_id == 250)
-        return 3;
-    return 0;
-}
-
-// 由地址取得工務負責人
-function getGunwuName($address)
-{
-    $north_arr = array('台北', '基隆', '新北', '桃園', '新竹');
-    $north_arr2 = array('宜蘭');
-    $center_arr = array('南投', '彰化', '雲林', '台中', '苗栗');
-    $south_arr = array('台南', '嘉義', '屏東', '高雄');
-    foreach ($north_arr as $key => $value)
-        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
-            return "張潘榮";
-    foreach ($north_arr2 as $key => $value)
-        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
-            return "高培軒";
-    foreach ($center_arr as $key => $value)
-        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
-            return "林瑋隆";
-    foreach ($south_arr as $key => $value)
-        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
-            return "鄭存邑";
-    return "";
-}
-
-function getOpendoorOptions($link)
-{
-    $sql = "
-        SELECT 
-            code_name AS val ,
-            content AS label 
-        FROM code 
-        WHERE field_name='open_kind'
-        ORDER BY label ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getYingyeokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('311','312','313','314','315')
-        ORDER BY accountid ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getShejiokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('911')
-        AND `role_id` NOT IN ('1')
-        ORDER BY accountid ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getShejiokLeaderOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('911')
-        AND `role_id` IN ('1')
-        ORDER BY accountid ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getGongwuokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('521','531')
-        ORDER BY accountid ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getShengguanokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('321')
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function warningMessage($data)
-{
-    $waringMessageArr = array(
-        '1' => '',
-        '2' => '沒有預計出貨日(到工地)',
-        '3' => '有實際完工工日，實際開工日未填寫',
-        '4' => '有實際完工工日，未填寫QC日',
-        '5' => '有實際完工工日，移交日未填寫',
-        '6' => '官檢日未填寫',
-        '7' => '官檢日不在移交日的60天內',
-        '8' => '移交日不是實際完工日+14天',
-    );
-    if (getWarningMessageStatus($data) !== 1)
-        return $waringMessageArr[getWarningMessageStatus($data)];
-    return "";
-}
-
-function getWarningMessageStatus($data)
-{
-    $real_contract_arrival_date = $data['real_contract_arrival_date'];
-
-    $install_start_date = $data['install_start_date'];
-    $install_end_date = $data['install_end_date'];
-    $tryrun_start_date = $data['tryrun_start_date'];
-    $tryrun_end_date = $data['tryrun_end_date'];
-    $tryrun_end_date_owner = $data['tryrun_end_date_owner'];
-    $estimate_install_start_date = $data['estimate_install_start_date'];
-    $estimate_install_end_date = $data['estimate_install_end_date'];
-    $estimate_tryrun_start_date = $data['estimate_tryrun_start_date'];
-    $estimate_tryrun_end_date = $data['estimate_tryrun_end_date'];
-    $official_check_date = $data['official_check_date'];
-    $delivery_date = $data['delivery_date'];
-    $qc_date = $data['qc_date'];
-    $end_qc_date = $data['end_qc_date'];
-
-    // 有任何開工/完工日期，卻沒有預計出貨日(到工地)
-    if (empty($real_contract_arrival_date)) {
-        $tmp_arr = [
-            'install_start_date',
-            'install_end_date',
-            'tryrun_start_date',
-            'tryrun_end_date',
-            'tryrun_end_date_owner',
-            'estimate_install_start_date',
-            'estimate_install_end_date',
-            'estimate_tryrun_start_date',
-            'estimate_tryrun_end_date'
-        ];
-        foreach ($tmp_arr as $row) {
-            if (!empty($data[$row])) {
-                return "2";
-            }
-        }
-    }
-    // 有實際完工日，要有實際開工日
-    if (!empty($install_end_date)) {
-        if (empty($install_start_date))
-            return "3";
-    }
-    if (!empty($tryrun_end_date)) {
-        if (empty($tryrun_start_date))
-            return "3";
-    }
-    // 有實際完工工日，要有QC日
-    if (!empty($install_end_date) || !empty($tryrun_end_date)) {
-        if (empty($qc_date) && empty($end_qc_date))
-            return "4";
-    }
-    // 有實際完工工日，移交日未填寫
-    if (!empty($install_end_date) || !empty($tryrun_end_date)) {
-        if (empty($delivery_date)) {
-            return "5";
-        }
-    }
-    // 有移交日，官檢日未填寫
-    if (!empty($delivery_date)) {
-        if (empty($official_check_date))
-            return "6";
-    }
-
-    // 有移交日，官檢日若不是移交日+60日
-    // if (!empty($delivery_date) && !empty($official_check_date)) {
-    //     $date = floor((strtotime($official_check_date) - strtotime($delivery_date)) / 86400);
-    //     if ($date <= 0 || $date > 60)
-    //         return "7";
-    // }
-
-    // 有實際完工工日，移交日若不是實際完工日+14天
-    // if (!empty($install_end_date) || !empty($tryrun_end_date)) {
-    //     $date = floor((strtotime($install_end_date) - strtotime($delivery_date)) / 86400);
-    //     if ($date <= 0 || $date > 14)
-    //         return "5";
-    // }
-
-    return "1";
-}
+<?php
+
+function getWipwholestatusData($link, $id)
+{
+    $db_query = "
+        SELECT * FROM wipwholestatus 
+        WHERE id='$id'
+        AND status = '1'
+    ";
+    $receivabledata = mysqli_query($link, $db_query);
+    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
+}
+
+function getWipwholeSearchSql()
+{
+
+    $area = [
+        'Y' => " '宜蘭','花蓮','台東' ",
+        'N' => " '臺北', '台北', '基隆', '新北' ",
+        'T' => " '桃園', '新竹' ",
+        'C' => " '南投', '臺中', '台中', '彰化', '雲林', '苗栗' ",
+        'K' => " '台南', '臺南', '嘉義', '屏東', '高雄' "
+    ];
+
+    $contractno = empty($_REQUEST['contractno']) ? null : trim($_REQUEST['contractno']);
+    $facilityno = empty($_REQUEST['facilityno']) ? null : trim($_REQUEST['facilityno']);
+    $custom = empty($_REQUEST['custom']) ? null : trim($_REQUEST['custom']);
+    $site_survey_contact_verify = !isset($_REQUEST['site_survey_contact_verify']) ? null : trim($_REQUEST['site_survey_contact_verify']);
+    $real_arrival_date_start = empty($_REQUEST['real_arrival_date_start']) ? null : trim($_REQUEST['real_arrival_date_start']);
+    $real_arrival_date_end = empty($_REQUEST['real_arrival_date_end']) ? null : trim($_REQUEST['real_arrival_date_end']);
+    $area_no = empty($_REQUEST['area_no']) ? null : trim($_REQUEST['area_no']);
+
+    $sql = "";
+    $sql .= empty($area_no) ? "" : " AND SUBSTR(address,1,2) IN (" . $area[$area_no] . ") ";
+    $sql .= empty($contractno) ? "" : " AND contractno LIKE '%$contractno%' ";
+    $sql .= empty($facilityno) ? "" : " AND facilityno LIKE '%$facilityno%' ";
+    $sql .= empty($custom) ? "" : " AND custom LIKE '%$custom%' ";
+    $sql .= $site_survey_contact_verify == "" ? "" : " AND site_survey_contact_verify = '" . $site_survey_contact_verify . "' ";
+    $sql .= empty($real_arrival_date_start) ? "" : " AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') >= '$real_arrival_date_start' ";
+    $sql .= empty($real_arrival_date_end) ? "" : " AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') <= '$real_arrival_date_end' ";
+
+    return $sql;
+}
+
+function getDepartmentId($link, $user_id)
+{
+    $sql = "
+        SELECT 
+            department_id
+        FROM account 
+        WHERE accountid = '$user_id'
+    ";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_row($res);
+    mysqli_free_result($res);
+    return $row[0];
+}
+
+function getRoleId($link, $user_id)
+{
+    $sql = "
+        SELECT 
+            role_id 
+        FROM account 
+        WHERE accountid = '$user_id'
+    ";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_row($res);
+    mysqli_free_result($res);
+    return $row[0];
+}
+
+function getEditFlag($department_id, $role_id, $user_id)
+{
+    // 業務部門
+    if ($department_id == "321")
+        return 8;
+    // 鍾哥(生管) 部門代碼:250 職位大小:1 4
+    if ($department_id == "250" && (in_array($role_id, ["1", "4"])))
+        return  8;
+    // 許協理 部門代碼:320 職位大小:1
+    if ($department_id == "320" && $role_id == "1")
+        return  8;
+    // 詹總 部門代碼:50 職位大小:1
+    if ($department_id == "50" && $role_id == "1")
+        return 8;
+    // 許總 部門代碼:20 職位大小:1
+    if ($department_id == "20" && $role_id == "1")
+        return 8;
+    // 安裝開發支援部
+    if ($department_id == "542")
+        return 4;
+    // 設計
+    if ($department_id == "911")
+        return 2;
+    // 宜蘭工務
+    if ($user_id == 'M0087')
+        return  4;
+    // 北區工務組長 
+    if ($user_id == 'M0041' || $user_id == 'M0176')
+        return  4;
+    // 中區工務組長
+    if ($user_id == 'M0113' || $user_id == 'M0158')
+        return  4;
+    // 南區工務組長    
+    if ($user_id == 'M0039' || $user_id == 'M0078')
+        return  4;
+    // 工務處 工務助理
+    if ($department_id == '50' && $role_id == '2')
+        return  4;
+    // 服務支援部 工務助理
+    if ($department_id == '501' && $role_id == '2')
+        return  4;
+    // 北區營銷部	工務助理
+    if ($department_id == '311' && $role_id == '4')
+        return  4;
+    // 中區營銷部 工務助理
+    if ($department_id == '313' && $role_id == '3')
+        return  4;
+    // 南區營銷部	工務助理
+    if ($department_id == '314' && $role_id == '4')
+        return  4;
+    // 宜花東營銷部	工務助理
+    if ($department_id == '315' && $role_id == '2')
+        return  4;
+    // 安裝開發支援部 工務助理
+    if ($department_id == '521' && $role_id == '11')
+        return  4;
+    // 宜花東營銷部 工務助理
+    if ($department_id == '315' && $role_id == '2')
+        return  4;
+    // 工務部門
+    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545]))
+        return  4;
+    // 品証部門
+    if ($department_id == '912')
+        return  4;
+    // 財會部門
+    if ($department_id == '210')
+        return  4;
+    $sql_cmd = sql_myself($user_id, "salesid");
+    // 營業員主管或營業員
+    if (!empty($sql_cmd))
+        return 1;
+    return 15;
+}
+
+function getDataSql($department_id, $role_id, $user_id)
+{
+    // 合約類型
+    $contract_type = 'A';
+
+    $department_arr = [
+        '310', '311', '312', '313', '314', '315',
+        '320', '501', '50',
+        '511', '512', '513', '514', '515',
+        '521', '541', '542', '543', '544', '545'
+    ];
+
+
+    // 工務助理專員
+    // 工務處 工務助理
+    if ($department_id == '50' && $role_id == '2') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 服務支援部 工務助理
+    if ($department_id == '501' && $role_id == '2') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 北區營銷部	工務助理
+    if ($department_id == '311' && $role_id == '4') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 中區營銷部 工務助理
+    if ($department_id == '313' && $role_id == '3') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 南區營銷部	工務助理
+    if ($department_id == '314' && $role_id == '4') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 宜花東營銷部	工務助理
+    if ($department_id == '314' && $role_id == '4') {
+        $sql = "
+                SELECT * FROM  wipwholestatus 
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                AND SUBSTR(address,1,2) in ('台東','宜蘭','花蓮')
+                ORDER BY real_contract_arrival_date DESC
+            ";
+        return $sql;
+    }
+    // 安裝開發支援部 工務助理
+    if ($department_id == '521' && $role_id == '11') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 宜花東營銷部 工務助理
+    if ($department_id == '315' && $role_id == '2') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('宜蘭','花蓮','台東')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+
+
+
+    if (in_array($department_id, $department_arr)) {
+        // 北區營銷部 營銷專案經理 311 1
+        //           新梯營銷經理 311 3
+        // 桃竹營銷部 銷售專案經理 312 1
+        // 中區營銷部 新梯營銷經理 313 1
+        // 南區營銷部 銷售專案經理 314 2
+        // 花東營銷部 新梯營銷經理 315 1
+        if ($department_id == '311' && (in_array($role_id, ['1', '3']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '312' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '313' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '314' && (in_array($role_id, ['2']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '315' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        $sql_cmd = sql_myself($user_id, "salesid");
+        $sql = "
+            SELECT * FROM wipwholestatus $sql_cmd 
+        ";
+        $sql .= empty($sql_cmd) ? " WHERE 1=1 AND status = '1' AND contract_type = '$contract_type' " : " AND status = '1' AND contract_type = '$contract_type'";
+        $sql .= getWipwholeSearchSql();
+        $sql .= "ORDER BY real_contract_arrival_date DESC ";
+    }
+    // 鍾哥 部門代碼:250 職位大小:1 4
+    // 許協理 部門代碼:320 職位大小:1
+    // 張主任 部門代碼:322 職位大小:1
+    // 詹總 部門代碼:50 職位大小:1
+    // 許總 部門代碼:20 職位大小:1
+    // 業務部門 部門代碼:321
+    // 服務支援部門 部門代碼:501
+    // 財會部門 部門代碼:210
+    // 品証部門 部門代碼:912
+    $department_arr = ['911', '250', '320', '50', '20', '321', '322', '220', '501', '210', '912'];
+    if (in_array($department_id, $department_arr)) {
+        $sql = "
+            SELECT * FROM wipwholestatus
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date ASC
+        ";
+        return $sql;
+    }
+    // (宜蘭)工務組長
+    if ($user_id == 'M0087') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('宜蘭')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 北區工務組長
+    if ($user_id == 'M0041' || $user_id == 'M0176') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 中區工務組長
+    if ($user_id == 'M0113' || $user_id == 'M0158') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 南區工務組長
+    if ($user_id == 'M0039' || $user_id == 'M0078') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 工務
+    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545])) {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    return $sql;
+}
+
+function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code)
+{
+    $flow_code_tmp = explode(',', $flow_code);
+    $flow_code = implode("','", $flow_code_tmp);
+    // 合約類型
+    $contract_type = 'A';
+    // 項目經理或是工務助理專員
+    $department_arr = [
+        '310', '311', '312', '313', '314', '315',
+        '320', '501', '50',
+        '511', '512', '513', '514', '515',
+        '521', '541', '542', '543', '544', '545'
+    ];
+    if (in_array($department_id, $department_arr)) {
+        $sql_cmd = sql_myself($user_id, "salesid");
+        $sql = "
+            SELECT * FROM wipwholestatus $sql_cmd 
+        ";
+        $sql .= empty($sql_cmd) ? " WHERE 1=1 AND contract_type = '$contract_type' " : " AND contract_type = '$contract_type'";
+        $sql .= "
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')        
+            )
+        ";
+        $sql .= getWipwholeSearchSql();
+        $sql .= "ORDER BY real_contract_arrival_date DESC ";
+    }
+
+    // 鍾哥 部門代碼:250 職位大小:1 4
+    // 許協理 部門代碼:320 職位大小:1
+    // 張主任 部門代碼:322 職位大小:1
+    // 詹總 部門代碼:50 職位大小:1
+    // 許總 部門代碼:20 職位大小:1
+    // 業務部門 部門代碼:321
+    // 服務支援部 部門代碼:501
+    // 財會部門 部門代碼:210
+    // 品証部門 部門代碼:912
+    $department_arr = ['911', '250', '320', '50', '20', '321', '220', '322', '501', '210', '912'];
+    if (in_array($department_id, $department_arr)) {
+        $sql = "
+            SELECT * FROM wipwholestatus
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')           
+            )
+        " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date ASC
+        ";
+        return $sql;
+    }
+
+    // (宜蘭)工務組長
+    if ($user_id == 'M0087') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')             
+            )
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('宜蘭')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 北區工務組長
+    if ($user_id == 'M0041' || $user_id == 'M0176') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')             
+            )
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 中區工務組長
+    if ($user_id == 'M0113' || $user_id == 'M0158') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')           
+            )
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 南區工務組長
+    if ($user_id == 'M0039' || $user_id == 'M0078') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')            
+            )
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 工務
+    if ($department_id == '521' || $department_id == '531') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')           
+            )
+            AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+
+    return $sql;
+}
+
+// 取得本次簽核的表單id值
+function getId($link, $form_key)
+{
+    $sql = "
+        SELECT form_id AS id FROM flow
+        WHERE form_key = '$form_key'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row['id'];
+}
+
+// 取得本次簽核的表單form_key值 (營業與設計流程)
+function getYDForm_key($link, $form_id)
+{
+    $sql = "
+        SELECT 
+            f.form_key
+        FROM flow AS f
+        LEFT JOIN subflow AS s
+        ON f.form_key = s.form_key
+        WHERE 1=1
+        AND f.form_id = '$form_id' 
+        AND f.flow_code IN ('A','B','C','D')
+        AND f.system_id = 'wws'
+        AND f.flow_id = 'wws01'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return empty($row['form_key']) ? 0 : $row['form_key'];
+}
+
+// 取得本次簽核的表單form_key值 (工務流程))
+function getGForm_key($link, $form_id)
+{
+    $sql = "
+        SELECT 
+            f.form_key
+        FROM flow AS f
+        LEFT JOIN subflow AS s
+        ON f.form_key = s.form_key
+        WHERE 1=1
+        AND f.form_id = '$form_id' 
+        AND f.flow_code IN ('G','H')
+        AND f.system_id = 'wws'
+        AND f.flow_id = 'wws01'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return empty($row['form_key']) ? 0 : $row['form_key'];
+}
+
+// 修正時間欄位
+function fixTime($time)
+{
+    return empty($time) ? '0000T00:00:00' : date('Y-m-d', strtotime($time)) . "T" . date('H:i:s', strtotime($time));
+}
+
+// 修正時間欄位 若是空值則帶入現在時間戳記
+function fixTimeToNow($time)
+{
+    return empty($time) ? date("Y-m-d") . "T" . date("H:i:s") : date('Y-m-d', strtotime($time)) . "T" . date('H:i:s', strtotime($time));
+}
+
+// 檢查營業階段
+function checkYingYeok($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(sales_spec_verify != '2',sales_spec_verify,'0') AS SIGNED) +
+                CAST(IF(customer_planning_verify != '2',customer_planning_verify,'0') AS SIGNED) +
+                CAST(IF(customer_color_verify != '2',customer_color_verify,'0') AS SIGNED) +
+                CAST(IF(customer_style_verify != '2',customer_style_verify,'0') AS SIGNED) +
+                CAST(IF(site_survey_contact_form_verify != '2',site_survey_contact_form_verify,'0') AS SIGNED) 
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND status = '1'
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 檢查設計階段
+function checkSheJiok($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(desin_spec_verify != '2' ,desin_spec_verify,'0') AS SIGNED) +
+                CAST(IF(desin_planning_verify != '2' ,desin_planning_verify,'0') AS SIGNED) +
+                CAST(IF(desin_color_verify != '2' ,desin_color_verify,'0') AS SIGNED) +
+                CAST(IF(desin_style_verify != '2' ,desin_style_verify,'0') AS SIGNED) 
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND status = '1'
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 檢查設計主管階段
+function checkSheJiokLeader($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(desin_leader_verify != '2',desin_leader_verify,'0') AS SIGNED) 
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND status = '1'
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 檢查工務階段
+function checkGongWuok($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(building_heigh_verify != '2',building_heigh_verify,'0') AS SIGNED)
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND status = '1'
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 檢查生管階段
+function checkShengGuanok($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(shengguanok_status != '2',shengguanok_status,'0') AS SIGNED)+
+                CAST(IF(prattford_order_date_verify != '2' ,prattford_order_date_verify,'0') AS SIGNED) +
+                CAST(IF(estimated_shipping_date_verify != '2' ,estimated_shipping_date_verify,'0') AS SIGNED) +
+                CAST(IF(estimated_shipping_schedule_date_verify != '2' ,estimated_shipping_schedule_date_verify,'0') AS SIGNED) +
+                CAST(IF(goods_type = 'A' || goods_type = 'C' ,'0','1') AS SIGNED) +
+                CAST(IF(taiwan_goods_type = 'A' || taiwan_goods_type = 'C' ,'0','1') AS SIGNED) +
+                CAST(IF(arrival_date_verify = 'A' ,'0','1') AS SIGNED) 
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND status = '1'
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 取得設計部主管編號
+function getSheJiokLeaderNo($link)
+{
+    $sql = "
+        SELECT accountid 
+        FROM `account` 
+        WHERE `department_id` = '911'
+        AND `role_id` = '1';    
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 取得工務部主管編號
+function getGongWuokNo($link)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key']))
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+    $sql = "
+        SELECT DISTINCT 
+            SUBSTR(address,1,2)
+        FROM `wipwholestatus`
+        WHERE id = '$id'
+        AND status = '1'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    // 宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
+    $arr = array(
+        "宜蘭" => "M0087",
+        "北" => "M0041",
+        "台北" => "M0041",
+        "基隆" => "M0041",
+        "新北" => "M0041",
+        "新竹" => "M0041",
+        "桃園" => "M0041",
+        "苗栗" => "M0113",
+        "中" => "M0113",
+        "南投" => "M0113",
+        "台中" => "M0113",
+        "彰化" => "M0113",
+        "雲林" => "M0113",
+        "南" => "M0102",
+        "台南" => "M0102",
+        "嘉義" => "M0102",
+        "屏東" => "M0102",
+        "高雄" => "M0102"
+    );
+    return empty($arr[$row[0]]) ? "" : $arr[$row[0]];
+}
+
+// 取得生管部主管編號
+function getShengGuanokLeaderNo($link)
+{
+    $sql = "
+        SELECT accountid 
+        FROM `account` 
+        WHERE `department_id` = '321'
+        AND `role_id` = '1';    
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 確認目前狀態 (營業設計)
+function checkNowFormYDStatus($link)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key'])) {
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+    }
+    $sql = "
+        SELECT
+            flow_code
+        FROM flow
+        WHERE form_id = '$id'
+        AND flow_code IN ('A','B','C','D')
+        AND system_id = 'wws'
+        AND flow_id = 'wws01'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return empty($row['0']) ? 'Z' : $row['0'];
+}
+
+// 確認目前狀態 (工務)
+function checkNowFormGStatus($link)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key'])) {
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+    }
+    $sql = "
+        SELECT
+            flow_code
+        FROM flow
+        WHERE form_id = '$id'
+        AND flow_code IN ('G','H')
+        AND system_id = 'wws'
+        AND flow_id = 'wws01'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return empty($row['0']) ? 'Z' : $row['0'];
+}
+
+// 取得資訊的欄位權限
+function getInformationStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    return "disabled";
+}
+
+// 取得業務的欄位權限
+function getYewuStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 321)
+        return "";
+    return "disabled";
+}
+
+// 取得工務的欄位權限
+function getWarehouseStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 521 || $user_department_id == 531)
+        return checkNowFormGStatus($link) == 'G' ? "" : "disabled";
+    return "disabled";
+}
+
+// 取得營業或契約的欄位權限
+function getMarketingStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315)
+        return checkNowFormYDStatus($link) == 'A' ? "" : "disabled";
+    if ($user_department_id == 501 || $user_department_id == 511 || $user_department_id == 512 || $user_department_id == 513 || $user_department_id == 514)
+        return checkNowFormYDStatus($link) == 'A' ? "" : "disabled";
+
+    return "disabled";
+}
+
+// 取得設計的欄位權限
+function getDesinStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 911)
+        return checkNowFormYDStatus($link) == 'B' ? "" : "disabled";
+    return "disabled";
+}
+
+// 取得設計主管的欄位權限
+function getDesinLeaderStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 911)
+        return checkNowFormYDStatus($link) == 'C' && $role_id == 1 ? "" : "disabled";
+    return "disabled";
+}
+
+// 取得生管的欄位權限
+function getShengguanStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 250 && (in_array($role_id, [1, 4])))
+        return "";
+    return "disabled";
+}
+
+// 取得下方table分頁的預設分頁
+function getTabNo($user_department_id)
+{
+    if (in_array($user_department_id, [220, 311, 312, 313, 314, 315]))
+        return 0;
+    if ($user_department_id == 911)
+        return 1;
+    if ($user_department_id == 521 || $user_department_id == 531)
+        return 2;
+    if ($user_department_id == 321 || $user_department_id == 250)
+        return 3;
+    return 0;
+}
+
+// 由地址取得工務負責人
+function getGunwuName($address)
+{
+    $north_arr = array('台北', '基隆', '新北', '桃園', '新竹');
+    $north_arr2 = array('宜蘭');
+    $center_arr = array('南投', '彰化', '雲林', '台中', '苗栗');
+    $south_arr = array('台南', '嘉義', '屏東', '高雄');
+    foreach ($north_arr as $key => $value)
+        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
+            return "張潘榮";
+    foreach ($north_arr2 as $key => $value)
+        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
+            return "高培軒";
+    foreach ($center_arr as $key => $value)
+        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
+            return "林瑋隆";
+    foreach ($south_arr as $key => $value)
+        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
+            return "鄭存邑";
+    return "";
+}
+
+function getOpendoorOptions($link)
+{
+    $sql = "
+        SELECT 
+            code_name AS val ,
+            content AS label 
+        FROM code 
+        WHERE field_name='open_kind'
+        ORDER BY label ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getYingyeokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('311','312','313','314','315')
+        ORDER BY accountid ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getShejiokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('911')
+        AND `role_id` NOT IN ('1')
+        ORDER BY accountid ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getShejiokLeaderOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('911')
+        AND `role_id` IN ('1')
+        ORDER BY accountid ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getGongwuokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('521','531')
+        ORDER BY accountid ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getShengguanokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('321')
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function warningMessage($data)
+{
+    $waringMessageArr = array(
+        '1' => '',
+        '2' => '沒有預計出貨日(到工地)',
+        '3' => '有實際完工工日，實際開工日未填寫',
+        '4' => '有實際完工工日，未填寫QC日',
+        '5' => '有實際完工工日，移交日未填寫',
+        '6' => '官檢日未填寫',
+        '7' => '官檢日不在移交日的60天內',
+        '8' => '移交日不是實際完工日+14天',
+    );
+    if (getWarningMessageStatus($data) !== 1)
+        return $waringMessageArr[getWarningMessageStatus($data)];
+    return "";
+}
+
+function getWarningMessageStatus($data)
+{
+    $real_contract_arrival_date = $data['real_contract_arrival_date'];
+
+    $install_start_date = $data['install_start_date'];
+    $install_end_date = $data['install_end_date'];
+    $tryrun_start_date = $data['tryrun_start_date'];
+    $tryrun_end_date = $data['tryrun_end_date'];
+    $tryrun_end_date_owner = $data['tryrun_end_date_owner'];
+    $estimate_install_start_date = $data['estimate_install_start_date'];
+    $estimate_install_end_date = $data['estimate_install_end_date'];
+    $estimate_tryrun_start_date = $data['estimate_tryrun_start_date'];
+    $estimate_tryrun_end_date = $data['estimate_tryrun_end_date'];
+    $official_check_date = $data['official_check_date'];
+    $delivery_date = $data['delivery_date'];
+    $qc_date = $data['qc_date'];
+    $end_qc_date = $data['end_qc_date'];
+
+    // 有任何開工/完工日期，卻沒有預計出貨日(到工地)
+    if (empty($real_contract_arrival_date)) {
+        $tmp_arr = [
+            'install_start_date',
+            'install_end_date',
+            'tryrun_start_date',
+            'tryrun_end_date',
+            'tryrun_end_date_owner',
+            'estimate_install_start_date',
+            'estimate_install_end_date',
+            'estimate_tryrun_start_date',
+            'estimate_tryrun_end_date'
+        ];
+        foreach ($tmp_arr as $row) {
+            if (!empty($data[$row])) {
+                return "2";
+            }
+        }
+    }
+    // 有實際完工日，要有實際開工日
+    if (!empty($install_end_date)) {
+        if (empty($install_start_date))
+            return "3";
+    }
+    if (!empty($tryrun_end_date)) {
+        if (empty($tryrun_start_date))
+            return "3";
+    }
+    // 有實際完工工日，要有QC日
+    if (!empty($install_end_date) || !empty($tryrun_end_date)) {
+        if (empty($qc_date) && empty($end_qc_date))
+            return "4";
+    }
+    // 有實際完工工日，移交日未填寫
+    if (!empty($install_end_date) || !empty($tryrun_end_date)) {
+        if (empty($delivery_date)) {
+            return "5";
+        }
+    }
+    // 有移交日，官檢日未填寫
+    if (!empty($delivery_date)) {
+        if (empty($official_check_date))
+            return "6";
+    }
+
+    // 有移交日，官檢日若不是移交日+60日
+    // if (!empty($delivery_date) && !empty($official_check_date)) {
+    //     $date = floor((strtotime($official_check_date) - strtotime($delivery_date)) / 86400);
+    //     if ($date <= 0 || $date > 60)
+    //         return "7";
+    // }
+
+    // 有實際完工工日，移交日若不是實際完工日+14天
+    // if (!empty($install_end_date) || !empty($tryrun_end_date)) {
+    //     $date = floor((strtotime($install_end_date) - strtotime($delivery_date)) / 86400);
+    //     if ($date <= 0 || $date > 14)
+    //         return "5";
+    // }
+
+    return "1";
+}
diff --git a/wms/wipwholeinstall-index-table-html.php b/wms/wipwholeinstall-index-table-html.php
index 4a262fac..a682a0a1 100644
--- a/wms/wipwholeinstall-index-table-html.php
+++ b/wms/wipwholeinstall-index-table-html.php
@@ -1,199 +1,211 @@
-<table id="table_index2" class="table table-striped table-bordered" style="width:98.5%">
-    <thead>
-        <tr>
-            <th style="vertical-align: middle;text-align:center;width:150px;">電梯編號</th>
-            <th style="vertical-align: middle;text-align:center;width:150px;">客戶姓名</th>
-            <th style="vertical-align: middle;text-align:center;width:250px;">合約地址</th>
-            <th style="vertical-align: middle;text-align:center;width:250px;">地工地址</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">警示</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">預計出貨日</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">發包廠商(工勘)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">發包日期(工勘)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">預計開工日(工勘)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">實際開工日(工勘)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">預計完工日(工勘)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">實際完工日(工勘)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">QC日(品證)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">QC合格日(品證)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">官檢日(品證)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">移交日(營業)</th>
-            <th style="vertical-align: middle;text-align:center;width:120px;">營業人員</th>
-            <th style="vertical-align: middle;text-align:center;width:120px;">編輯</th>
-        </tr>
-    </thead>
-    <tbody>
-        <?php
-
-        foreach ($dataDetailsArr as $key => $data) :
-
-        ?>
-            <tr>
-                <!-- <td>
-                    <?php
-                    if (in_array($department_id, [311, 312, 313, 314, 315, 501, 511, 512, 513, 513, 220, 911])) {
-                        $sql = "
-                            SELECT
-                                mid,
-                                pr_item_id,
-                                version
-                            FROM specsurvey_main
-                            WHERE contractno = '" . $data['contractno'] . "'
-                        ";
-                        $result = mysqli_query($link, $sql);
-                        $row = mysqli_fetch_array($result);
-                        if (empty($row['mid'])) {
-                            echo $data['contractno'];
-                        } else {
-                            echo "<a target='_blank' href='/wms/mkt/specsurvey-view.php?pa=" . $row['mid'] . "," . $row['pr_item_id'] . "," . $row['version'] . "&$token_link'>" . $data['contractno'] . "</a>";
-                        }
-                    } else {
-                        echo $data['contractno'];
-                    }
-                    ?>
-                </td> -->
-                <td><?php echo $data['facilityno']; ?></td>
-                <td><?php echo $data['custom']; ?></td>
-                <td><?php echo $data['address']; ?></td>
-                <td><?php echo $data['real_address']; ?></td>
-                <td style="text-align:left;"><span class="text-danger"><?php echo warningMessage($data); ?></span></td>
-                <td><?php echo substr($data['real_contract_arrival_date'], 0, 10); ?></td>
-                <?php
-                // foreach ($site_survey_status as $key => $val) {
-                //     if ((string)$data['site_survey_contact_verify'] == (string)$key) {
-                //         if (in_array($data['site_survey_contact_verify'], ['1', 'A'])) {
-                //             echo "<td style='color:#F00;'>$val</td>";
-                //         } else {
-                //             echo "<td>$val</td>";
-                //         }
-                //     }
-                // }
-                ?>
-                <td>
-                    <?php
-                    if (!empty($data['install_outsourcer']) && !empty($data['tryrun_outsourcer'])) {
-                        echo "安裝:" . $data['install_outsourcer'];
-                        echo "<br/>試車:" . $data['tryrun_outsourcer'];
-                    } else {
-                        if (!empty($data['install_outsourcer']))
-                            echo "安裝:" . $data['install_outsourcer'];
-                        if (!empty($data['tryrun_outsourcer']))
-                            echo "<br/>試車:" . $data['tryrun_outsourcer'];
-                    }
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['install_outsourcer_date']) && !empty($data['tryrun_outsourcer_date'])) {
-                        echo date("Y/m/d", strtotime($data['install_outsourcer_date']));
-                        echo "<br/>" . date("Y/m/d", strtotime($data['tryrun_outsourcer_date']));
-                    } else {
-                        if (!empty($data['install_outsourcer_date']))
-                            echo date("Y/m/d", strtotime($data['install_outsourcer_date'])). "<br/>　";
-                        if (!empty($data['tryrun_outsourcer_date']))
-                            echo "　<br/>" .date("Y/m/d", strtotime($data['tryrun_outsourcer_date']));
-                    }
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['estimate_install_start_date']) && !empty($data['estimate_tryrun_start_date'])) {
-                        echo date("Y/m/d", strtotime($data['estimate_install_start_date']));
-                        echo "<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_start_date']));
-                    } else {
-                        if (!empty($data['estimate_install_start_date']))
-                            echo date("Y/m/d", strtotime($data['estimate_install_start_date'])) . "<br/>　";
-                        if (!empty($data['estimate_tryrun_start_date']))
-                            echo "　<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_start_date']));
-                    }
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['install_start_date']) && !empty($data['tryrun_start_date'])) {
-                        echo date("Y/m/d", strtotime($data['install_start_date']));
-                        echo "<br/>" . date("Y/m/d", strtotime($data['tryrun_start_date']));
-                    } else {
-                        if (!empty($data['install_start_date']))
-                            echo date("Y/m/d", strtotime($data['install_start_date'])). "<br/>　";
-                        if (!empty($data['tryrun_start_date']))
-                            echo "　<br/>" .date("Y/m/d", strtotime($data['tryrun_start_date']));
-                    }
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['estimate_install_end_date']) && !empty($data['estimate_tryrun_end_date'])) {
-                        echo date("Y/m/d", strtotime($data['estimate_install_end_date']));
-                        echo "<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_end_date']));
-                    } else {
-                        if (!empty($data['estimate_install_end_date']))
-                            echo date("Y/m/d", strtotime($data['estimate_install_end_date'])). "<br/>　";
-                        if (!empty($data['estimate_tryrun_end_date']))
-                            echo "　<br/>" .date("Y/m/d", strtotime($data['estimate_tryrun_end_date']));
-                    }
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['install_end_date']) && !empty($data['tryrun_end_date'])) {
-                        echo date("Y/m/d", strtotime($data['install_end_date']));
-                        echo "<br/>" . date("Y/m/d", strtotime($data['tryrun_end_date']));
-                    } else {
-                        if (!empty($data['install_end_date']))
-                            echo date("Y/m/d", strtotime($data['install_end_date'])). "<br/>　";
-                        if (!empty($data['tryrun_end_date']))
-                            echo "　<br/>" .date("Y/m/d", strtotime($data['tryrun_end_date']));
-                    }
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['qc_date']))
-                        echo date("Y/m/d", strtotime($data['qc_date']));
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['end_qc_date']))
-                        echo date("Y/m/d", strtotime($data['end_qc_date']));
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['official_check_date']))
-                        echo date("Y/m/d", strtotime($data['official_check_date']));
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['delivery_date']))
-                        echo date("Y/m/d", strtotime($data['delivery_date']));
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['salesid']))
-                        echo accountidToName($data['salesid']);
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if ($edit_flag & 4 && ($user_auth & 2)) {
-                    ?>
-                        <p>
-                            <a target='_blank' href="wipwhole-rec-invoice-edit.php?function_name=wipwholestatus&<?php echo $token_link; ?>&id=<?php echo $data['id']; ?>" class="btn btn-primary btn-sm">
-                                <?php
-                                echo getGunwuName($data['address']);
-                                ?>
-                            </a>
-                        </p>
-                    <?php
-                    } else {
-                        echo getGunwuName($data['address']);
-                    }
-                    ?>
-                </td>
-            </tr>
-        <?php endforeach; ?>
-    </tbody>
+<table id="table_index2" class="table table-striped table-bordered" style="width:98.5%">
+    <thead>
+        <tr>
+            <th style="vertical-align: middle;text-align:center;width:150px;">電梯編號</th>
+            <th style="vertical-align: middle;text-align:center;width:150px;">客戶姓名</th>
+            <th style="vertical-align: middle;text-align:center;width:250px;">合約地址</th>
+            <th style="vertical-align: middle;text-align:center;width:250px;">地工地址</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">警示</th>
+            <th style="text-align:center;width:100px;">實際到廠日(觀音廠)</th>
+            <th style="text-align:center;width:100px;">預計出貨日(到工地)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">發包廠商(工勘)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">發包日期(工勘)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">預計開工日(工勘)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">實際開工日(工勘)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">預計完工日(工勘)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">實際完工日(工勘)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">QC日(品證)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">QC合格日(品證)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">官檢日(品證)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">移交日(營業)</th>
+            <th style="vertical-align: middle;text-align:center;width:120px;">營業人員</th>
+            <th style="vertical-align: middle;text-align:center;width:120px;">編輯</th>
+        </tr>
+    </thead>
+    <tbody>
+        <?php
+
+        foreach ($dataDetailsArr as $key => $data) :
+
+        ?>
+            <tr>
+                <!-- <td>
+                    <?php
+                    if (in_array($department_id, [311, 312, 313, 314, 315, 501, 511, 512, 513, 513, 220, 911])) {
+                        $sql = "
+                            SELECT
+                                mid,
+                                pr_item_id,
+                                version
+                            FROM specsurvey_main
+                            WHERE contractno = '" . $data['contractno'] . "'
+                        ";
+                        $result = mysqli_query($link, $sql);
+                        $row = mysqli_fetch_array($result);
+                        if (empty($row['mid'])) {
+                            echo $data['contractno'];
+                        } else {
+                            echo "<a target='_blank' href='/wms/mkt/specsurvey-view.php?pa=" . $row['mid'] . "," . $row['pr_item_id'] . "," . $row['version'] . "&$token_link'>" . $data['contractno'] . "</a>";
+                        }
+                    } else {
+                        echo $data['contractno'];
+                    }
+                    ?>
+                </td> -->
+                <td><?php echo $data['facilityno']; ?></td>
+                <td><?php echo $data['custom']; ?></td>
+                <td><?php echo $data['address']; ?></td>
+                <td><?php echo $data['real_address']; ?></td>
+                <td style="text-align:left;"><span class="text-danger"><?php echo warningMessage($data); ?></span></td>
+                <td>
+                    <?php
+                    if (!empty($data['actual_tofactory_date']))
+                        echo date("Y/m/d", strtotime($data['actual_tofactory_date']));
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['real_contract_arrival_date']))
+                        echo date("Y/m/d", strtotime(substr($data['real_contract_arrival_date'], 0, 10)));
+                    ?>
+                </td>
+                <?php
+                // foreach ($site_survey_status as $key => $val) {
+                //     if ((string)$data['site_survey_contact_verify'] == (string)$key) {
+                //         if (in_array($data['site_survey_contact_verify'], ['1', 'A'])) {
+                //             echo "<td style='color:#F00;'>$val</td>";
+                //         } else {
+                //             echo "<td>$val</td>";
+                //         }
+                //     }
+                // }
+                ?>
+                <td>
+                    <?php
+                    if (!empty($data['install_outsourcer']) && !empty($data['tryrun_outsourcer'])) {
+                        echo "安裝:" . $data['install_outsourcer'];
+                        echo "<br/>試車:" . $data['tryrun_outsourcer'];
+                    } else {
+                        if (!empty($data['install_outsourcer']))
+                            echo "安裝:" . $data['install_outsourcer'];
+                        if (!empty($data['tryrun_outsourcer']))
+                            echo "<br/>試車:" . $data['tryrun_outsourcer'];
+                    }
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['install_outsourcer_date']) && !empty($data['tryrun_outsourcer_date'])) {
+                        echo date("Y/m/d", strtotime($data['install_outsourcer_date']));
+                        echo "<br/>" . date("Y/m/d", strtotime($data['tryrun_outsourcer_date']));
+                    } else {
+                        if (!empty($data['install_outsourcer_date']))
+                            echo date("Y/m/d", strtotime($data['install_outsourcer_date'])) . "<br/>　";
+                        if (!empty($data['tryrun_outsourcer_date']))
+                            echo "　<br/>" . date("Y/m/d", strtotime($data['tryrun_outsourcer_date']));
+                    }
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['estimate_install_start_date']) && !empty($data['estimate_tryrun_start_date'])) {
+                        echo date("Y/m/d", strtotime($data['estimate_install_start_date']));
+                        echo "<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_start_date']));
+                    } else {
+                        if (!empty($data['estimate_install_start_date']))
+                            echo date("Y/m/d", strtotime($data['estimate_install_start_date'])) . "<br/>　";
+                        if (!empty($data['estimate_tryrun_start_date']))
+                            echo "　<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_start_date']));
+                    }
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['install_start_date']) && !empty($data['tryrun_start_date'])) {
+                        echo date("Y/m/d", strtotime($data['install_start_date']));
+                        echo "<br/>" . date("Y/m/d", strtotime($data['tryrun_start_date']));
+                    } else {
+                        if (!empty($data['install_start_date']))
+                            echo date("Y/m/d", strtotime($data['install_start_date'])) . "<br/>　";
+                        if (!empty($data['tryrun_start_date']))
+                            echo "　<br/>" . date("Y/m/d", strtotime($data['tryrun_start_date']));
+                    }
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['estimate_install_end_date']) && !empty($data['estimate_tryrun_end_date'])) {
+                        echo date("Y/m/d", strtotime($data['estimate_install_end_date']));
+                        echo "<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_end_date']));
+                    } else {
+                        if (!empty($data['estimate_install_end_date']))
+                            echo date("Y/m/d", strtotime($data['estimate_install_end_date'])) . "<br/>　";
+                        if (!empty($data['estimate_tryrun_end_date']))
+                            echo "　<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_end_date']));
+                    }
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['install_end_date']) && !empty($data['tryrun_end_date'])) {
+                        echo date("Y/m/d", strtotime($data['install_end_date']));
+                        echo "<br/>" . date("Y/m/d", strtotime($data['tryrun_end_date']));
+                    } else {
+                        if (!empty($data['install_end_date']))
+                            echo date("Y/m/d", strtotime($data['install_end_date'])) . "<br/>　";
+                        if (!empty($data['tryrun_end_date']))
+                            echo "　<br/>" . date("Y/m/d", strtotime($data['tryrun_end_date']));
+                    }
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['qc_date']))
+                        echo date("Y/m/d", strtotime($data['qc_date']));
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['end_qc_date']))
+                        echo date("Y/m/d", strtotime($data['end_qc_date']));
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['official_check_date']))
+                        echo date("Y/m/d", strtotime($data['official_check_date']));
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['delivery_date']))
+                        echo date("Y/m/d", strtotime($data['delivery_date']));
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['salesid']))
+                        echo accountidToName($data['salesid']);
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if ($edit_flag & 4 && ($user_auth & 2)) {
+                    ?>
+                        <p>
+                            <a target='_blank' href="wipwhole-rec-invoice-edit.php?function_name=wipwholestatus&<?php echo $token_link; ?>&id=<?php echo $data['id']; ?>" class="btn btn-primary btn-sm">
+                                <?php
+                                echo getGunwuName($data['address']);
+                                ?>
+                            </a>
+                        </p>
+                    <?php
+                    } else {
+                        echo getGunwuName($data['address']);
+                    }
+                    ?>
+                </td>
+            </tr>
+        <?php endforeach; ?>
+    </tbody>
 </table>
\ No newline at end of file
diff --git a/wms/wipwholeinstall-index.php b/wms/wipwholeinstall-index.php
index a148c22a..bdcbff84 100644
--- a/wms/wipwholeinstall-index.php
+++ b/wms/wipwholeinstall-index.php
@@ -1,385 +1,385 @@
-<?php
-// ini_set('display_errors', 'on');
-/**
- * 權限規則:
- * 1.工務:宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113)  南=鄭存邑(M0102)
- * 2.許協理 部門代碼:320 職位大小:1
- * 3.詹總 部門代碼:50 職位大小:1
- * 4.許總 部門代碼:20 職位大小:1
- * 
- */
-include "header.php";
-
-// 設定警告出貨到期的天數
-$numberOfDaysToAdd = 45;
-$futureDate = date("Y/m/d", strtotime(date("Y-m-d") . " +{$numberOfDaysToAdd} days"));
-
-include "wipwholeinstall-index-function.php";
-include "css/view/wipwholeinstall-index.php";
-
-// 宣告主資料空陣列
-$data = array();
-
-// 取得當前使用者所屬部門
-$department_id = getDepartmentId($link, $user_id);
-// 取得當前使用者所屬職位
-$role_id = getRoleId($link, $user_id);
-
-// 下方編輯按鈕權限
-// 4=工務
-
-$edit_flag = getEditFlag($department_id, $role_id, $user_id);
-
-// 取得當前使用者所屬部門
-$department_id = getDepartmentId($link, $user_id);
-// 取得當前使用者所屬職位
-$role_id = getRoleId($link, $user_id);
-
-// 接受搜尋 post 後觸發
-$contractno = empty($_REQUEST['contractno']) ? null : $_REQUEST['contractno'];
-$facilityno = empty($_REQUEST['facilityno']) ? null : $_REQUEST['facilityno'];
-$custom = empty($_REQUEST['custom']) ? null : $_REQUEST['custom'];
-$site_survey_contact_verify = !isset($_REQUEST['site_survey_contact_verify']) ? '' : $_REQUEST['site_survey_contact_verify'];
-$real_arrival_date_start = empty($_REQUEST['real_arrival_date_start']) ? null : $_REQUEST['real_arrival_date_start'];
-$real_arrival_date_end = empty($_REQUEST['real_arrival_date_end']) ? null : $_REQUEST['real_arrival_date_end'];
-$area_no = !isset($_REQUEST['area_no']) ? '' : $_REQUEST['area_no'];
-$erro_mesage_search = !isset($_REQUEST['erro_mesage_search']) ? 'A' : $_REQUEST['erro_mesage_search'];
-
-// 取得資料 sql
-$sql = getDataSql($department_id, $role_id, $user_id);
-$data = mysqli_query($link, $sql);
-
-$Tdata = [];
-$Fdata = [];
-
-foreach($data as $row){
-    if(!empty(warningMessage($row))){
-        array_push($Tdata,$row);
-    }else{
-        array_push($Fdata,$row);
-    }
-}
-if($erro_mesage_search == 'T')
-    $data = $Tdata;
-if($erro_mesage_search == 'F')
-    $data = $Fdata;
-
-?>
-
-<div style="overflow-x:auto;">
-    <form id='myForm' method='post' action='wipwholeinstall-index.php?<?= $token_link ?>'>
-        <table class='table query-table table-striped table-bordered display compact' style='width:98%;text-align:center;margin:0 auto'>
-            <thead>
-                <tr>
-                    <td colspan="9">
-                        <h3 style='text-align:center'>作番安裝大日程(新梯)</h3>
-                    </td>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <th>合約號</th>
-                    <td><input type="text" class='form-control' id='contractno' name='contractno' value="<?php echo $contractno; ?>"></td>
-                    <th>電梯編號</th>
-                    <td><input type="text" class='form-control' id='facilityno' name='facilityno' value="<?php echo $facilityno; ?>"></td>
-                    <th>客戶姓名</th>
-                    <td><input type="text" class='form-control' id='custom' name='custom' value="<?php echo $custom; ?>"></td>
-                    <th>預計出貨日</th>
-                    <td colspan="2">
-                        <input type="date" class='form-control' id='real_arrival_date_start' name='real_arrival_date_start' value="<?php echo $real_arrival_date_start; ?>" style='width:40%;display:inline;'>
-                        ～
-                        <input type="date" class='form-control' id='real_arrival_date_end' name='real_arrival_date_end' value="<?php echo $real_arrival_date_end; ?>" style='width:40%;display:inline;'>
-                    </td>
-                </tr>
-                <tr>
-                    <th>
-                        區域
-                    </th>
-                    <td>
-                        <?php
-                        $area_status = array(
-                            "" => "全部",
-                            "N" => "N：北區",
-                            "Y" => "Y：宜蘭",
-                            "T" => "T：桃竹苗",
-                            "C" => "C：中區",
-                            "K" => "K：南區"
-                        );
-                        ?>
-                        <select name="area_no" id="area_no">
-                            <?php
-                            foreach ($area_status as $key => $val) {
-                                if ((string)$area_no == (string)$key) {
-                                    echo "<option value='$key' selected>$val</option>";
-                                } else {
-                                    echo "<option value='$key'>$val</option>";
-                                }
-                            }
-                            ?>
-                        </select>
-                    </td>
-                    <th>
-                        工勘狀態
-                    </th>
-                    <td>
-                        <?php
-                        $site_survey_status = array(
-                            "0" => "已確認",
-                            "1" => "未確認",
-                            "2" => "無工勘需求",
-                            "A" => "未動工",
-                            "B" => "地下室施工",
-                            "C" => "打樁",
-                            "D" => "地基",
-                            "E" => "挖土",
-                            "G" => "機房",
-                            "H" => "機械式淨高",
-                            "M" => "樓中樓",
-                            "OH" => "最高層(頂樓高度)",
-                            "P" => "PIT(機坑深度)",
-                            "R" => "R 樓",
-                            "S" => "停工",
-                            "T" => "TOP",
-                            "TC" => "頂部間隙",
-                            "TS" => "行程",
-                            "TH" => "全高",
-                            "Y" => "已搭、已出",
-                            "YB" => "退購結案",
-                            "YF" => "既有建物",
-                            "YN" => "已搭、未出"
-                        );
-                        for ($i = 1; $i < 200; $i++) {
-                            $site_survey_status[$i . "F"] = $i . "F";
-                        }
-                        ?>
-                        <select style="width:100%;" name="site_survey_contact_verify" id="site_survey_contact_verify">
-                            <?php
-                            echo "<option value=''>全部</option>";
-                            foreach ($site_survey_status as $key => $val) {
-                                if ((string)$site_survey_contact_verify == (string)$key) {
-                                    echo "<option value='$key' selected>$val</option>";
-                                } else {
-                                    echo "<option value='$key'>$val</option>";
-                                }
-                            }
-                            ?>
-                        </select>
-                    </td>
-                    <td colspan="5" style='text-align:left'>
-                        <input type="radio" name="erro_mesage_search" id='erro_mesage_search' value='A' <?php echo $erro_mesage_search == 'A' ? "checked" : ""; ?> />
-                        <label for="erro_mesage_search">全部</label>
-                        <input type="radio" name="erro_mesage_search" id='erro_mesage_search_true' value='T' <?php echo $erro_mesage_search == 'T' ? "checked" : ""; ?> />
-                        <label for="erro_mesage_search_true">已出現警示</label>
-                        <input type="radio" name="erro_mesage_search" id='erro_mesage_search_false' value='F' <?php echo $erro_mesage_search == 'F' ? "checked" : ""; ?> />
-                        <label for="erro_mesage_search_false">未出現警示</label>
-                        <button type="submit" style='text-align:center; margin:0 auto' class="btn  btn-primary btn-sm">查詢</button>
-                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='day_before_input()'><?php echo $numberOfDaysToAdd; ?>天內資料</button>
-                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='day_before_all_input()'><?php echo $numberOfDaysToAdd; ?>天內資料(含今天以前)</button>
-                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='clean_all_input()'>清除</button>
-                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='generateButton()'>匯出excel</button>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-</div>
-<?php
-$dataArr = array(
-    "All" => $data
-);
-foreach ($dataArr as $key => $val) {
-    if ($val) :
-        $dataDetailsArr = $val;
-        echo "<div id='data_" . $key . "_table_div' class='data_table_div' style='overflow-x:auto;'>";
-        include "wipwholeinstall-index-table-html.php";
-        echo "</div>";
-    endif;
-}
-
-
-// 結束連線
-mysqli_close($link);
-?>
-<link href="/wms/css/select2.min.css" rel="stylesheet" />
-<script src="/wms/css/select2.min.js"></script>
-<script src="/wms/css/dataTables.fixedColumns.min.js"></script>
-<style>
-    .dataTables_scrollHead .dataTable {
-        margin-bottom: -2px;
-    }
-
-    .dataTables_scrollBody .dataTable {
-        margin-bottom: 0;
-    }
-
-    table {
-        margin-left: 0px;
-    }
-</style>
-<script>
-    // 設定 select2 (下拉式選單)
-    $(document).ready(function() {
-        $('#site_survey_contact_verify').select2();
-    });
-
-    // 匯出 excel 並帶出參數
-    const formData = new FormData();
-    formData.append("contractno", "<?php echo empty($_POST['contractno']) ? null : $_POST['contractno']; ?>");
-    formData.append("facilityno", "<?php echo empty($_POST['facilityno']) ? null : $_POST['facilityno']; ?>");
-    formData.append("custom", "<?php echo empty($_POST['custom']) ? null : $_POST['custom']; ?>");
-    formData.append("site_survey_contact_verify", "<?php echo empty($_POST['site_survey_contact_verify']) ? '' : $_POST['site_survey_contact_verify']; ?>");
-    formData.append("real_arrival_date_start", "<?php echo empty($_POST['real_arrival_date_start']) ? null : $_POST['real_arrival_date_start']; ?>");
-    formData.append("real_arrival_date_end", "<?php echo empty($_POST['real_arrival_date_end']) ? null : $_POST['real_arrival_date_end']; ?>");
-    formData.append("area_no", "<?php echo empty($_POST['area_no']) ? null : $_POST['area_no']; ?>");
-    formData.append("erro_mesage_search", "<?php echo empty($_POST['erro_mesage_search']) ? null : $_POST['erro_mesage_search']; ?>");
-
-    function generateButton() {
-        var xhr = new XMLHttpRequest();
-        xhr.open('POST', window.location.origin + "/wms/wipwholeinstall-index-export-excel.php?<?= $token_link ?>", true);
-        xhr.responseType = 'text';
-        xhr.onload = function() {
-            if (xhr.status === 200) {
-                var response = xhr.responseText;
-                var file_path = xhr.responseText;
-                var link = document.createElement('a');
-                link.setAttribute('href', window.location.origin + "/wms/excel/wipwholeintall.xlsx");
-                link.setAttribute('download', '出貨預定表(新梯).xlsx');
-                link.style.display = 'none';
-                document.body.appendChild(link);
-                link.click();
-                document.body.removeChild(link);
-            }
-        };
-        xhr.send(formData);
-    }
-
-    // 清除所有搜尋 input
-    function clean_all_input() {
-        document.getElementById("site_survey_contact_verify").value = "";
-        document.getElementById("contractno").value = "";
-        document.getElementById("facilityno").value = "";
-        document.getElementById("custom").value = "";
-        document.getElementById("real_arrival_date_start").value = "";
-        document.getElementById("real_arrival_date_end").value = "";
-        document.getElementById("myForm").submit();
-    }
-
-    // 45 天內查詢 (預計出貨日)
-    function day_before_input() {
-        document.getElementById("contractno").value = "";
-        document.getElementById("facilityno").value = "";
-        document.getElementById("custom").value = "";
-        document.getElementById("real_arrival_date_start").value = "<?php echo date("Y-m-d"); ?>";
-        document.getElementById("real_arrival_date_end").value = "<?php echo date("Y-m-d", strtotime("+" . $numberOfDaysToAdd . " days")) ?>";
-        document.getElementById("myForm").submit();
-    }
-
-    // 45 天內查詢含今天以前所有日期 (預計出貨日)
-    function day_before_all_input() {
-        document.getElementById("contractno").value = "";
-        document.getElementById("facilityno").value = "";
-        document.getElementById("custom").value = "";
-        document.getElementById("real_arrival_date_start").value = "";
-        document.getElementById("real_arrival_date_end").value = "<?php echo date("Y-m-d", strtotime("+" . $numberOfDaysToAdd . " days")) ?>";
-        document.getElementById("myForm").submit();
-    }
-
-
-    // 設置 datatable.js
-    $('#table_index2').DataTable({
-            scrollX: true,
-            fixedHeader: true,
-            scrollY: 500,
-            "language": {
-                "emptyTable": "無資料...",
-                "processing": "處理中...",
-                "loadingRecords": "載入中...",
-                "lengthMenu": "顯示_MENU_　筆",
-                "zeroRecords": "沒有符合的結果",
-                "info": "第 _START_ 至 _END_ 項，共 _TOTAL_ 項",
-                "infoEmpty": "第 0 至 0 項，共 0 項",
-                "infoFiltered": "(從 _MAX_ 項結果中過濾)",
-                "infoPostFix": "",
-                "search": "",
-                "paginate": {
-                    "first": "第一頁",
-                    "previous": "上一頁",
-                    "next": "下一頁",
-                    "last": "最後一頁"
-                },
-                "aria": {
-                    "sortAscending": ": 升冪排列",
-                    "sortDescending": ": 降冪排列"
-                }
-            }
-        }, {
-            "order": [
-                [4, "desc"],
-                [8, "asc"]
-            ]
-        }
-
-    );
-    document.querySelector("#table_index2_filter > label > input").placeholder = "快速搜尋";
-
-    // datatable 畫面重整後保留資料
-
-    var contractno = $("#contractno").val();
-    var facilityno = $("#facilityno").val();
-    var custom = $("#custom").val();
-    var site_survey_contact_verify = $("#site_survey_contact_verify").val();
-    var real_arrival_date_start = $("#real_arrival_date_start").val();
-    var real_arrival_date_end = $("#real_arrival_date_end").val();
-    var area_no = $("#area_no").val();
-    var erro_mesage_search = $('input[name=erro_mesage_search]:checked').val();
-
-    var showNum = <?php echo empty($_GET['showNum']) ? '10' : $_GET['showNum']; ?>;
-    var nowPage = <?php echo empty($_GET['nowPage']) ? '1' : $_GET['nowPage']; ?>;
-    var searchContent = "<?php echo empty($_GET['searchContent']) ? '' : $_GET['searchContent']; ?>";
-    var orderColumn = "<?php echo empty($_GET['orderColumn']) ? '' : $_GET['orderColumn']; ?>";
-    var orderDirection = "<?php echo empty($_GET['orderDirection']) ? '' : $_GET['orderDirection']; ?>";
-
-    var table = $('#table_index2').DataTable();
-
-    // 设置排序信息
-    if (orderColumn !== '' && orderDirection !== '') {
-        table.order([orderColumn, orderDirection]).draw();
-    }
-
-    table.search(searchContent).draw();
-    table.page.len(showNum).draw();
-    table.page((nowPage) - 1).draw('page');
-
-    // 監聽排序
-    table.on('order.dt', function() {
-        var order = table.order();
-        orderColumn = order[0][0];
-        orderDirection = order[0][1];
-    });
-
-    // 監聽頁碼
-    table.on('page.dt', function() {
-        searchDatatable(table);
-    });
-
-    // 監聽資料筆數
-    table.on('length.dt', function(e, settings, len) {
-        searchDatatable(table);
-    });
-
-    // 監聽搜尋事件
-    $("#table_index2_filter > label > input").change(function() {
-        searchDatatable(table);
-    });
-
-    function searchDatatable(table) {
-        showNum = table.page.len();
-        nowPage = table.page.info().page + 1;
-        searchContent = table.search();
-        window.location.href = "<?php echo "wipwholeinstall-index.php?function_name=wipinstall&$token_link"; ?>" +
-            "&showNum=" + showNum + "&nowPage=" + nowPage + "&searchContent=" + searchContent +
-            "&orderColumn=" + orderColumn + "&orderDirection=" + orderDirection +
-            "&contractno=" + contractno + "&facilityno=" + facilityno + "&custom=" + custom +
-            "&site_survey_contact_verify=" + site_survey_contact_verify + "&real_arrival_date_start=" + real_arrival_date_start +
-            "&real_arrival_date_end=" + real_arrival_date_end + "&area_no=" + area_no + "&erro_mesage_search=" + erro_mesage_search;
-    }
+<?php
+// ini_set('display_errors', 'on');
+/**
+ * 權限規則:
+ * 1.工務:宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113)  南=鄭存邑(M0102)
+ * 2.許協理 部門代碼:320 職位大小:1
+ * 3.詹總 部門代碼:50 職位大小:1
+ * 4.許總 部門代碼:20 職位大小:1
+ * 
+ */
+include "header.php";
+
+// 設定警告出貨到期的天數
+$numberOfDaysToAdd = 45;
+$futureDate = date("Y/m/d", strtotime(date("Y-m-d") . " +{$numberOfDaysToAdd} days"));
+
+include "wipwholeinstall-index-function.php";
+include "css/view/wipwholeinstall-index.php";
+
+// 宣告主資料空陣列
+$data = array();
+
+// 取得當前使用者所屬部門
+$department_id = getDepartmentId($link, $user_id);
+// 取得當前使用者所屬職位
+$role_id = getRoleId($link, $user_id);
+
+// 下方編輯按鈕權限
+// 4=工務
+
+$edit_flag = getEditFlag($department_id, $role_id, $user_id);
+
+// 取得當前使用者所屬部門
+$department_id = getDepartmentId($link, $user_id);
+// 取得當前使用者所屬職位
+$role_id = getRoleId($link, $user_id);
+
+// 接受搜尋 post 後觸發
+$contractno = empty($_REQUEST['contractno']) ? null : $_REQUEST['contractno'];
+$facilityno = empty($_REQUEST['facilityno']) ? null : $_REQUEST['facilityno'];
+$custom = empty($_REQUEST['custom']) ? null : $_REQUEST['custom'];
+$site_survey_contact_verify = !isset($_REQUEST['site_survey_contact_verify']) ? '' : $_REQUEST['site_survey_contact_verify'];
+$real_arrival_date_start = empty($_REQUEST['real_arrival_date_start']) ? null : $_REQUEST['real_arrival_date_start'];
+$real_arrival_date_end = empty($_REQUEST['real_arrival_date_end']) ? null : $_REQUEST['real_arrival_date_end'];
+$area_no = !isset($_REQUEST['area_no']) ? '' : $_REQUEST['area_no'];
+$erro_mesage_search = !isset($_REQUEST['erro_mesage_search']) ? 'A' : $_REQUEST['erro_mesage_search'];
+
+// 取得資料 sql
+$sql = getDataSql($department_id, $role_id, $user_id);
+$data = mysqli_query($link, $sql);
+
+$Tdata = [];
+$Fdata = [];
+
+foreach($data as $row){
+    if(!empty(warningMessage($row))){
+        array_push($Tdata,$row);
+    }else{
+        array_push($Fdata,$row);
+    }
+}
+if($erro_mesage_search == 'T')
+    $data = $Tdata;
+if($erro_mesage_search == 'F')
+    $data = $Fdata;
+
+?>
+
+<div style="overflow-x:auto;">
+    <form id='myForm' method='post' action='wipwholeinstall-index.php?<?= $token_link ?>'>
+        <table class='table query-table table-striped table-bordered display compact' style='width:98%;text-align:center;margin:0 auto'>
+            <thead>
+                <tr>
+                    <td colspan="9">
+                        <h3 style='text-align:center'>作番安裝大日程(新梯)</h3>
+                    </td>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <th>合約號</th>
+                    <td><input type="text" class='form-control' id='contractno' name='contractno' value="<?php echo $contractno; ?>"></td>
+                    <th>電梯編號</th>
+                    <td><input type="text" class='form-control' id='facilityno' name='facilityno' value="<?php echo $facilityno; ?>"></td>
+                    <th>客戶姓名</th>
+                    <td><input type="text" class='form-control' id='custom' name='custom' value="<?php echo $custom; ?>"></td>
+                    <th>預計出貨日</th>
+                    <td colspan="2">
+                        <input type="date" class='form-control' id='real_arrival_date_start' name='real_arrival_date_start' value="<?php echo $real_arrival_date_start; ?>" style='width:40%;display:inline;'>
+                        ～
+                        <input type="date" class='form-control' id='real_arrival_date_end' name='real_arrival_date_end' value="<?php echo $real_arrival_date_end; ?>" style='width:40%;display:inline;'>
+                    </td>
+                </tr>
+                <tr>
+                    <th>
+                        區域
+                    </th>
+                    <td>
+                        <?php
+                        $area_status = array(
+                            "" => "全部",
+                            "N" => "N：北區",
+                            "Y" => "Y：宜蘭",
+                            "T" => "T：桃竹苗",
+                            "C" => "C：中區",
+                            "K" => "K：南區"
+                        );
+                        ?>
+                        <select name="area_no" id="area_no">
+                            <?php
+                            foreach ($area_status as $key => $val) {
+                                if ((string)$area_no == (string)$key) {
+                                    echo "<option value='$key' selected>$val</option>";
+                                } else {
+                                    echo "<option value='$key'>$val</option>";
+                                }
+                            }
+                            ?>
+                        </select>
+                    </td>
+                    <th>
+                        工勘狀態
+                    </th>
+                    <td>
+                        <?php
+                        $site_survey_status = array(
+                            "0" => "已確認",
+                            "1" => "未確認",
+                            "2" => "無工勘需求",
+                            "A" => "未動工",
+                            "B" => "地下室施工",
+                            "C" => "打樁",
+                            "D" => "地基",
+                            "E" => "挖土",
+                            "G" => "機房",
+                            "H" => "機械式淨高",
+                            "M" => "樓中樓",
+                            "OH" => "最高層(頂樓高度)",
+                            "P" => "PIT(機坑深度)",
+                            "R" => "R 樓",
+                            "S" => "停工",
+                            "T" => "TOP",
+                            "TC" => "頂部間隙",
+                            "TS" => "行程",
+                            "TH" => "全高",
+                            "Y" => "已搭、已出",
+                            "YB" => "退購結案",
+                            "YF" => "既有建物",
+                            "YN" => "已搭、未出"
+                        );
+                        for ($i = 1; $i < 200; $i++) {
+                            $site_survey_status[$i . "F"] = $i . "F";
+                        }
+                        ?>
+                        <select style="width:100%;" name="site_survey_contact_verify" id="site_survey_contact_verify">
+                            <?php
+                            echo "<option value=''>全部</option>";
+                            foreach ($site_survey_status as $key => $val) {
+                                if ((string)$site_survey_contact_verify == (string)$key) {
+                                    echo "<option value='$key' selected>$val</option>";
+                                } else {
+                                    echo "<option value='$key'>$val</option>";
+                                }
+                            }
+                            ?>
+                        </select>
+                    </td>
+                    <td colspan="5" style='text-align:left'>
+                        <input type="radio" name="erro_mesage_search" id='erro_mesage_search' value='A' <?php echo $erro_mesage_search == 'A' ? "checked" : ""; ?> />
+                        <label for="erro_mesage_search">全部</label>
+                        <input type="radio" name="erro_mesage_search" id='erro_mesage_search_true' value='T' <?php echo $erro_mesage_search == 'T' ? "checked" : ""; ?> />
+                        <label for="erro_mesage_search_true">已出現警示</label>
+                        <input type="radio" name="erro_mesage_search" id='erro_mesage_search_false' value='F' <?php echo $erro_mesage_search == 'F' ? "checked" : ""; ?> />
+                        <label for="erro_mesage_search_false">未出現警示</label>
+                        <button type="submit" style='text-align:center; margin:0 auto' class="btn  btn-primary btn-sm">查詢</button>
+                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='day_before_input()'><?php echo $numberOfDaysToAdd; ?>天內資料</button>
+                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='day_before_all_input()'><?php echo $numberOfDaysToAdd; ?>天內資料(含今天以前)</button>
+                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='clean_all_input()'>清除</button>
+                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='generateButton()'>匯出excel</button>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+</div>
+<?php
+$dataArr = array(
+    "All" => $data
+);
+foreach ($dataArr as $key => $val) {
+    if ($val) :
+        $dataDetailsArr = $val;
+        echo "<div id='data_" . $key . "_table_div' class='data_table_div' style='overflow-x:auto;'>";
+        include "wipwholeinstall-index-table-html.php";
+        echo "</div>";
+    endif;
+}
+
+
+// 結束連線
+mysqli_close($link);
+?>
+<link href="/wms/css/select2.min.css" rel="stylesheet" />
+<script src="/wms/css/select2.min.js"></script>
+<script src="/wms/css/dataTables.fixedColumns.min.js"></script>
+<style>
+    .dataTables_scrollHead .dataTable {
+        margin-bottom: -2px;
+    }
+
+    .dataTables_scrollBody .dataTable {
+        margin-bottom: 0;
+    }
+
+    table {
+        margin-left: 0px;
+    }
+</style>
+<script>
+    // 設定 select2 (下拉式選單)
+    $(document).ready(function() {
+        $('#site_survey_contact_verify').select2();
+    });
+
+    // 匯出 excel 並帶出參數
+    const formData = new FormData();
+    formData.append("contractno", "<?php echo empty($_POST['contractno']) ? null : $_POST['contractno']; ?>");
+    formData.append("facilityno", "<?php echo empty($_POST['facilityno']) ? null : $_POST['facilityno']; ?>");
+    formData.append("custom", "<?php echo empty($_POST['custom']) ? null : $_POST['custom']; ?>");
+    formData.append("site_survey_contact_verify", "<?php echo empty($_POST['site_survey_contact_verify']) ? '' : $_POST['site_survey_contact_verify']; ?>");
+    formData.append("real_arrival_date_start", "<?php echo empty($_POST['real_arrival_date_start']) ? null : $_POST['real_arrival_date_start']; ?>");
+    formData.append("real_arrival_date_end", "<?php echo empty($_POST['real_arrival_date_end']) ? null : $_POST['real_arrival_date_end']; ?>");
+    formData.append("area_no", "<?php echo empty($_POST['area_no']) ? null : $_POST['area_no']; ?>");
+    formData.append("erro_mesage_search", "<?php echo empty($_POST['erro_mesage_search']) ? null : $_POST['erro_mesage_search']; ?>");
+
+    function generateButton() {
+        var xhr = new XMLHttpRequest();
+        xhr.open('POST', window.location.origin + "/wms/wipwholeinstall-index-export-excel.php?<?= $token_link ?>", true);
+        xhr.responseType = 'text';
+        xhr.onload = function() {
+            if (xhr.status === 200) {
+                var response = xhr.responseText;
+                var file_path = xhr.responseText;
+                var link = document.createElement('a');
+                link.setAttribute('href', window.location.origin + "/wms/excel/wipwholeintall.xlsx");
+                link.setAttribute('download', '出貨預定表(新梯).xlsx');
+                link.style.display = 'none';
+                document.body.appendChild(link);
+                link.click();
+                document.body.removeChild(link);
+            }
+        };
+        xhr.send(formData);
+    }
+
+    // 清除所有搜尋 input
+    function clean_all_input() {
+        document.getElementById("site_survey_contact_verify").value = "";
+        document.getElementById("contractno").value = "";
+        document.getElementById("facilityno").value = "";
+        document.getElementById("custom").value = "";
+        document.getElementById("real_arrival_date_start").value = "";
+        document.getElementById("real_arrival_date_end").value = "";
+        document.getElementById("myForm").submit();
+    }
+
+    // 45 天內查詢 (預計出貨日)
+    function day_before_input() {
+        document.getElementById("contractno").value = "";
+        document.getElementById("facilityno").value = "";
+        document.getElementById("custom").value = "";
+        document.getElementById("real_arrival_date_start").value = "<?php echo date("Y-m-d"); ?>";
+        document.getElementById("real_arrival_date_end").value = "<?php echo date("Y-m-d", strtotime("+" . $numberOfDaysToAdd . " days")) ?>";
+        document.getElementById("myForm").submit();
+    }
+
+    // 45 天內查詢含今天以前所有日期 (預計出貨日)
+    function day_before_all_input() {
+        document.getElementById("contractno").value = "";
+        document.getElementById("facilityno").value = "";
+        document.getElementById("custom").value = "";
+        document.getElementById("real_arrival_date_start").value = "";
+        document.getElementById("real_arrival_date_end").value = "<?php echo date("Y-m-d", strtotime("+" . $numberOfDaysToAdd . " days")) ?>";
+        document.getElementById("myForm").submit();
+    }
+
+
+    // 設置 datatable.js
+    $('#table_index2').DataTable({
+            scrollX: true,
+            fixedHeader: true,
+            scrollY: 500,
+            "language": {
+                "emptyTable": "無資料...",
+                "processing": "處理中...",
+                "loadingRecords": "載入中...",
+                "lengthMenu": "顯示_MENU_　筆",
+                "zeroRecords": "沒有符合的結果",
+                "info": "第 _START_ 至 _END_ 項，共 _TOTAL_ 項",
+                "infoEmpty": "第 0 至 0 項，共 0 項",
+                "infoFiltered": "(從 _MAX_ 項結果中過濾)",
+                "infoPostFix": "",
+                "search": "",
+                "paginate": {
+                    "first": "第一頁",
+                    "previous": "上一頁",
+                    "next": "下一頁",
+                    "last": "最後一頁"
+                },
+                "aria": {
+                    "sortAscending": ": 升冪排列",
+                    "sortDescending": ": 降冪排列"
+                }
+            }
+        }, {
+            "order": [
+                [4, "desc"],
+                [8, "asc"]
+            ]
+        }
+
+    );
+    document.querySelector("#table_index2_filter > label > input").placeholder = "快速搜尋";
+
+    // datatable 畫面重整後保留資料
+
+    var contractno = $("#contractno").val();
+    var facilityno = $("#facilityno").val();
+    var custom = $("#custom").val();
+    var site_survey_contact_verify = $("#site_survey_contact_verify").val();
+    var real_arrival_date_start = $("#real_arrival_date_start").val();
+    var real_arrival_date_end = $("#real_arrival_date_end").val();
+    var area_no = $("#area_no").val();
+    var erro_mesage_search = $('input[name=erro_mesage_search]:checked').val();
+
+    var showNum = <?php echo empty($_GET['showNum']) ? '10' : $_GET['showNum']; ?>;
+    var nowPage = <?php echo empty($_GET['nowPage']) ? '1' : $_GET['nowPage']; ?>;
+    var searchContent = "<?php echo empty($_GET['searchContent']) ? '' : $_GET['searchContent']; ?>";
+    var orderColumn = "<?php echo empty($_GET['orderColumn']) ? '' : $_GET['orderColumn']; ?>";
+    var orderDirection = "<?php echo empty($_GET['orderDirection']) ? '' : $_GET['orderDirection']; ?>";
+
+    var table = $('#table_index2').DataTable();
+
+    // 设置排序信息
+    if (orderColumn !== '' && orderDirection !== '') {
+        table.order([orderColumn, orderDirection]).draw();
+    }
+
+    table.search(searchContent).draw();
+    table.page.len(showNum).draw();
+    table.page((nowPage) - 1).draw('page');
+
+    // 監聽排序
+    table.on('order.dt', function() {
+        var order = table.order();
+        orderColumn = order[0][0];
+        orderDirection = order[0][1];
+    });
+
+    // 監聽頁碼
+    table.on('page.dt', function() {
+        searchDatatable(table);
+    });
+
+    // 監聽資料筆數
+    table.on('length.dt', function(e, settings, len) {
+        searchDatatable(table);
+    });
+
+    // 監聽搜尋事件
+    $("#table_index2_filter > label > input").change(function() {
+        searchDatatable(table);
+    });
+
+    function searchDatatable(table) {
+        showNum = table.page.len();
+        nowPage = table.page.info().page + 1;
+        searchContent = table.search();
+        window.location.href = "<?php echo "wipwholeinstall-index.php?function_name=wipinstall&$token_link"; ?>" +
+            "&showNum=" + showNum + "&nowPage=" + nowPage + "&searchContent=" + searchContent +
+            "&orderColumn=" + orderColumn + "&orderDirection=" + orderDirection +
+            "&contractno=" + contractno + "&facilityno=" + facilityno + "&custom=" + custom +
+            "&site_survey_contact_verify=" + site_survey_contact_verify + "&real_arrival_date_start=" + real_arrival_date_start +
+            "&real_arrival_date_end=" + real_arrival_date_end + "&area_no=" + area_no + "&erro_mesage_search=" + erro_mesage_search;
+    }
 </script>
\ No newline at end of file
diff --git a/wms/wipwholeinstall-renovate-index-export-excel.php b/wms/wipwholeinstall-renovate-index-export-excel.php
index 702992f7..41342d30 100644
--- a/wms/wipwholeinstall-renovate-index-export-excel.php
+++ b/wms/wipwholeinstall-renovate-index-export-excel.php
@@ -1,201 +1,201 @@
-<?php
-// ini_set('display_errors', 'on');
-
-include "database.php";
-include "fun_global.php";
-$token = $_REQUEST["token"];
-$token_link = "token=" . $_REQUEST["token"];
-list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
-$user_name = urldecode(base64_decode($enc_user_name));
-include "wipwholeinstall-renovate-index-function.php";
-
-// require dirname(__DIR__) . '/wms/excel/vendor/autoload.php';
-require dirname(__DIR__) . '/common/composer/vendor/autoload.php';
-
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
-use PhpOffice\PhpSpreadsheet\Style\Fill;
-
-//數字轉英文(0=>A、1=>B、26=>AA...以此類推)
-function num2alpha($n)
-{
-    for ($r = ""; $n >= 0; $n = intval($n / 26) - 1)
-        $r = chr($n % 26 + 0x41) . $r;
-    return $r;
-}
-
-//英文轉數字(A=>0、B=>1、AA=>26...以此類推)
-function alpha2num($a)
-{
-    $l = strlen($a);
-    $n = 0;
-    for ($i = 0; $i < $l; $i++)
-        $n = $n * 26 + ord($a[$i]) - 0x40;
-    return $n - 1;
-}
-
-function getArea($address)
-{
-    $address = mb_substr($address, 0, 2);
-    if (in_array($address, ['宜蘭', '花蓮', '台東']))
-        return '宜花東';
-    if (in_array($address, ['臺北', '台北', '基隆', '新北']))
-        return '北區';
-    if (in_array($address, ['桃園', '新竹']))
-        return '桃竹';
-    if (in_array($address, ['南投', '臺中', '台中', '彰化', '雲林', '苗栗']))
-        return '中區';
-    if (in_array($address, ['台南', '臺南', '嘉義', '屏東', '高雄']))
-        return '南區';
-}
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-
-    $contractno = empty($_POST['contractno']) ? null : $_POST['contractno'];
-    $facilityno = empty($_POST['facilityno']) ? null : $_POST['facilityno'];
-    $custom = empty($_POST['custom']) ? null : $_POST['custom'];
-    $site_survey_contact_verify = !isset($_POST['site_survey_contact_verify']) ? '' : $_POST['site_survey_contact_verify'];
-    $real_contract_arrival_date_start = empty($_POST['real_contract_arrival_date_start']) ? null : $_POST['real_contract_arrival_date_start'];
-    $real_contract_arrival_date_end = empty($_POST['real_contract_arrival_date_end']) ? null : $_POST['real_contract_arrival_date_end'];
-    $area_no = !isset($_POST['area_no']) ? '' : $_POST['area_no'];
-
-    // 取得當前使用者所屬部門
-    $department_id = getDepartmentId($link, $user_id);
-    // 取得當前使用者所屬職位
-    $role_id = getRoleId($link, $user_id);
-
-    $sql = getDataSql($department_id, $user_id, "A");
-
-    $result = mysqli_query($link, $sql);
-    if ($result) {
-        $data = array();
-        while ($row = $result->fetch_assoc()) {
-            $data[] = $row;
-        }
-        $result->close();
-    } else {
-        echo "Query failed: " . $connection->error;
-    }
-
-    // 建立一個新的 Spreadsheet 物件
-    $spreadsheet = new Spreadsheet();
-    $sheet = $spreadsheet->getActiveSheet();
-    $colTitleArr = [
-        '區域',
-        '合約號',
-        '作番號',
-        '汰改方案',
-        '客戶名稱',
-        '合約地址',
-        '工地地址',
-        '規格',
-        '依合約客戶需求日',
-        '實際到廠日(觀音廠)',
-        '預計出貨日(到工地)',
-        '實際出貨日(到工地)',
-        '工勘確認',
-        '工勘確認日',
-        '安裝廠商',
-        '實際發包日',
-        '預計開工日',
-        '實際開工日',
-        '預計完工日',
-        '實際完工日',
-        '試車廠商',
-        '實際發包日',
-        '預計開工日',
-        '實際開工日',
-        '預計完工日',
-        '實際完工日',
-        '內部QC日',
-        'QC合格日',
-        '官檢日',
-        '移交日',
-        '營業人員'
-    ];
-
-    $sheet->setTitle('汰改出貨預定表');
-    for ($i = 0; $i < count($colTitleArr); $i++)
-        $sheet->setCellValue(num2alpha($i) . '1', $colTitleArr[$i]);
-
-
-    $i = 2;
-    foreach ($data as $row) {
-
-        $two_row_status = false;
-        if (!empty($row['install_outsourcer']) && !empty($row['tryrun_outsourcer']))
-            $two_row_status = true;
-        if (!empty($row['install_outsourcer_date']) && !empty($row['tryrun_outsourcer_date']))
-            $two_row_status = true;
-        if (!empty($row['install_start_date']) && !empty($row['tryrun_start_date']))
-            $two_row_status = true;
-        if (!empty($row['estimate_install_end_date']) && !empty($row['estimate_tryrun_end_date']))
-            $two_row_status = true;
-
-        //規格
-        $Specification = $row['facility_kind'];
-        $Specification .= !empty($row['numberofpassenger']) ? "-" . $row['numberofpassenger'] : "";
-        $Specification .= !empty($row['weight']) ? "-" . $row['weight'] : "";
-        $Specification .= !empty($row['numberofstop']) ? "-" . $row['numberofstop'] : "";
-        $Specification .= !empty($row['numberoffloor']) ? "/" . $row['numberoffloor'] : "";
-        $Specification .= !empty($row['opentype']) ? "-" . $row['opentype'] : "";
-        $Specification .= !empty($row['speed']) ? $row['speed'] : "";
-
-        // 工務統計已確認
-        $gongwuok = 0;
-        if ($row['building_heigh_verify'] == 0)
-            $gongwuok += 1;
-        // if ($row['site_survey_contact_verify'] == 0)
-        if (!in_array($row['site_survey_contact_verify'], ['1', 'A']))
-            $gongwuok += 1;
-
-        $colContentArr = [
-            getArea($row['address']),
-            $row['contractno'],
-            $row['facilityno'],
-            implode("+", json_decode($row['renovate_type'])),
-            $row['custom'],
-            $row['address'],
-            $row['real_address'],
-            $Specification,
-            substr($row['contract_arrival_date'], 0, 10),
-            substr($row['actual_tofactory_date'], 0, 10),
-            substr($row['real_contract_arrival_date'], 0, 10),
-            substr($row['real_arrival_date'], 0, 10),
-            getGunwuName($row['address']) . $gongwuok . "/2",
-            substr($row['site_survey_contact_verify_at'], 0, 10),
-            $row['install_outsourcer'],
-            substr($row['install_outsourcer_date'], 0, 10),
-            substr($row['estimate_install_start_date'], 0, 10),
-            substr($row['install_start_date'], 0, 10),
-            substr($row['estimate_install_end_date'], 0, 10),
-            substr($row['install_end_date'], 0, 10),
-            $row['tryrun_outsourcer'],
-            substr($row['tryrun_outsourcer_date'], 0, 10),
-            substr($row['estimate_tryrun_start_date'], 0, 10),
-            substr($row['tryrun_start_date'], 0, 10),
-            substr($row['estimate_tryrun_end_date'], 0, 10),
-            substr($row['tryrun_end_date'], 0, 10),
-            substr($row['qc_date'], 0, 10),
-            substr($row['end_qc_date'], 0, 10),
-            substr($row['official_check_date'], 0, 10),
-            substr($row['delivery_date'], 0, 10),
-            accountidToName($row['salesid'])
-        ];
-        for ($j = 0; $j < count($colContentArr); $j++) {
-            $sheet->setCellValue(num2alpha($j) . $i, $colContentArr[$j]);
-        }
-        $i++;
-    }
-
-
-    $writer = new Xlsx($spreadsheet);
-    $file_path = dirname(__DIR__) . '/wms/excel/' . 'wipwholeintall.xlsx';
-    try {
-        $writer->save($file_path);
-        // 回傳檔案路徑給 JavaScript
-        echo $file_path;
-    } catch (Exception $e) {
-        echo 'Error: ' . $e->getMessage();
-    }
-    exit();
-}
+<?php
+// ini_set('display_errors', 'on');
+
+include "database.php";
+include "fun_global.php";
+$token = $_REQUEST["token"];
+$token_link = "token=" . $_REQUEST["token"];
+list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
+$user_name = urldecode(base64_decode($enc_user_name));
+include "wipwholeinstall-renovate-index-function.php";
+
+// require dirname(__DIR__) . '/wms/excel/vendor/autoload.php';
+require dirname(__DIR__) . '/common/composer/vendor/autoload.php';
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+
+//數字轉英文(0=>A、1=>B、26=>AA...以此類推)
+function num2alpha($n)
+{
+    for ($r = ""; $n >= 0; $n = intval($n / 26) - 1)
+        $r = chr($n % 26 + 0x41) . $r;
+    return $r;
+}
+
+//英文轉數字(A=>0、B=>1、AA=>26...以此類推)
+function alpha2num($a)
+{
+    $l = strlen($a);
+    $n = 0;
+    for ($i = 0; $i < $l; $i++)
+        $n = $n * 26 + ord($a[$i]) - 0x40;
+    return $n - 1;
+}
+
+function getArea($address)
+{
+    $address = mb_substr($address, 0, 2);
+    if (in_array($address, ['宜蘭', '花蓮', '台東']))
+        return '宜花東';
+    if (in_array($address, ['臺北', '台北', '基隆', '新北']))
+        return '北區';
+    if (in_array($address, ['桃園', '新竹']))
+        return '桃竹';
+    if (in_array($address, ['南投', '臺中', '台中', '彰化', '雲林', '苗栗']))
+        return '中區';
+    if (in_array($address, ['台南', '臺南', '嘉義', '屏東', '高雄']))
+        return '南區';
+}
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+
+    $contractno = empty($_POST['contractno']) ? null : $_POST['contractno'];
+    $facilityno = empty($_POST['facilityno']) ? null : $_POST['facilityno'];
+    $custom = empty($_POST['custom']) ? null : $_POST['custom'];
+    $site_survey_contact_verify = !isset($_POST['site_survey_contact_verify']) ? '' : $_POST['site_survey_contact_verify'];
+    $real_contract_arrival_date_start = empty($_POST['real_contract_arrival_date_start']) ? null : $_POST['real_contract_arrival_date_start'];
+    $real_contract_arrival_date_end = empty($_POST['real_contract_arrival_date_end']) ? null : $_POST['real_contract_arrival_date_end'];
+    $area_no = !isset($_POST['area_no']) ? '' : $_POST['area_no'];
+
+    // 取得當前使用者所屬部門
+    $department_id = getDepartmentId($link, $user_id);
+    // 取得當前使用者所屬職位
+    $role_id = getRoleId($link, $user_id);
+
+    $sql = getDataSql($department_id, $user_id, "A");
+
+    $result = mysqli_query($link, $sql);
+    if ($result) {
+        $data = array();
+        while ($row = $result->fetch_assoc()) {
+            $data[] = $row;
+        }
+        $result->close();
+    } else {
+        echo "Query failed: " . $connection->error;
+    }
+
+    // 建立一個新的 Spreadsheet 物件
+    $spreadsheet = new Spreadsheet();
+    $sheet = $spreadsheet->getActiveSheet();
+    $colTitleArr = [
+        '區域',
+        '合約號',
+        '作番號',
+        '汰改方案',
+        '客戶名稱',
+        '合約地址',
+        '工地地址',
+        '規格',
+        '依合約客戶需求日',
+        '實際到廠日(觀音廠)',
+        '預計出貨日(到工地)',
+        '實際出貨日(到工地)',
+        '工勘確認',
+        '工勘確認日',
+        '安裝廠商',
+        '實際發包日',
+        '預計開工日',
+        '實際開工日',
+        '預計完工日',
+        '實際完工日',
+        '試車廠商',
+        '實際發包日',
+        '預計開工日',
+        '實際開工日',
+        '預計完工日',
+        '實際完工日',
+        '內部QC日',
+        'QC合格日',
+        '官檢日',
+        '移交日',
+        '營業人員'
+    ];
+
+    $sheet->setTitle('汰改出貨預定表');
+    for ($i = 0; $i < count($colTitleArr); $i++)
+        $sheet->setCellValue(num2alpha($i) . '1', $colTitleArr[$i]);
+
+
+    $i = 2;
+    foreach ($data as $row) {
+
+        $two_row_status = false;
+        if (!empty($row['install_outsourcer']) && !empty($row['tryrun_outsourcer']))
+            $two_row_status = true;
+        if (!empty($row['install_outsourcer_date']) && !empty($row['tryrun_outsourcer_date']))
+            $two_row_status = true;
+        if (!empty($row['install_start_date']) && !empty($row['tryrun_start_date']))
+            $two_row_status = true;
+        if (!empty($row['estimate_install_end_date']) && !empty($row['estimate_tryrun_end_date']))
+            $two_row_status = true;
+
+        //規格
+        $Specification = $row['facility_kind'];
+        $Specification .= !empty($row['numberofpassenger']) ? "-" . $row['numberofpassenger'] : "";
+        $Specification .= !empty($row['weight']) ? "-" . $row['weight'] : "";
+        $Specification .= !empty($row['numberofstop']) ? "-" . $row['numberofstop'] : "";
+        $Specification .= !empty($row['numberoffloor']) ? "/" . $row['numberoffloor'] : "";
+        $Specification .= !empty($row['opentype']) ? "-" . $row['opentype'] : "";
+        $Specification .= !empty($row['speed']) ? $row['speed'] : "";
+
+        // 工務統計已確認
+        $gongwuok = 0;
+        if ($row['building_heigh_verify'] == 0)
+            $gongwuok += 1;
+        // if ($row['site_survey_contact_verify'] == 0)
+        if (!in_array($row['site_survey_contact_verify'], ['1', 'A']))
+            $gongwuok += 1;
+
+        $colContentArr = [
+            getArea($row['address']),
+            $row['contractno'],
+            $row['facilityno'],
+            implode("+", json_decode($row['renovate_type'])),
+            $row['custom'],
+            $row['address'],
+            $row['real_address'],
+            $Specification,
+            substr($row['contract_arrival_date'], 0, 10),
+            substr($row['actual_tofactory_date'], 0, 10),
+            substr($row['real_contract_arrival_date'], 0, 10),
+            substr($row['real_arrival_date'], 0, 10),
+            getGunwuName($row['address']) . $gongwuok . "/2",
+            substr($row['site_survey_contact_verify_at'], 0, 10),
+            $row['install_outsourcer'],
+            substr($row['install_outsourcer_date'], 0, 10),
+            substr($row['estimate_install_start_date'], 0, 10),
+            substr($row['install_start_date'], 0, 10),
+            substr($row['estimate_install_end_date'], 0, 10),
+            substr($row['install_end_date'], 0, 10),
+            $row['tryrun_outsourcer'],
+            substr($row['tryrun_outsourcer_date'], 0, 10),
+            substr($row['estimate_tryrun_start_date'], 0, 10),
+            substr($row['tryrun_start_date'], 0, 10),
+            substr($row['estimate_tryrun_end_date'], 0, 10),
+            substr($row['tryrun_end_date'], 0, 10),
+            substr($row['qc_date'], 0, 10),
+            substr($row['end_qc_date'], 0, 10),
+            substr($row['official_check_date'], 0, 10),
+            substr($row['delivery_date'], 0, 10),
+            accountidToName($row['salesid'])
+        ];
+        for ($j = 0; $j < count($colContentArr); $j++) {
+            $sheet->setCellValue(num2alpha($j) . $i, $colContentArr[$j]);
+        }
+        $i++;
+    }
+
+
+    $writer = new Xlsx($spreadsheet);
+    $file_path = dirname(__DIR__) . '/wms/excel/' . 'wipwholeintall.xlsx';
+    try {
+        $writer->save($file_path);
+        // 回傳檔案路徑給 JavaScript
+        echo $file_path;
+    } catch (Exception $e) {
+        echo 'Error: ' . $e->getMessage();
+    }
+    exit();
+}
diff --git a/wms/wipwholeinstall-renovate-index-function.php b/wms/wipwholeinstall-renovate-index-function.php
index 36aa79bf..7572ab4e 100644
--- a/wms/wipwholeinstall-renovate-index-function.php
+++ b/wms/wipwholeinstall-renovate-index-function.php
@@ -1,1172 +1,1172 @@
-<?php
-
-function getWipwholestatusData($link, $id)
-{
-    $db_query = "
-        SELECT * FROM wipwholestatus 
-        WHERE id='$id'
-        AND status = '1'
-    ";
-    $receivabledata = mysqli_query($link, $db_query);
-    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
-}
-
-function getWipwholeSearchSql()
-{
-
-    $area = [
-        'Y' => " '宜蘭','花蓮','台東' ",
-        'N' => " '臺北', '台北', '基隆', '新北' ",
-        'T' => " '桃園', '新竹' ",
-        'C' => " '南投', '臺中', '台中', '彰化', '雲林', '苗栗' ",
-        'K' => " '台南', '臺南', '嘉義', '屏東', '高雄' "
-    ];
-
-    $contractno = empty($_REQUEST['contractno']) ? null : trim($_REQUEST['contractno']);
-    $facilityno = empty($_REQUEST['facilityno']) ? null : trim($_REQUEST['facilityno']);
-    $custom = empty($_REQUEST['custom']) ? null : trim($_REQUEST['custom']);
-    $site_survey_contact_verify = !isset($_REQUEST['site_survey_contact_verify']) ? null : trim($_REQUEST['site_survey_contact_verify']);
-    $real_arrival_date_start = empty($_REQUEST['real_arrival_date_start']) ? null : trim($_REQUEST['real_arrival_date_start']);
-    $real_arrival_date_end = empty($_REQUEST['real_arrival_date_end']) ? null : trim($_REQUEST['real_arrival_date_end']);
-    $area_no = empty($_REQUEST['area_no']) ? null : trim($_REQUEST['area_no']);
-
-    $sql = "";
-    $sql .= empty($area_no) ? "" : " AND SUBSTR(address,1,2) IN (" . $area[$area_no] . ") ";
-    $sql .= empty($contractno) ? "" : " AND contractno LIKE '%$contractno%' ";
-    $sql .= empty($facilityno) ? "" : " AND facilityno LIKE '%$facilityno%' ";
-    $sql .= empty($custom) ? "" : " AND custom LIKE '%$custom%' ";
-    $sql .= $site_survey_contact_verify == "" ? "" : " AND site_survey_contact_verify = '" . $site_survey_contact_verify . "' ";
-    $sql .= empty($real_arrival_date_start) ? "" : " AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') >= '$real_arrival_date_start' ";
-    $sql .= empty($real_arrival_date_end) ? "" : " AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') <= '$real_arrival_date_end' ";
-
-    return $sql;
-}
-
-function getDepartmentId($link, $user_id)
-{
-    $sql = "
-        SELECT 
-            department_id
-        FROM account 
-        WHERE accountid = '$user_id'
-    ";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_row($res);
-    mysqli_free_result($res);
-    return $row[0];
-}
-
-function getRoleId($link, $user_id)
-{
-    $sql = "
-        SELECT 
-            role_id 
-        FROM account 
-        WHERE accountid = '$user_id'
-    ";
-    $res = mysqli_query($link, $sql);
-    $row = mysqli_fetch_row($res);
-    mysqli_free_result($res);
-    return $row[0];
-}
-
-function getEditFlag($department_id, $role_id, $user_id)
-{
-    // 業務部門
-    if ($department_id == "321")
-        return 8;
-    // 鍾哥(生管) 部門代碼:250 職位大小:1 4
-    if ($department_id == "250" && (in_array($role_id, ["1", "4"])))
-        return  8;
-    // 許協理 部門代碼:320 職位大小:1
-    if ($department_id == "320" && $role_id == "1")
-        return  8;
-    // 詹總 部門代碼:50 職位大小:1
-    if ($department_id == "50" && $role_id == "1")
-        return 8;
-    // 許總 部門代碼:20 職位大小:1
-    if ($department_id == "20" && $role_id == "1")
-        return 8;
-    // 安裝開發支援部
-    if ($department_id == "542")
-        return 4;
-    // 設計
-    if ($department_id == "911")
-        return 2;
-    // 品証
-    if ($department_id == "912")
-        return 4;
-    // 宜蘭工務
-    if ($user_id == 'M0087')
-        return  4;
-    // 北區工務組長 
-    if ($user_id == 'M0040'  || $user_id == 'M0176')
-        return  4;
-    // 中區工務組長
-    if ($user_id == 'M0113' || $user_id == 'M0158')
-        return  4;
-    // 南區工務組長    
-    if ($user_id == 'M0039' || $user_id == 'M0078')
-        return  4;
-    // 工務處 工務助理
-    if ($department_id == '50' && $role_id == '2')
-        return  4;
-    // 服務支援部 工務助理
-    if ($department_id == '501' && $role_id == '2')
-        return  4;
-    // 北區營銷部	工務助理
-    if ($department_id == '311' && $role_id == '4')
-        return  4;
-    // 中區營銷部 工務助理
-    if ($department_id == '313' && $role_id == '3')
-        return  4;
-    // 南區營銷部	工務助理
-    if ($department_id == '314' && $role_id == '4')
-        return  4;
-    // 宜花東營銷部	工務助理
-    if ($department_id == '315' && $role_id == '2')
-        return  4;
-    // 安裝開發支援部 工務助理
-    if ($department_id == '521' && $role_id == '11')
-        return  4;
-    // 宜花東營銷部 工務助理
-    if ($department_id == '315' && $role_id == '2')
-        return  4;
-    // 工務部門
-    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545]))
-        return  4;
-    // 財會部門
-    if ($department_id == '210')
-        return  4;
-    $sql_cmd = sql_myself($user_id, "salesid");
-    // 營業員主管或營業員
-    if (!empty($sql_cmd))
-        return 1;
-    return 15;
-}
-
-function getDataSql($department_id, $role_id, $user_id)
-{
-    // 合約類型
-    $contract_type = 'B';
-
-    // 營業員主管或營業員
-    $department_arr = [
-        '310', '311', '312', '313', '314', '315',
-        '320', '501', '50',
-        '511', '512', '513', '514', '515',
-        '521', '541', '542', '543', '544', '545'
-    ];
-
-    // 工務助理專員
-    // 工務處 工務助理
-    if ($department_id == '50' && $role_id == '2') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 服務支援部 工務助理
-    if ($department_id == '501' && $role_id == '2') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 北區營銷部	工務助理
-    if ($department_id == '311' && $role_id == '4') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 中區營銷部 工務助理
-    if ($department_id == '313' && $role_id == '3') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 南區營銷部	工務助理
-    if ($department_id == '314' && $role_id == '4') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 宜花東營銷部	工務助理
-    if ($department_id == '315' && $role_id == '2') {
-        $sql = "
-                SELECT * FROM  wipwholestatus 
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                AND SUBSTR(address,1,2) in ('宜蘭','花蓮','台東','臺東')
-                ORDER BY real_contract_arrival_date DESC
-            ";
-        return $sql;
-    }
-    // 安裝開發支援部 工務助理
-    if ($department_id == '521' && $role_id == '11') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 宜花東營銷部 工務助理
-    if ($department_id == '315' && $role_id == '2') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('宜蘭','花蓮','台東')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-
-
-    if (in_array($department_id, $department_arr)) {
-        // 北區營銷部 營銷專案經理 311 1
-        //           新梯營銷經理 311 3
-        // 桃竹營銷部 銷售專案經理 312 1
-        // 中區營銷部 新梯營銷經理 313 1
-        // 南區營銷部 銷售專案經理 314 2
-        // 花東區營銷部 銷售專案經理 315 2
-        if ($department_id == '311' && (in_array($role_id, ['1', '3']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '312' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '313' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '314' && (in_array($role_id, ['2']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-        if ($department_id == '315' && (in_array($role_id, ['1']))) {
-            $sql = "
-                SELECT * FROM wipwholestatus
-                WHERE 1=1 
-                AND status = '1'
-                AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-                ORDER BY real_contract_arrival_date ASC
-            ";
-            return $sql;
-        }
-
-        $sql_cmd = sql_myself($user_id, "salesid");
-        $sql = "
-            SELECT * FROM wipwholestatus $sql_cmd 
-        ";
-        $sql .= empty($sql_cmd) ? " WHERE 1=1 AND status = '1' AND contract_type = '$contract_type' " : "AND status = '1' AND contract_type = '$contract_type'";
-        $sql .= getWipwholeSearchSql();
-        $sql .= "ORDER BY real_contract_arrival_date DESC ";
-    }
-    // 鍾哥 部門代碼:250 職位大小:1 4
-    // 許協理 部門代碼:320 職位大小:1
-    // 張主任 部門代碼:322 職位大小:1
-    // 詹總 部門代碼:50 職位大小:1
-    // 許總 部門代碼:20 職位大小:1
-    // 業務部門 部門代碼:321
-    // 服務支援部門 部門代碼:501
-    // 財會部門 部門代碼:210
-    // 品証部門 部門代碼:912
-    $department_arr = ['911', '250', '320', '50', '20', '321', '322', '220', '501', '210', '912'];
-    if (in_array($department_id, $department_arr)) {
-        $sql = "
-            SELECT * FROM wipwholestatus
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date ASC
-        ";
-        return $sql;
-    }
-    // (宜蘭)工務組長
-    if ($user_id == 'M0087') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('宜蘭')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 北區工務組長
-    if ($user_id == 'M0041' || $user_id == 'M0176') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 中區工務組長
-    if ($user_id == 'M0113' || $user_id == 'M0158') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 南區工務組長
-    if ($user_id == 'M0039' || $user_id == 'M0078') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 工務
-    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545])) {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    return $sql;
-}
-
-function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code)
-{
-    $flow_code_tmp = explode(',', $flow_code);
-    $flow_code = implode("','", $flow_code_tmp);
-    // 合約類型
-    $contract_type = 'A';
-    // 營業員主管或營業員
-    $department_arr = ['310', '311', '312', '313', '314', '315'];
-    if (in_array($department_id, $department_arr)) {
-        $sql_cmd = sql_myself($user_id, "salesid");
-        $sql = "
-            SELECT * FROM wipwholestatus $sql_cmd 
-        ";
-        $sql .= empty($sql_cmd) ? " WHERE 1=1 AND contract_type = '$contract_type' " : " AND contract_type = '$contract_type'";
-        $sql .= "
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')        
-            )
-        ";
-        $sql .= getWipwholeSearchSql();
-        $sql .= "ORDER BY real_contract_arrival_date DESC ";
-    }
-
-    // 鍾哥 部門代碼:250 職位大小:1 4
-    // 許協理 部門代碼:320 職位大小:1
-    // 張主任 部門代碼:322 職位大小:1
-    // 詹總 部門代碼:50 職位大小:1
-    // 許總 部門代碼:20 職位大小:1
-    // 業務部門 部門代碼:321
-    // 服務支援部 部門代碼:501
-    // 財會部門 部門代碼:210
-    // 品証部門 部門代碼:912
-    $department_arr = ['911', '250', '320', '50', '20', '321', '220', '322', '501', '210', '912'];
-    if (in_array($department_id, $department_arr)) {
-        $sql = "
-            SELECT * FROM wipwholestatus
-            WHERE 1=1 
-            AND status = '1'
-            AND contract_type = '$contract_type'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')           
-            )
-        " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date ASC
-        ";
-        return $sql;
-    }
-
-    // (宜蘭)工務組長
-    if ($user_id == 'M0087') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')             
-            )
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('宜蘭')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 北區工務組長
-    if ($user_id == 'M0041' || $user_id == 'M0176') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')             
-            )
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 中區工務組長
-    if ($user_id == 'M0113' || $user_id == 'M0158') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')           
-            )
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 南區工務組長
-    if ($user_id == 'M0039' || $user_id == 'M0078') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')            
-            )
-            AND contract_type = '$contract_type'
-        " . getWipwholeSearchSql() . "
-            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-    // 工務
-    if ($department_id == '521' || $department_id == '531') {
-        $sql = "
-            SELECT * FROM  wipwholestatus 
-            WHERE 1=1 
-            AND status = '1'
-            AND id IN (
-                SELECT 
-                    form_id AS id
-                FROM flow 
-                WHERE system_id = 'wws' 
-                AND flow_id = 'wws01' 
-                AND flow_code IN ('$flow_code')           
-            )
-            AND contract_type = '$contract_type'
-            " . getWipwholeSearchSql() . "
-            ORDER BY real_contract_arrival_date DESC
-        ";
-        return $sql;
-    }
-
-    return $sql;
-}
-
-// 取得本次簽核的表單id值
-function getId($link, $form_key)
-{
-    $sql = "
-        SELECT form_id AS id FROM flow
-        WHERE form_key = '$form_key'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row['id'];
-}
-
-// 取得本次簽核的表單form_key值 (營業與設計流程)
-function getYDForm_key($link, $form_id)
-{
-    $sql = "
-        SELECT 
-            f.form_key
-        FROM flow AS f
-        LEFT JOIN subflow AS s
-        ON f.form_key = s.form_key
-        WHERE 1=1
-        AND f.form_id = '$form_id' 
-        AND f.flow_code IN ('A','B','C','D')
-        AND f.system_id = 'wws'
-        AND f.flow_id = 'wws01'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return empty($row['form_key']) ? 0 : $row['form_key'];
-}
-
-// 取得本次簽核的表單form_key值 (工務流程))
-function getGForm_key($link, $form_id)
-{
-    $sql = "
-        SELECT 
-            f.form_key
-        FROM flow AS f
-        LEFT JOIN subflow AS s
-        ON f.form_key = s.form_key
-        WHERE 1=1
-        AND f.form_id = '$form_id' 
-        AND f.flow_code IN ('G','H')
-        AND f.system_id = 'wws'
-        AND f.flow_id = 'wws01'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return empty($row['form_key']) ? 0 : $row['form_key'];
-}
-
-// 修正時間欄位
-function fixTime($time)
-{
-    return empty($time) ? '0000T00:00:00' : date('Y-m-d', strtotime($time)) . "T" . date('H:i:s', strtotime($time));
-}
-
-// 修正時間欄位 若是空值則帶入現在時間戳記
-function fixTimeToNow($time)
-{
-    return empty($time) ? date("Y-m-d") . "T" . date("H:i:s") : date('Y-m-d', strtotime($time)) . "T" . date('H:i:s', strtotime($time));
-}
-
-// 檢查營業階段
-function checkYingYeok($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(sales_spec_verify != '2',sales_spec_verify,'0') AS SIGNED) +
-                CAST(IF(customer_planning_verify != '2',customer_planning_verify,'0') AS SIGNED) +
-                CAST(IF(customer_color_verify != '2',customer_color_verify,'0') AS SIGNED) +
-                CAST(IF(customer_style_verify != '2',customer_style_verify,'0') AS SIGNED) +
-                CAST(IF(site_survey_contact_form_verify != '2',site_survey_contact_form_verify,'0') AS SIGNED) 
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND status = '1'
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 檢查設計階段
-function checkSheJiok($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(desin_spec_verify != '2' ,desin_spec_verify,'0') AS SIGNED) +
-                CAST(IF(desin_planning_verify != '2' ,desin_planning_verify,'0') AS SIGNED) +
-                CAST(IF(desin_color_verify != '2' ,desin_color_verify,'0') AS SIGNED) +
-                CAST(IF(desin_style_verify != '2' ,desin_style_verify,'0') AS SIGNED) 
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND status = '1'
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 檢查設計主管階段
-function checkSheJiokLeader($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(desin_leader_verify != '2',desin_leader_verify,'0') AS SIGNED) 
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND status = '1'
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 檢查工務階段
-function checkGongWuok($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(building_heigh_verify != '2',building_heigh_verify,'0') AS SIGNED)
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND status = '1'
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 檢查生管階段
-function checkShengGuanok($link, $id)
-{
-    $sql = "
-        SELECT 
-            SUM(
-                CAST(IF(shengguanok_status != '2',shengguanok_status,'0') AS SIGNED)+
-                CAST(IF(prattford_order_date_verify != '2' ,prattford_order_date_verify,'0') AS SIGNED) +
-                CAST(IF(estimated_shipping_date_verify != '2' ,estimated_shipping_date_verify,'0') AS SIGNED) +
-                CAST(IF(estimated_shipping_schedule_date_verify != '2' ,estimated_shipping_schedule_date_verify,'0') AS SIGNED) +
-                CAST(IF(goods_type = 'A' || goods_type = 'C' ,'0','1') AS SIGNED) +
-                CAST(IF(taiwan_goods_type = 'A' || taiwan_goods_type = 'C' ,'0','1') AS SIGNED) +
-                CAST(IF(arrival_date_verify = 'A' ,'0','1') AS SIGNED) 
-            ) AS sum_num
-        FROM wipwholestatus
-        WHERE 1=1
-        AND status = '1'
-        AND id = '$id'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 取得設計部主管編號
-function getSheJiokLeaderNo($link)
-{
-    $sql = "
-        SELECT accountid 
-        FROM `account` 
-        WHERE `department_id` = '911'
-        AND `role_id` = '1';    
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 取得工務部主管編號
-function getGongWuokNo($link)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key']))
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-    $sql = "
-        SELECT DISTINCT 
-            SUBSTR(address,1,2)
-        FROM `wipwholestatus`
-        WHERE id = '$id'
-        AND status = '1'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    // 宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
-    $arr = array(
-        "宜蘭" => "M0087",
-        "北" => "M0041",
-        "台北" => "M0041",
-        "基隆" => "M0041",
-        "新北" => "M0041",
-        "新竹" => "M0041",
-        "桃園" => "M0041",
-        "苗栗" => "M0113",
-        "中" => "M0113",
-        "南投" => "M0113",
-        "台中" => "M0113",
-        "彰化" => "M0113",
-        "雲林" => "M0113",
-        "南" => "M0102",
-        "台南" => "M0102",
-        "嘉義" => "M0102",
-        "屏東" => "M0102",
-        "高雄" => "M0102"
-    );
-    return empty($arr[$row[0]]) ? "" : $arr[$row[0]];
-}
-
-// 取得生管部主管編號
-function getShengGuanokLeaderNo($link)
-{
-    $sql = "
-        SELECT accountid 
-        FROM `account` 
-        WHERE `department_id` = '321'
-        AND `role_id` = '1';    
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return $row[0];
-}
-
-// 確認目前狀態 (營業設計)
-function checkNowFormYDStatus($link)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key'])) {
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-    }
-    $sql = "
-        SELECT
-            flow_code
-        FROM flow
-        WHERE form_id = '$id'
-        AND flow_code IN ('A','B','C','D')
-        AND system_id = 'wws'
-        AND flow_id = 'wws01'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return empty($row['0']) ? 'Z' : $row['0'];
-}
-
-// 確認目前狀態 (工務)
-function checkNowFormGStatus($link)
-{
-    if (isset($_GET['id']) || isset($_GET['form_key'])) {
-        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
-    }
-    $sql = "
-        SELECT
-            flow_code
-        FROM flow
-        WHERE form_id = '$id'
-        AND flow_code IN ('G','H')
-        AND system_id = 'wws'
-        AND flow_id = 'wws01'
-    ";
-    $result = mysqli_query($link, $sql);
-    $row = mysqli_fetch_array($result);
-    return empty($row['0']) ? 'Z' : $row['0'];
-}
-
-// 取得資訊的欄位權限
-function getInformationStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    return "disabled";
-}
-
-// 取得業務的欄位權限
-function getYewuStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 321)
-        return "";
-    return "disabled";
-}
-
-// 取得工務的欄位權限
-function getWarehouseStatus($link, $user_department_id, $role_id)
-{
-    // 工務處 工務助理
-    if ($user_department_id == '50' && $role_id == '2')
-        return "";
-    // 服務支援部 工務助理
-    if ($user_department_id == '501' && $role_id == '2')
-        return "";
-    // 北區營銷部	工務助理
-    if ($user_department_id == '311' && $role_id == '4')
-        return "";
-    // 中區營銷部 工務助理
-    if ($user_department_id == '313' && $role_id == '3')
-        return "";
-    // 南區營銷部	工務助理
-    if ($user_department_id == '314' && $role_id == '4')
-        return "";
-    // 宜花東營銷部	工務助理
-    if ($user_department_id == '315' && $role_id == '2')
-        return "";
-    // 安裝開發支援部 工務助理
-    if ($user_department_id == '521' && $role_id == '11')
-        return "";
-    // 宜花東營銷部 工務助理
-    if ($user_department_id == '315' && $role_id == '2')
-        return "";
-    if (in_array($user_department_id, [220]))
-        return "";
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 521 || $user_department_id == 531)
-        return checkNowFormGStatus($link) == 'G' ? "" : "disabled";
-    return "disabled";
-}
-
-// 取得營業或契約的欄位權限
-function getMarketingStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315)
-        return checkNowFormYDStatus($link) == 'A' ? "" : "disabled";
-    if ($user_department_id == 501 || $user_department_id == 511 || $user_department_id == 512 || $user_department_id == 513 || $user_department_id == 514)
-        return checkNowFormYDStatus($link) == 'A' ? "" : "disabled";
-
-    return "disabled";
-}
-
-// 取得設計的欄位權限
-function getDesinStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 911)
-        return checkNowFormYDStatus($link) == 'B' ? "" : "disabled";
-    return "disabled";
-}
-
-// 取得設計主管的欄位權限
-function getDesinLeaderStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 911)
-        return checkNowFormYDStatus($link) == 'C' && $role_id == 1 ? "" : "disabled";
-    return "disabled";
-}
-
-// 取得生管的欄位權限
-function getShengguanStatus($link, $user_department_id, $role_id)
-{
-    if ($user_department_id == 220)
-        return "";
-    if ($user_department_id == 250 && (in_array($role_id, [1, 4])))
-        return "";
-    return "disabled";
-}
-
-// 取得下方table分頁的預設分頁
-function getTabNo($user_department_id)
-{
-    if (in_array($user_department_id, [220, 311, 312, 313, 314, 315]))
-        return 0;
-    if ($user_department_id == 911)
-        return 1;
-    if ($user_department_id == 521 || $user_department_id == 531)
-        return 2;
-    if ($user_department_id == 321 || $user_department_id == 250)
-        return 3;
-    return 0;
-}
-
-// 由地址取得工務負責人
-function getGunwuName($address)
-{
-    $north_arr = array('台北', '基隆', '新北', '桃園', '新竹');
-    $north_arr2 = array('宜蘭');
-    $center_arr = array('南投', '彰化', '雲林', '台中', '苗栗');
-    $south_arr = array('台南', '嘉義', '屏東', '高雄');
-    foreach ($north_arr as $key => $value)
-        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
-            return "吳宗紘";
-    foreach ($north_arr2 as $key => $value)
-        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
-            return "高培軒";
-    foreach ($center_arr as $key => $value)
-        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
-            return "林瑋隆";
-    foreach ($south_arr as $key => $value)
-        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
-            return "鄭存邑";
-    return "";
-}
-
-function getOpendoorOptions($link)
-{
-    $sql = "
-        SELECT 
-            code_name AS val ,
-            content AS label 
-        FROM code 
-        WHERE field_name='open_kind'
-        ORDER BY label ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getYingyeokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('311','312','313','314','315')
-        ORDER BY accountid ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getShejiokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('911')
-        AND `role_id` NOT IN ('1')
-        ORDER BY accountid ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getShejiokLeaderOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('911')
-        AND `role_id` IN ('1')
-        ORDER BY accountid ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getGongwuokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('521','531')
-        ORDER BY accountid ASC
-    ";
-    return mysqli_query($link, $sql);
-}
-
-function getShengguanokOptions($link)
-{
-    $sql = "
-        SELECT 
-            accountid AS val ,
-            name AS label 
-        FROM `account` 
-        WHERE `department_id` IN ('321')
-    ";
-    return mysqli_query($link, $sql);
-}
-
-
-function warningMessage($data)
-{
-    $waringMessageArr = array(
-        '1' => '',
-        '2' => '沒有預計出貨日(到工地)',
-        '3' => '有實際完工工日，實際開工日未填寫',
-        '4' => '有實際完工工日，未填寫QC日',
-        '5' => '有實際完工工日，移交日未填寫',
-        '6' => '官檢日未填寫',
-        '7' => '官檢日不在移交日的60天內',
-        '8' => '移交日不是實際完工日+14天',
-    );
-    if (getWarningMessageStatus($data) !== 1)
-        return $waringMessageArr[getWarningMessageStatus($data)];
-    return "";
-}
-
-function getWarningMessageStatus($data)
-{
-    $real_contract_arrival_date = $data['real_contract_arrival_date'];
-
-    $install_start_date = $data['install_start_date'];
-    $install_end_date = $data['install_end_date'];
-    $tryrun_start_date = $data['tryrun_start_date'];
-    $tryrun_end_date = $data['tryrun_end_date'];
-    $tryrun_end_date_owner = $data['tryrun_end_date_owner'];
-    $estimate_install_start_date = $data['estimate_install_start_date'];
-    $estimate_install_end_date = $data['estimate_install_end_date'];
-    $estimate_tryrun_start_date = $data['estimate_tryrun_start_date'];
-    $estimate_tryrun_end_date = $data['estimate_tryrun_end_date'];
-    $official_check_date = $data['official_check_date'];
-    $delivery_date = $data['delivery_date'];
-    $qc_date = $data['qc_date'];
-    $end_qc_date = $data['end_qc_date'];
-
-    // 有任何開工/完工日期，卻沒有預計出貨日(到工地)
-    if (empty($real_contract_arrival_date)) {
-        $tmp_arr = [
-            'install_start_date',
-            'install_end_date',
-            'tryrun_start_date',
-            'tryrun_end_date',
-            'tryrun_end_date_owner',
-            'estimate_install_start_date',
-            'estimate_install_end_date',
-            'estimate_tryrun_start_date',
-            'estimate_tryrun_end_date'
-        ];
-        foreach ($tmp_arr as $row) {
-            if (!empty($data[$row])) {
-                return "2";
-            }
-        }
-    }
-    // 有實際完工日，要有實際開工日
-    if (!empty($install_end_date)) {
-        if (empty($install_start_date))
-            return "3";
-    }
-    if (!empty($tryrun_end_date)) {
-        if (empty($tryrun_start_date))
-            return "3";
-    }
-    // 有實際完工工日，要有QC日
-    if (!empty($install_end_date) || !empty($tryrun_end_date)) {
-        if (empty($qc_date) && empty($end_qc_date))
-            return "4";
-    }
-    // 有實際完工工日，移交日未填寫
-    if (!empty($install_end_date) || !empty($tryrun_end_date)) {
-        if (empty($delivery_date)) {
-            return "5";
-        }
-    }
-    // 有移交日，官檢日未填寫
-    if (!empty($delivery_date)) {
-        if (empty($official_check_date))
-            return "6";
-    }
-
-    // 有移交日，官檢日若不是移交日+60日
-    // if (!empty($delivery_date) && !empty($official_check_date)) {
-    //     $date = floor((strtotime($official_check_date) - strtotime($delivery_date)) / 86400);
-    //     if ($date <= 0 || $date > 60)
-    //         return "7";
-    // }
-
-    // 有實際完工工日，移交日若不是實際完工日+14天
-    // if (!empty($install_end_date) || !empty($tryrun_end_date)) {
-    //     $date = floor((strtotime($install_end_date) - strtotime($delivery_date)) / 86400);
-    //     if ($date <= 0 || $date > 14)
-    //         return "5";
-    // }
-
-    return "1";
-}
+<?php
+
+function getWipwholestatusData($link, $id)
+{
+    $db_query = "
+        SELECT * FROM wipwholestatus 
+        WHERE id='$id'
+        AND status = '1'
+    ";
+    $receivabledata = mysqli_query($link, $db_query);
+    return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC);
+}
+
+function getWipwholeSearchSql()
+{
+
+    $area = [
+        'Y' => " '宜蘭','花蓮','台東' ",
+        'N' => " '臺北', '台北', '基隆', '新北' ",
+        'T' => " '桃園', '新竹' ",
+        'C' => " '南投', '臺中', '台中', '彰化', '雲林', '苗栗' ",
+        'K' => " '台南', '臺南', '嘉義', '屏東', '高雄' "
+    ];
+
+    $contractno = empty($_REQUEST['contractno']) ? null : trim($_REQUEST['contractno']);
+    $facilityno = empty($_REQUEST['facilityno']) ? null : trim($_REQUEST['facilityno']);
+    $custom = empty($_REQUEST['custom']) ? null : trim($_REQUEST['custom']);
+    $site_survey_contact_verify = !isset($_REQUEST['site_survey_contact_verify']) ? null : trim($_REQUEST['site_survey_contact_verify']);
+    $real_arrival_date_start = empty($_REQUEST['real_arrival_date_start']) ? null : trim($_REQUEST['real_arrival_date_start']);
+    $real_arrival_date_end = empty($_REQUEST['real_arrival_date_end']) ? null : trim($_REQUEST['real_arrival_date_end']);
+    $area_no = empty($_REQUEST['area_no']) ? null : trim($_REQUEST['area_no']);
+
+    $sql = "";
+    $sql .= empty($area_no) ? "" : " AND SUBSTR(address,1,2) IN (" . $area[$area_no] . ") ";
+    $sql .= empty($contractno) ? "" : " AND contractno LIKE '%$contractno%' ";
+    $sql .= empty($facilityno) ? "" : " AND facilityno LIKE '%$facilityno%' ";
+    $sql .= empty($custom) ? "" : " AND custom LIKE '%$custom%' ";
+    $sql .= $site_survey_contact_verify == "" ? "" : " AND site_survey_contact_verify = '" . $site_survey_contact_verify . "' ";
+    $sql .= empty($real_arrival_date_start) ? "" : " AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') >= '$real_arrival_date_start' ";
+    $sql .= empty($real_arrival_date_end) ? "" : " AND DATE_FORMAT(real_contract_arrival_date, '%Y-%m-%d') <= '$real_arrival_date_end' ";
+
+    return $sql;
+}
+
+function getDepartmentId($link, $user_id)
+{
+    $sql = "
+        SELECT 
+            department_id
+        FROM account 
+        WHERE accountid = '$user_id'
+    ";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_row($res);
+    mysqli_free_result($res);
+    return $row[0];
+}
+
+function getRoleId($link, $user_id)
+{
+    $sql = "
+        SELECT 
+            role_id 
+        FROM account 
+        WHERE accountid = '$user_id'
+    ";
+    $res = mysqli_query($link, $sql);
+    $row = mysqli_fetch_row($res);
+    mysqli_free_result($res);
+    return $row[0];
+}
+
+function getEditFlag($department_id, $role_id, $user_id)
+{
+    // 業務部門
+    if ($department_id == "321")
+        return 8;
+    // 鍾哥(生管) 部門代碼:250 職位大小:1 4
+    if ($department_id == "250" && (in_array($role_id, ["1", "4"])))
+        return  8;
+    // 許協理 部門代碼:320 職位大小:1
+    if ($department_id == "320" && $role_id == "1")
+        return  8;
+    // 詹總 部門代碼:50 職位大小:1
+    if ($department_id == "50" && $role_id == "1")
+        return 8;
+    // 許總 部門代碼:20 職位大小:1
+    if ($department_id == "20" && $role_id == "1")
+        return 8;
+    // 安裝開發支援部
+    if ($department_id == "542")
+        return 4;
+    // 設計
+    if ($department_id == "911")
+        return 2;
+    // 品証
+    if ($department_id == "912")
+        return 4;
+    // 宜蘭工務
+    if ($user_id == 'M0087')
+        return  4;
+    // 北區工務組長 
+    if ($user_id == 'M0040'  || $user_id == 'M0176')
+        return  4;
+    // 中區工務組長
+    if ($user_id == 'M0113' || $user_id == 'M0158')
+        return  4;
+    // 南區工務組長    
+    if ($user_id == 'M0039' || $user_id == 'M0078')
+        return  4;
+    // 工務處 工務助理
+    if ($department_id == '50' && $role_id == '2')
+        return  4;
+    // 服務支援部 工務助理
+    if ($department_id == '501' && $role_id == '2')
+        return  4;
+    // 北區營銷部	工務助理
+    if ($department_id == '311' && $role_id == '4')
+        return  4;
+    // 中區營銷部 工務助理
+    if ($department_id == '313' && $role_id == '3')
+        return  4;
+    // 南區營銷部	工務助理
+    if ($department_id == '314' && $role_id == '4')
+        return  4;
+    // 宜花東營銷部	工務助理
+    if ($department_id == '315' && $role_id == '2')
+        return  4;
+    // 安裝開發支援部 工務助理
+    if ($department_id == '521' && $role_id == '11')
+        return  4;
+    // 宜花東營銷部 工務助理
+    if ($department_id == '315' && $role_id == '2')
+        return  4;
+    // 工務部門
+    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545]))
+        return  4;
+    // 財會部門
+    if ($department_id == '210')
+        return  4;
+    $sql_cmd = sql_myself($user_id, "salesid");
+    // 營業員主管或營業員
+    if (!empty($sql_cmd))
+        return 1;
+    return 15;
+}
+
+function getDataSql($department_id, $role_id, $user_id)
+{
+    // 合約類型
+    $contract_type = 'B';
+
+    // 營業員主管或營業員
+    $department_arr = [
+        '310', '311', '312', '313', '314', '315',
+        '320', '501', '50',
+        '511', '512', '513', '514', '515',
+        '521', '541', '542', '543', '544', '545'
+    ];
+
+    // 工務助理專員
+    // 工務處 工務助理
+    if ($department_id == '50' && $role_id == '2') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 服務支援部 工務助理
+    if ($department_id == '501' && $role_id == '2') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 北區營銷部	工務助理
+    if ($department_id == '311' && $role_id == '4') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 中區營銷部 工務助理
+    if ($department_id == '313' && $role_id == '3') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 南區營銷部	工務助理
+    if ($department_id == '314' && $role_id == '4') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 宜花東營銷部	工務助理
+    if ($department_id == '315' && $role_id == '2') {
+        $sql = "
+                SELECT * FROM  wipwholestatus 
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                AND SUBSTR(address,1,2) in ('宜蘭','花蓮','台東','臺東')
+                ORDER BY real_contract_arrival_date DESC
+            ";
+        return $sql;
+    }
+    // 安裝開發支援部 工務助理
+    if ($department_id == '521' && $role_id == '11') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 宜花東營銷部 工務助理
+    if ($department_id == '315' && $role_id == '2') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('宜蘭','花蓮','台東')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+
+
+    if (in_array($department_id, $department_arr)) {
+        // 北區營銷部 營銷專案經理 311 1
+        //           新梯營銷經理 311 3
+        // 桃竹營銷部 銷售專案經理 312 1
+        // 中區營銷部 新梯營銷經理 313 1
+        // 南區營銷部 銷售專案經理 314 2
+        // 花東區營銷部 銷售專案經理 315 2
+        if ($department_id == '311' && (in_array($role_id, ['1', '3']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '312' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '313' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '314' && (in_array($role_id, ['2']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+        if ($department_id == '315' && (in_array($role_id, ['1']))) {
+            $sql = "
+                SELECT * FROM wipwholestatus
+                WHERE 1=1 
+                AND status = '1'
+                AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+                ORDER BY real_contract_arrival_date ASC
+            ";
+            return $sql;
+        }
+
+        $sql_cmd = sql_myself($user_id, "salesid");
+        $sql = "
+            SELECT * FROM wipwholestatus $sql_cmd 
+        ";
+        $sql .= empty($sql_cmd) ? " WHERE 1=1 AND status = '1' AND contract_type = '$contract_type' " : "AND status = '1' AND contract_type = '$contract_type'";
+        $sql .= getWipwholeSearchSql();
+        $sql .= "ORDER BY real_contract_arrival_date DESC ";
+    }
+    // 鍾哥 部門代碼:250 職位大小:1 4
+    // 許協理 部門代碼:320 職位大小:1
+    // 張主任 部門代碼:322 職位大小:1
+    // 詹總 部門代碼:50 職位大小:1
+    // 許總 部門代碼:20 職位大小:1
+    // 業務部門 部門代碼:321
+    // 服務支援部門 部門代碼:501
+    // 財會部門 部門代碼:210
+    // 品証部門 部門代碼:912
+    $department_arr = ['911', '250', '320', '50', '20', '321', '322', '220', '501', '210', '912'];
+    if (in_array($department_id, $department_arr)) {
+        $sql = "
+            SELECT * FROM wipwholestatus
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date ASC
+        ";
+        return $sql;
+    }
+    // (宜蘭)工務組長
+    if ($user_id == 'M0087') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('宜蘭')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 北區工務組長
+    if ($user_id == 'M0041' || $user_id == 'M0176') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 中區工務組長
+    if ($user_id == 'M0113' || $user_id == 'M0158') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 南區工務組長
+    if ($user_id == 'M0039' || $user_id == 'M0078') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 工務
+    if (in_array($department_id, [521, 531, 541, 542, 543, 544, 545])) {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    return $sql;
+}
+
+function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code)
+{
+    $flow_code_tmp = explode(',', $flow_code);
+    $flow_code = implode("','", $flow_code_tmp);
+    // 合約類型
+    $contract_type = 'A';
+    // 營業員主管或營業員
+    $department_arr = ['310', '311', '312', '313', '314', '315'];
+    if (in_array($department_id, $department_arr)) {
+        $sql_cmd = sql_myself($user_id, "salesid");
+        $sql = "
+            SELECT * FROM wipwholestatus $sql_cmd 
+        ";
+        $sql .= empty($sql_cmd) ? " WHERE 1=1 AND contract_type = '$contract_type' " : " AND contract_type = '$contract_type'";
+        $sql .= "
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')        
+            )
+        ";
+        $sql .= getWipwholeSearchSql();
+        $sql .= "ORDER BY real_contract_arrival_date DESC ";
+    }
+
+    // 鍾哥 部門代碼:250 職位大小:1 4
+    // 許協理 部門代碼:320 職位大小:1
+    // 張主任 部門代碼:322 職位大小:1
+    // 詹總 部門代碼:50 職位大小:1
+    // 許總 部門代碼:20 職位大小:1
+    // 業務部門 部門代碼:321
+    // 服務支援部 部門代碼:501
+    // 財會部門 部門代碼:210
+    // 品証部門 部門代碼:912
+    $department_arr = ['911', '250', '320', '50', '20', '321', '220', '322', '501', '210', '912'];
+    if (in_array($department_id, $department_arr)) {
+        $sql = "
+            SELECT * FROM wipwholestatus
+            WHERE 1=1 
+            AND status = '1'
+            AND contract_type = '$contract_type'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')           
+            )
+        " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date ASC
+        ";
+        return $sql;
+    }
+
+    // (宜蘭)工務組長
+    if ($user_id == 'M0087') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')             
+            )
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('宜蘭')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 北區工務組長
+    if ($user_id == 'M0041' || $user_id == 'M0176') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')             
+            )
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 中區工務組長
+    if ($user_id == 'M0113' || $user_id == 'M0158') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')           
+            )
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 南區工務組長
+    if ($user_id == 'M0039' || $user_id == 'M0078') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')            
+            )
+            AND contract_type = '$contract_type'
+        " . getWipwholeSearchSql() . "
+            AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄')
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+    // 工務
+    if ($department_id == '521' || $department_id == '531') {
+        $sql = "
+            SELECT * FROM  wipwholestatus 
+            WHERE 1=1 
+            AND status = '1'
+            AND id IN (
+                SELECT 
+                    form_id AS id
+                FROM flow 
+                WHERE system_id = 'wws' 
+                AND flow_id = 'wws01' 
+                AND flow_code IN ('$flow_code')           
+            )
+            AND contract_type = '$contract_type'
+            " . getWipwholeSearchSql() . "
+            ORDER BY real_contract_arrival_date DESC
+        ";
+        return $sql;
+    }
+
+    return $sql;
+}
+
+// 取得本次簽核的表單id值
+function getId($link, $form_key)
+{
+    $sql = "
+        SELECT form_id AS id FROM flow
+        WHERE form_key = '$form_key'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row['id'];
+}
+
+// 取得本次簽核的表單form_key值 (營業與設計流程)
+function getYDForm_key($link, $form_id)
+{
+    $sql = "
+        SELECT 
+            f.form_key
+        FROM flow AS f
+        LEFT JOIN subflow AS s
+        ON f.form_key = s.form_key
+        WHERE 1=1
+        AND f.form_id = '$form_id' 
+        AND f.flow_code IN ('A','B','C','D')
+        AND f.system_id = 'wws'
+        AND f.flow_id = 'wws01'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return empty($row['form_key']) ? 0 : $row['form_key'];
+}
+
+// 取得本次簽核的表單form_key值 (工務流程))
+function getGForm_key($link, $form_id)
+{
+    $sql = "
+        SELECT 
+            f.form_key
+        FROM flow AS f
+        LEFT JOIN subflow AS s
+        ON f.form_key = s.form_key
+        WHERE 1=1
+        AND f.form_id = '$form_id' 
+        AND f.flow_code IN ('G','H')
+        AND f.system_id = 'wws'
+        AND f.flow_id = 'wws01'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return empty($row['form_key']) ? 0 : $row['form_key'];
+}
+
+// 修正時間欄位
+function fixTime($time)
+{
+    return empty($time) ? '0000T00:00:00' : date('Y-m-d', strtotime($time)) . "T" . date('H:i:s', strtotime($time));
+}
+
+// 修正時間欄位 若是空值則帶入現在時間戳記
+function fixTimeToNow($time)
+{
+    return empty($time) ? date("Y-m-d") . "T" . date("H:i:s") : date('Y-m-d', strtotime($time)) . "T" . date('H:i:s', strtotime($time));
+}
+
+// 檢查營業階段
+function checkYingYeok($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(sales_spec_verify != '2',sales_spec_verify,'0') AS SIGNED) +
+                CAST(IF(customer_planning_verify != '2',customer_planning_verify,'0') AS SIGNED) +
+                CAST(IF(customer_color_verify != '2',customer_color_verify,'0') AS SIGNED) +
+                CAST(IF(customer_style_verify != '2',customer_style_verify,'0') AS SIGNED) +
+                CAST(IF(site_survey_contact_form_verify != '2',site_survey_contact_form_verify,'0') AS SIGNED) 
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND status = '1'
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 檢查設計階段
+function checkSheJiok($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(desin_spec_verify != '2' ,desin_spec_verify,'0') AS SIGNED) +
+                CAST(IF(desin_planning_verify != '2' ,desin_planning_verify,'0') AS SIGNED) +
+                CAST(IF(desin_color_verify != '2' ,desin_color_verify,'0') AS SIGNED) +
+                CAST(IF(desin_style_verify != '2' ,desin_style_verify,'0') AS SIGNED) 
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND status = '1'
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 檢查設計主管階段
+function checkSheJiokLeader($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(desin_leader_verify != '2',desin_leader_verify,'0') AS SIGNED) 
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND status = '1'
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 檢查工務階段
+function checkGongWuok($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(building_heigh_verify != '2',building_heigh_verify,'0') AS SIGNED)
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND status = '1'
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 檢查生管階段
+function checkShengGuanok($link, $id)
+{
+    $sql = "
+        SELECT 
+            SUM(
+                CAST(IF(shengguanok_status != '2',shengguanok_status,'0') AS SIGNED)+
+                CAST(IF(prattford_order_date_verify != '2' ,prattford_order_date_verify,'0') AS SIGNED) +
+                CAST(IF(estimated_shipping_date_verify != '2' ,estimated_shipping_date_verify,'0') AS SIGNED) +
+                CAST(IF(estimated_shipping_schedule_date_verify != '2' ,estimated_shipping_schedule_date_verify,'0') AS SIGNED) +
+                CAST(IF(goods_type = 'A' || goods_type = 'C' ,'0','1') AS SIGNED) +
+                CAST(IF(taiwan_goods_type = 'A' || taiwan_goods_type = 'C' ,'0','1') AS SIGNED) +
+                CAST(IF(arrival_date_verify = 'A' ,'0','1') AS SIGNED) 
+            ) AS sum_num
+        FROM wipwholestatus
+        WHERE 1=1
+        AND status = '1'
+        AND id = '$id'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 取得設計部主管編號
+function getSheJiokLeaderNo($link)
+{
+    $sql = "
+        SELECT accountid 
+        FROM `account` 
+        WHERE `department_id` = '911'
+        AND `role_id` = '1';    
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 取得工務部主管編號
+function getGongWuokNo($link)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key']))
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+    $sql = "
+        SELECT DISTINCT 
+            SUBSTR(address,1,2)
+        FROM `wipwholestatus`
+        WHERE id = '$id'
+        AND status = '1'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    // 宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113) 南=韋宗榮(M0039)改鄭存邑(M0102)
+    $arr = array(
+        "宜蘭" => "M0087",
+        "北" => "M0041",
+        "台北" => "M0041",
+        "基隆" => "M0041",
+        "新北" => "M0041",
+        "新竹" => "M0041",
+        "桃園" => "M0041",
+        "苗栗" => "M0113",
+        "中" => "M0113",
+        "南投" => "M0113",
+        "台中" => "M0113",
+        "彰化" => "M0113",
+        "雲林" => "M0113",
+        "南" => "M0102",
+        "台南" => "M0102",
+        "嘉義" => "M0102",
+        "屏東" => "M0102",
+        "高雄" => "M0102"
+    );
+    return empty($arr[$row[0]]) ? "" : $arr[$row[0]];
+}
+
+// 取得生管部主管編號
+function getShengGuanokLeaderNo($link)
+{
+    $sql = "
+        SELECT accountid 
+        FROM `account` 
+        WHERE `department_id` = '321'
+        AND `role_id` = '1';    
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return $row[0];
+}
+
+// 確認目前狀態 (營業設計)
+function checkNowFormYDStatus($link)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key'])) {
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+    }
+    $sql = "
+        SELECT
+            flow_code
+        FROM flow
+        WHERE form_id = '$id'
+        AND flow_code IN ('A','B','C','D')
+        AND system_id = 'wws'
+        AND flow_id = 'wws01'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return empty($row['0']) ? 'Z' : $row['0'];
+}
+
+// 確認目前狀態 (工務)
+function checkNowFormGStatus($link)
+{
+    if (isset($_GET['id']) || isset($_GET['form_key'])) {
+        $id = isset($_GET['id']) ? $_GET['id'] : getId($link, $_GET['form_key']);
+    }
+    $sql = "
+        SELECT
+            flow_code
+        FROM flow
+        WHERE form_id = '$id'
+        AND flow_code IN ('G','H')
+        AND system_id = 'wws'
+        AND flow_id = 'wws01'
+    ";
+    $result = mysqli_query($link, $sql);
+    $row = mysqli_fetch_array($result);
+    return empty($row['0']) ? 'Z' : $row['0'];
+}
+
+// 取得資訊的欄位權限
+function getInformationStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    return "disabled";
+}
+
+// 取得業務的欄位權限
+function getYewuStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 321)
+        return "";
+    return "disabled";
+}
+
+// 取得工務的欄位權限
+function getWarehouseStatus($link, $user_department_id, $role_id)
+{
+    // 工務處 工務助理
+    if ($user_department_id == '50' && $role_id == '2')
+        return "";
+    // 服務支援部 工務助理
+    if ($user_department_id == '501' && $role_id == '2')
+        return "";
+    // 北區營銷部	工務助理
+    if ($user_department_id == '311' && $role_id == '4')
+        return "";
+    // 中區營銷部 工務助理
+    if ($user_department_id == '313' && $role_id == '3')
+        return "";
+    // 南區營銷部	工務助理
+    if ($user_department_id == '314' && $role_id == '4')
+        return "";
+    // 宜花東營銷部	工務助理
+    if ($user_department_id == '315' && $role_id == '2')
+        return "";
+    // 安裝開發支援部 工務助理
+    if ($user_department_id == '521' && $role_id == '11')
+        return "";
+    // 宜花東營銷部 工務助理
+    if ($user_department_id == '315' && $role_id == '2')
+        return "";
+    if (in_array($user_department_id, [220]))
+        return "";
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 521 || $user_department_id == 531)
+        return checkNowFormGStatus($link) == 'G' ? "" : "disabled";
+    return "disabled";
+}
+
+// 取得營業或契約的欄位權限
+function getMarketingStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 311 || $user_department_id == 312 || $user_department_id == 313 || $user_department_id == 314 || $user_department_id == 315)
+        return checkNowFormYDStatus($link) == 'A' ? "" : "disabled";
+    if ($user_department_id == 501 || $user_department_id == 511 || $user_department_id == 512 || $user_department_id == 513 || $user_department_id == 514)
+        return checkNowFormYDStatus($link) == 'A' ? "" : "disabled";
+
+    return "disabled";
+}
+
+// 取得設計的欄位權限
+function getDesinStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 911)
+        return checkNowFormYDStatus($link) == 'B' ? "" : "disabled";
+    return "disabled";
+}
+
+// 取得設計主管的欄位權限
+function getDesinLeaderStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 911)
+        return checkNowFormYDStatus($link) == 'C' && $role_id == 1 ? "" : "disabled";
+    return "disabled";
+}
+
+// 取得生管的欄位權限
+function getShengguanStatus($link, $user_department_id, $role_id)
+{
+    if ($user_department_id == 220)
+        return "";
+    if ($user_department_id == 250 && (in_array($role_id, [1, 4])))
+        return "";
+    return "disabled";
+}
+
+// 取得下方table分頁的預設分頁
+function getTabNo($user_department_id)
+{
+    if (in_array($user_department_id, [220, 311, 312, 313, 314, 315]))
+        return 0;
+    if ($user_department_id == 911)
+        return 1;
+    if ($user_department_id == 521 || $user_department_id == 531)
+        return 2;
+    if ($user_department_id == 321 || $user_department_id == 250)
+        return 3;
+    return 0;
+}
+
+// 由地址取得工務負責人
+function getGunwuName($address)
+{
+    $north_arr = array('台北', '基隆', '新北', '桃園', '新竹');
+    $north_arr2 = array('宜蘭');
+    $center_arr = array('南投', '彰化', '雲林', '台中', '苗栗');
+    $south_arr = array('台南', '嘉義', '屏東', '高雄');
+    foreach ($north_arr as $key => $value)
+        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
+            return "吳宗紘";
+    foreach ($north_arr2 as $key => $value)
+        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
+            return "高培軒";
+    foreach ($center_arr as $key => $value)
+        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
+            return "林瑋隆";
+    foreach ($south_arr as $key => $value)
+        if (mb_strpos($address, $value, 0, "UTF-8") !== false)
+            return "鄭存邑";
+    return "";
+}
+
+function getOpendoorOptions($link)
+{
+    $sql = "
+        SELECT 
+            code_name AS val ,
+            content AS label 
+        FROM code 
+        WHERE field_name='open_kind'
+        ORDER BY label ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getYingyeokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('311','312','313','314','315')
+        ORDER BY accountid ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getShejiokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('911')
+        AND `role_id` NOT IN ('1')
+        ORDER BY accountid ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getShejiokLeaderOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('911')
+        AND `role_id` IN ('1')
+        ORDER BY accountid ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getGongwuokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('521','531')
+        ORDER BY accountid ASC
+    ";
+    return mysqli_query($link, $sql);
+}
+
+function getShengguanokOptions($link)
+{
+    $sql = "
+        SELECT 
+            accountid AS val ,
+            name AS label 
+        FROM `account` 
+        WHERE `department_id` IN ('321')
+    ";
+    return mysqli_query($link, $sql);
+}
+
+
+function warningMessage($data)
+{
+    $waringMessageArr = array(
+        '1' => '',
+        '2' => '沒有預計出貨日(到工地)',
+        '3' => '有實際完工工日，實際開工日未填寫',
+        '4' => '有實際完工工日，未填寫QC日',
+        '5' => '有實際完工工日，移交日未填寫',
+        '6' => '官檢日未填寫',
+        '7' => '官檢日不在移交日的60天內',
+        '8' => '移交日不是實際完工日+14天',
+    );
+    if (getWarningMessageStatus($data) !== 1)
+        return $waringMessageArr[getWarningMessageStatus($data)];
+    return "";
+}
+
+function getWarningMessageStatus($data)
+{
+    $real_contract_arrival_date = $data['real_contract_arrival_date'];
+
+    $install_start_date = $data['install_start_date'];
+    $install_end_date = $data['install_end_date'];
+    $tryrun_start_date = $data['tryrun_start_date'];
+    $tryrun_end_date = $data['tryrun_end_date'];
+    $tryrun_end_date_owner = $data['tryrun_end_date_owner'];
+    $estimate_install_start_date = $data['estimate_install_start_date'];
+    $estimate_install_end_date = $data['estimate_install_end_date'];
+    $estimate_tryrun_start_date = $data['estimate_tryrun_start_date'];
+    $estimate_tryrun_end_date = $data['estimate_tryrun_end_date'];
+    $official_check_date = $data['official_check_date'];
+    $delivery_date = $data['delivery_date'];
+    $qc_date = $data['qc_date'];
+    $end_qc_date = $data['end_qc_date'];
+
+    // 有任何開工/完工日期，卻沒有預計出貨日(到工地)
+    if (empty($real_contract_arrival_date)) {
+        $tmp_arr = [
+            'install_start_date',
+            'install_end_date',
+            'tryrun_start_date',
+            'tryrun_end_date',
+            'tryrun_end_date_owner',
+            'estimate_install_start_date',
+            'estimate_install_end_date',
+            'estimate_tryrun_start_date',
+            'estimate_tryrun_end_date'
+        ];
+        foreach ($tmp_arr as $row) {
+            if (!empty($data[$row])) {
+                return "2";
+            }
+        }
+    }
+    // 有實際完工日，要有實際開工日
+    if (!empty($install_end_date)) {
+        if (empty($install_start_date))
+            return "3";
+    }
+    if (!empty($tryrun_end_date)) {
+        if (empty($tryrun_start_date))
+            return "3";
+    }
+    // 有實際完工工日，要有QC日
+    if (!empty($install_end_date) || !empty($tryrun_end_date)) {
+        if (empty($qc_date) && empty($end_qc_date))
+            return "4";
+    }
+    // 有實際完工工日，移交日未填寫
+    if (!empty($install_end_date) || !empty($tryrun_end_date)) {
+        if (empty($delivery_date)) {
+            return "5";
+        }
+    }
+    // 有移交日，官檢日未填寫
+    if (!empty($delivery_date)) {
+        if (empty($official_check_date))
+            return "6";
+    }
+
+    // 有移交日，官檢日若不是移交日+60日
+    // if (!empty($delivery_date) && !empty($official_check_date)) {
+    //     $date = floor((strtotime($official_check_date) - strtotime($delivery_date)) / 86400);
+    //     if ($date <= 0 || $date > 60)
+    //         return "7";
+    // }
+
+    // 有實際完工工日，移交日若不是實際完工日+14天
+    // if (!empty($install_end_date) || !empty($tryrun_end_date)) {
+    //     $date = floor((strtotime($install_end_date) - strtotime($delivery_date)) / 86400);
+    //     if ($date <= 0 || $date > 14)
+    //         return "5";
+    // }
+
+    return "1";
+}
diff --git a/wms/wipwholeinstall-renovate-index-table-html.php b/wms/wipwholeinstall-renovate-index-table-html.php
index 7846457c..5d7bf3b5 100644
--- a/wms/wipwholeinstall-renovate-index-table-html.php
+++ b/wms/wipwholeinstall-renovate-index-table-html.php
@@ -1,241 +1,252 @@
-<table id="table_index2" class="table table-striped table-bordered" style="width:98.5%">
-    <thead>
-        <tr>
-            <th style="vertical-align: middle;text-align:center;width:70px;"><span id="th_1">汰改<br />種類</span></th>
-            <th style="vertical-align: middle;text-align:center;width:150px;">電梯編號</th>
-            <th style="vertical-align: middle;text-align:center;width:150px;">客戶姓名</th>
-            <th style="vertical-align: middle;text-align:center;width:250px;">合約地址</th>
-            <th style="vertical-align: middle;text-align:center;width:250px;">地工地址</th>
-            <th style="vertical-align: middle;text-align:center;width:250px;">警示</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">預計出貨日</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">發包廠商(工勘)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">發包日期(工勘)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">預計開工日(工勘)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">實際開工日(工勘)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">預計完工日(工勘)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">實際完工日(工勘)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">QC日(品證)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">QC合格日(品證)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">官檢日(品證)</th>
-            <th style="vertical-align: middle;text-align:center;width:140px;">移交日(營業)</th>
-            <th style="vertical-align: middle;text-align:center;width:120px;">營業人員</th>
-            <th style="vertical-align: middle;text-align:center;width:120px;">編輯</th>
-        </tr>
-    </thead>
-    <tbody>
-        <?php
-
-        foreach ($dataDetailsArr as $key => $data) :
-        ?>
-            <tr>
-                <td>
-                    <?php
-                    // 汰改 json 轉字串組合 ex M1+M2
-                    echo implode("+", json_decode($data['renovate_type']));
-                    ?>
-                </td>
-                <td><?php echo $data['facilityno']; ?></td>
-                <td><?php echo $data['custom']; ?></td>
-                <td><?php echo $data['address']; ?></td>
-                <td><?php echo $data['real_address']; ?></td>
-                <td style="text-align:left;"><span class="text-danger"><?php echo warningMessage($data); ?></span></td>
-                <td><?php echo substr($data['real_contract_arrival_date'], 0, 10); ?></td>
-                <?php
-                // foreach ($site_survey_status as $key => $val) {
-                //     if ((string)$data['site_survey_contact_verify'] == (string)$key) {
-                //         if (in_array($data['site_survey_contact_verify'], ['1', 'A'])) {
-                //             echo "<td style='color:#F00;'>$val</td>";
-                //         } else {
-                //             echo "<td>$val</td>";
-                //         }
-                //     }
-                // }
-                ?>
-                <td>
-                    <?php
-                    if (!empty($data['install_outsourcer']) && !empty($data['tryrun_outsourcer'])) {
-                        echo "安裝:" . $data['install_outsourcer'];
-                        echo "<br/>試車:" . $data['tryrun_outsourcer'];
-                    } else {
-                        if (!empty($data['install_outsourcer']))
-                            echo "安裝:" . $data['install_outsourcer'];
-                        if (!empty($data['tryrun_outsourcer']))
-                            echo "<br/>試車:" . $data['tryrun_outsourcer'];
-                    }
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['install_outsourcer_date']) && !empty($data['tryrun_outsourcer_date'])) {
-                        echo date("Y/m/d", strtotime($data['install_outsourcer_date']));
-                        echo "<br/>" . date("Y/m/d", strtotime($data['tryrun_outsourcer_date']));
-                    } else {
-                        if (!empty($data['install_outsourcer_date']))
-                            echo date("Y/m/d", strtotime($data['install_outsourcer_date'])) . "<br/>　";
-                        if (!empty($data['tryrun_outsourcer_date']))
-                            echo "　<br/>" . date("Y/m/d", strtotime($data['tryrun_outsourcer_date']));
-                    }
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['estimate_install_start_date']) && !empty($data['estimate_tryrun_start_date'])) {
-                        echo date("Y/m/d", strtotime($data['estimate_install_start_date']));
-                        echo "<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_start_date']));
-                    } else {
-                        if (!empty($data['estimate_install_start_date']))
-                            echo date("Y/m/d", strtotime($data['estimate_install_start_date'])) . "<br/>　";
-                        if (!empty($data['estimate_tryrun_start_date']))
-                            echo "　<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_start_date']));
-                    }
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['install_start_date']) && !empty($data['tryrun_start_date'])) {
-                        echo date("Y/m/d", strtotime($data['install_start_date']));
-                        echo "<br/>" . date("Y/m/d", strtotime($data['tryrun_start_date']));
-                    } else {
-                        if (!empty($data['install_start_date']))
-                            echo date("Y/m/d", strtotime($data['install_start_date'])) . "<br/>　";
-                        if (!empty($data['tryrun_start_date']))
-                            echo "　<br/>" . date("Y/m/d", strtotime($data['tryrun_start_date']));
-                    }
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['estimate_install_end_date']) && !empty($data['estimate_tryrun_end_date'])) {
-                        echo date("Y/m/d", strtotime($data['estimate_install_end_date']));
-                        echo "<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_end_date']));
-                    } else {
-                        if (!empty($data['estimate_install_end_date']))
-                            echo date("Y/m/d", strtotime($data['estimate_install_end_date'])) . "<br/>　";
-                        if (!empty($data['estimate_tryrun_end_date']))
-                            echo "　<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_end_date']));
-                    }
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['install_end_date']) && !empty($data['tryrun_end_date'])) {
-                        echo date("Y/m/d", strtotime($data['install_end_date']));
-                        echo "<br/>" . date("Y/m/d", strtotime($data['tryrun_end_date']));
-                    } else {
-                        if (!empty($data['install_end_date']))
-                            echo date("Y/m/d", strtotime($data['install_end_date'])) . "<br/>　";
-                        if (!empty($data['tryrun_end_date']))
-                            echo "　<br/>" . date("Y/m/d", strtotime($data['tryrun_end_date']));
-                    }
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['qc_date']))
-                        echo date("Y/m/d", strtotime($data['qc_date']));
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['end_qc_date']))
-                        echo date("Y/m/d", strtotime($data['end_qc_date']));
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['official_check_date']))
-                        echo date("Y/m/d", strtotime($data['official_check_date']));
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['delivery_date']))
-                        echo date("Y/m/d", strtotime($data['delivery_date']));
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if (!empty($data['salesid']))
-                        echo accountidToName($data['salesid']);
-                    ?>
-                </td>
-                <td>
-                    <?php
-                    if ($edit_flag & 4 && ($user_auth & 2)) {
-                    ?>
-                        <p>
-                            <a target='_blank' href="wipwhole-renovate-rec-invoice-edit.php?function_name=wipwholestatus&<?php echo $token_link; ?>&id=<?php echo $data['id']; ?>" class="btn btn-primary btn-sm">
-                                <?php
-                                echo getGunwuName($data['address']);
-                                ?>
-                            </a>
-                        </p>
-                    <?php
-                    } else {
-                        echo getGunwuName($data['address']);
-                    }
-                    ?>
-                </td>
-            </tr>
-        <?php endforeach; ?>
-    </tbody>
-</table>
-<script>
-
-    const subContentDiv = document.createElement("div");
-    subContentDiv.style.position = "relative";
-    subContentDiv.style.top = 0;
-    subContentDiv.style.left = 0;
-    document.body.appendChild(subContentDiv);
-
-    const subContentInsideDiv = document.createElement("div");
-    subContentInsideDiv.style.position = "absolute";
-    subContentInsideDiv.style.top = 0;
-    subContentInsideDiv.style.left = 0;
-    subContentInsideDiv.style.width = "200px";
-    subContentInsideDiv.style.height = "100px";
-    subContentInsideDiv.style.border = "1px solid blue";
-    subContentInsideDiv.style.display = "none";
-    subContentInsideDiv.style.zIndex = 999;
-    subContentInsideDiv.style.backgroundColor = "#FFFFFF";
-    subContentInsideDiv.style.border = "5px solid #000";
-    subContentInsideDiv.style.borderRadius = "15px";
-
-    $("#th_1").hover(function() {
-        var p = $("#th_1").first();
-        var position = p.position();
-        // alert(position.top + '' + position.left)
-        $("#subContentInsideDiv").show();
-        $("#subContentDiv").css("top", position.top);
-        $("#subContentDiv").css("left", position.left);
-    }, function() {
-        $("#subContentInsideDiv").hide();
-    });
-</script>
-<!-- <style>
-    #subContentDiv {
-        position: relative;
-        top: 0;
-        left: 0;
-    }
-
-    #subContentInsideDiv {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 200px;
-        height: 100px;
-        border: 1px solid blue;
-        display: none;
-        z-index: 999;
-        background-color: #FFFFFF;
-        border: 5px solid #000;
-        border-radius: 15px;
-    }
-</style> -->
-
-<!-- <div id="subContentDiv">
-    <div id="subContentInsideDiv">
-
-    </div>
+<table id="table_index2" class="table table-striped table-bordered" style="width:98.5%">
+    <thead>
+        <tr>
+            <th style="vertical-align: middle;text-align:center;width:70px;"><span id="th_1">汰改<br />種類</span></th>
+            <th style="vertical-align: middle;text-align:center;width:150px;">電梯編號</th>
+            <th style="vertical-align: middle;text-align:center;width:150px;">客戶姓名</th>
+            <th style="vertical-align: middle;text-align:center;width:250px;">合約地址</th>
+            <th style="vertical-align: middle;text-align:center;width:250px;">地工地址</th>
+            <th style="vertical-align: middle;text-align:center;width:250px;">警示</th>
+            <th style="text-align:center;width:100px;">實際到廠日(觀音廠)</th>
+            <th style="text-align:center;width:100px;">預計出貨日(到工地)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">發包廠商(工勘)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">發包日期(工勘)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">預計開工日(工勘)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">實際開工日(工勘)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">預計完工日(工勘)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">實際完工日(工勘)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">QC日(品證)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">QC合格日(品證)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">官檢日(品證)</th>
+            <th style="vertical-align: middle;text-align:center;width:140px;">移交日(營業)</th>
+            <th style="vertical-align: middle;text-align:center;width:120px;">營業人員</th>
+            <th style="vertical-align: middle;text-align:center;width:120px;">編輯</th>
+        </tr>
+    </thead>
+    <tbody>
+        <?php
+
+        foreach ($dataDetailsArr as $key => $data) :
+        ?>
+            <tr>
+                <td>
+                    <?php
+                    // 汰改 json 轉字串組合 ex M1+M2
+                    echo implode("+", json_decode($data['renovate_type']));
+                    ?>
+                </td>
+                <td><?php echo $data['facilityno']; ?></td>
+                <td><?php echo $data['custom']; ?></td>
+                <td><?php echo $data['address']; ?></td>
+                <td><?php echo $data['real_address']; ?></td>
+                <td style="text-align:left;"><span class="text-danger"><?php echo warningMessage($data); ?></span></td>
+                <td>
+                    <?php
+                    if (!empty($data['actual_tofactory_date']))
+                        echo date("Y/m/d", strtotime($data['actual_tofactory_date']));
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['real_contract_arrival_date']))
+                        echo date("Y/m/d", strtotime(substr($data['real_contract_arrival_date'], 0, 10)));
+                    ?>
+                </td>
+                <?php
+                // foreach ($site_survey_status as $key => $val) {
+                //     if ((string)$data['site_survey_contact_verify'] == (string)$key) {
+                //         if (in_array($data['site_survey_contact_verify'], ['1', 'A'])) {
+                //             echo "<td style='color:#F00;'>$val</td>";
+                //         } else {
+                //             echo "<td>$val</td>";
+                //         }
+                //     }
+                // }
+                ?>
+                <td>
+                    <?php
+                    if (!empty($data['install_outsourcer']) && !empty($data['tryrun_outsourcer'])) {
+                        echo "安裝:" . $data['install_outsourcer'];
+                        echo "<br/>試車:" . $data['tryrun_outsourcer'];
+                    } else {
+                        if (!empty($data['install_outsourcer']))
+                            echo "安裝:" . $data['install_outsourcer'];
+                        if (!empty($data['tryrun_outsourcer']))
+                            echo "<br/>試車:" . $data['tryrun_outsourcer'];
+                    }
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['install_outsourcer_date']) && !empty($data['tryrun_outsourcer_date'])) {
+                        echo date("Y/m/d", strtotime($data['install_outsourcer_date']));
+                        echo "<br/>" . date("Y/m/d", strtotime($data['tryrun_outsourcer_date']));
+                    } else {
+                        if (!empty($data['install_outsourcer_date']))
+                            echo date("Y/m/d", strtotime($data['install_outsourcer_date'])) . "<br/>　";
+                        if (!empty($data['tryrun_outsourcer_date']))
+                            echo "　<br/>" . date("Y/m/d", strtotime($data['tryrun_outsourcer_date']));
+                    }
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['estimate_install_start_date']) && !empty($data['estimate_tryrun_start_date'])) {
+                        echo date("Y/m/d", strtotime($data['estimate_install_start_date']));
+                        echo "<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_start_date']));
+                    } else {
+                        if (!empty($data['estimate_install_start_date']))
+                            echo date("Y/m/d", strtotime($data['estimate_install_start_date'])) . "<br/>　";
+                        if (!empty($data['estimate_tryrun_start_date']))
+                            echo "　<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_start_date']));
+                    }
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['install_start_date']) && !empty($data['tryrun_start_date'])) {
+                        echo date("Y/m/d", strtotime($data['install_start_date']));
+                        echo "<br/>" . date("Y/m/d", strtotime($data['tryrun_start_date']));
+                    } else {
+                        if (!empty($data['install_start_date']))
+                            echo date("Y/m/d", strtotime($data['install_start_date'])) . "<br/>　";
+                        if (!empty($data['tryrun_start_date']))
+                            echo "　<br/>" . date("Y/m/d", strtotime($data['tryrun_start_date']));
+                    }
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['estimate_install_end_date']) && !empty($data['estimate_tryrun_end_date'])) {
+                        echo date("Y/m/d", strtotime($data['estimate_install_end_date']));
+                        echo "<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_end_date']));
+                    } else {
+                        if (!empty($data['estimate_install_end_date']))
+                            echo date("Y/m/d", strtotime($data['estimate_install_end_date'])) . "<br/>　";
+                        if (!empty($data['estimate_tryrun_end_date']))
+                            echo "　<br/>" . date("Y/m/d", strtotime($data['estimate_tryrun_end_date']));
+                    }
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['install_end_date']) && !empty($data['tryrun_end_date'])) {
+                        echo date("Y/m/d", strtotime($data['install_end_date']));
+                        echo "<br/>" . date("Y/m/d", strtotime($data['tryrun_end_date']));
+                    } else {
+                        if (!empty($data['install_end_date']))
+                            echo date("Y/m/d", strtotime($data['install_end_date'])) . "<br/>　";
+                        if (!empty($data['tryrun_end_date']))
+                            echo "　<br/>" . date("Y/m/d", strtotime($data['tryrun_end_date']));
+                    }
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['qc_date']))
+                        echo date("Y/m/d", strtotime($data['qc_date']));
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['end_qc_date']))
+                        echo date("Y/m/d", strtotime($data['end_qc_date']));
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['official_check_date']))
+                        echo date("Y/m/d", strtotime($data['official_check_date']));
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['delivery_date']))
+                        echo date("Y/m/d", strtotime($data['delivery_date']));
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if (!empty($data['salesid']))
+                        echo accountidToName($data['salesid']);
+                    ?>
+                </td>
+                <td>
+                    <?php
+                    if ($edit_flag & 4 && ($user_auth & 2)) {
+                    ?>
+                        <p>
+                            <a target='_blank' href="wipwhole-renovate-rec-invoice-edit.php?function_name=wipwholestatus&<?php echo $token_link; ?>&id=<?php echo $data['id']; ?>" class="btn btn-primary btn-sm">
+                                <?php
+                                echo getGunwuName($data['address']);
+                                ?>
+                            </a>
+                        </p>
+                    <?php
+                    } else {
+                        echo getGunwuName($data['address']);
+                    }
+                    ?>
+                </td>
+            </tr>
+        <?php endforeach; ?>
+    </tbody>
+</table>
+<script>
+    const subContentDiv = document.createElement("div");
+    subContentDiv.style.position = "relative";
+    subContentDiv.style.top = 0;
+    subContentDiv.style.left = 0;
+    document.body.appendChild(subContentDiv);
+
+    const subContentInsideDiv = document.createElement("div");
+    subContentInsideDiv.style.position = "absolute";
+    subContentInsideDiv.style.top = 0;
+    subContentInsideDiv.style.left = 0;
+    subContentInsideDiv.style.width = "200px";
+    subContentInsideDiv.style.height = "100px";
+    subContentInsideDiv.style.border = "1px solid blue";
+    subContentInsideDiv.style.display = "none";
+    subContentInsideDiv.style.zIndex = 999;
+    subContentInsideDiv.style.backgroundColor = "#FFFFFF";
+    subContentInsideDiv.style.border = "5px solid #000";
+    subContentInsideDiv.style.borderRadius = "15px";
+
+    $("#th_1").hover(function() {
+        var p = $("#th_1").first();
+        var position = p.position();
+        // alert(position.top + '' + position.left)
+        $("#subContentInsideDiv").show();
+        $("#subContentDiv").css("top", position.top);
+        $("#subContentDiv").css("left", position.left);
+    }, function() {
+        $("#subContentInsideDiv").hide();
+    });
+</script>
+<!-- <style>
+    #subContentDiv {
+        position: relative;
+        top: 0;
+        left: 0;
+    }
+
+    #subContentInsideDiv {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 200px;
+        height: 100px;
+        border: 1px solid blue;
+        display: none;
+        z-index: 999;
+        background-color: #FFFFFF;
+        border: 5px solid #000;
+        border-radius: 15px;
+    }
+</style> -->
+
+<!-- <div id="subContentDiv">
+    <div id="subContentInsideDiv">
+
+    </div>
 </div> -->
\ No newline at end of file
diff --git a/wms/wipwholeinstall-renovate-index.php b/wms/wipwholeinstall-renovate-index.php
index 875f4fca..68844c31 100644
--- a/wms/wipwholeinstall-renovate-index.php
+++ b/wms/wipwholeinstall-renovate-index.php
@@ -1,382 +1,382 @@
-<?php
-// ini_set('display_errors', 'on');
-/**
- * 權限規則:
- * 1.工務:宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113)  南=鄭存邑(M0102)
- * 2.許協理 部門代碼:320 職位大小:1
- * 3.詹總 部門代碼:50 職位大小:1
- * 4.許總 部門代碼:20 職位大小:1
- * 
- */
-include "header.php";
-
-// 設定警告出貨到期的天數
-$numberOfDaysToAdd = 45;
-$futureDate = date("Y/m/d", strtotime(date("Y-m-d") . " +{$numberOfDaysToAdd} days"));
-
-include "wipwholeinstall-renovate-index-function.php";
-include "css/view/wipwholeinstall-index.php";
-
-// 宣告主資料空陣列
-$data = array();
-
-// 取得當前使用者所屬部門
-$department_id = getDepartmentId($link, $user_id);
-// 取得當前使用者所屬職位
-$role_id = getRoleId($link, $user_id);
-
-// 下方編輯按鈕權限
-// 4=工務
-
-$edit_flag = getEditFlag($department_id, $role_id, $user_id);
-
-// 取得當前使用者所屬部門
-$department_id = getDepartmentId($link, $user_id);
-// 取得當前使用者所屬職位
-$role_id = getRoleId($link, $user_id);
-
-// 接受搜尋 post 後觸發
-$contractno = empty($_REQUEST['contractno']) ? null : $_REQUEST['contractno'];
-$facilityno = empty($_REQUEST['facilityno']) ? null : $_REQUEST['facilityno'];
-$custom = empty($_REQUEST['custom']) ? null : $_REQUEST['custom'];
-$site_survey_contact_verify = !isset($_REQUEST['site_survey_contact_verify']) ? '' : $_REQUEST['site_survey_contact_verify'];
-$real_arrival_date_start = empty($_REQUEST['real_arrival_date_start']) ? null : $_REQUEST['real_arrival_date_start'];
-$real_arrival_date_end = empty($_REQUEST['real_arrival_date_end']) ? null : $_REQUEST['real_arrival_date_end'];
-$area_no = !isset($_REQUEST['area_no']) ? '' : $_REQUEST['area_no'];
-$erro_mesage_search = !isset($_REQUEST['erro_mesage_search']) ? 'A' : $_REQUEST['erro_mesage_search'];
-
-// 取得資料 sql
-$sql = getDataSql($department_id, $role_id, $user_id);
-$data = mysqli_query($link, $sql);
-
-$Tdata = [];
-$Fdata = [];
-
-foreach ($data as $row) {
-    if (!empty(warningMessage($row))) {
-        array_push($Tdata, $row);
-    } else {
-        array_push($Fdata, $row);
-    }
-}
-if ($erro_mesage_search == 'T')
-    $data = $Tdata;
-if ($erro_mesage_search == 'F')
-    $data = $Fdata;
-
-?>
-
-<div style="overflow-x:auto;">
-    <form id='myForm' method='post' action='wipwholeinstall-renovate-index.php?<?= $token_link ?>'>
-        <table class='table query-table table-striped table-bordered display compact' style='width:98%;text-align:center;margin:0 auto'>
-            <thead>
-                <tr>
-                    <td colspan="9">
-                        <h3 style='text-align:center'>作番安裝大日程(汰改)</h3>
-                    </td>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <th>合約號</th>
-                    <td><input type="text" class='form-control' id='contractno' name='contractno' value="<?php echo $contractno; ?>"></td>
-                    <th>電梯編號</th>
-                    <td><input type="text" class='form-control' id='facilityno' name='facilityno' value="<?php echo $facilityno; ?>"></td>
-                    <th>客戶姓名</th>
-                    <td><input type="text" class='form-control' id='custom' name='custom' value="<?php echo $custom; ?>"></td>
-                    <th>預計出貨日</th>
-                    <td colspan="2">
-                        <input type="date" class='form-control' id='real_arrival_date_start' name='real_arrival_date_start' value="<?php echo $real_arrival_date_start; ?>" style='width:40%;display:inline;'>
-                        ～
-                        <input type="date" class='form-control' id='real_arrival_date_end' name='real_arrival_date_end' value="<?php echo $real_arrival_date_end; ?>" style='width:40%;display:inline;'>
-                    </td>
-                </tr>
-                <tr>
-                    <th>
-                        區域
-                    </th>
-                    <td>
-                        <?php
-                        $area_status = array(
-                            "" => "全部",
-                            "N" => "N：北區",
-                            "Y" => "Y：宜蘭",
-                            "T" => "T：桃竹苗",
-                            "C" => "C：中區",
-                            "K" => "K：南區"
-                        );
-                        ?>
-                        <select name="area_no" id="area_no">
-                            <?php
-                            foreach ($area_status as $key => $val) {
-                                if ((string)$area_no == (string)$key) {
-                                    echo "<option value='$key' selected>$val</option>";
-                                } else {
-                                    echo "<option value='$key'>$val</option>";
-                                }
-                            }
-                            ?>
-                        </select>
-                    </td>
-                    <th>
-                        工勘狀態
-                    </th>
-                    <td>
-                        <?php
-                        $site_survey_status = array(
-                            "0" => "已確認",
-                            "1" => "未確認",
-                            "2" => "無工勘需求",
-                            "A" => "未動工",
-                            "B" => "地下室施工",
-                            "C" => "打樁",
-                            "D" => "地基",
-                            "E" => "挖土",
-                            "G" => "機房",
-                            "H" => "機械式淨高",
-                            "M" => "樓中樓",
-                            "OH" => "最高層(頂樓高度)",
-                            "P" => "PIT(機坑深度)",
-                            "R" => "R 樓",
-                            "S" => "停工",
-                            "T" => "TOP",
-                            "TC" => "頂部間隙",
-                            "TS" => "行程",
-                            "TH" => "全高",
-                            "Y" => "已搭、已出",
-                            "YB" => "退購結案",
-                            "YF" => "既有建物",
-                            "YN" => "已搭、未出"
-                        );
-                        for ($i = 1; $i < 200; $i++) {
-                            $site_survey_status[$i . "F"] = $i . "F";
-                        }
-                        ?>
-                        <select style="width:100%;" name="site_survey_contact_verify" id="site_survey_contact_verify">
-                            <?php
-                            echo "<option value=''>全部</option>";
-                            foreach ($site_survey_status as $key => $val) {
-                                if ((string)$site_survey_contact_verify == (string)$key) {
-                                    echo "<option value='$key' selected>$val</option>";
-                                } else {
-                                    echo "<option value='$key'>$val</option>";
-                                }
-                            }
-                            ?>
-                        </select>
-                    </td>
-                    <td colspan="5" style='text-align:left'>
-                        <input type="radio" name="erro_mesage_search" id='erro_mesage_search' value='A' <?php echo $erro_mesage_search == 'A' ? "checked" : ""; ?> />
-                        <label for="erro_mesage_search">全部</label>
-                        <input type="radio" name="erro_mesage_search" id='erro_mesage_search_true' value='T' <?php echo $erro_mesage_search == 'T' ? "checked" : ""; ?> />
-                        <label for="erro_mesage_search_true">已出現警示</label>
-                        <input type="radio" name="erro_mesage_search" id='erro_mesage_search_false' value='F' <?php echo $erro_mesage_search == 'F' ? "checked" : ""; ?> />
-                        <label for="erro_mesage_search_false">未出現警示</label>
-                        <button type="submit" style='text-align:center; margin:0 auto' class="btn  btn-primary btn-sm">查詢</button>
-                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='day_before_input()'><?php echo $numberOfDaysToAdd; ?>天內資料</button>
-                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='day_before_all_input()'><?php echo $numberOfDaysToAdd; ?>天內資料(含今天以前)</button>
-                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='clean_all_input()'>清除</button>
-                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='generateButton()'>匯出excel</button>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-</div>
-<?php
-$dataArr = array(
-    "All" => $data
-);
-foreach ($dataArr as $key => $val) {
-    if ($val) :
-        $dataDetailsArr = $val;
-        echo "<div id='data_" . $key . "_table_div' class='data_table_div' style='overflow-x:auto;'>";
-        include "wipwholeinstall-renovate-index-table-html.php";
-        echo "</div>";
-    endif;
-}
-
-
-// 結束連線
-mysqli_close($link);
-?>
-<link href="/wms/css/select2.min.css" rel="stylesheet" />
-<script src="/wms/css/select2.min.js"></script>
-<script src="/wms/css/dataTables.fixedColumns.min.js"></script>
-<style>
-    .dataTables_scrollHead .dataTable {
-        margin-bottom: -2px;
-    }
-
-    .dataTables_scrollBody .dataTable {
-        margin-bottom: 0;
-    }
-
-    table {
-        margin-left: 0px;
-    }
-</style>
-<script>
-    $(document).ready(function() {
-        $('#site_survey_contact_verify').select2();
-    });
-
-
-    const formData = new FormData();
-    formData.append("contractno", "<?php echo empty($_POST['contractno']) ? null : $_POST['contractno']; ?>");
-    formData.append("facilityno", "<?php echo empty($_POST['facilityno']) ? null : $_POST['facilityno']; ?>");
-    formData.append("custom", "<?php echo empty($_POST['custom']) ? null : $_POST['custom']; ?>");
-    formData.append("site_survey_contact_verify", "<?php echo empty($_POST['site_survey_contact_verify']) ? '' : $_POST['site_survey_contact_verify']; ?>");
-    formData.append("real_arrival_date_start", "<?php echo empty($_POST['real_arrival_date_start']) ? null : $_POST['real_arrival_date_start']; ?>");
-    formData.append("real_arrival_date_end", "<?php echo empty($_POST['real_arrival_date_end']) ? null : $_POST['real_arrival_date_end']; ?>");
-    formData.append("area_no", "<?php echo empty($_POST['area_no']) ? null : $_POST['area_no']; ?>");
-    formData.append("erro_mesage_search", "<?php echo empty($_POST['erro_mesage_search']) ? null : $_POST['erro_mesage_search']; ?>");
-
-    function generateButton() {
-        var xhr = new XMLHttpRequest();
-        xhr.open('POST', window.location.origin + "/wms/wipwholeinstall-renovate-index-export-excel.php?<?= $token_link ?>", true);
-        xhr.responseType = 'text';
-        xhr.onload = function() {
-            if (xhr.status === 200) {
-                var response = xhr.responseText;
-                var file_path = xhr.responseText;
-                var link = document.createElement('a');
-                link.setAttribute('href', window.location.origin + "/wms/excel/wipwholeintall.xlsx");
-                link.setAttribute('download', '出貨預定表(汰改).xlsx');
-                link.style.display = 'none';
-                document.body.appendChild(link);
-                link.click();
-                document.body.removeChild(link);
-            }
-        };
-        xhr.send(formData);
-    }
-
-    function clean_all_input() {
-        document.getElementById("site_survey_contact_verify").value = "";
-        document.getElementById("contractno").value = "";
-        document.getElementById("facilityno").value = "";
-        document.getElementById("custom").value = "";
-        document.getElementById("real_arrival_date_start").value = "";
-        document.getElementById("real_arrival_date_end").value = "";
-        document.getElementById("myForm").submit();
-    }
-
-    function day_before_input() {
-        document.getElementById("contractno").value = "";
-        document.getElementById("facilityno").value = "";
-        document.getElementById("custom").value = "";
-        document.getElementById("real_arrival_date_start").value = "<?php echo date("Y-m-d"); ?>";
-        document.getElementById("real_arrival_date_end").value = "<?php echo date("Y-m-d", strtotime("+" . $numberOfDaysToAdd . " days")) ?>";
-        document.getElementById("myForm").submit();
-    }
-
-    function day_before_all_input() {
-        document.getElementById("contractno").value = "";
-        document.getElementById("facilityno").value = "";
-        document.getElementById("custom").value = "";
-        document.getElementById("real_arrival_date_start").value = "";
-        document.getElementById("real_arrival_date_end").value = "<?php echo date("Y-m-d", strtotime("+" . $numberOfDaysToAdd . " days")) ?>";
-        document.getElementById("myForm").submit();
-    }
-
-    $('#table_index2').DataTable({
-            scrollX: true,
-            fixedHeader: true,
-            scrollY: 500,
-            "language": {
-                "emptyTable": "無資料...",
-                "processing": "處理中...",
-                "loadingRecords": "載入中...",
-                "lengthMenu": "顯示_MENU_　筆",
-                "zeroRecords": "沒有符合的結果",
-                "info": "第 _START_ 至 _END_ 項，共 _TOTAL_ 項",
-                "infoEmpty": "第 0 至 0 項，共 0 項",
-                "infoFiltered": "(從 _MAX_ 項結果中過濾)",
-                "infoPostFix": "",
-                "search": "",
-                "paginate": {
-                    "first": "第一頁",
-                    "previous": "上一頁",
-                    "next": "下一頁",
-                    "last": "最後一頁"
-                },
-                "aria": {
-                    "sortAscending": ": 升冪排列",
-                    "sortDescending": ": 降冪排列"
-                }
-            }
-        }, {
-            "order": [
-                [4, "desc"],
-                [8, "asc"]
-            ]
-        }
-
-    );
-    document.querySelector("#table_index2_filter > label > input").placeholder = "快速搜尋";
-
-    // datatable 畫面重整後保留資料
-
-    var contractno = $("#contractno").val();
-    var facilityno = $("#facilityno").val();
-    var custom = $("#custom").val();
-    var site_survey_contact_verify = $("#site_survey_contact_verify").val();
-    var real_arrival_date_start = $("#real_arrival_date_start").val();
-    var real_arrival_date_end = $("#real_arrival_date_end").val();
-    var area_no = $("#area_no").val();
-    var erro_mesage_search = $('input[name=erro_mesage_search]:checked').val();
-
-    var showNum = <?php echo empty($_GET['showNum']) ? '10' : $_GET['showNum']; ?>;
-    var nowPage = <?php echo empty($_GET['nowPage']) ? '1' : $_GET['nowPage']; ?>;
-    var searchContent = "<?php echo empty($_GET['searchContent']) ? '' : $_GET['searchContent']; ?>";
-    var orderColumn = "<?php echo empty($_GET['orderColumn']) ? '' : $_GET['orderColumn']; ?>";
-    var orderDirection = "<?php echo empty($_GET['orderDirection']) ? '' : $_GET['orderDirection']; ?>";
-
-    var table = $('#table_index2').DataTable();
-
-    // 设置排序信息
-    if (orderColumn !== '' && orderDirection !== '') {
-        table.order([orderColumn, orderDirection]).draw();
-    }
-
-    table.search(searchContent).draw();
-    table.page.len(showNum).draw();
-    table.page((nowPage) - 1).draw('page');
-
-    // 監聽排序
-    table.on('order.dt', function() {
-        var order = table.order();
-        orderColumn = order[0][0];
-        orderDirection = order[0][1];
-    });
-
-    // 監聽頁碼
-    table.on('page.dt', function() {
-        searchDatatable(table);
-    });
-
-    // 監聽資料筆數
-    table.on('length.dt', function(e, settings, len) {
-        searchDatatable(table);
-    });
-
-    // 監聽搜尋事件
-    $("#table_index2_filter > label > input").change(function() {
-        searchDatatable(table);
-    });
-
-    function searchDatatable(table) {
-        showNum = table.page.len();
-        nowPage = table.page.info().page + 1;
-        searchContent = table.search();
-        var order = table.order();
-        orderColumn = order[0][0]; // 获取排序的列索引
-        orderDirection = order[0][1]; // 获取排序的方向
-        window.location.href = "<?php echo "wipwholeinstall-renovate-index.php?function_name=wipinstall&$token_link"; ?>" +
-            "&showNum=" + showNum + "&nowPage=" + nowPage + "&searchContent=" + searchContent +
-            "&orderColumn=" + orderColumn + "&orderDirection=" + orderDirection +
-            "&contractno=" + contractno + "&facilityno=" + facilityno + "&custom=" + custom +
-            "&site_survey_contact_verify=" + site_survey_contact_verify + "&real_arrival_date_start=" + real_arrival_date_start +
-            "&real_arrival_date_end=" + real_arrival_date_end + "&area_no=" + area_no + "&erro_mesage_search=" + erro_mesage_search;
-    }
+<?php
+// ini_set('display_errors', 'on');
+/**
+ * 權限規則:
+ * 1.工務:宜蘭=高培軒(M0087) 北=張潘榮(M0041) 中=林瑋隆(M0113)  南=鄭存邑(M0102)
+ * 2.許協理 部門代碼:320 職位大小:1
+ * 3.詹總 部門代碼:50 職位大小:1
+ * 4.許總 部門代碼:20 職位大小:1
+ * 
+ */
+include "header.php";
+
+// 設定警告出貨到期的天數
+$numberOfDaysToAdd = 45;
+$futureDate = date("Y/m/d", strtotime(date("Y-m-d") . " +{$numberOfDaysToAdd} days"));
+
+include "wipwholeinstall-renovate-index-function.php";
+include "css/view/wipwholeinstall-index.php";
+
+// 宣告主資料空陣列
+$data = array();
+
+// 取得當前使用者所屬部門
+$department_id = getDepartmentId($link, $user_id);
+// 取得當前使用者所屬職位
+$role_id = getRoleId($link, $user_id);
+
+// 下方編輯按鈕權限
+// 4=工務
+
+$edit_flag = getEditFlag($department_id, $role_id, $user_id);
+
+// 取得當前使用者所屬部門
+$department_id = getDepartmentId($link, $user_id);
+// 取得當前使用者所屬職位
+$role_id = getRoleId($link, $user_id);
+
+// 接受搜尋 post 後觸發
+$contractno = empty($_REQUEST['contractno']) ? null : $_REQUEST['contractno'];
+$facilityno = empty($_REQUEST['facilityno']) ? null : $_REQUEST['facilityno'];
+$custom = empty($_REQUEST['custom']) ? null : $_REQUEST['custom'];
+$site_survey_contact_verify = !isset($_REQUEST['site_survey_contact_verify']) ? '' : $_REQUEST['site_survey_contact_verify'];
+$real_arrival_date_start = empty($_REQUEST['real_arrival_date_start']) ? null : $_REQUEST['real_arrival_date_start'];
+$real_arrival_date_end = empty($_REQUEST['real_arrival_date_end']) ? null : $_REQUEST['real_arrival_date_end'];
+$area_no = !isset($_REQUEST['area_no']) ? '' : $_REQUEST['area_no'];
+$erro_mesage_search = !isset($_REQUEST['erro_mesage_search']) ? 'A' : $_REQUEST['erro_mesage_search'];
+
+// 取得資料 sql
+$sql = getDataSql($department_id, $role_id, $user_id);
+$data = mysqli_query($link, $sql);
+
+$Tdata = [];
+$Fdata = [];
+
+foreach ($data as $row) {
+    if (!empty(warningMessage($row))) {
+        array_push($Tdata, $row);
+    } else {
+        array_push($Fdata, $row);
+    }
+}
+if ($erro_mesage_search == 'T')
+    $data = $Tdata;
+if ($erro_mesage_search == 'F')
+    $data = $Fdata;
+
+?>
+
+<div style="overflow-x:auto;">
+    <form id='myForm' method='post' action='wipwholeinstall-renovate-index.php?<?= $token_link ?>'>
+        <table class='table query-table table-striped table-bordered display compact' style='width:98%;text-align:center;margin:0 auto'>
+            <thead>
+                <tr>
+                    <td colspan="9">
+                        <h3 style='text-align:center'>作番安裝大日程(汰改)</h3>
+                    </td>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <th>合約號</th>
+                    <td><input type="text" class='form-control' id='contractno' name='contractno' value="<?php echo $contractno; ?>"></td>
+                    <th>電梯編號</th>
+                    <td><input type="text" class='form-control' id='facilityno' name='facilityno' value="<?php echo $facilityno; ?>"></td>
+                    <th>客戶姓名</th>
+                    <td><input type="text" class='form-control' id='custom' name='custom' value="<?php echo $custom; ?>"></td>
+                    <th>預計出貨日</th>
+                    <td colspan="2">
+                        <input type="date" class='form-control' id='real_arrival_date_start' name='real_arrival_date_start' value="<?php echo $real_arrival_date_start; ?>" style='width:40%;display:inline;'>
+                        ～
+                        <input type="date" class='form-control' id='real_arrival_date_end' name='real_arrival_date_end' value="<?php echo $real_arrival_date_end; ?>" style='width:40%;display:inline;'>
+                    </td>
+                </tr>
+                <tr>
+                    <th>
+                        區域
+                    </th>
+                    <td>
+                        <?php
+                        $area_status = array(
+                            "" => "全部",
+                            "N" => "N：北區",
+                            "Y" => "Y：宜蘭",
+                            "T" => "T：桃竹苗",
+                            "C" => "C：中區",
+                            "K" => "K：南區"
+                        );
+                        ?>
+                        <select name="area_no" id="area_no">
+                            <?php
+                            foreach ($area_status as $key => $val) {
+                                if ((string)$area_no == (string)$key) {
+                                    echo "<option value='$key' selected>$val</option>";
+                                } else {
+                                    echo "<option value='$key'>$val</option>";
+                                }
+                            }
+                            ?>
+                        </select>
+                    </td>
+                    <th>
+                        工勘狀態
+                    </th>
+                    <td>
+                        <?php
+                        $site_survey_status = array(
+                            "0" => "已確認",
+                            "1" => "未確認",
+                            "2" => "無工勘需求",
+                            "A" => "未動工",
+                            "B" => "地下室施工",
+                            "C" => "打樁",
+                            "D" => "地基",
+                            "E" => "挖土",
+                            "G" => "機房",
+                            "H" => "機械式淨高",
+                            "M" => "樓中樓",
+                            "OH" => "最高層(頂樓高度)",
+                            "P" => "PIT(機坑深度)",
+                            "R" => "R 樓",
+                            "S" => "停工",
+                            "T" => "TOP",
+                            "TC" => "頂部間隙",
+                            "TS" => "行程",
+                            "TH" => "全高",
+                            "Y" => "已搭、已出",
+                            "YB" => "退購結案",
+                            "YF" => "既有建物",
+                            "YN" => "已搭、未出"
+                        );
+                        for ($i = 1; $i < 200; $i++) {
+                            $site_survey_status[$i . "F"] = $i . "F";
+                        }
+                        ?>
+                        <select style="width:100%;" name="site_survey_contact_verify" id="site_survey_contact_verify">
+                            <?php
+                            echo "<option value=''>全部</option>";
+                            foreach ($site_survey_status as $key => $val) {
+                                if ((string)$site_survey_contact_verify == (string)$key) {
+                                    echo "<option value='$key' selected>$val</option>";
+                                } else {
+                                    echo "<option value='$key'>$val</option>";
+                                }
+                            }
+                            ?>
+                        </select>
+                    </td>
+                    <td colspan="5" style='text-align:left'>
+                        <input type="radio" name="erro_mesage_search" id='erro_mesage_search' value='A' <?php echo $erro_mesage_search == 'A' ? "checked" : ""; ?> />
+                        <label for="erro_mesage_search">全部</label>
+                        <input type="radio" name="erro_mesage_search" id='erro_mesage_search_true' value='T' <?php echo $erro_mesage_search == 'T' ? "checked" : ""; ?> />
+                        <label for="erro_mesage_search_true">已出現警示</label>
+                        <input type="radio" name="erro_mesage_search" id='erro_mesage_search_false' value='F' <?php echo $erro_mesage_search == 'F' ? "checked" : ""; ?> />
+                        <label for="erro_mesage_search_false">未出現警示</label>
+                        <button type="submit" style='text-align:center; margin:0 auto' class="btn  btn-primary btn-sm">查詢</button>
+                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='day_before_input()'><?php echo $numberOfDaysToAdd; ?>天內資料</button>
+                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='day_before_all_input()'><?php echo $numberOfDaysToAdd; ?>天內資料(含今天以前)</button>
+                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='clean_all_input()'>清除</button>
+                        <button type="button" style='text-align:center; margin:0 auto' class="btn btn-primary btn-sm" onclick='generateButton()'>匯出excel</button>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+</div>
+<?php
+$dataArr = array(
+    "All" => $data
+);
+foreach ($dataArr as $key => $val) {
+    if ($val) :
+        $dataDetailsArr = $val;
+        echo "<div id='data_" . $key . "_table_div' class='data_table_div' style='overflow-x:auto;'>";
+        include "wipwholeinstall-renovate-index-table-html.php";
+        echo "</div>";
+    endif;
+}
+
+
+// 結束連線
+mysqli_close($link);
+?>
+<link href="/wms/css/select2.min.css" rel="stylesheet" />
+<script src="/wms/css/select2.min.js"></script>
+<script src="/wms/css/dataTables.fixedColumns.min.js"></script>
+<style>
+    .dataTables_scrollHead .dataTable {
+        margin-bottom: -2px;
+    }
+
+    .dataTables_scrollBody .dataTable {
+        margin-bottom: 0;
+    }
+
+    table {
+        margin-left: 0px;
+    }
+</style>
+<script>
+    $(document).ready(function() {
+        $('#site_survey_contact_verify').select2();
+    });
+
+
+    const formData = new FormData();
+    formData.append("contractno", "<?php echo empty($_POST['contractno']) ? null : $_POST['contractno']; ?>");
+    formData.append("facilityno", "<?php echo empty($_POST['facilityno']) ? null : $_POST['facilityno']; ?>");
+    formData.append("custom", "<?php echo empty($_POST['custom']) ? null : $_POST['custom']; ?>");
+    formData.append("site_survey_contact_verify", "<?php echo empty($_POST['site_survey_contact_verify']) ? '' : $_POST['site_survey_contact_verify']; ?>");
+    formData.append("real_arrival_date_start", "<?php echo empty($_POST['real_arrival_date_start']) ? null : $_POST['real_arrival_date_start']; ?>");
+    formData.append("real_arrival_date_end", "<?php echo empty($_POST['real_arrival_date_end']) ? null : $_POST['real_arrival_date_end']; ?>");
+    formData.append("area_no", "<?php echo empty($_POST['area_no']) ? null : $_POST['area_no']; ?>");
+    formData.append("erro_mesage_search", "<?php echo empty($_POST['erro_mesage_search']) ? null : $_POST['erro_mesage_search']; ?>");
+
+    function generateButton() {
+        var xhr = new XMLHttpRequest();
+        xhr.open('POST', window.location.origin + "/wms/wipwholeinstall-renovate-index-export-excel.php?<?= $token_link ?>", true);
+        xhr.responseType = 'text';
+        xhr.onload = function() {
+            if (xhr.status === 200) {
+                var response = xhr.responseText;
+                var file_path = xhr.responseText;
+                var link = document.createElement('a');
+                link.setAttribute('href', window.location.origin + "/wms/excel/wipwholeintall.xlsx");
+                link.setAttribute('download', '出貨預定表(汰改).xlsx');
+                link.style.display = 'none';
+                document.body.appendChild(link);
+                link.click();
+                document.body.removeChild(link);
+            }
+        };
+        xhr.send(formData);
+    }
+
+    function clean_all_input() {
+        document.getElementById("site_survey_contact_verify").value = "";
+        document.getElementById("contractno").value = "";
+        document.getElementById("facilityno").value = "";
+        document.getElementById("custom").value = "";
+        document.getElementById("real_arrival_date_start").value = "";
+        document.getElementById("real_arrival_date_end").value = "";
+        document.getElementById("myForm").submit();
+    }
+
+    function day_before_input() {
+        document.getElementById("contractno").value = "";
+        document.getElementById("facilityno").value = "";
+        document.getElementById("custom").value = "";
+        document.getElementById("real_arrival_date_start").value = "<?php echo date("Y-m-d"); ?>";
+        document.getElementById("real_arrival_date_end").value = "<?php echo date("Y-m-d", strtotime("+" . $numberOfDaysToAdd . " days")) ?>";
+        document.getElementById("myForm").submit();
+    }
+
+    function day_before_all_input() {
+        document.getElementById("contractno").value = "";
+        document.getElementById("facilityno").value = "";
+        document.getElementById("custom").value = "";
+        document.getElementById("real_arrival_date_start").value = "";
+        document.getElementById("real_arrival_date_end").value = "<?php echo date("Y-m-d", strtotime("+" . $numberOfDaysToAdd . " days")) ?>";
+        document.getElementById("myForm").submit();
+    }
+
+    $('#table_index2').DataTable({
+            scrollX: true,
+            fixedHeader: true,
+            scrollY: 500,
+            "language": {
+                "emptyTable": "無資料...",
+                "processing": "處理中...",
+                "loadingRecords": "載入中...",
+                "lengthMenu": "顯示_MENU_　筆",
+                "zeroRecords": "沒有符合的結果",
+                "info": "第 _START_ 至 _END_ 項，共 _TOTAL_ 項",
+                "infoEmpty": "第 0 至 0 項，共 0 項",
+                "infoFiltered": "(從 _MAX_ 項結果中過濾)",
+                "infoPostFix": "",
+                "search": "",
+                "paginate": {
+                    "first": "第一頁",
+                    "previous": "上一頁",
+                    "next": "下一頁",
+                    "last": "最後一頁"
+                },
+                "aria": {
+                    "sortAscending": ": 升冪排列",
+                    "sortDescending": ": 降冪排列"
+                }
+            }
+        }, {
+            "order": [
+                [4, "desc"],
+                [8, "asc"]
+            ]
+        }
+
+    );
+    document.querySelector("#table_index2_filter > label > input").placeholder = "快速搜尋";
+
+    // datatable 畫面重整後保留資料
+
+    var contractno = $("#contractno").val();
+    var facilityno = $("#facilityno").val();
+    var custom = $("#custom").val();
+    var site_survey_contact_verify = $("#site_survey_contact_verify").val();
+    var real_arrival_date_start = $("#real_arrival_date_start").val();
+    var real_arrival_date_end = $("#real_arrival_date_end").val();
+    var area_no = $("#area_no").val();
+    var erro_mesage_search = $('input[name=erro_mesage_search]:checked').val();
+
+    var showNum = <?php echo empty($_GET['showNum']) ? '10' : $_GET['showNum']; ?>;
+    var nowPage = <?php echo empty($_GET['nowPage']) ? '1' : $_GET['nowPage']; ?>;
+    var searchContent = "<?php echo empty($_GET['searchContent']) ? '' : $_GET['searchContent']; ?>";
+    var orderColumn = "<?php echo empty($_GET['orderColumn']) ? '' : $_GET['orderColumn']; ?>";
+    var orderDirection = "<?php echo empty($_GET['orderDirection']) ? '' : $_GET['orderDirection']; ?>";
+
+    var table = $('#table_index2').DataTable();
+
+    // 设置排序信息
+    if (orderColumn !== '' && orderDirection !== '') {
+        table.order([orderColumn, orderDirection]).draw();
+    }
+
+    table.search(searchContent).draw();
+    table.page.len(showNum).draw();
+    table.page((nowPage) - 1).draw('page');
+
+    // 監聽排序
+    table.on('order.dt', function() {
+        var order = table.order();
+        orderColumn = order[0][0];
+        orderDirection = order[0][1];
+    });
+
+    // 監聽頁碼
+    table.on('page.dt', function() {
+        searchDatatable(table);
+    });
+
+    // 監聽資料筆數
+    table.on('length.dt', function(e, settings, len) {
+        searchDatatable(table);
+    });
+
+    // 監聽搜尋事件
+    $("#table_index2_filter > label > input").change(function() {
+        searchDatatable(table);
+    });
+
+    function searchDatatable(table) {
+        showNum = table.page.len();
+        nowPage = table.page.info().page + 1;
+        searchContent = table.search();
+        var order = table.order();
+        orderColumn = order[0][0]; // 获取排序的列索引
+        orderDirection = order[0][1]; // 获取排序的方向
+        window.location.href = "<?php echo "wipwholeinstall-renovate-index.php?function_name=wipinstall&$token_link"; ?>" +
+            "&showNum=" + showNum + "&nowPage=" + nowPage + "&searchContent=" + searchContent +
+            "&orderColumn=" + orderColumn + "&orderDirection=" + orderDirection +
+            "&contractno=" + contractno + "&facilityno=" + facilityno + "&custom=" + custom +
+            "&site_survey_contact_verify=" + site_survey_contact_verify + "&real_arrival_date_start=" + real_arrival_date_start +
+            "&real_arrival_date_end=" + real_arrival_date_end + "&area_no=" + area_no + "&erro_mesage_search=" + erro_mesage_search;
+    }
 </script>
\ No newline at end of file