B70340 il y a 3 ans
Parent
révision
05ad50689d
31 fichiers modifiés avec 208 ajouts et 84 suppressions
  1. 3
    0
      .editorconfig
  2. BIN
      .vs/WINPROFIT-ERP-SYS/v16/.suo
  3. 20
    14
      SHENKANG-MES-SYS/LoginForm1.vb
  4. 2
    2
      SHENKANG-MES-SYS/My Project/AssemblyInfo.vb
  5. 8
    1
      SHENKANG-MES-SYS/MyModule/SQL_樣品訂單管理.vb
  6. 1
    1
      SHENKANG-MES-SYS/MyModule/SQL_登入與主程式.vb
  7. 64
    0
      SHENKANG-MES-SYS/MyModule/SQL_連線狀態模組.vb
  8. 1
    1
      SHENKANG-MES-SYS/MyModule/全域變數.vb
  9. 2
    1
      SHENKANG-MES-SYS/WINPROFIT-ERP-SYS.vbproj
  10. 1
    1
      SHENKANG-MES-SYS/bin/Debug/WINPROFIT-ERP-SYS.application
  11. BIN
      SHENKANG-MES-SYS/bin/Debug/WINPROFIT-ERP-SYS.exe
  12. 4
    4
      SHENKANG-MES-SYS/bin/Debug/WINPROFIT-ERP-SYS.exe.manifest
  13. BIN
      SHENKANG-MES-SYS/bin/Debug/WINPROFIT-ERP-SYS.pdb
  14. 9
    0
      SHENKANG-MES-SYS/bin/Debug/WINPROFIT-ERP-SYS.xml
  15. BIN
      SHENKANG-MES-SYS/bin/Debug/app.publish/WINPROFIT-ERP-SYS.exe
  16. BIN
      SHENKANG-MES-SYS/obj/Debug/DesignTimeResolveAssemblyReferences.cache
  17. 1
    1
      SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.application
  18. BIN
      SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.exe
  19. 4
    4
      SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.exe.manifest
  20. BIN
      SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.pdb
  21. 1
    1
      SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.vbproj.CoreCompileInputs.cache
  22. 2
    2
      SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.vbproj.FileListAbsolute.txt
  23. BIN
      SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.vbproj.GenerateResource.cache
  24. BIN
      SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.vbprojAssemblyReference.cache
  25. 9
    0
      SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.xml
  26. 4
    11
      SHENKANG-MES-SYS/人事管理系統/人員入職資料表.vb
  27. 4
    1
      SHENKANG-MES-SYS/成本管理系統/列印_樣品報價單.vb
  28. 11
    6
      SHENKANG-MES-SYS/樣品訂單管理系統/樣品單控制表.Designer.vb
  29. 17
    13
      SHENKANG-MES-SYS/樣品訂單管理系統/樣品單控制表.vb
  30. 30
    14
      SHENKANG-MES-SYS/樣品訂單管理系統/樣品進度表.Designer.vb
  31. 10
    6
      SHENKANG-MES-SYS/樣品訂單管理系統/樣品進度表.vb

+ 3
- 0
.editorconfig Voir le fichier

@@ -2,3 +2,6 @@
2 2
 
3 3
 # BC42322: 對介面類型進行來回轉換時可能發生執行階段錯誤
4 4
 dotnet_diagnostic.BC42322.severity = none
5
+
6
+# BC42353: 函式在所有程式碼路徑上皆不會傳回值
7
+dotnet_diagnostic.BC42353.severity = suggestion

BIN
.vs/WINPROFIT-ERP-SYS/v16/.suo Voir le fichier


+ 20
- 14
SHENKANG-MES-SYS/LoginForm1.vb Voir le fichier

@@ -34,16 +34,8 @@ Public Class LoginForm1
34 34
     Private Sub LoginForm1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
35 35
         '-----------------------控件基本設定-----------------------------------------------------------------------------------------------------------------------------------------------
36 36
         刷卡登入_ch.Checked = True : 刷卡登入_ch.Enabled = False
37
-        執行檔版本號_lb.Text = "執行檔版本號 : " & 版本
38
-        TextBox4.Text = "1"
37
+        執行檔版本號_lb.Text = "執行檔版本號 : " & 版本 : TextBox4.Text = "1"
39 38
         網段.ShowDialog()
40
-        If 登入判斷 = True Then
41
-            伺服器區域選擇_cb.Text = "巨益線路"
42
-            OK.Enabled = True : Cancel.Enabled = True : 刷卡登入_ch.Checked = True
43
-        ElseIf 登入判斷 = False Then
44
-            伺服器區域選擇_cb.Text = "開發線路"
45
-            OK.Enabled = True : Cancel.Enabled = True : 刷卡登入_ch.Checked = True
46
-        End If
47 39
         '-----------------------調整視窗大小-----------------------------------------------------------------------------------------------------------------------------------------------
48 40
         Me.Size = New Size(466, 279)
49 41
         If screenWidth = 1920 And screenHeight = 1080 Then : Me.Location = New Point(727, 401)
@@ -54,16 +46,30 @@ Public Class LoginForm1
54 46
         End If
55 47
         Timer1.Enabled = True
56 48
     End Sub
49
+    Private Sub LoginForm1_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
50
+        If 登入判斷 = True Then
51
+            伺服器區域選擇_cb.Text = "巨益線路"
52
+            OK.Enabled = True : Cancel.Enabled = True : 刷卡登入_ch.Checked = True
53
+        ElseIf 登入判斷 = False Then
54
+            伺服器區域選擇_cb.Text = "開發線路"
55
+            OK.Enabled = True : Cancel.Enabled = True : 刷卡登入_ch.Checked = True
56
+        End If
57
+    End Sub
57 58
     <Obsolete>
58 59
     Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 伺服器區域選擇_cb.SelectedIndexChanged
59 60
         '-----------------------確認登入伺服器位置-----------------------------------------------------------------------------------------------------------------------------------------
60 61
         If 伺服器區域選擇_cb.Text = "巨益線路" Then
61
-            登入人IP = "192.168.10.5"
62
-            登入()
63
-            OK.Enabled = True : Cancel.Enabled = True : 刷卡登入_ch.Checked = True
62
+            If SQL_連線狀態模組.ConnectTest("192.168.10.5") = True Then
63
+                登入人IP = "192.168.10.5" : 登入()
64
+                OK.Enabled = True : Cancel.Enabled = True : 刷卡登入_ch.Checked = True
65
+            Else
66
+                MsgBox("巨益伺服器無法連線,自動轉跳測試線路,請聯繫系統管理員!!")
67
+                伺服器區域選擇_cb.Text = "開發線路"
68
+                登入人IP = "106.1.48.106,4567" : 登入()
69
+                OK.Enabled = True : Cancel.Enabled = True : 刷卡登入_ch.Checked = True
70
+            End If
64 71
         ElseIf 伺服器區域選擇_cb.Text = "開發線路" Then
