Merge branch 'master' of ssh://10.10.101.21/source/mes-client

MES接口/DataHelper.cs

@@ -17,7 +17,6 @@ namespace MES_Interface
         //用户选择的数据库的连接字符串
         public static OracleConnection connection = null;
         //用户选择的数据库的连接字符串
-        public static string DBConnectionString;
         OracleCommand command = null;
         int ReconnectTime = 0;
         /// <summary>
@@ -38,7 +37,7 @@ namespace MES_Interface
                 connection = new OracleConnection(ConnectionStrings);
                 connection.Open();
             }
-            catch (Exception e)
+            catch (Exception)
             {
             }
         }
@@ -629,7 +628,7 @@ namespace MES_Interface
                         {
                             //重置的数据库链接后只执行一次
                             ReconnectTime = ReconnectTime + 1;
-                            connection = new OracleConnection(DBConnectionString);
+                            connection = new OracleConnection(ConnectionStrings);
                             result = ExecuteSql(SQL, Type, names);
                         }
                     }

MES接口/LogicHandler.cs

@@ -80,8 +80,7 @@ namespace MES_Interface
         {
             oErrorMessage = "";
             string SQL = "select em_code from employee where em_code=:UserName and em_password =:PassWord";
-            DataTable dt;
-            dt = (DataTable)dh.ExecuteSql(SQL, "select", iUserCode, iPassWord);
+            DataTable dt = (DataTable)dh.ExecuteSql(SQL, "select", iUserCode, iPassWord);
             if (dt.Rows.Count > 0)
                 return true;
             else
@@ -516,7 +515,8 @@ namespace MES_Interface
                 InsertMakeProcess(iSN, iMakeCode, iSourceCode, iMPKind, iResult, iUserCode);
                 return true;
             }
-            else {
+            else
+            {
                 return CS_SetFinish(iMakeCode, iSourceCode, iSN, iUserCode, out oErrorMessage);
             }
         }

UAS-MES/CustomControl/AccordionMenu/AccordionMenu.cs

@@ -100,7 +100,8 @@ namespace UAS_MES.CustomControl.AccordionMenu
             for (int i = 0; i < dt.Rows.Count; i++)
             {
                 //在这个Caller范围内的是用户可见的导航
-                Callers += "'" + dt.Rows[i]["ugp_caller"].ToString() + "',";
+           
+                    Callers += "'" + dt.Rows[i]["ugp_caller"].ToString() + "',";
                 //用一个数组记录所有的模块
                 Module[i] = dt.Rows[i]["sn_module"].ToString();
                 if (!Modules.Contains(dt.Rows[i]["sn_module"].ToString()))
@@ -301,7 +302,7 @@ namespace UAS_MES.CustomControl.AccordionMenu
             }
             //如果窗体已存在展示该窗体
             else
-                 tc.SelectTab(item.Name);
+                tc.SelectTab(item.Name);
         }
     }
 }

UAS-MES/DbFind.cs

@@ -185,7 +185,7 @@ namespace UAS_MES
                                     groupcontains = true;
                                 }
                             }
-                        }          
+                        }
                     }
                 }
                 if (!groupcontains)

UAS-MES/Entity/Status.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace UAS_MES.Entity
+{
+    class Status
+    {
+        /// <summary>
+        /// 已审核
+        /// </summary>
+        public static string AUDITED = "AUDITED";
+        /// <summary>
+        /// 再录入
+        /// </summary>
+        public static string ENTERING = "ENTERING";
+        /// <summary>
+        /// 未检验
+        /// </summary>
+        public static string UNCHECK = "UNCHECK";
+        /// <summary>
+        /// 检验中
+        /// </summary>
+        public static string CHECKING = "CHECKING";
+        /// <summary>
+        /// 未批准
+        /// </summary>
+        public static string UNAPPROVED = "UNAPPROVED";
+        /// <summary>
+        /// 已下放
+        /// </summary>
+        public static string STARTED = "STARTED";
+        /// <summary>
+        /// 已批准
+        /// </summary>
+        public static string APPROVE = "APPROVE";
+        /// <summary>
+        /// 已提交
+        /// </summary>
+        public static string COMMITED = "COMMITED";
+    }
+}

UAS-MES/FunctionCode/Employee/Employee_ChooseUserToGroup.Designer.cs

@@ -66,18 +66,20 @@
             // 
             this.ug_code_title.AutoSize = true;
             this.ug_code_title.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_code_title.Location = new System.Drawing.Point(116, 10);
+            this.ug_code_title.Location = new System.Drawing.Point(155, 12);
+            this.ug_code_title.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ug_code_title.Name = "ug_code_title";
-            this.ug_code_title.Size = new System.Drawing.Size(0, 21);
+            this.ug_code_title.Size = new System.Drawing.Size(0, 27);
             this.ug_code_title.TabIndex = 235;
             // 
             // ug_code_title_label
             // 
             this.ug_code_title_label.AutoSize = true;
             this.ug_code_title_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_code_title_label.Location = new System.Drawing.Point(23, 10);
+            this.ug_code_title_label.Location = new System.Drawing.Point(31, 12);
+            this.ug_code_title_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ug_code_title_label.Name = "ug_code_title_label";
-            this.ug_code_title_label.Size = new System.Drawing.Size(90, 21);
+            this.ug_code_title_label.Size = new System.Drawing.Size(112, 27);
             this.ug_code_title_label.TabIndex = 236;
             this.ug_code_title_label.Text = "用户组编号";
             // 
