Merge repos.ubtob.net:usoft/mes-client

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.Designer.cs

@@ -39,6 +39,9 @@
             this.DotVal = new System.Windows.Forms.TextBox();
             this.Confirm = new System.Windows.Forms.Button();
             this.TopBox = new System.Windows.Forms.Panel();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
+            this.EmployeeVal = new System.Windows.Forms.TextBox();
+            this.EmployeeLab = new System.Windows.Forms.Label();
             this.ma_qty = new System.Windows.Forms.TextBox();
             this.TargetQtyLab = new System.Windows.Forms.Label();
             this.pr_spec = new System.Windows.Forms.TextBox();
@@ -46,7 +49,6 @@
             this.BurnLotnoVal = new System.Windows.Forms.TextBox();
             this.BurnLotnoLab = new System.Windows.Forms.Label();
             this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
-            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
             this.DataBox = new System.Windows.Forms.DataGridView();
             this.work_order = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.burn_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -68,8 +70,6 @@
             this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.EmployeeVal = new System.Windows.Forms.TextBox();
-            this.EmployeeLab = new System.Windows.Forms.Label();
             this.TopBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DataBox)).BeginInit();
             this.tableLayoutPanel1.SuspendLayout();
@@ -211,6 +211,43 @@
             this.TopBox.Size = new System.Drawing.Size(1280, 201);
             this.TopBox.TabIndex = 153;
             // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = null;
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = null;
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(91, 30);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = null;
+            this.ma_code.ReturnData = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(205, 32);
+            this.ma_code.TabIndex = 143;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
+            // 
+            // EmployeeVal
+            // 
+            this.EmployeeVal.Location = new System.Drawing.Point(463, 75);
+            this.EmployeeVal.Name = "EmployeeVal";
+            this.EmployeeVal.Size = new System.Drawing.Size(113, 31);
+            this.EmployeeVal.TabIndex = 180;
+            // 
+            // EmployeeLab
+            // 
+            this.EmployeeLab.AutoSize = true;
+            this.EmployeeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.EmployeeLab.Location = new System.Drawing.Point(395, 75);
+            this.EmployeeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.EmployeeLab.Name = "EmployeeLab";
+            this.EmployeeLab.Size = new System.Drawing.Size(75, 28);
+            this.EmployeeLab.TabIndex = 179;
+            this.EmployeeLab.Text = "操作员";
+            // 
             // ma_qty
             // 
             this.ma_qty.Enabled = false;
@@ -280,25 +317,6 @@
             this.LockMakeCode.Text = "锁定";
             this.LockMakeCode.UseVisualStyleBackColor = true;
             // 
-            // ma_code
-            // 
-            this.ma_code.AllPower = null;
-            this.ma_code.Caller = null;
-            this.ma_code.Condition = null;
-            this.ma_code.DBTitle = null;
-            this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(91, 30);
-            this.ma_code.Name = "ma_code";
-            this.ma_code.Power = null;
-            this.ma_code.ReturnData = null;
-            this.ma_code.SelectField = null;
-            this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(205, 32);
-            this.ma_code.TabIndex = 143;
-            this.ma_code.TableName = null;
-            this.ma_code.Tag = "ma_code";
-            this.ma_code.TextBoxEnable = true;
-            // 
             // DataBox
             // 
             this.DataBox.AllowUserToAddRows = false;
@@ -440,7 +458,7 @@
             // 
             this.OperateResult.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OperateResult.Location = new System.Drawing.Point(0, 0);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.OperateResult.Name = "OperateResult";
@@ -520,24 +538,6 @@
             this.dataGridViewTextBoxColumn8.ReadOnly = true;
             this.dataGridViewTextBoxColumn8.Width = 150;
             // 
-            // EmployeeVal
-            // 
-            this.EmployeeVal.Location = new System.Drawing.Point(463, 75);
-            this.EmployeeVal.Name = "EmployeeVal";
-            this.EmployeeVal.Size = new System.Drawing.Size(113, 31);
-            this.EmployeeVal.TabIndex = 180;
-            // 
-            // EmployeeLab
-            // 
-            this.EmployeeLab.AutoSize = true;
-            this.EmployeeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.EmployeeLab.Location = new System.Drawing.Point(395, 75);
-            this.EmployeeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.EmployeeLab.Name = "EmployeeLab";
-            this.EmployeeLab.Size = new System.Drawing.Size(75, 28);
-            this.EmployeeLab.TabIndex = 179;
-            this.EmployeeLab.Text = "操作员";
-            // 
             // Make_BurnInfo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.resx

