版本號 : 2021050601

更新內容如下
1、修正銷售單申請  稅金欄位手動輸入時計算為連棟BUG

YD-ERP-SYS/Module/SQL_業務系統管理.vb

@@ -84,10 +84,10 @@
     '---------------------訂單控制表-----------------------------------------------------------------------------------------------------------------
     Friend Sub SQL_銷售控制表_訂單控制表()
         ConnOpen()
-        SQL1 = "SELECT      銷售控制表.流水號, 銷售控制表.單號, 銷售控制表.稅金,客戶資料表.名稱, 銷售控制表.開單日期, 銷售控制表.交貨日期, 
+        SQL1 = "SELECT      銷售控制表.流水號, 銷售控制表.單號, 客戶資料表.名稱, 銷售控制表.開單日期, 銷售控制表.交貨日期, 
                             銷售控制表.含稅, 銷售控制表.單位主管, 銷售控制表.審核日期, 銷售收款事項.內容, 銷售收款事項.金額, 
                             銷售控制表.送貨地點, 銷售控制表.運費, 銷售控制表.客戶編號, 客戶資料表.電話1, 客戶資料表.電話2,
-                            客戶資料表.地址, 客戶資料表.公司名稱, 客戶資料表.統編
+                            客戶資料表.地址, 客戶資料表.公司名稱, 客戶資料表.統編, 銷售控制表.稅金
                 FROM        銷售控制表 INNER JOIN
                             客戶資料表 ON 銷售控制表.客戶編號 = 客戶資料表.舊編 LEFT OUTER JOIN
                             銷售收款事項 ON 銷售控制表.單號 = 銷售收款事項.單號

YD-ERP-SYS/Module/全域變數.vb

@@ -4,7 +4,7 @@
     Public 版本號 As String : Public Target As String : Public Target1 As String : Public Target2 As String : Public FTP帳號 As String : Public FTP密碼 As String : Public FTP物理位置 As String
     Public AA(99) As String : Public BB(99) As Boolean : Public CC(99) As Boolean : Public 登入判斷 As Boolean : Public 業務號碼 As String
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2021050501"
+    Public 版本 As String = "2021050601"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 列印用SQL As String = "" : Public 列印用SQL2 As String : Public 公司編號 As String : Public 公司電話 As String : Public 公司統編 As String : Public 公司地址 As String
     Public 關鍵字編號 As String

YD-ERP-SYS/obj/Debug/YD-ERP-SYS.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-cb0269c7dead0353b1cddba61be0da71dc8dff85
+134da36bc1a476ecd17ffb6779b8ecef1e31298c

YD-ERP-SYS/業務系統管理/訂單控制表.vb

@@ -17,7 +17,7 @@ Public Class 訂單控制表
         銷售單據_dgv.Columns(4).FillWeight = 110 : 銷售單據_dgv.Columns(5).FillWeight = 50 : 銷售單據_dgv.Columns(6).Visible = False : 銷售單據_dgv.Columns(7).FillWeight = 110
         銷售單據_dgv.Columns(8).FillWeight = 85 : 銷售單據_dgv.Columns(9).FillWeight = 100 : 銷售單據_dgv.Columns(10).Visible = False : 銷售單據_dgv.Columns(11).Visible = False
         銷售單據_dgv.Columns(12).Visible = False : 銷售單據_dgv.Columns(13).Visible = False : 銷售單據_dgv.Columns(14).Visible = False : 銷售單據_dgv.Columns(15).Visible = False
-        銷售單據_dgv.Columns(16).Visible = False : 銷售單據_dgv.Columns(17).Visible = False
+        銷售單據_dgv.Columns(16).Visible = False : 銷售單據_dgv.Columns(17).Visible = False : 銷售單據_dgv.Columns(18).Visible = False
 
         銷售單據_dgv.Columns("金額").DefaultCellStyle.Format = "#,##0"
         銷售單據_dgv.Columns("金額").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
