From d2318ee66210b81836e07f1554c06b780357ff4b Mon Sep 17 00:00:00 2001 From: jrbin Date: Wed, 8 Nov 2023 11:32:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=B0=BD=E6=A0=B8bug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/cont/sign_form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wms/cont/sign_form.php b/wms/cont/sign_form.php index c0f18d9e..97e92175 100644 --- a/wms/cont/sign_form.php +++ b/wms/cont/sign_form.php @@ -475,7 +475,7 @@ function get_sequnece_no($seq_name = '', $p_yyyymm = '')
- +
From a8e9365d122d7467118bff0a43b13221029db57a Mon Sep 17 00:00:00 2001 From: jrbin Date: Wed, 8 Nov 2023 15:02:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?+=E9=84=AD=E4=BC=8A=E5=B2=91=E6=AC=8A?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/crm/crmm01-index.php | 4 ++-- wms/crm/crmm02-index.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wms/crm/crmm01-index.php b/wms/crm/crmm01-index.php index 06fd0f02..f770edb9 100644 --- a/wms/crm/crmm01-index.php +++ b/wms/crm/crmm01-index.php @@ -41,8 +41,8 @@ $salesman = empty($_GET['salesman']) ? "%" : $_GET['salesman']; $where .= " and salesman_name like '$salesman'"; $sql_cmd = sql_myself($user_id, "salesman"); -// max,許紓晴,林慧珊 -if (in_array($user_department_id, $depart_arr) || $user_id == "M0060" || $user_id == "M0107" || $user_id == "M0193") $sql_cmd = ""; +// max,許紓晴,林慧珊,鄭伊岑 +if (in_array($user_department_id, $depart_arr) || $user_id == "M0060" || $user_id == "M0107" || $user_id == "M0193" || $user_id == "M0149") $sql_cmd = ""; if (!empty($sql_cmd)) $where .= " and ".str_replace("where", "", $sql_cmd); /* $checkAll = ['p0044', 'M0007']; diff --git a/wms/crm/crmm02-index.php b/wms/crm/crmm02-index.php index a93fc9bb..671b7b2f 100644 --- a/wms/crm/crmm02-index.php +++ b/wms/crm/crmm02-index.php @@ -42,7 +42,7 @@ $where .= " and salesman like '$salesman'"; $lm_name = empty($_GET['linkman']) ? "%" : $_GET['linkman']; $where .= " and linkman like '$lm_name'"; $sql_cmd = sql_myself($user_id, "salesman"); -if (in_array($user_department_id, $depart_arr) || $user_id == "M0060") $sql_cmd = ""; // M0060:Max +if (in_array($user_department_id, $depart_arr) || $user_id == "M0060" || $user_id == "M0149") $sql_cmd = ""; // M0060:Max,鄭伊岑 if (!empty($sql_cmd)) $where .= " and ".str_replace("where", "", $sql_cmd); $sql = "SELECT vol_no,customer,manager,f_return_content('customer_source',source ) source,