Browse Source

修改放大镜缺失读取数据标识属性

章政 8 years ago
parent
commit
d65cb18a9d

+ 5 - 3
UAS-MES/FunctionCode/Employee/Employee_ChooseUserToGroup.Designer.cs

@@ -378,7 +378,7 @@
             this.em_code3.DBTitle = null;
             this.em_code3.FormName = null;
             this.em_code3.Location = new System.Drawing.Point(153, 90);
-            this.em_code3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.em_code3.Margin = new System.Windows.Forms.Padding(4);
             this.em_code3.Name = "em_code3";
             this.em_code3.Power = null;
             this.em_code3.SelectField = null;
@@ -386,6 +386,7 @@
             this.em_code3.Size = new System.Drawing.Size(230, 26);
             this.em_code3.TabIndex = 258;
             this.em_code3.TableName = null;
+            this.em_code3.Tag = "em_code";
             this.em_code3.TextBoxEnable = false;
             // 
             // em_code2
@@ -396,7 +397,7 @@
             this.em_code2.DBTitle = null;
             this.em_code2.FormName = null;
             this.em_code2.Location = new System.Drawing.Point(772, 90);
-            this.em_code2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.em_code2.Margin = new System.Windows.Forms.Padding(4);
             this.em_code2.Name = "em_code2";
             this.em_code2.Power = null;
             this.em_code2.SelectField = null;
@@ -404,6 +405,7 @@
             this.em_code2.Size = new System.Drawing.Size(227, 26);
             this.em_code2.TabIndex = 259;
             this.em_code2.TableName = null;
+            this.em_code2.Tag = "em_code";
             this.em_code2.TextBoxEnable = false;
             // 
             // Employee_ChooseUserToGroup
@@ -432,7 +434,7 @@
             this.Controls.Add(this.ug_code_title_label);
             this.Controls.Add(this.ug_code_title);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Employee_ChooseUserToGroup";
             this.Tag = "ShowDialogWindow";
             this.Text = "人员选择";

+ 27 - 0
UAS-MES/FunctionCode/Employee/Employee_ChooseUserToGroup.resx

@@ -206,6 +206,18 @@
   <metadata name="em_position.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="em_code1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="em_name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="em_depart.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="em_position.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="UserOut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACUAAAAXCAYAAACMLIalAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
@@ -259,4 +271,19 @@
   <metadata name="em_recorder.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="em_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="eg_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="em_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="em_indate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="em_recorder.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

+ 2 - 6
UAS-MES/FunctionCode/Employee/Employee_Power.cs

@@ -104,7 +104,6 @@ namespace UAS_MES.Employee
             dh.ExecuteSql("delete from cs$usergrouppower where ugp_groupcode='" + ug_code.Text + "'", "delete");
             string insertsql = "Insert into cs$usergrouppower (ugp_id,ugp_groupcode,ugp_caller,ugp_ifread,ugp_ifwrite,ugp_ifdelete,ugp_ifspecial,ugp_ifall) values(cs$usergrouppower_seq.nextval,'" + ug_code.Text + "',:ugp_caller,:ugp_ifread,:ugp_ifwrite,:ugp_ifdelete,:ugp_ifspecial,:ugp_ifall)";
             //获取变化了得DataSource
-
             DataTable ChangedDT = dt.GetChanges();
             if (ChangedDT != null)
             {
@@ -151,11 +150,8 @@ namespace UAS_MES.Employee
                     dic.Add("IFSPECIAL", dt.Rows[i]["UGP_IFSPECIAL"].ToString() != "1" ? false : true);
                     dic.Add("IFALL", dt.Rows[i]["UGP_IFALL"].ToString() != "1" ? false : true);
                     //之后通过Call来获取页面操作的权限
-                    if (SystemInf.Caller.ContainsKey(dt.Rows[i]["ugp_caller"].ToString()))
-                    {
-                        SystemInf.Caller.Remove(dt.Rows[i]["ugp_caller"].ToString());
-                    }
-                    SystemInf.Caller.Add(dt.Rows[i]["ugp_caller"].ToString(), dic);
+                    if (!SystemInf.Caller.ContainsKey(dt.Rows[i]["ugp_caller"].ToString()))
+                        SystemInf.Caller.Add(dt.Rows[i]["ugp_caller"].ToString(), dic);
                 }
                 MessageBox.Show("保存成功!");
             }

+ 2 - 2
UAS-MES/FunctionCode/Employee/Employee_PowerSarch.Designer.cs

@@ -202,7 +202,7 @@
             this.Screen.DownImage = ((System.Drawing.Image)(resources.GetObject("Screen.DownImage")));
             this.Screen.Image = null;
             this.Screen.IsShowBorder = true;
-            this.Screen.Location = new System.Drawing.Point(681, 34);
+            this.Screen.Location = new System.Drawing.Point(686, 31);
             this.Screen.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Screen.MoveImage = ((System.Drawing.Image)(resources.GetObject("Screen.MoveImage")));
             this.Screen.Name = "Screen";
@@ -227,7 +227,7 @@
             this.ug_code.Power = null;
             this.ug_code.SelectField = null;
             this.ug_code.SetValueField = null;
-            this.ug_code.Size = new System.Drawing.Size(204, 26);
+            this.ug_code.Size = new System.Drawing.Size(204, 25);
             this.ug_code.TabIndex = 218;
             this.ug_code.TableName = null;
             this.ug_code.Tag = "ug_code";

+ 33 - 0
UAS-MES/FunctionCode/Employee/Employee_PowerSarch.resx

@@ -150,6 +150,39 @@
   <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="ug_group.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ugp_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="sn_displayname.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Em_GroupCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ugp_ifread.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ugp_ifwrite.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ugp_ifdelete.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ugp_ifspecial.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="Screen.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -180,7 +180,7 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(743, 80);
+            this.pr_detail_label.Location = new System.Drawing.Point(743, 76);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
@@ -426,7 +426,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(907, 80);
+            this.pr_detail.Location = new System.Drawing.Point(907, 76);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);