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

UAS-MES/App.config

@@ -12,7 +12,7 @@
   <connectionStrings>
     <add name="MES" connectionString="Password=select!#%*(;User ID=MES;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));" />
   </connectionStrings>
-  <startup useLegacyV2RuntimeActivationPolicy="true">
+  <startup useLegacyV2RuntimeActivationPolicy="true"> 
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
     <supportedRuntime version="v2.0.50727" />
   </startup>

UAS-MES/CustomControl/TextBoxWithIcon/SearchTextBox.Designer.cs

@@ -37,12 +37,12 @@
             // 
             this.TextBox.AllPower = null;
             this.TextBox.BackColor = System.Drawing.Color.White;
-            this.TextBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.TextBox.Dock = System.Windows.Forms.DockStyle.Left;
             this.TextBox.ID = null;
             this.TextBox.Location = new System.Drawing.Point(0, 0);
             this.TextBox.Name = "TextBox";
             this.TextBox.Power = null;
-            this.TextBox.Size = new System.Drawing.Size(247, 21);
+            this.TextBox.Size = new System.Drawing.Size(225, 25);
             this.TextBox.Str = null;
             this.TextBox.Str1 = null;
             this.TextBox.Str2 = null;

UAS-MES/CustomControl/TextBoxWithIcon/SearchTextBox.cs

@@ -270,44 +270,44 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
         public void TextBox_Leave(object sender, EventArgs e)
         {
             TextBox.BackColor = System.Drawing.Color.White;
-            if (TextBox.Text != "") {
-                DataHelper dh = new DataHelper();
-
-                List<string> fields = new List<string>();
-                //获取查询的字段
-                string[] field = selectField.Replace(",", "#").Trim().Split('#');
-                for (int i = 0; i < field.Length; i++)
-                {
-                    if (i % 2 == 0)
-                        fields.Add(field[i]);
-                }
-                //将查询到的结果返回界面
-                string sql = "select " + BaseUtil.AddField(fields.ToArray()) + " from " + tableName + " where " + Tag + "='" + TextBox.Text + "'";
-                if (condition != null)
-                {
-                    sql += " and " + condition;
-                }
-                DataTable dt = (DataTable)dh.ExecuteSql(sql, "select");
-                FormCollection fmCollection = Application.OpenForms;
-                if (dt.Rows.Count > 0)
-                {
-                    for (int i = 0; i < dt.Columns.Count; i++)
-                    {
-                        for (int j = 0; j < SetValueField.Length; j++)
-                        {
-                            //利用字段的Tag属性来和列名进行比对
-                            object tag = fmCollection[FormName].Controls[SetValueField[j]].Tag;
-                            if (SetValueField[j] == dt.Columns[i].ColumnName.ToLower() || (tag != null && tag == dt.Columns[i].ColumnName.ToLower()))
-                            {
-                                fmCollection[FormName].Controls[SetValueField[j]].Text = dt.Rows[0][dt.Columns[i].ColumnName].ToString();
-                            }
-                        }
-                    }
-                    LeaveFindData = true;
-                }
-                else
-                    LeaveFindData = false;
-            }
+            //if (TextBox.Text != "") {
+            //    DataHelper dh = new DataHelper();
+
+            //    List<string> fields = new List<string>();
+            //    //获取查询的字段
+            //    string[] field = selectField.Replace(",", "#").Trim().Split('#');
+            //    for (int i = 0; i < field.Length; i++)
+            //    {
+            //        if (i % 2 == 0)
+            //            fields.Add(field[i]);
+            //    }
+            //    //将查询到的结果返回界面
+            //    string sql = "select " + BaseUtil.AddField(fields.ToArray()) + " from " + tableName + " where " + Tag + "='" + TextBox.Text + "'";
+            //    if (condition != null)
+            //    {
+            //        sql += " and " + condition;
+            //    }
+            //    DataTable dt = (DataTable)dh.ExecuteSql(sql, "select");
+            //    FormCollection fmCollection = Application.OpenForms;
+            //    if (dt.Rows.Count > 0)
+            //    {
+            //        for (int i = 0; i < dt.Columns.Count; i++)
+            //        {
+            //            for (int j = 0; j < SetValueField.Length; j++)
+            //            {
+            //                //利用字段的Tag属性来和列名进行比对
+            //                object tag = fmCollection[FormName].Controls[SetValueField[j]].Tag;
+            //                if (SetValueField[j] == dt.Columns[i].ColumnName.ToLower() || (tag != null && tag == dt.Columns[i].ColumnName.ToLower()))
+            //                {
+            //                    fmCollection[FormName].Controls[SetValueField[j]].Text = dt.Rows[0][dt.Columns[i].ColumnName].ToString();
+            //                }
+            //            }
+            //        }
+            //        LeaveFindData = true;
+            //    }
+            //    else
+            //        LeaveFindData = false;
+            //}
         }
 
         private void SearchTextBox_Load(object sender, EventArgs e)

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);
+            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,16 +85,16 @@
             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);
+            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(148, 20);
+            this.ug_code.Size = new System.Drawing.Size(197, 25);
             this.ug_code.TabIndex = 236;
             this.ug_code.TableName = null;
