20230305備份

SHENKANG-MES-SYS/LoginForm1.vb

@@ -15,6 +15,8 @@ Public Class LoginForm1
     Private ReadOnly screenWidth = Screen.PrimaryScreen.Bounds.Width
     Private ReadOnly screenHeight = Screen.PrimaryScreen.Bounds.Height
     Dim HH As String
+    Dim Str As String = Application.StartupPath
+    Dim Strs As String = Application.StartupPath
     Private Sub Set_清單1()
         表單1_dgv.DataSource = Nothing : ds2.Clear()
         表單1_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -24,11 +26,36 @@ Public Class LoginForm1
         da.Fill(ds2) : 表單1_dgv.DataSource = ds2.Tables(0) : conn.Close()
     End Sub
     Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick
-        '-----------------------刪除自動更新項目--------------------------------------------------------------------------------------------
-        Dim Str As String = Application.StartupPath
-        If File.Exists(Str + "\SYS-UPDATE.exe") Then : File.Delete(Str + "\SYS-UPDATE.exe") : End If
-        If File.Exists(Str + "\LIVE.txt") Then : File.Delete(Str + "\LIVE.txt") : End If
-        Timer1.Enabled = False
+        '-----------------------刪除自動更新項目-------------------------------------------------------------------------------------------------------------------------------------------
+        Dim 已開啟 As Boolean = False
+
+        If File.Exists(My.Computer.FileSystem.SpecialDirectories.Desktop & "\SYS-UPDATE.exe") Then
+            Dim pro() As Process = System.Diagnostics.Process.GetProcesses()
+            ' 判斷是否有符合的Process
+            For Each process As Process In pro
+                If ("SYS-UPDATE").Equals(process.ProcessName) Then
+                    已開啟 = True
+                End If
+            Next
+            If 已開啟 = False Then
+                Timer1.Enabled = False
+                If File.Exists(Str + "\SYS-UPDATE.exe") Then : File.Delete(Str + "\SYS-UPDATE.exe") : End If
+                If File.Exists(Str + "\LIVE.txt") Then : File.Delete(Str + "\LIVE.txt") : End If : Timer1.Enabled = False
+            End If
+        ElseIf File.Exists(Strs & "\SYS-UPDATE.exe") Then
+            Dim pro() As Process = System.Diagnostics.Process.GetProcesses()
+            ' 判斷是否有符合的Process
+            For Each process As Process In pro
+                If ("SYS-UPDATE").Equals(process.ProcessName) Then
+                    已開啟 = True
+                End If
+            Next
+            If 已開啟 = False Then
+                Timer1.Enabled = False
+                If File.Exists(Str + "\SYS-UPDATE.exe") Then : File.Delete(Str + "\SYS-UPDATE.exe") : End If
+                If File.Exists(Str + "\LIVE.txt") Then : File.Delete(Str + "\LIVE.txt") : End If : Timer1.Enabled = False
+            End If
+        End If
     End Sub
     <Obsolete>
     Private Sub LoginForm1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -143,19 +170,25 @@ Public Class LoginForm1
         conn.Close()
     End Sub
     Private Sub 自動更新1()
-        Dim aa1 As MsgBoxResult
-        aa1 = MsgBox("系統版本號 與 資料庫版本號 對應不上，請開發人員注意是否有其他人員修改。並決定是否下載最新的執行檔?", MsgBoxStyle.OkCancel)
-        If aa1 = MsgBoxResult.Ok Then
-            UPDATE_bt.PerformClick()
-        Else
-            登入程序()
+        Dim Str As String = Application.StartupPath
+        If File.Exists(Str + "\NOTAUTO.txt") Then : Else
+            Dim aa1 As MsgBoxResult
+            aa1 = MsgBox("系統版本號 與 資料庫版本號 對應不上，請開發人員注意是否有其他人員修改。並決定是否下載最新的執行檔?", MsgBoxStyle.OkCancel)
+            If aa1 = MsgBoxResult.Ok Then
+                UPDATE_bt.PerformClick()
+            Else
+                登入程序()
+            End If
         End If
     End Sub
     Private Sub 自動更新2()
-        Dim aa1 As MsgBoxResult
-        aa1 = MsgBox("系統版本號 與 資料庫版本號 對應不上，請下載最新的執行檔。", MsgBoxStyle.OkCancel)
-        If aa1 = MsgBoxResult.Ok Then
-            UPDATE_bt.PerformClick()
+        Dim Str As String = Application.StartupPath
+        If File.Exists(Str + "\NOTAUTO.txt") Then : Else
+            Dim aa1 As MsgBoxResult
+            aa1 = MsgBox("系統版本號 與 資料庫版本號 對應不上，請下載最新的執行檔。", MsgBoxStyle.OkCancel)
+            If aa1 = MsgBoxResult.Ok Then
+                UPDATE_bt.PerformClick()
+            End If
         End If
     End Sub
     Private Sub OK_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK.Click

SHENKANG-MES-SYS/MyModule/SQL_資料庫系統管理.vb

@@ -181,9 +181,23 @@
         CmdSet_For_dr()
     End Sub
     Friend Sub SQL_主資料庫LOG檔案截斷()
-        ConnOpen() : SQL1 = "USE [" & PA & "] ALTER DATABASE [" & PA & "]
-                             SET RECOVERY SIMPLE; DBCC SHRINKFILE([" & PA & "_Log], 1); 
-                             ALTER DATABASE [" & PA & "]
-                             SET RECOVERY FULL;" : CmdSet_For_dr()
+        Dim DSF(1) As String : Dim NB1 As Integer = 0
+        ConnOpen_工程圖庫SQL() : SQL1 = "USE [" & PA & "]" : CmdSet_For_dr()
+        ConnOpen_工程圖庫SQL() : SQL1 = "select name from sys.database_files;" : CmdSet_For_dr()
+        While (dr.Read()) : DSF(NB1) = dr("name").ToString : NB1 += 1 : End While
+
+        If PA = DSF(0) Then : Else
+            ConnOpen_工程圖庫SQL() : SQL1 = "alter database [" & PA & "] modify file(name=[" & DSF(0) & "], newname =[" & PA & "])" : CmdSet_For_dr()
+        End If
+
+        If PA & "_log" = DSF(1) Then : Else
+            ConnOpen_工程圖庫SQL() : SQL1 = "alter database [" & PA & "] modify file(name=[" & DSF(1) & "], newname=[" & PA & "_log])" : CmdSet_For_dr()
+        End If
+
+        ConnOpen_工程圖庫SQL() : SQL1 = "ALTER DATABASE [" & PA & "]
+                                   SET RECOVERY SIMPLE;" : CmdSet_For_dr()
+        ConnOpen_工程圖庫SQL() : SQL1 = "DBCC SHRINKFILE ([" & PA & "_Log], 1);" : CmdSet_For_dr()
+        ConnOpen_工程圖庫SQL() : SQL1 = "ALTER DATABASE [" & PA & "]
+                                   SET RECOVERY FULL;" : CmdSet_For_dr()
     End Sub
 End Module

SHENKANG-MES-SYS/MyModule/SQL_量產訂單管理系統.vb

@@ -508,7 +508,23 @@
                             訂單控制表 ON 訂單明細表.資料流水號 = 訂單控制表.資料流水號
                 WHERE      (訂單明細表.客戶訂單號 LIKE N'" & 量產訂單明細表.Number_tb.Text & "') AND (訂單明細表.訂單流水號 LIKE N'" & 量產訂單明細表.訂單號_tb.Text & "')
                 ORDER BY   ProductName, 訂單明細表.Color"
