From 3da5761322b56d1b8d62288e79b931253b3b39d9 Mon Sep 17 00:00:00 2001
From: Ellin <b0206040@masada.com.tw>
Date: Wed, 22 Nov 2023 19:31:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B2=BB=E7=94=A8=E5=A0=B1=E9=8A=B7=E5=96=AE?=
 =?UTF-8?q?=E5=89=B5=E5=BB=BA=E4=BA=BA=E5=82=B3=E5=85=A5T8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/WriteOff.xlsx    | Bin 8775 -> 8783 bytes
 wms/rib02-create.php | 138 ++++++++++++++++++++++++++-----------
 wms/rib02-edit.php   | 160 +++++++++++++++++++++++++++++--------------
 wms/rib02-submit.php |  37 ++++++----
 wms/rib03-submit.php |  17 ++---
 5 files changed, 240 insertions(+), 112 deletions(-)

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

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

diff --git a/wms/rib02-create.php b/wms/rib02-create.php
index 3a77e4d9..7cc5dd20 100644
--- a/wms/rib02-create.php
+++ b/wms/rib02-create.php
@@ -3,6 +3,7 @@ include "./header.php";
 
 $rib_id = isset($_GET['id']) ? $_GET['id'] : null;
 $BillNo = isset($_GET['BillNo']) ? $_GET['BillNo'] : null;
