增加權限判斷機制

2 years ago · cb3bc4f170
9 changed files with 129 additions and 79 deletions
--- a/Code/TSMC_NJ/.vs/ProjectEvaluation/tsmc_nj.metadata.v5.1
+++ b/Code/TSMC_NJ/.vs/ProjectEvaluation/tsmc_nj.metadata.v5.1
--- a/Code/TSMC_NJ/.vs/ProjectEvaluation/tsmc_nj.projects.v5.1
+++ b/Code/TSMC_NJ/.vs/ProjectEvaluation/tsmc_nj.projects.v5.1
--- a/Code/TSMC_NJ/.vs/TSMC_NJ/DesignTimeBuild/.dtbcache.v2
+++ b/Code/TSMC_NJ/.vs/TSMC_NJ/DesignTimeBuild/.dtbcache.v2
--- a/Code/TSMC_NJ/.vs/TSMC_NJ/v17/.futdcache.v2
+++ b/Code/TSMC_NJ/.vs/TSMC_NJ/v17/.futdcache.v2
--- a/Code/TSMC_NJ/.vs/TSMC_NJ/v17/.suo
+++ b/Code/TSMC_NJ/.vs/TSMC_NJ/v17/.suo
--- a/Code/TSMC_NJ/TSMC_Login/MainFormLogin.vb
+++ b/Code/TSMC_NJ/TSMC_Login/MainFormLogin.vb
@ -13,10 +13,11 @@ Public Class MainFormLogin
    Dim MyMDIForm As New TSMC_NJ.MDIForm

    Private Sub btnLogin_Click(sender As Object, e As EventArgs) Handles btnLogin.Click
-        MyMDIForm.Show()
        MyMDIForm.tsLoginUser.Text = txtID.Text.ToString()
+        MyMDIForm.strUserRole = 0
        MyMDIForm.tsCurrentLanguage.Text = DirectCast(CBLanguage.SelectedItem, KeyValuePair(Of String, String)).Value
        MyMDIForm.strLanguage = DirectCast(CBLanguage.SelectedItem, KeyValuePair(Of String, String)).Key
+        MyMDIForm.Show()
        Me.Close()
    End Sub

--- a/Code/TSMC_NJ/TSMC_NJ/MDIForm.Designer.vb
+++ b/Code/TSMC_NJ/TSMC_NJ/MDIForm.Designer.vb
@ -27,6 +27,10 @@ Partial Class MDIForm
        Me.SsFormStatus = New System.Windows.Forms.StatusStrip()
        Me.ToolStripStatusLabel1 = New System.Windows.Forms.ToolStripStatusLabel()
        Me.tsLoginUser = New System.Windows.Forms.ToolStripStatusLabel()
+        Me.ToolStripStatusLabel7 = New System.Windows.Forms.ToolStripStatusLabel()
+        Me.ToolStripStatusLabel6 = New System.Windows.Forms.ToolStripStatusLabel()
+        Me.tsUserRole = New System.Windows.Forms.ToolStripStatusLabel()
+        Me.tsRole = New System.Windows.Forms.ToolStripStatusLabel()
        Me.ToolStripStatusLabel5 = New System.Windows.Forms.ToolStripStatusLabel()
        Me.ToolStripStatusLabel4 = New System.Windows.Forms.ToolStripStatusLabel()
        Me.tsCurrentLanguage = New System.Windows.Forms.ToolStripStatusLabel()
@ -53,10 +57,6 @@ Partial Class MDIForm
        Me.TSM_DataMA = New System.Windows.Forms.ToolStripMenuItem()
        Me.TSM_SYS = New System.Windows.Forms.ToolStripMenuItem()
        Me.trLogout = New System.Windows.Forms.Timer(Me.components)
