3rd迭代

UAS_MES_WEIP/FunctionCode/Make/Make_BakingManage.Designer.cs

@@ -28,6 +28,15 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.Container = new System.Windows.Forms.TableLayoutPanel();
+            this.DataBox = new System.Windows.Forms.DataGridView();
+            this.BOX_NO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.WORK_ORDER = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.REEL_NO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.IN_DATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ESTIMATE_TIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.IN_NAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BAKING_TIME = 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();
@@ -38,14 +47,6 @@
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.serialNumber = new System.Windows.Forms.Label();
-            this.Container = new System.Windows.Forms.TableLayoutPanel();
-            this.DataBox = new System.Windows.Forms.DataGridView();
-            this.BOX_NO = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.REEL_NO = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.IN_DATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ESTIMATE_TIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.IN_NAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.OUT_NAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
             this.panel2 = new System.Windows.Forms.Panel();
             this.EmployeeVal1 = new System.Windows.Forms.TextBox();
@@ -54,6 +55,9 @@
             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();
@@ -64,15 +68,127 @@
             this.BackingLab = new System.Windows.Forms.Label();
             this.ReelNoVal = new System.Windows.Forms.TextBox();
             this.ReelNoLab = new System.Windows.Forms.Label();
-            this.SNDetails.SuspendLayout();
-            this.tableLayoutPanel1.SuspendLayout();
+            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.Container.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DataBox)).BeginInit();
+            this.SNDetails.SuspendLayout();
+            this.tableLayoutPanel1.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
             this.panel2.SuspendLayout();
             this.panel1.SuspendLayout();
             this.SuspendLayout();
             // 
+            // Container
+            // 
+            this.Container.ColumnCount = 1;
+            this.Container.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.Container.Controls.Add(this.DataBox, 0, 2);
+            this.Container.Controls.Add(this.SNDetails, 0, 0);
+            this.Container.Controls.Add(this.tableLayoutPanel2, 0, 1);
+            this.Container.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.Container.Location = new System.Drawing.Point(0, 0);
+            this.Container.Margin = new System.Windows.Forms.Padding(4);
+            this.Container.Name = "Container";
+            this.Container.RowCount = 3;
+            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 15F));
+            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F));
+            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 55F));
+            this.Container.Size = new System.Drawing.Size(1280, 720);
+            this.Container.TabIndex = 9;
+            // 
+            // 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.BOX_NO,
+            this.WORK_ORDER,
+            this.REEL_NO,
+            this.IN_DATE,
+            this.ESTIMATE_TIME,
+            this.IN_NAME,
+            this.BAKING_TIME});
+            this.DataBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.DataBox.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
+            this.DataBox.Location = new System.Drawing.Point(3, 327);
+            this.DataBox.Name = "DataBox";
+            this.DataBox.ReadOnly = true;
+            this.DataBox.RowHeadersWidth = 62;
+            this.DataBox.RowTemplate.Height = 30;
+            this.DataBox.Size = new System.Drawing.Size(1274, 390);
+            this.DataBox.TabIndex = 155;
+            // 
+            // BOX_NO
+            // 
+            this.BOX_NO.DataPropertyName = "BOX_NO";
+            this.BOX_NO.HeaderText = "烘烤箱号";
+            this.BOX_NO.MinimumWidth = 8;
+            this.BOX_NO.Name = "BOX_NO";
+            this.BOX_NO.ReadOnly = true;
+            this.BOX_NO.Visible = false;
+            this.BOX_NO.Width = 150;
+            // 
+            // 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 = 130;
+            // 
+            // REEL_NO
+            // 
+            this.REEL_NO.DataPropertyName = "REEL_NO";
+            this.REEL_NO.HeaderText = "物料条码";
+            this.REEL_NO.MinimumWidth = 8;
+            this.REEL_NO.Name = "REEL_NO";
+            this.REEL_NO.ReadOnly = true;
+            this.REEL_NO.Width = 150;
+            // 
+            // IN_DATE
+            // 
+            this.IN_DATE.DataPropertyName = "IN_DATE";
+            this.IN_DATE.HeaderText = "入烘烤时间";
+            this.IN_DATE.MinimumWidth = 8;
+            this.IN_DATE.Name = "IN_DATE";
+            this.IN_DATE.ReadOnly = true;
+            this.IN_DATE.Width = 150;
+            // 
+            // ESTIMATE_TIME
+            // 
+            this.ESTIMATE_TIME.DataPropertyName = "ESTIMATE_TIME";
+            this.ESTIMATE_TIME.HeaderText = "预计烘烤时长";
+            this.ESTIMATE_TIME.MinimumWidth = 8;
+            this.ESTIMATE_TIME.Name = "ESTIMATE_TIME";
+            this.ESTIMATE_TIME.ReadOnly = true;
+            this.ESTIMATE_TIME.Width = 150;
+            // 
+            // IN_NAME
+            // 
+            this.IN_NAME.DataPropertyName = "IN_NAME";
+            this.IN_NAME.HeaderText = "入烘烤人员";
+            this.IN_NAME.MinimumWidth = 8;
+            this.IN_NAME.Name = "IN_NAME";
+            this.IN_NAME.ReadOnly = true;
+            this.IN_NAME.Width = 150;
+            // 
+            // BAKING_TIME
+            // 
+            this.BAKING_TIME.DataPropertyName = "BAKING_TIME";
+            this.BAKING_TIME.HeaderText = "当前烘烤时间";
+            this.BAKING_TIME.MinimumWidth = 8;
+            this.BAKING_TIME.Name = "BAKING_TIME";
+            this.BAKING_TIME.ReadOnly = true;
+            this.BAKING_TIME.Width = 150;
+            // 
             // SNDetails
             // 
             this.SNDetails.BorderColor = System.Drawing.Color.Black;
@@ -201,101 +317,6 @@
             this.serialNumber.TabIndex = 4;
             this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // Container
-            // 
-            this.Container.ColumnCount = 1;
-            this.Container.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.Container.Controls.Add(this.DataBox, 0, 2);
-            this.Container.Controls.Add(this.SNDetails, 0, 0);
-            this.Container.Controls.Add(this.tableLayoutPanel2, 0, 1);
-            this.Container.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.Container.Location = new System.Drawing.Point(0, 0);
-            this.Container.Margin = new System.Windows.Forms.Padding(4);
-            this.Container.Name = "Container";
-            this.Container.RowCount = 3;
-            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 15F));
-            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F));
-            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 55F));
-            this.Container.Size = new System.Drawing.Size(1280, 720);
-            this.Container.TabIndex = 9;
-            // 
-            // 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.BOX_NO,
-            this.REEL_NO,
-            this.IN_DATE,
-            this.ESTIMATE_TIME,
-            this.IN_NAME,
-            this.OUT_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, 327);
-            this.DataBox.Name = "DataBox";
-            this.DataBox.ReadOnly = true;
-            this.DataBox.RowHeadersWidth = 62;
-            this.DataBox.RowTemplate.Height = 30;
-            this.DataBox.Size = new System.Drawing.Size(1274, 390);
-            this.DataBox.TabIndex = 155;
-            // 
-            // BOX_NO
-            // 
-            this.BOX_NO.DataPropertyName = "BOX_NO";
-            this.BOX_NO.HeaderText = "烘烤箱号";
-            this.BOX_NO.MinimumWidth = 8;
-            this.BOX_NO.Name = "BOX_NO";
-            this.BOX_NO.ReadOnly = true;
-            this.BOX_NO.Width = 150;
-            // 
-            // REEL_NO
-            // 
-            this.REEL_NO.DataPropertyName = "REEL_NO";
-            this.REEL_NO.HeaderText = "物料条码";
-            this.REEL_NO.MinimumWidth = 8;
-            this.REEL_NO.Name = "REEL_NO";
-            this.REEL_NO.ReadOnly = true;
-            this.REEL_NO.Width = 150;
-            // 
-            // IN_DATE
-            // 
-            this.IN_DATE.DataPropertyName = "IN_DATE";
-            this.IN_DATE.HeaderText = "入烘烤时间";
-            this.IN_DATE.MinimumWidth = 8;
-            this.IN_DATE.Name = "IN_DATE";
-            this.IN_DATE.ReadOnly = true;
-            this.IN_DATE.Width = 150;
-            // 
-            // ESTIMATE_TIME
-            // 
-            this.ESTIMATE_TIME.DataPropertyName = "ESTIMATE_TIME";
-            this.ESTIMATE_TIME.HeaderText = "预计烘烤时长";
-            this.ESTIMATE_TIME.MinimumWidth = 8;
-            this.ESTIMATE_TIME.Name = "ESTIMATE_TIME";
-            this.ESTIMATE_TIME.ReadOnly = true;
-            this.ESTIMATE_TIME.Width = 150;
-            // 
-            // IN_NAME
-            // 
-            this.IN_NAME.DataPropertyName = "IN_NAME";
-            this.IN_NAME.HeaderText = "入烘烤人员";
-            this.IN_NAME.MinimumWidth = 8;
-            this.IN_NAME.Name = "IN_NAME";
-            this.IN_NAME.ReadOnly = true;
-            this.IN_NAME.Width = 150;
-            // 
-            // OUT_NAME
-            // 
-            this.OUT_NAME.DataPropertyName = "OUT_NAME";
-            this.OUT_NAME.HeaderText = "出烘烤人员";
-            this.OUT_NAME.MinimumWidth = 8;
-            this.OUT_NAME.Name = "OUT_NAME";
-            this.OUT_NAME.ReadOnly = true;
-            this.OUT_NAME.Width = 150;
-            // 
             // tableLayoutPanel2
             // 
             this.tableLayoutPanel2.ColumnCount = 2;