-        列印用SQL = SQL1
+        CmdSet_For_DGV()
+    End Sub
+    Friend Sub SQL_訂單清單1()
+        ConnOpen()
+        SQL1 = "SELECT      訂單明細表.訂單流水號, 訂單明細表.客戶訂單號, 訂單明細表.ItemNumber, 訂單控制表.GOODBOX AS ProductName, 
+                            訂單明細表.Color, 訂單明細表.DM, 訂單明細表.[4], 訂單明細表.[4.5], 訂單明細表.[5], 訂單明細表.[5.5], 
+                            訂單明細表.[6], 訂單明細表.[6.5], 訂單明細表.[7], 訂單明細表.[7.5], 訂單明細表.[8], 訂單明細表.[8.5], 訂單明細表.[9], 
+                            訂單明細表.[9.5], 訂單明細表.[10], 訂單明細表.[10.5], 訂單明細表.[11], 訂單明細表.[11.5], 訂單明細表.[12], 
+                            訂單明細表.[12.5], 訂單明細表.[13], 訂單明細表.[14], 
+                            訂單明細表.[4] + 訂單明細表.[4.5] + 訂單明細表.[5] + 訂單明細表.[5.5] + 訂單明細表.[6] + 訂單明細表.[6.5] + 訂單明細表.[7]
+                             + 訂單明細表.[7.5] + 訂單明細表.[8] + 訂單明細表.[8.5] + 訂單明細表.[9] + 訂單明細表.[9.5] + 訂單明細表.[10] + 訂單明細表.[10.5]
+                             + 訂單明細表.[11] + 訂單明細表.[11.5] + 訂單明細表.[12] + 訂單明細表.[12.5] + 訂單明細表.[13] + 訂單明細表.[14] AS TOTAL,
+                            訂單明細表.資料流水號, 訂單控制表.備註
+                FROM        訂單明細表 FULL OUTER JOIN
+                            訂單控制表 ON 訂單明細表.資料流水號 = 訂單控制表.資料流水號
+                WHERE      (訂單明細表.客戶訂單號 LIKE N'" & 量產訂單明細表.Number_tb.Text & "') AND (訂單明細表.訂單流水號 LIKE N'" & 量產訂單明細表.訂單號_tb.Text & "')
+                ORDER BY   ProductName, 訂單明細表.Color"
         CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_訂單附件資料()

SHENKANG-MES-SYS/MyModule/全域變數.vb

@@ -7,7 +7,7 @@
                                  CC51, CC52, CC53, CC54, CC55, CC56, CC57, CC58, CC59, CC60, CC61, CC62, CC63, CC64, CC65, CC66, CC67, CC68, CC69, CC70, CC71, CC72, CC73, CC74, CC75, CC76, CC77, CC78, 
                                  CC79, CC80, CC81, CC82, CC83, CC84, CC85, CC86, CC87, CC88, CC89, CC90, CC91, CC92, CC93, CC94, CC95 FROM"
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2022090701"
+    Public 版本 As String = "2023022201"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public PA, PA1, PA2, PA3, PA4, PA5, PA6, PA7, PA8, PA9, PA10, PA11, PA12, PA13, PA14, PA15, PA16, PA17, PA18, PA19, PA20, PA21, PA22, PA23, PA24, PA25, PA26, PA27, PA28, PA29, PA30, PA31,
            PA32, PA33 As String

SHENKANG-MES-SYS/bin/Debug/WINPROFIT-ERP-SYS.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>AbqFOE3SwHROS1aqXvGmkyFUQHAO/A5oQ0n3t5euvkU=</dsig:DigestValue>
+        <dsig:DigestValue>pKda73CBRtjnQwsydPGB1TxWevF1wTN70dpluk6119o=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

SHENKANG-MES-SYS/bin/Debug/WINPROFIT-ERP-SYS.exe.manifest

@@ -43,14 +43,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WINPROFIT-ERP-SYS.exe" size="5659136">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WINPROFIT-ERP-SYS.exe" size="5665280">
       <assemblyIdentity name="WINPROFIT-ERP-SYS" version="1.1.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>2zv4eFsWSle7YYSvD3vz23v2+dFvgzkphtOxYCBKb7Y=</dsig:DigestValue>
+        <dsig:DigestValue>yhMlGH/urFVdF20232h9Fxy3YcWCavO4/xBMCcONq2I=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>AbqFOE3SwHROS1aqXvGmkyFUQHAO/A5oQ0n3t5euvkU=</dsig:DigestValue>
+        <dsig:DigestValue>pKda73CBRtjnQwsydPGB1TxWevF1wTN70dpluk6119o=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.exe.manifest

@@ -43,14 +43,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WINPROFIT-ERP-SYS.exe" size="5659136">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WINPROFIT-ERP-SYS.exe" size="5665280">
       <assemblyIdentity name="WINPROFIT-ERP-SYS" version="1.1.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>2zv4eFsWSle7YYSvD3vz23v2+dFvgzkphtOxYCBKb7Y=</dsig:DigestValue>
+        <dsig:DigestValue>yhMlGH/urFVdF20232h9Fxy3YcWCavO4/xBMCcONq2I=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

SHENKANG-MES-SYS/基本資料管理系統/清單修改.vb

@@ -110,36 +110,40 @@ Public Class 清單修改
         Set_資料清單() : Set_grid()
     End Sub
     Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