-            this.ug_code.Tag = "ugp_groupcode";
+            this.ug_code.Tag = "ug_code";
             this.ug_code.TextBoxEnable = true;
             this.ug_code.UserControlTextChanged += new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextChange(this.ug_code_UserControlTextChanged);
             // 
@@ -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);
             // 
@@ -189,11 +194,11 @@
             this.Column2.HeaderText = "";
             this.Column2.Name = "Column2";
             // 
-            // 权限控制
+            // 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,7 +207,8 @@
             this.Controls.Add(this.SavePower);
             this.Controls.Add(this.GroupPowerDGV);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Name = "权限控制";
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Name = "Employee_Power";
             this.Tag = "Employee!Power";
             this.Text = "权限控制";
             this.Load += new System.EventHandler(this.权限控制_Load);

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

@@ -100,7 +100,7 @@
             this.panel2.Controls.Add(this.label2);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(1363, 41);
             this.panel2.TabIndex = 156;
@@ -253,7 +253,7 @@
             this.ob_aqlcode.BackColor = System.Drawing.Color.White;
             this.ob_aqlcode.ID = null;
             this.ob_aqlcode.Location = new System.Drawing.Point(629, 680);
-            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(4);
             this.ob_aqlcode.Name = "ob_aqlcode";
             this.ob_aqlcode.Power = null;
             this.ob_aqlcode.Size = new System.Drawing.Size(224, 25);
@@ -269,7 +269,7 @@
             this.ob_maxngacceptqty.BackColor = System.Drawing.Color.White;
             this.ob_maxngacceptqty.ID = null;
             this.ob_maxngacceptqty.Location = new System.Drawing.Point(287, 730);
-            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_maxngacceptqty.Name = "ob_maxngacceptqty";
             this.ob_maxngacceptqty.Power = null;
             this.ob_maxngacceptqty.Size = new System.Drawing.Size(224, 25);
@@ -286,7 +286,7 @@
             this.ob_status.Enabled = false;
             this.ob_status.ID = null;
             this.ob_status.Location = new System.Drawing.Point(1163, 122);
-            this.ob_status.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_status.Margin = new System.Windows.Forms.Padding(4);
             this.ob_status.Name = "ob_status";
             this.ob_status.Power = null;
             this.ob_status.Size = new System.Drawing.Size(180, 25);
@@ -300,7 +300,7 @@
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OperateResult.Location = new System.Drawing.Point(1073, 216);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(269, 396);
             this.OperateResult.TabIndex = 177;
@@ -314,8 +314,8 @@
             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(1160, 622);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Clean.Location = new System.Drawing.Point(1166, 622);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
@@ -333,7 +333,7 @@
             this.ob_remark.BackColor = System.Drawing.Color.White;
             this.ob_remark.ID = null;
             this.ob_remark.Location = new System.Drawing.Point(136, 682);
-            this.ob_remark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_remark.Margin = new System.Windows.Forms.Padding(4);
             this.ob_remark.Name = "ob_remark";
             this.ob_remark.Power = null;
             this.ob_remark.Size = new System.Drawing.Size(375, 25);
@@ -352,7 +352,7 @@
             this.GetBatch.Image = ((System.Drawing.Image)(resources.GetObject("GetBatch.Image")));
             this.GetBatch.IsShowBorder = true;
             this.GetBatch.Location = new System.Drawing.Point(676, 170);
-            this.GetBatch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.GetBatch.Margin = new System.Windows.Forms.Padding(4);
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
             this.GetBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.NormalImage")));
@@ -373,7 +373,7 @@
             this.SaveConfiguration.Image = ((System.Drawing.Image)(resources.GetObject("SaveConfiguration.Image")));
             this.SaveConfiguration.IsShowBorder = true;
             this.SaveConfiguration.Location = new System.Drawing.Point(399, 634);
-            this.SaveConfiguration.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.SaveConfiguration.Margin = new System.Windows.Forms.Padding(4);
             this.SaveConfiguration.MoveImage = ((System.Drawing.Image)(resources.GetObject("SaveConfiguration.MoveImage")));
             this.SaveConfiguration.Name = "SaveConfiguration";
             this.SaveConfiguration.NormalImage = ((System.Drawing.Image)(resources.GetObject("SaveConfiguration.NormalImage")));
@@ -394,7 +394,7 @@
             this.RefreshConfiguration.Image = ((System.Drawing.Image)(resources.GetObject("RefreshConfiguration.Image")));
             this.RefreshConfiguration.IsShowBorder = true;
             this.RefreshConfiguration.Location = new System.Drawing.Point(613, 634);
-            this.RefreshConfiguration.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.RefreshConfiguration.Margin = new System.Windows.Forms.Padding(4);
             this.RefreshConfiguration.MoveImage = ((System.Drawing.Image)(resources.GetObject("RefreshConfiguration.MoveImage")));
             this.RefreshConfiguration.Name = "RefreshConfiguration";
             this.RefreshConfiguration.NormalImage = ((System.Drawing.Image)(resources.GetObject("RefreshConfiguration.NormalImage")));
