diff --git a/wms/account_log/M0122-2023-10-25.ini b/wms/account_log/M0122-2023-10-25.ini new file mode 100644 index 00000000..0f1e7bed --- /dev/null +++ b/wms/account_log/M0122-2023-10-25.ini @@ -0,0 +1 @@ +a:3:{s:4:"list";s:0:"";s:4:"note";s:7:"success";s:5:"token";s:115:"M0122.JUU1JTkwJUIzJUU1JTg3JUIxJUU2JTg0JTg5.2023-10-25 08:38:29.2023-10-26 08:38:29.f8d2f26d38da98ee11629960c160322c";}08:38:29 diff --git a/wms/rib01-business-check.php b/wms/rib01-business-check.php index da9ccee9..37d97f87 100644 --- a/wms/rib01-business-check.php +++ b/wms/rib01-business-check.php @@ -3,16 +3,11 @@ include "./header.php"; $BillNo = $_GET['BillNo']; $state = $_GET['state']; //取得表頭數據 -$date_sql = "SELECT BillNo from rib_business WHERE (BillNo LIKE '$sqlname%')"; +$date_sql = "SELECT * from rib_business WHERE (BillNo='$BillNo')"; $query_rib = mysqli_query($link, $date_sql); -$myNo = mysqli_fetch_all($query_rib); -foreach ($myNo as $thisMyNo) { - $thisMyNo = (int)substr($thisMyNo[0], -2); - if ($thisMyNo > $MaxBillNo) { - $MaxBillNo = $thisMyNo; - } +foreach ($query_rib as $q) { + $rib = $q; } -$BillNo = $sqlname; // 連線T8MASADA try { $conn = new PDO("sqlsrv:Server=60.244.87.101;Database=T8MASADA", "masada", "ZXCVasdf1234"); @@ -52,17 +47,12 @@ try { echo "fail"; echo $e->getMessage(); } -$MaxBillNo += 1; -if ($MaxBillNo < 10) { - $BillNo .= "0" . strval($MaxBillNo); -} else { - $BillNo .= strval($MaxBillNo); -} + ?>
- +
@@ -79,7 +69,7 @@ if ($MaxBillNo < 10) {
- disabled> + disabled>
@@ -90,7 +80,7 @@ if ($MaxBillNo < 10) { 請選擇採購人員 $value) { ?> -
@@ -138,7 +144,9 @@ if ($MaxBillNo < 10) { $BizValue) { ?> - +
@@ -159,6 +167,99 @@ if ($MaxBillNo < 10) { + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
發票日期數量單價費用項目原幣報銷金額說明發票號碼功能
+ + + + + + + + + + + +
+
+ +
+ + + + + \ No newline at end of file diff --git a/wms/rib01-business-index.php b/wms/rib01-business-index.php new file mode 100644 index 00000000..442bae45 --- /dev/null +++ b/wms/rib01-business-index.php @@ -0,0 +1,250 @@ + 0) { + echo "有下屬"; + $column_str = "('$user_id'" . ",'"; + $column_str .= implode("','", $follower); + $column_str .= "')"; + $sql .= "WHERE ((PersonId in $column_str) or (CreatorId in $column_str))"; + } else { + $sql .= "WHERE ((PersonId= '$user_id') or (CreatorId= '$user_id'))"; + }; + $data = mysqli_query($link, $sql); +} +$DeptName = array(); +// 連線T8MASADA +try { + $conn = new PDO("sqlsrv:Server=60.244.87.101;Database=T8MASADA", "masada", "ZXCVasdf1234"); + if ($conn) { + $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + $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); + foreach ($deptype as $dept) { + $deptid = $dept['DeptId']; + $deptname = $dept['DeptName']; + $DeptName[$deptid] = $deptname; + } + //取得供應商 + $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 $partner){ + $partnerid = $partner['BizPartnerId']; + $partnername = $partner['BizPartnerName']; + $Supplier[$partnerid]= $partnername; + } + $conn = null; + } +} catch (PDOException $e) { + echo "fail"; + echo $e->getMessage(); +} +?> + +

+ + + +

+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
單據編號單據日期供應商報銷人報銷部門幣別報銷金額狀態功能
+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+
+
+ + +There is no record!"; +endif; + +include "./footer.php"; +?> \ No newline at end of file diff --git a/wms/rib02-edit.php b/wms/rib02-edit.php deleted file mode 100644 index eec268f2..00000000 --- a/wms/rib02-edit.php +++ /dev/null @@ -1,731 +0,0 @@ -setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); - $sql_feetype = "SELECT FeeTypeId, FeeTypeName FROM comFeeType WHERE (FeeTypeId NOT LIKE 'A%')AND(FeeTypeId NOT LIKE 'M%') AND(FeeTypeId NOT LIKE 'Z%')"; - $feetype = $conn->query($sql_feetype); - $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']; - array_push($member["$personid"], "$depart"); - } - - //取得部門代碼 - $sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001'"; - $deptype = $conn->query($sql_department); - $conn = null; - } -} catch (PDOException $e) { - echo "fail"; - echo $e->getMessage(); -} - - -// 找出使用者的部門 -// $mydepart_sql = "SELECT department_id from account Where accountid = '$user_id'"; -// $mydepart = mysqli_query($link, $mydepart_sql); -// foreach ($mydepart as $dep) { -// $mydepart = $dep['department_id']; -// } - -// 取得部門代碼 -// $sql_depid = "SELECT DISTINCT department_id, name from department"; -// $dept_query = mysqli_query($link, $sql_depid); -// $deptype = mysqli_fetch_all($dept_query, MYSQLI_ASSOC); - -// 取得人員名單 -// $sql_deptmem = "select * from account WHERE accounttype NOT IN ('A','X')"; -// $deptmem = mysqli_query($link, $sql_deptmem); -// $deptmem = mysqli_fetch_all($deptmem, MYSQLI_ASSOC); - - -//取得計量單位 -$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", "ZXCVasdf1234"); - 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(); -} - -?> -
- -
- - - -
-
- -
-
-