@@ -325,7 +346,7 @@
             // 
             // EmployeeVal1
             // 
-            this.EmployeeVal1.Location = new System.Drawing.Point(109, 43);
+            this.EmployeeVal1.Location = new System.Drawing.Point(98, 57);
             this.EmployeeVal1.Name = "EmployeeVal1";
             this.EmployeeVal1.Size = new System.Drawing.Size(113, 31);
             this.EmployeeVal1.TabIndex = 180;
@@ -336,7 +357,7 @@
             // 
             this.Choose1.Cursor = System.Windows.Forms.Cursors.Hand;
             this.Choose1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Choose1.Location = new System.Drawing.Point(370, 88);
+            this.Choose1.Location = new System.Drawing.Point(359, 102);
             this.Choose1.Name = "Choose1";
             this.Choose1.Size = new System.Drawing.Size(90, 30);
             this.Choose1.TabIndex = 173;
@@ -348,7 +369,7 @@
             // 
             this.EmployeeLab1.AutoSize = true;
             this.EmployeeLab1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.EmployeeLab1.Location = new System.Drawing.Point(25, 43);
+            this.EmployeeLab1.Location = new System.Drawing.Point(25, 57);
             this.EmployeeLab1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.EmployeeLab1.Name = "EmployeeLab1";
             this.EmployeeLab1.Size = new System.Drawing.Size(80, 28);
@@ -357,7 +378,7 @@
             // 
             // ReelNoVal1
             // 
-            this.ReelNoVal1.Location = new System.Drawing.Point(110, 90);
+            this.ReelNoVal1.Location = new System.Drawing.Point(99, 104);
             this.ReelNoVal1.Name = "ReelNoVal1";
             this.ReelNoVal1.Size = new System.Drawing.Size(243, 31);
             this.ReelNoVal1.TabIndex = 164;
@@ -368,7 +389,7 @@
             // 
             this.ReelNoLab1.AutoSize = true;
             this.ReelNoLab1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ReelNoLab1.Location = new System.Drawing.Point(25, 90);
+            this.ReelNoLab1.Location = new System.Drawing.Point(25, 104);
             this.ReelNoLab1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ReelNoLab1.Name = "ReelNoLab1";
             this.ReelNoLab1.Size = new System.Drawing.Size(80, 28);
@@ -377,6 +398,9 @@
             // 
             // panel1
             // 
+            this.panel1.Controls.Add(this.LockMakeCode);
+            this.panel1.Controls.Add(this.ms_makecode_label);
+            this.panel1.Controls.Add(this.ma_code);
             this.panel1.Controls.Add(this.EmployeeVal);
             this.panel1.Controls.Add(this.EmployeeLab);
             this.panel1.Controls.Add(this.EstimateLab1);
@@ -393,9 +417,51 @@
             this.panel1.Size = new System.Drawing.Size(631, 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;
+            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(13, 19);
+            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(101, 28);
+            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(112, 6);
+            this.EmployeeVal.Location = new System.Drawing.Point(102, 60);
             this.EmployeeVal.Name = "EmployeeVal";
             this.EmployeeVal.Size = new System.Drawing.Size(113, 31);
             this.EmployeeVal.TabIndex = 178;
@@ -406,7 +472,7 @@
             // 
             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(28, 6);
+            this.EmployeeLab.Location = new System.Drawing.Point(28, 60);
             this.EmployeeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.EmployeeLab.Name = "EmployeeLab";
             this.EmployeeLab.Size = new System.Drawing.Size(80, 28);
@@ -417,7 +483,7 @@
             // 
             this.EstimateLab1.AutoSize = true;
             this.EstimateLab1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.EstimateLab1.Location = new System.Drawing.Point(171, 82);
+            this.EstimateLab1.Location = new System.Drawing.Point(161, 99);
             this.EstimateLab1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.EstimateLab1.Name = "EstimateLab1";
             this.EstimateLab1.Size = new System.Drawing.Size(54, 28);
@@ -426,7 +492,7 @@
             // 
             // EstimateVal
             // 
-            this.EstimateVal.Location = new System.Drawing.Point(112, 80);
+            this.EstimateVal.Location = new System.Drawing.Point(102, 97);
             this.EstimateVal.Name = "EstimateVal";
             this.EstimateVal.Size = new System.Drawing.Size(60, 31);
             this.EstimateVal.TabIndex = 175;
@@ -436,7 +502,7 @@
             // 
             this.EstimateLab.AutoSize = true;
             this.EstimateLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.EstimateLab.Location = new System.Drawing.Point(7, 81);
+            this.EstimateLab.Location = new System.Drawing.Point(13, 98);
             this.EstimateLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.EstimateLab.Name = "EstimateLab";
             this.EstimateLab.Size = new System.Drawing.Size(101, 28);
@@ -447,7 +513,7 @@
             // 
             this.Choose.Cursor = System.Windows.Forms.Cursors.Hand;
             this.Choose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Choose.Location = new System.Drawing.Point(372, 117);
+            this.Choose.Location = new System.Drawing.Point(365, 133);
             this.Choose.Name = "Choose";
             this.Choose.Size = new System.Drawing.Size(92, 30);
             this.Choose.TabIndex = 173;
@@ -457,26 +523,28 @@
             // 
             // BackingVal
             // 
-            this.BackingVal.Location = new System.Drawing.Point(112, 43);
+            this.BackingVal.Location = new System.Drawing.Point(102, 173);
             this.BackingVal.Name = "BackingVal";
             this.BackingVal.Size = new System.Drawing.Size(243, 31);
             this.BackingVal.TabIndex = 166;
+            this.BackingVal.Visible = false;
             this.BackingVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.BackingVal_KeyDown);
             // 
             // BackingLab
             // 
             this.BackingLab.AutoSize = true;
             this.BackingLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BackingLab.Location = new System.Drawing.Point(28, 45);
+            this.BackingLab.Location = new System.Drawing.Point(28, 175);
             this.BackingLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.BackingLab.Name = "BackingLab";
             this.BackingLab.Size = new System.Drawing.Size(80, 28);
             this.BackingLab.TabIndex = 165;
             this.BackingLab.Text = "烘烤箱:";
+            this.BackingLab.Visible = false;
             // 
             // ReelNoVal
             // 
-            this.ReelNoVal.Location = new System.Drawing.Point(112, 119);
+            this.ReelNoVal.Location = new System.Drawing.Point(102, 135);
             this.ReelNoVal.Name = "ReelNoVal";
             this.ReelNoVal.Size = new System.Drawing.Size(243, 31);
             this.ReelNoVal.TabIndex = 164;
@@ -487,13 +555,61 @@
             // 
             this.ReelNoLab.AutoSize = true;
             this.ReelNoLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ReelNoLab.Location = new System.Drawing.Point(28, 119);
+            this.ReelNoLab.Location = new System.Drawing.Point(28, 138);
             this.ReelNoLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ReelNoLab.Name = "ReelNoLab";
             this.ReelNoLab.Size = new System.Drawing.Size(80, 28);
             this.ReelNoLab.TabIndex = 163;
             this.ReelNoLab.Text = "条码号:";
             // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "BOX_NO";
+            this.dataGridViewTextBoxColumn1.HeaderText = "烘烤箱号";
+            this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "REEL_NO";
+            this.dataGridViewTextBoxColumn2.HeaderText = "物料条码";
+            this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "IN_DATE";
+            this.dataGridViewTextBoxColumn3.HeaderText = "入烘烤时间";
+            this.dataGridViewTextBoxColumn3.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "ESTIMATE_TIME";
+            this.dataGridViewTextBoxColumn4.HeaderText = "预计烘烤时长";
+            this.dataGridViewTextBoxColumn4.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "IN_NAME";
+            this.dataGridViewTextBoxColumn5.HeaderText = "入烘烤人员";
+            this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.DataPropertyName = "BAKING_TIME";
+            this.dataGridViewTextBoxColumn6.HeaderText = "烘烤时间";
+            this.dataGridViewTextBoxColumn6.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.Width = 150;
+            // 
             // Make_BakingManage
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
@@ -506,11 +622,11 @@
             this.Name = "Make_BakingManage";
             this.Text = "Make_InBaking";
             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.Container.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.DataBox)).EndInit();
             this.tableLayoutPanel2.ResumeLayout(false);
             this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
@@ -534,12 +650,6 @@
         private System.Windows.Forms.Label serialNumber;
         private System.Windows.Forms.TableLayoutPanel Container;
         private System.Windows.Forms.DataGridView DataBox;
-        private System.Windows.Forms.DataGridViewTextBoxColumn BOX_NO;
-        private System.Windows.Forms.DataGridViewTextBoxColumn REEL_NO;
-        private System.Windows.Forms.DataGridViewTextBoxColumn IN_DATE;
-        private System.Windows.Forms.DataGridViewTextBoxColumn ESTIMATE_TIME;
-        private System.Windows.Forms.DataGridViewTextBoxColumn IN_NAME;
-        private System.Windows.Forms.DataGridViewTextBoxColumn OUT_NAME;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Button Choose1;
@@ -550,13 +660,29 @@
         private System.Windows.Forms.TextBox EstimateVal;
         private System.Windows.Forms.Label EstimateLab;
         private System.Windows.Forms.Button Choose;