-        Me.ToolStripStatusLabel6 = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.ToolStripStatusLabel7 = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.tsUserRole = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.tsRole = New System.Windows.Forms.ToolStripStatusLabel()
        Me.SsFormStatus.SuspendLayout()
        Me.APMenu.SuspendLayout()
        Me.SuspendLayout()
@ -77,6 +77,27 @@ Partial Class MDIForm
        Me.tsLoginUser.Name = "tsLoginUser"
        resources.ApplyResources(Me.tsLoginUser, "tsLoginUser")
        '
+        'ToolStripStatusLabel7
+        '
+        Me.ToolStripStatusLabel7.Name = "ToolStripStatusLabel7"
+        resources.ApplyResources(Me.ToolStripStatusLabel7, "ToolStripStatusLabel7")
+        Me.ToolStripStatusLabel7.Spring = True
+        '
+        'ToolStripStatusLabel6
+        '
+        Me.ToolStripStatusLabel6.Name = "ToolStripStatusLabel6"
+        resources.ApplyResources(Me.ToolStripStatusLabel6, "ToolStripStatusLabel6")
+        '
+        'tsUserRole
+        '
+        Me.tsUserRole.Name = "tsUserRole"
+        resources.ApplyResources(Me.tsUserRole, "tsUserRole")
+        '
+        'tsRole
+        '
+        Me.tsRole.Name = "tsRole"
+        resources.ApplyResources(Me.tsRole, "tsRole")
+        '
        'ToolStripStatusLabel5
        '
        Me.ToolStripStatusLabel5.Name = "ToolStripStatusLabel5"
@ -118,8 +139,8 @@ Partial Class MDIForm
        'TSM_DriverOP
        '
        Me.TSM_DriverOP.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmi_DriverOP01, Me.tsmi_DriverOP02, Me.tsmi_DriverOP03, Me.tsmi_DriverOP04, Me.tsmi_DriverOP05, Me.tsmi_DriverOP06})
-        Me.TSM_DriverOP.Name = "TSM_DriverOP"
        resources.ApplyResources(Me.TSM_DriverOP, "TSM_DriverOP")
+        Me.TSM_DriverOP.Name = "TSM_DriverOP"
        '
        'tsmi_DriverOP01
        '
@ -154,8 +175,8 @@ Partial Class MDIForm
        'TSM_InInv
        '
        Me.TSM_InInv.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmi_InINV01})
-        Me.TSM_InInv.Name = "TSM_InInv"
        resources.ApplyResources(Me.TSM_InInv, "TSM_InInv")
+        Me.TSM_InInv.Name = "TSM_InInv"
        '
        'tsmi_InINV01
        '
@ -165,8 +186,8 @@ Partial Class MDIForm
        'TSM_OutInv
        '
        Me.TSM_OutInv.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmi_OutINV01})
-        Me.TSM_OutInv.Name = "TSM_OutInv"
        resources.ApplyResources(Me.TSM_OutInv, "TSM_OutInv")
+        Me.TSM_OutInv.Name = "TSM_OutInv"
        '
        'tsmi_OutINV01
        '
@ -176,8 +197,8 @@ Partial Class MDIForm
        'TSM_MNG
        '
        Me.TSM_MNG.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmi_MNG01, Me.tsmi_MNG02, Me.tsmi_MNG03})
-        Me.TSM_MNG.Name = "TSM_MNG"
        resources.ApplyResources(Me.TSM_MNG, "TSM_MNG")
+        Me.TSM_MNG.Name = "TSM_MNG"
        '
        'tsmi_MNG01
        '
@ -196,44 +217,23 @@ Partial Class MDIForm
        '
        'TSM_RPT
        '
-        Me.TSM_RPT.Name = "TSM_RPT"
        resources.ApplyResources(Me.TSM_RPT, "TSM_RPT")
+        Me.TSM_RPT.Name = "TSM_RPT"
        '
        'TSM_DataMA
        '
-        Me.TSM_DataMA.Name = "TSM_DataMA"
        resources.ApplyResources(Me.TSM_DataMA, "TSM_DataMA")
