2020110201備份

Signed-off-by: B70340 <b70340@gmail.com>

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

@@ -136,6 +136,19 @@
                 ORDER BY   銷售控制表.單號 DESC"
         CmdSet_For_DGV()
     End Sub
+    Friend Sub SQL_銷售分析表_稅金()
+        If 銷售分析表.依開單日期_ch.Checked = False Then
+            SQL2 = "(銷售控制表.交貨日期 BETWEEN '" & Format(銷售分析表.開始日期_dtp.Value, "yyyy/MM/dd") & "' AND '" & Format(銷售分析表.結束日期_dtp.Value, "yyyy/MM/dd") & "')"
+        ElseIf 銷售分析表.依開單日期_ch.Checked = True Then
+            SQL2 = "(銷售控制表.開單日期 BETWEEN '" & Format(銷售分析表.開始日期_dtp.Value, "yyyy/MM/dd") & "' AND '" & Format(銷售分析表.結束日期_dtp.Value, "yyyy/MM/dd") & "')"
+        End If
+        ConnOpen()
+        SQL1 = "SELECT     單號 AS 項次, 單號, 稅金
+                FROM       銷售控制表
+                WHERE     (單號 Not Like '4%') AND (單號 LIKE '" & PA19 & "%') AND (稅金 > 0) AND " & SQL2 & " 
+                ORDER BY   單號 DESC"
+        CmdSet_For_DGV()
+    End Sub
     Friend Sub SQL_銷售分析表_運費()
         If 銷售分析表.依開單日期_ch.Checked = False Then
             SQL2 = "(交貨日期 BETWEEN '" & Format(銷售分析表.開始日期_dtp.Value, "yyyy/MM/dd") & "' AND '" & Format(銷售分析表.結束日期_dtp.Value, "yyyy/MM/dd") & "')"

YD-ERP-SYS/Module/SQL_跨介面共用.vb

@@ -199,7 +199,7 @@
     End Sub
     Friend Sub SQL_銷售收款事項()
         ConnOpen()
-        SQL1 = "SELECT 資料流水號, 單號, 項次 AS 真項次, 項次, 內容, 金額 FROM 銷售收款事項 WHERE (單號 LIKE '" & PA2 & "') ORDER BY 項次 DESC"
+        SQL1 = "SELECT 資料流水號, 單號, 項次 AS 真項次, 項次, 內容, 金額 FROM 銷售收款事項 WHERE (單號 LIKE '" & PA2 & "') ORDER BY 項次 DESC, 內容 DESC"
         CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_銷售控制表_刪除()
@@ -232,7 +232,7 @@
     Friend Sub SQL_銷售控制表_修改()
         ConnOpen()
         SQL1 = "UPDATE 銷售控制表 SET 單號 = N'" & PA2 & "', 開單日期 = N'" & DTP & "', 客戶編號 = N'" & PA3 & "', 交貨日期 = '" & DTP1 & "', 含稅 = '" & BL1 & "', 送貨地點 = N'" & PA5 & "', 
-                       運費 = N'" & NU1 & "', 管銷費用 = N'" & NU2 & "' 
+                       運費 = N'" & NU1 & "', 管銷費用 = N'" & NU2 & "' , 稅金 = N'" & NU3 & "' 
                 WHERE 流水號 LIKE '" & PA1 & "%'"
         CmdSet_For_dr()
     End Sub
@@ -286,6 +286,11 @@
         SQL1 = "INSERT INTO 銷售收款事項 (資料流水號, 單號, 項次, 內容, 金額) VALUES (N'" & PA1 & "', '" & PA & "', '" & PA2 & "', N'', N'0')"
         CmdSet_For_dr()
     End Sub
+    Friend Sub SQL_銷售收款事項_新增3()
+        ConnOpen()
+        SQL1 = "INSERT INTO 銷售收款事項 (資料流水號, 單號, 項次, 內容, 金額) VALUES (N'" & PA1 & "', '" & PA & "', '0', N'刷卡', N'0')"
+        CmdSet_For_dr()
+    End Sub
     Friend Sub SQL_銷售備註表_刪除()
         ConnOpen() : SQL1 = "DELETE 銷售備註表 WHERE 資料流水號 LIKE '" & PA & "'" : CmdSet_For_dr()
     End Sub

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 = "2020101402"
+    Public 版本 As String = "2020102601"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     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/採購系統管理/供應商資料表.Designer.vb

@@ -529,7 +529,6 @@ Partial Class 供應商資料表
         '
         Me.結算日_nud.Location = New System.Drawing.Point(1073, 105)
         Me.結算日_nud.Maximum = New Decimal(New Integer() {31, 0, 0, 0})
-        Me.結算日_nud.Minimum = New Decimal(New Integer() {1, 0, 0, 0})
         Me.結算日_nud.Name = "結算日_nud"
         Me.結算日_nud.Size = New System.Drawing.Size(40, 23)
         Me.結算日_nud.TabIndex = 1061

YD-ERP-SYS/採購系統管理/供應商資料表.vb

@@ -98,13 +98,16 @@ Public Class 供應商資料表
             狀態_lb.Text = "編輯狀態"
             供應商_dgv.Enabled = False : 查詢_tb.Enabled = False '--------------------關閉DGV與關鍵字查詢控件的點選控制功能
 
-            SQL_供應商資料表_編號_最後一筆資料()  '--------------------自動取得新編號
-            If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("編號").ToString, 4)) : Else : EDR = 0 : End If
-            conn.Close() : EDR += 1
-            If EDR < 10 Then : ESTR = 地區編碼_cb.Text & "00" & EDR
-            ElseIf EDR > 9 And EDR < 100 Then : ESTR = 地區編碼_cb.Text & "0" & EDR
-            ElseIf EDR > 99 And EDR < 1000 Then : ESTR = 地區編碼_cb.Text & EDR
-            End If : 編號_tb.Text = ESTR
+            'SQL_供應商資料表_編號_最後一筆資料()  '--------------------自動取得新編號
+            'If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("編號").ToString, 4)) : Else : EDR = 0 : End If
+            'conn.Close() : EDR += 1
+            'If EDR < 10 Then : ESTR = 地區編碼_cb.Text & "00" & EDR
+            'ElseIf EDR > 9 And EDR < 100 Then : ESTR = 地區編碼_cb.Text & "0" & EDR
+            'ElseIf EDR > 99 And EDR < 1000 Then : ESTR = 地區編碼_cb.Text & EDR
+            'End If : 編號_tb.Text = ESTR
+
+            PA = InputBox("過渡時期，手工請輸入供應商編號!")
+            編號_tb.Text = PA
 
             Set_日期格式轉換() '--------------------到職日期格式傳換
             SQL_供應商資料表_新增() '--------------------人事資料表中寫入一筆資料

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

@@ -55,6 +55,8 @@ Partial Class 訂單控制表
         Me.Label2 = New System.Windows.Forms.Label()
         Me.單號_tb = New System.Windows.Forms.TextBox()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.其他成本_tb = New System.Windows.Forms.TextBox()
+        Me.Label45 = New System.Windows.Forms.Label()
         Me.物料成本_tb = New System.Windows.Forms.TextBox()
         Me.Label43 = New System.Windows.Forms.Label()
         Me.預估利潤_tb = New System.Windows.Forms.TextBox()
@@ -115,8 +117,13 @@ Partial Class 訂單控制表
         Me.最低運費_cb = New System.Windows.Forms.ComboBox()
         Me.客戶1_tb = New System.Windows.Forms.TextBox()
         Me.Label12 = New System.Windows.Forms.Label()
-        Me.其他成本_tb = New System.Windows.Forms.TextBox()
-        Me.Label45 = New System.Windows.Forms.Label()
+        Me.刷卡總和_tb = New System.Windows.Forms.TextBox()
+        Me.刷卡稅金_tb = New System.Windows.Forms.TextBox()
+        Me.Label46 = New System.Windows.Forms.Label()
+        Me.Label47 = New System.Windows.Forms.Label()
+        Me.刷卡傭金_tb = New System.Windows.Forms.TextBox()
+        Me.Label48 = New System.Windows.Forms.Label()
+        Me.通知_lb = New System.Windows.Forms.Label()
         CType(Me.銷售單據_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         CType(Me.客戶資料_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -343,6 +350,13 @@ Partial Class 訂單控制表
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Panel1.AutoScroll = True
         Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
+        Me.Panel1.Controls.Add(Me.通知_lb)
+        Me.Panel1.Controls.Add(Me.刷卡總和_tb)
+        Me.Panel1.Controls.Add(Me.刷卡稅金_tb)
+        Me.Panel1.Controls.Add(Me.Label46)
+        Me.Panel1.Controls.Add(Me.Label47)
+        Me.Panel1.Controls.Add(Me.刷卡傭金_tb)
+        Me.Panel1.Controls.Add(Me.Label48)
         Me.Panel1.Controls.Add(Me.其他成本_tb)
         Me.Panel1.Controls.Add(Me.Label45)
         Me.Panel1.Controls.Add(Me.物料成本_tb)
@@ -397,6 +411,28 @@ Partial Class 訂單控制表
         Me.Panel1.Size = New System.Drawing.Size(638, 502)
         Me.Panel1.TabIndex = 1278
         '
+        '其他成本_tb
+        '
+        Me.其他成本_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.其他成本_tb.ForeColor = System.Drawing.Color.Green
+        Me.其他成本_tb.Location = New System.Drawing.Point(534, 700)
+        Me.其他成本_tb.Name = "其他成本_tb"
+        Me.其他成本_tb.Size = New System.Drawing.Size(81, 23)
+        Me.其他成本_tb.TabIndex = 1337
+        Me.其他成本_tb.Text = "0"
+        Me.其他成本_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        'Label45
+        '
+        Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label45.AutoSize = True
+        Me.Label45.ForeColor = System.Drawing.Color.Green
+        Me.Label45.Location = New System.Drawing.Point(452, 703)
+        Me.Label45.Name = "Label45"
+        Me.Label45.Size = New System.Drawing.Size(83, 16)
+        Me.Label45.TabIndex = 1336
+        Me.Label45.Text = "其   他   成   本"
+        '
         '物料成本_tb
         '
         Me.物料成本_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -515,6 +551,7 @@ Partial Class 訂單控制表
         Me.項次3_tb.Name = "項次3_tb"
         Me.項次3_tb.Size = New System.Drawing.Size(32, 23)
         Me.項次3_tb.TabIndex = 1290
+        Me.項次3_tb.Visible = False
         '
         '項次2_tb
         '
@@ -733,7 +770,7 @@ Partial Class 訂單控制表
         Me.客戶資料_dgv.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.客戶資料_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.客戶資料_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.客戶資料_dgv.Location = New System.Drawing.Point(17, 7168)
+        Me.客戶資料_dgv.Location = New System.Drawing.Point(17, 7445)
         Me.客戶資料_dgv.Name = "客戶資料_dgv"
         Me.客戶資料_dgv.RowHeadersWidth = 5
         DataGridViewCellStyle4.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
@@ -877,7 +914,7 @@ Partial Class 訂單控制表
         DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
         Me.收款事項_dgv.RowsDefaultCellStyle = DataGridViewCellStyle10
         Me.收款事項_dgv.RowTemplate.Height = 24
-        Me.收款事項_dgv.Size = New System.Drawing.Size(440, 118)
+        Me.收款事項_dgv.Size = New System.Drawing.Size(357, 118)
         Me.收款事項_dgv.TabIndex = 1282
         '
         'Label28
@@ -1048,27 +1085,82 @@ Partial Class 訂單控制表
         Me.Label12.TabIndex = 1306
         Me.Label12.Text = "客戶"
         '
-        '其他成本_tb
-        '
-        Me.其他成本_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.其他成本_tb.ForeColor = System.Drawing.Color.Green
-        Me.其他成本_tb.Location = New System.Drawing.Point(534, 700)
-        Me.其他成本_tb.Name = "其他成本_tb"
-        Me.其他成本_tb.Size = New System.Drawing.Size(81, 23)
-        Me.其他成本_tb.TabIndex = 1337
-        Me.其他成本_tb.Text = "0"
-        Me.其他成本_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
-        '
-        'Label45
-        '
-        Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label45.AutoSize = True
-        Me.Label45.ForeColor = System.Drawing.Color.Green
-        Me.Label45.Location = New System.Drawing.Point(452, 703)
-        Me.Label45.Name = "Label45"
-        Me.Label45.Size = New System.Drawing.Size(83, 16)
-        Me.Label45.TabIndex = 1336
-        Me.Label45.Text = "其   他   成   本"
+        '刷卡總和_tb
+        '
+        Me.刷卡總和_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.刷卡總和_tb.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.刷卡總和_tb.Location = New System.Drawing.Point(365, 673)
+        Me.刷卡總和_tb.Name = "刷卡總和_tb"
+        Me.刷卡總和_tb.Size = New System.Drawing.Size(81, 23)
+        Me.刷卡總和_tb.TabIndex = 1346
+        Me.刷卡總和_tb.Text = "0"
+        Me.刷卡總和_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        '刷卡稅金_tb
+        '
+        Me.刷卡稅金_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.刷卡稅金_tb.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.刷卡稅金_tb.Location = New System.Drawing.Point(365, 713)
+        Me.刷卡稅金_tb.Name = "刷卡稅金_tb"
+        Me.刷卡稅金_tb.Size = New System.Drawing.Size(81, 23)
+        Me.刷卡稅金_tb.TabIndex = 1348
+        Me.刷卡稅金_tb.Text = "0"
+        Me.刷卡稅金_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        'Label46
+        '
+        Me.Label46.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label46.AutoSize = True
+        Me.Label46.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.Label46.Location = New System.Drawing.Point(364, 697)
+        Me.Label46.Name = "Label46"
+        Me.Label46.Size = New System.Drawing.Size(83, 16)
+        Me.Label46.TabIndex = 1347
+        Me.Label46.Text = "刷   卡   稅   金"
+        '
+        'Label47
+        '
+        Me.Label47.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label47.AutoSize = True
+        Me.Label47.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.Label47.Location = New System.Drawing.Point(364, 658)
+        Me.Label47.Name = "Label47"
+        Me.Label47.Size = New System.Drawing.Size(83, 16)
+        Me.Label47.TabIndex = 1345
+        Me.Label47.Text = "刷   卡   總   和"
+        '
+        '刷卡傭金_tb
+        '
+        Me.刷卡傭金_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.刷卡傭金_tb.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.刷卡傭金_tb.Location = New System.Drawing.Point(366, 752)
+        Me.刷卡傭金_tb.Name = "刷卡傭金_tb"
+        Me.刷卡傭金_tb.Size = New System.Drawing.Size(81, 23)
+        Me.刷卡傭金_tb.TabIndex = 1344
+        Me.刷卡傭金_tb.Text = "0"
+        Me.刷卡傭金_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        'Label48
+        '
+        Me.Label48.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label48.AutoSize = True
+        Me.Label48.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.Label48.Location = New System.Drawing.Point(364, 737)
+        Me.Label48.Name = "Label48"
+        Me.Label48.Size = New System.Drawing.Size(83, 16)
+        Me.Label48.TabIndex = 1343
+        Me.Label48.Text = "刷   卡   傭   金"
+        '
+        '通知_lb
+        '
+        Me.通知_lb.AutoSize = True
+        Me.通知_lb.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.通知_lb.ForeColor = System.Drawing.Color.Red
+        Me.通知_lb.Location = New System.Drawing.Point(120, 7)
+        Me.通知_lb.Name = "通知_lb"
+        Me.通知_lb.Size = New System.Drawing.Size(127, 15)
+        Me.通知_lb.TabIndex = 1349
+        Me.通知_lb.Text = "........................................"
         '
         '訂單控制表
         '
@@ -1213,4 +1305,11 @@ Partial Class 訂單控制表
     Friend WithEvents Label12 As Label
     Friend WithEvents 其他成本_tb As TextBox
     Friend WithEvents Label45 As Label
+    Friend WithEvents 刷卡總和_tb As TextBox
+    Friend WithEvents 刷卡稅金_tb As TextBox
+    Friend WithEvents Label46 As Label
+    Friend WithEvents Label47 As Label
+    Friend WithEvents 刷卡傭金_tb As TextBox
+    Friend WithEvents Label48 As Label
+    Friend WithEvents 通知_lb As Label
 End Class

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

@@ -55,7 +55,7 @@ Public Class 訂單控制表
         銷售明細_dgv.Columns(13).ReadOnly = True
 
         銷售明細_dgv.Columns("數量").DefaultCellStyle.Format = "#,##0" : 銷售明細_dgv.Columns("成本").DefaultCellStyle.Format = "#,##0"
-        銷售明細_dgv.Columns("單價").DefaultCellStyle.Format = "#,##0" : 銷售明細_dgv.Columns("售價").DefaultCellStyle.Format = "#,##0"
+        銷售明細_dgv.Columns("單價").DefaultCellStyle.Format = "#,##0.0" : 銷售明細_dgv.Columns("售價").DefaultCellStyle.Format = "#,##0"
         銷售明細_dgv.Columns("數量").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
         銷售明細_dgv.Columns("數量").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
         銷售明細_dgv.Columns("成本").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
@@ -150,15 +150,23 @@ Public Class 訂單控制表
         DTP = Format(開單日期_dtp.Value, "yyyy/MM/dd") : DTP1 = Format(Today(), "yyyyMMdd")
     End Sub
     Private Sub Set_合記計算()
-        Dim 不含1類銷售小記 As Integer
+        Dim 不含1類銷售小記 As Integer : Dim 金額1 As Integer = 0
         售價小計_tb.Text = "0" : 稅金_tb.Text = "0" : 銷售合計_tb.Text = "0" : 收入小計_tb.Text = "0" : 支出小計_tb.Text = "0" : 額外收支_tb.Text = "0" : 物料成本_tb.Text = "0"
-        司機運費_tb.Text = "0" : 管銷費用_tb.Text = "0" : 其他成本_tb.Text = "0"
+        司機運費_tb.Text = "0" : 管銷費用_tb.Text = "0" : 其他成本_tb.Text = "0" : 刷卡總和_tb.Text = "0" : 刷卡稅金_tb.Text = "0" : 刷卡傭金_tb.Text = "0"
+        '-------001-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+        For i As Integer = 0 To 收款事項_dgv.Rows.Count - 1
+            If 收款事項_dgv("真項次", i).Value.ToString = "0" And 收款事項_dgv("內容", i).Value.ToString <> "未收餘額" Then
+                刷卡總和_tb.Text = Val(刷卡總和_tb.Text) + 收款事項_dgv("金額", i).Value
+            End If
+        Next
+        刷卡稅金_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 * 銷售明細_dgv("單價", i).Value)
 
             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 * 銷售明細_dgv("單價", i).Value)