@@ -191,6 +191,7 @@ Public Class 訂單控制表
         刷卡稅金_tb.Text = CInt(Val(Val(刷卡總和_tb.Text) * 0.05)) : 刷卡傭金_tb.Text = CInt(Val(Val(刷卡總和_tb.Text) * 0.02))
         '-------002-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
+            銷售合計_tb.Text = Val(銷售合計_tb.Text) + 銷售明細_dgv("售價", i).Value
             售價小計_tb.Text = Val(售價小計_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value)
 
             If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) <> "1" Then
@@ -206,22 +207,27 @@ Public Class 訂單控制表
             End If
         Next
         管銷費用_tb.Text = Val(物料成本_tb.Text) * 1.06 - Val(物料成本_tb.Text)
-        銷售合計_tb.Text = Val(售價小計_tb.Text) + Val(稅金_tb.Text)
+
 
         If Val(稅金_tb.Text) = 0 And Val(刷卡稅金_tb.Text) = 0 Then
             通知_lb.Text = "無稅金"
         ElseIf Val(稅金_tb.Text) = 0 And Val(刷卡稅金_tb.Text) <> 0 Then
-            通知_lb.Text = "應刷卡稅金小，有刷卡帶入的稅金，所以拆售價以未稅顯示" : 稅金_tb.Text = 刷卡稅金_tb.Text : 售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
+            通知_lb.Text = "應刷卡稅金小，有刷卡帶入的稅金，所以拆售價以未稅顯示" : 稅金_tb.Text = Val(稅金_tb.Text) : 售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
         ElseIf Val(稅金_tb.Text) <> 0 And Val(刷卡稅金_tb.Text) <> 0 And Val(稅金_tb.Text) > Val(刷卡稅金_tb.Text) Then
             通知_lb.Text = "應所拆售價稅金大於刷卡稅金，計算正常，利潤中扣除刷卡傭金"
         ElseIf Val(稅金_tb.Text) <> 0 And Val(刷卡稅金_tb.Text) <> 0 And Val(稅金_tb.Text) < Val(刷卡稅金_tb.Text) Then
             通知_lb.Text = "刷卡稅金大於自動計算後的稅金，邏輯有誤，請從新拆售價。"
         End If
 
-        If 稅金存檔 <> 0 And Val(稅金_tb.Text) <> 0 And 稅金存檔 <> Val(稅金_tb.Text) Then
+        If 稅金存檔 <> Val(稅金_tb.Text) Then
+            稅金_tb.Text = 稅金存檔
+            售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
+            銷售合計_tb.Text = Val(售價小計_tb.Text) + Val(稅金_tb.Text)
+        ElseIf 稅金存檔 = Val(稅金_tb.Text) Then
             稅金_tb.Text = 稅金存檔
+            銷售合計_tb.Text = Val(售價小計_tb.Text) + Val(稅金_tb.Text)
+            售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
         End If
-
         '-------003-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         For i As Integer = 0 To 銷售備註_dgv.Rows.Count - 1
             收入小計_tb.Text = Val(收入小計_tb.Text) + 銷售備註_dgv("收入", i).Value

YD-ERP-SYS/業務系統管理/銷售單審核.vb

@@ -70,7 +70,7 @@ Public Class 銷售單審核
 
         銷售單據_dgv.Columns(0).Visible = False : 銷售單據_dgv.Columns(1).FillWeight = 100 : 銷售單據_dgv.Columns(2).Visible = False : 銷售單據_dgv.Columns(3).Visible = False
         銷售單據_dgv.Columns(4).Visible = False : 銷售單據_dgv.Columns(5).Visible = False : 銷售單據_dgv.Columns(6).Visible = False : 銷售單據_dgv.Columns(7).Visible = False
-        銷售單據_dgv.Columns(8).Visible = False : 銷售單據_dgv.Columns(9).Visible = False : 銷售單據_dgv.Columns(10).Visible = False
+        銷售單據_dgv.Columns(8).Visible = False : 銷售單據_dgv.Columns(9).Visible = False : 銷售單據_dgv.Columns(10).Visible = False : 銷售單據_dgv.Columns(11).Visible = False
     End Sub
     Private Sub Set_清單2()
         客戶資料_dgv.DataSource = Nothing : ds2.Clear()
