diff --git a/app/app-wipinstallation-log.php b/app/app-wipinstallation-log.php index f1a2d1b7..c55f7f15 100644 --- a/app/app-wipinstallation-log.php +++ b/app/app-wipinstallation-log.php @@ -24,6 +24,150 @@ if ($user_id == 'A000000001') { $sql = "SELECT * FROM wipinstallation where (facilityno = '$facilityno') order by id desc"; # sql語法存在變數中 } else { $sql = " + SELECT + '0' AS id, + facilityno, + SUBSTR(real_contract_arrival_date,1,10) AS issue_time, + '分配安裝人員' AS 'process', + 'bg-success' AS 'light_color', + '' AS memo, + creater, + create_at + FROM wipwholestatus + WHERE (facilityno = '$facilityno') + AND real_contract_arrival_date != '' + AND real_contract_arrival_date IS NOT NULL + + UNION + + SELECT + '1' AS id, + facilityno, + SUBSTR(real_arrival_date,1,10) AS issue_time, + '已出貨' AS 'process', + 'bg-success' AS 'light_color', + '' AS memo, + creater, + create_at + FROM wipwholestatus + WHERE (facilityno = '$facilityno') + AND real_arrival_date != '' + AND real_arrival_date IS NOT NULL + + UNION + + SELECT + '2' AS id, + facilityno, + SUBSTR(estimate_install_start_date,1,10) AS issue_time, + '預計安裝日期' AS 'process', + 'bg-success' AS 'light_color', + '' AS memo, + creater, + create_at + FROM wipwholestatus + WHERE (facilityno = '$facilityno') + AND estimate_install_start_date != '' + AND estimate_install_start_date IS NOT NULL + + UNION + + SELECT + '3' AS id, + facilityno, + SUBSTR(install_start_date,1,10) AS issue_time, + '已開工' AS 'process', + 'bg-success' AS 'light_color', + '' AS memo, + creater, + create_at + FROM wipwholestatus + WHERE (facilityno = '$facilityno') + AND install_start_date != '' + AND install_start_date IS NOT NULL + + UNION + + SELECT + '4' AS id, + facilityno, + SUBSTR(estimate_tryrun_start_date,1,10) AS issue_time, + '預計試車日期' AS 'process', + 'bg-success' AS 'light_color', + '' AS memo, + creater, + create_at + FROM wipwholestatus + WHERE (facilityno = '$facilityno') + AND estimate_tryrun_start_date != '' + AND estimate_tryrun_start_date IS NOT NULL + + UNION + + SELECT + '5' AS id, + facilityno, + SUBSTR(tryrun_start_date,1,10) AS issue_time, + '開始試車' AS 'process', + 'bg-success' AS 'light_color', + '' AS memo, + creater, + create_at + FROM wipwholestatus + WHERE (facilityno = '$facilityno') + AND tryrun_start_date != '' + AND tryrun_start_date IS NOT NULL + + UNION + + SELECT + '6' AS id, + facilityno, + SUBSTR(end_qc_date,1,10) AS issue_time, + '完成QC' AS 'process', + 'bg-success' AS 'light_color', + '' AS memo, + creater, + create_at + FROM wipwholestatus + WHERE (facilityno = '$facilityno') + AND end_qc_date != '' + AND end_qc_date IS NOT NULL + + UNION + + SELECT + '7' AS id, + facilityno, + SUBSTR(official_check_date,1,10) AS issue_time, + '完成官檢' AS 'process', + 'bg-success' AS 'light_color', + '' AS memo, + creater, + create_at + FROM wipwholestatus + WHERE (facilityno = '$facilityno') + AND official_check_date != '' + AND official_check_date IS NOT NULL + + UNION + + SELECT + '8' AS id, + facilityno, + SUBSTR(delivery_date,1,10) AS issue_time, + '完成移交' AS 'process', + 'bg-success' AS 'light_color', + '' AS memo, + creater, + create_at + FROM wipwholestatus + WHERE (facilityno = '$facilityno') + AND delivery_date != '' + AND delivery_date IS NOT NULL + + + /* SELECT '0' AS id, facilityno, @@ -107,6 +251,8 @@ if ($user_id == 'A000000001') { create_at FROM wipwholestatus WHERE (facilityno = '$facilityno') +*/ + ORDER BY id DESC "; } diff --git a/app/app-wipproduction-log.php b/app/app-wipproduction-log.php index ead78b90..6f95a3d4 100644 --- a/app/app-wipproduction-log.php +++ b/app/app-wipproduction-log.php @@ -27,6 +27,101 @@ if ($user_id == 'A000000001') { SELECT '0' AS id, facilityno, + '' AS issue_time, + '生產中' AS 'process', + 'bg-success' AS 'light_color', + '' AS memo, + creater, + create_at + FROM wipwholestatus + WHERE facilityno = '$facilityno' + + UNION + + SELECT + '1' AS id, + facilityno, + SUBSTR(estimated_shipping_date,1,10) AS issue_time, + '生產完成' AS 'process', + 'bg-success' AS 'light_color', + '' AS memo, + creater, + create_at + FROM wipwholestatus + WHERE facilityno = '$facilityno' + AND estimated_shipping_date != '' + AND estimated_shipping_date IS NOT NULL + + UNION + + SELECT + '2' AS id, + facilityno, + SUBSTR(estimated_shipping_schedule_date,1,10) AS issue_time, + '預計攬收' AS 'process', + 'bg-success' AS 'light_color', + '' AS memo, + creater, + create_at + FROM wipwholestatus + WHERE facilityno = '$facilityno' + AND estimated_shipping_schedule_date != '' + AND estimated_shipping_schedule_date IS NOT NULL + + UNION + + SELECT + '3' AS id, + facilityno, + SUBSTR(actual_tofactory_date,1,10) AS issue_time, + '攬收成功(桃園)' AS 'process', + 'bg-success' AS 'light_color', + '' AS memo, + creater, + create_at + FROM wipwholestatus + WHERE facilityno = '$facilityno' + AND actual_tofactory_date != '' + AND actual_tofactory_date IS NOT NULL + + UNION + + SELECT + '4' AS id, + facilityno, + SUBSTR(real_contract_arrival_date,1,10) AS issue_time, + '預計出貨日' AS 'process', + 'bg-success' AS 'light_color', + '' AS memo, + creater, + create_at + FROM wipwholestatus + WHERE facilityno = '$facilityno' + AND real_contract_arrival_date != '' + AND real_contract_arrival_date IS NOT NULL + + UNION + + SELECT + '5' AS id, + facilityno, + SUBSTR(real_arrival_date,1,10) AS issue_time, + '出貨' AS 'process', + 'bg-success' AS 'light_color', + '' AS memo, + creater, + create_at + FROM wipwholestatus + WHERE facilityno = '$facilityno' + AND real_arrival_date != '' + AND real_arrival_date IS NOT NULL + + +/* + UNION + SELECT + '1' AS id, + facilityno, SUBSTR(prattford_order_date,1,10) AS issue_time, CASE prattford_order_date_verify WHEN 0 THEN '生產完成' @@ -47,7 +142,7 @@ if ($user_id == 'A000000001') { WHERE (facilityno = '$facilityno') UNION SELECT - '1' AS id, + '2' AS id, facilityno, SUBSTR(goods_type_date,1,10) AS issue_time, CASE goods_type @@ -71,7 +166,7 @@ if ($user_id == 'A000000001') { WHERE (facilityno = '$facilityno') UNION SELECT - '2' AS id, + '3' AS id, facilityno, SUBSTR(actual_tofactory_date,1,10) AS issue_time, CASE arrival_date_verify @@ -97,7 +192,7 @@ if ($user_id == 'A000000001') { WHERE (facilityno = '$facilityno') UNION SELECT - '3' AS id, + '4' AS id, facilityno, SUBSTR(real_arrival_date,1,10) AS issue_time, IF(real_arrival_date IS NOT NULL || real_arrival_date != '','已出貨','未出貨') AS 'process', @@ -107,6 +202,8 @@ if ($user_id == 'A000000001') { create_at FROM wipwholestatus WHERE (facilityno = '$facilityno') +*/ + ORDER BY id DESC "; } diff --git a/phb/map/tw.html b/phb/map/tw.html index d029e751..ecfdae00 100644 --- a/phb/map/tw.html +++ b/phb/map/tw.html @@ -1,596 +1,637 @@ + 電梯地圖 - - + + -
- - - - - - - - - + + + + + + + } - + + + - + + \ No newline at end of file diff --git a/wms/css/view/wipwhole-index.php b/wms/css/view/wipwhole-index.php index c24af508..e1f5e17e 100644 --- a/wms/css/view/wipwhole-index.php +++ b/wms/css/view/wipwhole-index.php @@ -126,51 +126,61 @@ /* 旋转动画 */ } -/* The Modal (background) */ -.modal { - display: none; /* Hidden by default */ - position: fixed; /* Stay in place */ - z-index: 1; /* Sit on top */ - padding-top: 100px; /* Location of the box */ - left: 0; - top: 0; - width: 100%; /* Full width */ - height: 100%; /* Full height */ - overflow: auto; /* Enable scroll if needed */ - -} -.modal .back{ - position: absolute; - top: 0; - left:0; - width: 100%; - height: 100%; - background-color: rgba(0,0,0,0.4); /* Black w/ opacity */ -} -/* Modal Content */ -.modal-content { - z-index: 9; - background-color: #fefefe; - margin: auto; - padding: 20px; - border: 1px solid #888; - width: 80%; -} - -/* The Close Button */ -.close { - color: #aaaaaa; - float: right; - font-size: 28px; - font-weight: bold; -} - -.close:hover, -.close:focus { - color: #000; - text-decoration: none; - cursor: pointer; -} + /* The Modal (background) */ + .modal { + display: none; + /* Hidden by default */ + position: fixed; + /* Stay in place */ + z-index: 1; + /* Sit on top */ + padding-top: 100px; + /* Location of the box */ + left: 0; + top: 0; + width: 100%; + /* Full width */ + height: 100%; + /* Full height */ + overflow: auto; + /* Enable scroll if needed */ + + } + + .modal .back { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: rgba(0, 0, 0, 0.4); + /* Black w/ opacity */ + } + + /* Modal Content */ + .modal-content { + z-index: 9; + background-color: #fefefe; + margin: auto; + padding: 20px; + border: 1px solid #888; + width: 80%; + } + + /* The Close Button */ + .close { + color: #aaaaaa; + float: right; + font-size: 28px; + font-weight: bold; + } + + .close:hover, + .close:focus { + color: #000; + text-decoration: none; + cursor: pointer; + } @keyframes spin { diff --git a/wms/css/view/wipwhole-renovate-index.php b/wms/css/view/wipwhole-renovate-index.php index 9bd7eef9..70b3576f 100644 --- a/wms/css/view/wipwhole-renovate-index.php +++ b/wms/css/view/wipwhole-renovate-index.php @@ -126,6 +126,62 @@ /* 旋转动画 */ } + /* The Modal (background) */ + .modal { + display: none; + /* Hidden by default */ + position: fixed; + /* Stay in place */ + z-index: 1; + /* Sit on top */ + padding-top: 100px; + /* Location of the box */ + left: 0; + top: 0; + width: 100%; + /* Full width */ + height: 100%; + /* Full height */ + overflow: auto; + /* Enable scroll if needed */ + + } + + .modal .back { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: rgba(0, 0, 0, 0.4); + /* Black w/ opacity */ + } + + /* Modal Content */ + .modal-content { + z-index: 9; + background-color: #fefefe; + margin: auto; + padding: 20px; + border: 1px solid #888; + width: 80%; + } + + /* The Close Button */ + .close { + color: #aaaaaa; + float: right; + font-size: 28px; + font-weight: bold; + } + + .close:hover, + .close:focus { + color: #000; + text-decoration: none; + cursor: pointer; + } + @media screen and (max-width: 600px) { table { diff --git a/wms/frame/api_getdata.php b/wms/frame/api_getdata.php index 7da622b0..374eba8b 100644 --- a/wms/frame/api_getdata.php +++ b/wms/frame/api_getdata.php @@ -1,4 +1,5 @@ "ok","err"=>"","errCode"=>""); +$json = array("st" => "ok", "err" => "", "errCode" => ""); /** * 表單列表 */ -function get_forms() { +function get_forms() +{ global $link; $i = 1; @@ -45,7 +47,8 @@ function get_forms() { /** * 公告欄列表 */ -function get_board() { +function get_board() +{ global $link; $i = 1; @@ -70,14 +73,15 @@ function get_board() { /** * 系統通知列表 */ -function get_notice($token) { +function get_notice($token) +{ global $link; if (!$token) throw new \Exception("token empty", 802); list($user_id) = explode(".", $token); $i = 1; $data = []; $sql = "select id, kind, related_id, title from notice "; - $sql .= "where (permission like '%".$user_id."%' or permission = 'ALL' or creater = '$user_id') "; + $sql .= "where (permission like '%" . $user_id . "%' or permission = 'ALL' or creater = '$user_id') "; $sql .= "and haveread != '1' "; $sql .= "order by create_at desc limit 0, 6"; $res = mysqli_query($link, $sql); @@ -95,24 +99,64 @@ function get_notice($token) { /** * 待我簽核 */ -function get_pending($token) { +function get_pending($token) +{ global $link; if (!$token) throw new \Exception("token empty", 802); list($user_id) = explode(".", $token); $i = 1; $data = []; + $sql = " + SELECT + t.system_id, + t.system_name, + t.flow_id, + t.flow_name, + COUNT(*) + FROM ( + SELECT s.form_key, + m.system_id, + y.system_name, + m.flow_id, + m.flow_name, + m.path + FROM subflow s, + flow f, + flow_main m, + system_main y + WHERE EXISTS ( + SELECT form_key, + MAX(seq) + FROM subflow + GROUP BY form_key + HAVING SUBSTRING(s.form_key, 1, 10) = form_key + AND s.seq = max(seq) + ) + AND SUBSTRING(s.form_key, 1, 10) = f.form_key + AND f.flow_id = m.flow_id + AND f.system_id = y.system_id + AND s.current_assigner = '$user_id' + AND f.flow_code != 'Z' + ) t + GROUP BY t.system_id, + t.flow_id, + t.system_name, + t.flow_name + LIMIT 0, 6 + "; + + // $sql = "select t.system_id, t.system_name, t.flow_id, t.flow_name, count(*) from ("; + // $sql .= "select s.form_key, m.system_id, y.system_name, m.flow_id, m.flow_name, m.path from subflow s, flow f, flow_main m, system_main y "; + // $sql .= "where "; + // $sql .= "EXISTS ( + // select form_key, max(seq) from subflow + // group by form_key + // having SUBSTRING(s.form_key,1,10) = form_key and s.seq = max(seq) + // ) "; + // $sql .= "and SUBSTRING(s.form_key,1,10) = f.form_key and f.flow_id = m.flow_id and f.system_id = y.system_id and s.current_assigner = '$user_id'"; + // $sql .= ") t group by t.system_id, t.flow_id, t.system_name, t.flow_name "; + // $sql .= "limit 0, 6"; - $sql = "select t.system_id, t.system_name, t.flow_id, t.flow_name, count(*) from ("; - $sql .= "select s.form_key, m.system_id, y.system_name, m.flow_id, m.flow_name, m.path from subflow s, flow f, flow_main m, system_main y "; - $sql .= "where "; - $sql .= "EXISTS ( - select form_key, max(seq) from subflow - group by form_key - having SUBSTRING(s.form_key,1,10) = form_key and s.seq = max(seq) - ) "; - $sql .= "and SUBSTRING(s.form_key,1,10) = f.form_key and f.flow_id = m.flow_id and f.system_id = y.system_id and s.current_assigner = '$user_id'"; - $sql .= ") t group by t.system_id, t.flow_id, t.system_name, t.flow_name "; - $sql .= "limit 0, 6"; $res = mysqli_query($link, $sql); while ($row = mysqli_fetch_row($res)) { $data[$i]["sid"] = $row[0]; @@ -139,7 +183,7 @@ function get_pending($token) { return $data; } -try{ +try { if (empty($_REQUEST)) throw new \Exception("post empty", 801); if (empty($_REQUEST["p"])) throw new \Exception("post p empty", 801); @@ -161,13 +205,10 @@ try{ default: echo "error"; } - - -}catch(\Exception $ex){ - $json["st"] = "err"; - $json["err"] = $ex->getMessage(); - $json["errCode"] = (!empty($ex->getCode()))?$ex->getCode():701; +} catch (\Exception $ex) { + $json["st"] = "err"; + $json["err"] = $ex->getMessage(); + $json["errCode"] = (!empty($ex->getCode())) ? $ex->getCode() : 701; } -echo json_encode($json,JSON_UNESCAPED_UNICODE); -?> \ No newline at end of file +echo json_encode($json, JSON_UNESCAPED_UNICODE); diff --git a/wms/wipwhole-index-table-html.php b/wms/wipwhole-index-table-html.php index 04f873a1..5ba74871 100644 --- a/wms/wipwhole-index-table-html.php +++ b/wms/wipwhole-index-table-html.php @@ -139,7 +139,7 @@ if (in_array($user_id, ['M0175', 'M0079'])) { - + $val) { if ((string)$data['site_survey_contact_verify'] == (string)$key) { diff --git a/wms/wipwhole-index.php b/wms/wipwhole-index.php index 93f4dd29..9f87ec09 100644 --- a/wms/wipwhole-index.php +++ b/wms/wipwhole-index.php @@ -234,11 +234,8 @@ $dataZ = mysqli_query($link, $sql);
-
- - @@ -247,7 +244,66 @@ $dataZ = mysqli_query($link, $sql);
- +

欄位維護權限

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
欄位維護單位
合約號業務部
電梯編號業務部
客戶姓名業務部
規格業務部
地址業務部(營業人員 or 工勘人員透過申請單)
工勘狀態工勘人員
合約交期(到工地)業務部
下單日(普來特富)業務部
預計到廠日(觀音廠)生管部門
實際到廠日(觀音廠)生管部門
預計出貨日(到工地)業務部(營業人員 or 工勘人員透過申請單)
實際出貨日(到工地)生管部門
+
+
diff --git a/wms/wipwhole-renovate-index-table-html.php b/wms/wipwhole-renovate-index-table-html.php index a851d304..3be85123 100644 --- a/wms/wipwhole-renovate-index-table-html.php +++ b/wms/wipwhole-renovate-index-table-html.php @@ -146,7 +146,7 @@ if (in_array($user_id, ['M0175', 'M0079'])) { - + $val) { if ((string)$data['site_survey_contact_verify'] == (string)$key) { diff --git a/wms/wipwhole-renovate-index.php b/wms/wipwhole-renovate-index.php index 337567da..f38bbd42 100644 --- a/wms/wipwhole-renovate-index.php +++ b/wms/wipwhole-renovate-index.php @@ -209,28 +209,101 @@ $dataZ = mysqli_query($link, $sql); + $data, @@ -513,6 +586,21 @@ mysqli_close($link); $("#del_form").submit(); } +
diff --git a/wms/wipwhole-wipinstallstatus-index.php b/wms/wipwhole-wipinstallstatus-index.php index bf793f6d..a7756b7f 100644 --- a/wms/wipwhole-wipinstallstatus-index.php +++ b/wms/wipwhole-wipinstallstatus-index.php @@ -504,6 +504,9 @@ if ((int)$radsY . $radsM > (int)$radeY . $radeM) { M1 (int)$radeY . $radeM) { MA (int)$radeY . $radeM) { 合計 合約地址 地工地址 警示 - 預計出貨日 + 實際到廠日(觀音廠) + 預計出貨日(到工地) 發包廠商(工勘) 發包日期(工勘) 預計開工日(工勘) @@ -56,7 +57,18 @@ - + + + + + + $val) { // if ((string)$data['site_survey_contact_verify'] == (string)$key) { @@ -88,9 +100,9 @@ echo "
" . date("Y/m/d", strtotime($data['tryrun_outsourcer_date'])); } else { if (!empty($data['install_outsourcer_date'])) - echo date("Y/m/d", strtotime($data['install_outsourcer_date'])). "
　"; + echo date("Y/m/d", strtotime($data['install_outsourcer_date'])) . "
　"; if (!empty($data['tryrun_outsourcer_date'])) - echo "　
" .date("Y/m/d", strtotime($data['tryrun_outsourcer_date'])); + echo "　
" . date("Y/m/d", strtotime($data['tryrun_outsourcer_date'])); } ?> @@ -114,9 +126,9 @@ echo "
" . date("Y/m/d", strtotime($data['tryrun_start_date'])); } else { if (!empty($data['install_start_date'])) - echo date("Y/m/d", strtotime($data['install_start_date'])). "
　"; + echo date("Y/m/d", strtotime($data['install_start_date'])) . "
　"; if (!empty($data['tryrun_start_date'])) - echo "　
" .date("Y/m/d", strtotime($data['tryrun_start_date'])); + echo "　
" . date("Y/m/d", strtotime($data['tryrun_start_date'])); } ?> @@ -127,9 +139,9 @@ echo "
" . date("Y/m/d", strtotime($data['estimate_tryrun_end_date'])); } else { if (!empty($data['estimate_install_end_date'])) - echo date("Y/m/d", strtotime($data['estimate_install_end_date'])). "
　"; + echo date("Y/m/d", strtotime($data['estimate_install_end_date'])) . "
　"; if (!empty($data['estimate_tryrun_end_date'])) - echo "　
" .date("Y/m/d", strtotime($data['estimate_tryrun_end_date'])); + echo "　
" . date("Y/m/d", strtotime($data['estimate_tryrun_end_date'])); } ?> @@ -140,9 +152,9 @@ echo "
" . date("Y/m/d", strtotime($data['tryrun_end_date'])); } else { if (!empty($data['install_end_date'])) - echo date("Y/m/d", strtotime($data['install_end_date'])). "
　"; + echo date("Y/m/d", strtotime($data['install_end_date'])) . "
　"; if (!empty($data['tryrun_end_date'])) - echo "　
" .date("Y/m/d", strtotime($data['tryrun_end_date'])); + echo "　
" . date("Y/m/d", strtotime($data['tryrun_end_date'])); } ?> diff --git a/wms/wipwholeinstall-renovate-index-table-html.php b/wms/wipwholeinstall-renovate-index-table-html.php index 7846457c..2f3dc8f4 100644 --- a/wms/wipwholeinstall-renovate-index-table-html.php +++ b/wms/wipwholeinstall-renovate-index-table-html.php @@ -7,7 +7,8 @@ 合約地址 地工地址 警示 - 預計出貨日 + 實際到廠日(觀音廠) + 預計出貨日(到工地) 發包廠商(工勘) 發包日期(工勘) 預計開工日(工勘) @@ -39,7 +40,18 @@ - + + + + + + $val) { // if ((string)$data['site_survey_contact_verify'] == (string)$key) { @@ -181,7 +193,6 @@