@@ -141,28 +141,4 @@
   <metadata name="update_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="work_order.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="burn_lotno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="line.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="burn_software.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="check_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dot_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="update_time.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="update_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

UAS_MES_WEIP/FunctionCode/Make/Make_PcbClean.Designer.cs

@@ -0,0 +1,442 @@
+namespace UAS_MES_NEW.Make
+{
+    partial class Make_PcbClean
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.ms_makecode_label = new System.Windows.Forms.Label();
+            this.LineLab = new System.Windows.Forms.Label();
+            this.LineVal = new System.Windows.Forms.ComboBox();
+            this.TopBox = new System.Windows.Forms.Panel();
+            this.SideLab = new System.Windows.Forms.Label();
+            this.SideVal = new System.Windows.Forms.ComboBox();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
+            this.SnVal = new System.Windows.Forms.TextBox();
+            this.SnLab = new System.Windows.Forms.Label();
+            this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
+            this.DataBox = new System.Windows.Forms.DataGridView();
+            this.work_order = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SN = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.line = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Side = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.update_time = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.update_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.RightBox = new System.Windows.Forms.Panel();
+            this.ClearMsg = new System.Windows.Forms.Button();
+            this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.TopBox.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.DataBox)).BeginInit();
+            this.tableLayoutPanel1.SuspendLayout();
+            this.RightBox.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // ms_makecode_label
+            // 
+            this.ms_makecode_label.AutoSize = true;
+            this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ms_makecode_label.Location = new System.Drawing.Point(31, 30);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_makecode_label.Name = "ms_makecode_label";
+            this.ms_makecode_label.Size = new System.Drawing.Size(75, 28);
+            this.ms_makecode_label.TabIndex = 142;
+            this.ms_makecode_label.Text = "工单号";
+            // 
+            // LineLab
+            // 
+            this.LineLab.AutoSize = true;
+            this.LineLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.LineLab.Location = new System.Drawing.Point(395, 30);
+            this.LineLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.LineLab.Name = "LineLab";
+            this.LineLab.Size = new System.Drawing.Size(54, 28);
+            this.LineLab.TabIndex = 144;
+            this.LineLab.Text = "线体";
+            // 
+            // LineVal
+            // 
+            this.LineVal.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.LineVal.FormattingEnabled = true;
+            this.LineVal.Location = new System.Drawing.Point(441, 29);
+            this.LineVal.Name = "LineVal";
+            this.LineVal.Size = new System.Drawing.Size(189, 32);
+            this.LineVal.TabIndex = 145;
+            // 
+            // TopBox
+            // 
+            this.TopBox.Controls.Add(this.SideLab);
+            this.TopBox.Controls.Add(this.SideVal);
+            this.TopBox.Controls.Add(this.ma_code);
+            this.TopBox.Controls.Add(this.SnVal);
+            this.TopBox.Controls.Add(this.SnLab);
+            this.TopBox.Controls.Add(this.LineLab);
+            this.TopBox.Controls.Add(this.LockMakeCode);
+            this.TopBox.Controls.Add(this.LineVal);
+            this.TopBox.Controls.Add(this.ms_makecode_label);
+            this.TopBox.Dock = System.Windows.Forms.DockStyle.Top;
+            this.TopBox.Location = new System.Drawing.Point(0, 0);
+            this.TopBox.Name = "TopBox";
+            this.TopBox.Size = new System.Drawing.Size(1280, 201);
+            this.TopBox.TabIndex = 153;
+            // 
+            // SideLab
+            // 
+            this.SideLab.AutoSize = true;
+            this.SideLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SideLab.Location = new System.Drawing.Point(663, 31);
+            this.SideLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.SideLab.Name = "SideLab";
+            this.SideLab.Size = new System.Drawing.Size(54, 28);
+            this.SideLab.TabIndex = 156;
+            this.SideLab.Text = "面别";
+            // 
+            // SideVal
+            // 
+            this.SideVal.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.SideVal.FormattingEnabled = true;
+            this.SideVal.Items.AddRange(new object[] {
+            "A面",
+            "B面"});
+            this.SideVal.Location = new System.Drawing.Point(712, 30);
+            this.SideVal.Name = "SideVal";
+            this.SideVal.Size = new System.Drawing.Size(89, 32);
+            this.SideVal.TabIndex = 157;
+            // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = null;
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = null;
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(91, 30);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = null;
+            this.ma_code.ReturnData = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(205, 32);
+            this.ma_code.TabIndex = 143;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
+            // 
+            // SnVal
+            // 
+            this.SnVal.Location = new System.Drawing.Point(86, 121);
+            this.SnVal.Name = "SnVal";
+            this.SnVal.Size = new System.Drawing.Size(243, 31);
+            this.SnVal.TabIndex = 155;
+            this.SnVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SnVal_KeyDown);
+            // 
+            // SnLab
+            // 
+            this.SnLab.AutoSize = true;
+            this.SnLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SnLab.Location = new System.Drawing.Point(26, 121);
+            this.SnLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.SnLab.Name = "SnLab";
+            this.SnLab.Size = new System.Drawing.Size(75, 28);
+            this.SnLab.TabIndex = 154;
+            this.SnLab.Text = "序列号";
+            // 
+            // LockMakeCode
+            // 
+            this.LockMakeCode.AutoSize = true;
+            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.LockMakeCode.LeaveEvent = false;
+            this.LockMakeCode.Location = new System.Drawing.Point(310, 32);
+            this.LockMakeCode.Name = "LockMakeCode";
+            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
+            this.LockMakeCode.TabIndex = 153;
+            this.LockMakeCode.Text = "锁定";
+            this.LockMakeCode.UseVisualStyleBackColor = true;
+            // 
+            // DataBox
+            // 
+            this.DataBox.AllowUserToAddRows = false;
+            this.DataBox.AllowUserToDeleteRows = false;
+            this.DataBox.BackgroundColor = System.Drawing.SystemColors.Control;
+            this.DataBox.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.DataBox.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.work_order,
+            this.SN,
+            this.line,
+            this.Side,
+            this.update_time,
+            this.update_name});
+            this.DataBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.DataBox.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
+            this.DataBox.Location = new System.Drawing.Point(3, 3);
+            this.DataBox.Name = "DataBox";
+            this.DataBox.ReadOnly = true;
+            this.DataBox.RowHeadersWidth = 62;
+            this.DataBox.RowTemplate.Height = 30;
+            this.DataBox.Size = new System.Drawing.Size(890, 513);
+            this.DataBox.TabIndex = 154;
+            // 
+            // work_order
+            // 
+            this.work_order.DataPropertyName = "work_order";
+            this.work_order.HeaderText = "工单号";
+            this.work_order.MinimumWidth = 8;
+            this.work_order.Name = "work_order";
+            this.work_order.ReadOnly = true;
+            this.work_order.Width = 150;
+            // 
+            // SN
+            // 
+            this.SN.DataPropertyName = "SN";
+            this.SN.HeaderText = "序列号";
+            this.SN.MinimumWidth = 8;
+            this.SN.Name = "SN";
+            this.SN.ReadOnly = true;
+            this.SN.Width = 180;
+            // 
+            // line
+            // 
+            this.line.DataPropertyName = "line";
+            this.line.HeaderText = "线体";
+            this.line.MinimumWidth = 8;
+            this.line.Name = "line";
+            this.line.ReadOnly = true;
+            this.line.Width = 120;
+            // 
+            // Side
+            // 
+            this.Side.DataPropertyName = "Side";
+            this.Side.HeaderText = "面别";
+            this.Side.MinimumWidth = 8;
+            this.Side.Name = "Side";
+            this.Side.ReadOnly = true;
+            this.Side.Width = 80;
+            // 
+            // update_time
+            // 
+            this.update_time.DataPropertyName = "update_time";
+            this.update_time.HeaderText = "操作时间";
+            this.update_time.MinimumWidth = 8;
+            this.update_time.Name = "update_time";
+            this.update_time.ReadOnly = true;
+            this.update_time.Width = 150;
+            // 
+            // update_name
+            // 
+            this.update_name.DataPropertyName = "update_name";
+            this.update_name.HeaderText = "操作人";
+            this.update_name.MinimumWidth = 8;
+            this.update_name.Name = "update_name";
+            this.update_name.ReadOnly = true;
+            this.update_name.Width = 150;
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.ColumnCount = 2;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 70F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
+            this.tableLayoutPanel1.Controls.Add(this.DataBox, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.RightBox, 1, 0);
+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 201);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            this.tableLayoutPanel1.RowCount = 1;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 519F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1280, 519);
+            this.tableLayoutPanel1.TabIndex = 156;
+            // 
+            // RightBox
+            // 
+            this.RightBox.Controls.Add(this.ClearMsg);
+            this.RightBox.Controls.Add(this.OperateResult);
+            this.RightBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.RightBox.Location = new System.Drawing.Point(899, 3);
+            this.RightBox.Name = "RightBox";
+            this.RightBox.Size = new System.Drawing.Size(378, 513);
+            this.RightBox.TabIndex = 156;
+            // 
+            // ClearMsg
+            // 
+            this.ClearMsg.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.ClearMsg.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.ClearMsg.Location = new System.Drawing.Point(155, 471);
+            this.ClearMsg.Name = "ClearMsg";
+            this.ClearMsg.Size = new System.Drawing.Size(81, 28);
+            this.ClearMsg.TabIndex = 156;
+            this.ClearMsg.Text = "清理";
+            this.ClearMsg.UseVisualStyleBackColor = true;
+            this.ClearMsg.Click += new System.EventHandler(this.ClearMsg_Click);
+            // 
+            // OperateResult
+            // 
+            this.OperateResult.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OperateResult.Location = new System.Drawing.Point(0, 0);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(378, 463);
+            this.OperateResult.TabIndex = 155;
+            this.OperateResult.Text = "";
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "work_order";
+            this.dataGridViewTextBoxColumn1.HeaderText = "工单号";
+            this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            this.dataGridViewTextBoxColumn1.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "burn_lotno";
+            this.dataGridViewTextBoxColumn2.HeaderText = "烧录批号";
+            this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            this.dataGridViewTextBoxColumn2.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "line";
+            this.dataGridViewTextBoxColumn3.HeaderText = "线体";
+            this.dataGridViewTextBoxColumn3.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.Visible = false;
+            this.dataGridViewTextBoxColumn3.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "burn_software";
+            this.dataGridViewTextBoxColumn4.HeaderText = "烧录软件";
+            this.dataGridViewTextBoxColumn4.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            this.dataGridViewTextBoxColumn4.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "check_code";
+            this.dataGridViewTextBoxColumn5.HeaderText = "校验码";
+            this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.ReadOnly = true;
+            this.dataGridViewTextBoxColumn5.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.DataPropertyName = "dot_detail";
+            this.dataGridViewTextBoxColumn6.HeaderText = "打点信息";
+            this.dataGridViewTextBoxColumn6.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.ReadOnly = true;
+            this.dataGridViewTextBoxColumn6.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.DataPropertyName = "update_time";
+            this.dataGridViewTextBoxColumn7.HeaderText = "操作时间";
+            this.dataGridViewTextBoxColumn7.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.ReadOnly = true;
+            this.dataGridViewTextBoxColumn7.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn8
+            // 
+            this.dataGridViewTextBoxColumn8.DataPropertyName = "update_name";
+            this.dataGridViewTextBoxColumn8.HeaderText = "操作人";
+            this.dataGridViewTextBoxColumn8.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.ReadOnly = true;
+            this.dataGridViewTextBoxColumn8.Width = 150;
+            // 
+            // Make_PcbClean
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1280, 720);
+            this.Controls.Add(this.tableLayoutPanel1);
+            this.Controls.Add(this.TopBox);
+            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "Make_PcbClean";
+            this.Text = "Make_BurnInfo";
+            this.Load += new System.EventHandler(this.Make_BurnInfo_Load);
+            this.TopBox.ResumeLayout(false);
+            this.TopBox.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.DataBox)).EndInit();
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.RightBox.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
+        private System.Windows.Forms.Label ms_makecode_label;
+        private System.Windows.Forms.Label LineLab;
+        private System.Windows.Forms.ComboBox LineVal;
+        private System.Windows.Forms.Panel TopBox;
+        private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
+        private System.Windows.Forms.Label SnLab;
+        private System.Windows.Forms.DataGridView DataBox;
+        private System.Windows.Forms.TextBox SnVal;
+        private CustomControl.RichText.RichTextAutoBottom OperateResult;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.Panel RightBox;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
+        private System.Windows.Forms.Button ClearMsg;
+        private System.Windows.Forms.Label SideLab;
+        private System.Windows.Forms.ComboBox SideVal;
+        private System.Windows.Forms.DataGridViewTextBoxColumn work_order;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SN;
+        private System.Windows.Forms.DataGridViewTextBoxColumn line;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Side;
+        private System.Windows.Forms.DataGridViewTextBoxColumn update_time;
+        private System.Windows.Forms.DataGridViewTextBoxColumn update_name;
+    }
+}