+        Me.TSM_DataMA.Name = "TSM_DataMA"
        '
        'TSM_SYS
        '
-        Me.TSM_SYS.Name = "TSM_SYS"
        resources.ApplyResources(Me.TSM_SYS, "TSM_SYS")
+        Me.TSM_SYS.Name = "TSM_SYS"
        '
        'trLogout
        '
        Me.trLogout.Interval = 1000
        '
-        'ToolStripStatusLabel6
-        '
-        Me.ToolStripStatusLabel6.Name = "ToolStripStatusLabel6"
-        resources.ApplyResources(Me.ToolStripStatusLabel6, "ToolStripStatusLabel6")
-        '
-        'ToolStripStatusLabel7
-        '
-        Me.ToolStripStatusLabel7.Name = "ToolStripStatusLabel7"
-        resources.ApplyResources(Me.ToolStripStatusLabel7, "ToolStripStatusLabel7")
-        Me.ToolStripStatusLabel7.Spring = True
-        '
-        'tsUserRole
-        '
-        Me.tsUserRole.Name = "tsUserRole"
-        resources.ApplyResources(Me.tsUserRole, "tsUserRole")
-        '
-        'tsRole
-        '
-        Me.tsRole.Name = "tsRole"
-        resources.ApplyResources(Me.tsRole, "tsRole")
-        '
        'MDIForm
        '
        resources.ApplyResources(Me, "$this")
--- a/Code/TSMC_NJ/TSMC_NJ/MDIForm.resx
+++ b/Code/TSMC_NJ/TSMC_NJ/MDIForm.resx
@ -74,7 +74,7 @@
    <value>0, 19</value>
  </data>
  <data name="ToolStripStatusLabel7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>281, 19</value>
+    <value>292, 19</value>
  </data>
  <data name="ToolStripStatusLabel6.Size" type="System.Drawing.Size, System.Drawing">
    <value>84, 19</value>
@ -89,7 +89,7 @@
    <value>0, 19</value>
  </data>
  <data name="ToolStripStatusLabel5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>281, 19</value>
+    <value>292, 19</value>
  </data>
  <data name="ToolStripStatusLabel4.Size" type="System.Drawing.Size, System.Drawing">
    <value>84, 19</value>
@ -101,7 +101,7 @@
    <value>0, 19</value>
  </data>
  <data name="ToolStripStatusLabel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>281, 19</value>
+    <value>292, 19</value>
  </data>
  <data name="ToolStripStatusLabel3.Size" type="System.Drawing.Size, System.Drawing">
    <value>84, 19</value>
@ -186,6 +186,9 @@
  <data name="tsmi_DriverOP06.Text" xml:space="preserve">
    <value>列印小白單</value>
  </data>
+  <data name="TSM_DriverOP.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
  <data name="TSM_DriverOP.Size" type="System.Drawing.Size, System.Drawing">
    <value>81, 23</value>
  </data>
@ -198,6 +201,9 @@
  <data name="tsmi_InINV01.Text" xml:space="preserve">
    <value>指定入庫</value>
  </data>
+  <data name="TSM_InInv.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
  <data name="TSM_InInv.Size" type="System.Drawing.Size, System.Drawing">
    <value>81, 23</value>
  </data>
@ -210,6 +216,9 @@
  <data name="tsmi_OutINV01.Text" xml:space="preserve">
    <value>指定出庫</value>
  </data>
+  <data name="TSM_OutInv.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
  <data name="TSM_OutInv.Size" type="System.Drawing.Size, System.Drawing">
    <value>81, 23</value>
  </data>
@ -217,41 +226,53 @@
    <value>出庫作業</value>
  </data>
  <data name="tsmi_MNG01.Size" type="System.Drawing.Size, System.Drawing">