+$CurrId = isset($_GET['CurrId']) ? $_GET['CurrId'] : null;
 $sql_rib = "";
 if (empty($rib_id)) {
     $sql_rib = "SELECT * FROM rib WHERE BillNo = '$BillNo' && CurrentState=0";
@@ -97,9 +98,6 @@ $sql_department = "SELECT DeptId,DeptName FROM comDepartment WHERE DeptId!='0001
 $deptype = $conn->query($sql_department);
 
 
-//取得幣別
-$CurrId = $_GET['CurrId'];
-
 //取得計量單位
 $sql_unit = "SELECT * FROM unit";
 $unit_query = mysqli_query($link, $sql_unit);
@@ -286,7 +284,7 @@ $materials = $conn->query($sql_Material);
             </div>
             <div class="col-md-3">
                 <label for="Price" style="color: red;">單價 (原幣值含稅)</label>
-                <input class="form-control" type="number" step="any" name="Price" id="Price" required onchange="calOAmount(this.id)">
+                <input class="form-control" type="number" step="any" name="Price" id="Price" required>
             </div>
             <div class="col-md-3">
                 <label for="Quantity" style="color: red;">數量</label>
@@ -423,6 +421,7 @@ $materials = $conn->query($sql_Material);
 <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 TempArr = [];
+    var CurrId = "<?= $CurrId ?>";
     $(document).ready(function() {
         $("#ProjectId").selectize();
         $("#CU_MaterialId").selectize();
@@ -530,52 +529,106 @@ $materials = $conn->query($sql_Material);
             changeWriteOffId($('#FeeDeptId').val());
         })
         $("#Price").change(function() {
-            $("#OAmount").val($("#Quantity").val() * $("#Price").val());
-            $("#LAmount").val($("#OAmount").val() * $("#CurrLAmount").val());
-            if ($("#TaxId").val() === "ST005") {
-                $("#OTax").val($("#OAmount").val() - ($("#OAmount").val() / 1.05));
-                $("#LTax").val($("#OTax").val() * $("#CurrLAmount").val());
-                $("#OAmountUnWithTax").val($("#OAmount").val() / 1.05);
-                $("#LAmountUnWithTax").val($("#OAmountUnWithTax").val() * $("#CurrLAmount").val());
+            if (CurrId === "TWD") {
+                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
+                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
+                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
 
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                }
             } else {
-                $("#OTax").val(0);
-                $("#LTax").val(0);
-                $("#OAmountUnWithTax").val($("#OAmount").val());
-                $("#LAmountUnWithTax").val($("#OAmount").val() * $("#CurrLAmount").val());
+                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
+                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
+                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
+                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                }
             }
+
         });
         $("#Quantity").change(function() {
-            $("#OAmount").val($("#Quantity").val() * $("#Price").val());
-            $("#LAmount").val($("#OAmount").val() * $("#CurrLAmount").val());
-            if ($("#TaxId").val() === "ST005") {
-                $("#OTax").val($("#OAmount").val() - ($("#OAmount").val() / 1.05));
-                $("#LTax").val($("#OTax").val() * $("#CurrLAmount").val());
-                $("#OAmountUnWithTax").val($("#OAmount").val() / 1.05);
-                $("#LAmountUnWithTax").val($("#OAmountUnWithTax").val() * $("#CurrLAmount").val());
+            if (CurrId === "TWD") {
+                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
+                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
+                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
 
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                }
             } else {
-                $("#OTax").val(0);
-                $("#LTax").val(0);
-                $("#OAmountUnWithTax").val($("#OAmount").val());
-                $("#LAmountUnWithTax").val($("#OAmount").val() * $("#CurrLAmount").val());
+                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
+                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
+                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
+                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                }
             }
+
         });
         $("#TaxId").change(function() {
-            $("#OAmount").val($("#Quantity").val() * $("#Price").val());
-            $("#LAmount").val($("#OAmount").val() * $("#CurrLAmount").val());
-            if ($("#TaxId").val() === "ST005") {
-                $("#OTax").val($("#OAmount").val() - ($("#OAmount").val() / 1.05));
-                $("#LTax").val($("#OTax").val() * $("#CurrLAmount").val());
-                $("#OAmountUnWithTax").val($("#OAmount").val() / 1.05);
-                $("#LAmountUnWithTax").val($("#OAmountUnWithTax").val() * $("#CurrLAmount").val());
+            if (CurrId === "TWD") {
+                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
+                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
+                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
 
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                }
             } else {
-                $("#OTax").val(0);
-                $("#LTax").val(0);
-                $("#OAmountUnWithTax").val($("#OAmount").val());
-                $("#LAmountUnWithTax").val($("#OAmount").val() * $("#CurrLAmount").val());
+                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
+                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
+                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
+                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                }
             }
+
         })
         $("#FeeDate").change(function() {
             if ($("#FeeDate").val().length != 8) {
@@ -594,8 +647,15 @@ $materials = $conn->query($sql_Material);
                 } else {
                     now.setMonth(now.getMonth() - 2);
                     now.setDate(1);
-                    now.setDate(now.getDate() - 1)
-                    if (feedate < now) {
+                    now.setDate(now.getDate() - 1);
+                    console.log(now.getFullYear());
+                        console.log(now.getMonth());
+                        console.log(now.getDate());
+                        console.log(feedate.getFullYear());
+                        console.log(feedate.getMonth());
+                        console.log(feedate.getDate());
+                    if (feedate <= now) {
+
                         alert("超過兩個月的費用無法進行報銷");
                         $("#FeeDate").val('');
                     }
diff --git a/wms/rib02-edit.php b/wms/rib02-edit.php
index a608cabe..a78cde97 100644
--- a/wms/rib02-edit.php
+++ b/wms/rib02-edit.php
@@ -52,8 +52,8 @@ $bizcount = 0;
 foreach ($BizPartner as $biz) {
     $bizKey = $biz['BizPartnerId'];
     $bizValue = $biz['BizPartnerName'];
-    array_push($BusinessPartner,$bizKey);
-    $bizcount +=1;
+    array_push($BusinessPartner, $bizKey);
+    $bizcount += 1;
 }
 $BizJSON = json_encode($BusinessPartner);
 $sql_Project = "SELECT * FROM comProject";
@@ -418,8 +418,8 @@ $materials = $conn->query($sql_Material);
         </div>
         <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()" value="<?= $ribsub['TaxNo'] ?>"> 
+                <label for="TaxNo">供應商統一編號</label>
+                <input type="text" name="TaxNo" id="TaxNo" class="form-control" onblur="checkBiz()" value="<?= $ribsub['TaxNo'] ?>">
             </div>
         </div>
 
@@ -437,29 +437,31 @@ $materials = $conn->query($sql_Material);
 <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 CurrId = "<?= $ribsub['CurrId'] ?>";
     $(document).ready(function() {
         $("#ProjectId").selectize();
         $("#CU_MaterialId").selectize();
     })
+
     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
+            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內無此供應商")
             }
         }
-        if (answer==1){
-            alert("供應商認證成功")
-        }else{
-            alert("T8內無此供應商")
-        }
-    }
 
     }
     var TempArr = [];
