20200912備份

Signed-off-by: B70340 <b70340@gmail.com>

MaoOrange-Hongji/LoginForm1.Designer.vb

@@ -126,7 +126,7 @@ Partial Class LoginForm1
         Me.伺服器區域_ch.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.伺服器區域_ch.ForeColor = System.Drawing.Color.Blue
         Me.伺服器區域_ch.FormattingEnabled = True
-        Me.伺服器區域_ch.Items.AddRange(New Object() {"懋桔", "開發", "設計"})
+        Me.伺服器區域_ch.Items.AddRange(New Object() {"懋桔", "設計"})
         Me.伺服器區域_ch.Location = New System.Drawing.Point(334, 36)
         Me.伺服器區域_ch.Name = "伺服器區域_ch"
         Me.伺服器區域_ch.Size = New System.Drawing.Size(75, 20)

MaoOrange-Hongji/LoginForm1.vb

@@ -11,6 +11,7 @@ Public Class LoginForm1
     Public Property Credentials As ICredentials
     ReadOnly screenWidth = Screen.PrimaryScreen.Bounds.Width
     ReadOnly screenHeight = Screen.PrimaryScreen.Bounds.Height
+    Dim 鎖定 As Boolean
     Private Sub Set_清單1()
         FTP清單_dgv.DataSource = Nothing : ds2.Clear()
         FTP清單_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -36,16 +37,23 @@ Public Class LoginForm1
         ElseIf screenWidth = 1280 And screenHeight = 1024 Then : Me.Location = New Point(407, 373)
         ElseIf screenWidth = 1600 And screenHeight = 900 Then : Me.Location = New Point(567, 311)
         End If
+
         Me.ActiveControl = 使用者帳號_cb
+        '-----------------------系統鎖定判斷-----------------------------------------------------------------------------------------------------------------------------------------------
+        SQL_系統版本號驗證()
+        If dr.Read() Then : 鎖定 = dr("系統鎖定") : End If : conn.Close()
+        If 鎖定 = True Then
+            MsgBox("非系統功能因素造成目前系統已鎖定，無法開啟，請聯繫系統開發商。")
+            Me.Close()
+        End If
     End Sub
-    Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 伺服器區域_ch.SelectedIndexChanged
+    Private Sub 伺服器區域_ch_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 伺服器區域_ch.SelectedIndexChanged
         '-----------------------確認登入伺服器位置-----------------------------------------------------------------------------------------------------------------------------------------
         If 伺服器區域_ch.Text = "懋桔" Then
             登入人IP = "192.168.0.199" : 登入() : 確認_bt.Enabled = True : 取消_bt.Enabled = True : 刷卡登入_ch.Checked = True
         ElseIf 伺服器區域_ch.Text = "設計" Then
             登入人IP = "106.1.50.79" : 登入() : 確認_bt.Enabled = True : 取消_bt.Enabled = True : 刷卡登入_ch.Checked = True
         End If
-
     End Sub
     Private Sub 登入()
         '-----------------------寫入連線字串-----------------------------------------------------------------------------------------------------------------------------------------------

MaoOrange-Hongji/MAOJI-ERP-SYS.vb

@@ -37,6 +37,7 @@ Public Class MAOJI_ERP_SYS
         '----------系統登入時抬頭資訊顯示---------------------------------------------------------------------------------------------------------------
         Me.Text = Me.Text & "  --  " & g_conn_type & "  --  " & gUserName & "  --  系統版本  :" & 版本
         ComboBox1下拉表單資料載入() : 公司名稱_cb.SelectedIndex = 1
+        NewWindowToolStripMenuItem.Visible = False
         '----------系統登入權限執行---------------------------------------------------------------------------------------------------------------------
         資料庫系統管理ToolStripMenuItem.Enabled = CC(0) : 系統使用者管理ToolStripMenuItem.Enabled = CC(1) : 系統通用變數管理ToolStripMenuItem.Enabled = CC(2)
         系統編碼規則1ToolStripMenuItem.Enabled = CC(3) : 系統執行檔版本管理ToolStripMenuItem.Enabled = CC(4) : FTP資料夾管理ToolStripMenuItem.Enabled = CC(5)

MaoOrange-Hongji/Module/SQL_跨介面共用.vb

@@ -18,7 +18,7 @@
         ConnOpen() : SQL1 = "SELECT 資料夾名稱, 指定頁面, 備註, 指定 FROM FTP資料夾管理" : CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_系統版本號驗證()
-        ConnOpen() : SQL1 = "SELECT 系統認證版本號 FROM 版本號管理 " : CmdSet_For_dr()
+        ConnOpen() : SQL1 = "SELECT 系統認證版本號, 系統鎖定 FROM 版本號管理 " : CmdSet_For_dr()
     End Sub
     Friend Sub SQL_公司基本資料宣告()
         ConnOpen() : SQL1 = "SELECT 公司編號, 統編, 電話, 地址 FROM MJ公司基本資料 WHERE 公司名 LIKE N'" & PA & "'" : CmdSet_For_dr()

