20230527備份

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

@@ -3,7 +3,7 @@
     Public g_conn_type, gUserName, 登入人職稱, 登入人級別, 登入人組別, 登入人IP, 版本號, Target, Target1, Target2, FTP帳號, FTP密碼, FTP物理位置, 業務號碼, AA(99), 類別 As String
     Public BB(99), CC(99), 登入判斷 As Boolean
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2023050601"
+    Public 版本 As String = "2023052301"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 列印用SQL, 列印用SQL2, 公司編號, 公司電話, 公司統編, 公司地址, 關鍵字編號, 進度條後墜 As String
     '----系統閒置-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

YD-ERP-SYS/倉儲系統管理/單據狀態查詢.vb

@@ -386,10 +386,14 @@ Public Class 單據狀態查詢
         End Try
     End Sub
     Private Sub 銷售單進出庫狀態_bt_Click(sender As Object, e As EventArgs) Handles 銷售單進出庫狀態_bt.Click
-        PA = 單號_tb.Text : SQL_銷售控制表_出貨修改() : PA = "" : Set_清單1() : Set_清單4() : Set_清單2() : Set_清單3() : MsgBox("修改完成!!!")
+        If 單號_tb.Text = "" Then : MsgBox("沒已選則單號!!") : Else
+            PA = 單號_tb.Text : SQL_銷售控制表_出貨修改() : PA = "" : Set_清單1() : Set_清單4() : Set_清單2() : Set_清單3() : MsgBox("修改完成!!!")
+        End If
     End Sub
     Private Sub 銷售單退出庫狀態_bt_Click(sender As Object, e As EventArgs) Handles 銷售單退出庫狀態_bt.Click
-        PA = 單號_tb.Text : SQL_銷售控制表_出貨返回() : PA = "" : Set_清單1() : Set_清單4() : Set_清單2() : Set_清單3() : MsgBox("退單完成!!!")
+        If 單號_tb.Text = "" Then : MsgBox("沒已選則單號!!") : Else
+            PA = 單號_tb.Text : SQL_銷售控制表_出貨返回() : PA = "" : Set_清單1() : Set_清單4() : Set_清單2() : Set_清單3() : MsgBox("退單完成!!!")
+        End If
     End Sub
     Private Sub 銷售明細退出庫_bt_Click(sender As Object, e As EventArgs) Handles 銷售明細退出庫_bt.Click
         Try
@@ -402,18 +406,24 @@ Public Class 單據狀態查詢
         End Try
     End Sub
     Private Sub 銷售單進採購狀態_bt_Click(sender As Object, e As EventArgs) Handles 銷售單進採購狀態_bt.Click
-        PA = 單號_tb.Text : SQL_銷售控制表_轉採購修改() : PA = "" : Set_清單1() : Set_清單4() : Set_清單2() : Set_清單3() : MsgBox("修改完成!!!")
+        If 單號_tb.Text = "" Then : MsgBox("沒已選則單號!!") : Else
+            PA = 單號_tb.Text : SQL_銷售控制表_轉採購修改() : PA = "" : Set_清單1() : Set_清單4() : Set_清單2() : Set_清單3() : MsgBox("修改完成!!!")
+        End If
     End Sub
     Private Sub 單據驗證跳過_bt_Click(sender As Object, e As EventArgs) Handles 單據驗證跳過_bt.Click
-        If 已出貨_ch.Checked = True And 轉採購_ch.Checked = True Then
-            PA = 單號_tb.Text : SQL_銷售控制表_驗證跳過() : PA = "" : Set_清單1() : Set_清單4() : Set_清單2() : Set_清單3() : MsgBox("修改完成!!!")
-        Else : MsgBox("單據還未走完流程!!!") : End If
+        If 單號_tb.Text = "" Then : MsgBox("沒已選則單號!!") : Else
+            If 已出貨_ch.Checked = True And 轉採購_ch.Checked = True Then
+                PA = 單號_tb.Text : SQL_銷售控制表_驗證跳過() : PA = "" : Set_清單1() : Set_清單4() : Set_清單2() : Set_清單3() : MsgBox("修改完成!!!")
+            Else : MsgBox("單據還未走完流程!!!") : End If
+        End If
     End Sub
     Private Sub 銷售明細退庫_bt_Click(sender As Object, e As EventArgs) Handles 銷售明細退庫_bt.Click
         PA = 單號_tb.Text : PA1 = 料號_tb.Text : SQL_銷售明細_出貨返回_單筆() : PA = "" : PA1 = "" : Set_清單1() : Set_清單4() : Set_清單2() : Set_清單3() : MsgBox("退單完成!!!")
     End Sub
     Private Sub 退採購_bt_Click(sender As Object, e As EventArgs) Handles 退採購_bt.Click