@@ -569,52 +571,106 @@ $materials = $conn->query($sql_Material);
         })
 
         $("#Price").change(function() {
-            $("#OAmount").val($("#Quantity").val() * $("#Price").val());
-            $("#LAmount").val($("#OAmount").val() * $("#CurrLAmount").val());
-            if ($("#TaxId").val() === "ST005") {
-                $("#OTax").val($("#OAmount").val() - ($("#OAmount").val() / 1.05));
-                $("#LTax").val($("#OTax").val() * $("#CurrLAmount").val());
-                $("#OAmountUnWithTax").val($("#OAmount").val() / 1.05);
-                $("#LAmountUnWithTax").val($("#OAmountUnWithTax").val() * $("#CurrLAmount").val());
+            if (CurrId === "TWD") {
+                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
+                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
+                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
 
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                }
             } else {
-                $("#OTax").val(0);
-                $("#LTax").val(0);
-                $("#OAmountUnWithTax").val($("#OAmount").val());
-                $("#LAmountUnWithTax").val($("#OAmount").val() * $("#CurrLAmount").val());
+                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
+                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
+                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
+                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                }
             }
+
         });
         $("#Quantity").change(function() {
-            $("#OAmount").val($("#Quantity").val() * $("#Price").val());
-            $("#LAmount").val($("#OAmount").val() * $("#CurrLAmount").val());
-            if ($("#TaxId").val() === "ST005") {
-                $("#OTax").val($("#OAmount").val() - ($("#OAmount").val() / 1.05));
-                $("#LTax").val($("#OTax").val() * $("#CurrLAmount").val());
-                $("#OAmountUnWithTax").val($("#OAmount").val() / 1.05);
-                $("#LAmountUnWithTax").val($("#OAmountUnWithTax").val() * $("#CurrLAmount").val());
+            if (CurrId === "TWD") {
+                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
+                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
+                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
 
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                }
             } else {
-                $("#OTax").val(0);
-                $("#LTax").val(0);
-                $("#OAmountUnWithTax").val($("#OAmount").val());
-                $("#LAmountUnWithTax").val($("#OAmount").val() * $("#CurrLAmount").val());
+                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
+                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
+                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
+                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                }
             }
+
         });
         $("#TaxId").change(function() {
-            $("#OAmount").val($("#Quantity").val() * $("#Price").val());
-            $("#LAmount").val($("#OAmount").val() * $("#CurrLAmount").val());
-            if ($("#TaxId").val() === "ST005") {
-                $("#OTax").val($("#OAmount").val() - ($("#OAmount").val() / 1.05));
-                $("#LTax").val($("#OTax").val() * $("#CurrLAmount").val());
-                $("#OAmountUnWithTax").val($("#OAmount").val() / 1.05);
-                $("#LAmountUnWithTax").val($("#OAmountUnWithTax").val() * $("#CurrLAmount").val());
+            if (CurrId === "TWD") {
+                $("#OAmount").val(Math.round($("#Quantity").val() * $("#Price").val()));
+                $("#LAmount").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(Math.round($("#OAmount").val() - ($("#OAmount").val() / 1.05)));
+                    $("#LTax").val(Math.round($("#OTax").val() * $("#CurrLAmount").val()));
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val() / 1.05));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()));
 
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(Math.round($("#OAmount").val()));
+                    $("#LAmountUnWithTax").val(Math.round($("#OAmount").val() * $("#CurrLAmount").val()));
+                }
             } else {
-                $("#OTax").val(0);
-                $("#LTax").val(0);
-                $("#OAmountUnWithTax").val($("#OAmount").val());
-                $("#LAmountUnWithTax").val($("#OAmount").val() * $("#CurrLAmount").val());
+                $("#OAmount").val(($("#Quantity").val() * $("#Price").val()).toFixed(2));
+                $("#LAmount").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                if ($("#TaxId").val() === "ST005") {
+                    $("#OTax").val(($("#OAmount").val() - ($("#OAmount").val() / 1.05)).toFixed(2));
+                    $("#LTax").val(($("#OTax").val() * $("#CurrLAmount").val()).toFixed(2));
+                    $("#OAmountUnWithTax").val(($("#OAmount").val() / 1.05).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmountUnWithTax").val() * $("#CurrLAmount").val()).toFixed(2));
+
+                } else {
+                    $("#OTax").val(0);
+                    $("#LTax").val(0);
+                    $("#OAmountUnWithTax").val(($("#OAmount").val()).toFixed(2));
+                    $("#LAmountUnWithTax").val(($("#OAmount").val() * $("#CurrLAmount").val()).toFixed(2));
+                }
             }
+
         })
 
 