+                不含1類銷售小記 = 不含1類銷售小記 + 銷售明細_dgv("售價", i).Value
             End If
             If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) = 1 Then
                 其他成本_tb.Text = Val(其他成本_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value)
@@ -171,21 +179,33 @@ Public Class 訂單控制表
         管銷費用_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)
+        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
+        '-------003-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         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
         Next
         額外收支_tb.Text = Val(收入小計_tb.Text) - Val(支出小計_tb.Text)
-
+        '-------004-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         Dim 金額 As Integer = 0
         For i As Integer = 0 To 收款事項_dgv.Rows.Count - 1
-            If 收款事項_dgv("真項次", i).Value.ToString <> "0" Then
+            If 收款事項_dgv("真項次", i).Value.ToString <> "0" And 收款事項_dgv("內容", i).Value.ToString <> "未收餘額" Then
                 金額 = 金額 + 收款事項_dgv("金額", i).Value
-            ElseIf 收款事項_dgv("真項次", i).Value.ToString = "0" Then
+            ElseIf 收款事項_dgv("真項次", i).Value.ToString = "0" And 收款事項_dgv("內容", i).Value.ToString <> "未收餘額" Then
+                金額 = 金額 + 收款事項_dgv("金額", i).Value
+            ElseIf 收款事項_dgv("真項次", i).Value.ToString = "0" And 收款事項_dgv("內容", i).Value.ToString = "未收餘額" Then
                 收款事項_dgv("金額", i).Value = CInt(Val(銷售合計_tb.Text)) - 金額
             End If
         Next
-
+        '-------005-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         If 送貨地點_cb.Text = "" Or 送貨地點_cb.Text = "自取" Or 最低運費_cb.Text = "" Or 最低售價_cb.Text = "" Then
             司機運費_tb.Text = "0"
         Else
@@ -193,19 +213,20 @@ Public Class 訂單控制表
                 If (不含1類銷售小記 - Val(其他成本_tb.Text)) <= Val(最低售價_cb.Text) Then
                     司機運費_tb.Text = 最低運費_cb.Text
                 ElseIf (不含1類銷售小記 - Val(其他成本_tb.Text)) > Val(最低售價_cb.Text) Then
-                    司機運費_tb.Text = (不含1類銷售小記 - Val(其他成本_tb.Text)) / 100 * 3
+                    司機運費_tb.Text = (不含1類銷售小記 - Val(稅金_tb.Text) - Val(刷卡傭金_tb.Text) - Val(其他成本_tb.Text)) / 100 * 3
                 End If
             Else
                 司機運費_tb.Text = 運費
             End If
         End If
-
-        預估利潤_tb.Text = Val(售價小計_tb.Text) + Val(額外收支_tb.Text) - Val(其他成本_tb.Text) - Val(物料成本_tb.Text) - Val(司機運費_tb.Text) - Val(管銷費用_tb.Text)
-
+        '-------006-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+        預估利潤_tb.Text = Val(售價小計_tb.Text) + Val(額外收支_tb.Text) - Val(其他成本_tb.Text) - Val(物料成本_tb.Text) - Val(司機運費_tb.Text) - Val(管銷費用_tb.Text) - Val(刷卡傭金_tb.Text)
+        '-------007-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         售價小計_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") : 預估利潤_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 訂單控制表_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.MdiParent = YD_ERP_SYS : Me.WindowState = 2 : Me.AutoScroll = True

YD-ERP-SYS/業務系統管理/銷售分析表.Designer.vb

@@ -32,6 +32,8 @@ Partial Class 銷售分析表
         Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.中間日期_dtp = New System.Windows.Forms.DateTimePicker()
         Me.一般月_ch = New System.Windows.Forms.CheckBox()
         Me.會計月_ch = New System.Windows.Forms.CheckBox()
@@ -73,11 +75,13 @@ Partial Class 銷售分析表
         Me.Label30 = New System.Windows.Forms.Label()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.Label2 = New System.Windows.Forms.Label()
+        Me.稅金_dgv = New System.Windows.Forms.DataGridView()
         CType(Me.銷售明細_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.銷售它項_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.銷售備註_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.運費_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.廠商彙總_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.稅金_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         '中間日期_dtp
@@ -253,7 +257,7 @@ Partial Class 銷售分析表
         DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
         Me.銷售備註_dgv.RowsDefaultCellStyle = DataGridViewCellStyle6
         Me.銷售備註_dgv.RowTemplate.Height = 24
-        Me.銷售備註_dgv.Size = New System.Drawing.Size(621, 165)
+        Me.銷售備註_dgv.Size = New System.Drawing.Size(329, 165)
         Me.銷售備註_dgv.TabIndex = 1262
         '
         '運費_dgv
@@ -532,11 +536,29 @@ Partial Class 銷售分析表
         Me.Label2.TabIndex = 1333
         Me.Label2.Text = "依業務與日期為主要查詢條件生成報表"
         '
+        '稅金_dgv
+        '
+        DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.稅金_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
+        Me.稅金_dgv.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.稅金_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.稅金_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.稅金_dgv.Location = New System.Drawing.Point(339, 508)
+        Me.稅金_dgv.Name = "稅金_dgv"
+        Me.稅金_dgv.RowHeadersWidth = 5
+        DataGridViewCellStyle12.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.稅金_dgv.RowsDefaultCellStyle = DataGridViewCellStyle12
+        Me.稅金_dgv.RowTemplate.Height = 24
+        Me.稅金_dgv.Size = New System.Drawing.Size(287, 165)
+        Me.稅金_dgv.TabIndex = 1334
+        '
         '銷售分析表
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1344, 681)
+        Me.Controls.Add(Me.稅金_dgv)
         Me.Controls.Add(Me.Label2)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.其他成本_tb)
@@ -587,6 +609,7 @@ Partial Class 銷售分析表
         CType(Me.銷售備註_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.運費_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.廠商彙總_dgv, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.稅金_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -633,4 +656,5 @@ Partial Class 銷售分析表
     Friend WithEvents Label30 As Label
     Friend WithEvents Label1 As Label
     Friend WithEvents Label2 As Label
+    Friend WithEvents 稅金_dgv As DataGridView
 End Class

YD-ERP-SYS/業務系統管理/銷售分析表.vb

@@ -1,6 +1,6 @@
 Option Strict Off
 Public Class 銷售分析表
-    ReadOnly ds1 As New DataSet : ReadOnly ds2 As New DataSet : ReadOnly ds3 As New DataSet : ReadOnly ds4 As New DataSet : ReadOnly ds5 As New DataSet
+    ReadOnly ds1 As New DataSet : ReadOnly ds2 As New DataSet : ReadOnly ds3 As New DataSet : ReadOnly ds4 As New DataSet : ReadOnly ds5 As New DataSet : ReadOnly ds6 As New DataSet
     Dim 首次開啟 As Boolean = False : Dim 比例 As Integer
     Private Sub Set_清單1()
         廠商彙總_dgv.DataSource = Nothing : ds1.Clear()
@@ -129,7 +129,7 @@ Public Class 銷售分析表
         For I As Integer = 0 To 14 : 銷售明細_dgv.Columns(I).ReadOnly = True : Next
 
         銷售明細_dgv.Columns("數量").DefaultCellStyle.Format = "#,##0" : 銷售明細_dgv.Columns("成本").DefaultCellStyle.Format = "#,##0"
-        銷售明細_dgv.Columns("單價").DefaultCellStyle.Format = "#,##0" : 銷售明細_dgv.Columns("售價").DefaultCellStyle.Format = "#,##0"
+        銷售明細_dgv.Columns("單價").DefaultCellStyle.Format = "#,##0.0" : 銷售明細_dgv.Columns("售價").DefaultCellStyle.Format = "#,##0"
         銷售明細_dgv.Columns("數量").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
         銷售明細_dgv.Columns("數量").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
         銷售明細_dgv.Columns("成本").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
@@ -173,7 +173,7 @@ Public Class 銷售分析表
         SQL_銷售分析表_銷售備註()
         da.Fill(ds5) : 銷售備註_dgv.DataSource = ds5.Tables(0) : conn.Close()
 
-        銷售備註_dgv.Columns(0).FillWeight = 80 : 銷售備註_dgv.Columns(1).FillWeight = 120 : 銷售備註_dgv.Columns(2).FillWeight = 910
+        銷售備註_dgv.Columns(0).FillWeight = 80 : 銷售備註_dgv.Columns(1).FillWeight = 120 : 銷售備註_dgv.Columns(2).FillWeight = 510
         銷售備註_dgv.Columns(3).FillWeight = 120
 
         For I As Integer = 0 To 3 : 銷售備註_dgv.Columns(I).ReadOnly = True : Next
@@ -192,6 +192,33 @@ Public Class 銷售分析表
             銷售備註_dgv("項次", i).Value = i + 1
         Next
     End Sub
+    Private Sub Set_清單6()
+        稅金_dgv.DataSource = Nothing : ds6.Clear()
+        稅金_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        稅金_dgv.ColumnHeadersHeight = 25
+        稅金_dgv.AllowUserToAddRows = False
+        稅金_dgv.RowTemplate.Height = 26
+
+        PA19 = 業務_cb.Text
+        SQL_銷售分析表_稅金()
+        da.Fill(ds6) : 稅金_dgv.DataSource = ds6.Tables(0) : conn.Close()
+
+        稅金_dgv.Columns(0).FillWeight = 80 : 稅金_dgv.Columns(1).FillWeight = 120 : 稅金_dgv.Columns(2).FillWeight = 100
+
+        For I As Integer = 0 To 2 : 稅金_dgv.Columns(I).ReadOnly = True : Next
+
+        稅金_dgv.Columns("稅金").DefaultCellStyle.Format = "#,##0"
+        稅金_dgv.Columns("稅金").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+        稅金_dgv.Columns("稅金").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+        稅金_dgv.Columns("項次").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+        稅金_dgv.Columns("項次").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+        稅金_dgv.Columns("單號").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+        稅金_dgv.Columns("單號").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+
+        For i As Integer = 0 To 稅金_dgv.Rows.Count - 1
+            稅金_dgv("項次", i).Value = i + 1
+        Next
+    End Sub
     Private Sub Set_合記計算()
         售價小計_tb.Text = "0" : 稅金_tb.Text = "0" : 銷售合計_tb.Text = "0" : 收入小計_tb.Text = "0" : 支出小計_tb.Text = "0" : 額外收支_tb.Text = "0" : 物料成本_tb.Text = "0"
         司機運費_tb.Text = "0" : 管銷費用_tb.Text = "0" : 其他成本_tb.Text = "0"
@@ -205,10 +232,9 @@ Public Class 銷售分析表
             If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) = 1 Then
                 其他成本_tb.Text = Val(其他成本_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value)
             End If
-
-            If 銷售明細_dgv("含稅", i).Value = True Then
-                稅金_tb.Text = Val(稅金_tb.Text) + ((銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value * 1.05) - (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value))
-            End If
+        Next
+        For i As Integer = 0 To 稅金_dgv.Rows.Count - 1
+            稅金_tb.Text = Val(稅金_tb.Text) + 稅金_dgv("稅金", i).Value
         Next
 
         管銷費用_tb.Text = Val(物料成本_tb.Text) * 1.06 - Val(物料成本_tb.Text)
@@ -301,7 +327,7 @@ Public Class 銷售分析表
     End Sub
     Private Sub 銷售分析表_SizeChanged(sender As Object, e As EventArgs) Handles MyBase.SizeChanged
         If 首次開啟 = True Then
-            Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4() : Set_清單5() : Set_合記計算()
+            Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4() : Set_清單5() : Set_清單6() : Set_合記計算()
         End If
     End Sub
     Private Sub 日期格式()
@@ -352,13 +378,13 @@ Public Class 銷售分析表
         會計月_ch.Checked = False : 一般月_ch.Checked = True : 日期格式()
     End Sub
     Private Sub 開始日期_dtp_ValueChanged(sender As Object, e As EventArgs) Handles 開始日期_dtp.ValueChanged
-        Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4() : Set_清單5() : Set_合記計算()
+        Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4() : Set_清單5() : Set_清單6() : Set_合記計算()
     End Sub
     Private Sub 結束日期_dtp_ValueChanged(sender As Object, e As EventArgs) Handles 結束日期_dtp.ValueChanged
