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

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.Designer.cs

@@ -195,7 +195,7 @@
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
             this.sncode.TabIndex = 204;
-            this.sncode.Tag = "ifwrite";
+            this.sncode.Tag = "ifread";
             this.sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sncode_KeyDown);
             // 
             // OperateResult

UAS-MES/FunctionCode/Make/Make_CollectNetCode.Designer.cs

@@ -177,7 +177,7 @@
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
             this.sncode.TabIndex = 189;
-            this.sncode.Tag = "ifwrite";
+            this.sncode.Tag = "ifread";
             this.sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sncode_KeyDown);
             // 
             // OperateResult

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.Designer.cs

@@ -286,7 +286,7 @@
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
             this.sncode.TabIndex = 169;
-            this.sncode.Tag = "ifwrite";
+            this.sncode.Tag = "ifread";
             this.sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sn_code_KeyDown);
             // 
             // OperateResult

UAS-MES/FunctionCode/Make/Make_CustomLabelPrint.Designer.cs

@@ -223,7 +223,7 @@
             this.inputText.Str1 = null;
             this.inputText.Str2 = null;
             this.inputText.TabIndex = 187;
-            this.inputText.Tag = "ifwrite";
+            this.inputText.Tag = "ifread";
             this.inputText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.inputText_KeyDown);
             // 
             // OperateResult

UAS-MES/FunctionCode/Make/Make_FeedingCollection.Designer.cs

@@ -393,7 +393,7 @@
             this.Confirm.Power = null;
             this.Confirm.Size = new System.Drawing.Size(80, 30);
             this.Confirm.TabIndex = 73;
-            this.Confirm.Tag = "IfWrite";
+            this.Confirm.Tag = "IfRead";
             this.Confirm.Text = "确认";
             this.Confirm.UseVisualStyleBackColor = true;
             this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
@@ -412,7 +412,7 @@
             this.code.Str1 = null;
             this.code.Str2 = null;
             this.code.TabIndex = 0;
-            this.code.Tag = "IfWrite";
+            this.code.Tag = "IfRead";
             this.code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.code_KeyDown);
             // 
             // sn_code

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.Designer.cs

@@ -261,7 +261,7 @@
             this.sncode.Str1 = null;
             this.sncode.Str2 = null;
             this.sncode.TabIndex = 169;
-            this.sncode.Tag = "ifwrite";
+            this.sncode.Tag = "ifRead";
             this.sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sn_code_KeyDown);
             // 
             // OperateResult

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

@@ -610,7 +610,7 @@
             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 = "IFREAD";
+            this.ForcePass.Power = "ifspecial";
             this.ForcePass.Size = new System.Drawing.Size(91, 38);
             this.ForcePass.TabIndex = 165;
             this.ForcePass.Text = "强制通过";
@@ -630,7 +630,7 @@
             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 = "IFREAD";
+            this.ForceRejection.Power = "ifspecial";
             this.ForceRejection.Size = new System.Drawing.Size(91, 38);
             this.ForceRejection.TabIndex = 164;
             this.ForceRejection.Text = "强制批退";
@@ -767,9 +767,9 @@
             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(true);
+            this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }