Browse Source

Merge branch 'main' into gary

gary
gary_chen\gary_chen 1 year ago
parent
commit
6a15faab16
  1. 2
      wms/cont/sign_list.php
  2. 12
      wms/fun_global.php
  3. 14
      wms/header.php
  4. 2
      wms/mkt/pricereview-edit.php
  5. 43
      wms/mkt/pricereview_renovate-check.php
  6. 2
      wms/mkt/pricereview_renovate-edit.php
  7. 6
      wms/mkt/pricereview_renovate-record-update.php
  8. 59
      wms/rib01-business-create.php
  9. 189
      wms/rib01-business-edit.php
  10. 9
      wms/rib01-business-submit.php
  11. 12
      wms/rib01-create.php
  12. 23
      wms/rib02-check.php
  13. 79
      wms/rib02-create.php
  14. 138
      wms/rib02-edit.php
  15. 20
      wms/rib02-submit.php
  16. 7
      wms/schedule-index.php
  17. 8
      wms/sign/list.php

2
wms/cont/sign_list.php

@ -133,7 +133,7 @@ if ($data) :
//echo " select f_return_name(current_assigner) signer from subflow where form_key='". $row['form_key'] ."'"; ". (is_array($row['form_key'])?'': $row['form_key']) ."
list($signer)=mysqli_fetch_array(mysqli_query($link, "select max(f_return_name(current_assigner) ) signer from subflow where form_key='". $row['form_key'] ."'" ));
echo "<td>" .(empty($signer)?"結案":$signer) . "</td>";
echo "<td>" .(empty($signer)?"結案":"N") . "</td>";
?>

12
wms/fun_global.php