-        Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4() : Set_清單5() : Set_合記計算()
+        Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4() : Set_清單5() : Set_清單6() : Set_合記計算()
     End Sub
     Private Sub 業務_cb_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 業務_cb.SelectedIndexChanged
-        Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4() : Set_清單5() : Set_合記計算()
+        Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4() : Set_清單5() : Set_清單6() : Set_合記計算()
     End Sub
     Private Sub 銷售明細_dgv_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 銷售明細_dgv.RowPostPaint
         Dim linePen As New Pen(Color.Blue, 2)
@@ -371,9 +397,9 @@ Public Class 銷售分析表
         End If
     End Sub
     Private Sub 依開單日期_ch_CheckedChanged(sender As Object, e As EventArgs) Handles 依開單日期_ch.Click
-        依開單日期_ch.Checked = True : 依交貨日期_ch.Checked = False : Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4() : Set_清單5() : Set_合記計算()
+        依開單日期_ch.Checked = True : 依交貨日期_ch.Checked = False : Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4() : Set_清單5() : Set_清單6() : Set_合記計算()
     End Sub
     Private Sub 依交貨日期_ch_CheckedChanged(sender As Object, e As EventArgs) Handles 依交貨日期_ch.Click
-        依開單日期_ch.Checked = False : 依交貨日期_ch.Checked = True : Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4() : Set_清單5() : Set_合記計算()
+        依開單日期_ch.Checked = False : 依交貨日期_ch.Checked = True : Set_清單1() : Set_清單2() : Set_清單3() : Set_清單4() : Set_清單5() : Set_清單6() : Set_合記計算()
     End Sub
 End Class

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

@@ -105,6 +105,8 @@ Partial Class 銷售單審核
         Me.單據核准_bt = New System.Windows.Forms.Button()
         Me.單據作廢_bt = New System.Windows.Forms.Button()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.其他成本_tb = New System.Windows.Forms.TextBox()
+        Me.Label45 = New System.Windows.Forms.Label()
         Me.Reset_bt = New System.Windows.Forms.Button()
         Me.讀取標準成本_bt = New System.Windows.Forms.Button()
         Me.物料成本_tb = New System.Windows.Forms.TextBox()
@@ -170,8 +172,14 @@ Partial Class 銷售單審核
         Me.物料圖1_pb = New System.Windows.Forms.PictureBox()
         Me.最低售價_cb = New System.Windows.Forms.ComboBox()
         Me.最低運費_cb = New System.Windows.Forms.ComboBox()
-        Me.其他成本_tb = New System.Windows.Forms.TextBox()
-        Me.Label45 = New System.Windows.Forms.Label()
+        Me.刷卡收款_bt = New System.Windows.Forms.Button()
+        Me.刷卡總和_tb = New System.Windows.Forms.TextBox()
+        Me.刷卡稅金_tb = New System.Windows.Forms.TextBox()
+        Me.Label46 = New System.Windows.Forms.Label()
+        Me.Label47 = New System.Windows.Forms.Label()
+        Me.刷卡傭金_tb = New System.Windows.Forms.TextBox()
+        Me.Label48 = New System.Windows.Forms.Label()
+        Me.通知_lb = New System.Windows.Forms.Label()
         CType(Me.售價_nud, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.區域庫存_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.成本_nud, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -634,7 +642,7 @@ Partial Class 銷售單審核
         '
         Me.刪除單據上點選的資料_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.刪除單據上點選的資料_bt.ForeColor = System.Drawing.Color.Red
-        Me.刪除單據上點選的資料_bt.Location = New System.Drawing.Point(279, 3)
+        Me.刪除單據上點選的資料_bt.Location = New System.Drawing.Point(202, 3)
         Me.刪除單據上點選的資料_bt.Name = "刪除單據上點選的資料_bt"
         Me.刪除單據上點選的資料_bt.Size = New System.Drawing.Size(163, 23)
         Me.刪除單據上點選的資料_bt.TabIndex = 1281
@@ -890,6 +898,14 @@ Partial Class 銷售單審核
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Panel1.AutoScroll = True
         Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
+        Me.Panel1.Controls.Add(Me.通知_lb)
+        Me.Panel1.Controls.Add(Me.刷卡總和_tb)
+        Me.Panel1.Controls.Add(Me.刷卡稅金_tb)
+        Me.Panel1.Controls.Add(Me.Label46)
+        Me.Panel1.Controls.Add(Me.Label47)
+        Me.Panel1.Controls.Add(Me.刷卡傭金_tb)
+        Me.Panel1.Controls.Add(Me.Label48)
+        Me.Panel1.Controls.Add(Me.刷卡收款_bt)
         Me.Panel1.Controls.Add(Me.其他成本_tb)
         Me.Panel1.Controls.Add(Me.Label45)
         Me.Panel1.Controls.Add(Me.Reset_bt)
@@ -951,6 +967,28 @@ Partial Class 銷售單審核
         Me.Panel1.Size = New System.Drawing.Size(731, 502)
         Me.Panel1.TabIndex = 1331
         '
+        '其他成本_tb
+        '
+        Me.其他成本_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.其他成本_tb.ForeColor = System.Drawing.Color.Green
+        Me.其他成本_tb.Location = New System.Drawing.Point(622, 702)
+        Me.其他成本_tb.Name = "其他成本_tb"
+        Me.其他成本_tb.Size = New System.Drawing.Size(81, 23)
+        Me.其他成本_tb.TabIndex = 1335
+        Me.其他成本_tb.Text = "0"
+        Me.其他成本_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        'Label45
+        '
+        Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label45.AutoSize = True
+        Me.Label45.ForeColor = System.Drawing.Color.Green
+        Me.Label45.Location = New System.Drawing.Point(540, 705)
+        Me.Label45.Name = "Label45"
+        Me.Label45.Size = New System.Drawing.Size(83, 16)
+        Me.Label45.TabIndex = 1334
+        Me.Label45.Text = "其   他   成   本"
+        '
         'Reset_bt
         '
         Me.Reset_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -967,9 +1005,9 @@ Partial Class 銷售單審核
         '
         Me.讀取標準成本_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.讀取標準成本_bt.ForeColor = System.Drawing.Color.Green
-        Me.讀取標準成本_bt.Location = New System.Drawing.Point(496, 3)
+        Me.讀取標準成本_bt.Location = New System.Drawing.Point(106, 3)
         Me.讀取標準成本_bt.Name = "讀取標準成本_bt"
-        Me.讀取標準成本_bt.Size = New System.Drawing.Size(163, 23)
+        Me.讀取標準成本_bt.Size = New System.Drawing.Size(95, 23)
         Me.讀取標準成本_bt.TabIndex = 1332
         Me.讀取標準成本_bt.Text = "讀取標準成本"
         Me.讀取標準成本_bt.UseVisualStyleBackColor = True
@@ -1097,16 +1135,17 @@ Partial Class 銷售單審核
         '
         Me.項次3_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.項次3_tb.Enabled = False
-        Me.項次3_tb.Location = New System.Drawing.Point(486, 631)
+        Me.項次3_tb.Location = New System.Drawing.Point(202, 331)
         Me.項次3_tb.Name = "項次3_tb"
         Me.項次3_tb.Size = New System.Drawing.Size(32, 23)
         Me.項次3_tb.TabIndex = 1290
+        Me.項次3_tb.Visible = False
         '
         '刪除收款事項上點選的資料_bt
         '
         Me.刪除收款事項上點選的資料_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.刪除收款事項上點選的資料_bt.ForeColor = System.Drawing.Color.Red
-        Me.刪除收款事項上點選的資料_bt.Location = New System.Drawing.Point(279, 632)
+        Me.刪除收款事項上點選的資料_bt.Location = New System.Drawing.Point(269, 632)
         Me.刪除收款事項上點選的資料_bt.Name = "刪除收款事項上點選的資料_bt"
         Me.刪除收款事項上點選的資料_bt.Size = New System.Drawing.Size(163, 23)
         Me.刪除收款事項上點選的資料_bt.TabIndex = 1287
@@ -1117,7 +1156,7 @@ Partial Class 銷售單審核
         '
         Me.新增一筆收款事項_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.新增一筆收款事項_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.新增一筆收款事項_bt.Location = New System.Drawing.Point(110, 632)
+        Me.新增一筆收款事項_bt.Location = New System.Drawing.Point(105, 632)
         Me.新增一筆收款事項_bt.Name = "新增一筆收款事項_bt"
         Me.新增一筆收款事項_bt.Size = New System.Drawing.Size(163, 23)
         Me.新增一筆收款事項_bt.TabIndex = 1286
@@ -1277,7 +1316,7 @@ Partial Class 銷售單審核
         '
         Me.刪除備註_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.刪除備註_bt.ForeColor = System.Drawing.Color.Red
-        Me.刪除備註_bt.Location = New System.Drawing.Point(279, 440)
+        Me.刪除備註_bt.Location = New System.Drawing.Point(268, 440)
         Me.刪除備註_bt.Name = "刪除備註_bt"
         Me.刪除備註_bt.Size = New System.Drawing.Size(163, 23)
         Me.刪除備註_bt.TabIndex = 1256
@@ -1288,7 +1327,7 @@ Partial Class 銷售單審核
         '
         Me.銷售備註_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.銷售備註_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.銷售備註_bt.Location = New System.Drawing.Point(110, 440)
+        Me.銷售備註_bt.Location = New System.Drawing.Point(105, 440)
         Me.銷售備註_bt.Name = "銷售備註_bt"
         Me.銷售備註_bt.Size = New System.Drawing.Size(163, 23)
         Me.銷售備註_bt.TabIndex = 1261
@@ -1363,7 +1402,7 @@ Partial Class 銷售單審核
         Me.客戶資料_dgv.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.客戶資料_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.客戶資料_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.客戶資料_dgv.Location = New System.Drawing.Point(17, 7445)
+        Me.客戶資料_dgv.Location = New System.Drawing.Point(17, 7722)
         Me.客戶資料_dgv.Name = "客戶資料_dgv"
         Me.客戶資料_dgv.RowHeadersWidth = 5
         DataGridViewCellStyle8.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
@@ -1507,7 +1546,7 @@ Partial Class 銷售單審核
         DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
         Me.收款事項_dgv.RowsDefaultCellStyle = DataGridViewCellStyle14
         Me.收款事項_dgv.RowTemplate.Height = 24
-        Me.收款事項_dgv.Size = New System.Drawing.Size(532, 118)
+        Me.收款事項_dgv.Size = New System.Drawing.Size(445, 118)
         Me.收款事項_dgv.TabIndex = 1282
         '
         'Label28
@@ -1663,27 +1702,93 @@ Partial Class 銷售單審核
         Me.最低運費_cb.TabIndex = 1302
         Me.最低運費_cb.Visible = False
         '
-        '其他成本_tb
-        '
-        Me.其他成本_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.其他成本_tb.ForeColor = System.Drawing.Color.Green
-        Me.其他成本_tb.Location = New System.Drawing.Point(622, 702)
-        Me.其他成本_tb.Name = "其他成本_tb"
-        Me.其他成本_tb.Size = New System.Drawing.Size(81, 23)
-        Me.其他成本_tb.TabIndex = 1335
-        Me.其他成本_tb.Text = "0"
-        Me.其他成本_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
-        '
-        'Label45
-        '
-        Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label45.AutoSize = True
-        Me.Label45.ForeColor = System.Drawing.Color.Green
-        Me.Label45.Location = New System.Drawing.Point(540, 705)
-        Me.Label45.Name = "Label45"
-        Me.Label45.Size = New System.Drawing.Size(83, 16)
-        Me.Label45.TabIndex = 1334
-        Me.Label45.Text = "其   他   成   本"
+        '刷卡收款_bt
+        '
+        Me.刷卡收款_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.刷卡收款_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.刷卡收款_bt.Location = New System.Drawing.Point(433, 632)
+        Me.刷卡收款_bt.Name = "刷卡收款_bt"
+        Me.刷卡收款_bt.Size = New System.Drawing.Size(92, 23)
+        Me.刷卡收款_bt.TabIndex = 1336
+        Me.刷卡收款_bt.Text = "新增刷卡收款"
+        Me.刷卡收款_bt.UseVisualStyleBackColor = True
+        '
+        '刷卡總和_tb
+        '
+        Me.刷卡總和_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.刷卡總和_tb.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.刷卡總和_tb.Location = New System.Drawing.Point(453, 673)
+        Me.刷卡總和_tb.Name = "刷卡總和_tb"
+        Me.刷卡總和_tb.Size = New System.Drawing.Size(81, 23)
+        Me.刷卡總和_tb.TabIndex = 1340
+        Me.刷卡總和_tb.Text = "0"
+        Me.刷卡總和_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        '刷卡稅金_tb
+        '
+        Me.刷卡稅金_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.刷卡稅金_tb.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.刷卡稅金_tb.Location = New System.Drawing.Point(453, 713)
+        Me.刷卡稅金_tb.Name = "刷卡稅金_tb"
+        Me.刷卡稅金_tb.Size = New System.Drawing.Size(81, 23)
+        Me.刷卡稅金_tb.TabIndex = 1342
+        Me.刷卡稅金_tb.Text = "0"
+        Me.刷卡稅金_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        'Label46
+        '
+        Me.Label46.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label46.AutoSize = True
+        Me.Label46.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.Label46.Location = New System.Drawing.Point(452, 697)
+        Me.Label46.Name = "Label46"
+        Me.Label46.Size = New System.Drawing.Size(83, 16)
+        Me.Label46.TabIndex = 1341
+        Me.Label46.Text = "刷   卡   稅   金"
+        '
+        'Label47
+        '
+        Me.Label47.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label47.AutoSize = True
+        Me.Label47.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.Label47.Location = New System.Drawing.Point(452, 658)
+        Me.Label47.Name = "Label47"
+        Me.Label47.Size = New System.Drawing.Size(83, 16)
+        Me.Label47.TabIndex = 1339
+        Me.Label47.Text = "刷   卡   總   和"
+        '
+        '刷卡傭金_tb
+        '
+        Me.刷卡傭金_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.刷卡傭金_tb.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.刷卡傭金_tb.Location = New System.Drawing.Point(454, 752)
+        Me.刷卡傭金_tb.Name = "刷卡傭金_tb"
+        Me.刷卡傭金_tb.Size = New System.Drawing.Size(81, 23)
+        Me.刷卡傭金_tb.TabIndex = 1338
+        Me.刷卡傭金_tb.Text = "0"
+        Me.刷卡傭金_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        'Label48
+        '
+        Me.Label48.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label48.AutoSize = True
+        Me.Label48.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.Label48.Location = New System.Drawing.Point(452, 737)
+        Me.Label48.Name = "Label48"
+        Me.Label48.Size = New System.Drawing.Size(83, 16)
+        Me.Label48.TabIndex = 1337
+        Me.Label48.Text = "刷   卡   傭   金"
+        '
+        '通知_lb
+        '
+        Me.通知_lb.AutoSize = True
+        Me.通知_lb.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.通知_lb.ForeColor = System.Drawing.Color.Red
+        Me.通知_lb.Location = New System.Drawing.Point(368, 7)
+        Me.通知_lb.Name = "通知_lb"
+        Me.通知_lb.Size = New System.Drawing.Size(127, 15)
+        Me.通知_lb.TabIndex = 1343
+        Me.通知_lb.Text = "........................................"
         '
         '銷售單審核
         '
@@ -1929,4 +2034,12 @@ Partial Class 銷售單審核
     Friend WithEvents Reset_bt As Button
     Friend WithEvents 其他成本_tb As TextBox
     Friend WithEvents Label45 As Label
+    Friend WithEvents 刷卡收款_bt As Button
+    Friend WithEvents 刷卡總和_tb As TextBox
+    Friend WithEvents 刷卡稅金_tb As TextBox
+    Friend WithEvents Label46 As Label
+    Friend WithEvents Label47 As Label
+    Friend WithEvents 刷卡傭金_tb As TextBox
+    Friend WithEvents Label48 As Label
+    Friend WithEvents 通知_lb As Label
 End Class

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

@@ -3,7 +3,7 @@ Public Class 銷售單審核
     ReadOnly ds As New DataSet : ReadOnly ds1 As New DataSet : ReadOnly ds2 As New DataSet : ReadOnly ds3 As New DataSet : ReadOnly ds4 As New DataSet
     ReadOnly ds5 As New DataSet : ReadOnly ds6 As New DataSet
     Dim 首次開啟 As Boolean = False : Dim EDR As Integer = 0 : Dim ESTR As String : Dim EDR1 As Integer = 0 : Dim ESTR1 As String : Dim NUM1 As Integer
-    Dim 運費 As Integer
+    Dim 運費 As Integer : Dim 刷卡控制 As Boolean = False
     Private Sub Set_清單()
         物料清單_dgv.DataSource = Nothing : ds.Clear()
         物料清單_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -121,10 +121,10 @@ Public Class 銷售單審核
         銷售明細_dgv.Columns(20).Visible = False
 
         銷售明細_dgv.Columns(1).ReadOnly = True : 銷售明細_dgv.Columns(2).ReadOnly = True : 銷售明細_dgv.Columns(3).ReadOnly = True : 銷售明細_dgv.Columns(4).ReadOnly = True
-        銷售明細_dgv.Columns(11).ReadOnly = True : 銷售明細_dgv.Columns(15).ReadOnly = True : 銷售明細_dgv.Columns(16).ReadOnly = True
+        銷售明細_dgv.Columns(11).ReadOnly = True : 銷售明細_dgv.Columns(13).ReadOnly = True : 銷售明細_dgv.Columns(16).ReadOnly = True
 
         銷售明細_dgv.Columns("數量").DefaultCellStyle.Format = "#,##0" : 銷售明細_dgv.Columns("成本").DefaultCellStyle.Format = "#,##0"
-        銷售明細_dgv.Columns("單價").DefaultCellStyle.Format = "#,##0" : 銷售明細_dgv.Columns("售價").DefaultCellStyle.Format = "#,##0"
+        銷售明細_dgv.Columns("單價").DefaultCellStyle.Format = "#,##0.0" : 銷售明細_dgv.Columns("售價").DefaultCellStyle.Format = "#,##0"
         銷售明細_dgv.Columns("數量").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
         銷售明細_dgv.Columns("數量").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
         銷售明細_dgv.Columns("成本").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
@@ -272,15 +272,23 @@ Public Class 銷售單審核
         DTP = Format(Today(), "yyyy/MM/dd") : DTP1 = Format(Today(), "yyyyMMdd")
     End Sub
     Private Sub Set_合記計算()
-        Dim 不含1類銷售小記 As Integer
+        Dim 不含1類銷售小記 As Integer : Dim 金額1 As Integer = 0
         售價小計_tb.Text = "0" : 稅金_tb.Text = "0" : 銷售合計_tb.Text = "0" : 收入小計_tb.Text = "0" : 支出小計_tb.Text = "0" : 額外收支_tb.Text = "0" : 物料成本_tb.Text = "0"
-        司機運費_tb.Text = "0" : 管銷費用_tb.Text = "0" : 其他成本_tb.Text = "0"
+        司機運費_tb.Text = "0" : 管銷費用_tb.Text = "0" : 其他成本_tb.Text = "0" : 刷卡總和_tb.Text = "0" : 刷卡稅金_tb.Text = "0" : 刷卡傭金_tb.Text = "0"
+        '-------001-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+        For i As Integer = 0 To 收款事項_dgv.Rows.Count - 1
+            If 收款事項_dgv("真項次", i).Value.ToString = "0" And 收款事項_dgv("內容", i).Value.ToString <> "未收餘額" Then
+                刷卡總和_tb.Text = Val(刷卡總和_tb.Text) + 收款事項_dgv("金額", i).Value
+            End If
+        Next
+        刷卡稅金_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 * 銷售明細_dgv("單價", i).Value)
 
             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 * 銷售明細_dgv("單價", i).Value)
+                不含1類銷售小記 = 不含1類銷售小記 + 銷售明細_dgv("售價", i).Value
             End If
             If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) = 1 Then
                 其他成本_tb.Text = Val(其他成本_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value)
@@ -293,21 +301,33 @@ Public Class 銷售單審核
         管銷費用_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)
+        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
+        '-------003-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         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
         Next
         額外收支_tb.Text = Val(收入小計_tb.Text) - Val(支出小計_tb.Text)
-
+        '-------004-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         Dim 金額 As Integer = 0
         For i As Integer = 0 To 收款事項_dgv.Rows.Count - 1
-            If 收款事項_dgv("真項次", i).Value.ToString <> "0" Then
+            If 收款事項_dgv("真項次", i).Value.ToString <> "0" And 收款事項_dgv("內容", i).Value.ToString <> "未收餘額" Then
                 金額 = 金額 + 收款事項_dgv("金額", i).Value
-            ElseIf 收款事項_dgv("真項次", i).Value.ToString = "0" Then
+            ElseIf 收款事項_dgv("真項次", i).Value.ToString = "0" And 收款事項_dgv("內容", i).Value.ToString <> "未收餘額" Then
+                金額 = 金額 + 收款事項_dgv("金額", i).Value
+            ElseIf 收款事項_dgv("真項次", i).Value.ToString = "0" And 收款事項_dgv("內容", i).Value.ToString = "未收餘額" Then
                 收款事項_dgv("金額", i).Value = CInt(Val(銷售合計_tb.Text)) - 金額
             End If
         Next
-
+        '-------005-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         If 送貨地點_cb.Text = "" Or 送貨地點_cb.Text = "自取" Or 最低運費_cb.Text = "" Or 最低售價_cb.Text = "" Then
             司機運費_tb.Text = "0"
         Else
@@ -315,20 +335,22 @@ Public Class 銷售單審核
                 If (不含1類銷售小記 - Val(其他成本_tb.Text)) <= Val(最低售價_cb.Text) Then
                     司機運費_tb.Text = 最低運費_cb.Text
                 ElseIf (不含1類銷售小記 - Val(其他成本_tb.Text)) > Val(最低售價_cb.Text) Then
-                    司機運費_tb.Text = (不含1類銷售小記 - Val(其他成本_tb.Text)) / 100 * 3
+                    司機運費_tb.Text = (不含1類銷售小記 - Val(稅金_tb.Text) - Val(刷卡傭金_tb.Text) - Val(其他成本_tb.Text)) / 100 * 3
                 End If
             Else
                 司機運費_tb.Text = 運費
             End If
         End If
-
-        預估利潤_tb.Text = Val(售價小計_tb.Text) + Val(額外收支_tb.Text) - Val(其他成本_tb.Text) - Val(物料成本_tb.Text) - Val(司機運費_tb.Text) - Val(管銷費用_tb.Text)
-
+        '-------006-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+        預估利潤_tb.Text = Val(售價小計_tb.Text) + Val(額外收支_tb.Text) - Val(其他成本_tb.Text) - Val(物料成本_tb.Text) - Val(司機運費_tb.Text) - Val(管銷費用_tb.Text) - Val(刷卡傭金_tb.Text)
+        '-------007-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         售價小計_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") : 預估利潤_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 指定倉庫_cb_下拉表單資料載入()
         If 需要全部庫存區域清單_ch.Checked = True Then
             SQL_倉名_下拉清單()
@@ -387,9 +409,9 @@ Public Class 銷售單審核
     Private Sub 銷售明細_dgv_CellEndEdit(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 銷售明細_dgv.CellEndEdit
         For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
             If 銷售明細_dgv("含稅", i).Value = False Then
-                銷售明細_dgv("售價", i).Value = 銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value
+                銷售明細_dgv("單價", i).Value = 銷售明細_dgv("售價", i).Value / 銷售明細_dgv("數量", i).Value
             ElseIf 銷售明細_dgv("含稅", i).Value = True Then
-                銷售明細_dgv("售價", i).Value = 銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value * 1.05
+                銷售明細_dgv("單價", i).Value = (銷售明細_dgv("售價", i).Value / 1.05) / 銷售明細_dgv("數量", i).Value
             End If
 
             If 銷售明細_dgv("倉儲情況", i).Value <> "已有貨" Then
@@ -583,17 +605,19 @@ Public Class 銷售單審核
         送貨地點_cb.SelectedIndex = 最低售價_cb.SelectedIndex : 最低運費_cb.SelectedIndex = 最低售價_cb.SelectedIndex
     End Sub
     Private Sub 含稅_ch_CheckedChanged(sender As Object, e As EventArgs) Handles 含稅_ch.CheckedChanged
-        For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
-            If 含稅_ch.Checked = False Then : 銷售明細_dgv("含稅", i).Value = False
-            ElseIf 含稅_ch.Checked = True Then : 銷售明細_dgv("含稅", i).Value = True
-            End If
-            If 銷售明細_dgv("含稅", i).Value = False Then
-                銷售明細_dgv("售價", i).Value = 銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value
-            ElseIf 銷售明細_dgv("含稅", i).Value = True Then
-                銷售明細_dgv("售價", i).Value = 銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value * 1.05
-            End If
-        Next
-        Set_合記計算()
+        If 刷卡控制 = False Then
+            For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
+                If 含稅_ch.Checked = False Then : 銷售明細_dgv("含稅", i).Value = False
+                ElseIf 含稅_ch.Checked = True Then : 銷售明細_dgv("含稅", i).Value = True
+                End If
+                If 銷售明細_dgv("含稅", i).Value = False Then
+                    銷售明細_dgv("售價", i).Value = 銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value
+                ElseIf 銷售明細_dgv("含稅", i).Value = True Then
+                    銷售明細_dgv("售價", i).Value = 銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value * 1.05
+                End If
+            Next
+            Set_合記計算()
+        End If
     End Sub
     Private Sub 客戶編號_tb_TextChanged(sender As Object, e As EventArgs) Handles 客戶編號_tb.TextChanged
         PA15 = 客戶編號_tb.Text
@@ -672,6 +696,7 @@ Public Class 銷售單審核
 
                 DTP = Format(開單日期_dtp.Value, "yyyy/MM/dd") : DTP1 = Format(交貨日期_dtp.Value, "yyyy/MM/dd") : BL1 = 含稅_ch.Checked : 運費 = 司機運費_tb.Text
                 PA1 = 流水號_tb.Text : PA2 = 單號_tb.Text : PA3 = 客戶編號_tb.Text : PA4 = 流水號_tb.Text : PA5 = 送貨地點_cb.Text : NU1 = 司機運費_tb.Text : NU2 = 管銷費用_tb.Text
+                NU3 = 稅金_tb.Text
                 SQL_銷售控制表_修改() '--------------------資料修改
 
                 For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
@@ -761,6 +786,7 @@ Public Class 銷售單審核
 
                 DTP = Format(開單日期_dtp.Value, "yyyy/MM/dd") : DTP1 = Format(交貨日期_dtp.Value, "yyyy/MM/dd") : BL1 = 含稅_ch.Checked : 運費 = 司機運費_tb.Text
                 PA1 = 流水號_tb.Text : PA2 = 單號_tb.Text : PA3 = 客戶編號_tb.Text : PA4 = 流水號_tb.Text : PA5 = 送貨地點_cb.Text : NU1 = 司機運費_tb.Text : NU2 = 管銷費用_tb.Text
+                NU3 = 稅金_tb.Text
                 SQL_銷售控制表_修改() '--------------------資料修改
 
                 For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
@@ -815,66 +841,66 @@ Public Class 銷售單審核
                                 PA1 = 單號_tb.Text : PA2 = 料號_tb.Text : PA3 = 倉庫編號_tb.Text
                                 SQL_銷售明細表_確認單據是否申請()
                                 If dr.Read() Then
-                                    conn.Close() : MsgBox("該料號已經在本單據中申請過了，如要修改，請直接到單據中尋找並修改。")
+                                    conn.Close() : MsgBox("該料號已經在本單據中申請過了，如果是標準規格品，請不要重複開兩次。。")
                                 Else
-                                    SQL_銷售明細表_最後一筆資料()
+                                End If
+                                SQL_銷售明細表_最後一筆資料()
+                                If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("資料流水號").ToString, 9)) : Else : EDR = 0 : End If
+                                conn.Close() : EDR += 1
+                                If EDR < 10 Then : ESTR = "SA" & "00000000" & EDR
+                                ElseIf EDR > 9 And EDR < 100 Then : ESTR = "SA" & "0000000" & EDR
+                                ElseIf EDR > 99 And EDR < 1000 Then : ESTR = "SA" & "000000" & EDR
+                                ElseIf EDR > 999 And EDR < 10000 Then : ESTR = "SA" & "00000" & EDR
+                                ElseIf EDR > 9999 And EDR < 100000 Then : ESTR = "SA" & "0000" & EDR
+                                ElseIf EDR > 99999 And EDR < 100000 Then : ESTR = "SA" & "000" & EDR
+                                ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "SA" & "00" & EDR
+                                ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "SA" & "0" & EDR
+                                ElseIf EDR > 99999999 Then : ESTR = "SA" & EDR : End If
+
+                                Set_日期格式轉換()
+                                PA3 = ESTR : PA4 = 單號_tb.Text : PA5 = 倉庫級別_tb.Text : PA6 = 倉庫編號_tb.Text : NU1 = 訂購數量_nud.Value : NU2 = 成本_nud.Value : NU3 = 售價_nud.Value
+                                PA7 = 儲態編號_cb.Text : PA8 = 訂製編碼_cb.Text : BL2 = 含稅_ch.Checked
+                                If Val(可申請_tb.Text) > 0 Then
+                                    PA9 = "已有貨"
+                                    SQL_銷售單申請_銷售明細表_新增()
+
+                                    If 調庫單號_tb.Text = "" Then
+                                        Set_日期格式轉換()
+                                        For i As Integer = 1 To 999
+                                            NUM1 = 0 + i
+                                            If NUM1 < 10 Then : 調庫單號_tb.Text = "WH-" & DTP1 & "-00" & NUM1
+                                            ElseIf NUM1 > 9 And NUM1 < 100 Then : 調庫單號_tb.Text = "WH-" & DTP1 & "-0" & NUM1
+                                            ElseIf NUM1 > 99 Then : 調庫單號_tb.Text = "WH-" & DTP1 & "-" & NUM1
+                                            End If
+                                            PA1 = 調庫單號_tb.Text
+                                            SQL_倉儲明細執行單號_執行單號驗證()
+                                            If dr.Read() Then : Else : i = 999 : conn.Close() : End If : conn.Close()
+                                        Next
+                                        SQL_倉儲明細執行單號_新增() : conn.Close()
+                                    End If
+
+                                    SQL_倉儲明細表_最後一筆資料()
                                     If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("資料流水號").ToString, 9)) : Else : EDR = 0 : End If
                                     conn.Close() : EDR += 1
