添加品质确认流程

UAS_MES_WEIP/FunctionCode/Make/Make_BakingManage.Designer.cs

@@ -30,16 +30,6 @@
         {
             this.Container = new System.Windows.Forms.TableLayoutPanel();
             this.DataBox = new System.Windows.Forms.DataGridView();
-            this.SNDetails = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.productName = new System.Windows.Forms.Label();
-            this.productCode = new System.Windows.Forms.Label();
-            this.workOrder = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.serialNumber = new System.Windows.Forms.Label();
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
             this.panel2 = new System.Windows.Forms.Panel();
             this.EmployeeVal1 = new System.Windows.Forms.TextBox();
@@ -48,9 +38,7 @@
             this.ReelNoVal1 = new System.Windows.Forms.TextBox();
             this.ReelNoLab1 = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
             this.ms_makecode_label = new System.Windows.Forms.Label();
-            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.EstimateLab1 = new System.Windows.Forms.Label();
@@ -61,6 +49,11 @@
             this.BackingLab = new System.Windows.Forms.Label();
             this.ReelNoVal = new System.Windows.Forms.TextBox();
             this.ReelNoLab = new System.Windows.Forms.Label();
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.textBox2 = new System.Windows.Forms.TextBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.panel3 = new System.Windows.Forms.Panel();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -68,6 +61,8 @@
             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.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.BOX_NO = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.WORK_ORDER = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.REEL_NO = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -77,13 +72,26 @@
             this.IN_NAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.BAKING_TIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.PR_SPEC = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SNDetails = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.productName = new System.Windows.Forms.Label();
+            this.productCode = new System.Windows.Forms.Label();
+            this.workOrder = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.serialNumber = 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.Container.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DataBox)).BeginInit();
-            this.SNDetails.SuspendLayout();
-            this.tableLayoutPanel1.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
             this.panel2.SuspendLayout();
             this.panel1.SuspendLayout();
+            this.panel3.SuspendLayout();
+            this.SNDetails.SuspendLayout();
+            this.tableLayoutPanel1.SuspendLayout();
             this.SuspendLayout();
             // 
             // Container
@@ -130,146 +138,20 @@
             this.DataBox.Size = new System.Drawing.Size(1274, 390);
             this.DataBox.TabIndex = 155;
             // 
-            // SNDetails
-            // 
-            this.SNDetails.BorderColor = System.Drawing.Color.Black;
-            this.SNDetails.Controls.Add(this.tableLayoutPanel1);
-            this.SNDetails.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.SNDetails.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SNDetails.Location = new System.Drawing.Point(3, 4);
-            this.SNDetails.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.SNDetails.Name = "SNDetails";
-            this.SNDetails.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.SNDetails.Size = new System.Drawing.Size(1274, 100);
-            this.SNDetails.TabIndex = 4;
-            this.SNDetails.TabStop = false;
-            this.SNDetails.Text = "条码信息";
-            this.SNDetails.TextColor = System.Drawing.Color.Black;
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.ColumnCount = 8;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18.09942F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.09638F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 13.18958F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30.80901F));
-            this.tableLayoutPanel1.Controls.Add(this.productName, 7, 0);
-            this.tableLayoutPanel1.Controls.Add(this.productCode, 5, 0);
-            this.tableLayoutPanel1.Controls.Add(this.workOrder, 3, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label4, 6, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label3, 4, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label2, 2, 0);
-            this.tableLayoutPanel1.Controls.Add(this.serialNumber, 1, 0);
-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 32);
-            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            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.Size = new System.Drawing.Size(1268, 64);
-            this.tableLayoutPanel1.TabIndex = 0;
-            // 
-            // productName
-            // 
-            this.productName.AutoSize = true;
-            this.productName.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.productName.Location = new System.Drawing.Point(876, 0);
-            this.productName.Name = "productName";
-            this.productName.Size = new System.Drawing.Size(389, 64);
-            this.productName.TabIndex = 7;
-            this.productName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // productCode
-            // 
-            this.productCode.AutoSize = true;
-            this.productCode.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.productCode.Location = new System.Drawing.Point(628, 0);
-            this.productCode.Name = "productCode";
-            this.productCode.Size = new System.Drawing.Size(161, 64);
-            this.productCode.TabIndex = 6;
-            this.productCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // workOrder
-            // 
-            this.workOrder.AutoSize = true;
-            this.workOrder.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.workOrder.Location = new System.Drawing.Point(394, 0);
-            this.workOrder.Name = "workOrder";
-            this.workOrder.Size = new System.Drawing.Size(147, 64);
-            this.workOrder.TabIndex = 5;
-            this.workOrder.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label4.Location = new System.Drawing.Point(795, 0);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(75, 64);
-            this.label4.TabIndex = 3;
-            this.label4.Text = "物料规格: ";
-            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label1.Location = new System.Drawing.Point(3, 0);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(75, 64);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "条码号: ";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label3.Location = new System.Drawing.Point(547, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(75, 64);
-            this.label3.TabIndex = 2;
-            this.label3.Text = "物料编号: ";
-            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label2.Location = new System.Drawing.Point(313, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(75, 64);
-            this.label2.TabIndex = 1;
-            this.label2.Text = "物料名称: ";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // serialNumber
-            // 
-            this.serialNumber.AutoSize = true;
-            this.serialNumber.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.serialNumber.Location = new System.Drawing.Point(84, 0);
-            this.serialNumber.Name = "serialNumber";
-            this.serialNumber.Size = new System.Drawing.Size(223, 64);
-            this.serialNumber.TabIndex = 4;
-            this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
             // tableLayoutPanel2
             // 
-            this.tableLayoutPanel2.ColumnCount = 2;
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.tableLayoutPanel2.ColumnCount = 3;
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 34F));
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33F));
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33F));
             this.tableLayoutPanel2.Controls.Add(this.panel2, 1, 0);
             this.tableLayoutPanel2.Controls.Add(this.panel1, 0, 0);