-        If TextBox1.Text = "" Then
-            MsgBox("資料有缺或有誤，請重新檢查")
-        Else
-            ConnOpen()
-            If 部門清單修改 = True Then : SQL1 = "UPDATE METOO部門清單 SET 部門 = N'" & TextBox1.Text & "' WHERE 部門 LIKE N'" & TextBox2.Text & "'"
-            ElseIf 職稱清單修改 = True Then : SQL1 = "UPDATE METOO職稱清單 SET 職稱 = N'" & TextBox1.Text & "' WHERE 職稱 LIKE N'" & TextBox2.Text & "'"
-            ElseIf 客戶清單修改 = True Then : SQL1 = "UPDATE 客戶控制表 SET 客戶簡稱 = N'" & TextBox1.Text & "' WHERE 客戶簡稱 LIKE N'" & TextBox2.Text & "'"
-            ElseIf 工廠清單修改 = True Then : SQL1 = "UPDATE 工廠控制表 SET 工廠 = N'" & TextBox1.Text & "' WHERE 工廠 LIKE N'" & TextBox2.Text & "'"
-            ElseIf 顏色清單修改 = True Then : SQL1 = "UPDATE 顏色清單 SET 顏色 = N'" & TextBox1.Text & "' WHERE 顏色 LIKE N'" & TextBox2.Text & "'"
-            ElseIf 港口清單修改 = True Then : SQL1 = "UPDATE 港口清單 SET FOB = N'" & TextBox1.Text & "' WHERE FOB LIKE N'" & TextBox2.Text & "'"
-            ElseIf 季節清單修改 = True Then : SQL1 = "UPDATE 季節清單 SET SEASON = N'" & TextBox1.Text & "' WHERE SEASON LIKE N'" & TextBox2.Text & "'"
-            ElseIf 供應商清單修改 = True Then : SQL1 = "UPDATE 供應商清單 SET 廠商 = N'" & TextBox1.Text & "' WHERE 廠商 LIKE N'" & TextBox2.Text & "'"
-            ElseIf 國家清單修改 = True Then : SQL1 = "UPDATE 國家清單 SET 國家 = N'" & TextBox1.Text & "' WHERE 國家 LIKE N'" & TextBox2.Text & "'"
-            ElseIf PURPOSE清單修改 = True Then : SQL1 = "UPDATE PURPOSE清單 SET 狀態 = N'" & TextBox1.Text & "' WHERE 狀態 LIKE N'" & TextBox2.Text & "'"
-            ElseIf 部件清單修改 = True Then : SQL1 = "UPDATE 部件清單 SET 部件 = N'" & TextBox1.Text & "' WHERE 部件 LIKE N'" & TextBox2.Text & "'"
-            ElseIf 交貨條件修改 = True Then : SQL1 = "UPDATE DELIVERYTERMS SET DELIVERYTERMS = N'" & TextBox1.Text & "' WHERE DELIVERYTERMS LIKE N'" & TextBox2.Text & "'"
-            ElseIf 到港清單修改 = True Then : SQL1 = "UPDATE TOPORT SET TOPORT = N'" & TextBox1.Text & "' WHERE TOPORT LIKE N'" & TextBox2.Text & "'"
-            ElseIf 交貨管道修改 = True Then : SQL1 = "UPDATE MODEOFDELIVERY SET MODEOFDELIVERY = N'" & TextBox1.Text & "' WHERE MODEOFDELIVERY LIKE N'" & TextBox2.Text & "'"
-            ElseIf 模具用結構 = True Then : SQL1 = "UPDATE 模具開發用結構清單 SET 結構 = N'" & TextBox1.Text & "' WHERE 結構 LIKE N'" & TextBox2.Text & "'"
-            ElseIf 模具用材質 = True Then : SQL1 = "UPDATE 模具開發用材質清單 SET 材質 = N'" & TextBox1.Text & "' WHERE 材質 LIKE N'" & TextBox2.Text & "'"
-            ElseIf 行政物料 = True Then : SQL1 = "UPDATE 人員行政物料表 SET 行政物料 = N'" & TextBox1.Text & "' WHERE 行政物料 LIKE N'" & TextBox2.Text & "'"
-            ElseIf 訂單顏色修改 = True Then : SQL1 = "UPDATE 訂單顏色清單 SET 顏色 = N'" & TextBox1.Text & "' WHERE 顏色 LIKE N'" & TextBox2.Text & "'"
-            ElseIf 楦頭編碼修改 = True Then : SQL1 = "UPDATE 楦頭縮寫管理 SET 縮寫 = N'" & TextBox1.Text & "' WHERE 縮寫 LIKE N'" & TextBox2.Text & "'"
-            ElseIf 廠商類別修改 = True Then : SQL1 = "UPDATE 廠商類別 SET 廠商類別 = N'" & TextBox1.Text & "' WHERE 廠商類別 LIKE N'" & TextBox2.Text & "'"
+        Dim aa As MsgBoxResult = MsgBox("修改資料時要確認資料沒有被使用，不然會造成系統抓不到資料的錯誤!! 請確定你是否要將 [" & TextBox2.Text & "] 替換成 [" &
+                                        TextBox1.Text & "] !!", MsgBoxStyle.OkCancel)
+        If aa = MsgBoxResult.Ok Then
+            If TextBox1.Text = "" Then
+                MsgBox("資料有缺或有誤，請重新檢查")
+            Else
+                ConnOpen()
+                If 部門清單修改 = True Then : SQL1 = "UPDATE METOO部門清單 SET 部門 = N'" & TextBox1.Text & "' WHERE 部門 LIKE N'" & TextBox2.Text & "'"
+                ElseIf 職稱清單修改 = True Then : SQL1 = "UPDATE METOO職稱清單 SET 職稱 = N'" & TextBox1.Text & "' WHERE 職稱 LIKE N'" & TextBox2.Text & "'"
+                ElseIf 客戶清單修改 = True Then : SQL1 = "UPDATE 客戶控制表 SET 客戶簡稱 = N'" & TextBox1.Text & "' WHERE 客戶簡稱 LIKE N'" & TextBox2.Text & "'"
+                ElseIf 工廠清單修改 = True Then : SQL1 = "UPDATE 工廠控制表 SET 工廠 = N'" & TextBox1.Text & "' WHERE 工廠 LIKE N'" & TextBox2.Text & "'"
+                ElseIf 顏色清單修改 = True Then : SQL1 = "UPDATE 顏色清單 SET 顏色 = N'" & TextBox1.Text & "' WHERE 顏色 LIKE N'" & TextBox2.Text & "'"
+                ElseIf 港口清單修改 = True Then : SQL1 = "UPDATE 港口清單 SET FOB = N'" & TextBox1.Text & "' WHERE FOB LIKE N'" & TextBox2.Text & "'"
+                ElseIf 季節清單修改 = True Then : SQL1 = "UPDATE 季節清單 SET SEASON = N'" & TextBox1.Text & "' WHERE SEASON LIKE N'" & TextBox2.Text & "'"
+                ElseIf 供應商清單修改 = True Then : SQL1 = "UPDATE 供應商清單 SET 廠商 = N'" & TextBox1.Text & "' WHERE 廠商 LIKE N'" & TextBox2.Text & "'"
+                ElseIf 國家清單修改 = True Then : SQL1 = "UPDATE 國家清單 SET 國家 = N'" & TextBox1.Text & "' WHERE 國家 LIKE N'" & TextBox2.Text & "'"
+                ElseIf PURPOSE清單修改 = True Then : SQL1 = "UPDATE PURPOSE清單 SET 狀態 = N'" & TextBox1.Text & "' WHERE 狀態 LIKE N'" & TextBox2.Text & "'"
+                ElseIf 部件清單修改 = True Then : SQL1 = "UPDATE 部件清單 SET 部件 = N'" & TextBox1.Text & "' WHERE 部件 LIKE N'" & TextBox2.Text & "'"
+                ElseIf 交貨條件修改 = True Then : SQL1 = "UPDATE DELIVERYTERMS SET DELIVERYTERMS = N'" & TextBox1.Text & "' WHERE DELIVERYTERMS LIKE N'" & TextBox2.Text & "'"
+                ElseIf 到港清單修改 = True Then : SQL1 = "UPDATE TOPORT SET TOPORT = N'" & TextBox1.Text & "' WHERE TOPORT LIKE N'" & TextBox2.Text & "'"
+                ElseIf 交貨管道修改 = True Then : SQL1 = "UPDATE MODEOFDELIVERY SET MODEOFDELIVERY = N'" & TextBox1.Text & "' WHERE MODEOFDELIVERY LIKE N'" & TextBox2.Text & "'"
+                ElseIf 模具用結構 = True Then : SQL1 = "UPDATE 模具開發用結構清單 SET 結構 = N'" & TextBox1.Text & "' WHERE 結構 LIKE N'" & TextBox2.Text & "'"
+                ElseIf 模具用材質 = True Then : SQL1 = "UPDATE 模具開發用材質清單 SET 材質 = N'" & TextBox1.Text & "' WHERE 材質 LIKE N'" & TextBox2.Text & "'"
+                ElseIf 行政物料 = True Then : SQL1 = "UPDATE 人員行政物料表 SET 行政物料 = N'" & TextBox1.Text & "' WHERE 行政物料 LIKE N'" & TextBox2.Text & "'"
+                ElseIf 訂單顏色修改 = True Then : SQL1 = "UPDATE 訂單顏色清單 SET 顏色 = N'" & TextBox1.Text & "' WHERE 顏色 LIKE N'" & TextBox2.Text & "'"
+                ElseIf 楦頭編碼修改 = True Then : SQL1 = "UPDATE 楦頭縮寫管理 SET 縮寫 = N'" & TextBox1.Text & "' WHERE 縮寫 LIKE N'" & TextBox2.Text & "'"
+                ElseIf 廠商類別修改 = True Then : SQL1 = "UPDATE 廠商類別 SET 廠商類別 = N'" & TextBox1.Text & "' WHERE 廠商類別 LIKE N'" & TextBox2.Text & "'"
+                End If
+                cmd.CommandText = SQL1 : cmd.ExecuteNonQuery()
+                MsgBox("修改完成")
+                conn.Close()
             End If
