1.修正未上傳檔案卻產生日期戳記bug

2.大日程新增許協理更改業務項目的權限

wms/wipwhole-rec-invoice-edit-fileupload.php

@@ -11,10 +11,14 @@ function fileIUpload($post_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 "";
+    }
 }
 
 // 營業

wms/wipwhole-rec-invoice-edit-submit.php

@@ -483,13 +483,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
             ";
             if (!empty($official_check_file))
                 $updatesql .= "official_check_file = '$official_check_file', ";
-        } else {
+        } else if (in_array($user_id, ['M0175', 'M0079', 'M0060'])) {
-            echo  "暫無權限";
-            exit();
-        }
-
             // 暫時可編輯及刪除權限
-        if (in_array($user_id, ['M0175', 'M0079'])) {
             $updatesql .= "
                 contractno = '$contractno', 
                 facility_temp_no = '$facility_temp_no', 
@@ -509,6 +504,9 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
                 contract_arrival_date = '$contract_arrival_date', 
                 facility_kind = '$facility_kind',
             ";
+        }else{
+            echo  "暫無權限";
+            exit();
         }
 
         // 工務助理

wms/wipwhole-rec-invoice-edit.php

@@ -59,7 +59,7 @@ if (in_array($user_id, ['M0164', 'M0165', 'M0127', 'M0193', 'M0170', 'M0188']))
 
 // 暫時可編輯及刪除權限
 $update_delete_status = "disabled";
-if (in_array($user_id, ['M0175', 'M0079'])) {
+if (in_array($user_id, ['M0175', 'M0079', 'M0060'])) {
     $update_delete_status = "";
 }
 
@@ -260,6 +260,17 @@ include "wipwhole-rec-invoice-edit-submit.php";
                         </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>
@@ -1202,7 +1213,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="<?= SUBSTR($row['real_arrival_date'],0,10); ?>" <?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>

wms/wipwhole-renovate-rec-invoice-edit-submit.php

@@ -463,14 +463,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
             ";
             if (!empty($official_check_file))
                 $updatesql .= "official_check_file = '$official_check_file', ";
-        } else {
+        } else if (in_array($user_id, ['M0175', 'M0079', 'M0060'])) {
-            echo  "暫無權限";
-            exit();
-        }
-
-
             // 暫時可編輯及刪除權限
-        if (in_array($user_id, ['M0175', 'M0079'])) {
             $updatesql .= "
                 contractno = '$contractno', 
                 facility_temp_no = '$facility_temp_no', 
@@ -490,9 +484,11 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
                 contract_arrival_date = '$contract_arrival_date', 
                 facility_kind = '$facility_kind',
             ";
+        } else {
+            echo  "暫無權限";
+            exit();
         }
 
-
         // 工務助理
         $updatesql .= "
             install_outsourcer = '$install_outsourcer',
@@ -513,7 +509,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
             estimate_tryrun_end_date_owner = '$estimate_tryrun_end_date_owner',
             warehouse_assistant_remark = '$warehouse_assistant_remark',
         ";
-        if (!empty($plan_diagram_file)){
+        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)),

wms/wipwhole-renovate-rec-invoice-edit.php

@@ -57,7 +57,7 @@ if (in_array($user_id, ['M0164', 'M0165', 'M0127', 'M0193', 'M0170', 'M0188']))
 
 // 暫時可編輯及刪除權限
 $update_delete_status = "disabled";
-if (in_array($user_id, ['M0175', 'M0079'])) {
+if (in_array($user_id, ['M0175', 'M0079', 'M0060'])) {
     $update_delete_status = "";
 }
 
@@ -249,6 +249,17 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
                         </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>