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

UAS-MES/DataOperate/DataHelper.cs

@@ -255,7 +255,7 @@ namespace UAS_MES.DataOperate
             string sql = "select ";
             sql += AddField(Fields);
             sql += " from " + TableName + " where " + Condition;
-
+            
             command = new OracleCommand(sql, connection);
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter(command);
@@ -479,11 +479,22 @@ namespace UAS_MES.DataOperate
         {
             string sql = "select count(1) from " + TableName + " where " + Condition;
             command = new OracleCommand(sql, connection);
-
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter(command);
             DataTable dt = new DataTable();
-            ad.Fill(dt);
+            try
+            {
+                ad.Fill(dt);
+            }
+            catch (Exception)
+            {
+                connection = new OracleConnection(DBConnectionString);
+                connection.Open();
+                command = new OracleCommand(sql, connection);
+                ad = new OracleDataAdapter();
+                ad.SelectCommand = command;
+                ad.Fill(dt);
+            }
             ad.Dispose();
             command.Dispose();
             return int.Parse(dt.Rows[0][0].ToString()) > 0;
@@ -526,7 +537,7 @@ namespace UAS_MES.DataOperate
                 for (int i = 0; i < addpar.Length; i++)
                     command.Parameters.Add(new OracleParameter(addpar[i].ToString(), OracleDbType.Varchar2, names[i], ParameterDirection.Input));
             }
