diff --git a/wms/wipwhole-rec-invoice-edit-fileupload.php b/wms/wipwhole-rec-invoice-edit-fileupload.php
index 30da7a85..f62a3132 100644
--- a/wms/wipwhole-rec-invoice-edit-fileupload.php
+++ b/wms/wipwhole-rec-invoice-edit-fileupload.php
@@ -34,5 +34,6 @@ $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");
 // 生管
 $shengguanok_status_file = fileIUpload("shengguanok_status_file");
diff --git a/wms/wipwhole-rec-invoice-edit-submit.php b/wms/wipwhole-rec-invoice-edit-submit.php
index c41aa812..f15f83af 100644
--- a/wms/wipwhole-rec-invoice-edit-submit.php
+++ b/wms/wipwhole-rec-invoice-edit-submit.php
@@ -153,6 +153,25 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         $delivery_date = $_POST['delivery_date'] ?: $row['delivery_date'];
         $delivery_date_owner = $_POST['delivery_date_owner'] ?: $row['delivery_date_owner'];
 
+        // 工務助理
+        $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'];
 
@@ -468,6 +487,30 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
             echo  "暫無權限";
             exit();
         }
+
+        // 工務助理
+        $updatesql .= "
+            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 .= " 
             creater = '$creater', 
             create_at = '$create_at'  
