修改权限组放大镜宽度

UAS-MES/App.config

@@ -21,9 +21,6 @@
       <setting name="ProjectName" serializeAs="String">
         <value>优软科技MES</value>
       </setting>
-      <setting name="DefaultDB" serializeAs="String">
-        <value />
-      </setting>
       <setting name="LastLoginUser" serializeAs="String">
         <value />
       </setting>
@@ -41,7 +38,7 @@
   <applicationSettings>
     <UAS_MES.Properties.Settings>
       <setting name="MES" serializeAs="String">
-        <value>Password=select!#%*(;User ID=MES_TEST;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
+        <value>Password=select!#%*(;User ID=UAS_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=218.17.158.219)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
       </setting>
     </UAS_MES.Properties.Settings>
   </applicationSettings>

UAS-MES/DataOperate/DataHelper.cs

@@ -27,13 +27,9 @@ namespace UAS_MES.DataOperate
             {
                 //如果选择的是默认数据则直接用配置文件的信息连接，否则选择数据库的账套信息
                 if (DBConnectionString == null || DBConnectionString == ConnectionStrings)
-                {
                     connection = new OracleConnection(ConnectionStrings);
-                }
                 else
-                {
                     connection = new OracleConnection(DBConnectionString);
-                }
                 connection.Open();
             }
             catch (Exception e) { OracleConnection.ClearPool(connection); LogManager.DoLog(e.Message); }
@@ -931,11 +927,10 @@ namespace UAS_MES.DataOperate
             command.CommandText = ProcedureName;
             command.CommandType = CommandType.StoredProcedure;
             for (int i = 0; i < param.Length; i++)
-                command.Parameters.Add(new OracleParameter(param[i].ToString(), OracleDbType.Varchar2, 20, param[i], ParameterDirection.InputOutput));
+                command.Parameters.Add(new OracleParameter(param[i].ToString(), OracleDbType.Varchar2, 200, param[i], ParameterDirection.InputOutput));
             command.ExecuteNonQuery();
-            for (int i = 0; i < command.Parameters.Count; i++) {
+            for (int i = 0; i < command.Parameters.Count; i++)
                 param[i] = command.Parameters[i].Value.ToString();
-            }
             command.Dispose();
         }
 

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(118, 10);
+            this.ug_code_title.Location = new System.Drawing.Point(157, 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(118, 42);
+            this.ug_name_title.Location = new System.Drawing.Point(157, 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 = "用户组";
             // 
@@ -167,11 +177,12 @@
             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(118, 108);
-            this.em_name3.Margin = new System.Windows.Forms.Padding(2);
+            this.em_name3.Location = new System.Drawing.Point(153, 135);
+            this.em_name3.Lock = false;
+            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(148, 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;
@@ -183,11 +194,12 @@
             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.Lock = false;
+            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;
@@ -202,13 +214,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;
@@ -222,13 +234,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;
@@ -243,11 +255,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
@@ -283,10 +295,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);
@@ -294,10 +306,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);
@@ -312,11 +324,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
@@ -365,12 +377,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(176, 21);
+            this.em_code3.Size = new System.Drawing.Size(230, 26);
             this.em_code3.TabIndex = 258;
             this.em_code3.TableName = null;
             this.em_code3.TextBoxEnable = false;
@@ -382,21 +395,22 @@
             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(172, 21);
+            this.em_code2.Size = new System.Drawing.Size(227, 26);
             this.em_code2.TabIndex = 259;
             this.em_code2.TableName = null;
             this.em_code2.TextBoxEnable = false;
             // 
             // 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);
@@ -418,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_ChooseUserToGroup.resx

@@ -206,18 +206,6 @@
   <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
@@ -271,19 +259,4 @@
   <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>

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

@@ -28,8 +28,8 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Employee_Group));
             this.ug_code_label = new System.Windows.Forms.Label();
             this.ug_name_label = new System.Windows.Forms.Label();
@@ -51,9 +51,10 @@
             // 
             this.ug_code_label.AutoSize = true;
             this.ug_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_code_label.Location = new System.Drawing.Point(9, 24);
+            this.ug_code_label.Location = new System.Drawing.Point(12, 30);
+            this.ug_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ug_code_label.Name = "ug_code_label";
-            this.ug_code_label.Size = new System.Drawing.Size(90, 21);
+            this.ug_code_label.Size = new System.Drawing.Size(112, 27);
             this.ug_code_label.TabIndex = 237;
             this.ug_code_label.Text = "用户组代码";
             // 
@@ -61,9 +62,10 @@
             // 
             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(256, 24);
+            this.ug_name_label.Location = new System.Drawing.Point(341, 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(58, 21);
+            this.ug_name_label.Size = new System.Drawing.Size(72, 27);
             this.ug_name_label.TabIndex = 239;
             this.ug_name_label.Text = "用户组";
             // 
@@ -77,11 +79,11 @@
             this.ug_name,
             this.UserSetting,
             this.PowerSetting});
