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] =?UTF-8?q?=E4=BF=AE=E6=94=B9rib01-check=E6=AC=8A=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>