-            cmd.CommandText = SQL1 : cmd.ExecuteNonQuery()
-            MsgBox("修改完成")
-            conn.Close()
+            Set_資料清單() : Set_grid()
         End If
-        Set_資料清單() : Set_grid()
     End Sub
     Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
         If 部門清單修改 = True Then : SQL1 = "DELETE FROM METOO部門清單 WHERE (部門 = N'" & TextBox1.Text & "')"

SHENKANG-MES-SYS/樣品訂單管理系統/樣品單控制表.Designer.vb

@@ -155,7 +155,7 @@ Partial Class 樣品單控制表
         Me.樣品訂單清單_lb.AutoSize = True
         Me.樣品訂單清單_lb.Location = New System.Drawing.Point(14, 5)
         Me.樣品訂單清單_lb.Name = "樣品訂單清單_lb"
-        Me.樣品訂單清單_lb.Size = New System.Drawing.Size(80, 16)
+        Me.樣品訂單清單_lb.Size = New System.Drawing.Size(79, 16)
         Me.樣品訂單清單_lb.TabIndex = 677
         Me.樣品訂單清單_lb.Text = "樣品訂單清單"
         '
@@ -204,7 +204,7 @@ Partial Class 樣品單控制表
         Me.SO_lb.AutoSize = True
         Me.SO_lb.Location = New System.Drawing.Point(509, 9)
         Me.SO_lb.Name = "SO_lb"
-        Me.SO_lb.Size = New System.Drawing.Size(38, 16)
+        Me.SO_lb.Size = New System.Drawing.Size(37, 16)
         Me.SO_lb.TabIndex = 681
         Me.SO_lb.Text = "S/O#"
         '
@@ -230,7 +230,7 @@ Partial Class 樣品單控制表
         Me.SEASON_lb.ForeColor = System.Drawing.Color.Red
         Me.SEASON_lb.Location = New System.Drawing.Point(493, 37)
         Me.SEASON_lb.Name = "SEASON_lb"
-        Me.SEASON_lb.Size = New System.Drawing.Size(57, 16)
+        Me.SEASON_lb.Size = New System.Drawing.Size(56, 16)
         Me.SEASON_lb.TabIndex = 683
         Me.SEASON_lb.Text = "SEASON"
         '
@@ -249,7 +249,7 @@ Partial Class 樣品單控制表
         Me.CUST_lb.ForeColor = System.Drawing.Color.Red
         Me.CUST_lb.Location = New System.Drawing.Point(508, 241)
         Me.CUST_lb.Name = "CUST_lb"
-        Me.CUST_lb.Size = New System.Drawing.Size(39, 16)
+        Me.CUST_lb.Size = New System.Drawing.Size(38, 16)
         Me.CUST_lb.TabIndex = 685
         Me.CUST_lb.Text = "CUST"
         '
@@ -288,7 +288,7 @@ Partial Class 樣品單控制表
         Me.STYLE_lb.ForeColor = System.Drawing.Color.Red
         Me.STYLE_lb.Location = New System.Drawing.Point(497, 112)
         Me.STYLE_lb.Name = "STYLE_lb"
-        Me.STYLE_lb.Size = New System.Drawing.Size(50, 16)
+        Me.STYLE_lb.Size = New System.Drawing.Size(49, 16)
         Me.STYLE_lb.TabIndex = 687
         Me.STYLE_lb.Text = "STYLE#"
         '
@@ -307,7 +307,7 @@ Partial Class 樣品單控制表
         Me.COUNTRY1_lb.ForeColor = System.Drawing.Color.Red
         Me.COUNTRY1_lb.Location = New System.Drawing.Point(720, 86)
         Me.COUNTRY1_lb.Name = "COUNTRY1_lb"
-        Me.COUNTRY1_lb.Size = New System.Drawing.Size(67, 16)
+        Me.COUNTRY1_lb.Size = New System.Drawing.Size(66, 16)
         Me.COUNTRY1_lb.TabIndex = 691
         Me.COUNTRY1_lb.Text = "COUNTRY"
         '
@@ -326,7 +326,7 @@ Partial Class 樣品單控制表
         Me.PURPOSE_lb.ForeColor = System.Drawing.Color.Red
         Me.PURPOSE_lb.Location = New System.Drawing.Point(487, 86)
         Me.PURPOSE_lb.Name = "PURPOSE_lb"
-        Me.PURPOSE_lb.Size = New System.Drawing.Size(63, 16)
+        Me.PURPOSE_lb.Size = New System.Drawing.Size(62, 16)
         Me.PURPOSE_lb.TabIndex = 693
         Me.PURPOSE_lb.Text = "PURPOSE"
         '
@@ -353,7 +353,7 @@ Partial Class 樣品單控制表
         Me.ETD_lb.AutoSize = True
         Me.ETD_lb.Location = New System.Drawing.Point(756, 61)
         Me.ETD_lb.Name = "ETD_lb"
-        Me.ETD_lb.Size = New System.Drawing.Size(31, 16)
+        Me.ETD_lb.Size = New System.Drawing.Size(30, 16)
         Me.ETD_lb.TabIndex = 697
         Me.ETD_lb.Text = "ETD"
         '
@@ -371,7 +371,7 @@ Partial Class 樣品單控制表
         Me.Label25.ForeColor = System.Drawing.Color.Red
         Me.Label25.Location = New System.Drawing.Point(515, 164)
         Me.Label25.Name = "Label25"
-        Me.Label25.Size = New System.Drawing.Size(32, 16)
+        Me.Label25.Size = New System.Drawing.Size(31, 16)
         Me.Label25.TabIndex = 699
         Me.Label25.Text = "QTY"
         '
@@ -508,7 +508,7 @@ Partial Class 樣品單控制表
         Me.制表日期_lb.AutoSize = True
         Me.制表日期_lb.Location = New System.Drawing.Point(731, 163)
         Me.制表日期_lb.Name = "制表日期_lb"
-        Me.制表日期_lb.Size = New System.Drawing.Size(56, 16)
+        Me.制表日期_lb.Size = New System.Drawing.Size(55, 16)
         Me.制表日期_lb.TabIndex = 713
         Me.制表日期_lb.Text = "制表日期"
         '
@@ -525,7 +525,7 @@ Partial Class 樣品單控制表
         Me.制表人_lb.AutoSize = True
         Me.制表人_lb.Location = New System.Drawing.Point(743, 138)
         Me.制表人_lb.Name = "制表人_lb"
