M0117
/
gary_wms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

新梯價審添加按鈕(結案同意、不同意)

gary
Cheng 1 year ago
parent
be6379d25f
commit
d17d7cf2d0
4 changed files with 91 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 85
      wms/contract-repair/api/putContractData.php
  2. 1
      wms/contract-repair/contract-repair-input.php
  3. 2
      wms/contract-repair/contract-repair-management.php
  4. 56
      wms/mkt/pricereview-index.php

85
wms/contract-repair/api/putContractData.php
View File

@ -56,7 +56,7 @@ if (isset($_POST['contracttype']) && $_POST['contracttype'] == 'r' && isset($_PO
// echo json_encode($sql); // echo json_encode($sql);
// exit; // exit;
$stmt->execute(); $stmt->execute();
t8Insert($_POST); // t8Insert($_POST);
// header("HTTP/1.1 204 NO Content"); // header("HTTP/1.1 204 NO Content");
$conn->commit(); $conn->commit();
@ -67,49 +67,50 @@ if (isset($_POST['contracttype']) && $_POST['contracttype'] == 'r' && isset($_PO
} }
} }
function t8Insert($data) // 塞保養合約進T8的 API function
{ // function t8Insert($data)
require_once('../../contract/connt8.php'); // {
$create_date = date('Y-m-dH-i-s'); // require_once('../../contract/connt8.php');
$repair_no = !empty($data['repair_no']) ? $data['repair_no'] : null; // 報價單號 // $create_date = date('Y-m-dH-i-s');
$company = !empty($data['company']) ? $data['company'] : null; //立約人 // $repair_no = !empty($data['repair_no']) ? $data['repair_no'] : null; // 報價單號
$repaireid = !empty($data['repaireid']) ? $data['repaireid'] : null; //維保人員 // $company = !empty($data['company']) ? $data['company'] : null; //立約人
$facilityno = !empty($data['facilityno']) ? $data['facilityno'] : null; // 電梯編號 // $repaireid = !empty($data['repaireid']) ? $data['repaireid'] : null; //維保人員
$type = !empty($data['type']) ? $data['type'] : null; //工程進度 // $facilityno = !empty($data['facilityno']) ? $data['facilityno'] : null; // 電梯編號
$sign_date = !empty($data['sign_date']) ? $data['sign_date'] : null; //簽訂時間 // $type = !empty($data['type']) ? $data['type'] : null; //工程進度
$invoice = !empty($data['invoice']) ? $data['invoice'] : null; // 發票抬頭 // $sign_date = !empty($data['sign_date']) ? $data['sign_date'] : null; //簽訂時間
$taxid = !empty($data['taxid']) ? $data['taxid'] : null; //統編 // $invoice = !empty($data['invoice']) ? $data['invoice'] : null; // 發票抬頭
$address = !empty($data['address']) ? $data['address'] : null; //工程地址 // $taxid = !empty($data['taxid']) ? $data['taxid'] : null; //統編
$contract_status = !empty($data['contract_status']) ? $data['contract_status'] : null; // $address = !empty($data['address']) ? $data['address'] : null; //工程地址
$user_id = !empty($_data['user_id']) ? $data['user_id'] : 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); // $sign = str_replace("-", '', $sign_date);
$create = str_replace('-', '', $create_date); // $create = str_replace('-', '', $create_date);
$sql = "INSERT INTO comBusinessPartner // $sql = "INSERT INTO comBusinessPartner
(BizPartnerId,BizPartnerName,BusinessAttr,CountryId,BizToDate,TaxNo,ContactAddress,CreatorId,CreateTime,BizPartnerTypeId) // (BizPartnerId,BizPartnerName,BusinessAttr,CountryId,BizToDate,TaxNo,ContactAddress,CreatorId,CreateTime,BizPartnerTypeId)
VALUES(:BizPartnerId,:BizPartnerName,1,'TW',99999999,:TaxNo,:ContactAddress,:CreatorId,:CreateTime,'10')"; // VALUES(:BizPartnerId,:BizPartnerName,1,'TW',99999999,:TaxNo,:ContactAddress,:CreatorId,:CreateTime,'10')";
$stmt = $connT8->prepare($sql); // $stmt = $connT8->prepare($sql);
$stmt->bindParam(':BizPartnerId', $repair_no); //報價單編號 // $stmt->bindParam(':BizPartnerId', $repair_no); //報價單編號
$stmt->bindParam(':BizPartnerName', $company); // $stmt->bindParam(':BizPartnerName', $company);
$stmt->bindParam(':TaxNo', $taxid); // $stmt->bindParam(':TaxNo', $taxid);
$stmt->bindParam(':ContactAddress', $address); // $stmt->bindParam(':ContactAddress', $address);
$stmt->bindParam(':CreatorId', $user_id); // $stmt->bindParam(':CreatorId', $user_id);
$stmt->bindParam(':CreateTime', $create); // $stmt->bindParam(':CreateTime', $create);
$stmt->execute(); // $stmt->execute();
$sql = "INSERT INTO comCustomer // $sql = "INSERT INTO comCustomer
(OrgId,BizPartnerTypeId,CurrId,BizPartnerId,PersonId,CreatorId,IsInUsed,InvoiceAddress,CreateTime) // (OrgId,BizPartnerTypeId,CurrId,BizPartnerId,PersonId,CreatorId,IsInUsed,InvoiceAddress,CreateTime)
VALUES('1000','10','TWD',:BizPartnerId,:PersonId,:CreatorId,1,:InvoiceAddress,:CreateTime)"; // VALUES('1000','10','TWD',:BizPartnerId,:PersonId,:CreatorId,1,:InvoiceAddress,:CreateTime)";
$stmt = $connT8->prepare($sql); // $stmt = $connT8->prepare($sql);
$stmt->bindParam(':BizPartnerId', $repair_no); // $stmt->bindParam(':BizPartnerId', $repair_no);
$stmt->bindParam(':PersonId', $salesman); // $stmt->bindParam(':PersonId', $salesman);
$stmt->bindParam(':CreatorId', $user_id); // $stmt->bindParam(':CreatorId', $user_id);
$stmt->bindParam(':InvoiceAddress', $address); // $stmt->bindParam(':InvoiceAddress', $address);
$stmt->bindParam(':CreateTime', $create); // $stmt->bindParam(':CreateTime', $create);
$stmt->execute(); // $stmt->execute();
$sql = "INSERT INTO "; // $sql = "INSERT INTO ";
$connT8->commit(); // $connT8->commit();
} // }