@@ -311,6 +311,7 @@ Public Class 銷售單審核
         刷卡稅金_tb.Text = CInt(Val(Val(刷卡總和_tb.Text) * 0.05)) : 刷卡傭金_tb.Text = CInt(Val(Val(刷卡總和_tb.Text) * 0.02))
         '-------002-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
+            銷售合計_tb.Text = Val(銷售合計_tb.Text) + 銷售明細_dgv("售價", i).Value
             售價小計_tb.Text = Val(售價小計_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value)
 
             If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) <> "1" Then
@@ -326,22 +327,27 @@ Public Class 銷售單審核
             End If
         Next
         管銷費用_tb.Text = Val(物料成本_tb.Text) * 1.06 - Val(物料成本_tb.Text)
-        銷售合計_tb.Text = Val(售價小計_tb.Text) + Val(稅金_tb.Text)
+
 
         If Val(稅金_tb.Text) = 0 And Val(刷卡稅金_tb.Text) = 0 Then
             通知_lb.Text = "無稅金"
         ElseIf Val(稅金_tb.Text) = 0 And Val(刷卡稅金_tb.Text) <> 0 Then
-            通知_lb.Text = "應刷卡稅金小，有刷卡帶入的稅金，所以拆售價以未稅顯示" : 稅金_tb.Text = 刷卡稅金_tb.Text : 售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
+            通知_lb.Text = "應刷卡稅金小，有刷卡帶入的稅金，所以拆售價以未稅顯示" : 稅金_tb.Text = Val(稅金_tb.Text) : 售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
         ElseIf Val(稅金_tb.Text) <> 0 And Val(刷卡稅金_tb.Text) <> 0 And Val(稅金_tb.Text) > Val(刷卡稅金_tb.Text) Then
             通知_lb.Text = "應所拆售價稅金大於刷卡稅金，計算正常，利潤中扣除刷卡傭金"
         ElseIf Val(稅金_tb.Text) <> 0 And Val(刷卡稅金_tb.Text) <> 0 And Val(稅金_tb.Text) < Val(刷卡稅金_tb.Text) Then
             通知_lb.Text = "刷卡稅金大於自動計算後的稅金，邏輯有誤，請從新拆售價。"
         End If
 
-        If 稅金存檔 <> 0 And Val(稅金_tb.Text) <> 0 And 稅金存檔 <> Val(稅金_tb.Text) Then
+        If 稅金存檔 <> Val(稅金_tb.Text) Then
             稅金_tb.Text = 稅金存檔
+            售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
+            銷售合計_tb.Text = Val(售價小計_tb.Text) + Val(稅金_tb.Text)
+        ElseIf 稅金存檔 = Val(稅金_tb.Text) Then
+            稅金_tb.Text = 稅金存檔
+            銷售合計_tb.Text = Val(售價小計_tb.Text) + Val(稅金_tb.Text)
+            售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
         End If
-
         '-------003-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         For i As Integer = 0 To 銷售備註_dgv.Rows.Count - 1
             收入小計_tb.Text = Val(收入小計_tb.Text) + 銷售備註_dgv("收入", i).Value
@@ -626,6 +632,12 @@ Public Class 銷售單審核
             PA = 查詢_tb.Text : Set_清單() : 地區_cb.Text = ""
         End If
     End Sub
