1.取消追蹤 出貨地區預定明細.xls 並添加至gitignore

2.作番大日程 index 新增 合約交期(到工地) 欄位
3.待簽進入明細頁 新增 _blank 開啟分頁，並嘗試隱藏已結案的內容。

.gitignore

@@ -19,3 +19,4 @@ wms/header.php
 wms/loginapi.php
 wms/excel/gary_test.xlsx
 wms/excel/wipwholeintall.xlsx
+wms/excel/estimated_shipping_date_report.xlsx

wms/sign/list.php

@@ -145,19 +145,23 @@ $flow_name_opt = (array_unique($flow_name_opt, SORT_REGULAR));
                 <?php
                 $rowspan = 1;
                 foreach ($res_get as $key => $data) :
+                    //嘗試將已結案隱藏起來 : 測試使用者體驗
+                    if ($data['flow_code'] !== 'Z') {
                 ?>
-                    <tr>
-                        <td><a href="<?=$data['path']  ."?form_key=".$data['form_key']."&token=$token"   ?>" ><?= $data['form_key']; ?></a></td>
-                        <td><?php echo $data['system_name']; ?></td>
-                        <td><?php echo $data['flow_name']; ?></td>
-                        <td><?php echo $data['update_date']; ?></td>
-                        <td><?php echo $data['current_assigner_name']; ?></td>
-                        <td><?php echo $data['flow_code'] == 'Z' ? "結案" : ""; ?></td>
+                        <tr>
+                            <td><a target="_blank" href="<?= $data['path']  . "?form_key=" . $data['form_key'] . "&token=$token"   ?>"><?= $data['form_key']; ?></a></td>
+                            <td><?php echo $data['system_name']; ?></td>
+                            <td><?php echo $data['flow_name']; ?></td>
+                            <td><?php echo $data['update_date']; ?></td>
+                            <td><?php echo $data['current_assigner_name']; ?></td>
+                            <td><?php echo $data['flow_code'] == 'Z' ? "結案" : ""; ?></td>
+                        </tr>
 
-                    </tr>
 
-
-                <?php endforeach; ?>
+                <?php
+                    }
+                endforeach;
+                ?>
             </tbody>
         </table>
     </div>

wms/wipwhole-index-function.php

@@ -909,7 +909,7 @@ function getTabNo($user_department_id)
 // 由地址取得工務負責人
 function getGunwuName($address)
 {
-    $north_arr = array('台北', '基隆', '新北', '桃園', '新竹');
+    $north_arr = array('台北', '基隆', '新北', '桃園', '新竹', '台東', '花蓮');
     $north_arr2 = array('宜蘭');
     $center_arr = array('南投', '彰化', '雲林', '台中', '苗栗');
     $south_arr = array('台南', '嘉義', '屏東', '高雄');

wms/wipwhole-index-table-html.php

@@ -27,6 +27,7 @@ if (in_array($user_id, ['M0175', 'M0079'])) {
             <th style="text-align:center;width:150px;">規格</th>
             <th style="text-align:center;width:150px;">地址</th>
             <th style="text-align:center;width:80px;">工勘狀態</th>
+            <th style="text-align:center;width:100px;">合約交期(到工地)</th>
             <th style="text-align:center;width:100px;">下單日(普來特富)</th>
             <th style="text-align:center;width:100px;">預計到廠日(觀音廠)</th>
             <th style="text-align:center;width:100px;">實際到廠日(觀音廠)</th>
@@ -150,6 +151,12 @@ if (in_array($user_id, ['M0175', 'M0079'])) {
                     }
                 }
                 ?>
+                <td>
+                    <?php
+                    if (!empty($data['contract_arrival_date']))
+                        echo date("Y/m/d", strtotime($data['contract_arrival_date']));
+                    ?>
+                </td>
                 <td>
                     <?php
                     if (!empty($data['prattford_order_date']))

wms/wipwhole-renovate-index-function.php

@@ -367,7 +367,7 @@ function getDataSql($department_id, $role_id, $user_id)
 {
 
     // 補丁 黃孟澤 & 葉博澄 權限 = 李烘銘
-    if(in_array($user_id,['M0166','M0091'])){
+    if (in_array($user_id, ['M0166', 'M0091'])) {
         $user_id = 'M0086';
     }
 
@@ -542,7 +542,7 @@ function getDataSqlByflowCode($department_id, $role_id, $user_id, $flow_code)
 {
 
     // 補丁 黃孟澤 & 葉博澄 權限 = 李烘銘
-    if(in_array($user_id,['M0166','M0091'])){
+    if (in_array($user_id, ['M0166', 'M0091'])) {
         $user_id = 'M0086';
     }
 
@@ -772,7 +772,7 @@ function getDataSqlByflowCode($department_id, $role_id, $user_id, $flow_code)
 
 function getGunwuName($address)
 {
-    $north_arr = array('台北', '基隆', '新北', '桃園', '新竹');
+    $north_arr = array('台北', '基隆', '新北', '桃園', '新竹', '台東');
     $north_arr2 = array('宜蘭');
     $center_arr = array('南投', '彰化', '雲林', '台中', '苗栗');
     $south_arr = array('台南', '嘉義', '屏東', '高雄');

wms/wipwhole-renovate-index-table-html.php

@@ -28,6 +28,7 @@ if (in_array($user_id, ['M0175', 'M0079'])) {
             <th style="text-align:center;width:150px;">規格</th>
             <th style="text-align:center;width:150px;">地址</th>
             <th style="text-align:center;width:100px;">工勘狀態</th>
+            <th style="text-align:center;width:100px;">合約交期(到工地)</th>
             <th style="text-align:center;width:100px;">下單日(普來特富)</th>
             <th style="text-align:center;width:100px;">預計到廠日(觀音廠)</th>
             <th style="text-align:center;width:100px;">實際到廠日(觀音廠)</th>
@@ -157,6 +158,12 @@ if (in_array($user_id, ['M0175', 'M0079'])) {
                     }
                 }
                 ?>
+                <td>
+                    <?php
+                    if (!empty($data['contract_arrival_date']))
+                        echo date("Y/m/d", strtotime($data['contract_arrival_date']));
+                    ?>
+                </td>
                 <td>
                     <?php
                     if (!empty($data['prattford_order_date']))