-
+            
             switch (Type.ToUpper())
             {
                 case "SELECT":
@@ -911,7 +922,7 @@ namespace UAS_MES.DataOperate
         {
             string sql = "update " + TableName + " set " + update + " where " + condition;
             command = new OracleCommand(sql, connection);
-
+            
             Reconnect(command);
             try
             {

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

@@ -79,10 +79,9 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(680, 328);
-            this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(510, 262);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_batchqty_label.Size = new System.Drawing.Size(58, 21);
             this.ob_batchqty_label.TabIndex = 158;
             this.ob_batchqty_label.Text = "实批数";
             // 
@@ -90,10 +89,9 @@
             // 
             this.ob_result_label.AutoSize = true;
             this.ob_result_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_result_label.Location = new System.Drawing.Point(680, 287);
-            this.ob_result_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_result_label.Location = new System.Drawing.Point(510, 230);
             this.ob_result_label.Name = "ob_result_label";
-            this.ob_result_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_result_label.Size = new System.Drawing.Size(74, 21);
             this.ob_result_label.TabIndex = 166;
             this.ob_result_label.Text = "判定结果";
             // 
@@ -101,10 +99,9 @@
             // 
             this.ob_okqty_label.AutoSize = true;
             this.ob_okqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_okqty_label.Location = new System.Drawing.Point(680, 414);
-            this.ob_okqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_okqty_label.Location = new System.Drawing.Point(510, 331);
             this.ob_okqty_label.Name = "ob_okqty_label";
-            this.ob_okqty_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_okqty_label.Size = new System.Drawing.Size(58, 21);
             this.ob_okqty_label.TabIndex = 160;
             this.ob_okqty_label.Text = "合格数";
             // 
@@ -112,10 +109,9 @@
             // 
             this.ob_ngqty_label.AutoSize = true;
             this.ob_ngqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_ngqty_label.Location = new System.Drawing.Point(680, 456);
-            this.ob_ngqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_ngqty_label.Location = new System.Drawing.Point(510, 365);
             this.ob_ngqty_label.Name = "ob_ngqty_label";
-            this.ob_ngqty_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_ngqty_label.Size = new System.Drawing.Size(74, 21);
             this.ob_ngqty_label.TabIndex = 162;
             this.ob_ngqty_label.Text = "不合格数";
             // 
@@ -123,10 +119,9 @@
             // 
             this.oi_checkqty_label.AutoSize = true;
             this.oi_checkqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.oi_checkqty_label.Location = new System.Drawing.Point(680, 370);
-            this.oi_checkqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.oi_checkqty_label.Location = new System.Drawing.Point(510, 296);
             this.oi_checkqty_label.Name = "oi_checkqty_label";
-            this.oi_checkqty_label.Size = new System.Drawing.Size(72, 27);
+            this.oi_checkqty_label.Size = new System.Drawing.Size(58, 21);
             this.oi_checkqty_label.TabIndex = 164;
             this.oi_checkqty_label.Text = "抽检数";
             // 
@@ -136,10 +131,9 @@
             this.ReworkRequire.Checked = true;
             this.ReworkRequire.CheckState = System.Windows.Forms.CheckState.Checked;
             this.ReworkRequire.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ReworkRequire.Location = new System.Drawing.Point(163, 656);
-            this.ReworkRequire.Margin = new System.Windows.Forms.Padding(4);
+            this.ReworkRequire.Location = new System.Drawing.Point(122, 525);
             this.ReworkRequire.Name = "ReworkRequire";
-            this.ReworkRequire.Size = new System.Drawing.Size(154, 31);
+            this.ReworkRequire.Size = new System.Drawing.Size(125, 25);
             this.ReworkRequire.TabIndex = 168;
             this.ReworkRequire.Text = "发起返工需求";
             this.ReworkRequire.UseVisualStyleBackColor = true;
@@ -148,10 +142,9 @@
             // 
             this.ob_aqlcode_label.AutoSize = true;
             this.ob_aqlcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_aqlcode_label.Location = new System.Drawing.Point(680, 498);
-            this.ob_aqlcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_aqlcode_label.Location = new System.Drawing.Point(510, 398);
             this.ob_aqlcode_label.Name = "ob_aqlcode_label";
-            this.ob_aqlcode_label.Size = new System.Drawing.Size(52, 27);
+            this.ob_aqlcode_label.Size = new System.Drawing.Size(42, 21);
             this.ob_aqlcode_label.TabIndex = 169;
             this.ob_aqlcode_label.Text = "AQL";
             // 
@@ -159,10 +152,9 @@
             // 
             this.ob_prodcode_label.AutoSize = true;
             this.ob_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_prodcode_label.Location = new System.Drawing.Point(352, 181);
-            this.ob_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_prodcode_label.Location = new System.Drawing.Point(264, 145);
             this.ob_prodcode_label.Name = "ob_prodcode_label";
-            this.ob_prodcode_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_prodcode_label.Size = new System.Drawing.Size(74, 21);
             this.ob_prodcode_label.TabIndex = 218;
             this.ob_prodcode_label.Text = "产品编号";
             // 
@@ -170,10 +162,9 @@
             // 
             this.ob_makecode_label.AutoSize = true;
             this.ob_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_makecode_label.Location = new System.Drawing.Point(11, 181);
-            this.ob_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_makecode_label.Location = new System.Drawing.Point(8, 145);
             this.ob_makecode_label.Name = "ob_makecode_label";
-            this.ob_makecode_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_makecode_label.Size = new System.Drawing.Size(58, 21);
             this.ob_makecode_label.TabIndex = 216;
             this.ob_makecode_label.Text = "工单号";
             // 
@@ -181,10 +172,9 @@
             // 
             this.ob_checkno_label.AutoSize = true;
             this.ob_checkno_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno_label.Location = new System.Drawing.Point(11, 51);
-            this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_checkno_label.Location = new System.Drawing.Point(8, 41);
             this.ob_checkno_label.Name = "ob_checkno_label";
-            this.ob_checkno_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_checkno_label.Size = new System.Drawing.Size(58, 21);
             this.ob_checkno_label.TabIndex = 214;
             this.ob_checkno_label.Text = "抽检批";
             // 
@@ -192,10 +182,9 @@
             // 
             this.obd_outboxcode_label.AutoSize = true;
             this.obd_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.obd_outboxcode_label.Location = new System.Drawing.Point(11, 91);
-            this.obd_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.obd_outboxcode_label.Location = new System.Drawing.Point(8, 73);
             this.obd_outboxcode_label.Name = "obd_outboxcode_label";
-            this.obd_outboxcode_label.Size = new System.Drawing.Size(52, 27);
+            this.obd_outboxcode_label.Size = new System.Drawing.Size(42, 21);
             this.obd_outboxcode_label.TabIndex = 212;
             this.obd_outboxcode_label.Text = "箱号";
             // 
@@ -203,10 +192,9 @@
             // 
             this.ms_sncode_label.AutoSize = true;
             this.ms_sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_sncode_label.Location = new System.Drawing.Point(11, 134);
-            this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_sncode_label.Location = new System.Drawing.Point(8, 107);
             this.ms_sncode_label.Name = "ms_sncode_label";
-            this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
+            this.ms_sncode_label.Size = new System.Drawing.Size(58, 21);
             this.ms_sncode_label.TabIndex = 210;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -217,9 +205,8 @@
             this.panel2.Controls.Add(this.label1);
             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);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1300, 38);
+            this.panel2.Size = new System.Drawing.Size(975, 30);
             this.panel2.TabIndex = 220;
             this.panel2.Tag = "NoAuto";
             // 
@@ -228,10 +215,9 @@
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.label1.Location = new System.Drawing.Point(16, 5);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(12, 4);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(157, 27);
+            this.label1.Size = new System.Drawing.Size(127, 21);
             this.label1.TabIndex = 0;
             this.label1.Text = "OQC批结果判定";
             // 
@@ -239,10 +225,9 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(48, 568);
-            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label3.Location = new System.Drawing.Point(36, 454);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(571, 24);
+            this.label3.Size = new System.Drawing.Size(444, 20);
             this.label3.TabIndex = 222;
             this.label3.Text = "--说明:如何物料没有维护AQL标准，需手动填写最大不合格允许通过数";
             // 
@@ -250,19 +235,17 @@
             // 
             this.ob_maxngacceptqty_label.AutoSize = true;
             this.ob_maxngacceptqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_maxngacceptqty_label.Location = new System.Drawing.Point(48, 532);
-            this.ob_maxngacceptqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_maxngacceptqty_label.Location = new System.Drawing.Point(36, 426);
             this.ob_maxngacceptqty_label.Name = "ob_maxngacceptqty_label";
-            this.ob_maxngacceptqty_label.Size = new System.Drawing.Size(212, 27);
+            this.ob_maxngacceptqty_label.Size = new System.Drawing.Size(170, 21);
             this.ob_maxngacceptqty_label.TabIndex = 223;
             this.ob_maxngacceptqty_label.Text = "最大不合格允许通过数";
             // 
             // Remark
             // 
-            this.Remark.Location = new System.Drawing.Point(117, 239);
-            this.Remark.Margin = new System.Windows.Forms.Padding(4);
+            this.Remark.Location = new System.Drawing.Point(88, 191);
             this.Remark.Name = "Remark";
-            this.Remark.Size = new System.Drawing.Size(547, 280);
+            this.Remark.Size = new System.Drawing.Size(411, 225);
             this.Remark.TabIndex = 225;
             this.Remark.Text = "";
             // 
@@ -270,10 +253,9 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(11, 239);
-            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label5.Location = new System.Drawing.Point(8, 191);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(52, 27);
+            this.label5.Size = new System.Drawing.Size(42, 21);
             this.label5.TabIndex = 226;
             this.label5.Text = "备注";
             // 
@@ -281,10 +263,9 @@
             // 
             this.ob_status_label.AutoSize = true;
             this.ob_status_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_status_label.Location = new System.Drawing.Point(680, 246);
-            this.ob_status_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ob_status_label.Location = new System.Drawing.Point(510, 197);
             this.ob_status_label.Name = "ob_status_label";
-            this.ob_status_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_status_label.Size = new System.Drawing.Size(74, 21);
             this.ob_status_label.TabIndex = 232;
             this.ob_status_label.Text = "批次状态";
             // 
@@ -294,11 +275,10 @@
             this.ob_status.BackColor = System.Drawing.Color.White;
             this.ob_status.Enabled = false;
             this.ob_status.ID = null;
-            this.ob_status.Location = new System.Drawing.Point(800, 246);
-            this.ob_status.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_status.Location = new System.Drawing.Point(600, 197);
             this.ob_status.Name = "ob_status";
             this.ob_status.Power = null;
-            this.ob_status.Size = new System.Drawing.Size(195, 25);
+            this.ob_status.Size = new System.Drawing.Size(147, 21);
             this.ob_status.Str = null;
             this.ob_status.Str1 = null;
             this.ob_status.Str2 = null;
@@ -311,11 +291,10 @@
             this.ob_source.BackColor = System.Drawing.Color.White;
             this.ob_source.Enabled = false;
             this.ob_source.ID = null;
-            this.ob_source.Location = new System.Drawing.Point(1012, 94);
-            this.ob_source.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_source.Location = new System.Drawing.Point(759, 75);
             this.ob_source.Name = "ob_source";
             this.ob_source.Power = null;
-            this.ob_source.Size = new System.Drawing.Size(195, 25);
+            this.ob_source.Size = new System.Drawing.Size(147, 21);
             this.ob_source.Str = null;
             this.ob_source.Str1 = null;
             this.ob_source.Str2 = null;
@@ -329,11 +308,10 @@
             this.ob_id.BackColor = System.Drawing.Color.White;
             this.ob_id.Enabled = false;
             this.ob_id.ID = null;
-            this.ob_id.Location = new System.Drawing.Point(1012, 69);
-            this.ob_id.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_id.Location = new System.Drawing.Point(759, 55);
             this.ob_id.Name = "ob_id";
             this.ob_id.Power = null;
-            this.ob_id.Size = new System.Drawing.Size(195, 25);
+            this.ob_id.Size = new System.Drawing.Size(147, 21);
             this.ob_id.Str = null;
             this.ob_id.Str1 = null;
             this.ob_id.Str2 = null;
@@ -344,10 +322,9 @@
             // OperateResult
             // 
             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(1013, 214);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
+            this.OperateResult.Location = new System.Drawing.Point(760, 171);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(279, 398);
+            this.OperateResult.Size = new System.Drawing.Size(210, 319);
             this.OperateResult.TabIndex = 227;
             this.OperateResult.Text = "";
             // 
@@ -358,13 +335,12 @@
             this.GetBatch.DownImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.DownImage")));
             this.GetBatch.Image = ((System.Drawing.Image)(resources.GetObject("GetBatch.Image")));
             this.GetBatch.IsShowBorder = true;
-            this.GetBatch.Location = new System.Drawing.Point(681, 182);
-            this.GetBatch.Margin = new System.Windows.Forms.Padding(4);
+            this.GetBatch.Location = new System.Drawing.Point(511, 146);
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
             this.GetBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.NormalImage")));
             this.GetBatch.Power = "";
-            this.GetBatch.Size = new System.Drawing.Size(80, 30);
+            this.GetBatch.Size = new System.Drawing.Size(60, 24);
             this.GetBatch.TabIndex = 221;
             this.GetBatch.Text = "获取批";
             this.GetBatch.UseVisualStyleBackColor = true;
@@ -376,11 +352,10 @@
             this.ob_prodcode.BackColor = System.Drawing.Color.White;
             this.ob_prodcode.Enabled = false;
             this.ob_prodcode.ID = null;
-            this.ob_prodcode.Location = new System.Drawing.Point(473, 186);
-            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_prodcode.Location = new System.Drawing.Point(355, 149);
             this.ob_prodcode.Name = "ob_prodcode";
             this.ob_prodcode.Power = null;
-            this.ob_prodcode.Size = new System.Drawing.Size(191, 25);
+            this.ob_prodcode.Size = new System.Drawing.Size(144, 21);
             this.ob_prodcode.Str = null;
             this.ob_prodcode.Str1 = null;
             this.ob_prodcode.Str2 = null;
@@ -393,11 +368,10 @@
             this.ob_makecode.BackColor = System.Drawing.Color.White;
             this.ob_makecode.Enabled = false;
             this.ob_makecode.ID = null;
-            this.ob_makecode.Location = new System.Drawing.Point(117, 183);
-            this.ob_makecode.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_makecode.Location = new System.Drawing.Point(88, 146);
             this.ob_makecode.Name = "ob_makecode";
             this.ob_makecode.Power = null;
-            this.ob_makecode.Size = new System.Drawing.Size(212, 25);
+            this.ob_makecode.Size = new System.Drawing.Size(160, 21);
             this.ob_makecode.Str = null;
             this.ob_makecode.Str1 = null;
             this.ob_makecode.Str2 = null;
@@ -409,11 +383,10 @@
             this.ob_checkno.AllPower = "";
             this.ob_checkno.BackColor = System.Drawing.Color.White;
             this.ob_checkno.ID = null;
-            this.ob_checkno.Location = new System.Drawing.Point(117, 54);
-            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_checkno.Location = new System.Drawing.Point(88, 43);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = "";
-            this.ob_checkno.Size = new System.Drawing.Size(547, 25);
+            this.ob_checkno.Size = new System.Drawing.Size(411, 21);
             this.ob_checkno.Str = null;
             this.ob_checkno.Str1 = null;
             this.ob_checkno.Str2 = null;
@@ -426,11 +399,10 @@
             this.obd_outboxcode.AllPower = null;
             this.obd_outboxcode.BackColor = System.Drawing.Color.White;
             this.obd_outboxcode.ID = null;
-            this.obd_outboxcode.Location = new System.Drawing.Point(117, 94);
-            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4);
+            this.obd_outboxcode.Location = new System.Drawing.Point(88, 75);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
-            this.obd_outboxcode.Size = new System.Drawing.Size(547, 25);
+            this.obd_outboxcode.Size = new System.Drawing.Size(411, 21);
             this.obd_outboxcode.Str = null;
             this.obd_outboxcode.Str1 = null;
             this.obd_outboxcode.Str2 = null;