+    Private Sub 稅金_tb_KeyPress(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles 稅金_tb.KeyPress
+        If e.KeyChar = Chr(13) Then
+            稅金存檔 = 稅金_tb.Text
+            Set_合記計算()
+        End If
+    End Sub
     Private Sub 指定倉庫_cb_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 指定倉庫_cb.SelectedIndexChanged
         PA6 = 指定倉庫_cb.Text : SQL_指定倉儲_資料讀取()
         If dr.Read() Then : 倉庫級別_tb.Text = dr("倉級") : 倉庫編號_tb.Text = dr("倉名編號") : End If : conn.Close()
@@ -1193,13 +1205,14 @@ Public Class 銷售單審核
         刷卡稅金_tb.Text = CInt(Val(Val(刷卡總和_tb.Text) * 0.05)) : 刷卡傭金_tb.Text = CInt(Val(Val(刷卡總和_tb.Text) * 0.02))
         '-------002-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
+            銷售合計_tb.Text = Val(銷售合計_tb.Text) + 銷售明細_dgv("售價", i).Value
             售價小計_tb.Text = Val(售價小計_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value)
 
-            If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) <> 1 Then
+            If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) <> "1" Then
                 物料成本_tb.Text = Val(物料成本_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value)
                 不含1類銷售小記 = 不含1類銷售小記 + 銷售明細_dgv("售價", i).Value
             End If
-            If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) = 1 Then
+            If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) = "1" Then
                 其他成本_tb.Text = Val(其他成本_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value)
             End If
 
@@ -1208,22 +1221,27 @@ Public Class 銷售單審核
             End If
         Next
         管銷費用_tb.Text = Val(物料成本_tb.Text) * 1.06 - Val(物料成本_tb.Text)
-        銷售合計_tb.Text = Val(售價小計_tb.Text) + Val(稅金_tb.Text)
+
 
         If Val(稅金_tb.Text) = 0 And Val(刷卡稅金_tb.Text) = 0 Then
             通知_lb.Text = "無稅金"
         ElseIf Val(稅金_tb.Text) = 0 And Val(刷卡稅金_tb.Text) <> 0 Then
-            通知_lb.Text = "應刷卡稅金小，有刷卡帶入的稅金，所以拆售價以未稅顯示" : 稅金_tb.Text = 刷卡稅金_tb.Text : 售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
+            通知_lb.Text = "應刷卡稅金小，有刷卡帶入的稅金，所以拆售價以未稅顯示" : 稅金_tb.Text = Val(稅金_tb.Text) : 售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
         ElseIf Val(稅金_tb.Text) <> 0 And Val(刷卡稅金_tb.Text) <> 0 And Val(稅金_tb.Text) > Val(刷卡稅金_tb.Text) Then
             通知_lb.Text = "應所拆售價稅金大於刷卡稅金，計算正常，利潤中扣除刷卡傭金"
         ElseIf Val(稅金_tb.Text) <> 0 And Val(刷卡稅金_tb.Text) <> 0 And Val(稅金_tb.Text) < Val(刷卡稅金_tb.Text) Then
             通知_lb.Text = "刷卡稅金大於自動計算後的稅金，邏輯有誤，請從新拆售價。"
         End If
 
-        If 稅金存檔 <> 0 And Val(稅金_tb.Text) <> 0 And 稅金存檔 <> Val(稅金_tb.Text) Then
+        If 稅金存檔 <> Val(稅金_tb.Text) Then
             稅金_tb.Text = 稅金存檔
+            售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
+            銷售合計_tb.Text = Val(售價小計_tb.Text) + Val(稅金_tb.Text)
+        ElseIf 稅金存檔 = Val(稅金_tb.Text) Then
+            稅金_tb.Text = 稅金存檔
+            銷售合計_tb.Text = Val(售價小計_tb.Text) + Val(稅金_tb.Text)
+            售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
         End If
-
         '-------003-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         For i As Integer = 0 To 銷售備註_dgv.Rows.Count - 1
             收入小計_tb.Text = Val(收入小計_tb.Text) + 銷售備註_dgv("收入", i).Value