-                                    If EDR < 10 Then : ESTR = "SA" & "00000000" & EDR
-                                    ElseIf EDR > 9 And EDR < 100 Then : ESTR = "SA" & "0000000" & EDR
-                                    ElseIf EDR > 99 And EDR < 1000 Then : ESTR = "SA" & "000000" & EDR
-                                    ElseIf EDR > 999 And EDR < 10000 Then : ESTR = "SA" & "00000" & EDR
-                                    ElseIf EDR > 9999 And EDR < 100000 Then : ESTR = "SA" & "0000" & EDR
-                                    ElseIf EDR > 99999 And EDR < 100000 Then : ESTR = "SA" & "000" & EDR
-                                    ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "SA" & "00" & EDR
-                                    ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "SA" & "0" & EDR
-                                    ElseIf EDR > 99999999 Then : ESTR = "SA" & EDR : End If
-
-                                    Set_日期格式轉換()
-                                    PA3 = ESTR : PA4 = 單號_tb.Text : PA5 = 倉庫級別_tb.Text : PA6 = 倉庫編號_tb.Text : NU1 = 訂購數量_nud.Value : NU2 = 成本_nud.Value : NU3 = 售價_nud.Value
-                                    PA7 = 儲態編號_cb.Text : PA8 = 訂製編碼_cb.Text : BL2 = 含稅_ch.Checked
-                                    If Val(可申請_tb.Text) > 0 Then
-                                        PA9 = "已有貨"
-                                        SQL_銷售單申請_銷售明細表_新增()
-
-                                        If 調庫單號_tb.Text = "" Then
-                                            Set_日期格式轉換()
-                                            For i As Integer = 1 To 999
-                                                NUM1 = 0 + i
-                                                If NUM1 < 10 Then : 調庫單號_tb.Text = "WH-" & DTP1 & "-00" & NUM1
-                                                ElseIf NUM1 > 9 And NUM1 < 100 Then : 調庫單號_tb.Text = "WH-" & DTP1 & "-0" & NUM1
-                                                ElseIf NUM1 > 99 Then : 調庫單號_tb.Text = "WH-" & DTP1 & "-" & NUM1
-                                                End If
-                                                PA1 = 調庫單號_tb.Text
-                                                SQL_倉儲明細執行單號_執行單號驗證()
-                                                If dr.Read() Then : Else : i = 999 : conn.Close() : End If : conn.Close()
-                                            Next
-                                            SQL_倉儲明細執行單號_新增() : conn.Close()
-                                        End If
-
-                                        SQL_倉儲明細表_最後一筆資料()
-                                        If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("資料流水號").ToString, 9)) : Else : EDR = 0 : End If
-                                        conn.Close() : EDR += 1
-                                        If EDR < 10 Then : ESTR = "WH" & "00000000" & EDR
-                                        ElseIf EDR > 9 And EDR < 100 Then : ESTR = "WH" & "0000000" & EDR
-                                        ElseIf EDR > 99 And EDR < 1000 Then : ESTR = "WH" & "000000" & EDR
-                                        ElseIf EDR > 999 And EDR < 10000 Then : ESTR = "WH" & "00000" & EDR
-                                        ElseIf EDR > 9999 And EDR < 100000 Then : ESTR = "WH" & "0000" & EDR
-                                        ElseIf EDR > 99999 And EDR < 100000 Then : ESTR = "WH" & "000" & EDR
-                                        ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "WH" & "00" & EDR
-                                        ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "WH" & "0" & EDR
-                                        ElseIf EDR > 99999999 Then : ESTR = "WH" & EDR : End If
-
-                                        PA3 = ESTR : PA4 = 調庫單號_tb.Text : PA5 = 倉庫級別_tb.Text : PA6 = 倉庫編號_tb.Text : PA9 = 單號_tb.Text
-                                        SQL_銷售單申請_倉儲明細表_銷售出庫()
-                                        Set_清單4()
-                                    ElseIf Val(可申請_tb.Text) = 0 Then
-                                        PA9 = "未有貨"
-                                        SQL_銷售單申請_銷售明細表_新增()
-                                        Set_清單4()
-                                    End If : conn.Close()
-                                    Set_清單()
-                                End If
+                                    If EDR < 10 Then : ESTR = "WH" & "00000000" & EDR
+                                    ElseIf EDR > 9 And EDR < 100 Then : ESTR = "WH" & "0000000" & EDR
+                                    ElseIf EDR > 99 And EDR < 1000 Then : ESTR = "WH" & "000000" & EDR
+                                    ElseIf EDR > 999 And EDR < 10000 Then : ESTR = "WH" & "00000" & EDR
+                                    ElseIf EDR > 9999 And EDR < 100000 Then : ESTR = "WH" & "0000" & EDR
+                                    ElseIf EDR > 99999 And EDR < 100000 Then : ESTR = "WH" & "000" & EDR
+                                    ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "WH" & "00" & EDR
+                                    ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "WH" & "0" & EDR
+                                    ElseIf EDR > 99999999 Then : ESTR = "WH" & EDR : End If
+
+                                    PA3 = ESTR : PA4 = 調庫單號_tb.Text : PA5 = 倉庫級別_tb.Text : PA6 = 倉庫編號_tb.Text : PA9 = 單號_tb.Text
+                                    SQL_銷售單申請_倉儲明細表_銷售出庫()
+                                    Set_清單4()
+                                ElseIf Val(可申請_tb.Text) = 0 Then
+                                    PA9 = "未有貨"
+                                    SQL_銷售單申請_銷售明細表_新增()
+                                    Set_清單4()
+                                End If : conn.Close()
+                                Set_清單()
                             End If
                         End If
                     End If
@@ -1062,15 +1088,23 @@ Public Class 銷售單審核
         Next : YD_ERP_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
     End Sub
     Private Sub Reset_bt_Click(sender As Object, e As EventArgs) Handles Reset_bt.Click
-        Dim 不含1類銷售小記 As Integer
+        Dim 不含1類銷售小記 As Integer : Dim 金額1 As Integer = 0
         售價小計_tb.Text = "0" : 稅金_tb.Text = "0" : 銷售合計_tb.Text = "0" : 收入小計_tb.Text = "0" : 支出小計_tb.Text = "0" : 額外收支_tb.Text = "0" : 物料成本_tb.Text = "0"
         司機運費_tb.Text = "0" : 管銷費用_tb.Text = "0" : 其他成本_tb.Text = "0"
+        '-------001-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+        For i As Integer = 0 To 收款事項_dgv.Rows.Count - 1
+            If 收款事項_dgv("真項次", i).Value.ToString = "0" And 收款事項_dgv("內容", i).Value.ToString <> "未收餘額" Then
+                刷卡總和_tb.Text = Val(刷卡總和_tb.Text) + 收款事項_dgv("金額", i).Value
+            End If
+        Next
+        刷卡稅金_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 * 銷售明細_dgv("單價", i).Value)
 
             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 * 銷售明細_dgv("單價", i).Value)
+                不含1類銷售小記 = 不含1類銷售小記 + 銷售明細_dgv("售價", i).Value
             End If
             If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) = 1 Then
                 其他成本_tb.Text = Val(其他成本_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value)
@@ -1083,42 +1117,93 @@ Public Class 銷售單審核
         管銷費用_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)
+        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
+        '-------003-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         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
         Next
         額外收支_tb.Text = Val(收入小計_tb.Text) - Val(支出小計_tb.Text)
-
+        '-------004-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         Dim 金額 As Integer = 0
         For i As Integer = 0 To 收款事項_dgv.Rows.Count - 1
-            If 收款事項_dgv("真項次", i).Value.ToString <> "0" Then
+            If 收款事項_dgv("真項次", i).Value.ToString <> "0" And 收款事項_dgv("內容", i).Value.ToString <> "未收餘額" Then
+                金額 = 金額 + 收款事項_dgv("金額", i).Value
+            ElseIf 收款事項_dgv("真項次", i).Value.ToString = "0" And 收款事項_dgv("內容", i).Value.ToString <> "未收餘額" Then
                 金額 = 金額 + 收款事項_dgv("金額", i).Value
-            ElseIf 收款事項_dgv("真項次", i).Value.ToString = "0" Then
+            ElseIf 收款事項_dgv("真項次", i).Value.ToString = "0" And 收款事項_dgv("內容", i).Value.ToString = "未收餘額" Then
                 收款事項_dgv("金額", i).Value = CInt(Val(銷售合計_tb.Text)) - 金額
             End If
         Next
-
+        '-------005-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         If 送貨地點_cb.Text = "" Or 送貨地點_cb.Text = "自取" Or 最低運費_cb.Text = "" Or 最低售價_cb.Text = "" Then
             司機運費_tb.Text = "0"
         Else
             If (不含1類銷售小記 - Val(其他成本_tb.Text)) <= Val(最低售價_cb.Text) Then
                 司機運費_tb.Text = 最低運費_cb.Text
             ElseIf (不含1類銷售小記 - Val(其他成本_tb.Text)) > Val(最低售價_cb.Text) Then
-                司機運費_tb.Text = (不含1類銷售小記 - Val(其他成本_tb.Text)) / 100 * 3
+                司機運費_tb.Text = (不含1類銷售小記 - Val(稅金_tb.Text) - Val(刷卡傭金_tb.Text) - Val(其他成本_tb.Text)) / 100 * 3
             End If
         End If
         存檔1()
-
-        預估利潤_tb.Text = Val(售價小計_tb.Text) + Val(額外收支_tb.Text) - Val(其他成本_tb.Text) - Val(物料成本_tb.Text) - Val(司機運費_tb.Text) - Val(管銷費用_tb.Text)
-
+        '-------004-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+        預估利潤_tb.Text = Val(售價小計_tb.Text) + Val(額外收支_tb.Text) - Val(其他成本_tb.Text) - Val(物料成本_tb.Text) - Val(司機運費_tb.Text) - Val(管銷費用_tb.Text) - Val(刷卡傭金_tb.Text)
+        '-------004-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         售價小計_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") : 預估利潤_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 司機運費_tb_TextChanged(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles 司機運費_tb.KeyPress
         If e.KeyChar = Chr(13) Then
             運費 = 司機運費_tb.Text : 存檔1() : Set_合記計算()
         End If
     End Sub
+    Private Sub 刷卡收款_bt_Click(sender As Object, e As EventArgs) Handles 刷卡收款_bt.Click
+        If 流水號_tb.Text = "" Then
+            MsgBox("沒有銷售單號，無法作業。")
+        Else
+            SQL_銷售收款事項_最後一筆資料()
+            If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("資料流水號").ToString, 9)) : Else : EDR = 0 : End If
+            conn.Close() : EDR += 1
+            If EDR < 10 Then : ESTR = "ST" & "00000000" & EDR
+            ElseIf EDR > 9 And EDR < 100 Then : ESTR = "ST" & "0000000" & EDR
+            ElseIf EDR > 99 And EDR < 1000 Then : ESTR = "ST" & "000000" & EDR
+            ElseIf EDR > 999 And EDR < 10000 Then : ESTR = "ST" & "00000" & EDR
+            ElseIf EDR > 9999 And EDR < 100000 Then : ESTR = "ST" & "0000" & EDR
+            ElseIf EDR > 99999 And EDR < 100000 Then : ESTR = "ST" & "000" & EDR
+            ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "ST" & "00" & EDR
+            ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "ST" & "0" & EDR
+            ElseIf EDR > 99999999 Then : ESTR = "ST" & EDR : End If
+            PA1 = ESTR
+
+            SQL_銷售收款事項_最後一筆項次()
+            If dr.Read() Then : EDR = dr("項次").ToString : Else : EDR = 0 : End If
+            conn.Close() : EDR += 1
+            If EDR < 10 Then : ESTR = EDR
+            ElseIf EDR > 9 And EDR < 100 Then : ESTR = EDR : End If
+            PA2 = ESTR : PA = 單號_tb.Text
+            SQL_銷售收款事項_新增3()
+
+            For i As Integer = 0 To 收款事項_dgv.Rows.Count - 1
+                資料數 = 收款事項_dgv.Rows.Count : MyModule1.進度條()
+                PA10 = 收款事項_dgv.Rows(i).Cells("內容").Value : PA11 = 收款事項_dgv.Rows(i).Cells("資料流水號").Value
+                NU1 = 收款事項_dgv.Rows(i).Cells("金額").Value
+                SQL_銷售收款事項_修改() : conn.Close()
+            Next : YD_ERP_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
+
+            Set_清單6()
+
+            刷卡控制 = True : 含稅_ch.Checked = True : 刷卡控制 = False
+        End If
+    End Sub
 End Class

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

@@ -22,20 +22,20 @@ Partial Class 銷售單申請
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.銷售單據_dgv = New System.Windows.Forms.DataGridView()
         Me.未審核_lb = New System.Windows.Forms.Label()
         Me.開立庫存調整單_bt = New System.Windows.Forms.Button()
@@ -111,6 +111,17 @@ Partial Class 銷售單申請
         Me.售價_nud = New System.Windows.Forms.NumericUpDown()
         Me.Label22 = New System.Windows.Forms.Label()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.通知_lb = New System.Windows.Forms.Label()
+        Me.刷卡總和_tb = New System.Windows.Forms.TextBox()
+        Me.刷卡稅金_tb = New System.Windows.Forms.TextBox()
+        Me.Label46 = New System.Windows.Forms.Label()
+        Me.Label47 = New System.Windows.Forms.Label()
+        Me.刷卡傭金_tb = New System.Windows.Forms.TextBox()
+        Me.Label48 = New System.Windows.Forms.Label()
+        Me.刷卡收款_bt = New System.Windows.Forms.Button()
+        Me.其他成本_tb = New System.Windows.Forms.TextBox()
+        Me.Label45 = New System.Windows.Forms.Label()
+        Me.Label44 = New System.Windows.Forms.Label()
         Me.Reset_bt = New System.Windows.Forms.Button()
         Me.讀取標準成本_bt = New System.Windows.Forms.Button()
         Me.物料成本_tb = New System.Windows.Forms.TextBox()
@@ -169,9 +180,6 @@ Partial Class 銷售單申請
         Me.業務_cb = New System.Windows.Forms.ComboBox()
         Me.物料圖_pb = New System.Windows.Forms.PictureBox()
         Me.物料圖1_pb = New System.Windows.Forms.PictureBox()
