B70340 4 years ago
parent
commit
747de71ef6

BIN
工巧明智能管理系統/.vs/我的系統/v16/.suo View File


+ 1
- 1
工巧明智能管理系統/我的系統/Login.Designer.vb View File

240
         Me.ComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
240
         Me.ComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
241
         Me.ComboBox1.ForeColor = System.Drawing.Color.Blue
241
         Me.ComboBox1.ForeColor = System.Drawing.Color.Blue
242
         Me.ComboBox1.FormattingEnabled = True
242
         Me.ComboBox1.FormattingEnabled = True
243
-        Me.ComboBox1.Items.AddRange(New Object() {"台灣"})
243
+        Me.ComboBox1.Items.AddRange(New Object() {"工巧明外網", "工巧明內網"})
244
         Me.ComboBox1.Location = New System.Drawing.Point(338, 5)
244
         Me.ComboBox1.Location = New System.Drawing.Point(338, 5)
245
         Me.ComboBox1.Name = "ComboBox1"
245
         Me.ComboBox1.Name = "ComboBox1"
246
         Me.ComboBox1.Size = New System.Drawing.Size(102, 24)
246
         Me.ComboBox1.Size = New System.Drawing.Size(102, 24)

+ 20
- 12
工巧明智能管理系統/我的系統/Login.vb View File

51
         TextBox4.Text = "1"
51
         TextBox4.Text = "1"
52
         Label1.Text = "執行檔版本號 : " & 版本
52
         Label1.Text = "執行檔版本號 : " & 版本
53
         網段.ShowDialog()
53
         網段.ShowDialog()
54
-        If 登入判斷 = True Then
55
-            ComboBox1.Text = "台灣"
54
+        If 登入判斷 = True And 內外網 = False Then
55
+            ComboBox1.Text = "工巧明內網"
56
             OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
56
             OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
57
-        ElseIf 登入判斷 = False Then
58
-            ComboBox1.Text = "台灣"
57
+        ElseIf 登入判斷 = False And 內外網 = False Then
58
+            ComboBox1.Text = "工巧明內網"
59
+            OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
60
+        ElseIf 登入判斷 = True And 內外網 = True Then
61
+            ComboBox1.Text = "工巧明外網"
59
             OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
62
             OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
60
         End If
63
         End If
61
         '-----------------------取得本機IP-----------------------------------------------------------------------------------------------------------------------------------------------
64
         '-----------------------取得本機IP-----------------------------------------------------------------------------------------------------------------------------------------------
64
         MYIP = IPAdress.ToString
67
         MYIP = IPAdress.ToString
65
         '-----------------------IP比對----------------------------------------------------------------------------------------------------------------------------------------------------
68
         '-----------------------IP比對----------------------------------------------------------------------------------------------------------------------------------------------------
66
         If Strings.Left(MYIP, 10) = "192.168.12" Or Strings.Left(MYIP, 7) = "10.0.0." Then
69
         If Strings.Left(MYIP, 10) = "192.168.12" Or Strings.Left(MYIP, 7) = "10.0.0." Then
67
-            ComboBox1.Text = "台灣"
70
+            ComboBox1.Text = "工巧明內網"
68
             OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
71
             OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
69
         Else
72
         Else
70
-            ComboBox1.Text = ""
71
-            MsgBox("本機網路目前不再台灣伺服器所在網域,請注意連接網域的VPN是否有開啟!")
72
-            OK.Enabled = False : Cancel.Enabled = False : CheckBox1.Checked = False
73
+            ComboBox1.Text = "工巧明外網"
74
+            OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
73
         End If
75
         End If
74
 
76
 
75
         '-----------------------調整視窗大小-----------------------------------------------------------------------------------------------------------------------------------------------
77
         '-----------------------調整視窗大小-----------------------------------------------------------------------------------------------------------------------------------------------
84
     <Obsolete>
86
     <Obsolete>
85
     Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged
87
     Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged
86
         '-----------------------確認登入伺服器位置-----------------------------------------------------------------------------------------------------------------------------------------
88
         '-----------------------確認登入伺服器位置-----------------------------------------------------------------------------------------------------------------------------------------
87
-        If ComboBox1.Text = "台灣" Then
89
+        If ComboBox1.Text = "工巧明內網" Then
88
             HostName = Dns.GetHostName '获得本机的机器名
90
             HostName = Dns.GetHostName '获得本机的机器名
89
             IPAdress = Dns.GetHostByName(HostName).AddressList.GetValue(0) '获得本机的IP
91
             IPAdress = Dns.GetHostByName(HostName).AddressList.GetValue(0) '获得本机的IP
90
             MYIP = IPAdress.ToString
92
             MYIP = IPAdress.ToString
92
                 登入人IP = "192.168.12.127"
94
                 登入人IP = "192.168.12.127"
93
                 登入()
95
                 登入()
94
                 OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
96
                 OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