@@ -443,11 +415,10 @@
             this.ms_sncode.AllPower = "";
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(117, 136);
-            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
+            this.ms_sncode.Location = new System.Drawing.Point(88, 109);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = "";
-            this.ms_sncode.Size = new System.Drawing.Size(547, 25);
+            this.ms_sncode.Size = new System.Drawing.Size(411, 21);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -461,11 +432,10 @@
             this.ob_nowcheckqty.BackColor = System.Drawing.Color.White;
             this.ob_nowcheckqty.Enabled = false;
             this.ob_nowcheckqty.ID = null;
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(800, 328);
-            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(600, 262);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Power = null;
-            this.ob_nowcheckqty.Size = new System.Drawing.Size(195, 25);
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(147, 21);
             this.ob_nowcheckqty.Str = null;
             this.ob_nowcheckqty.Str1 = null;
             this.ob_nowcheckqty.Str2 = null;
@@ -478,11 +448,10 @@
             this.ob_okqty.BackColor = System.Drawing.Color.White;
             this.ob_okqty.Enabled = false;
             this.ob_okqty.ID = null;
-            this.ob_okqty.Location = new System.Drawing.Point(800, 414);
-            this.ob_okqty.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_okqty.Location = new System.Drawing.Point(600, 331);
             this.ob_okqty.Name = "ob_okqty";
             this.ob_okqty.Power = null;
