Forráskód Böngészése

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

callm 1 napja
szülő
commit
36e851c6e0

+ 530 - 0
UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.Designer.cs

@@ -0,0 +1,530 @@
+namespace UAS_MES_NEW.Make
+{
+    partial class Make_BurnInfo
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.ms_makecode_label = new System.Windows.Forms.Label();
+            this.LineLab = new System.Windows.Forms.Label();
+            this.LineVal = new System.Windows.Forms.ComboBox();
+            this.BurnSwVal = new System.Windows.Forms.TextBox();
+            this.BurnSwLab = new System.Windows.Forms.Label();
+            this.CheckCodeLab = new System.Windows.Forms.Label();
+            this.DotLab = new System.Windows.Forms.Label();
+            this.CheckCodeVal = new System.Windows.Forms.TextBox();
+            this.DotVal = new System.Windows.Forms.TextBox();
+            this.Confirm = new System.Windows.Forms.Button();
+            this.TopBox = new System.Windows.Forms.Panel();
+            this.BurnLotnoVal = new System.Windows.Forms.TextBox();
+            this.BurnLotnoLab = new System.Windows.Forms.Label();
+            this.DataBox = new System.Windows.Forms.DataGridView();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.RightBox = new System.Windows.Forms.Panel();
+            this.ClearMsg = new System.Windows.Forms.Button();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.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.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
+            this.TopBox.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.DataBox)).BeginInit();
+            this.tableLayoutPanel1.SuspendLayout();
+            this.RightBox.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // ms_makecode_label
+            // 
+            this.ms_makecode_label.AutoSize = true;
+            this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ms_makecode_label.Location = new System.Drawing.Point(25, 32);
+            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(96, 28);
+            this.ms_makecode_label.TabIndex = 142;
+            this.ms_makecode_label.Text = "归属工单";
+            // 
+            // LineLab
+            // 
+            this.LineLab.AutoSize = true;
+            this.LineLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.LineLab.Location = new System.Drawing.Point(402, 32);
+            this.LineLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.LineLab.Name = "LineLab";
+            this.LineLab.Size = new System.Drawing.Size(54, 28);
+            this.LineLab.TabIndex = 144;
+            this.LineLab.Text = "线体";
+            // 
+            // LineVal
+            // 
+            this.LineVal.FormattingEnabled = true;
+            this.LineVal.Location = new System.Drawing.Point(458, 32);
+            this.LineVal.Name = "LineVal";
+            this.LineVal.Size = new System.Drawing.Size(243, 32);
+            this.LineVal.TabIndex = 145;
+            // 
+            // BurnSwVal
+            // 
+            this.BurnSwVal.Location = new System.Drawing.Point(90, 102);
+            this.BurnSwVal.Multiline = true;
+            this.BurnSwVal.Name = "BurnSwVal";
+            this.BurnSwVal.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.BurnSwVal.Size = new System.Drawing.Size(276, 50);
+            this.BurnSwVal.TabIndex = 146;
+            this.BurnSwVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.BurnSwVal_KeyDown);
+            // 
+            // BurnSwLab
+            // 
+            this.BurnSwLab.AutoSize = true;
+            this.BurnSwLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.BurnSwLab.Location = new System.Drawing.Point(25, 111);
+            this.BurnSwLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.BurnSwLab.Name = "BurnSwLab";
+            this.BurnSwLab.Size = new System.Drawing.Size(96, 28);
+            this.BurnSwLab.TabIndex = 147;
+            this.BurnSwLab.Text = "烧录软件";
+            // 
+            // CheckCodeLab
+            // 
+            this.CheckCodeLab.AutoSize = true;
+            this.CheckCodeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.CheckCodeLab.Location = new System.Drawing.Point(402, 111);
+            this.CheckCodeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.CheckCodeLab.Name = "CheckCodeLab";
+            this.CheckCodeLab.Size = new System.Drawing.Size(75, 28);
+            this.CheckCodeLab.TabIndex = 148;
+            this.CheckCodeLab.Text = "效验码";
+            // 
+            // DotLab
+            // 
+            this.DotLab.AutoSize = true;
+            this.DotLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.DotLab.Location = new System.Drawing.Point(718, 111);
+            this.DotLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.DotLab.Name = "DotLab";
+            this.DotLab.Size = new System.Drawing.Size(96, 28);
+            this.DotLab.TabIndex = 149;
+            this.DotLab.Text = "打点信息";
+            // 
+            // CheckCodeVal
+            // 
+            this.CheckCodeVal.Location = new System.Drawing.Point(458, 102);
+            this.CheckCodeVal.Multiline = true;
+            this.CheckCodeVal.Name = "CheckCodeVal";
+            this.CheckCodeVal.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.CheckCodeVal.Size = new System.Drawing.Size(243, 50);
+            this.CheckCodeVal.TabIndex = 150;
+            this.CheckCodeVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.CheckCodeVal_KeyDown);
+            // 
+            // DotVal
+            // 
+            this.DotVal.Location = new System.Drawing.Point(780, 99);
+            this.DotVal.Multiline = true;
+            this.DotVal.Name = "DotVal";
+            this.DotVal.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.DotVal.Size = new System.Drawing.Size(243, 50);
+            this.DotVal.TabIndex = 151;
+            this.DotVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DotVal_KeyDown);
+            // 
+            // Confirm
+            // 
+            this.Confirm.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Confirm.Location = new System.Drawing.Point(1054, 111);
+            this.Confirm.Name = "Confirm";
+            this.Confirm.Size = new System.Drawing.Size(81, 28);
+            this.Confirm.TabIndex = 152;
+            this.Confirm.Text = "确定";
+            this.Confirm.UseVisualStyleBackColor = true;
+            this.Confirm.Click += new System.EventHandler(this.Confirm_Click);
+            // 
+            // TopBox
+            // 
+            this.TopBox.Controls.Add(this.BurnLotnoVal);
+            this.TopBox.Controls.Add(this.BurnLotnoLab);
+            this.TopBox.Controls.Add(this.LineLab);
+            this.TopBox.Controls.Add(this.LockMakeCode);
+            this.TopBox.Controls.Add(this.Confirm);
+            this.TopBox.Controls.Add(this.DotVal);
+            this.TopBox.Controls.Add(this.LineVal);
+            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);
+            this.TopBox.Dock = System.Windows.Forms.DockStyle.Top;
+            this.TopBox.Location = new System.Drawing.Point(0, 0);
+            this.TopBox.Name = "TopBox";
+            this.TopBox.Size = new System.Drawing.Size(1280, 192);
+            this.TopBox.TabIndex = 153;
+            // 
+            // BurnLotnoVal
+            // 
+            this.BurnLotnoVal.Location = new System.Drawing.Point(780, 32);
+            this.BurnLotnoVal.Name = "BurnLotnoVal";
+            this.BurnLotnoVal.Size = new System.Drawing.Size(243, 31);
+            this.BurnLotnoVal.TabIndex = 155;
+            this.BurnLotnoVal.KeyDown += new System.Windows.Forms.KeyEventHandler(this.BurnLotnoVal_KeyDown);
+            // 
+            // BurnLotnoLab
+            // 
+            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(718, 36);
+            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 = 154;
+            this.BurnLotnoLab.Text = "烧录批次";
+            // 
+            // DataBox
+            // 
+            this.DataBox.AllowUserToAddRows = false;
+            this.DataBox.AllowUserToDeleteRows = false;
+            this.DataBox.BackgroundColor = System.Drawing.SystemColors.Control;
+            this.DataBox.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.DataBox.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.work_order,
+            this.burn_lotno,
+            this.line,
+            this.burn_software,
+            this.check_code,
+            this.dot_detail,
+            this.update_time,
+            this.update_name});
+            this.DataBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.DataBox.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
+            this.DataBox.Location = new System.Drawing.Point(3, 3);
+            this.DataBox.Name = "DataBox";
+            this.DataBox.ReadOnly = true;
+            this.DataBox.RowHeadersWidth = 62;
+            this.DataBox.RowTemplate.Height = 30;
+            this.DataBox.Size = new System.Drawing.Size(890, 522);
+            this.DataBox.TabIndex = 154;
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.ColumnCount = 2;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 70F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
+            this.tableLayoutPanel1.Controls.Add(this.DataBox, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.RightBox, 1, 0);
+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 192);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            this.tableLayoutPanel1.RowCount = 1;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 528F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1280, 528);
+            this.tableLayoutPanel1.TabIndex = 156;
+            // 
+            // RightBox
+            // 
+            this.RightBox.Controls.Add(this.ClearMsg);
+            this.RightBox.Controls.Add(this.OperateResult);
+            this.RightBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.RightBox.Location = new System.Drawing.Point(899, 3);
+            this.RightBox.Name = "RightBox";
+            this.RightBox.Size = new System.Drawing.Size(378, 522);
+            this.RightBox.TabIndex = 156;
+            // 
+            // ClearMsg
+            // 
+            this.ClearMsg.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.ClearMsg.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.ClearMsg.Location = new System.Drawing.Point(155, 471);
+            this.ClearMsg.Name = "ClearMsg";
+            this.ClearMsg.Size = new System.Drawing.Size(81, 28);
+            this.ClearMsg.TabIndex = 156;
+            this.ClearMsg.Text = "清理";
+            this.ClearMsg.UseVisualStyleBackColor = true;
+            this.ClearMsg.Click += new System.EventHandler(this.ClearMsg_Click);
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "work_order";
+            this.dataGridViewTextBoxColumn1.HeaderText = "工单号";
+            this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            this.dataGridViewTextBoxColumn1.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "burn_lotno";
+            this.dataGridViewTextBoxColumn2.HeaderText = "烧录批号";
+            this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            this.dataGridViewTextBoxColumn2.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "line";
+            this.dataGridViewTextBoxColumn3.HeaderText = "线体";
+            this.dataGridViewTextBoxColumn3.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "burn_software";
+            this.dataGridViewTextBoxColumn4.HeaderText = "烧录软件";
+            this.dataGridViewTextBoxColumn4.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            this.dataGridViewTextBoxColumn4.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "check_code";
+            this.dataGridViewTextBoxColumn5.HeaderText = "校验码";
+            this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.ReadOnly = true;
+            this.dataGridViewTextBoxColumn5.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.DataPropertyName = "dot_detail";
+            this.dataGridViewTextBoxColumn6.HeaderText = "打点信息";
+            this.dataGridViewTextBoxColumn6.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.ReadOnly = true;
+            this.dataGridViewTextBoxColumn6.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.DataPropertyName = "update_time";
+            this.dataGridViewTextBoxColumn7.HeaderText = "操作时间";
+            this.dataGridViewTextBoxColumn7.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.ReadOnly = true;
+            this.dataGridViewTextBoxColumn7.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn8
+            // 
+            this.dataGridViewTextBoxColumn8.DataPropertyName = "update_name";
+            this.dataGridViewTextBoxColumn8.HeaderText = "操作人";
+            this.dataGridViewTextBoxColumn8.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.ReadOnly = true;
+            this.dataGridViewTextBoxColumn8.Width = 150;
+            // 
+            // 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.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;
+            // 
+            // OperateResult
+            // 
+            this.OperateResult.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OperateResult.Location = new System.Drawing.Point(0, 0);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(378, 463);
+            this.OperateResult.TabIndex = 155;
+            this.OperateResult.Text = "";
+            // 
+            // LockMakeCode
+            // 
+            this.LockMakeCode.AutoSize = true;
+            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.LockMakeCode.LeaveEvent = false;
+            this.LockMakeCode.Location = new System.Drawing.Point(310, 34);
+            this.LockMakeCode.Name = "LockMakeCode";
+            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
+            this.LockMakeCode.TabIndex = 153;
+            this.LockMakeCode.Text = "锁定";
+            this.LockMakeCode.UseVisualStyleBackColor = true;
+            // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = null;
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = null;
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(91, 32);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = null;
+            this.ma_code.ReturnData = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(205, 32);
+            this.ma_code.TabIndex = 143;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
+            // 
+            // Make_BurnInfo
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1280, 720);
+            this.Controls.Add(this.tableLayoutPanel1);
+            this.Controls.Add(this.TopBox);
+            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "Make_BurnInfo";
+            this.Text = "Make_BurnInfo";
+            this.Load += new System.EventHandler(this.Make_BurnInfo_Load);
+            this.TopBox.ResumeLayout(false);
+            this.TopBox.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.DataBox)).EndInit();
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.RightBox.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
+        private System.Windows.Forms.Label ms_makecode_label;
+        private System.Windows.Forms.Label LineLab;
+        private System.Windows.Forms.ComboBox LineVal;
+        private System.Windows.Forms.TextBox BurnSwVal;
+        private System.Windows.Forms.Label BurnSwLab;
+        private System.Windows.Forms.Label CheckCodeLab;
+        private System.Windows.Forms.Label DotLab;
+        private System.Windows.Forms.TextBox CheckCodeVal;
+        private System.Windows.Forms.TextBox DotVal;
+        private System.Windows.Forms.Button Confirm;
+        private System.Windows.Forms.Panel TopBox;
+        private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
+        private System.Windows.Forms.Label BurnLotnoLab;
+        private System.Windows.Forms.DataGridView DataBox;
+        private System.Windows.Forms.TextBox BurnLotnoVal;
+        private CustomControl.RichText.RichTextAutoBottom OperateResult;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn work_order;
+        private System.Windows.Forms.DataGridViewTextBoxColumn burn_lotno;
+        private System.Windows.Forms.DataGridViewTextBoxColumn line;
+        private System.Windows.Forms.DataGridViewTextBoxColumn burn_software;
+        private System.Windows.Forms.DataGridViewTextBoxColumn check_code;
+        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.Panel RightBox;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
+        private System.Windows.Forms.Button ClearMsg;
+    }
+}