-        private System.Windows.Forms.TextBox BackingVal;
-        private System.Windows.Forms.Label BackingLab;
         private System.Windows.Forms.TextBox ReelNoVal;
         private System.Windows.Forms.Label ReelNoLab;
         private System.Windows.Forms.TextBox EmployeeVal;
         private System.Windows.Forms.Label EmployeeLab;
         private System.Windows.Forms.TextBox EmployeeVal1;
         private System.Windows.Forms.Label EmployeeLab1;
+        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.TextBox BackingVal;
+        private System.Windows.Forms.Label BackingLab;
+        private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
+        private System.Windows.Forms.Label ms_makecode_label;
+        private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
+        private System.Windows.Forms.DataGridViewTextBoxColumn BOX_NO;
+        private System.Windows.Forms.DataGridViewTextBoxColumn WORK_ORDER;
+        private System.Windows.Forms.DataGridViewTextBoxColumn REEL_NO;
+        private System.Windows.Forms.DataGridViewTextBoxColumn IN_DATE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn ESTIMATE_TIME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn IN_NAME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn BAKING_TIME;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_BakingManage.cs

@@ -8,6 +8,7 @@ using System.Text;
 using System.Windows.Forms;
 using UAS_MES_NEW.DataOperate;
 using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
 
 namespace UAS_MES_NEW.Make
 {
@@ -21,6 +22,7 @@ namespace UAS_MES_NEW.Make
         StringBuilder SQL = new StringBuilder();
         DataHelper dh = SystemInf.dh;
         DataTable dt;
+        DataTable Dbfind;
 
         private void Make_InBaking_Load(object sender, EventArgs e)
         {
@@ -31,6 +33,35 @@ namespace UAS_MES_NEW.Make
             ReLoad.Tick += ReLoadData;
             ReLoad.Start();
 
+            //设置锁定工单
+            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;
+        }
+
+        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.ToString(), "select");
+            if (dt.Rows.Count > 0)
+            {
+                BaseUtil.SetFormValue(this.Controls, dt);
+            }
+
+            EstimateVal.Focus();
+            EstimateVal.SelectAll();
         }
 
         private void ReLoadData(object sender, EventArgs e)
@@ -111,7 +142,10 @@ namespace UAS_MES_NEW.Make
 
         private void LoadBaking()
         {
-            dt = (DataTable)dh.ExecuteSql($"SELECT box_no,reel_no,in_date,in_name,estimate_time FROM baking_log WHERE status = '烘烤中'", "select");
+            SQL.Clear();
+            SQL.Append($@"SELECT work_order,box_no,reel_no,in_date,in_name,estimate_time,trunc((sysdate - in_date) * 24) || ':' || lpad(trunc(MOD((sysdate - in_date) * 24 * 60, 60)), 2, '0')
+                || ':' || lpad(trunc(MOD((sysdate - in_date) * 24 * 60 * 60, 60)),2,'0') baking_time FROM baking_log WHERE status = '烘烤中' ORDER BY in_date DESC");
+            dt = (DataTable)dh.ExecuteSql(SQL.ToString(), "select");
             DataBox.DataSource = dt;
         }
 
@@ -147,7 +181,7 @@ namespace UAS_MES_NEW.Make
 
             if (e.KeyCode != Keys.Enter) return;
 
-            BackingVal.Text = BackingVal.Text.Trim();
+            //BackingVal.Text = BackingVal.Text.Trim();
 
             EstimateVal.Focus();
             EstimateVal.SelectAll();
@@ -229,17 +263,23 @@ namespace UAS_MES_NEW.Make
 
         private void Choose_Click(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(EmployeeVal.Text))
+            if (string.IsNullOrEmpty(ma_code.Text))
             {
-                MessageBox.Show("请输入烘烤操作员姓名");
+                MessageBox.Show("请选择归属工单");
                 return;
             }
 
-            if (string.IsNullOrEmpty(BackingVal.Text))
+            if (string.IsNullOrEmpty(EmployeeVal.Text))
             {
-                MessageBox.Show("请扫描烘烤箱号");
+                MessageBox.Show("请输入烘烤操作员姓名");
                 return;
             }
+
+            //if (string.IsNullOrEmpty(BackingVal.Text))
+            //{
+            //    MessageBox.Show("请扫描烘烤箱号");
+            //    return;
+            //}
             if (string.IsNullOrEmpty(EstimateVal.Text))
             {
                 MessageBox.Show("请填写扫描时长");
@@ -258,12 +298,12 @@ namespace UAS_MES_NEW.Make
                 return;
             }
 
-            dh.ExecuteSql($@"INSERT INTO baking_log (baking_id,box_no,reel_no,status,in_date,in_name,estimate_time)
-                SELECT baking_log_seq.NEXTVAL,'{BackingVal.Text}', '{ReelNoVal.Text}', '烘烤中',sysdate,'{EmployeeVal.Text.Trim()}','{EstimateVal.Text}' FROM dual", "insert");
+            dh.ExecuteSql($@"INSERT INTO baking_log (baking_id,box_no,reel_no,status,in_date,in_name,estimate_time,work_order)
+                SELECT baking_log_seq.NEXTVAL,'', '{ReelNoVal.Text}', '烘烤中',sysdate,'{EmployeeVal.Text.Trim()}','{EstimateVal.Text}','{ma_code.Text}' FROM dual", "insert");
 
-            EmployeeVal.Text = "";
-            BackingVal.Text = "";
-            EstimateVal.Text = "";
+            //EmployeeVal.Text = "";
+            //BackingVal.Text = "";
+            //EstimateVal.Text = "";
             ReelNoVal.Text = "";
             UpdateMaterial("C");
             LoadBaking();
@@ -292,8 +332,8 @@ namespace UAS_MES_NEW.Make
                 return;
             }
 
-            dh.ExecuteSql($@"UPDATE baking_log SET status = '已烘烤',out_date = sysdate,baking_time = TRUNC(sysdate - in_date),out_name = '{EmployeeVal1.Text.Trim()}' WHERE status = '烘烤中' and reel_no = '{ReelNoVal1.Text.Trim()}'", "insert");
-            EmployeeVal1.Text = "";
+            dh.ExecuteSql($@"UPDATE baking_log SET status = '已烘烤',out_date = sysdate,baking_time = trunc((sysdate - in_date) * 24) || ':' || lpad(trunc(MOD((sysdate - in_date) * 24 * 60, 60)),2,'0') || ':' || lpad(trunc(MOD((sysdate - in_date) * 24 * 60 * 60, 60)),2,'0'),out_name = '{EmployeeVal1.Text.Trim()}' WHERE status = '烘烤中' and reel_no = '{ReelNoVal1.Text.Trim()}'", "insert");
+            //EmployeeVal1.Text = "";
             ReelNoVal1.Text = "";
             UpdateMaterial("C");
             LoadBaking();

UAS_MES_WEIP/FunctionCode/Make/Make_BakingManage.resx

@@ -120,22 +120,7 @@
   <metadata name="BOX_NO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="REEL_NO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="IN_DATE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ESTIMATE_TIME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="IN_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="OUT_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="BOX_NO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="WORK_ORDER.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="REEL_NO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -150,7 +135,7 @@
   <metadata name="IN_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="OUT_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="BAKING_TIME.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_BurnInfo.Designer.cs

@@ -39,11 +39,23 @@
             this.DotVal = new System.Windows.Forms.TextBox();
             this.Confirm = new System.Windows.Forms.Button();
             this.TopBox = new System.Windows.Forms.Panel();
+            this.ma_qty = new System.Windows.Forms.TextBox();
+            this.TargetQtyLab = new System.Windows.Forms.Label();
+            this.pr_spec = new System.Windows.Forms.TextBox();
+            this.PrdetailLab = new System.Windows.Forms.Label();
             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();
+            this.line = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.burn_software = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.check_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dot_detail = 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();
@@ -56,18 +68,8 @@
             this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.PrdetailLab = new System.Windows.Forms.Label();
-            this.pr_spec = new System.Windows.Forms.TextBox();
-            this.ma_qty = new System.Windows.Forms.TextBox();
-            this.TargetQtyLab = new System.Windows.Forms.Label();
-            this.work_order = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.burn_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.line = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.burn_software = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.check_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dot_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.update_time = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.update_name = 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();
@@ -89,7 +91,7 @@
             // 
             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, 75);
+            this.LineLab.Location = new System.Drawing.Point(726, 75);
             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);
@@ -100,7 +102,7 @@
             // LineVal
             // 
             this.LineVal.FormattingEnabled = true;
-            this.LineVal.Location = new System.Drawing.Point(463, 75);
+            this.LineVal.Location = new System.Drawing.Point(777, 74);
             this.LineVal.Name = "LineVal";
             this.LineVal.Size = new System.Drawing.Size(243, 32);
             this.LineVal.TabIndex = 145;
@@ -178,10 +180,14 @@
             this.Confirm.TabIndex = 152;
             this.Confirm.Text = "确定";
             this.Confirm.UseVisualStyleBackColor = true;
+            this.Confirm.Visible = false;
             this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
             // 
             // TopBox
             // 
+            this.TopBox.Controls.Add(this.ma_code);
+            this.TopBox.Controls.Add(this.EmployeeVal);
+            this.TopBox.Controls.Add(this.EmployeeLab);
             this.TopBox.Controls.Add(this.ma_qty);
             this.TopBox.Controls.Add(this.TargetQtyLab);
             this.TopBox.Controls.Add(this.pr_spec);
@@ -196,7 +202,6 @@
             this.TopBox.Controls.Add(this.CheckCodeVal);
             this.TopBox.Controls.Add(this.ms_makecode_label);
             this.TopBox.Controls.Add(this.DotLab);