@@ -85,9 +87,10 @@
             // 
             this.ug_name_title.AutoSize = true;
             this.ug_name_title.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_name_title.Location = new System.Drawing.Point(116, 42);
+            this.ug_name_title.Location = new System.Drawing.Point(155, 52);
+            this.ug_name_title.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ug_name_title.Name = "ug_name_title";
-            this.ug_name_title.Size = new System.Drawing.Size(0, 21);
+            this.ug_name_title.Size = new System.Drawing.Size(0, 27);
             this.ug_name_title.TabIndex = 238;
             // 
             // label2
@@ -95,9 +98,10 @@
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.Blue;
-            this.label2.Location = new System.Drawing.Point(23, 134);
+            this.label2.Location = new System.Drawing.Point(31, 168);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 21);
+            this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.TabIndex = 242;
             this.label2.Text = "组内成员";
             // 
@@ -105,9 +109,10 @@
             // 
             this.em_name3_label.AutoSize = true;
             this.em_name3_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_name3_label.Location = new System.Drawing.Point(23, 104);
+            this.em_name3_label.Location = new System.Drawing.Point(31, 130);
+            this.em_name3_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.em_name3_label.Name = "em_name3_label";
-            this.em_name3_label.Size = new System.Drawing.Size(74, 21);
+            this.em_name3_label.Size = new System.Drawing.Size(92, 27);
             this.em_name3_label.TabIndex = 246;
             this.em_name3_label.Text = "用户名称";
             // 
@@ -115,9 +120,10 @@
             // 
             this.em_code3_label.AutoSize = true;
             this.em_code3_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_code3_label.Location = new System.Drawing.Point(23, 72);
+            this.em_code3_label.Location = new System.Drawing.Point(31, 90);
+            this.em_code3_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.em_code3_label.Name = "em_code3_label";
-            this.em_code3_label.Size = new System.Drawing.Size(74, 21);
+            this.em_code3_label.Size = new System.Drawing.Size(92, 27);
             this.em_code3_label.TabIndex = 244;
             this.em_code3_label.Text = "用户编号";
             // 
@@ -125,9 +131,10 @@
             // 
             this.em_name2_label.AutoSize = true;
             this.em_name2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_name2_label.Location = new System.Drawing.Point(480, 104);
+            this.em_name2_label.Location = new System.Drawing.Point(640, 130);
+            this.em_name2_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.em_name2_label.Name = "em_name2_label";
-            this.em_name2_label.Size = new System.Drawing.Size(74, 21);
+            this.em_name2_label.Size = new System.Drawing.Size(92, 27);
             this.em_name2_label.TabIndex = 251;
             this.em_name2_label.Text = "用户名称";
             // 
@@ -135,9 +142,10 @@
             // 
             this.em_code2_label.AutoSize = true;
             this.em_code2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_code2_label.Location = new System.Drawing.Point(480, 72);
+            this.em_code2_label.Location = new System.Drawing.Point(640, 90);
+            this.em_code2_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.em_code2_label.Name = "em_code2_label";
-            this.em_code2_label.Size = new System.Drawing.Size(74, 21);
+            this.em_code2_label.Size = new System.Drawing.Size(92, 27);
             this.em_code2_label.TabIndex = 249;
             this.em_code2_label.Text = "用户编号";
             // 
@@ -146,9 +154,10 @@
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label6.ForeColor = System.Drawing.Color.Blue;
-            this.label6.Location = new System.Drawing.Point(480, 134);
+            this.label6.Location = new System.Drawing.Point(640, 168);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(74, 21);
+            this.label6.Size = new System.Drawing.Size(92, 27);
             this.label6.TabIndex = 248;
             this.label6.Text = "组外成员";
             // 
@@ -156,9 +165,10 @@
             // 
             this.ug_name_title_label.AutoSize = true;
             this.ug_name_title_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_name_title_label.Location = new System.Drawing.Point(23, 42);
+            this.ug_name_title_label.Location = new System.Drawing.Point(31, 52);
+            this.ug_name_title_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ug_name_title_label.Name = "ug_name_title_label";
-            this.ug_name_title_label.Size = new System.Drawing.Size(58, 21);
+            this.ug_name_title_label.Size = new System.Drawing.Size(72, 27);
             this.ug_name_title_label.TabIndex = 257;
             this.ug_name_title_label.Text = "用户组";
             // 
@@ -169,12 +179,13 @@
             this.em_code2.Condition = null;
             this.em_code2.DBTitle = null;
             this.em_code2.FormName = null;
-            this.em_code2.Location = new System.Drawing.Point(579, 72);
+            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.Name = "em_code2";
             this.em_code2.Power = null;
             this.em_code2.SelectField = null;
             this.em_code2.SetValueField = null;
-            this.em_code2.Size = new System.Drawing.Size(164, 20);
+            this.em_code2.Size = new System.Drawing.Size(226, 25);
             this.em_code2.TabIndex = 259;
             this.em_code2.TableName = null;
             this.em_code2.Tag = "em_code";
@@ -187,12 +198,13 @@
             this.em_code3.Condition = null;
             this.em_code3.DBTitle = null;
             this.em_code3.FormName = null;
-            this.em_code3.Location = new System.Drawing.Point(115, 72);
+            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.Name = "em_code3";
             this.em_code3.Power = null;
             this.em_code3.SelectField = null;
             this.em_code3.SetValueField = null;
-            this.em_code3.Size = new System.Drawing.Size(167, 21);
+            this.em_code3.Size = new System.Drawing.Size(231, 26);
             this.em_code3.TabIndex = 258;
             this.em_code3.TableName = null;
             this.em_code3.Tag = "em_code";
