From f8f352229f3758d02202bb5cbea4f0e78d7ed9a0 Mon Sep 17 00:00:00 2001 From: "gary_chen\\gary_chen" Date: Thu, 2 Nov 2023 17:01:16 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=A3=9C=E4=B8=81=20//=20?= =?UTF-8?q?=E8=A3=9C=E4=B8=81=20=E9=BB=83=E5=AD=9F=E6=BE=A4=20&=20?= =?UTF-8?q?=E8=91=89=E5=8D=9A=E6=BE=84=20=E6=AC=8A=E9=99=90=E7=AD=89?= =?UTF-8?q?=E6=96=BC=20=E6=9D=8E=E7=83=98=E9=8A=98=E3=80=82=202.=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=9A=AB=E6=99=82=E5=88=AA=E9=99=A4=E5=8F=8A=E7=B7=A8?= =?UTF-8?q?=E8=BC=AF=E6=AC=8A=E9=99=90=20(M0175=E5=8F=8AM0079)=E3=80=82=20?= =?UTF-8?q?3.=E6=96=B0=E5=A2=9E=20=E5=AE=89=E8=A3=9D=E5=9C=96=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E6=99=82=EF=BC=8C=E5=90=8C=E6=99=82=E5=AF=AB=E5=85=A5?= =?UTF-8?q?=E5=82=99=E8=A8=BB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/wipwhole-index-function.php | 44 ++++++++++++- wms/wipwhole-index-table-html.php | 11 ++++ wms/wipwhole-index.php | 21 ++++++- wms/wipwhole-rec-invoice-edit-submit.php | 30 ++++++++- wms/wipwhole-rec-invoice-edit.php | 41 +++++++----- wms/wipwhole-renovate-index-function.php | 63 +++++++++++++++---- wms/wipwhole-renovate-index-table-html.php | 11 ++++ wms/wipwhole-renovate-index.php | 20 +++++- ...whole-renovate-rec-invoice-edit-submit.php | 32 +++++++++- wms/wipwhole-renovate-rec-invoice-edit.php | 45 +++++++------ wms/wipwholeinstall-index-function.php | 34 +++++++++- ...ipwholeinstall-renovate-index-function.php | 34 +++++++++- 12 files changed, 328 insertions(+), 58 deletions(-) diff --git a/wms/wipwhole-index-function.php b/wms/wipwhole-index-function.php index 81804787..2c895426 100644 --- a/wms/wipwhole-index-function.php +++ b/wms/wipwhole-index-function.php @@ -5,6 +5,7 @@ function getWipwholestatusData($link, $id) $db_query = " SELECT * FROM wipwholestatus WHERE id='$id' + AND status = '1' "; $receivabledata = mysqli_query($link, $db_query); return mysqli_fetch_array($receivabledata, MYSQLI_ASSOC); @@ -125,11 +126,16 @@ function getDataSql($department_id, $role_id, $user_id) '511', '512', '513', '514' ]; + // 補丁 黃孟澤 & 葉博澄 權限 = 李烘銘 + if(in_array($user_id,['M0166','M0091'])){ + $user_id = 'M0086'; + } + $sql_cmd = sql_myself($user_id, "salesid"); $sql = " SELECT * FROM wipwholestatus $sql_cmd "; - $sql .= empty($sql_cmd) ? " WHERE 1=1 AND contract_type = '$contract_type' " : " AND contract_type = '$contract_type'"; + $sql .= empty($sql_cmd) ? " WHERE 1=1 AND status = '1' AND contract_type = '$contract_type' " : " AND status = '1' AND contract_type = '$contract_type'"; $sql .= getWipwholeSearchSql(); $sql .= "ORDER BY real_contract_arrival_date DESC "; @@ -145,6 +151,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -155,6 +162,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -165,6 +173,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -175,6 +184,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -185,6 +195,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -206,6 +217,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -217,6 +229,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " AND SUBSTR(address,1,2) in ('宜蘭') @@ -229,6 +242,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " AND SUBSTR(address,1,2) in ('臺北','台北','基隆','新北','桃園','新竹') @@ -241,6 +255,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " AND SUBSTR(address,1,2) in ('南投','臺中','台中','彰化','雲林','苗栗') @@ -253,6 +268,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " AND SUBSTR(address,1,2) in ('台南','臺南','嘉義','屏東','高雄') @@ -265,6 +281,7 @@ function getDataSql($department_id, $role_id, $user_id) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date DESC @@ -276,6 +293,13 @@ function getDataSql($department_id, $role_id, $user_id) function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) { + + // 補丁 黃孟澤 & 葉博澄 權限 = 李烘銘 + if(in_array($user_id,['M0166','M0091'])){ + $user_id = 'M0086'; + } + + $flow_code_tmp = explode(',', $flow_code); $flow_code = implode("','", $flow_code_tmp); // 合約類型 @@ -293,6 +317,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -303,6 +328,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -313,6 +339,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -323,6 +350,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -333,6 +361,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' " . getWipwholeSearchSql() . " ORDER BY real_contract_arrival_date ASC @@ -345,6 +374,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) "; $sql .= empty($sql_cmd) ? " WHERE 1=1 AND contract_type = '$contract_type' " : " AND contract_type = '$contract_type'"; $sql .= " + AND status = '1' AND id IN ( SELECT form_id AS id @@ -372,6 +402,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND contract_type = '$contract_type' AND id IN ( SELECT @@ -392,6 +423,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id IN ( SELECT form_id AS id @@ -412,6 +444,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id IN ( SELECT form_id AS id @@ -432,6 +465,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id IN ( SELECT form_id AS id @@ -452,6 +486,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id IN ( SELECT form_id AS id @@ -472,6 +507,7 @@ function getDataSqlByFlowCode($department_id, $role_id, $user_id, $flow_code) $sql = " SELECT * FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id IN ( SELECT form_id AS id @@ -568,6 +604,7 @@ function checkYingYeok($link, $id) ) AS sum_num FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id = '$id' "; $result = mysqli_query($link, $sql); @@ -588,6 +625,7 @@ function checkSheJiok($link, $id) ) AS sum_num FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id = '$id' "; $result = mysqli_query($link, $sql); @@ -605,6 +643,7 @@ function checkSheJiokLeader($link, $id) ) AS sum_num FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id = '$id' "; $result = mysqli_query($link, $sql); @@ -622,6 +661,7 @@ function checkGongWuok($link, $id) ) AS sum_num FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id = '$id' "; $result = mysqli_query($link, $sql); @@ -645,6 +685,7 @@ function checkShengGuanok($link, $id) ) AS sum_num FROM wipwholestatus WHERE 1=1 + AND status = '1' AND id = '$id' "; $result = mysqli_query($link, $sql); @@ -676,6 +717,7 @@ function getGongWuokNo($link) SUBSTR(address,1,2) FROM `wipwholestatus` WHERE id = '$id' + AND status = '1' "; $result = mysqli_query($link, $sql); $row = mysqli_fetch_array($result); diff --git a/wms/wipwhole-index-table-html.php b/wms/wipwhole-index-table-html.php index 9e4155d3..b6a69908 100644 --- a/wms/wipwhole-index-table-html.php +++ b/wms/wipwhole-index-table-html.php @@ -7,10 +7,20 @@ $tableArr = array( "CH" => "table_index6", "Z" => "table_index7" ); + +// 暫時可編輯及刪除權限 +$update_delete_status = false; +if (in_array($user_id, ['M0175', 'M0079'])) { + $update_delete_status = true; +} + ?> + 刪除" : ""; + ?> @@ -101,6 +111,7 @@ $tableArr = array( ?> + " : ""; ?>
合約號 電梯編號 客戶姓名
+