+ 177 - 0
UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.cs

@@ -0,0 +1,177 @@
+using NPOI.SS.Formula;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using UAS_MES_NEW.CustomControl.ButtonUtil;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
+
+namespace UAS_MES_NEW.Make
+{
+    public partial class Make_BurnInfo : Form
+    {
+        public Make_BurnInfo()
+        {
+            InitializeComponent();
+        }
+
+        LogStringBuilder sql = new LogStringBuilder();
+        DataTable Dbfind;
+        DataHelper dh;
+        DataTable dt;
+
+        private void Make_BurnInfo_Load(object sender, EventArgs e)
+        {
+            //设置锁定工单
+            LockMakeCode.GetMakeCodeCtl(ma_code);
+            ma_code.SetLockCheckBox(LockMakeCode);
+            //工单号放大镜配置
+            ma_code.TableName = "make left join product on ma_prodcode=pr_code";
+            ma_code.SelectField = "ma_code # 工单号,pr_code # 产品编号,pr_detail # 产品名称";
+            ma_code.FormName = Name;
+            ma_code.SetValueField = new string[] { "ma_code", "pr_code", "pr_detail" };
+            ma_code.Condition = "ma_statuscode='STARTED'";
+            ma_code.DbChange += Ma_code_DbChange;
+
+            dh = SystemInf.dh;
+
+            dt = (DataTable)dh.ExecuteSql("SELECT * FROM line WHERE li_wcname = 'SMT' ORDER BY li_auditdate", "select");
+            if (dt.Rows.Count > 0)
+            {
+                foreach (DataRow item in dt.Rows)
+                {
+                    LineVal.Items.Add(item["li_code"].ToString());
+                }
+            }
+        }
+            
+        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 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 + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
+            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            if (dt.Rows.Count > 0)
+            {
+                BaseUtil.SetFormValue(this.Controls, dt);
+            }
+
+            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 Confirm_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(ma_code.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()}',
+                '{User.UserName}',sysdate,'{ma_code.Text.Trim()}')", "insert");
+
+
+            BurnLotnoVal.Focus();
+            BurnLotnoVal.SelectAll();
+
+            BurnSwVal.Text = "";
+            CheckCodeVal.Text = "";
+            DotVal.Text = "";
+
+            ShowMsg(1, "添加烧录信息成功");
+
+            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 ShowMsg(int type, string msg)
+        {
+            string fullDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            if (type == 0)
+            {
+                OperateResult.AppendText($"{fullDateTime}: {msg}\n", Color.Red);
+            }
+            else if (type == 1)
+            {
+                OperateResult.AppendText($"{fullDateTime}: {msg}\n", Color.Green);
+            }
+        }
+
+        private void BurnLotnoVal_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            BurnSwVal.Focus();
+            BurnSwVal.SelectAll();
+        }
+
+        private void BurnSwVal_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            CheckCodeVal.Focus();
+            CheckCodeVal.SelectAll();
+        }
+
+        private void CheckCodeVal_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            DotVal.Focus();
+            DotVal.SelectAll();
+        }
+
+        private void DotVal_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter) return;
+
+            Confirm.Focus();
+        }
+
+        private void ClearMsg_Click(object sender, EventArgs e)
+        {
+            OperateResult.Clear();
+        }
+    }
+}