@@ -203,11 +215,11 @@
             this.em_name3.AllPower = null;
             this.em_name3.BackColor = System.Drawing.Color.White;
             this.em_name3.ID = null;
-            this.em_name3.Location = new System.Drawing.Point(115, 108);
-            this.em_name3.Margin = new System.Windows.Forms.Padding(2);
+            this.em_name3.Location = new System.Drawing.Point(153, 135);
+            this.em_name3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.em_name3.Name = "em_name3";
             this.em_name3.Power = null;
-            this.em_name3.Size = new System.Drawing.Size(151, 21);
+            this.em_name3.Size = new System.Drawing.Size(200, 25);
             this.em_name3.Str = null;
             this.em_name3.Str1 = null;
             this.em_name3.Str2 = null;
@@ -219,11 +231,11 @@
             this.em_name2.AllPower = null;
             this.em_name2.BackColor = System.Drawing.Color.White;
             this.em_name2.ID = null;
-            this.em_name2.Location = new System.Drawing.Point(579, 104);
-            this.em_name2.Margin = new System.Windows.Forms.Padding(2);
+            this.em_name2.Location = new System.Drawing.Point(772, 130);
+            this.em_name2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.em_name2.Name = "em_name2";
             this.em_name2.Power = null;
-            this.em_name2.Size = new System.Drawing.Size(148, 21);
+            this.em_name2.Size = new System.Drawing.Size(196, 25);
             this.em_name2.Str = null;
             this.em_name2.Str1 = null;
             this.em_name2.Str2 = null;
@@ -238,13 +250,13 @@
             this.ScreenOutGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ScreenOutGroup.Image = null;
             this.ScreenOutGroup.IsShowBorder = true;
-            this.ScreenOutGroup.Location = new System.Drawing.Point(782, 72);
-            this.ScreenOutGroup.Margin = new System.Windows.Forms.Padding(2);
+            this.ScreenOutGroup.Location = new System.Drawing.Point(1043, 90);
+            this.ScreenOutGroup.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ScreenOutGroup.MoveImage = ((System.Drawing.Image)(resources.GetObject("ScreenOutGroup.MoveImage")));
             this.ScreenOutGroup.Name = "ScreenOutGroup";
             this.ScreenOutGroup.NormalImage = ((System.Drawing.Image)(resources.GetObject("ScreenOutGroup.NormalImage")));
             this.ScreenOutGroup.Power = null;
-            this.ScreenOutGroup.Size = new System.Drawing.Size(56, 27);
+            this.ScreenOutGroup.Size = new System.Drawing.Size(75, 34);
             this.ScreenOutGroup.TabIndex = 254;
             this.ScreenOutGroup.Text = "筛选";
             this.ScreenOutGroup.UseVisualStyleBackColor = false;
@@ -258,13 +270,13 @@
             this.ScreenInGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ScreenInGroup.Image = null;
             this.ScreenInGroup.IsShowBorder = true;
-            this.ScreenInGroup.Location = new System.Drawing.Point(319, 70);
-            this.ScreenInGroup.Margin = new System.Windows.Forms.Padding(2);
+            this.ScreenInGroup.Location = new System.Drawing.Point(425, 88);
+            this.ScreenInGroup.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ScreenInGroup.MoveImage = ((System.Drawing.Image)(resources.GetObject("ScreenInGroup.MoveImage")));
             this.ScreenInGroup.Name = "ScreenInGroup";
             this.ScreenInGroup.NormalImage = ((System.Drawing.Image)(resources.GetObject("ScreenInGroup.NormalImage")));
             this.ScreenInGroup.Power = null;
-            this.ScreenInGroup.Size = new System.Drawing.Size(56, 27);
+            this.ScreenInGroup.Size = new System.Drawing.Size(75, 34);
             this.ScreenInGroup.TabIndex = 253;
             this.ScreenInGroup.Text = "筛选";
             this.ScreenInGroup.UseVisualStyleBackColor = false;
@@ -279,11 +291,11 @@
             this.em_name1,
             this.em_depart,
             this.em_position});
-            this.OutGroupUser.Location = new System.Drawing.Point(478, 158);
-            this.OutGroupUser.Margin = new System.Windows.Forms.Padding(2);
+            this.OutGroupUser.Location = new System.Drawing.Point(637, 198);
+            this.OutGroupUser.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OutGroupUser.Name = "OutGroupUser";
             this.OutGroupUser.RowTemplate.Height = 27;
-            this.OutGroupUser.Size = new System.Drawing.Size(375, 444);
+            this.OutGroupUser.Size = new System.Drawing.Size(500, 555);
             this.OutGroupUser.TabIndex = 243;
             // 
             // em_code1
@@ -319,10 +331,10 @@
             // UserOut
             // 
             this.UserOut.Image = ((System.Drawing.Image)(resources.GetObject("UserOut.Image")));
-            this.UserOut.Location = new System.Drawing.Point(408, 417);
-            this.UserOut.Margin = new System.Windows.Forms.Padding(2);
+            this.UserOut.Location = new System.Drawing.Point(544, 521);
+            this.UserOut.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.UserOut.Name = "UserOut";
-            this.UserOut.Size = new System.Drawing.Size(56, 24);
+            this.UserOut.Size = new System.Drawing.Size(75, 30);
             this.UserOut.TabIndex = 241;
             this.UserOut.UseVisualStyleBackColor = true;
             this.UserOut.Click += new System.EventHandler(this.UserOut_Click);