-        Me.Label44 = New System.Windows.Forms.Label()
-        Me.其他成本_tb = New System.Windows.Forms.TextBox()
-        Me.Label45 = New System.Windows.Forms.Label()
         CType(Me.銷售單據_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.銷售明細_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.區域庫存_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -189,16 +197,16 @@ Partial Class 銷售單申請
         '
         '銷售單據_dgv
         '
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.銷售單據_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.銷售單據_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle15
         Me.銷售單據_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.銷售單據_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.銷售單據_dgv.Location = New System.Drawing.Point(609, 29)
         Me.銷售單據_dgv.Name = "銷售單據_dgv"
         Me.銷售單據_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle2.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.銷售單據_dgv.RowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle16.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.銷售單據_dgv.RowsDefaultCellStyle = DataGridViewCellStyle16
         Me.銷售單據_dgv.RowTemplate.Height = 24
         Me.銷售單據_dgv.Size = New System.Drawing.Size(146, 141)
         Me.銷售單據_dgv.TabIndex = 1154
@@ -437,8 +445,8 @@ Partial Class 銷售單申請
         '
         '銷售明細_dgv
         '
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.White
-        Me.銷售明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle17.BackColor = System.Drawing.Color.White
+        Me.銷售明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
         Me.銷售明細_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.銷售明細_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -446,9 +454,9 @@ Partial Class 銷售單申請
         Me.銷售明細_dgv.Location = New System.Drawing.Point(3, 29)
         Me.銷售明細_dgv.Name = "銷售明細_dgv"
         Me.銷售明細_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.銷售明細_dgv.RowsDefaultCellStyle = DataGridViewCellStyle4
+        DataGridViewCellStyle18.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.銷售明細_dgv.RowsDefaultCellStyle = DataGridViewCellStyle18
         Me.銷售明細_dgv.RowTemplate.Height = 24
         Me.銷售明細_dgv.Size = New System.Drawing.Size(721, 409)
         Me.銷售明細_dgv.TabIndex = 1199
@@ -478,7 +486,7 @@ Partial Class 銷售單申請
         '
         Me.刪除單據上點選的資料_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.刪除單據上點選的資料_bt.ForeColor = System.Drawing.Color.Red
-        Me.刪除單據上點選的資料_bt.Location = New System.Drawing.Point(279, 3)
+        Me.刪除單據上點選的資料_bt.Location = New System.Drawing.Point(198, 3)
         Me.刪除單據上點選的資料_bt.Name = "刪除單據上點選的資料_bt"
         Me.刪除單據上點選的資料_bt.Size = New System.Drawing.Size(163, 23)
         Me.刪除單據上點選的資料_bt.TabIndex = 1203
@@ -498,17 +506,17 @@ Partial Class 銷售單申請
         '
         '區域庫存_dgv
         '
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.區域庫存_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
+        DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.區域庫存_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19
         Me.區域庫存_dgv.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.區域庫存_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.區域庫存_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.區域庫存_dgv.Location = New System.Drawing.Point(414, 318)
         Me.區域庫存_dgv.Name = "區域庫存_dgv"
         Me.區域庫存_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle6.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.區域庫存_dgv.RowsDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle20.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.區域庫存_dgv.RowsDefaultCellStyle = DataGridViewCellStyle20
         Me.區域庫存_dgv.RowTemplate.Height = 24
         Me.區域庫存_dgv.Size = New System.Drawing.Size(191, 92)
         Me.區域庫存_dgv.TabIndex = 1245
@@ -862,8 +870,8 @@ Partial Class 銷售單申請
         '
         '物料清單_dgv
         '
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.物料清單_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.物料清單_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21
         Me.物料清單_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.物料清單_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -871,9 +879,9 @@ Partial Class 銷售單申請
         Me.物料清單_dgv.Location = New System.Drawing.Point(3, 80)
         Me.物料清單_dgv.Name = "物料清單_dgv"
         Me.物料清單_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle8.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.物料清單_dgv.RowsDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle22.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.物料清單_dgv.RowsDefaultCellStyle = DataGridViewCellStyle22
         Me.物料清單_dgv.RowTemplate.Height = 24
         Me.物料清單_dgv.Size = New System.Drawing.Size(602, 235)
         Me.物料清單_dgv.TabIndex = 1205
@@ -961,6 +969,14 @@ Partial Class 銷售單申請
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Panel1.AutoScroll = True
         Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
+        Me.Panel1.Controls.Add(Me.通知_lb)
+        Me.Panel1.Controls.Add(Me.刷卡總和_tb)
+        Me.Panel1.Controls.Add(Me.刷卡稅金_tb)
+        Me.Panel1.Controls.Add(Me.Label46)
+        Me.Panel1.Controls.Add(Me.Label47)
+        Me.Panel1.Controls.Add(Me.刷卡傭金_tb)
+        Me.Panel1.Controls.Add(Me.Label48)
+        Me.Panel1.Controls.Add(Me.刷卡收款_bt)
         Me.Panel1.Controls.Add(Me.其他成本_tb)
         Me.Panel1.Controls.Add(Me.Label45)
         Me.Panel1.Controls.Add(Me.Label44)
@@ -1020,6 +1036,126 @@ Partial Class 銷售單申請
         Me.Panel1.Size = New System.Drawing.Size(731, 502)
         Me.Panel1.TabIndex = 1252
         '
+        '通知_lb
+        '
+        Me.通知_lb.AutoSize = True
+        Me.通知_lb.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.通知_lb.ForeColor = System.Drawing.Color.Red
+        Me.通知_lb.Location = New System.Drawing.Point(361, 8)
+        Me.通知_lb.Name = "通知_lb"
+        Me.通知_lb.Size = New System.Drawing.Size(127, 15)
+        Me.通知_lb.TabIndex = 1317
+        Me.通知_lb.Text = "........................................"
+        '
+        '刷卡總和_tb
+        '
+        Me.刷卡總和_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.刷卡總和_tb.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.刷卡總和_tb.Location = New System.Drawing.Point(455, 671)
+        Me.刷卡總和_tb.Name = "刷卡總和_tb"
+        Me.刷卡總和_tb.Size = New System.Drawing.Size(81, 23)
+        Me.刷卡總和_tb.TabIndex = 1314
+        Me.刷卡總和_tb.Text = "0"
+        Me.刷卡總和_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        '刷卡稅金_tb
+        '
+        Me.刷卡稅金_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.刷卡稅金_tb.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.刷卡稅金_tb.Location = New System.Drawing.Point(455, 711)
+        Me.刷卡稅金_tb.Name = "刷卡稅金_tb"
+        Me.刷卡稅金_tb.Size = New System.Drawing.Size(81, 23)
+        Me.刷卡稅金_tb.TabIndex = 1316
+        Me.刷卡稅金_tb.Text = "0"
+        Me.刷卡稅金_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        'Label46
+        '
+        Me.Label46.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label46.AutoSize = True
+        Me.Label46.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.Label46.Location = New System.Drawing.Point(454, 695)
+        Me.Label46.Name = "Label46"
+        Me.Label46.Size = New System.Drawing.Size(83, 16)
+        Me.Label46.TabIndex = 1315
+        Me.Label46.Text = "刷   卡   稅   金"
+        '
+        'Label47
+        '
+        Me.Label47.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label47.AutoSize = True
+        Me.Label47.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.Label47.Location = New System.Drawing.Point(454, 656)
+        Me.Label47.Name = "Label47"
+        Me.Label47.Size = New System.Drawing.Size(83, 16)
+        Me.Label47.TabIndex = 1313
+        Me.Label47.Text = "刷   卡   總   和"
+        '
+        '刷卡傭金_tb
+        '
+        Me.刷卡傭金_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.刷卡傭金_tb.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.刷卡傭金_tb.Location = New System.Drawing.Point(456, 750)
+        Me.刷卡傭金_tb.Name = "刷卡傭金_tb"
+        Me.刷卡傭金_tb.Size = New System.Drawing.Size(81, 23)
+        Me.刷卡傭金_tb.TabIndex = 1312
+        Me.刷卡傭金_tb.Text = "0"
+        Me.刷卡傭金_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        'Label48
+        '
+        Me.Label48.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label48.AutoSize = True
+        Me.Label48.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.Label48.Location = New System.Drawing.Point(454, 735)
+        Me.Label48.Name = "Label48"
+        Me.Label48.Size = New System.Drawing.Size(83, 16)
+        Me.Label48.TabIndex = 1311
+        Me.Label48.Text = "刷   卡   傭   金"
+        '
+        '刷卡收款_bt
+        '
+        Me.刷卡收款_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.刷卡收款_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.刷卡收款_bt.Location = New System.Drawing.Point(429, 632)
+        Me.刷卡收款_bt.Name = "刷卡收款_bt"
+        Me.刷卡收款_bt.Size = New System.Drawing.Size(92, 23)
+        Me.刷卡收款_bt.TabIndex = 1310
+        Me.刷卡收款_bt.Text = "新增刷卡收款"
+        Me.刷卡收款_bt.UseVisualStyleBackColor = True
+        '
+        '其他成本_tb
+        '
+        Me.其他成本_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.其他成本_tb.ForeColor = System.Drawing.Color.Green
+        Me.其他成本_tb.Location = New System.Drawing.Point(624, 700)
+        Me.其他成本_tb.Name = "其他成本_tb"
+        Me.其他成本_tb.Size = New System.Drawing.Size(81, 23)
+        Me.其他成本_tb.TabIndex = 1309
+        Me.其他成本_tb.Text = "0"
+        Me.其他成本_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        'Label45
+        '
+        Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label45.AutoSize = True
+        Me.Label45.ForeColor = System.Drawing.Color.Green
+        Me.Label45.Location = New System.Drawing.Point(542, 703)
+        Me.Label45.Name = "Label45"
+        Me.Label45.Size = New System.Drawing.Size(83, 16)
+        Me.Label45.TabIndex = 1308
+        Me.Label45.Text = "其   他   成   本"
+        '
+        'Label44
+        '
+        Me.Label44.AutoSize = True
+        Me.Label44.Location = New System.Drawing.Point(39, 363)
+        Me.Label44.Name = "Label44"
+        Me.Label44.Size = New System.Drawing.Size(68, 16)
+        Me.Label44.TabIndex = 1307
+        Me.Label44.Text = "客戶流水號"
+        Me.Label44.Visible = False
+        '
         'Reset_bt
         '
         Me.Reset_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -1036,9 +1172,9 @@ Partial Class 銷售單申請
         '
         Me.讀取標準成本_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.讀取標準成本_bt.ForeColor = System.Drawing.Color.Green
-        Me.讀取標準成本_bt.Location = New System.Drawing.Point(498, 3)
+        Me.讀取標準成本_bt.Location = New System.Drawing.Point(107, 3)
         Me.讀取標準成本_bt.Name = "讀取標準成本_bt"
-        Me.讀取標準成本_bt.Size = New System.Drawing.Size(163, 23)
+        Me.讀取標準成本_bt.Size = New System.Drawing.Size(90, 23)
         Me.讀取標準成本_bt.TabIndex = 1305
         Me.讀取標準成本_bt.Text = "讀取標準成本"
         Me.讀取標準成本_bt.UseVisualStyleBackColor = True
@@ -1146,16 +1282,17 @@ Partial Class 銷售單申請
         '
         Me.項次3_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.項次3_tb.Enabled = False
-        Me.項次3_tb.Location = New System.Drawing.Point(503, 631)
+        Me.項次3_tb.Location = New System.Drawing.Point(502, 440)
         Me.項次3_tb.Name = "項次3_tb"
         Me.項次3_tb.Size = New System.Drawing.Size(32, 23)
         Me.項次3_tb.TabIndex = 1290
+        Me.項次3_tb.Visible = False
         '
         '刪除收款事項上點選的資料_bt
         '
         Me.刪除收款事項上點選的資料_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.刪除收款事項上點選的資料_bt.ForeColor = System.Drawing.Color.Red
-        Me.刪除收款事項上點選的資料_bt.Location = New System.Drawing.Point(279, 632)
+        Me.刪除收款事項上點選的資料_bt.Location = New System.Drawing.Point(266, 632)
         Me.刪除收款事項上點選的資料_bt.Name = "刪除收款事項上點選的資料_bt"
         Me.刪除收款事項上點選的資料_bt.Size = New System.Drawing.Size(163, 23)
         Me.刪除收款事項上點選的資料_bt.TabIndex = 1287
@@ -1166,7 +1303,7 @@ Partial Class 銷售單申請
         '
         Me.新增一筆收款事項_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.新增一筆收款事項_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.新增一筆收款事項_bt.Location = New System.Drawing.Point(110, 632)
+        Me.新增一筆收款事項_bt.Location = New System.Drawing.Point(102, 632)
         Me.新增一筆收款事項_bt.Name = "新增一筆收款事項_bt"
         Me.新增一筆收款事項_bt.Size = New System.Drawing.Size(163, 23)
         Me.新增一筆收款事項_bt.TabIndex = 1286
@@ -1176,7 +1313,7 @@ Partial Class 銷售單申請
         '項次2_tb
         '
         Me.項次2_tb.Enabled = False
-        Me.項次2_tb.Location = New System.Drawing.Point(36, 632)
+        Me.項次2_tb.Location = New System.Drawing.Point(33, 632)
         Me.項次2_tb.Name = "項次2_tb"
         Me.項次2_tb.Size = New System.Drawing.Size(68, 23)
         Me.項次2_tb.TabIndex = 1284
@@ -1326,7 +1463,7 @@ Partial Class 銷售單申請
         '
         Me.刪除備註_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.刪除備註_bt.ForeColor = System.Drawing.Color.Red
-        Me.刪除備註_bt.Location = New System.Drawing.Point(279, 440)
+        Me.刪除備註_bt.Location = New System.Drawing.Point(268, 440)
         Me.刪除備註_bt.Name = "刪除備註_bt"
         Me.刪除備註_bt.Size = New System.Drawing.Size(163, 23)
         Me.刪除備註_bt.TabIndex = 1256
@@ -1337,7 +1474,7 @@ Partial Class 銷售單申請
         '
         Me.銷售備註_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.銷售備註_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.銷售備註_bt.Location = New System.Drawing.Point(110, 440)
+        Me.銷售備註_bt.Location = New System.Drawing.Point(103, 440)
         Me.銷售備註_bt.Name = "銷售備註_bt"
         Me.銷售備註_bt.Size = New System.Drawing.Size(163, 23)
         Me.銷售備註_bt.TabIndex = 1261
@@ -1347,7 +1484,7 @@ Partial Class 銷售單申請
         '項次1_tb
         '
         Me.項次1_tb.Enabled = False
-        Me.項次1_tb.Location = New System.Drawing.Point(36, 440)
+        Me.項次1_tb.Location = New System.Drawing.Point(33, 440)
         Me.項次1_tb.Name = "項次1_tb"
         Me.項次1_tb.Size = New System.Drawing.Size(68, 23)
         Me.項次1_tb.TabIndex = 1264
@@ -1407,17 +1544,17 @@ Partial Class 銷售單申請
         '
         '客戶資料_dgv
         '
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.客戶資料_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
+        DataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.客戶資料_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23
         Me.客戶資料_dgv.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.客戶資料_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.客戶資料_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.客戶資料_dgv.Location = New System.Drawing.Point(17, 6614)
+        Me.客戶資料_dgv.Location = New System.Drawing.Point(17, 7445)
         Me.客戶資料_dgv.Name = "客戶資料_dgv"
         Me.客戶資料_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle10.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.客戶資料_dgv.RowsDefaultCellStyle = DataGridViewCellStyle10
+        DataGridViewCellStyle24.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.客戶資料_dgv.RowsDefaultCellStyle = DataGridViewCellStyle24
         Me.客戶資料_dgv.RowTemplate.Height = 24
         Me.客戶資料_dgv.Size = New System.Drawing.Size(191, 92)
         Me.客戶資料_dgv.TabIndex = 1254
@@ -1425,8 +1562,8 @@ Partial Class 銷售單申請
         '
         '收款事項_dgv
         '
-        DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.收款事項_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
+        DataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.收款事項_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle25
         Me.收款事項_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.收款事項_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -1434,11 +1571,11 @@ Partial Class 銷售單申請
         Me.收款事項_dgv.Location = New System.Drawing.Point(3, 657)
         Me.收款事項_dgv.Name = "收款事項_dgv"
         Me.收款事項_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle12.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.收款事項_dgv.RowsDefaultCellStyle = DataGridViewCellStyle12
+        DataGridViewCellStyle26.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.收款事項_dgv.RowsDefaultCellStyle = DataGridViewCellStyle26
         Me.收款事項_dgv.RowTemplate.Height = 24
-        Me.收款事項_dgv.Size = New System.Drawing.Size(532, 118)
+        Me.收款事項_dgv.Size = New System.Drawing.Size(447, 118)
         Me.收款事項_dgv.TabIndex = 1282
         '
         'Label28
@@ -1483,8 +1620,8 @@ Partial Class 銷售單申請
         '
         '銷售備註_dgv
         '
-        DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.銷售備註_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13
+        DataGridViewCellStyle27.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.銷售備註_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle27
         Me.銷售備註_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.銷售備註_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -1492,9 +1629,9 @@ Partial Class 銷售單申請
         Me.銷售備註_dgv.Location = New System.Drawing.Point(3, 465)
         Me.銷售備註_dgv.Name = "銷售備註_dgv"
         Me.銷售備註_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle14.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.銷售備註_dgv.RowsDefaultCellStyle = DataGridViewCellStyle14
+        DataGridViewCellStyle28.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.銷售備註_dgv.RowsDefaultCellStyle = DataGridViewCellStyle28
         Me.銷售備註_dgv.RowTemplate.Height = 24
         Me.銷售備註_dgv.Size = New System.Drawing.Size(532, 165)
         Me.銷售備註_dgv.TabIndex = 1250
@@ -1653,38 +1790,6 @@ Partial Class 銷售單申請
         Me.物料圖1_pb.TabIndex = 1201
         Me.物料圖1_pb.TabStop = False
         '
-        'Label44
-        '
-        Me.Label44.AutoSize = True
-        Me.Label44.Location = New System.Drawing.Point(39, 363)
-        Me.Label44.Name = "Label44"
-        Me.Label44.Size = New System.Drawing.Size(68, 16)
-        Me.Label44.TabIndex = 1307
-        Me.Label44.Text = "客戶流水號"
-        Me.Label44.Visible = False
-        '
-        '其他成本_tb
-        '
-        Me.其他成本_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.其他成本_tb.ForeColor = System.Drawing.Color.Green
-        Me.其他成本_tb.Location = New System.Drawing.Point(624, 700)
-        Me.其他成本_tb.Name = "其他成本_tb"
-        Me.其他成本_tb.Size = New System.Drawing.Size(81, 23)
-        Me.其他成本_tb.TabIndex = 1309
-        Me.其他成本_tb.Text = "0"
-        Me.其他成本_tb.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
-        '
-        'Label45
-        '
-        Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label45.AutoSize = True
-        Me.Label45.ForeColor = System.Drawing.Color.Green
-        Me.Label45.Location = New System.Drawing.Point(542, 703)
-        Me.Label45.Name = "Label45"
-        Me.Label45.Size = New System.Drawing.Size(83, 16)
-        Me.Label45.TabIndex = 1308
-        Me.Label45.Text = "其   他   成   本"
-        '
         '銷售單申請
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
@@ -1931,4 +2036,12 @@ Partial Class 銷售單申請
     Friend WithEvents Label44 As Label
     Friend WithEvents 其他成本_tb As TextBox
     Friend WithEvents Label45 As Label
+    Friend WithEvents 刷卡收款_bt As Button
+    Friend WithEvents 刷卡總和_tb As TextBox
+    Friend WithEvents 刷卡稅金_tb As TextBox
+    Friend WithEvents Label46 As Label
+    Friend WithEvents Label47 As Label
+    Friend WithEvents 刷卡傭金_tb As TextBox
+    Friend WithEvents Label48 As Label
+    Friend WithEvents 通知_lb As Label
 End Class

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

@@ -3,7 +3,7 @@ Public Class 銷售單申請
     ReadOnly ds As New DataSet : ReadOnly ds1 As New DataSet : ReadOnly ds2 As New DataSet : ReadOnly ds3 As New DataSet : ReadOnly ds4 As New DataSet
     ReadOnly ds5 As New DataSet : ReadOnly ds6 As New DataSet
     Dim 首次開啟 As Boolean = False : Dim EDR As Integer = 0 : Dim ESTR As String : Dim EDR1 As Integer = 0 : Dim ESTR1 As String : Dim NUM1 As Integer
-    Dim 運費 As Integer
+    Dim 運費 As Integer : Dim 刷卡控制 As Boolean = False
     Private Sub Set_清單()
         物料清單_dgv.DataSource = Nothing : ds.Clear()
         物料清單_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -121,10 +121,10 @@ Public Class 銷售單申請
         銷售明細_dgv.Columns(20).Visible = False
 
         銷售明細_dgv.Columns(1).ReadOnly = True : 銷售明細_dgv.Columns(2).ReadOnly = True : 銷售明細_dgv.Columns(3).ReadOnly = True : 銷售明細_dgv.Columns(4).ReadOnly = True
-        銷售明細_dgv.Columns(11).ReadOnly = True : 銷售明細_dgv.Columns(15).ReadOnly = True : 銷售明細_dgv.Columns(16).ReadOnly = True
+        銷售明細_dgv.Columns(11).ReadOnly = True : 銷售明細_dgv.Columns(13).ReadOnly = True : 銷售明細_dgv.Columns(16).ReadOnly = True
 
         銷售明細_dgv.Columns("數量").DefaultCellStyle.Format = "#,##0" : 銷售明細_dgv.Columns("成本").DefaultCellStyle.Format = "#,##0"
-        銷售明細_dgv.Columns("單價").DefaultCellStyle.Format = "#,##0" : 銷售明細_dgv.Columns("售價").DefaultCellStyle.Format = "#,##0"
+        銷售明細_dgv.Columns("單價").DefaultCellStyle.Format = "#,##0.0" : 銷售明細_dgv.Columns("售價").DefaultCellStyle.Format = "#,##0"
         銷售明細_dgv.Columns("數量").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
         銷售明細_dgv.Columns("數量").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
         銷售明細_dgv.Columns("成本").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
@@ -272,17 +272,25 @@ Public Class 銷售單申請
         DTP = Format(開單日期_dtp.Value, "yyyy/MM/dd") : DTP2 = Format(交貨日期_dtp.Value, "yyyy/MM/dd") : DTP1 = Format(Today(), "yyyyMMdd")
     End Sub
     Private Sub Set_合記計算()
-        Dim 不含1類銷售小記 As Integer
+        Dim 不含1類銷售小記 As Integer : Dim 金額1 As Integer = 0
         售價小計_tb.Text = "0" : 稅金_tb.Text = "0" : 銷售合計_tb.Text = "0" : 收入小計_tb.Text = "0" : 支出小計_tb.Text = "0" : 額外收支_tb.Text = "0" : 物料成本_tb.Text = "0"
-        司機運費_tb.Text = "0" : 管銷費用_tb.Text = "0" : 其他成本_tb.Text = "0"
+        司機運費_tb.Text = "0" : 管銷費用_tb.Text = "0" : 其他成本_tb.Text = "0" : 刷卡總和_tb.Text = "0" : 刷卡稅金_tb.Text = "0" : 刷卡傭金_tb.Text = "0"
+        '-------001-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+        For i As Integer = 0 To 收款事項_dgv.Rows.Count - 1
+            If 收款事項_dgv("真項次", i).Value.ToString = "0" And 收款事項_dgv("內容", i).Value.ToString <> "未收餘額" Then
+                刷卡總和_tb.Text = Val(刷卡總和_tb.Text) + 收款事項_dgv("金額", i).Value
+            End If
+        Next
+        刷卡稅金_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 * 銷售明細_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 * 銷售明細_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
 
@@ -293,21 +301,33 @@ Public Class 銷售單申請
         管銷費用_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)