95
-            Else
96
-                MsgBox("所選擇服務器不是台灣服務器,請連線該服務器所在網域的VPN,確保連線正常後重新選擇伺服器!")
97
-                OK.Enabled = False : Cancel.Enabled = False : CheckBox1.Checked = False
97
+            End If
98
+        ElseIf ComboBox1.Text = "工巧明外網" Then
99
+            HostName = Dns.GetHostName '获得本机的机器名
100
+            IPAdress = Dns.GetHostByName(HostName).AddressList.GetValue(0) '获得本机的IP
101
+            MYIP = IPAdress.ToString
102
+            If Strings.Left(MYIP, 10) <> "192.168.12" Or Strings.Left(MYIP, 7) <> "10.0.0." Then
103
+                登入人IP = "180.177.181.162,5264"
104
+                登入()
105
+                OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
98
             End If
106
             End If
99
         End If
107
         End If
100
         UsernameTextBox.Focus()
108
         UsernameTextBox.Focus()

+ 2
- 2
工巧明智能管理系統/我的系統/MyModule/MyModule.vb View File

6
     Public 登入權限AQL As String = "姓名, 帳號, 密碼, 密碼日期, CC00, CC01, CC02, CC03, CC04, CC05, CC06, CC07, CC08, CC09, CC10, CC11, CC12, CC13, CC14, CC15, CC16, CC17, CC18, CC19, CC20, CC21, CC22, 
6
     Public 登入權限AQL As String = "姓名, 帳號, 密碼, 密碼日期, CC00, CC01, CC02, CC03, CC04, CC05, CC06, CC07, CC08, CC09, CC10, CC11, CC12, CC13, CC14, CC15, CC16, CC17, CC18, CC19, CC20, CC21, CC22, 
7
                                     CC23, CC24, CC25, CC26"
7
                                     CC23, CC24, CC25, CC26"
8
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
8
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
9
-    Public 版本 As String = "2020112301"
9
+    Public 版本 As String = "2021010101"
10
     '----系統閒置-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
10
     '----系統閒置-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
11
-    Public 判斷重登 As Boolean : Public 重登確認 As Boolean : Public 主頁開啟 As Boolean
11
+    Public 判斷重登 As Boolean : Public 內外網 As Boolean : Public 重登確認 As Boolean : Public 主頁開啟 As Boolean
12
     Public timeExit As Integer = 0 : Public timeExit2 As Integer = 0 : Public timeNow As Integer = 0 : Public timeNow2 As Integer = 0 : Public 密碼時限 As Integer = 30
12
     Public timeExit As Integer = 0 : Public timeExit2 As Integer = 0 : Public timeNow As Integer = 0 : Public timeNow2 As Integer = 0 : Public 密碼時限 As Integer = 30
13
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
13
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
14
     Public MSG As MsgBoxResult
14
     Public MSG As MsgBoxResult

BIN
工巧明智能管理系統/我的系統/bin/Debug/GCM-ERP-SYS.exe View File


BIN
工巧明智能管理系統/我的系統/bin/Debug/GCM-ERP-SYS.pdb View File


BIN
工巧明智能管理系統/我的系統/obj/x86/Debug/GCM-ERP-SYS.exe View File


BIN
工巧明智能管理系統/我的系統/obj/x86/Debug/GCM-ERP-SYS.pdb View File


BIN
工巧明智能管理系統/我的系統/obj/x86/Debug/工巧明智能管理系統.vbproj.GenerateResource.cache View File


BIN
工巧明智能管理系統/我的系統/obj/x86/Debug/工巧明智能管理系統.vbproj.ResolveComReference.cache View File


BIN
工巧明智能管理系統/我的系統/obj/x86/Debug/工巧明智能管理系統.vbprojAssemblyReference.cache View File


+ 32
- 20
工巧明智能管理系統/我的系統/網段.Designer.vb View File

29
         Me.Label5 = New System.Windows.Forms.Label()
29
         Me.Label5 = New System.Windows.Forms.Label()
30
         Me.Version = New System.Windows.Forms.Label()
30
         Me.Version = New System.Windows.Forms.Label()
31
         Me.Copyright = New System.Windows.Forms.Label()
31
         Me.Copyright = New System.Windows.Forms.Label()
32
-        Me.Button2 = New System.Windows.Forms.Button()
33
-        Me.Button1 = New System.Windows.Forms.Button()
32
+        Me.設計_bt = New System.Windows.Forms.Button()
33
+        Me.內網_bt = New System.Windows.Forms.Button()
34
+        Me.外網_bt = New System.Windows.Forms.Button()
34
         Me.SuspendLayout()
35
         Me.SuspendLayout()
35
         '
36
         '
36
         'Label1
37
         'Label1
102
         Me.Copyright.TabIndex = 673
103
         Me.Copyright.TabIndex = 673
103
         Me.Copyright.Text = "著作權"
104
         Me.Copyright.Text = "著作權"
104
         '
105
         '
105
-        'Button2
106
+        '設計_bt
106
         '
107
         '