@@ -330,10 +342,10 @@
             // UserIn
             // 
             this.UserIn.Image = ((System.Drawing.Image)(resources.GetObject("UserIn.Image")));
-            this.UserIn.Location = new System.Drawing.Point(408, 356);
-            this.UserIn.Margin = new System.Windows.Forms.Padding(2);
+            this.UserIn.Location = new System.Drawing.Point(544, 445);
+            this.UserIn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.UserIn.Name = "UserIn";
-            this.UserIn.Size = new System.Drawing.Size(56, 24);
+            this.UserIn.Size = new System.Drawing.Size(75, 30);
             this.UserIn.TabIndex = 240;
             this.UserIn.UseVisualStyleBackColor = true;
             this.UserIn.Click += new System.EventHandler(this.UserIn_Click);
@@ -348,11 +360,11 @@
             this.em_name,
             this.em_indate,
             this.em_recorder});
-            this.InGroupUser.Location = new System.Drawing.Point(20, 158);
-            this.InGroupUser.Margin = new System.Windows.Forms.Padding(2);
+            this.InGroupUser.Location = new System.Drawing.Point(27, 198);
+            this.InGroupUser.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.InGroupUser.Name = "InGroupUser";
             this.InGroupUser.RowTemplate.Height = 27;
-            this.InGroupUser.Size = new System.Drawing.Size(375, 444);
+            this.InGroupUser.Size = new System.Drawing.Size(500, 555);
             this.InGroupUser.TabIndex = 239;
             // 
             // em_code
@@ -396,9 +408,9 @@
             // 
             // Employee_ChooseUserToGroup
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(876, 612);
+            this.ClientSize = new System.Drawing.Size(1168, 765);
             this.Controls.Add(this.em_code2);
             this.Controls.Add(this.em_code3);
             this.Controls.Add(this.ug_name_title_label);
@@ -420,6 +432,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.Name = "Employee_ChooseUserToGroup";
             this.Tag = "ShowDialogWindow";
             this.Text = "人员选择";

UAS-MES/FunctionCode/Employee/Employee_Group.Designer.cs

@@ -62,7 +62,7 @@
             // 
             this.ug_name_label.AutoSize = true;
             this.ug_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_name_label.Location = new System.Drawing.Point(341, 30);
+            this.ug_name_label.Location = new System.Drawing.Point(352, 30);
             this.ug_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ug_name_label.Name = "ug_name_label";
             this.ug_name_label.Size = new System.Drawing.Size(72, 27);
@@ -83,7 +83,7 @@
             this.UserGroupDGV.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.UserGroupDGV.Name = "UserGroupDGV";
             this.UserGroupDGV.RowTemplate.Height = 27;
-            this.UserGroupDGV.Size = new System.Drawing.Size(833, 598);
+            this.UserGroupDGV.Size = new System.Drawing.Size(869, 598);
             this.UserGroupDGV.TabIndex = 244;
             this.UserGroupDGV.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.UserGroupDGV_CellClick);
             // 
@@ -135,7 +135,7 @@
             this.NewGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.NewGroup.Image = null;
             this.NewGroup.IsShowBorder = true;
-            this.NewGroup.Location = new System.Drawing.Point(707, 28);
+            this.NewGroup.Location = new System.Drawing.Point(743, 29);
             this.NewGroup.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.NewGroup.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewGroup.MoveImage")));
             this.NewGroup.Name = "NewGroup";
@@ -156,7 +156,7 @@
             this.DeleteGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.DeleteGroup.Image = null;
             this.DeleteGroup.IsShowBorder = true;
-            this.DeleteGroup.Location = new System.Drawing.Point(785, 28);
+            this.DeleteGroup.Location = new System.Drawing.Point(821, 29);
             this.DeleteGroup.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.DeleteGroup.MoveImage = ((System.Drawing.Image)(resources.GetObject("DeleteGroup.MoveImage")));
             this.DeleteGroup.Name = "DeleteGroup";
@@ -176,7 +176,7 @@
             this.Screen.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Screen.Image = null;
             this.Screen.IsShowBorder = true;
-            this.Screen.Location = new System.Drawing.Point(631, 28);
+            this.Screen.Location = new System.Drawing.Point(667, 29);
             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";
@@ -195,7 +195,7 @@
             this.ug_name1.Condition = null;
             this.ug_name1.DBTitle = null;
             this.ug_name1.FormName = null;
-            this.ug_name1.Location = new System.Drawing.Point(432, 30);
+            this.ug_name1.Location = new System.Drawing.Point(443, 30);
             this.ug_name1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ug_name1.Name = "ug_name1";
             this.ug_name1.Power = null;
@@ -230,7 +230,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(915, 695);
+            this.ClientSize = new System.Drawing.Size(959, 695);
             this.Controls.Add(this.UserGroupDGV);
             this.Controls.Add(this.NewGroup);
             this.Controls.Add(this.DeleteGroup);
@@ -240,7 +240,7 @@
             this.Controls.Add(this.ug_code1);
             this.Controls.Add(this.ug_code_label);
             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_Group";
             this.Tag = "Employee!Data";
             this.Text = "人员资料";

UAS-MES/FunctionCode/Employee/Employee_Power.Designer.cs

@@ -120,17 +120,17 @@
             // 
             // SavePower
             // 
-            this.SavePower.AllPower = "ifall";
+            this.SavePower.AllPower = "";
             this.SavePower.BackColor = System.Drawing.Color.Transparent;
             this.SavePower.DownImage = ((System.Drawing.Image)(resources.GetObject("SavePower.DownImage")));
             this.SavePower.Image = ((System.Drawing.Image)(resources.GetObject("SavePower.Image")));
             this.SavePower.IsShowBorder = true;