+            this.tableLayoutPanel2.Controls.Add(this.panel3, 2, 0);
             this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 111);
             this.tableLayoutPanel2.Name = "tableLayoutPanel2";
             this.tableLayoutPanel2.RowCount = 1;
-            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
             this.tableLayoutPanel2.Size = new System.Drawing.Size(1274, 210);
             this.tableLayoutPanel2.TabIndex = 156;
             // 
@@ -280,9 +162,9 @@
             this.panel2.Controls.Add(this.EmployeeLab1);
             this.panel2.Controls.Add(this.ReelNoVal1);
             this.panel2.Controls.Add(this.ReelNoLab1);
-            this.panel2.Location = new System.Drawing.Point(640, 3);
+            this.panel2.Location = new System.Drawing.Point(436, 3);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(631, 204);
+            this.panel2.Size = new System.Drawing.Size(414, 204);
             this.panel2.TabIndex = 177;
             // 
             // EmployeeVal1
@@ -356,21 +238,9 @@
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(3, 3);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(631, 204);
+            this.panel1.Size = new System.Drawing.Size(427, 204);
             this.panel1.TabIndex = 136;
             // 
-            // 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(311, 19);
-            this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
-            this.LockMakeCode.TabIndex = 181;
-            this.LockMakeCode.Text = "锁定";
-            this.LockMakeCode.UseVisualStyleBackColor = true;
-            // 
             // ms_makecode_label
             // 
             this.ms_makecode_label.AutoSize = true;
@@ -382,25 +252,6 @@
             this.ms_makecode_label.TabIndex = 179;
             this.ms_makecode_label.Text = "归属工单:";
             // 
-            // 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(102, 19);
-            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 = 180;
-            this.ma_code.TableName = null;
-            this.ma_code.Tag = "ma_code";
-            this.ma_code.TextBoxEnable = true;
-            // 
             // EmployeeVal
             // 
             this.EmployeeVal.Location = new System.Drawing.Point(102, 60);
@@ -505,12 +356,62 @@
             this.ReelNoLab.TabIndex = 163;
             this.ReelNoLab.Text = "条码号:";
             // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(95, 57);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(113, 31);
+            this.textBox1.TabIndex = 184;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label5.Location = new System.Drawing.Point(18, 57);
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(101, 28);
+            this.label5.TabIndex = 183;
+            this.label5.Text = "品质人员:";
+            // 
+            // textBox2
+            // 
+            this.textBox2.Location = new System.Drawing.Point(96, 104);
+            this.textBox2.Name = "textBox2";
+            this.textBox2.Size = new System.Drawing.Size(243, 31);
+            this.textBox2.TabIndex = 182;
+            this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown);
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label6.Location = new System.Drawing.Point(22, 104);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(80, 28);
+            this.label6.TabIndex = 181;
+            this.label6.Text = "条码号:";
+            // 
+            // panel3
+            // 
+            this.panel3.Controls.Add(this.textBox1);
+            this.panel3.Controls.Add(this.label5);
+            this.panel3.Controls.Add(this.label6);
+            this.panel3.Controls.Add(this.textBox2);
+            this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel3.Location = new System.Drawing.Point(856, 3);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(415, 204);
+            this.panel3.TabIndex = 178;
+            // 
             // dataGridViewTextBoxColumn1
             // 
             this.dataGridViewTextBoxColumn1.DataPropertyName = "BOX_NO";
             this.dataGridViewTextBoxColumn1.HeaderText = "烘烤箱号";
             this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
             this.dataGridViewTextBoxColumn1.Visible = false;
             this.dataGridViewTextBoxColumn1.Width = 150;
             // 