-            this.TopBox.Controls.Add(this.ma_code);
             this.TopBox.Controls.Add(this.CheckCodeLab);
             this.TopBox.Controls.Add(this.BurnSwVal);
             this.TopBox.Controls.Add(this.BurnSwLab);
@@ -206,6 +211,44 @@
             this.TopBox.Size = new System.Drawing.Size(1280, 201);
             this.TopBox.TabIndex = 153;
             // 
+            // ma_qty
+            // 
+            this.ma_qty.Enabled = false;
+            this.ma_qty.Location = new System.Drawing.Point(463, 30);
+            this.ma_qty.Name = "ma_qty";
+            this.ma_qty.Size = new System.Drawing.Size(61, 31);
+            this.ma_qty.TabIndex = 159;
+            // 
+            // TargetQtyLab
+            // 
+            this.TargetQtyLab.AutoSize = true;
+            this.TargetQtyLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.TargetQtyLab.Location = new System.Drawing.Point(395, 30);
+            this.TargetQtyLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.TargetQtyLab.Name = "TargetQtyLab";
+            this.TargetQtyLab.Size = new System.Drawing.Size(96, 28);
+            this.TargetQtyLab.TabIndex = 158;
+            this.TargetQtyLab.Text = "工单数量";
+            // 
+            // pr_spec
+            // 
+            this.pr_spec.Enabled = false;
+            this.pr_spec.Location = new System.Drawing.Point(610, 30);
+            this.pr_spec.Name = "pr_spec";
+            this.pr_spec.Size = new System.Drawing.Size(429, 31);
+            this.pr_spec.TabIndex = 157;
+            // 
+            // PrdetailLab
+            // 
+            this.PrdetailLab.AutoSize = true;
+            this.PrdetailLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.PrdetailLab.Location = new System.Drawing.Point(541, 30);
+            this.PrdetailLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.PrdetailLab.Name = "PrdetailLab";
+            this.PrdetailLab.Size = new System.Drawing.Size(102, 28);
+            this.PrdetailLab.TabIndex = 156;
+            this.PrdetailLab.Text = "机型信息 ";
+            // 
             // BurnLotnoVal
             // 
             this.BurnLotnoVal.Location = new System.Drawing.Point(91, 75);
@@ -281,6 +324,79 @@
             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;
+            // 
+            // burn_lotno
+            // 
+            this.burn_lotno.DataPropertyName = "burn_lotno";
+            this.burn_lotno.HeaderText = "烧录批号";
+            this.burn_lotno.MinimumWidth = 8;
+            this.burn_lotno.Name = "burn_lotno";
+            this.burn_lotno.ReadOnly = true;
+            this.burn_lotno.Width = 150;
+            // 
+            // line
+            // 
+            this.line.DataPropertyName = "line";
+            this.line.HeaderText = "线体";
+            this.line.MinimumWidth = 8;
+            this.line.Name = "line";
+            this.line.ReadOnly = true;
+            this.line.Visible = false;
+            this.line.Width = 150;
+            // 
+            // burn_software
+            // 
+            this.burn_software.DataPropertyName = "burn_software";
+            this.burn_software.HeaderText = "烧录软件";
+            this.burn_software.MinimumWidth = 8;
+            this.burn_software.Name = "burn_software";
+            this.burn_software.ReadOnly = true;
+            this.burn_software.Width = 150;
+            // 
+            // check_code
+            // 
+            this.check_code.DataPropertyName = "check_code";
+            this.check_code.HeaderText = "校验码";
+            this.check_code.MinimumWidth = 8;
+            this.check_code.Name = "check_code";
+            this.check_code.ReadOnly = true;
+            this.check_code.Width = 150;
+            // 
+            // dot_detail
+            // 
+            this.dot_detail.DataPropertyName = "dot_detail";
+            this.dot_detail.HeaderText = "打点信息";
+            this.dot_detail.MinimumWidth = 8;
+            this.dot_detail.Name = "dot_detail";
+            this.dot_detail.ReadOnly = true;
+            this.dot_detail.Width = 150;
+            // 
+            // 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;
@@ -404,116 +520,23 @@
             this.dataGridViewTextBoxColumn8.ReadOnly = true;
             this.dataGridViewTextBoxColumn8.Width = 150;
             // 
-            // PrdetailLab
-            // 
-            this.PrdetailLab.AutoSize = true;
-            this.PrdetailLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrdetailLab.Location = new System.Drawing.Point(541, 30);
-            this.PrdetailLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.PrdetailLab.Name = "PrdetailLab";
-            this.PrdetailLab.Size = new System.Drawing.Size(102, 28);
-            this.PrdetailLab.TabIndex = 156;
-            this.PrdetailLab.Text = "机型信息 ";
-            // 
-            // pr_spec
-            // 
-            this.pr_spec.Enabled = false;
-            this.pr_spec.Location = new System.Drawing.Point(610, 30);
-            this.pr_spec.Name = "pr_spec";
-            this.pr_spec.Size = new System.Drawing.Size(429, 31);
-            this.pr_spec.TabIndex = 157;
-            // 
-            // ma_qty
-            // 
-            this.ma_qty.Enabled = false;
-            this.ma_qty.Location = new System.Drawing.Point(463, 30);
-            this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(61, 31);
-            this.ma_qty.TabIndex = 159;
-            // 
-            // TargetQtyLab
-            // 
-            this.TargetQtyLab.AutoSize = true;
-            this.TargetQtyLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.TargetQtyLab.Location = new System.Drawing.Point(395, 30);
-            this.TargetQtyLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.TargetQtyLab.Name = "TargetQtyLab";
-            this.TargetQtyLab.Size = new System.Drawing.Size(96, 28);
-            this.TargetQtyLab.TabIndex = 158;
-            this.TargetQtyLab.Text = "工单数量";
-            // 
-            // 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;
-            // 
-            // burn_lotno
+            // EmployeeVal
             // 
-            this.burn_lotno.DataPropertyName = "burn_lotno";
-            this.burn_lotno.HeaderText = "烧录批号";
-            this.burn_lotno.MinimumWidth = 8;
-            this.burn_lotno.Name = "burn_lotno";
-            this.burn_lotno.ReadOnly = true;
-            this.burn_lotno.Width = 150;
+            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;
             // 
-            // line
+            // EmployeeLab
             // 
-            this.line.DataPropertyName = "line";
-            this.line.HeaderText = "线体";
-            this.line.MinimumWidth = 8;
-            this.line.Name = "line";
-            this.line.ReadOnly = true;
-            this.line.Visible = false;
-            this.line.Width = 150;
-            // 
-            // burn_software
-            // 
-            this.burn_software.DataPropertyName = "burn_software";
-            this.burn_software.HeaderText = "烧录软件";
-            this.burn_software.MinimumWidth = 8;
-            this.burn_software.Name = "burn_software";
-            this.burn_software.ReadOnly = true;
-            this.burn_software.Width = 150;
-            // 
-            // check_code
-            // 
-            this.check_code.DataPropertyName = "check_code";
-            this.check_code.HeaderText = "校验码";
-            this.check_code.MinimumWidth = 8;
-            this.check_code.Name = "check_code";
-            this.check_code.ReadOnly = true;
-            this.check_code.Width = 150;
-            // 
-            // dot_detail
-            // 
-            this.dot_detail.DataPropertyName = "dot_detail";
-            this.dot_detail.HeaderText = "打点信息";
-            this.dot_detail.MinimumWidth = 8;
-            this.dot_detail.Name = "dot_detail";
-            this.dot_detail.ReadOnly = true;
-            this.dot_detail.Width = 150;
-            // 
-            // 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;
+            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
             // 
@@ -579,5 +602,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dot_detail;
         private System.Windows.Forms.DataGridViewTextBoxColumn update_time;
         private System.Windows.Forms.DataGridViewTextBoxColumn update_name;
+        private System.Windows.Forms.TextBox EmployeeVal;
+        private System.Windows.Forms.Label EmployeeLab;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.cs

@@ -71,6 +71,8 @@ namespace UAS_MES_NEW.Make
             {
                 DataBox.DataSource = dt;
             }
+
+            ShowMsg(1, $"工单: {ma_code.Text} 已找到{dt.Rows.Count}条烧录记录");
         }
 
         private void Confirm_Click(object sender, EventArgs e)
@@ -154,8 +156,63 @@ namespace UAS_MES_NEW.Make
                 }
             }
 