-            this.SavePower.Location = new System.Drawing.Point(535, 598);
+            this.SavePower.Location = new System.Drawing.Point(537, 571);
             this.SavePower.Margin = new System.Windows.Forms.Padding(4);
             this.SavePower.MoveImage = ((System.Drawing.Image)(resources.GetObject("SavePower.MoveImage")));
             this.SavePower.Name = "SavePower";
             this.SavePower.NormalImage = ((System.Drawing.Image)(resources.GetObject("SavePower.NormalImage")));
-            this.SavePower.Power = "ifwrite";
+            this.SavePower.Power = "";
             this.SavePower.Size = new System.Drawing.Size(80, 30);
             this.SavePower.TabIndex = 1;
             this.SavePower.Tag = "";
@@ -149,7 +149,7 @@
             this.ugp_id,
             this.Column1,
             this.Column2});
-            this.GroupPowerDGV.Location = new System.Drawing.Point(4, 88);
+            this.GroupPowerDGV.Location = new System.Drawing.Point(4, 63);
             this.GroupPowerDGV.Margin = new System.Windows.Forms.Padding(4);
             this.GroupPowerDGV.Name = "GroupPowerDGV";
             this.GroupPowerDGV.RowTemplate.Height = 23;
@@ -198,7 +198,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1149, 635);
+            this.ClientSize = new System.Drawing.Size(1149, 619);
             this.Controls.Add(this.sn_module);
             this.Controls.Add(this.ug_code);
             this.Controls.Add(this.Screen);

UAS-MES/FunctionCode/Employee/Employee_Power.cs

@@ -48,7 +48,8 @@ namespace UAS_MES.Employee
             //不检测进程
             CheckForIllegalCrossThreadCalls = false;
             //界面加载时设置保存按钮不可见
-            SavePower.Visible = false;
+            if (ug_code.Text == "")
+                SavePower.Visible = false;
             dh = new DataHelper();
             ///手动插入四列含有列头勾选框的列
             for (int i = 0; i < title.Length; i++)
@@ -99,8 +100,15 @@ namespace UAS_MES.Employee
             //保存表格中变更的记录
             dt = (DataTable)GroupPowerDGV.DataSource;
             //删除之前的分组权限
-            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)";
+            if (sn_module.Text == "" || sn_module.Text == "全部")
+            {
+                dh.ExecuteSql("delete from cs$usergrouppower where ugp_groupcode='" + ug_code.Text + "'", "delete");
+            }
+            else
+            {
+                dh.ExecuteSql("delete from cs$usergrouppower where ugp_groupcode='" + ug_code.Text + "' and ugp_module='" + sn_module.Text + "'", "delete");
+            }
+            string insertsql = "Insert into cs$usergrouppower (ugp_id,ugp_module,ugp_groupcode,ugp_caller,ugp_ifread,ugp_ifwrite,ugp_ifdelete,ugp_ifspecial,ugp_ifall) values(cs$usergrouppower_seq.nextval,'"+sn_module.Text+"','" + ug_code.Text + "',:ugp_caller,:ugp_ifread,:ugp_ifwrite,:ugp_ifdelete,:ugp_ifspecial,:ugp_ifall)";
             //获取变化了得DataSource
             DataTable ChangedDT = dt.GetChanges();
             if (ChangedDT != null)

UAS-MES/FunctionCode/Employee/Employee_Power.resx

@@ -395,4 +395,19 @@
   <metadata name="Column2.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="Sn_ClassName1.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="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>
 </root>

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

@@ -102,7 +102,7 @@
             this.Column2,
             this.Column3});
             this.PowerSearchDGV.Location = new System.Drawing.Point(0, 89);
-            this.PowerSearchDGV.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.PowerSearchDGV.Margin = new System.Windows.Forms.Padding(4);
             this.PowerSearchDGV.Name = "PowerSearchDGV";
             this.PowerSearchDGV.ReadOnly = true;
             this.PowerSearchDGV.RowTemplate.Height = 23;
@@ -197,7 +197,7 @@
             // 
             // Screen
             // 
-            this.Screen.AllPower = "ifall";
+            this.Screen.AllPower = "";
             this.Screen.BackColor = System.Drawing.Color.Transparent;
             this.Screen.DownImage = ((System.Drawing.Image)(resources.GetObject("Screen.DownImage")));
             this.Screen.Image = null;
@@ -207,7 +207,7 @@
             this.Screen.MoveImage = ((System.Drawing.Image)(resources.GetObject("Screen.MoveImage")));
             this.Screen.Name = "Screen";
             this.Screen.NormalImage = ((System.Drawing.Image)(resources.GetObject("Screen.NormalImage")));
-            this.Screen.Power = "ifread";
+            this.Screen.Power = "";
             this.Screen.Size = new System.Drawing.Size(75, 28);
             this.Screen.TabIndex = 219;
             this.Screen.Text = "筛选";

UAS-MES/FunctionCode/Employee/Employee_PowerSarch.resx

@@ -150,39 +150,6 @@
   <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>

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.cs

