20210101備份

工巧明智能管理系統/我的系統/Login.Designer.vb

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

工巧明智能管理系統/我的系統/Login.vb

@@ -51,11 +51,14 @@ Public Class Login
         TextBox4.Text = "1"
         Label1.Text = "執行檔版本號 : " & 版本
         網段.ShowDialog()
-        If 登入判斷 = True Then
-            ComboBox1.Text = "台灣"
+        If 登入判斷 = True And 內外網 = False Then
+            ComboBox1.Text = "工巧明內網"
             OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
-        ElseIf 登入判斷 = False Then
-            ComboBox1.Text = "台灣"
+        ElseIf 登入判斷 = False And 內外網 = False Then
+            ComboBox1.Text = "工巧明內網"
+            OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
+        ElseIf 登入判斷 = True And 內外網 = True Then
+            ComboBox1.Text = "工巧明外網"
             OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
         End If
         '-----------------------取得本機IP-----------------------------------------------------------------------------------------------------------------------------------------------
@@ -64,12 +67,11 @@ Public Class Login
         MYIP = IPAdress.ToString
         '-----------------------IP比對----------------------------------------------------------------------------------------------------------------------------------------------------
         If Strings.Left(MYIP, 10) = "192.168.12" Or Strings.Left(MYIP, 7) = "10.0.0." Then
-            ComboBox1.Text = "台灣"
+            ComboBox1.Text = "工巧明內網"
             OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
         Else
-            ComboBox1.Text = ""
-            MsgBox("本機網路目前不再台灣伺服器所在網域，請注意連接網域的VPN是否有開啟!")
-            OK.Enabled = False : Cancel.Enabled = False : CheckBox1.Checked = False
+            ComboBox1.Text = "工巧明外網"
+            OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
         End If
 
         '-----------------------調整視窗大小-----------------------------------------------------------------------------------------------------------------------------------------------
@@ -84,7 +86,7 @@ Public Class Login
     <Obsolete>
     Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged
         '-----------------------確認登入伺服器位置-----------------------------------------------------------------------------------------------------------------------------------------
-        If ComboBox1.Text = "台灣" Then
+        If ComboBox1.Text = "工巧明內網" Then
             HostName = Dns.GetHostName '获得本机的机器名
             IPAdress = Dns.GetHostByName(HostName).AddressList.GetValue(0) '获得本机的IP
             MYIP = IPAdress.ToString
@@ -92,9 +94,15 @@ Public Class Login
                 登入人IP = "192.168.12.127"
                 登入()
                 OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
-            Else
-                MsgBox("所選擇服務器不是台灣服務器，請連線該服務器所在網域的VPN，確保連線正常後重新選擇伺服器!")
-                OK.Enabled = False : Cancel.Enabled = False : CheckBox1.Checked = False
+            End If
+        ElseIf ComboBox1.Text = "工巧明外網" Then
+            HostName = Dns.GetHostName '获得本机的机器名
+            IPAdress = Dns.GetHostByName(HostName).AddressList.GetValue(0) '获得本机的IP
+            MYIP = IPAdress.ToString
+            If Strings.Left(MYIP, 10) <> "192.168.12" Or Strings.Left(MYIP, 7) <> "10.0.0." Then
+                登入人IP = "180.177.181.162,5264"
+                登入()
+                OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
             End If
         End If
         UsernameTextBox.Focus()

工巧明智能管理系統/我的系統/MyModule/MyModule.vb

@@ -6,9 +6,9 @@
     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, 
                                     CC23, CC24, CC25, CC26"
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2020112301"
+    Public 版本 As String = "2021010101"
     '----系統閒置-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 判斷重登 As Boolean : Public 重登確認 As Boolean : Public 主頁開啟 As Boolean
+    Public 判斷重登 As Boolean : Public 內外網 As Boolean : Public 重登確認 As Boolean : Public 主頁開啟 As Boolean
     Public timeExit As Integer = 0 : Public timeExit2 As Integer = 0 : Public timeNow As Integer = 0 : Public timeNow2 As Integer = 0 : Public 密碼時限 As Integer = 30
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public MSG As MsgBoxResult

工巧明智能管理系統/我的系統/網段.Designer.vb

@@ -29,8 +29,9 @@ Partial Class 網段
         Me.Label5 = New System.Windows.Forms.Label()
         Me.Version = New System.Windows.Forms.Label()
         Me.Copyright = New System.Windows.Forms.Label()
