修改上料采集工单锁定功能

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

@@ -45,7 +45,6 @@
             this.softwareversion_label = new System.Windows.Forms.CheckBox();
             this.ecn_label = new System.Windows.Forms.CheckBox();
             this.ClearSn_code = new System.Windows.Forms.PictureBox();
-            this.CleanMa_code = new System.Windows.Forms.PictureBox();
             this.ma_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pr_detail = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.mcd_remainqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
@@ -62,7 +61,6 @@
             this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.CleanMa_code)).BeginInit();
             this.SuspendLayout();
             // 
             // panel2
@@ -90,7 +88,7 @@
             // 
             this.mcd_restqty_label.AutoSize = true;
             this.mcd_restqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_restqty_label.Location = new System.Drawing.Point(598, 109);
+            this.mcd_restqty_label.Location = new System.Drawing.Point(609, 109);
             this.mcd_restqty_label.Name = "mcd_restqty_label";
             this.mcd_restqty_label.Size = new System.Drawing.Size(74, 21);
             this.mcd_restqty_label.TabIndex = 59;
@@ -100,7 +98,7 @@
             // 
             this.mcd_inqty_label.AutoSize = true;
             this.mcd_inqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty_label.Location = new System.Drawing.Point(321, 109);
+            this.mcd_inqty_label.Location = new System.Drawing.Point(335, 109);
             this.mcd_inqty_label.Name = "mcd_inqty_label";
             this.mcd_inqty_label.Size = new System.Drawing.Size(74, 21);
             this.mcd_inqty_label.TabIndex = 56;
@@ -130,7 +128,7 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(598, 59);
+            this.pr_detail_label.Location = new System.Drawing.Point(609, 59);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(74, 21);
             this.pr_detail_label.TabIndex = 50;
@@ -140,7 +138,7 @@
             // 
             this.ma_prodcode_label.AutoSize = true;
             this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode_label.Location = new System.Drawing.Point(321, 59);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(335, 59);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
             this.ma_prodcode_label.Size = new System.Drawing.Size(74, 21);
             this.ma_prodcode_label.TabIndex = 51;
@@ -236,22 +234,11 @@
             this.ClearSn_code.TabStop = false;
             this.ClearSn_code.Click += new System.EventHandler(this.ClearSn_code_Click);
             // 
-            // CleanMa_code
-            // 
-            this.CleanMa_code.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.CleanMa_code.Image = global::UAS_MES.Properties.Resources.bindingNavigatorDeleteItem_Image;
-            this.CleanMa_code.Location = new System.Drawing.Point(292, 62);
-            this.CleanMa_code.Name = "CleanMa_code";
-            this.CleanMa_code.Size = new System.Drawing.Size(16, 16);
-            this.CleanMa_code.TabIndex = 139;
-            this.CleanMa_code.TabStop = false;
-            this.CleanMa_code.Click += new System.EventHandler(this.CleanMa_code_Click);
-            // 
             // ma_prodcode
             // 
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(416, 59);
+            this.ma_prodcode.Location = new System.Drawing.Point(425, 59);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Size = new System.Drawing.Size(0, 21);
             this.ma_prodcode.TabIndex = 99;
@@ -260,7 +247,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(698, 59);
+            this.pr_detail.Location = new System.Drawing.Point(699, 59);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 21);
             this.pr_detail.TabIndex = 98;
@@ -269,7 +256,7 @@
             // 
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(697, 109);
+            this.mcd_remainqty.Location = new System.Drawing.Point(698, 109);
             this.mcd_remainqty.Name = "mcd_remainqty";
             this.mcd_remainqty.Size = new System.Drawing.Size(0, 21);
             this.mcd_remainqty.TabIndex = 97;
@@ -279,7 +266,7 @@
             // 
             this.mcd_inqty.AutoSize = true;
             this.mcd_inqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty.Location = new System.Drawing.Point(416, 109);
+            this.mcd_inqty.Location = new System.Drawing.Point(425, 109);
             this.mcd_inqty.Name = "mcd_inqty";
             this.mcd_inqty.Size = new System.Drawing.Size(0, 21);
             this.mcd_inqty.TabIndex = 96;
@@ -288,7 +275,7 @@
             // 
             this.ma_qty.AutoSize = true;
             this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty.Location = new System.Drawing.Point(136, 109);
+            this.ma_qty.Location = new System.Drawing.Point(120, 109);
             this.ma_qty.Name = "ma_qty";
             this.ma_qty.Size = new System.Drawing.Size(0, 21);
             this.ma_qty.TabIndex = 95;
@@ -406,8 +393,9 @@
             // 
             this.LockMakeCode.AutoSize = true;
             this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LockMakeCode.Location = new System.Drawing.Point(136, 37);
-            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.LockMakeCode.LeaveEvent = false;
+            this.LockMakeCode.Location = new System.Drawing.Point(272, 62);
+            this.LockMakeCode.Margin = new System.Windows.Forms.Padding(2);
             this.LockMakeCode.Name = "LockMakeCode";
             this.LockMakeCode.Size = new System.Drawing.Size(51, 21);
             this.LockMakeCode.TabIndex = 140;
@@ -421,8 +409,8 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(136, 61);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.ma_code.Location = new System.Drawing.Point(120, 61);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(2);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.SelectField = null;
@@ -440,7 +428,6 @@
             this.ClientSize = new System.Drawing.Size(983, 568);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.LockMakeCode);
-            this.Controls.Add(this.CleanMa_code);
             this.Controls.Add(this.ClearSn_code);
             this.Controls.Add(this.ma_prodcode);
             this.Controls.Add(this.pr_detail);
@@ -477,7 +464,6 @@
             this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.CleanMa_code)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -513,7 +499,6 @@
         private CustomControl.ValueLabel.ValueLabel pr_detail;
         private CustomControl.ValueLabel.ValueLabel ma_prodcode;
         private System.Windows.Forms.PictureBox ClearSn_code;
-        private System.Windows.Forms.PictureBox CleanMa_code;
         private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
         private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
     }

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -502,11 +502,6 @@ namespace UAS_MES.Make
             sn_code.Clear();
         }
 
-        private void CleanMa_code_Click(object sender, EventArgs e)
-        {
-            ma_code.Text = "";
-        }
-
         private void ma_code_UserControlTextChanged(object sender, EventArgs e)
         {
             sql.Clear();