-            this.ob_okqty.Size = new System.Drawing.Size(195, 25);
+            this.ob_okqty.Size = new System.Drawing.Size(147, 21);
             this.ob_okqty.Str = null;
             this.ob_okqty.Str1 = null;
             this.ob_okqty.Str2 = null;
@@ -495,11 +464,10 @@
             this.oi_checkqty.BackColor = System.Drawing.Color.White;
             this.oi_checkqty.Enabled = false;
             this.oi_checkqty.ID = null;
-            this.oi_checkqty.Location = new System.Drawing.Point(800, 370);
-            this.oi_checkqty.Margin = new System.Windows.Forms.Padding(4);
+            this.oi_checkqty.Location = new System.Drawing.Point(600, 296);
             this.oi_checkqty.Name = "oi_checkqty";
             this.oi_checkqty.Power = null;
-            this.oi_checkqty.Size = new System.Drawing.Size(195, 25);
+            this.oi_checkqty.Size = new System.Drawing.Size(147, 21);
             this.oi_checkqty.Str = null;
             this.oi_checkqty.Str1 = null;
             this.oi_checkqty.Str2 = null;
@@ -512,11 +480,10 @@
             this.ob_ngqty.BackColor = System.Drawing.Color.White;
             this.ob_ngqty.Enabled = false;
             this.ob_ngqty.ID = null;
-            this.ob_ngqty.Location = new System.Drawing.Point(800, 456);
-            this.ob_ngqty.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_ngqty.Location = new System.Drawing.Point(600, 365);
             this.ob_ngqty.Name = "ob_ngqty";
             this.ob_ngqty.Power = null;
-            this.ob_ngqty.Size = new System.Drawing.Size(195, 25);
+            this.ob_ngqty.Size = new System.Drawing.Size(147, 21);
             this.ob_ngqty.Str = null;
             this.ob_ngqty.Str1 = null;
             this.ob_ngqty.Str2 = null;
@@ -529,11 +496,10 @@
             this.ob_result.BackColor = System.Drawing.Color.White;
             this.ob_result.Enabled = false;
             this.ob_result.ID = null;
-            this.ob_result.Location = new System.Drawing.Point(800, 287);
-            this.ob_result.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_result.Location = new System.Drawing.Point(600, 230);
             this.ob_result.Name = "ob_result";
             this.ob_result.Power = null;
-            this.ob_result.Size = new System.Drawing.Size(195, 25);
+            this.ob_result.Size = new System.Drawing.Size(147, 21);
             this.ob_result.Str = null;
             this.ob_result.Str1 = null;
             this.ob_result.Str2 = null;
@@ -546,11 +512,10 @@
             this.ob_aqlcode.BackColor = System.Drawing.Color.White;
             this.ob_aqlcode.Enabled = false;
             this.ob_aqlcode.ID = null;
-            this.ob_aqlcode.Location = new System.Drawing.Point(800, 498);
-            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_aqlcode.Location = new System.Drawing.Point(600, 398);
             this.ob_aqlcode.Name = "ob_aqlcode";
             this.ob_aqlcode.Power = null;
-            this.ob_aqlcode.Size = new System.Drawing.Size(195, 25);
+            this.ob_aqlcode.Size = new System.Drawing.Size(147, 21);
             this.ob_aqlcode.Str = null;
             this.ob_aqlcode.Str1 = null;
             this.ob_aqlcode.Str2 = null;
@@ -565,13 +530,12 @@
             this.WithdrawPass.Enabled = false;
             this.WithdrawPass.Image = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.Image")));
             this.WithdrawPass.IsShowBorder = true;