@@ -1367,9 +1385,7 @@ Public Class 銷售單審核
         司機運費_tb.Text = Format(Val(司機運費_tb.Text), "#,##0") : 管銷費用_tb.Text = Format(Val(管銷費用_tb.Text), "#,##0") : 預估利潤_tb.Text = Format(Val(預估利潤_tb.Text), "#,##0")
         物料成本_tb.Text = Format(Val(物料成本_tb.Text), "#,##0") : 其他成本_tb.Text = Format(Val(其他成本_tb.Text), "#,##0") : 刷卡總和_tb.Text = Format(Val(刷卡總和_tb.Text), "#,##0")
         刷卡稅金_tb.Text = Format(Val(刷卡稅金_tb.Text), "#,##0") : 刷卡傭金_tb.Text = Format(Val(刷卡傭金_tb.Text), "#,##0")
-
     End Sub
-
     Private Sub 刷卡收款_bt_Click(sender As Object, e As EventArgs) Handles 刷卡收款_bt.Click
         If 流水號_tb.Text = "" Then
             MsgBox("沒有銷售單號，無法作業。")

YD-ERP-SYS/業務系統管理/銷售單申請.vb

@@ -317,6 +317,7 @@ Public Class 銷售單申請
         刷卡稅金_tb.Text = CInt(Val(Val(刷卡總和_tb.Text) * 0.05)) : 刷卡傭金_tb.Text = CInt(Val(刷卡總和_tb.Text) * 0.02)
         '-------002-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
+            銷售合計_tb.Text = Val(銷售合計_tb.Text) + 銷售明細_dgv("售價", i).Value
             售價小計_tb.Text = Val(售價小計_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value)
 
             If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) <> "1" Then
@@ -332,20 +333,26 @@ Public Class 銷售單申請
             End If
         Next
         管銷費用_tb.Text = Val(物料成本_tb.Text) * 1.06 - Val(物料成本_tb.Text)
-        銷售合計_tb.Text = Val(售價小計_tb.Text) + Val(稅金_tb.Text)
+
 
         If Val(稅金_tb.Text) = 0 And Val(刷卡稅金_tb.Text) = 0 Then
             通知_lb.Text = "無稅金"
         ElseIf Val(稅金_tb.Text) = 0 And Val(刷卡稅金_tb.Text) <> 0 Then
-            通知_lb.Text = "應刷卡稅金小，有刷卡帶入的稅金，所以拆售價以未稅顯示" : 稅金_tb.Text = 刷卡稅金_tb.Text : 售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
+            通知_lb.Text = "應刷卡稅金小，有刷卡帶入的稅金，所以拆售價以未稅顯示" : 稅金_tb.Text = Val(稅金_tb.Text) : 售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
         ElseIf Val(稅金_tb.Text) <> 0 And Val(刷卡稅金_tb.Text) <> 0 And Val(稅金_tb.Text) > Val(刷卡稅金_tb.Text) Then
             通知_lb.Text = "應所拆售價稅金大於刷卡稅金，計算正常，利潤中扣除刷卡傭金"
         ElseIf Val(稅金_tb.Text) <> 0 And Val(刷卡稅金_tb.Text) <> 0 And Val(稅金_tb.Text) < Val(刷卡稅金_tb.Text) Then
             通知_lb.Text = "刷卡稅金大於自動計算後的稅金，邏輯有誤，請從新拆售價。"
         End If
 
-        If 稅金存檔 <> 0 And Val(稅金_tb.Text) <> 0 And 稅金存檔 <> Val(稅金_tb.Text) Then
+        If 稅金存檔 <> Val(稅金_tb.Text) Then
+            稅金_tb.Text = 稅金存檔
+            售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
+            銷售合計_tb.Text = Val(售價小計_tb.Text) + Val(稅金_tb.Text)
+        ElseIf 稅金存檔 = Val(稅金_tb.Text) Then
             稅金_tb.Text = 稅金存檔
+            銷售合計_tb.Text = Val(售價小計_tb.Text) + Val(稅金_tb.Text)
+            售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
         End If
         '-------003-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         For i As Integer = 0 To 銷售備註_dgv.Rows.Count - 1
@@ -636,6 +643,12 @@ Public Class 銷售單申請
             PA = 查詢_tb.Text : Set_清單() : 地區_cb.Text = ""
         End If
     End Sub