@@ -520,6 +421,7 @@
             this.dataGridViewTextBoxColumn2.HeaderText = "物料条码";
             this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
             this.dataGridViewTextBoxColumn2.Width = 150;
             // 
             // dataGridViewTextBoxColumn3
@@ -528,6 +430,7 @@
             this.dataGridViewTextBoxColumn3.HeaderText = "入烘烤时间";
             this.dataGridViewTextBoxColumn3.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
             this.dataGridViewTextBoxColumn3.Width = 150;
             // 
             // dataGridViewTextBoxColumn4
@@ -536,6 +439,7 @@
             this.dataGridViewTextBoxColumn4.HeaderText = "预计烘烤时长";
             this.dataGridViewTextBoxColumn4.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
             this.dataGridViewTextBoxColumn4.Width = 150;
             // 
             // dataGridViewTextBoxColumn5
@@ -544,6 +448,7 @@
             this.dataGridViewTextBoxColumn5.HeaderText = "入烘烤人员";
             this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.ReadOnly = true;
             this.dataGridViewTextBoxColumn5.Width = 150;
             // 
             // dataGridViewTextBoxColumn6
@@ -552,6 +457,7 @@
             this.dataGridViewTextBoxColumn6.HeaderText = "烘烤时间";
             this.dataGridViewTextBoxColumn6.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.ReadOnly = true;
             this.dataGridViewTextBoxColumn6.Width = 150;
             // 
             // dataGridViewTextBoxColumn7
@@ -560,8 +466,27 @@
             this.dataGridViewTextBoxColumn7.HeaderText = "当前烘烤时间";
             this.dataGridViewTextBoxColumn7.MinimumWidth = 8;
             this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.ReadOnly = true;
             this.dataGridViewTextBoxColumn7.Width = 150;
             // 
+            // dataGridViewTextBoxColumn8
+            // 
+            this.dataGridViewTextBoxColumn8.DataPropertyName = "BAKING_TIME";
+            this.dataGridViewTextBoxColumn8.HeaderText = "当前烘烤时间";
+            this.dataGridViewTextBoxColumn8.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.ReadOnly = true;
+            this.dataGridViewTextBoxColumn8.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn9
+            // 
+            this.dataGridViewTextBoxColumn9.DataPropertyName = "PR_SPEC";
+            this.dataGridViewTextBoxColumn9.HeaderText = "物料规格";
+            this.dataGridViewTextBoxColumn9.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.dataGridViewTextBoxColumn9.ReadOnly = true;
+            this.dataGridViewTextBoxColumn9.Width = 220;
+            // 
             // BOX_NO
             // 
             this.BOX_NO.DataPropertyName = "BOX_NO";
@@ -644,6 +569,165 @@
             this.PR_SPEC.ReadOnly = true;
             this.PR_SPEC.Width = 220;
             // 
