20210830備份

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 = "2021082701"
+    Public 版本 As String = "2021083001"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     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/業務系統管理/訂單控制表.vb

@@ -204,6 +204,7 @@ Public Class 訂單控制表
             End If
             If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) = "1" Then
                 其他成本_tb.Text = Val(其他成本_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value)
+                '不含1類銷售小記 = 不含1類銷售小記 - 銷售明細_dgv("成本", i).Value
             End If
 
             If 銷售明細_dgv("含稅", i).Value = True Then
@@ -256,7 +257,7 @@ 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) - Val(刷卡傭金_tb.Text) - Val(其他成本_tb.Text)) / 100 * 3
+                    司機運費_tb.Text = (不含1類銷售小記 - Val(稅金_tb.Text) - Val(刷卡傭金_tb.Text)) / 100 * 3 ' - Val(其他成本_tb.Text)
                 End If
             Else
                 司機運費_tb.Text = 運費

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

@@ -324,6 +324,7 @@ Public Class 銷售單審核
             End If
             If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) = "1" Then
                 其他成本_tb.Text = Val(其他成本_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value)
+                '不含1類銷售小記 = 不含1類銷售小記 - 銷售明細_dgv("成本", i).Value
             End If
 
             If 銷售明細_dgv("含稅", i).Value = True Then
@@ -376,7 +377,7 @@ 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) - Val(刷卡傭金_tb.Text) - Val(其他成本_tb.Text)) / 100 * 3
+                    司機運費_tb.Text = (不含1類銷售小記 - Val(稅金_tb.Text) - Val(刷卡傭金_tb.Text)) / 100 * 3 ' - Val(其他成本_tb.Text)
                 End If
             Else
                 司機運費_tb.Text = 運費
@@ -1249,6 +1250,7 @@ Public Class 銷售單審核
             End If
             If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) = "1" Then
                 其他成本_tb.Text = Val(其他成本_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value)
+                '不含1類銷售小記 = 不含1類銷售小記 - 銷售明細_dgv("成本", i).Value
             End If
 
             If 銷售明細_dgv("含稅", i).Value = True Then
@@ -1300,7 +1302,7 @@ 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) - Val(刷卡傭金_tb.Text) - Val(其他成本_tb.Text)) / 100 * 3
+                司機運費_tb.Text = (不含1類銷售小記 - Val(稅金_tb.Text) - Val(刷卡傭金_tb.Text)) / 100 * 3 ' - Val(其他成本_tb.Text)
             End If
         End If
         存檔1()
@@ -1360,6 +1362,7 @@ Public Class 銷售單審核
             End If
             If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) = "1" Then
                 其他成本_tb.Text = Val(其他成本_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value)
+                '不含1類銷售小記 = 不含1類銷售小記 - 銷售明細_dgv("成本", i).Value
             End If
 
             If 銷售明細_dgv("含稅", i).Value = True Then
@@ -1405,7 +1408,7 @@ 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) - Val(刷卡傭金_tb.Text) - Val(其他成本_tb.Text)) / 100 * 3
+                    司機運費_tb.Text = (不含1類銷售小記 - Val(稅金_tb.Text) - Val(刷卡傭金_tb.Text)) / 100 * 3 ' - Val(其他成本_tb.Text)
                 End If
             Else
                 司機運費_tb.Text = 運費

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

@@ -30,12 +30,12 @@ Partial Class 銷售單申請
         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 DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle14 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()
         Me.銷售單據_dgv = New System.Windows.Forms.DataGridView()
@@ -1000,7 +1000,6 @@ Partial Class 銷售單申請
         Me.Panel1.Controls.Add(Me.新增衍生運費_bt)
         Me.Panel1.Controls.Add(Me.項次4_tb)
         Me.Panel1.Controls.Add(Me.Label49)
-        Me.Panel1.Controls.Add(Me.銷售衍生運費_dgv)
         Me.Panel1.Controls.Add(Me.刷卡可刪除_ch)
         Me.Panel1.Controls.Add(Me.通知_lb)
         Me.Panel1.Controls.Add(Me.刷卡總和_tb)
@@ -1056,15 +1055,16 @@ Partial Class 銷售單申請
         Me.Panel1.Controls.Add(Me.訂製編碼_cb)
         Me.Panel1.Controls.Add(Me.流水號_tb)
         Me.Panel1.Controls.Add(Me.Label1)
-        Me.Panel1.Controls.Add(Me.銷售明細_dgv)
         Me.Panel1.Controls.Add(Me.收款事項_dgv)
         Me.Panel1.Controls.Add(Me.Label28)
         Me.Panel1.Controls.Add(Me.刪除單據上點選的資料_bt)
         Me.Panel1.Controls.Add(Me.Label20)
         Me.Panel1.Controls.Add(Me.Label39)
         Me.Panel1.Controls.Add(Me.Label40)