@@ -415,7 +415,7 @@
             this.Save.Image = ((System.Drawing.Image)(resources.GetObject("Save.Image")));
             this.Save.IsShowBorder = true;
             this.Save.Location = new System.Drawing.Point(551, 725);
-            this.Save.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Save.Margin = new System.Windows.Forms.Padding(4);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
             this.Save.NormalImage = ((System.Drawing.Image)(resources.GetObject("Save.NormalImage")));
@@ -438,7 +438,7 @@
             this.ci_kind,
             this.oi_sampleqty});
             this.CheckTypeDGV.Location = new System.Drawing.Point(57, 216);
-            this.CheckTypeDGV.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.CheckTypeDGV.Margin = new System.Windows.Forms.Padding(4);
             this.CheckTypeDGV.Name = "CheckTypeDGV";
             this.CheckTypeDGV.RowTemplate.Height = 23;
             this.CheckTypeDGV.Size = new System.Drawing.Size(993, 398);
@@ -495,7 +495,7 @@
             this.pr_kind.Enabled = false;
             this.pr_kind.ID = null;
             this.pr_kind.Location = new System.Drawing.Point(813, 122);
-            this.pr_kind.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pr_kind.Margin = new System.Windows.Forms.Padding(4);
             this.pr_kind.Name = "pr_kind";
             this.pr_kind.Power = null;
             this.pr_kind.Size = new System.Drawing.Size(180, 25);
@@ -512,7 +512,7 @@
             this.ob_prodcode.Enabled = false;
             this.ob_prodcode.ID = null;
             this.ob_prodcode.Location = new System.Drawing.Point(1163, 68);
-            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4);
             this.ob_prodcode.Name = "ob_prodcode";
             this.ob_prodcode.Power = null;
             this.ob_prodcode.Size = new System.Drawing.Size(180, 25);
@@ -529,7 +529,7 @@
             this.ob_source.Enabled = false;
             this.ob_source.ID = null;
             this.ob_source.Location = new System.Drawing.Point(465, 121);
-            this.ob_source.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_source.Margin = new System.Windows.Forms.Padding(4);
             this.ob_source.Name = "ob_source";
             this.ob_source.Power = null;
             this.ob_source.Size = new System.Drawing.Size(180, 25);
@@ -545,7 +545,7 @@
             this.ob_batchqty.BackColor = System.Drawing.Color.White;
             this.ob_batchqty.ID = null;
             this.ob_batchqty.Location = new System.Drawing.Point(135, 121);
-            this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Power = null;
             this.ob_batchqty.Size = new System.Drawing.Size(180, 25);
@@ -561,7 +561,7 @@
             this.obd_outboxcode.BackColor = System.Drawing.Color.White;
             this.obd_outboxcode.ID = null;
             this.obd_outboxcode.Location = new System.Drawing.Point(465, 61);
-            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
             this.obd_outboxcode.Size = new System.Drawing.Size(180, 25);
@@ -577,7 +577,7 @@
             this.ob_checkno.BackColor = System.Drawing.Color.White;
             this.ob_checkno.ID = null;
             this.ob_checkno.Location = new System.Drawing.Point(135, 59);
-            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = null;
             this.ob_checkno.Size = new System.Drawing.Size(180, 25);
@@ -594,7 +594,7 @@
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.ID = null;
             this.ms_sncode.Location = new System.Drawing.Point(813, 64);
-            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
             this.ms_sncode.Size = new System.Drawing.Size(180, 25);
@@ -605,7 +605,7 @@
             this.ms_sncode.Tag = "NoAuto";
             this.ms_sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_sncode_KeyDown);
             // 
-            // 抽样计划维护
+            // OQC_PlanMaintain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -643,8 +643,8 @@
             this.Controls.Add(this.ms_sncode);
             this.Controls.Add(this.ms_sncode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.Name = "抽样计划维护";
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "OQC_PlanMaintain";
             this.Tag = "OQC!PlanMaintain";
             this.Text = "抽样计划维护";
             this.Load += new System.EventHandler(this.抽样计划维护_Load);

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.resx

@@ -788,19 +788,4 @@
   <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/Login.cs

@@ -34,6 +34,7 @@ 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")));

UAS-MES/Program.cs

@@ -17,6 +17,7 @@ namespace UAS_MES
         {
             try
             {
+                Console.WriteLine("1231");
                 WindowsIdentity identity = WindowsIdentity.GetCurrent();
                 WindowsPrincipal principal = new WindowsPrincipal(identity);
                 //设置应用程序处理异常方式：ThreadException处理
@@ -92,7 +93,7 @@ namespace UAS_MES
             if (ex != null)
             {
                 sb.AppendLine(ex.Message);
-                //sb.AppendLine("【异常方法】：" + ex.TargetSite);
+                sb.AppendLine("【异常方法】：" + ex.TargetSite);
             }
             else { sb.AppendLine("【未处理异常】：" + backStr); }
             return sb.ToString();

UAS-MES/UAS-MES.csproj

@@ -40,7 +40,7 @@
     <MinimumRequiredVersion>1.0.0.59</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>181</ApplicationRevision>
+    <ApplicationRevision>182</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>

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