+    Private Sub 稅金_tb_KeyPress(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles 稅金_tb.KeyPress
+        If e.KeyChar = Chr(13) Then
+            稅金存檔 = 稅金_tb.Text
+            Set_合記計算()
+        End If
+    End Sub
     Private Sub 指定倉庫_cb_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 指定倉庫_cb.SelectedIndexChanged
         PA6 = 指定倉庫_cb.Text : SQL_指定倉儲_資料讀取()
         If dr.Read() Then : 倉庫級別_tb.Text = dr("倉級") : 倉庫編號_tb.Text = dr("倉名編號") : End If : conn.Close()
@@ -1285,13 +1298,14 @@ Public Class 銷售單申請
         刷卡稅金_tb.Text = CInt(Val(Val(刷卡總和_tb.Text) * 0.05)) : 刷卡傭金_tb.Text = CInt(Val(Val(刷卡總和_tb.Text) * 0.02))
         '-------002-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
+            銷售合計_tb.Text = Val(銷售合計_tb.Text) + 銷售明細_dgv("售價", i).Value
             售價小計_tb.Text = Val(售價小計_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value)
 
-            If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) <> 1 Then
+            If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) <> "1" Then
                 物料成本_tb.Text = Val(物料成本_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value)
                 不含1類銷售小記 = 不含1類銷售小記 + 銷售明細_dgv("售價", i).Value
             End If
-            If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) = 1 Then
+            If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) = "1" Then
                 其他成本_tb.Text = Val(其他成本_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value)
             End If
 
@@ -1300,20 +1314,26 @@ Public Class 銷售單申請
             End If
         Next
         管銷費用_tb.Text = Val(物料成本_tb.Text) * 1.06 - Val(物料成本_tb.Text)
-        銷售合計_tb.Text = Val(售價小計_tb.Text) + Val(稅金_tb.Text)
+
 
         If Val(稅金_tb.Text) = 0 And Val(刷卡稅金_tb.Text) = 0 Then
             通知_lb.Text = "無稅金"
         ElseIf Val(稅金_tb.Text) = 0 And Val(刷卡稅金_tb.Text) <> 0 Then
-            通知_lb.Text = "應刷卡稅金小，有刷卡帶入的稅金，所以拆售價以未稅顯示" : 稅金_tb.Text = 刷卡稅金_tb.Text : 售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
+            通知_lb.Text = "應刷卡稅金小，有刷卡帶入的稅金，所以拆售價以未稅顯示" : 稅金_tb.Text = Val(稅金_tb.Text) : 售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
         ElseIf Val(稅金_tb.Text) <> 0 And Val(刷卡稅金_tb.Text) <> 0 And Val(稅金_tb.Text) > Val(刷卡稅金_tb.Text) Then
             通知_lb.Text = "應所拆售價稅金大於刷卡稅金，計算正常，利潤中扣除刷卡傭金"
         ElseIf Val(稅金_tb.Text) <> 0 And Val(刷卡稅金_tb.Text) <> 0 And Val(稅金_tb.Text) < Val(刷卡稅金_tb.Text) Then
             通知_lb.Text = "刷卡稅金大於自動計算後的稅金，邏輯有誤，請從新拆售價。"
         End If
 
-        If 稅金存檔 <> 0 And Val(稅金_tb.Text) <> 0 And 稅金存檔 <> Val(稅金_tb.Text) Then
+        If 稅金存檔 <> Val(稅金_tb.Text) Then
+            稅金_tb.Text = 稅金存檔
+            售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
+            銷售合計_tb.Text = Val(售價小計_tb.Text) + Val(稅金_tb.Text)
+        ElseIf 稅金存檔 = Val(稅金_tb.Text) Then
             稅金_tb.Text = 稅金存檔
+            銷售合計_tb.Text = Val(售價小計_tb.Text) + Val(稅金_tb.Text)
+            售價小計_tb.Text = Val(銷售合計_tb.Text) - Val(稅金_tb.Text)
         End If
         '-------003-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         For i As Integer = 0 To 銷售備註_dgv.Rows.Count - 1