@@ -164,7 +164,7 @@ namespace UAS_MES.OQC
         {
             if (ob_result.Text == "OK" || ob_result.Text == "FOK")
             {
-                dh.ExecuteSql("update OQCBatch set ob_status='UNCHECK' ,ob_result='' where ob_checkno='" + ob_checkno.Text + "'", "select");
+                dh.ExecuteSql("update OQCBatch set ob_status='CHECKING' ,ob_result='' where ob_checkno='" + ob_checkno.Text + "'", "select");
                 ob_result.Text = "";
                 DoLog("撤销通过", "撤销通过成功", "撤销");
                 OperateResult.AppendText(">>撤销通过批" + ob_checkno.Text + "成功\n", Color.Green);
@@ -199,7 +199,7 @@ namespace UAS_MES.OQC
                         else return;
                     }
                 }
-                dh.ExecuteSql("update OQCBatch set ob_status='UNCHECK' ,ob_result='' where ob_checkno='" + ob_checkno.Text + "'", "select");
+                dh.ExecuteSql("update OQCBatch set ob_status='CHECKING' ,ob_result='' where ob_checkno='" + ob_checkno.Text + "'", "select");
                 ob_result.Text = "";
                 DoLog("撤销判退", "撤销判退成功", "撤销");
                 OperateResult.AppendText(">>撤销判退成功\n", Color.Green);

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -38,8 +38,6 @@ namespace UAS_MES.OQC
             ob_aqlcode.SetValueField = new string[] { "ob_aqlcode" };
             ob_aqlcode.FormName = Name;
             ob_aqlcode.Condition = "al_statuscode='AUDITED'";
-
-            chooseAllButton1.ChooseAll(CheckTypeDGV);
         }
 
         private void 抽样计划维护_SizeChanged(object sender, EventArgs e)

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.designer.cs

@@ -65,7 +65,7 @@
             this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.chooseAllButton1 = new UAS_MES.CustomControl.ButtonUtil.ChooseAllButton();
+            this.ChooseAll = new UAS_MES.CustomControl.ButtonUtil.ChooseAllButton();
             this.panel2.SuspendLayout();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).BeginInit();
@@ -155,7 +155,7 @@
             // 
             this.ob_remark_label.AutoSize = true;
             this.ob_remark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_remark_label.Location = new System.Drawing.Point(345, 79);
+            this.ob_remark_label.Location = new System.Drawing.Point(345, 74);
             this.ob_remark_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_remark_label.Name = "ob_remark_label";
             this.ob_remark_label.Size = new System.Drawing.Size(52, 27);
@@ -219,12 +219,12 @@
             this.panel1.Location = new System.Drawing.Point(33, 162);
             this.panel1.Margin = new System.Windows.Forms.Padding(4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(993, 124);
+            this.panel1.Size = new System.Drawing.Size(993, 120);
             this.panel1.TabIndex = 193;
             // 
             // ad_qty
             // 
-            this.ad_qty.Location = new System.Drawing.Point(100, 79);
+            this.ad_qty.Location = new System.Drawing.Point(100, 74);
             this.ad_qty.Margin = new System.Windows.Forms.Padding(4);
             this.ad_qty.Name = "ad_qty";
             this.ad_qty.Size = new System.Drawing.Size(204, 25);
@@ -236,7 +236,7 @@
             // 
             this.ad_qty_label.AutoSize = true;
             this.ad_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ad_qty_label.Location = new System.Drawing.Point(16, 79);
+            this.ad_qty_label.Location = new System.Drawing.Point(16, 74);
             this.ad_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ad_qty_label.Name = "ad_qty_label";
             this.ad_qty_label.Size = new System.Drawing.Size(72, 27);
@@ -248,7 +248,7 @@
             this.ob_remark.AllPower = null;
             this.ob_remark.BackColor = System.Drawing.Color.White;
             this.ob_remark.ID = null;
-            this.ob_remark.Location = new System.Drawing.Point(585, 79);
+            this.ob_remark.Location = new System.Drawing.Point(585, 74);
             this.ob_remark.Margin = new System.Windows.Forms.Padding(4);
             this.ob_remark.Name = "ob_remark";
             this.ob_remark.Power = null;
@@ -361,7 +361,7 @@
             this.Clean.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1145, 720);
+            this.Clean.Location = new System.Drawing.Point(1145, 729);
             this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
@@ -403,7 +403,7 @@
             this.Save.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Save.Image = ((System.Drawing.Image)(resources.GetObject("Save.Image")));
             this.Save.IsShowBorder = true;
-            this.Save.Location = new System.Drawing.Point(490, 720);
+            this.Save.Location = new System.Drawing.Point(490, 729);
             this.Save.Margin = new System.Windows.Forms.Padding(4);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
@@ -562,21 +562,21 @@
             this.ms_sncode.Tag = "NoAuto";
             this.ms_sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_sncode_KeyDown);
             // 
-            // chooseAllButton1
+            // ChooseAll
             // 
-            this.chooseAllButton1.Location = new System.Drawing.Point(33, 289);
-            this.chooseAllButton1.Name = "chooseAllButton1";
-            this.chooseAllButton1.Size = new System.Drawing.Size(75, 23);
-            this.chooseAllButton1.TabIndex = 194;
-            this.chooseAllButton1.Text = "chooseAllButton1";
-            this.chooseAllButton1.UseVisualStyleBackColor = true;
+            this.ChooseAll.Location = new System.Drawing.Point(33, 289);
+            this.ChooseAll.Name = "ChooseAll";
+            this.ChooseAll.Size = new System.Drawing.Size(75, 23);
+            this.ChooseAll.TabIndex = 194;
+            this.ChooseAll.Text = "全选";
+            this.ChooseAll.UseVisualStyleBackColor = true;
             // 
             // OQC_PlanMaintain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1363, 781);