-        Me.Panel1.Controls.Add(Me.銷售備註_dgv)
         Me.Panel1.Controls.Add(Me.Label51)
+        Me.Panel1.Controls.Add(Me.銷售明細_dgv)
+        Me.Panel1.Controls.Add(Me.銷售衍生運費_dgv)
+        Me.Panel1.Controls.Add(Me.銷售備註_dgv)
         Me.Panel1.Location = New System.Drawing.Point(1, 172)
         Me.Panel1.Name = "Panel1"
         Me.Panel1.Size = New System.Drawing.Size(924, 502)
@@ -1123,8 +1123,8 @@ Partial Class 銷售單申請
         '
         '銷售衍生運費_dgv
         '
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.銷售衍生運費_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
+        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
         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
@@ -1132,9 +1132,9 @@ Partial Class 銷售單申請
         Me.銷售衍生運費_dgv.Location = New System.Drawing.Point(3, 542)
         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
+        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
         Me.銷售衍生運費_dgv.RowTemplate.Height = 24
         Me.銷售衍生運費_dgv.Size = New System.Drawing.Size(725, 102)
         Me.銷售衍生運費_dgv.TabIndex = 1334
@@ -1398,7 +1398,7 @@ 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(419, 391)
+        Me.項次3_tb.Location = New System.Drawing.Point(419, 390)
         Me.項次3_tb.Name = "項次3_tb"
         Me.項次3_tb.Size = New System.Drawing.Size(32, 23)
         Me.項次3_tb.TabIndex = 1290
@@ -1660,17 +1660,17 @@ Partial Class 銷售單申請
         '
         '客戶資料_dgv
         '
-        DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.客戶資料_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
+        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
         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, 14052)
+        Me.客戶資料_dgv.Location = New System.Drawing.Point(17, 14326)
         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
+        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
         Me.客戶資料_dgv.RowTemplate.Height = 24
         Me.客戶資料_dgv.Size = New System.Drawing.Size(191, 92)
         Me.客戶資料_dgv.TabIndex = 1254
@@ -1678,8 +1678,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
+        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.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
@@ -1687,9 +1687,9 @@ Partial Class 銷售單申請
         Me.收款事項_dgv.Location = New System.Drawing.Point(3, 669)
         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
+        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(725, 102)
         Me.收款事項_dgv.TabIndex = 1282

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

@@ -324,6 +324,7 @@ Public Class 銷售單申請
             End If
             If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) = "1" Then
                 其他成本_tb.Text = Val(其他成本_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value)
+                '不含1類銷售小記 = 不含1類銷售小記 - 銷售明細_dgv("成本", i).Value
             End If
 
             If 銷售明細_dgv("含稅", i).Value = True Then
@@ -376,7 +377,7 @@ 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) - Val(刷卡傭金_tb.Text) - Val(其他成本_tb.Text)) / 100 * 3
+                    司機運費_tb.Text = (不含1類銷售小記 - Val(稅金_tb.Text) - Val(刷卡傭金_tb.Text)) / 100 * 3 ' - Val(其他成本_tb.Text)
                 End If
             Else
                 司機運費_tb.Text = 運費
@@ -1327,6 +1328,7 @@ Public Class 銷售單申請
             End If
             If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) = "1" Then
                 其他成本_tb.Text = Val(其他成本_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value)
+                '不含1類銷售小記 = 不含1類銷售小記 - 銷售明細_dgv("成本", i).Value
             End If
 
             If 銷售明細_dgv("含稅", i).Value = True Then
@@ -1378,7 +1380,7 @@ 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) - Val(刷卡傭金_tb.Text) - Val(其他成本_tb.Text)) / 100 * 3
+                司機運費_tb.Text = (不含1類銷售小記 - Val(稅金_tb.Text) - Val(刷卡傭金_tb.Text)) / 100 * 3 ' - Val(其他成本_tb.Text)
             End If
         End If
         存檔1()
@@ -1432,6 +1434,7 @@ Public Class 銷售單申請
             End If
             If Strings.Left(銷售明細_dgv("料號", i).Value.ToString, 1) = "1" Then
                 其他成本_tb.Text = Val(其他成本_tb.Text) + (銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value)
+                '不含1類銷售小記 = 不含1類銷售小記 - 銷售明細_dgv("成本", i).Value
             End If
 
             If 銷售明細_dgv("含稅", i).Value = True Then
@@ -1477,7 +1480,7 @@ 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) - Val(刷卡傭金_tb.Text) - Val(其他成本_tb.Text)) / 100 * 3
+                    司機運費_tb.Text = (不含1類銷售小記 - Val(稅金_tb.Text) - Val(刷卡傭金_tb.Text)) / 100 * 3 ' - Val(其他成本_tb.Text)
                 End If
             Else
                 司機運費_tb.Text = 運費