+ 168 - 0
UAS_MES_WEIP/FunctionCode/Make/Make_BurnInfo.resx

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

+ 518 - 0
UAS_MES_WEIP/FunctionCode/Make/Make_BurnInspection.Designer.cs

@@ -0,0 +1,518 @@
+namespace UAS_MES_NEW.Make
+{
+    partial class Make_BurnInspection
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_BurnInspection));
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.Query = new System.Windows.Forms.Button();
+            this.LineLab = new System.Windows.Forms.Label();
+            this.LockMakeCode = new UAS_MES_NEW.CustomControl.CustomCheckBox.LockCheckBox();
+            this.LineVal = new System.Windows.Forms.ComboBox();
+            this.ms_makecode_label = new System.Windows.Forms.Label();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeSearchTextBox();
+            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.OperatResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.NG = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.OK = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.ClearMsg = new System.Windows.Forms.Button();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.DataBox = new System.Windows.Forms.DataGridView();
+            this.panel4 = new System.Windows.Forms.Panel();
+            this.BurnLotnoVal = new System.Windows.Forms.TextBox();
+            this.BurnLotnoLab = new System.Windows.Forms.Label();
+            this.BURN_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            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.inspect_res = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.check_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dot_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.inspect_time = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.inspect_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.panel1.SuspendLayout();
+            this.tableLayoutPanel1.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.panel3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.DataBox)).BeginInit();
+            this.panel4.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // panel1
+            // 
+            this.panel1.Controls.Add(this.Query);
+            this.panel1.Controls.Add(this.LineLab);
+            this.panel1.Controls.Add(this.LockMakeCode);
+            this.panel1.Controls.Add(this.LineVal);
+            this.panel1.Controls.Add(this.ms_makecode_label);
+            this.panel1.Controls.Add(this.ma_code);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel1.Location = new System.Drawing.Point(0, 0);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(1280, 112);
+            this.panel1.TabIndex = 132;
+            // 
+            // Query
+            // 
+            this.Query.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Query.Location = new System.Drawing.Point(719, 21);
+            this.Query.Name = "Query";
+            this.Query.Size = new System.Drawing.Size(81, 28);
+            this.Query.TabIndex = 161;
+            this.Query.Text = "查询";
+            this.Query.UseVisualStyleBackColor = true;
+            this.Query.Click += new System.EventHandler(this.Query_Click);
+            // 
+            // 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(398, 21);
+            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 = 158;
+            this.LineLab.Text = "线体";
+            // 
+            // LockMakeCode
+            // 
+            this.LockMakeCode.AutoSize = true;
+            this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.LockMakeCode.LeaveEvent = false;
+            this.LockMakeCode.Location = new System.Drawing.Point(306, 23);
+            this.LockMakeCode.Name = "LockMakeCode";
+            this.LockMakeCode.Size = new System.Drawing.Size(72, 28);
+            this.LockMakeCode.TabIndex = 160;
+            this.LockMakeCode.Text = "锁定";
+            this.LockMakeCode.UseVisualStyleBackColor = true;
+            // 
+            // LineVal
+            // 
+            this.LineVal.FormattingEnabled = true;
+            this.LineVal.Location = new System.Drawing.Point(454, 21);
+            this.LineVal.Name = "LineVal";
+            this.LineVal.Size = new System.Drawing.Size(243, 32);
+            this.LineVal.TabIndex = 159;
+            // 
+            // 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(21, 21);
+            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(96, 28);
+            this.ms_makecode_label.TabIndex = 156;
+            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(87, 21);
+            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 = 157;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "ma_code";
+            this.ma_code.TextBoxEnable = true;
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn1.HeaderText = "MAC";
+            this.dataGridViewTextBoxColumn1.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn2.HeaderText = "测试项目";
+            this.dataGridViewTextBoxColumn2.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn3.HeaderText = "测试结果";
+            this.dataGridViewTextBoxColumn3.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.dataGridViewTextBoxColumn4.HeaderText = "测试结果";
+            this.dataGridViewTextBoxColumn4.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.HeaderText = "是否检测";
+            this.dataGridViewTextBoxColumn5.MinimumWidth = 8;
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.Width = 150;
+            // 
+            // OperatResult
+            // 
+            this.OperatResult.AcceptsTab = true;
+            this.OperatResult.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.OperatResult.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OperatResult.Location = new System.Drawing.Point(0, 0);
+            this.OperatResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.OperatResult.Name = "OperatResult";
+            this.OperatResult.Size = new System.Drawing.Size(378, 492);
+            this.OperatResult.TabIndex = 133;
+            this.OperatResult.Text = "";
+            // 
+            // NG
+            // 
+            this.NG.AllPower = null;
+            this.NG.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.NG.BackColor = System.Drawing.Color.Transparent;
+            this.NG.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.NG.DownImage = ((System.Drawing.Image)(resources.GetObject("NG.DownImage")));
+            this.NG.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            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.Margin = new System.Windows.Forms.Padding(5);
+            this.NG.MoveImage = ((System.Drawing.Image)(resources.GetObject("NG.MoveImage")));
+            this.NG.Name = "NG";
+            this.NG.NormalImage = ((System.Drawing.Image)(resources.GetObject("NG.NormalImage")));
+            this.NG.Power = null;
+            this.NG.Size = new System.Drawing.Size(147, 54);
+            this.NG.TabIndex = 136;
+            this.NG.Tag = "IfRead";
+            this.NG.Text = "NG";
+            this.NG.UseVisualStyleBackColor = true;
+            this.NG.Click += new System.EventHandler(this.NG_Click);
+            // 
+            // OK
+            // 
+            this.OK.AllPower = null;
+            this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.OK.BackColor = System.Drawing.Color.Transparent;
+            this.OK.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.OK.DownImage = ((System.Drawing.Image)(resources.GetObject("OK.DownImage")));
+            this.OK.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            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.Margin = new System.Windows.Forms.Padding(5);
+            this.OK.MoveImage = ((System.Drawing.Image)(resources.GetObject("OK.MoveImage")));
+            this.OK.Name = "OK";
+            this.OK.NormalImage = ((System.Drawing.Image)(resources.GetObject("OK.NormalImage")));
+            this.OK.Power = null;
+            this.OK.Size = new System.Drawing.Size(147, 54);
+            this.OK.TabIndex = 134;
+            this.OK.Tag = "IfRead";
+            this.OK.Text = "OK";
+            this.OK.UseVisualStyleBackColor = false;
+            this.OK.Click += new System.EventHandler(this.OK_Click);
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.ColumnCount = 2;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 70F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
+            this.tableLayoutPanel1.Controls.Add(this.panel2, 1, 0);
+            this.tableLayoutPanel1.Controls.Add(this.panel3, 0, 0);
+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 112);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            this.tableLayoutPanel1.RowCount = 1;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1280, 608);
+            this.tableLayoutPanel1.TabIndex = 133;
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.ClearMsg);
+            this.panel2.Controls.Add(this.OperatResult);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel2.Location = new System.Drawing.Point(899, 3);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(378, 602);
+            this.panel2.TabIndex = 0;
+            // 
+            // ClearMsg
+            // 
+            this.ClearMsg.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.ClearMsg.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.ClearMsg.Location = new System.Drawing.Point(156, 500);
+            this.ClearMsg.Name = "ClearMsg";
+            this.ClearMsg.Size = new System.Drawing.Size(81, 28);
+            this.ClearMsg.TabIndex = 157;
+            this.ClearMsg.Text = "清理";
+            this.ClearMsg.UseVisualStyleBackColor = true;
+            this.ClearMsg.Click += new System.EventHandler(this.ClearMsg_Click);
+            // 
+            // panel3
+            // 
+            this.panel3.Controls.Add(this.DataBox);
+            this.panel3.Controls.Add(this.panel4);
+            this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel3.Location = new System.Drawing.Point(3, 3);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(890, 602);
+            this.panel3.TabIndex = 1;
+            // 
+            // 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.BURN_ID,
+            this.work_order,
+            this.burn_lotno,
+            this.line,
+            this.burn_software,
+            this.inspect_res,
+            this.check_code,
+            this.dot_detail,
+            this.inspect_time,
+            this.inspect_name});
+            this.DataBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.DataBox.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
+            this.DataBox.Location = new System.Drawing.Point(0, 0);
+            this.DataBox.Name = "DataBox";
+            this.DataBox.ReadOnly = true;
+            this.DataBox.RowHeadersWidth = 62;
+            this.DataBox.RowTemplate.Height = 30;
+            this.DataBox.Size = new System.Drawing.Size(890, 500);
+            this.DataBox.TabIndex = 155;
+            // 
+            // panel4
+            // 
+            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.Name = "panel4";
+            this.panel4.Size = new System.Drawing.Size(890, 102);
+            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.Name = "BurnLotnoVal";
+            this.BurnLotnoVal.Size = new System.Drawing.Size(243, 31);
+            this.BurnLotnoVal.TabIndex = 162;
+            // 
+            // 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.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 = "烧录批次";
+            // 
+            // BURN_ID
+            // 
+            this.BURN_ID.DataPropertyName = "BURN_ID";
+            this.BURN_ID.HeaderText = "BURN_ID";
+            this.BURN_ID.MinimumWidth = 8;
+            this.BURN_ID.Name = "BURN_ID";
+            this.BURN_ID.ReadOnly = true;
+            this.BURN_ID.Visible = false;
+            this.BURN_ID.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 = 120;
+            // 
+            // 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.Width = 70;
+            // 
+            // 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;
+            // 
+            // inspect_res
+            // 
+            this.inspect_res.DataPropertyName = "inspect_res";
+            this.inspect_res.HeaderText = "抽检结果";
+            this.inspect_res.MinimumWidth = 8;
+            this.inspect_res.Name = "inspect_res";
+            this.inspect_res.ReadOnly = true;
+            this.inspect_res.Width = 80;
+            // 
+            // 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;
+            // 
+            // inspect_time
+            // 
+            this.inspect_time.DataPropertyName = "inspect_time";
+            this.inspect_time.HeaderText = "抽检时间";
+            this.inspect_time.MinimumWidth = 8;
+            this.inspect_time.Name = "inspect_time";
+            this.inspect_time.ReadOnly = true;
+            // 
+            // inspect_name
+            // 
+            this.inspect_name.DataPropertyName = "inspect_name";
+            this.inspect_name.HeaderText = "抽检人员";
+            this.inspect_name.MinimumWidth = 8;
+            this.inspect_name.Name = "inspect_name";
+            this.inspect_name.ReadOnly = true;
+            this.inspect_name.Width = 80;
+            // 
+            // Make_BurnInspection
+            // 
+            this.AllowDrop = true;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1280, 720);
+            this.Controls.Add(this.tableLayoutPanel1);
+            this.Controls.Add(this.panel1);
+            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "Make_BurnInspection";
+            this.Text = "Make_WirelessTest";
+            this.Load += new System.EventHandler(this.Make_WirelessTest_Load);
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.panel2.ResumeLayout(false);
+            this.panel3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.DataBox)).EndInit();
+            this.panel4.ResumeLayout(false);
+            this.panel4.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+        private System.Windows.Forms.Panel panel1;
+        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 CustomControl.ButtonUtil.NormalButton OK;
+        private CustomControl.ButtonUtil.NormalButton NG;
+        private CustomControl.RichText.RichTextAutoBottom OperatResult;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.Button ClearMsg;
+        private System.Windows.Forms.TextBox BurnLotnoVal;
+        private System.Windows.Forms.Label BurnLotnoLab;
+        private System.Windows.Forms.Label LineLab;
+        private CustomControl.CustomCheckBox.LockCheckBox LockMakeCode;
+        private System.Windows.Forms.ComboBox LineVal;
+        private System.Windows.Forms.Label ms_makecode_label;
+        private CustomControl.TextBoxWithIcon.MaCodeSearchTextBox ma_code;
+        private System.Windows.Forms.DataGridView DataBox;
+        private System.Windows.Forms.Panel panel4;
+        private System.Windows.Forms.Button Query;
+        private System.Windows.Forms.DataGridViewTextBoxColumn BURN_ID;
+        private System.Windows.Forms.DataGridViewTextBoxColumn work_order;
+        private System.Windows.Forms.DataGridViewTextBoxColumn burn_lotno;
+        private System.Windows.Forms.DataGridViewTextBoxColumn line;
+        private System.Windows.Forms.DataGridViewTextBoxColumn burn_software;
+        private System.Windows.Forms.DataGridViewTextBoxColumn inspect_res;
+        private System.Windows.Forms.DataGridViewTextBoxColumn check_code;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dot_detail;
+        private System.Windows.Forms.DataGridViewTextBoxColumn inspect_time;
+        private System.Windows.Forms.DataGridViewTextBoxColumn inspect_name;
+    }
+}