-        PA = 單號_tb.Text : SQL_銷售控制表_轉採購返回() : PA = "" : Set_清單1() : Set_清單4() : Set_清單2() : Set_清單3() : MsgBox("退單完成!!!")
+        If 單號_tb.Text = "" Then : MsgBox("沒已選則單號!!") : Else
+            PA = 單號_tb.Text : SQL_銷售控制表_轉採購返回() : PA = "" : Set_清單1() : Set_清單4() : Set_清單2() : Set_清單3() : MsgBox("退單完成!!!")
+        End If
     End Sub
     Private Sub 驗證計算_bt_Click(sender As Object, e As EventArgs) Handles 驗證計算_bt.Click
         Try
@@ -456,7 +466,6 @@ Public Class 單據狀態查詢
         Catch ex As Exception
             MsgBox(ex.Message)
         End Try
-
     End Sub
     Private Sub 銷售轉採購_bt_Click(sender As Object, e As EventArgs) Handles 銷售轉採購_bt.Click
         Try

YD-ERP-SYS/財務系統管理/高層客製報表.vb

@@ -151,9 +151,9 @@
             新增資料流水1() : PA2 = "1.刷卡" : PA3 = "支票" : SQL_客製表2_新增()
             新增資料流水1() : PA2 = "2.雅邸" : PA3 = "活存" : SQL_客製表2_新增()
             新增資料流水1() : PA2 = "3.呂苡瑄" : PA3 = "活存" : SQL_客製表2_新增()
-            新增資料流水1() : PA2 = "4.國泰世華" : PA3 = "活存" : SQL_客製表2_新增()
-            新增資料流水1() : PA2 = "5.EDA" : PA3 = "" : SQL_客製表2_新增()
-            新增資料流水1() : PA2 = "6.Doris" : PA3 = "" : SQL_客製表2_新增()
+            新增資料流水1() : PA2 = "4.Doris" : PA3 = "" : SQL_客製表2_新增()
+            新增資料流水1() : PA2 = "5.國泰世華" : PA3 = "活存" : SQL_客製表2_新增()
+            新增資料流水1() : PA2 = "6.EDA" : PA3 = "" : SQL_客製表2_新增()
             新增資料流水1() : PA2 = "7.合計" : PA3 = "" : SQL_客製表2_新增()
             Set_清單4()
         End If
@@ -495,16 +495,11 @@
         SQL_客製表1_最後一筆資料()
         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 = "YD" & "00000000" & EDR
-        ElseIf EDR > 9 And EDR < 100 Then : ESTR = "YD" & "0000000" & EDR
-        ElseIf EDR > 99 And EDR < 1000 Then : ESTR = "YD" & "000000" & EDR
-        ElseIf EDR > 999 And EDR < 10000 Then : ESTR = "YD" & "00000" & EDR
-        ElseIf EDR > 9999 And EDR < 100000 Then : ESTR = "YD" & "0000" & EDR
-        ElseIf EDR > 99999 And EDR < 100000 Then : ESTR = "YD" & "000" & EDR
-        ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "YD" & "00" & EDR
-        ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "YD" & "0" & EDR
-        ElseIf EDR > 99999999 Then : ESTR = "YD" & EDR : End If
-        PA1 = ESTR
+        If EDR < 10 Then : ESTR = "YD" & "00000000" & EDR : ElseIf EDR > 9 And EDR < 100 Then : ESTR = "YD" & "0000000" & EDR
+        ElseIf EDR > 99 And EDR < 1000 Then : ESTR = "YD" & "000000" & EDR : ElseIf EDR > 999 And EDR < 10000 Then : ESTR = "YD" & "00000" & EDR
+        ElseIf EDR > 9999 And EDR < 100000 Then : ESTR = "YD" & "0000" & EDR : ElseIf EDR > 99999 And EDR < 100000 Then : ESTR = "YD" & "000" & EDR
+        ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "YD" & "00" & EDR : ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "YD" & "0" & EDR
+        ElseIf EDR > 99999999 Then : ESTR = "YD" & EDR : End If : PA1 = ESTR
     End Sub
     Private Sub 新增一筆資料1_bt_Click(sender As Object, e As EventArgs) Handles 新增一筆資料1_bt.Click
         存檔() : 類別 = "A" : PA = Strings.Format(開單日期_dtp.Value, "yyyy/MM/dd") : PA2 = "" : 新增資料流水() : SQL_客製表1_新增() : Set_清單1()