65
-            登入人IP = "106.1.48.106,4567"
66
-            登入()
72
+            登入人IP = "106.1.48.106,4567" : 登入()
67 73
             OK.Enabled = True : Cancel.Enabled = True : 刷卡登入_ch.Checked = True
68 74
         End If
69 75
         UsernameTextBox.Focus()

+ 2
- 2
SHENKANG-MES-SYS/My Project/AssemblyInfo.vb Voir le fichier

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
31 31
 ' 指定為預設值: 
32 32
 ' <Assembly: AssemblyVersion("1.0.*")>
33 33
 
34
-<Assembly: AssemblyVersion("1.0.0.0")>
35
-<Assembly: AssemblyFileVersion("1.0.0.0")>
34
+<Assembly: AssemblyVersion("1.1.0.0")>
35
+<Assembly: AssemblyFileVersion("1.1.0.0")>

+ 8
- 1
SHENKANG-MES-SYS/MyModule/SQL_樣品訂單管理.vb Voir le fichier

@@ -358,7 +358,14 @@
358 358
     '---------------------樣品進度表------------------------------------------
359 359
     Friend Sub SQL_樣品訂單控制表1()
360 360
         ConnOpen()
361
-        SQL1 = "SELECT SO, 版次 FROM 樣品訂單控制表 WHERE 季節 LIKE N'" & 樣品進度表.SEASON_cb.Text & "' AND 客戶 LIKE N'" & 樣品進度表.CUST_cb.Text & "' AND 狀態 LIKE N'" & 樣品進度表分類1 & "' ORDER BY 型體號碼, SO, 版次 DESC"
361
+        SQL1 = "SELECT   樣品訂單控制表.SO, 樣品訂單控制表.版次
362
+                FROM     樣品訂單控制表 INNER JOIN
363
+                         樣品訂單清單 ON 樣品訂單控制表.SO = 樣品訂單清單.SO INNER JOIN
364
+                         樣品訂單部件表 ON 樣品訂單控制表.SO = 樣品訂單部件表.SO
365
+                WHERE   (樣品訂單控制表.季節 LIKE N'" & 樣品進度表.SEASON_cb.Text & "') AND (樣品訂單控制表.客戶 LIKE N'" & 樣品進度表.CUST_cb.Text & "') AND 
366
+                        (樣品訂單控制表.狀態 LIKE N'" & 樣品進度表分類1 & "')
367
+                GROUP BY 樣品訂單控制表.型體號碼, 樣品訂單控制表.SO, 樣品訂單控制表.版次
368
+                ORDER BY 樣品訂單控制表.型體號碼, 樣品訂單控制表.SO, 樣品訂單控制表.版次 DESC"
362 369
         CmdSet_For_DGV()
363 370
     End Sub
364 371
     Friend Sub SQL_樣品訂單控制表2()

SHENKANG-MES-SYS/MyModule/SQL_登入.vb → SHENKANG-MES-SYS/MyModule/SQL_登入與主程式.vb Voir le fichier

@@ -1,4 +1,4 @@
1
-Module SQL_登入
1
+Module SQL_登入與主程式
2 2
     Friend Sub SQL_資料夾名稱清單()
3 3
         ConnOpen()
4 4
         SQL1 = "SELECT 資料夾名稱, 指定 FROM FTP資料夾管理 WHERE (指定 NOT LIKE 'NA') ORDER BY 指定"

+ 64
- 0
SHENKANG-MES-SYS/MyModule/SQL_連線狀態模組.vb Voir le fichier

