From 6d7b8a483489343b974b9583cbc520145c0d45f4 Mon Sep 17 00:00:00 2001
From: Ellin <b0206040@masada.com.tw>
Date: Fri, 3 Nov 2023 18:15:31 +0800
Subject: [PATCH 1/5] =?UTF-8?q?rib02-edit=E5=8F=AF=E7=9C=8B=E5=88=B0?=
 =?UTF-8?q?=E5=BB=A0=E5=95=86=E7=B5=B1=E7=B7=A8;=20rib01-business=E8=AA=BF?=
 =?UTF-8?q?=E7=B5=B1=E7=B7=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/rib01-business-check.php |  2 +-
 wms/rib01-business-edit.php  | 20 ++++++--------------
 wms/rib02-edit.php           |  2 +-
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/wms/rib01-business-check.php b/wms/rib01-business-check.php
index 412ef3ef..f60daff4 100644
--- a/wms/rib01-business-check.php
+++ b/wms/rib01-business-check.php
@@ -54,7 +54,7 @@ $conn = null;
     <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">
+    <form class="form-horizontal" name="ribbizadd" id="ribbizadd" method="POST" action="rib01-business-edit.php?BillNo=<?= $BillNo ?>&submit=edit&state=0&<?= $token_link ?>" enctype="multipart/form-data">
         <div class="form-group">
             <div class="col-md-6">
                 <label for="BillNo">單據編號</label>
diff --git a/wms/rib01-business-edit.php b/wms/rib01-business-edit.php
index 7036aa3c..c9e867c3 100644
--- a/wms/rib01-business-edit.php
+++ b/wms/rib01-business-edit.php
@@ -69,7 +69,7 @@ $conn = null;
         <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>