-            BurnSwVal.Focus();
-            BurnSwVal.SelectAll();
+            if (string.IsNullOrEmpty(ma_code.Text))
+            {
+                ShowMsg(0, "请选择归属工单");
+                ma_code.Focus();
+                return;
+            }
+
+            if (string.IsNullOrEmpty(EmployeeVal.Text))
+            {
+                ShowMsg(0, "请输入操作人员");
+                ma_code.Focus();
+                return;
+            }
+
+            /*if (string.IsNullOrEmpty(LineVal.Text))
+            {
+                ShowMsg(0, "请选择线体");
+                LineVal.Focus();
+                LineVal.SelectAll();
+                return;
+            }*/
+
+            if (string.IsNullOrEmpty(BurnLotnoVal.Text))
+            {
+                ShowMsg(0, "请扫描包批次号");
+                BurnLotnoVal.Focus();
+                BurnLotnoVal.SelectAll();
+                return;
+            }
+            dt = (DataTable)dh.ExecuteSql($@"select * from burn_info where burn_lotno = '{BurnLotnoVal.Text}'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                ShowMsg(0, $"批号:{BurnLotnoVal.Text} 已记录，请勿重复使用");
+                return;
+            }
+
+            dh.ExecuteSql($@"insert INTO burn_info (burn_id,burn_lotno,burn_software,
+                check_code,dot_detail,line,
+                update_name,update_time,work_order) VALUES (BURN_INFO_SEQ.nextval,'{BurnLotnoVal.Text.Trim()}','{BurnSwVal.Text.Trim()}',
+                '{CheckCodeVal.Text.Trim()}','{DotVal.Text.Trim()}','{LineVal.Text.Trim()}',
+                '{EmployeeVal.Text}',sysdate,'{ma_code.Text.Trim()}')", "insert");
+
+            BurnLotnoVal.Focus();
+            BurnLotnoVal.SelectAll();
+            BurnLotnoVal.Text = "";
+
+            /*BurnSwVal.Text = "";
+            CheckCodeVal.Text = "";
+            DotVal.Text = "";*/
+
+            ShowMsg(1, $"批号:{BurnLotnoVal.Text} 添加烧录信息成功");
+
+            dt = (DataTable)dh.ExecuteSql($"SELECT BURN_LOTNO,WORK_ORDER,LINE,BURN_SOFTWARE,CHECK_CODE,DOT_DETAIL,UPDATE_TIME,UPDATE_NAME FROM burn_info WHERE work_order = '{ma_code.Text}'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                DataBox.DataSource = dt;
+            }
         }
 
         private void BurnSwVal_KeyDown(object sender, KeyEventArgs e)

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.resx

@@ -141,4 +141,28 @@
   <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_BurnInspection.Designer.cs

@@ -30,6 +30,10 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_BurnInspection));
             this.panel1 = new System.Windows.Forms.Panel();
+            this.ma_qty = new System.Windows.Forms.TextBox();
+            this.TargetQtyLab = new System.Windows.Forms.Label();
+            this.pr_spec = new System.Windows.Forms.TextBox();
+            this.PrdetailLab = new System.Windows.Forms.Label();
             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();
@@ -59,10 +63,11 @@
             this.panel4 = new System.Windows.Forms.Panel();
             this.BurnLotnoVal = new System.Windows.Forms.TextBox();
             this.BurnLotnoLab = 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();
-            this.PrdetailLab = new System.Windows.Forms.Label();
+            this.EmployeeVal = new System.Windows.Forms.TextBox();
+            this.EmployeeLab = new System.Windows.Forms.Label();
+            this.OkBox = new System.Windows.Forms.CheckBox();
+            this.TestLab = new System.Windows.Forms.Label();
+            this.NgBox = new System.Windows.Forms.CheckBox();
             this.panel1.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
             this.panel2.SuspendLayout();
@@ -76,6 +81,8 @@
             this.panel1.Controls.Add(this.ma_qty);
             this.panel1.Controls.Add(this.TargetQtyLab);
             this.panel1.Controls.Add(this.pr_spec);
+            this.panel1.Controls.Add(this.EmployeeVal);
+            this.panel1.Controls.Add(this.EmployeeLab);
             this.panel1.Controls.Add(this.PrdetailLab);
             this.panel1.Controls.Add(this.LockMakeCode);
             this.panel1.Controls.Add(this.ms_makecode_label);
@@ -87,6 +94,44 @@
             this.panel1.Size = new System.Drawing.Size(1280, 112);
             this.panel1.TabIndex = 132;
             // 
+            // ma_qty
+            // 
+            this.ma_qty.Enabled = false;
+            this.ma_qty.Location = new System.Drawing.Point(444, 21);
+            this.ma_qty.Name = "ma_qty";
+            this.ma_qty.Size = new System.Drawing.Size(61, 31);
+            this.ma_qty.TabIndex = 164;
+            // 
+            // TargetQtyLab
+            // 
+            this.TargetQtyLab.AutoSize = true;
+            this.TargetQtyLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.TargetQtyLab.Location = new System.Drawing.Point(376, 21);
+            this.TargetQtyLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.TargetQtyLab.Name = "TargetQtyLab";
+            this.TargetQtyLab.Size = new System.Drawing.Size(96, 28);
+            this.TargetQtyLab.TabIndex = 163;
+            this.TargetQtyLab.Text = "工单数量";
+            // 
+            // pr_spec
+            // 
+            this.pr_spec.Enabled = false;
+            this.pr_spec.Location = new System.Drawing.Point(590, 21);
+            this.pr_spec.Name = "pr_spec";
+            this.pr_spec.Size = new System.Drawing.Size(429, 31);
+            this.pr_spec.TabIndex = 162;
+            // 
+            // PrdetailLab
+            // 
+            this.PrdetailLab.AutoSize = true;
+            this.PrdetailLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.PrdetailLab.Location = new System.Drawing.Point(522, 21);
+            this.PrdetailLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.PrdetailLab.Name = "PrdetailLab";
+            this.PrdetailLab.Size = new System.Drawing.Size(102, 28);
+            this.PrdetailLab.TabIndex = 161;
+            this.PrdetailLab.Text = "机型信息 ";
+            // 
             // LockMakeCode
             // 
             this.LockMakeCode.AutoSize = true;
@@ -192,7 +237,7 @@
             this.NG.ForeColor = System.Drawing.Color.Red;
             this.NG.Image = null;
             this.NG.IsShowBorder = true;
-            this.NG.Location = new System.Drawing.Point(650, 14);
+            this.NG.Location = new System.Drawing.Point(681, 52);
             this.NG.Margin = new System.Windows.Forms.Padding(5);
             this.NG.MoveImage = ((System.Drawing.Image)(resources.GetObject("NG.MoveImage")));
             this.NG.Name = "NG";
@@ -203,6 +248,7 @@
             this.NG.Tag = "IfRead";
             this.NG.Text = "NG";
             this.NG.UseVisualStyleBackColor = true;
+            this.NG.Visible = false;
             this.NG.Click += new System.EventHandler(this.NG_Click);
             // 
             // OK
@@ -216,7 +262,7 @@
             this.OK.ForeColor = System.Drawing.Color.Green;
             this.OK.Image = null;
             this.OK.IsShowBorder = true;
-            this.OK.Location = new System.Drawing.Point(441, 14);
+            this.OK.Location = new System.Drawing.Point(524, 52);
             this.OK.Margin = new System.Windows.Forms.Padding(5);
             this.OK.MoveImage = ((System.Drawing.Image)(resources.GetObject("OK.MoveImage")));
             this.OK.Name = "OK";
@@ -227,6 +273,7 @@
             this.OK.Tag = "IfRead";
             this.OK.Text = "OK";
             this.OK.UseVisualStyleBackColor = false;
+            this.OK.Visible = false;
             this.OK.Click += new System.EventHandler(this.OK_Click);
             // 
             // tableLayoutPanel1
@@ -301,7 +348,7 @@
             this.DataBox.ReadOnly = true;
             this.DataBox.RowHeadersWidth = 62;
             this.DataBox.RowTemplate.Height = 30;
-            this.DataBox.Size = new System.Drawing.Size(890, 500);
+            this.DataBox.Size = new System.Drawing.Size(890, 462);
             this.DataBox.TabIndex = 155;
             // 
             // BURN_ID
@@ -397,73 +444,92 @@
             // 
             // panel4
             // 
+            this.panel4.Controls.Add(this.OkBox);
+            this.panel4.Controls.Add(this.TestLab);
+            this.panel4.Controls.Add(this.NgBox);
             this.panel4.Controls.Add(this.BurnLotnoVal);
             this.panel4.Controls.Add(this.BurnLotnoLab);
             this.panel4.Controls.Add(this.OK);
             this.panel4.Controls.Add(this.NG);
             this.panel4.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel4.Location = new System.Drawing.Point(0, 500);
+            this.panel4.Location = new System.Drawing.Point(0, 462);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(890, 102);
+            this.panel4.Size = new System.Drawing.Size(890, 140);
             this.panel4.TabIndex = 156;
             // 
             // BurnLotnoVal
             // 
             this.BurnLotnoVal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.BurnLotnoVal.Location = new System.Drawing.Point(132, 27);
+            this.BurnLotnoVal.Location = new System.Drawing.Point(84, 65);
             this.BurnLotnoVal.Name = "BurnLotnoVal";
             this.BurnLotnoVal.Size = new System.Drawing.Size(243, 31);
             this.BurnLotnoVal.TabIndex = 162;
+            this.BurnLotnoVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.BurnLotnoVal_KeyDown);
             // 
             // BurnLotnoLab
             // 
             this.BurnLotnoLab.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.BurnLotnoLab.AutoSize = true;
             this.BurnLotnoLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BurnLotnoLab.Location = new System.Drawing.Point(70, 31);
+            this.BurnLotnoLab.Location = new System.Drawing.Point(7, 65);
             this.BurnLotnoLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.BurnLotnoLab.Name = "BurnLotnoLab";
             this.BurnLotnoLab.Size = new System.Drawing.Size(96, 28);
             this.BurnLotnoLab.TabIndex = 161;
             this.BurnLotnoLab.Text = "烧录批次";
             // 