@@ -0,0 +1,64 @@
1
+Module SQL_連線狀態模組
2
+#Region "——连接测试:避免等待时间过长——"
3
+    Dim bConnect As Boolean
4
+    Dim BgWorker1 As New System.ComponentModel.BackgroundWorker
5
+    Dim ServerIP As String
6
+    ''' <summary>
7
+    ''' 测试连接:True-连接成功,False-连接失败
8
+    ''' 参数[必选]:服务器IP
9
+    ''' 参数[可选]:等待超时时间(秒),默认为1.2秒
10
+    ''' </summary>
11
+    ''' <returns></returns>
12
+    ''' <remarks></remarks>
13
+    Function ConnectTest(ByVal varServerIP As String, Optional ByVal varTimeout As Decimal = 3) As Boolean
14
+        AddHandler BgWorker1.DoWork, AddressOf BgWorker1_DoWork
15
+        Dim g As Integer
16
+        Dim k As Integer
17
+        If BgWorker1.CancellationPending Then
18
+            BgWorker1.CancelAsync()
19
+            '取消BackgroundWorker執行中的工作
20
+        End If
21
+        Try
22
+            If varServerIP = "" Then
23
+                Exit Function
24
+            End If
25
+            ServerIP = varServerIP
26
+            If varTimeout <= 0 Then
27
+                varTimeout = 3
28
+            End If
29
+            k = Int(varTimeout * 10)
30
+            bConnect = False
31
+            BgWorker1.WorkerSupportsCancellation = True
32
+            BgWorker1.RunWorkerAsync()
33
+            For g = 1 To k '1.2s
34
+                Threading.Thread.Sleep(100)
35
+                If bConnect = True Then
36
+                    ConnectTest = True
37
+                    Exit Function
38
+                End If
39
+            Next
40
+            ConnectTest = False
41
+            BgWorker1.CancelAsync()
42
+        Catch ex As Exception
43
+            MsgBox(ex.Message)
44
+        End Try
45
+    End Function
46
+    '--异步动作
47
+    Private Sub BgWorker1_DoWork(ByVal sender As System.Object, ByVal e As System.ComponentModel.DoWorkEventArgs)
48
+        Call ConnectMSSQLServer()
49
+    End Sub
50
+    '--连接数据库
51
+    Private Function ConnectMSSQLServer() As Boolean
52
+        Dim sqlConTest As Data.SqlClient.SqlConnection ' 连接   
53
+        sqlConTest = New Data.SqlClient.SqlConnection
54
+        sqlConTest.ConnectionString = "Data Source=" + ServerIP + ";Initial Catalog=METO-MES-SYS;Persist Security Info=True;User ID=B70340;Password=Lee0911274990;Max pool size = 200;Connection Timeout=0"
55
+        Try
56
+            sqlConTest.Open()
57
+            sqlConTest.Close()
58
+        Catch ex As Exception
59
+        Finally
60
+            bConnect = True
61
+        End Try
62
+    End Function
63
+#End Region
64
+End Module

+ 1
- 1
SHENKANG-MES-SYS/MyModule/全域變數.vb Voir le fichier

@@ -9,7 +9,7 @@
9 9
                                  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, 
10 10
                                  CC79, CC80, CC81, CC82, CC83, CC84, CC85, CC86, CC87, CC88, CC89, CC90, CC91, CC92, CC93, CC94, CC95 FROM"
11 11
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
12
-    Public 版本 As String = "2021102001"
12
+    Public 版本 As String = "2022041801"
13 13
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
14 14
     Public PA As String = "" : Public PA1 As String = "" : Public PA2 As String = "" : Public PA3 As String = "" : Public PA4 As String = "" : Public PA5 As String = "" : Public PA6 As String = ""
15 15
     Public PA7 As String = "" : Public PA8 As String = "" : Public PA9 As String = "" : Public PA10 As String = "" : Public PA11 As String = "" : Public PA12 As String = "" : Public PA13 As String = ""

+ 2
- 1
SHENKANG-MES-SYS/WINPROFIT-ERP-SYS.vbproj Voir le fichier

@@ -127,9 +127,10 @@
127 127
     <Compile Include="MyModule\SQL_成本管理系統.vb" />
128 128
     <Compile Include="MyModule\SQL_採購系統管理.vb" />
129 129
     <Compile Include="MyModule\SQL_樣品訂單管理.vb" />
130
-    <Compile Include="MyModule\SQL_登入.vb" />
130
+    <Compile Include="MyModule\SQL_登入與主程式.vb" />
131 131
     <Compile Include="MyModule\SQL_製鞋系統管理.vb" />
132 132
     <Compile Include="MyModule\SQL_資料庫系統.vb" />
133
+    <Compile Include="MyModule\SQL_連線狀態模組.vb" />
133 134
     <Compile Include="MyModule\SQL_量產訂單管理系統.vb" />
134 135
     <Compile Include="SplashScreen1.Designer.vb">
135 136
       <DependentUpon>SplashScreen1.vb</DependentUpon>

+ 1
- 1
SHENKANG-MES-SYS/bin/Debug/WINPROFIT-ERP-SYS.application Voir le fichier

@@ -14,7 +14,7 @@
14 14
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
15 15
         </dsig:Transforms>
16 16
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
17
-        <dsig:DigestValue>m89nRaRclWjieRR0Jua8D+nsGNlBgVo99G1syUK0zjg=</dsig:DigestValue>
17
+        <dsig:DigestValue>+OQAxi13uH9eVXk1MJpvqnernwHvYewa+YpOqEjNM5U=</dsig:DigestValue>
18 18
       </hash>
19 19
     </dependentAssembly>
20 20
   </dependency>

BIN
SHENKANG-MES-SYS/bin/Debug/WINPROFIT-ERP-SYS.exe Voir le fichier


+ 4
- 4
SHENKANG-MES-SYS/bin/Debug/WINPROFIT-ERP-SYS.exe.manifest Voir le fichier

@@ -4,7 +4,7 @@
4 4
   <description asmv2:iconFile="SHENKANG.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
5 5
   <application />
6 6
   <entryPoint>
7
-    <assemblyIdentity name="WINPROFIT-ERP-SYS" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
7
+    <assemblyIdentity name="WINPROFIT-ERP-SYS" version="1.1.0.0" language="neutral" processorArchitecture="msil" />
8 8
     <commandLine file="WINPROFIT-ERP-SYS.exe" parameters="" />
9 9
   </entryPoint>
10 10
   <trustInfo>
@@ -43,14 +43,14 @@
43 43
     </dependentAssembly>
44 44
   </dependency>
45 45
   <dependency>
46
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WINPROFIT-ERP-SYS.exe" size="5627392">
47
-      <assemblyIdentity name="WINPROFIT-ERP-SYS" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
46
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WINPROFIT-ERP-SYS.exe" size="5630464">
47
+      <assemblyIdentity name="WINPROFIT-ERP-SYS" version="1.1.0.0" language="neutral" processorArchitecture="msil" />
48 48
       <hash>
49 49
         <dsig:Transforms>
50 50
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
51 51
         </dsig:Transforms>
52 52
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
53
-        <dsig:DigestValue>hO2Vcij7W0pmog4isMcrhNehHleozBqGl4qSCERMABg=</dsig:DigestValue>
53
+        <dsig:DigestValue>ZXd2DehjNi2/VfKchliwZQFQKo8nDxXgEgYwAtoqW1I=</dsig:DigestValue>
54 54
       </hash>
55 55
     </dependentAssembly>
56 56
   </dependency>

BIN
SHENKANG-MES-SYS/bin/Debug/WINPROFIT-ERP-SYS.pdb Voir le fichier


+ 9
- 0
SHENKANG-MES-SYS/bin/Debug/WINPROFIT-ERP-SYS.xml Voir le fichier

@@ -142,5 +142,14 @@ WINPROFIT-ERP-SYS
142 142
   查詢類型 System.Drawing.Bitmap 的當地語系化資源。
143 143
 </summary>
144 144
 </member>
145
+<member name="M:WINPROFIT_ERP_SYS.SQL_連線狀態模組.ConnectTest(System.String,System.Decimal)">
146
+ <summary>
147
+ 测试连接:True-连接成功,False-连接失败
148
+ 参数[必选]:服务器IP
149
+ 参数[可选]:等待超时时间(秒),默认为1.2秒
150
+ </summary>
151
+ <returns></returns>
152
+ <remarks></remarks>
153
+</member>
145 154
 </members>
146 155
 </doc>

BIN
SHENKANG-MES-SYS/bin/Debug/app.publish/WINPROFIT-ERP-SYS.exe Voir le fichier


BIN
SHENKANG-MES-SYS/obj/Debug/DesignTimeResolveAssemblyReferences.cache Voir le fichier


+ 1
- 1
SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.application Voir le fichier

@@ -14,7 +14,7 @@
14 14
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
15 15
         </dsig:Transforms>
16 16
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
17
-        <dsig:DigestValue>m89nRaRclWjieRR0Jua8D+nsGNlBgVo99G1syUK0zjg=</dsig:DigestValue>
17
+        <dsig:DigestValue>+OQAxi13uH9eVXk1MJpvqnernwHvYewa+YpOqEjNM5U=</dsig:DigestValue>
18 18
       </hash>
19 19
     </dependentAssembly>
20 20
   </dependency>

BIN
SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.exe Voir le fichier


+ 4
- 4
SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.exe.manifest Voir le fichier

@@ -4,7 +4,7 @@
4 4
   <description asmv2:iconFile="SHENKANG.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
5 5
   <application />
6 6
   <entryPoint>
7
-    <assemblyIdentity name="WINPROFIT-ERP-SYS" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
7
+    <assemblyIdentity name="WINPROFIT-ERP-SYS" version="1.1.0.0" language="neutral" processorArchitecture="msil" />
8 8
     <commandLine file="WINPROFIT-ERP-SYS.exe" parameters="" />
9 9
   </entryPoint>
10 10
   <trustInfo>
@@ -43,14 +43,14 @@
43 43
     </dependentAssembly>
44 44
   </dependency>
45 45
   <dependency>
46
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WINPROFIT-ERP-SYS.exe" size="5627392">
47
-      <assemblyIdentity name="WINPROFIT-ERP-SYS" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
46
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WINPROFIT-ERP-SYS.exe" size="5630464">
47
+      <assemblyIdentity name="WINPROFIT-ERP-SYS" version="1.1.0.0" language="neutral" processorArchitecture="msil" />
48 48
       <hash>
49 49
         <dsig:Transforms>
50 50
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
51 51
         </dsig:Transforms>
52 52
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
53
-        <dsig:DigestValue>hO2Vcij7W0pmog4isMcrhNehHleozBqGl4qSCERMABg=</dsig:DigestValue>
53
+        <dsig:DigestValue>ZXd2DehjNi2/VfKchliwZQFQKo8nDxXgEgYwAtoqW1I=</dsig:DigestValue>
54 54
       </hash>
55 55
     </dependentAssembly>
56 56
   </dependency>

BIN
SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.pdb Voir le fichier


+ 1
- 1
SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.vbproj.CoreCompileInputs.cache Voir le fichier

@@ -1 +1 @@
1
-6855e067415fc0a60745078f280177a00d63aa62
1
+b05eb67811b07a4e5cec9cae0d353305bffb6e45

+ 2
- 2
SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.vbproj.FileListAbsolute.txt Voir le fichier

@@ -1235,8 +1235,8 @@ D:\工巧明\WINPROFIT\WINPROFIT-ERP-SYS\SHENKANG-MES-SYS\bin\Debug\WINPROFIT-ER
1235 1235
 D:\工巧明\WINPROFIT\WINPROFIT-ERP-SYS\SHENKANG-MES-SYS\bin\Debug\WINPROFIT-ERP-SYS.exe
1236 1236
 D:\工巧明\WINPROFIT\WINPROFIT-ERP-SYS\SHENKANG-MES-SYS\bin\Debug\WINPROFIT-ERP-SYS.pdb
1237 1237
 D:\工巧明\WINPROFIT\WINPROFIT-ERP-SYS\SHENKANG-MES-SYS\bin\Debug\WINPROFIT-ERP-SYS.xml
1238
-D:\工巧明\WINPROFIT\WINPROFIT-ERP-SYS\SHENKANG-MES-SYS\obj\Debug\WINPROFIT-ERP-SYS.vbprojAssemblyReference.cache
1239 1238
 D:\工巧明\WINPROFIT\WINPROFIT-ERP-SYS\SHENKANG-MES-SYS\obj\Debug\WINPROFIT_ERP_SYS.SplashScreen1.resources
1239
+D:\工巧明\WINPROFIT\WINPROFIT-ERP-SYS\SHENKANG-MES-SYS\obj\Debug\WINPROFIT_ERP_SYS.輸入密碼.resources
1240 1240
 D:\工巧明\WINPROFIT\WINPROFIT-ERP-SYS\SHENKANG-MES-SYS\obj\Debug\WINPROFIT_ERP_SYS.列印_量產訂單控制表.resources
1241 1241
 D:\工巧明\WINPROFIT\WINPROFIT-ERP-SYS\SHENKANG-MES-SYS\obj\Debug\WINPROFIT_ERP_SYS.成本資料庫管理.resources
1242 1242
 D:\工巧明\WINPROFIT\WINPROFIT-ERP-SYS\SHENKANG-MES-SYS\obj\Debug\WINPROFIT_ERP_SYS.網段.resources
@@ -1346,4 +1346,4 @@ D:\工巧明\WINPROFIT\WINPROFIT-ERP-SYS\SHENKANG-MES-SYS\obj\Debug\WINPROFIT-ER
1346 1346
 D:\工巧明\WINPROFIT\WINPROFIT-ERP-SYS\SHENKANG-MES-SYS\obj\Debug\WINPROFIT-ERP-SYS.exe
1347 1347
 D:\工巧明\WINPROFIT\WINPROFIT-ERP-SYS\SHENKANG-MES-SYS\obj\Debug\WINPROFIT-ERP-SYS.xml
1348 1348
 D:\工巧明\WINPROFIT\WINPROFIT-ERP-SYS\SHENKANG-MES-SYS\obj\Debug\WINPROFIT-ERP-SYS.pdb
1349
-D:\工巧明\WINPROFIT\WINPROFIT-ERP-SYS\SHENKANG-MES-SYS\obj\Debug\WINPROFIT_ERP_SYS.輸入密碼.resources
1349
+D:\工巧明\WINPROFIT\WINPROFIT-ERP-SYS\SHENKANG-MES-SYS\obj\Debug\WINPROFIT-ERP-SYS.vbprojAssemblyReference.cache

BIN
SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.vbproj.GenerateResource.cache Voir le fichier


BIN
SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.vbprojAssemblyReference.cache Voir le fichier


+ 9
- 0
SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.xml Voir le fichier

@@ -142,5 +142,14 @@ WINPROFIT-ERP-SYS
142 142
   查詢類型 System.Drawing.Bitmap 的當地語系化資源。
143 143
 </summary>
144 144
 </member>
145
+<member name="M:WINPROFIT_ERP_SYS.SQL_連線狀態模組.ConnectTest(System.String,System.Decimal)">
146
+ <summary>
147
+ 测试连接:True-连接成功,False-连接失败
148
+ 参数[必选]:服务器IP
149
+ 参数[可选]:等待超时时间(秒),默认为1.2秒
150
+ </summary>
151
+ <returns></returns>
152
+ <remarks></remarks>
153
+</member>
145 154
 </members>
146 155
 </doc>

+ 4
- 11
SHENKANG-MES-SYS/人事管理系統/人員入職資料表.vb Voir le fichier

@@ -113,6 +113,7 @@ Public Class 人員入職資料表
113 113
         DTP1 = Format(DateTimePicker2.Value, "yyyy/MM/dd")
114 114
     End Sub
115 115
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles 人事資料建檔_bt.Click
116
+        Dim frq As FtpWebRequest, frp As FtpWebResponse, fcr As NetworkCredential
116 117
         If 檔案名稱_tb.Text = "" Or 登入姓名_tb.Text = "" Or 姓名_tb.Text = "" Then
117 118
             MsgBox("請確定人事資料表的圖片檔已準備完成,並且有選擇未建檔的人事清單資料、人員中文姓名有填寫等")
118 119
         Else
@@ -121,7 +122,6 @@ Public Class 人員入職資料表
121 122
             Else
122 123
 
123 124
                 Dim 驗證 As String = "" : Dim 取變數 As String
124
-                Dim frq As FtpWebRequest, frp As FtpWebResponse, fcr As NetworkCredential
125 125
                 取變數 = Strings.StrReverse(檔案名稱_tb.Text)
126 126
                 For i As Integer = 1 To 10
127 127
                     If i = 1 Then
@@ -151,18 +151,11 @@ Public Class 人員入職資料表
151 151
                     ElseIf NUM1 > 9999999 Then : 員工編號_tb.Text = "EN" & NUM1
152 152
                     End If
153 153
 
154
-                    Set_日期格式轉換()
155
-                    SQL_新增人事資料表()
156
-                    conn.Close() : dr.Close()
154
+                    Set_日期格式轉換() : SQL_新增人事資料表() : conn.Close() : dr.Close()
157 155
                     MsgBox("新增完成")
158 156
                     '---------------------------------------------------------------------------------------------------------------------------------
159
-                    檔案名稱_tb.Text = ""
160
-
161
-                    SQL_更改使用者權限管理表()
162
-                    conn.Close() : dr.Close()
163
-                    MsgBox("更改完成")
164
-                    Set_使用者清單() : Set_人員清單()
165
-                    讀取圖片()
157
+                    SQL_更改使用者權限管理表() : conn.Close() : dr.Close()
158
+                    Set_使用者清單() : Set_人員清單() : 讀取圖片()
166 159
                     '---FTP方式刪除檔案----------------------------------------------------------------------------------------------------------------------------------------------------------------------
167 160
                     frq = CType(WebRequest.Create(New Uri(Target1 & 檔案名稱_tb.Text)), FtpWebRequest)
168 161
                     fcr = New NetworkCredential(FTP帳號, FTP密碼)

+ 4
- 1
SHENKANG-MES-SYS/成本管理系統/列印_樣品報價單.vb Voir le fichier

@@ -70,7 +70,10 @@ Public Class 列印_樣品報價單
70 70
                            "' AND 形體名 LIKE N'" & DataGridView1.Rows(i).Cells("STYLENAME").Value & "' AND 類別 LIKE N'設計圖'"
71 71
                     CmdSet_For_dr()
72 72
                     While dr.Read() = True
73
-                        Dim bytes As Byte() = New Byte(-1) {} : bytes = DirectCast(dr.Item("圖片"), Byte()) : Dim oStream As New MemoryStream(bytes) : PictureBox1.Image = Bitmap.FromStream(oStream)
73
+                        Dim unused As Byte() = New Byte(-1) {}
74
+                        Dim bytes As Byte() = DirectCast(dr.Item("圖片"), Byte())
75
+                        Dim oStream As New MemoryStream(bytes)
76
+                        PictureBox1.Image = Bitmap.FromStream(oStream)
74 77
                     End While
75 78
                     conn.Close() : GG(xlApp, xlSheet)
76 79
                 Else

+ 11
- 6
SHENKANG-MES-SYS/樣品訂單管理系統/樣品單控制表.Designer.vb Voir le fichier

@@ -153,7 +153,7 @@ Partial Class 樣品單控制表
153 153
         '樣品訂單清單_lb
154 154
         '
155 155
         Me.樣品訂單清單_lb.AutoSize = True
156
-        Me.樣品訂單清單_lb.Location = New System.Drawing.Point(14, 13)
156
+        Me.樣品訂單清單_lb.Location = New System.Drawing.Point(14, 5)
157 157
         Me.樣品訂單清單_lb.Name = "樣品訂單清單_lb"
158 158
         Me.樣品訂單清單_lb.Size = New System.Drawing.Size(80, 16)
159 159
         Me.樣品訂單清單_lb.TabIndex = 677
@@ -161,9 +161,11 @@ Partial Class 樣品單控制表
161 161
         '
162 162
         '樣品單_dgv
163 163
         '
164
+        Me.樣品單_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
165
+            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
164 166
         Me.樣品單_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
165 167
         Me.樣品單_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
166
-        Me.樣品單_dgv.Location = New System.Drawing.Point(12, 39)
168
+        Me.樣品單_dgv.Location = New System.Drawing.Point(12, 26)
167 169
         Me.樣品單_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
168 170
         Me.樣品單_dgv.Name = "樣品單_dgv"
169 171
         Me.樣品單_dgv.RowHeadersWidth = 5
@@ -177,7 +179,7 @@ Partial Class 樣品單控制表
177 179
         '
178 180
         Me.搜尋_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
179 181
         Me.搜尋_bt.ForeColor = System.Drawing.Color.Black
180
-        Me.搜尋_bt.Location = New System.Drawing.Point(381, 8)
182
+        Me.搜尋_bt.Location = New System.Drawing.Point(381, 0)
181 183
         Me.搜尋_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
182 184
         Me.搜尋_bt.Name = "搜尋_bt"
183 185
         Me.搜尋_bt.Size = New System.Drawing.Size(50, 24)
@@ -189,7 +191,7 @@ Partial Class 樣品單控制表
189 191
         '
190 192
         Me.返回_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
191 193
         Me.返回_bt.ForeColor = System.Drawing.Color.Black
192
-        Me.返回_bt.Location = New System.Drawing.Point(437, 8)
194
+        Me.返回_bt.Location = New System.Drawing.Point(437, 0)
193 195
         Me.返回_bt.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
194 196
         Me.返回_bt.Name = "返回_bt"
195 197
         Me.返回_bt.Size = New System.Drawing.Size(50, 24)
@@ -552,6 +554,8 @@ Partial Class 樣品單控制表
552 554
         '
553 555
         '明細3_dgv
554 556
         '
557
+        Me.明細3_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
558
+            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
555 559
         Me.明細3_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
556 560
         Me.明細3_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
557 561
         Me.明細3_dgv.Location = New System.Drawing.Point(493, 292)
@@ -739,6 +743,7 @@ Partial Class 樣品單控制表
739 743
         '
740 744
         DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
741 745
         Me.明細4_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
746
+        Me.明細4_dgv.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
742 747
         Me.明細4_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
743 748
         Me.明細4_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
744 749
         Me.明細4_dgv.Location = New System.Drawing.Point(493, 823)
@@ -849,7 +854,7 @@ Partial Class 樣品單控制表
849 854
         '樣品訂單轉制預告訂單_bt
850 855
         '
851 856
         Me.樣品訂單轉制預告訂單_bt.ForeColor = System.Drawing.Color.Red
852
-        Me.樣品訂單轉制預告訂單_bt.Location = New System.Drawing.Point(100, 8)
857
+        Me.樣品訂單轉制預告訂單_bt.Location = New System.Drawing.Point(100, 0)
853 858
         Me.樣品訂單轉制預告訂單_bt.Name = "樣品訂單轉制預告訂單_bt"
854 859
         Me.樣品訂單轉制預告訂單_bt.Size = New System.Drawing.Size(158, 24)
855 860
         Me.樣品訂單轉制預告訂單_bt.TabIndex = 747
@@ -971,7 +976,7 @@ Partial Class 樣品單控制表
971 976
         '清單伸展_ch
972 977
         '
973 978
         Me.清單伸展_ch.AutoSize = True
974
-        Me.清單伸展_ch.Location = New System.Drawing.Point(264, 11)
979
+        Me.清單伸展_ch.Location = New System.Drawing.Point(264, 3)
975 980
         Me.清單伸展_ch.Name = "清單伸展_ch"
976 981
         Me.清單伸展_ch.Size = New System.Drawing.Size(75, 20)
977 982
         Me.清單伸展_ch.TabIndex = 749

+ 17
- 13
SHENKANG-MES-SYS/樣品訂單管理系統/樣品單控制表.vb Voir le fichier

@@ -384,21 +384,21 @@ Public Class 樣品單控制表
384 384
     Private Sub 新增準備4_1()
385 385
         For i As Integer = 0 To 明細2_dgv.Rows.Count - 1
386 386
             資料數 = 明細2_dgv.Rows.Count : MyModule1.進度條()
387
-            PA = 明細2_dgv.Rows(i).Cells("顏色").Value : PA1 = 明細2_dgv.Rows(i).Cells("架號").Value
388
-            PA2 = 明細2_dgv.Rows(i).Cells("數量").Value : PA3 = 明細2_dgv.Rows(i).Cells("SIZE").Value
389
-            PA4 = 明細2_dgv.Rows(i).Cells("KEEP").Value : PA5 = 明細2_dgv.Rows(i).Cells("借出者").Value
390
-            PA6 = 明細4_dgv.Rows(i).Cells("備註").Value : PA10 = 明細2_dgv.Rows(i).Cells("項次").Value
391
-            PA11 = 明細2_dgv.Rows(i).Cells("版次").Value
387
+            PA = 明細2_dgv.Rows(i).Cells("顏色").Value.ToString : PA1 = 明細2_dgv.Rows(i).Cells("架號").Value.ToString
388
+            PA2 = 明細2_dgv.Rows(i).Cells("數量").Value.ToString : PA3 = 明細2_dgv.Rows(i).Cells("SIZE").Value.ToString
389
+            PA4 = 明細2_dgv.Rows(i).Cells("KEEP").Value.ToString : PA5 = 明細2_dgv.Rows(i).Cells("借出者").Value.ToString
390
+            PA6 = 明細4_dgv.Rows(i).Cells("備註").Value.ToString : PA10 = 明細2_dgv.Rows(i).Cells("項次").Value.ToString
391
+            PA11 = 明細2_dgv.Rows(i).Cells("版次").Value.ToString
392 392
             SQL_修改樣品訂單清單() : conn.Close()
393 393
         Next : WINPROFIT_ERP_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
394 394
     End Sub
395 395
     Private Sub 新增準備4_2()
396 396
         For i As Integer = 0 To 明細3_dgv.Rows.Count - 1
397 397
             資料數 = 明細3_dgv.Rows.Count : MyModule1.進度條()
398
-            PA = 明細3_dgv.Rows(i).Cells("材料名稱").Value : PA1 = 明細3_dgv.Rows(i).Cells("顏色").Value
399
-            PA2 = 明細3_dgv.Rows(i).Cells("備註").Value : PA3 = 明細3_dgv.Rows(i).Cells("廠商").Value
400
-            PA4 = 明細3_dgv.Rows(i).Cells("排列").Value : PA5 = 明細3_dgv.Rows(i).Cells("流水號").Value
401
-            PA6 = 明細3_dgv.Rows(i).Cells("部件").Value
398
+            PA = 明細3_dgv.Rows(i).Cells("材料名稱").Value.ToString : PA1 = 明細3_dgv.Rows(i).Cells("顏色").Value.ToString
399
+            PA2 = 明細3_dgv.Rows(i).Cells("備註").Value.ToString : PA3 = 明細3_dgv.Rows(i).Cells("廠商").Value.ToString
400
+            PA4 = 明細3_dgv.Rows(i).Cells("排列").Value.ToString : PA5 = 明細3_dgv.Rows(i).Cells("流水號").Value.ToString
401
+            PA6 = 明細3_dgv.Rows(i).Cells("部件").Value.ToString
402 402
             SQL_修改樣品訂單部件表() : conn.Close()
403 403
         Next : WINPROFIT_ERP_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
404 404
     End Sub
@@ -610,7 +610,7 @@ Public Class 樣品單控制表
610 610
             新增文件 = False : Timer1.Enabled = False : 資料尚未存檔_lb.Visible = False
611 611
             一般新增_bt.Enabled = True : 複製新增_bt.Enabled = True : 修改模式_bt.Enabled = True : REVISED_bt.Enabled = True
612 612
             存檔_bt.Enabled = False : 新增_bt.Enabled = False : 新增1_bt.Enabled = False : 刪除_bt.Enabled = False : 刪除1_bt.Enabled = False
613
-            MsgBox("存檔完成") : Set_清單()
613
+            MsgBox("存檔完成") : 返回_bt.PerformClick()
614 614
         End If
615 615
     End Sub
616 616
     Private Sub Button10_Click(sender As Object, e As EventArgs) Handles 刪除3_bt.Click
@@ -745,9 +745,13 @@ Public Class 樣品單控制表
745 745
         ComboBox6下拉表單資料載入()
746 746
     End Sub
747 747
     Private Sub Button30_Click(sender As Object, e As EventArgs) Handles 指定資料寫入_bt.Click
748
-        明細3_dgv.Rows(Val(筆資料中的_tb.Text) - 1).Cells("廠商").Value = 供應商_cb.Text
749
-        明細3_dgv.Rows(Val(筆資料中的_tb.Text) - 1).Cells("材料名稱").Value = 供應商2_cb.Text
750
-        明細3_dgv.Rows(Val(筆資料中的_tb.Text) - 1).Cells("顏色").Value = 供應商3_cb.Text
748
+        If 筆資料中的_tb.Text = "" Then
749
+            MsgBox("資料寫入前須先選擇清單中的哪一筆")
750
+        Else
751
+            明細3_dgv.Rows(Val(筆資料中的_tb.Text) - 1).Cells("廠商").Value = 供應商_cb.Text
752
+            明細3_dgv.Rows(Val(筆資料中的_tb.Text) - 1).Cells("材料名稱").Value = 供應商2_cb.Text
753
+            明細3_dgv.Rows(Val(筆資料中的_tb.Text) - 1).Cells("顏色").Value = 供應商3_cb.Text
754
+        End If
751 755
     End Sub
752 756
     Private Sub ComboBox12_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 供應商_cb.SelectedIndexChanged
753 757
         ComboBox13下拉表單資料載入() : ComboBox14下拉表單資料載入()

+ 30
- 14
SHENKANG-MES-SYS/樣品訂單管理系統/樣品進度表.Designer.vb Voir le fichier

@@ -56,6 +56,7 @@ Partial Class 樣品進度表
56 56
         Me.文字提醒_lb = New System.Windows.Forms.Label()
57 57
         Me.全部列印自動框線_cb = New System.Windows.Forms.CheckBox()
58 58
         Me.重新讀取_bt = New System.Windows.Forms.Button()
59
+        Me.Panel1 = New System.Windows.Forms.Panel()
59 60
         CType(Me.進度表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
60 61
         CType(Me.版本_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
61 62
         CType(Me.部件A_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -67,6 +68,7 @@ Partial Class 樣品進度表
67 68
         Me.GroupBox1.SuspendLayout()
68 69
         CType(Me.季節客戶_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
69 70
         CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
71
+        Me.Panel1.SuspendLayout()
70 72
         Me.SuspendLayout()
71 73
         '
72 74
         '清除_bt
@@ -119,6 +121,9 @@ Partial Class 樣品進度表
119 121
         '
120 122
         '進度表_dgv
121 123
         '
124
+        Me.進度表_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
125
+            Or System.Windows.Forms.AnchorStyles.Left) _
126
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
122 127
         Me.進度表_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
123 128
         Me.進度表_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
124 129
         Me.進度表_dgv.Location = New System.Drawing.Point(9, 37)
@@ -173,14 +178,14 @@ Partial Class 樣品進度表
173 178
         '部件C_dgv
174 179
         '
175 180
         Me.部件C_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
176
-        Me.部件C_dgv.Location = New System.Drawing.Point(842, 76)
181
+        Me.部件C_dgv.Location = New System.Drawing.Point(75, 418)
177 182
         Me.部件C_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
178 183
         Me.部件C_dgv.Name = "部件C_dgv"
179 184
         Me.部件C_dgv.RowHeadersWidth = 5
180 185
         DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
181 186
         Me.部件C_dgv.RowsDefaultCellStyle = DataGridViewCellStyle5
182 187
         Me.部件C_dgv.RowTemplate.Height = 24
183
-        Me.部件C_dgv.Size = New System.Drawing.Size(252, 158)
188
+        Me.部件C_dgv.Size = New System.Drawing.Size(264, 158)
184 189
         Me.部件C_dgv.TabIndex = 702
185 190
         '
186 191
         '部件D_dgv
@@ -219,7 +224,7 @@ Partial Class 樣品進度表
219 224
         DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
220 225
         Me.部件F_dgv.RowsDefaultCellStyle = DataGridViewCellStyle8
221 226
         Me.部件F_dgv.RowTemplate.Height = 24
222
-        Me.部件F_dgv.Size = New System.Drawing.Size(233, 169)
227
+        Me.部件F_dgv.Size = New System.Drawing.Size(252, 169)
223 228
         Me.部件F_dgv.TabIndex = 705
224 229
         '
225 230
         '查看歷史進度表資料_bt
@@ -236,7 +241,7 @@ Partial Class 樣品進度表
236 241
         '
237 242
         Me.GroupBox1.Controls.Add(Me.關閉_bt)
238 243
         Me.GroupBox1.Controls.Add(Me.季節客戶_dgv)
239
-        Me.GroupBox1.Location = New System.Drawing.Point(878, 109)
244
+        Me.GroupBox1.Location = New System.Drawing.Point(3, 3)
240 245
         Me.GroupBox1.Name = "GroupBox1"
241 246
         Me.GroupBox1.Size = New System.Drawing.Size(439, 733)
242 247
         Me.GroupBox1.TabIndex = 707
@@ -258,14 +263,14 @@ Partial Class 樣品進度表
258 263
         Me.季節客戶_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
259 264
         Me.季節客戶_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
260 265
         Me.季節客戶_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
261
-        Me.季節客戶_dgv.Location = New System.Drawing.Point(23, 54)
266
+        Me.季節客戶_dgv.Location = New System.Drawing.Point(6, 54)
262 267
         Me.季節客戶_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
263 268
         Me.季節客戶_dgv.Name = "季節客戶_dgv"
264 269
         Me.季節客戶_dgv.RowHeadersWidth = 5
265 270
         DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
266 271
         Me.季節客戶_dgv.RowsDefaultCellStyle = DataGridViewCellStyle10
267 272
         Me.季節客戶_dgv.RowTemplate.Height = 24
268
-        Me.季節客戶_dgv.Size = New System.Drawing.Size(385, 658)
273
+        Me.季節客戶_dgv.Size = New System.Drawing.Size(427, 672)
269 274
         Me.季節客戶_dgv.TabIndex = 704
270 275
         '
271 276
         '列印_bt
@@ -281,7 +286,7 @@ Partial Class 樣品進度表
281 286
         '
282 287
         Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
283 288
         Me.PictureBox2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
284
-        Me.PictureBox2.Location = New System.Drawing.Point(75, 418)
289
+        Me.PictureBox2.Location = New System.Drawing.Point(345, 418)
285 290
         Me.PictureBox2.Name = "PictureBox2"
286 291
         Me.PictureBox2.Size = New System.Drawing.Size(285, 166)
287 292
         Me.PictureBox2.TabIndex = 784
@@ -338,19 +343,34 @@ Partial Class 樣品進度表
338 343
         Me.重新讀取_bt.Text = "重新讀取"
339 344
         Me.重新讀取_bt.UseVisualStyleBackColor = True
340 345
         '
346
+        'Panel1
347
+        '
348
+        Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
349
+        Me.Panel1.Controls.Add(Me.GroupBox1)
350
+        Me.Panel1.Location = New System.Drawing.Point(720, 76)
351
+        Me.Panel1.Name = "Panel1"
352
+        Me.Panel1.Size = New System.Drawing.Size(449, 741)
353
+        Me.Panel1.TabIndex = 790
354
+        '
341 355
         '樣品進度表
342 356
         '
343 357
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
344 358
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
345 359
         Me.ClientSize = New System.Drawing.Size(1914, 971)
360
+        Me.Controls.Add(Me.Panel1)
346 361
         Me.Controls.Add(Me.重新讀取_bt)
347 362
         Me.Controls.Add(Me.全部列印自動框線_cb)
348 363
         Me.Controls.Add(Me.文字提醒_lb)
349 364
         Me.Controls.Add(Me.全部取消_bt)
350 365
         Me.Controls.Add(Me.全部選擇_bt)
351 366
         Me.Controls.Add(Me.列印_bt)
352
-        Me.Controls.Add(Me.GroupBox1)
353 367
         Me.Controls.Add(Me.查看歷史進度表資料_bt)
368
+        Me.Controls.Add(Me.清除_bt)
369
+        Me.Controls.Add(Me.CUST_cb)
370
+        Me.Controls.Add(Me.CUST_lb)
371
+        Me.Controls.Add(Me.SEASON_cb)
372
+        Me.Controls.Add(Me.SEASON_lb)
373
+        Me.Controls.Add(Me.進度表_dgv)
354 374
         Me.Controls.Add(Me.部件F_dgv)
355 375
         Me.Controls.Add(Me.部件E_dgv)
356 376
         Me.Controls.Add(Me.部件D_dgv)
@@ -358,12 +378,6 @@ Partial Class 樣品進度表
358 378
         Me.Controls.Add(Me.部件B_dgv)
359 379
         Me.Controls.Add(Me.部件A_dgv)
360 380
         Me.Controls.Add(Me.版本_dgv)
361
-        Me.Controls.Add(Me.清除_bt)
362
-        Me.Controls.Add(Me.CUST_cb)
363
-        Me.Controls.Add(Me.CUST_lb)
364
-        Me.Controls.Add(Me.SEASON_cb)
365
-        Me.Controls.Add(Me.SEASON_lb)
366
-        Me.Controls.Add(Me.進度表_dgv)
367 381
         Me.Controls.Add(Me.PictureBox2)
368 382
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
369 383
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
@@ -380,6 +394,7 @@ Partial Class 樣品進度表
380 394
         Me.GroupBox1.ResumeLayout(False)
381 395
         CType(Me.季節客戶_dgv, System.ComponentModel.ISupportInitialize).EndInit()
382 396
         CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
397
+        Me.Panel1.ResumeLayout(False)
383 398
         Me.ResumeLayout(False)
384 399
         Me.PerformLayout()
385 400
 
@@ -409,4 +424,5 @@ Partial Class 樣品進度表
409 424
     Friend WithEvents 文字提醒_lb As Label
410 425
     Friend WithEvents 全部列印自動框線_cb As CheckBox
411 426
     Friend WithEvents 重新讀取_bt As Button
427
+    Friend WithEvents Panel1 As Panel
412 428
 End Class

+ 10
- 6
SHENKANG-MES-SYS/樣品訂單管理系統/樣品進度表.vb Voir le fichier

@@ -13,7 +13,6 @@ Imports System.Threading
13 13
 Public Class 樣品進度表
14 14
     Private ReadOnly ds, ds1, ds2, ds3, ds4, ds5, ds6, ds7, ds8 As New DataSet
15 15
     Dim N1, N2, N3, N4, N5, N6, FFGG As Integer
16
-    Dim SSDD As String
17 16
     Dim xlApp As Application : Dim xlBook As Workbook : Dim xlSheet As Worksheet
18 17
     Private Sub Set_清單1()
19 18
         版本_dgv.DataSource = Nothing : ds1.Clear()
@@ -1228,7 +1227,7 @@ Public Class 樣品進度表
1228 1227
         Me.MdiParent = WINPROFIT_ERP_SYS : Me.WindowState = 2 : Me.AutoScroll = True
1229 1228
         ComboBox7下拉表單資料載入() : ComboBox2下拉表單資料載入()
1230 1229
         版本_dgv.Visible = False : 部件A_dgv.Visible = False : 部件B_dgv.Visible = False : 部件C_dgv.Visible = False : 部件D_dgv.Visible = False : 部件E_dgv.Visible = False
1231
-        部件F_dgv.Visible = False : GroupBox1.Visible = False : SEASON_cb.Enabled = False : CUST_cb.Enabled = False
1230
+        部件F_dgv.Visible = False : Panel1.Visible = False : SEASON_cb.Enabled = False : CUST_cb.Enabled = False
1232 1231
         查看歷史進度表資料_bt.PerformClick()
1233 1232
     End Sub
1234 1233
     Private Sub 進度表_dgv_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 進度表_dgv.RowPostPaint
@@ -1284,10 +1283,10 @@ Public Class 樣品進度表
1284 1283
         SEASON_cb.Enabled = True : CUST_cb.Enabled = True : ComboBox7下拉表單資料載入() : ComboBox2下拉表單資料載入()
1285 1284
     End Sub
1286 1285
     Private Sub 關閉_bt_Click(sender As Object, e As EventArgs) Handles 關閉_bt.Click
1287
-        GroupBox1.Visible = False
1286
+        Panel1.Visible = False
1288 1287
     End Sub
1289 1288
     Private Sub 查看歷史進度表資料_bt_Click(sender As Object, e As EventArgs) Handles 查看歷史進度表資料_bt.Click
1290
-        Set_清單8() : GroupBox1.Visible = True
1289
+        Set_清單8() : Panel1.Visible = True
1291 1290
     End Sub
1292 1291
     Private Sub 全部取消_bt_Click(sender As Object, e As EventArgs) Handles 全部取消_bt.Click
1293 1292
         For i As Integer = 0 To 進度表_dgv.Rows.Count - 1 : 進度表_dgv.Rows(i).Cells("選擇").Value = False : Next
@@ -1301,10 +1300,15 @@ Public Class 樣品進度表
1301 1300
         SQL_圖片導入2()
1302 1301
         PictureBox2.Image = Nothing
1303 1302
         While dr.Read() = True
1304
-            Dim bytes As Byte() = New Byte(-1) {}
1305
-            bytes = DirectCast(dr.Item("圖片"), Byte())
1303
+            Dim unused As Byte() = New Byte(-1) {}
1304
+            Dim bytes As Byte() = DirectCast(dr.Item("圖片"), Byte())
1306 1305
             Dim oStream As New MemoryStream(bytes)
1307 1306
             PictureBox2.Image = Bitmap.FromStream(oStream)
1307
+
1308
+            'Dim bytes As Byte() = New Byte(-1) {}
1309
+            'bytes = DirectCast(dr.Item("圖片"), Byte())
1310
+            'Dim oStream As New MemoryStream(bytes)
1311
+            'PictureBox2.Image = Bitmap.FromStream(oStream)
1308 1312
         End While
1309 1313
         conn.Close()
1310 1314
         PictureBox2.SizeMode = 4

Loading…
Annuler
Enregistrer