@@ -714,62 +757,6 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
     }
 }
 
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    if ($_POST['form_name'] == 'update_estimate_install_date_form') {
-        foreach ($_POST as $k => $v)
-            $$k = htmlspecialchars(stripslashes(trim($v)));
-
-        $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'];
-
-        $updatesql = "
-            UPDATE wipwholestatus 
-            SET 
-                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'
-            WHERE id = '$id'
-        ";
-        // 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_install_date_form') {
         foreach ($_POST as $k => $v)
diff --git a/wms/wipwhole-rec-invoice-edit.php b/wms/wipwhole-rec-invoice-edit.php
index 6fba7b73..8f6080b8 100644
--- a/wms/wipwhole-rec-invoice-edit.php
+++ b/wms/wipwhole-rec-invoice-edit.php
@@ -1,5 +1,5 @@
 <?php
-ini_set('display_errors', 'on');
+// ini_set('display_errors', 'on');
 /**
  * (新梯)流程規則:
  * 1. A:營業員確認中 生管建立大日程 (或是系統洗入)
@@ -51,9 +51,9 @@ $pinzheng = getPinzhengStatus($link, $user_department_id, $role_id);
 // 取得分頁頁碼
 $tab = getTabNo($user_department_id);
 
-if (in_array($user_id, ['M0164', 'M0165', 'M0127'])) {
+if (in_array($user_id, ['M0164', 'M0165', 'M0127', 'M0193'])) {
     $warehouse2 = "";
-    $tab = 2;
+    $tab = 5;
 }
 
 // select => options 開門方式 
@@ -264,6 +264,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
             <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%">
@@ -341,9 +342,9 @@ include "wipwhole-rec-invoice-edit-submit.php";
                         <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'])){
+                                                                                                                                                            if (isset($row2['change_status'])) {
                                                                                                                                                                 echo $row2['change_status'] === 'Z' ? "" : "disabled";
-                                                                                                                                                            }else{
+                                                                                                                                                            } else {
                                                                                                                                                                 echo "disabled";
                                                                                                                                                             }
                                                                                                                                                             ?>>
@@ -834,162 +835,6 @@ include "wipwhole-rec-invoice-edit-submit.php";
                             ?>
                         </td>
                     </tr>
-                    <tr>
-                        <td colspan="4">
-                            預計安裝及試車日程
-                            <br />
-                            (工務助理項目)
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">安裝發包廠商</td>
-                        <td>
-                            <input id="install_outsourcer_tmp" 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_tmp" 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" type="date" id="install_outsourcer_date_tmp" value="<?= $row['install_outsourcer_date']; ?>" <?= $warehouse2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#install_outsourcer_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="install_outsourcer_date_owner_tmp" 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" type="date" id="estimate_install_start_date_tmp" value="<?= $row['estimate_install_start_date']; ?>" <?= $warehouse2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#estimate_install_start_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="estimate_install_start_date_owner_tmp" 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" type="date" id="estimate_install_end_date_tmp" value="<?= $row['estimate_install_end_date']; ?>" <?= $warehouse2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#estimate_install_end_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="estimate_install_end_date_owner_tmp" 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 id="tryrun_outsourcer_tmp" 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_tmp" 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" type="date" id="tryrun_outsourcer_date_tmp" value="<?= $row['tryrun_outsourcer_date']; ?>" <?= $warehouse2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#tryrun_outsourcer_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="tryrun_outsourcer_date_owner_tmp" 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" type="date" id="estimate_tryrun_start_date_tmp" value="<?= $row['estimate_tryrun_start_date']; ?>" <?= $warehouse2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#estimate_tryrun_start_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="estimate_tryrun_start_date_owner_tmp" 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" type="date" id="estimate_tryrun_end_date_tmp" value="<?= $row['estimate_tryrun_end_date']; ?>" <?= $warehouse2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#estimate_tryrun_end_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="estimate_tryrun_end_date_owner_tmp" 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" id="warehouse_assistant_remark_tmp" <?= $warehouse2; ?>><?php echo $row['warehouse_assistant_remark']; ?></textarea>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="4">
-                            <?php
-                            if (getSaveEstimateInstallData($user_department_id, $role_id))
-                                echo "<button onclick='saveEstimateInstallData()' type='button' class='btn btn-primary btn-lg pull-right' style='margin-left:3px;'>存檔</button>";
-                            ?>
-                        </td>
-                    </tr>
-
                     <tr>
                         <td colspan="4">
                             實際安裝及試車日程
@@ -1350,7 +1195,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
                     <tr>
                         <td style="vertical-align: middle">實際出貨日(到工地)</td>
                         <td>
-                            <input class="form-control" type="date" id="real_arrival_date_tmp" value="<?= $row['real_arrival_date']; ?>" <?php echo $shengguan; ?>>
+                            <input class="form-control" type="date" id="real_arrival_date_tmp" value="<?= SUBSTR($row['real_arrival_date'],0,10); ?>" <?php echo $shengguan; ?>>
                         </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>
@@ -1439,6 +1284,174 @@ include "wipwhole-rec-invoice-edit-submit.php";
                 </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 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" 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" 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" 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" 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" 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" 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" 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 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">
@@ -1471,26 +1484,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
     <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_estimate_install_date_form" enctype="multipart/form-data">
-    <input type="hidden" id="install_outsourcer" name='install_outsourcer' value="<?php echo $row['install_outsourcer']; ?>" />
-    <input type="hidden" id="install_outsourcer_owner" name='install_outsourcer_owner' value="<?php echo $row['install_outsourcer_owner']; ?>" />
-    <input type="hidden" id="install_outsourcer_date" name='install_outsourcer_date' value="<?php echo $row['install_outsourcer_date']; ?>" />
-    <input type="hidden" id="install_outsourcer_date_owner" name='install_outsourcer_date_owner' value="<?php echo $row['install_outsourcer_date_owner']; ?>" />
-    <input type="hidden" id="estimate_install_start_date" name='estimate_install_start_date' value="<?php echo $row['estimate_install_start_date']; ?>" />
-    <input type="hidden" id="estimate_install_start_date_owner" name='estimate_install_start_date_owner' value="<?php echo $row['estimate_install_start_date_owner']; ?>" />
-    <input type="hidden" id="estimate_install_end_date" name='estimate_install_end_date' value="<?php echo $row['estimate_install_end_date']; ?>" />
-    <input type="hidden" id="estimate_install_end_date_owner" name='estimate_install_end_date_owner' value="<?php echo $row['estimate_install_end_date_owner']; ?>" />
-    <input type="hidden" id="tryrun_outsourcer" name='tryrun_outsourcer' value="<?php echo $row['tryrun_outsourcer']; ?>" />
-    <input type="hidden" id="tryrun_outsourcer_owner" name='tryrun_outsourcer_owner' value="<?php echo $row['tryrun_outsourcer_owner']; ?>" />
-    <input type="hidden" id="tryrun_outsourcer_date" name='tryrun_outsourcer_date' value="<?php echo $row['tryrun_outsourcer_date']; ?>" />
-    <input type="hidden" id="tryrun_outsourcer_date_owner" name='tryrun_outsourcer_date_owner' value="<?php echo $row['tryrun_outsourcer_date_owner']; ?>" />
-    <input type="hidden" id="estimate_tryrun_start_date" name='estimate_tryrun_start_date' value="<?php echo $row['estimate_tryrun_start_date']; ?>" />
-    <input type="hidden" id="estimate_tryrun_start_date_owner" name='estimate_tryrun_start_date_owner' value="<?php echo $row['estimate_tryrun_start_date_owner']; ?>" />
-    <input type="hidden" id="estimate_tryrun_end_date" name='estimate_tryrun_end_date' value="<?php echo $row['estimate_tryrun_end_date']; ?>" />
-    <input type="hidden" id="estimate_tryrun_end_date_owner" name='estimate_tryrun_end_date_owner' value="<?php echo $row['estimate_tryrun_end_date_owner']; ?>" />
-    <input type="hidden" id="warehouse_assistant_remark" name='warehouse_assistant_remark' value="<?php echo $row['warehouse_assistant_remark']; ?>" />
-    <input type="hidden" name='form_name' value="update_estimate_install_date_form" />
-</form>
+
 <form method="post" id="update_install_date_form" enctype="multipart/form-data">
     <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']; ?>" />
@@ -1579,14 +1573,20 @@ include "wipwhole-rec-invoice-edit-submit.php";
         });
 
         var oursourcer_input_arr = [
-            'install_outsourcer',
-            'install_outsourcer_date',
             'install_start_date',
             'install_end_date',
-            'tryrun_outsourcer',
-            'tryrun_outsourcer_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',
@@ -1595,7 +1595,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
             'estimate_tryrun_end_date',
         ]
         for (var i = 0; i < oursourcer_input_arr.length; i++) {
-            inputChangeOutsourcer(oursourcer_input_arr[i]);
+            inputChangeOutsourcer2(oursourcer_input_arr[i]);
         }
 
     });
@@ -1613,6 +1613,12 @@ include "wipwhole-rec-invoice-edit-submit.php";
         });
     }
 
+    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);
@@ -1829,29 +1835,6 @@ include "wipwhole-rec-invoice-edit-submit.php";
         }
     }
 
-    function saveEstimateInstallData() {
-        if (confirm('確定要更改預計安裝日程嗎?') == true) {
-            $("#install_outsourcer").val($("#install_outsourcer_tmp").val());
-            $("#install_outsourcer_owner").val($("#install_outsourcer_owner_tmp").val());
-            $("#install_outsourcer_date").val($("#install_outsourcer_date_tmp").val());
-            $("#install_outsourcer_date_owner").val($("#install_outsourcer_date_owner_tmp").val());
-            $("#estimate_install_start_date").val($("#estimate_install_start_date_tmp").val());
-            $("#estimate_install_start_date_owner").val($("#estimate_install_start_date_owner_tmp").val());
-            $("#estimate_install_end_date").val($("#estimate_install_end_date_tmp").val());
-            $("#estimate_install_end_date_owner").val($("#estimate_install_end_date_owner_tmp").val());
-            $("#tryrun_outsourcer").val($("#tryrun_outsourcer_tmp").val());
-            $("#tryrun_outsourcer_owner").val($("#tryrun_outsourcer_owner_tmp").val());
-            $("#tryrun_outsourcer_date").val($("#tryrun_outsourcer_date_tmp").val());
-            $("#tryrun_outsourcer_date_owner").val($("#tryrun_outsourcer_date_owner_tmp").val());
-            $("#estimate_tryrun_start_date").val($("#estimate_tryrun_start_date_tmp").val());
-            $("#estimate_tryrun_start_date_owner").val($("#estimate_tryrun_start_date_owner_tmp").val());
-            $("#estimate_tryrun_end_date").val($("#estimate_tryrun_end_date_tmp").val());
-            $("#estimate_tryrun_end_date_owner").val($("#estimate_tryrun_end_date_owner_tmp").val());
-            $("#warehouse_assistant_remark").val($("#warehouse_assistant_remark_tmp").val());
-            $('#update_estimate_install_date_form').submit();
-        }
-    }
-
     function saveInstallData() {
         if (confirm('確定要更改實際安裝日程嗎?') == true) {
             $("#install_start_date").val($("#install_start_date_tmp").val());
diff --git a/wms/wipwhole-rec-invoice.php b/wms/wipwhole-rec-invoice.php
index 3d1b0207..787a92d6 100644
--- a/wms/wipwhole-rec-invoice.php
+++ b/wms/wipwhole-rec-invoice.php
@@ -770,11 +770,11 @@ if ($department_id == "321" || $department_id == "220") {
                             </td>
                             <td style="vertical-align: middle">合約交期<br />(到工地)</td>
                             <td>
-                                <input class="form-control " type="datetime-local" id="contract_arrival_date" name="contract_arrival_date" value="<?php echo $contract_arrival_date; ?>">
+                                <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="datetime-local" include_once="real_contract_arrival_date" name="real_contract_arrival_date" value="<?php echo $real_contract_arrival_date; ?>">
+                                <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>
                         </tr>
                         <tr>
diff --git a/wms/wipwhole-renovate-rec-invoice-edit-submit.php b/wms/wipwhole-renovate-rec-invoice-edit-submit.php
index 277fd3f4..ed3df4f3 100644
--- a/wms/wipwhole-renovate-rec-invoice-edit-submit.php
+++ b/wms/wipwhole-renovate-rec-invoice-edit-submit.php
@@ -93,6 +93,25 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         $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'];
 
+        // 工務助理
+        $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'];
+
         // 工勘變更通知繪圖人員
         if ($site_survey_contact_verify !== $old_site_survey_contact_verify) {
             $site_survey_status = array(
@@ -448,6 +467,30 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
             echo  "暫無權限";
             exit();
         }
+
+        // 工務助理
+        $updatesql .= "
+            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 .= " 
             creater = '$creater', 
             create_at = '$create_at'  
@@ -689,62 +732,6 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
 }
 
 
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    if ($_POST['form_name'] == 'update_estimate_install_date_form') {
-        foreach ($_POST as $k => $v)
-            $$k = htmlspecialchars(stripslashes(trim($v)));
-
-        $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'];
-
-        $updatesql = "
-            UPDATE wipwholestatus 
-            SET 
-                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'
-            WHERE id = '$id'
-        ";
-        // echo $updatesql;
-        // exit;
-        mysqli_query($link, $updatesql);
-
-        echo "<script type ='text/JavaScript'>";
-        echo "alert('已更新日期');";
-        echo "location.href='wipwhole-renovate-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)
diff --git a/wms/wipwhole-renovate-rec-invoice-edit.php b/wms/wipwhole-renovate-rec-invoice-edit.php
index da0c6662..ba056c99 100644
--- a/wms/wipwhole-renovate-rec-invoice-edit.php
+++ b/wms/wipwhole-renovate-rec-invoice-edit.php
@@ -1,5 +1,5 @@
 <?php
-ini_set('display_errors', 'on');
+// ini_set('display_errors', 'on');
 /**
  * (汰改)流程規則:
  * 1. A:工務組長確認中 生管建立大日程 (或是系統洗入) 
@@ -49,9 +49,9 @@ $pinzheng = getPinzhengStatus($link, $user_department_id, $role_id);
 // 取得分頁頁碼
 $tab = getTabNo($user_department_id);
 
-if (in_array($user_id, ['M0164', 'M0165', 'M0127'])) {
+if (in_array($user_id, ['M0164', 'M0165', 'M0127', 'M0193'])) {
     $warehouse2 = "";
-    $tab = 0;
+    $tab = 5;
 }
 
 // select => options 開門方式 
@@ -253,6 +253,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
             <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-3">
             <table class="table  table-bordered" style="width:100%">
@@ -436,162 +437,6 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
                             ?>
                         </td>
                     </tr>
-                    <tr>
-                        <td colspan="4">
-                            預計安裝及試車日程
-                            <br />
-                            (工務助理項目)
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="vertical-align: middle">安裝發包廠商</td>
-                        <td>
-                            <input id="install_outsourcer_tmp" 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_tmp" 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" type="date" id="install_outsourcer_date_tmp" value="<?= $row['install_outsourcer_date']; ?>" <?= $warehouse2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#install_outsourcer_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="install_outsourcer_date_owner_tmp" 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" type="date" id="estimate_install_start_date_tmp" value="<?= $row['estimate_install_start_date']; ?>" <?= $warehouse2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#estimate_install_start_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="estimate_install_start_date_owner_tmp" 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" type="date" id="estimate_install_end_date_tmp" value="<?= $row['estimate_install_end_date']; ?>" <?= $warehouse2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#estimate_install_end_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="estimate_install_end_date_owner_tmp" 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 id="tryrun_outsourcer_tmp" 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_tmp" 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" type="date" id="tryrun_outsourcer_date_tmp" value="<?= $row['tryrun_outsourcer_date']; ?>" <?= $warehouse2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#tryrun_outsourcer_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="tryrun_outsourcer_date_owner_tmp" 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" type="date" id="estimate_tryrun_start_date_tmp" value="<?= $row['estimate_tryrun_start_date']; ?>" <?= $warehouse2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#estimate_tryrun_start_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="estimate_tryrun_start_date_owner_tmp" 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" type="date" id="estimate_tryrun_end_date_tmp" value="<?= $row['estimate_tryrun_end_date']; ?>" <?= $warehouse2; ?>>
-                                <span class="input-group-btn">
-                                    <button class="btn btn-default" type='button' onclick='$("#estimate_tryrun_end_date_tmp").val("");' <?= $warehouse2; ?>>清除</button>
-                                </span>
-                            </div>
-                        </td>
-                        <td style="vertical-align: middle">確認人</td>
-                        <td>
-                            <select class="disabled_select" id="estimate_tryrun_end_date_owner_tmp" 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" id="warehouse_assistant_remark_tmp" <?= $warehouse2; ?>><?php echo $row['warehouse_assistant_remark']; ?></textarea>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan="4">
-                            <?php
-                            if (getSaveEstimateInstallData($user_department_id, $role_id))
-                                echo "<button onclick='saveEstimateInstallData()' type='button' class='btn btn-primary btn-lg pull-right' style='margin-left:3px;'>存檔</button>";
-                            ?>
-                        </td>
-                    </tr>
-
                     <tr>
                         <td colspan="4">
                             實際安裝及試車日程
@@ -1345,7 +1190,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
                     <tr>
                         <td style="vertical-align: middle">實際出貨日(到工地)</td>
                         <td>
-                            <input class="form-control " type="date" id="real_arrival_date_tmp" value="<?= $row['real_arrival_date']; ?>" <?php echo $shengguan; ?>>
+                            <input class="form-control " type="date" id="real_arrival_date_tmp" value="<?= SUBSTR($row['real_arrival_date'],0,10); ?>" <?php echo $shengguan; ?>>
                         </td>
                         <td colspan="4">
                             <button onclick="updateRealArrivalDate()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;" <?php echo $shengguan; ?>>出貨日調整</button>
@@ -1436,6 +1281,174 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
                 </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 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" 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" 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" 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" 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" 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" 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" 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 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">
@@ -1468,26 +1481,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
     <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_estimate_install_date_form" enctype="multipart/form-data">
-    <input type="hidden" id="install_outsourcer" name='install_outsourcer' value="<?php echo $row['install_outsourcer']; ?>" />
-    <input type="hidden" id="install_outsourcer_owner" name='install_outsourcer_owner' value="<?php echo $row['install_outsourcer_owner']; ?>" />
-    <input type="hidden" id="install_outsourcer_date" name='install_outsourcer_date' value="<?php echo $row['install_outsourcer_date']; ?>" />
-    <input type="hidden" id="install_outsourcer_date_owner" name='install_outsourcer_date_owner' value="<?php echo $row['install_outsourcer_date_owner']; ?>" />
-    <input type="hidden" id="estimate_install_start_date" name='estimate_install_start_date' value="<?php echo $row['estimate_install_start_date']; ?>" />
-    <input type="hidden" id="estimate_install_start_date_owner" name='estimate_install_start_date_owner' value="<?php echo $row['estimate_install_start_date_owner']; ?>" />
-    <input type="hidden" id="estimate_install_end_date" name='estimate_install_end_date' value="<?php echo $row['estimate_install_end_date']; ?>" />
-    <input type="hidden" id="estimate_install_end_date_owner" name='estimate_install_end_date_owner' value="<?php echo $row['estimate_install_end_date_owner']; ?>" />
-    <input type="hidden" id="tryrun_outsourcer" name='tryrun_outsourcer' value="<?php echo $row['tryrun_outsourcer']; ?>" />
-    <input type="hidden" id="tryrun_outsourcer_owner" name='tryrun_outsourcer_owner' value="<?php echo $row['tryrun_outsourcer_owner']; ?>" />
-    <input type="hidden" id="tryrun_outsourcer_date" name='tryrun_outsourcer_date' value="<?php echo $row['tryrun_outsourcer_date']; ?>" />
-    <input type="hidden" id="tryrun_outsourcer_date_owner" name='tryrun_outsourcer_date_owner' value="<?php echo $row['tryrun_outsourcer_date_owner']; ?>" />
-    <input type="hidden" id="estimate_tryrun_start_date" name='estimate_tryrun_start_date' value="<?php echo $row['estimate_tryrun_start_date']; ?>" />
-    <input type="hidden" id="estimate_tryrun_start_date_owner" name='estimate_tryrun_start_date_owner' value="<?php echo $row['estimate_tryrun_start_date_owner']; ?>" />
-    <input type="hidden" id="estimate_tryrun_end_date" name='estimate_tryrun_end_date' value="<?php echo $row['estimate_tryrun_end_date']; ?>" />
-    <input type="hidden" id="estimate_tryrun_end_date_owner" name='estimate_tryrun_end_date_owner' value="<?php echo $row['estimate_tryrun_end_date_owner']; ?>" />
-    <input type="hidden" id="warehouse_assistant_remark" name='warehouse_assistant_remark' value="<?php echo $row['warehouse_assistant_remark']; ?>" />
-    <input type="hidden" name='form_name' value="update_estimate_install_date_form" />
-</form>
+
 <form method="post" id="update_install_date_form" enctype="multipart/form-data">
     <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']; ?>" />
@@ -1577,15 +1571,22 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
         $("#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_outsourcer',
-            'install_outsourcer_date',
             'install_start_date',
             'install_end_date',
-            'tryrun_outsourcer',
-            'tryrun_outsourcer_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',
@@ -1594,7 +1595,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
             'estimate_tryrun_end_date',
         ]
         for (var i = 0; i < oursourcer_input_arr.length; i++) {
-            inputChangeOutsourcer(oursourcer_input_arr[i]);
+            inputChangeOutsourcer2(oursourcer_input_arr[i]);
         }
 
     });
@@ -1612,6 +1613,12 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
         });
     }
 
+    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);
diff --git a/wms/wipwhole-renovate-rec-invoice.php b/wms/wipwhole-renovate-rec-invoice.php
index ff440b4b..bf65e236 100644
--- a/wms/wipwhole-renovate-rec-invoice.php
+++ b/wms/wipwhole-renovate-rec-invoice.php
@@ -808,11 +808,11 @@ if ($department_id == "321" || $department_id == "220") {
                             </td>
                             <td style="vertical-align: middle">合約交期<br />(到工地)</td>
                             <td>
-                                <input class="form-control " type="datetime-local" id="contract_arrival_date" name="contract_arrival_date" value="<?php echo $contract_arrival_date; ?>">
+                                <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="datetime-local" id="real_contract_arrival_date" name="real_contract_arrival_date" value="<?php echo $real_contract_arrival_date; ?>">
+                                <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>