-        Me.制表人_lb.Size = New System.Drawing.Size(44, 16)
+        Me.制表人_lb.Size = New System.Drawing.Size(43, 16)
         Me.制表人_lb.TabIndex = 715
         Me.制表人_lb.Text = "制表人"
         '
@@ -541,7 +541,7 @@ Partial Class 樣品單控制表
         Me.版次_lb.AutoSize = True
         Me.版次_lb.Location = New System.Drawing.Point(756, 9)
         Me.版次_lb.Name = "版次_lb"
-        Me.版次_lb.Size = New System.Drawing.Size(32, 16)
+        Me.版次_lb.Size = New System.Drawing.Size(31, 16)
         Me.版次_lb.TabIndex = 717
         Me.版次_lb.Text = "版次"
         '
@@ -571,7 +571,7 @@ Partial Class 樣品單控制表
         Me.部件_lb.AutoSize = True
         Me.部件_lb.Location = New System.Drawing.Point(1469, 269)
         Me.部件_lb.Name = "部件_lb"
-        Me.部件_lb.Size = New System.Drawing.Size(44, 16)
+        Me.部件_lb.Size = New System.Drawing.Size(43, 16)
         Me.部件_lb.TabIndex = 723
         Me.部件_lb.Text = "部件。"
         '
@@ -580,7 +580,7 @@ Partial Class 樣品單控制表
         Me.選擇_lb.AutoSize = True
         Me.選擇_lb.Location = New System.Drawing.Point(1243, 269)
         Me.選擇_lb.Name = "選擇_lb"
-        Me.選擇_lb.Size = New System.Drawing.Size(32, 16)
+        Me.選擇_lb.Size = New System.Drawing.Size(31, 16)
         Me.選擇_lb.TabIndex = 722
         Me.選擇_lb.Text = "選擇"
         '
@@ -643,7 +643,7 @@ Partial Class 樣品單控制表
         Me.項_lb.AutoSize = True
         Me.項_lb.Location = New System.Drawing.Point(1442, 10)
         Me.項_lb.Name = "項_lb"
-        Me.項_lb.Size = New System.Drawing.Size(20, 16)
+        Me.項_lb.Size = New System.Drawing.Size(19, 16)
         Me.項_lb.TabIndex = 729
         Me.項_lb.Text = "項"
         '
@@ -652,7 +652,7 @@ Partial Class 樣品單控制表
         Me.選擇第_lb.AutoSize = True
         Me.選擇第_lb.Location = New System.Drawing.Point(1344, 10)
         Me.選擇第_lb.Name = "選擇第_lb"
-        Me.選擇第_lb.Size = New System.Drawing.Size(44, 16)
+        Me.選擇第_lb.Size = New System.Drawing.Size(43, 16)
         Me.選擇第_lb.TabIndex = 728
         Me.選擇第_lb.Text = "選擇第"
         '
@@ -793,7 +793,7 @@ Partial Class 樣品單控制表
         Me.排序時間_lb.AutoSize = True
         Me.排序時間_lb.Location = New System.Drawing.Point(1711, 268)
         Me.排序時間_lb.Name = "排序時間_lb"
-        Me.排序時間_lb.Size = New System.Drawing.Size(181, 16)
+        Me.排序時間_lb.Size = New System.Drawing.Size(180, 16)
         Me.排序時間_lb.TabIndex = 741
         Me.排序時間_lb.Text = "排序格式為 : 01、02、03、到99"
         '
@@ -802,7 +802,7 @@ Partial Class 樣品單控制表
         Me.REQBY_lb.AutoSize = True
         Me.REQBY_lb.Location = New System.Drawing.Point(734, 112)
         Me.REQBY_lb.Name = "REQBY_lb"
-        Me.REQBY_lb.Size = New System.Drawing.Size(53, 16)
+        Me.REQBY_lb.Size = New System.Drawing.Size(52, 16)
         Me.REQBY_lb.TabIndex = 743
         Me.REQBY_lb.Text = "REQ. BY"
         '
@@ -828,7 +828,7 @@ Partial Class 樣品單控制表
         Me.FACTORY_lb.ForeColor = System.Drawing.Color.Red
         Me.FACTORY_lb.Location = New System.Drawing.Point(487, 60)
         Me.FACTORY_lb.Name = "FACTORY_lb"
-        Me.FACTORY_lb.Size = New System.Drawing.Size(62, 16)
+        Me.FACTORY_lb.Size = New System.Drawing.Size(61, 16)
         Me.FACTORY_lb.TabIndex = 745
         Me.FACTORY_lb.Text = "FACTORY"
         '
@@ -907,7 +907,7 @@ Partial Class 樣品單控制表
         Me.COUNTRY_lb.ForeColor = System.Drawing.Color.Black
         Me.COUNTRY_lb.Location = New System.Drawing.Point(14, 88)
         Me.COUNTRY_lb.Name = "COUNTRY_lb"
-        Me.COUNTRY_lb.Size = New System.Drawing.Size(67, 16)
+        Me.COUNTRY_lb.Size = New System.Drawing.Size(66, 16)
         Me.COUNTRY_lb.TabIndex = 750
         Me.COUNTRY_lb.Text = "COUNTRY"
         '
@@ -946,7 +946,7 @@ Partial Class 樣品單控制表
         Me.ETD1_lb.AutoSize = True
         Me.ETD1_lb.Location = New System.Drawing.Point(50, 58)
         Me.ETD1_lb.Name = "ETD1_lb"
-        Me.ETD1_lb.Size = New System.Drawing.Size(31, 16)
+        Me.ETD1_lb.Size = New System.Drawing.Size(30, 16)
         Me.ETD1_lb.TabIndex = 715
         Me.ETD1_lb.Text = "ETD"
         '
@@ -963,7 +963,7 @@ Partial Class 樣品單控制表
         Me.ISSUE1_lb.AutoSize = True
         Me.ISSUE1_lb.Location = New System.Drawing.Point(6, 27)
         Me.ISSUE1_lb.Name = "ISSUE1_lb"
-        Me.ISSUE1_lb.Size = New System.Drawing.Size(75, 16)
+        Me.ISSUE1_lb.Size = New System.Drawing.Size(74, 16)
         Me.ISSUE1_lb.TabIndex = 713
         Me.ISSUE1_lb.Text = "ISSUE DATE"
         '
@@ -980,7 +980,7 @@ Partial Class 樣品單控制表
         Me.清單伸展_ch.AutoSize = True
         Me.清單伸展_ch.Location = New System.Drawing.Point(264, 3)
         Me.清單伸展_ch.Name = "清單伸展_ch"
-        Me.清單伸展_ch.Size = New System.Drawing.Size(75, 20)
+        Me.清單伸展_ch.Size = New System.Drawing.Size(74, 20)
         Me.清單伸展_ch.TabIndex = 749
         Me.清單伸展_ch.Text = "清單伸展"
         Me.清單伸展_ch.UseVisualStyleBackColor = True
@@ -1042,7 +1042,7 @@ Partial Class 樣品單控制表
         Me.選擇清單中_lb.AutoSize = True
         Me.選擇清單中_lb.Location = New System.Drawing.Point(494, 269)
         Me.選擇清單中_lb.Name = "選擇清單中_lb"