-            this.WithdrawPass.Location = new System.Drawing.Point(580, 606);
-            this.WithdrawPass.Margin = new System.Windows.Forms.Padding(4);
+            this.WithdrawPass.Location = new System.Drawing.Point(435, 485);
             this.WithdrawPass.MoveImage = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.MoveImage")));
             this.WithdrawPass.Name = "WithdrawPass";
             this.WithdrawPass.NormalImage = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.NormalImage")));
             this.WithdrawPass.Power = "";
-            this.WithdrawPass.Size = new System.Drawing.Size(91, 38);
+            this.WithdrawPass.Size = new System.Drawing.Size(68, 30);
             this.WithdrawPass.TabIndex = 167;
             this.WithdrawPass.Text = "撤销通过";
             this.WithdrawPass.UseVisualStyleBackColor = true;
@@ -585,15 +549,14 @@
             this.BatchRejection.Enabled = false;
             this.BatchRejection.Image = ((System.Drawing.Image)(resources.GetObject("BatchRejection.Image")));
             this.BatchRejection.IsShowBorder = true;
-            this.BatchRejection.Location = new System.Drawing.Point(41, 658);
-            this.BatchRejection.Margin = new System.Windows.Forms.Padding(4);
+            this.BatchRejection.Location = new System.Drawing.Point(31, 526);
             this.BatchRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("BatchRejection.MoveImage")));
             this.BatchRejection.Name = "BatchRejection";
             this.BatchRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("BatchRejection.NormalImage")));
             this.BatchRejection.Power = "";
-            this.BatchRejection.Size = new System.Drawing.Size(91, 38);
+            this.BatchRejection.Size = new System.Drawing.Size(68, 30);
             this.BatchRejection.TabIndex = 166;
-            this.BatchRejection.Text = "批次退";
+            this.BatchRejection.Text = "批判退";
             this.BatchRejection.UseVisualStyleBackColor = true;
             this.BatchRejection.Click += new System.EventHandler(this.BatchRejection_Click);
             // 
@@ -605,13 +568,12 @@
             this.ForcePass.Enabled = false;
             this.ForcePass.Image = ((System.Drawing.Image)(resources.GetObject("ForcePass.Image")));
             this.ForcePass.IsShowBorder = true;
-            this.ForcePass.Location = new System.Drawing.Point(393, 606);
-            this.ForcePass.Margin = new System.Windows.Forms.Padding(4);
+            this.ForcePass.Location = new System.Drawing.Point(295, 485);
             this.ForcePass.MoveImage = ((System.Drawing.Image)(resources.GetObject("ForcePass.MoveImage")));
             this.ForcePass.Name = "ForcePass";
             this.ForcePass.NormalImage = ((System.Drawing.Image)(resources.GetObject("ForcePass.NormalImage")));
             this.ForcePass.Power = "";
-            this.ForcePass.Size = new System.Drawing.Size(91, 38);
+            this.ForcePass.Size = new System.Drawing.Size(68, 30);
             this.ForcePass.TabIndex = 165;
             this.ForcePass.Text = "强制通过";
             this.ForcePass.UseVisualStyleBackColor = true;
@@ -625,13 +587,12 @@
             this.ForceRejection.Enabled = false;
             this.ForceRejection.Image = ((System.Drawing.Image)(resources.GetObject("ForceRejection.Image")));
             this.ForceRejection.IsShowBorder = true;
-            this.ForceRejection.Location = new System.Drawing.Point(393, 660);
-            this.ForceRejection.Margin = new System.Windows.Forms.Padding(4);
+            this.ForceRejection.Location = new System.Drawing.Point(295, 528);
             this.ForceRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("ForceRejection.MoveImage")));
             this.ForceRejection.Name = "ForceRejection";
             this.ForceRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("ForceRejection.NormalImage")));
             this.ForceRejection.Power = "";
-            this.ForceRejection.Size = new System.Drawing.Size(91, 38);
+            this.ForceRejection.Size = new System.Drawing.Size(68, 30);
             this.ForceRejection.TabIndex = 164;
             this.ForceRejection.Text = "强制批退";
             this.ForceRejection.UseVisualStyleBackColor = true;
@@ -645,13 +606,12 @@
             this.WithdrawRejection.Enabled = false;
             this.WithdrawRejection.Image = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.Image")));
             this.WithdrawRejection.IsShowBorder = true;
-            this.WithdrawRejection.Location = new System.Drawing.Point(580, 660);
-            this.WithdrawRejection.Margin = new System.Windows.Forms.Padding(4);
+            this.WithdrawRejection.Location = new System.Drawing.Point(435, 528);
             this.WithdrawRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.MoveImage")));
             this.WithdrawRejection.Name = "WithdrawRejection";
             this.WithdrawRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.NormalImage")));
             this.WithdrawRejection.Power = "";
-            this.WithdrawRejection.Size = new System.Drawing.Size(91, 38);
+            this.WithdrawRejection.Size = new System.Drawing.Size(68, 30);
             this.WithdrawRejection.TabIndex = 163;
             this.WithdrawRejection.Text = "撤销判退";
             this.WithdrawRejection.UseVisualStyleBackColor = true;
@@ -665,13 +625,12 @@
             this.BatchPass.Enabled = false;
             this.BatchPass.Image = ((System.Drawing.Image)(resources.GetObject("BatchPass.Image")));
             this.BatchPass.IsShowBorder = true;
-            this.BatchPass.Location = new System.Drawing.Point(41, 605);
-            this.BatchPass.Margin = new System.Windows.Forms.Padding(4);
+            this.BatchPass.Location = new System.Drawing.Point(31, 484);
             this.BatchPass.MoveImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.MoveImage")));
             this.BatchPass.Name = "BatchPass";
             this.BatchPass.NormalImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.NormalImage")));
             this.BatchPass.Power = "";