-            this.UserGroupDGV.Location = new System.Drawing.Point(9, 57);
-            this.UserGroupDGV.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.UserGroupDGV.Location = new System.Drawing.Point(12, 71);
+            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(625, 478);
+            this.UserGroupDGV.Size = new System.Drawing.Size(833, 598);
             this.UserGroupDGV.TabIndex = 244;
             this.UserGroupDGV.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.UserGroupDGV_CellClick);
             // 
@@ -110,8 +112,8 @@
             // 
             this.UserSetting.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.UserSetting.DataPropertyName = "UserSetting";
-            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.UserSetting.DefaultCellStyle = dataGridViewCellStyle21;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.UserSetting.DefaultCellStyle = dataGridViewCellStyle1;
             this.UserSetting.HeaderText = "成员设置";
             this.UserSetting.Name = "UserSetting";
             this.UserSetting.Width = 120;
@@ -120,8 +122,8 @@
             // 
             this.PowerSetting.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.PowerSetting.DataPropertyName = "PowerSetting";
-            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.PowerSetting.DefaultCellStyle = dataGridViewCellStyle22;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.PowerSetting.DefaultCellStyle = dataGridViewCellStyle2;
             this.PowerSetting.HeaderText = "权限分配";
             this.PowerSetting.Name = "PowerSetting";
             // 
@@ -133,13 +135,13 @@
             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(530, 22);
-            this.NewGroup.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.NewGroup.Location = new System.Drawing.Point(707, 28);
+            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";
             this.NewGroup.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewGroup.NormalImage")));
             this.NewGroup.Power = null;
-            this.NewGroup.Size = new System.Drawing.Size(45, 26);
+            this.NewGroup.Size = new System.Drawing.Size(60, 32);
             this.NewGroup.TabIndex = 243;
             this.NewGroup.Tag = "ShowDialogWindow";
             this.NewGroup.Text = "新增";
@@ -154,13 +156,13 @@
             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(589, 22);
-            this.DeleteGroup.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.DeleteGroup.Location = new System.Drawing.Point(785, 28);
+            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";
             this.DeleteGroup.NormalImage = ((System.Drawing.Image)(resources.GetObject("DeleteGroup.NormalImage")));
             this.DeleteGroup.Power = null;
-            this.DeleteGroup.Size = new System.Drawing.Size(45, 26);
+            this.DeleteGroup.Size = new System.Drawing.Size(60, 32);
             this.DeleteGroup.TabIndex = 242;
             this.DeleteGroup.Text = "删除";
             this.DeleteGroup.UseVisualStyleBackColor = false;
@@ -174,13 +176,13 @@
             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(473, 22);
-            this.Screen.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Screen.Location = new System.Drawing.Point(631, 28);
+            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";
             this.Screen.NormalImage = ((System.Drawing.Image)(resources.GetObject("Screen.NormalImage")));
             this.Screen.Power = null;
-            this.Screen.Size = new System.Drawing.Size(45, 26);
+            this.Screen.Size = new System.Drawing.Size(60, 32);
             this.Screen.TabIndex = 241;
             this.Screen.Text = "筛选";
             this.Screen.UseVisualStyleBackColor = false;
@@ -193,13 +195,13 @@
             this.ug_name1.Condition = null;
             this.ug_name1.DBTitle = null;
             this.ug_name1.FormName = null;