-            this.Controls.Add(this.chooseAllButton1);
+            this.Controls.Add(this.ChooseAll);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.pr_detail_label);
@@ -606,12 +606,12 @@
             this.Text = "抽样计划维护";
             this.Load += new System.EventHandler(this.抽样计划维护_Load);
             this.SizeChanged += new System.EventHandler(this.抽样计划维护_SizeChanged);
-            this.panel2.ResumeLayout(false);
+            this.panel2.ResumeLayout(true);
             this.panel2.PerformLayout();
-            this.panel1.ResumeLayout(false);
+            this.panel1.ResumeLayout(true);
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }
@@ -654,6 +654,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn ci_id;
         private System.Windows.Forms.DataGridViewTextBoxColumn ci_kind;
         private System.Windows.Forms.DataGridViewTextBoxColumn oi_sampleqty;
-        private CustomControl.ButtonUtil.ChooseAllButton chooseAllButton1;
+        private CustomControl.ButtonUtil.ChooseAllButton ChooseAll;
     }
 }

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.resx

@@ -526,4 +526,19 @@
   <metadata name="oi_sampleqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Choose.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ci_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ci_kind.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_sampleqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.Designer.cs

@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OQC_SamplingDataCollection));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.ob_checkno_label = new System.Windows.Forms.Label();
             this.obd_outboxcode_label = new System.Windows.Forms.Label();
             this.ms_sncode_label = new System.Windows.Forms.Label();
@@ -79,10 +79,8 @@
             this.ob_ngqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_batchqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.bccode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.Refresh = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.GetBatch = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.BatchPass = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.Cancel = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
@@ -315,7 +313,6 @@
             // 
             this.ob_maxngacceptqty.AllPower = null;
             this.ob_maxngacceptqty.BackColor = System.Drawing.Color.White;
-            this.ob_maxngacceptqty.Enabled = false;
             this.ob_maxngacceptqty.ID = null;
             this.ob_maxngacceptqty.Location = new System.Drawing.Point(860, 51);
             this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(4);
@@ -588,8 +585,8 @@
             // 
             this.oi_ng.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
             this.oi_ng.DataPropertyName = "oi_count";
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.oi_ng.DefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.oi_ng.DefaultCellStyle = dataGridViewCellStyle3;
             this.oi_ng.HeaderText = "样本数量";
             this.oi_ng.Name = "oi_ng";
             this.oi_ng.Width = 96;
@@ -729,27 +726,6 @@
             this.bccode.Tag = "bc_code";
             this.bccode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.bccode_KeyDown);
             // 
-            // Refresh
-            // 
-            this.Refresh.AllPower = "ifall";
-            this.Refresh.BackColor = System.Drawing.Color.Transparent;
-            this.Refresh.DownImage = ((System.Drawing.Image)(resources.GetObject("Refresh.DownImage")));
-            this.Refresh.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Refresh.Image = ((System.Drawing.Image)(resources.GetObject("Refresh.Image")));
-            this.Refresh.IsShowBorder = true;
-            this.Refresh.Location = new System.Drawing.Point(629, 36);
-            this.Refresh.Margin = new System.Windows.Forms.Padding(4);
-            this.Refresh.MoveImage = ((System.Drawing.Image)(resources.GetObject("Refresh.MoveImage")));
-            this.Refresh.Name = "Refresh";
-            this.Refresh.NormalImage = ((System.Drawing.Image)(resources.GetObject("Refresh.NormalImage")));
-            this.Refresh.Power = "ifRead";
-            this.Refresh.Size = new System.Drawing.Size(80, 30);
-            this.Refresh.TabIndex = 176;
-            this.Refresh.Tag = "IFREAD";
-            this.Refresh.Text = "刷新";
-            this.Refresh.UseVisualStyleBackColor = true;
-            this.Refresh.Click += new System.EventHandler(this.Refresh_Click);
-            // 
             // GetBatch
             // 
             this.GetBatch.AllPower = "ifall";
@@ -792,27 +768,6 @@
             this.BatchPass.UseVisualStyleBackColor = true;
             this.BatchPass.Click += new System.EventHandler(this.BatchPass_Click);
             // 
-            // Cancel
-            // 
-            this.Cancel.AllPower = null;
-            this.Cancel.BackColor = System.Drawing.Color.Transparent;
-            this.Cancel.DownImage = ((System.Drawing.Image)(resources.GetObject("Cancel.DownImage")));
-            this.Cancel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Cancel.Image = ((System.Drawing.Image)(resources.GetObject("Cancel.Image")));
-            this.Cancel.IsShowBorder = true;
-            this.Cancel.Location = new System.Drawing.Point(743, 709);
-            this.Cancel.Margin = new System.Windows.Forms.Padding(4);
-            this.Cancel.MoveImage = ((System.Drawing.Image)(resources.GetObject("Cancel.MoveImage")));
-            this.Cancel.Name = "Cancel";
-            this.Cancel.NormalImage = ((System.Drawing.Image)(resources.GetObject("Cancel.NormalImage")));
-            this.Cancel.Power = null;
-            this.Cancel.Size = new System.Drawing.Size(80, 30);
-            this.Cancel.TabIndex = 173;
-            this.Cancel.Tag = "OQC!Inspection";
-            this.Cancel.Text = "取消";
-            this.Cancel.UseVisualStyleBackColor = true;
-            this.Cancel.Click += new System.EventHandler(this.Cancel_Click);
-            // 
             // Confirm
             // 
             this.Confirm.AllPower = "ifall";
@@ -957,10 +912,8 @@
             this.Controls.Add(this.label1);
             this.Controls.Add(this.bccode);
             this.Controls.Add(this.bc_code_label);