+        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
+        '-------003-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         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
         Next
         額外收支_tb.Text = Val(收入小計_tb.Text) - Val(支出小計_tb.Text)
-
+        '-------004-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         Dim 金額 As Integer = 0
         For i As Integer = 0 To 收款事項_dgv.Rows.Count - 1
-            If 收款事項_dgv("真項次", i).Value.ToString <> "0" Then
+            If 收款事項_dgv("真項次", i).Value.ToString <> "0" And 收款事項_dgv("內容", i).Value.ToString <> "未收餘額" Then
                 金額 = 金額 + 收款事項_dgv("金額", i).Value
-            ElseIf 收款事項_dgv("真項次", i).Value.ToString = "0" Then
+            ElseIf 收款事項_dgv("真項次", i).Value.ToString = "0" And 收款事項_dgv("內容", i).Value.ToString <> "未收餘額" Then
+                金額 = 金額 + 收款事項_dgv("金額", i).Value
+            ElseIf 收款事項_dgv("真項次", i).Value.ToString = "0" And 收款事項_dgv("內容", i).Value.ToString = "未收餘額" Then
                 收款事項_dgv("金額", i).Value = CInt(Val(銷售合計_tb.Text)) - 金額
             End If
         Next
-
+        '-------005-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         If 送貨地點_cb.Text = "" Or 送貨地點_cb.Text = "自取" Or 最低運費_cb.Text = "" Or 最低售價_cb.Text = "" Then
             司機運費_tb.Text = "0"
         Else
@@ -315,19 +335,20 @@ Public Class 銷售單申請
                 If (不含1類銷售小記 - Val(其他成本_tb.Text)) <= Val(最低售價_cb.Text) Then
                     司機運費_tb.Text = 最低運費_cb.Text
                 ElseIf (不含1類銷售小記 - Val(其他成本_tb.Text)) > Val(最低售價_cb.Text) Then
-                    司機運費_tb.Text = (不含1類銷售小記 - Val(其他成本_tb.Text)) / 100 * 3
+                    司機運費_tb.Text = (不含1類銷售小記 - Val(稅金_tb.Text) - Val(刷卡傭金_tb.Text) - Val(其他成本_tb.Text)) / 100 * 3
                 End If
             Else
                 司機運費_tb.Text = 運費
             End If
         End If
-
-        預估利潤_tb.Text = Val(售價小計_tb.Text) + Val(額外收支_tb.Text) - Val(其他成本_tb.Text) - Val(物料成本_tb.Text) - Val(司機運費_tb.Text) - Val(管銷費用_tb.Text)
-
+        '-------006-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+        預估利潤_tb.Text = Val(售價小計_tb.Text) + Val(額外收支_tb.Text) - Val(其他成本_tb.Text) - Val(物料成本_tb.Text) - Val(司機運費_tb.Text) - Val(管銷費用_tb.Text) - Val(刷卡傭金_tb.Text)
+        '-------007-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         售價小計_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") : 預估利潤_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 指定倉庫_cb_下拉表單資料載入()
         If 需要全部庫存區域清單_ch.Checked = True Then
@@ -395,9 +416,9 @@ Public Class 銷售單申請
         If e.RowIndex = -1 Then : Else
             For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
                 If 銷售明細_dgv("含稅", i).Value = False Then
-                    銷售明細_dgv("售價", i).Value = 銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value
+                    銷售明細_dgv("單價", i).Value = 銷售明細_dgv("售價", i).Value / 銷售明細_dgv("數量", i).Value
                 ElseIf 銷售明細_dgv("含稅", i).Value = True Then
-                    銷售明細_dgv("售價", i).Value = 銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value * 1.05
+                    銷售明細_dgv("單價", i).Value = (銷售明細_dgv("售價", i).Value / 1.05) / 銷售明細_dgv("數量", i).Value
                 End If
 
                 If 銷售明細_dgv("倉儲情況", i).Value <> "已有貨" Then
@@ -593,17 +614,19 @@ Public Class 銷售單申請
         送貨地點_cb.SelectedIndex = 最低售價_cb.SelectedIndex : 最低運費_cb.SelectedIndex = 最低售價_cb.SelectedIndex
     End Sub
     Private Sub 含稅_ch_CheckedChanged(sender As Object, e As EventArgs) Handles 含稅_ch.CheckedChanged
-        For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
-            If 含稅_ch.Checked = False Then : 銷售明細_dgv("含稅", i).Value = False
-            ElseIf 含稅_ch.Checked = True Then : 銷售明細_dgv("含稅", i).Value = True
-            End If
-            If 銷售明細_dgv("含稅", i).Value = False Then
-                銷售明細_dgv("售價", i).Value = 銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value
-            ElseIf 銷售明細_dgv("含稅", i).Value = True Then
-                銷售明細_dgv("售價", i).Value = 銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value * 1.05
-            End If
-        Next
-        Set_合記計算()
+        If 刷卡控制 = False Then
+            For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
+                If 含稅_ch.Checked = False Then : 銷售明細_dgv("含稅", i).Value = False
+                ElseIf 含稅_ch.Checked = True Then : 銷售明細_dgv("含稅", i).Value = True
+                End If
+                If 銷售明細_dgv("含稅", i).Value = False Then
+                    銷售明細_dgv("售價", i).Value = 銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value
+                ElseIf 銷售明細_dgv("含稅", i).Value = True Then
+                    銷售明細_dgv("售價", i).Value = 銷售明細_dgv("數量", i).Value * 銷售明細_dgv("單價", i).Value * 1.05
+                End If
+            Next
+            Set_合記計算()
+        End If
     End Sub
     Private Sub 客戶編號_tb_TextChanged(sender As Object, e As EventArgs) Handles 客戶編號_tb.TextChanged
         PA15 = 客戶編號_tb.Text
@@ -741,6 +764,7 @@ Public Class 銷售單申請
 
                 DTP = Format(開單日期_dtp.Value, "yyyy/MM/dd") : DTP1 = Format(交貨日期_dtp.Value, "yyyy/MM/dd") : BL1 = 含稅_ch.Checked : 運費 = 司機運費_tb.Text
                 PA1 = 流水號_tb.Text : PA2 = 單號_tb.Text : PA3 = 客戶編號_tb.Text : PA4 = 流水號_tb.Text : PA5 = 送貨地點_cb.Text : NU1 = 司機運費_tb.Text : NU2 = 管銷費用_tb.Text
+                NU3 = 稅金_tb.Text
                 SQL_銷售控制表_修改() '--------------------資料修改
 
                 For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
@@ -829,6 +853,7 @@ Public Class 銷售單申請
 
                 DTP = Format(開單日期_dtp.Value, "yyyy/MM/dd") : DTP1 = Format(交貨日期_dtp.Value, "yyyy/MM/dd") : BL1 = 含稅_ch.Checked : 運費 = 司機運費_tb.Text
                 PA1 = 流水號_tb.Text : PA2 = 單號_tb.Text : PA3 = 客戶編號_tb.Text : PA4 = 流水號_tb.Text : PA5 = 送貨地點_cb.Text : NU1 = 司機運費_tb.Text : NU2 = 管銷費用_tb.Text
+                NU3 = 稅金_tb.Text
                 SQL_銷售控制表_修改() '--------------------資料修改
 
                 For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
@@ -883,66 +908,67 @@ Public Class 銷售單申請
                             PA1 = 單號_tb.Text : PA2 = 料號_tb.Text : PA3 = 倉庫編號_tb.Text
                             SQL_銷售明細表_確認單據是否申請()
                             If dr.Read() Then
-                                conn.Close() : MsgBox("該料號已經在本單據中申請過了，如要修改，請直接到單據中尋找並修改。")
+                                conn.Close() : MsgBox("該料號已經在本單據中申請過了，如果是標準規格品，請不要重複開兩次。")
                             Else
