diff --git a/wms/bonus/api/get.php b/wms/bonus/api/get.php index 52ae13ff..ef18e03d 100644 --- a/wms/bonus/api/get.php +++ b/wms/bonus/api/get.php @@ -1,37 +1,36 @@ + prepare($sql); -$stmt->execute(); -$data = $stmt->fetch(PDO::FETCH_ASSOC); -$data['amount'] = intval($data['amount']); -$checkBillNo = $data['CBno']; - + $stmt = $connT8->prepare($sql); + $stmt->execute(); + $data = $stmt->fetch(PDO::FETCH_ASSOC); + // $data['amount'] = intval($data['amount']); + if (!empty($data['CBno']) && $data['CBno'] != '') { + $checkBillNo = $data['CBno']; -$sql = "SELECT + $sql = "SELECT c.BillDate AS CheckBillDate FROM arWriteOffBill AS a LEFT JOIN arWriteOffBillRec AS b ON a.BillNo=b.BillNo @@ -39,9 +38,7 @@ $sql = "SELECT (SELECT temp1.*,arWriteOffBillDetail.* FROM arWriteOffBillDetail LEFT JOIN (SELECT - arCheckBill.BillNo AS checkBillNo, - arCheckBill.BillDate, - arCheckBillInvInfo.InvoiceNo + arCheckBill.BillNo AS checkBillNo, arCheckBill.BillDate,arCheckBillInvInfo.InvoiceNo FROM arCheckBill LEFT JOIN arCheckBillInvInfo ON arCheckBill.InvoiceBillNo=arCheckBillInvInfo.InvoiceBillNo) AS temp1 @@ -50,27 +47,33 @@ $sql = "SELECT WHERE c.checkBillNo = '$checkBillNo' "; -$stmt = $connT8->prepare($sql); -$stmt->execute(); -$check = $stmt->fetch(PDO::FETCH_ASSOC); - - + $stmt = $connT8->prepare($sql); + $stmt->execute(); + $check = $stmt->fetch(PDO::FETCH_ASSOC); -$CU_MaterialId = $data['facility']; -$sql = "SELECT SQuantity FROM salIncomeApplyDetail WHERE BillNo = :contract_no AND CU_MaterialId = :CU_MaterialId"; -$stmt = $connT8->prepare($sql); -$stmt->bindParam(':contract_no', $contract_no); -$stmt->bindParam(':CU_MaterialId', $CU_MaterialId); -$stmt->execute(); -$result = $stmt->fetchAll(PDO::FETCH_ASSOC); -$count = COUNT($result); -$data['maintain_month'] = intval($count * $result[0]['SQuantity']); -if (!empty($check['CheckBillDate'])) { - header('Content-Type: application/json'); - echo json_encode($data); -} else { - echo false; - exit; + // $CU_MaterialId = $data['facility']; + // $sql = "SELECT SQuantity FROM salIncomeApplyDetail WHERE BillNo = :contract_no AND CU_MaterialId = :CU_MaterialId"; + // $stmt = $connT8->prepare($sql); + // $stmt->bindParam(':contract_no', $contract_no); + // $stmt->bindParam(':CU_MaterialId', $CU_MaterialId); + // $stmt->execute(); + // $result = $stmt->fetchAll(PDO::FETCH_ASSOC); + // $count = COUNT($result); + // $data['maintain_month'] = intval($count * $result[0]['SQuantity']); + echo '1'; + } else { + echo '2'; + } + } catch (PDOException $e) { + echo '123'; + } + // if (($check['CheckBillDate']) !== '') { + // header('Content-Type: application/json'); + // echo $check['CheckBillDate']; + // } else { + // echo false; + // exit; + // } } diff --git a/wms/bonus/bonus.php b/wms/bonus/bonus.php new file mode 100644 index 00000000..79900417 --- /dev/null +++ b/wms/bonus/bonus.php @@ -0,0 +1,207 @@ + '新梯', + '2' => '汰改', + '3' => '保養' +]; + +$bonus_type = [ + '1' => '契約人獎金', + '2' => '區經理獎金', + '3' => '專任契約經理獎金' +]; +$clause = ''; +if (!empty($_GET['check'])) { + if ($_GET['check'] == 1) { + $clause .= "AND pay_day > DATE_SUB(NOW(), INTERVAL 1 MONTH)"; + } else if ($_GET['check'] == 2) { + $clause .= "AND status = 1"; + } else if ($_GET['check'] == 3) { + $clause .= "AND status = 2"; + } +} + +$sql = "SELECT * FROM bonus WHERE 1=1 $clause"; +$stmt = $conn->prepare($sql); +$stmt->execute(); +$datas = $stmt->fetchAll(PDO::FETCH_ASSOC); + +$now = new DateTime(); +$oneMonthAgo = $now->modify('+1 month'); + + +// 查看 T8 是否有收款明細 +// require("./api/get.php"); +function isPay($contract_no) +{ + $api_url = './api/get.php?contract_no=' . $contract_no; + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $api_url); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_HTTPHEADER, array($contract_no)); + + $response = curl_exec($ch); + echo $response; + if ($response === false) { + echo '123Curl error: ' . curl_error($ch); + } else { + $result = json_decode($response, true); + if ($result['Status'] == 'Success') + return $result; + if ($result['Status'] == 'Error') + return $result; + } + + curl_close($ch); +} +?> + + + + + + + + + +
+
+ + + + btn-sm categoryBtn"> 所有獎金 + btn-sm categoryBtn"> 應發獎金 + btn-sm categoryBtn"> 未發獎金 + btn-sm categoryBtn"> 已發獎金 + + + + + + + + + + + + + + + + + + + $data) : + $isPay = isPay($data['contract_no']); + ?> + + + + + + + + + + + + + + + + +
項次合約類別合約號做番號獎金類別獎金試用版本應發人員發放時間是否發放是否收款檢視
+ + + + + 查看詳情 + +
+
+
+ + + + \ No newline at end of file diff --git a/wms/bonus/bonus_detail.php b/wms/bonus/bonus_detail.php new file mode 100644 index 00000000..d32848d2 --- /dev/null +++ b/wms/bonus/bonus_detail.php @@ -0,0 +1,198 @@ +prepare($sql); +$stmt->bindParam(':id', $_GET['id']); +$stmt->execute(); +$result = $stmt->fetch(PDO::FETCH_ASSOC); +echo '
';
+print_r($result);
+echo '
'; +?> + + + + + + + + + + +
+
+ +
+ + + + + + + + + + + +
+