107
-        Me.Button2.Location = New System.Drawing.Point(401, 237)
108
-        Me.Button2.Name = "Button2"
109
-        Me.Button2.Size = New System.Drawing.Size(75, 34)
110
-        Me.Button2.TabIndex = 671
111
-        Me.Button2.Text = "No"
112
-        Me.Button2.UseVisualStyleBackColor = True
108
+        Me.設計_bt.Location = New System.Drawing.Point(401, 237)
109
+        Me.設計_bt.Name = "設計_bt"
110
+        Me.設計_bt.Size = New System.Drawing.Size(75, 34)
111
+        Me.設計_bt.TabIndex = 671
112
+        Me.設計_bt.Text = "設計"
113
+        Me.設計_bt.UseVisualStyleBackColor = True
113
         '
114
         '
114
-        'Button1
115
+        '內網_bt
115
         '
116
         '
116
-        Me.Button1.Location = New System.Drawing.Point(320, 237)
117
-        Me.Button1.Name = "Button1"
118
-        Me.Button1.Size = New System.Drawing.Size(75, 34)
119
-        Me.Button1.TabIndex = 670
120
-        Me.Button1.Text = "Yes"
121
-        Me.Button1.UseVisualStyleBackColor = True
117
+        Me.內網_bt.Location = New System.Drawing.Point(320, 237)
118
+        Me.內網_bt.Name = "內網_bt"
119
+        Me.內網_bt.Size = New System.Drawing.Size(75, 34)
120
+        Me.內網_bt.TabIndex = 670
121
+        Me.內網_bt.Text = "內網"
122
+        Me.內網_bt.UseVisualStyleBackColor = True
123
+        '
124
+        '外網_bt
125
+        '
126
+        Me.外網_bt.Location = New System.Drawing.Point(239, 237)
127
+        Me.外網_bt.Name = "外網_bt"
128
+        Me.外網_bt.Size = New System.Drawing.Size(75, 34)
129
+        Me.外網_bt.TabIndex = 678
130
+        Me.外網_bt.Text = "外網"
131
+        Me.外網_bt.UseVisualStyleBackColor = True
122
         '
132
         '
123
         '網段
133
         '網段
124
         '
134
         '
127
         Me.BackgroundImage = Global.工巧明智能管理系統.My.Resources.Resources._002
137
         Me.BackgroundImage = Global.工巧明智能管理系統.My.Resources.Resources._002
128
         Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
138
         Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
129
         Me.ClientSize = New System.Drawing.Size(488, 283)
139
         Me.ClientSize = New System.Drawing.Size(488, 283)
140
+        Me.Controls.Add(Me.外網_bt)
130
         Me.Controls.Add(Me.Label1)
141
         Me.Controls.Add(Me.Label1)
131
         Me.Controls.Add(Me.Label8)
142
         Me.Controls.Add(Me.Label8)
132
         Me.Controls.Add(Me.Label6)
143
         Me.Controls.Add(Me.Label6)
133
         Me.Controls.Add(Me.Label5)
144
         Me.Controls.Add(Me.Label5)
134
         Me.Controls.Add(Me.Copyright)
145
         Me.Controls.Add(Me.Copyright)
135
-        Me.Controls.Add(Me.Button2)
136
-        Me.Controls.Add(Me.Button1)
146
+        Me.Controls.Add(Me.設計_bt)
147
+        Me.Controls.Add(Me.內網_bt)
137
         Me.Controls.Add(Me.Version)
148
         Me.Controls.Add(Me.Version)
138
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
149
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
139
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
150
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
152
     Friend WithEvents Label5 As Label
163
     Friend WithEvents Label5 As Label
153
     Friend WithEvents Version As Label
164
     Friend WithEvents Version As Label
154
     Friend WithEvents Copyright As Label
165
     Friend WithEvents Copyright As Label
155
-    Friend WithEvents Button2 As Button
156
-    Friend WithEvents Button1 As Button
166
+    Friend WithEvents 設計_bt As Button
167
+    Friend WithEvents 內網_bt As Button
168
+    Friend WithEvents 外網_bt As Button
157
 End Class
169
 End Class

+ 7
- 4
工巧明智能管理系統/我的系統/網段.vb View File

12
         MYIP = IPAdress.ToString
12
         MYIP = IPAdress.ToString
13
         Label6.Text = MYIP
13
         Label6.Text = MYIP
14
     End Sub
14
     End Sub
15
-    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
16
-        登入判斷 = True : Me.Close()
15
+    Private Sub 內網_bt_Click(sender As Object, e As EventArgs) Handles 內網_bt.Click
16
+        登入判斷 = True : 內外網 = False : Me.Close()
17
     End Sub
17
     End Sub
18
-    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
19
-        登入判斷 = False : Me.Close()
18
+    Private Sub 設計_bt_Click(sender As Object, e As EventArgs) Handles 設計_bt.Click
19
+        登入判斷 = False : 內外網 = False : Me.Close()
20
+    End Sub
21
+    Private Sub 外網_bt_Click(sender As Object, e As EventArgs) Handles 外網_bt.Click
22
+        登入判斷 = True : 內外網 = True : Me.Close()
20
     End Sub
23
     End Sub
21
 End Class
24
 End Class

Loading…
Cancel
Save