diff --git a/wms/cont/sign_list.php b/wms/cont/sign_list.php index 0d942a5e..d08da664 100644 --- a/wms/cont/sign_list.php +++ b/wms/cont/sign_list.php @@ -41,7 +41,7 @@ $res = mysqli_query($link, $sql); $row = mysqli_fetch_row($res); $user_department_id = $row[0]; mysqli_free_result($res); -if (in_array($user_department_id, $depart_arr) || $user_id == "M0008" || $user_id == "M0012" || $user_id == "M0006") $where = ""; +if (in_array($user_department_id, $depart_arr) || $user_id == "M0008" || $user_id == "M0012" || $user_id == "M0006" || $user_id =="M0189") $where = ""; // 電梯廠牌 $elevator_brand_arr = []; diff --git a/wms/contract/api/postContractNewApplyData.php b/wms/contract/api/postContractNewApplyData.php index d7e3c107..dec5c161 100644 --- a/wms/contract/api/postContractNewApplyData.php +++ b/wms/contract/api/postContractNewApplyData.php @@ -8,7 +8,6 @@ if($_SERVER['REQUEST_METHOD'] != 'POST'){ } //暫存、送審 if(isset($_POST['vol_no']) && !empty($_POST['vol_no']) && ($_POST['status'] == 0 || $_POST['status'] == 1) ){ - if($_POST['regulations'] < 10){ header("HTTP/1.1 500 傳送失敗!!試車時間不得低於10天"); exit; diff --git a/wms/contract/contract-new-apply.php b/wms/contract/contract-new-apply.php index d53c5e62..7cf65fe2 100644 --- a/wms/contract/contract-new-apply.php +++ b/wms/contract/contract-new-apply.php @@ -9,7 +9,10 @@ if(!(isset($_GET['id']) && !empty($_GET['id']))){ } $id = $_GET["id"]; -$sql_str = "SELECT contract_new_apply.*, account.name as review_person_name FROM contract_new_apply LEFT JOIN account ON contract_new_apply.review_person_id = account.accountid WHERE contract_new_apply.mid = :mid"; +$sql_str = "SELECT contract_new_apply.*, account.name as review_person_name +FROM contract_new_apply +LEFT JOIN account ON contract_new_apply.review_person_id = account.accountid +WHERE contract_new_apply.mid = :mid"; $stmt = $conn->prepare($sql_str); $stmt->bindParam(':mid',$id); $stmt->execute(); @@ -46,11 +49,9 @@ if(empty($contract_new_apply)){ $stmt->execute(); $items = $stmt->fetchAll(PDO::FETCH_ASSOC); $total_items = 0; - print_r($items); foreach($items as $item){ $total_items += $item['item_qty']; } - echo $total_items ; $sql_str = "SELECT * FROM pricereview_pay WHERE mid = :mid ORDER BY pay_kind ASC"; $stmt = $conn->prepare($sql_str); $stmt->bindParam(':mid', $mid); @@ -80,7 +81,6 @@ if(empty($contract_new_apply)){ $stmt->bindParam(':mid', $mid); $stmt->execute(); $items = $stmt->fetchAll(PDO::FETCH_ASSOC); - print_r($items); $price_a = 0; $price_b = 0; foreach($pays as $pay){ @@ -91,6 +91,12 @@ if(empty($contract_new_apply)){ } } + $sql_str = "SELECT file_name FROM contract_apply_files WHERE contract_id = :contract_id AND deleted_at IS NULL"; + $stmt = $conn->prepare($sql_str); + $stmt->bindParam(':contract_id', $id); + $stmt->execute(); + $files = $stmt->fetchAll(PDO::FETCH_ASSOC); + print_r($files); } $secondPayDeadline = $contract['secondPayDeadline'] ?? 0; $status = isset($contract['status']) ? $contract['status'] : -1; @@ -450,7 +456,12 @@ $person = $contract['person']; 附件上傳 + + + + + @@ -518,7 +529,7 @@ $person = $contract['person']; - +