-            this.BatchPass.Size = new System.Drawing.Size(91, 38);
+            this.BatchPass.Size = new System.Drawing.Size(68, 30);
             this.BatchPass.TabIndex = 162;
             this.BatchPass.Text = "批判过";
             this.BatchPass.UseVisualStyleBackColor = true;
@@ -684,13 +643,12 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1113, 642);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4);
+            this.Clean.Location = new System.Drawing.Point(835, 514);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(85, 36);
+            this.Clean.Size = new System.Drawing.Size(64, 29);
             this.Clean.TabIndex = 159;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -701,11 +659,10 @@
             this.ob_maxngacceptqty.AllPower = "";
             this.ob_maxngacceptqty.BackColor = System.Drawing.Color.White;
             this.ob_maxngacceptqty.ID = null;
-            this.ob_maxngacceptqty.Location = new System.Drawing.Point(268, 534);
-            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(4);
+            this.ob_maxngacceptqty.Location = new System.Drawing.Point(201, 427);
             this.ob_maxngacceptqty.Name = "ob_maxngacceptqty";
             this.ob_maxngacceptqty.Power = "";
-            this.ob_maxngacceptqty.Size = new System.Drawing.Size(257, 25);
+            this.ob_maxngacceptqty.Size = new System.Drawing.Size(194, 21);
             this.ob_maxngacceptqty.Str = null;
             this.ob_maxngacceptqty.Str1 = null;
             this.ob_maxngacceptqty.Str2 = null;
@@ -714,9 +671,9 @@
             // 
             // OQC_BatchResultJudge
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1300, 706);
+            this.ClientSize = new System.Drawing.Size(975, 565);
             this.Controls.Add(this.ob_maxngacceptqty);
             this.Controls.Add(this.ob_status_label);
             this.Controls.Add(this.ob_status);
@@ -760,16 +717,15 @@
             this.Controls.Add(this.ob_ngqty_label);
             this.Controls.Add(this.oi_checkqty_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "OQC_BatchResultJudge";
             this.Tag = "OQC!BatchResultJudge";
             this.Text = "抽检批维护";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OQC_BatchResultJudge_FormClosing);
             this.Load += new System.EventHandler(this.抽检批维护_Load);
             this.SizeChanged += new System.EventHandler(this.抽检批维护_SizeChanged);
-            this.panel2.ResumeLayout(false);
+            this.panel2.ResumeLayout(true);
             this.panel2.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-MES/Main.Designer.cs

@@ -1,4 +1,4 @@
- namespace UAS_MES
+namespace UAS_MES
 {
     partial class Main
     {
@@ -21,7 +21,7 @@
         }
 
         #region Windows 窗体设计器生成的代码
-         
+
         /// <summary>
         /// 设计器支持所需的方法 - 不要修改
         /// 使用代码编辑器修改此方法的内容。
@@ -32,16 +32,16 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main));
             this.ProductName = new System.Windows.Forms.Label();
             this.MainTabControl = new System.Windows.Forms.TabControl();
-            this.name_label = new System.Windows.Forms.Label();
+            this.inf_name_label = new System.Windows.Forms.Label();
             this.BasicInf = new System.Windows.Forms.Panel();
-            this.inf_currentstep = new System.Windows.Forms.Label();
-            this.step_label = new System.Windows.Forms.Label();
-            this.inf_name = new System.Windows.Forms.Label();
+            this.Inf_currentstep = new System.Windows.Forms.Label();
+            this.Inf_currentstep_label = new System.Windows.Forms.Label();
+            this.Inf_name = new System.Windows.Forms.Label();
             this.Inf_linecode = new System.Windows.Forms.Label();
-            this.inf_source = new System.Windows.Forms.Label();
-            this.inf_db = new System.Windows.Forms.Label();
+            this.Inf_source = new System.Windows.Forms.Label();
+            this.Inf_db = new System.Windows.Forms.Label();
             this.Inf_linecode_label = new System.Windows.Forms.Label();
-            this.db_label = new System.Windows.Forms.Label();
+            this.Inf_db_label = new System.Windows.Forms.Label();
             this.Inf_source_label = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
             this.Menu = new UAS_MES.CustomControl.AccordionMenu.AccordionMenu();
@@ -79,65 +79,66 @@
             this.MainTabControl.TabIndex = 7;
             this.MainTabControl.ControlRemoved += new System.Windows.Forms.ControlEventHandler(this.MainTabControl_ControlRemoved);
             // 
-            // name_label
+            // inf_name_label
             // 
-            this.name_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.name_label.AutoSize = true;
-            this.name_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.name_label.Location = new System.Drawing.Point(6, 8);
-            this.name_label.Name = "name_label";
-            this.name_label.Size = new System.Drawing.Size(35, 17);
-            this.name_label.TabIndex = 4;
-            this.name_label.Text = "姓名:";
+            this.inf_name_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.inf_name_label.AutoSize = true;
+            this.inf_name_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.inf_name_label.Location = new System.Drawing.Point(6, 8);
+            this.inf_name_label.Name = "inf_name_label";
+            this.inf_name_label.Size = new System.Drawing.Size(35, 17);
+            this.inf_name_label.TabIndex = 4;
+            this.inf_name_label.Text = "姓名:";
             // 
             // BasicInf
             // 
-            this.BasicInf.Controls.Add(this.inf_currentstep);
-            this.BasicInf.Controls.Add(this.step_label);
-            this.BasicInf.Controls.Add(this.inf_name);
+            this.BasicInf.Controls.Add(this.Inf_currentstep);
+            this.BasicInf.Controls.Add(this.Inf_currentstep_label);
+            this.BasicInf.Controls.Add(this.Inf_name);
             this.BasicInf.Controls.Add(this.Inf_linecode);