-        Me.Button2 = New System.Windows.Forms.Button()
-        Me.Button1 = New System.Windows.Forms.Button()
+        Me.設計_bt = New System.Windows.Forms.Button()
+        Me.內網_bt = New System.Windows.Forms.Button()
+        Me.外網_bt = New System.Windows.Forms.Button()
         Me.SuspendLayout()
         '
         'Label1
@@ -102,23 +103,32 @@ Partial Class 網段
         Me.Copyright.TabIndex = 673
         Me.Copyright.Text = "著作權"
         '
-        'Button2
+        '設計_bt
         '
-        Me.Button2.Location = New System.Drawing.Point(401, 237)
-        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(75, 34)
-        Me.Button2.TabIndex = 671
-        Me.Button2.Text = "No"
-        Me.Button2.UseVisualStyleBackColor = True
+        Me.設計_bt.Location = New System.Drawing.Point(401, 237)
+        Me.設計_bt.Name = "設計_bt"
+        Me.設計_bt.Size = New System.Drawing.Size(75, 34)
+        Me.設計_bt.TabIndex = 671
+        Me.設計_bt.Text = "設計"
+        Me.設計_bt.UseVisualStyleBackColor = True
         '
-        'Button1
+        '內網_bt
         '
-        Me.Button1.Location = New System.Drawing.Point(320, 237)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(75, 34)
-        Me.Button1.TabIndex = 670
-        Me.Button1.Text = "Yes"
-        Me.Button1.UseVisualStyleBackColor = True
+        Me.內網_bt.Location = New System.Drawing.Point(320, 237)
+        Me.內網_bt.Name = "內網_bt"
+        Me.內網_bt.Size = New System.Drawing.Size(75, 34)
+        Me.內網_bt.TabIndex = 670
+        Me.內網_bt.Text = "內網"
+        Me.內網_bt.UseVisualStyleBackColor = True
+        '
+        '外網_bt
+        '
+        Me.外網_bt.Location = New System.Drawing.Point(239, 237)
+        Me.外網_bt.Name = "外網_bt"
+        Me.外網_bt.Size = New System.Drawing.Size(75, 34)
+        Me.外網_bt.TabIndex = 678
+        Me.外網_bt.Text = "外網"
+        Me.外網_bt.UseVisualStyleBackColor = True
         '
         '網段
         '
@@ -127,13 +137,14 @@ Partial Class 網段
         Me.BackgroundImage = Global.工巧明智能管理系統.My.Resources.Resources._002
         Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
         Me.ClientSize = New System.Drawing.Size(488, 283)
+        Me.Controls.Add(Me.外網_bt)
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.Label8)
         Me.Controls.Add(Me.Label6)
         Me.Controls.Add(Me.Label5)
         Me.Controls.Add(Me.Copyright)
-        Me.Controls.Add(Me.Button2)
-        Me.Controls.Add(Me.Button1)
+        Me.Controls.Add(Me.設計_bt)
+        Me.Controls.Add(Me.內網_bt)
         Me.Controls.Add(Me.Version)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
@@ -152,6 +163,7 @@ Partial Class 網段
     Friend WithEvents Label5 As Label
     Friend WithEvents Version As Label
     Friend WithEvents Copyright As Label
-    Friend WithEvents Button2 As Button
-    Friend WithEvents Button1 As Button
+    Friend WithEvents 設計_bt As Button
+    Friend WithEvents 內網_bt As Button
+    Friend WithEvents 外網_bt As Button
 End Class

工巧明智能管理系統/我的系統/網段.vb

@@ -12,10 +12,13 @@ Public Class 網段
         MYIP = IPAdress.ToString
         Label6.Text = MYIP
     End Sub
-    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        登入判斷 = True : Me.Close()
+    Private Sub 內網_bt_Click(sender As Object, e As EventArgs) Handles 內網_bt.Click
+        登入判斷 = True : 內外網 = False : Me.Close()
     End Sub
-    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
-        登入判斷 = False : Me.Close()
+    Private Sub 設計_bt_Click(sender As Object, e As EventArgs) Handles 設計_bt.Click
+        登入判斷 = False : 內外網 = False : Me.Close()
+    End Sub
+    Private Sub 外網_bt_Click(sender As Object, e As EventArgs) Handles 外網_bt.Click
+        登入判斷 = True : 內外網 = True : Me.Close()
     End Sub
 End Class