+ 187 - 0
UAS_MES_WEIP/FunctionCode/Make/Make_BurnInspection.cs

@@ -0,0 +1,187 @@
+using DevExpress.Printing.Core.PdfExport.Metafile;
+using NPOI.SS.Formula.Eval;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Configuration.Assemblies;
+using System.Data;
+using System.Diagnostics;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using System.Xml;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
+
+namespace UAS_MES_NEW.Make
+{
+    public partial class Make_BurnInspection : Form
+    {
+
+        StringBuilder SQL = new StringBuilder();
+
+        LogStringBuilder sql = new LogStringBuilder();
+        DataHelper dh = new DataHelper();
+        DataTable Dbfind;
+        DataTable dt = new DataTable();
+
+        string SN,WO = "";
+
+        string burnId;
+
+        public Make_BurnInspection()
+        {
+            InitializeComponent();
+        }
+
+        private void Make_WirelessTest_Load(object sender, EventArgs e)
+        {
+            //设置锁定工单
+            LockMakeCode.GetMakeCodeCtl(ma_code);
+            ma_code.SetLockCheckBox(LockMakeCode);
+            //工单号放大镜配置
+            ma_code.TableName = "make left join product on ma_prodcode=pr_code";
+            ma_code.SelectField = "ma_code # 工单号,pr_code # 产品编号,pr_detail # 产品名称";
+            ma_code.FormName = Name;
+            ma_code.SetValueField = new string[] { "ma_code", "pr_code", "pr_detail" };
+            ma_code.Condition = "ma_statuscode='STARTED'";
+            ma_code.DbChange += Ma_code_DbChange;
+
+            dh = SystemInf.dh;
+        }
+
+        private void Ma_code_DbChange(object sender, EventArgs e)
+        {
+            Dbfind = ma_code.ReturnData;
+            BaseUtil.SetFormValue(this.Controls, Dbfind);
+            //获取工单的其他信息
+            sql.Clear();
+            sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode as pr_code ,pr_detail,");
+            sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty 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 + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
+            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            if (dt.Rows.Count > 0)
+            {
+                BaseUtil.SetFormValue(this.Controls, dt);
+            }
+        }
+
+        private void ClearMsg_Click(object sender, EventArgs e)
+        {
+            OperatResult.Clear();
+        }
+
+        private void OK_Click(object sender, EventArgs e)
+        {
+
+            PassStation("OK");
+        }
+
+        private void NG_Click(object sender, EventArgs e)
+        {
+
+            PassStation("NG");
+        }
+
+        private void PassStation(string testResult)
+        {
+            BurnLotnoVal.Text = BurnLotnoVal.Text.Trim();
+
+            if (DataBox.Rows.Count == 0)
+            {
+                ShowMsg(0, $"请先查询出烧录批号");
+                return;
+            }
+            if (string.IsNullOrEmpty(BurnLotnoVal.Text))
+            {
+                ShowMsg(0, $"请扫描烧录批号");
+                return;
+            }
+
+            foreach (DataGridViewRow item in DataBox.Rows)
+            {
+                string currLotNo = item.Cells["burn_lotno"].Value.ToString();
+                if (currLotNo == BurnLotnoVal.Text.Trim())
+                {
+                    burnId = item.Cells["BURN_ID"].Value.ToString();
+                }
+            }
+
+            if (string.IsNullOrEmpty(burnId))
+            {
+                ShowMsg(0, $"请抽检所查询中烧录批号");
+                return;
+            }
+
+            dt = (DataTable)dh.ExecuteSql($@"select * from burn_inspect where burn_lotno = '{BurnLotnoVal.Text}'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                ShowMsg(0, $"批号 {BurnLotnoVal.Text}已抽检");
+                return;
+            }
+
+            SQL.Clear();
+            SQL.Append($@"INSERT INTO burn_inspect (burn_inspect_id,burn_lotno,burn_id,
+                inspect_res,inspect_time,inspect_name) VALUES (burn_inspect_seq.NEXTVAL, '{BurnLotnoVal.Text}',{burnId},
+                '{testResult}',sysdate,'{User.UserName}')");
+            dh.ExecuteSql(SQL.ToString(), "insert");
+
+            ShowMsg(1, $"{BurnLotnoVal.Text} 记录抽检结果{testResult} 成功");
+
+            BurnLotnoVal.Focus();
+            BurnLotnoVal.SelectAll();
+        }
+
+        private void Query_Click(object sender, EventArgs e)
+        {
+            if(string.IsNullOrEmpty(ma_code.Text) && string.IsNullOrEmpty(LineVal.Text))
+            {
+                ShowMsg(0, $"请选择工单或者线体");
+                return;
+            }
+
+            SQL.Clear();
+
+            if (!string.IsNullOrEmpty(ma_code.Text))
+            {
+                SQL.Append($"AND a.work_order = '{ma_code.Text}'");
+            }
+
+            if (!string.IsNullOrEmpty(LineVal.Text))
+            {
+                SQL.Append($"AND a.line = '{LineVal.Text}'");
+            }
+
+            dt = (DataTable)dh.ExecuteSql($@"SELECT a.burn_id,a.burn_lotno,a.work_order,
+                a.line,a.burn_software,a.check_code,
+                a.dot_detail,b.inspect_time,b.inspect_name,b.inspect_res
+                FROM burn_info a LEFT JOIN burn_inspect b ON a.burn_id = b.burn_id
+                WHERE 1 = 1 {SQL.ToString()}", "select");
+            if (dt.Rows.Count > 0)
+            {
+                DataBox.DataSource = dt;
+            }
+        }
+
+        private void ShowMsg(int type, string msg)
+        {
+            string fullDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            if (type == 0)
+            {
+                OperatResult.AppendText($"{fullDateTime}: {msg}\n", Color.Red);
+            }
+            else if (type == 1)
+            {
+                OperatResult.AppendText($"{fullDateTime}: {msg}\n", Color.Green);
+            }
+            else if (type == 1)
+            {
+                OperatResult.AppendText($"{fullDateTime}: {msg}\n", Color.YellowGreen);
+            }
+        }
+    }
+}

+ 227 - 0
UAS_MES_WEIP/FunctionCode/Make/Make_BurnInspection.resx

@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="NG.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="NG.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="NG.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="OK.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="OK.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="OK.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="BURN_ID.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="inspect_res.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="inspect_time.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="inspect_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

+ 455 - 0
UAS_MES_WEIP/FunctionCode/Make/Make_EquiConnect.Designer.cs

@@ -0,0 +1,455 @@
+namespace UAS_MES_NEW.Make
+{
+    partial class Make_EquiConnect
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            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.LineLab = new System.Windows.Forms.Label();
+            this.LineVal = new System.Windows.Forms.ComboBox();
+            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();
+            this.productName = new System.Windows.Forms.Label();
+            this.productCode = new System.Windows.Forms.Label();
+            this.workOrder = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.serialNumber = new System.Windows.Forms.Label();
+            this.onWatch = new System.Windows.Forms.Button();
+            this.allParse = new System.Windows.Forms.Button();
+            this.Device = new System.Windows.Forms.ComboBox();
+            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.Container.SuspendLayout();
+            this.panel1.SuspendLayout();
+            this.SNDetails.SuspendLayout();
+            this.tableLayoutPanel1.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.panel1, 0, 1);
+            this.Container.Controls.Add(this.OperatResult, 0, 2);
+            this.Container.Controls.Add(this.SNDetails, 0, 0);
+            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, 10F));
+            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, 60F));
+            this.Container.Size = new System.Drawing.Size(1280, 720);
+            this.Container.TabIndex = 8;
+            // 
+            // panel1
+            // 
+            this.panel1.Controls.Add(this.onWatch);
+            this.panel1.Controls.Add(this.allParse);
+            this.panel1.Controls.Add(this.Device);
+            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);
+            this.panel1.Controls.Add(this.SNLab);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel1.Location = new System.Drawing.Point(3, 75);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(1274, 210);
+            this.panel1.TabIndex = 4;
+            // 
+            // 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(60, 33);
+            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(121, 33);
+            this.LineVal.Name = "LineVal";
+            this.LineVal.Size = new System.Drawing.Size(243, 32);
+            this.LineVal.TabIndex = 168;
+            // 
+            // OK
+            // 
+            this.OK.AllPower = null;
+            this.OK.BackColor = System.Drawing.Color.Transparent;
+            this.OK.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.OK.DownImage = ((System.Drawing.Image)(resources.GetObject("OK.DownImage")));
+            this.OK.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OK.ForeColor = System.Drawing.Color.Green;
+            this.OK.Image = null;
+            this.OK.IsShowBorder = true;
+            this.OK.Location = new System.Drawing.Point(402, 93);
+            this.OK.Margin = new System.Windows.Forms.Padding(5);
+            this.OK.MoveImage = ((System.Drawing.Image)(resources.GetObject("OK.MoveImage")));
+            this.OK.Name = "OK";
+            this.OK.NormalImage = ((System.Drawing.Image)(resources.GetObject("OK.NormalImage")));
+            this.OK.Power = null;
+            this.OK.Size = new System.Drawing.Size(147, 54);
+            this.OK.TabIndex = 165;
+            this.OK.Tag = "IfRead";
+            this.OK.Text = "OK";
+            this.OK.UseVisualStyleBackColor = false;
+            this.OK.Click += new System.EventHandler(this.OK_Click);
+            // 
+            // NG
+            // 
+            this.NG.AllPower = null;
+            this.NG.BackColor = System.Drawing.Color.Transparent;
+            this.NG.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.NG.DownImage = ((System.Drawing.Image)(resources.GetObject("NG.DownImage")));
+            this.NG.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.NG.ForeColor = System.Drawing.Color.Red;
+            this.NG.Image = null;
+            this.NG.IsShowBorder = true;
+            this.NG.Location = new System.Drawing.Point(578, 93);
+            this.NG.Margin = new System.Windows.Forms.Padding(5);
+            this.NG.MoveImage = ((System.Drawing.Image)(resources.GetObject("NG.MoveImage")));
+            this.NG.Name = "NG";
+            this.NG.NormalImage = ((System.Drawing.Image)(resources.GetObject("NG.NormalImage")));
+            this.NG.Power = null;
+            this.NG.Size = new System.Drawing.Size(147, 54);
+            this.NG.TabIndex = 166;
+            this.NG.Tag = "IfRead";
+            this.NG.Text = "NG";
+            this.NG.UseVisualStyleBackColor = true;
+            this.NG.Click += new System.EventHandler(this.NG_Click);
+            // 
+            // SNVal
+            // 
+            this.SNVal.Location = new System.Drawing.Point(121, 103);
+            this.SNVal.Name = "SNVal";
+            this.SNVal.Size = new System.Drawing.Size(243, 31);
+            this.SNVal.TabIndex = 164;
+            // 
+            // 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, 106);
+            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 = "序列号";
+            // 
+            // OperatResult
+            // 
+            this.OperatResult.AcceptsTab = true;
+            this.OperatResult.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.OperatResult.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.OperatResult.Location = new System.Drawing.Point(4, 293);
+            this.OperatResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.OperatResult.Name = "OperatResult";
+            this.OperatResult.Size = new System.Drawing.Size(1272, 422);
+            this.OperatResult.TabIndex = 134;
+            this.OperatResult.Text = "";
+            // 
+            // SNDetails
+            // 
+            this.SNDetails.BorderColor = System.Drawing.Color.Black;
+            this.SNDetails.Controls.Add(this.tableLayoutPanel1);
+            this.SNDetails.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.SNDetails.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SNDetails.Location = new System.Drawing.Point(3, 3);
+            this.SNDetails.Name = "SNDetails";
+            this.SNDetails.Size = new System.Drawing.Size(1274, 66);
+            this.SNDetails.TabIndex = 3;
+            this.SNDetails.TabStop = false;
+            this.SNDetails.Text = "产品序列信息";
+            this.SNDetails.TextColor = System.Drawing.Color.Black;
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.ColumnCount = 8;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451613F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.09677F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451613F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.09677F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451613F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 13.19F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451613F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 36.81F));
+            this.tableLayoutPanel1.Controls.Add(this.productName, 7, 0);
+            this.tableLayoutPanel1.Controls.Add(this.productCode, 5, 0);
+            this.tableLayoutPanel1.Controls.Add(this.workOrder, 3, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label4, 6, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label3, 4, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label2, 2, 0);
+            this.tableLayoutPanel1.Controls.Add(this.serialNumber, 1, 0);
+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 31);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            this.tableLayoutPanel1.RowCount = 1;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 109F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1268, 32);
+            this.tableLayoutPanel1.TabIndex = 0;
+            // 
+            // productName
+            // 
+            this.productName.AutoSize = true;
+            this.productName.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.productName.Location = new System.Drawing.Point(800, 0);
+            this.productName.Name = "productName";
+            this.productName.Size = new System.Drawing.Size(465, 32);
+            this.productName.TabIndex = 7;
+            this.productName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // productCode
+            // 
+            this.productCode.AutoSize = true;
+            this.productCode.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.productCode.Location = new System.Drawing.Point(552, 0);
+            this.productCode.Name = "productCode";
+            this.productCode.Size = new System.Drawing.Size(161, 32);
+            this.productCode.TabIndex = 6;
+            this.productCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // workOrder
+            // 
+            this.workOrder.AutoSize = true;
+            this.workOrder.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.workOrder.Location = new System.Drawing.Point(318, 0);
+            this.workOrder.Name = "workOrder";
+            this.workOrder.Size = new System.Drawing.Size(147, 32);
+            this.workOrder.TabIndex = 5;
+            this.workOrder.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label4.Location = new System.Drawing.Point(719, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(75, 32);
+            this.label4.TabIndex = 3;
+            this.label4.Text = "产品名称: ";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label1.Location = new System.Drawing.Point(3, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(75, 32);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "序列号: ";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label3.Location = new System.Drawing.Point(471, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(75, 32);
+            this.label3.TabIndex = 2;
+            this.label3.Text = "产品编号: ";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label2.Location = new System.Drawing.Point(237, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(75, 32);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "工单: ";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // serialNumber
+            // 
+            this.serialNumber.AutoSize = true;
+            this.serialNumber.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.serialNumber.Location = new System.Drawing.Point(84, 0);
+            this.serialNumber.Name = "serialNumber";
+            this.serialNumber.Size = new System.Drawing.Size(147, 32);
+            this.serialNumber.TabIndex = 4;
+            this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // 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.Name = "onWatch";
+            this.onWatch.Size = new System.Drawing.Size(122, 38);
+            this.onWatch.TabIndex = 175;
+            this.onWatch.Text = "开启解析";
+            this.onWatch.UseVisualStyleBackColor = true;
+            this.onWatch.Visible = false;
+            // 
+            // allParse
+            // 
+            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.Name = "allParse";
+            this.allParse.Size = new System.Drawing.Size(122, 38);
+            this.allParse.TabIndex = 174;
+            this.allParse.Text = "批量解析";
+            this.allParse.UseVisualStyleBackColor = true;
+            this.allParse.Visible = false;
+            // 
+            // Device
+            // 
+            this.Device.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.Device.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Device.Items.AddRange(new object[] {
+            "AOI设备",
+            "X-ray设备",
+            "CCD设备"});
+            this.Device.Location = new System.Drawing.Point(823, 12);
+            this.Device.Name = "Device";
+            this.Device.Size = new System.Drawing.Size(285, 32);
+            this.Device.TabIndex = 170;
+            this.Device.Visible = false;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label5.Location = new System.Drawing.Point(712, 16);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(96, 28);
+            this.label5.TabIndex = 169;
+            this.label5.Text = "设备类型";
+            this.label5.Visible = false;
+            // 
+            // Choose
+            // 
+            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.Name = "Choose";
+            this.Choose.Size = new System.Drawing.Size(90, 33);
+            this.Choose.TabIndex = 172;
+            this.Choose.Text = "选择";
+            this.Choose.UseVisualStyleBackColor = true;
+            this.Choose.Visible = false;
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label6.Location = new System.Drawing.Point(689, 54);
+            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;
+            // 
+            // Make_EquiConnect
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1280, 720);
+            this.Controls.Add(this.Container);
+            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "Make_EquiConnect";
+            this.Text = "Make_EquiConnect";
+            this.Load += new System.EventHandler(this.Make_EquiConnect_Load);
+            this.Container.ResumeLayout(false);
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            this.SNDetails.ResumeLayout(false);
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.tableLayoutPanel1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+        private System.Windows.Forms.TableLayoutPanel Container;
+        private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder SNDetails;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.Label productName;
+        private System.Windows.Forms.Label productCode;
+        private System.Windows.Forms.Label workOrder;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label serialNumber;
+        private System.Windows.Forms.Panel panel1;
+        private CustomControl.RichText.RichTextAutoBottom OperatResult;
+        private System.Windows.Forms.TextBox SNVal;
+        private System.Windows.Forms.Label SNLab;
+        private CustomControl.ButtonUtil.NormalButton OK;
+        private CustomControl.ButtonUtil.NormalButton NG;
+        private System.Windows.Forms.Label LineLab;
+        private System.Windows.Forms.ComboBox LineVal;
+        private System.Windows.Forms.Button onWatch;
+        private System.Windows.Forms.Button allParse;
+        private System.Windows.Forms.ComboBox Device;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Button Choose;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.TextBox txtPath;
+    }
+}

+ 134 - 0
UAS_MES_WEIP/FunctionCode/Make/Make_EquiConnect.cs

@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+
+namespace UAS_MES_NEW.Make
+{
+    public partial class Make_EquiConnect : Form
+    {
+        public Make_EquiConnect()
+        {
+            InitializeComponent();
+        }
+
+        StringBuilder SQL = new StringBuilder();
+        DataHelper dh = SystemInf.dh;
+        DataTable dt;
+
+        private void Make_EquiConnect_Load(object sender, EventArgs e)
+        {
+            dt = (DataTable)dh.ExecuteSql("SELECT * FROM line WHERE li_wcname = 'SMT' ORDER BY li_auditdate", "select");
+            if (dt.Rows.Count > 0)
+            {
+                foreach (DataRow item in dt.Rows)
+                {
+                    LineVal.Items.Add(item["li_code"].ToString());
+                }
+            }
+        }
+
+        private void OK_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(LineVal.Text))
+            {
+                ShowMsg(0, "请选择线体");
+                return;
+            }
+
+            if (string.IsNullOrEmpty(SNVal.Text))
+            {
+                ShowMsg(0, "请选择扫描序列号");
+                return;
+            }
+
+            InsertLog("OK");
+        }
+
+        private void NG_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(LineVal.Text))
+            {
+                ShowMsg(0, "请选择线体");
+                return;
+            }
+
+            if (string.IsNullOrEmpty(SNVal.Text))
+            {
+                ShowMsg(0, "请选择扫描序列号");
+                return;
+            }
+
+            InsertLog("NG");
+        }
+
+        private void InsertLog(string resType)
+        {
+            UpdateSN("L", SNVal.Text.Trim());
+
+            dh.ExecuteSql($@"INSERT INTO steptestdetail (std_id,std_sn,std_makecode,std_class,std_testresult,std_indate,std_rescode) 
+                VALUES (steptestdetail_seq.NEXTVAL, '{SNVal.Text.Trim()}','{workOrder.Text.Trim()}','Xray抽检','{resType}',sysdate, '{User.CurrentStepCode}')", "insert");
+
+            ShowMsg(1, $"已记录 {SNVal.Text.Trim()},测试结果为 {resType}");
+
+            SNVal.Focus();
+            SNVal.SelectAll();
+        }
+
+        private void ShowMsg(int type, string msg)
+        {
+            msg = msg.Replace("\r", "").Replace("\n", "");
+            string msgTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            string showMsg = $"{msgTime}: {msg}\n";
+            if (type == 0)
+            {
+                OperatResult.AppendText(showMsg, Color.Red);
+            }
+            else if (type == 1)
+            {
+                OperatResult.AppendText(showMsg, Color.Green);
+            }
+            else if (type == 2)
+            {
+                OperatResult.AppendText(showMsg, Color.GreenYellow);
+            }
+        }
+
+        private void UpdateSN(string type, string sn)
+        {
+            if (type == "C")
+            {
+                serialNumber.Text = "";
+                workOrder.Text = "";
+                productCode.Text = "";
+                productName.Text = "";
+            }
+            else if (type == "L")
+            {
+                SQL.Clear();
+                SQL.Append($@"SELECT ms_sncode,ma_code,pr_code,pr_spec FROM makeserial,make,product
+                        WHERE ms_sncode = '{sn}' AND ms_makecode = ma_code AND ms_prodcode = pr_code");
+                dt = (DataTable)dh.ExecuteSql(SQL.ToString(), "select");
+                if (dt.Rows.Count > 0)
+                {
+                    serialNumber.Text = dt.Rows[0]["ms_sncode"].ToString();
+                    workOrder.Text = dt.Rows[0]["ma_code"].ToString();
+                    productCode.Text = dt.Rows[0]["pr_code"].ToString();
+                    productName.Text = dt.Rows[0]["pr_spec"].ToString();
+                }
+                else
+                {
+                    UpdateSN("C", sn);
+                }
+            }
+        }
+
+    }
+}
+