-            // ma_qty
-            // 
-            this.ma_qty.Enabled = false;
-            this.ma_qty.Location = new System.Drawing.Point(444, 21);
-            this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(61, 31);
-            this.ma_qty.TabIndex = 164;
-            // 
-            // TargetQtyLab
-            // 
-            this.TargetQtyLab.AutoSize = true;
-            this.TargetQtyLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.TargetQtyLab.Location = new System.Drawing.Point(376, 21);
-            this.TargetQtyLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.TargetQtyLab.Name = "TargetQtyLab";
-            this.TargetQtyLab.Size = new System.Drawing.Size(96, 28);
-            this.TargetQtyLab.TabIndex = 163;
-            this.TargetQtyLab.Text = "工单数量";
-            // 
-            // pr_spec
-            // 
-            this.pr_spec.Enabled = false;
-            this.pr_spec.Location = new System.Drawing.Point(590, 21);
-            this.pr_spec.Name = "pr_spec";
-            this.pr_spec.Size = new System.Drawing.Size(429, 31);
-            this.pr_spec.TabIndex = 162;
-            // 
-            // PrdetailLab
-            // 
-            this.PrdetailLab.AutoSize = true;
-            this.PrdetailLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrdetailLab.Location = new System.Drawing.Point(522, 21);
-            this.PrdetailLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.PrdetailLab.Name = "PrdetailLab";
-            this.PrdetailLab.Size = new System.Drawing.Size(102, 28);
-            this.PrdetailLab.TabIndex = 161;
-            this.PrdetailLab.Text = "机型信息 ";
+            // EmployeeVal
+            // 
+            this.EmployeeVal.Location = new System.Drawing.Point(87, 59);
+            this.EmployeeVal.Name = "EmployeeVal";
+            this.EmployeeVal.Size = new System.Drawing.Size(113, 31);
+            this.EmployeeVal.TabIndex = 182;
+            // 
+            // 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(42, 62);
+            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 = 181;
+            this.EmployeeLab.Text = "抽检员";
+            // 
+            // OkBox
+            // 
+            this.OkBox.AutoSize = true;
+            this.OkBox.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.OkBox.Location = new System.Drawing.Point(120, 31);
+            this.OkBox.Name = "OkBox";
+            this.OkBox.Size = new System.Drawing.Size(62, 28);
+            this.OkBox.TabIndex = 183;
+            this.OkBox.Text = "OK";
+            this.OkBox.UseVisualStyleBackColor = true;
+            this.OkBox.Click += new System.EventHandler(this.OkBox_Click);
+            // 
+            // TestLab
+            // 
+            this.TestLab.AutoSize = true;
+            this.TestLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.TestLab.Location = new System.Drawing.Point(7, 29);
+            this.TestLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.TestLab.Name = "TestLab";
+            this.TestLab.Size = new System.Drawing.Size(96, 28);
+            this.TestLab.TabIndex = 185;
+            this.TestLab.Text = "判定结果";
+            // 
+            // NgBox
+            // 
+            this.NgBox.AutoSize = true;
+            this.NgBox.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.NgBox.Location = new System.Drawing.Point(225, 31);
+            this.NgBox.Name = "NgBox";
+            this.NgBox.Size = new System.Drawing.Size(64, 28);
+            this.NgBox.TabIndex = 184;
+            this.NgBox.Text = "NG";
+            this.NgBox.UseVisualStyleBackColor = true;
+            this.NgBox.Click += new System.EventHandler(this.NgBox_Click);
             // 
             // Make_BurnInspection
             // 
@@ -526,5 +592,10 @@
         private System.Windows.Forms.Label TargetQtyLab;
         private System.Windows.Forms.TextBox pr_spec;
         private System.Windows.Forms.Label PrdetailLab;
+        private System.Windows.Forms.TextBox EmployeeVal;
+        private System.Windows.Forms.Label EmployeeLab;
+        private System.Windows.Forms.CheckBox OkBox;
+        private System.Windows.Forms.Label TestLab;
+        private System.Windows.Forms.CheckBox NgBox;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_BurnInspection.cs

@@ -84,6 +84,8 @@ namespace UAS_MES_NEW.Make
             {
                 DataBox.DataSource = dt;
             }
+
+            ShowMsg(1, $"工单: {ma_code.Text} 已找到{dt.Rows.Count}条烧录记录");
         }
 
         private void ClearMsg_Click(object sender, EventArgs e)
@@ -107,9 +109,15 @@ namespace UAS_MES_NEW.Make
         {
             BurnLotnoVal.Text = BurnLotnoVal.Text.Trim();
 
+            if (string.IsNullOrEmpty(EmployeeVal.Text))
+            {
+                ShowMsg(0, $"请填写抽检人员");
+                return;
+            }
+
             if (DataBox.Rows.Count == 0)
             {
-                ShowMsg(0, $"请先查询出烧录批号");
+                ShowMsg(0, $"请选择工单筛选出烧录信息");
                 return;
             }
             if (string.IsNullOrEmpty(BurnLotnoVal.Text))
@@ -152,6 +160,30 @@ namespace UAS_MES_NEW.Make
             BurnLotnoVal.SelectAll();
         }
 
+        private void BurnLotnoVal_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            if (OkBox.Checked)
+            {
+                PassStation("OK");
+            }
+            else
+            {
+                PassStation("NG");
+            }
+        }
+
+        private void OkBox_Click(object sender, EventArgs e)
+        {
+            NgBox.Checked = false;
+        }
+
+        private void NgBox_Click(object sender, EventArgs e)
+        {
+            OkBox.Checked = false;
+        }
+
         private void ShowMsg(int type, string msg)
         {
             string fullDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");

UAS_MES_WEIP/FunctionCode/Make/Make_EquiConnect.Designer.cs

@@ -31,6 +31,14 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_EquiConnect));
             this.Container = new System.Windows.Forms.TableLayoutPanel();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.txtPath = new System.Windows.Forms.TextBox();
+            this.LineVal = new System.Windows.Forms.ComboBox();
+            this.SnType2 = new System.Windows.Forms.CheckBox();
+            this.SnType1 = new System.Windows.Forms.CheckBox();
+            this.SnTypeLab = new System.Windows.Forms.Label();
+            this.OkBox = new System.Windows.Forms.CheckBox();
+            this.TestLab = new System.Windows.Forms.Label();
+            this.NgBox = new System.Windows.Forms.CheckBox();
             this.EmployeeVal = new System.Windows.Forms.TextBox();
             this.EmployeeLab = new System.Windows.Forms.Label();
             this.onWatch = new System.Windows.Forms.Button();
@@ -39,15 +47,11 @@
             this.label5 = new System.Windows.Forms.Label();
             this.Choose = new System.Windows.Forms.Button();
             this.label6 = new System.Windows.Forms.Label();
-            this.txtPath = new System.Windows.Forms.TextBox();
             this.LineLab = new System.Windows.Forms.Label();
-            this.LineVal = new System.Windows.Forms.ComboBox();
-            this.SNVal = new System.Windows.Forms.TextBox();
-            this.SNLab = new System.Windows.Forms.Label();
-            this.OkBox = new System.Windows.Forms.CheckBox();
-            this.NgBox = new System.Windows.Forms.CheckBox();
             this.OK = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.NG = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.SNVal = new System.Windows.Forms.TextBox();
+            this.SNLab = new System.Windows.Forms.Label();
             this.OperatResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
             this.SNDetails = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
@@ -61,7 +65,6 @@
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.serialNumber = new System.Windows.Forms.Label();
-            this.TestLab = new System.Windows.Forms.Label();
             this.Container.SuspendLayout();
             this.panel1.SuspendLayout();
             this.SNDetails.SuspendLayout();
@@ -88,6 +91,11 @@
             // 
             // panel1
             // 
+            this.panel1.Controls.Add(this.txtPath);
+            this.panel1.Controls.Add(this.LineVal);
+            this.panel1.Controls.Add(this.SnType2);
+            this.panel1.Controls.Add(this.SnType1);
+            this.panel1.Controls.Add(this.SnTypeLab);
             this.panel1.Controls.Add(this.OkBox);
             this.panel1.Controls.Add(this.TestLab);
             this.panel1.Controls.Add(this.NgBox);
@@ -99,9 +107,7 @@
             this.panel1.Controls.Add(this.label5);
             this.panel1.Controls.Add(this.Choose);
             this.panel1.Controls.Add(this.label6);
-            this.panel1.Controls.Add(this.txtPath);
             this.panel1.Controls.Add(this.LineLab);
-            this.panel1.Controls.Add(this.LineVal);
             this.panel1.Controls.Add(this.OK);
             this.panel1.Controls.Add(this.NG);
             this.panel1.Controls.Add(this.SNVal);
@@ -112,9 +118,97 @@
             this.panel1.Size = new System.Drawing.Size(1274, 174);
             this.panel1.TabIndex = 4;
             // 