@ -28,18 +28,6 @@ function sql_myself($user_id, $column="creater") {
return $sql_cmd;
}
/**
* 連線T8 MSSQL
*/
try {
$conn = new PDO("sqlsrv:Server=60.244.87.101;Database=T8MASADA", "masada", "@m222222");
if ($conn) {
$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
}
} catch (PDOException $e) {
echo "fail";
echo $e->getMessage();
}
/**

14
wms/header.php

@ -9,6 +9,20 @@ if (isset($_REQUEST["function_name"])) {
$function_name = "";
$function_flag = False;
}
/**
* 連線T8 MSSQL
*/
try {
$conn = new PDO("sqlsrv:Server=60.244.87.101;Database=T8MASADA", "masada", "@m222222");
if ($conn) {
$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
}
} catch (PDOException $e) {
echo "fail";
echo $e->getMessage();
}
/*****************************
* global:

2
wms/mkt/pricereview-edit.php

@ -909,7 +909,7 @@ $(function(){
$("input[name='mn_memo']").each(function(){ mnMemoArr.push($(this).val()+"@@"); })
$('#mn_memo_all').val(mnMemoArr);
var mnRelateFacilArr = [];
$("td[name='mn_relate_facil']").each(function(){ mnRelateFacilArr.push($(this).html()); })
$("td[name='mn_relate_facil']").each(function(){ mnRelateFacilArr.push($(this).html().trim()); })
$('#mn_relate_facil_all').val(mnRelateFacilArr);
var exNoteArr = [];
$("input[name='except_note']").each(function(){ exNoteArr.push($(this).val()); })

43
wms/mkt/pricereview_renovate-check.php

@ -66,8 +66,26 @@ foreach ($res as $data) {
mysqli_free_result($res_s);
if (!empty($row_s["sign1"])) list($person1, $status1, $dtte1) = explode(",", $row_s["sign1"]);
else $person1 = $status1 = $dtte1 = "";
if (!empty($row_s["sign2"])) list($person2, $status2, $dtte2) = explode(",", $row_s["sign2"]);
else $person2 = $status2 = $dtte2 = "";
if (!empty($row_s["sign2"])) {
if ($st == 2 && (preg_match("/Y/", $row_s["sign2"]) || preg_match("/N/", $row_s["sign2"]))) {
echo "<script>";
echo "alert('請勿重覆審核!');";
echo "location.href='pricereview_renovate-index.php?function_name=pricereview_renovate&".$token_link."';";
echo "</script>";
exit;
}
$sign2_arr = explode("<##>", $row_s["sign2"]); // M0024,,<##>M0175,,
$person2_arr = [];
foreach ($sign2_arr as $v) {
list($person2, $status2, $dtte2) = explode(",", $v);
if (strlen($v) == 7) { // 未審
$person2_arr[] = $person2;
} else {
unset($person2_arr);
break;
}
}
} else $person2 = $status2 = $dtte2 = "";
if (!empty($row_s["sign3"])) list($person3, $status3, $dtte3) = explode(",", $row_s["sign3"]);
else $person3 = $status3 = $dtte3 = "";
if (!empty($row_s["sign4"])) list($person4, $status4, $dtte4) = explode(",", $row_s["sign4"]);
@ -99,7 +117,7 @@ foreach ($res as $data) {
if ($st == 1 && ($person1 == $user_id) && ($status1 == "")) {
$sign_on = 1;
}
if ($st == 2 && ($person2 == $user_id) && ($status2 == "")) {
if ($st == 2 && ($person2 == $user_id || (isset($person2_arr) && in_array($user_id, $person2_arr))) && ($status2 == "")) {
$sign_on = 1;
}
if ($st == 3 && ($person3 == $user_id) && ($status3 == "")) {
@ -402,7 +420,6 @@ hr {
</div>
</div>
</div>
<div class="container">
<form class="form-inline" method="post" action="pricereview_renovate-record-check.php" enctype="multipart/form-data">
<input type="hidden" name="id" id="id" value="<?=$id;?>">
@ -440,7 +457,6 @@ hr {
$item_amt_A_all += $val["item_price_bp"];
if ($viewmi) {
for ($i=0; $i<$val["item_qty"]; $i++) {
?>
<tr name="facil_templ">
<td><?php echo $idx; ?><input type="hidden" name="item_no" value="<?php echo $item_no; ?>"></td>
@ -456,7 +472,6 @@ hr {
<td><input type="text" name="gross_profit" class="form-control dollar-right" size="9" value="<?=number_format($val["gross_profit"]);?>"></td>
<td><input type="text" name="gross_profit_rate" class="form-control" size="6" value="<?=number_format($val["gross_profit_rate"], 1);?>"></td>
<!--<td><input type="text" name="note" class="form-control" size="17" value="<?=$val["note"];?>"></td>-->
</tr>
<tr name="facil_templ2">
<td colspan="5"></td>
@ -506,8 +521,8 @@ hr {
</thead>
<tbody>
<?php
$item_amt_B_all = 0;
$idx = 1;
$item_amt_B_all = 0;
foreach ($option_arr as $item_no => $val) {
$item_amt_B_all += $val["item_price_bp"];
?>
@ -976,7 +991,19 @@ hr {
</tr>
<tr>
<td>業務承辦人</td>
<td><?php echo (empty($accountname_arr[$person2])) ? "---" : $accountname_arr[$person2]; ?></td>
<td>
<?php
if (empty($person2_arr)) {
echo (empty($accountname_arr[$person2])) ? "---" : $accountname_arr[$person2];
} else {
$person2_name_str = "";
foreach ($person2_arr as $pv) {
$person2_name_str .= $accountname_arr[$pv]."/";
}
echo rtrim($person2_name_str, "/");
}
?>
</td>
<td><?php echo $checker_2_result; ?></td>
<td><?php echo nl2br($sign2_note); ?></td>
<td><?php echo $dtte2; ?></td>

2
wms/mkt/pricereview_renovate-edit.php

@ -984,7 +984,7 @@ $(function(){
$("input[name='mn_memo']").each(function(){ mnMemoArr.push($(this).val()+"@@"); })
$('#mn_memo_all').val(mnMemoArr);
var mnRelateFacilArr = [];
$("td[name='mn_relate_facil']").each(function(){ mnRelateFacilArr.push($(this).html()); })
$("td[name='mn_relate_facil']").each(function(){ mnRelateFacilArr.push($(this).html().trim()); })
$('#mn_relate_facil_all').val(mnRelateFacilArr);
var exNoteArr = [];
$("input[name='except_note']").each(function(){ exNoteArr.push($(this).val()); })

6
wms/mkt/pricereview_renovate-record-update.php

@ -129,6 +129,9 @@ if(isset($_POST['pmstatus'])) {
$item_price_arr = explode(",", $item_price_all);
$gross_profit_arr = explode(",", $gross_profit_all);
$item_price_arr = $gross_profit_arr = []; // 先reset, 等審核才產出
// 非全汰改=REN
$renovate_flag = "";
if (preg_match("/M1/", $fp_kind_all)) $renovate_flag = "REN";
// 如果售價變動或電梯數量異動,售價則平均分攤到每台
/*
@ -220,6 +223,7 @@ if(isset($_POST['pmstatus'])) {
if (empty($iid) && $op_act_arr[$k] == "I") {
$to_ins_arr[] = $k;
} else {
$option_relate_spec = "";
$tmp_arr = explode("<br>", $option_relate_facil_arr[$k]);
foreach ($tmp_arr as $val) {
$option_relate_spec .= substr($val, 0, strpos($val, ".")).",";
@ -433,7 +437,7 @@ if(isset($_POST['pmstatus'])) {
// <75%以下呈至總經理審核. ($price_rate)
// 上級主管 > 伃廷 > MAX > 總經理
if ($status == "YS") {
$manager_arr = pricereview_class($price_rate, $user_id);
$manager_arr = pricereview_renovate_class($price_rate, $user_id, $renovate_flag);
if ($manager_arr) {
$sign1 = $sign2 = $sign3 = $sign4 = "";
foreach ($manager_arr as $k => $v) {

59
wms/rib01-business-create.php

@ -44,9 +44,17 @@ $sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001
$deptype = $conn->query($sql_department);
//取得供應商
$BusinessPartner = array();
$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
$BizPartner = $conn->query($sql_Biz);
$conn = null;
$bizcount = 0;
foreach ($BizPartner as $biz) {
$bizKey = $biz['BizPartnerId'];
$bizValue = $biz['BizPartnerName'];
array_push($BusinessPartner, $bizKey);
$bizcount += 1;
}
$BizJSON = json_encode($BusinessPartner);
$MaxBillNo += 1;
if ($MaxBillNo < 10) {
@ -129,17 +137,10 @@ if ($MaxBillNo < 10) {
</select>
</div>
<div class="col-md-4">
<label for="comSupplierId" style="color: red;">供應商</label>
<select name="comSupplierId" id="comSupplierId" required>
<option value=""></option>
<?php
foreach ($BizPartner as $BizKey => $BizValue) { ?>
<option value="<?= $BizValue['BizPartnerId'] ?>"><?= $BizValue['BizPartnerId'] . $BizValue['BizPartnerName'] ?></option>
<?php } ?>
</select>
<label for="BizPartnerId" style="color: red;">供應商統一編號</label>
<input id="BizPartnerId" name="BizPartnerId" class="form-control" onblur="checkBiz()">
</div>
</div>
<div class="form-group">
@ -150,7 +151,7 @@ if ($MaxBillNo < 10) {
</div>
<div class="col-md-9 ">
<button onclick="send()" class="btn btn-primary btn-lg pull-right">下一步</button>
<button type="button" onclick="send()" class="btn btn-primary btn-lg pull-right">下一步</button>
</div>
</div>
</form>
@ -158,6 +159,7 @@ if ($MaxBillNo < 10) {
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script>
var bizok = 0;
$(document).ready(function() {
$("#comSupplierId").selectize();
})
@ -167,6 +169,30 @@ if ($MaxBillNo < 10) {
})
})
function checkBiz() {
var biz = $("#BizPartnerId").val();
if (biz.length != 8) {
bizok = 0;
alert("統一編號格式錯誤");
} else {
var BizArray = <?php echo $BizJSON; ?>;
var answer = 0;
for (var partner = 0; partner < <?= $bizcount ?>; partner++) {
var value = BizArray[partner];
if (biz == value) {
answer += 1
}
}
if (answer == 1) {
bizok = 1;
alert("供應商認證成功")
} else {
bizok = 0;
alert("無此供應商,請聯絡採購人員建立供應商")
}
}
}
function changeWriteOffId(SelectedDept) {
var SelectDeptId = 'WriteOff' + SelectedDept + "-";
for (var i = 0; i < PersonId.options.length; i++) {
@ -182,12 +208,13 @@ if ($MaxBillNo < 10) {
};
function send() {
if ($("#comSupplierId").val() === "") {
alert("請選擇供應商");
if (bizok != 1) {
alert("請輸入供應商");
return;
} else {
$("#BillNo").prop("disabled", false);
$("#BillDate").prop("disabled", false);
$('#ribbizadd').submit();
}
$("#BillNo").prop("disabled", false);
$("#BillDate").prop("disabled", false);
$('#ribbizadd').submit();
}
</script>

189
wms/rib01-business-edit.php

@ -1,2 +1,189 @@
<?php
echo "qwqqwwe";
include "./header.php";
$BillNo = $_GET['BillNo'];
$state = $_GET['state'];
//取得表頭數據
$date_sql = "SELECT * from rib_business WHERE (BillNo='$BillNo')";
$query_rib = mysqli_query($link, $date_sql);
foreach ($query_rib as $q) {
$rib = $q;
}
// 連線T8MASADA
$member = array();
//取得人員名單與使用者的部門
$sql_mydept = "SELECT UserId, Username FROM capMembership";
$deptmem = $conn->query($sql_mydept);
foreach ($deptmem as $mem) {
$userid = $mem['UserId'];
$username = $mem['Username'];
$member["$userid"] = [$username];
};
$sql_dept = "SELECT DeptId, PersonId FROM comPerson WHERE DeptId!='0001'";
$allpeople = $conn->query($sql_dept);
foreach ($allpeople as $man) {
if ($man['PersonId'] == $user_id) {
$mydepart = $man['DeptId'];
}
$personid = $man['PersonId'];
$depart = $man['DeptId'];
if (isset($member["$personid"])) {
array_push($member["$personid"], "$depart");
};
}
//取得部門代碼
$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
$deptype = $conn->query($sql_department);
//取得供應商
$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
$BizPartner = $conn->query($sql_Biz);
$conn = null;
?>
<div style="width: 90%;">
<div style="padding-left: 2rem; padding-bottom: 1rem;">
<a href="rib01-business-index.php?<?php echo $token_link; ?>" class="btn btn-default btn-lg">
<span class="glyphicon glyphicon-home"></span>
</a>
</div>
</div>
<div class="container" id="ribadd">
<div class="text-center">
<h3>報銷單據 (廠商)</h3>
</div>
<form class="form-horizontal" name="ribbizadd" id="ribbizadd" method="POST" action="rib01-business-edit.php?submit=edit&state=0&<?= $token_link ?>" enctype="multipart/form-data">
<div class="form-group">
<div class="col-md-6">
<label for="BillNo">單據編號</label>
<input class="form-control" type="text" name="BillNo" id="BillNo" value="<?php echo $BillNo ?>" disabled>
</div>
<div class="col-md-6">
<label for="BillDate">單據日期</label>
<input class="form-control" type="text" name="BillDate" id="BillDate" value=<?= $rib['BillDate'] ?> disabled>
</div>
</div>
<div class="form-group">
<div class="col-md-6">
<label for="DeptId" style="color: red;">採購部門</label>
<select name="DeptId" id="DeptId" class="form-control" disabled>
<?php
foreach ($deptype as $dept) { ?>
<option value="<?php echo $dept['DeptId']; ?>" <?php
if ($dept['DeptId'] == $rib['DeptId']) {
echo "selected";
} ?>><?php echo $dept['DeptName']; ?></option>
<?php };
?>
</select>
</div>
<div class="col-md-6">
<label for="PersonId" style="color: red;">採購人員</label>
<select name="PersonId" id="PersonId" class="form-control" disabled>
<option value="" style="display:flex" id="WriteOffoption">請選擇採購人員</option>
<?php
foreach ($member as $key => $value) { ?>
<option value="<?php echo $key; ?>" id="<?= 'WriteOff' . $value[1] . "-" . $value[0] ?>" <?php if ($key == $rib['PersonId']) {
echo "selected";
} ?>> <?php echo $value[0]; ?> </option>
<?php }
?>
</select>
</div>
</div>
<div class="form-group">
<div class="col-md-4">
<label for="CurrId" style="color: red;">幣別</label>
<select name="CurrId" id="CurrId" class="form-control" disabled>
<option value="TWD" <?php if ($rib['CurrId'] == 'TWD') {
echo "selected";
} ?>>台幣</option>
<option value="CNY" <?php if ($rib['CurrId'] == 'CNY') {
echo "selected";
} ?>>人民幣</option>
<option value="EUR" <?php if ($rib['CurrId'] == 'EUR') {
echo "selected";
} ?>>歐元</option>
<option value="HKD" <?php if ($rib['CurrId'] == 'HKD') {
echo "selected";
} ?>>港幣</option>
<option value="USD" <?php if ($rib['CurrId'] == 'USD') {
echo "selected";
} ?>>美元</option>
</select>
</div>
<div class="col-md-4">
<label for="TaxId" style="color: red;">稅碼</label>
<select name="TaxId" class="form-control" disabled>
<option value="ST005" <?php if ($rib['TaxId'] == 'ST005') {
echo "selected";
} ?>>營業稅5%</option>
<option value="ST101" <?php if ($rib['TaxId'] == 'ST101') {
echo "selected";
} ?>>零稅</option>
<option value="ST102" <?php if ($rib['TaxId'] == 'ST102') {
echo "selected";
} ?>>免稅</option>
</select>
</div>
<div class="col-md-4">
<label for="comSupplierId" style="color: red;">供應商</label>
<select name="comSupplierId" id="comSupplierId" disabled>
<option value=""></option>
<?php
foreach ($BizPartner as $BizKey => $BizValue) { ?>
<option value="<?= $BizValue['BizPartnerId'] ?>" <?php if ($rib['BizPartnerId'] == $BizValue['BizPartnerId']) {
echo "selected";
} ?>><?= $BizValue['BizPartnerId'] . $BizValue['BizPartnerName'] ?></option>
<?php } ?>
</select>
</div>
</div>
<div class="form-group">
</div>
<hr>
<div class="form-group">
<div class="col-md-3">
</div>
<div class="col-md-9 ">
<button type="submit" class="btn btn-primary btn-lg pull-right">修改</button>
</div>
</div>
</form>
</div>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script>
$(document).ready(function() {
$("#comSupplierId").selectize();
})
$(function() {
$("#DeptId").change(function() {
changeWriteOffId($('#DeptId').val());
})
})
function changeWriteOffId(SelectedDept) {
var SelectDeptId = 'WriteOff' + SelectedDept + "-";
for (var i = 0; i < PersonId.options.length; i++) {
PersonId.options[i].selected = false;
let thisid = PersonId.options[i].id
if (thisid.search(SelectDeptId) === 0) {
PersonId.options[i].style['display'] = '';
} else {
PersonId.options[i].style['display'] = 'none';
};
};
};
</script>

9
wms/rib01-business-submit.php

@ -7,13 +7,13 @@ $BillDate = (int)$_POST['BillDate'];
$CurrId = $_POST['CurrId'];
$DeptId = $_POST['DeptId'];
$PersonId = $_POST['PersonId'];
$comSupplierId = $_POST['comSupplierId'];
$BizPartnerId = $_POST['BizPartnerId'];
$TaxId = $_POST['TaxId'];
if ($submit == "add") {
$SQL1 = "INSERT INTO rib_business (`BillNo`,`BillDate`,`BizPartnerId`,`CurrId`,`TaxId`,
`PersonId`,`DeptId`,`CreditAgeDate`,`RecBizPartnerId`,`CurrentState`,`CreatorId`) VALUES (
'$BillNo',$BillDate,'$comSupplierId','$CurrId','$TaxId','$PersonId','$DeptId',$BillDate,'$comSupplierId',
'$BillNo',$BillDate,'$BizPartnerId','$CurrId','$TaxId','$PersonId','$DeptId',$BillDate,'$BizPartnerId',
0,'$user_id')";
mysqli_query($link, $SQL1);
if (mysqli_affected_rows($link)) {
@ -21,9 +21,10 @@ if ($submit == "add") {
} else {
echo '<script>alert("新增 失敗")</script>';
}
echo $SQL1;
?>
<script>
<!-- <script>
window.location.href = "rib02-business-create.php?BillNo=<?php echo $BillNo ?>&RowCode=1&TaxId=<?= $TaxId?>&<?= $token_link ?>";
</script>
</script> -->
<?php
}

12
wms/rib01-create.php

@ -104,18 +104,6 @@ if ($MaxBillNo < 10) {
</div>
<div class="form-group">
<!-- <div class="col-md-3">
<label for="WriteOffType">報銷人類型</label>
<select name="WriteOffType" class="form-control">
<option value="0">客戶</option>
<option value="1">廠商</option>
<option value="2" selected>員工</option>
<option value="3">其他</option>
<option value="4">公司</option>
</select>
</div> -->
<div class="col-md-3">
<label for="DeptId" style="color: red;">報銷單位</label>
<select name="DeptId" id="DeptId" class="form-control" required>

23
wms/rib02-check.php

@ -33,10 +33,6 @@ $sql_unit = "SELECT * FROM unit";
$unit_query = mysqli_query($link, $sql_unit);
$unit = mysqli_fetch_all($unit_query, MYSQLI_ASSOC);
// 連線T8MASADA 取得供應商
$sql = "SELECT * FROM comBusinessPartner";
$BizPartner = $conn->query($sql);
?>
<div style="width: 90%;">
@ -287,24 +283,7 @@ $BizPartner = $conn->query($sql);
</div>
<div class="form-group">
<div class="col-md-3">
<label for="comSuppliername">供應商</label>
<select name="comSuppliername" id="comSuppliername" class="form-control" disabled>
<option value="" <?php if ($ribsub['comSupplierName'] == "") {
echo "selected";
} ?>> </option>
<option value="雜項請款用" <?php if ($ribsub['comSupplierName'] == "雜項請款用") {
echo "selected";
} ?>>V0001雜項請款用</option>
<?php
foreach ($BizPartner as $BizKey => $BizValue) { ?>
<option value="<?= $BizValue['BizPartnerId'] ?>" <?php if ($ribsub['comSupplierName'] == $BizValue['BizPartnerName']) {
echo "selected";
} ?>><?= $BizValue['BizPartnerId'] . $BizValue['BizPartnerName'] ?></option>
<?php } ?>
</select>
</div>
<div class="col-md-3">
<label for="TaxNo">統一編號 (供應商)</label>
<label for="TaxNo">供應商統一編號</label>
<input type="text" name="TaxNo" id="TaxNo" class="form-control" value="<?= $ribsub['TaxNo'] ?>" disabled />
</div>
</div>

79
wms/rib02-create.php

@ -50,7 +50,6 @@ foreach ($allpeople as $man) {
//取得部門代碼
$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
$deptype = $conn->query($sql_department);
$conn = null;
//取得幣別
@ -61,23 +60,22 @@ $sql_unit = "SELECT * FROM unit";
$unit_query = mysqli_query($link, $sql_unit);
$unit = mysqli_fetch_all($unit_query, MYSQLI_ASSOC);
// 連線T8MASADA 取得供應商、合約跟作番號
try {
$conn = new PDO("sqlsrv:Server=60.244.87.101;Database=T8MASADA", "masada", "@m222222");
if ($conn) {
$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$sql_Biz = "SELECT * FROM comBusinessPartner";
$BizPartner = $conn->query($sql_Biz);
$sql_Project = "SELECT * FROM comProject";
$projects = $conn->query($sql_Project);
$sql_Material = "SELECT * FROM comMaterialGroup";
$materials = $conn->query($sql_Material);
$conn = null;
}
} catch (PDOException $e) {
echo "fail";
echo $e->getMessage();
// 取得供應商、合約跟作番號
$BusinessPartner = array();
$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
$BizPartner = $conn->query($sql_Biz);
$bizcount = 0;
foreach ($BizPartner as $biz) {
$bizKey = $biz['BizPartnerId'];
$bizValue = $biz['BizPartnerName'];
array_push($BusinessPartner,$bizKey);
$bizcount +=1;
}
$BizJSON = json_encode($BusinessPartner);
$sql_Project = "SELECT * FROM comProject";
$projects = $conn->query($sql_Project);
$sql_Material = "SELECT * FROM comMaterialGroup";
$materials = $conn->query($sql_Material);
?>
<div style="width: 90%;">
@ -302,20 +300,9 @@ try {
</div>
<div class="form-group">
<div class="col-md-3">
<label for="comSupplierName">供應商</label>
<select name="comSupplierName" id="comSupplierName">
<option value=""></option>
<option value="雜項請款用">V0001雜項請款用</option>
<?php
foreach ($BizPartner as $BizKey => $BizValue) { ?>
<option value="<?= $BizValue['BizPartnerName'] ?>"><?= $BizValue['BizPartnerId'] . $BizValue['BizPartnerName'] ?></option>
<?php } ?>
</select>
</div>
<div class="col-md-3" id="Tax">
<label for="TaxNo">統一編號 (供應商)</label>
<input type="text" name="TaxNo" id="TaxNo" class="form-control">
<label for="TaxNo">供應商統一編號</label>
<input type="text" name="TaxNo" id="TaxNo" class="form-control" onblur="checkBiz()">
</div>
</div>
<div>
@ -343,21 +330,29 @@ try {
$(document).ready(function() {
$("#ProjectId").selectize();
$("#CU_MaterialId").selectize();
$("#comSupplierName").selectize();
})
$(function() {
$("#comSupplierName").change(function() {
if ($("#comSupplierName").val() == "雜項請款用") {
$("#Tax").show();
} else {
$("#Tax").hide();
}
})
$("#TaxNo").change(function() {
if ($("#TaxNo").val().length !== 8) {
function checkBiz() {
if ($("#TaxNo").val().length !== 8) {
alert("統一編號格式錯誤");
}else{
var biz = $("#TaxNo").val();
var BizArray = <?php echo $BizJSON; ?>;
var answer = 0;
for (var partner = 0; partner < <?= $bizcount ?>; partner++){
var value = BizArray[partner];
if (biz == value){
answer +=1
}
})
}
if (answer==1){
alert("供應商認證成功")
}else{
alert("T8內無此供應商")
}
}
}
$(function() {
$("#VoucherType").change(function() {
if ($("#VoucherType").val() !== "0") {
$("#NotInvoice1").hide();

138
wms/rib02-edit.php

@ -38,30 +38,28 @@ foreach ($allpeople as $man) {
//取得部門代碼
$sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'";
$deptype = $conn->query($sql_department);
$conn = null;
//取得計量單位
$sql_unit = "SELECT * FROM unit";
$unit_query = mysqli_query($link, $sql_unit);
$unit = mysqli_fetch_all($unit_query, MYSQLI_ASSOC);
// 連線T8MASADA 取得供應商、合約跟作番號
try {
$conn = new PDO("sqlsrv:Server=60.244.87.101;Database=T8MASADA", "masada", "@m222222");
if ($conn) {
$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$sql_Biz = "SELECT * FROM comBusinessPartner";
$BizPartner = $conn->query($sql_Biz);
$sql_Project = "SELECT * FROM comProject";
$projects = $conn->query($sql_Project);
$sql_Material = "SELECT * FROM comMaterialGroup";
$materials = $conn->query($sql_Material);
$conn = null;
}
} catch (PDOException $e) {
echo "fail";
echo $e->getMessage();
// 取得供應商、合約跟作番號
$BusinessPartner = array();
$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
$BizPartner = $conn->query($sql_Biz);
$bizcount = 0;
foreach ($BizPartner as $biz) {
$bizKey = $biz['BizPartnerId'];
$bizValue = $biz['BizPartnerName'];
array_push($BusinessPartner,$bizKey);
$bizcount +=1;
}
$BizJSON = json_encode($BusinessPartner);
$sql_Project = "SELECT * FROM comProject";
$projects = $conn->query($sql_Project);
$sql_Material = "SELECT * FROM comMaterialGroup";
$materials = $conn->query($sql_Material);
?>
<div style="width: 90%;">
@ -419,26 +417,9 @@ try {
<input type="hidden" name="rib_id" id="rib_id" value="<?= $ribsub['rib_id'] ?>">
</div>
<div class="form-group">
<div class="col-md-3">
<label for="comSupplierName">供應商</label>
<select name="comSupplierName" id="comSupplierName">
<option value="" <?php if ($ribsub['comSupplierId'] == "") {
echo "selected";
} ?>> </option>
<option value="雜項請款用" <?php if ($ribsub['comSupplierName'] == "雜項請款用") {
echo "selected";
} ?>>V0001雜項請款用</option>
<?php
foreach ($BizPartner as $BizKey => $BizValue) { ?>
<option value="<?= $BizValue['BizPartnerName'] ?>" <?php if ($BizValue['BizPartnerName'] == $ribsub['comSupplierName']) {
echo "selected";
} ?>><?= $BizValue['BizPartnerId'] . $BizValue['BizPartnerName'] ?></option>
<?php } ?>
</select>
</div>
<div class="col-md-3" id="Tax">
<label for="TaxNo">統一編號 (供應商)</label>
<input type="text" name="TaxNo" id="TaxNo" value="<?= $ribsub['TaxNo'] ?>" class="form-control">
<label for="TaxNo">供應商統一編號</label>
<input type="text" name="TaxNo" id="TaxNo" class="form-control" onblur="checkBiz()">
</div>
</div>
@ -459,24 +440,30 @@ try {
$(document).ready(function() {
$("#ProjectId").selectize();
$("#CU_MaterialId").selectize();
$("#comSupplierName").selectize();
})
var TempArr = [];
$(function() {
$("#comSupplierName").change(function() {
if ($("#comSupplierName").val() == "雜項請款用") {
$("#Tax").show();
} else {
$("#Tax").hide();
}
})
$("#TaxNo").change(function() {
if ($("#TaxNo").val().length !== 8) {
function checkBiz() {
if ($("#TaxNo").val().length !== 8) {
alert("統一編號格式錯誤");
}else{
var biz = $("#TaxNo").val();
var BizArray = <?php echo $BizJSON; ?>;
var answer = 0;
for (var partner = 0; partner < <?= $bizcount ?>; partner++){
var value = BizArray[partner];
if (biz == value){
answer +=1
}
})
}
if (answer==1){
alert("供應商認證成功")
}else{
alert("T8內無此供應商")
}
}
}
var TempArr = [];
$(function() {
$("#VoucherType").change(function() {
if ($("#VoucherType").val() !== "0") {
$("#NotInvoice1").hide();
@ -581,21 +568,6 @@ try {
}
})
$("#comSupplierIdNum option").each(function(index, el) {
TempArr[index] = $(this).text();
})
$(document).bind('click', function(e) {
var e = e || window.event;
var elem = e.target || e.srcElement;
while (elem) {
if (elem.id && (elem.id == 'comSupplierIdNum' || elem.id == "comSupplierName")) {
return;
}
elem = elem.parentNode;
}
$('#comSupplierIdNum').css('display', 'none');
});
$("#Price").change(function() {
$("#OAmount").val($("#Quantity").val() * $("#Price").val());
$("#LAmount").val($("#OAmount").val() * $("#CurrLAmount").val());
@ -649,44 +621,10 @@ try {
})
function ShowInvoice() {
// $("#Invoice").show();
window.open('rib02-invoice.php', '新視窗的名稱', config = 'height=600, width=600');
}
function changeF(this_) {
$(this_).prev("input").val($(this_).find("option:selected").text());
$("#comSupplierIdNum").css({
"display": "none"
});
}
function setfocus(this_) {
$("#comSupplierIdNum").css({
"display": ""
});
var select = $("#comSupplierIdNum");
select.empty();
if (select) {
$("#comSupplierIdNum").attr("size", 5);
for (i = 0; i < TempArr.length; i++) {
var option = new Option(TempArr[i], TempArr[i]);
select.append(option);
}
}
}
function setinput(this_) {
var select = $("#comSupplierIdNum");
select.html("");
for (i = 0; i < TempArr.length; i++) {
if (TempArr[i].indexOf(this_.value) >= 0) {
var option = new Option(TempArr[i], TempArr[i]);
select.append(option);
}
}
}
function changeWriteOffId(SelectedDept) {
var SelectDeptId = 'WriteOff' + SelectedDept + '-';
for (var i = 0; i < WriteOffId.options.length; i++) {

20
wms/rib02-submit.php

@ -5,6 +5,15 @@ $ribsub_id = isset($_GET['ribsub_id']) ? $_GET['ribsub_id'] : Null;
$submit = $_GET['submit'];
$state = empty($_GET['state']) ? 0 : $_GET['state'];
// 取得供應商
$BusinessPartner = array();
$sql_Biz = "SELECT comBusinessPartner.BizPartnerId, comBusinessPartner.BizPartnerName FROM comBusinessPartner INNER JOIN comSupplier ON comBusinessPartner.BizPartnerId=comSupplier.BizPartnerId WHERE comBusinessPartner.BizPartnerId !='V0001'";
$BizPartner = $conn->query($sql_Biz);
foreach ($BizPartner as $biz) {
$bizKey = $biz['BizPartnerId'];
$bizValue = $biz['BizPartnerName'];
$BusinessPartner[$bizKey]=$bizValue;
}
$RowCode = $_POST['RowCode'];
$FeeDate = $_POST['FeeDate'];
@ -26,7 +35,7 @@ $VoucherCount = empty($_POST['VoucherCount']) ? 1 : $_POST['VoucherCount'];
$VoucherType = isset($_POST['VoucherType']) ? $_POST['VoucherType'] : 0;
$InvoiceNo = empty($_POST['InvoiceNo']) ? NULL : $_POST['InvoiceNo'];
$CurrId = empty($_POST['CurrId']) ? null : $_POST['CurrId'];
$comSupplierName = empty($_POST['comSupplierName']) ? null : $_POST['comSupplierName'];
// $comSupplierName = empty($_POST['comSupplierName']) ? null : $_POST['comSupplierName'];
$FromSourceTag = 0;
$TaxRate = ($TaxId == "ST005") ? 0.05 : 0;
$OTax = isset($_POST['OTax']) ? $_POST['OTax'] : NULL;
@ -35,6 +44,15 @@ $OAmountUnWithTax = isset($_POST['OAmountUnWithTax']) ? $_POST['OAmountUnWithTax
$LAmountUnWithTax = isset($_POST['LAmountUnWithTax']) ? $_POST['LAmountUnWithTax'] : null;
$LAmount = isset($_POST['LAmount']) ? $_POST['LAmount'] : null;
$TaxNo = empty($_POST['TaxNo']) ? '' : $_POST['TaxNo'];
if (empty($TaxNo)){
$comSupplierName = "雜項請款用";
}else{
if (isset($BusinessPartner[$TaxNo])){
$comSupplierName= $BusinessPartner[$TaxNo];
}else{
$comSupplierName = "雜項請款用";
}
}
if (isset($comSupplierName) && ($comSupplierName != "雜項請款用")) {

7
wms/schedule-index.php

@ -4,12 +4,16 @@ include "header.php";
$tourl = $_SERVER["SCRIPT_NAME"]."?function_name=schedule&token=".$token;
// 工務總處可瀏覽全部資料
$sql = "select department_id from account where accountid = '$user_id'";
$sql = "select department_id, role_id from account where accountid = '$user_id'";
$res = mysqli_query($link, $sql);
$row = mysqli_fetch_row($res);
$user_department_id = $row[0];
$user_role_id = $row[1];
mysqli_free_result($res);
// 各區工務助理專員可瀏覽全部
$dr_arr = ['3114', '3133', '3144', '3152'];
if (!isset($_GET["p"]) || $_GET["p"] <= 0) $p = 1;
else $p = $_GET["p"];
$page_each = 50;
@ -22,6 +26,7 @@ $page_close = 0;
$sql_cmd2 = "";
$sql_cmd = sql_myself($user_id);
if ($user_department_id == "501" || $user_department_id == "322" || $user_id == "M0012" || $user_id == "M0105") $sql_cmd = "";
if (in_array($user_department_id.$user_role_id, $dr_arr)) $sql_cmd = "";
//if (empty($sql_cmd)) $sql_cmd = "where ";
if (!empty($_GET["contractno"])) $sql_cmd2 .= "and contractno = '".$_GET["contractno"]."' ";
if (!empty($_GET["facilityno"])) $sql_cmd2 .= "and facilityno = '".$_GET["facilityno"]."' ";

8
wms/sign/list.php

@ -90,14 +90,14 @@ $flow_name_opt = (array_unique($flow_name_opt, SORT_REGULAR));
<thead>
<tr>
<td colspan="8">
<h3 style='text-align:center'>签查询</h3>
<h3 style='text-align:center'>簽查詢</h3>
</td>
</tr>
</thead>
<tbody>
<tr>
<th style='width:50px'>统名称</th>
<th style='width:50px'>統名稱</th>
<td colspan='1'>
<select class='form-control' name='system_id'>
<?php
@ -108,7 +108,7 @@ $flow_name_opt = (array_unique($flow_name_opt, SORT_REGULAR));
?>
</select>
</td>
<th>流程名</th>
<th>流程名</th>
<td colspan='1'> <select class='form-control' name='flow_id'>
<?php
echo " <option class='form-control' value='%' >全部</option>";
@ -123,7 +123,7 @@ $flow_name_opt = (array_unique($flow_name_opt, SORT_REGULAR));
<tfoot>
<tr>
<td colspan="8" style='text-align:center'>
<button type="submit" style='text-align:center; margin:0 auto;width:50px' class="btn btn-primary"></button>
<button type="submit" style='text-align:center; margin:0 auto;width:50px' class="btn btn-primary"></button>
</td>
</tr>
</tfoot>

Loading…
Cancel
Save