-    <value>153, 24</value>
+    <value>180, 24</value>
  </data>
  <data name="tsmi_MNG01.Text" xml:space="preserve">
    <value>𥂟點出庫</value>
  </data>
  <data name="tsmi_MNG02.Size" type="System.Drawing.Size, System.Drawing">
-    <value>153, 24</value>
+    <value>180, 24</value>
  </data>
  <data name="tsmi_MNG02.Text" xml:space="preserve">
    <value>盤點再入庫</value>
  </data>
  <data name="tsmi_MNG03.Size" type="System.Drawing.Size, System.Drawing">
-    <value>153, 24</value>
+    <value>180, 24</value>
  </data>
  <data name="tsmi_MNG03.Text" xml:space="preserve">
    <value>儲位重整</value>
  </data>
+  <data name="TSM_MNG.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
  <data name="TSM_MNG.Size" type="System.Drawing.Size, System.Drawing">
    <value>81, 23</value>
  </data>
  <data name="TSM_MNG.Text" xml:space="preserve">
    <value>管理作業</value>
  </data>
+  <data name="TSM_RPT.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
  <data name="TSM_RPT.Size" type="System.Drawing.Size, System.Drawing">
    <value>81, 23</value>
  </data>
  <data name="TSM_RPT.Text" xml:space="preserve">
    <value>報表查詢</value>
  </data>
+  <data name="TSM_DataMA.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
  <data name="TSM_DataMA.Size" type="System.Drawing.Size, System.Drawing">
    <value>81, 23</value>
  </data>
  <data name="TSM_DataMA.Text" xml:space="preserve">
    <value>資料維護</value>
  </data>
+  <data name="TSM_SYS.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
  <data name="TSM_SYS.Size" type="System.Drawing.Size, System.Drawing">
    <value>81, 23</value>
  </data>
@ -318,6 +339,30 @@
  <data name="&gt;&gt;tsLoginUser.Type" xml:space="preserve">
    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="&gt;&gt;ToolStripStatusLabel7.Name" xml:space="preserve">
+    <value>ToolStripStatusLabel7</value>
+  </data>
+  <data name="&gt;&gt;ToolStripStatusLabel7.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;ToolStripStatusLabel6.Name" xml:space="preserve">
+    <value>ToolStripStatusLabel6</value>
+  </data>
+  <data name="&gt;&gt;ToolStripStatusLabel6.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tsUserRole.Name" xml:space="preserve">
+    <value>tsUserRole</value>
+  </data>
+  <data name="&gt;&gt;tsUserRole.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tsRole.Name" xml:space="preserve">
+    <value>tsRole</value>
+  </data>
+  <data name="&gt;&gt;tsRole.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
  <data name="&gt;&gt;ToolStripStatusLabel5.Name" xml:space="preserve">
    <value>ToolStripStatusLabel5</value>
  </data>
@ -468,30 +513,6 @@
  <data name="&gt;&gt;trLogout.Type" xml:space="preserve">
    <value>System.Windows.Forms.Timer, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;ToolStripStatusLabel6.Name" xml:space="preserve">
-    <value>ToolStripStatusLabel6</value>
-  </data>
-  <data name="&gt;&gt;ToolStripStatusLabel6.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ToolStripStatusLabel7.Name" xml:space="preserve">
-    <value>ToolStripStatusLabel7</value>
-  </data>
-  <data name="&gt;&gt;ToolStripStatusLabel7.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;tsUserRole.Name" xml:space="preserve">
-    <value>tsUserRole</value>
-  </data>
-  <data name="&gt;&gt;tsUserRole.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;tsRole.Name" xml:space="preserve">
-    <value>tsRole</value>
-  </data>
-  <data name="&gt;&gt;tsRole.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>MDIForm</value>
  </data>
--- a/Code/TSMC_NJ/TSMC_NJ/MDIForm.vb
+++ b/Code/TSMC_NJ/TSMC_NJ/MDIForm.vb
@ -20,10 +20,15 @@ Public Class MDIForm

            '依照權限顯示畫面
            Select Case strUserRole