+            // SNDetails
+            // 
+            this.SNDetails.BorderColor = System.Drawing.Color.Black;
+            this.SNDetails.Controls.Add(this.tableLayoutPanel1);
+            this.SNDetails.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.SNDetails.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SNDetails.Location = new System.Drawing.Point(3, 4);
+            this.SNDetails.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SNDetails.Name = "SNDetails";
+            this.SNDetails.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.SNDetails.Size = new System.Drawing.Size(1274, 100);
+            this.SNDetails.TabIndex = 4;
+            this.SNDetails.TabStop = false;
+            this.SNDetails.Text = "条码信息";
+            this.SNDetails.TextColor = System.Drawing.Color.Black;
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.ColumnCount = 8;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18.09942F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.09638F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 13.18958F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451406F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30.80901F));
+            this.tableLayoutPanel1.Controls.Add(this.productName, 7, 0);
+            this.tableLayoutPanel1.Controls.Add(this.productCode, 5, 0);
+            this.tableLayoutPanel1.Controls.Add(this.workOrder, 3, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label4, 6, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label3, 4, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label2, 2, 0);
+            this.tableLayoutPanel1.Controls.Add(this.serialNumber, 1, 0);
+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 32);
+            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            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.Size = new System.Drawing.Size(1268, 64);
+            this.tableLayoutPanel1.TabIndex = 0;
+            // 
+            // productName
+            // 
+            this.productName.AutoSize = true;
+            this.productName.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.productName.Location = new System.Drawing.Point(876, 0);
+            this.productName.Name = "productName";
+            this.productName.Size = new System.Drawing.Size(389, 64);
+            this.productName.TabIndex = 7;
+            this.productName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // productCode
+            // 
+            this.productCode.AutoSize = true;
+            this.productCode.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.productCode.Location = new System.Drawing.Point(628, 0);
+            this.productCode.Name = "productCode";
+            this.productCode.Size = new System.Drawing.Size(161, 64);
+            this.productCode.TabIndex = 6;
+            this.productCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // workOrder
+            // 
+            this.workOrder.AutoSize = true;
+            this.workOrder.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.workOrder.Location = new System.Drawing.Point(394, 0);
+            this.workOrder.Name = "workOrder";
+            this.workOrder.Size = new System.Drawing.Size(147, 64);
+            this.workOrder.TabIndex = 5;
+            this.workOrder.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label4.Location = new System.Drawing.Point(795, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(75, 64);
+            this.label4.TabIndex = 3;
+            this.label4.Text = "物料规格: ";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label1.Location = new System.Drawing.Point(3, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(75, 64);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "条码号: ";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label3.Location = new System.Drawing.Point(547, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(75, 64);
+            this.label3.TabIndex = 2;
+            this.label3.Text = "物料编号: ";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label2.Location = new System.Drawing.Point(313, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(75, 64);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "物料名称: ";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // serialNumber
+            // 
+            this.serialNumber.AutoSize = true;
+            this.serialNumber.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.serialNumber.Location = new System.Drawing.Point(84, 0);
+            this.serialNumber.Name = "serialNumber";
+            this.serialNumber.Size = new System.Drawing.Size(223, 64);
+            this.serialNumber.TabIndex = 4;
+            this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // 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(311, 19);
+            this.LockMakeCode.Name = "LockMakeCode";
+            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
+            this.LockMakeCode.TabIndex = 181;
+            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(102, 19);
+            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 = 180;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
+            // 
             // Make_BakingManage
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
@@ -658,14 +742,16 @@
             this.Load += new System.EventHandler(this.Make_InBaking_Load);
             this.Container.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.DataBox)).EndInit();
-            this.SNDetails.ResumeLayout(false);
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
             this.tableLayoutPanel2.ResumeLayout(false);
             this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            this.panel3.ResumeLayout(false);
+            this.panel3.PerformLayout();
+            this.SNDetails.ResumeLayout(false);
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.tableLayoutPanel1.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -721,5 +807,12 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn IN_NAME;
         private System.Windows.Forms.DataGridViewTextBoxColumn BAKING_TIME;
         private System.Windows.Forms.DataGridViewTextBoxColumn PR_SPEC;
+        private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.TextBox textBox2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_BakingManage.cs

@@ -326,7 +326,7 @@ namespace UAS_MES_NEW.Make
             }
             if (string.IsNullOrEmpty(ReelNoVal1.Text))
             {
-                MessageBox.Show("请扫描入烘烤物料条码");
+                MessageBox.Show("请扫描出烘烤物料条码");
                 return;
             }
 
@@ -347,5 +347,29 @@ namespace UAS_MES_NEW.Make
             MessageBox.Show($"条码号:{ReelNoVal1.Text} 出烘烤箱成功");
         }
 
+        private void textBox2_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            if (string.IsNullOrEmpty(textBox1.Text))
+            {
+                MessageBox.Show("请输入烘烤品质确认人员");
+                return;
+            }
+
+            dt = (DataTable)dh.ExecuteSql($@"SELECT * FROM baking_log WHERE status = '已烘烤' AND reel_no = '{textBox2.Text.Trim()}'", "select");
+            if (dt.Rows.Count == 0)
+            {
+                MessageBox.Show($"条码号:{textBox2.Text} 暂无操作出烘烤，请重试");
+                textBox2.Focus();
+                textBox2.SelectAll();
+                return;
+            }
+
+            dh.ExecuteSql($@"UPDATE baking_log SET baking_qa_time = sysdate,baking_qa = '{textBox1.Text.Trim()}' WHERE reel_no = '{textBox2.Text.Trim()}'", "insert");
+            textBox2.Text = "";
+            LoadBaking();
+            MessageBox.Show($"条码号:{textBox2.Text} 品质确认成功");
+        }
     }
 }