MaoOrange-Hongji/Module/全域變數.vb

@@ -4,7 +4,7 @@
     Public 版本號 As String : Public Target As String : Public Target1 As String : Public Target2 As String : Public FTP帳號 As String : Public FTP密碼 As String : Public FTP物理位置 As String
     Public AA(99) As String : Public BB(99) As Boolean : Public CC(99) As Boolean : Public 登入判斷 As Boolean
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2020071701"
+    Public 版本 As String = "2020090101"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 列印用SQL As String = "" : Public 列印用SQL2 As String : Public 公司編號 As String : Public 公司電話 As String : Public 公司統編 As String : Public 公司地址 As String
     Public 關鍵字編號 As String

MaoOrange-Hongji/總務系統管理/車輛保養紀錄表.Designer.vb

@@ -279,7 +279,7 @@ Partial Class 車輛保養紀錄表
         Me.修改資料_bt.Name = "修改資料_bt"
         Me.修改資料_bt.Size = New System.Drawing.Size(53, 50)
         Me.修改資料_bt.TabIndex = 1122
-        Me.修改資料_bt.Text = "修改資料"
+        Me.修改資料_bt.Text = "儲存"
         Me.修改資料_bt.UseVisualStyleBackColor = True
         '
         '新增資料_bt

MaoOrange-Hongji/總務系統管理/車輛保養紀錄表.vb

@@ -199,29 +199,29 @@ Public Class 車輛保養紀錄表
     Private Sub Button4_Click(sender As Object, e As EventArgs) Handles 復原_bt.Click
         報告圖_pb.Refresh()
     End Sub
-    '@#处理鼠标按键抬起的事件，根据鼠标按下时保存的鼠标位置，和当前鼠标的位置， 
-    '计算鼠标移动偏移量，借此调用移动图片的函数，移动图片 
-    Private Sub PictureBox1_MouseUp(ByVal sender As Object, ByVal e As MouseEventArgs) Handles 報告圖_pb.MouseUp
-        m_DeltaX = m_MousePosX - e.X
-        m_DeltaY = m_MousePosY - e.Y
-        m_Leftx -= m_DeltaX
-        m_Lefty -= m_DeltaY
-        Picturemove(sender, e)
-        Me.Cursor = Cursors.Arrow
-    End Sub
-    '@#当鼠标按下时，将鼠标变成手形，并且记录下当前鼠标的位置 
-    Private Sub PictureBox1_MouseDown(ByVal sender As Object, ByVal e As MouseEventArgs) Handles 報告圖_pb.MouseDown
-        Me.Cursor = Cursors.Hand
-        m_MousePosX = e.X
-        m_MousePosY = e.Y
-    End Sub
-    '@#根据偏移量计算出的图片位置，重画图片 
-    Private Sub Picturemove(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs)
-        Dim myBit As New Bitmap(報告圖_pb.Image)
-        Dim myPicGrh As Graphics = Me.報告圖_pb.CreateGraphics
-        myPicGrh.Clear(Me.報告圖_pb.BackColor)
-        myPicGrh.DrawImageUnscaled(myBit, m_Leftx - 152, m_Lefty)
-        myBit.Dispose()
-        myPicGrh.Dispose()
-    End Sub
+    ''@#处理鼠标按键抬起的事件，根据鼠标按下时保存的鼠标位置，和当前鼠标的位置， 
+    ''计算鼠标移动偏移量，借此调用移动图片的函数，移动图片 
+    'Private Sub PictureBox1_MouseUp(ByVal sender As Object, ByVal e As MouseEventArgs) Handles 報告圖_pb.MouseUp
+    '    m_DeltaX = m_MousePosX - e.X
+    '    m_DeltaY = m_MousePosY - e.Y
+    '    m_Leftx -= m_DeltaX
+    '    m_Lefty -= m_DeltaY
+    '    Picturemove(sender, e)
+    '    Me.Cursor = Cursors.Arrow
+    'End Sub
+    ''@#当鼠标按下时，将鼠标变成手形，并且记录下当前鼠标的位置 
+    'Private Sub PictureBox1_MouseDown(ByVal sender As Object, ByVal e As MouseEventArgs) Handles 報告圖_pb.MouseDown
+    '    Me.Cursor = Cursors.Hand
+    '    m_MousePosX = e.X
+    '    m_MousePosY = e.Y
+    'End Sub
+    ''@#根据偏移量计算出的图片位置，重画图片 
+    'Private Sub Picturemove(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs)
+    '    Dim myBit As New Bitmap(報告圖_pb.Image)
+    '    Dim myPicGrh As Graphics = Me.報告圖_pb.CreateGraphics
+    '    myPicGrh.Clear(Me.報告圖_pb.BackColor)
+    '    myPicGrh.DrawImageUnscaled(myBit, m_Leftx, m_Lefty)
+    '    myBit.Dispose()
+    '    myPicGrh.Dispose()
+    'End Sub
 End Class