+ 197 - 0
UAS_MES_WEIP/FunctionCode/Make/Make_EquiConnect.resx

@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="OK.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="OK.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="OK.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="NG.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="NG.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="NG.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+</root>

+ 23 - 9
UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.cs

@@ -224,15 +224,29 @@ namespace UAS_MES_NEW.Make
                 {
                     //if (int.Parse(st_combinenumber.Text) >= 0)
                     //{
-                        sql.Clear();
-                        sql.Append("update StencilUse set SU_ENSIONA='" + ST_ENSIONA.Text + "',SU_ENSIONB='" + ST_ENSIONB.Text + "',SU_ENSIONC='" + ST_ENSIONC.Text + "',SU_ENSIOND='" + ST_ENSIOND.Text + "',SU_ENSIONE='" + ST_ENSIONE.Text + "', su_cleannums=nvl(su_cleannums,0)+1, SU_BACKDATE=sysdate,su_returnman='" + dt.Rows[0]["em_name"].ToString() + "',su_returnmancode='" + em_code1.Text + "',");
-                        sql.Append("SU_THISUSETIMES='" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + "',SU_STATUS='借出'");
-                        sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='在线')");
-                        dh.ExecuteSql(sql.ToString(), "update");
-                        sql.Clear();
-                        sql.Append("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "',St_USECOUNT=nvl(St_USECOUNT,0)+" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + ",ST_USESTATUS='借出' where st_code='" + SU_DEVCODE1.Text + "'");
-                        dh.ExecuteSql(sql.ToString(), "update");
-                        MessageBox.Show("刮刀" + SU_DEVCODE1.Text + "退回成功!");
+                    /*sql.Clear();
+                    sql.Append("update StencilUse set SU_ENSIONA='" + ST_ENSIONA.Text + "',SU_ENSIONB='" + ST_ENSIONB.Text + "',SU_ENSIONC='" + ST_ENSIONC.Text + "',SU_ENSIOND='" + ST_ENSIOND.Text + "',SU_ENSIONE='" + ST_ENSIONE.Text + "', su_cleannums=nvl(su_cleannums,0)+1, SU_BACKDATE=sysdate,su_returnman='" + dt.Rows[0]["em_name"].ToString() + "',su_returnmancode='" + em_code1.Text + "',");
+                    sql.Append("SU_THISUSETIMES='" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + "',SU_STATUS='借出'");
+                    sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='在线')");
+                    dh.ExecuteSql(sql.ToString(), "update");
+                    sql.Clear();
+                    sql.Append("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "',St_USECOUNT=nvl(St_USECOUNT,0)+" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + ",ST_USESTATUS='借出' where st_code='" + SU_DEVCODE1.Text + "'");
+                    dh.ExecuteSql(sql.ToString(), "update");*/
+
+                    sql.Clear();
+                    sql.Append($@"INSERT INTO stenciluse (su_id,su_ensiona,su_ensionb,su_ensionc,su_ensiond,su_ensione,su_stid,su_stcode,
+                            su_cleannums,su_backdate,su_returnman,su_returnmancode,su_status,su_returnifclean)
+                            SELECT stenciluse_seq.NEXTVAL,'{ST_ENSIONA.Text}', '{ST_ENSIONB.Text}', '{ST_ENSIONC.Text}','{ST_ENSIOND.Text}','{ST_ENSIONE.Text}',st_id,'{SU_DEVCODE1.Text.Trim()}',
+                            '{(SU_RETURNIFCLEAN.Checked ? 1 : 0)}', sysdate,'{User.UserName}','{em_code1.Text.Trim()}','借出', '{(SU_RETURNIFCLEAN.Checked ? "-1" : "0")}'
+                            FROM stencil WHERE st_code = '" + SU_DEVCODE1.Text.Trim() + "'");
+                    dh.ExecuteSql(sql.ToString(), "insert");
+
+                    dh.ExecuteSql($@"UPDATE stencil SET st_cleannums = nvl(st_cleannums, 0) + 1,st_ensiona = '{ST_ENSIONA.Text}',st_ensionb = '{ST_ENSIONB.Text}',
+                            st_ensionc = '{ST_ENSIONC.Text}',st_ensiond = '{ST_ENSIOND.Text}',st_ensione = '{ST_ENSIONE.Text}',st_usestatus = '借出'
+                            WHERE st_code = '{SU_DEVCODE1.Text}'", "update");
+
+
+                    MessageBox.Show("刮刀" + SU_DEVCODE1.Text + "退回成功!");
                         SU_DEVCODE1.Text = "";
                         st_combinenumber.Text = "";
                         em_code1.Text = "";

+ 19 - 4
UAS_MES_WEIP/FunctionCode/Make/Make_SMTStencil.cs

@@ -222,16 +222,31 @@ namespace UAS_MES_NEW.Make
                 dt = (DataTable)dh.ExecuteSql("select em_name from employee where em_code='" + em_code1.Text + "'", "select");
                 if (dt.Rows.Count > 0)
                 {
-                    //if (int.Parse(st_combinenumber.Text) >= 0)
-                    //{
-                        sql.Clear();
+                        //if (int.Parse(st_combinenumber.Text) >= 0)
+                        //{
+
+                        /*sql.Clear();
                         sql.Append("update StencilUse set SU_ENSIONA='" + ST_ENSIONA.Text + "',SU_ENSIONB='" + ST_ENSIONB.Text + "',SU_ENSIONC='" + ST_ENSIONC.Text + "',SU_ENSIOND='" + ST_ENSIOND.Text + "',SU_ENSIONE='" + ST_ENSIONE.Text + "', su_cleannums=nvl(su_cleannums,0)+1, SU_BACKDATE=sysdate,su_returnman='" + dt.Rows[0]["em_name"].ToString() + "',su_returnmancode='" + em_code1.Text + "',");
                         sql.Append("SU_THISUSETIMES='" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + "',SU_STATUS='借出'");
                         sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='在线')");
                         dh.ExecuteSql(sql.ToString(), "update");
                         sql.Clear();
                         sql.Append("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "',St_USECOUNT=nvl(St_USECOUNT,0)+" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + ",ST_USESTATUS='借出' where st_code='" + SU_DEVCODE1.Text + "'");
-                        dh.ExecuteSql(sql.ToString(), "update");
+                        dh.ExecuteSql(sql.ToString(), "update");*/
+
+
+                        sql.Clear();
+                        sql.Append($@"INSERT INTO stenciluse (su_id,su_ensiona,su_ensionb,su_ensionc,su_ensiond,su_ensione,su_stid,su_stcode,
+                            su_cleannums,su_backdate,su_returnman,su_returnmancode,su_status,su_returnifclean)
+                            SELECT stenciluse_seq.NEXTVAL,'{ST_ENSIONA.Text}', '{ST_ENSIONB.Text}', '{ST_ENSIONC.Text}','{ST_ENSIOND.Text}','{ST_ENSIONE.Text}',st_id,'{SU_DEVCODE1.Text.Trim()}',
+                            '{(SU_RETURNIFCLEAN.Checked ? 1 : 0)}', sysdate,'{User.UserName}','{em_code1.Text.Trim()}','借出', '{(SU_RETURNIFCLEAN.Checked ? "-1" : "0")}'
+                            FROM stencil WHERE st_code = '" + SU_DEVCODE1.Text.Trim() + "'");
+                        dh.ExecuteSql(sql.ToString(), "insert");
+
+                        dh.ExecuteSql($@"UPDATE stencil SET st_cleannums = nvl(st_cleannums, 0) + 1,st_ensiona = '{ST_ENSIONA.Text}',st_ensionb = '{ST_ENSIONB.Text}',
+                            st_ensionc = '{ST_ENSIONC.Text}',st_ensiond = '{ST_ENSIOND.Text}',st_ensione = '{ST_ENSIONE.Text}',st_usestatus = '借出'
+                            WHERE st_code = '{SU_DEVCODE1.Text}'", "update");
+
                         MessageBox.Show("钢网" + SU_DEVCODE1.Text + "退回成功!");
                         SU_DEVCODE1.Text = "";
                         st_combinenumber.Text = "";

+ 9 - 2
UAS_MES_WEIP/FunctionCode/Make/Make_SMTStockSStencil.cs

@@ -156,11 +156,18 @@ namespace UAS_MES_NEW.Make
                         MessageBox.Show("刮刀编号" + SU_DEVCODE1.Text + "不存在或者未审核");
                         return;
                     }
-                    sql.Clear();
+                    /*sql.Clear();
                     sql.Append("update StencilUse set SU_CLEANNUMS = nvl(SU_CLEANNUMS,0)+1,su_returnman='" + User.UserName + "',SU_STOCKBACKDATE=sysdate ,su_backdate=sysdate,");
                     sql.Append(" SU_STATUS='在仓'");
                     sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='借出' and su_stockusedate is not null)");
-                    dh.ExecuteSql(sql.ToString(), "update");
+                    dh.ExecuteSql(sql.ToString(), "update");*/
+
+                    dh.ExecuteSql($@"INSERT INTO stenciluse (su_id,su_cleannums,su_returnman,su_stid,su_stcode,
+                        su_stockbackdate,su_backdate,su_status,su_returnifclean)
+                        SELECT stenciluse_seq.NEXTVAL,'{(SU_RETURNIFCLEAN.Checked ? 1 : 0)}','{User.UserName}',st_id,'{SU_DEVCODE1.Text.Trim()}',
+                        sysdate,sysdate,'在仓', '{(SU_RETURNIFCLEAN.Checked ? -1 : 0)}'
+                        FROM stencil WHERE st_code = '{SU_DEVCODE1.Text}'", "insert");
+
                     sql.Clear();
                     sql.Append("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,ST_USESTATUS='在仓'");
                     sql.Append("  ");

+ 11 - 2
UAS_MES_WEIP/FunctionCode/Make/Make_SMTStockStencil.cs

@@ -156,11 +156,20 @@ namespace UAS_MES_NEW.Make
                         MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
                         return;
                     }
-                    sql.Clear();
+                    /*sql.Clear();
                     sql.Append("update StencilUse set SU_CLEANNUMS = nvl(SU_CLEANNUMS,0)+1,su_returnman='" + User.UserName + "',SU_STOCKBACKDATE=sysdate ,su_backdate=sysdate,");
                     sql.Append(" SU_STATUS='在仓'");
                     sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='借出' and su_stockusedate is not null)");
-                    dh.ExecuteSql(sql.ToString(), "update");
+                    dh.ExecuteSql(sql.ToString(), "update");*/
+
+                    sql.Clear();
+                    sql.Append($@"INSERT INTO stenciluse (su_id,su_cleannums,su_returnman,su_stid,su_stcode,
+                        su_stockbackdate,su_backdate,su_status,su_returnifclean)
+                        SELECT stenciluse_seq.NEXTVAL,'{(SU_RETURNIFCLEAN.Checked ? 1 : 0)}','{User.UserName}',st_id,'{SU_DEVCODE1.Text.Trim()}',
+                        sysdate,sysdate,'在仓', '{(SU_RETURNIFCLEAN.Checked ? -1 : 0)}'
+                        FROM stencil WHERE st_code = '{SU_DEVCODE1.Text}'");
+                    dh.ExecuteSql(sql.ToString(), "insert");
+
                     sql.Clear();
                     sql.Append("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,ST_USESTATUS='在仓'");
                     sql.Append("  ");

+ 27 - 0
UAS_MES_WEIP/UAS_MES_WEIP.csproj

@@ -639,6 +639,24 @@
     <Compile Include="FunctionCode\Make\Make_CheckNoRelpace.Designer.cs">
       <DependentUpon>Make_CheckNoRelpace.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_BurnInfo.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_BurnInfo.Designer.cs">
+      <DependentUpon>Make_BurnInfo.cs</DependentUpon>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_BurnInspection.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_BurnInspection.Designer.cs">
+      <DependentUpon>Make_BurnInspection.cs</DependentUpon>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_EquiConnect.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_EquiConnect.Designer.cs">
+      <DependentUpon>Make_EquiConnect.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_CollectBTMAC.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1378,6 +1396,15 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_CheckNoRelpace.resx">
       <DependentUpon>Make_CheckNoRelpace.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_BurnInfo.resx">
+      <DependentUpon>Make_BurnInfo.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_BurnInspection.resx">
+      <DependentUpon>Make_BurnInspection.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_EquiConnect.resx">
+      <DependentUpon>Make_EquiConnect.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_CollectBTMAC.resx">
       <DependentUpon>Make_CollectBTMAC.cs</DependentUpon>
     </EmbeddedResource>

+ 10 - 3
UAS_Tools_HY/Main.cs

@@ -208,11 +208,13 @@ namespace UAS_MES_Tools
                     else if (typeNum == 2)
                     {
                         SN.Text = "";
-                        //BoxNo.Text = "";
                         dCount.Text = "0";
-                        //Datas.Rows.Clear();
+                        BoxNo.Enabled = true;
                         BoxNo.Focus();
                         BoxNo.SelectAll();
+
+                        //BoxNo.Text = "";
+                        //Datas.Rows.Clear();
                     }
 
                     QDquery_Click(null, null);
@@ -316,11 +318,16 @@ namespace UAS_MES_Tools
                     BoxNo.Focus();
                     BoxNo.SelectAll();
                     MessageBox.Show($"核对完成,此箱{BoxNo.Text} 已装满{dt.Rows[0]["CAPACITY"].ToString()} 个,请扫描未核对箱号", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                    BoxNo.Text = "";
                     return;
                 }
             }
 
-            if (CheckEnter()) return;
+            if (CheckEnter())
+            {
+                BoxNo.Text = "";
+                return;
+            }
 
             /*if (Datas.Rows.Count > 0)
             {