diff --git a/wms/rib02-submit.php b/wms/rib02-submit.php
index dcf669ce..46a3871b 100644
--- a/wms/rib02-submit.php
+++ b/wms/rib02-submit.php
@@ -7,7 +7,8 @@ $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'";
+$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'];
@@ -20,30 +21,40 @@ $FeeDate = $_POST['FeeDate'];
 $FeeTypeGen = isset($_POST['FeeTypeGen']) ? $_POST['FeeTypeGen'] : null;
 $FeeTypeId = $_POST['FeeTypeId'];
 $FeeDeptId = $_POST['FeeDeptId'];
+$CurrId = empty($_POST['CurrId']) ? null : $_POST['CurrId'];
 $WriteOffId = $_POST['WriteOffId'];
 $FeeNoteShow = $_POST['FeeNoteShow'];
 $ProjectId = empty($_POST['ProjectId']) ? Null : $_POST['ProjectId'];
 $CU_MaterialId = empty($_POST['CU_MaterialId']) ? null : $_POST['CU_MaterialId'];
 $UnitId = $_POST['UnitId'];
-$Price = $_POST['Price'];
+$Price = $CurrId == "TWD" ? round($_POST['Price']) : round($_POST['Price'], 2);
 $Quantity = $_POST['Quantity'];
-$OAmount = $_POST['OAmount'];
+$OAmount = $CurrId == "TWD" ? round($_POST['OAmount']) : round($_POST['OAmount'], 2);
 $TaxId = $_POST['TaxId'];
 $IsCounteract = $_POST['IsCounteract'];
 $InvoiceId = $_POST['InvoiceId'];
 $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'];
+
 $CurrLAmount = empty($_POST['CurrLAmount']) ? null : $_POST['CurrLAmount'];
 // $comSupplierName = empty($_POST['comSupplierName']) ? null : $_POST['comSupplierName'];
 $FromSourceTag = 0;
 $TaxRate = ($TaxId == "ST005") ? 0.05 : 0;