-            this.ug_name1.Location = new System.Drawing.Point(324, 24);
-            this.ug_name1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ug_name1.Location = new System.Drawing.Point(432, 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;
             this.ug_name1.SelectField = null;
             this.ug_name1.SetValueField = null;
-            this.ug_name1.Size = new System.Drawing.Size(135, 21);
+            this.ug_name1.Size = new System.Drawing.Size(183, 26);
             this.ug_name1.TabIndex = 240;
             this.ug_name1.TableName = null;
             this.ug_name1.Tag = "ug_code";
@@ -212,13 +214,13 @@
             this.ug_code1.Condition = null;
             this.ug_code1.DBTitle = null;
             this.ug_code1.FormName = null;
-            this.ug_code1.Location = new System.Drawing.Point(104, 24);
-            this.ug_code1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ug_code1.Location = new System.Drawing.Point(139, 30);
+            this.ug_code1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ug_code1.Name = "ug_code1";
             this.ug_code1.Power = null;
             this.ug_code1.SelectField = null;
             this.ug_code1.SetValueField = null;
-            this.ug_code1.Size = new System.Drawing.Size(135, 21);
+            this.ug_code1.Size = new System.Drawing.Size(180, 26);
             this.ug_code1.TabIndex = 238;
             this.ug_code1.TableName = null;
             this.ug_code1.Tag = "ug_code";
@@ -226,9 +228,9 @@
             // 
             // Employee_Group
             // 
-            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(686, 556);
+            this.ClientSize = new System.Drawing.Size(915, 695);
             this.Controls.Add(this.UserGroupDGV);
             this.Controls.Add(this.NewGroup);
             this.Controls.Add(this.DeleteGroup);
@@ -238,6 +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.Name = "Employee_Group";
             this.Tag = "Employee!Data";
             this.Text = "人员资料";

UAS-MES/FunctionCode/Employee/Employee_Group.resx

@@ -132,21 +132,6 @@
   <metadata name="PowerSetting.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="ug_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ug_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ug_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="UserSetting.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="PowerSetting.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="NewGroup.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

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

@@ -48,9 +48,10 @@
             // 
             this.sn_module_label.AutoSize = true;
             this.sn_module_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_module_label.Location = new System.Drawing.Point(272, 14);
+            this.sn_module_label.Location = new System.Drawing.Point(363, 18);
+            this.sn_module_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.sn_module_label.Name = "sn_module_label";
-            this.sn_module_label.Size = new System.Drawing.Size(74, 21);
+            this.sn_module_label.Size = new System.Drawing.Size(92, 27);
             this.sn_module_label.TabIndex = 211;
             this.sn_module_label.Text = "对应模块";
             // 
@@ -58,9 +59,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(16, 14);
+            this.label1.Location = new System.Drawing.Point(21, 18);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(58, 21);
+            this.label1.Size = new System.Drawing.Size(72, 27);
             this.label1.TabIndex = 212;
             this.label1.Text = "用户组";
             // 
@@ -68,10 +70,10 @@
             // 
             this.sn_module.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.sn_module.FormattingEnabled = true;
-            this.sn_module.Location = new System.Drawing.Point(368, 18);
-            this.sn_module.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.sn_module.Location = new System.Drawing.Point(491, 22);
+            this.sn_module.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.sn_module.Name = "sn_module";
-            this.sn_module.Size = new System.Drawing.Size(140, 20);
+            this.sn_module.Size = new System.Drawing.Size(185, 23);
             this.sn_module.TabIndex = 237;
             this.sn_module.Tag = "sn_classname";
             this.sn_module.SelectedIndexChanged += new System.EventHandler(this.sn_module_SelectedIndexChanged);
@@ -83,13 +85,13 @@
             this.ug_code.Condition = null;
             this.ug_code.DBTitle = null;
             this.ug_code.FormName = null;
-            this.ug_code.Location = new System.Drawing.Point(95, 16);
-            this.ug_code.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ug_code.Location = new System.Drawing.Point(127, 20);
+            this.ug_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ug_code.Name = "ug_code";
             this.ug_code.Power = null;
             this.ug_code.SelectField = null;
             this.ug_code.SetValueField = null;
-            this.ug_code.Size = new System.Drawing.Size(152, 23);
+            this.ug_code.Size = new System.Drawing.Size(205, 29);
             this.ug_code.TabIndex = 236;
             this.ug_code.TableName = null;
             this.ug_code.Tag = "ug_code";
@@ -103,12 +105,13 @@
             this.Screen.DownImage = ((System.Drawing.Image)(resources.GetObject("Screen.DownImage")));
             this.Screen.Image = ((System.Drawing.Image)(resources.GetObject("Screen.Image")));
             this.Screen.IsShowBorder = true;
-            this.Screen.Location = new System.Drawing.Point(530, 15);
+            this.Screen.Location = new System.Drawing.Point(707, 19);
+            this.Screen.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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 = null;
-            this.Screen.Size = new System.Drawing.Size(52, 24);
+            this.Screen.Size = new System.Drawing.Size(69, 30);
             this.Screen.TabIndex = 232;
             this.Screen.Tag = "IfRead|ifAll";
             this.Screen.Text = "筛选";
@@ -122,12 +125,13 @@
             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(401, 478);
+            this.SavePower.Location = new System.Drawing.Point(535, 598);
+            this.SavePower.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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.Size = new System.Drawing.Size(60, 24);
+            this.SavePower.Size = new System.Drawing.Size(80, 30);
             this.SavePower.TabIndex = 1;
             this.SavePower.Tag = "";
             this.SavePower.Text = "保存";
@@ -145,10 +149,11 @@
             this.ugp_id,
             this.Column1,
             this.Column2});
-            this.GroupPowerDGV.Location = new System.Drawing.Point(3, 70);
+            this.GroupPowerDGV.Location = new System.Drawing.Point(4, 88);
+            this.GroupPowerDGV.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.GroupPowerDGV.Name = "GroupPowerDGV";
             this.GroupPowerDGV.RowTemplate.Height = 23;
-            this.GroupPowerDGV.Size = new System.Drawing.Size(855, 400);
+            this.GroupPowerDGV.Size = new System.Drawing.Size(1140, 500);
             this.GroupPowerDGV.TabIndex = 0;
             this.GroupPowerDGV.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.GroupPower_DataError);
             // 
@@ -191,9 +196,9 @@
             // 
             // Employee_Power
             // 
-            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(862, 508);
+            this.ClientSize = new System.Drawing.Size(1149, 635);
             this.Controls.Add(this.sn_module);
             this.Controls.Add(this.ug_code);
             this.Controls.Add(this.Screen);
@@ -202,6 +207,7 @@
             this.Controls.Add(this.SavePower);
             this.Controls.Add(this.GroupPowerDGV);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Employee_Power";
             this.Tag = "Employee!Power";
             this.Text = "权限控制";

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

@@ -53,9 +53,10 @@
             // 
             this.Group_label.AutoSize = true;
             this.Group_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Group_label.Location = new System.Drawing.Point(10, 25);