-        Me.選擇清單中_lb.Size = New System.Drawing.Size(68, 16)
+        Me.選擇清單中_lb.Size = New System.Drawing.Size(67, 16)
         Me.選擇清單中_lb.TabIndex = 756
         Me.選擇清單中_lb.Text = "選擇清單中"
         '
@@ -1059,7 +1059,7 @@ Partial Class 樣品單控制表
         Me.筆資料中的_lb.AutoSize = True
         Me.筆資料中的_lb.Location = New System.Drawing.Point(642, 269)
         Me.筆資料中的_lb.Name = "筆資料中的_lb"
-        Me.筆資料中的_lb.Size = New System.Drawing.Size(68, 16)
+        Me.筆資料中的_lb.Size = New System.Drawing.Size(67, 16)
         Me.筆資料中的_lb.TabIndex = 758
         Me.筆資料中的_lb.Text = "筆資料中的"
         '
@@ -1076,7 +1076,7 @@ Partial Class 樣品單控制表
         Me.筆_lb.AutoSize = True
         Me.筆_lb.Location = New System.Drawing.Point(785, 269)
         Me.筆_lb.Name = "筆_lb"
-        Me.筆_lb.Size = New System.Drawing.Size(20, 16)
+        Me.筆_lb.Size = New System.Drawing.Size(19, 16)
         Me.筆_lb.TabIndex = 760
         Me.筆_lb.Text = "筆"
         '
@@ -1094,7 +1094,7 @@ Partial Class 樣品單控制表
         Me.供應商_lb.AutoSize = True
         Me.供應商_lb.Location = New System.Drawing.Point(985, 242)
         Me.供應商_lb.Name = "供應商_lb"
-        Me.供應商_lb.Size = New System.Drawing.Size(44, 16)
+        Me.供應商_lb.Size = New System.Drawing.Size(43, 16)
         Me.供應商_lb.TabIndex = 762
         Me.供應商_lb.Text = "供應商"
         '
@@ -1133,7 +1133,7 @@ Partial Class 樣品單控制表
         Me.中皮_lb.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
         Me.中皮_lb.Location = New System.Drawing.Point(515, 215)
         Me.中皮_lb.Name = "中皮_lb"
-        Me.中皮_lb.Size = New System.Drawing.Size(32, 16)
+        Me.中皮_lb.Size = New System.Drawing.Size(31, 16)
         Me.中皮_lb.TabIndex = 766
         Me.中皮_lb.Text = "中皮"
         '
@@ -1174,7 +1174,7 @@ Partial Class 樣品單控制表
         Me.中底_lb.ForeColor = System.Drawing.Color.Green
         Me.中底_lb.Location = New System.Drawing.Point(514, 190)
         Me.中底_lb.Name = "中底_lb"
-        Me.中底_lb.Size = New System.Drawing.Size(32, 16)
+        Me.中底_lb.Size = New System.Drawing.Size(31, 16)
         Me.中底_lb.TabIndex = 770
         Me.中底_lb.Text = "中底"
         '
@@ -1193,7 +1193,7 @@ Partial Class 樣品單控制表
         Me.Label31.AutoSize = True
         Me.Label31.Location = New System.Drawing.Point(1414, 190)
         Me.Label31.Name = "Label31"
-        Me.Label31.Size = New System.Drawing.Size(117, 16)
+        Me.Label31.Size = New System.Drawing.Size(116, 16)
         Me.Label31.TabIndex = 775
         Me.Label31.Text = "Construction Name"
         '
@@ -1219,7 +1219,7 @@ Partial Class 樣品單控制表
         Me.楦頭編號_lb.ForeColor = System.Drawing.Color.Red
         Me.楦頭編號_lb.Location = New System.Drawing.Point(1182, 163)
         Me.楦頭編號_lb.Name = "楦頭編號_lb"
-        Me.楦頭編號_lb.Size = New System.Drawing.Size(56, 16)
+        Me.楦頭編號_lb.Size = New System.Drawing.Size(55, 16)
         Me.楦頭編號_lb.TabIndex = 773
         Me.楦頭編號_lb.Text = "楦頭編號"
         '
@@ -1237,7 +1237,7 @@ Partial Class 樣品單控制表
         Me.廠商類別_lb.AutoSize = True
         Me.廠商類別_lb.Location = New System.Drawing.Point(831, 242)
         Me.廠商類別_lb.Name = "廠商類別_lb"
-        Me.廠商類別_lb.Size = New System.Drawing.Size(56, 16)
+        Me.廠商類別_lb.Size = New System.Drawing.Size(55, 16)
         Me.廠商類別_lb.TabIndex = 777
         Me.廠商類別_lb.Text = "廠商類別"
         '
@@ -1256,7 +1256,7 @@ Partial Class 樣品單控制表
         Me.模具編號_lb.ForeColor = System.Drawing.Color.Red
         Me.模具編號_lb.Location = New System.Drawing.Point(1182, 189)
         Me.模具編號_lb.Name = "模具編號_lb"
-        Me.模具編號_lb.Size = New System.Drawing.Size(56, 16)
+        Me.模具編號_lb.Size = New System.Drawing.Size(55, 16)
         Me.模具編號_lb.TabIndex = 779
         Me.模具編號_lb.Text = "模具編號"
         '
@@ -1265,6 +1265,7 @@ Partial Class 樣品單控制表
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1914, 971)
+        Me.Controls.Add(Me.樣品單_dgv)
         Me.Controls.Add(Me.模具編號_cb)
         Me.Controls.Add(Me.模具編號_lb)
         Me.Controls.Add(Me.廠商類別_cb)
@@ -1291,7 +1292,6 @@ Partial Class 樣品單控制表
         Me.Controls.Add(Me.ComboBox10)
         Me.Controls.Add(Me.新增客戶清單_bt)
         Me.Controls.Add(Me.明細6_dgv)
-        Me.Controls.Add(Me.樣品單_dgv)
         Me.Controls.Add(Me.清單伸展_ch)
         Me.Controls.Add(Me.GroupBox1)
         Me.Controls.Add(Me.樣品訂單轉制預告訂單_bt)

SHENKANG-MES-SYS/樣品訂單管理系統/樣品單控制表.vb

@@ -15,9 +15,8 @@ Public Class 樣品單控制表
         da.Fill(ds) : 樣品單_dgv.DataSource = ds.Tables(0) : conn.Close() : Set_grid()
     End Sub
     Private Sub Set_grid()
-        Dim YY As Integer
+        Dim YY As Integer = 樣品單_dgv.Size.Height
         If 清單伸展_ch.Checked = False Then
-            YY = 樣品單_dgv.Size.Height
             樣品單_dgv.Size = New Size(475, YY)
             樣品單_dgv.Columns(0).Width = 55 : 樣品單_dgv.Columns(1).Width = 65 : 樣品單_dgv.Columns(2).Width = 125 : 樣品單_dgv.Columns(3).Width = 80 : 樣品單_dgv.Columns(4).Width = 80
         Else
@@ -64,7 +63,6 @@ Public Class 樣品單控制表
                 明細3_dgv.Rows(i).Cells("排列").Value = ""
             End If
         Next
-
     End Sub
     Private Sub Set_清單3()
         明細5_dgv.DataSource = Nothing : ds4.Clear()
@@ -316,7 +314,7 @@ Public Class 樣品單控制表
     End Sub
     Private Sub DataGridView2_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 明細2_dgv.CellClick
         If e.RowIndex = -1 Then : Else