UAS_MES_WEIP/FunctionCode/Make/Make_PcbClean.cs

@@ -0,0 +1,156 @@
+using NPOI.SS.Formula;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using UAS_MES_NEW.CustomControl.ButtonUtil;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
+
+namespace UAS_MES_NEW.Make
+{
+    public partial class Make_PcbClean : Form
+    {
+        public Make_PcbClean()
+        {
+            InitializeComponent();
+        }
+
+        LogStringBuilder sql = new LogStringBuilder();
+        DataTable Dbfind;
+        DataHelper dh;
+        DataTable dt;
+
+        private void Make_BurnInfo_Load(object sender, EventArgs e)
+        {
+            //设置锁定工单
+            LockMakeCode.GetMakeCodeCtl(ma_code);
+            ma_code.SetLockCheckBox(LockMakeCode);
+            //工单号放大镜配置
+            ma_code.TableName = "make left join product on ma_prodcode=pr_code";
+            ma_code.SelectField = "ma_code # 工单号,pr_code # 产品编号,pr_detail # 产品名称";
+            ma_code.FormName = Name;
+            ma_code.SetValueField = new string[] { "ma_code", "pr_code", "pr_detail" };
+            ma_code.Condition = "ma_statuscode='STARTED'";
+            ma_code.DbChange += Ma_code_DbChange;
+
+            dh = SystemInf.dh;
+        }
+            
+        private void Ma_code_DbChange(object sender, EventArgs e)
+        {
+            Dbfind = ma_code.ReturnData;
+            BaseUtil.SetFormValue(this.Controls, Dbfind);
+            //获取工单的其他信息
+            sql.Clear();
+            sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode as pr_code ,pr_detail,");
+            sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,ma_qty from make left join makecraftdetail on ");
+            sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + ma_code.Text + "'");
+            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            if (dt.Rows.Count > 0)
+            {
+                BaseUtil.SetFormValue(this.Controls, dt);
+            }
+
+            LineVal.Items.Clear();
+            sql.Clear();
+            sql.Append($@"SELECT dl_linecode FROM deviceline WHERE dl_statuscode = 'STARTED' AND dl_macode = '{ma_code.Text.Trim()}' ORDER BY substr(dl_linecode, 0, 3) DESC, substr(dl_linecode,length(dl_linecode) - 1)");
+            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            if (dt.Rows.Count > 0)
+            {
+                foreach(DataRow item in dt.Rows)
+                {
+                    LineVal.Items.Add(item["dl_linecode"].ToString());
+                }
+                if(dt.Rows.Count > 1)
+                {
+                    LineVal.SelectedIndex = 0;
+                }
+                else
+                {
+                    LineVal.SelectedIndex = -1;
+                }
+            }
+            else
+            {
+                ShowMsg(0, $"工单:{ma_code.Text} 未找到启动线体");
+                return;
+            }
+
+            dt = (DataTable)dh.ExecuteSql($@"SELECT sn, work_order, line, side, update_time, update_name FROM sn_clean WHERE work_order = '{ma_code.Text}'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                DataBox.DataSource = dt;
+            }
+        }
+
+        private void SnVal_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+            SnVal.Text = SnVal.Text.Trim();
+
+            if (string.IsNullOrEmpty(ma_code.Text))
+            {
+                ShowMsg(0, $"请选择清洗归属工单号");
+                return;
+            }
+
+            if (LineVal.SelectedIndex == -1)
+            {
+                ShowMsg(0, $"请选择清洗归属线体");
+                return;
+            }
+
+            if (SideVal.SelectedIndex == -1)
+            {
+                ShowMsg(0, $"请选择清洗面别");
+                return;
+            }
+
+            sql.Clear();
+            sql.Append($@"select * from smtbind where sb_barcode = '{SnVal.Text}'");
+            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            if (dt.Rows.Count == 0)
+            {
+                ShowMsg(0, $"序列号:{SnVal.Text} 未进行拼板绑定");
+                return;
+            }
+
+            dh.ExecuteSql($@"INSERT INTO sn_clean (CLEAN_ID,SN,WORK_ORDER,LINE,SIDE,UPDATE_TIME,UPDATE_NAME)
+                VALUES (CLEAN_ID_SEQ.NEXTVAL, '{SnVal.Text}','{ma_code.Text}','{LineVal.Text}','{SideVal.Text}',sysdate,'{User.UserName}')", "insert");
+            ShowMsg(1, $"序列号:{SnVal.Text} 已记录清洗");
+            SnVal.Focus();
+            SnVal.SelectAll();
+            SnVal.Text = "";
+
+            dt = (DataTable)dh.ExecuteSql($@"SELECT sn, work_order, line, side, update_time, update_name FROM sn_clean WHERE work_order = '{ma_code.Text}'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                DataBox.DataSource = dt;
+            }
+        }
+
+        private void ClearMsg_Click(object sender, EventArgs e)
+        {
+            OperateResult.Clear();
+        }
+
+        private void ShowMsg(int type, string msg)
+        {
+            string fullDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            if (type == 0)
+            {
+                OperateResult.AppendText($"{fullDateTime}: {msg}\n", Color.Red);
+            }
+            else if (type == 1)
+            {
+                OperateResult.AppendText($"{fullDateTime}: {msg}\n", Color.Green);
+            }
+        }
+    }
+}