-                                SQL_銷售明細表_最後一筆資料()
+                            End If
+
+                            SQL_銷售明細表_最後一筆資料()
+                            If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("資料流水號").ToString, 9)) : Else : EDR = 0 : End If
+                            conn.Close() : EDR += 1
+                            If EDR < 10 Then : ESTR = "SA" & "00000000" & EDR
+                            ElseIf EDR > 9 And EDR < 100 Then : ESTR = "SA" & "0000000" & EDR
+                            ElseIf EDR > 99 And EDR < 1000 Then : ESTR = "SA" & "000000" & EDR
+                            ElseIf EDR > 999 And EDR < 10000 Then : ESTR = "SA" & "00000" & EDR
+                            ElseIf EDR > 9999 And EDR < 100000 Then : ESTR = "SA" & "0000" & EDR
+                            ElseIf EDR > 99999 And EDR < 100000 Then : ESTR = "SA" & "000" & EDR
+                            ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "SA" & "00" & EDR
+                            ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "SA" & "0" & EDR
+                            ElseIf EDR > 99999999 Then : ESTR = "SA" & EDR : End If
+
+                            Set_日期格式轉換()
+                            PA3 = ESTR : PA4 = 單號_tb.Text : PA5 = 倉庫級別_tb.Text : PA6 = 倉庫編號_tb.Text : NU1 = 訂購數量_nud.Value : NU2 = 成本_nud.Value : NU3 = 售價_nud.Value
+                            PA7 = 儲態編號_cb.Text : PA8 = 訂製編碼_cb.Text : BL2 = 含稅_ch.Checked : PA10 = 倉庫編號_tb.Text
+                            If Val(可申請_tb.Text) > 0 Then
+                                PA9 = "已有貨"
+                                SQL_銷售單申請_銷售明細表_新增()
+
+                                If 調庫單號_tb.Text = "" Then
+                                    Set_日期格式轉換()
+                                    For i As Integer = 1 To 999
+                                        NUM1 = 0 + i
+                                        If NUM1 < 10 Then : 調庫單號_tb.Text = "WH-" & DTP1 & "-00" & NUM1
+                                        ElseIf NUM1 > 9 And NUM1 < 100 Then : 調庫單號_tb.Text = "WH-" & DTP1 & "-0" & NUM1
+                                        ElseIf NUM1 > 99 Then : 調庫單號_tb.Text = "WH-" & DTP1 & "-" & NUM1
+                                        End If
+                                        PA1 = 調庫單號_tb.Text
+                                        SQL_倉儲明細執行單號_執行單號驗證()
+                                        If dr.Read() Then : Else : i = 999 : conn.Close() : End If : conn.Close()
+                                    Next
+                                    SQL_倉儲明細執行單號_新增() : conn.Close()
+                                End If
+
+                                SQL_倉儲明細表_最後一筆資料()
                                 If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("資料流水號").ToString, 9)) : Else : EDR = 0 : End If
                                 conn.Close() : EDR += 1
-                                If EDR < 10 Then : ESTR = "SA" & "00000000" & EDR
-                                ElseIf EDR > 9 And EDR < 100 Then : ESTR = "SA" & "0000000" & EDR
-                                ElseIf EDR > 99 And EDR < 1000 Then : ESTR = "SA" & "000000" & EDR
-                                ElseIf EDR > 999 And EDR < 10000 Then : ESTR = "SA" & "00000" & EDR
-                                ElseIf EDR > 9999 And EDR < 100000 Then : ESTR = "SA" & "0000" & EDR
-                                ElseIf EDR > 99999 And EDR < 100000 Then : ESTR = "SA" & "000" & EDR
-                                ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "SA" & "00" & EDR
-                                ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "SA" & "0" & EDR
-                                ElseIf EDR > 99999999 Then : ESTR = "SA" & EDR : End If
-
-                                Set_日期格式轉換()
-                                PA3 = ESTR : PA4 = 單號_tb.Text : PA5 = 倉庫級別_tb.Text : PA6 = 倉庫編號_tb.Text : NU1 = 訂購數量_nud.Value : NU2 = 成本_nud.Value : NU3 = 售價_nud.Value
-                                PA7 = 儲態編號_cb.Text : PA8 = 訂製編碼_cb.Text : BL2 = 含稅_ch.Checked : PA10 = 倉庫編號_tb.Text
-                                If Val(可申請_tb.Text) > 0 Then
-                                    PA9 = "已有貨"
-                                    SQL_銷售單申請_銷售明細表_新增()
-
-                                    If 調庫單號_tb.Text = "" Then
-                                        Set_日期格式轉換()
-                                        For i As Integer = 1 To 999
-                                            NUM1 = 0 + i
-                                            If NUM1 < 10 Then : 調庫單號_tb.Text = "WH-" & DTP1 & "-00" & NUM1
-                                            ElseIf NUM1 > 9 And NUM1 < 100 Then : 調庫單號_tb.Text = "WH-" & DTP1 & "-0" & NUM1
-                                            ElseIf NUM1 > 99 Then : 調庫單號_tb.Text = "WH-" & DTP1 & "-" & NUM1
-                                            End If
-                                            PA1 = 調庫單號_tb.Text
-                                            SQL_倉儲明細執行單號_執行單號驗證()
-                                            If dr.Read() Then : Else : i = 999 : conn.Close() : End If : conn.Close()
-                                        Next
-                                        SQL_倉儲明細執行單號_新增() : conn.Close()
-                                    End If
-
-                                    SQL_倉儲明細表_最後一筆資料()
-                                    If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("資料流水號").ToString, 9)) : Else : EDR = 0 : End If
-                                    conn.Close() : EDR += 1
-                                    If EDR < 10 Then : ESTR = "WH" & "00000000" & EDR
-                                    ElseIf EDR > 9 And EDR < 100 Then : ESTR = "WH" & "0000000" & EDR
-                                    ElseIf EDR > 99 And EDR < 1000 Then : ESTR = "WH" & "000000" & EDR
-                                    ElseIf EDR > 999 And EDR < 10000 Then : ESTR = "WH" & "00000" & EDR
-                                    ElseIf EDR > 9999 And EDR < 100000 Then : ESTR = "WH" & "0000" & EDR
-                                    ElseIf EDR > 99999 And EDR < 100000 Then : ESTR = "WH" & "000" & EDR
-                                    ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "WH" & "00" & EDR
-                                    ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "WH" & "0" & EDR
-                                    ElseIf EDR > 99999999 Then : ESTR = "WH" & EDR : End If
-
-                                    PA3 = ESTR : PA4 = 調庫單號_tb.Text : PA5 = 倉庫級別_tb.Text : PA6 = 倉庫編號_tb.Text : PA9 = 單號_tb.Text
-                                    SQL_銷售單申請_倉儲明細表_銷售出庫()
-                                    Set_清單4()
-                                ElseIf Val(可申請_tb.Text) = 0 Then
-                                    PA9 = "未有貨"
-                                    SQL_銷售單申請_銷售明細表_新增()
-                                    Set_清單4()
-                                End If : conn.Close()
-                                Set_清單()
-                            End If
+                                If EDR < 10 Then : ESTR = "WH" & "00000000" & EDR
+                                ElseIf EDR > 9 And EDR < 100 Then : ESTR = "WH" & "0000000" & EDR
+                                ElseIf EDR > 99 And EDR < 1000 Then : ESTR = "WH" & "000000" & EDR
+                                ElseIf EDR > 999 And EDR < 10000 Then : ESTR = "WH" & "00000" & EDR
+                                ElseIf EDR > 9999 And EDR < 100000 Then : ESTR = "WH" & "0000" & EDR
+                                ElseIf EDR > 99999 And EDR < 100000 Then : ESTR = "WH" & "000" & EDR
+                                ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "WH" & "00" & EDR
+                                ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "WH" & "0" & EDR
+                                ElseIf EDR > 99999999 Then : ESTR = "WH" & EDR : End If
+
+                                PA3 = ESTR : PA4 = 調庫單號_tb.Text : PA5 = 倉庫級別_tb.Text : PA6 = 倉庫編號_tb.Text : PA9 = 單號_tb.Text
+                                SQL_銷售單申請_倉儲明細表_銷售出庫()
+                                Set_清單4()
+                            ElseIf Val(可申請_tb.Text) = 0 Then
+                                PA9 = "未有貨"
+                                SQL_銷售單申請_銷售明細表_新增()
+                                Set_清單4()
+                            End If : conn.Close()
+                            Set_清單()
                         End If
                     End If
                 End If
@@ -1042,7 +1068,7 @@ Public Class 銷售單申請
                     MsgBox("沒有選擇收款事項，無法作業。")
                 Else
                     If 項次3_tb.Text = "0" Then
-                        MsgBox("不能刪除 [未收餘額] 選項!!")
+                        MsgBox("不能刪除 [未收餘額] 或 [刷卡] 選項!!")
                     Else
                         Dim aa1 As MsgBoxResult = MsgBox("你確定要刪除這筆資料?", MsgBoxStyle.OkCancel)
                         If aa1 = MsgBoxResult.Ok Then
@@ -1054,6 +1080,44 @@ Public Class 銷售單申請
             End If
         End If
     End Sub
+    Private Sub 刷卡收款_bt_Click(sender As Object, e As EventArgs) Handles 刷卡收款_bt.Click
+        If 流水號_tb.Text = "" Then
+            MsgBox("沒有銷售單號，無法作業。")
+        Else
+            SQL_銷售收款事項_最後一筆資料()
+            If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("資料流水號").ToString, 9)) : Else : EDR = 0 : End If
+            conn.Close() : EDR += 1
+            If EDR < 10 Then : ESTR = "ST" & "00000000" & EDR
+            ElseIf EDR > 9 And EDR < 100 Then : ESTR = "ST" & "0000000" & EDR
+            ElseIf EDR > 99 And EDR < 1000 Then : ESTR = "ST" & "000000" & EDR
+            ElseIf EDR > 999 And EDR < 10000 Then : ESTR = "ST" & "00000" & EDR
+            ElseIf EDR > 9999 And EDR < 100000 Then : ESTR = "ST" & "0000" & EDR
+            ElseIf EDR > 99999 And EDR < 100000 Then : ESTR = "ST" & "000" & EDR
+            ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "ST" & "00" & EDR
+            ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "ST" & "0" & EDR
+            ElseIf EDR > 99999999 Then : ESTR = "ST" & EDR : End If
+            PA1 = ESTR
+
+            SQL_銷售收款事項_最後一筆項次()
+            If dr.Read() Then : EDR = dr("項次").ToString : Else : EDR = 0 : End If
+            conn.Close() : EDR += 1
+            If EDR < 10 Then : ESTR = EDR
+            ElseIf EDR > 9 And EDR < 100 Then : ESTR = EDR : End If
+            PA2 = ESTR : PA = 單號_tb.Text
+            SQL_銷售收款事項_新增3()
+
+            For i As Integer = 0 To 收款事項_dgv.Rows.Count - 1
+                資料數 = 收款事項_dgv.Rows.Count : MyModule1.進度條()
+                PA10 = 收款事項_dgv.Rows(i).Cells("內容").Value : PA11 = 收款事項_dgv.Rows(i).Cells("資料流水號").Value
+                NU1 = 收款事項_dgv.Rows(i).Cells("金額").Value
+                SQL_銷售收款事項_修改() : conn.Close()
+            Next : YD_ERP_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
+
+            Set_清單6()
+
+            刷卡控制 = True : 含稅_ch.Checked = True : 刷卡控制 = False
+        End If
+    End Sub
     Private Sub 新增一筆收款事項_bt_Click(sender As Object, e As EventArgs) Handles 新增一筆收款事項_bt.Click
         If 流水號_tb.Text = "" Then
             MsgBox("沒有銷售單號，無法作業。")
@@ -1105,15 +1169,23 @@ Public Class 銷售單申請
         Next : YD_ERP_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
     End Sub
     Private Sub Reset_bt_Click(sender As Object, e As EventArgs) Handles Reset_bt.Click
-        Dim 不含1類銷售小記 As Integer
+        Dim 不含1類銷售小記 As Integer : Dim 金額1 As Integer = 0
         售價小計_tb.Text = "0" : 稅金_tb.Text = "0" : 銷售合計_tb.Text = "0" : 收入小計_tb.Text = "0" : 支出小計_tb.Text = "0" : 額外收支_tb.Text = "0" : 物料成本_tb.Text = "0"
-        司機運費_tb.Text = "0" : 管銷費用_tb.Text = "0" : 其他成本_tb.Text = "0"
+        司機運費_tb.Text = "0" : 管銷費用_tb.Text = "0" : 其他成本_tb.Text = "0" : 刷卡總和_tb.Text = "0" : 刷卡稅金_tb.Text = "0" : 刷卡傭金_tb.Text = "0"
+        '-------001-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+        For i As Integer = 0 To 收款事項_dgv.Rows.Count - 1
+            If 收款事項_dgv("真項次", i).Value.ToString = "0" And 收款事項_dgv("內容", i).Value.ToString <> "未收餘額" Then
+                刷卡總和_tb.Text = Val(刷卡總和_tb.Text) + 收款事項_dgv("金額", i).Value
+            End If
+        Next
+        刷卡稅金_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 * 銷售明細_dgv("單價", i).Value)
 
             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 * 銷售明細_dgv("單價", i).Value)
+                不含1類銷售小記 = 不含1類銷售小記 + 銷售明細_dgv("售價", i).Value
             End If
             If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) = 1 Then
                 其他成本_tb.Text = Val(其他成本_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value)
@@ -1126,38 +1198,51 @@ Public Class 銷售單申請
         管銷費用_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)
+        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
+        '-------003-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         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
         Next
         額外收支_tb.Text = Val(收入小計_tb.Text) - Val(支出小計_tb.Text)
-
+        '-------004-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         Dim 金額 As Integer = 0
         For i As Integer = 0 To 收款事項_dgv.Rows.Count - 1
-            If 收款事項_dgv("真項次", i).Value.ToString <> "0" Then
+            If 收款事項_dgv("真項次", i).Value.ToString <> "0" And 收款事項_dgv("內容", i).Value.ToString <> "未收餘額" Then
+                金額 = 金額 + 收款事項_dgv("金額", i).Value
+            ElseIf 收款事項_dgv("真項次", i).Value.ToString = "0" And 收款事項_dgv("內容", i).Value.ToString <> "未收餘額" Then
                 金額 = 金額 + 收款事項_dgv("金額", i).Value
-            ElseIf 收款事項_dgv("真項次", i).Value.ToString = "0" Then
+            ElseIf 收款事項_dgv("真項次", i).Value.ToString = "0" And 收款事項_dgv("內容", i).Value.ToString = "未收餘額" Then
                 收款事項_dgv("金額", i).Value = CInt(Val(銷售合計_tb.Text)) - 金額
             End If
         Next
-
+        '-------005-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         If 送貨地點_cb.Text = "" Or 送貨地點_cb.Text = "自取" Or 最低運費_cb.Text = "" Or 最低售價_cb.Text = "" Then
             司機運費_tb.Text = "0"
         Else
             If (不含1類銷售小記 - Val(其他成本_tb.Text)) <= Val(最低售價_cb.Text) Then
                 司機運費_tb.Text = 最低運費_cb.Text
             ElseIf (不含1類銷售小記 - Val(其他成本_tb.Text)) > Val(最低售價_cb.Text) Then
-                司機運費_tb.Text = (不含1類銷售小記 - Val(其他成本_tb.Text)) / 100 * 3
+                司機運費_tb.Text = (不含1類銷售小記 - Val(稅金_tb.Text) - Val(刷卡傭金_tb.Text) - Val(其他成本_tb.Text)) / 100 * 3
             End If
         End If
         存檔1()
-
-        預估利潤_tb.Text = Val(售價小計_tb.Text) + Val(額外收支_tb.Text) - Val(其他成本_tb.Text) - Val(物料成本_tb.Text) - Val(司機運費_tb.Text) - Val(管銷費用_tb.Text)
-
+        '-------006-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+        預估利潤_tb.Text = Val(售價小計_tb.Text) + Val(額外收支_tb.Text) - Val(其他成本_tb.Text) - Val(物料成本_tb.Text) - Val(司機運費_tb.Text) - Val(管銷費用_tb.Text) - Val(刷卡傭金_tb.Text)
+        '-------007-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
         售價小計_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") : 預估利潤_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 司機運費_tb_TextChanged(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles 司機運費_tb.KeyPress
         If e.KeyChar = Chr(13) Then