-            選擇第_tb.Text = 明細2_dgv(0, e.RowIndex).Value.ToString : 項_tb.Text = 明細2_dgv(7, e.RowIndex).Value.ToString
+            選擇第_tb.Text = 明細2_dgv(0, e.RowIndex).Value.ToString : 項_tb.Text = 明細2_dgv(8, e.RowIndex).Value.ToString
             QTY_tb.Text = "0"
             For i As Integer = 0 To 明細2_dgv.Rows.Count - 1
                 QTY_tb.Text = Val(QTY_tb.Text) + 明細2_dgv.Rows(i).Cells("數量").Value
@@ -421,7 +419,7 @@ Public Class 樣品單控制表
         ElseIf NUM1 > 999999999 Then : 新流水號1 = "SR" & NUM1
         End If
     End Sub
-    Private Sub Button7_Click(sender As Object, e As EventArgs) Handles 新增1_bt.Click
+    Private Sub 新增1_bt_Click(sender As Object, e As EventArgs) Handles 新增1_bt.Click
         新增準備4_1() : 新增準備4_2()
         SQL_最後一筆項次()
         If dr.Read() Then : 新項次 = dr("項次") : Else : 新項次 = "00" : End If : conn.Close()
@@ -436,7 +434,7 @@ Public Class 樣品單控制表
         Set_清單1() : Set_清單2() : Set_清單4()
     End Sub
     Private Sub Button8_Click(sender As Object, e As EventArgs) Handles 刪除_bt.Click
-        If 選擇第_tb.Text = "" Then
+        If 選擇第_tb.Text = "" And 項_tb.Text = "" Then
             MsgBox("未選擇需要刪除的資料")
         Else
             新增準備4_1() : 新增準備4_2()
@@ -453,7 +451,7 @@ Public Class 樣品單控制表
             Set_清單1() : Set_清單2() : Set_清單4() : 選擇第_tb.Text = "" : 項_tb.Text = ""
         End If
     End Sub
-    Private Sub Button6_Click(sender As Object, e As EventArgs) Handles 新增_bt.Click
+    Private Sub 新增_bt_Click(sender As Object, e As EventArgs) Handles 新增_bt.Click
         If 新增1_cb.Text = "" Then
             MsgBox("未選擇需要新增的部件")
         Else
@@ -625,6 +623,10 @@ Public Class 樣品單控制表
                 SQL_刪除樣品訂單控制表() : conn.Close()
                 SQL_刪除樣品訂單部件表1() : conn.Close()
                 MsgBox("刪除完成") : Set_清單() : 明細2_dgv.DataSource = Nothing : ds1.Clear() : 明細3_dgv.DataSource = Nothing : ds2.Clear()
+                新增文件 = False : Timer1.Enabled = False : 資料尚未存檔_lb.Visible = False
+                一般新增_bt.Enabled = True : 複製新增_bt.Enabled = True : 修改模式_bt.Enabled = True : REVISED_bt.Enabled = True
+                存檔_bt.Enabled = False : 新增_bt.Enabled = False : 新增1_bt.Enabled = False : 刪除_bt.Enabled = False : 刪除1_bt.Enabled = False
+                返回_bt.PerformClick()
             End If
         End If
     End Sub

SHENKANG-MES-SYS/樣品訂單管理系統/樣品單資料庫除錯_1.vb

@@ -1,14 +1,14 @@
 Option Strict Off
 Public Class 樣品單資料庫除錯_1
-    Private ReadOnly ds As New DataSet
     Private Sub Set_清單()
+        Dim ds As New DataSet
         除錯_dgv.DataSource = Nothing : ds.Clear()
         除錯_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         除錯_dgv.ColumnHeadersHeight = 25
         除錯_dgv.AllowUserToAddRows = False
         SQL_除錯清單()
         da.Fill(ds) : 除錯_dgv.DataSource = ds.Tables(0) : conn.Close()
-        除錯_dgv.Columns(0).Width = 120 : 除錯_dgv.Columns(1).Width = 120 : 除錯_dgv.Columns(2).Width = 120 : 除錯_dgv.Columns(3).Width = 120
+        '除錯_dgv.Columns(0).Width = 120 : 除錯_dgv.Columns(1).Width = 120 : 除錯_dgv.Columns(2).Width = 120 : 除錯_dgv.Columns(3).Width = 120
     End Sub
     Private Sub 樣品單資料庫除錯_1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Set_清單()

SHENKANG-MES-SYS/資料庫管理系統/系統編碼規則_1.vb

@@ -198,10 +198,14 @@ Public Class 系統編碼規則_1
         End If : Set_工程圖片資料庫狀態() : MsgBox("修改完成!!!")
     End Sub
     Private Sub LOG檔截斷3_bt_Click(sender As Object, e As EventArgs) Handles LOG檔截斷3_bt.Click
-        For I As Integer = 0 To 資料庫清單1_dgv.Rows.Count - 1
-            PA = 資料庫清單1_dgv(0, I).Value.ToString : SQL_主資料庫LOG檔案截斷()
-        Next
-        重新讀取_bt.PerformClick()
+        Try
+            For I As Integer = 0 To 資料庫清單1_dgv.Rows.Count - 1
+                PA = 資料庫清單1_dgv(0, I).Value.ToString : 圖片庫 = PA : SQL_連線字串_圖片資料庫() : SQL_主資料庫LOG檔案截斷()
+            Next
+            重新讀取_bt.PerformClick() : MsgBox("伺服器截斷完成!!!")
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
     End Sub
 
     Private Sub 客戶_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 客戶_dgv.CellClick

SHENKANG-MES-SYS/量產訂單管理系統/列印_訂單明細.Designer.vb

@@ -22,8 +22,8 @@ Partial Class 列印_訂單明細
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.Button11 = New System.Windows.Forms.Button()
         Me.DataGridView1 = New System.Windows.Forms.DataGridView()
@@ -58,8 +58,8 @@ Partial Class 列印_訂單明細
         '
         'DataGridView1
         '
-        DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.DataGridView1.Location = New System.Drawing.Point(12, 12)
         Me.DataGridView1.Name = "DataGridView1"
@@ -70,8 +70,8 @@ Partial Class 列印_訂單明細
         '
         'DataGridView2
         '
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.DataGridView2.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.DataGridView2.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
         Me.DataGridView2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.DataGridView2.Location = New System.Drawing.Point(12, 161)
         Me.DataGridView2.Name = "DataGridView2"

SHENKANG-MES-SYS/量產訂單管理系統/列印_訂單明細.vb

@@ -13,7 +13,7 @@ Imports System.Threading
 Public Class 列印_訂單明細
     Private ReadOnly ds, ds2 As New DataSet
     Dim N1 As Integer = 5 : Dim N2 As Integer
-    Dim M1 As String
+    Dim M0, M1 As String
     Dim xlApp As Microsoft.Office.Interop.Excel.Application
     Dim xlBook As Microsoft.Office.Interop.Excel.Workbook
     Dim xlSheet As Microsoft.Office.Interop.Excel.Worksheet
@@ -22,9 +22,7 @@ Public Class 列印_訂單明細
         DataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         DataGridView1.ColumnHeadersHeight = 25
         DataGridView1.AllowUserToAddRows = False
-        ConnOpen()
-        SQL1 = 列印用SQL
-        CmdSet_For_DGV()
+        SQL_訂單清單1()
         da.Fill(ds) : DataGridView1.DataSource = ds.Tables(0) : conn.Close()
     End Sub
     Private Sub Set_清單2()