UAS_MES_WEIP/FunctionCode/Make/Make_PcbClean.resx

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="work_order.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="line.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Side.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="update_time.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="update_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.cs

@@ -176,7 +176,7 @@ namespace UAS_MES_NEW.Make
                     st_table.SelectedItem = null;
                     SU_DEVCODE.Text = "";
                     em_code.Text = "";
-                    Receive.Enabled = false;
+                    //Receive.Enabled = false;
                     LoadGridData();
 
                     /*if (int.Parse(su_singlepringqty1.Text) > 0)
@@ -257,7 +257,7 @@ namespace UAS_MES_NEW.Make
                             ST_ENSIOND.Text = "";
                             ST_ENSIONE.Text = "";
                             SU_RETURNIFCLEAN.Checked = false;
-                            Return.Enabled = false;
+                            //Return.Enabled = false;
                             Confirm.PerformClick();
                     //}
                     //else
@@ -539,43 +539,52 @@ namespace UAS_MES_NEW.Make
 
         private void normalButton1_Click(object sender, EventArgs e)
         {
-
-                    DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED' and st_kind = '刮刀'", "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        string status = dt.Rows[0]["ST_USESTATUS"].ToString();
-                        if (status == "在仓" || status == "借出")
-                        {
-                            MessageBox.Show("当前刮刀" + SU_DEVCODE.Text + "未在线,无法操作");
-                            return;
-                        }
-                        if (status == "报废")
-                        {
-                            MessageBox.Show("当前刮刀" + SU_DEVCODE.Text + "处于" + status + "状态,无法操作");
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        MessageBox.Show("刮刀编号" + SU_DEVCODE1.Text + "不存在或者未审核");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED' and st_kind = '刮刀'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                string status = dt.Rows[0]["ST_USESTATUS"].ToString();
+                if (status == "在仓" || status == "借出")
+                {
+                    MessageBox.Show("当前刮刀" + SU_DEVCODE.Text + "未在线,无法操作");
+                    return;
+                }
+                if (status == "报废")
+                {
+                    MessageBox.Show("当前刮刀" + SU_DEVCODE.Text + "处于" + status + "状态,无法操作");
+                    return;
+                }
+            }
+            else
+            {
+                MessageBox.Show("刮刀编号" + SU_DEVCODE1.Text + "不存在或者未审核");
                 return;
-                    }
+            }
+            sql.Clear();
+            sql.Append("select nvl(su_cleannums,0)+1 su_cleannums from StencilUse nvl where su_id = (select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "')");
+            dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
+            string su_cleannums = dt.Rows[0]["su_cleannums"].ToString();
 
-                            sql.Clear();
-                            sql.Append("update StencilUse set  su_cleannums=nvl(su_cleannums,0)+1, su_auditdate=sysdate");
-                            sql.Append("  where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='在线')");
-                            dh.ExecuteSql(sql.ToString(), "update");
-                            MessageBox.Show("刮刀" + SU_DEVCODE1.Text + "12小时清洗成功！");
-                            SU_DEVCODE1.Text = "";
-                            st_combinenumber.Text = "";
-                            em_code1.Text = "";
-                            ST_ENSIONA.Text = "";
-                            ST_ENSIONB.Text = "";
-                            ST_ENSIONC.Text = "";
-                            ST_ENSIOND.Text = "";
-                            ST_ENSIONE.Text = "";
-                            Confirm.PerformClick();
+            sql.Clear();
+            sql.Append($@"INSERT INTO stenciluse (su_id,su_stid,su_stcode,su_indate,su_useman,su_status,
+                su_returnifclean,su_cleannums)
+                SELECT stenciluse_seq.NEXTVAL,st_id,'{SU_DEVCODE1.Text.Trim()}',sysdate,'{User.UserName}','12小时清洗',
+                '{(SU_RETURNIFCLEAN.Checked ? "-1" : "0")}', '{su_cleannums}' FROM stencil WHERE st_code = '" + SU_DEVCODE1.Text.Trim() + "'");
+            dh.ExecuteSql(sql.ToString(), "insert");
 
+            /*sql.Clear();
+            sql.Append("update StencilUse set  su_cleannums=nvl(su_cleannums,0)+1, su_auditdate=sysdate");
+            sql.Append("  where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='在线')");
+            dh.ExecuteSql(sql.ToString(), "update");*/
+            MessageBox.Show("刮刀" + SU_DEVCODE1.Text + "12小时清洗成功！");
+            SU_DEVCODE1.Text = "";
+            st_combinenumber.Text = "";
+            em_code1.Text = "";
+            ST_ENSIONA.Text = "";
+            ST_ENSIONB.Text = "";
+            ST_ENSIONC.Text = "";
+            ST_ENSIOND.Text = "";
+            ST_ENSIONE.Text = "";
+            Confirm.PerformClick();
         }
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStencil.cs

@@ -176,7 +176,7 @@ namespace UAS_MES_NEW.Make
                     st_table.SelectedItem = null;
                     SU_DEVCODE.Text = "";
                     em_code.Text = "";
-                    Receive.Enabled = false;
+                    //Receive.Enabled = false;
                     LoadGridData();
 
                     //if (int.Parse(su_singlepringqty1.Text) > 0)
@@ -235,7 +235,7 @@ namespace UAS_MES_NEW.Make
                         sql.Append("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "',St_USECOUNT=nvl(St_USECOUNT,0)+" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + ",ST_USESTATUS='借出' where st_code='" + SU_DEVCODE1.Text + "'");
                         dh.ExecuteSql(sql.ToString(), "update");*/
 
-
+                        
                         sql.Clear();
                         sql.Append($@"INSERT INTO stenciluse (su_id,su_ensiona,su_ensionb,su_ensionc,su_ensiond,su_ensione,su_stid,su_stcode,su_indate,su_useman,
                             su_cleannums,su_backdate,su_returnman,su_returnmancode,su_status,su_returnifclean)
@@ -258,7 +258,7 @@ namespace UAS_MES_NEW.Make
                         ST_ENSIOND.Text = "";
                         ST_ENSIONE.Text = "";
                         SU_RETURNIFCLEAN.Checked = false;
-                        Return.Enabled = false;
+                        //Return.Enabled = false;
                         Confirm.PerformClick();
                     //}
                     //else
@@ -540,43 +540,53 @@ namespace UAS_MES_NEW.Make
 
         private void normalButton1_Click(object sender, EventArgs e)
         {
-
-                    DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED' and st_kind = '钢网'", "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        string status = dt.Rows[0]["ST_USESTATUS"].ToString();
-                        if (status == "在仓" || status == "借出")
-                        {
-                            MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "未在线,无法操作");
-                            return;
-                        }
-                        if (status == "报废")
-                        {
-                            MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法操作");
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED' and st_kind = '钢网'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                string status = dt.Rows[0]["ST_USESTATUS"].ToString();
+                if (status == "在仓" || status == "借出")
+                {
+                    MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "未在线,无法操作");
+                    return;
+                }
+                if (status == "报废")
+                {
+                    MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法操作");
+                    return;
+                }
+            }
+            else
+            {
+                MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
                 return;
-                    }
+            }
+
+            sql.Clear();
+            sql.Append("select nvl(su_cleannums,0)+1 su_cleannums from StencilUse nvl where su_id = (select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "')");
+            dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
+            string su_cleannums = dt.Rows[0]["su_cleannums"].ToString();
 
-                            sql.Clear();
-                            sql.Append("update StencilUse set  su_cleannums=nvl(su_cleannums,0)+1, su_auditdate=sysdate");
-                            sql.Append("  where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='在线')");
-                            dh.ExecuteSql(sql.ToString(), "update");
-                            MessageBox.Show("钢网" + SU_DEVCODE1.Text + "12小时清洗成功！");
-                            SU_DEVCODE1.Text = "";
-                            st_combinenumber.Text = "";
-                            em_code1.Text = "";
-                            ST_ENSIONA.Text = "";
-                            ST_ENSIONB.Text = "";
-                            ST_ENSIONC.Text = "";
-                            ST_ENSIOND.Text = "";
-                            ST_ENSIONE.Text = "";
-                            Confirm.PerformClick();
+            sql.Clear();
+            sql.Append($@"INSERT INTO stenciluse (su_id,su_stid,su_stcode,su_indate,su_useman,su_status,
+                su_returnifclean,su_cleannums)
+                SELECT stenciluse_seq.NEXTVAL,st_id,'{SU_DEVCODE1.Text.Trim()}',sysdate,'{User.UserName}','12小时清洗',
+                '{(SU_RETURNIFCLEAN.Checked ? "-1" : "0")}', '{su_cleannums}' FROM stencil WHERE st_code = '" + SU_DEVCODE1.Text.Trim() + "'");
+            dh.ExecuteSql(sql.ToString(), "insert");
 
+            /*sql.Clear();
+            sql.Append("update StencilUse set  su_cleannums=nvl(su_cleannums,0)+1, su_auditdate=sysdate");
+            sql.Append("  where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='在线')");
+            dh.ExecuteSql(sql.ToString(), "update");*/
+            MessageBox.Show("钢网" + SU_DEVCODE1.Text + "12小时清洗成功！");
+            SU_DEVCODE1.Text = "";
+            st_combinenumber.Text = "";
+            em_code1.Text = "";
+            ST_ENSIONA.Text = "";
+            ST_ENSIONB.Text = "";
+            ST_ENSIONC.Text = "";
+            ST_ENSIOND.Text = "";
+            ST_ENSIONE.Text = "";
+            Confirm.PerformClick();
         }
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStockSStencil.cs

@@ -128,7 +128,7 @@ namespace UAS_MES_NEW.Make
             dh.ExecuteSql("update Stencil set ST_USESTATUS='借出' where st_code='" + SU_DEVCODE.Text + "'", "update");
             MessageBox.Show("出库成功");
             SU_DEVCODE.Text = "";
-            Receive.Enabled = false;
+            //Receive.Enabled = false;
             LoadGridData();
         }
 

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStockStencil.cs

@@ -129,7 +129,7 @@ namespace UAS_MES_NEW.Make
 
             MessageBox.Show("出库成功");
             SU_DEVCODE.Text = "";
-            Receive.Enabled = false;
+            //Receive.Enabled = false;
             LoadGridData();
         }
 

UAS_MES_WEIP/UAS_MES_WEIP.csproj

@@ -543,6 +543,12 @@
     <Compile Include="FunctionCode\Employee\Employee_PowerSarch.Designer.cs">
       <DependentUpon>Employee_PowerSarch.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_PcbClean.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_PcbClean.Designer.cs">
+      <DependentUpon>Make_PcbClean.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_FeedingCollectionCombine.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1354,6 +1360,9 @@
     <EmbeddedResource Include="FunctionCode\Employee\Employee_PowerSarch.resx">
       <DependentUpon>Employee_PowerSarch.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_PcbClean.resx">
+      <DependentUpon>Make_PcbClean.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_FeedingCollectionCombine.resx">
       <DependentUpon>Make_FeedingCollectionCombine.cs</DependentUpon>
     </EmbeddedResource>