20211002備份

YD-ERP-SYS/LoginForm1.Designer.vb

@@ -46,6 +46,7 @@ Partial Class LoginForm1
         Me.UsernameLabel = New System.Windows.Forms.Label()
         Me.LogoPictureBox = New System.Windows.Forms.PictureBox()
         Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
+        Me.UPDATE_bt = New System.Windows.Forms.Button()
         CType(Me.FTP清單_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LogoPictureBox, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -118,7 +119,7 @@ Partial Class LoginForm1
         Me.Label3.AutoSize = True
         Me.Label3.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Label3.ForeColor = System.Drawing.Color.Red
-        Me.Label3.Location = New System.Drawing.Point(481, 22)
+        Me.Label3.Location = New System.Drawing.Point(481, 19)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(188, 48)
         Me.Label3.TabIndex = 661
@@ -136,10 +137,10 @@ Partial Class LoginForm1
         '
         'FTP執行檔_wb
         '
-        Me.FTP執行檔_wb.Location = New System.Drawing.Point(484, 73)
+        Me.FTP執行檔_wb.Location = New System.Drawing.Point(484, 103)
         Me.FTP執行檔_wb.MinimumSize = New System.Drawing.Size(20, 20)
         Me.FTP執行檔_wb.Name = "FTP執行檔_wb"
-        Me.FTP執行檔_wb.Size = New System.Drawing.Size(187, 159)
+        Me.FTP執行檔_wb.Size = New System.Drawing.Size(187, 129)
         Me.FTP執行檔_wb.TabIndex = 659
         Me.FTP執行檔_wb.Url = New System.Uri("", System.UriKind.Relative)
         '
@@ -238,7 +239,7 @@ Partial Class LoginForm1
         Me.PasswordLabel.BackColor = System.Drawing.Color.White
         Me.PasswordLabel.Location = New System.Drawing.Point(265, 83)
         Me.PasswordLabel.Name = "PasswordLabel"
-        Me.PasswordLabel.Size = New System.Drawing.Size(220, 23)
+        Me.PasswordLabel.Size = New System.Drawing.Size(183, 23)
         Me.PasswordLabel.TabIndex = 650
         Me.PasswordLabel.Text = "密碼(&P)"
         Me.PasswordLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -248,7 +249,7 @@ Partial Class LoginForm1
         Me.UsernameLabel.BackColor = System.Drawing.Color.White
         Me.UsernameLabel.Location = New System.Drawing.Point(265, 37)
         Me.UsernameLabel.Name = "UsernameLabel"
-        Me.UsernameLabel.Size = New System.Drawing.Size(220, 23)
+        Me.UsernameLabel.Size = New System.Drawing.Size(183, 23)
         Me.UsernameLabel.TabIndex = 648
         Me.UsernameLabel.Text = "使用者名稱(&U)"
         Me.UsernameLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -263,11 +264,22 @@ Partial Class LoginForm1
         Me.LogoPictureBox.TabIndex = 647
         Me.LogoPictureBox.TabStop = False
         '
+        'UPDATE_bt
+        '
+        Me.UPDATE_bt.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.UPDATE_bt.Location = New System.Drawing.Point(484, 67)
+        Me.UPDATE_bt.Name = "UPDATE_bt"
+        Me.UPDATE_bt.Size = New System.Drawing.Size(187, 33)
+        Me.UPDATE_bt.TabIndex = 668
+        Me.UPDATE_bt.Text = "UPDATE"
+        Me.UPDATE_bt.UseCompatibleTextRendering = True
+        '
         'LoginForm1
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(454, 240)
+        Me.ClientSize = New System.Drawing.Size(675, 240)
+        Me.Controls.Add(Me.UPDATE_bt)
         Me.Controls.Add(Me.使用者帳號_cb)
         Me.Controls.Add(Me.Label5)
         Me.Controls.Add(Me.伺服器區域_ch)
@@ -328,4 +340,5 @@ Partial Class LoginForm1
     Friend WithEvents UsernameLabel As Windows.Forms.Label
     Friend WithEvents LogoPictureBox As Windows.Forms.PictureBox
     Friend WithEvents SaveFileDialog1 As Windows.Forms.SaveFileDialog
+    Friend WithEvents UPDATE_bt As Button
 End Class

YD-ERP-SYS/LoginForm1.vb

@@ -30,11 +30,6 @@ Public Class LoginForm1
         刷卡登入_ch.Checked = True : 刷卡登入_ch.Enabled = False : 登入綁定_ch.Checked = False : 登入綁定_ch.Enabled = False : 帳號_tb.Visible = False
         執行檔版本號_lb.Text = "執行檔版本號 : " & 版本
         網段.ShowDialog()
-        If 登入判斷 = True Then
-            伺服器區域_ch.Text = "雅邸" : 確認_bt.Enabled = True : 取消_bt.Enabled = True : 刷卡登入_ch.Checked = True
-        ElseIf 登入判斷 = False Then
-            伺服器區域_ch.Text = "設計" : 確認_bt.Enabled = True : 取消_bt.Enabled = True : 刷卡登入_ch.Checked = True
-        End If
         '-----------------------調整視窗大小-----------------------------------------------------------------------------------------------------------------------------------------------
         Me.Size = New Size(466, 279)
         If screenWidth = 1920 And screenHeight = 1080 Then : Me.Location = New Point(727, 401)
@@ -44,6 +39,17 @@ Public Class LoginForm1
         ElseIf screenWidth = 1600 And screenHeight = 900 Then : Me.Location = New Point(567, 311)
         End If
         Me.ActiveControl = 使用者帳號_cb
+        '-----------------------刪除自動更新項目-----------------------------------------------------------------------------------------------------------------------------------------------
+        Dim Str As String = Application.StartupPath
+        If File.Exists(Str + "\SYS-UPDATE.exe") Then : File.Delete(Str + "\SYS-UPDATE.exe") : End If
+    End Sub
+    Private Sub LoginForm1_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
+        '-----------------------伺服器登入選擇-----------------------------------------------------------------------------------------------------------------------------------------------
+        If 登入判斷 = True Then
+            伺服器區域_ch.Text = "雅邸" : 確認_bt.Enabled = True : 取消_bt.Enabled = True : 刷卡登入_ch.Checked = True
+        ElseIf 登入判斷 = False Then
+            伺服器區域_ch.Text = "設計" : 確認_bt.Enabled = True : 取消_bt.Enabled = True : 刷卡登入_ch.Checked = True
+        End If
         '-----MAC碼與硬碟資料-------------------------------------------------------------------------------------------------------------------------------------------------------------
         Dim Wmi As New Management.ManagementObjectSearcher("SELECT * FROM Win32_NetworkAdapterConfiguration")
         For Each WmiObj As Management.ManagementObject In Wmi.Get
@@ -112,16 +118,10 @@ Public Class LoginForm1
         Dim aa1 As MsgBoxResult
         aa1 = MsgBox("系統版本號 與 資料庫版本號 對應不上，請下載最新的執行檔。", MsgBoxStyle.OkCancel)
         If aa1 = MsgBoxResult.Ok Then
-            With SaveFileDialog1 : .Filter = "所有文件(*.exe)|*.exe" : End With
-            SaveFileDialog1.FileName = "YD-ERP-SYS - " & 版本號 & ".exe"
-            SaveFileDialog1.ShowDialog()
-            If Strings.Right(SaveFileDialog1.FileName, 27) = "YD-ERP-SYS - " & 版本號 & ".exe" Then
-                My.Computer.Network.DownloadFile(Target & AA(0) & "/" & "YD-ERP-SYS - " & 版本號 & ".exe", SaveFileDialog1.FileName, "", "", True, 10000, True)
-                MsgBox("下載完成，請手動刪除就的執行檔，並且用新的執行檔開啟。")
-                Me.Close()
-            Else
-                MsgBox("操作不正確，請用手動方式下載更新。")
-            End If
+            Dim Str As String = Application.StartupPath
+            My.Computer.Network.DownloadFile(Target & AA(0) & "/" & "SYS-UPDATE.exe", Str + "\SYS-UPDATE.exe")
+            Shell(Str + "\SYS-UPDATE.exe", vbNormalFocus)
+            Me.Close()
         End If
     End Sub
     Private Sub 登入第一層()
@@ -218,4 +218,10 @@ Public Class LoginForm1
     Private Sub ComboBox2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 使用者帳號_cb.TextChanged
         帳號_tb.Text = 使用者帳號_cb.Text
     End Sub
+    Private Sub UPDATE_bt_Click(sender As Object, e As EventArgs) Handles UPDATE_bt.Click
+        Dim Str As String = Application.StartupPath
+        My.Computer.Network.DownloadFile(Target & AA(0) & "/" & "SYS-UPDATE.exe", Str + "\SYS-UPDATE.exe")
+        Shell(Str + "\SYS-UPDATE.exe", vbNormalFocus)
+        Me.Close()
+    End Sub
 End Class

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

@@ -86,14 +86,24 @@
         ConnOpen()
         SQL1 = "SELECT      銷售控制表.流水號, 銷售控制表.單號, 客戶資料表.名稱, 銷售控制表.開單日期, 銷售控制表.交貨日期, 
                             銷售控制表.含稅, 銷售控制表.單位主管, 銷售控制表.審核日期, 銷售收款事項.內容, 銷售收款事項.金額, 
-                            銷售控制表.送貨地點, 銷售控制表.運費, 銷售控制表.客戶編號, 客戶資料表.電話1, 客戶資料表.電話2,
+                            銷售控制表.送貨地點, 銷售控制表.運費, 銷售控制表.客戶編號, 客戶資料表.電話1, 客戶資料表.電話2, 
                             客戶資料表.地址, 客戶資料表.公司名稱, 客戶資料表.統編, 銷售控制表.稅金
                 FROM        銷售控制表 INNER JOIN
-                            客戶資料表 ON 銷售控制表.客戶編號 = 客戶資料表.舊編 LEFT OUTER JOIN
+                            客戶資料表 ON 銷售控制表.客戶編號 = 客戶資料表.舊編 INNER JOIN
+                                (SELECT          銷售明細表.單號
+                                  FROM               銷售明細表 INNER JOIN
+                                                              物料資料庫 ON 銷售明細表.料號 = 物料資料庫.料號
+                                  WHERE           (銷售明細表.料號 LIKE N'%" & PA21 & "%') OR
+                                                              (銷售明細表.備註 LIKE N'%" & PA21 & "%') OR
+                                                              (物料資料庫.品名 LIKE N'%" & PA21 & "%')
+                                  GROUP BY    銷售明細表.單號) AS QQQ ON 銷售控制表.單號 = QQQ.單號 LEFT OUTER JOIN
                             銷售收款事項 ON 銷售控制表.單號 = 銷售收款事項.單號
-                WHERE      (銷售控制表.單號 LIKE '" & PA19 & "%') AND (銷售收款事項.內容 LIKE '未收餘額') AND (客戶資料表.名稱 LIKE N'%" & PA20 & "%' OR 
-                            客戶資料表.電話1 LIKE N'%" & PA20 & "%' OR 客戶資料表.電話2 LIKE N'%" & PA20 & "%' OR 客戶資料表.地址 LIKE N'%" & PA20 & "%' OR 
-                            客戶資料表.公司名稱 LIKE N'%" & PA20 & "%' OR 客戶資料表.統編 LIKE N'%" & PA20 & "%')
+                WHERE      (銷售控制表.單號 LIKE '" & PA19 & "%') AND (銷售收款事項.內容 LIKE '未收餘額') AND (客戶資料表.名稱 LIKE N'%" & PA20 & "%') OR
+                           (銷售控制表.單號 LIKE '" & PA19 & "%') AND (銷售收款事項.內容 LIKE '未收餘額') AND (客戶資料表.電話1 LIKE N'%" & PA20 & "%') OR
+                           (銷售控制表.單號 LIKE '" & PA19 & "%') AND (銷售收款事項.內容 LIKE '未收餘額') AND (客戶資料表.電話2 LIKE N'%" & PA20 & "%') OR
+                           (銷售控制表.單號 LIKE '" & PA19 & "%') AND (銷售收款事項.內容 LIKE '未收餘額') AND (客戶資料表.地址 LIKE N'%" & PA20 & "%') OR
+                           (銷售控制表.單號 LIKE '" & PA19 & "%') AND (銷售收款事項.內容 LIKE '未收餘額') AND (客戶資料表.公司名稱 LIKE N'%" & PA20 & "%') OR
+                           (銷售控制表.單號 LIKE '" & PA19 & "%') AND (銷售收款事項.內容 LIKE '未收餘額') AND (客戶資料表.統編 LIKE N'%" & PA20 & "%')
                 ORDER BY    銷售控制表.單號 DESC"
         CmdSet_For_DGV()
     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 = "2021091101"
+    Public 版本 As String = "2021093001"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     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/YD-ERP-SYS.vb

@@ -86,7 +86,7 @@ Public Class YD_ERP_SYS
             業務_cb.SelectedIndex = i
             Set_清單1()
             If 銷售單據_dgv.Rows.Count > 0 Then
-                單數 = (Strings.Right(銷售單據_dgv.Rows(0).Cells("單號").Value, 6) - Strings.Right(銷售單據_dgv.Rows(銷售單據_dgv.Rows.Count - 1).Cells("單號").Value, 6)) - 銷售單據_dgv.Rows.Count
+                單數 = (Strings.Mid(銷售單據_dgv.Rows(0).Cells("單號").Value, 2, 6) - Strings.Mid(銷售單據_dgv.Rows(銷售單據_dgv.Rows.Count - 1).Cells("單號").Value, 2, 6)) - 銷售單據_dgv.Rows.Count
                 狀態1 = 業務_cb.Text & " 號業務單最後入單單號 [ " & 銷售單據_dgv.Rows(0).Cells("單號").Value & " ]，開單日期是 [ " & 銷售單據_dgv.Rows(0).Cells("開單日期").Value & " ]。 
    由單號 [" & 銷售單據_dgv.Rows(銷售單據_dgv.Rows.Count - 1).Cells("單號").Value & "]  到系統中最後一單，約有 " & 單數 & " 張單據未補齊。" & vbCrLf &
    "-------------------------------------------------------------------"

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

@@ -1 +1 @@
-a295a2c2a91acb30ae4591c544c591a7f823e28f
+53c57df21c94a96acbf03635a64eb5ec9304008f

YD-ERP-SYS/obj/Debug/YD-ERP-SYS.vbproj.FileListAbsolute.txt

@@ -511,3 +511,64 @@ D:\工巧明\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.財務_決算表.resourc
 D:\工巧明\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.財務_收支單一覽表.resources
 D:\工巧明\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.財務_收支單審核.resources
 D:\工巧明\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.財務_收支單申請.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\bin\Debug\YD-ERP-SYS.exe.config
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\bin\Debug\YD-ERP-SYS.exe
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\bin\Debug\YD-ERP-SYS.pdb
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\bin\Debug\YD-ERP-SYS.xml
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.人事資料表.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.人員ID卡系統配置設定.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.倉儲入庫.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.倉儲出庫.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.倉儲分區控制表.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.倉儲控制表.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.單據狀態查詢.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.盤盈盤損控制表.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.盤盈盤損申請.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.盤盈盤損審核.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.一般申請_採購單.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.銷售申請_採購單.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.應收帳款未收.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.應收帳款已收.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.採購單審核.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.採購應付帳款.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.採購對帳單.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.採購訂製大圖.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.客戶資料表.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.供應商資料表.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.物料檔案.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.訂單控制表.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.貨款試算表.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.銷售分析表.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.銷售單審核.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.銷售單申請.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.匯入EXCEL.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.匯出EXCEL.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.匯率管理.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.會計科目管理.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.業務獎金計算基礎.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.業績單據完單設定.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.業績獎金彙總表.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.業績運費明細表.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.財務_決算表.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.營運成本收支單_對帳表.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.財務_收支單一覽表.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.財務_收支單審核.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.財務_收支單申請.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.薪資轉帳表.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.FTP資料夾管理.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.LoginForm1.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.Resources.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.YD_ERP_SYS.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.個人帳號管理.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.簽名檔管理.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.系統使用者管理.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.系統執行檔版本管理.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.系統編碼規則.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.網段.resources
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD-ERP-SYS.vbproj.GenerateResource.cache
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD-ERP-SYS.vbproj.CoreCompileInputs.cache
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD-ERP-SYS.vbproj.CopyComplete
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD-ERP-SYS.exe
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD-ERP-SYS.xml
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD-ERP-SYS.pdb
+D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD-ERP-SYS.vbprojAssemblyReference.cache

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

@@ -23,18 +23,18 @@ Partial Class 訂單控制表
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        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 DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle43 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle44 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle45 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle46 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle47 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle48 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.業務_cb = New System.Windows.Forms.ComboBox()
         Me.銷售單據_dgv = New System.Windows.Forms.DataGridView()
         Me.未審核_lb = New System.Windows.Forms.Label()
@@ -117,6 +117,7 @@ Partial Class 訂單控制表
         Me.Label40 = New System.Windows.Forms.Label()
         Me.Label20 = New System.Windows.Forms.Label()
         Me.銷售明細_dgv = New System.Windows.Forms.DataGridView()
+        Me.Label14 = New System.Windows.Forms.Label()
         Me.銷售收款流水號_tb = New System.Windows.Forms.TextBox()
         Me.Label37 = New System.Windows.Forms.Label()
         Me.銷售備註流水號_tb = New System.Windows.Forms.TextBox()
@@ -137,12 +138,14 @@ Partial Class 訂單控制表
         Me.重新整理_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.Label13 = New System.Windows.Forms.Label()
         Me.Panel2 = New System.Windows.Forms.Panel()
+        Me.物料關鍵字_tb = New System.Windows.Forms.TextBox()
+        Me.Label15 = New System.Windows.Forms.Label()
         Me.Panel3 = New System.Windows.Forms.Panel()
         Me.字體大小調整_lb = New System.Windows.Forms.Label()
         Me.字體_NUD = New System.Windows.Forms.NumericUpDown()
         Me.顯示_bt = New System.Windows.Forms.Button()
         Me.隱藏_bt = New System.Windows.Forms.Button()
-        Me.Label14 = New System.Windows.Forms.Label()
+        Me.查詢_bt = New System.Windows.Forms.Button()
         CType(Me.銷售單據_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         CType(Me.銷售衍生運費_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -162,27 +165,27 @@ Partial Class 訂單控制表
         Me.業務_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.業務_cb.FormattingEnabled = True
         Me.業務_cb.Items.AddRange(New Object() {"", "1", "2", "3", "4", "5", "6", "7", "8", "9", "B", "Y"})
-        Me.業務_cb.Location = New System.Drawing.Point(74, 1)
+        Me.業務_cb.Location = New System.Drawing.Point(67, 1)
         Me.業務_cb.Name = "業務_cb"
         Me.業務_cb.Size = New System.Drawing.Size(40, 24)
         Me.業務_cb.TabIndex = 1258
         '
         '銷售單據_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
+        DataGridViewCellStyle37.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.銷售單據_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle37
         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
         Me.銷售單據_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.銷售單據_dgv.Location = New System.Drawing.Point(3, 27)
+        Me.銷售單據_dgv.Location = New System.Drawing.Point(3, 52)
         Me.銷售單據_dgv.Name = "銷售單據_dgv"
         Me.銷售單據_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle2.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.銷售單據_dgv.RowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle38.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.銷售單據_dgv.RowsDefaultCellStyle = DataGridViewCellStyle38
         Me.銷售單據_dgv.RowTemplate.Height = 24
-        Me.銷售單據_dgv.Size = New System.Drawing.Size(548, 686)
+        Me.銷售單據_dgv.Size = New System.Drawing.Size(548, 661)
         Me.銷售單據_dgv.TabIndex = 1256
         '
         '未審核_lb
@@ -458,8 +461,8 @@ Partial Class 訂單控制表
         '
         '銷售衍生運費_dgv
         '
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.銷售衍生運費_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle39.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.銷售衍生運費_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle39
         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
@@ -467,9 +470,9 @@ Partial Class 訂單控制表
         Me.銷售衍生運費_dgv.Location = New System.Drawing.Point(3, 540)
         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
+        DataGridViewCellStyle40.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.銷售衍生運費_dgv.RowsDefaultCellStyle = DataGridViewCellStyle40
         Me.銷售衍生運費_dgv.RowTemplate.Height = 24
         Me.銷售衍生運費_dgv.Size = New System.Drawing.Size(574, 102)
         Me.銷售衍生運費_dgv.TabIndex = 1350
@@ -905,17 +908,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
+        DataGridViewCellStyle41.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.客戶資料_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle41
         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, 11366)
+        Me.客戶資料_dgv.Location = New System.Drawing.Point(17, 11832)
         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
+        DataGridViewCellStyle42.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.客戶資料_dgv.RowsDefaultCellStyle = DataGridViewCellStyle42
         Me.客戶資料_dgv.RowTemplate.Height = 24
         Me.客戶資料_dgv.Size = New System.Drawing.Size(191, 92)
         Me.客戶資料_dgv.TabIndex = 1254
@@ -1005,8 +1008,8 @@ Partial Class 訂單控制表
         '
         '銷售備註_dgv
         '
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.銷售備註_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle43.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.銷售備註_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle43
         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
@@ -1014,17 +1017,17 @@ Partial Class 訂單控制表
         Me.銷售備註_dgv.Location = New System.Drawing.Point(3, 411)
         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
+        DataGridViewCellStyle44.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.銷售備註_dgv.RowsDefaultCellStyle = DataGridViewCellStyle44
         Me.銷售備註_dgv.RowTemplate.Height = 24
         Me.銷售備註_dgv.Size = New System.Drawing.Size(571, 102)
         Me.銷售備註_dgv.TabIndex = 1250
         '
         '收款事項_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
+        DataGridViewCellStyle45.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.收款事項_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle45
         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
@@ -1032,9 +1035,9 @@ Partial Class 訂單控制表
         Me.收款事項_dgv.Location = New System.Drawing.Point(3, 668)
         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
+        DataGridViewCellStyle46.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.收款事項_dgv.RowsDefaultCellStyle = DataGridViewCellStyle46
         Me.收款事項_dgv.RowTemplate.Height = 24
         Me.收款事項_dgv.Size = New System.Drawing.Size(574, 102)
         Me.收款事項_dgv.TabIndex = 1282
@@ -1071,8 +1074,8 @@ Partial Class 訂單控制表
         '
         '銷售明細_dgv
         '
-        DataGridViewCellStyle11.BackColor = System.Drawing.Color.White
-        Me.銷售明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
+        DataGridViewCellStyle47.BackColor = System.Drawing.Color.White
+        Me.銷售明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle47
         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
@@ -1080,13 +1083,23 @@ Partial Class 訂單控制表
         Me.銷售明細_dgv.Location = New System.Drawing.Point(3, 29)
         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
+        DataGridViewCellStyle48.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle48.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.銷售明細_dgv.RowsDefaultCellStyle = DataGridViewCellStyle48
         Me.銷售明細_dgv.RowTemplate.Height = 24
         Me.銷售明細_dgv.Size = New System.Drawing.Size(760, 355)
         Me.銷售明細_dgv.TabIndex = 1199
         '
+        'Label14
+        '
+        Me.Label14.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label14.AutoSize = True
+        Me.Label14.Location = New System.Drawing.Point(579, 452)
+        Me.Label14.Name = "Label14"
+        Me.Label14.Size = New System.Drawing.Size(168, 16)
+        Me.Label14.TabIndex = 1353
+        Me.Label14.Text = "--------------------------------"
+        '
         '銷售收款流水號_tb
         '
         Me.銷售收款流水號_tb.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -1209,7 +1222,7 @@ Partial Class 訂單控制表
         '客戶1_tb
         '
         Me.客戶1_tb.ForeColor = System.Drawing.Color.Black
-        Me.客戶1_tb.Location = New System.Drawing.Point(173, 2)
+        Me.客戶1_tb.Location = New System.Drawing.Point(166, 2)
         Me.客戶1_tb.Name = "客戶1_tb"
         Me.客戶1_tb.Size = New System.Drawing.Size(122, 23)
         Me.客戶1_tb.TabIndex = 1307
@@ -1219,7 +1232,7 @@ Partial Class 訂單控制表
         Me.Label12.AutoSize = True
         Me.Label12.ForeColor = System.Drawing.Color.Black
         Me.Label12.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label12.Location = New System.Drawing.Point(118, 6)
+        Me.Label12.Location = New System.Drawing.Point(111, 6)
         Me.Label12.Name = "Label12"
         Me.Label12.Size = New System.Drawing.Size(56, 16)
         Me.Label12.TabIndex = 1306
@@ -1272,7 +1285,7 @@ Partial Class 訂單控制表
         Me.Label13.AutoSize = True
         Me.Label13.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Label13.ForeColor = System.Drawing.Color.Red
-        Me.Label13.Location = New System.Drawing.Point(296, 5)
+        Me.Label13.Location = New System.Drawing.Point(289, 5)
         Me.Label13.Name = "Label13"
         Me.Label13.Size = New System.Drawing.Size(260, 15)
         Me.Label13.TabIndex = 1338
@@ -1283,7 +1296,9 @@ Partial Class 訂單控制表
         Me.Panel2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        Me.Panel2.Controls.Add(Me.未審核_lb)
+        Me.Panel2.Controls.Add(Me.查詢_bt)
+        Me.Panel2.Controls.Add(Me.物料關鍵字_tb)
+        Me.Panel2.Controls.Add(Me.Label15)
         Me.Panel2.Controls.Add(Me.Label27)
         Me.Panel2.Controls.Add(Me.Label23)
         Me.Panel2.Controls.Add(Me.銷售資料流水號_tb)
@@ -1299,11 +1314,31 @@ Partial Class 訂單控制表
         Me.Panel2.Controls.Add(Me.銷售收款流水號_tb)
         Me.Panel2.Controls.Add(Me.Label13)
         Me.Panel2.Controls.Add(Me.銷售單據_dgv)
+        Me.Panel2.Controls.Add(Me.未審核_lb)
         Me.Panel2.Location = New System.Drawing.Point(2, 2)
         Me.Panel2.Name = "Panel2"
         Me.Panel2.Size = New System.Drawing.Size(556, 719)
         Me.Panel2.TabIndex = 1339
         '
+        '物料關鍵字_tb
+        '
+        Me.物料關鍵字_tb.ForeColor = System.Drawing.Color.Black
+        Me.物料關鍵字_tb.Location = New System.Drawing.Point(67, 27)
+        Me.物料關鍵字_tb.Name = "物料關鍵字_tb"
+        Me.物料關鍵字_tb.Size = New System.Drawing.Size(221, 23)
+        Me.物料關鍵字_tb.TabIndex = 1340
+        '
+        'Label15
+        '
+        Me.Label15.AutoSize = True
+        Me.Label15.ForeColor = System.Drawing.Color.Black
+        Me.Label15.ImeMode = System.Windows.Forms.ImeMode.NoControl
+        Me.Label15.Location = New System.Drawing.Point(0, 31)
+        Me.Label15.Name = "Label15"
+        Me.Label15.Size = New System.Drawing.Size(68, 16)
+        Me.Label15.TabIndex = 1339
+        Me.Label15.Text = "物料關鍵字"
+        '
         'Panel3
         '
         Me.Panel3.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
@@ -1385,15 +1420,14 @@ Partial Class 訂單控制表
         Me.隱藏_bt.Text = "隱藏" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "控件"
         Me.隱藏_bt.UseVisualStyleBackColor = True
         '
-        'Label14
+        '查詢_bt
         '
-        Me.Label14.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label14.AutoSize = True
-        Me.Label14.Location = New System.Drawing.Point(579, 452)
-        Me.Label14.Name = "Label14"
-        Me.Label14.Size = New System.Drawing.Size(168, 16)
-        Me.Label14.TabIndex = 1353
-        Me.Label14.Text = "--------------------------------"
+        Me.查詢_bt.Location = New System.Drawing.Point(291, 26)
+        Me.查詢_bt.Name = "查詢_bt"
+        Me.查詢_bt.Size = New System.Drawing.Size(81, 25)
+        Me.查詢_bt.TabIndex = 1341
+        Me.查詢_bt.Text = "查詢"
+        Me.查詢_bt.UseVisualStyleBackColor = True
         '
         '訂單控制表
         '
@@ -1533,4 +1567,7 @@ Partial Class 訂單控制表
     Protected WithEvents 銷售單據_dgv As DataGridView
     Friend WithEvents 字體大小調整_lb As Label
     Friend WithEvents Label14 As Label
+    Friend WithEvents 物料關鍵字_tb As TextBox
+    Friend WithEvents Label15 As Label
+    Friend WithEvents 查詢_bt As Button
 End Class

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

@@ -9,7 +9,7 @@ Public Class 訂單控制表
         銷售單據_dgv.AllowUserToAddRows = False
         銷售單據_dgv.RowTemplate.Height = 35
 
-        PA19 = 業務_cb.Text : PA20 = 客戶1_tb.Text
+        PA19 = 業務_cb.Text : PA20 = 客戶1_tb.Text : PA21 = 物料關鍵字_tb.Text
         SQL_銷售控制表_訂單控制表()
         da.Fill(ds1) : 銷售單據_dgv.DataSource = ds1.Tables(0) : conn.Close()
 
@@ -492,14 +492,12 @@ Public Class 訂單控制表
         Next
         Set_合記計算()
     End Sub
-
     Private Sub 字體_NUD_ValueChanged(sender As Object, e As EventArgs) Handles 字體_NUD.ValueChanged
         銷售單據_dgv.RowsDefaultCellStyle.Font = New Font("微軟正黑體", 字體_NUD.Value)
         銷售明細_dgv.RowsDefaultCellStyle.Font = New Font("微軟正黑體", 字體_NUD.Value)
         銷售備註_dgv.RowsDefaultCellStyle.Font = New Font("微軟正黑體", 字體_NUD.Value)
         銷售衍生運費_dgv.RowsDefaultCellStyle.Font = New Font("微軟正黑體", 字體_NUD.Value)
         收款事項_dgv.RowsDefaultCellStyle.Font = New Font("微軟正黑體", 字體_NUD.Value)
-
     End Sub
     Private Sub 客戶編號_tb_TextChanged(sender As Object, e As EventArgs) Handles 客戶編號_tb.TextChanged
         PA15 = 客戶編號_tb.Text
@@ -510,10 +508,11 @@ Public Class 訂單控制表
             客戶_tb.Text = "" : 公司_tb.Text = "" : 統編_tb.Text = "" : 住址_tb.Text = "" : 電話1_tb.Text = "" : 電話2_tb.Text = ""
         End If
     End Sub
+    Private Sub 物料關鍵字_tb_KeyPress(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles 物料關鍵字_tb.KeyPress
+        If e.KeyChar = Chr(13) Then : Set_清單1() : End If
+    End Sub
     Private Sub 客戶1_tb_KeyPress(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles 客戶1_tb.KeyPress
-        If e.KeyChar = Chr(13) Then
-            Set_清單1()
-        End If
+        If e.KeyChar = Chr(13) Then : Set_清單1() : End If
     End Sub
     Private Sub 重新整理_tsm_Click(sender As Object, e As EventArgs) Handles 重新整理_tsm.Click
         Set_清單4() : Set_清單5() : Set_清單6() : Set_清單7()
@@ -536,4 +535,7 @@ Public Class 訂單控制表
         NU1 = Panel3.Size.Width - 556
         Panel3.Size = New Size(NU1, NU2)
     End Sub
+    Private Sub 查詢_bt_Click(sender As Object, e As EventArgs) Handles 查詢_bt.Click
+        Set_清單1()
+    End Sub
 End Class

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

@@ -748,8 +748,8 @@ Public Class 銷售單申請
                 If dr.Read() Then
                     MsgBox("輸入的銷售單號重複。")
                 Else
-                    If IsNumeric(PA) = True Then
-                        If PA.Length = 7 Then
+                    If IsNumeric(Strings.Mid(PA, 2, 6)) = True Then
+                        If PA.Length = 7 Or PA.Length = 9 Then
                             開立庫存調整單_bt.Enabled = False : 銷售單據_dgv.Enabled = False
                             單號_tb.Text = PA : 調庫單號_tb.Text = "" : 客戶編號_tb.Text = "" : 運費 = 0 : 客戶流水_tb.Text = ""
 
@@ -792,10 +792,10 @@ Public Class 銷售單申請
                             司機運費_tb.Text = "0" : 預估利潤_tb.Text = "0" : 客戶編號_tb.Text = "" : 客戶_tb.Text = "" : 公司_tb.Text = "" : 電話1_tb.Text = "" : 電話2_tb.Text = ""
                             統編_tb.Text = "" : 住址_tb.Text = "" : 含稅_ch.Checked = False
                         Else
-                            MsgBox("輸入的單號需要完整七個數字。")
+                            MsgBox("輸入的單號需要完整七位數或是九位數。")
                         End If
                     Else
-                        MsgBox("請輸入數字。")
+                        MsgBox("單號除了開頭第一位其他都必須是數字。")
                     End If
                 End If
             End If