@@ -104,7 +102,7 @@ Public Class 列印_訂單明細
         If OD(34) <> 0 Then : xlSheet.Cells(16, N1) = "11" : N1 += 1 : End If : If OD(41) <> 0 Then : xlSheet.Cells(16, N1) = "11.5" : N1 += 1 : End If
         If OD(35) <> 0 Then : xlSheet.Cells(16, N1) = "12" : N1 += 1 : End If : If OD(42) <> 0 Then : xlSheet.Cells(16, N1) = "12.5" : N1 += 1 : End If
         If OD(36) <> 0 Then : xlSheet.Cells(16, N1) = "13" : N1 += 1 : End If : If OD(37) <> 0 Then : xlSheet.Cells(16, N1) = "14" : N1 += 1 : End If
-        xlSheet.Cells(16, N1) = "TOTAL"
+        xlSheet.Cells(16, N1) = "TOTAL" : xlSheet.Cells(16, N1 + 1) = "備註"
 
         For i As Integer = 0 To DataGridView1.Rows.Count - 1
             xlSheet.Cells(i + 17, 1) = DataGridView1.Rows(i).Cells("ItemNumber").Value
@@ -133,6 +131,7 @@ Public Class 列印_訂單明細
             If OD(36) <> 0 Then : xlSheet.Cells(i + 17, N1) = DataGridView1.Rows(i).Cells("13").Value : N1 += 1 : End If
             If OD(37) <> 0 Then : xlSheet.Cells(i + 17, N1) = DataGridView1.Rows(i).Cells("14").Value : N1 += 1 : End If
             xlSheet.Cells(i + 17, N1) = DataGridView1.Rows(i).Cells("TOTAL").Value
+            xlSheet.Cells(i + 17, N1 + 1) = DataGridView1.Rows(i).Cells("備註").Value
             With xlApp.Selection
                 .Font.Bold = True
             End With
@@ -151,7 +150,7 @@ Public Class 列印_訂單明細
         If OD(34) <> 0 Then : xlSheet.Cells(N2 + 17, N1) = OD(34) : N1 += 1 : End If : If OD(41) <> 0 Then : xlSheet.Cells(N2 + 17, N1) = OD(41) : N1 += 1 : End If  '11  11.5
         If OD(35) <> 0 Then : xlSheet.Cells(N2 + 17, N1) = OD(35) : N1 += 1 : End If : If OD(42) <> 0 Then : xlSheet.Cells(N2 + 17, N1) = OD(42) : N1 += 1 : End If  '12  12.5
         If OD(36) <> 0 Then : xlSheet.Cells(N2 + 17, N1) = OD(36) : N1 += 1 : End If : If OD(37) <> 0 Then : xlSheet.Cells(N2 + 17, N1) = OD(37) : N1 += 1 : End If  '13  14
-        xlSheet.Cells(N2 + 17, N1) = OD(38)
+        xlSheet.Cells(N2 + 17, N1) = OD(38) : N1 += 3
 
         BB(xlApp, xlSheet)
 
@@ -184,11 +183,13 @@ Public Class 列印_訂單明細
     End Sub
     Private Sub BB(ByVal myExcel As Application, ByVal xlSheet As Worksheet)
         Dim 位置1 As String
-        If N1 = 6 Then : M1 = "F" : ElseIf N1 = 7 Then : M1 = "G" : ElseIf N1 = 8 Then : M1 = "H" : ElseIf N1 = 9 Then : M1 = "I" : ElseIf N1 = 10 Then : M1 = "J"
-        ElseIf N1 = 11 Then : M1 = "K" : ElseIf N1 = 12 Then : M1 = "L" : ElseIf N1 = 13 Then : M1 = "M" : ElseIf N1 = 14 Then : M1 = "N"
-        ElseIf N1 = 15 Then : M1 = "O" : ElseIf N1 = 16 Then : M1 = "P" : ElseIf N1 = 17 Then : M1 = "Q" : ElseIf N1 = 18 Then : M1 = "R"
-        ElseIf N1 = 19 Then : M1 = "S" : ElseIf N1 = 20 Then : M1 = "T" : ElseIf N1 = 21 Then : M1 = "U" : ElseIf N1 = 22 Then : M1 = "V"
-        ElseIf N1 = 23 Then : M1 = "W" : ElseIf N1 = 24 Then : M1 = "X" : ElseIf N1 = 25 Then : M1 = "Y" : ElseIf N1 = 26 Then : M1 = "Z" : End If
+        If N1 = 6 Then : M0 = "D" : M1 = "F" : ElseIf N1 = 7 Then : M0 = "E" : M1 = "G" : ElseIf N1 = 8 Then : M0 = "F" : M1 = "H" : ElseIf N1 = 9 Then : M0 = "G" : M1 = "I"
+        ElseIf N1 = 10 Then : M0 = "H" : M1 = "J" : ElseIf N1 = 11 Then : M0 = "I" : M1 = "K" : ElseIf N1 = 12 Then : M0 = "J" : M1 = "L" : ElseIf N1 = 13 Then : M0 = "K" : M1 = "M"
+        ElseIf N1 = 14 Then : M0 = "L" : M1 = "N" : ElseIf N1 = 15 Then : M0 = "M" : M1 = "O" : ElseIf N1 = 16 Then : M0 = "N" : M1 = "P" : ElseIf N1 = 17 Then : M0 = "O" : M1 = "Q"
+        ElseIf N1 = 18 Then : M0 = "P" : M1 = "R" : ElseIf N1 = 19 Then : M0 = "Q" : M1 = "S" : ElseIf N1 = 20 Then : M0 = "R" : M1 = "T" : ElseIf N1 = 21 Then : M0 = "S" : M1 = "U"
+        ElseIf N1 = 22 Then : M0 = "T" : M1 = "V" : ElseIf N1 = 23 Then : M0 = "U" : M1 = "W" : ElseIf N1 = 24 Then : M0 = "V" : M1 = "X" : ElseIf N1 = 25 Then : M0 = "W" : M1 = "Y"
+        ElseIf N1 = 26 Then : M0 = "X" : M1 = "Z" : ElseIf N1 = 27 Then : M0 = "Y" : M1 = "AA" : ElseIf N1 = 28 Then : M0 = "Z" : M1 = "AB" : ElseIf N1 = 29 Then : M0 = "AA" : M1 = "AC"
+        ElseIf N1 = 30 Then : M0 = "AB" : M1 = "AD" : End If
 
         xlSheet.Cells.Select()
         With myExcel.Selection.Font
@@ -235,6 +236,18 @@ Public Class 列印_訂單明細
             .IndentLevel = 0 : .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False
         End With
 
+        位置1 = M0 & "16:" & M1 & "16" : xlSheet.Range(位置1).Select()
+        With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
+            .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
+
+        For I As Integer = 17 To N2 + 14
+            位置1 = M0 & I & ":" & M1 & I : xlSheet.Range(位置1).Select()
+            With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
+                .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With : myExcel.Selection.Merge
+            With myExcel.Selection : .HorizontalAlignment = xlLeft : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
+                .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = True : End With
+        Next
+
         xlSheet.Range("A2:B2,A3:B3,A4:B4,A5:B6,C5:C6,A7:B7,A8:B8,A9:B15,C9:C15").Select() : xlSheet.Range("C9").Activate()
         With myExcel.Selection
             .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0