+            this.Group_label.Location = new System.Drawing.Point(13, 31);
+            this.Group_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Group_label.Name = "Group_label";
-            this.Group_label.Size = new System.Drawing.Size(74, 21);
+            this.Group_label.Size = new System.Drawing.Size(92, 27);
             this.Group_label.TabIndex = 214;
             this.Group_label.Text = "选择分组";
             // 
@@ -63,9 +64,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(268, 25);
+            this.label1.Location = new System.Drawing.Point(357, 31);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(74, 21);
+            this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 216;
             this.label1.Text = "选择模块";
             // 
@@ -73,10 +75,10 @@
             // 
             this.sn_module.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.sn_module.FormattingEnabled = true;
-            this.sn_module.Location = new System.Drawing.Point(352, 26);
-            this.sn_module.Margin = new System.Windows.Forms.Padding(2);
+            this.sn_module.Location = new System.Drawing.Point(469, 32);
+            this.sn_module.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.sn_module.Name = "sn_module";
-            this.sn_module.Size = new System.Drawing.Size(126, 20);
+            this.sn_module.Size = new System.Drawing.Size(167, 23);
             this.sn_module.TabIndex = 217;
             this.sn_module.SelectedIndexChanged += new System.EventHandler(this.sn_module_SelectedIndexChanged);
             // 
@@ -99,11 +101,12 @@
             this.Column1,
             this.Column2,
             this.Column3});
-            this.PowerSearchDGV.Location = new System.Drawing.Point(0, 71);
+            this.PowerSearchDGV.Location = new System.Drawing.Point(0, 89);
+            this.PowerSearchDGV.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.PowerSearchDGV.Name = "PowerSearchDGV";
             this.PowerSearchDGV.ReadOnly = true;
             this.PowerSearchDGV.RowTemplate.Height = 23;
-            this.PowerSearchDGV.Size = new System.Drawing.Size(896, 485);
+            this.PowerSearchDGV.Size = new System.Drawing.Size(1195, 606);
             this.PowerSearchDGV.TabIndex = 220;
             // 
             // ug_group
@@ -199,13 +202,13 @@
             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(511, 27);
-            this.Screen.Margin = new System.Windows.Forms.Padding(2);
+            this.Screen.Location = new System.Drawing.Point(681, 34);
+            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";
             this.Screen.NormalImage = ((System.Drawing.Image)(resources.GetObject("Screen.NormalImage")));
             this.Screen.Power = "ifread";
-            this.Screen.Size = new System.Drawing.Size(56, 22);
+            this.Screen.Size = new System.Drawing.Size(75, 28);
             this.Screen.TabIndex = 219;
             this.Screen.Text = "筛选";
             this.Screen.UseVisualStyleBackColor = false;
@@ -218,13 +221,13 @@
             this.ug_code.Condition = null;
             this.ug_code.DBTitle = null;
             this.ug_code.FormName = null;
-            this.ug_code.Location = new System.Drawing.Point(84, 26);
-            this.ug_code.Margin = new System.Windows.Forms.Padding(2);
+            this.ug_code.Location = new System.Drawing.Point(112, 32);
+            this.ug_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ug_code.Name = "ug_code";
             this.ug_code.Power = null;
             this.ug_code.SelectField = null;
             this.ug_code.SetValueField = null;
-            this.ug_code.Size = new System.Drawing.Size(148, 21);
+            this.ug_code.Size = new System.Drawing.Size(204, 26);
             this.ug_code.TabIndex = 218;
             this.ug_code.TableName = null;
             this.ug_code.Tag = "ug_code";
@@ -234,9 +237,9 @@
             // 
             // Employee_PowerSarch
             // 
-            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(898, 558);
+            this.ClientSize = new System.Drawing.Size(1197, 698);
             this.Controls.Add(this.PowerSearchDGV);
             this.Controls.Add(this.Screen);
             this.Controls.Add(this.ug_code);