-            this.BasicInf.Controls.Add(this.inf_source);
-            this.BasicInf.Controls.Add(this.inf_db);
+            this.BasicInf.Controls.Add(this.Inf_source);
+            this.BasicInf.Controls.Add(this.Inf_db);
             this.BasicInf.Controls.Add(this.Inf_linecode_label);
-            this.BasicInf.Controls.Add(this.db_label);
+            this.BasicInf.Controls.Add(this.Inf_db_label);
             this.BasicInf.Controls.Add(this.Inf_source_label);
-            this.BasicInf.Controls.Add(this.name_label);
+            this.BasicInf.Controls.Add(this.inf_name_label);
             this.BasicInf.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.BasicInf.Location = new System.Drawing.Point(0, 593);
             this.BasicInf.Name = "BasicInf";
             this.BasicInf.Size = new System.Drawing.Size(978, 31);
             this.BasicInf.TabIndex = 6;
-            // 
-            // inf_currentstep
-            // 
-            this.inf_currentstep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.inf_currentstep.AutoSize = true;
-            this.inf_currentstep.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_currentstep.Location = new System.Drawing.Point(228, 8);
-            this.inf_currentstep.Name = "inf_currentstep";
-            this.inf_currentstep.Size = new System.Drawing.Size(0, 17);
-            this.inf_currentstep.TabIndex = 15;
-            // 
-            // step_label
-            // 
-            this.step_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.step_label.AutoSize = true;
-            this.step_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.step_label.Location = new System.Drawing.Point(147, 8);
-            this.step_label.Name = "step_label";
-            this.step_label.Size = new System.Drawing.Size(59, 17);
-            this.step_label.TabIndex = 14;
-            this.step_label.Text = "岗位工序:";
-            // 
-            // inf_name
-            // 
-            this.inf_name.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.inf_name.AutoSize = true;
-            this.inf_name.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_name.Location = new System.Drawing.Point(64, 8);
-            this.inf_name.Name = "inf_name";
-            this.inf_name.Size = new System.Drawing.Size(0, 17);
-            this.inf_name.TabIndex = 13;
+            this.BasicInf.SizeChanged += new System.EventHandler(this.BasicInf_SizeChanged);
+            // 
+            // Inf_currentstep
+            // 
+            this.Inf_currentstep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.Inf_currentstep.AutoSize = true;
+            this.Inf_currentstep.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Inf_currentstep.Location = new System.Drawing.Point(228, 8);
+            this.Inf_currentstep.Name = "Inf_currentstep";
+            this.Inf_currentstep.Size = new System.Drawing.Size(0, 17);
+            this.Inf_currentstep.TabIndex = 15;
+            // 
+            // Inf_currentstep_label
+            // 
+            this.Inf_currentstep_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.Inf_currentstep_label.AutoSize = true;
+            this.Inf_currentstep_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Inf_currentstep_label.Location = new System.Drawing.Point(147, 8);
+            this.Inf_currentstep_label.Name = "Inf_currentstep_label";
+            this.Inf_currentstep_label.Size = new System.Drawing.Size(59, 17);
+            this.Inf_currentstep_label.TabIndex = 14;
+            this.Inf_currentstep_label.Text = "岗位工序:";
+            // 
+            // Inf_name
+            // 
+            this.Inf_name.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.Inf_name.AutoSize = true;
+            this.Inf_name.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Inf_name.Location = new System.Drawing.Point(64, 8);
+            this.Inf_name.Name = "Inf_name";
+            this.Inf_name.Size = new System.Drawing.Size(0, 17);
+            this.Inf_name.TabIndex = 13;
             // 
             // Inf_linecode
             // 
@@ -149,25 +150,25 @@
             this.Inf_linecode.Size = new System.Drawing.Size(0, 17);
             this.Inf_linecode.TabIndex = 11;
             // 
-            // inf_source
+            // Inf_source
             // 
-            this.inf_source.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.inf_source.AutoSize = true;
-            this.inf_source.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_source.Location = new System.Drawing.Point(565, 8);
-            this.inf_source.Name = "inf_source";
-            this.inf_source.Size = new System.Drawing.Size(0, 17);
-            this.inf_source.TabIndex = 10;
+            this.Inf_source.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.Inf_source.AutoSize = true;
+            this.Inf_source.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Inf_source.Location = new System.Drawing.Point(565, 8);
+            this.Inf_source.Name = "Inf_source";
+            this.Inf_source.Size = new System.Drawing.Size(0, 17);
+            this.Inf_source.TabIndex = 10;
             // 
-            // inf_db
+            // Inf_db
             // 
-            this.inf_db.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.inf_db.AutoSize = true;
-            this.inf_db.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_db.Location = new System.Drawing.Point(772, 8);
-            this.inf_db.Name = "inf_db";
-            this.inf_db.Size = new System.Drawing.Size(0, 17);
-            this.inf_db.TabIndex = 9;
+            this.Inf_db.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.Inf_db.AutoSize = true;
+            this.Inf_db.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Inf_db.Location = new System.Drawing.Point(772, 8);
+            this.Inf_db.Name = "Inf_db";
+            this.Inf_db.Size = new System.Drawing.Size(0, 17);
+            this.Inf_db.TabIndex = 9;
             // 
             // Inf_linecode_label
             // 
@@ -180,16 +181,16 @@
             this.Inf_linecode_label.TabIndex = 8;
             this.Inf_linecode_label.Text = "线别:";
             // 
-            // db_label
+            // Inf_db_label
             // 