-                Case "1"
-                Case "2"
-                Case "3"
-                Case "4"
+                Case "0"  '自動倉廠商
+                    'Dim strRights = New String(,) {{"TSM_DriverOP", "司機作業"}, {"TSM_InInv", "入庫作業"}, {"TSM_OutInv", "出庫作業"}, {"TSM_MNG", "管理作業"}, {"TSM_RPT", "報表查詢"}, {"TSM_DataMA", "資料維護"},{"TSM_SYS","系統設定"}}
+                    Dim strRights = New String(,) {{"TSM_InInv", "入庫作業"}, {"TSM_OutInv", "出庫作業"}, {"TSM_MNG", "管理作業"}, {"TSM_RPT", "報表查詢"}, {"TSM_DataMA", "資料維護"}, {"TSM_SYS", "系統設定"}}
+                    ShowRight(strRights)
+                Case "1"  '庫房
+
+                Case "2"  '供應商
+                Case "3"  '清運商
+                Case "4"  '運輸商
                    '隱藏主選單
                    APMenu.Visible = False

@ -65,6 +70,21 @@ Public Class MDIForm
        intNow = intLogout   '設定Logout時間
    End Sub

+    Private Sub tsmi_DriverOP01_Click(sender As Object, e As EventArgs) Handles tsmi_DriverOP01.Click
+        Try
+            Dim DriverOP01 As New DriverOP01()
+            DriverOP01.MdiParent = Me
+            DriverOP01.Show()
+        Catch ex As Exception
+
+        End Try
+    End Sub
+
+    Private Sub MDIForm_FormClosed(sender As Object, e As FormClosedEventArgs) Handles MyBase.FormClosed
+        Dim ClsLoginForm = Application.OpenForms("LoginForm")
+        ClsLoginForm.Close()
+    End Sub
+
    Public Sub ChangeLanguage()
        Try
            '設定對應語系檔
@ -97,18 +117,26 @@ Public Class MDIForm
        End Try
    End Sub

-    Private Sub tsmi_DriverOP01_Click(sender As Object, e As EventArgs) Handles tsmi_DriverOP01.Click
-        Try
-            Dim DriverOP01 As New DriverOP01()
-            DriverOP01.MdiParent = Me
-            DriverOP01.Show()
-        Catch ex As Exception
-
-        End Try
-    End Sub
+    Private Sub ShowRight(ByVal strRights(,) As String)
+        '{"TSM_DriverOP", "司機作業"}, {"TSM_InInv", "入庫作業"}, {"TSM_OutInv", "出庫作業"}, {"TSM_MNG", "管理作業"}, {"TSM_RPT", "報表查詢"}, {"TSM_DataMA", "資料維護"},{"TSM_SYS","系統設定"}
+        For Each strRight As String In strRights
+            Select Case strRight
+                Case "TSM_DriverOP"
+                    APMenu.Items("TSM_DriperOP").Enabled = True
+                Case "TSM_InInv"
+                    APMenu.Items("TSM_InInv").Enabled = True
+                Case "TSM_OutInv"
+                    APMenu.Items("TSM_OutInv").Enabled = True
+                Case "TSM_MNG"
+                    APMenu.Items("TSM_MNG").Enabled = True
+                Case "TSM_RPT"
+                    APMenu.Items("TSM_RPT").Enabled = True
+                Case "TSM_DataMA"
+                    APMenu.Items("TSM_DataMA").Enabled = True
+                Case "TSM_SYS"
+                    APMenu.Items("TSM_SYS").Enabled = True
+            End Select
+        Next

-    Private Sub MDIForm_FormClosed(sender As Object, e As FormClosedEventArgs) Handles MyBase.FormClosed
-        Dim ClsLoginForm = Application.OpenForms("LoginForm")
-        ClsLoginForm.Close()
    End Sub
 End Class