From be6379d25f73ed377372b9af4f0f2bc243b6a200 Mon Sep 17 00:00:00 2001 From: Cheng Date: Wed, 24 Jan 2024 11:12:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E6=A2=AF=E5=83=B9=E5=AF=A9BUG?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/fun_global.php | 13 ++++++------- wms/mkt/pricereview-index.php | 10 +++++++++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/wms/fun_global.php b/wms/fun_global.php index b468f413..8105db67 100644 --- a/wms/fun_global.php +++ b/wms/fun_global.php @@ -83,13 +83,12 @@ function manage_class($user_id, &$ret = []) * @return array * */ -function pricereview_class($rate, $user_id, &$ret = [], $special_fee) +function pricereview_class($rate, $user_id, &$ret = [], $special_fee, $i = 0) { global $link; $sql = "select manager from account where accountid = '$user_id'"; $res = mysqli_query($link, $sql); - $i = 0; while ($row = mysqli_fetch_assoc($res)) { if ($row["manager"] == "M0001") return; // 董事長略過 if ($user_id == 'TEST01') { @@ -112,13 +111,13 @@ function pricereview_class($rate, $user_id, &$ret = [], $special_fee) } if ($row["manager"] != "M0060" && $row["manager"] != "M0006" && $row["manager"] != "M0008") { if ($row["manager"] == 'M0029') { - $ret[1] = "M0147,,"; + $ret[1] = "M0137,,"; $i++; - pricereview_class($rate, $row["manager"], $ret, $special_fee); + pricereview_class($rate, $row["manager"], $ret, $special_fee, $i); } else { $ret[1] = $row["manager"] . ",,"; $i++; - pricereview_class($rate, $row["manager"], $ret, $special_fee); + pricereview_class($rate, $row["manager"], $ret, $special_fee, $i); } } else { // if ($user_id == 'M0033' || $user_id == 'M0137' || $user_id == 'M0029' || $user_id == 'M0054' || $user_id == 'M0086') { @@ -168,7 +167,7 @@ function pricereview_renovate_class($rate, $user_id, $renovate_flag) } } // $ret[1] = "M0029"; - mysqli_free_result($res); + $ret[2] = 'M0012'; if ($renovate_flag == "REN") { // $ret[2] = 'M0012'; @@ -179,7 +178,7 @@ function pricereview_renovate_class($rate, $user_id, $renovate_flag) if ($rate <= 100) $ret[3] = "M0008"; // 詹總 if ($rate < 75) $ret[4] = "M0006"; // 總經理 } - + mysqli_free_result($res); return $ret; } diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php index 70da5706..df5394a7 100644 --- a/wms/mkt/pricereview-index.php +++ b/wms/mkt/pricereview-index.php @@ -84,7 +84,15 @@ if (!empty($_GET['check']) && $_GET['check'] == '1') { $results = $stmt->fetchAll(PDO::FETCH_ASSOC); foreach ($results as $result) { - if (strlen($result[$sign]) != 7) { + if (strlen($result[$sign]) > 30 && $sign == 'sign2') { + // echo "
";
+            // print_r(($result[$sign]));
+            // echo '
'; + + $id[] = $result['mid']; + } + if (strlen($result[$sign]) != 7 && $sign != 'sign2') { + echo '123'; $id[] = $result['mid']; } } From d17d7cf2d0649774527d2e0bc3b387004c4319ec Mon Sep 17 00:00:00 2001 From: Cheng Date: Wed, 24 Jan 2024 14:19:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E6=A2=AF=E5=83=B9=E5=AF=A9?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=88=95(=E7=B5=90=E6=A1=88?= =?UTF-8?q?=E5=90=8C=E6=84=8F=E3=80=81=E4=B8=8D=E5=90=8C=E6=84=8F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/contract-repair/api/putContractData.php | 85 ++++++++++--------- wms/contract-repair/contract-repair-input.php | 1 + .../contract-repair-management.php | 2 +- wms/mkt/pricereview-index.php | 60 ++++++++++--- 4 files changed, 91 insertions(+), 57 deletions(-) diff --git a/wms/contract-repair/api/putContractData.php b/wms/contract-repair/api/putContractData.php index 1b960e02..05417f59 100644 --- a/wms/contract-repair/api/putContractData.php +++ b/wms/contract-repair/api/putContractData.php @@ -56,7 +56,7 @@ if (isset($_POST['contracttype']) && $_POST['contracttype'] == 'r' && isset($_PO // echo json_encode($sql); // exit; $stmt->execute(); - t8Insert($_POST); + // t8Insert($_POST); // header("HTTP/1.1 204 NO Content"); $conn->commit(); @@ -67,49 +67,50 @@ if (isset($_POST['contracttype']) && $_POST['contracttype'] == 'r' && isset($_PO } } -function t8Insert($data) -{ - require_once('../../contract/connt8.php'); - $create_date = date('Y-m-dH-i-s'); - $repair_no = !empty($data['repair_no']) ? $data['repair_no'] : null; // 報價單號 - $company = !empty($data['company']) ? $data['company'] : null; //立約人 - $repaireid = !empty($data['repaireid']) ? $data['repaireid'] : null; //維保人員 - $facilityno = !empty($data['facilityno']) ? $data['facilityno'] : null; // 電梯編號 - $type = !empty($data['type']) ? $data['type'] : null; //工程進度 - $sign_date = !empty($data['sign_date']) ? $data['sign_date'] : null; //簽訂時間 - $invoice = !empty($data['invoice']) ? $data['invoice'] : null; // 發票抬頭 - $taxid = !empty($data['taxid']) ? $data['taxid'] : null; //統編 - $address = !empty($data['address']) ? $data['address'] : null; //工程地址 - $contract_status = !empty($data['contract_status']) ? $data['contract_status'] : null; - $user_id = !empty($_data['user_id']) ? $data['user_id'] : null; +// 塞保養合約進T8的 API function +// function t8Insert($data) +// { +// require_once('../../contract/connt8.php'); +// $create_date = date('Y-m-dH-i-s'); +// $repair_no = !empty($data['repair_no']) ? $data['repair_no'] : null; // 報價單號 +// $company = !empty($data['company']) ? $data['company'] : null; //立約人 +// $repaireid = !empty($data['repaireid']) ? $data['repaireid'] : null; //維保人員 +// $facilityno = !empty($data['facilityno']) ? $data['facilityno'] : null; // 電梯編號 +// $type = !empty($data['type']) ? $data['type'] : null; //工程進度 +// $sign_date = !empty($data['sign_date']) ? $data['sign_date'] : null; //簽訂時間 +// $invoice = !empty($data['invoice']) ? $data['invoice'] : null; // 發票抬頭 +// $taxid = !empty($data['taxid']) ? $data['taxid'] : null; //統編 +// $address = !empty($data['address']) ? $data['address'] : null; //工程地址 +// $contract_status = !empty($data['contract_status']) ? $data['contract_status'] : null; +// $user_id = !empty($_data['user_id']) ? $data['user_id'] : null; - $sign = str_replace("-", '', $sign_date); - $create = str_replace('-', '', $create_date); +// $sign = str_replace("-", '', $sign_date); +// $create = str_replace('-', '', $create_date); - $sql = "INSERT INTO comBusinessPartner - (BizPartnerId,BizPartnerName,BusinessAttr,CountryId,BizToDate,TaxNo,ContactAddress,CreatorId,CreateTime,BizPartnerTypeId) - VALUES(:BizPartnerId,:BizPartnerName,1,'TW',99999999,:TaxNo,:ContactAddress,:CreatorId,:CreateTime,'10')"; - $stmt = $connT8->prepare($sql); - $stmt->bindParam(':BizPartnerId', $repair_no); //報價單編號 - $stmt->bindParam(':BizPartnerName', $company); - $stmt->bindParam(':TaxNo', $taxid); - $stmt->bindParam(':ContactAddress', $address); - $stmt->bindParam(':CreatorId', $user_id); - $stmt->bindParam(':CreateTime', $create); - $stmt->execute(); +// $sql = "INSERT INTO comBusinessPartner +// (BizPartnerId,BizPartnerName,BusinessAttr,CountryId,BizToDate,TaxNo,ContactAddress,CreatorId,CreateTime,BizPartnerTypeId) +// VALUES(:BizPartnerId,:BizPartnerName,1,'TW',99999999,:TaxNo,:ContactAddress,:CreatorId,:CreateTime,'10')"; +// $stmt = $connT8->prepare($sql); +// $stmt->bindParam(':BizPartnerId', $repair_no); //報價單編號 +// $stmt->bindParam(':BizPartnerName', $company); +// $stmt->bindParam(':TaxNo', $taxid); +// $stmt->bindParam(':ContactAddress', $address); +// $stmt->bindParam(':CreatorId', $user_id); +// $stmt->bindParam(':CreateTime', $create); +// $stmt->execute(); - $sql = "INSERT INTO comCustomer - (OrgId,BizPartnerTypeId,CurrId,BizPartnerId,PersonId,CreatorId,IsInUsed,InvoiceAddress,CreateTime) - VALUES('1000','10','TWD',:BizPartnerId,:PersonId,:CreatorId,1,:InvoiceAddress,:CreateTime)"; - $stmt = $connT8->prepare($sql); - $stmt->bindParam(':BizPartnerId', $repair_no); - $stmt->bindParam(':PersonId', $salesman); - $stmt->bindParam(':CreatorId', $user_id); - $stmt->bindParam(':InvoiceAddress', $address); - $stmt->bindParam(':CreateTime', $create); - $stmt->execute(); +// $sql = "INSERT INTO comCustomer +// (OrgId,BizPartnerTypeId,CurrId,BizPartnerId,PersonId,CreatorId,IsInUsed,InvoiceAddress,CreateTime) +// VALUES('1000','10','TWD',:BizPartnerId,:PersonId,:CreatorId,1,:InvoiceAddress,:CreateTime)"; +// $stmt = $connT8->prepare($sql); +// $stmt->bindParam(':BizPartnerId', $repair_no); +// $stmt->bindParam(':PersonId', $salesman); +// $stmt->bindParam(':CreatorId', $user_id); +// $stmt->bindParam(':InvoiceAddress', $address); +// $stmt->bindParam(':CreateTime', $create); +// $stmt->execute(); - $sql = "INSERT INTO "; +// $sql = "INSERT INTO "; - $connT8->commit(); -} +// $connT8->commit(); +// } diff --git a/wms/contract-repair/contract-repair-input.php b/wms/contract-repair/contract-repair-input.php index 525e7ab3..67c069e4 100644 --- a/wms/contract-repair/contract-repair-input.php +++ b/wms/contract-repair/contract-repair-input.php @@ -78,6 +78,7 @@ $contract_stauts = ["合約簽回", "採購", "工程發包", "工程中", "修

未填寫

+ 維保人員