-            this.db_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.db_label.AutoSize = true;
-            this.db_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.db_label.Location = new System.Drawing.Point(701, 8);
-            this.db_label.Name = "db_label";
-            this.db_label.Size = new System.Drawing.Size(47, 17);
-            this.db_label.TabIndex = 7;
-            this.db_label.Text = "数据库:";
+            this.Inf_db_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.Inf_db_label.AutoSize = true;
+            this.Inf_db_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Inf_db_label.Location = new System.Drawing.Point(701, 8);
+            this.Inf_db_label.Name = "Inf_db_label";
+            this.Inf_db_label.Size = new System.Drawing.Size(47, 17);
+            this.Inf_db_label.TabIndex = 7;
+            this.Inf_db_label.Text = "数据库:";
             // 
             // Inf_source_label
             // 
@@ -217,7 +218,7 @@
             // 
             this.Menu.Dock = System.Windows.Forms.DockStyle.Fill;
             this.Menu.Location = new System.Drawing.Point(0, 0);
-            this.Menu.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Menu.Margin = new System.Windows.Forms.Padding(4);
             this.Menu.Name = "Menu";
             this.Menu.Size = new System.Drawing.Size(137, 560);
             this.Menu.TabIndex = 3;
@@ -242,7 +243,7 @@
             this.headBar1.BackColor = System.Drawing.SystemColors.ControlDarkDark;
             this.headBar1.Dock = System.Windows.Forms.DockStyle.Top;
             this.headBar1.Location = new System.Drawing.Point(0, 0);
-            this.headBar1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.headBar1.Margin = new System.Windows.Forms.Padding(4);
             this.headBar1.Name = "headBar1";
             this.headBar1.Size = new System.Drawing.Size(978, 32);
             this.headBar1.TabIndex = 0;
@@ -280,18 +281,18 @@
         private System.Windows.Forms.Label ProductName;
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.TabControl MainTabControl;
-        private System.Windows.Forms.Label name_label;
+        private System.Windows.Forms.Label inf_name_label;
         private System.Windows.Forms.Panel BasicInf;
-        private System.Windows.Forms.Label db_label;
-        private System.Windows.Forms.Label inf_name;
-        private System.Windows.Forms.Label inf_db;
+        private System.Windows.Forms.Label Inf_db_label;
+        private System.Windows.Forms.Label Inf_name;
+        private System.Windows.Forms.Label Inf_db;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.NotifyIcon notifyIcon1;
         private new CustomControl.AccordionMenu.AccordionMenu Menu;
-        private System.Windows.Forms.Label inf_currentstep;
-        private System.Windows.Forms.Label step_label;
+        private System.Windows.Forms.Label Inf_currentstep;
+        private System.Windows.Forms.Label Inf_currentstep_label;
         private System.Windows.Forms.Label Inf_linecode;
-        private System.Windows.Forms.Label inf_source;
+        private System.Windows.Forms.Label Inf_source;
         private System.Windows.Forms.Label Inf_linecode_label;
         private System.Windows.Forms.Label Inf_source_label;
     }

UAS-MES/Main.cs

@@ -94,12 +94,12 @@ namespace UAS_MES
             this.MainTabControl.DrawItem += new DrawItemEventHandler(this.MainTabControl_DrawItem);
             this.MainTabControl.MouseDown += new MouseEventHandler(this.MainTabControl_MouseDown);
             //设置底部栏目的基础信息
-            inf_name.Text = User.UserName;
+            Inf_name.Text = User.UserName;
             //inf_position.Text = User.UserPosition;
             Inf_linecode.Text = User.UserLineCode;
-            inf_source.Text = User.UserSourceCode;
-            inf_db.Text = SystemInf.CurrentDB;
-            inf_currentstep.Text = User.CurrentStepName;
+            Inf_source.Text = User.UserSourceCode;
+            Inf_db.Text = SystemInf.CurrentDB;
+            Inf_currentstep.Text = User.CurrentStepName;
             //设置获取当前屏幕大小自动全屏但是保留任务栏
             Rectangle ScreenArea = Screen.GetWorkingArea(this);
             Top = 0;
@@ -352,5 +352,18 @@ namespace UAS_MES
             }
             BaseUtil.FormStepInOrOut(this, false);
         }
+
+        private void BasicInf_SizeChanged(object sender, EventArgs e)
+        {
+            Inf_name.Location = new Point(inf_name_label.Location.X + inf_name_label.Width + 5, inf_name_label.Location.Y);
+            Inf_currentstep_label.Location = new Point(Inf_name.Location.X + Inf_name.Width + 45, Inf_name.Location.Y);
+            Inf_currentstep.Location = new Point(Inf_currentstep_label.Location.X + Inf_currentstep_label.Width + 5, Inf_currentstep_label.Location.Y);
+            Inf_linecode_label.Location = new Point(Inf_currentstep.Location.X + Inf_currentstep.Width + 45, Inf_currentstep.Location.Y);
+            Inf_linecode.Location = new Point(Inf_linecode_label.Location.X + Inf_linecode_label.Width + 5, Inf_linecode_label.Location.Y);
+            Inf_source_label.Location = new Point(Inf_linecode.Location.X + Inf_linecode.Width + 45, Inf_linecode.Location.Y);
+            Inf_source.Location = new Point(Inf_source_label.Location.X + Inf_source_label.Width + 5, Inf_source_label.Location.Y);
+            Inf_db_label.Location = new Point(Inf_source.Location.X + Inf_source.Width + 45, Inf_source.Location.Y);
+            Inf_db.Location = new Point(Inf_db_label.Location.X + Inf_db_label.Width + 5, Inf_db_label.Location.Y);
+        }
     }
 }