+            // txtPath
+            // 
+            this.txtPath.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtPath.Location = new System.Drawing.Point(869, 59);
+            this.txtPath.Name = "txtPath";
+            this.txtPath.Size = new System.Drawing.Size(332, 31);
+            this.txtPath.TabIndex = 171;
+            this.txtPath.Visible = false;
+            // 
+            // LineVal
+            // 
+            this.LineVal.FormattingEnabled = true;
+            this.LineVal.Location = new System.Drawing.Point(1173, 96);
+            this.LineVal.Name = "LineVal";
+            this.LineVal.Size = new System.Drawing.Size(164, 32);
+            this.LineVal.TabIndex = 168;
+            this.LineVal.Visible = false;
+            // 
+            // SnType2
+            // 
+            this.SnType2.AutoSize = true;
+            this.SnType2.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.SnType2.Location = new System.Drawing.Point(227, 107);
+            this.SnType2.Name = "SnType2";
+            this.SnType2.Size = new System.Drawing.Size(90, 28);
+            this.SnType2.TabIndex = 183;
+            this.SnType2.Text = "序列号";
+            this.SnType2.UseVisualStyleBackColor = true;
+            this.SnType2.Click += new System.EventHandler(this.SnType2_Click);
+            // 
+            // SnType1
+            // 
+            this.SnType1.AutoSize = true;
+            this.SnType1.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.SnType1.Location = new System.Drawing.Point(131, 107);
+            this.SnType1.Name = "SnType1";
+            this.SnType1.Size = new System.Drawing.Size(90, 28);
+            this.SnType1.TabIndex = 181;
+            this.SnType1.Text = "拼板号";
+            this.SnType1.UseVisualStyleBackColor = true;
+            this.SnType1.Click += new System.EventHandler(this.SnType1_Click);
+            // 
+            // SnTypeLab
+            // 
+            this.SnTypeLab.AutoSize = true;
+            this.SnTypeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SnTypeLab.Location = new System.Drawing.Point(30, 106);
+            this.SnTypeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.SnTypeLab.Name = "SnTypeLab";
+            this.SnTypeLab.Size = new System.Drawing.Size(122, 28);
+            this.SnTypeLab.TabIndex = 182;
+            this.SnTypeLab.Text = "序列号类型:";
+            // 
+            // OkBox
+            // 
+            this.OkBox.AutoSize = true;
+            this.OkBox.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.OkBox.Location = new System.Drawing.Point(139, 66);
+            this.OkBox.Name = "OkBox";
+            this.OkBox.Size = new System.Drawing.Size(62, 28);
+            this.OkBox.TabIndex = 178;
+            this.OkBox.Text = "OK";
+            this.OkBox.UseVisualStyleBackColor = true;
+            this.OkBox.Click += new System.EventHandler(this.OkBox_Click);
+            // 
+            // TestLab
+            // 
+            this.TestLab.AutoSize = true;
+            this.TestLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.TestLab.Location = new System.Drawing.Point(44, 65);
+            this.TestLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.TestLab.Name = "TestLab";
+            this.TestLab.Size = new System.Drawing.Size(101, 28);
+            this.TestLab.TabIndex = 180;
+            this.TestLab.Text = "判定结果:";
+            // 
+            // NgBox
+            // 
+            this.NgBox.AutoSize = true;
+            this.NgBox.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.NgBox.Location = new System.Drawing.Point(216, 66);
+            this.NgBox.Name = "NgBox";
+            this.NgBox.Size = new System.Drawing.Size(64, 28);
+            this.NgBox.TabIndex = 179;
+            this.NgBox.Text = "NG";
+            this.NgBox.UseVisualStyleBackColor = true;
+            this.NgBox.Click += new System.EventHandler(this.NgBox_Click);
+            // 
             // EmployeeVal
             // 
-            this.EmployeeVal.Location = new System.Drawing.Point(101, 24);
+            this.EmployeeVal.Location = new System.Drawing.Point(118, 24);
             this.EmployeeVal.Name = "EmployeeVal";
             this.EmployeeVal.Size = new System.Drawing.Size(103, 31);
             this.EmployeeVal.TabIndex = 177;
@@ -125,18 +219,18 @@
             // 
             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(39, 24);
+            this.EmployeeLab.Location = new System.Drawing.Point(60, 24);
             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.Size = new System.Drawing.Size(80, 28);
             this.EmployeeLab.TabIndex = 176;
-            this.EmployeeLab.Text = "抽检员";
+            this.EmployeeLab.Text = "抽检员:";
             // 
             // onWatch
             // 
             this.onWatch.Cursor = System.Windows.Forms.Cursors.Hand;
             this.onWatch.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.onWatch.Location = new System.Drawing.Point(792, 102);
+            this.onWatch.Location = new System.Drawing.Point(869, 96);
             this.onWatch.Name = "onWatch";
             this.onWatch.Size = new System.Drawing.Size(122, 38);
             this.onWatch.TabIndex = 175;
@@ -148,7 +242,7 @@
             // 
             this.allParse.Cursor = System.Windows.Forms.Cursors.Hand;
             this.allParse.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.allParse.Location = new System.Drawing.Point(986, 102);
+            this.allParse.Location = new System.Drawing.Point(997, 96);
             this.allParse.Name = "allParse";
             this.allParse.Size = new System.Drawing.Size(122, 38);
             this.allParse.TabIndex = 174;
@@ -164,7 +258,7 @@
             "AOI设备",
             "X-ray设备",
             "CCD设备"});
-            this.Device.Location = new System.Drawing.Point(823, 12);
+            this.Device.Location = new System.Drawing.Point(869, 16);
             this.Device.Name = "Device";
             this.Device.Size = new System.Drawing.Size(285, 32);
             this.Device.TabIndex = 170;
@@ -174,7 +268,7 @@
             // 
             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(712, 16);
+            this.label5.Location = new System.Drawing.Point(779, 20);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(96, 28);
             this.label5.TabIndex = 169;
@@ -185,7 +279,7 @@
             // 
             this.Choose.Cursor = System.Windows.Forms.Cursors.Hand;
             this.Choose.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Choose.Location = new System.Drawing.Point(1176, 49);
+            this.Choose.Location = new System.Drawing.Point(1222, 57);
             this.Choose.Name = "Choose";
             this.Choose.Size = new System.Drawing.Size(90, 33);
             this.Choose.TabIndex = 172;
@@ -197,83 +291,24 @@
             // 
             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(689, 54);
+            this.label6.Location = new System.Drawing.Point(758, 59);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(117, 28);
             this.label6.TabIndex = 173;
             this.label6.Text = "文件夹路径";
             this.label6.Visible = false;
             // 
-            // txtPath
-            // 
-            this.txtPath.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtPath.Location = new System.Drawing.Point(823, 51);
-            this.txtPath.Name = "txtPath";
-            this.txtPath.Size = new System.Drawing.Size(332, 31);
-            this.txtPath.TabIndex = 171;
-            this.txtPath.Visible = false;
-            // 
             // 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(49, 93);
+            this.LineLab.Location = new System.Drawing.Point(1127, 96);
             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 = 167;
             this.LineLab.Text = "线体";
-            // 
-            // LineVal
-            // 
-            this.LineVal.FormattingEnabled = true;
-            this.LineVal.Location = new System.Drawing.Point(101, 93);
-            this.LineVal.Name = "LineVal";
-            this.LineVal.Size = new System.Drawing.Size(164, 32);
-            this.LineVal.TabIndex = 168;
-            // 
-            // SNVal
-            // 
-            this.SNVal.Location = new System.Drawing.Point(101, 133);
-            this.SNVal.Name = "SNVal";
-            this.SNVal.Size = new System.Drawing.Size(243, 31);
-            this.SNVal.TabIndex = 164;
-            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(39, 133);
-            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 = 163;
-            this.SNLab.Text = "序列号";
-            // 
-            // OkBox
-            // 
-            this.OkBox.AutoSize = true;
-            this.OkBox.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.OkBox.Location = new System.Drawing.Point(101, 61);
-            this.OkBox.Name = "OkBox";
-            this.OkBox.Size = new System.Drawing.Size(62, 28);
-            this.OkBox.TabIndex = 178;
-            this.OkBox.Text = "OK";
-            this.OkBox.UseVisualStyleBackColor = true;
-            this.OkBox.Click += new System.EventHandler(this.OkBox_Click);
-            // 
-            // NgBox
-            // 
-            this.NgBox.AutoSize = true;
-            this.NgBox.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.NgBox.Location = new System.Drawing.Point(169, 61);
-            this.NgBox.Name = "NgBox";
-            this.NgBox.Size = new System.Drawing.Size(64, 28);
-            this.NgBox.TabIndex = 179;
-            this.NgBox.Text = "NG";
-            this.NgBox.UseVisualStyleBackColor = true;
-            this.NgBox.Click += new System.EventHandler(this.NgBox_Click);
+            this.LineLab.Visible = false;
             // 
             // OK
             // 
@@ -285,7 +320,7 @@
             this.OK.ForeColor = System.Drawing.Color.Green;
             this.OK.Image = null;
             this.OK.IsShowBorder = true;
-            this.OK.Location = new System.Drawing.Point(400, 86);
+            this.OK.Location = new System.Drawing.Point(871, 142);
             this.OK.Margin = new System.Windows.Forms.Padding(5);
             this.OK.MoveImage = ((System.Drawing.Image)(resources.GetObject("OK.MoveImage")));
             this.OK.Name = "OK";
@@ -309,7 +344,7 @@
             this.NG.ForeColor = System.Drawing.Color.Red;
             this.NG.Image = null;
             this.NG.IsShowBorder = true;
-            this.NG.Location = new System.Drawing.Point(566, 86);
+            this.NG.Location = new System.Drawing.Point(1028, 142);
             this.NG.Margin = new System.Windows.Forms.Padding(5);
             this.NG.MoveImage = ((System.Drawing.Image)(resources.GetObject("NG.MoveImage")));
             this.NG.Name = "NG";
@@ -323,6 +358,25 @@
             this.NG.Visible = false;
             this.NG.Click += new System.EventHandler(this.NG_Click);
             // 
+            // SNVal
+            // 
+            this.SNVal.Location = new System.Drawing.Point(118, 145);
+            this.SNVal.Name = "SNVal";
+            this.SNVal.Size = new System.Drawing.Size(243, 31);
+            this.SNVal.TabIndex = 164;
+            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(60, 146);
+            this.SNLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.SNLab.Name = "SNLab";
+            this.SNLab.Size = new System.Drawing.Size(80, 28);
+            this.SNLab.TabIndex = 163;
+            this.SNLab.Text = "序列号:";
+            // 
             // OperatResult
             // 
             this.OperatResult.AcceptsTab = true;