-            this.Controls.Add(this.Refresh);
             this.Controls.Add(this.GetBatch);
             this.Controls.Add(this.BatchPass);
-            this.Controls.Add(this.Cancel);
             this.Controls.Add(this.Confirm);
             this.Controls.Add(this.ob_checkno);
             this.Controls.Add(this.ob_checkno_label);
@@ -992,10 +945,8 @@
         private CustomControl.TextBoxWithIcon.EnterTextBox ms_sncode;
         private System.Windows.Forms.Label ms_sncode_label;
         private CustomControl.ButtonUtil.NormalButton Confirm;
-        private CustomControl.ButtonUtil.NormalButton Cancel;
         private CustomControl.ButtonUtil.NormalButton BatchPass;
         private CustomControl.ButtonUtil.NormalButton GetBatch;
-        private new CustomControl.ButtonUtil.NormalButton Refresh;
         private CustomControl.TextBoxWithIcon.EnterTextBox bccode;
         private System.Windows.Forms.Label bc_code_label;
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_batchqty;

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -100,31 +100,29 @@ namespace UAS_MES.OQC
                             string oMsID = "";
                             if (LogicHandler.CheckStepSNAndMacode(dt.Rows[0]["ob_makecode"].ToString(), User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
                             {
-                                if (ob_aqlcode.Text == "")
-                                {
-                                    return false;
-                                }
-                                else {
-                                    return true;
-                                }
+                                return true;
                             }
-                            else {
+                            else
+                            {
                                 OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                                 return false;
                             }
                         }
                     }
-                    else {
+                    else
+                    {
                         OperateResult.AppendText(">>序列号" + sncode.Text + "不属于当前抽检批次\n", Color.Red);
                         return false;
                     }
                 }
-                else {
+                else
+                {
                     OperateResult.AppendText(">>送检批次必须是待检验或者检验中\n", Color.Red);
                     return false;
                 }
             }
-            else {
+            else
+            {
                 OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
                 return false;
             }
@@ -262,6 +260,7 @@ namespace UAS_MES.OQC
                         sncode.Text = "";
                         TempForCheckType.Clear();
                         TempForBadGroup.Clear();
+                        sncode.Focus();
                     }
                     else OperateResult.AppendText(">>含有未通过项请勾选不良明细\n", Color.Red);
                 }
@@ -270,11 +269,6 @@ namespace UAS_MES.OQC
             else OperateResult.AppendText(">>必须是待检验或者检测中的送检批才能进行此操作\n", Color.Red);
         }
 
-        private void Cancel_Click(object sender, EventArgs e)
-        {
-
-        }
-
         private void BatchPass_Click(object sender, EventArgs e)
         {
             if (CheckBefore())
@@ -294,11 +288,6 @@ namespace UAS_MES.OQC
             }
         }
 
-        private void Refresh_Click(object sender, EventArgs e)
-        {
-
-        }
-
         private bool CheckBefore()
         {
             if (ob_maxngacceptqty.Text == "" || ob_maxngacceptqty.Text == "0")
@@ -324,7 +313,8 @@ namespace UAS_MES.OQC
                     }
                 }
             }
-            else {
+            else
+            {
                 sql.Clear();
                 sql.Append("select wm_concat(oi_itemcode) codes from OQCitems where ");
                 sql.Append("nvl(oi_checkqty,0)<oi_sampleqty  and oi_sampleqty>0 and rownum<30 and oi_checkno='" + ob_checkno.Text + "'");

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.resx

@@ -258,6 +258,15 @@
   <metadata name="bc_name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="or_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bc_code1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bc_name1.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>
@@ -267,6 +276,36 @@
   <metadata name="bg_name.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>
+  <metadata name="bg_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bg_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="choose.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_itemcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_ng.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_leveldefect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ois_remark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ois_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ois_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="choose.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -324,137 +363,6 @@
         ZrIE7d4UdV3k12BxFb3huIgob74jq7eOllIz0Q9sQrs7Ui9wepGrci6vk/HQgzzKm+7IZUgTOpQ2kj7o
         zB15DHqhq3IurxPdaY8R5U37C1K8XmyU9PGfh25xfV0R/UeTz52y3EtWQ9dqNEP4HY3LfwGra+NvPdw7
         fgAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="Refresh.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="Refresh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
-  <data name="Refresh.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="Refresh.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="GetBatch.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -717,137 +625,6 @@
         2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
         zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="Cancel.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
-        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
-        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
-        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
-        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
-        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
-        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="Cancel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
-  <data name="Cancel.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
-        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
-        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
-        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
-        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
-        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
-        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="Cancel.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
-        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
-        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
-        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
-        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
-        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
-        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
-        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="Confirm.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

UAS-MES/UAS-MES.csproj

@@ -40,7 +40,7 @@
     <MinimumRequiredVersion>1.0.0.201</MinimumRequiredVersion>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>265</ApplicationRevision>
+    <ApplicationRevision>267</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -397,6 +397,7 @@
       <DependentUpon>DbFind.cs</DependentUpon>
     </Compile>
     <Compile Include="Entity\ItemObject.cs" />
+    <Compile Include="Entity\Status.cs" />
     <Compile Include="Entity\SystemInf.cs" />
     <Compile Include="Entity\User.cs" />
     <Compile Include="Enum\EMouseState.cs" />

UAS_WinForm.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-MES接口", "MES接口\UAS-MES接口.csproj", "{A52EFE9C-838E-4E8C-BAAA-B1C226E57A81}"
 EndProject