From 7195447afac7ca23d06fba91c1b2b8349122a9e3 Mon Sep 17 00:00:00 2001
From: Ellin <b0206040@masada.com.tw>
Date: Wed, 25 Oct 2023 09:29:28 +0800
Subject: [PATCH] rebase

---
 wms/rib02-edit.php | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/wms/rib02-edit.php b/wms/rib02-edit.php
index 6a8827bb..eec268f2 100644
--- a/wms/rib02-edit.php
+++ b/wms/rib02-edit.php
@@ -33,8 +33,7 @@ try {
             }
             $personid = $man['PersonId'];
             $depart = $man['DeptId'];
-            if(isset($member["$personid"])){
-            array_push($member["$personid"], "$depart");}
+            array_push($member["$personid"], "$depart");
         }
 
         //取得部門代碼
@@ -47,6 +46,25 @@ try {
     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);
@@ -605,7 +623,7 @@ try {
             $("#OAmount").val($("#Quantity").val() * $("#Price").val());
             $("#LAmount").val($("#OAmount").val() * $("#CurrLAmount").val());
             if ($("#TaxId").val() === "ST005") {
-                $("#OTax").val($("#OAmount").val()-($("#OAmount").val() /1.05));
+                $("#OTax").val($("#OAmount").val() * 0.05);
                 $("#LTax").val($("#OTax").val() * $("#CurrLAmount").val());
                 $("#OAmountUnWithTax").val($("#OAmount").val() / 1.05);
                 $("#LAmountUnWithTax").val($("#OAmountUnWithTax").val() * $("#CurrLAmount").val());
@@ -620,24 +638,8 @@ try {
         $("#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());
-
-            } else {
-                $("#OTax").val(0);
-                $("#LTax").val(0);
-                $("#OAmountUnWithTax").val($("#OAmount").val());
-                $("#LAmountUnWithTax").val($("#OAmount").val() * $("#CurrLAmount").val());
-            }
-        });
-        $("#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));
+            if ($("#TaxId") === "ST005") {
+                $("#OTax").val($("#OAmount").val() * 0.05);
                 $("#LTax").val($("#OTax").val() * $("#CurrLAmount").val());
                 $("#OAmountUnWithTax").val($("#OAmount").val() / 1.05);
                 $("#LAmountUnWithTax").val($("#OAmountUnWithTax").val() * $("#CurrLAmount").val());
@@ -722,7 +724,6 @@ try {
                 $("#OAmountUnWithTax").prop("disabled", false);
                 $("#LAmountUnWithTax").prop("disabled", false);
                 $("#LAmount").prop("disabled", false);
-                $("#OAmount").prop("disabled", false);
             <?php } ?>
             $('#ribsubeditform').submit();
         }