-$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;
+if ($CurrId == "TWD") {
+    $OTax = isset($_POST['OTax']) ? round($_POST['OTax']) : NULL;
+    $LTax = isset($_POST['LTax']) ? round($_POST['LTax']) : NULL;
+    $OAmountUnWithTax = isset($_POST['OAmountUnWithTax']) ? round($_POST['OAmountUnWithTax']) : null;
+    $LAmountUnWithTax = isset($_POST['LAmountUnWithTax']) ? round($_POST['LAmountUnWithTax']) : null;
+    $LAmount = isset($_POST['LAmount']) ? round($_POST['LAmount']) : null;
+}else{
+    $OTax = isset($_POST['OTax']) ? round($_POST['OTax'], 2) : NULL;
+    $LTax = isset($_POST['LTax']) ? round($_POST['LTax'], 2) : NULL;
+    $OAmountUnWithTax = isset($_POST['OAmountUnWithTax']) ? round($_POST['OAmountUnWithTax'], 2) : null;
+    $LAmountUnWithTax = isset($_POST['LAmountUnWithTax']) ? round($_POST['LAmountUnWithTax'], 2) : null;
+    $LAmount = isset($_POST['LAmount']) ? round($_POST['LAmount'], 2) : null;
+}
+
 $TaxNo = empty($_POST['TaxNo']) ? '' : $_POST['TaxNo'];
 if (empty($TaxNo)) {
     $comSupplierName = "雜項請款用";
@@ -71,7 +82,7 @@ if (isset($comSupplierName) && ($comSupplierName != "雜項請款用")) {
 
 $SQL1 = "";
 if ($submit == "add") {
-    if (($user_id == "M0056" )|| ($user_id == "M0209")) {
+    if (($user_id == "M0056") || ($user_id == "M0209")) {
         $SQL1 = "INSERT INTO rib_sub (`RowCode`,`rib_id`,`RowNo`,`FeeDate`,`FeeTypeId`,`WriteOffType`,
     `BizOrgId`,`WriteOffId`,`FeeOrgId`,`FeeDeptId`,`FeeCompanyId`,`UnitId`,`Quantity`,
     `Price`,`OAmount`,`FeeNoteShow`,`CurrId`,`SupplyOrgId`,`CurrOAmount`,`FromSourceTag`,`TaxId`,`IsCounteract`,`InvoiceId`,`TaxRate`,`CreatorId`,`TaxNo`,`CurrentLAmount`,`OTax`,`LTax`,
@@ -139,7 +150,7 @@ if ($submit == "add") {
 
 ?>
     <script>
-        window.location.href = "rib01-check.php?id=<?php echo $rib_id ?>&state=0&<?= $token_link ?>";
+        window.location.href = "rib01-check.php?id=<?php echo $rib_id ?>&state=<?= $state ?>&<?= $token_link ?>";
     </script>
     <?php
 } elseif ($submit == "edit") {
@@ -201,7 +212,7 @@ if ($submit == "add") {
         mysqli_query($link, $sql_rib);
     ?>
         <script>
-            window.location.href = "rib01-check.php?id=<?php echo $rib_id ?>&state=0&<?= $token_link ?>";
+            window.location.href = "rib01-check.php?id=<?php echo $rib_id ?>&state=<?= $state ?>&<?= $token_link ?>";
         </script>
     <?php
 
@@ -213,7 +224,7 @@ if ($submit == "add") {
 
     ?>
         <script>
-            window.location.href = "rib01-check.php?id=<?php echo $rib_id ?>&state=0&<?= $token_link ?>";
+            window.location.href = "rib01-check.php?id=<?php echo $rib_id ?>&state=<?= $state ?>&<?= $token_link ?>";
         </script>
 <?php
 
diff --git a/wms/rib03-submit.php b/wms/rib03-submit.php
index 4650beaf..336be643 100644
--- a/wms/rib03-submit.php
+++ b/wms/rib03-submit.php
@@ -87,13 +87,13 @@ if ($state == 1) {
     while ($ribsub = mysqli_fetch_assoc($ribsub_data)) {
         $count += 1;
         $OAmountWithTax += $ribsub['OAmount'];
-        $LAmount = $ribsub['OAmount'] * $CurrLAmount;
-        $OAmountUnWithTax = $ribsub['OAmount'] / (1 + $ribsub['TaxRate']);
-        $LAmountUnWithTax = $OAmountUnWithTax * $CurrLAmount;
-        $sub_WriteOffAmount = $ribsub['OAmount'];
-        $sub_OTax = $ribsub['OAmount'] - $OAmountUnWithTax;
+        $LAmount = $rib['CurrId']=="TWD"? round($ribsub['OAmount'] * $CurrLAmount):round($ribsub['OAmount'] * $CurrLAmount,2);
+        $OAmountUnWithTax = $rib['CurrId']=="TWD"? round($ribsub['OAmount'] / (1 + $ribsub['TaxRate'])):round($ribsub['OAmount'] / (1 + $ribsub['TaxRate']),2);
+        $LAmountUnWithTax = $rib['CurrId']=="TWD"?round($OAmountUnWithTax * $CurrLAmount):round($OAmountUnWithTax * $CurrLAmount,2);
+        $sub_WriteOffAmount = $rib['CurrId']=="TWD"? round($ribsub['OAmount']):round($ribsub['OAmount'],2);
+        $sub_OTax = $rib['CurrId']=="TWD"? round(($ribsub['OAmount'] - $OAmountUnWithTax)):round(($ribsub['OAmount'] - $OAmountUnWithTax),2);
         $OTax += $sub_OTax;
-        $sub_LTax = $LAmount - $LAmountUnWithTax;
+        $sub_LTax = $rib['CurrId']=="TWD"? round(($LAmount - $LAmountUnWithTax)):round(($LAmount - $LAmountUnWithTax),2);
         $LTax += $sub_LTax;
         $WriteOffAmount += $ribsub['OAmount'];
         $OAmount += $OAmountUnWithTax;
@@ -336,17 +336,18 @@ OAmount =$OAmount, UnPayOAmount=$UnPayOAmount, Balance = $OAmountWithTax, LBalan
         $IsCounteract = $ribsub['IsCounteract'];
         $CU_MaterialId = empty($ribsub['CU_MaterialId']) ? null : $ribsub['CU_MaterialId'];
         $TaxNo = empty($ribsub['TaxNo']) ? null : $ribsub['TaxNo'];
+        $CreatorId = $ribsub['CreatorId'];
 
         $sqlsub = "INSERT INTO glFeeWriteOffSub (BillNo, RowCode,RowNo,FeeDate,FeeTypeId, WriteOffType,
             BizOrgId, WriteOffId, FeeOrgId, FeeDeptId, FeeCompanyId, UnitId ,
              Quantity, Price, CurrOAmount,CurrLAmount,TaxId,TaxRate,OTax,LTax,LAmountUnWithTax
-             ,OAmountUnWithTax,OAmount,LAmount,FeeBalance,VoucherCount,CurrId,WriteOffAmount,SupplyOrgId,IsCounteract,IsKeyByFeeInfo
+             ,OAmountUnWithTax,OAmount,LAmount,FeeBalance,VoucherCount,CurrId,WriteOffAmount,SupplyOrgId,IsCounteract,IsKeyByFeeInfo,CreatorId
              ";
 
         $sqlsub2 = ") VALUES ('$BillNo',$RowCode, $RowNo,$FeeDate,'$FeeTypeId',$WriteOffType,
             '1000','$WriteOffId','1000','$FeeDeptId','1000','$UnitId',
             $Quantity, $Price, $CurrOAmount, $CurrLAmount,'$TaxId',$TaxRate,$OTax,$LTax,$LAmountUnWithTax
-            ,$OAmountUnWithTax,$OAmount,$LAmount,$FeeBalance,$VoucherCount,'$CurrId',$WriteOffAmount,'1000',$IsCounteract,0
+            ,$OAmountUnWithTax,$OAmount,$LAmount,$FeeBalance,$VoucherCount,'$CurrId',$WriteOffAmount,'1000',$IsCounteract,0,$CreatorId
             ";
 
         $sqlsub .= empty($WriteOffDescribe) ? "" : ",WriteOffDescribe";