費用單據

-
-
- - -
- -
- - - -
- -
- - -
- -
- - -
-
- - -
- - - - - -
- - - -
- -
-
- -
- - -
- -
- - -
-
- - - -
-
- - -
-
-
-
- - -
-
- - -
- -
- -
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
-
- - " disabled> -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- -
- - -
-
- - -
-
- -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
- -
-
-
- - -
-
- - -
-
- -
-
- -
-
- -
-
- -
-
- - - \ No newline at end of file diff --git a/wms/rib02-submit.php b/wms/rib02-submit.php index de8e4394..229dea2b 100644 --- a/wms/rib02-submit.php +++ b/wms/rib02-submit.php @@ -29,11 +29,11 @@ $CurrId = empty($_POST['CurrId']) ? null : $_POST['CurrId']; $comSupplierName = empty($_POST['comSupplierName']) ? null : $_POST['comSupplierName']; $FromSourceTag = 0; $TaxRate = ($TaxId == "ST005") ? 0.05 : 0; -$OTax = empty($_POST['OTax']) ? null : $_POST['OTax']; -$LTax = empty($_POST['LTax']) ? null : $_POST['LTax']; -$OAmountUnWithTax = empty($_POST['OAmountUnWithTax']) ? null : $_POST['OAmountUnWithTax']; -$LAmountUnWithTax = empty($_POST['LAmountUnWithTax']) ? null : $_POST['LAmountUnWithTax']; -$LAmount = empty($_POST['LAmount']) ? null : $_POST['LAmount']; +$OTax = isset($_POST['OTax']) ? $_POST['OTax'] : NULL; +$LTax = isset($_POST['LTax']) ? $_POST['LTax'] : NULL; +$OAmountUnWithTax = isset($_POST['OAmountUnWithTax']) ? $_POST['OAmountUnWithTax'] : null; +$LAmountUnWithTax = isset($_POST['LAmountUnWithTax']) ? $_POST['LAmountUnWithTax'] : null; +$LAmount = isset($_POST['LAmount']) ? $_POST['LAmount'] : null; $TaxNo = empty($_POST['TaxNo']) ? '' : $_POST['TaxNo']; if (isset($comSupplierName) && ($comSupplierName != "雜項請款用")) { @@ -113,16 +113,17 @@ if ($submit == "add") { $SQL1 .= empty($InvoiceNo) ? "" : ",InvoiceNo='$InvoiceNo'"; $SQL1 .= empty($comSupplierName) ? ",comSupplierName=' '" : ",comSupplierName='$comSupplierName'"; $SQL1 .= empty($comSupplierId) ? ",comSupplierId=' '" : ",comSupplierId='$comSupplierId'"; - $SQL1 .= empty($OTax) ? "" : ",OTax=$OTax"; - $SQL1 .= empty($LTax) ? "" : ",LTax=$LTax"; - $SQL1 .= empty($OAmountUnWithTax) ? "" : ",OAmountUnWithTax=$OAmountUnWithTax"; - $SQL1 .= empty($LAmountUnWithTax) ? "" : ",LAmountUnWithTax=$LAmountUnWithTax"; - $SQL1 .= empty($LAmount) ? "" : ",LAmount=$LAmount"; + $SQL1 .= isset($OTax) ? ",OTax=$OTax" : ""; + $SQL1 .= isset($LTax) ? ",LTax=$LTax" : ""; + $SQL1 .= isset($OAmountUnWithTax) ? ",OAmountUnWithTax=$OAmountUnWithTax" : ""; + $SQL1 .= isset($LAmountUnWithTax) ? ",LAmountUnWithTax=$LAmountUnWithTax" : ""; + $SQL1 .= isset($LAmount) ? ",LAmount=$LAmount" : ""; if ($user_id == "M0056" && $state == 1) { $SQL1 .= ",FeeBalance=$LAmountUnWithTax"; $SQL1 .= ",WriteOffAmount=$OAmount"; } $SQL1 .= " WHERE ribsub_id = $ribsub_id"; + echo $SQL1; //上傳資料庫--表身 mysqli_query($link, $SQL1); if (mysqli_affected_rows($link)) { @@ -158,12 +159,13 @@ if ($submit == "add") { $SQL1 = str_replace("'", '', $SQL1); $sql_rib = "UPDATE rib SET OAmountWithTax=$OAmountWithTax, LAmountWithTax= $LAmountWithTax, LAmount=$LAmount,OAmount =$OAmount, UnPayOAmount=$OAmountWithTax, Balance = $OAmountWithTax, LBalance= $UnPayLAmount ,UnPaymentLAmt=$UnPayLAmount, UnPayLAmount=$UnPayLAmount,OTax=$OTax, LTax=$LTax, WriteOffAmount=$WriteOffAmount, LastOperatorId='$user_id' WHERE rib_id = $rib_id"; mysqli_query($link, $sql_rib); - ?>