From ad352146e92d684536bb8840a7dc41b3be644f84 Mon Sep 17 00:00:00 2001 From: gary_chen Date: Mon, 13 Nov 2023 01:47:35 +0000 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20wms/contract/api/getFa?= =?UTF-8?q?cilityNo.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/contract/api/getFacilityNo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wms/contract/api/getFacilityNo.php b/wms/contract/api/getFacilityNo.php index e568a08c..fcf0b76f 100644 --- a/wms/contract/api/getFacilityNo.php +++ b/wms/contract/api/getFacilityNo.php @@ -1,5 +1,5 @@ Date: Mon, 13 Nov 2023 09:58:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=A4=A7=E6=97=A5?= =?UTF-8?q?=E7=A8=8B=E5=87=BA=E8=B2=A8=E6=97=A5=E7=94=B3=E8=AB=8B=E5=96=AE?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=94=B3=E8=AB=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/wipwhole-change-contractdate-submit.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wms/wipwhole-change-contractdate-submit.php b/wms/wipwhole-change-contractdate-submit.php index e57d5831..ce2f56d2 100644 --- a/wms/wipwhole-change-contractdate-submit.php +++ b/wms/wipwhole-change-contractdate-submit.php @@ -54,6 +54,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { // 批次申請 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], @@ -65,7 +66,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { 'contractno' => $contractno, 'tds' => $tds, 'form_key' => getFomkeySeq($link), - 'user_id' => $user_id + 'user_id' => $user_id, + 'change_status' => $assign_status ); // 寫入表單主檔 addWipwholeChangeContractdateDetails($link, $data_arr); From 44e910cbb413f94a5b4301418d55f13e574d24b2 Mon Sep 17 00:00:00 2001 From: "gary_chen\\gary_chen" Date: Mon, 13 Nov 2023 16:03:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=A4=A7=E6=97=A5?= =?UTF-8?q?=E7=A8=8B=E7=94=B3=E8=AB=8B=E8=A8=88=E7=95=AB=E5=9C=96=E4=B8=8A?= =?UTF-8?q?=E5=82=B3=E7=B0=BD=E6=A0=B8=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...change-planning-customer-name-function.php | 13 +- ...e-change-planning-customer-name-submit.php | 239 +++++++----------- ...wipwhole-change-planning-customer-name.php | 42 +-- wms/wipwhole-rec-invoice-edit.php | 92 ++++--- 4 files changed, 166 insertions(+), 220 deletions(-) diff --git a/wms/wipwhole-change-planning-customer-name-function.php b/wms/wipwhole-change-planning-customer-name-function.php index 14f6fae6..a5ae80ad 100644 --- a/wms/wipwhole-change-planning-customer-name-function.php +++ b/wms/wipwhole-change-planning-customer-name-function.php @@ -33,6 +33,8 @@ function isLeader($link, $user_id) 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; } @@ -426,10 +428,8 @@ function getChangeStatus($link, $cid) function getChangeStatusName($link, $cid) { $dataArr = array( - 'A' => '申請中', 'B' => '申請中', 'C' => '已取消', - 'D' => '工務已通過', 'Z' => '已通過', ); $sql = " @@ -628,19 +628,14 @@ function getAssignStatusSelect($link, $user_id, $nowFormStatus) $options_str = ""; diff --git a/wms/wipwhole-change-planning-customer-name-submit.php b/wms/wipwhole-change-planning-customer-name-submit.php index 689aadb5..8dbffb67 100644 --- a/wms/wipwhole-change-planning-customer-name-submit.php +++ b/wms/wipwhole-change-planning-customer-name-submit.php @@ -13,7 +13,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { $tds = date("Y-m-d H:i:s"); // 單次申請 - if (($_POST['assign_status'] == 'A' || $_POST['assign_status'] == 'B') && empty($all_contractno_change)) { + if (($_POST['assign_status'] == 'B') && empty($all_contractno_change)) { $data_arr = array( 'id' => $id, 'all_contractno_change' => $all_contractno_change, @@ -40,7 +40,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { } // 批次申請 - if (($_POST['assign_status'] == 'A' || $_POST['assign_status'] == 'B') && !empty($all_contractno_change)) { + if (($_POST['assign_status'] == 'B') && !empty($all_contractno_change)) { $wipwholestatus_id_arr = getWipwholestatusIdByConstractNo($link, $contractno); $customer_planning_verify_file = fileIUpload("customer_planning_verify_file"); @@ -74,71 +74,45 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { } } - // 單次申請 營業 - 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_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'] == '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 ($user_id == 'M0060') { - 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 (isLeader($link, $user_id)) { - 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') { + if (isLeader($link, $user_id)) { + if (getChangeStatus($link, $cid) == 'B') { $seq = $_POST['seq']; $sql = " UPDATE subflow @@ -192,89 +166,66 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { // 通過 if ($_POST['assign_status'] == 'Z') { - if ($user_id == 'M0060') { - $tds = date("Y-m-d H:i:s"); - $next_users = $_POST['next_users']; - $seq = $_POST['seq'] + 1; - $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); - - // // 發送系統通知 - // $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; + $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']; - // // 大日程出貨日調整 通知營業人員 - // $noticeData = array( - // 'related_id' => $cid, - // 'title' => '作番大日程(新梯)出貨日調整通知 > ' . $facilityno, - // 'content' => $content, - // 'permission' => $row['val'], - // ); - // addNotice($link, $noticeData); - // endforeach; + 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 c2bc904e..24a9e5cc 100644 --- a/wms/wipwhole-change-planning-customer-name.php +++ b/wms/wipwhole-change-planning-customer-name.php @@ -269,7 +269,7 @@ if (!empty(checkNowFormStatus($link))) 填寫客戶姓名 - + "; @@ -281,8 +281,8 @@ if (!empty(checkNowFormStatus($link))) 上傳計劃圖 - - + 下載附件" : ""; ?> @@ -326,7 +326,11 @@ if (!empty(checkNowFormStatus($link))) if (empty(checkNowFormStatus($link))) { if (isLeader($link, $user_id)) { - echoMaxSelect($max_options); + echo " + + "; } else if (in_array(getDepartmentId($link, $user_id), [ '311', '312', '313', '314', '315', '501', '511', '512', '513', '514', @@ -340,16 +344,8 @@ if (!empty(checkNowFormStatus($link))) endforeach; echo ""; } - } else if (checkNowFormStatus($link) == 'A' || checkNowFormStatus($link) == 'D') { - echo " - - "; } else if (checkNowFormStatus($link) == 'B') { if (isLeader($link, $user_id)) { - echoMaxSelect($max_options); - } else { echo " "; echo ""; - } else if (checkNowFormStatus($link) == 'A') { - if ($user_id == 'M0060') { - echo ""; - } else if (isLeader($link, $user_id)) { - echo ""; - } else { - echo ""; - } - echo ""; } else if (checkNowFormStatus($link) == 'B') { if (isLeader($link, $user_id)) { echo ""; - } else if ($user_id == 'M0060') { - echo ""; - } else { - echo ""; - } - echo ""; - } else if (checkNowFormStatus($link) == 'D') { - if (isLeader($link, $user_id)) { - echo ""; - } else if ($user_id == 'M0060') { - echo ""; } else { echo ""; } echo ""; - } + } ?> diff --git a/wms/wipwhole-rec-invoice-edit.php b/wms/wipwhole-rec-invoice-edit.php index 075ad168..945ef6ec 100644 --- a/wms/wipwhole-rec-invoice-edit.php +++ b/wms/wipwhole-rec-invoice-edit.php @@ -1334,7 +1334,7 @@ include "wipwhole-rec-invoice-edit-submit.php"; (工務助理項目) - + 安裝發包廠商 @@ -1913,7 +1913,6 @@ include "wipwhole-rec-invoice-edit-submit.php"; // 發包類型 let outsourcer_type = $("input[name^='outsourcer_type']:checked").val(); - // 預計出貨日(到工地) let real_contract_arrival_date = $("#real_contract_arrival_date").val(); // 樓停 @@ -1921,38 +1920,63 @@ include "wipwhole-rec-invoice-edit-submit.php"; // 目前操作者 let user_id = ''; - 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); + 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': '請選擇發包種類' + } + 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 = ''; + + if (typeof outsourcer_type == 'undefined') + return 2; + return 0; + } function resetIOutSourcerDate() { From 8851a83459996e8db1bebfd655c72b78c9b877a7 Mon Sep 17 00:00:00 2001 From: "gary_chen\\gary_chen" Date: Tue, 14 Nov 2023 15:06:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=A7=E6=97=A5=E7=A8=8B=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=87=AA=E5=8B=95=E5=B8=B6=E5=85=A5=E9=A0=90=E8=A8=88?= =?UTF-8?q?=E7=99=BC=E5=8C=85=E6=97=A5=E6=9C=9F=E5=8A=9F=E8=83=BD=20?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=87=9F=E6=A5=AD=E7=84=A1=E6=B3=95=E8=AA=BF?= =?UTF-8?q?=E6=95=B4=E7=A7=BB=E4=BA=A4=E6=97=A5bug=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AE=89=E8=A3=9D=E5=A4=A7=E6=97=A5=E7=A8=8B=E8=AD=A6=E7=A4=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/wipwhole-index-function.php | 62 ++++- wms/wipwhole-rec-invoice-edit-submit.php | 46 ++-- wms/wipwhole-rec-invoice-edit.php | 87 +++++-- wms/wipwhole-rec-invoice.php | 6 +- wms/wipwhole-rec-renovate-invoice.php | 6 +- ...whole-renovate-rec-invoice-edit-submit.php | 46 ++-- wms/wipwhole-renovate-rec-invoice-edit.php | 235 +++++++++++++++--- wms/wipwholeinstall-index-function.php | 97 ++++++++ wms/wipwholeinstall-index-table-html.php | 2 + ...ipwholeinstall-renovate-index-function.php | 100 +++++++- ...wholeinstall-renovate-index-table-html.php | 2 + 11 files changed, 579 insertions(+), 110 deletions(-) diff --git a/wms/wipwhole-index-function.php b/wms/wipwhole-index-function.php index 3f8c6d67..66d0e67b 100644 --- a/wms/wipwhole-index-function.php +++ b/wms/wipwhole-index-function.php @@ -831,18 +831,68 @@ function getWarehouseStatus($link, $user_department_id, $role_id, $status) } // 取得營業或契約的欄位權限 -function getMarketingStatus($link, $user_department_id, $role_id) +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) - 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"; - + 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) { diff --git a/wms/wipwhole-rec-invoice-edit-submit.php b/wms/wipwhole-rec-invoice-edit-submit.php index a9456aab..af4823a0 100644 --- a/wms/wipwhole-rec-invoice-edit-submit.php +++ b/wms/wipwhole-rec-invoice-edit-submit.php @@ -154,6 +154,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { $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']; @@ -511,24 +512,25 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { // 工務助理 if (in_array($user_id, ['M0164', 'M0165', 'M0127', 'M0193', 'M0170', 'M0188'])) { $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', - "; + 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', "; @@ -823,6 +825,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { 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']; @@ -843,8 +847,12 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { tryrun_start_date_owner = '$tryrun_start_date_owner', tryrun_end_date = '$tryrun_end_date', tryrun_end_date_owner = '$tryrun_end_date_owner' - WHERE id = '$id' "; + if (empty($change_all_contractno)) { + $updatesql .= "WHERE id = '$id' "; + } else { + $updatesql .= "WHERE contractno = '$contractno' "; + } // echo $updatesql; // exit; mysqli_query($link, $updatesql); diff --git a/wms/wipwhole-rec-invoice-edit.php b/wms/wipwhole-rec-invoice-edit.php index 945ef6ec..c4398a84 100644 --- a/wms/wipwhole-rec-invoice-edit.php +++ b/wms/wipwhole-rec-invoice-edit.php @@ -1,5 +1,5 @@ 合約號 - " > + " > 移交日
- > + > - +
@@ -507,10 +508,10 @@ include "wipwhole-rec-invoice-edit-submit.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)) { ?> - + @@ -953,8 +954,11 @@ include "wipwhole-rec-invoice-edit-submit.php"; 存檔"; + echo ""; + echo ""; + } ?> @@ -1337,17 +1341,20 @@ include "wipwhole-rec-invoice-edit-submit.php"; 發包類型 - + /> - + /> - + /> - - + + @@ -1356,7 +1363,7 @@ include "wipwhole-rec-invoice-edit-submit.php"; 安裝發包廠商 - /> + /> 確認人 @@ -1423,7 +1430,7 @@ include "wipwhole-rec-invoice-edit-submit.php"; 試車發包廠商 - /> + /> 確認人 @@ -1546,6 +1553,8 @@ include "wipwhole-rec-invoice-edit-submit.php";
+ + @@ -1897,15 +1906,33 @@ include "wipwhole-rec-invoice-edit-submit.php"; function saveInstallData() { if (confirm('確定要更改實際安裝日程嗎?') == true) { - $("#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(); + 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(); + } } } @@ -1955,7 +1982,9 @@ include "wipwhole-rec-invoice-edit-submit.php"; } } else { const errrMessage = { - '2': '請選擇發包種類' + '2': '請選擇發包種類', + '3': '樓停未填寫', + '4': '預計交期(到工地)未填寫' } if ((errrMessage[getSetOutSourcerDateStatus()] !== 'undefined')) { alert(errrMessage[getSetOutSourcerDateStatus()]); @@ -1975,7 +2004,15 @@ include "wipwhole-rec-invoice-edit-submit.php"; if (typeof outsourcer_type == 'undefined') return 2; - return 0; + 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; } diff --git a/wms/wipwhole-rec-invoice.php b/wms/wipwhole-rec-invoice.php index 787a92d6..033a370c 100644 --- a/wms/wipwhole-rec-invoice.php +++ b/wms/wipwhole-rec-invoice.php @@ -542,7 +542,7 @@ if ($department_id == "321" || $department_id == "220") { '$facility_kind', '$address', '$contract_arrival_date', - '$real_contract_arrival_date', + '$contract_arrival_date', '$sales_spec_verify', '$sales_spec_verify_file', '$sales_spec_verify_at', @@ -772,10 +772,10 @@ if ($department_id == "321" || $department_id == "220") { - 預計交期
(到工地) + 工地負責人 diff --git a/wms/wipwhole-rec-renovate-invoice.php b/wms/wipwhole-rec-renovate-invoice.php index 6878f90a..1550676d 100644 --- a/wms/wipwhole-rec-renovate-invoice.php +++ b/wms/wipwhole-rec-renovate-invoice.php @@ -540,7 +540,7 @@ if ($department_id == "321" || $department_id == "220") { '$facility_kind', '$address', '$contract_arrival_date', - '$real_contract_arrival_date', + '$contract_arrival_date', '$sales_spec_verify', '$sales_spec_verify_file', '$sales_spec_verify_at', @@ -771,10 +771,10 @@ if ($department_id == "321" || $department_id == "220") { - 預計交期
(到工地) + 工地負責人 diff --git a/wms/wipwhole-renovate-rec-invoice-edit-submit.php b/wms/wipwhole-renovate-rec-invoice-edit-submit.php index 17c21cb5..a7133eb6 100644 --- a/wms/wipwhole-renovate-rec-invoice-edit-submit.php +++ b/wms/wipwhole-renovate-rec-invoice-edit-submit.php @@ -94,6 +94,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { $old_site_survey_contact_verify = $_POST['old_site_survey_contact_verify']; // 工務助理 + $outsourcer_type = $_POST['outsourcer_type']; $install_outsourcer = $_POST['install_outsourcer']; $install_outsourcer_owner = $_POST['install_outsourcer_owner']; $install_outsourcer_date = $_POST['install_outsourcer_date']; @@ -491,24 +492,25 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { // 工務助理 if (in_array($user_id, ['M0164', 'M0165', 'M0127', 'M0193', 'M0170', 'M0188'])) { $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', - "; + 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 .= " @@ -797,6 +799,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { 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']; @@ -817,8 +821,12 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") { tryrun_start_date_owner = '$tryrun_start_date_owner', tryrun_end_date = '$tryrun_end_date', tryrun_end_date_owner = '$tryrun_end_date_owner' - WHERE id = '$id' "; + if (empty($change_all_contractno)) { + $updatesql .= "WHERE id = '$id' "; + } else { + $updatesql .= "WHERE contractno = '$contractno' "; + } // echo $updatesql; // exit; mysqli_query($link, $updatesql); diff --git a/wms/wipwhole-renovate-rec-invoice-edit.php b/wms/wipwhole-renovate-rec-invoice-edit.php index acba025d..a47ed372 100644 --- a/wms/wipwhole-renovate-rec-invoice-edit.php +++ b/wms/wipwhole-renovate-rec-invoice-edit.php @@ -99,7 +99,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 合約號 - " > + " > 作番號 - " > + " > 汰改種類 - > @@ -134,21 +134,21 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 合約交期
(到工地) - > + > 客戶名稱 - " > + " > 號機 - " > + " > 工地負責人 - " > + " > 預計交期(到工地)
@@ -158,21 +158,21 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; ?> - + 經度 - " > + " > 緯度 - " > + " > 地址 - " > + " > 工地地址
載重 - " > + " > 人乘 - " > + " > 樓停 - " > + " > 樓層 - " > + " > 機型 - " > + " > 開門方式 - > 速度 - " > + " > 簽核狀況 @@ -550,8 +550,11 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 存檔"; + echo ""; + echo ""; + } ?> @@ -689,9 +692,9 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 移交日
- > + > - +
@@ -1146,8 +1149,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; + + 發包類型 + + /> + + /> + + /> + + + + + + + 安裝發包廠商 - /> + /> 確認人 @@ -1402,7 +1426,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; 試車發包廠商 - /> + /> 確認人 @@ -1525,6 +1549,8 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
+ + @@ -1906,15 +1932,156 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php"; function saveInstallData() { if (confirm('確定要更改實際安裝日程嗎?') == true) { - $("#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(); + 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 = ''; + + 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 = ''; + + 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; } \ No newline at end of file diff --git a/wms/wipwholeinstall-index-function.php b/wms/wipwholeinstall-index-function.php index 2596cf3d..fea088b3 100644 --- a/wms/wipwholeinstall-index-function.php +++ b/wms/wipwholeinstall-index-function.php @@ -1051,3 +1051,100 @@ function getShengguanokOptions($link) "; 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 5cfe2e93..4a262fac 100644 --- a/wms/wipwholeinstall-index-table-html.php +++ b/wms/wipwholeinstall-index-table-html.php @@ -5,6 +5,7 @@ 客戶姓名 合約地址 地工地址 + 警示 預計出貨日 發包廠商(工勘) 發包日期(工勘) @@ -54,6 +55,7 @@ + $val) { diff --git a/wms/wipwholeinstall-renovate-index-function.php b/wms/wipwholeinstall-renovate-index-function.php index 58f48d6d..36aa79bf 100644 --- a/wms/wipwholeinstall-renovate-index-function.php +++ b/wms/wipwholeinstall-renovate-index-function.php @@ -230,7 +230,7 @@ function getDataSql($department_id, $role_id, $user_id) AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " - AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄') + AND SUBSTR(address,1,2) in ('宜蘭','花蓮','台東','臺東') ORDER BY real_contract_arrival_date DESC "; return $sql; @@ -1072,3 +1072,101 @@ function getShengguanokOptions($link) "; 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 c87fc54f..7846457c 100644 --- a/wms/wipwholeinstall-renovate-index-table-html.php +++ b/wms/wipwholeinstall-renovate-index-table-html.php @@ -6,6 +6,7 @@ 客戶姓名 合約地址 地工地址 + 警示 預計出貨日 發包廠商(工勘) 發包日期(工勘) @@ -37,6 +38,7 @@ + $val) {