@@ -244,7 +247,7 @@
             this.Controls.Add(this.label1);
             this.Controls.Add(this.Group_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(2);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "Employee_PowerSarch";
             this.Tag = "Employee!PowerSarch";
             this.Text = "权限查看";

UAS-MES/Login.cs

@@ -34,12 +34,11 @@ namespace UAS_MES
 
         private void Login_Load(object sender, EventArgs e)
         {
-            Console.WriteLine("TestContent");
             ftpOperater ftp = new ftpOperater();
             //从FTP的配置文件读取的数据库信息，并且进行解密
             //SystemInf.DefaultDB = Encryption.DecryptStr((ftp.GetFileContent("db.config")));
             //设置默认数据库
-            SystemInf.DefaultDB = Properties.Settings.Default.Properties["DefaultDB"].DefaultValue.ToString();
+            SystemInf.DefaultDB = Properties.Settings.Default.Properties["MES"].DefaultValue.ToString();
             dh = new DataHelper();
             //将账套的信息查询出来赋给下拉框
             DbComboxData = (DataTable)dh.ExecuteSql("select ms_pwd,ma_user,ma_address from master", "select");
@@ -83,6 +82,7 @@ namespace UAS_MES
                     SystemInf.ScreenWidth = Screen.PrimaryScreen.WorkingArea.Width;
                     SystemInf.ScreenHeight = Screen.PrimaryScreen.WorkingArea.Height;
                     SystemInf.ConnectionString = "Data Source=" + DbComboxData.Rows[i]["ma_address"] + ";User ID=" + DbComboxData.Rows[i]["ma_user"] + ";PassWord=" + DbComboxData.Rows[i]["ms_pwd"];
+                    Console.WriteLine(SystemInf.ConnectionString);
                     DataHelper.DBConnectionString = SystemInf.ConnectionString;
                     //重新执行一遍构造函数使得重置之后的链接字符串生效
                     dh = new DataHelper();

UAS-MES/Properties/Settings.Designer.cs

@@ -35,18 +35,6 @@ namespace UAS_MES.Properties {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string DefaultDB {
-            get {
-                return ((string)(this["DefaultDB"]));
-            }
-            set {
-                this["DefaultDB"] = value;
-            }
-        }
-        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("")]
@@ -97,9 +85,9 @@ namespace UAS_MES.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Password=select!#%*(;User ID=MES_TEST;Pooling=false;Data Source=(DESCRIPTION=(ADD" +
-            "RESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA" +
-            "=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Password=select!#%*(;User ID=UAS_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDR" +
+            "ESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=218.17.158.219)(PORT=1521)))(CONNECT_DATA=" +
+            "(SERVER=DEDICATED)(SERVICE_NAME=orcl)));")]
         public string MES {
             get {
                 return ((string)(this["MES"]));

UAS-MES/Properties/Settings.settings

@@ -5,9 +5,6 @@
     <Setting Name="ProjectName" Type="System.String" Scope="User">
       <Value Profile="(Default)">优软科技MES</Value>
     </Setting>
-    <Setting Name="DefaultDB" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
     <Setting Name="LastLoginUser" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
@@ -21,7 +18,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="MES" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">Password=select!#%*(;User ID=MES_TEST;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
+      <Value Profile="(Default)">Password=select!#%*(;User ID=UAS_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=218.17.158.219)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
     </Setting>
   </Settings>
 </SettingsFile>

UAS-MES/PublicMethod/LogicHandler.cs

@@ -993,11 +993,11 @@ namespace UAS_MES.PublicMethod
                 return false;
         }
 
-        public static bool SetFinish(string iMakeCode, string iSource, string iSN, string iUserCode, out string oErrorMessage)
+        public static bool SetStepFinish(string iMakeCode, string iSource, string iSN, string iUserCode, out string oErrorMessage)
         {
             oErrorMessage = "";
             string[] param = new string[] { iMakeCode, iSource, iSN, iUserCode, oErrorMessage };
-            dh.CallProcedure("CS_SETFINISH", ref param);
+            dh.CallProcedure("CS_SETSTEPFINISH", ref param);
             if (oErrorMessage == "" || oErrorMessage == null)
                 return true;
             else
@@ -1101,7 +1101,8 @@ namespace UAS_MES.PublicMethod
             //记录操作日志
             InsertMakeProcess(iSnCode, iMakeCode, iResult, iUserName);
             //判断当前采集点是否为扣料工序cd_ifreduce =-1 则为扣料工序
-            SetCollectionFinish(iSnCode, iMakeCode, iUserName, iSourceCode, out oErrorMessage);
+            SetStepFinish(iMakeCode, iSourceCode, iSnCode, iUserName,out oErrorMessage);
+            //SetCollectionFinish(iSnCode, iMakeCode, iUserName, iSourceCode, out oErrorMessage);
             return true;
         }
 
@@ -1300,134 +1301,135 @@ namespace UAS_MES.PublicMethod
         /// <returns></returns>
         public static bool UpdateMakeMessage(string iSnCode, string iMakeCode, string iSourceCode, string iUserName, string iResult, out string oErrorMessage)
         {
-            oErrorMessage = "";
-            string StepCode = "";
-            string StepName = "";
-            string LineCode = "";
-            if (iResult == "" || iResult == null)
-            {
-                iResult = "测试合格";
-            }
-            GetStepCodeAndNameAndLineBySource(iSourceCode, ref StepCode, ref StepName, ref LineCode);
-            //判断是否上料工序，如果是的话执行该步骤
-            DataTable dt = dh.getFieldsDataByCondition("make left join craft on cr_code=ma_craftcode left join craftdetail on cd_crid=cr_id", new string[] { "cd_ifinput", "cr_code" }, "ma_code='" + iMakeCode + "' and cd_stepcode='" + StepCode + "'");
-            string Yes_No = dh.GetConfig("BatchNumber", "MESSetting").ToString();
-            string cr_code = "";
-            if (dt.Rows.Count > 0)
-            {
-                cr_code = dt.Rows[0]["cr_code"].ToString();
-                if (dt.Rows[0]["cd_ifinput"].ToString() != "0")
-                {
-                    sql.Clear();
-                    sql.Append("select wm_concat(mss_prodcode) code,count(1) cn from (select sum(nvl(mss_remain,0))remain,mss_prodcode,max(mss_baseqty) mss_baseqty ");
-                    sql.Append("from makesourcestock where mss_makecode='" + iMakeCode + "' and mss_stepcode='" + StepCode + "' ");
-                    sql.Append("and mss_linecode='" + LineCode + "' group by mss_prodcode)T where T.remain<mss_baseqty and rownum<20");
-                    dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
-                    //如果配置的是Yes
-                    if (Yes_No != "0")
-                    {
-                        //如果批次料不足
-                        if (dt.Rows.Count > 0 && int.Parse(dt.Rows[0]["cn"].ToString()) > 0)
-                        {
-                            oErrorMessage += "批次物料：" + iSnCode + "，" + dt.Rows[0]["code"] + "岗位备料不足";
-                            return false;
-                        }
-                    }
-                    //如果配置的是No 或者批次料足够
-                    else if (Yes_No == "0" || dt.Rows.Count == 0)
-                    {
-                        //扣减批次数量，插入数据至用料表
-                        sql.Clear();
-                        sql.Append("select mss_prodcode , max(mss_baseqty) baseqty from makesourcestock ");
-                        sql.Append("mss_makecode='" + iMakeCode + "' and mss_stepcode='" + StepCode + "'  and mss_linecode='" + LineCode + "' group by mss_prodcode");
-                        DataTable dt1 = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
-                        for (int i = 0; i < dt1.Rows.Count; i++)
-                        {
-                            string prodcode = dt1.Rows[i]["mss_prodcode"].ToString();
-                            //本次上料需要扣除的数量
-                            int baseqty = int.Parse(dt1.Rows[i]["baseqty"].ToString());
-                            sql.Clear();
-                            sql.Append("select mss_remain,mss_useqty,mss_id ,mss_barcode from makesourcestock where mss_makecode='" + iMakeCode + "' and ");
-                            sql.Append("mss_stepcode='" + StepCode + "' and mss_prodcode='" + prodcode + "'  and mss_linecode='" + LineCode + "'  and mss_remain >0 order by mss_id  asc");
-                            DataTable dt2 = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
-                            for (int j = 0; i < dt2.Rows.Count; j++)
-                            {
-                                int remain = int.Parse(dt2.Rows[j]["mss_remain"].ToString());
-                                int useqty = int.Parse(dt2.Rows[j]["mss_useqty"].ToString());
-                                string mss_id = dt2.Rows[j]["mss_id"].ToString();
-                                string barcode = dt2.Rows[j]["mss_barcode"].ToString();
-                                //如果可扣数量大于0
-                                if (baseqty > 0)
-                                {
-                                    //并且可扣数量大于剩余数量
-                                    if (baseqty > remain)
-                                    {
-                                        sql.Clear();
-                                        sql.Append("update makesourcestock set mss_useqty=nvl(mss_useqty,0)+mss_remain,mss_remain = 0 where mss_id='" + mss_id + "' ");
-                                        dh.ExecuteSql(sql.ToString(), "update");
-                                        //扣减剩余数量
-                                        baseqty -= remain;
-                                    }
-                                    else if (remain >= baseqty)
-                                    {
-                                        dh.ExecuteSql("update makesourcestock set mss_remain = mss_remain-mss_baseqty where mss_id =" + mss_id, "select");
-                                        baseqty = 0;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            //查询批次和批数量
-            int batchqty = 0;
-            string checkno = "";
-            dt = (DataTable)dh.ExecuteSql("select count(ms_checkno) count,ms_checkno from makeserial where ms_checkno=(select ms_checkno from makeserial where ms_sncode='" + iSnCode + "') group by ms_checkno", "select");
-            if (dt.Rows.Count > 0)
-            {
-                batchqty = int.Parse(dt.Rows[0]["count"].ToString());
-                checkno = dt.Rows[0]["ms_checkno"].ToString();
-            }
-            object nextstepcode = dh.getFieldDataByCondition("makecraftdetail", "mcd_nextstepcode", "mcd_macode='" + iMakeCode + "' and mcd_stepcode='" + StepCode + "'");
-            if (iResult.Contains("批次通过") && dt.Rows.Count > 0)
-            {
-                //更新执行的数量
-                sqls.Add("update makecraftdetail set mcd_inqty=mcd_inqty+" + batchqty + ",mcd_outqty = mcd_outqty + " + batchqty + ",mcd_okqty = mcd_okqty + " + batchqty + " where mcd_macode='" + iMakeCode + "' and mcd_stepcode='" + StepCode + "' ");
-                //更新makeSerial 的下一工序
-                sqls.Add("update makeserial set ms_paststep = ms_paststep || '," + StepCode + "',ms_nextstepcode='" + nextstepcode.ToString() + "' where ms_checkno='" + checkno + "'");
-            }
-            else
-            {
-                //更新执行的数量
-                sqls.Add("update makecraftdetail set mcd_inqty=mcd_inqty+1,mcd_outqty = mcd_outqty + 1,mcd_okqty = mcd_okqty + 1 where mcd_macode='" + iMakeCode + "' and mcd_stepcode='" + StepCode + "' ");
-                //更新makeSerial 的下一工序
-                sqls.Add("update makeserial set ms_paststep = ms_paststep || '," + StepCode + "',ms_stepcode='" + StepCode + "',ms_nextstepcode='" + nextstepcode.ToString() + "' where ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
-            }
-            //更新序列号已经采集的工序 ms_paststep 已采集数据，更新下一工序
-            dh.ExecuteSQLTran(sqls.ToArray());
-            sqls.Clear();
-            //记录操作日志
-            InsertMakeProcess(iSnCode, iMakeCode, iResult, iUserName);
-            //检测下道工序是否存在，不存在 更新状态为已完成
-            if (nextstepcode == null || nextstepcode.ToString() == "")
-            {
-                if (iResult.Contains("批次通过"))
-                {
-                    sqls.Add("update make set ma_madeqty=ma_madeqty+" + batchqty + " where ma_code='" + iMakeCode + "'");
-                    sqls.Add("update makeserial set ms_status=2 where ms_checkno='" + checkno + "'");
-                }
-                else
-                {
-                    sqls.Add("update make set ma_madeqty=ma_madeqty+1  where ma_code='" + iMakeCode + "'");
-                    sqls.Add("update makeserial set ms_status=2 where ms_sncode='" + iSnCode + "'");
-                }
-                dh.ExecuteSQLTran(sqls.ToArray());
-                sqls.Clear();
-            }
-            else
-                CheckNextStepIfQC(iSnCode, iMakeCode, nextstepcode.ToString(), cr_code, iUserName, out oErrorMessage);
-            // 将数据插入craftmaterial表
-            SetCollectionFinish(iSnCode, iMakeCode, iUserName, iSourceCode, out oErrorMessage);
+            SetStepFinish(iMakeCode, iSourceCode, iSnCode, iUserName, out oErrorMessage);
+            //oErrorMessage = "";
+            //string StepCode = "";
+            //string StepName = "";
+            //string LineCode = "";
+            //if (iResult == "" || iResult == null)
+            //{
+            //    iResult = "测试合格";
+            //}
+            //GetStepCodeAndNameAndLineBySource(iSourceCode, ref StepCode, ref StepName, ref LineCode);
+            ////判断是否上料工序，如果是的话执行该步骤
+            //DataTable dt = dh.getFieldsDataByCondition("make left join craft on cr_code=ma_craftcode left join craftdetail on cd_crid=cr_id", new string[] { "cd_ifinput", "cr_code" }, "ma_code='" + iMakeCode + "' and cd_stepcode='" + StepCode + "'");
+            //string Yes_No = dh.GetConfig("BatchNumber", "MESSetting").ToString();
+            //string cr_code = "";
+            //if (dt.Rows.Count > 0)
+            //{
+            //    cr_code = dt.Rows[0]["cr_code"].ToString();
+            //    if (dt.Rows[0]["cd_ifinput"].ToString() != "0")
+            //    {
+            //        sql.Clear();
+            //        sql.Append("select wm_concat(mss_prodcode) code,count(1) cn from (select sum(nvl(mss_remain,0))remain,mss_prodcode,max(mss_baseqty) mss_baseqty ");
+            //        sql.Append("from makesourcestock where mss_makecode='" + iMakeCode + "' and mss_stepcode='" + StepCode + "' ");
+            //        sql.Append("and mss_linecode='" + LineCode + "' group by mss_prodcode)T where T.remain<mss_baseqty and rownum<20");
+            //        dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
+            //        //如果配置的是Yes
+            //        if (Yes_No != "0")
+            //        {
+            //            //如果批次料不足
+            //            if (dt.Rows.Count > 0 && int.Parse(dt.Rows[0]["cn"].ToString()) > 0)
+            //            {
+            //                oErrorMessage += "批次物料：" + iSnCode + "，" + dt.Rows[0]["code"] + "岗位备料不足";
+            //                return false;
+            //            }
+            //        }
+            //        //如果配置的是No 或者批次料足够
+            //        else if (Yes_No == "0" || dt.Rows.Count == 0)
+            //        {
+            //            //扣减批次数量，插入数据至用料表
+            //            sql.Clear();
+            //            sql.Append("select mss_prodcode , max(mss_baseqty) baseqty from makesourcestock ");
+            //            sql.Append("mss_makecode='" + iMakeCode + "' and mss_stepcode='" + StepCode + "'  and mss_linecode='" + LineCode + "' group by mss_prodcode");
+            //            DataTable dt1 = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
+            //            for (int i = 0; i < dt1.Rows.Count; i++)
+            //            {
+            //                string prodcode = dt1.Rows[i]["mss_prodcode"].ToString();
+            //                //本次上料需要扣除的数量
+            //                int baseqty = int.Parse(dt1.Rows[i]["baseqty"].ToString());
+            //                sql.Clear();
+            //                sql.Append("select mss_remain,mss_useqty,mss_id ,mss_barcode from makesourcestock where mss_makecode='" + iMakeCode + "' and ");
+            //                sql.Append("mss_stepcode='" + StepCode + "' and mss_prodcode='" + prodcode + "'  and mss_linecode='" + LineCode + "'  and mss_remain >0 order by mss_id  asc");
+            //                DataTable dt2 = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
+            //                for (int j = 0; i < dt2.Rows.Count; j++)
+            //                {
+            //                    int remain = int.Parse(dt2.Rows[j]["mss_remain"].ToString());
+            //                    int useqty = int.Parse(dt2.Rows[j]["mss_useqty"].ToString());
+            //                    string mss_id = dt2.Rows[j]["mss_id"].ToString();
+            //                    string barcode = dt2.Rows[j]["mss_barcode"].ToString();
+            //                    //如果可扣数量大于0
+            //                    if (baseqty > 0)
+            //                    {
+            //                        //并且可扣数量大于剩余数量
+            //                        if (baseqty > remain)
+            //                        {
+            //                            sql.Clear();
+            //                            sql.Append("update makesourcestock set mss_useqty=nvl(mss_useqty,0)+mss_remain,mss_remain = 0 where mss_id='" + mss_id + "' ");
+            //                            dh.ExecuteSql(sql.ToString(), "update");
+            //                            //扣减剩余数量
+            //                            baseqty -= remain;
+            //                        }
+            //                        else if (remain >= baseqty)
+            //                        {
+            //                            dh.ExecuteSql("update makesourcestock set mss_remain = mss_remain-mss_baseqty where mss_id =" + mss_id, "select");
+            //                            baseqty = 0;
+            //                        }
+            //                    }
+            //                }
+            //            }
+            //        }
+            //    }
+            //}
+            ////查询批次和批数量
+            //int batchqty = 0;
+            //string checkno = "";
+            //dt = (DataTable)dh.ExecuteSql("select count(ms_checkno) count,ms_checkno from makeserial where ms_checkno=(select ms_checkno from makeserial where ms_sncode='" + iSnCode + "') group by ms_checkno", "select");
+            //if (dt.Rows.Count > 0)
+            //{
+            //    batchqty = int.Parse(dt.Rows[0]["count"].ToString());
+            //    checkno = dt.Rows[0]["ms_checkno"].ToString();
+            //}
+            //object nextstepcode = dh.getFieldDataByCondition("makecraftdetail", "mcd_nextstepcode", "mcd_macode='" + iMakeCode + "' and mcd_stepcode='" + StepCode + "'");
+            //if (iResult.Contains("批次通过") && dt.Rows.Count > 0)
+            //{
+            //    //更新执行的数量
+            //    sqls.Add("update makecraftdetail set mcd_inqty=mcd_inqty+" + batchqty + ",mcd_outqty = mcd_outqty + " + batchqty + ",mcd_okqty = mcd_okqty + " + batchqty + " where mcd_macode='" + iMakeCode + "' and mcd_stepcode='" + StepCode + "' ");
+            //    //更新makeSerial 的下一工序
+            //    sqls.Add("update makeserial set ms_paststep = ms_paststep || '," + StepCode + "',ms_nextstepcode='" + nextstepcode.ToString() + "' where ms_checkno='" + checkno + "'");
+            //}
+            //else
+            //{
+            //    //更新执行的数量
+            //    sqls.Add("update makecraftdetail set mcd_inqty=mcd_inqty+1,mcd_outqty = mcd_outqty + 1,mcd_okqty = mcd_okqty + 1 where mcd_macode='" + iMakeCode + "' and mcd_stepcode='" + StepCode + "' ");
+            //    //更新makeSerial 的下一工序
+            //    sqls.Add("update makeserial set ms_paststep = ms_paststep || '," + StepCode + "',ms_stepcode='" + StepCode + "',ms_nextstepcode='" + nextstepcode.ToString() + "' where ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
+            //}
+            ////更新序列号已经采集的工序 ms_paststep 已采集数据，更新下一工序
+            //dh.ExecuteSQLTran(sqls.ToArray());
+            //sqls.Clear();
+            ////记录操作日志
+            //InsertMakeProcess(iSnCode, iMakeCode, iResult, iUserName);
+            ////检测下道工序是否存在，不存在 更新状态为已完成
+            //if (nextstepcode == null || nextstepcode.ToString() == "")
+            //{
+            //    if (iResult.Contains("批次通过"))
+            //    {
+            //        sqls.Add("update make set ma_madeqty=ma_madeqty+" + batchqty + " where ma_code='" + iMakeCode + "'");
+            //        sqls.Add("update makeserial set ms_status=2 where ms_checkno='" + checkno + "'");
+            //    }
+            //    else
+            //    {
+            //        sqls.Add("update make set ma_madeqty=ma_madeqty+1  where ma_code='" + iMakeCode + "'");
+            //        sqls.Add("update makeserial set ms_status=2 where ms_sncode='" + iSnCode + "'");
+            //    }
+            //    dh.ExecuteSQLTran(sqls.ToArray());
+            //    sqls.Clear();
+            //}
+            //else
+            //    CheckNextStepIfQC(iSnCode, iMakeCode, nextstepcode.ToString(), cr_code, iUserName, out oErrorMessage);
+            //// 将数据插入craftmaterial表
+            //SetCollectionFinish(iSnCode, iMakeCode, iUserName, iSourceCode, out oErrorMessage);
             return true;
         }