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

1."申請計劃圖上傳功能" 新增上船附件功能 

2.大日程開放許協理的編輯權限
gary
gary_chen\gary_chen 1 year ago
parent
e2c5b7c912
commit
c59adb60bc
10 changed files with 296 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .gitignore
  2. 26
      wms/wipwhole-change-planning-customer-name-function.php
  3. 4
      wms/wipwhole-change-planning-customer-name-submit.php
  4. 15
      wms/wipwhole-change-planning-customer-name.php
  5. 23
      wms/wipwhole-index-function.php
  6. 33
      wms/wipwhole-rec-invoice-edit-submit.php
  7. 65
      wms/wipwhole-rec-invoice-edit.php
  8. 22
      wms/wipwhole-renovate-index-function.php
  9. 33
      wms/wipwhole-renovate-rec-invoice-edit-submit.php
  10. 22
      wms/wipwhole-renovate-rec-invoice-edit.php

1
.gitignore
View File

@ -20,3 +20,4 @@ wms/loginapi.php
wms/excel/gary_test.xlsx
wms/excel/wipwholeintall.xlsx
wms/excel/estimated_shipping_date_report.xlsx
*.docx

26
wms/wipwhole-change-planning-customer-name-function.php
View File

@ -1,5 +1,26 @@
<?php
function fileIUpload($post_name)
{
if ($_FILES[$post_name]["error"] == 0) {
$datetime = date("YmdHis");
$file_name = str_replace("#", "", $_FILES[$post_name]["name"]);
$temp_file_name = $_FILES[$post_name]["tmp_name"];
$target_dir = empty($file_name) ? "" : "public-wipwhole/";
$sales_spec_verify_file = strtolower($target_dir . basename($datetime . $file_name));
if (file_exists($sales_spec_verify_file))
unlink($sales_spec_verify_file);
move_uploaded_file($temp_file_name, $sales_spec_verify_file);
if (!empty($file_name)) {
return strtolower($target_dir . basename($datetime . $file_name));
} else {
return "";
}
} else {
return "";
}
}
function isLeader($link, $user_id)
{
if (getDepartmentId($link, $user_id) == '314' && getRoleId($link, $user_id) == '1')
@ -57,23 +78,28 @@ function checkPageUserStatus($user_id)
*/
function addWipwholeChangeContractdateDetails($link, $data)
{
$customer_planning_verify_file = $data['user_id'];
$user_id = $data['user_id'];
$tds = $data['tds'];
$id = $data['id'];
$custom_name = $data['custom_name'];
$change_status = $data['change_status'];
$customer_planning_verify_file = $data['customer_planning_verify_file'];
$sql2 = "
INSERT INTO `wipwhole_change_planning_customer_details` (
`creater`,
`create_at`,
`wipwholestatus_id`,
`custom_name`,
`customer_planning_verify_file`,
`change_status`
) VALUES (
'$user_id',
'$tds',
'$id',
'$custom_name',
'$customer_planning_verify_file',
'$change_status'
)
";

4
wms/wipwhole-change-planning-customer-name-submit.php
View File

@ -5,6 +5,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
if (!empty($_POST['custom_name'])) {
if ($checkStatus) {
$customer_planning_verify_file = fileIUpload("customer_planning_verify_file");
$all_contractno_change = empty($_POST['all_contractno_change']) ? null : $_POST['all_contractno_change'];
$custom_name = $_POST['custom_name'];
$contractno = $_POST['contractno'];
@ -21,6 +22,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
'tds' => $tds,
'form_key' => getFomkeySeq($link),
'user_id' => $user_id,
'customer_planning_verify_file' => $customer_planning_verify_file,
'change_status' => $_POST['assign_status']
);
// 寫入表單主檔
@ -40,6 +42,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
// 批次申請
if (($_POST['assign_status'] == 'A' || $_POST['assign_status'] == 'B') && !empty($all_contractno_change)) {
$wipwholestatus_id_arr = getWipwholestatusIdByConstractNo($link, $contractno);
$customer_planning_verify_file = fileIUpload("customer_planning_verify_file");
foreach ($wipwholestatus_id_arr as $wipwholestatus_id) {
$data_arr = array(
'id' => $wipwholestatus_id[0],
@ -48,6 +51,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
'contractno' => $contractno,
'tds' => $tds,
'form_key' => getFomkeySeq($link),
'customer_planning_verify_file' => $customer_planning_verify_file,
'user_id' => $user_id
);
// 寫入表單主檔

15
wms/wipwhole-change-planning-customer-name.php
View File

@ -1,7 +1,8 @@
<?php
// ini_set('display_errors', 'on');
function getAccounttype($link,$user_id){
function getAccounttype($link, $user_id)
{
$sql = "SELECT * FROM account where accountid = '$user_id'";
$data = mysqli_query($link, $sql);
$row = mysqli_fetch_array($data, MYSQLI_ASSOC);
@ -74,7 +75,7 @@ if (!empty(checkNowFormStatus($link)))
?>
<div style="overflow-x:auto;">
<form method="post">
<form method="post" enctype="multipart/form-data">
<div class="tab-pane active" class="assign_content" role="mainpanel" id="tabassign">
<!-- hidden域 -->
<input type="hidden" name="form_key" value='' />
@ -268,7 +269,7 @@ if (!empty(checkNowFormStatus($link)))
<?php echo $row["address"]; ?>
</td>
<th>填寫客戶姓名</th>
<td colspan="2">
<td >
<?php
if (empty(checkNowFormStatus($link))) {
echo "<input type='text' name='custom_name' />";
@ -277,7 +278,13 @@ if (!empty(checkNowFormStatus($link)))
echo "<input type='hidden' name='custom_name' value='" . $row2["custom_name"] . "' />";
}
?>
</td>
<th>上傳計劃圖</th>
<td colspan="3">
<input type='file' name='customer_planning_verify_file' id='customer_planning_verify_file' style='width:190px;'/>
<?php
echo !empty($row2['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row2['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
?>
</td>
</tr>
</tbody>

23
wms/wipwhole-index-function.php
View File

@ -1120,3 +1120,26 @@ function getWipwholeChangePlanningCustomerDetailsStatus($link, $id)
";
return mysqli_query($link, $sql);
}
function getAllCustomerPlanningVerify($link, $id)
{
$sql = "
SELECT
customer_planning_verify_file,
create_at
FROM wipwholestatus
WHERE id = $id
AND customer_planning_verify_file != ''
AND customer_planning_verify_file IS NOT NULL
UNION
SELECT
customer_planning_verify_file,
create_at
FROM wipwhole_change_planning_customer_details
WHERE wipwholestatus_id = $id
AND customer_planning_verify_file != ''
AND customer_planning_verify_file IS NOT NULL
";
return mysqli_query($link, $sql);
}

33
wms/wipwhole-rec-invoice-edit-submit.php
View File

@ -483,8 +483,10 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
";
if (!empty($official_check_file))
$updatesql .= "official_check_file = '$official_check_file', ";
} else if (in_array($user_id, ['M0175', 'M0079', 'M0060'])) {
}
// 暫時可編輯及刪除權限
if (in_array($user_id, ['M0175', 'M0079', 'M0060'])) {
$updatesql .= "
contractno = '$contractno',
facility_temp_no = '$facility_temp_no',
@ -504,9 +506,6 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
contract_arrival_date = '$contract_arrival_date',
facility_kind = '$facility_kind',
";
}else{
echo "暫無權限";
exit();
}
// 工務助理
@ -535,6 +534,32 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>上傳了安裝圖附件<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
";
}
// 許協更新業務確認項目權限
if ($user_id == 'M0060') {
$updatesql .= "
prattford_order_date_verify = '$prattford_order_date_verify' ,
prattford_order_date = '$prattford_order_date',
prattford_order_date_owner = '$prattford_order_date_owner',
estimated_shipping_date_verify = '$estimated_shipping_date_verify',
estimated_shipping_date = '$estimated_shipping_date',
estimated_shipping_date_owner = '$estimated_shipping_date_owner',
estimated_shipping_schedule_date_verify = '$estimated_shipping_schedule_date_verify',
estimated_shipping_schedule_date = '$estimated_shipping_schedule_date',
estimated_shipping_schedule_date_owner = '$estimated_shipping_schedule_date_owner',
goods_type = '$goods_type',
goods_type_date = '$goods_type_date',
goods_type_owner = '$goods_type_owner',
taiwan_goods_type = '$taiwan_goods_type',
taiwan_goods_type_date = '$taiwan_goods_type_date',
taiwan_goods_type_owner = '$taiwan_goods_type_owner',
shengguanok_status = '$shengguanok_status',
shengguanok_status_at = '$shengguanok_status_at',
shengguanok_status_owner = '$shengguanok_status_owner',
yewu_remark = '',
";
}
$updatesql .= "
creater = '$creater',
create_at = '$create_at'

65
wms/wipwhole-rec-invoice-edit.php
View File

@ -63,6 +63,11 @@ if (in_array($user_id, ['M0175', 'M0079', 'M0060'])) {
$update_delete_status = "";
}
// 許協業務項編輯權限
if (in_array($user_id, ['M0060'])) {
$yewu = "";
}
// select => options 開門方式
$opendoor_options = getOpendoorOptions($link);
// select => options 確認人
@ -359,7 +364,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
</td>
<td style="vertical-align: middle;">附件</td>
<td style="vertical-align: middle;">
<input style="width:70%;display:inline;" type="file" id="customer_planning_verify_file" name="customer_planning_verify_file" <?php
<!-- <input style="width:70%;display:inline;" type="file" id="customer_planning_verify_file" name="customer_planning_verify_file" <?php
if (isset($row2['change_status'])) {
echo $row2['change_status'] === 'Z' ? "" : "disabled";
} else {
@ -368,6 +373,13 @@ include "wipwhole-rec-invoice-edit-submit.php";
?>>
<?php
echo !empty($row['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
?> -->
<?php
$customer_planning_verify_files = getAllCustomerPlanningVerify($link, $id);
foreach ($customer_planning_verify_files as $row2) :
echo "<a id='customer_planning_verify_file_a' style='color:#00F;'
href='" . $row2['customer_planning_verify_file'] . "' target='_blank'>下載附件_" . $row2['create_at'] . "</a><br/>";
endforeach;
?>
</td>
<td style="vertical-align: middle">確認時間</td>
@ -548,7 +560,11 @@ include "wipwhole-rec-invoice-edit-submit.php";
<td style="vertical-align: middle;">附件</td>
<td style="vertical-align: middle;">
<?php
echo !empty($row['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
// echo !empty($row['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
foreach ($customer_planning_verify_files as $row2) :
echo "<a id='customer_planning_verify_file_a' style='color:#00F;'
href='" . $row2['customer_planning_verify_file'] . "' target='_blank'>下載附件_" . $row2['create_at'] . "</a><br/>";
endforeach;
?>
</td>
<td style="vertical-align: middle"> 確認時間</td>
@ -1125,7 +1141,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
<button class="btn btn-primary btn-lg pull-right" type="button" style="margin-left:3px;" disabled>日程已結案</button>
<?php
} else {
if (($user_department_id == 220 || ($user_department_id == 321 && $role_id !== '5'))) {
if (($user_department_id == 220 || ($user_department_id == 321 && $role_id !== '5') || $user_id == 'M0060')) {
?>
<button onclick="savedata()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">存檔</button>
<?php
@ -1311,6 +1327,24 @@ include "wipwhole-rec-invoice-edit-submit.php";
(工務助理項目)
</td>
</tr>
<!-- <tr>
<td style="vertical-align: middle">發包類型</td>
<td>
<input type='radio' name='outsourcer_type' id='outsourcer_type_I' value='I' />
<label for='outsourcer_type_I'>安裝</label>
<input type='radio' name='outsourcer_type' id='outsourcer_type_T' value='T' />
<label for='outsourcer_type_T'>試車</label>
<input type='radio' name='outsourcer_type' id='outsourcer_type_IT' value='IT' />
<label for='outsourcer_type_IT'>安裝+試車</label>
<?php
if (getSaveEstimateInstallData($user_department_id, $role_id)) {
?>
<button type='button' class='btn btn-default' onclick='setOutSourcerDate();'>帶入日期</button>
<?php
}
?>
</td>
</tr> -->
<tr>
<td style="vertical-align: middle">安裝發包廠商</td>
<td>
@ -1866,4 +1900,29 @@ include "wipwhole-rec-invoice-edit-submit.php";
$('#update_install_date_form').submit();
}
}
// function setOutSourcerDate() {
// // 發包類型
// let outsourcer_type = $("input[name^='outsourcer_type']").val();
// // 預計出貨日(到工地)
// let real_contract_arrival_date = $("#real_contract_arrival_date").val();
// // 樓停
// let numberofstop = $("#numberofstop").val();
// if (outsourcer_type === 'I') {
// // 預計安裝開工日
// Date.prototype.addDays = function(days) {
// this.setDate(this.getDate() + days);
// return this;
// }
// }
// if (outsourcer_type === 'T') {
// }
// if (outsourcer_type === 'IT') {
// }
// }
</script>

22
wms/wipwhole-renovate-index-function.php
View File

@ -1100,3 +1100,25 @@ function getWipwholeChangePlanningCustomerDetailsStatus($link, $id)
";
return mysqli_query($link, $sql);
}
function getAllCustomerPlanningVerify($link, $id)
{
$sql = "
SELECT
customer_planning_verify_file,
create_at
FROM wipwholestatus
WHERE id = $id
AND customer_planning_verify_file != ''
AND customer_planning_verify_file IS NOT NULL
UNION
SELECT
customer_planning_verify_file,
create_at
FROM wipwhole_change_planning_customer_details
WHERE wipwholestatus_id = $id
AND customer_planning_verify_file != ''
AND customer_planning_verify_file IS NOT NULL
";
return mysqli_query($link, $sql);
}

33
wms/wipwhole-renovate-rec-invoice-edit-submit.php
View File

@ -463,7 +463,9 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
";
if (!empty($official_check_file))
$updatesql .= "official_check_file = '$official_check_file', ";
} else if (in_array($user_id, ['M0175', 'M0079', 'M0060'])) {
}
if (in_array($user_id, ['M0175', 'M0079', 'M0060'])) {
// 暫時可編輯及刪除權限
$updatesql .= "
contractno = '$contractno',
@ -484,9 +486,6 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
contract_arrival_date = '$contract_arrival_date',
facility_kind = '$facility_kind',
";
} else {
echo "暫無權限";
exit();
}
// 工務助理
@ -515,6 +514,32 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
all_remark = CONCAT('" . $user_id . accountidToName($user_id) . "_" . $datetime . "<br/>上傳了安裝圖附件<br/><br/>',IF(all_remark IS NULL,'',all_remark)),
";
}
// 許協更新業務確認項目權限
if ($user_id == 'M0060') {
$updatesql .= "
prattford_order_date_verify = '$prattford_order_date_verify' ,
prattford_order_date = '$prattford_order_date',
prattford_order_date_owner = '$prattford_order_date_owner',
estimated_shipping_date_verify = '$estimated_shipping_date_verify',
estimated_shipping_date = '$estimated_shipping_date',
estimated_shipping_date_owner = '$estimated_shipping_date_owner',
estimated_shipping_schedule_date_verify = '$estimated_shipping_schedule_date_verify',
estimated_shipping_schedule_date = '$estimated_shipping_schedule_date',
estimated_shipping_schedule_date_owner = '$estimated_shipping_schedule_date_owner',
goods_type = '$goods_type',
goods_type_date = '$goods_type_date',
goods_type_owner = '$goods_type_owner',
taiwan_goods_type = '$taiwan_goods_type',
taiwan_goods_type_date = '$taiwan_goods_type_date',
taiwan_goods_type_owner = '$taiwan_goods_type_owner',
shengguanok_status = '$shengguanok_status',
shengguanok_status_at = '$shengguanok_status_at',
shengguanok_status_owner = '$shengguanok_status_owner',
yewu_remark = '',
";
}
$updatesql .= "
creater = '$creater',
create_at = '$create_at'

22
wms/wipwhole-renovate-rec-invoice-edit.php
View File

@ -61,6 +61,11 @@ if (in_array($user_id, ['M0175', 'M0079', 'M0060'])) {
$update_delete_status = "";
}
// 許協業務項編輯權限
if (in_array($user_id, ['M0060'])) {
$yewu = "";
}
// select => options 開門方式
$opendoor_options = getOpendoorOptions($link);
@ -409,7 +414,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
</td>
<td style="vertical-align: middle;">附件</td>
<td style="vertical-align: middle;">
<input style="width:70%;display:inline;" type="file" id="customer_planning_verify_file" name="customer_planning_verify_file" <?php
<!-- <input style="width:70%;display:inline;" type="file" id="customer_planning_verify_file" name="customer_planning_verify_file" <?php
if (isset($row2['change_status'])) {
echo $row2['change_status'] === 'Z' ? "" : "disabled";
} else {
@ -418,6 +423,13 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
?>>
<?php
echo !empty($row['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
?> -->
<?php
$customer_planning_verify_files = getAllCustomerPlanningVerify($link, $id);
foreach ($customer_planning_verify_files as $row2) :
echo "<a id='customer_planning_verify_file_a' style='color:#00F;'
href='" . $row2['customer_planning_verify_file'] . "' target='_blank'>下載附件_" . $row2['create_at'] . "</a>";
endforeach;
?>
</td>
<td style="vertical-align: middle">確認時間</td>
@ -753,7 +765,11 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
<td style="vertical-align: middle;">附件</td>
<td style="vertical-align: middle;">
<?php
echo !empty($row['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
// echo !empty($row['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
foreach ($customer_planning_verify_files as $row2) :
echo "<a id='customer_planning_verify_file_a' style='color:#00F;'
href='" . $row2['customer_planning_verify_file'] . "' target='_blank'>下載附件_" . $row2['create_at'] . "</a>";
endforeach;
?>
</td>
<td style="vertical-align: middle"> 確認時間</td>
@ -1128,7 +1144,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
<button class="btn btn-primary btn-lg pull-right" type="button" style="margin-left:3px;" disabled>日程已結案</button>
<?php
} else {
if (($user_department_id == '220' || ($user_department_id == '321' && $role_id !== '5'))) {
if (($user_department_id == '220' || ($user_department_id == '321' && $role_id !== '5') || $user_id == 'M0060')) {
?>
<button onclick="savedata()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">存檔</button>
<button onclick="doShengguanAssign()" type="button" class="btn btn-primary btn-lg pull-right" style="margin-left:3px;">結案</button>

Write Preview
Loading…
Cancel
Save