+                <select name="DeptId" id="DeptId" class="form-control">
                     <?php
                     foreach ($deptype as $dept) { ?>
                         <option value="<?php echo $dept['DeptId']; ?>" <?php
@@ -82,7 +82,7 @@ $conn = null;
             </div>
             <div class="col-md-6">
                 <label for="PersonId" style="color: red;">採購人員</label>
-                <select name="PersonId" id="PersonId" class="form-control" disabled>
+                <select name="PersonId" id="PersonId" class="form-control">
                     <option value="" style="display:flex" id="WriteOffoption">請選擇採購人員</option>
                     <?php
                     foreach ($member as $key => $value) { ?>
@@ -99,7 +99,7 @@ $conn = null;
 
             <div class="col-md-4">
                 <label for="CurrId" style="color: red;">幣別</label>
-                <select name="CurrId" id="CurrId" class="form-control" disabled>
+                <select name="CurrId" id="CurrId" class="form-control">
                     <option value="TWD" <?php if ($rib['CurrId'] == 'TWD') {
                                             echo "selected";
                                         } ?>>台幣</option>
@@ -119,7 +119,7 @@ $conn = null;
             </div>
             <div class="col-md-4">
                 <label for="TaxId" style="color: red;">稅碼</label>
-                <select name="TaxId" class="form-control" disabled>
+                <select name="TaxId" class="form-control">
                     <option value="ST005" <?php if ($rib['TaxId'] == 'ST005') {
                                                 echo "selected";
                                             } ?>>營業稅5%</option>
@@ -132,16 +132,8 @@ $conn = null;
                 </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>
+                <label for="BizPartnerId" style="color: red;">供應商統一編號</label>
+                <input id="BizPartnerId" name="BizPartnerId" class="form-control" onblur="checkBiz()" value="<?= $rib['BizPartnerId'] ?>">
             </div>
         </div>
 
diff --git a/wms/rib02-edit.php b/wms/rib02-edit.php
index 2665a7c2..af0c7365 100644
--- a/wms/rib02-edit.php
+++ b/wms/rib02-edit.php
@@ -419,7 +419,7 @@ $materials = $conn->query($sql_Material);
         <div class="form-group">
             <div class="col-md-3" id="Tax">
             <label for="TaxNo">供應商統一編號</label>
-                <input type="text" name="TaxNo" id="TaxNo" class="form-control" onblur="checkBiz()"> 
+                <input type="text" name="TaxNo" id="TaxNo" class="form-control" onblur="checkBiz()" value="<?= $ribsub['TaxNo'] ?>"> 
             </div>
         </div>
 

From 72d8aa05287a4ebf29f093b208c5632d7d4191b4 Mon Sep 17 00:00:00 2001
From: Ellin <b0206040@masada.com.tw>
Date: Mon, 6 Nov 2023 10:05:19 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=83=E8=A8=88?=
 =?UTF-8?q?=E4=BA=BA=E5=93=A1=E6=AC=8A=E9=99=90;=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/WriteOff.xlsx    | Bin 8789 -> 8775 bytes
 wms/rib01-check.php  |  28 +++-------------------------
 wms/rib01-delete.php |   4 ++--
 wms/rib01-edit.php   |   2 +-
 wms/rib01-index.php  |   8 ++++----
 wms/rib01-submit.php |   2 +-
 wms/rib02-check.php  |   2 +-
 wms/rib02-create.php |   4 ++--
 wms/rib02-edit.php   |   8 ++++----
 wms/rib02-submit.php |   2 +-
 wms/rib03-submit.php |  32 +++++++-------------------------
 11 files changed, 26 insertions(+), 66 deletions(-)

diff --git a/wms/WriteOff.xlsx b/wms/WriteOff.xlsx
index c02cdf37f54f6769f75e3318e7de25131d334ff5..72bfafda606d6730ee46b513cc027f4f774f308c 100644
GIT binary patch
delta 1873
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

delta 1860
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

diff --git a/wms/rib01-check.php b/wms/rib01-check.php
index 0824d469..d1055df4 100644
--- a/wms/rib01-check.php
+++ b/wms/rib01-check.php
@@ -88,7 +88,7 @@ if ($state == 0) :
         </p>
     </div>
 <?php
-elseif ($state == 1 && $user_id == "M0056") :
+elseif ($state == 1 && ($user_id == "M0056" || $user_id == "M0209")) :
 ?>
     <div style="width: 90%;">
 
@@ -107,7 +107,7 @@ elseif ($state == 1 && $user_id == "M0056") :
         </p>
     </div>
 <?php
-elseif ($state == 1 && $user_id != "M0056") :
+elseif ($state == 1 && ($user_id == "M0056" || $user_id == "M0209")) :
 ?>
 
     <div style="padding-left: 2rem;">
@@ -179,28 +179,6 @@ endif
             </div>
 
             <div class="form-group">
-
-                <!-- <div class="col-md-3">
-                    <label for="WriteOffType">報銷人類型</label>
-                    <select name="WriteOffType" id="WriteOffType" class="form-control" disabled>
-                        <option value=0 <?php if ($data['WriteOffType'] == 0) {
-                                            echo "selected";
-                                        } ?>>客戶</option>
-                        <option value=1 <?php if ($data['WriteOffType'] == 1) {
-                                            echo "selected";
-                                        } ?>>廠商</option>
-                        <option value=2 <?php if ($data['WriteOffType'] == 2) {
-                                            echo "selected";
-                                        } ?>>員工</option>
-                        <option value=3 <?php if ($data['WriteOffType'] == 3) {
-                                            echo "selected";
-                                        } ?>>其他</option>
-                        <option value=4 <?php if ($data['WriteOffType'] == 4) {
-                                            echo "selected";
-                                        } ?>>公司</option>
-                    </select>
-
-                </div> -->
                 <div class="col-md-3">
                     <label for="DeptId">報銷單位</label>
                     <select name="DeptId" id="DeptId" class="form-control" required disabled>
@@ -253,7 +231,7 @@ endif
                 </div>
             </div>
             <?php
-            if ($user_id == "M0056" && $state == 1) { ?>
+            if (($user_id == "M0056" || $user_id == "M0209") && $state == 1) { ?>
                 <div class="form-group">
 
                     <div class="col-md-3">
diff --git a/wms/rib01-delete.php b/wms/rib01-delete.php
index 03bd4d46..9c726833 100644
--- a/wms/rib01-delete.php
+++ b/wms/rib01-delete.php
@@ -2,7 +2,7 @@
 include "./header.php";
 $rib_id = isset($_GET['id']) ? $_GET['id'] : die('ERROR:Rib_id is not found.');
 $state = isset($_GET['state'])?$_GET['state']:0;
-if ($state==1&& $user_id=="M0056"){
+if ($state==1&& ($user_id == "M0056" || $user_id == "M0209")){
     ?>
     <script type="text/javascript">
     
@@ -22,7 +22,7 @@ if ($state==1&& $user_id=="M0056"){
 </script>
 <?php
 }
-elseif($state==1&& $user_id!="M0056"){
+elseif($state==1&& $user_id!="M0056" && $user_id!="M0209"){
     ?>
     <script type="text/javascript">
     
diff --git a/wms/rib01-edit.php b/wms/rib01-edit.php
index 50817599..65531ae1 100644
--- a/wms/rib01-edit.php
+++ b/wms/rib01-edit.php
@@ -205,7 +205,7 @@ if ($pay_data) {
             </div>
             <div class="form-group">
                 <?php
-                if ($user_id == "M0056" && $state == 1) { ?>
+                if (($user_id == "M0056" || $user_id == "M0209") && $state == 1) { ?>
                     <div class="form-group">
 
                         <div class="col-md-3">
diff --git a/wms/rib01-index.php b/wms/rib01-index.php
index 5f008903..81bb5fe3 100644
--- a/wms/rib01-index.php
+++ b/wms/rib01-index.php
@@ -8,7 +8,7 @@ $data = array();
 $sql = "select * from rib ";
 
 // 是否為會計 阿娥 
-if ($user_id == 'M0056') {
+if (($user_id == "M0056" || $user_id == "M0209")) {
     $sql .= "WHERE ((CurrentState =1) or (TransactId= '$user_id') or (WriteOffId='$user_id') or (GatheringPersonId='$user_id'))";
     $data = mysqli_query($link, $sql);
 } else {
@@ -96,7 +96,7 @@ if ($data) :
                     <th>報銷人</th>
                     <th>幣別</th>
                     <?php
-                    if ($user_id == "M0056") { ?>
+                    if (($user_id == "M0056" || $user_id == "M0209")) { ?>
                         <th>報銷金額</th>
                     <?php } ?>
                     <th style="width: 8%;">狀態</th>
@@ -129,7 +129,7 @@ if ($data) :
                             elseif ($data['CurrId'] == "EUR") : echo "歐元";
                             endif;    ?> </td>
                         <?php
-                        if ($user_id == "M0056") { ?>
+                        if (($user_id == "M0056" || $user_id == "M0209")) { ?>
                             <td><?php echo $data['OAmountWithTax']; ?> </td>
                         <?php } ?>
                         <td><?php if ($data['CurrentState'] == 0) : echo "草稿";
@@ -142,7 +142,7 @@ if ($data) :
                         </td>
                         <td>
                             <p>
-                                <?php if ($user_id == 'M0056' && $data['CurrentState'] == 1) {
+                                <?php if (($user_id == "M0056" || $user_id == "M0209") && $data['CurrentState'] == 1) {
                                 ?>
                                     <a href="rib01-check.php?id=<?php echo $data['rib_id'] ?>&state=1&<?= $token_link ?>" class="btn btn-success btn-sm">
                                         <span class="glyphicon glyphicon-pawn"></span>
diff --git a/wms/rib01-submit.php b/wms/rib01-submit.php
index e1953525..281d4eca 100644
--- a/wms/rib01-submit.php
+++ b/wms/rib01-submit.php
@@ -82,7 +82,7 @@ if (mysqli_affected_rows($link)) {
 }
 
 //增加紀錄
-if ($user_id == 'M0056') {
+if (($user_id == "M0056" || $user_id == "M0209")) {
     $sql_submit = str_replace("'", "", $SQL1);
     $sql_rib = "UPDATE rib SET LastOperatorId = '$user_id', LastOperation='$sql_submit' WHERE rib_id=$rib_id";
     mysqli_query($link, $sql_rib);
diff --git a/wms/rib02-check.php b/wms/rib02-check.php
index 2a8fa752..628cbe1c 100644
--- a/wms/rib02-check.php
+++ b/wms/rib02-check.php
@@ -172,7 +172,7 @@ $unit = mysqli_fetch_all($unit_query, MYSQLI_ASSOC);
             </div>
         </div>
         <?php
-        if ($user_id == "M0056") {
+        if ($user_id == "M0056" || $user_id == "M0209") {
         ?>
             <div class="form-group">
                 <div class="col-md-3">
diff --git a/wms/rib02-create.php b/wms/rib02-create.php
index f482aaad..3291bd43 100644
--- a/wms/rib02-create.php
+++ b/wms/rib02-create.php
@@ -105,7 +105,7 @@ $materials = $conn->query($sql_Material);
                 <input class="form-control" type="int" name="FeeDate" id="FeeDate" placeholder="西元年(4碼)+月(2碼)+日(2碼)" required>
 
             </div>
-            <?php if ($user_id == "M0056") { ?>
+            <?php if ($user_id == "M0056" || $user_id == "M0209") { ?>
                 <div class="col-md-3">
                     <label for="FeeTypeId" style="color: red;">費用項目代碼</label>
                     <select name="FeeTypeId" class="form-control" required>
@@ -282,7 +282,7 @@ $materials = $conn->query($sql_Material);
                     <option value="25">一般電子發票-> 進項三聯式收銀機統一發票及一般稅額計算之電子發票</option>
                     <option value="21">三聯式手開發票-> 進項三聯式、電子計算機統一發票</option>
                     <option value="22">二聯式收銀機發票 -> 進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
-                    <?php if ($user_id == "M0056") { ?>
+                    <?php if ($user_id == "M0056" || $user_id == "M0209") { ?>
                         <option value="23">三聯式、電子計算機、三聯式收銀機統一發票及一般稅額計算之電子發票之進貨退出或折讓證明單</option>
                         <option value="24">二聯式收銀機統一發票及載有稅額之其他憑證之進貨退出或折讓證明單</option>
                         <option value="26">彙總登錄每張稅額伍佰元以下之進項三聯式、電子計算機統一發票</option>
diff --git a/wms/rib02-edit.php b/wms/rib02-edit.php
index af0c7365..a9cb2903 100644
--- a/wms/rib02-edit.php
+++ b/wms/rib02-edit.php
@@ -89,7 +89,7 @@ $materials = $conn->query($sql_Material);
                 <input class="form-control" type="int" name="FeeDate" id="FeeDate" placeholder="西元年(4碼)+月(2碼)+日(2碼)" value="<?= $ribsub['FeeDate'] ?>" required>
 
             </div>
-            <?php if ($user_id == "M0056") { ?>
+            <?php if ($user_id == "M0056" || $user_id == "M0209") { ?>
                 <div class="col-md-3">
                     <label for="FeeTypeId" style="color: red;">費用項目代碼</label>
                     <select name="FeeTypeId" class="form-control" required>
@@ -296,7 +296,7 @@ $materials = $conn->query($sql_Material);
             </div>
         </div>
         <?php
-        if ($user_id == "M0056" && $state == 1) {
+        if (($user_id == "M0056" || $user_id == "M0209") && $state == 1) {
         ?>
             <div class="form-group">
                 <div class="col-md-3">
@@ -385,7 +385,7 @@ $materials = $conn->query($sql_Material);
                     <option value="22" <?php if ($ribsub['InvoiceId'] == "22") {
                                             echo "selected";
                                         } ?>>二聯式收銀機發票 -> 進項二聯式收銀機統一發票、載有稅額之其他憑證</option>
-                    <?php if ($user_id == "M0056") { ?>
+                    <?php if ($user_id == "M0056" || $user_id == "M0209") { ?>
                         <option value="23" <?php if ($ribsub['InvoiceId'] == "23") {
                                                 echo "selected";
                                             } ?>>三聯式、電子計算機、三聯式收銀機統一發票及一般稅額計算之電子發票之進貨退出或折讓證明單</option>
@@ -649,7 +649,7 @@ $materials = $conn->query($sql_Material);
         } else {
             $("#OAmount").prop("disabled", false);
             <?php
-            if ($user_id == "M0056" && $state == 1) { ?>
+            if (($user_id == "M0056" || $user_id == "M0209") && $state == 1) { ?>
                 $("#OTax").prop("disabled", false);
                 $("#LTax").prop("disabled", false);
                 $("#OAmountUnWithTax").prop("disabled", false);
diff --git a/wms/rib02-submit.php b/wms/rib02-submit.php
index 17b17f11..21061f47 100644
--- a/wms/rib02-submit.php
+++ b/wms/rib02-submit.php
@@ -128,7 +128,7 @@ if ($submit == "add") {
     $SQL1 .= isset($OAmountUnWithTax) ? ",OAmountUnWithTax=$OAmountUnWithTax" : "";
     $SQL1 .= isset($LAmountUnWithTax) ? ",LAmountUnWithTax=$LAmountUnWithTax" : "";
     $SQL1 .= isset($LAmount) ? ",LAmount=$LAmount" : "";
-    if ($user_id == "M0056" && $state == 1) {
+    if (($user_id == "M0056" || $user_id == "M0209") && $state == 1) {
         $SQL1 .= ",FeeBalance=$LAmountUnWithTax";
         $SQL1 .= ",WriteOffAmount=$OAmount";
     }
diff --git a/wms/rib03-submit.php b/wms/rib03-submit.php
index 035c88a8..3ce609d2 100644
--- a/wms/rib03-submit.php
+++ b/wms/rib03-submit.php
@@ -200,16 +200,10 @@ OAmount =$OAmount, UnPayOAmount=$UnPayOAmount, Balance = $OAmountWithTax, LBalan
     }
     $notice_rib_num = mysqli_num_rows($notice_rib);
     $notice_rib = mysqli_fetch_row($notice_rib);
-
-    $notice_sql = "SELECT * FROM notice WHERE related_id = 810";
-    $notice_num = mysqli_query($link, $notice_sql);
-    $notice_num = mysqli_num_rows($notice_num);
     $title = "有" . $notice_rib_num . "個費用報銷單待審核";
-    if ($notice_num == 0) {
-        $insert_notice_sql = "INSERT INTO notice (kind, related_id, title, content, haveread, permission, creater) VALUES(1,810,'$title','$content',1,'M0056','system')";
-    } else {
-        $insert_notice_sql = "UPDATE notice SET title= '$title', content='$content',permission='M0056' WHERE related_id=810";
-    }
+    $insert_notice_sql = "UPDATE notice SET title= '$title', content='$content',haveread=NULL WHERE id=1654";
+    mysqli_query($link, $insert_notice_sql);
+    $insert_notice_sql = "UPDATE notice SET title= '$title', content='$content',haveread=NULL WHERE id=1959";
     mysqli_query($link, $insert_notice_sql);
 } elseif ($state == 2) {
     //取得表頭資料
@@ -392,23 +386,11 @@ OAmount =$OAmount, UnPayOAmount=$UnPayOAmount, Balance = $OAmountWithTax, LBalan
     }
     $notice_rib_num = mysqli_num_rows($notice_rib);
     $notice_rib = mysqli_fetch_row($notice_rib);
-    $notice_sql = "SELECT * FROM notice WHERE related_id = 810";
-    $notice_num = mysqli_query($link, $notice_sql);
-    $notice_num = mysqli_num_rows($notice_num);
     $title = "有" . $notice_rib_num . "個費用報銷單待審核";
-    if ($notice_rib_num > 0) {
-        if ($notice_num == 0) {
-            $insert_notice_sql = "INSERT INTO notice (kind, related_id, title, content, haveread, permission, creater) VALUES(1,810,'$title','$content',1,'M0056','system')";
-        } else {
-            $insert_notice_sql = "UPDATE notice SET title= '$title', content='$content',permission='M0056' WHERE related_id=810";
-        }
-        mysqli_query($link, $insert_notice_sql);
-    } else {
-        if ($notice_num != 0) {
-            $insert_notice_sql = "DELETE FROM notice WHERE related_id = 810";
-        }
-        mysqli_query($link, $insert_notice_sql);
-    }
+    $insert_notice_sql = "UPDATE notice SET title= '$title', content='$content',haveread=NULL WHERE id=1654";
+    mysqli_query($link, $insert_notice_sql);
+    $insert_notice_sql = "UPDATE notice SET title= '$title', content='$content',haveread=NULL WHERE id=1959";
+    mysqli_query($link, $insert_notice_sql);
 }
 ?>
 <script>

From 7780a7e46c657bfcab437849ca3a1e3aaca25164 Mon Sep 17 00:00:00 2001
From: Ellin <b0206040@masada.com.tw>
Date: Tue, 7 Nov 2023 08:25:27 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9rib01-check=E6=AC=8A?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/rib-test.php    | 38 ++++++++++++++++++++------------------
 wms/rib01-check.php |  6 +++---
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/wms/rib-test.php b/wms/rib-test.php
index 80737f7e..d494f071 100644
--- a/wms/rib-test.php
+++ b/wms/rib-test.php
@@ -3,6 +3,7 @@ include "T8_Authorization.php";
 echo "ii";
 ?>
 <script>
+          console.log(<?=$now ?>);
   get_Auth();
   window.addEventListener('message', function(event) {
     if (event.origin === "http://localhost:3000" && (typeof event.data === "string")) {
@@ -18,8 +19,8 @@ echo "ii";
       var body = [{
           "name": "MasterTable",
           "rows": [{
-            "BillNo": "Z003",
-            "BillDate": 20230930,
+            "BillNo": "Z004",
+            "BillDate": 20231030,
             "OrgId": "1000",
             "TypeId": "OPV",
             "IsPriceWithTax":1,
@@ -28,7 +29,7 @@ echo "ii";
             "CurrId": "RMB",
             "CurrOAmount":1,
             "CurrLAmount":4,
-            "TaxId": "ST005",
+            "TaxId": "ST101",
             "PersonId": "M0012",
             "DeptId": "220",
             "CompId": "1001",
@@ -39,16 +40,16 @@ echo "ii";
         {
           "name": "DetailTable",
           "rows": [{
-              "BillNo": "Z003",
+              "BillNo": "Z004",
               "RowCode": 1,
               "RowNo": 1,
               "ItemType": 0,
-              "TaxId": "ST005",
+              "TaxId": "ST101",
               "MaterialId": "MX00000001",
               "UnitId": "PCS",
               "MaterialSpec": "",
               "SQuantity":10,
-              "SPrice":105,
+              "SPrice":100,
             },
             // {
             //   "BillNo": "Z002",
@@ -66,19 +67,20 @@ echo "ii";
             //   "TaxId": "ST005"
             // }
           ]
-        },
-        {
-          "name":"apCheckBillInvInfo",
-          "rows":[{
-            "BillNo":"Z003",
-            "RowCode":1,
-            "RowNo":1,
-            "InvoiceNo":"ap12345678",
-            "InvoiceId":25,
-            "TaxId":"ST005",
-            "LAmountWithTax":105
-          }]
         }
+        // ,
+        // {
+        //   "name":"apCheckBillInvInfo",
+        //   "rows":[{
+        //     "BillNo":"Z003",
+        //     "RowCode":1,
+        //     "RowNo":1,
+        //     "InvoiceNo":"ap12345678",
+        //     "InvoiceId":25,
+        //     "TaxId":"ST005",
+        //     "LAmountWithTax":105
+        //   }]
+        // }
       ];
       var json = JSON.stringify(body);
       obj = {
diff --git a/wms/rib01-check.php b/wms/rib01-check.php
index d1055df4..936e976e 100644
--- a/wms/rib01-check.php
+++ b/wms/rib01-check.php
@@ -298,7 +298,7 @@ endif
                 </a>
             </div>
         <?php
-        elseif ($state == 1 && $user_id == 'M0056') :
+        elseif ($state == 1 && ($user_id == "M0056" || $user_id == "M0209")) :
         ?>
             <div class="form-group">
                 <div class="col-md-7">
@@ -349,7 +349,7 @@ $feetype = mysqli_fetch_all($feetype_query, MYSQLI_ASSOC);
                         <th>發票日期</th>
                         <th>數量</th>
                         <th>單價</th>
-                        <th>費用項目</th>
+                        <th>費用/產品</th>
                         <th>原幣報銷金額</th>
                         <th>說明</th>
                         <th>發票號碼</th>
@@ -379,7 +379,7 @@ $feetype = mysqli_fetch_all($feetype_query, MYSQLI_ASSOC);
                                         <span class=" glyphicon glyphicon-trash"></span>
                                     </a>
                                 </td>
-                            <?php } elseif ($state == 1 && $user_id == "M0056") { ?>
+                            <?php } elseif ($state == 1 && ($user_id == "M0056" || $user_id == "M0209")) { ?>
                                 <td><a href="rib02-edit.php?id=<?php echo $pay['ribsub_id'] ?>&state=1&<?= $token_link ?>" class="btn btn-warning btn-sm">
                                         <span class=" glyphicon glyphicon-pencil"></span>
                                     </a>

From 9da64863c224ce5063ab75659614ff80ebba000c Mon Sep 17 00:00:00 2001
From: Ellin <b0206040@masada.com.tw>
Date: Tue, 7 Nov 2023 15:04:12 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=A8=BB=E8=A7=A3=E6=8E=89header.php?=
 =?UTF-8?q?=E9=80=A3T8=E8=B3=87=E6=96=99=E5=BA=AB=E7=9A=84echo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/header.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wms/header.php b/wms/header.php
index 348fbd63..7d7ff253 100644
--- a/wms/header.php
+++ b/wms/header.php
@@ -18,8 +18,8 @@ try {
       $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
   }
 } catch (PDOException $e) {
-  echo "fail";
-  echo $e->getMessage();
+  //echo "fail";
+  //echo $e->getMessage();
 }
 
 

From 57136fa53213875d96b2e8675becf58c64ca25b4 Mon Sep 17 00:00:00 2001
From: jrbin <jrbin@masada.com.tw>
Date: Wed, 8 Nov 2023 09:08:38 +0800
Subject: [PATCH 5/5] =?UTF-8?q?sql=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/excel-upload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wms/excel-upload.php b/wms/excel-upload.php
index b1944a1e..5c681828 100644
--- a/wms/excel-upload.php
+++ b/wms/excel-upload.php
@@ -151,7 +151,7 @@ if (move_uploaded_file($temp_file_name, $target_file)) {
                 default:
                     $facility_kind = "";
             }
-            $facilitsql = "SELECT * FROM facility where facilityno='$facilityno'";
+            $facilitsql = "SELECT * FROM facility where facilityno='$facilityno' and contractno='$contractno'";
             $facilit_nums_rows=mysqli_num_rows(mysqli_query($link,$facilitsql));
             if($facilit_nums_rows==0){
                 $weight= "450";//重量