@@ -485,17 +539,6 @@
             this.serialNumber.TabIndex = 4;
             this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
-            // TestLab
-            // 
-            this.TestLab.AutoSize = true;
-            this.TestLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.TestLab.Location = new System.Drawing.Point(18, 61);
-            this.TestLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.TestLab.Name = "TestLab";
-            this.TestLab.Size = new System.Drawing.Size(96, 28);
-            this.TestLab.TabIndex = 180;
-            this.TestLab.Text = "判定结果";
-            // 
             // Make_EquiConnect
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
@@ -552,5 +595,8 @@
         private System.Windows.Forms.CheckBox OkBox;
         private System.Windows.Forms.CheckBox NgBox;
         private System.Windows.Forms.Label TestLab;
+        private System.Windows.Forms.CheckBox SnType2;
+        private System.Windows.Forms.CheckBox SnType1;
+        private System.Windows.Forms.Label SnTypeLab;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_EquiConnect.cs

@@ -42,11 +42,11 @@ namespace UAS_MES_NEW.Make
                 return;
             }
 
-            if (string.IsNullOrEmpty(LineVal.Text))
+            /*if (string.IsNullOrEmpty(LineVal.Text))
             {
                 ShowMsg(0, "请选择线体");
                 return;
-            }
+            }*/
 
             if (string.IsNullOrEmpty(SNVal.Text))
             {
@@ -65,11 +65,11 @@ namespace UAS_MES_NEW.Make
                 return;
             }
 
-            if (string.IsNullOrEmpty(LineVal.Text))
+            /*if (string.IsNullOrEmpty(LineVal.Text))
             {
                 ShowMsg(0, "请选择线体");
                 return;
-            }
+            }*/
 
             if (string.IsNullOrEmpty(SNVal.Text))
             {
@@ -184,6 +184,16 @@ namespace UAS_MES_NEW.Make
             NgBox.Checked = false;
         }
 
+        private void SnType1_Click(object sender, EventArgs e)
+        {
+            SnType2.Checked = false;
+        }
+
+        private void SnType2_Click(object sender, EventArgs e)
+        {
+            SnType1.Checked = false;
+        }
+
         private void SNVal_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode != Keys.Enter) return;
@@ -196,21 +206,72 @@ namespace UAS_MES_NEW.Make
                 return;
             }
 
-            dt = (DataTable)dh.ExecuteSql($@"SELECT ms_makecode,ms_prodcode,cd_stepcode,cd_stepname,cd_stepno FROM makeserial,craft,craftdetail
-                WHERE ms_sncode = '{SNVal.Text}' AND ms_prodcode = cr_prodcode AND cr_id = cd_crid AND cd_stepno = 1 ORDER BY cd_stepno", "select");
-            if (dt.Rows.Count == 0)
+            if (!OkBox.Checked && !NgBox.Checked)
+            {
+                ShowMsg(0, "请勾选判定结果");
+                return;
+            }
+
+            if (!SnType1.Checked && !SnType2.Checked)
             {
-                ShowMsg(0, $"序列号:{SNVal.Text} 无归属记录,请过投入站后再采集Xray信息");
+                ShowMsg(0, "请勾选序列号类型");
                 return;
             }
 
-            dt = (DataTable)dh.ExecuteSql($@"SELECT mp_linecode FROM makeprocess WHERE mp_sncode = '{SNVal.Text}' AND mp_stepcode = '{dt.Rows[0]["cd_stepcode"]}'", "select");
-            if (dt.Rows.Count == 0)
+            if (string.IsNullOrEmpty(SNVal.Text))
             {
-                ShowMsg(0, $"序列号:{SNVal.Text} 无投入过站记录,请过投入站后再采集Xray信息");
+                ShowMsg(0, "请选择扫描序列号");
                 return;
             }
 
+            if (SnType1.Checked)
+            {
+                List<string> snList = new List<string>();
+                dt = (DataTable)dh.ExecuteSql($@"select * from smtbind where sb_maincode = '{SNVal.Text}'", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    foreach (DataRow dr in dt.Rows)
+                    {
+                        snList.Add(dr["sb_maincode"].ToString());
+                    }
+                }
+
+                foreach(string str in snList)
+                {
+                    dt = (DataTable)dh.ExecuteSql($@"SELECT ms_makecode,ms_prodcode,cd_stepcode,cd_stepname,cd_stepno FROM makeserial,craft,craftdetail
+                        WHERE ms_sncode = '{str}' AND ms_prodcode = cr_prodcode AND cr_id = cd_crid AND cd_stepno = 1 ORDER BY cd_stepno", "select");
+                    if (dt.Rows.Count == 0)
+                    {
+                        ShowMsg(0, $"拼板号:{SNVal.Text} 中序列号:{str} 无归属记录,请过投入站后再采集Xray信息");
+                        return;
+                    }
+
+                    dt = (DataTable)dh.ExecuteSql($@"SELECT mp_linecode FROM makeprocess WHERE mp_sncode = '{str}' AND mp_stepcode = '{dt.Rows[0]["cd_stepcode"]}'", "select");
+                    if (dt.Rows.Count == 0)
+                    {
+                        ShowMsg(0, $"拼板号:{SNVal.Text} 中序列号:{str} 无投入过站记录,请过投入站后再采集Xray信息");
+                        return;
+                    }
+                }
+            }
+            else
+            {
+                dt = (DataTable)dh.ExecuteSql($@"SELECT ms_makecode,ms_prodcode,cd_stepcode,cd_stepname,cd_stepno FROM makeserial,craft,craftdetail
+                WHERE ms_sncode = '{SNVal.Text}' AND ms_prodcode = cr_prodcode AND cr_id = cd_crid AND cd_stepno = 1 ORDER BY cd_stepno", "select");
+                if (dt.Rows.Count == 0)
+                {
+                    ShowMsg(0, $"序列号:{SNVal.Text} 无归属记录,请过投入站后再采集Xray信息");
+                    return;
+                }
+
+                dt = (DataTable)dh.ExecuteSql($@"SELECT mp_linecode FROM makeprocess WHERE mp_sncode = '{SNVal.Text}' AND mp_stepcode = '{dt.Rows[0]["cd_stepcode"]}'", "select");
+                if (dt.Rows.Count == 0)
+                {
+                    ShowMsg(0, $"序列号:{SNVal.Text} 无投入过站记录,请过投入站后再采集Xray信息");
+                    return;
+                }
+            }
+
             for (int i = 0; i <= LineVal.Items.Count; i++)
             {
                 string mplinecode = dt.Rows[0]["mp_linecode"].ToString();
@@ -222,28 +283,17 @@ namespace UAS_MES_NEW.Make
                 }
             }
 
-            if (string.IsNullOrEmpty(LineVal.Text))
-            {
-                ShowMsg(0, "请选择线体");
-                return;
-            }
-
-            if(!OkBox.Checked && !NgBox.Checked)
-            {
-                ShowMsg(0, "请勾选判定结果");
-                return;
-            }
-
-            if (string.IsNullOrEmpty(SNVal.Text))
-            {
-                ShowMsg(0, "请选择扫描序列号");
-                return;
-            }
+            //if (string.IsNullOrEmpty(LineVal.Text))
+            //{
+            //    ShowMsg(0, "请选择线体");
+            //    return;
+            //}
 
             InsertLog(OkBox.Checked ? "OK" : "NG");
 
             SNVal.Focus();
             SNVal.SelectAll();
+            SNVal.Text = "";
         }
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.Designer.cs

@@ -355,7 +355,7 @@
             this.normalButton1.Power = null;
             this.normalButton1.Size = new System.Drawing.Size(107, 42);
             this.normalButton1.TabIndex = 128;
-            this.normalButton1.Text = "6小时清洗";
+            this.normalButton1.Text = "12小时清洗";
             this.normalButton1.UseVisualStyleBackColor = false;
             this.normalButton1.Click += new System.EventHandler(this.normalButton1_Click);
             // 

UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.cs

@@ -565,7 +565,7 @@ namespace UAS_MES_NEW.Make
                             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 + "6小时清洗成功！");
+                            MessageBox.Show("刮刀" + SU_DEVCODE1.Text + "12小时清洗成功！");
                             SU_DEVCODE1.Text = "";
                             st_combinenumber.Text = "";
                             em_code1.Text = "";

UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.resx

@@ -294,30 +294,6 @@
   <metadata name="su_usemacode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="su_stcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="st_pcbcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SU_LINECODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_stverison.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_singlepringqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_table.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_usemacode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="Confirm.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStencil.Designer.cs

@@ -760,7 +760,7 @@
             this.normalButton1.Power = null;
             this.normalButton1.Size = new System.Drawing.Size(107, 42);
             this.normalButton1.TabIndex = 128;
-            this.normalButton1.Text = "6小时清洗";
+            this.normalButton1.Text = "12小时清洗";
             this.normalButton1.UseVisualStyleBackColor = false;
             this.normalButton1.Click += new System.EventHandler(this.normalButton1_Click);
             // 

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStencil.cs

@@ -566,7 +566,7 @@ namespace UAS_MES_NEW.Make
                             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 + "6小时清洗成功！");
+                            MessageBox.Show("钢网" + SU_DEVCODE1.Text + "12小时清洗成功！");
                             SU_DEVCODE1.Text = "";
                             st_combinenumber.Text = "";
                             em_code1.Text = "";

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStencil.resx

@@ -218,30 +218,6 @@
   <metadata name="su_usemacode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="su_stcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="st_pcbcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SU_LINECODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_stverison.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_singlepringqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_table.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="su_usemacode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="Confirm.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m