1
wms/contract-repair/contract-repair-input.php
View File

@ -78,6 +78,7 @@ $contract_stauts = ["合約簽回", "採購", "工程發包", "工程中", "修
<input type="text" x-model="data.company" /> <input type="text" x-model="data.company" />
<p class="alerttext" x-show="data.company==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.company==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td style="vertical-align: middle">維保人員</td> <td style="vertical-align: middle">維保人員</td>
<td style="vertical-align: middle"> <td style="vertical-align: middle">
<select class="repaireid" id="repaireid" x-model="data.repairerid"> <select class="repaireid" id="repaireid" x-model="data.repairerid">

2
wms/contract-repair/contract-repair-management.php
View File

@ -64,7 +64,7 @@ $contracts = $stmt->fetchAll(PDO::FETCH_ASSOC);
echo '修理完成'; echo '修理完成';
} }
?></th> ?></th>
<td><?php echo $contract['create_user'] ?></td> <td><?php echo $contract['create_userid'] ?></td>
<td><?php echo $contract['create_date'] ?></td> <td><?php echo $contract['create_date'] ?></td>
<td style="width:30px"> <td style="width:30px">
<p> <p>

56
wms/mkt/pricereview-index.php
View File

@ -57,13 +57,9 @@ if (!empty($_GET['system_id']) && !empty($_GET['flow_id'])) {
$id[] = $test; $id[] = $test;
} }
} }
$inClause = implode(',', $id); $inClause = implode(',', $id);
// echo '<pre>';
// print_r($inClause);
// echo '</pre>';
} }
// 查看已經簽核的單號。
if (!empty($_GET['check']) && $_GET['check'] == '1') { if (!empty($_GET['check']) && $_GET['check'] == '1') {
if ($user_id == 'M0026' || $user_id == 'M0033') { if ($user_id == 'M0026' || $user_id == 'M0033') {
$sign = "sign1"; $sign = "sign1";
@ -77,6 +73,14 @@ if (!empty($_GET['check']) && $_GET['check'] == '1') {
$sign = "sign3"; $sign = "sign3";
$clause = "sign3 like '%$user_id%' "; $clause = "sign3 like '%$user_id%' ";
} }
if (empty($sign)) {
echo "
<script>
alert('沒有該單號');
window.history.back();
</script>
";
}
$sql = "SELECT mid,$sign FROM pricereview_sign WHERE $clause ORDER BY mid"; $sql = "SELECT mid,$sign FROM pricereview_sign WHERE $clause ORDER BY mid";
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
@ -85,17 +89,13 @@ if (!empty($_GET['check']) && $_GET['check'] == '1') {
foreach ($results as $result) { foreach ($results as $result) {
if (strlen($result[$sign]) > 30 && $sign == 'sign2') { if (strlen($result[$sign]) > 30 && $sign == 'sign2') {
// echo "<pre>";
// print_r(($result[$sign]));
// echo '</pre>';
$id[] = $result['mid']; $id[] = $result['mid'];
} } else {
if (strlen($result[$sign]) != 7 && $sign != 'sign2') { if (strlen($result[$sign]) != 7 && $sign != 'sign2') {
echo '123';
$id[] = $result['mid']; $id[] = $result['mid'];
} }
} }
}
$inClause = implode(',', $id); $inClause = implode(',', $id);
} }
@ -115,7 +115,7 @@ if ($user_id == "M0060") {
if (empty($sql_cmd)) $sql = "select pricereview_main.*, contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress from pricereview_main left join contract_new_apply on pricereview_main.id = contract_new_apply.mid where pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id"; if (empty($sql_cmd)) $sql = "select pricereview_main.*, contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress from pricereview_main left join contract_new_apply on pricereview_main.id = contract_new_apply.mid where pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id";
else $sql = "select pricereview_main.*, contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress from pricereview_main left join contract_new_apply on contract_new_apply.mid = pricereview_main.id $sql_cmd and pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id"; else $sql = "select pricereview_main.*, contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress from pricereview_main left join contract_new_apply on contract_new_apply.mid = pricereview_main.id $sql_cmd and pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id";
if (!empty($res_get) || !empty($_GET['check'])) { if (!empty($res_get)) {
$sql = "SELECT pricereview_main.*,contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress $sql = "SELECT pricereview_main.*,contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress
from pricereview_main from pricereview_main
left join contract_new_apply on contract_new_apply.mid = pricereview_main.id left join contract_new_apply on contract_new_apply.mid = pricereview_main.id
@ -125,6 +125,35 @@ if (!empty($res_get) || !empty($_GET['check'])) {
} }
$data = mysqli_query($link, $sql); $data = mysqli_query($link, $sql);
// 若結案不同意
if (!empty($_GET['check']) && $_GET['check'] == 2) {
foreach ($data as $data) {
if ($data['status'] == 'YY') {
$agree[] = $data['id'];
}
}
$inClause = implode(',', $agree);
$sql = "SELECT pricereview_main.*,contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress
from pricereview_main
left join contract_new_apply on contract_new_apply.mid = pricereview_main.id
$sql_cmd and pricereview_main.status like 'Y%' and pricereview_main.id IN ($inClause) AND pricereview_main.ekind = '新梯' order by pricereview_main.id";
$data = mysqli_query($link, $sql);
}
// 若結案同意
if (!empty($_GET['check']) && $_GET['check'] == 3) {
foreach ($data as $data) {
if ($data['status'] == 'YN') {
$agree[] = $data['id'];
}
}
$inClause = implode(',', $agree);
$sql = "SELECT pricereview_main.*,contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress
from pricereview_main
left join contract_new_apply on contract_new_apply.mid = pricereview_main.id
$sql_cmd and pricereview_main.status like 'Y%' and pricereview_main.id IN ($inClause) AND pricereview_main.ekind = '新梯' order by pricereview_main.id";
$data = mysqli_query($link, $sql);
}
$para = "function_name=pricereview&" . $token_link; $para = "function_name=pricereview&" . $token_link;
?> ?>
@ -310,6 +339,9 @@ if ($data) :
<a href="/wms/mkt/pricereview-index.php?&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 所有價審</a> <a href="/wms/mkt/pricereview-index.php?&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 所有價審</a>
<a href="/wms/mkt/pricereview-index.php?system_id=<?= $result[1]['sid'] ?>&flow_id=<?= $result[1]['fid'] ?>&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 待我簽核</a> <a href="/wms/mkt/pricereview-index.php?system_id=<?= $result[1]['sid'] ?>&flow_id=<?= $result[1]['fid'] ?>&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 待我簽核</a>
<a href="/wms/mkt/pricereview-index.php?check=1&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 簽核完畢</a> <a href="/wms/mkt/pricereview-index.php?check=1&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 簽核完畢</a>
<a href="/wms/mkt/pricereview-index.php?check=2&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 結案同意</a>
<a href="/wms/mkt/pricereview-index.php?check=3&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 結案不同意</a>
<table id="table_index" class="table table-striped table-bordered" style="width:100%"> <table id="table_index" class="table table-striped table-bordered" style="width:100%">
<thead> <thead>
<tr> <tr>

Write Preview
Loading…
Cancel
Save