獎金計算

+
+ + + +
+
+
+ + \ No newline at end of file diff --git a/wms/bonus/connT8.php b/wms/bonus/connT8.php new file mode 100644 index 00000000..9324c5ca --- /dev/null +++ b/wms/bonus/connT8.php @@ -0,0 +1,15 @@ +setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + } +} catch (PDOException $e) { + // echo "fail"; + // echo $e->getMessage(); + die("ERROR!!!: " . $e->getMessage()); +} diff --git a/wms/contract-repair/api/postContractData.php b/wms/contract-repair/api/postContractData.php index b4815669..ae043761 100644 --- a/wms/contract-repair/api/postContractData.php +++ b/wms/contract-repair/api/postContractData.php @@ -377,7 +377,9 @@ if (isset($_POST['contractno']) && $_POST['contractno'] != "" && isset($_POST['c sign_date, contract_status, create_user, - create_date) VALUES( + create_date, + delete_status) + VALUES( :repair_no, :contractno, :company, @@ -391,7 +393,8 @@ if (isset($_POST['contractno']) && $_POST['contractno'] != "" && isset($_POST['c :sign_date, :contract_status, :create_userid, - :create_date + :create_date, + 1 )"; $stmt = $conn->prepare($sql); $stmt->bindParam(":repair_no", $repair_no); diff --git a/wms/contract-repair/contract-repair-input.php b/wms/contract-repair/contract-repair-input.php index d85fa1bd..939edeea 100644 --- a/wms/contract-repair/contract-repair-input.php +++ b/wms/contract-repair/contract-repair-input.php @@ -14,6 +14,7 @@ $stmt = $conn->prepare($sql_str); $stmt->bindParam(':accounttype', $accounttype); $stmt->execute(); $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC); + $persons = array_map(function ($person) { return [ 'view' => $person['accountid'] . '-' . $person['name'], @@ -21,6 +22,9 @@ $persons = array_map(function ($person) { 'name' => $person['name'] ]; }, $contractpersons); +// echo '
';
+// print_r($persons);
+// echo '
'; $contract_stauts = ["合約簽回", "採購", "工程發包", "工程中", "修理完成"]; ?> @@ -81,7 +85,7 @@ $contract_stauts = ["合約簽回", "採購", "工程發包", "工程中", "修 維保人員